mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-05-24 07:10:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_lyt_bird_gauge OK (#131)

Browse Source
This commit is contained in:
robojumper
2025-03-14 03:09:58 +01:00
committed by GitHub
parent 455642a81a
commit d60d45eb6e
35 changed files with 6953 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/SOUE01/splits.txt
+3
View File
@@ -505,8 +505,11 @@ d/lyt/d_lyt_help.cpp:
d/lyt/d_lyt_bird_gauge.cpp:
.text start:0x80152FD0 end:0x801548D8
.ctors start:0x804DB784 end:0x804DB788
.rodata start:0x804E80F8 end:0x804E8138
.data start:0x80524020 end:0x80524510
.sbss start:0x805754E0 end:0x805754E8
.sdata2 start:0x8057A038 end:0x8057A040
.bss start:0x805B0FB0 end:0x805B1230
d/lyt/d_lyt_sky_gauge.cpp:
.text start:0x801548E0 end:0x80155CC8
config/SOUE01/symbols.txt
+90 -87
View File
@@ -4457,7 +4457,7 @@ finalizeState_Unuse__18dLytMeter1Button_cFv = .text:0x800C8BF0; // type:function
build__18dLytMeter1Button_cFPQ23d2d10ResAccIf_c = .text:0x800C8C00; // type:function size:0x1A8
build__Q23d2d7dLytSubFPCcPQ23m2d10ResAccIf_c = .text:0x800C8DB0; // type:function size:0x8
remove__18dLytMeter1Button_cFv = .text:0x800C8DC0; // type:function size:0x58
LytMeter0x14__18dLytMeter1Button_cFv = .text:0x800C8E20; // type:function size:0x268
execute__18dLytMeter1Button_cFv = .text:0x800C8E20; // type:function size:0x268
getStateID__87sStateMgr_c<18dLytMeter1Button_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x800C9090; // type:function size:0x10
executeState__87sStateMgr_c<18dLytMeter1Button_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800C90A0; // type:function size:0x10
shouldButton1Beep = .text:0x800C90B0; // type:function size:0x84
@@ -4476,7 +4476,7 @@ executeState_Unuse__18dLytMeter2Button_cFv = .text:0x800C9380; // type:function
finalizeState_Unuse__18dLytMeter2Button_cFv = .text:0x800C93E0; // type:function size:0x4
build__18dLytMeter2Button_cFPQ23d2d10ResAccIf_c = .text:0x800C93F0; // type:function size:0x16C
remove__18dLytMeter2Button_cFv = .text:0x800C9560; // type:function size:0x58
LytMeter0x14__18dLytMeter2Button_cFv = .text:0x800C95C0; // type:function size:0x298
execute__18dLytMeter2Button_cFv = .text:0x800C95C0; // type:function size:0x298
getStateID__87sStateMgr_c<18dLytMeter2Button_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x800C9860; // type:function size:0x10
executeState__87sStateMgr_c<18dLytMeter2Button_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x800C9870; // type:function size:0x10
fn_800C9880 = .text:0x800C9880; // type:function size:0x84
@@ -4758,7 +4758,7 @@ draw__11dLytMeter_cFv = .text:0x800D7B50; // type:function size:0x128
fn_800D7C80 = .text:0x800D7C80; // type:function size:0x8
fn_800D7C90 = .text:0x800D7C90; // type:function size:0x8
getLyt__14dLytSkyGauge_cFv = .text:0x800D7CA0; // type:function size:0x8
fn_800D7CB0 = .text:0x800D7CB0; // type:function size:0x8
getLyt__15dLytBirdGauge_cFv = .text:0x800D7CB0; // type:function size:0x8
__ct__20dLytMeterContainer_cFv = .text:0x800D7CC0; // type:function size:0x84
__dt__11dLytMeter_cFv = .text:0x800D7D50; // type:function size:0xB94
build__20dLytMeterContainer_cFv = .text:0x800D88F0; // type:function size:0x324
@@ -5615,7 +5615,7 @@ executeState_Off__20dLytMeterRemoconBg_cFv = .text:0x800E6B70; // type:function
finalizeState_Off__20dLytMeterRemoconBg_cFv = .text:0x800E6B80; // type:function size:0x4
build__20dLytMeterRemoconBg_cFPQ23d2d10ResAccIf_c = .text:0x800E6B90; // type:function size:0x9C
remove__20dLytMeterRemoconBg_cFv = .text:0x800E6C30; // type:function size:0x8
LytMeter0x14__20dLytMeterRemoconBg_cFv = .text:0x800E6C40; // type:function size:0x180
execute__20dLytMeterRemoconBg_cFv = .text:0x800E6C40; // type:function size:0x180
getName__20dLytMeterRemoconBg_cCFv = .text:0x800E6DC0; // type:function size:0x8
getLyt__20dLytMeterRemoconBg_cFv = .text:0x800E6DD0; // type:function size:0x8
getPane__20dLytMeterRemoconBg_cFv = .text:0x800E6DE0; // type:function size:0x8
@@ -8524,65 +8524,65 @@ fn_80152F90 = .text:0x80152F90; // type:function size:0x8
fn_80152FA0 = .text:0x80152FA0; // type:function size:0x8
fn_80152FB0 = .text:0x80152FB0; // type:function size:0x8
fn_80152FC0 = .text:0x80152FC0; // type:function size:0x8
fn_80152FD0 = .text:0x80152FD0; // type:function size:0x4
fn_80152FE0 = .text:0x80152FE0; // type:function size:0xC
fn_80152FF0 = .text:0x80152FF0; // type:function size:0x4
fn_80153000 = .text:0x80153000; // type:function size:0x4
fn_80153010 = .text:0x80153010; // type:function size:0x70
fn_80153080 = .text:0x80153080; // type:function size:0x4
fn_80153090 = .text:0x80153090; // type:function size:0x4
fn_801530A0 = .text:0x801530A0; // type:function size:0x80
fn_80153120 = .text:0x80153120; // type:function size:0x4
fn_80153130 = .text:0x80153130; // type:function size:0x4
fn_80153140 = .text:0x80153140; // type:function size:0x80
fn_801531C0 = .text:0x801531C0; // type:function size:0x4
fn_801531D0 = .text:0x801531D0; // type:function size:0x4
fn_801531E0 = .text:0x801531E0; // type:function size:0x70
fn_80153250 = .text:0x80153250; // type:function size:0x4
initializeState_ModeNone__19dLytBirdGaugeMain_cFv = .text:0x80152FD0; // type:function size:0x4
executeState_ModeNone__19dLytBirdGaugeMain_cFv = .text:0x80152FE0; // type:function size:0xC
finalizeState_ModeNone__19dLytBirdGaugeMain_cFv = .text:0x80152FF0; // type:function size:0x4
initializeState_ModeIn__19dLytBirdGaugeMain_cFv = .text:0x80153000; // type:function size:0x4
executeState_ModeIn__19dLytBirdGaugeMain_cFv = .text:0x80153010; // type:function size:0x70
finalizeState_ModeIn__19dLytBirdGaugeMain_cFv = .text:0x80153080; // type:function size:0x4
initializeState_ModeDash__19dLytBirdGaugeMain_cFv = .text:0x80153090; // type:function size:0x4
executeState_ModeDash__19dLytBirdGaugeMain_cFv = .text:0x801530A0; // type:function size:0x80
finalizeState_ModeDash__19dLytBirdGaugeMain_cFv = .text:0x80153120; // type:function size:0x4
initializeState_ModeRecovery__19dLytBirdGaugeMain_cFv = .text:0x80153130; // type:function size:0x4
executeState_ModeRecovery__19dLytBirdGaugeMain_cFv = .text:0x80153140; // type:function size:0x80
finalizeState_ModeRecovery__19dLytBirdGaugeMain_cFv = .text:0x801531C0; // type:function size:0x4
initializeState_ModeOut__19dLytBirdGaugeMain_cFv = .text:0x801531D0; // type:function size:0x4
executeState_ModeOut__19dLytBirdGaugeMain_cFv = .text:0x801531E0; // type:function size:0x70
finalizeState_ModeOut__19dLytBirdGaugeMain_cFv = .text:0x80153250; // type:function size:0x4
__ct__19dLytBirdGaugeMain_cFv = .text:0x80153260; // type:function size:0xD8
fn_80153340 = .text:0x80153340; // type:function size:0x178
fn_801534C0 = .text:0x801534C0; // type:function size:0xA8
fn_80153570 = .text:0x80153570; // type:function size:0x10
fn_80153580 = .text:0x80153580; // type:function size:0x5C
fn_801535E0 = .text:0x801535E0; // type:function size:0x4C
fn_80153630 = .text:0x80153630; // type:function size:0x10
fn_80153640 = .text:0x80153640; // type:function size:0x80
fn_801536C0 = .text:0x801536C0; // type:function size:0xD0
fn_80153790 = .text:0x80153790; // type:function size:0xE0
fn_80153870 = .text:0x80153870; // type:function size:0x80
fn_801538F0 = .text:0x801538F0; // type:function size:0x4
fn_80153900 = .text:0x80153900; // type:function size:0x60
fn_80153960 = .text:0x80153960; // type:function size:0x4
fn_80153970 = .text:0x80153970; // type:function size:0x4
fn_80153980 = .text:0x80153980; // type:function size:0xE8
fn_80153A70 = .text:0x80153A70; // type:function size:0x4
fn_80153A80 = .text:0x80153A80; // type:function size:0x4
fn_80153A90 = .text:0x80153A90; // type:function size:0x58
fn_80153AF0 = .text:0x80153AF0; // type:function size:0x4
fn_80153B00 = .text:0x80153B00; // type:function size:0x4
fn_80153B10 = .text:0x80153B10; // type:function size:0x58
fn_80153B70 = .text:0x80153B70; // type:function size:0x4
fn_80153B80 = .text:0x80153B80; // type:function size:0x4
fn_80153B90 = .text:0x80153B90; // type:function size:0x60
fn_80153BF0 = .text:0x80153BF0; // type:function size:0x4
fn_80153C00 = .text:0x80153C00; // type:function size:0x58
fn_80153C60 = .text:0x80153C60; // type:function size:0x74
fn_80153CE0 = .text:0x80153CE0; // type:function size:0x48
fn_80153D30 = .text:0x80153D30; // type:function size:0x28
fn_80153D60 = .text:0x80153D60; // type:function size:0x8
fn_80153D70 = .text:0x80153D70; // type:function size:0x8
fn_80153D80 = .text:0x80153D80; // type:function size:0x60
fn_80153DE0 = .text:0x80153DE0; // type:function size:0xC
fn_80153DF0 = .text:0x80153DF0; // type:function size:0x1C
fn_80153E10 = .text:0x80153E10; // type:function size:0x1C
fn_80153E30 = .text:0x80153E30; // type:function size:0x1C
fn_80153E50 = .text:0x80153E50; // type:function size:0x10
fn_80153E60 = .text:0x80153E60; // type:function size:0x10
fn_80153E70 = .text:0x80153E70; // type:function size:0x10
fn_80153E80 = .text:0x80153E80; // type:function size:0x10
fn_80153E90 = .text:0x80153E90; // type:function size:0x10
fn_80153EA0 = .text:0x80153EA0; // type:function size:0x10
fn_80153EB0 = .text:0x80153EB0; // type:function size:0x10
build__19dLytBirdGaugeMain_cFPQ23d2d10ResAccIf_c = .text:0x80153340; // type:function size:0x178
execute__19dLytBirdGaugeMain_cFv = .text:0x801534C0; // type:function size:0xA8
executeState__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80153570; // type:function size:0x10
remove__19dLytBirdGaugeMain_cFv = .text:0x80153580; // type:function size:0x5C
cancelAnimation__19dLytBirdGaugeMain_cFv = .text:0x801535E0; // type:function size:0x4C
changeState__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>FRC12sStateIDIf_c = .text:0x80153630; // type:function size:0x10
changeToIn__19dLytBirdGaugeMain_cFv = .text:0x80153640; // type:function size:0x80
changeToDash__19dLytBirdGaugeMain_cFv = .text:0x801536C0; // type:function size:0xD0
changeToRecovery__19dLytBirdGaugeMain_cFv = .text:0x80153790; // type:function size:0xE0
changeToOut__19dLytBirdGaugeMain_cFv = .text:0x80153870; // type:function size:0x80
initializeState_In__15dLytBirdGauge_cFv = .text:0x801538F0; // type:function size:0x4
executeState_In__15dLytBirdGauge_cFv = .text:0x80153900; // type:function size:0x60
finalizeState_In__15dLytBirdGauge_cFv = .text:0x80153960; // type:function size:0x4
initializeState_None__15dLytBirdGauge_cFv = .text:0x80153970; // type:function size:0x4
executeState_None__15dLytBirdGauge_cFv = .text:0x80153980; // type:function size:0xE8
finalizeState_None__15dLytBirdGauge_cFv = .text:0x80153A70; // type:function size:0x4
initializeState_Dash__15dLytBirdGauge_cFv = .text:0x80153A80; // type:function size:0x4
executeState_Dash__15dLytBirdGauge_cFv = .text:0x80153A90; // type:function size:0x58
finalizeState_Dash__15dLytBirdGauge_cFv = .text:0x80153AF0; // type:function size:0x4
initializeState_Recovery__15dLytBirdGauge_cFv = .text:0x80153B00; // type:function size:0x4
executeState_Recovery__15dLytBirdGauge_cFv = .text:0x80153B10; // type:function size:0x58
finalizeState_Recovery__15dLytBirdGauge_cFv = .text:0x80153B70; // type:function size:0x4
initializeState_Out__15dLytBirdGauge_cFv = .text:0x80153B80; // type:function size:0x4
executeState_Out__15dLytBirdGauge_cFv = .text:0x80153B90; // type:function size:0x60
finalizeState_Out__15dLytBirdGauge_cFv = .text:0x80153BF0; // type:function size:0x4
hide__15dLytBirdGauge_cFv = .text:0x80153C00; // type:function size:0x58
build__15dLytBirdGauge_cFPQ23d2d10ResAccIf_c = .text:0x80153C60; // type:function size:0x74
execute__15dLytBirdGauge_cFv = .text:0x80153CE0; // type:function size:0x48
remove__15dLytBirdGauge_cFv = .text:0x80153D30; // type:function size:0x28
getName__15dLytBirdGauge_cCFv = .text:0x80153D60; // type:function size:0x8
getPane__15dLytBirdGauge_cFv = .text:0x80153D70; // type:function size:0x8
build__35sFStateFct_c<19dLytBirdGaugeMain_c>FRC12sStateIDIf_c = .text:0x80153D80; // type:function size:0x60
dispose__35sFStateFct_c<19dLytBirdGaugeMain_c>FRP10sStateIf_c = .text:0x80153DE0; // type:function size:0xC
initialize__32sFState_c<19dLytBirdGaugeMain_c>Fv = .text:0x80153DF0; // type:function size:0x1C
execute__32sFState_c<19dLytBirdGaugeMain_c>Fv = .text:0x80153E10; // type:function size:0x1C
finalize__32sFState_c<19dLytBirdGaugeMain_c>Fv = .text:0x80153E30; // type:function size:0x1C
initializeState__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80153E50; // type:function size:0x10
finalizeState__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80153E60; // type:function size:0x10
refreshState__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>Fv = .text:0x80153E70; // type:function size:0x10
getState__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80153E80; // type:function size:0x10
getNewStateID__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80153E90; // type:function size:0x10
getStateID__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80153EA0; // type:function size:0x10
getOldStateID__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c>CFv = .text:0x80153EB0; // type:function size:0x10
finalizeState__34sFStateID_c<19dLytBirdGaugeMain_c>CFR19dLytBirdGaugeMain_c = .text:0x80153EC0; // type:function size:0x30
executeState__34sFStateID_c<19dLytBirdGaugeMain_c>CFR19dLytBirdGaugeMain_c = .text:0x80153EF0; // type:function size:0x30
initializeState__34sFStateID_c<19dLytBirdGaugeMain_c>CFR19dLytBirdGaugeMain_c = .text:0x80153F20; // type:function size:0x30
@@ -8627,7 +8627,7 @@ initializeState_Out__14dLytSkyGauge_cFv = .text:0x80155150; // type:function siz
executeState_Out__14dLytSkyGauge_cFv = .text:0x80155160; // type:function size:0x58
finalizeState_Out__14dLytSkyGauge_cFv = .text:0x801551C0; // type:function size:0x4
build__14dLytSkyGauge_cFPQ23d2d10ResAccIf_c = .text:0x801551D0; // type:function size:0x60
LytMeter0x14__14dLytSkyGauge_cFv = .text:0x80155230; // type:function size:0x48
execute__14dLytSkyGauge_cFv = .text:0x80155230; // type:function size:0x48
remove__14dLytSkyGauge_cFv = .text:0x80155280; // type:function size:0x28
setHeight__14dLytSkyGauge_cFf = .text:0x801552B0; // type:function size:0x8
getName__14dLytSkyGauge_cCFv = .text:0x801552C0; // type:function size:0x8 scope:weak
@@ -20842,7 +20842,7 @@ fn_8037DBB0 = .text:0x8037DBB0; // type:function size:0x98
fn_8037DC50 = .text:0x8037DC50; // type:function size:0x70
fn_8037DCC0 = .text:0x8037DCC0; // type:function size:0x48
fn_8037DD10 = .text:0x8037DD10; // type:function size:0x1BC
SmallSoundManager__playSound = .text:0x8037DED0; // type:function size:0x2D0
playSound__17SmallSoundManagerF7WZSound = .text:0x8037DED0; // type:function size:0x2D0
fn_8037E1A0 = .text:0x8037E1A0; // type:function size:0x90
fn_8037E230 = .text:0x8037E230; // type:function size:0xEC
fn_8037E320 = .text:0x8037E320; // type:function size:0x78
@@ -28313,7 +28313,7 @@ lbl_804E7FC0 = .rodata:0x804E7FC0; // type:object size:0x20 data:4byte
lbl_804E7FE0 = .rodata:0x804E7FE0; // type:object size:0x18 data:4byte
lbl_804E7FF8 = .rodata:0x804E7FF8; // type:object size:0xD0 data:4byte
lbl_804E80C8 = .rodata:0x804E80C8; // type:object size:0x30
lbl_804E80F8 = .rodata:0x804E80F8; // type:object size:0x40 data:4byte
brlanMap = .rodata:0x804E80F8; // type:object size:0x40 scope:local data:4byte
brlanMap = .rodata:0x804E8138; // type:object size:0x18 scope:local data:4byte
lbl_804E8150 = .rodata:0x804E8150; // type:object size:0xC8 data:4byte
lbl_804E8218 = .rodata:0x804E8218; // type:object size:0x10 data:4byte
@@ -32913,21 +32913,21 @@ jumptable_80523E40 = .data:0x80523E40; // type:object size:0x84 scope:local
lbl_80523F7C = .data:0x80523F7C; // type:object size:0xC
lbl_80523F88 = .data:0x80523F88; // type:object size:0xC
lbl_80523F94 = .data:0x80523F94; // type:object size:0x8C
lbl_80524020 = .data:0x80524020; // type:object size:0x18
lbl_80524038 = .data:0x80524038; // type:object size:0x10
lbl_80524020 = .data:0x80524020; // type:object size:0x16 data:string
lbl_80524038 = .data:0x80524038; // type:object size:0xB data:string
lbl_80524048 = .data:0x80524048; // type:object size:0x18 data:string
lbl_80524060 = .data:0x80524060; // type:object size:0xC
lbl_8052406C = .data:0x8052406C; // type:object size:0xC
lbl_80524078 = .data:0x80524078; // type:object size:0xC
lbl_80524060 = .data:0x80524060; // type:object size:0xA data:string
lbl_8052406C = .data:0x8052406C; // type:object size:0xA data:string
lbl_80524078 = .data:0x80524078; // type:object size:0xA data:string
lbl_80524084 = .data:0x80524084; // type:object size:0x1C data:string
lbl_805240A0 = .data:0x805240A0; // type:object size:0x18
lbl_805240B8 = .data:0x805240B8; // type:object size:0x14
lbl_805240A0 = .data:0x805240A0; // type:object size:0x17 data:string
lbl_805240B8 = .data:0x805240B8; // type:object size:0x13 data:string
__vt__15dLytBirdGauge_c = .data:0x805240CC; // type:object size:0x34
lbl_80524100 = .data:0x80524100; // type:object size:0x10
lbl_80524110 = .data:0x80524110; // type:object size:0x30
lbl_80524140 = .data:0x80524140; // type:object size:0x30
lbl_80524170 = .data:0x80524170; // type:object size:0x18
lbl_80524188 = .data:0x80524188; // type:object size:0x31C
__vt__19dLytBirdGaugeMain_c = .data:0x80524100; // type:object size:0xC
__vt__58sFStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c> = .data:0x80524110; // type:object size:0x30
__vt__88sStateMgr_c<19dLytBirdGaugeMain_c,20sStateMethodUsr_FI_c,12sFStateFct_c,13sStateIDChk_c> = .data:0x80524140; // type:object size:0x30
__vt__35sFStateFct_c<19dLytBirdGaugeMain_c> = .data:0x80524170; // type:object size:0x14
__vt__32sFState_c<19dLytBirdGaugeMain_c> = .data:0x80524188; // type:object size:0x18
__vt__30sFStateID_c<15dLytBirdGauge_c> = .data:0x805244A4; // type:object size:0x34
__vt__34sFStateID_c<19dLytBirdGaugeMain_c> = .data:0x805244D8; // type:object size:0x34
@6398 = .data:0x80524510; // type:object size:0x15 scope:local data:string
@@ -40116,7 +40116,7 @@ sInstance__17dLytAreaCaption_c = .sbss:0x805754C0; // type:object size:0x8 data:
LytWipe = .sbss:0x805754C8; // type:object size:0x8 data:4byte
LYT_HELP_PTR = .sbss:0x805754D0; // type:object size:0x8 data:4byte
lbl_805754D8 = .sbss:0x805754D8; // type:object size:0x8 data:4byte
lbl_805754E0 = .sbss:0x805754E0; // type:object size:0x8 data:4byte
sInstance__15dLytBirdGauge_c = .sbss:0x805754E0; // type:object size:0x4 data:4byte
sInstance__14dLytSkyGauge_c = .sbss:0x805754E8; // type:object size:0x4 data:4byte
lbl_805754F0 = .sbss:0x805754F0; // type:object size:0x8 data:4byte
sInstance__17dLytCursorStick_c = .sbss:0x805754F8; // type:object size:0x8 data:4byte
@@ -40569,7 +40569,7 @@ FANFARE_SOUND_MGR_source = .sbss:0x80575D84; // type:object size:0x4 data:4byte
lbl_80575D88 = .sbss:0x80575D88; // type:object size:0x8 data:4byte
SOME_UNUSED_SOUND_MGR = .sbss:0x80575D90; // type:object size:0x4 data:4byte
SOME_UNUSED_SOUND_MGR_source = .sbss:0x80575D94; // type:object size:0x4 data:4byte
SOUND_EFFECT_SOUND_MGR = .sbss:0x80575D98; // type:object size:0x4 data:4byte
sInstance__17SmallSoundManager = .sbss:0x80575D98; // type:object size:0x4 data:4byte
SOUND_EFFECT_SOUND_MGR_source = .sbss:0x80575D9C; // type:object size:0x4 data:4byte
lbl_80575DA0 = .sbss:0x80575DA0; // type:object size:0x4 data:4byte
lbl_80575DA4 = .sbss:0x80575DA4; // type:object size:0x4 data:4byte
@@ -49003,14 +49003,17 @@ LytHelp__STATE_IN = .bss:0x805B0EC0; // type:object size:0x40 data:4byte
LytHelp__STATE_WAIT = .bss:0x805B0F00; // type:object size:0x40 data:4byte
LytHelp__STATE_OUT = .bss:0x805B0F40; // type:object size:0x40 data:4byte
LytHelp__STATE_END = .bss:0x805B0F80; // type:object size:0x30 data:4byte
lbl_805B0FB0 = .bss:0x805B0FB0; // type:object size:0x10
LytBirdGaugeMain__STATE_MODE_NONE = .bss:0x805B0FC0; // type:object size:0x40 data:4byte
LytBirdGaugeMain__STATE_MODE_IN = .bss:0x805B1000; // type:object size:0x40 data:4byte
LytBirdGaugeMain__STATE_MODE_DASH = .bss:0x805B1040; // type:object size:0x40 data:4byte
lbl_805B1080 = .bss:0x805B1080; // type:object size:0x40 data:4byte
LytBirdGaugeMain__STATE_MODE_OUT = .bss:0x805B10C0; // type:object size:0x80 data:4byte
LytBirdGauge__STATE_NONE = .bss:0x805B1140; // type:object size:0xC0 data:4byte
LytBirdGauge__STATE_OUT = .bss:0x805B1200; // type:object size:0x30 data:4byte
lbl_805B0FB0 = .bss:0x805B0FB0; // type:object size:0xC
StateID_ModeNone__19dLytBirdGaugeMain_c = .bss:0x805B0FC0; // type:object size:0x30 data:4byte
StateID_ModeIn__19dLytBirdGaugeMain_c = .bss:0x805B1000; // type:object size:0x30 data:4byte
StateID_ModeDash__19dLytBirdGaugeMain_c = .bss:0x805B1040; // type:object size:0x30 data:4byte
StateID_ModeRecovery__19dLytBirdGaugeMain_c = .bss:0x805B1080; // type:object size:0x30 data:4byte
StateID_ModeOut__19dLytBirdGaugeMain_c = .bss:0x805B10C0; // type:object size:0x30 data:4byte
StateID_In__15dLytBirdGauge_c = .bss:0x805B1100; // type:object size:0x30 data:4byte
StateID_None__15dLytBirdGauge_c = .bss:0x805B1140; // type:object size:0x30 data:4byte
StateID_Dash__15dLytBirdGauge_c = .bss:0x805B1180; // type:object size:0x30 data:4byte
StateID_Recovery__15dLytBirdGauge_c = .bss:0x805B11C0; // type:object size:0x30 data:4byte
StateID_Out__15dLytBirdGauge_c = .bss:0x805B1200; // type:object size:0x30 data:4byte
@6369 = .bss:0x805B1230; // type:object size:0xC scope:local
...bss.0 = .bss:0x805B1230; // type:label scope:local
StateID_ModeNone__18dLytSkyGaugeMain_c = .bss:0x805B1240; // type:object size:0x30 data:4byte
configure.py
+1 -1
View File
@@ -422,7 +422,7 @@ config.libs = [
Object(NonMatching, "d/lyt/d_lyt_area_caption.cpp"),
Object(NonMatching, "d/lyt/d_lyt_wipe.cpp"),
Object(NonMatching, "d/lyt/d_lyt_help.cpp"),
Object(NonMatching, "d/lyt/d_lyt_bird_gauge.cpp"),
Object(Matching, "d/lyt/d_lyt_bird_gauge.cpp"),
Object(Matching, "d/lyt/d_lyt_sky_gauge.cpp"),
Object(NonMatching, "d/lyt/d_lyt_boss_gauge.cpp"),
Object(NonMatching, "d/lyt/d_lyt_pause_disp_00.cpp"),
include/d/lyt/d2d.h
+1 -1
View File
@@ -144,7 +144,7 @@ public:
virtual ~dSubPane() {}
virtual bool build(ResAccIf_c *resAcc) = 0;
virtual bool remove() = 0;
virtual bool LytMeter0x14() = 0;
virtual bool execute() = 0;
virtual nw4r::lyt::Pane *getPane() = 0;
virtual LytBase_c *getLyt() = 0;
virtual const char *getName() const = 0;
include/d/lyt/d_lyt_bird_gauge.h
+53 -9
View File
@@ -1,15 +1,42 @@
#ifndef D_LYT_BIRD_GAUGE_H
#define D_LYT_BIRD_GAUGE_H
#include "common.h"
#include "d/lyt/d2d.h"
#include "m/m_color.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dLytBirdGaugeMain_c {
public:
dLytBirdGaugeMain_c();
virtual ~dLytBirdGaugeMain_c() {}
bool build(d2d::ResAccIf_c *resAcc);
bool execute();
bool remove();
const d2d::dLytSub &getLyt() const {
return mLyt;
}
d2d::dLytSub &getLyt() {
return mLyt;
}
void cancelAnimation();
bool isAnimating() const {
return mIsAnimating;
}
s32 getDisplayedDashes() const {
return mNumDisplayedDashes;
}
void changeToIn();
void changeToDash();
void changeToRecovery();
void changeToOut();
private:
STATE_FUNC_DECLARE(dLytBirdGaugeMain_c, ModeNone);
STATE_FUNC_DECLARE(dLytBirdGaugeMain_c, ModeIn);
@@ -17,9 +44,11 @@ private:
STATE_FUNC_DECLARE(dLytBirdGaugeMain_c, ModeRecovery);
STATE_FUNC_DECLARE(dLytBirdGaugeMain_c, ModeOut);
/* 0x04 */ UI_STATE_MGR_DECLARE(dLytBirdGaugeMain_c);
/* 0x40 */ d2d::dLytSub mLyt;
/* 0xD4 */ d2d::AnmGroup_c mAnmGroups[8];
/* 0x004 */ UI_STATE_MGR_DECLARE(dLytBirdGaugeMain_c);
/* 0x040 */ d2d::dLytSub mLyt;
/* 0x0D4 */ d2d::AnmGroup_c mAnmGroups[8];
/* 0x2D4 */ bool mIsAnimating;
/* 0x2D8 */ s32 mNumDisplayedDashes;
};
class dLytBirdGauge_c : public d2d::dSubPane {
@@ -27,14 +56,24 @@ public:
dLytBirdGauge_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mMain.getLyt().getLayout()->GetRootPane();
}
virtual d2d::LytBase_c *getLyt() override {
return &mMain.getLyt();
}
virtual const char *getName() const override {
return mMain.getLyt().getName();
}
virtual ~dLytBirdGauge_c() {}
void hide();
private:
static dLytBirdGauge_c *sInstance;
STATE_FUNC_DECLARE(dLytBirdGauge_c, In);
STATE_FUNC_DECLARE(dLytBirdGauge_c, None);
STATE_FUNC_DECLARE(dLytBirdGauge_c, Dash);
@@ -44,6 +83,11 @@ private:
/* 0x008 */ UI_STATE_MGR_DECLARE(dLytBirdGauge_c);
/* 0x008 */ d2d::ResAccIf_c mResAcc;
/* 0x3B4 */ dLytBirdGaugeMain_c mMain;
/* 0x690 */ bool field_0x690;
/* 0x691 */ bool field_0x691;
/* 0x692 */ bool field_0x692;
/* 0x693 */ bool field_0x693;
/* 0x694 */ s32 mGameStateDashes;
};
#endif
include/d/lyt/d_lyt_common_icon_item.h
+1 -1
View File
@@ -65,7 +65,7 @@ public:
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/d_lyt_map.h
+1 -1
View File
@@ -143,7 +143,7 @@ public:
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mLyt.getLayout()->GetRootPane();
}
include/d/lyt/d_lyt_sky_gauge.h
+1 -2
View File
@@ -3,7 +3,6 @@
#include "d/lyt/d2d.h"
#include "s/s_State.hpp"
#include "s/s_StateMgr.hpp"
class dLytSkyGauge_c;
@@ -53,7 +52,7 @@ public:
dLytSkyGauge_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mMain.getLyt().getLayout()->GetRootPane();
}
include/d/lyt/meter/d_lyt_meter.h
+2 -2
View File
@@ -29,7 +29,7 @@ public:
virtual ~dLytMeter1Button_c() {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mLyt.getLayout()->GetRootPane();
}
@@ -64,7 +64,7 @@ public:
virtual ~dLytMeter2Button_c() {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mLyt.getLayout()->GetRootPane();
}
include/d/lyt/meter/d_lyt_meter_a_btn.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterABtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override {
return mLyt.getLayout()->GetRootPane();
}
include/d/lyt/meter/d_lyt_meter_cross_btn.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
dLytMeterCrossBtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_dowsing.h
+1 -1
View File
@@ -75,7 +75,7 @@ public:
dLytMeterDowsing_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterGanbariGauge_c() : mStateMgr1(*this, sStateID::null), mStateMgr2(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_heart.h
+1 -1
View File
@@ -8,7 +8,7 @@ public:
dLytMeterHeart_c() {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_item_select.h
+1 -1
View File
@@ -55,7 +55,7 @@ public:
dLytMeterItemSelect_c();
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_minus_btn.h
+1 -1
View File
@@ -66,7 +66,7 @@ public:
dLytMeterMinusBtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_nun_stk.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterNunStk_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_nunchaku_bg.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterNunchakuBg_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_plus_btn.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterPlusBtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_remocon_bg.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterRemoconBg_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_rupy.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
dLytMeterRupy_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_shield_gauge.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterShieldGauge_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_timer.h
+2 -2
View File
@@ -14,7 +14,7 @@ public:
}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
@@ -39,7 +39,7 @@ public:
}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/d/lyt/meter/d_lyt_meter_z_btn.h
+1 -1
View File
@@ -10,7 +10,7 @@ public:
dLytMeterZBtn_c() : mStateMgr(*this, sStateID::null) {}
virtual bool build(d2d::ResAccIf_c *resAcc) override;
virtual bool remove() override;
virtual bool LytMeter0x14() override;
virtual bool execute() override;
virtual nw4r::lyt::Pane *getPane() override;
virtual d2d::LytBase_c *getLyt() override;
virtual const char *getName() const override;
include/toBeSorted/small_sound_mgr.h
+6483
View File
File diff suppressed because it is too large Load Diff
src/REL/d/t/d_t_reaction.cpp
+4 -6
View File
@@ -7,6 +7,7 @@
#include "d/col/c/c_cc_d.h"
#include "d/col/cc/d_cc_s.h"
#include "d/flag/sceneflag_manager.h"
#include "toBeSorted/small_sound_mgr.h"
SPECIAL_ACTOR_PROFILE(TAG_REACTION, dTgReaction_c, fProfile::TAG_REACTION, 0x0151, 0, 0);
@@ -158,9 +159,6 @@ void dTgReaction_c::executeState_Wait() {
}
void dTgReaction_c::finalizeState_Wait() {}
extern "C" void *SOUND_EFFECT_SOUND_MGR;
extern "C" void SmallSoundManager__playSound(void *, u16);
void dTgReaction_c::checkForBonkItem() {
if (dAcPy_c::LINK != nullptr && dAcPy_c::LINK->checkFlags0x350(0x2000)) {
mVec3_c diff = position - dAcPy_c::LINK->position;
@@ -181,7 +179,7 @@ void dTgReaction_c::checkForBonkItem() {
if (dAcObjBase_c::create(fProfile::ITEM, roomid, newItemParms, &c2, nullptr, nullptr, 0xFFFFFFFF)) {
field_0x4DD = 1;
onDelete();
SmallSoundManager__playSound(SOUND_EFFECT_SOUND_MGR, 0x13AD); // TODO (Sound ID)
SmallSoundManager::GetInstance()->playSound(SE_S_READ_RIDDLE_A);
}
}
} else {
@@ -203,7 +201,7 @@ void dTgReaction_c::checkForBonkItem() {
pos.y += field_0x4E4;
if (fn_578_DB0(pos, uVar3)) {
SmallSoundManager__playSound(SOUND_EFFECT_SOUND_MGR, 0x13AE); // TODO (Sound ID)
SmallSoundManager::GetInstance()->playSound(SE_S_READ_RIDDLE_B);
}
SceneflagManager::sInstance->setFlag(roomid, getSceneFlag());
onDelete();
@@ -237,7 +235,7 @@ void dTgReaction_c::checkForSlingBellowsItem() {
mVec3_c spawnPos = position;
spawnPos.y += field_0x4E4;
if (fn_578_DB0(spawnPos, uVar3)) {
SmallSoundManager__playSound(SOUND_EFFECT_SOUND_MGR, 0x13AE); // TODO (Sound ID)
SmallSoundManager::GetInstance()->playSound(SE_S_READ_RIDDLE_B);
}
SceneflagManager::sInstance->setFlag(roomid, getSceneFlag());
onDelete();
src/d/a/obj/d_a_obj_tbox.cpp
+2 -3
View File
@@ -33,6 +33,7 @@
#include "toBeSorted/counters/goddess_chest_counter.h"
#include "toBeSorted/dowsing_target.h"
#include "toBeSorted/event_manager.h"
#include "toBeSorted/small_sound_mgr.h"
SPECIAL_ACTOR_PROFILE(TBOX, dAcTbox_c, fProfile::TBOX, 0x018D, 0, 6);
@@ -1753,8 +1754,6 @@ void dAcTbox_c::initializeState_DemoAppear() {
field_0x11C0.set(0.0f, 0.0f, 0.0f);
field_0x11CC.set(0.0f, 0.0f, 0.0f);
}
extern "C" void SmallSoundManager__playSound(void *, u32);
extern "C" void *SOUND_EFFECT_SOUND_MGR;
void dAcTbox_c::executeState_DemoAppear() {
int val = field_0x11F8++;
if (field_0x11F8 < 11) {
@@ -1787,7 +1786,7 @@ void dAcTbox_c::executeState_DemoAppear() {
if (isStop && mAnmMatClr1.isStop(0) && field_0x11F8 > 0x5A) {
mEvent.advanceNext();
mStateMgr.changeState(StateID_WaitOpen);
SmallSoundManager__playSound(SOUND_EFFECT_SOUND_MGR, 0x13AD);
SmallSoundManager::GetInstance()->playSound(SE_S_READ_RIDDLE_A);
}
}
}
src/d/d_cs_game.cpp
+2 -3
View File
@@ -5,6 +5,7 @@
#include "d/lyt/d_structd.h"
#include "f/f_base.h"
#include "toBeSorted/arc_managers/layout_arc_manager.h"
#include "toBeSorted/small_sound_mgr.h"
SPECIAL_BASE_PROFILE(C_GAME, dCsGame_c, fProfile::C_GAME, 0x2BF, 0x06F9);
@@ -401,14 +402,12 @@ void dCsGame_c::lytItemCursor_c::lytBowCsr_c::initializeState_Charge() {
mAnm[MAIN_ANIM_ARROW_EFFECT].setAnimEnable(true);
mAnm[MAIN_ANIM_ARROW_EFFECT].setFrame(0.0f);
}
extern "C" void *SOUND_EFFECT_SOUND_MGR;
extern "C" void SmallSoundManager__playSound(void *, s32);
void dCsGame_c::lytItemCursor_c::lytBowCsr_c::executeState_Charge() {
if (field_0x54 >= 1.0f) {
if (!mAnm[MAIN_ANIM_ARROW_PEAK].isFlag2()) {
mAnm[MAIN_ANIM_ARROW_PEAK].setAnimEnable(true);
mAnm[MAIN_ANIM_ARROW_PEAK].setFrame(0.0f);
SmallSoundManager__playSound(SOUND_EFFECT_SOUND_MGR, 0x148D);
SmallSoundManager::GetInstance()->playSound(SE_S_BW_ALIGN_SIGHT);
}
mAnm[MAIN_ANIM_ARROW_KEEP].setAnimEnable(false);
} else {
src/d/lyt/d_lyt_bird_gauge.cpp
+280
View File
@@ -1,5 +1,8 @@
#include "d/lyt/d_lyt_bird_gauge.h"
#include "common.h"
#include "toBeSorted/small_sound_mgr.h"
STATE_DEFINE(dLytBirdGaugeMain_c, ModeNone);
STATE_DEFINE(dLytBirdGaugeMain_c, ModeIn);
STATE_DEFINE(dLytBirdGaugeMain_c, ModeDash);
@@ -11,3 +14,280 @@ STATE_DEFINE(dLytBirdGauge_c, None);
STATE_DEFINE(dLytBirdGauge_c, Dash);
STATE_DEFINE(dLytBirdGauge_c, Recovery);
STATE_DEFINE(dLytBirdGauge_c, Out);
dLytBirdGauge_c *dLytBirdGauge_c::sInstance;
static const d2d::LytBrlanMapping brlanMap[] = {
{ "birdGauge_00_in.brlan", "G_inOut_00"},
{ "birdGauge_00_dash.brlan", "G_wing_00"},
{ "birdGauge_00_dash.brlan", "G_wing_01"},
{ "birdGauge_00_dash.brlan", "G_wing_02"},
{"birdGauge_00_recovery.brlan", "G_wing_00"},
{"birdGauge_00_recovery.brlan", "G_wing_01"},
{"birdGauge_00_recovery.brlan", "G_wing_02"},
{ "birdGauge_00_out.brlan", "G_inOut_00"},
};
#define LYT_SKY_GAUGE_MAIN_ANIM_IN 0
#define LYT_SKY_GAUGE_MAIN_ANIM_DASH 1
#define LYT_SKY_GAUGE_MAIN_ANIM_RECOVERY 4
#define LYT_SKY_GAUGE_MAIN_ANIM_OUT 7
#define LYT_SKY_GAUGE_MAIN_NUM_WINGS 3
#define LYT_SKY_GAUGE_MAIN_NUM_ANIMS 8
void dLytBirdGaugeMain_c::initializeState_ModeNone() {}
void dLytBirdGaugeMain_c::executeState_ModeNone() {
mIsAnimating = true;
}
void dLytBirdGaugeMain_c::finalizeState_ModeNone() {}
void dLytBirdGaugeMain_c::initializeState_ModeIn() {}
void dLytBirdGaugeMain_c::executeState_ModeIn() {
if (mIsAnimating) {
return;
}
if (mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_IN].isEndReached()) {
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_IN].setAnimEnable(false);
mIsAnimating = true;
}
}
void dLytBirdGaugeMain_c::finalizeState_ModeIn() {}
void dLytBirdGaugeMain_c::initializeState_ModeDash() {}
void dLytBirdGaugeMain_c::executeState_ModeDash() {
if (mIsAnimating) {
return;
}
if (mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_DASH + mNumDisplayedDashes].isEndReached()) {
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_DASH + mNumDisplayedDashes].setAnimEnable(false);
mIsAnimating = true;
}
}
void dLytBirdGaugeMain_c::finalizeState_ModeDash() {}
void dLytBirdGaugeMain_c::initializeState_ModeRecovery() {}
void dLytBirdGaugeMain_c::executeState_ModeRecovery() {
if (mIsAnimating) {
return;
}
if (mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_RECOVERY + mNumDisplayedDashes - 1].isEndReached()) {
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_RECOVERY + mNumDisplayedDashes - 1].setAnimEnable(false);
mIsAnimating = true;
}
}
void dLytBirdGaugeMain_c::finalizeState_ModeRecovery() {}
void dLytBirdGaugeMain_c::initializeState_ModeOut() {}
void dLytBirdGaugeMain_c::executeState_ModeOut() {
if (mIsAnimating) {
return;
}
if (mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_OUT].isEndReached()) {
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_OUT].setAnimEnable(false);
mIsAnimating = true;
}
}
void dLytBirdGaugeMain_c::finalizeState_ModeOut() {}
dLytBirdGaugeMain_c::dLytBirdGaugeMain_c() : mStateMgr(*this) {}
bool dLytBirdGaugeMain_c::build(d2d::ResAccIf_c *resAcc) {
mLyt.setResAcc(resAcc);
mLyt.build("birdGauge_00.brlyt", nullptr);
mLyt.setPriority(0x8A);
for (int i = 0; i < LYT_SKY_GAUGE_MAIN_NUM_ANIMS; i++) {
mAnmGroups[i].init(brlanMap[i].mFile, resAcc, mLyt.getLayout(), brlanMap[i].mName);
mAnmGroups[i].setDirection(false);
mAnmGroups[i].setAnimEnable(false);
}
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_IN].setAnimEnable(true);
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_IN].setFrame(0.0f);
for (int i = 0; i < LYT_SKY_GAUGE_MAIN_NUM_WINGS; i++) {
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_DASH + i].setAnimEnable(true);
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_DASH + i].setFrame(0.0f);
}
mLyt.calc();
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_IN].setAnimEnable(false);
for (int i = 0; i < LYT_SKY_GAUGE_MAIN_NUM_WINGS; i++) {
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_DASH + i].setAnimEnable(false);
}
mNumDisplayedDashes = LYT_SKY_GAUGE_MAIN_NUM_WINGS;
cancelAnimation();
return true;
}
bool dLytBirdGaugeMain_c::execute() {
mStateMgr.executeState();
for (int i = 0; i < LYT_SKY_GAUGE_MAIN_NUM_ANIMS; i++) {
if (mAnmGroups[i].isFlag2()) {
mAnmGroups[i].play();
}
}
mLyt.calc();
return true;
}
bool dLytBirdGaugeMain_c::remove() {
mLyt.unbindAnims();
for (int i = 0; i < LYT_SKY_GAUGE_MAIN_NUM_ANIMS; i++) {
mAnmGroups[i].afterUnbind();
}
return true;
}
void dLytBirdGaugeMain_c::cancelAnimation() {
mStateMgr.changeState(StateID_ModeNone);
mIsAnimating = false;
}
void dLytBirdGaugeMain_c::changeToIn() {
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_IN].setAnimEnable(true);
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_IN].setFrame(0.0f);
mLyt.calc();
mStateMgr.changeState(StateID_ModeIn);
mIsAnimating = false;
}
void dLytBirdGaugeMain_c::changeToDash() {
mNumDisplayedDashes--;
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_RECOVERY + mNumDisplayedDashes].setAnimEnable(false);
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_DASH + mNumDisplayedDashes].setAnimEnable(true);
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_DASH + mNumDisplayedDashes].setFrame(0.0f);
mLyt.calc();
mStateMgr.changeState(StateID_ModeDash);
mIsAnimating = false;
}
void dLytBirdGaugeMain_c::changeToRecovery() {
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_DASH + mNumDisplayedDashes].setAnimEnable(false);
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_RECOVERY + mNumDisplayedDashes].setAnimEnable(true);
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_RECOVERY + mNumDisplayedDashes].setFrame(0.0f);
mLyt.calc();
SmallSoundManager::GetInstance()->playSound(SE_S_BIRD_RECOVER);
mStateMgr.changeState(StateID_ModeRecovery);
mIsAnimating = false;
mNumDisplayedDashes++;
}
void dLytBirdGaugeMain_c::changeToOut() {
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_OUT].setAnimEnable(true);
mAnmGroups[LYT_SKY_GAUGE_MAIN_ANIM_OUT].setFrame(0.0f);
mLyt.calc();
mStateMgr.changeState(StateID_ModeOut);
mIsAnimating = false;
}
void dLytBirdGauge_c::initializeState_In() {}
void dLytBirdGauge_c::executeState_In() {
if (mMain.isAnimating()) {
mMain.cancelAnimation();
mStateMgr.changeState(StateID_None);
field_0x692 = true;
}
}
void dLytBirdGauge_c::finalizeState_In() {}
void dLytBirdGauge_c::initializeState_None() {}
void dLytBirdGauge_c::executeState_None() {
s32 displayedDashes = mMain.getDisplayedDashes();
if (field_0x690) {
mMain.changeToIn();
mStateMgr.changeState(StateID_In);
field_0x690 = false;
field_0x692 = false;
field_0x693 = false;
} else if (displayedDashes != 0 && mGameStateDashes < displayedDashes) {
mMain.changeToDash();
mStateMgr.changeState(StateID_Dash);
} else if (displayedDashes < 3 && mGameStateDashes > displayedDashes) {
mMain.changeToRecovery();
mStateMgr.changeState(StateID_Recovery);
}
}
void dLytBirdGauge_c::finalizeState_None() {}
void dLytBirdGauge_c::initializeState_Dash() {}
void dLytBirdGauge_c::executeState_Dash() {
if (mMain.isAnimating()) {
mMain.cancelAnimation();
mStateMgr.changeState(StateID_None);
}
}
void dLytBirdGauge_c::finalizeState_Dash() {}
void dLytBirdGauge_c::initializeState_Recovery() {}
void dLytBirdGauge_c::executeState_Recovery() {
if (mMain.isAnimating()) {
mMain.cancelAnimation();
mStateMgr.changeState(StateID_None);
}
}
void dLytBirdGauge_c::finalizeState_Recovery() {}
void dLytBirdGauge_c::initializeState_Out() {}
void dLytBirdGauge_c::executeState_Out() {
if (mMain.isAnimating()) {
field_0x693 = true;
mMain.cancelAnimation();
mStateMgr.changeState(StateID_None);
}
}
void dLytBirdGauge_c::finalizeState_Out() {}
void dLytBirdGauge_c::hide() {
mMain.changeToOut();
mStateMgr.changeState(StateID_Out);
field_0x692 = false;
field_0x693 = false;
}
bool dLytBirdGauge_c::build(d2d::ResAccIf_c *resAcc) {
sInstance = this;
mMain.build(resAcc);
field_0x690 = false;
field_0x691 = false;
field_0x692 = false;
field_0x693 = true;
mGameStateDashes = LYT_SKY_GAUGE_MAIN_NUM_WINGS;
mStateMgr.changeState(StateID_None);
return true;
}
bool dLytBirdGauge_c::execute() {
mMain.execute();
mStateMgr.executeState();
return true;
}
bool dLytBirdGauge_c::remove() {
mMain.remove();
return true;
}
src/d/lyt/d_lyt_common_arrow.cpp
+5 -7
View File
@@ -4,6 +4,7 @@
#include "d/lyt/d_structd.h"
#include "rvl/MTX/mtx.h"
#include "toBeSorted/arc_managers/layout_arc_manager.h"
#include "toBeSorted/small_sound_mgr.h"
STATE_DEFINE(dLytCommonArrow_c, None);
STATE_DEFINE(dLytCommonArrow_c, In);
@@ -227,9 +228,6 @@ void dLytCommonArrow_c::initializeState_Wait() {
mTimer = 0;
}
extern "C" void SmallSoundManager__playSound(void *, u32);
extern "C" void *SOUND_EFFECT_SOUND_MGR;
void dLytCommonArrow_c::executeState_Wait() {
if (mOutRequested == 1) {
mStateMgr.changeState(StateID_Out);
@@ -262,9 +260,9 @@ void dLytCommonArrow_c::executeState_Wait() {
if (field_0x6C0 != 2) {
displayElement(field_0x6C0 + ANIM_DECIDE_OFFSET, 0.0f);
if (field_0x6C0 == 0) {
SmallSoundManager__playSound(SOUND_EFFECT_SOUND_MGR, 0x142D);
SmallSoundManager::GetInstance()->playSound(SE_S_MENU_SELECT_TURN_PAGE_LEFT);
} else {
SmallSoundManager__playSound(SOUND_EFFECT_SOUND_MGR, 0x142E);
SmallSoundManager::GetInstance()->playSound(SE_S_MENU_SELECT_TURN_PAGE_RIGHT);
}
mTimer++;
}
@@ -287,9 +285,9 @@ void dLytCommonArrow_c::executeState_Wait() {
if (field_0x6BC != field_0x6B8 && field_0x6B8 != 2) {
if (field_0x6B8 == 0) {
SmallSoundManager__playSound(SOUND_EFFECT_SOUND_MGR, 0x142B);
SmallSoundManager::GetInstance()->playSound(SE_S_MENU_POINT_TURN_PAGE_LEFT);
} else {
SmallSoundManager__playSound(SOUND_EFFECT_SOUND_MGR, 0x142C);
SmallSoundManager::GetInstance()->playSound(SE_S_MENU_POINT_TURN_PAGE_RIGHT);
}
}
}
src/d/lyt/d_lyt_sky_gauge.cpp
+3 -1
View File
@@ -188,11 +188,13 @@ bool dLytSkyGauge_c::build(d2d::ResAccIf_c *resAcc) {
mStateMgr.changeState(StateID_None);
return true;
}
bool dLytSkyGauge_c::LytMeter0x14() {
bool dLytSkyGauge_c::execute() {
mMain.execute();
mStateMgr.executeState();
return true;
}
bool dLytSkyGauge_c::remove() {
mMain.remove();
return true;
src/d/lyt/meter/d_lyt_meter.cpp
+2 -2
View File
@@ -130,7 +130,7 @@ bool dLytMeter1Button_c::remove() {
return true;
}
bool dLytMeter1Button_c::LytMeter0x14() {
bool dLytMeter1Button_c::execute() {
if (*mStateMgr.getStateID() == StateID_ToUnuse) {
// TODO
} else {
@@ -238,7 +238,7 @@ bool dLytMeter2Button_c::remove() {
return true;
}
bool dLytMeter2Button_c::LytMeter0x14() {
bool dLytMeter2Button_c::execute() {
if (*mStateMgr.getStateID() == StateID_ToUnuse) {
// TODO
} else {
src/d/lyt/meter/d_lyt_meter_ganbari_gauge.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ bool dLytMeterGanbariGauge_c::remove() {
return true;
}
bool dLytMeterGanbariGauge_c::LytMeter0x14() {
bool dLytMeterGanbariGauge_c::execute() {
// TODO
return true;
}
src/d/lyt/meter/d_lyt_meter_remocon_bg.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ bool dLytMeterRemoconBg_c::remove() {
return true;
}
bool dLytMeterRemoconBg_c::LytMeter0x14() {
bool dLytMeterRemoconBg_c::execute() {
// TODO
return true;
}
src/d/lyt/meter/d_lyt_meter_shield_gauge.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ bool dLytMeterShieldGauge_c::remove() {
return true;
}
bool dLytMeterShieldGauge_c::LytMeter0x14() {
bool dLytMeterShieldGauge_c::execute() {
// TODO
return true;
}