From c08453c49d014163a96eec42b03cf0bdfff9375d Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Tue, 23 Jan 2024 23:21:49 -0600 Subject: [PATCH] Rename some symbols in minigame_seq.c --- config/GMPE01_00/symbols.txt | 102 +++++++++++++++++------------------ include/unsplit.h | 2 +- src/REL/w03Dll/mg_item.c | 10 ++-- src/game/objmain.c | 2 +- 4 files changed, 57 insertions(+), 59 deletions(-) diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 18cebb77..0520abba 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -658,18 +658,18 @@ MGSeqInit = .text:0x800353AC; // type:function size:0xBC MGSeqMain = .text:0x80035468; // type:function size:0x188 CreateSeq = .text:0x800355F0; // type:function size:0x1A4 scope:local MGSeqCreate = .text:0x80035794; // type:function size:0x100 -MGSeqGetStat = .text:0x80035894; // type:function size:0x88 -MGSeqSetPos = .text:0x8003591C; // type:function size:0x4C -MGSeqSetParam = .text:0x80035968; // type:function size:0x4C +MGSeqStatGet = .text:0x80035894; // type:function size:0x88 +MGSeqPosSet = .text:0x8003591C; // type:function size:0x4C +MGSeqParamSet = .text:0x80035968; // type:function size:0x4C MGSeqKill = .text:0x800359B4; // type:function size:0x58 MGSeqKillAll = .text:0x80035A0C; // type:function size:0x3C -MGSeqIsDone = .text:0x80035A48; // type:function size:0xA4 +MGSeqDoneCheck = .text:0x80035A48; // type:function size:0xA4 MGSeqStub = .text:0x80035AEC; // type:function size:0x4 MGSeqSprKill = .text:0x80035AF0; // type:function size:0x8C SeqInitTimer = .text:0x80035B7C; // type:function size:0x2E0 scope:local SeqUpdateTimer = .text:0x80035E5C; // type:function size:0x69C scope:local -fn_800364F8 = .text:0x800364F8; // type:function size:0x3D8 -fn_800368D0 = .text:0x800368D0; // type:function size:0x2F8 +SeqInitType2 = .text:0x800364F8; // type:function size:0x3D8 scope:local +SeqUpdateType2 = .text:0x800368D0; // type:function size:0x2F8 scope:local fn_80036BC8 = .text:0x80036BC8; // type:function size:0x188 SeqMakeWord = .text:0x80036D50; // type:function size:0x1D0 scope:local SeqLoadFontChar = .text:0x80036F20; // type:function size:0x26C scope:local @@ -680,21 +680,21 @@ SeqUpdateMGBattle = .text:0x80037F94; // type:function size:0xDA4 scope:local SeqUpdateMG1vs3 = .text:0x80038D38; // type:function size:0xDA4 scope:local SeqUpdateMGStory = .text:0x80039ADC; // type:function size:0xBB8 scope:local SeqUpdateMG2vs2 = .text:0x8003A694; // type:function size:0xAB4 scope:local -fn_8003B148 = .text:0x8003B148; // type:function size:0x3C4 -fn_8003B50C = .text:0x8003B50C; // type:function size:0x91C +SeqInitFlip = .text:0x8003B148; // type:function size:0x3C4 scope:local +SeqUpdateFlip = .text:0x8003B50C; // type:function size:0x91C scope:local SeqUpdateMGBowser = .text:0x8003BE28; // type:function size:0xC84 scope:local -fn_8003CAAC = .text:0x8003CAAC; // type:function size:0xDC -fn_8003CB88 = .text:0x8003CB88; // type:function size:0x3DC +SeqInitDraw = .text:0x8003CAAC; // type:function size:0xDC scope:local +SeqUpdateDraw = .text:0x8003CB88; // type:function size:0x3DC scope:local SeqInitWin = .text:0x8003CF64; // type:function size:0x8A0 scope:local SeqUpdateWin = .text:0x8003D804; // type:function size:0x72C scope:local SeqInitRecord = .text:0x8003DF30; // type:function size:0x774 scope:local SeqUpdateRecord = .text:0x8003E6A4; // type:function size:0x304 scope:local -MGSeqPauseStart = .text:0x8003E9A8; // type:function size:0x6C -SeqPauseProcFunc = .text:0x8003EA14; // type:function size:0x94C scope:local -MGSeqPauseStop = .text:0x8003F360; // type:function size:0xC +MGSeqPauseInit = .text:0x8003E9A8; // type:function size:0x6C +PauseProc = .text:0x8003EA14; // type:function size:0x94C scope:local +MGSeqPauseKill = .text:0x8003F360; // type:function size:0xC MGSeqPauseEnableCtrl = .text:0x8003F36C; // type:function size:0x40 -MGSeqPracticeStart = .text:0x8003F3AC; // type:function size:0xDC -SeqPracticeProcFunc = .text:0x8003F488; // type:function size:0x234 scope:local +MGSeqPracticeInit = .text:0x8003F3AC; // type:function size:0xDC +PracticeProc = .text:0x8003F488; // type:function size:0x234 scope:local SeqSEPlay = .text:0x8003F6BC; // type:function size:0xD4 scope:local MGSeqPracticeExitCheck = .text:0x8003F790; // type:function size:0x128 espInit = .text:0x8003F8B8; // type:function size:0xA0 @@ -4932,28 +4932,28 @@ lbl_8012F020 = .data:0x8012F020; // type:object size:0x94 lbl_8012F0B4 = .data:0x8012F0B4; // type:object size:0x11 data:string lbl_8012F0C5 = .data:0x8012F0C5; // type:object size:0x3A lbl_8012F0FF = .data:0x8012F0FF; // type:object size:0x31 -SeqTable = .data:0x8012F130; // type:object size:0x1DC scope:local -lbl_8012F30C = .data:0x8012F30C; // type:object size:0x18 -SeqTypeTable = .data:0x8012F324; // type:object size:0x12 scope:local +seqInfo = .data:0x8012F130; // type:object size:0x1DC scope:local +seqType2SprTbl = .data:0x8012F30C; // type:object size:0x18 scope:local +seqTypeTbl = .data:0x8012F324; // type:object size:0x12 scope:local lbl_8012F336 = .data:0x8012F336; // type:object size:0x53 scope:local data:string lbl_8012F389 = .data:0x8012F389; // type:object size:0x9 scope:local data:string lbl_8012F392 = .data:0x8012F392; // type:object size:0x9 scope:local data:string -SeqFontAlphaTbl = .data:0x8012F39B; // type:object size:0x35 scope:local data:string -SeqFontKanaTbl = .data:0x8012F3D0; // type:object size:0x52 scope:local data:string -SeqFontNumTbl = .data:0x8012F422; // type:object size:0xB scope:local data:string +seqFontAlphaTbl = .data:0x8012F39B; // type:object size:0x35 scope:local data:string +seqFontKanaTbl = .data:0x8012F3D0; // type:object size:0x52 scope:local data:string +seqFontNumTbl = .data:0x8012F422; // type:object size:0xB scope:local data:string lbl_8012F430 = .data:0x8012F430; // type:object size:0x14 -WordTbl = .data:0x8012F444; // type:object size:0x18 scope:local -LetterBattleOfs = .data:0x8012F45C; // type:object size:0x40 scope:local -Letter2vs2Ofs = .data:0x8012F49C; // type:object size:0x1C scope:local -LetterBowserOfs = .data:0x8012F4B8; // type:object size:0x38 scope:local -lbl_8012F4F0 = .data:0x8012F4F0; // type:object size:0xC -CharNameTbl = .data:0x8012F4FC; // type:object size:0x78 scope:local -lbl_8012F574 = .data:0x8012F574; // type:object size:0xC -WinStrTbl = .data:0x8012F580; // type:object size:0x18 scope:local -WinPosOfs = .data:0x8012F598; // type:object size:0x50 scope:local -PracticeTbl = .data:0x8012F5E8; // type:object size:0xAC scope:local -PracticePosTbl = .data:0x8012F694; // type:object size:0xC scope:local -SeqFXTable = .data:0x8012F6A0; // type:object size:0xF0 scope:local +wordTbl = .data:0x8012F444; // type:object size:0x18 scope:local +letterBattleOfs = .data:0x8012F45C; // type:object size:0x40 scope:local +letter2vs2Ofs = .data:0x8012F49C; // type:object size:0x1C scope:local +letterBowserOfs = .data:0x8012F4B8; // type:object size:0x38 scope:local +lbl_8012F4F0 = .data:0x8012F4F0; // type:object size:0xA data:string +charNameTbl = .data:0x8012F4FC; // type:object size:0x78 scope:local +lbl_8012F574 = .data:0x8012F574; // type:object size:0xA data:string +winStrTbl = .data:0x8012F580; // type:object size:0x18 scope:local +winPosOfs = .data:0x8012F598; // type:object size:0x50 scope:local +practiceTbl = .data:0x8012F5E8; // type:object size:0xAC scope:local +practiceData = .data:0x8012F694; // type:object size:0xC scope:local +seqFXTbl = .data:0x8012F6A0; // type:object size:0xF0 scope:local lbl_8012F790 = .data:0x8012F790; // type:object size:0x15 data:string lbl_8012F7A5 = .data:0x8012F7A5; // type:object size:0x10 data:string lbl_8012F7B5 = .data:0x8012F7B5; // type:object size:0x13 data:string @@ -5521,8 +5521,8 @@ CZoomM = .bss:0x801901A0; // type:object size:0x40 omDLLinfoTbl = .bss:0x801901E0; // type:object size:0x50 sndFXBuf = .bss:0x80190230; // type:object size:0x200 scope:local charVoiceGroupStat = .bss:0x80190430; // type:object size:0x20 scope:local -SeqData = .bss:0x80190450; // type:object size:0x400 scope:local data:4byte -SeqDuration = .bss:0x80190850; // type:object size:0x10 scope:local data:2byte +seqStat = .bss:0x80190450; // type:object size:0x400 scope:local data:4byte +seqMaxTime = .bss:0x80190850; // type:object size:0x10 scope:local data:2byte esprite = .bss:0x80190860; // type:object size:0x600 data:2byte espanim = .bss:0x80190E60; // type:object size:0x1200 data:4byte lbl_80192060 = .bss:0x80192060; // type:object size:0x100 @@ -5782,9 +5782,9 @@ lbl_801D34A0 = .sdata:0x801D34A0; // type:object size:0x4 data:4byte lbl_801D34A4 = .sdata:0x801D34A4; // type:object size:0xC lbl_801D34B0 = .sdata:0x801D34B0; // type:object size:0x1 lbl_801D34B1 = .sdata:0x801D34B1; // type:object size:0x7 -MGSeqInitFlag = .sdata:0x801D34B8; // type:object size:0x4 data:4byte +mgSeqInitF = .sdata:0x801D34B8; // type:object size:0x4 data:4byte lbl_801D34BC = .sdata:0x801D34BC; // type:object size:0x7 data:string -lbl_801D34C3 = .sdata:0x801D34C3; // type:object size:0x1 data:byte +lbl_801D34C3 = .sdata:0x801D34C3; // type:object size:0x3 data:byte lbl_801D34C6 = .sdata:0x801D34C6; // type:object size:0x6 lbl_801D34CC = .sdata:0x801D34CC; // type:object size:0x8 lbl_801D34D4 = .sdata:0x801D34D4; // type:object size:0x6 @@ -5825,8 +5825,8 @@ lbl_801D3598 = .sdata:0x801D3598; // type:object size:0x6 lbl_801D359E = .sdata:0x801D359E; // type:object size:0x5 data:string lbl_801D35A3 = .sdata:0x801D35A3; // type:object size:0x7 lbl_801D35AA = .sdata:0x801D35AA; // type:object size:0x6 -lbl_801D35B0 = .sdata:0x801D35B0; // type:object size:0x8 -PauseStrTbl = .sdata:0x801D35B8; // type:object size:0x8 scope:local +lbl_801D35B0 = .sdata:0x801D35B0; // type:object size:0x6 data:string +pauseStrTbl = .sdata:0x801D35B8; // type:object size:0x8 scope:local lbl_801D35C0 = .sdata:0x801D35C0; // type:object size:0x8 lbl_801D35C8 = .sdata:0x801D35C8; // type:object size:0x8 lbl_801D35D0 = .sdata:0x801D35D0; // type:object size:0x8 @@ -6245,17 +6245,17 @@ nMesh = .sbss:0x801D3D64; // type:object size:0x4 scope:local data:4byte nObj = .sbss:0x801D3D68; // type:object size:0x4 scope:local data:4byte MtxTop = .sbss:0x801D3D6C; // type:object size:0x4 data:4byte Vertextop = .sbss:0x801D3D70; // type:object size:0x4 data:4byte -SeqLanguage = .sbss:0x801D3D78; // type:object size:0x4 scope:local data:4byte -PauseProcess = .sbss:0x801D3D7C; // type:object size:0x4 scope:local data:4byte -PauseActive = .sbss:0x801D3D80; // type:object size:0x4 scope:local data:4byte -PauseExit = .sbss:0x801D3D84; // type:object size:0x4 scope:local data:4byte -PauseWait = .sbss:0x801D3D88; // type:object size:0x4 scope:local data:4byte -SeqRecordValue = .sbss:0x801D3D8C; // type:object size:0x4 scope:local data:4byte -PauseSeq = .sbss:0x801D3D90; // type:object size:0x2 scope:local data:2byte -SeqSpeed = .sbss:0x801D3D92; // type:object size:0x2 scope:local data:2byte +seqLanguage = .sbss:0x801D3D78; // type:object size:0x4 scope:local data:4byte +pauseProcess = .sbss:0x801D3D7C; // type:object size:0x4 scope:local data:4byte +pauseActiveF = .sbss:0x801D3D80; // type:object size:0x4 scope:local data:4byte +pauseExitF = .sbss:0x801D3D84; // type:object size:0x4 scope:local data:4byte +pauseWaitF = .sbss:0x801D3D88; // type:object size:0x4 scope:local data:4byte +seqRecordVal = .sbss:0x801D3D8C; // type:object size:0x4 scope:local data:4byte +seqPauseF = .sbss:0x801D3D90; // type:object size:0x2 scope:local data:2byte +seqSpeed = .sbss:0x801D3D92; // type:object size:0x2 scope:local data:2byte lbl_801D3D94 = .sbss:0x801D3D94; // type:object size:0x1 data:byte -SeqDone = .sbss:0x801D3D95; // type:object size:0x1 scope:local data:byte -SeqTimer = .sbss:0x801D3D96; // type:object size:0x2 scope:local data:2byte +seqDoneF = .sbss:0x801D3D95; // type:object size:0x1 scope:local data:byte +seqTimer = .sbss:0x801D3D96; // type:object size:0x2 scope:local data:2byte gid = .sbss:0x801D3D98; // type:object size:0x2 scope:local data:2byte lbl_801D3DA0 = .sbss:0x801D3DA0; // type:object size:0x8 wipeFadeInF = .sbss:0x801D3DA8; // type:object size:0x8 data:4byte @@ -7152,9 +7152,7 @@ lbl_801D4E44 = .sdata2:0x801D4E44; // type:object size:0x4 data:float lbl_801D4E48 = .sdata2:0x801D4E48; // type:object size:0x8 data:double lbl_801D4E50 = .sdata2:0x801D4E50; // type:object size:0x8 data:double lbl_801D4E58 = .sdata2:0x801D4E58; // type:object size:0x8 data:double -lbl_801D4E60 = .sdata2:0x801D4E60; // type:object size:0x2 data:2byte -lbl_801D4E62 = .sdata2:0x801D4E62; // type:object size:0x2 data:2byte -lbl_801D4E64 = .sdata2:0x801D4E64; // type:object size:0x2 data:2byte +lbl_801D4E60 = .sdata2:0x801D4E60; // type:object size:0x6 data:2byte lbl_801D4E68 = .sdata2:0x801D4E68; // type:object size:0x4 data:float lbl_801D4E6C = .sdata2:0x801D4E6C; // type:object size:0x4 data:float lbl_801D4E70 = .sdata2:0x801D4E70; // type:object size:0x4 data:float diff --git a/include/unsplit.h b/include/unsplit.h index b1f96683..7f4e6841 100644 --- a/include/unsplit.h +++ b/include/unsplit.h @@ -5,7 +5,7 @@ void MGSeqKillAll(void); -void MGSeqPracticeStart(void); +void MGSeqPracticeInit(void); void CharMotionClose(s16 character); void CharModelClose(s16 character); void CharModelKill(s16 character); diff --git a/src/REL/w03Dll/mg_item.c b/src/REL/w03Dll/mg_item.c index 9efb1210..7a32b5d2 100644 --- a/src/REL/w03Dll/mg_item.c +++ b/src/REL/w03Dll/mg_item.c @@ -66,7 +66,7 @@ s32 BoardModelMotionShiftSet(s16, s32, f32, f32, u32); s32 BoardVecDAngleCalcRange(float *value, float min, float range); void BoardCameraQuakeSet(s32 duration, float strength); s16 MGSeqCreate(s32, ...); -u8 MGSeqGetStat(s16); +u8 MGSeqStatGet(s16); void omVibrate(s16, s16, s16, s16); void BoardPlayerMotBlendSet(s32, s32, s32); f32 BoardPlayerRotYGet(s32); @@ -339,7 +339,7 @@ void fn_1_A44C(s32 arg0) { BoardMusStart(1, 0x17, 0x7F, 0); temp_r30 = MGSeqCreate(3, 0); - while (MGSeqGetStat(temp_r30) != 0) { + while (MGSeqStatGet(temp_r30) != 0) { HuPrcVSleep(); } fn_1_A7A0(arg0); @@ -448,7 +448,7 @@ void fn_1_A994(omObjData* arg0) { temp_r31 = (someBits*)&lbl_1_bss_188->work[0]; if ((temp_r31->unk00_bit0 != 0)|| (BoardIsKill() != 0)) { if (temp_r31->unk4 != -1) { - MGSeqSetParam(temp_r31->unk4, 2, -1U); + MGSeqParamSet(temp_r31->unk4, 2, -1U); temp_r31->unk4 = -1; } lbl_1_bss_188 = NULL; @@ -465,7 +465,7 @@ void fn_1_A994(omObjData* arg0) { } else { fn_1_ACD8(2); } - MGSeqSetParam(temp_r31->unk4, 1, temp_r31->unk1); + MGSeqParamSet(temp_r31->unk4, 1, temp_r31->unk1); temp_r31->unk2 = 0x3CU; } } @@ -544,7 +544,7 @@ void fn_1_ACD8(s32 arg0) { lbl_1_data_4D8 = -1; } if (temp_r31->unk4 != -1) { - MGSeqSetParam(temp_r31->unk4, 2, -1U); + MGSeqParamSet(temp_r31->unk4, 2, -1U); temp_r31->unk4 = -1; } BoardPlayerMotionShiftSet(temp_r31->unk00_bit4, 0xB, 0.0f, 10.0f, 0); diff --git a/src/game/objmain.c b/src/game/objmain.c index ce30d3d7..5712f4d5 100644 --- a/src/game/objmain.c +++ b/src/game/objmain.c @@ -85,7 +85,7 @@ static void omWatchOverlayProc(void) omovlstat = omnextovlstat; omnextovl = OVL_INVALID; if(_CheckFlag(FLAG_ID_MAKE(1, 12))) { - MGSeqPracticeStart(); + MGSeqPracticeInit(); } omSysPauseEnable(TRUE); omcurdll = omDLLStart(omcurovl, 0);