This commit is contained in:
robojumper
2026-10-04 10:27:42 +02:00
parent be8b040059
commit 020ccc9a36
3 changed files with 41 additions and 34 deletions
+39 -33
View File
@@ -10123,16 +10123,16 @@ vt_0x80__16dAcFishMgrBase_cFv = .text:0x8018B9E0; // type:function size:0x8
initializeState_Wait__16dAcFishMgrBase_cFv = .text:0x8018B9F0; // type:function size:0x4
executeState_Wait__16dAcFishMgrBase_cFv = .text:0x8018BA00; // type:function size:0x4
finalizeState_Wait__16dAcFishMgrBase_cFv = .text:0x8018BA10; // type:function size:0x4
__dt__16dAcFishMgrBase_cFv = .text:0x8018BA20; // type:function size:0xD8
finalizeState__31sFStateID_c<16dAcFishMgrBase_c>CFR16dAcFishMgrBase_c = .text:0x8018BB00; // type:function size:0x30
executeState__31sFStateID_c<16dAcFishMgrBase_c>CFR16dAcFishMgrBase_c = .text:0x8018BB30; // type:function size:0x30
initializeState__31sFStateID_c<16dAcFishMgrBase_c>CFR16dAcFishMgrBase_c = .text:0x8018BB60; // type:function size:0x30
__dt__16dAcFishMgrBase_cFv = .text:0x8018BA20; // type:function size:0xD8 scope:weak
finalizeState__31sFStateID_c<16dAcFishMgrBase_c>CFR16dAcFishMgrBase_c = .text:0x8018BB00; // type:function size:0x30 scope:weak
executeState__31sFStateID_c<16dAcFishMgrBase_c>CFR16dAcFishMgrBase_c = .text:0x8018BB30; // type:function size:0x30 scope:weak
initializeState__31sFStateID_c<16dAcFishMgrBase_c>CFR16dAcFishMgrBase_c = .text:0x8018BB60; // type:function size:0x30 scope:weak
__sinit_\d_a_fish_mgr_base_cpp = .text:0x8018BB90; // type:function size:0x124 scope:local
__dt__31sFStateID_c<16dAcFishMgrBase_c>Fv = .text:0x8018BCC0; // type:function size:0x58
__dt__38sFStateVirtualID_c<16dAcFishMgrBase_c>Fv = .text:0x8018BD20; // type:function size:0x5C
number__38sFStateVirtualID_c<16dAcFishMgrBase_c>CFv = .text:0x8018BD80; // type:function size:0xDC
superID__38sFStateVirtualID_c<16dAcFishMgrBase_c>CFv = .text:0x8018BE60; // type:function size:0xE0
isSameName__31sFStateID_c<16dAcFishMgrBase_c>CFPCc = .text:0x8018BF40; // type:function size:0x88
__dt__31sFStateID_c<16dAcFishMgrBase_c>Fv = .text:0x8018BCC0; // type:function size:0x58 scope:weak
__dt__38sFStateVirtualID_c<16dAcFishMgrBase_c>Fv = .text:0x8018BD20; // type:function size:0x5C scope:weak
number__38sFStateVirtualID_c<16dAcFishMgrBase_c>CFv = .text:0x8018BD80; // type:function size:0xDC scope:weak
superID__38sFStateVirtualID_c<16dAcFishMgrBase_c>CFv = .text:0x8018BE60; // type:function size:0xE0 scope:weak
isSameName__31sFStateID_c<16dAcFishMgrBase_c>CFPCc = .text:0x8018BF40; // type:function size:0x88 scope:weak
baseID_Swim<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x8018BFD0; // type:function size:0xC
baseID_Escape<10sStateID_c>__Fv_RC12sStateIDIf_c = .text:0x8018BFE0; // type:function size:0xC
createHeap__13dAcFishBase_cFv = .text:0x8018BFF0; // type:function size:0xB4
@@ -14499,7 +14499,7 @@ doDelete__11dTgAllDie_cFv = .text:0x80273CA0; // type:function size:0x8
actorExecute__11dTgAllDie_cFv = .text:0x80273CB0; // type:function size:0x26C
draw__11dTgAllDie_cFv = .text:0x80273F20; // type:function size:0x8
getNearestToPlayer__11dTgAllDie_cFl = .text:0x80273F30; // type:function size:0xD0
__dt__11dTgAllDie_cFv = .text:0x80274000; // type:function size:0x5C
__dt__11dTgAllDie_cFv = .text:0x80274000; // type:function size:0x5C scope:weak
dTgViewClip_c_classInit__Fv = .text:0x80274060; // type:function size:0x4C
create__13dTgViewClip_cFv = .text:0x802740B0; // type:function size:0x74
doDelete__13dTgViewClip_cFv = .text:0x80274130; // type:function size:0x8
@@ -14512,7 +14512,7 @@ checkForceOn__13dTgViewClip_cFl = .text:0x802742E0; // type:function size:0x44
getViewClipBit__13dTgViewClip_cFlUc = .text:0x80274330; // type:function size:0x14
setViewClipBit__13dTgViewClip_cFlUc = .text:0x80274350; // type:function size:0x18
setViewClip__13dTgViewClip_cFlUc = .text:0x80274370; // type:function size:0x10
__dt__13dTgViewClip_cFv = .text:0x80274380; // type:function size:0x5C
__dt__13dTgViewClip_cFv = .text:0x80274380; // type:function size:0x5C scope:weak
dTgSw_c_classInit__Fv = .text:0x802743E0; // type:function size:0xBC
__dt__19sFState_c<7dTgSw_c>Fv = .text:0x802744A0; // type:function size:0x58 scope:weak
__dt__22sFStateFct_c<7dTgSw_c>Fv = .text:0x80274500; // type:function size:0x6C scope:weak
@@ -35589,8 +35589,14 @@ __vt__16dLytMapMarkers_c = .data:0x8052A820; // type:object size:0x20
__vt__15dLytMapIcon00_c = .data:0x8052A840; // type:object size:0x20
__vt__15dLytMapIcon01_c = .data:0x8052A860; // type:object size:0x20
lbl_8052A880 = .data:0x8052A880; // type:object size:0x10
lbl_8052A890 = .data:0x8052A890; // type:object size:0xC8
lbl_8052A958 = .data:0x8052A958; // type:object size:0x68
__vt__16dAcFishMgrBase_c = .data:0x8052A890; // type:object size:0x84
...data.0 = .data:0x8052A890; // type:label scope:local
@18044 = .data:0x8052A914; // type:object size:0xC scope:local
@18045 = .data:0x8052A920; // type:object size:0xC scope:local
@18046 = .data:0x8052A92C; // type:object size:0xC scope:local
@18048 = .data:0x8052A938; // type:object size:0x1F scope:local data:string
__vt__38sFStateVirtualID_c<16dAcFishMgrBase_c> = .data:0x8052A958; // type:object size:0x34 scope:weak
__vt__31sFStateID_c<16dAcFishMgrBase_c> = .data:0x8052A98C; // type:object size:0x34 scope:weak
__vt__13dAcFishBase_c = .data:0x8052A9C0; // type:object size:0x1AC
lbl_8052AB6C = .data:0x8052AB6C; // type:object size:0x6C
@LOCAL@addAttentionTarget__12dAcOInsect_cFv@tmpTarget = .data:0x8052ABD8; // type:object size:0x30 scope:local
@@ -42668,7 +42674,7 @@ lbl_805758F0 = .sbss:0x805758F0; // type:object size:0x2 data:2byte
lbl_805758F4 = .sbss:0x805758F4; // type:object size:0x1 data:byte
lbl_805758F8 = .sbss:0x805758F8; // type:object size:0x8 data:byte
lbl_80575900 = .sbss:0x80575900; // type:object size:0x8 data:byte
@GUARD@draw__11dAcOFairy_cFv@rot = .sbss:0x80575908; // type:object size:0x1 scope:local data:byte
@GUARD@draw__11dAcOFairy_cFv@sph = .sbss:0x80575908; // type:object size:0x1 scope:local data:byte
sTboxActorList__9dAcTbox_c = .sbss:0x80575910; // type:object size:0x8 data:4byte
sCurrentObtainingItemOarcName = .sbss:0x80575918; // type:object size:0x4 data:4byte
@GUARD@create__9dAcTbox_cFv@s1 = .sbss:0x8057591C; // type:object size:0x1 data:byte
@@ -47123,9 +47129,9 @@ lbl_8057AD08 = .sdata2:0x8057AD08; // type:object size:0x4 align:4 data:float
lbl_8057AD0C = .sdata2:0x8057AD0C; // type:object size:0x4 align:4 data:float
lbl_8057AD10 = .sdata2:0x8057AD10; // type:object size:0x4 align:4 data:float
lbl_8057AD14 = .sdata2:0x8057AD14; // type:object size:0x4 align:4 data:float
lbl_8057AD18 = .sdata2:0x8057AD18; // type:object size:0x4 align:4 data:float
lbl_8057AD1C = .sdata2:0x8057AD1C; // type:object size:0x4 align:4 data:float
lbl_8057AD20 = .sdata2:0x8057AD20; // type:object size:0x4 align:4 data:float
@17983 = .sdata2:0x8057AD18; // type:object size:0x4 scope:local align:4 data:float
@17984 = .sdata2:0x8057AD1C; // type:object size:0x4 scope:local align:4 data:float
@17985 = .sdata2:0x8057AD20; // type:object size:0x4 scope:local align:4 data:float
lbl_8057AD28 = .sdata2:0x8057AD28; // type:object size:0x4 align:4 data:float
lbl_8057AD2C = .sdata2:0x8057AD2C; // type:object size:0x4 align:4 data:float
lbl_8057AD30 = .sdata2:0x8057AD30; // type:object size:0x4 align:4 data:float
@@ -48531,14 +48537,14 @@ lbl_8057C494 = .sdata2:0x8057C494; // type:object size:0x4 align:4 data:float
@9634 = .sdata2:0x8057C4D8; // type:object size:0x4 scope:local align:4 data:float
SPECIAL_TYPES = .sdata2:0x8057C4E0; // type:object size:0x3 scope:local data:string
@10716 = .sdata2:0x8057C4E8; // type:object size:0x8 scope:local align:8 data:double
lbl_8057C4F0 = .sdata2:0x8057C4F0; // type:object size:0x4 align:4 data:float
lbl_8057C4F4 = .sdata2:0x8057C4F4; // type:object size:0x4 align:4 data:float
lbl_8057C4F8 = .sdata2:0x8057C4F8; // type:object size:0x4 align:4 data:float
lbl_8057C4FC = .sdata2:0x8057C4FC; // type:object size:0x4 align:4 data:float
lbl_8057C500 = .sdata2:0x8057C500; // type:object size:0x4 align:4 data:float
lbl_8057C508 = .sdata2:0x8057C508; // type:object size:0x4 align:4 data:float
lbl_8057C50C = .sdata2:0x8057C50C; // type:object size:0x4 align:4 data:float
lbl_8057C510 = .sdata2:0x8057C510; // type:object size:0x4 align:4 data:float
@26839 = .sdata2:0x8057C4F0; // type:object size:0x4 scope:local align:4 data:float
@26908 = .sdata2:0x8057C4F4; // type:object size:0x4 scope:local align:4 data:float
@26909 = .sdata2:0x8057C4F8; // type:object size:0x4 scope:local align:4 data:float
@26910 = .sdata2:0x8057C4FC; // type:object size:0x4 scope:local align:4 data:float
@26936 = .sdata2:0x8057C500; // type:object size:0x4 scope:local align:4 data:float
@25902 = .sdata2:0x8057C508; // type:object size:0x4 scope:local align:4 data:float
@25931 = .sdata2:0x8057C50C; // type:object size:0x4 scope:local align:4 data:float
@25932 = .sdata2:0x8057C510; // type:object size:0x4 scope:local align:4 data:float
D201_BossKeyPuzzleFlags = .sdata2:0x8057C518; // type:object size:0x4 scope:local data:byte
lbl_8057C520 = .sdata2:0x8057C520; // type:object size:0x4 align:4 data:float
lbl_8057C524 = .sdata2:0x8057C524; // type:object size:0x4 align:4 data:float
@@ -49037,11 +49043,11 @@ lbl_8057CDE8 = .sdata2:0x8057CDE8; // type:object size:0x4 align:4 data:float
lbl_8057CDEC = .sdata2:0x8057CDEC; // type:object size:0x4 align:4 data:float
lbl_8057CDF0 = .sdata2:0x8057CDF0; // type:object size:0x4 align:4 data:float
@4639 = .sdata2:0x8057CDF8; // type:object size:0x4 scope:local align:4 data:float
lbl_8057CE00 = .sdata2:0x8057CE00; // type:object size:0x4 align:4 data:float
lbl_8057CE04 = .sdata2:0x8057CE04; // type:object size:0x4 align:4 data:float
lbl_8057CE08 = .sdata2:0x8057CE08; // type:object size:0x4 align:4 data:float
lbl_8057CE0C = .sdata2:0x8057CE0C; // type:object size:0x4 align:4 data:float
lbl_8057CE10 = .sdata2:0x8057CE10; // type:object size:0x4 align:4 data:float
@2377 = .sdata2:0x8057CE00; // type:object size:0x4 scope:local align:4 data:float
@2378 = .sdata2:0x8057CE04; // type:object size:0x4 scope:local align:4 data:float
@2379 = .sdata2:0x8057CE08; // type:object size:0x4 scope:local align:4 data:float
@2380 = .sdata2:0x8057CE0C; // type:object size:0x4 scope:local align:4 data:float
@2381 = .sdata2:0x8057CE10; // type:object size:0x4 scope:local align:4 data:float
lbl_8057CE18 = .sdata2:0x8057CE18; // type:object size:0x4 align:4 data:float
lbl_8057CE1C = .sdata2:0x8057CE1C; // type:object size:0x4 align:4 data:float
lbl_8057CE20 = .sdata2:0x8057CE20; // type:object size:0x4 align:4 data:float
@@ -52310,8 +52316,8 @@ lbl_805B2010 = .bss:0x805B2010; // type:object size:0x14
REVISION_r = .bss:0x805B2024; // type:object size:0xC data:4byte
REV_INFO_END = .bss:0x805B2030; // type:object size:0x28
lbl_805B2058 = .bss:0x805B2058; // type:object size:0x10 align:4 data:4byte
lbl_805B2068 = .bss:0x805B2068; // type:object size:0xC
AcFishMgrBase__STATE_WAIT = .bss:0x805B2074; // type:object size:0x34 data:4byte
@17470 = .bss:0x805B2068; // type:object size:0xC scope:local
StateID_Wait__16dAcFishMgrBase_c = .bss:0x805B2074; // type:object size:0x34 data:4byte
lbl_805B20A8 = .bss:0x805B20A8; // type:object size:0xC
StateID_Swim__13dAcFishBase_c = .bss:0x805B20B4; // type:object size:0x40 data:4byte
StateID_Escape__13dAcFishBase_c = .bss:0x805B20F4; // type:object size:0x34 data:4byte
@@ -52485,7 +52491,7 @@ StateID_Cure__11dAcOFairy_c = .bss:0x805B4EE8; // type:object size:0x30 data:4by
StateID_CureEnd__11dAcOFairy_c = .bss:0x805B4F28; // type:object size:0x30 data:4byte
@25810 = .bss:0x805B4F58; // type:object size:0xC scope:local
StateID_CatchDemo__11dAcOFairy_c = .bss:0x805B4F68; // type:object size:0x30 data:4byte
@LOCAL@draw__11dAcOFairy_cFv@rot = .bss:0x805B4F98; // type:object size:0x10 scope:local align:4 data:4byte
@LOCAL@draw__11dAcOFairy_cFv@sph = .bss:0x805B4F98; // type:object size:0x10 scope:local align:4 data:4byte
lbl_805B4FA8 = .bss:0x805B4FA8; // type:object size:0x30 align:4 data:float
lbl_805B4FD8 = .bss:0x805B4FD8; // type:object size:0xC align:4 data:float
lbl_805B4FE4 = .bss:0x805B4FE4; // type:object size:0xC align:4 data:float
+1 -1
View File
@@ -612,7 +612,7 @@ config.libs = [
Object(NonMatching, "d/d_pouch.cpp"),
Object(NonMatching, "toBeSorted/d_beacon.cpp"),
Object(NonMatching, "toBeSorted/d_underground.cpp"),
Object(NonMatching, "d/a/d_a_fish_mgr_base.cpp"),
Object(Matching, "d/a/d_a_fish_mgr_base.cpp"),
Object(NonMatching, "d/a/d_a_fish_base.cpp"),
Object(NonMatching, "toBeSorted/sword_proj_effect_list.cpp"),
Object(NonMatching, "d/a/d_a_insect.cpp"),
+1
View File
@@ -10,6 +10,7 @@ int dAcFishMgrBase_c::actorCreate() {
int dAcFishMgrBase_c::actorPostCreate() {
f32 f = 1000.0f; // Temp needed for reg alloc?
(void)200.0f;
field_0x148 = f;
mVec3_c v = mPosition;
v.y += 20000.0f;