Conversation
CharlesFolz4
force-pushed
the
ContestScript
branch
from
1a1c73b to
6c02487
Compare
lhearachel
left a comment
lhearachel
left a comment
There was a problem hiding this comment.
Some preliminary feedback, mostly for the script commands and some structure.
asm/macros/scrcmd.inc
Outdated
| .endm | ||
|
|
||
| .macro ScrCmd_0FA arg0, arg1, arg2, arg3 | ||
| .macro ContestNew contestRank, contestType, competitionType, partySlot |
There was a problem hiding this comment.
suggestion: Script commands should start with a verb. Maybe StartContest? NewContest?
asm/macros/scrcmd.inc
Outdated
| .endm | ||
|
|
||
| .macro ScrCmd_0FC arg0, arg1 | ||
| .macro ScrCmd_BufferJudgeName judgeID, idx |
There was a problem hiding this comment.
issue: Remove the ScrCmd_ prefix from this command.
| .macro ScrCmd_114 | ||
| .macro HBlankSystem_Start | ||
| .short 276 | ||
| .endm |
There was a problem hiding this comment.
suggestion: StopHBlank / StartHBlank.
asm/macros/scrcmd.inc
Outdated
| .endm | ||
|
|
||
| .macro ScrCmd_115 arg0 | ||
| .macro ScrCmd_GetShouldSkipAwardCeremony destSkipAwardCeremony |
There was a problem hiding this comment.
issue: Ditto here for the ScrCmd_ prefix.
include/overlay017/ov17_0223B140.h
Outdated
| int ActingCompetitionInit(ApplicationManager *appMan, int *param1); | ||
| int ActingCompetitionMain(ApplicationManager *appMan, int *param1); | ||
| int ActingCompetitionExit(ApplicationManager *appMan, int *param1); |
There was a problem hiding this comment.
polish: Add an underscore before Init/Main/Exit. Applies to other occurrences in the PR.
include/struct_defs/contest.h
Outdated
There was a problem hiding this comment.
question: This is likely out-of-scope for this PR, but do we have a plan for merging the relevant struct-files together and getting them out of this folder?
There was a problem hiding this comment.
For now, I think it makes sense to merge just the Contest struct into unk_020933F8.h. Not sure about the rest though.
CharlesFolz4
force-pushed
the
ContestScript
branch
from
40ddf29 to
a554a43
Compare
2 participants
Document Contest script commands
Renamed
scripts_contest_registrationtoscripts_contestsLabel prefixes in scripts_contests are split into
ContestRegistration_,OngoingContest_, etc, depending on context.ObjectEventIDs referenced in this script are prefixed with their map, either
CONTEST_HALL_LOBBY_, orCONTEST_HALL_STAGE_ONGOING_CONTEST_, instead ofLOCALID_, because this script file is not local to any one specific map.Major struct identified
UnkStruct_02095C48asContestThis also includes a lot of scattered miscellaneous contest documentation that isn't specific to the scripts, but was helpful in building up context for identifying things in general, and also serves as some initial contest documentation.