From b2cd6346b286bebae8075146ce80cb4ef59d2109 Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Fri, 29 Dec 2023 08:48:28 -0600 Subject: [PATCH 1/2] Label rest of board/main.c --- config/GMPE01_00/splits.txt | 2 +- config/GMPE01_00/symbols.txt | 90 ++++++++++++++++++------------------ configure.py | 2 +- include/common_structs.h | 4 +- include/functions.h | 2 +- src/REL/w10Dll/w10Dll.c | 2 +- 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/config/GMPE01_00/splits.txt b/config/GMPE01_00/splits.txt index 490c4d0b..870ef2e3 100644 --- a/config/GMPE01_00/splits.txt +++ b/config/GMPE01_00/splits.txt @@ -349,7 +349,7 @@ game/board/window.c: .sbss start:0x801D3F68 end:0x801D3F90 .sdata2 start:0x801D5318 end:0x801D5328 -game/board/board_snd.c: +game/board/speaker.c: .text start:0x80070D84 end:0x80071290 .data start:0x80139AE8 end:0x80139B00 .sdata start:0x801D36E8 end:0x801D36F0 diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index a7dbbeb8..5a60dbdc 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -1005,22 +1005,22 @@ ExecBoardFunc = .text:0x8005B494; // type:function size:0x9C scope:local KillBoardFunc = .text:0x8005B530; // type:function size:0xCC scope:local BoardKill = .text:0x8005B5FC; // type:function size:0xAC BoardIsKill = .text:0x8005B6A8; // type:function size:0x48 -BoardSetPauseEnable = .text:0x8005B6F0; // type:function size:0x74 -BoardGetPauseEnable = .text:0x8005B764; // type:function size:0x48 -BoardSetSave = .text:0x8005B7AC; // type:function size:0x524 -fn_8005BCD0 = .text:0x8005BCD0; // type:function size:0x160 -BoardLoadConfig = .text:0x8005BE30; // type:function size:0x160 -DestroyBoardMainProc = .text:0x8005BF90; // type:function size:0xC scope:local -BoardMainProcFunc = .text:0x8005BF9C; // type:function size:0x7D0 scope:local +BoardPauseEnableSet = .text:0x8005B6F0; // type:function size:0x74 +BoardPauseEnableGet = .text:0x8005B764; // type:function size:0x48 +BoardSaveInit = .text:0x8005B7AC; // type:function size:0x524 +BoardStoryConfigSet = .text:0x8005BCD0; // type:function size:0x160 +BoardConfigSet = .text:0x8005BE30; // type:function size:0x160 +DestroyMainFunc = .text:0x8005BF90; // type:function size:0xC scope:local +MainFunc = .text:0x8005BF9C; // type:function size:0x7D0 scope:local BoardTurnNext = .text:0x8005C76C; // type:function size:0x8C BoardIsTurnCont = .text:0x8005C7F8; // type:function size:0x28C -BoardSetNextOvl = .text:0x8005CA84; // type:function size:0xC4 -BoardHasStarted = .text:0x8005CB48; // type:function size:0x8C +BoardNextOvlSet = .text:0x8005CA84; // type:function size:0xC4 +BoardIsStarted = .text:0x8005CB48; // type:function size:0x8C CreateBoard = .text:0x8005CBD4; // type:function size:0x410 scope:local DestroyBoard = .text:0x8005CFE4; // type:function size:0x128 scope:local -fn_8005D10C = .text:0x8005D10C; // type:function size:0xC -fn_8005D118 = .text:0x8005D118; // type:function size:0x44 -fn_8005D15C = .text:0x8005D15C; // type:function size:0x50 +BoardLightHookSet = .text:0x8005D10C; // type:function size:0xC +BoardLightSet = .text:0x8005D118; // type:function size:0x44 +BoardLightReset = .text:0x8005D15C; // type:function size:0x50 BoardCameraBackup = .text:0x8005D1AC; // type:function size:0x3C BoardCameraRestore = .text:0x8005D1E8; // type:function size:0x48 BoardCameraScissorSet = .text:0x8005D230; // type:function size:0x54 @@ -1067,8 +1067,8 @@ BoardMGStartFlagSet = .text:0x8005F294; // type:function size:0x28 BoardMGStartFlagReset = .text:0x8005F2BC; // type:function size:0x28 BoardMGStartFlagGet = .text:0x8005F2E4; // type:function size:0x48 BoardMTXCalcLookAt = .text:0x8005F32C; // type:function size:0x10C -fn_8005F438 = .text:0x8005F438; // type:function size:0x330 -fn_8005F768 = .text:0x8005F768; // type:function size:0x390 +BoardArcSin = .text:0x8005F438; // type:function size:0x330 +BoardArcCos = .text:0x8005F768; // type:function size:0x390 BoardRandInit = .text:0x8005FAF8; // type:function size:0x24 BoardRand = .text:0x8005FB1C; // type:function size:0x24 BoardRandMod = .text:0x8005FB40; // type:function size:0x50 @@ -1085,19 +1085,19 @@ BoardFilterFadeIsDone = .text:0x8006039C; // type:function size:0x5C BoardFilterFadeAlive = .text:0x800603F8; // type:function size:0x34 BoardFilterFadeUpdate = .text:0x8006042C; // type:function size:0x178 BoardFilterFadeDraw = .text:0x800605A4; // type:function size:0x350 -fn_800608F4 = .text:0x800608F4; // type:function size:0x164 -fn_80060A58 = .text:0x80060A58; // type:function size:0x24 -fn_80060A7C = .text:0x80060A7C; // type:function size:0x88 -fn_80060B04 = .text:0x80060B04; // type:function size:0xB8 -fn_80060BBC = .text:0x80060BBC; // type:function size:0x564 -fn_80061120 = .text:0x80061120; // type:function size:0x14C -fn_8006126C = .text:0x8006126C; // type:function size:0x254 -BoardTurnRemainInit = .text:0x800614C0; // type:function size:0x2B4 -BoardTurnRemainUpdate = .text:0x80061774; // type:function size:0x2AC -BoardTurnRemainHide = .text:0x80061A20; // type:function size:0xAC -fn_80061ACC = .text:0x80061ACC; // type:function size:0x80 -fn_80061B4C = .text:0x80061B4C; // type:function size:0x54 -fn_80061BA0 = .text:0x80061BA0; // type:function size:0x3A4 +BoardConfettiCreate = .text:0x800608F4; // type:function size:0x164 +BoardConfettiStop = .text:0x80060A58; // type:function size:0x24 +BoardConfettiKill = .text:0x80060A7C; // type:function size:0x88 +ConfettiUpdate = .text:0x80060B04; // type:function size:0xB8 scope:local +ConfettiSpawn = .text:0x80060BBC; // type:function size:0x564 scope:local +ConfettiMove = .text:0x80061120; // type:function size:0x14C +ConfettiDraw = .text:0x8006126C; // type:function size:0x254 +BoardLast5GfxInit = .text:0x800614C0; // type:function size:0x2B4 +BoardLast5GfxUpdate = .text:0x80061774; // type:function size:0x2AC +BoardLast5GfxHide = .text:0x80061A20; // type:function size:0xAC +BoardTauntInit = .text:0x80061ACC; // type:function size:0x80 +BoardTauntKill = .text:0x80061B4C; // type:function size:0x54 +TauntUpdate = .text:0x80061BA0; // type:function size:0x3A4 scope:local fn_80061F44 = .text:0x80061F44; // type:function size:0x38 fn_80061F7C = .text:0x80061F7C; // type:function size:0x48 fn_80061FC4 = .text:0x80061FC4; // type:function size:0xC @@ -5141,11 +5141,11 @@ lbl_8013976C = .data:0x8013976C; // type:object size:0x13 data:string lbl_8013977F = .data:0x8013977F; // type:object size:0x19 camViewTbl = .data:0x80139798; // type:object size:0x24 scope:local jumptable_801397BC = .data:0x801397BC; // type:object size:0x24 scope:local -lbl_801397E0 = .data:0x801397E0; // type:object size:0x48 -turnRemainSprTbl = .data:0x80139828; // type:object size:0xC scope:local -turnRemainSprPosTbl = .data:0x80139834; // type:object size:0x30 scope:local -lbl_80139864 = .data:0x80139864; // type:object size:0x10 -lbl_80139874 = .data:0x80139874; // type:object size:0x24 +confettiLightTbl = .data:0x801397E0; // type:object size:0x48 scope:local +last5GfxSprTbl = .data:0x80139828; // type:object size:0xC scope:local +last5GfxPosTbl = .data:0x80139834; // type:object size:0x30 scope:local +tauntActiveSfxTbl = .data:0x80139864; // type:object size:0x10 scope:local +tauntSfxTbl = .data:0x80139874; // type:object size:0x24 scope:local lbl_80139898 = .data:0x80139898; // type:object size:0x10 lbl_801398A8 = .data:0x801398A8; // type:object size:0x10 lbl_801398B8 = .data:0x801398B8; // type:object size:0xA data:2byte @@ -5496,7 +5496,7 @@ ToeMessageArray = .bss:0x8019C490; // type:object size:0x40 scope:local ToeThread = .bss:0x8019C4D0; // type:object size:0x310 scope:local align:8 ToeThreadStack = .bss:0x8019C7E0; // type:object size:0x1000 scope:local boardCamera = .bss:0x8019D7E0; // type:object size:0xC4 data:byte -boardCameraBackup = .bss:0x8019D8A4; // type:object size:0xC4 +cameraBackup = .bss:0x8019D8A4; // type:object size:0xC4 scope:local lbl_8019D968 = .bss:0x8019D968; // type:object size:0x10 lbl_8019D978 = .bss:0x8019D978; // type:object size:0x10 lbl_8019D988 = .bss:0x8019D988; // type:object size:0x10 @@ -6250,23 +6250,23 @@ XfbH = .sbss:0x801D3ECC; // type:object size:0x2 scope:local data:2byte XfbW = .sbss:0x801D3ECE; // type:object size:0x2 scope:local data:2byte boardMainProc = .sbss:0x801D3ED0; // type:object size:0x4 data:4byte boardObjMan = .sbss:0x801D3ED4; // type:object size:0x4 data:4byte -boardCameraObj = .sbss:0x801D3ED8; // type:object size:0x4 data:4byte -lbl_801D3EDC = .sbss:0x801D3EDC; // type:object size:0x4 data:4byte -boardCameraUseBackup = .sbss:0x801D3EE0; // type:object size:0x4 data:4byte -boardCreateFunc = .sbss:0x801D3EE4; // type:object size:0x4 scope:local data:4byte -boardDestroyFunc = .sbss:0x801D3EE8; // type:object size:0x4 scope:local data:4byte -lbl_801D3EEC = .sbss:0x801D3EEC; // type:object size:0x4 data:4byte -lbl_801D3EF0 = .sbss:0x801D3EF0; // type:object size:0x4 data:4byte +cameraObj = .sbss:0x801D3ED8; // type:object size:0x4 scope:local data:4byte +tauntObj = .sbss:0x801D3EDC; // type:object size:0x4 scope:local data:4byte +cameraUseBackup = .sbss:0x801D3EE0; // type:object size:0x4 scope:local data:4byte +createFunc = .sbss:0x801D3EE4; // type:object size:0x4 scope:local data:4byte +destroyFunc = .sbss:0x801D3EE8; // type:object size:0x4 scope:local data:4byte +boardLightSetHook = .sbss:0x801D3EEC; // type:object size:0x4 data:4byte +boardLightResetHook = .sbss:0x801D3EF0; // type:object size:0x4 data:4byte boardTurnFunc = .sbss:0x801D3EF4; // type:object size:0x4 data:4byte lbl_801D3EF8 = .sbss:0x801D3EF8; // type:object size:0x4 data:4byte lbl_801D3EFC = .sbss:0x801D3EFC; // type:object size:0x4 data:4byte lbl_801D3F00 = .sbss:0x801D3F00; // type:object size:0x4 data:4byte -boardPlayerEffect = .sbss:0x801D3F04; // type:object size:0x4 data:4byte -boardFilterObj = .sbss:0x801D3F08; // type:object size:0x4 data:4byte -lbl_801D3F0C = .sbss:0x801D3F0C; // type:object size:0x4 data:4byte -boardTurnRemainObj = .sbss:0x801D3F10; // type:object size:0x4 data:4byte +boardTurnStartFunc = .sbss:0x801D3F04; // type:object size:0x4 data:4byte +filterObj = .sbss:0x801D3F08; // type:object size:0x4 scope:local data:4byte +confettiObj = .sbss:0x801D3F0C; // type:object size:0x4 scope:local data:4byte +last5GfxObj = .sbss:0x801D3F10; // type:object size:0x4 scope:local data:4byte boardRandSeed = .sbss:0x801D3F14; // type:object size:0x4 data:4byte -boardMainObj = .sbss:0x801D3F18; // type:object size:0x8 data:4byte +boardMainObj = .sbss:0x801D3F18; // type:object size:0x4 data:4byte lbl_801D3F20 = .sbss:0x801D3F20; // type:object size:0x4 data:4byte lbl_801D3F24 = .sbss:0x801D3F24; // type:object size:0x4 data:4byte lbl_801D3F28 = .sbss:0x801D3F28; // type:object size:0x4 data:4byte diff --git a/configure.py b/configure.py index ccbd95a3..798511c3 100644 --- a/configure.py +++ b/configure.py @@ -283,7 +283,7 @@ config.libs = [ Object(NonMatching, "game/board/board.c"), Object(NonMatching, "game/board/model.c"), Object(NonMatching, "game/board/window.c"), - Object(NonMatching, "game/board/board_snd.c"), + Object(NonMatching, "game/board/speaker.c"), Object(NonMatching, "game/board/com.c"), Object(NonMatching, "game/board/overhead.c"), Object(NonMatching, "game/board/space.c"), diff --git a/include/common_structs.h b/include/common_structs.h index 190e7251..bb1c8bb0 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -16,8 +16,8 @@ typedef struct system_state { /* 0x00 */ struct { u8 story : 1; u8 team : 1; - u8 : 7; }; +/* 0x01 */ s8 diff_story; /* 0x02 */ struct { u16 bonus_star : 1; u16 explain_mg : 1; @@ -62,8 +62,8 @@ typedef struct player_state { u8 team : 1; u8 field02_bit1 : 1; u8 player_idx : 2; - u8 field02_bit4 : 5; }; +/* 0x03 */ s8 handicap; /* 0x04 */ s8 port; /* 0x05 */ s8 items[3]; /* 0x08 */ struct { diff --git a/include/functions.h b/include/functions.h index 264e3222..1aee5033 100644 --- a/include/functions.h +++ b/include/functions.h @@ -71,7 +71,7 @@ void fn_800B42BC(s16); s32 BoardModelIDGet(s16); void BoardInit(void*, void*); void BoardModelScaleSetV(s32, Vec*); -void fn_8005D10C(void*, void*); +void BoardLightHookSet(void*, void*); s16 BoardModelCreate(s32, void*, s32); void BoardModelKill(s16); void fn_8006DDE8(s16, f32); diff --git a/src/REL/w10Dll/w10Dll.c b/src/REL/w10Dll/w10Dll.c index 0a3507af..682f64c4 100644 --- a/src/REL/w10Dll/w10Dll.c +++ b/src/REL/w10Dll/w10Dll.c @@ -105,7 +105,7 @@ void fn_1_E0(void) { BoardModelMotionStart(lbl_1_data_32, 1, 0x40000001); lbl_1_data_30 = BoardModelCreate(MAKE_DATA_NUM(DATADIR_BGUEST, 13), lbl_1_data_6C, 0); BoardModelMotionStart(lbl_1_data_30, 1, 0x40000001); - fn_8005D10C(&fn_1_8C0, &fn_1_904); + BoardLightHookSet(&fn_1_8C0, &fn_1_904); for (i = 0; i < ARRAY_COUNT(lbl_1_data_0); i++) { temp_r30 = &lbl_1_data_0[i]; if (temp_r30->unk24 != -1) { From 282e4f6c67394155425e9692d629b00121d0aeba Mon Sep 17 00:00:00 2001 From: gamemasterplc Date: Fri, 29 Dec 2023 10:23:38 -0600 Subject: [PATCH 2/2] Mostly label chrman.c --- config/GMPE01_00/symbols.txt | 139 +++++++++++++++++++---------------- src/REL/bootDll/bootDll.c | 2 +- src/game/objmain.c | 2 +- 3 files changed, 76 insertions(+), 67 deletions(-) diff --git a/config/GMPE01_00/symbols.txt b/config/GMPE01_00/symbols.txt index 5a60dbdc..678fa03c 100644 --- a/config/GMPE01_00/symbols.txt +++ b/config/GMPE01_00/symbols.txt @@ -839,64 +839,64 @@ HuARDirCheck = .text:0x80049490; // type:function size:0x58 HuARDirFree = .text:0x800494E8; // type:function size:0x68 HuAR_ARAMtoMRAMFileRead = .text:0x80049550; // type:function size:0x390 ArqCallBackAMFileRead = .text:0x800498E0; // type:function size:0x10 scope:local -fn_800498F0 = .text:0x800498F0; // type:function size:0x134 -fn_80049A24 = .text:0x80049A24; // type:function size:0x1C -fn_80049A40 = .text:0x80049A40; // type:function size:0x98 -fn_80049AD8 = .text:0x80049AD8; // type:function size:0x58 -fn_80049B30 = .text:0x80049B30; // type:function size:0x428 -fn_80049F58 = .text:0x80049F58; // type:function size:0x3C -fn_80049F94 = .text:0x80049F94; // type:function size:0x180 -fn_8004A114 = .text:0x8004A114; // type:function size:0x20C -fn_8004A320 = .text:0x8004A320; // type:function size:0x173C -fn_8004BA5C = .text:0x8004BA5C; // type:function size:0xB0 -fn_8004BB0C = .text:0x8004BB0C; // type:function size:0x254 -fn_8004BD60 = .text:0x8004BD60; // type:function size:0xB0 -fn_8004BE10 = .text:0x8004BE10; // type:function size:0xB0 -fn_8004BEC0 = .text:0x8004BEC0; // type:function size:0xB0 -fn_8004BF70 = .text:0x8004BF70; // type:function size:0xB0 -fn_8004C020 = .text:0x8004C020; // type:function size:0xB0 -fn_8004C0D0 = .text:0x8004C0D0; // type:function size:0xB0 -fn_8004C180 = .text:0x8004C180; // type:function size:0x1CC -fn_8004C34C = .text:0x8004C34C; // type:function size:0x4A0 -fn_8004C7EC = .text:0x8004C7EC; // type:function size:0x1E8 -fn_8004C9D4 = .text:0x8004C9D4; // type:function size:0x344 -fn_8004CD18 = .text:0x8004CD18; // type:function size:0x1D0 -fn_8004CEE8 = .text:0x8004CEE8; // type:function size:0x88 -fn_8004CF70 = .text:0x8004CF70; // type:function size:0x9C -fn_8004D00C = .text:0x8004D00C; // type:function size:0x2B8 -fn_8004D2C4 = .text:0x8004D2C4; // type:function size:0x430 -fn_8004D6F4 = .text:0x8004D6F4; // type:function size:0x244 -fn_8004D938 = .text:0x8004D938; // type:function size:0x7C -fn_8004D9B4 = .text:0x8004D9B4; // type:function size:0x17C -fn_8004DB30 = .text:0x8004DB30; // type:function size:0x7C -fn_8004DBAC = .text:0x8004DBAC; // type:function size:0x7C -fn_8004DC28 = .text:0x8004DC28; // type:function size:0x4C -fn_8004DC74 = .text:0x8004DC74; // type:function size:0x44 -fn_8004DCB8 = .text:0x8004DCB8; // type:function size:0x44 -fn_8004DCFC = .text:0x8004DCFC; // type:function size:0x44 -fn_8004DD40 = .text:0x8004DD40; // type:function size:0x44 -fn_8004DD84 = .text:0x8004DD84; // type:function size:0x84 -fn_8004DE08 = .text:0x8004DE08; // type:function size:0x44 -fn_8004DE4C = .text:0x8004DE4C; // type:function size:0x4C -fn_8004DE98 = .text:0x8004DE98; // type:function size:0x80 -fn_8004DF18 = .text:0x8004DF18; // type:function size:0x1D4 -fn_8004E0EC = .text:0x8004E0EC; // type:function size:0x484 -fn_8004E570 = .text:0x8004E570; // type:function size:0x3FC -fn_8004E96C = .text:0x8004E96C; // type:function size:0x168 -fn_8004EAD4 = .text:0x8004EAD4; // type:function size:0x1A0 +CharManInit = .text:0x800498F0; // type:function size:0x134 +CharAMemPtrGet = .text:0x80049A24; // type:function size:0x1C +CharARAMOpen = .text:0x80049A40; // type:function size:0x98 +CharARAMClose = .text:0x80049AD8; // type:function size:0x58 +CharKill = .text:0x80049B30; // type:function size:0x428 +CharKillAll = .text:0x80049F58; // type:function size:0x3C +CharModelCreate = .text:0x80049F94; // type:function size:0x180 +UpdateChar = .text:0x8004A114; // type:function size:0x20C scope:local +UpdateCharAnim = .text:0x8004A320; // type:function size:0x173C scope:local +PlayCharVoice = .text:0x8004BA5C; // type:function size:0xB0 scope:local +InitEffect = .text:0x8004BB0C; // type:function size:0x254 scope:local +CreateEffectDust = .text:0x8004BD60; // type:function size:0xB0 scope:local +CreateEffectSmoke = .text:0x8004BE10; // type:function size:0xB0 scope:local +CreateEffectDot = .text:0x8004BEC0; // type:function size:0xB0 scope:local +CreateEffectStar = .text:0x8004BF70; // type:function size:0xB0 scope:local +CreateEffectWarn = .text:0x8004C020; // type:function size:0xB0 scope:local +CreateEffectBird = .text:0x8004C0D0; // type:function size:0xB0 scope:local +CreateEffect = .text:0x8004C180; // type:function size:0x1CC scope:local +UpdateEffect = .text:0x8004C34C; // type:function size:0x4A0 scope:local +RotateEffect = .text:0x8004C7EC; // type:function size:0x1E8 scope:local +PlayEffectSound = .text:0x8004C9D4; // type:function size:0x344 scope:local +CharMotionCreate = .text:0x8004CD18; // type:function size:0x1D0 +CharMotionSet = .text:0x8004CEE8; // type:function size:0x88 +CharMotionKill = .text:0x8004CF70; // type:function size:0x9C +CharModelKill = .text:0x8004D00C; // type:function size:0x2B8 +CharModelKillIndex = .text:0x8004D2C4; // type:function size:0x430 +CharModelKillAll = .text:0x8004D6F4; // type:function size:0x244 +CharModelMotionSet = .text:0x8004D938; // type:function size:0x7C +CharModelTexAnimSet = .text:0x8004D9B4; // type:function size:0x17C +CharModelTexNameGet = .text:0x8004DB30; // type:function size:0x7C +CharModelHookNameGet = .text:0x8004DBAC; // type:function size:0x7C +CharModelMotionTimeSet = .text:0x8004DC28; // type:function size:0x4C +CharModelMotionTimeGet = .text:0x8004DC74; // type:function size:0x44 +CharModelMotionMaxTimeGet = .text:0x8004DCB8; // type:function size:0x44 +CharModelMotionEndCheck = .text:0x8004DCFC; // type:function size:0x44 +CharModelMotionShiftIDGet = .text:0x8004DD40; // type:function size:0x44 +CharModelMotionShiftSet = .text:0x8004DD84; // type:function size:0x84 +CharModelMotionShiftTimeGet = .text:0x8004DE08; // type:function size:0x44 +CharModelMotionSpeedSet = .text:0x8004DE4C; // type:function size:0x4C +CharModelLayerSetAll = .text:0x8004DE98; // type:function size:0x80 +CharModelCreateItemHook = .text:0x8004DF18; // type:function size:0x1D4 +UpdateItemHook = .text:0x8004E0EC; // type:function size:0x484 scope:local +CharModelCreateParticle = .text:0x8004E570; // type:function size:0x3FC +OrbitEffect = .text:0x8004E96C; // type:function size:0x168 scope:local +CharModelCreateCoinParticle = .text:0x8004EAD4; // type:function size:0x1A0 fn_8004EC74 = .text:0x8004EC74; // type:function size:0x130 fn_8004EDA4 = .text:0x8004EDA4; // type:function size:0x2B4 fn_8004F058 = .text:0x8004F058; // type:function size:0xE4 fn_8004F13C = .text:0x8004F13C; // type:function size:0x2B4 -fn_8004F3F0 = .text:0x8004F3F0; // type:function size:0x80 -fn_8004F470 = .text:0x8004F470; // type:function size:0xBC +CharModelLayerSetAll2 = .text:0x8004F3F0; // type:function size:0x80 +CharModelSetVoiceEnable = .text:0x8004F470; // type:function size:0xBC fn_8004F52C = .text:0x8004F52C; // type:function size:0x4C fn_8004F578 = .text:0x8004F578; // type:function size:0xB0 fn_8004F628 = .text:0x8004F628; // type:function size:0x2CC fn_8004F8F4 = .text:0x8004F8F4; // type:function size:0x2CC fn_8004FBC0 = .text:0x8004FBC0; // type:function size:0xF80 -fn_80050B40 = .text:0x80050B40; // type:function size:0x30 -fn_80050B70 = .text:0x80050B70; // type:function size:0xEC +CharModelSetStepType = .text:0x80050B40; // type:function size:0x30 +PlayStepFX = .text:0x80050B70; // type:function size:0xEC scope:local MapWall = .text:0x80050C5C; // type:function size:0x1B8 MapWallCheck = .text:0x80050E14; // type:function size:0x110 MapPos = .text:0x80050F24; // type:function size:0x2A8 @@ -5070,11 +5070,14 @@ lbl_801306D8 = .data:0x801306D8; // type:object size:0x19 data:string lbl_801306F1 = .data:0x801306F1; // type:object size:0x14 data:string lbl_80130705 = .data:0x80130705; // type:object size:0x93 lbl_80130798 = .data:0x80130798; // type:object size:0x30 -lbl_801307C8 = .data:0x801307C8; // type:object size:0x60 -lbl_80130828 = .data:0x80130828; // type:object size:0x60 -lbl_80130888 = .data:0x80130888; // type:object size:0x168 +effectDataTbl = .data:0x801307C8; // type:object size:0x60 scope:local +charDirTbl = .data:0x80130828; // type:object size:0x60 scope:local +effectParam = .data:0x80130888; // type:object size:0x110 scope:local +lbl_801309A0 = .data:0x801309A0; // type:object size:0x20 +lbl_801309C0 = .data:0x801309C0; // type:object size:0x20 +lbl_801309E0 = .data:0x801309E0; // type:object size:0x10 jumptable_801309F0 = .data:0x801309F0; // type:object size:0x1E8 scope:local -lbl_80130BD8 = .data:0x80130BD8; // type:object size:0x40 +voiceParam = .data:0x80130BD8; // type:object size:0x40 scope:local lbl_80130C18 = .data:0x80130C18; // type:object size:0xE data:string lbl_80130C26 = .data:0x80130C26; // type:object size:0xE data:string lbl_80130C34 = .data:0x80130C34; // type:object size:0xE data:string @@ -5103,21 +5106,26 @@ lbl_80130D80 = .data:0x80130D80; // type:object size:0x18 data:string lbl_80130D98 = .data:0x80130D98; // type:object size:0xE data:string lbl_80130DA6 = .data:0x80130DA6; // type:object size:0x18 data:string lbl_80130DBE = .data:0x80130DBE; // type:object size:0x1A -lbl_80130DD8 = .data:0x80130DD8; // type:object size:0x100 +charTexNameTbl = .data:0x80130DD8; // type:object size:0x100 lbl_80130ED8 = .data:0x80130ED8; // type:object size:0xD data:string lbl_80130EE5 = .data:0x80130EE5; // type:object size:0xD data:string lbl_80130EF2 = .data:0x80130EF2; // type:object size:0xE data:string lbl_80130F00 = .data:0x80130F00; // type:object size:0xE data:string lbl_80130F0E = .data:0x80130F0E; // type:object size:0x12 -lbl_80130F20 = .data:0x80130F20; // type:object size:0xA0 -lbl_80130FC0 = .data:0x80130FC0; // type:object size:0x38 -lbl_80130FF8 = .data:0x80130FF8; // type:object size:0x38 +hookNameTbl = .data:0x80130F20; // type:object size:0xA0 scope:local +modelParticleParam = .data:0x80130FC0; // type:object size:0x38 scope:local +coinParticleParam = .data:0x80130FF8; // type:object size:0x38 scope:local lbl_80131030 = .data:0x80131030; // type:object size:0x38 lbl_80131068 = .data:0x80131068; // type:object size:0x38 lbl_801310A0 = .data:0x801310A0; // type:object size:0x1C lbl_801310BC = .data:0x801310BC; // type:object size:0x38 lbl_801310F4 = .data:0x801310F4; // type:object size:0x38 -lbl_8013112C = .data:0x8013112C; // type:object size:0xBC +lbl_8013112C = .data:0x8013112C; // type:object size:0x1A data:string +lbl_80131146 = .data:0x80131146; // type:object size:0x12 +lbl_80131158 = .data:0x80131158; // type:object size:0x24 +lbl_8013117C = .data:0x8013117C; // type:object size:0x24 +lbl_801311A0 = .data:0x801311A0; // type:object size:0x24 +lbl_801311C4 = .data:0x801311C4; // type:object size:0x24 VolumeTable = .data:0x801311E8; // type:object size:0x100 scope:local lbl_801312E8 = .data:0x801312E8; // type:object size:0x4D lbl_80131335 = .data:0x80131335; // type:object size:0x1B @@ -5465,11 +5473,12 @@ ARInfo = .bss:0x801967E0; // type:object size:0x400 data:byte arqReq = .bss:0x80196BE0; // type:object size:0x20 scope:local ARQueBuf = .bss:0x80196C00; // type:object size:0x280 scope:local preLoadBuf = .bss:0x80196E80; // type:object size:0x40 scope:local align:32 -lbl_80196EC0 = .bss:0x80196EC0; // type:object size:0x640 -lbl_80197500 = .bss:0x80197500; // type:object size:0x10 data:2byte -lbl_80197510 = .bss:0x80197510; // type:object size:0x20 -lbl_80197530 = .bss:0x80197530; // type:object size:0x80 -lbl_801975B0 = .bss:0x801975B0; // type:object size:0xA0 +charInstance = .bss:0x80196EC0; // type:object size:0x640 scope:local +effectMdl = .bss:0x80197500; // type:object size:0x10 scope:local data:2byte +particleData = .bss:0x80197510; // type:object size:0x20 scope:local +itemHookProcess = .bss:0x80197530; // type:object size:0x80 scope:local +lbl_801975B0 = .bss:0x801975B0; // type:object size:0x10 +lbl_801975C0 = .bss:0x801975C0; // type:object size:0x90 MapObject = .bss:0x80197650; // type:object size:0x40 MapMT = .bss:0x80197690; // type:object size:0x30 MapMTR = .bss:0x801976C0; // type:object size:0x30 @@ -6203,8 +6212,8 @@ cardWork = .sbss:0x801D3DFC; // type:object size:0x4 scope:local data:4byte arqIdx = .sbss:0x801D3E00; // type:object size:0x2 scope:local data:2byte arqCnt = .sbss:0x801D3E04; // type:object size:0x4 scope:local data:4byte ARBase = .sbss:0x801D3E08; // type:object size:0x8 scope:local data:4byte -lbl_801D3E10 = .sbss:0x801D3E10; // type:object size:0x4 data:4byte -lbl_801D3E14 = .sbss:0x801D3E14; // type:object size:0x4 data:4byte +effectAMemP = .sbss:0x801D3E10; // type:object size:0x4 scope:local data:4byte +skipAnimUpdate = .sbss:0x801D3E14; // type:object size:0x4 scope:local data:4byte ColisionCount = .sbss:0x801D3E18; // type:object size:0x4 data:4byte topvtx = .sbss:0x801D3E1C; // type:object size:0x4 scope:local data:4byte AttrHsf = .sbss:0x801D3E20; // type:object size:0x4 scope:local data:4byte diff --git a/src/REL/bootDll/bootDll.c b/src/REL/bootDll/bootDll.c index 699a613d..237f2d75 100644 --- a/src/REL/bootDll/bootDll.c +++ b/src/REL/bootDll/bootDll.c @@ -108,7 +108,7 @@ static void BootProc(void) WipeColorSet(255, 255, 255); if(!SystemInitF) { tick_prev = OSGetTick(); - fn_800498F0(); + CharManInit(); HuWindowInit(); MGSeqInit(); HuWinInit(1); diff --git a/src/game/objmain.c b/src/game/objmain.c index 7be27e96..afe4efb8 100644 --- a/src/game/objmain.c +++ b/src/game/objmain.c @@ -139,7 +139,7 @@ void omOvlReturnEx(s16 level, s16 arg2) void omOvlKill(s16 arg) { - fn_8004D6F4(-1); + CharModelKillAll(-1); MGSeqKillAll(); Hu3DAllKill(); HuWinAllKill();