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

Merge pull request #120 from gamemasterplc/main

Browse source 
Label some board translation units
This commit is contained in:
gamemasterplc 2024-01-17 16:24:25 -06:00 • committed by GitHub
commit 83ae6c2e57
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 110 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

197
config/GMPE01_00/symbols.txt
View file

@ -1503,44 +1503,44 @@ WarpLaunch = .text:0x800811BC; // type:function size:0xBC scope:local
WarpStartImpact = .text:0x80081278; // type:function size:0x1B0 scope:local WarpStartImpact = .text:0x80081278; // type:function size:0x1B0 scope:local
WarpFall = .text:0x80081428; // type:function size:0xA4 scope:local WarpFall = .text:0x80081428; // type:function size:0xA4 scope:local
WarpImpact = .text:0x800814CC; // type:function size:0x200 scope:local WarpImpact = .text:0x800814CC; // type:function size:0x200 scope:local
fn_800816CC = .text:0x800816CC; // type:function size:0x11C BoardCharWheelInit = .text:0x800816CC; // type:function size:0x11C
fn_800817E8 = .text:0x800817E8; // type:function size:0x34 BoardCharWheelCheck = .text:0x800817E8; // type:function size:0x34
fn_8008181C = .text:0x8008181C; // type:function size:0x50 BoardCharWheelWait = .text:0x8008181C; // type:function size:0x50
fn_8008186C = .text:0x8008186C; // type:function size:0x18 BoardCharWheelResultGet = .text:0x8008186C; // type:function size:0x18
fn_80081884 = .text:0x80081884; // type:function size:0x1C BoardCharWheelSpeedSet = .text:0x80081884; // type:function size:0x1C
fn_800818A0 = .text:0x800818A0; // type:function size:0xFC ExecCharWheel = .text:0x800818A0; // type:function size:0xFC scope:local
fn_8008199C = .text:0x8008199C; // type:function size:0x754 InitCharWheel = .text:0x8008199C; // type:function size:0x754 scope:local
fn_800820F0 = .text:0x800820F0; // type:function size:0x314 UpdateCharWheel = .text:0x800820F0; // type:function size:0x314 scope:local
fn_80082404 = .text:0x80082404; // type:function size:0x164 StopCharWheel = .text:0x80082404; // type:function size:0x164 scope:local
fn_80082568 = .text:0x80082568; // type:function size:0x120 GrowCharWheel = .text:0x80082568; // type:function size:0x120 scope:local
fn_80082688 = .text:0x80082688; // type:function size:0x10C ShrinkCharWheel = .text:0x80082688; // type:function size:0x10C scope:local
fn_80082794 = .text:0x80082794; // type:function size:0x38 KillCharWheelSpr = .text:0x80082794; // type:function size:0x38 scope:local
fn_800827CC = .text:0x800827CC; // type:function size:0xBC SetCharWheelChars = .text:0x800827CC; // type:function size:0xBC scope:local
fn_80082888 = .text:0x80082888; // type:function size:0x224 GetInput = .text:0x80082888; // type:function size:0x224 scope:local
fn_80082AAC = .text:0x80082AAC; // type:function size:0x10 BoardCharWheelSetTarget = .text:0x80082AAC; // type:function size:0x10
fn_80082ABC = .text:0x80082ABC; // type:function size:0x148 GetComDelay = .text:0x80082ABC; // type:function size:0x148 scope:local
fn_80082C04 = .text:0x80082C04; // type:function size:0x8C GetComInput = .text:0x80082C04; // type:function size:0x8C scope:local
BoardMushroomExec = .text:0x80082C90; // type:function size:0xA4 BoardMushroomExec = .text:0x80082C90; // type:function size:0xA4
fn_80082D34 = .text:0x80082D34; // type:function size:0x38C MushroomMain = .text:0x80082D34; // type:function size:0x38C scope:local
fn_800830C0 = .text:0x800830C0; // type:function size:0x58 KillMushroom = .text:0x800830C0; // type:function size:0x58 scope:local
fn_80083118 = .text:0x80083118; // type:function size:0x118 BoxMain = .text:0x80083118; // type:function size:0x118 scope:local
fn_80083230 = .text:0x80083230; // type:function size:0x114 ShowBox = .text:0x80083230; // type:function size:0x114 scope:local
fn_80083344 = .text:0x80083344; // type:function size:0x160 ExitBox = .text:0x80083344; // type:function size:0x160 scope:local
fn_800834A4 = .text:0x800834A4; // type:function size:0x68 HideBox = .text:0x800834A4; // type:function size:0x68 scope:local
fn_8008350C = .text:0x8008350C; // type:function size:0xD4 CenterBox = .text:0x8008350C; // type:function size:0xD4 scope:local
fn_800835E0 = .text:0x800835E0; // type:function size:0x2EC InitBox = .text:0x800835E0; // type:function size:0x2EC scope:local
fn_800838CC = .text:0x800838CC; // type:function size:0x64 MarkKillBox = .text:0x800838CC; // type:function size:0x64 scope:local
fn_80083930 = .text:0x80083930; // type:function size:0x34 SetBoxHide = .text:0x80083930; // type:function size:0x34 scope:local
fn_80083964 = .text:0x80083964; // type:function size:0x54 SetBoxCenter = .text:0x80083964; // type:function size:0x54 scope:local
fn_800839B8 = .text:0x800839B8; // type:function size:0x34 SetBoxShow = .text:0x800839B8; // type:function size:0x34 scope:local
fn_800839EC = .text:0x800839EC; // type:function size:0x5C WaitBoxOpen = .text:0x800839EC; // type:function size:0x5C scope:local
fn_80083A48 = .text:0x80083A48; // type:function size:0x58 WaitBoxCenter = .text:0x80083A48; // type:function size:0x58 scope:local
fn_80083AA0 = .text:0x80083AA0; // type:function size:0x60 CheckBox = .text:0x80083AA0; // type:function size:0x60 scope:local
fn_80083B00 = .text:0x80083B00; // type:function size:0x240 DoItemGive = .text:0x80083B00; // type:function size:0x240 scope:local
fn_80083D40 = .text:0x80083D40; // type:function size:0xD4 StartItemGive = .text:0x80083D40; // type:function size:0xD4 scope:local
fn_80083E14 = .text:0x80083E14; // type:function size:0x38 KillItemMdl = .text:0x80083E14; // type:function size:0x38 scope:local
fn_80083E4C = .text:0x80083E4C; // type:function size:0x48 ShowItemMdl = .text:0x80083E4C; // type:function size:0x48 scope:local
fn_80083E94 = .text:0x80083E94; // type:function size:0x48 WaitItemGive = .text:0x80083E94; // type:function size:0x48 scope:local
BoardStarHostSet = .text:0x80083EDC; // type:function size:0xA8 BoardStarHostSet = .text:0x80083EDC; // type:function size:0xA8
BoardStarHostMdlGet = .text:0x80083F84; // type:function size:0x8 BoardStarHostMdlGet = .text:0x80083F84; // type:function size:0x8
BoardStarExec = .text:0x80083F8C; // type:function size:0xCC BoardStarExec = .text:0x80083F8C; // type:function size:0xCC
@ -1765,27 +1765,27 @@ fn_8009B330 = .text:0x8009B330; // type:function size:0xD8
fn_8009B408 = .text:0x8009B408; // type:function size:0x6C fn_8009B408 = .text:0x8009B408; // type:function size:0x6C
fn_8009B474 = .text:0x8009B474; // type:function size:0x60 fn_8009B474 = .text:0x8009B474; // type:function size:0x60
BoardBattleExec = .text:0x8009B4D4; // type:function size:0x124 BoardBattleExec = .text:0x8009B4D4; // type:function size:0x124
fn_8009B5F8 = .text:0x8009B5F8; // type:function size:0x2C DestroyBattle = .text:0x8009B5F8; // type:function size:0x2C scope:local
fn_8009B624 = .text:0x8009B624; // type:function size:0x708 ExecBattle = .text:0x8009B624; // type:function size:0x708 scope:local
fn_8009BD2C = .text:0x8009BD2C; // type:function size:0x1D4 TakeCoins = .text:0x8009BD2C; // type:function size:0x1D4 scope:local
fn_8009BF00 = .text:0x8009BF00; // type:function size:0x1FC InitExplode = .text:0x8009BF00; // type:function size:0x1FC scope:local
fn_8009C0FC = .text:0x8009C0FC; // type:function size:0x24 CheckExplode = .text:0x8009C0FC; // type:function size:0x24 scope:local
fn_8009C120 = .text:0x8009C120; // type:function size:0x2D0 UpdateExplode = .text:0x8009C120; // type:function size:0x2D0 scope:local
fn_8009C3F0 = .text:0x8009C3F0; // type:function size:0x1E8 CreateBattleMain = .text:0x8009C3F0; // type:function size:0x1E8 scope:local
fn_8009C5D8 = .text:0x8009C5D8; // type:function size:0x1A0 UpdateBattleMain = .text:0x8009C5D8; // type:function size:0x1A0 scope:local
fn_8009C778 = .text:0x8009C778; // type:function size:0x64 DescendBattleBomb = .text:0x8009C778; // type:function size:0x64 scope:local
fn_8009C7DC = .text:0x8009C7DC; // type:function size:0x88 EndBattle = .text:0x8009C7DC; // type:function size:0x88 scope:local
fn_8009C864 = .text:0x8009C864; // type:function size:0x124 ShowBattleGame = .text:0x8009C864; // type:function size:0x124 scope:local
fn_8009C988 = .text:0x8009C988; // type:function size:0x8C RaiseBattleGame = .text:0x8009C988; // type:function size:0x8C scope:local
fn_8009CA14 = .text:0x8009CA14; // type:function size:0x260 UpdateBattleCoin = .text:0x8009CA14; // type:function size:0x260 scope:local
fn_8009CC74 = .text:0x8009CC74; // type:function size:0x128 ShowBattleCoin = .text:0x8009CC74; // type:function size:0x128 scope:local
fn_8009CD9C = .text:0x8009CD9C; // type:function size:0x12C InitBattleGameSpr = .text:0x8009CD9C; // type:function size:0x12C scope:local
fn_8009CEC8 = .text:0x8009CEC8; // type:function size:0x58 HideBattleSpr = .text:0x8009CEC8; // type:function size:0x58 scope:local
fn_8009CF20 = .text:0x8009CF20; // type:function size:0x64 VibratePad = .text:0x8009CF20; // type:function size:0x64 scope:local
fn_8009CF84 = .text:0x8009CF84; // type:function size:0x24 StopBattleBomb = .text:0x8009CF84; // type:function size:0x24 scope:local
fn_8009CFA8 = .text:0x8009CFA8; // type:function size:0x10 GetBattleBombState = .text:0x8009CFA8; // type:function size:0x10 scope:local
fn_8009CFB8 = .text:0x8009CFB8; // type:function size:0x34 SetBattleBombState = .text:0x8009CFB8; // type:function size:0x34 scope:local
fn_8009CFEC = .text:0x8009CFEC; // type:function size:0x15C SetBattleCoinValue = .text:0x8009CFEC; // type:function size:0x15C scope:local
BoardFortuneExec = .text:0x8009D148; // type:function size:0x124 BoardFortuneExec = .text:0x8009D148; // type:function size:0x124
fn_8009D26C = .text:0x8009D26C; // type:function size:0x74 fn_8009D26C = .text:0x8009D26C; // type:function size:0x74
fn_8009D2E0 = .text:0x8009D2E0; // type:function size:0xC fn_8009D2E0 = .text:0x8009D2E0; // type:function size:0xC
@ -5220,8 +5220,11 @@ loseMotTbl = .data:0x8013A1CC; // type:object size:0x20 scope:local
coinChgObj = .data:0x8013A1F0; // type:object size:0x10 scope:local coinChgObj = .data:0x8013A1F0; // type:object size:0x10 scope:local
coinDigitMdl = .data:0x8013A200; // type:object size:0x28 scope:local coinDigitMdl = .data:0x8013A200; // type:object size:0x28 scope:local
jumptable_8013A228 = .data:0x8013A228; // type:object size:0x1C scope:local jumptable_8013A228 = .data:0x8013A228; // type:object size:0x1C scope:local
lbl_8013A248 = .data:0x8013A248; // type:object size:0x58 wheelSprTbl = .data:0x8013A248; // type:object size:0x28 scope:local
lbl_8013A2A0 = .data:0x8013A2A0; // type:object size:0x10 wheelSprPrio = .data:0x8013A270; // type:object size:0xA scope:local
wheelCharIconPrioTbl = .data:0x8013A27A; // type:object size:0x4 scope:local data:byte
wheelCharIconTbl = .data:0x8013A280; // type:object size:0x20 scope:local
lbl_8013A2A0 = .data:0x8013A2A0; // type:object size:0xF data:string
boardStarSndTbl = .data:0x8013A2B0; // type:object size:0x20 boardStarSndTbl = .data:0x8013A2B0; // type:object size:0x20
hostMotTbl = .data:0x8013A2D0; // type:object size:0x48 scope:local hostMotTbl = .data:0x8013A2D0; // type:object size:0x48 scope:local
starEffParam = .data:0x8013A318; // type:object size:0x50 scope:local noreloc starEffParam = .data:0x8013A318; // type:object size:0x50 scope:local noreloc
@ -5271,11 +5274,11 @@ genieMotTbl = .data:0x8013A9FC; // type:object size:0x10 scope:local
lbl_8013AA10 = .data:0x8013AA10; // type:object size:0x20 lbl_8013AA10 = .data:0x8013AA10; // type:object size:0x20
jumptable_8013AA30 = .data:0x8013AA30; // type:object size:0x1C scope:local jumptable_8013AA30 = .data:0x8013AA30; // type:object size:0x1C scope:local
lbl_8013AA4C = .data:0x8013AA4C; // type:object size:0x14 lbl_8013AA4C = .data:0x8013AA4C; // type:object size:0x14
lbl_8013AA60 = .data:0x8013AA60; // type:object size:0x18 battleCursorPosTbl = .data:0x8013AA60; // type:object size:0x18 scope:local data:float
lbl_8013AA78 = .data:0x8013AA78; // type:object size:0x20 bombFXTbl = .data:0x8013AA78; // type:object size:0x20 scope:local
lbl_8013AA98 = .data:0x8013AA98; // type:object size:0x18 battleSprPrioTbl = .data:0x8013AA98; // type:object size:0x16 scope:local
jumptable_8013AAB0 = .data:0x8013AAB0; // type:object size:0x24 scope:local jumptable_8013AAB0 = .data:0x8013AAB0; // type:object size:0x24 scope:local
lbl_8013AAD4 = .data:0x8013AAD4; // type:object size:0x3C battleChanceTbl = .data:0x8013AAD4; // type:object size:0x3C scope:local
lbl_8013AB10 = .data:0x8013AB10; // type:object size:0x18 lbl_8013AB10 = .data:0x8013AB10; // type:object size:0x18
lbl_8013AB28 = .data:0x8013AB28; // type:object size:0xC0 lbl_8013AB28 = .data:0x8013AB28; // type:object size:0xC0
lbl_8013ABE8 = .data:0x8013ABE8; // type:object size:0x80 lbl_8013ABE8 = .data:0x8013ABE8; // type:object size:0x80
@ -5581,7 +5584,7 @@ booCamTarget = .bss:0x801A4BCC; // type:object size:0xC scope:local data:float
booCamUp = .bss:0x801A4BD8; // type:object size:0xC scope:local data:float booCamUp = .bss:0x801A4BD8; // type:object size:0xC scope:local data:float
lbl_801A4BE8 = .bss:0x801A4BE8; // type:object size:0x30 lbl_801A4BE8 = .bss:0x801A4BE8; // type:object size:0x30
lbl_801A4C18 = .bss:0x801A4C18; // type:object size:0x18 lbl_801A4C18 = .bss:0x801A4C18; // type:object size:0x18
lbl_801A4C30 = .bss:0x801A4C30; // type:object size:0x10 data:2byte battleMGList = .bss:0x801A4C30; // type:object size:0x10 scope:local data:2byte
lbl_801A4C40 = .bss:0x801A4C40; // type:object size:0xC data:4byte lbl_801A4C40 = .bss:0x801A4C40; // type:object size:0xC data:4byte
lbl_801A4C4C = .bss:0x801A4C4C; // type:object size:0xC data:float lbl_801A4C4C = .bss:0x801A4C4C; // type:object size:0xC data:float
lbl_801A4C58 = .bss:0x801A4C58; // type:object size:0x20 data:2byte lbl_801A4C58 = .bss:0x801A4C58; // type:object size:0x20 data:2byte
@ -5883,11 +5886,11 @@ warpSpringMdl = .sdata:0x801D3748; // type:object size:0x2 scope:local data:2byt
warpImpactMdl = .sdata:0x801D374A; // type:object size:0x2 scope:local data:2byte warpImpactMdl = .sdata:0x801D374A; // type:object size:0x2 scope:local data:2byte
warpImpactPlayer = .sdata:0x801D374C; // type:object size:0x4 scope:local warpImpactPlayer = .sdata:0x801D374C; // type:object size:0x4 scope:local
lbl_801D3750 = .sdata:0x801D3750; // type:object size:0x8 lbl_801D3750 = .sdata:0x801D3750; // type:object size:0x8
lbl_801D3758 = .sdata:0x801D3758; // type:object size:0x1 data:byte wheelPos = .sdata:0x801D3758; // type:object size:0x1 scope:local data:byte
lbl_801D375A = .sdata:0x801D375A; // type:object size:0x2 data:2byte wheelSprGrp = .sdata:0x801D375A; // type:object size:0x2 scope:local data:2byte
lbl_801D375C = .sdata:0x801D375C; // type:object size:0x4 data:4byte wheelFXStat = .sdata:0x801D375C; // type:object size:0x4 scope:local data:4byte
lbl_801D3760 = .sdata:0x801D3760; // type:object size:0x8 boxObj = .sdata:0x801D3760; // type:object size:0x8 scope:local
lbl_801D3768 = .sdata:0x801D3768; // type:object size:0x8 data:2byte itemMdl = .sdata:0x801D3768; // type:object size:0x2 scope:local data:2byte
starParman = .sdata:0x801D3770; // type:object size:0x2 scope:local data:2byte starParman = .sdata:0x801D3770; // type:object size:0x2 scope:local data:2byte
hostMdl = .sdata:0x801D3772; // type:object size:0x2 scope:local data:2byte hostMdl = .sdata:0x801D3772; // type:object size:0x2 scope:local data:2byte
diceMdl = .sdata:0x801D3778; // type:object size:0x6 scope:local diceMdl = .sdata:0x801D3778; // type:object size:0x6 scope:local
@ -5906,7 +5909,7 @@ lbl_801D37B4 = .sdata:0x801D37B4; // type:object size:0x2 data:2byte
lbl_801D37B6 = .sdata:0x801D37B6; // type:object size:0x2 data:2byte lbl_801D37B6 = .sdata:0x801D37B6; // type:object size:0x2 data:2byte
lbl_801D37B8 = .sdata:0x801D37B8; // type:object size:0x3 data:string lbl_801D37B8 = .sdata:0x801D37B8; // type:object size:0x3 data:string
lbl_801D37BB = .sdata:0x801D37BB; // type:object size:0xD lbl_801D37BB = .sdata:0x801D37BB; // type:object size:0xD
lbl_801D37C8 = .sdata:0x801D37C8; // type:object size:0x8 lbl_801D37C8 = .sdata:0x801D37C8; // type:object size:0x3 data:string
lbl_801D37D0 = .sdata:0x801D37D0; // type:object size:0x8 lbl_801D37D0 = .sdata:0x801D37D0; // type:object size:0x8
lbl_801D37D8 = .sdata:0x801D37D8; // type:object size:0x8 lbl_801D37D8 = .sdata:0x801D37D8; // type:object size:0x8
lbl_801D37E0 = .sdata:0x801D37E0; // type:object size:0x8 lbl_801D37E0 = .sdata:0x801D37E0; // type:object size:0x8
@ -6407,18 +6410,18 @@ warpSpace = .sbss:0x801D4034; // type:object size:0x2 scope:local data:2byte
warpImpactCnt = .sbss:0x801D4036; // type:object size:0x1 scope:local data:byte warpImpactCnt = .sbss:0x801D4036; // type:object size:0x1 scope:local data:byte
warpTarget = .sbss:0x801D4037; // type:object size:0x1 scope:local data:byte warpTarget = .sbss:0x801D4037; // type:object size:0x1 scope:local data:byte
warpState = .sbss:0x801D4038; // type:object size:0x1 scope:local data:byte warpState = .sbss:0x801D4038; // type:object size:0x1 scope:local data:byte
lbl_801D4040 = .sbss:0x801D4040; // type:object size:0x4 data:4byte charWheelObj = .sbss:0x801D4040; // type:object size:0x4 scope:local data:4byte
lbl_801D4044 = .sbss:0x801D4044; // type:object size:0x2 data:2byte targetF = .sbss:0x801D4044; // type:object size:0x2 scope:local data:2byte
lbl_801D4048 = .sbss:0x801D4048; // type:object size:0x4 data:float angleOfs = .sbss:0x801D4048; // type:object size:0x4 scope:local data:float
lbl_801D404C = .sbss:0x801D404C; // type:object size:0x2 data:2byte targetVal = .sbss:0x801D404C; // type:object size:0x2 scope:local data:2byte
lbl_801D4050 = .sbss:0x801D4050; // type:object size:0x4 data:float wheelSpeed = .sbss:0x801D4050; // type:object size:0x4 scope:local data:float
lbl_801D4054 = .sbss:0x801D4054; // type:object size:0x2 data:2byte wheelTimer = .sbss:0x801D4054; // type:object size:0x2 scope:local data:2byte
lbl_801D4056 = .sbss:0x801D4056; // type:object size:0x2 data:2byte comDelay = .sbss:0x801D4056; // type:object size:0x2 scope:local data:2byte
lbl_801D4058 = .sbss:0x801D4058; // type:object size:0x8 data:byte wheelChars = .sbss:0x801D4058; // type:object size:0x4 scope:local data:byte
lbl_801D4060 = .sbss:0x801D4060; // type:object size:0x4 data:4byte mushroomProc = .sbss:0x801D4060; // type:object size:0x4 scope:local data:4byte
lbl_801D4064 = .sbss:0x801D4064; // type:object size:0x4 data:4byte itemGiveObj = .sbss:0x801D4064; // type:object size:0x4 scope:local data:4byte
lbl_801D4068 = .sbss:0x801D4068; // type:object size:0x1 data:byte pickerChoice = .sbss:0x801D4068; // type:object size:0x1 scope:local data:byte
lbl_801D4069 = .sbss:0x801D4069; // type:object size:0x7 data:byte itemResult = .sbss:0x801D4069; // type:object size:0x1 scope:local data:byte
starProc = .sbss:0x801D4070; // type:object size:0x4 scope:local data:4byte starProc = .sbss:0x801D4070; // type:object size:0x4 scope:local data:4byte
giveStarObj = .sbss:0x801D4074; // type:object size:0x4 scope:local data:4byte giveStarObj = .sbss:0x801D4074; // type:object size:0x4 scope:local data:4byte
starEffAnim = .sbss:0x801D4078; // type:object size:0x4 scope:local data:4byte starEffAnim = .sbss:0x801D4078; // type:object size:0x4 scope:local data:4byte
@ -6487,18 +6490,18 @@ lbl_801D4166 = .sbss:0x801D4166; // type:object size:0x8 data:2byte
lbl_801D416E = .sbss:0x801D416E; // type:object size:0x2 data:2byte lbl_801D416E = .sbss:0x801D416E; // type:object size:0x2 data:2byte
lbl_801D4170 = .sbss:0x801D4170; // type:object size:0x1 data:byte lbl_801D4170 = .sbss:0x801D4170; // type:object size:0x1 data:byte
lbl_801D4171 = .sbss:0x801D4171; // type:object size:0x7 data:byte lbl_801D4171 = .sbss:0x801D4171; // type:object size:0x7 data:byte
lbl_801D4178 = .sbss:0x801D4178; // type:object size:0x4 data:4byte battleProc = .sbss:0x801D4178; // type:object size:0x4 scope:local data:4byte
lbl_801D417C = .sbss:0x801D417C; // type:object size:0x4 data:4byte battleObj = .sbss:0x801D417C; // type:object size:0x4 scope:local data:4byte
lbl_801D4180 = .sbss:0x801D4180; // type:object size:0x4 data:4byte explodeObj = .sbss:0x801D4180; // type:object size:0x4 scope:local data:4byte
lbl_801D4184 = .sbss:0x801D4184; // type:object size:0x4 data:float battleCoinPosF = .sbss:0x801D4184; // type:object size:0x4 scope:local data:float
lbl_801D4188 = .sbss:0x801D4188; // type:object size:0x4 data:float battleCoinSpeed = .sbss:0x801D4188; // type:object size:0x4 scope:local data:float
lbl_801D418C = .sbss:0x801D418C; // type:object size:0x8 totalCoinStr = .sbss:0x801D418C; // type:object size:0x8 scope:local
lbl_801D4194 = .sbss:0x801D4194; // type:object size:0x1 data:byte battleMGIdx = .sbss:0x801D4194; // type:object size:0x1 scope:local data:byte
lbl_801D4196 = .sbss:0x801D4196; // type:object size:0x1 data:byte battleCoinIdx = .sbss:0x801D4196; // type:object size:0x1 scope:local data:byte
lbl_801D4198 = .sbss:0x801D4198; // type:object size:0x2 data:2byte currSpace = .sbss:0x801D4198; // type:object size:0x2 scope:local data:2byte
lbl_801D419A = .sbss:0x801D419A; // type:object size:0x1 data:byte mgChoice = .sbss:0x801D419A; // type:object size:0x1 scope:local data:byte
lbl_801D419B = .sbss:0x801D419B; // type:object size:0x1 data:byte coinTakeMax = .sbss:0x801D419B; // type:object size:0x1 scope:local data:byte
lbl_801D419C = .sbss:0x801D419C; // type:object size:0x1 data:byte currPlayer = .sbss:0x801D419C; // type:object size:0x1 scope:local data:byte
lbl_801D41A0 = .sbss:0x801D41A0; // type:object size:0x4 data:4byte lbl_801D41A0 = .sbss:0x801D41A0; // type:object size:0x4 data:4byte
lbl_801D41A4 = .sbss:0x801D41A4; // type:object size:0x4 data:4byte lbl_801D41A4 = .sbss:0x801D41A4; // type:object size:0x4 data:4byte
lbl_801D41A8 = .sbss:0x801D41A8; // type:object size:0x1 data:byte lbl_801D41A8 = .sbss:0x801D41A8; // type:object size:0x1 data:byte
@ -7659,7 +7662,7 @@ lbl_801D57F0 = .sdata2:0x801D57F0; // type:object size:0x8 data:double
lbl_801D57F8 = .sdata2:0x801D57F8; // type:object size:0x4 data:float lbl_801D57F8 = .sdata2:0x801D57F8; // type:object size:0x4 data:float
lbl_801D5800 = .sdata2:0x801D5800; // type:object size:0x8 data:double lbl_801D5800 = .sdata2:0x801D5800; // type:object size:0x8 data:double
lbl_801D5808 = .sdata2:0x801D5808; // type:object size:0x8 data:float lbl_801D5808 = .sdata2:0x801D5808; // type:object size:0x8 data:float
lbl_801D5810 = .sdata2:0x801D5810; // type:object size:0x8 boxOfs = .sdata2:0x801D5810; // type:object size:0x8 scope:local data:float
lbl_801D5818 = .sdata2:0x801D5818; // type:object size:0x4 data:float lbl_801D5818 = .sdata2:0x801D5818; // type:object size:0x4 data:float
lbl_801D581C = .sdata2:0x801D581C; // type:object size:0x4 data:float lbl_801D581C = .sdata2:0x801D581C; // type:object size:0x4 data:float
lbl_801D5820 = .sdata2:0x801D5820; // type:object size:0x4 data:float lbl_801D5820 = .sdata2:0x801D5820; // type:object size:0x4 data:float
@ -7976,7 +7979,7 @@ lbl_801D5DCA = .sdata2:0x801D5DCA; // type:object size:0x1 data:byte
lbl_801D5DCC = .sdata2:0x801D5DCC; // type:object size:0x4 data:float lbl_801D5DCC = .sdata2:0x801D5DCC; // type:object size:0x4 data:float
lbl_801D5DD0 = .sdata2:0x801D5DD0; // type:object size:0x8 data:double lbl_801D5DD0 = .sdata2:0x801D5DD0; // type:object size:0x8 data:double
lbl_801D5DD8 = .sdata2:0x801D5DD8; // type:object size:0x8 data:float lbl_801D5DD8 = .sdata2:0x801D5DD8; // type:object size:0x8 data:float
lbl_801D5DE0 = .sdata2:0x801D5DE0; // type:object size:0x8 battleCoinTbl = .sdata2:0x801D5DE0; // type:object size:0x5 scope:local
lbl_801D5DE8 = .sdata2:0x801D5DE8; // type:object size:0x4 data:float lbl_801D5DE8 = .sdata2:0x801D5DE8; // type:object size:0x4 data:float
lbl_801D5DEC = .sdata2:0x801D5DEC; // type:object size:0x4 data:float lbl_801D5DEC = .sdata2:0x801D5DEC; // type:object size:0x4 data:float
lbl_801D5DF0 = .sdata2:0x801D5DF0; // type:object size:0x4 data:float lbl_801D5DF0 = .sdata2:0x801D5DF0; // type:object size:0x4 data:float

