kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve board/window.c splits

Browse source 
Also labeled board/window.c
This commit is contained in:
gamemasterplc 2023-12-28 14:11:55 -06:00
parent 55ec1e65f7
commit 78510395ca
4 changed files with 57 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

16
config/GMPE01_00/splits.txt
View file

@ -341,16 +341,22 @@ game/board/model.c:
.sdata2 start:0x801D5300 end:0x801D5318 .sdata2 start:0x801D5300 end:0x801D5318
game/board/window.c: game/board/window.c:
.text start:0x8006FD7C end:0x800714F8 .text start:0x8006FD7C end:0x80070D84
.rodata start:0x8011DE60 end:0x8011DED0 .rodata start:0x8011DE60 end:0x8011DED0
.data start:0x80139AA0 end:0x80139B00 .data start:0x80139AA0 end:0x80139AE8
.bss start:0x8019D998 end:0x8019D9F8 .bss start:0x8019D998 end:0x8019D9F8
.sdata start:0x801D36E0 end:0x801D36F0 .sdata start:0x801D36E0 end:0x801D36E8
.sbss start:0x801D3F68 end:0x801D3F98 .sbss start:0x801D3F68 end:0x801D3F90
.sdata2 start:0x801D5318 end:0x801D5328 .sdata2 start:0x801D5318 end:0x801D5328
game/board/board_snd.c:
.text start:0x80070D84 end:0x80071290
.data start:0x80139AE8 end:0x80139B00
.sdata start:0x801D36E8 end:0x801D36F0
.sbss start:0x801D3F90 end:0x801D3F98
game/board/com.c: game/board/com.c:
.text start:0x800714F8 end:0x800729A4 .text start:0x80071290 end:0x800729A4
.data start:0x80139B00 end:0x80139BC8 .data start:0x80139B00 end:0x80139BC8
.sdata start:0x801D36F0 end:0x801D36F8 .sdata start:0x801D36F0 end:0x801D36F8
.sdata2 start:0x801D5328 end:0x801D5350 .sdata2 start:0x801D5328 end:0x801D5350

88
config/GMPE01_00/symbols.txt
View file

