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

Merge pull request #112 from gamemasterplc/main

Browse source 
Label 3 board translation units
This commit is contained in:
gamemasterplc 2024-01-16 14:48:19 -06:00 • committed by GitHub
commit 9afe4445bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 138 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/GMPE01_00/splits.txt
View file

@ -359,7 +359,7 @@ game/board/com.c:
.sdata start:0x801D36F0 end:0x801D36F8 .sdata start:0x801D36F0 end:0x801D36F8
.sdata2 start:0x801D5328 end:0x801D5350 .sdata2 start:0x801D5328 end:0x801D5350
game/board/overhead.c: game/board/view.c:
.text start:0x800729A4 end:0x80073FF4 .text start:0x800729A4 end:0x80073FF4
.rodata start:0x8011DED0 end:0x8011DEF0 .rodata start:0x8011DED0 end:0x8011DEF0
.data start:0x80139BC8 end:0x80139CC8 .data start:0x80139BC8 end:0x80139CC8

250
config/GMPE01_00/symbols.txt
View file

@ -1005,8 +1005,8 @@ ExecBoardFunc = .text:0x8005B494; // type:function size:0x9C scope:local
KillBoardFunc = .text:0x8005B530; // type:function size:0xCC scope:local KillBoardFunc = .text:0x8005B530; // type:function size:0xCC scope:local
BoardKill = .text:0x8005B5FC; // type:function size:0xAC BoardKill = .text:0x8005B5FC; // type:function size:0xAC
BoardIsKill = .text:0x8005B6A8; // type:function size:0x48 BoardIsKill = .text:0x8005B6A8; // type:function size:0x48
BoardPauseEnableSet = .text:0x8005B6F0; // type:function size:0x74 BoardPauseDisableSet = .text:0x8005B6F0; // type:function size:0x74
BoardPauseEnableGet = .text:0x8005B764; // type:function size:0x48 BoardPauseDisableGet = .text:0x8005B764; // type:function size:0x48
BoardSaveInit = .text:0x8005B7AC; // type:function size:0x524 BoardSaveInit = .text:0x8005B7AC; // type:function size:0x524
BoardStoryConfigSet = .text:0x8005BCD0; // type:function size:0x160 BoardStoryConfigSet = .text:0x8005BCD0; // type:function size:0x160
BoardPartyConfigSet = .text:0x8005BE30; // type:function size:0x160 BoardPartyConfigSet = .text:0x8005BE30; // type:function size:0x160
@ -1301,8 +1301,8 @@ BoardWinCreate = .text:0x80070530; // type:function size:0x1A0
BoardWinInsertMesSet = .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
BoardWinSetAttr = .text:0x80070770; // type:function size:0x48 BoardWinAttrSet = .text:0x80070770; // type:function size:0x48
BoardWinResetAttr = .text:0x800707B8; // type:function size:0x48 BoardWinAttrReset = .text:0x800707B8; // type:function size:0x48
BoardWinChoiceDisable = .text:0x80070800; // type:function size:0x1C BoardWinChoiceDisable = .text:0x80070800; // type:function size:0x1C
BoardWinKeyWait = .text:0x8007081C; // type:function size:0xC BoardWinKeyWait = .text:0x8007081C; // type:function size:0xC
BoardWinSpeedGet = .text:0x80070828; // type:function size:0x64 BoardWinSpeedGet = .text:0x80070828; // type:function size:0x64
@ -1327,51 +1327,51 @@ fn_8007111C = .text:0x8007111C; // type:function size:0x50
fn_8007116C = .text:0x8007116C; // type:function size:0x74 fn_8007116C = .text:0x8007116C; // type:function size:0x74
fn_800711E0 = .text:0x800711E0; // type:function size:0x78 fn_800711E0 = .text:0x800711E0; // type:function size:0x78
fn_80071258 = .text:0x80071258; // type:function size:0x38 fn_80071258 = .text:0x80071258; // type:function size:0x38
fn_80071290 = .text:0x80071290; // type:function size:0x38 ExecComKeyLeft = .text:0x80071290; // type:function size:0x38 scope:local
fn_800712C8 = .text:0x800712C8; // type:function size:0x28 BoardComKeySetLeft = .text:0x800712C8; // type:function size:0x28
fn_800712F0 = .text:0x800712F0; // type:function size:0x38 ExecComKeyRight = .text:0x800712F0; // type:function size:0x38 scope:local
fn_80071328 = .text:0x80071328; // type:function size:0x28 BoardComKeySetRight = .text:0x80071328; // type:function size:0x28
fn_80071350 = .text:0x80071350; // type:function size:0x38 ExecComKeyUp = .text:0x80071350; // type:function size:0x38 scope:local
fn_80071388 = .text:0x80071388; // type:function size:0x28 BoardComKeySetUp = .text:0x80071388; // type:function size:0x28
fn_800713B0 = .text:0x800713B0; // type:function size:0x38 ExecComKeyDown = .text:0x800713B0; // type:function size:0x38 scope:local
fn_800713E8 = .text:0x800713E8; // type:function size:0x28 BoardComKeySetDown = .text:0x800713E8; // type:function size:0x28
fn_80071410 = .text:0x80071410; // type:function size:0xE8 ExecComKey = .text:0x80071410; // type:function size:0xE8 scope:local
fn_800714F8 = .text:0x800714F8; // type:function size:0x100 BoardComPreferItemGet = .text:0x800714F8; // type:function size:0x100
fn_800715F8 = .text:0x800715F8; // type:function size:0x120 BoardComPreferItemCheck = .text:0x800715F8; // type:function size:0x120
BoardCOMGetItemWeight = .text:0x80071718; // type:function size:0x74 BoardComItemWeightGet = .text:0x80071718; // type:function size:0x74
fn_8007178C = .text:0x8007178C; // type:function size:0xD0 BoardComTutorialItemGet = .text:0x8007178C; // type:function size:0xD0
fn_8007185C = .text:0x8007185C; // type:function size:0x6C BoardComUseItemSet = .text:0x8007185C; // type:function size:0x6C
fn_800718C8 = .text:0x800718C8; // type:function size:0x68 BoardComUseItemCheck = .text:0x800718C8; // type:function size:0x68
fn_80071930 = .text:0x80071930; // type:function size:0x16C ChooseUseItem = .text:0x80071930; // type:function size:0x16C scope:local
fn_80071A9C = .text:0x80071A9C; // type:function size:0x220 CheckMiniUse = .text:0x80071A9C; // type:function size:0x220 scope:local
fn_80071CBC = .text:0x80071CBC; // type:function size:0x248 CheckMegaUse = .text:0x80071CBC; // type:function size:0x248 scope:local
fn_80071F04 = .text:0x80071F04; // type:function size:0x158 CheckSparkUse = .text:0x80071F04; // type:function size:0x158 scope:local
fn_8007205C = .text:0x8007205C; // type:function size:0x314 CheckBoardChangeUse = .text:0x8007205C; // type:function size:0x314 scope:local
fn_80072370 = .text:0x80072370; // type:function size:0x198 CheckSwapUse = .text:0x80072370; // type:function size:0x198 scope:local
fn_80072508 = .text:0x80072508; // type:function size:0x7C CheckBooUse = .text:0x80072508; // type:function size:0x7C scope:local
fn_80072584 = .text:0x80072584; // type:function size:0x74 CheckLampUse = .text:0x80072584; // type:function size:0x74 scope:local
fn_800725F8 = .text:0x800725F8; // type:function size:0x304 BoardComJunctionInputGet = .text:0x800725F8; // type:function size:0x304
fn_800728FC = .text:0x800728FC; // type:function size:0xA8 BoardComPlayerPathCheck = .text:0x800728FC; // type:function size:0xA8
fn_800729A4 = .text:0x800729A4; // type:function size:0x134 BoardViewOverheadExec = .text:0x800729A4; // type:function size:0x134
fn_80072AD8 = .text:0x80072AD8; // type:function size:0x3C BoardViewFocusGetPos = .text:0x80072AD8; // type:function size:0x3C
fn_80072B14 = .text:0x80072B14; // type:function size:0xF0 BoardViewFocusSet = .text:0x80072B14; // type:function size:0xF0
fn_80072C04 = .text:0x80072C04; // type:function size:0x128 BoardViewMoveStart = .text:0x80072C04; // type:function size:0x128
fn_80072D2C = .text:0x80072D2C; // type:function size:0x34 BoardViewMoveCheck = .text:0x80072D2C; // type:function size:0x34
fn_80072D60 = .text:0x80072D60; // type:function size:0xC BoardViewMoveEnd = .text:0x80072D60; // type:function size:0xC
fn_80072D6C = .text:0x80072D6C; // type:function size:0x3C BoardViewWait = .text:0x80072D6C; // type:function size:0x3C
fn_80072DA8 = .text:0x80072DA8; // type:function size:0xC8 BoardViewMapExec = .text:0x80072DA8; // type:function size:0xC8
fn_80072E70 = .text:0x80072E70; // type:function size:0x398 ExecMapView = .text:0x80072E70; // type:function size:0x398 scope:local
fn_80073208 = .text:0x80073208; // type:function size:0x170 ExecStarView = .text:0x80073208; // type:function size:0x170 scope:local
fn_80073378 = .text:0x80073378; // type:function size:0x158 ExecOverheadView = .text:0x80073378; // type:function size:0x158 scope:local
fn_800734D0 = .text:0x800734D0; // type:function size:0x80 DestroyView = .text:0x800734D0; // type:function size:0x80 scope:local
fn_80073550 = .text:0x80073550; // type:function size:0x178 SetTargetView = .text:0x80073550; // type:function size:0x178 scope:local
fn_800736C8 = .text:0x800736C8; // type:function size:0x4C DestroyFocus = .text:0x800736C8; // type:function size:0x4C scope:local
fn_80073714 = .text:0x80073714; // type:function size:0xE0 CreateButtonWin = .text:0x80073714; // type:function size:0xE0 scope:local
fn_800737F4 = .text:0x800737F4; // type:function size:0x38 DestroyButtonWin = .text:0x800737F4; // type:function size:0x38 scope:local
fn_8007382C = .text:0x8007382C; // type:function size:0x374 InitOverheadView = .text:0x8007382C; // type:function size:0x374 scope:local
fn_80073BA0 = .text:0x80073BA0; // type:function size:0x24 DestroyOverheadView = .text:0x80073BA0; // type:function size:0x24 scope:local
fn_80073BC4 = .text:0x80073BC4; // type:function size:0x400 UpdateOverheadView = .text:0x80073BC4; // type:function size:0x400 scope:local
fn_80073FC4 = .text:0x80073FC4; // type:function size:0x30 WaitOverheadView = .text:0x80073FC4; // type:function size:0x30 scope:local
BoardSpaceWalkEventFuncSet = .text:0x80073FF4; // type:function size:0x8 BoardSpaceWalkEventFuncSet = .text:0x80073FF4; // type:function size:0x8
BoardSpaceWalkMiniEventFuncSet = .text:0x80073FFC; // type:function size:0x8 BoardSpaceWalkMiniEventFuncSet = .text:0x80073FFC; // type:function size:0x8
BoardSpaceLandEventFuncSet = .text:0x80074004; // type:function size:0x8 BoardSpaceLandEventFuncSet = .text:0x80074004; // type:function size:0x8
@ -1414,38 +1414,38 @@ BoardSpaceCameraSet = .text:0x800771F0; // type:function size:0x2C
BoardSpaceBlockPosSet = .text:0x8007721C; // type:function size:0xD0 BoardSpaceBlockPosSet = .text:0x8007721C; // type:function size:0xD0
BoardSpaceInit = .text:0x800772EC; // type:function size:0x750 BoardSpaceInit = .text:0x800772EC; // type:function size:0x750
BoardSpaceDestroy = .text:0x80077A3C; // type:function size:0x70 BoardSpaceDestroy = .text:0x80077A3C; // type:function size:0x70
fn_80077AAC = .text:0x80077AAC; // type:function size:0x8 BoardShopHostSet = .text:0x80077AAC; // type:function size:0x8
fn_80077AB4 = .text:0x80077AB4; // type:function size:0x8 BoardShopHostGet = .text:0x80077AB4; // type:function size:0x8
fn_80077ABC = .text:0x80077ABC; // type:function size:0xD4 BoardShopInit = .text:0x80077ABC; // type:function size:0xD4
fn_80077B90 = .text:0x80077B90; // type:function size:0xA0 BoardShopKill = .text:0x80077B90; // type:function size:0xA0
BoardShopExec = .text:0x80077C30; // type:function size:0x9C BoardShopExec = .text:0x80077C30; // type:function size:0x9C
fn_80077CCC = .text:0x80077CCC; // type:function size:0x800 ExecShop = .text:0x80077CCC; // type:function size:0x800 scope:local
fn_800784CC = .text:0x800784CC; // type:function size:0xD4 DestroyShop = .text:0x800784CC; // type:function size:0xD4 scope:local
fn_800785A0 = .text:0x800785A0; // type:function size:0x1B4 PopupShop = .text:0x800785A0; // type:function size:0x1B4 scope:local
fn_80078754 = .text:0x80078754; // type:function size:0xBC CloseShop = .text:0x80078754; // type:function size:0xBC scope:local
fn_80078810 = .text:0x80078810; // type:function size:0x13C CreateShopWin = .text:0x80078810; // type:function size:0x13C scope:local
fn_8007894C = .text:0x8007894C; // type:function size:0x314 UpdateShopWin = .text:0x8007894C; // type:function size:0x314 scope:local
fn_80078C60 = .text:0x80078C60; // type:function size:0x168 SetShopWinItem = .text:0x80078C60; // type:function size:0x168 scope:local
fn_80078DC8 = .text:0x80078DC8; // type:function size:0x2C PauseShopWin = .text:0x80078DC8; // type:function size:0x2C scope:local
fn_80078DF4 = .text:0x80078DF4; // type:function size:0x18C StartItemGive = .text:0x80078DF4; // type:function size:0x18C scope:local
fn_80078F80 = .text:0x80078F80; // type:function size:0x168 ExecItemGive = .text:0x80078F80; // type:function size:0x168 scope:local
fn_800790E8 = .text:0x800790E8; // type:function size:0x34C MoveItemGive = .text:0x800790E8; // type:function size:0x34C scope:local
fn_80079434 = .text:0x80079434; // type:function size:0x144 ShrinkItemGive = .text:0x80079434; // type:function size:0x144 scope:local
fn_80079578 = .text:0x80079578; // type:function size:0x6C WaitItemGive = .text:0x80079578; // type:function size:0x6C scope:local
fn_800795E4 = .text:0x800795E4; // type:function size:0x280 GetShopItems = .text:0x800795E4; // type:function size:0x280 scope:local
fn_80079864 = .text:0x80079864; // type:function size:0xA0 GetDefaultShopItems = .text:0x80079864; // type:function size:0xA0 scope:local
fn_80079904 = .text:0x80079904; // type:function size:0x14C SortShopItems = .text:0x80079904; // type:function size:0x14C scope:local
fn_80079A50 = .text:0x80079A50; // type:function size:0x1C8 DecideComEnter = .text:0x80079A50; // type:function size:0x1C8 scope:local
fn_80079C18 = .text:0x80079C18; // type:function size:0x60 DecideComBuy = .text:0x80079C18; // type:function size:0x60 scope:local
COMGetShopItemSelect = .text:0x80079C78; // type:function size:0x158 scope:local GetComItemChoice = .text:0x80079C78; // type:function size:0x158 scope:local
fn_80079DD0 = .text:0x80079DD0; // type:function size:0x30 WaitItemChoice = .text:0x80079DD0; // type:function size:0x30 scope:local
fn_80079E00 = .text:0x80079E00; // type:function size:0x188 CreateShopItemChoice = .text:0x80079E00; // type:function size:0x188 scope:local
fn_80079F88 = .text:0x80079F88; // type:function size:0xC GetShopItemChoice = .text:0x80079F88; // type:function size:0xC scope:local
fn_80079F94 = .text:0x80079F94; // type:function size:0x38 GetShopItemWinChoice = .text:0x80079F94; // type:function size:0x38 scope:local
fn_80079FCC = .text:0x80079FCC; // type:function size:0x260 MoveShopItemChoice = .text:0x80079FCC; // type:function size:0x260 scope:local
fn_8007A22C = .text:0x8007A22C; // type:function size:0x104 UpdateShopItemChoice = .text:0x8007A22C; // type:function size:0x104 scope:local
fn_8007A330 = .text:0x8007A330; // type:function size:0x30 GetShopItemChoiceInput = .text:0x8007A330; // type:function size:0x30 scope:local
fn_8007A360 = .text:0x8007A360; // type:function size:0x4DC BoardShopTutorialExec = .text:0x8007A360; // type:function size:0x4DC
fn_8007A83C = .text:0x8007A83C; // type:function size:0x8 fn_8007A83C = .text:0x8007A83C; // type:function size:0x8
fn_8007A844 = .text:0x8007A844; // type:function size:0x8 fn_8007A844 = .text:0x8007A844; // type:function size:0x8
BoardLotteryExec = .text:0x8007A84C; // type:function size:0x8C BoardLotteryExec = .text:0x8007A84C; // type:function size:0x8C
@ -5181,20 +5181,26 @@ megaSquishSfxTbl = .data:0x80139A80; // type:object size:0x20 scope:local
PortraitTbl = .data:0x80139AA0; // type:object size:0x24 scope:local PortraitTbl = .data:0x80139AA0; // type:object size:0x24 scope:local
StarPortraitTbl = .data:0x80139AC4; // type:object size:0x24 scope:local 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
lbl_80139B98 = .data:0x80139B98; // type:object size:0x30 comJunctionDirTbl = .data:0x80139B98; // type:object size:0x30 scope:local
lbl_80139BC8 = .data:0x80139BC8; // type:object size:0xB8 overhead2DPos = .data:0x80139BC8; // type:object size:0x28 scope:local
lbl_80139C80 = .data:0x80139C80; // type:object size:0x24 mapViewMinZ = .data:0x80139BF0; // type:object size:0x24 scope:local
lbl_80139CA4 = .data:0x80139CA4; // type:object size:0x24 mapViewMaxZ = .data:0x80139C14; // type:object size:0x24 scope:local
mapViewMinX = .data:0x80139C38; // type:object size:0x24 scope:local
mapViewMaxX = .data:0x80139C5C; // type:object size:0x24 scope:local
overheadCamZoom = .data:0x80139C80; // type:object size:0x24 scope:local
overheadCamPosZ = .data:0x80139CA4; // type:object size:0x24 scope:local
spaceImgIdx = .data:0x80139CC8; // type:object size:0xC scope:local spaceImgIdx = .data:0x80139CC8; // type:object size:0xC scope:local
spaceHiliteImgIdx = .data:0x80139CD4; // type:object size:0xC scope:local spaceHiliteImgIdx = .data:0x80139CD4; // type:object size:0xC scope:local
jumptable_80139CE0 = .data:0x80139CE0; // type:object size:0x28 scope:local jumptable_80139CE0 = .data:0x80139CE0; // type:object size:0x28 scope:local
lbl_80139D08 = .data:0x80139D08; // type:object size:0x24 hostMessTbl = .data:0x80139D08; // type:object size:0x24 scope:local
ItemPriceTbl = .data:0x80139D2C; // type:object size:0x10 scope:local itemPriceTbl = .data:0x80139D2C; // type:object size:0x10 scope:local
lbl_80139D3C = .data:0x80139D3C; // type:object size:0x6C shopMotTbl = .data:0x80139D3C; // type:object size:0x6C scope:local
lbl_80139DA8 = .data:0x80139DA8; // type:object size:0xB0 lbl_80139DA8 = .data:0x80139DA8; // type:object size:0xA data:string
lbl_80139E58 = .data:0x80139E58; // type:object size:0x30 data:float itemPrioTbl = .data:0x80139DB2; // type:object size:0x8C scope:local
rankItemGroupTbl = .data:0x80139E3E; // type:object size:0x18 scope:local
cursorPosTbl = .data:0x80139E58; // type:object size:0x30 scope:local data:float
lbl_80139E88 = .data:0x80139E88; // type:object size:0x1A8 lbl_80139E88 = .data:0x80139E88; // type:object size:0x1A8
lbl_8013A030 = .data:0x8013A030; // type:object size:0xDA lbl_8013A030 = .data:0x8013A030; // type:object size:0xDA
lbl_8013A10A = .data:0x8013A10A; // type:object size:0x13 lbl_8013A10A = .data:0x8013A10A; // type:object size:0x13
@ -5531,14 +5537,14 @@ postTurnHook = .bss:0x8019D978; // type:object size:0x10 scope:local
playerMatCopy = .bss:0x8019D988; // type:object size:0x10 scope:local playerMatCopy = .bss:0x8019D988; // type:object size:0x10 scope:local
winInsertMesTbl = .bss:0x8019D998; // type:object size:0x20 scope:local winInsertMesTbl = .bss:0x8019D998; // type:object size:0x20 scope:local
choiceDisableTbl = .bss:0x8019D9B8; // type:object size:0x40 scope:local choiceDisableTbl = .bss:0x8019D9B8; // type:object size:0x40 scope:local
lbl_8019D9F8 = .bss:0x8019D9F8; // type:object size:0xC data:float focusPos = .bss:0x8019D9F8; // type:object size:0xC scope:local data:float
lbl_8019DA04 = .bss:0x8019DA04; // type:object size:0xC data:4byte focusPosTarget = .bss:0x8019DA04; // type:object size:0xC scope:local data:4byte
spaceData = .bss:0x8019DA10; // type:object size:0x7000 scope:local data:float spaceData = .bss:0x8019DA10; // type:object size:0x7000 scope:local data:float
boardSpaceStarTbl = .bss:0x801A4A10; // type:object size:0x10 boardSpaceStarTbl = .bss:0x801A4A10; // type:object size:0x10
spaceTex = .bss:0x801A4A20; // type:object size:0x20 scope:local spaceTex = .bss:0x801A4A20; // type:object size:0x20 scope:local
spaceHiliteTex = .bss:0x801A4A40; // type:object size:0x20 scope:local spaceHiliteTex = .bss:0x801A4A40; // type:object size:0x20 scope:local
lbl_801A4A60 = .bss:0x801A4A60; // type:object size:0x14 data:4byte activeItemTbl = .bss:0x801A4A60; // type:object size:0x14 scope:local data:4byte
lbl_801A4A74 = .bss:0x801A4A74; // type:object size:0x1C choiceEnableTbl = .bss:0x801A4A74; // type:object size:0x18 scope:local
lbl_801A4A90 = .bss:0x801A4A90; // type:object size:0xC data:2byte lbl_801A4A90 = .bss:0x801A4A90; // type:object size:0xC data:2byte
lbl_801A4A9C = .bss:0x801A4A9C; // type:object size:0xC lbl_801A4A9C = .bss:0x801A4A9C; // type:object size:0xC
lbl_801A4AA8 = .bss:0x801A4AA8; // type:object size:0x18 data:2byte lbl_801A4AA8 = .bss:0x801A4AA8; // type:object size:0x18 data:2byte
@ -5828,18 +5834,18 @@ lbl_801D36CC = .sdata:0x801D36CC; // type:object size:0x6 data:string
lbl_801D36D2 = .sdata:0x801D36D2; // type:object size:0x8 data:string lbl_801D36D2 = .sdata:0x801D36D2; // type:object size:0x8 data:string
windowID = .sdata:0x801D36E0; // type:object size:0x2 scope:local 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 itemUse = .sdata:0x801D36F0; // type:object size:0x1 scope:local data:byte
lbl_801D36F8 = .sdata:0x801D36F8; // type:object size:0x2 data:2byte buttonWin = .sdata:0x801D36F8; // type:object size:0x2 scope:local data:2byte
lbl_801D36FA = .sdata:0x801D36FA; // type:object size:0x6 data:2byte focusMdl = .sdata:0x801D36FA; // type:object size:0x2 scope:local data:2byte
spaceDrawMdl = .sdata:0x801D3700; // type:object size:0x2 scope:local data:2byte spaceDrawMdl = .sdata:0x801D3700; // type:object size:0x2 scope:local data:2byte
starPlatMdl = .sdata:0x801D3702; // type:object size:0x2 scope:local data:2byte starPlatMdl = .sdata:0x801D3702; // type:object size:0x2 scope:local data:2byte
lbl_801D3708 = .sdata:0x801D3708; // type:object size:0x2 data:2byte itemMdl = .sdata:0x801D3708; // type:object size:0x2 scope:local data:2byte
lbl_801D370A = .sdata:0x801D370A; // type:object size:0x1 data:byte itemChoice = .sdata:0x801D370A; // type:object size:0x1 scope:local data:byte
lbl_801D370C = .sdata:0x801D370C; // type:object size:0x8 shopMdlParam = .sdata:0x801D370C; // type:object size:0x8 scope:local
lbl_801D3714 = .sdata:0x801D3714; // type:object size:0x2 data:2byte hostMdl = .sdata:0x801D3714; // type:object size:0x2 scope:local data:2byte
lbl_801D3716 = .sdata:0x801D3716; // type:object size:0x6 data:2byte shopMot = .sdata:0x801D3716; // type:object size:0x6 scope:local data:2byte
lbl_801D371C = .sdata:0x801D371C; // type:object size:0x1 data:byte itemCurChoice = .sdata:0x801D371C; // type:object size:0x1 scope:local data:byte
lbl_801D371D = .sdata:0x801D371D; // type:object size:0xB defaultItemTbl = .sdata:0x801D371D; // type:object size:0x5 scope:local
lbl_801D3728 = .sdata:0x801D3728; // type:object size:0x2 data:2byte lbl_801D3728 = .sdata:0x801D3728; // type:object size:0x2 data:2byte
lbl_801D372A = .sdata:0x801D372A; // type:object size:0x8 data:2byte lbl_801D372A = .sdata:0x801D372A; // type:object size:0x8 data:2byte
lbl_801D3732 = .sdata:0x801D3732; // type:object size:0x2 data:2byte lbl_801D3732 = .sdata:0x801D3732; // type:object size:0x2 data:2byte
@ -6330,14 +6336,14 @@ winPortrait = .sbss:0x801D3F8A; // type:object size:0x1 scope:local data:byte
autoPickF = .sbss:0x801D3F8B; // type:object size:0x1 scope:local data:byte autoPickF = .sbss:0x801D3F8B; // type:object size:0x1 scope:local data:byte
winChoice = .sbss:0x801D3F8C; // type:object size:0x1 scope:local 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 viewProc = .sbss:0x801D3F98; // type:object size:0x4 scope:local data:4byte
lbl_801D3F9C = .sbss:0x801D3F9C; // type:object size:0x1 data:byte pauseDisableF = .sbss:0x801D3F9C; // type:object size:0x1 scope:local data:byte
lbl_801D3FA0 = .sbss:0x801D3FA0; // type:object size:0x4 data:4byte overheadObj = .sbss:0x801D3FA0; // type:object size:0x4 scope:local data:4byte
lbl_801D3FA4 = .sbss:0x801D3FA4; // type:object size:0x2 data:2byte focusTimer = .sbss:0x801D3FA4; // type:object size:0x2 scope:local data:2byte
lbl_801D3FA6 = .sbss:0x801D3FA6; // type:object size:0x1 data:byte focusDestroyF = .sbss:0x801D3FA6; // type:object size:0x1 scope:local data:byte
lbl_801D3FA7 = .sbss:0x801D3FA7; // type:object size:0x1 data:byte viewMoveF = .sbss:0x801D3FA7; // type:object size:0x1 scope:local data:byte
lbl_801D3FA8 = .sbss:0x801D3FA8; // type:object size:0x1 data:byte viewPlayer = .sbss:0x801D3FA8; // type:object size:0x1 scope:local data:byte
lbl_801D3FA9 = .sbss:0x801D3FA9; // type:object size:0x7 data:byte viewControls = .sbss:0x801D3FA9; // type:object size:0x1 scope:local data:byte
spaceDrawF = .sbss:0x801D3FB0; // type:object size:0x2 scope:local data:2byte spaceDrawF = .sbss:0x801D3FB0; // type:object size:0x2 scope:local data:2byte
spaceDrawCnt = .sbss:0x801D3FB4; // type:object size:0x4 scope:local data:4byte spaceDrawCnt = .sbss:0x801D3FB4; // type:object size:0x4 scope:local data:4byte
walkEventFunc = .sbss:0x801D3FB8; // type:object size:0x4 scope:local data:4byte walkEventFunc = .sbss:0x801D3FB8; // type:object size:0x4 scope:local data:4byte
@ -6350,15 +6356,15 @@ spaceHiliteTexData = .sbss:0x801D3FD4; // type:object size:0x4 scope:local data:
spaceTexData = .sbss:0x801D3FD8; // type:object size:0x4 scope:local data:4byte spaceTexData = .sbss:0x801D3FD8; // type:object size:0x4 scope:local data:4byte
spaceAttr = .sbss:0x801D3FDC; // type:object size:0x8 scope:local data:4byte spaceAttr = .sbss:0x801D3FDC; // type:object size:0x8 scope:local data:4byte
spaceCnt = .sbss:0x801D3FE4; // type:object size:0x4 scope:local data:2byte spaceCnt = .sbss:0x801D3FE4; // type:object size:0x4 scope:local data:2byte
lbl_801D3FE8 = .sbss:0x801D3FE8; // type:object size:0x4 data:4byte shopProc = .sbss:0x801D3FE8; // type:object size:0x4 scope:local data:4byte
lbl_801D3FEC = .sbss:0x801D3FEC; // type:object size:0x4 data:4byte shopWinObj = .sbss:0x801D3FEC; // type:object size:0x4 scope:local data:4byte
lbl_801D3FF0 = .sbss:0x801D3FF0; // type:object size:0x4 data:4byte itemGiveObj = .sbss:0x801D3FF0; // type:object size:0x4 scope:local data:4byte
lbl_801D3FF4 = .sbss:0x801D3FF4; // type:object size:0x4 data:4byte itemChoiceObj = .sbss:0x801D3FF4; // type:object size:0x4 scope:local data:4byte
lbl_801D3FF8 = .sbss:0x801D3FF8; // type:object size:0x4 data:4byte comF = .sbss:0x801D3FF8; // type:object size:0x4 scope:local data:4byte
lbl_801D3FFC = .sbss:0x801D3FFC; // type:object size:0x2 data:2byte angleVal = .sbss:0x801D3FFC; // type:object size:0x2 scope:local data:2byte
lbl_801D3FFE = .sbss:0x801D3FFE; // type:object size:0x1 data:byte shopPlayer = .sbss:0x801D3FFE; // type:object size:0x1 scope:local data:byte
lbl_801D4000 = .sbss:0x801D4000; // type:object size:0x4 data:4byte shopMdlPtr = .sbss:0x801D4000; // type:object size:0x4 scope:local data:4byte
lbl_801D4004 = .sbss:0x801D4004; // type:object size:0x4 shopMdlIdx = .sbss:0x801D4004; // type:object size:0x4 scope:local
lbl_801D4008 = .sbss:0x801D4008; // type:object size:0x4 data:4byte lbl_801D4008 = .sbss:0x801D4008; // type:object size:0x4 data:4byte
lbl_801D400C = .sbss:0x801D400C; // type:object size:0x4 data:4byte lbl_801D400C = .sbss:0x801D400C; // type:object size:0x4 data:4byte
lbl_801D4010 = .sbss:0x801D4010; // type:object size:0x4 data:4byte lbl_801D4010 = .sbss:0x801D4010; // type:object size:0x4 data:4byte

