d_lyt_area_caption OK

This commit is contained in:
robojumper
2025-04-20 14:19:18 +02:00
parent 397eb596cd
commit 2eead00a49
10 changed files with 227 additions and 67 deletions
+1
View File
@@ -654,6 +654,7 @@ d/lyt/d_lyt_area_caption.cpp:
.data start:0x80522B00 end:0x80522E80
.sdata start:0x80572878 end:0x80572880
.sbss start:0x805754C0 end:0x805754C8
.sdata2 start:0x80579FD0 end:0x80579FE0
.bss start:0x805B0A70 end:0x805B0B30
d/lyt/d_lyt_wipe.cpp:
+34 -34
View File
@@ -2359,15 +2359,15 @@ fn_80059650 = .text:0x80059650; // type:function size:0x4
checkInputManagerPressedMask = .text:0x80059660; // type:function size:0x18
checkButtonAPressed__4dPadFv = .text:0x80059680; // type:function size:0x18
checkButtonBPressed__4dPadFv = .text:0x800596A0; // type:function size:0x18
checkButtonCPressed = .text:0x800596C0; // type:function size:0x18
checkButtonCPressed__4dPadFv = .text:0x800596C0; // type:function size:0x18
checkButtonZPressed__4dPadFv = .text:0x800596E0; // type:function size:0x18
checkButtonDpadUpPressed = .text:0x80059700; // type:function size:0x18
checkButtonDpadUpPressed__4dPadFv = .text:0x80059700; // type:function size:0x18
checkButtonDpadDownPressed__4dPadFv = .text:0x80059720; // type:function size:0x18
checkButtonDpadLeftPressed = .text:0x80059740; // type:function size:0x18
checkButtonDpadRightPressed = .text:0x80059760; // type:function size:0x18
checkButton1Pressed = .text:0x80059780; // type:function size:0x18
checkButton2Pressed = .text:0x800597A0; // type:function size:0x18
checkButtonMinusPressed = .text:0x800597C0; // type:function size:0x18
checkButtonDpadLeftPressed__4dPadFv = .text:0x80059740; // type:function size:0x18
checkButtonDpadRightPressed__4dPadFv = .text:0x80059760; // type:function size:0x18
checkButton1Pressed__4dPadFv = .text:0x80059780; // type:function size:0x18
checkButton2Pressed__4dPadFv = .text:0x800597A0; // type:function size:0x18
checkButtonMinusPressed__4dPadFv = .text:0x800597C0; // type:function size:0x18
checkButtonPlusPressed__4dPadFv = .text:0x800597E0; // type:function size:0x18
checkInputManagerHeldMask = .text:0x80059800; // type:function size:0x18
down__Q23EGG14CoreControllerCFUl = .text:0x80059820; // type:function size:0x18
@@ -3595,7 +3595,7 @@ fn_800A08F0__12EventManagerFQ27fBase_c12GROUP_TYPE_e = .text:0x800A08F0; // type
checkButton2HeldForCutscenes = .text:0x800A0950; // type:function size:0x60
canSkipCurrentEvent__12EventManagerFv = .text:0x800A09B0; // type:function size:0x1D0
fn_800A0B80 = .text:0x800A0B80; // type:function size:0x10
eventRelatedStateFlags_shift0x11_1 = .text:0x800A0B90; // type:function size:0x10
eventRelatedStateFlags_shift0x11_1__12EventManagerFv = .text:0x800A0B90; // type:function size:0x10
fn_800A0BA0 = .text:0x800A0BA0; // type:function size:0x94
__ct__5EventFPCcUlUlPvPv = .text:0x800A0C40; // type:function size:0xEC
__ct__5EventFPCcPvUlUlPvPv = .text:0x800A0D30; // type:function size:0xEC
@@ -8266,7 +8266,7 @@ finalizeState_Start__22dLytAreaCaptionParts_cFv = .text:0x8014B600; // type:func
initializeState_Out__22dLytAreaCaptionParts_cFv = .text:0x8014B610; // type:function size:0x4
executeState_Out__22dLytAreaCaptionParts_cFv = .text:0x8014B620; // type:function size:0x98
finalizeState_Out__22dLytAreaCaptionParts_cFv = .text:0x8014B6C0; // type:function size:0x4
fn_8014B6D0 = .text:0x8014B6D0; // type:function size:0x1CC
shouldImmediatelyDismiss__22dLytAreaCaptionParts_cCFv = .text:0x8014B6D0; // type:function size:0x1CC
create__17dLytAreaCaption_cFv = .text:0x8014B8A0; // type:function size:0x74
__ct__22dLytAreaCaptionParts_cFv = .text:0x8014B920; // type:function size:0x10C
__dt__35sFState_c<22dLytAreaCaptionParts_c>Fv = .text:0x8014BA30; // type:function size:0x58
@@ -10578,10 +10578,10 @@ isAreaTypeSky__11dStageMgr_cCFv = .text:0x80199970; // type:function size:0x2C
isAreaTypeOverworldOrSkyloft__11dStageMgr_cCFv = .text:0x801999A0; // type:function size:0x3C
isAreaTypeDungeonOrBoss__11dStageMgr_cCFv = .text:0x801999E0; // type:function size:0x3C
getMapNameId__11dStageMgr_cCFv = .text:0x80199A20; // type:function size:0x20
StageManager__getSTIFbyte4 = .text:0x80199A40; // type:function size:0x20
fn_80199A60 = .text:0x80199A60; // type:function size:0x3C
isSTIFbyte4_5or6 = .text:0x80199AA0; // type:function size:0x3C
fn_80199AE0 = .text:0x80199AE0; // type:function size:0x3C
getSTIFbyte4__11dStageMgr_cCFv = .text:0x80199A40; // type:function size:0x20
isSTIFbyte4_2or3or4__11dStageMgr_cCFv = .text:0x80199A60; // type:function size:0x3C
isSTIFbyte4_5or6__11dStageMgr_cCFv = .text:0x80199AA0; // type:function size:0x3C
isSTIFbyte4_7or8or9or10or11__11dStageMgr_cCFv = .text:0x80199AE0; // type:function size:0x3C
getSTIFunk1__11dStageMgr_cCFv = .text:0x80199B20; // type:function size:0x20
StageManager__getSTIFunk3 = .text:0x80199B40; // type:function size:0x1C
fn_80199B60 = .text:0x80199B60; // type:function size:0xC
@@ -32791,27 +32791,27 @@ __vt__26sFState_c<13dLytBattery_c> = .data:0x80522928; // type:object size:0x18
@8279 = .data:0x80522A90; // type:object size:0x1C scope:local data:string
@8280 = .data:0x80522AAC; // type:object size:0x1B scope:local data:string
__vt__28sFStateID_c<13dLytBattery_c> = .data:0x80522AC8; // type:object size:0x34 scope:weak
lbl_80522B00 = .data:0x80522B00; // type:object size:0x1C
lbl_80522B00 = .data:0x80522B00; // type:object size:0x1B data:string
lbl_80522B1C = .data:0x80522B1C; // type:object size:0xC data:string
lbl_80522B28 = .data:0x80522B28; // type:object size:0x1C
lbl_80522B44 = .data:0x80522B44; // type:object size:0xC
lbl_80522B50 = .data:0x80522B50; // type:object size:0x20
lbl_80522B70 = .data:0x80522B70; // type:object size:0x10
lbl_80522B80 = .data:0x80522B80; // type:object size:0x1C
lbl_80522B9C = .data:0x80522B9C; // type:object size:0x1C
lbl_80522BB8 = .data:0x80522BB8; // type:object size:0x20
lbl_80522BD8 = .data:0x80522BD8; // type:object size:0x1C
lbl_80522BF4 = .data:0x80522BF4; // type:object size:0xC
lbl_80522C00 = .data:0x80522C00; // type:object size:0x10
lbl_80522C10 = .data:0x80522C10; // type:object size:0x10
lbl_80522C20 = .data:0x80522C20; // type:object size:0x58
lbl_80522C78 = .data:0x80522C78; // type:object size:0xC
lbl_80522C84 = .data:0x80522C84; // type:object size:0xC
lbl_80522B28 = .data:0x80522B28; // type:object size:0x1A data:string
lbl_80522B44 = .data:0x80522B44; // type:object size:0xA data:string
lbl_80522B50 = .data:0x80522B50; // type:object size:0x1E data:string
lbl_80522B70 = .data:0x80522B70; // type:object size:0xE data:string
lbl_80522B80 = .data:0x80522B80; // type:object size:0x1B data:string
lbl_80522B9C = .data:0x80522B9C; // type:object size:0x1A data:string
lbl_80522BB8 = .data:0x80522BB8; // type:object size:0x1E data:string
lbl_80522BD8 = .data:0x80522BD8; // type:object size:0x19 data:string
lbl_80522BF4 = .data:0x80522BF4; // type:object size:0xB data:string
lbl_80522C00 = .data:0x80522C00; // type:object size:0xD data:string
lbl_80522C10 = .data:0x80522C10; // type:object size:0xE data:string
lbl_80522C20 = .data:0x80522C20; // type:object size:0xE data:string
lbl_80522C78 = .data:0x80522C78; // type:object size:0xB data:string
lbl_80522C84 = .data:0x80522C84; // type:object size:0x9 data:string
lbl_80522C90 = .data:0x80522C90; // type:object size:0x30
lbl_80522CC0 = .data:0x80522CC0; // type:object size:0x30
lbl_80522CF0 = .data:0x80522CF0; // type:object size:0x18
lbl_80522D08 = .data:0x80522D08; // type:object size:0x140
lbl_80522E48 = .data:0x80522E48; // type:object size:0x38
lbl_80522CF0 = .data:0x80522CF0; // type:object size:0x14
lbl_80522D08 = .data:0x80522D08; // type:object size:0x18
lbl_80522E48 = .data:0x80522E48; // type:object size:0x34
lbl_80522E80 = .data:0x80522E80; // type:object size:0x14 data:string
lbl_80522E94 = .data:0x80522E94; // type:object size:0xC
lbl_80522EA0 = .data:0x80522EA0; // type:object size:0x10
@@ -38292,8 +38292,8 @@ lbl_80572854 = .sdata:0x80572854; // type:object size:0x8
lbl_8057285C = .sdata:0x8057285C; // type:object size:0xC
lbl_80572868 = .sdata:0x80572868; // type:object size:0x4 data:4byte
@8144 = .sdata:0x80572870; // type:object size:0x1 scope:local data:string
lbl_80572878 = .sdata:0x80572878; // type:object size:0x4
lbl_8057287C = .sdata:0x8057287C; // type:object size:0x4
lbl_80572878 = .sdata:0x80572878; // type:object size:0x1
lbl_8057287C = .sdata:0x8057287C; // type:object size:0x1
lbl_80572880 = .sdata:0x80572880; // type:object size:0x8
lbl_80572888 = .sdata:0x80572888; // type:object size:0x8 data:string
lbl_80572890 = .sdata:0x80572890; // type:object size:0x8
@@ -48987,7 +48987,7 @@ StateID_On__13dLytBattery_c = .bss:0x805B09C0; // type:object size:0x30 data:4by
StateID_None__13dLytBattery_c = .bss:0x805B0A00; // type:object size:0x30 data:4byte
@7518 = .bss:0x805B0A30; // type:object size:0xC scope:local
StateID_Out__13dLytBattery_c = .bss:0x805B0A40; // type:object size:0x30 data:4byte
lbl_805B0A70 = .bss:0x805B0A70; // type:object size:0x10
lbl_805B0A70 = .bss:0x805B0A70; // type:object size:0xC
StateID_Wait__22dLytAreaCaptionParts_c = .bss:0x805B0A80; // type:object size:0x30 data:4byte
StateID_Start__22dLytAreaCaptionParts_c = .bss:0x805B0AC0; // type:object size:0x30 data:4byte
StateID_Out__22dLytAreaCaptionParts_c = .bss:0x805B0B00; // type:object size:0x30 data:4byte