2
include/board_unsplit.h
View file

@ -15,7 +15,7 @@ void fn_800A4C88(void);
void fn_800A6B10(void); void fn_800A6B10(void);
void BoardStatusItemSet(s32); void BoardStatusItemSet(s32);
void BoardTutorialItemSet(s32); void BoardTutorialItemSet(s32);
void fn_80082AAC(s32); void BoardCharWheelSetTarget(s32);
void BoardTutorialDirInputSet(s32, s32, s32); void BoardTutorialDirInputSet(s32, s32, s32);
void BoardSpaceStarSetIndex(s32); void BoardSpaceStarSetIndex(s32);
void BoardModelRotYSet(s16, f32); void BoardModelRotYSet(s16, f32);

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

@ -107,7 +107,7 @@ void fn_1_1134(void) {
fn_1_1E3C(7, 0x122, 0x8C); fn_1_1E3C(7, 0x122, 0x8C);
fn_1_BA0(0x2E0017); fn_1_BA0(0x2E0017);
fn_1_1FB0(); fn_1_1FB0();
fn_80082AAC(1); BoardCharWheelSetTarget(1);
} }
void fn_1_1178(void) { void fn_1_1178(void) {

16
src/game/board/warp.c
View file

@ -15,10 +15,10 @@ static void WarpImpact(s32);
extern void omVibrate(s16, s16, s16, s16); extern void omVibrate(s16, s16, s16, s16);
extern void fn_800816CC(s32, s32); extern void BoardCharWheelInit(s32, s32);
extern void fn_80081884(f32); extern void BoardCharWheelSpeedSet(f32);
extern void fn_8008181C(void); extern void BoardCharWheelWait(void);
extern s32 fn_8008186C(void); extern s32 BoardCharWheelResultGet(void);
extern f32 BoardModelMotionTimeGet(s16); extern f32 BoardModelMotionTimeGet(s16);
extern void BoardModelHookReset(s16); extern void BoardModelHookReset(s16);
extern s32 BoardModelHookSet(s16, char*, s16); extern s32 BoardModelHookSet(s16, char*, s16);
@ -77,10 +77,10 @@ void WarpProcess(void) {
BoardTutorialHookExec(18, 0); BoardTutorialHookExec(18, 0);
boardTutorialData[0] = 0; boardTutorialData[0] = 0;
} }
fn_800816CC(curr_player, 3); BoardCharWheelInit(curr_player, 3);
fn_80081884(18.0f); BoardCharWheelSpeedSet(18.0f);
fn_8008181C(); BoardCharWheelWait();
warpTarget = fn_8008186C(); warpTarget = BoardCharWheelResultGet();
BoardCameraViewSet(1); BoardCameraViewSet(1);
BoardCameraMotionWait(); BoardCameraMotionWait();
WarpInit(curr_player); WarpInit(curr_player);