2
configure.py
View file

@ -365,7 +365,7 @@ config.libs = [
Object(Matching, "game/board/window.c"), Object(Matching, "game/board/window.c"),
Object(NonMatching, "game/board/audio.c"), Object(NonMatching, "game/board/audio.c"),
Object(NonMatching, "game/board/com.c"), Object(NonMatching, "game/board/com.c"),
Object(NonMatching, "game/board/overhead.c"), Object(NonMatching, "game/board/view.c"),
Object(NonMatching, "game/board/space.c"), Object(NonMatching, "game/board/space.c"),
Object(NonMatching, "game/board/shop.c"), Object(NonMatching, "game/board/shop.c"),
Object(NonMatching, "game/board/lottery.c"), Object(NonMatching, "game/board/lottery.c"),

4
include/board_unsplit.h
View file

@ -7,7 +7,7 @@ void BoardCameraTargetModelSet(s16 model);
void BoardCameraMotionStartEx(s16, Vec *, Vec *, f32, f32, s16); void BoardCameraMotionStartEx(s16, Vec *, Vec *, f32, f32, s16);
void BoardCameraMotionWait(void); void BoardCameraMotionWait(void);
void BoardSpacePosGet(s32, s32, Vec*); void BoardSpacePosGet(s32, s32, Vec*);
void fn_8007A360(s32); void BoardShopTutorialExec(s32);
void fn_8007F894(void); void fn_8007F894(void);
s16 BoardStarHostMdlGet(void); s16 BoardStarHostMdlGet(void);
void BoardStatusShowSetAll(s32); void BoardStatusShowSetAll(s32);
@ -40,7 +40,7 @@ void BoardSpaceLandEventFuncSet(void*);
s32 BoardSpaceFlagSearch(s32, s32); s32 BoardSpaceFlagSearch(s32, s32);
void BoardSpaceInit(s32); void BoardSpaceInit(s32);
void BoardSpaceDestroy(void); void BoardSpaceDestroy(void);
void fn_80077AAC(s16); void BoardShopHostSet(s16);
void fn_8007A83C(s16); void fn_8007A83C(s16);
void fn_80083EDC(s16); void fn_80083EDC(s16);
void fn_800A4F6C(s16); void fn_800A4F6C(s16);

4
include/game/board/window.h
View file

@ -17,8 +17,8 @@ void BoardWinCreate(s32 pos, u32 mess, s32 portrait);
void BoardWinInsertMesSet(u32 value, s32 index); void BoardWinInsertMesSet(u32 value, s32 index);
void BoardWinWait(void); void BoardWinWait(void);
void BoardWinKill(void); void BoardWinKill(void);
void BoardWinSetAttr(s32 attr); void BoardWinAttrSet(s32 attr);
void BoardWinResetAttr(s32 attr); void BoardWinAttrReset(s32 attr);
void BoardWinChoiceDisable(s32 choice); void BoardWinChoiceDisable(s32 choice);
void BoardWinKeyWait(void); void BoardWinKeyWait(void);
int BoardWinSpeedGet(void); int BoardWinSpeedGet(void);

2
src/REL/w10Dll/main.c
View file

@ -129,7 +129,7 @@ void BoardCreate(void) {
BoardSpaceLandEventFuncSet(&fn_1_908); BoardSpaceLandEventFuncSet(&fn_1_908);
fn_80083EDC(lbl_1_data_2C); fn_80083EDC(lbl_1_data_2C);
fn_800A4F6C(lbl_1_data_32); fn_800A4F6C(lbl_1_data_32);
fn_80077AAC(lbl_1_data_2E); BoardShopHostSet(lbl_1_data_2E);
fn_8007A83C(lbl_1_data_30); fn_8007A83C(lbl_1_data_30);
HuWinMesMaxSizeGet(1, spC, 0x2E003A); HuWinMesMaxSizeGet(1, spC, 0x2E003A);
lbl_1_bss_E = HuWinCreate(-10000.0f, 390.0f, spC[0], spC[1], 1); lbl_1_bss_E = HuWinCreate(-10000.0f, 390.0f, spC[0], spC[1], 1);

2
src/REL/w10Dll/scene.c
View file

@ -188,7 +188,7 @@ void fn_1_13A4(void) {
BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30);
BoardCameraMotionWait(); BoardCameraMotionWait();
fn_1_BA0(0x2E002C); fn_1_BA0(0x2E002C);
fn_8007A360(temp_r3_2); BoardShopTutorialExec(temp_r3_2);
BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30); BoardCameraMotionStartEx(lbl_1_bss_0->unk8, &sp8, NULL, 3200.0f, -1.0f, 30);
BoardCameraMotionWait(); BoardCameraMotionWait();
temp_r3_2 = BoardSpaceFlagSearch(0, 0x10000000); temp_r3_2 = BoardSpaceFlagSearch(0, 0x10000000);

4
src/game/board/window.c
View file

@ -281,14 +281,14 @@ void BoardWinKill(void) {
} }
} }
void BoardWinSetAttr(s32 attr) { void BoardWinAttrSet(s32 attr) {
winAttr |= attr; winAttr |= attr;
if (windowID >= 0) { if (windowID >= 0) {
HuWinAttrSet(windowID, winAttr); HuWinAttrSet(windowID, winAttr);
} }
} }
void BoardWinResetAttr(s32 attr) { void BoardWinAttrReset(s32 attr) {
winAttr &= ~attr; winAttr &= ~attr;
if (windowID >= 0) { if (windowID >= 0) {
HuWinAttrSet(windowID, winAttr); HuWinAttrSet(windowID, winAttr);