@ -1010,7 +1010,7 @@ BoardGetPauseEnable = .text:0x8005B764; // type:function size:0x48
BoardSetSave = .text:0x8005B7AC; // type:function size:0x524 BoardSetSave = .text:0x8005B7AC; // type:function size:0x524
fn_8005BCD0 = .text:0x8005BCD0; // type:function size:0x160 fn_8005BCD0 = .text:0x8005BCD0; // type:function size:0x160
BoardLoadConfig = .text:0x8005BE30; // type:function size:0x160 BoardLoadConfig = .text:0x8005BE30; // type:function size:0x160
fn_8005BF90 = .text:0x8005BF90; // type:function size:0xC DestroyBoardMainProc = .text:0x8005BF90; // type:function size:0xC scope:local
BoardMainProcFunc = .text:0x8005BF9C; // type:function size:0x7D0 scope:local BoardMainProcFunc = .text:0x8005BF9C; // type:function size:0x7D0 scope:local
BoardTurnNext = .text:0x8005C76C; // type:function size:0x8C BoardTurnNext = .text:0x8005C76C; // type:function size:0x8C
BoardIsTurnCont = .text:0x8005C7F8; // type:function size:0x28C BoardIsTurnCont = .text:0x8005C7F8; // type:function size:0x28C
@ -1289,33 +1289,33 @@ fn_8006F8A8 = .text:0x8006F8A8; // type:function size:0x9C
fn_8006F944 = .text:0x8006F944; // type:function size:0x178 fn_8006F944 = .text:0x8006F944; // type:function size:0x178
fn_8006FABC = .text:0x8006FABC; // type:function size:0x194 fn_8006FABC = .text:0x8006FABC; // type:function size:0x194
fn_8006FC50 = .text:0x8006FC50; // type:function size:0x12C fn_8006FC50 = .text:0x8006FC50; // type:function size:0x12C
fn_8006FD7C = .text:0x8006FD7C; // type:function size:0x24 BoardWinInit = .text:0x8006FD7C; // type:function size:0x24
fn_8006FDA0 = .text:0x8006FDA0; // type:function size:0x34 lbl_8006FDA0 = .text:0x8006FDA0; // type:function size:0x34
fn_8006FDD4 = .text:0x8006FDD4; // type:function size:0x24 BoardWinKillAll = .text:0x8006FDD4; // type:function size:0x24
fn_8006FDF8 = .text:0x8006FDF8; // type:function size:0x6C BoardWinDestroy = .text:0x8006FDF8; // type:function size:0x6C
fn_8006FE64 = .text:0x8006FE64; // type:function size:0x514 BoardWinProc = .text:0x8006FE64; // type:function size:0x514
BoardWinChoiceGet = .text:0x80070378; // type:function size:0xC BoardWinChoiceGet = .text:0x80070378; // type:function size:0xC
fn_80070384 = .text:0x80070384; // type:function size:0xC BoardWinPause = .text:0x80070384; // type:function size:0xC
fn_80070390 = .text:0x80070390; // type:function size:0x1A0 BoardWinCreateChoice = .text:0x80070390; // type:function size:0x1A0
BoardWinCreate = .text:0x80070530; // type:function size:0x1A0 BoardWinCreate = .text:0x80070530; // type:function size:0x1A0
fn_800706D0 = .text:0x800706D0; // type:function size:0x18 BoardWinInsertMesSet = .text:0x800706D0; // type:function size:0x18
BoardWinWait = .text:0x800706E8; // type:function size:0x50 BoardWinWait = .text:0x800706E8; // type:function size:0x50
BoardWinKill = .text:0x80070738; // type:function size:0x38 BoardWinKill = .text:0x80070738; // type:function size:0x38
fn_80070770 = .text:0x80070770; // type:function size:0x48 BoardWinSetAttr = .text:0x80070770; // type:function size:0x48
fn_800707B8 = .text:0x800707B8; // type:function size:0x48 BoardWinResetAttr = .text:0x800707B8; // type:function size:0x48
fn_80070800 = .text:0x80070800; // type:function size:0x1C BoardWinChoiceDisable = .text:0x80070800; // type:function size:0x1C
fn_8007081C = .text:0x8007081C; // type:function size:0xC BoardWinKeyWait = .text:0x8007081C; // type:function size:0xC
fn_80070828 = .text:0x80070828; // type:function size:0x64 BoardWinSpeedGet = .text:0x80070828; // type:function size:0x64
fn_8007088C = .text:0x8007088C; // type:function size:0x50 BoardWinSpeedSet = .text:0x8007088C; // type:function size:0x50
fn_800708DC = .text:0x800708DC; // type:function size:0x38 BoardWinChoiceNowGet = .text:0x800708DC; // type:function size:0x38
fn_80070914 = .text:0x80070914; // type:function size:0x44 BoardWinPriSet = .text:0x80070914; // type:function size:0x44
fn_80070958 = .text:0x80070958; // type:function size:0x38 BoardWinChoiceNowGet2 = .text:0x80070958; // type:function size:0x38
fn_80070990 = .text:0x80070990; // type:function size:0x38 BoardWinPortraitGet = .text:0x80070990; // type:function size:0x38
fn_800709C8 = .text:0x800709C8; // type:function size:0x38 BoardWinPortraitGetStar = .text:0x800709C8; // type:function size:0x38
fn_80070A00 = .text:0x80070A00; // type:function size:0x168 BoardWinPlayerSet = .text:0x80070A00; // type:function size:0x168
fn_80070B68 = .text:0x80070B68; // type:function size:0x214 BoardWinStartComKeySet = .text:0x80070B68; // type:function size:0x214
fn_80070D7C = .text:0x80070D7C; // type:function size:0x8 BoardWinComKeyFuncSet = .text:0x80070D7C; // type:function size:0x8
fn_80070D84 = .text:0x80070D84; // type:function size:0x68 BoardWinPlaySpeak = .text:0x80070D84; // type:function size:0x68
fn_80070DEC = .text:0x80070DEC; // type:function size:0xD0 fn_80070DEC = .text:0x80070DEC; // type:function size:0xD0
fn_80070EBC = .text:0x80070EBC; // type:function size:0x2C fn_80070EBC = .text:0x80070EBC; // type:function size:0x2C
fn_80070EE8 = .text:0x80070EE8; // type:function size:0x60 fn_80070EE8 = .text:0x80070EE8; // type:function size:0x60
@ -5159,8 +5159,8 @@ lbl_8013993C = .data:0x8013993C; // type:object size:0xA0
lbl_801399DC = .data:0x801399DC; // type:object size:0x20 lbl_801399DC = .data:0x801399DC; // type:object size:0x20
lbl_801399FC = .data:0x801399FC; // type:object size:0x74 lbl_801399FC = .data:0x801399FC; // type:object size:0x74
lbl_80139A70 = .data:0x80139A70; // type:object size:0x30 lbl_80139A70 = .data:0x80139A70; // type:object size:0x30
lbl_80139AA0 = .data:0x80139AA0; // type:object size:0x24 PortraitTbl = .data:0x80139AA0; // type:object size:0x24 scope:local
lbl_80139AC4 = .data:0x80139AC4; // type:object size:0x24 StarPortraitTbl = .data:0x80139AC4; // type:object size:0x24 scope:local
lbl_80139AE8 = .data:0x80139AE8; // type:object size:0x18 lbl_80139AE8 = .data:0x80139AE8; // type:object size:0x18
COMItemWeightTbl = .data:0x80139B00; // type:object size:0x60 scope:local COMItemWeightTbl = .data:0x80139B00; // type:object size:0x60 scope:local
COMItemUseCheckFuncTbl = .data:0x80139B60; // type:object size:0x38 scope:local COMItemUseCheckFuncTbl = .data:0x80139B60; // type:object size:0x38 scope:local
@ -5500,8 +5500,8 @@ boardCameraBackup = .bss:0x8019D8A4; // type:object size:0xC4
lbl_8019D968 = .bss:0x8019D968; // type:object size:0x10 lbl_8019D968 = .bss:0x8019D968; // type:object size:0x10
lbl_8019D978 = .bss:0x8019D978; // type:object size:0x10 lbl_8019D978 = .bss:0x8019D978; // type:object size:0x10
lbl_8019D988 = .bss:0x8019D988; // type:object size:0x10 lbl_8019D988 = .bss:0x8019D988; // type:object size:0x10
lbl_8019D998 = .bss:0x8019D998; // type:object size:0x20 winInsertMesTbl = .bss:0x8019D998; // type:object size:0x20 scope:local
lbl_8019D9B8 = .bss:0x8019D9B8; // type:object size:0x40 choiceDisableTbl = .bss:0x8019D9B8; // type:object size:0x40 scope:local
lbl_8019D9F8 = .bss:0x8019D9F8; // type:object size:0xC data:float lbl_8019D9F8 = .bss:0x8019D9F8; // type:object size:0xC data:float
lbl_8019DA04 = .bss:0x8019DA04; // type:object size:0xC data:4byte lbl_8019DA04 = .bss:0x8019DA04; // type:object size:0xC data:4byte
SpaceData = .bss:0x8019DA10; // type:object size:0x7000 scope:local data:float SpaceData = .bss:0x8019DA10; // type:object size:0x7000 scope:local data:float
@ -5750,7 +5750,7 @@ lbl_801D35D0 = .sdata:0x801D35D0; // type:object size:0x8
lbl_801D35D8 = .sdata:0x801D35D8; // type:object size:0x8 lbl_801D35D8 = .sdata:0x801D35D8; // type:object size:0x8
colorN$400 = .sdata:0x801D35E0; // type:object size:0x4 data:byte colorN$400 = .sdata:0x801D35E0; // type:object size:0x4 data:byte
colorN$444 = .sdata:0x801D35E4; // type:object size:0x4 data:byte colorN$444 = .sdata:0x801D35E4; // type:object size:0x4 data:byte
winPrio = .sdata:0x801D35E8; // type:object size:0x8 data:2byte winPrio = .sdata:0x801D35E8; // type:object size:0x8 scope:local data:2byte
lbl_801D35F0 = .sdata:0x801D35F0; // type:object size:0x8 lbl_801D35F0 = .sdata:0x801D35F0; // type:object size:0x8
lbl_801D35F8 = .sdata:0x801D35F8; // type:object size:0x8 lbl_801D35F8 = .sdata:0x801D35F8; // type:object size:0x8
lbl_801D3600 = .sdata:0x801D3600; // type:object size:0x8 lbl_801D3600 = .sdata:0x801D3600; // type:object size:0x8
@ -5791,7 +5791,7 @@ lbl_801D36C0 = .sdata:0x801D36C0; // type:object size:0x6 data:string
lbl_801D36C6 = .sdata:0x801D36C6; // type:object size:0x6 data:string lbl_801D36C6 = .sdata:0x801D36C6; // type:object size:0x6 data:string
lbl_801D36CC = .sdata:0x801D36CC; // type:object size:0x6 data:string lbl_801D36CC = .sdata:0x801D36CC; // type:object size:0x6 data:string
lbl_801D36D2 = .sdata:0x801D36D2; // type:object size:0xE lbl_801D36D2 = .sdata:0x801D36D2; // type:object size:0xE
lbl_801D36E0 = .sdata:0x801D36E0; // type:object size:0x8 data:2byte windowID = .sdata:0x801D36E0; // type:object size:0x2 scope:local data:2byte
lbl_801D36E8 = .sdata:0x801D36E8; // type:object size:0x8 data:4byte lbl_801D36E8 = .sdata:0x801D36E8; // type:object size:0x8 data:4byte
lbl_801D36F0 = .sdata:0x801D36F0; // type:object size:0x8 data:byte lbl_801D36F0 = .sdata:0x801D36F0; // type:object size:0x8 data:byte
lbl_801D36F8 = .sdata:0x801D36F8; // type:object size:0x2 data:2byte lbl_801D36F8 = .sdata:0x801D36F8; // type:object size:0x2 data:2byte
@ -6279,21 +6279,21 @@ lbl_801D3F4E = .sbss:0x801D3F4E; // type:object size:0xA
lbl_801D3F58 = .sbss:0x801D3F58; // type:object size:0x4 data:4byte lbl_801D3F58 = .sbss:0x801D3F58; // type:object size:0x4 data:4byte
lbl_801D3F5C = .sbss:0x801D3F5C; // type:object size:0x4 data:4byte lbl_801D3F5C = .sbss:0x801D3F5C; // type:object size:0x4 data:4byte
lbl_801D3F60 = .sbss:0x801D3F60; // type:object size:0x8 data:2byte lbl_801D3F60 = .sbss:0x801D3F60; // type:object size:0x8 data:2byte
lbl_801D3F68 = .sbss:0x801D3F68; // type:object size:0x4 data:4byte winProc = .sbss:0x801D3F68; // type:object size:0x4 scope:local data:4byte
lbl_801D3F6C = .sbss:0x801D3F6C; // type:object size:0x4 data:4byte comKeyFunc = .sbss:0x801D3F6C; // type:object size:0x4 scope:local data:4byte
lbl_801D3F70 = .sbss:0x801D3F70; // type:object size:0x8 data:float lbl_801D3F70 = .sbss:0x801D3F70; // type:object size:0x8 data:float
lbl_801D3F78 = .sbss:0x801D3F78; // type:object size:0x4 data:4byte winAttr = .sbss:0x801D3F78; // type:object size:0x4 scope:local data:4byte
lbl_801D3F7C = .sbss:0x801D3F7C; // type:object size:0x4 data:4byte winMess = .sbss:0x801D3F7C; // type:object size:0x4 scope:local data:4byte
lbl_801D3F80 = .sbss:0x801D3F80; // type:object size:0x2 data:2byte defaultChoice = .sbss:0x801D3F80; // type:object size:0x2 scope:local data:2byte
lbl_801D3F82 = .sbss:0x801D3F82; // type:object size:0x2 data:2byte messSpeed = .sbss:0x801D3F82; // type:object size:0x2 scope:local data:2byte
lbl_801D3F84 = .sbss:0x801D3F84; // type:object size:0x2 data:2byte winPrio = .sbss:0x801D3F84; // type:object size:0x2 scope:local data:2byte
lbl_801D3F86 = .sbss:0x801D3F86; // type:object size:0x1 data:byte winWait = .sbss:0x801D3F86; // type:object size:0x1 scope:local data:byte
lbl_801D3F87 = .sbss:0x801D3F87; // type:object size:0x1 data:byte winPause = .sbss:0x801D3F87; // type:object size:0x1 scope:local data:byte
lbl_801D3F88 = .sbss:0x801D3F88; // type:object size:0x1 data:byte disablePlayer = .sbss:0x801D3F88; // type:object size:0x1 scope:local data:byte
lbl_801D3F89 = .sbss:0x801D3F89; // type:object size:0x1 data:byte winPosIdx = .sbss:0x801D3F89; // type:object size:0x1 scope:local data:byte
lbl_801D3F8A = .sbss:0x801D3F8A; // type:object size:0x1 data:byte winFrame = .sbss:0x801D3F8A; // type:object size:0x1 scope:local data:byte
lbl_801D3F8B = .sbss:0x801D3F8B; // type:object size:0x1 data:byte autoPickF = .sbss:0x801D3F8B; // type:object size:0x1 scope:local data:byte
lbl_801D3F8C = .sbss:0x801D3F8C; // type:object size:0x1 data:byte winChoice = .sbss:0x801D3F8C; // type:object size:0x1 scope:local data:byte
lbl_801D3F90 = .sbss:0x801D3F90; // type:object size:0x8 lbl_801D3F90 = .sbss:0x801D3F90; // type:object size:0x8
lbl_801D3F98 = .sbss:0x801D3F98; // type:object size:0x4 data:4byte lbl_801D3F98 = .sbss:0x801D3F98; // type:object size:0x4 data:4byte
lbl_801D3F9C = .sbss:0x801D3F9C; // type:object size:0x1 data:byte lbl_801D3F9C = .sbss:0x801D3F9C; // type:object size:0x1 data:byte

1
configure.py
View file

@ -283,6 +283,7 @@ config.libs = [
Object(NonMatching, "game/board/board.c"), Object(NonMatching, "game/board/board.c"),
Object(NonMatching, "game/board/model.c"), Object(NonMatching, "game/board/model.c"),
Object(NonMatching, "game/board/window.c"), Object(NonMatching, "game/board/window.c"),
Object(NonMatching, "game/board/board_snd.c"),
Object(NonMatching, "game/board/com.c"), Object(NonMatching, "game/board/com.c"),
Object(NonMatching, "game/board/overhead.c"), Object(NonMatching, "game/board/overhead.c"),
Object(NonMatching, "game/board/space.c"), Object(NonMatching, "game/board/space.c"),

2
src/game/window.c
View file

@ -185,7 +185,7 @@ static s32 winVoiceTbl[] = {
0x49 0x49
}; };
s16 winPrio = 1000; static s16 winPrio = 1000;
void HuWindowInit(void) { void HuWindowInit(void) {
s16 i; s16 i;