Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2025-02-25 08:42:47 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

En_Fishing (3 non-matching) (#378)

Browse Source 
* En_Fishing

* PR

* PR

* Object

* Undef

* PR

* format
This commit is contained in:
Maide 2022-01-03 23:48:37 +00:00 committed by GitHub
parent 3d883491e1
commit 618b25f41d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 5787 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
assets/xml/objects/object_fish.xml
View File

@ -1,6 +1,6 @@
<Root>
<File Name="object_fish" Segment="6">
<Animation Name="object_fish_Anim_00007C" Offset="0x7C" />
<Animation Name="gFishingFishAnim" Offset="0x7C" />
<DList Name="object_fish_DL_000940" Offset="0x940" />
<DList Name="object_fish_DL_0009E8" Offset="0x9E8" />
<DList Name="object_fish_DL_000B00" Offset="0xB00" />
@ -35,29 +35,29 @@
<Limb Name="object_fish_Standardlimb_002960" Type="Standard" Offset="0x2960" />
<Limb Name="object_fish_Standardlimb_00296C" Type="Standard" Offset="0x296C" />
<Limb Name="object_fish_Standardlimb_002978" Type="Standard" Offset="0x2978" />
<Skeleton Name="object_fish_Skel_0029C0" Type="Flex" LimbType="Standard" Offset="0x29C0" />
<Skeleton Name="gFishingFishSkel" Type="Flex" LimbType="Standard" Offset="0x29C0" />
<Texture Name="object_fish_Tex_0029D0" OutName="tex_0029D0" Format="rgba16" Width="8" Height="16" Offset="0x29D0" />
<Texture Name="object_fish_Tex_002AD0" OutName="tex_002AD0" Format="rgba16" Width="8" Height="8" Offset="0x2AD0" />
<DList Name="object_fish_DL_002BD0" Offset="0x2BD0" />
<Texture Name="object_fish_Tex_002CE0" OutName="tex_002CE0" Format="i4" Width="32" Height="64" Offset="0x2CE0" />
<Texture Name="object_fish_Tex_0030E0" OutName="tex_0030E0" Format="i4" Width="16" Height="16" Offset="0x30E0" />
<DList Name="object_fish_DL_003230" Offset="0x3230" />
<DList Name="gFishingStreamSplashDL" Offset="0x3230" />
<Texture Name="object_fish_Tex_003320" OutName="tex_003320" Format="ia8" Width="16" Height="16" Offset="0x3320" />
<DList Name="object_fish_DL_003460" Offset="0x3460" />
<DList Name="object_fish_DL_0034C0" Offset="0x34C0" />
<DList Name="gFishingBubbleSetupDL" Offset="0x3460" />
<DList Name="gFishingBubbleVtxDL" Offset="0x34C0" />
<Texture Name="object_fish_Tex_0034E0" OutName="tex_0034E0" Format="i8" Width="16" Height="16" Offset="0x34E0" />
<DList Name="object_fish_DL_003610" Offset="0x3610" />
<DList Name="object_fish_DL_003680" Offset="0x3680" />
<DList Name="gFishingDustSplashSetupDL" Offset="0x3610" />
<DList Name="gFishingDustSplashVtxDL" Offset="0x3680" />
<DList Name="object_fish_DL_0036E0" Offset="0x36E0" />
<DList Name="object_fish_DL_003710" Offset="0x3710" />
<DList Name="object_fish_DL_003760" Offset="0x3760" />
<DList Name="gFishingLineVtxDL" Offset="0x3710" />
<DList Name="gFishingRainDropVtxDL" Offset="0x3760" />
<Texture Name="object_fish_Tex_003778" OutName="tex_003778" Format="rgba16" Width="16" Height="16" Offset="0x3778" />
<DList Name="object_fish_DL_0039A8" Offset="0x39A8" />
<DList Name="object_fish_DL_003A18" Offset="0x3A18" />
<Animation Name="object_fish_Anim_00453C" Offset="0x453C" />
<DList Name="gFishingRainSplashSetupDL" Offset="0x39A8" />
<DList Name="gFishingRainSplashVtxDL" Offset="0x3A18" />
<Animation Name="gFishingOwnerAnim" Offset="0x453C" />
<DList Name="object_fish_DL_006F60" Offset="0x6F60" />
<DList Name="object_fish_DL_007350" Offset="0x7350" />
<DList Name="object_fish_DL_0074C8" Offset="0x74C8" />
<DList Name="gFishingOwnerHairDL" Offset="0x7350" />
<DList Name="gFishingOwnerHatDL" Offset="0x74C8" />
<DList Name="object_fish_DL_0076B8" Offset="0x76B8" />
<DList Name="object_fish_DL_007CF8" Offset="0x7CF8" />
<DList Name="object_fish_DL_007E48" Offset="0x7E48" />
@ -73,12 +73,12 @@
<Limb Name="object_fish_Standardlimb_0085B4" Type="Standard" Offset="0x85B4" />
<Limb Name="object_fish_Standardlimb_0085C0" Type="Standard" Offset="0x85C0" />
<Limb Name="object_fish_Standardlimb_0085CC" Type="Standard" Offset="0x85CC" />
<Skeleton Name="object_fish_Skel_0085F8" Type="Flex" LimbType="Standard" Offset="0x85F8" />
<DList Name="object_fish_DL_008610" Offset="0x8610" />
<DList Name="object_fish_DL_008678" Offset="0x8678" />
<Skeleton Name="gFishingOwnerSkel" Type="Flex" LimbType="Standard" Offset="0x85F8" />
<DList Name="gFishingRippleSetupDL" Offset="0x8610" />
<DList Name="gFishingRippleVtxDL" Offset="0x8678" />
<Texture Name="object_fish_Tex_008690" OutName="tex_008690" Format="i4" Width="32" Height="32" Offset="0x8690" />
<DList Name="object_fish_DL_0088C0" Offset="0x88C0" />
<DList Name="object_fish_DL_008970" Offset="0x8970" />
<DList Name="gFishingWaterDustSetupDL" Offset="0x88C0" />
<DList Name="gFishingWaterDustVtxDL" Offset="0x8970" />
<Texture Name="object_fish_TLUT_008990" OutName="tlut_008990" Format="rgba16" Width="16" Height="16" Offset="0x8990" />
<Texture Name="object_fish_Tex_008B90" OutName="tex_008B90" Format="ci8" Width="8" Height="8" Offset="0x8B90" />
<Texture Name="object_fish_Tex_008BD0" OutName="tex_008BD0" Format="ci8" Width="16" Height="16" Offset="0x8BD0" />
@ -86,21 +86,23 @@
<Texture Name="object_fish_Tex_008DD0" OutName="tex_008DD0" Format="ci8" Width="8" Height="8" Offset="0x8DD0" />
<Texture Name="object_fish_Tex_008E10" OutName="tex_008E10" Format="ci8" Width="32" Height="32" Offset="0x8E10" />
<Texture Name="object_fish_Tex_009210" OutName="tex_009210" Format="ci8" Width="8" Height="8" Offset="0x9210" />
<!-- <Blob Name="object_fish_Blob_009250" Size="0xC00" Offset="0x9250" /> -->
<Texture Name="gFishingOwnerEyeOpenTex" OutName="tex_009250" Format="ci8" Width="32" Height="32" Offset="0x9250" />
<Texture Name="gFishingOwnerEyeHalfTex" OutName="tex_009650" Format="ci8" Width="32" Height="32" Offset="0x9650" />
<Texture Name="gFishingOwnerEyeClosedTex" OutName="tex_009A50" Format="ci8" Width="32" Height="32" Offset="0x9A50" />
<Texture Name="object_fish_Tex_009E50" OutName="tex_009E50" Format="ci8" Width="64" Height="32" Offset="0x9E50" />
<Texture Name="object_fish_Tex_00A650" OutName="tex_00A650" Format="ci8" Width="8" Height="8" Offset="0xA650" />
<Texture Name="object_fish_Tex_00A690" OutName="tex_00A690" Format="ci8" Width="16" Height="16" Offset="0xA690" />
<Texture Name="object_fish_Tex_00A790" OutName="tex_00A790" Format="ci8" Width="8" Height="16" Offset="0xA790" />
<Texture Name="object_fish_Tex_00A810" OutName="tex_00A810" Format="ci8" Width="16" Height="16" Offset="0xA810" />
<Texture Name="object_fish_Tex_00A910" OutName="tex_00A910" Format="ia8" Width="64" Height="64" Offset="0xA910" />
<DList Name="object_fish_DL_00B950" Offset="0xB950" />
<DList Name="object_fish_DL_00B9C0" Offset="0xB9C0" />
<DList Name="gFishingSinkingLureSegmentSetupDL" Offset="0xB950" />
<DList Name="gFishingSinkingLureSegmentVtxDL" Offset="0xB9C0" />
<Texture Name="object_fish_Tex_00B9E0" OutName="tex_00B9E0" Format="rgba16" Width="64" Height="16" Offset="0xB9E0" />
<DList Name="object_fish_DL_00C220" Offset="0xC220" />
<DList Name="object_fish_DL_00C298" Offset="0xC298" />
<DList Name="gFishingGroupFishSetupDL" Offset="0xC220" />
<DList Name="gFishingGroupFishVtxDL" Offset="0xC298" />
<DList Name="object_fish_DL_00C650" Offset="0xC650" />
<Texture Name="object_fish_Tex_00C780" OutName="tex_00C780" Format="rgba16" Width="32" Height="32" Offset="0xC780" />
<Animation Name="object_fish_Anim_00CFE0" Offset="0xCFE0" />
<Animation Name="gFishingLoachAnim" Offset="0xCFE0" />
<DList Name="object_fish_DL_00DED0" Offset="0xDED0" />
<DList Name="object_fish_DL_00DFA8" Offset="0xDFA8" />
<DList Name="object_fish_DL_00E048" Offset="0xE048" />
@ -129,29 +131,32 @@
<Limb Name="object_fish_Standardlimb_011008" Type="Standard" Offset="0x11008" />
<Limb Name="object_fish_Standardlimb_011014" Type="Standard" Offset="0x11014" />
<Limb Name="object_fish_Standardlimb_011020" Type="Standard" Offset="0x11020" />
<Skeleton Name="object_fish_Skel_011058" Type="Flex" LimbType="Standard" Offset="0x11058" />
<!-- <Blob Name="object_fish_Blob_011064" Size="0x30C" Offset="0x11064" /> -->
<DList Name="object_fish_DL_0113D0" Offset="0x113D0" />
<DList Name="object_fish_DL_011410" Offset="0x11410" />
<Skeleton Name="gFishingLoachSkel" Type="Flex" LimbType="Standard" Offset="0x11058" />
<Blob Name="object_fish_Blob_011064" Size="0xC" Offset="0x11064" />
<Texture Name="gFishingRodSegmentStripTex" OutName="tex_011070" Format="rgba16" Width="16" Height="8" Offset="0x11070" />
<Texture Name="gFishingRodSegmentBlackTex" OutName="tex_011170" Format="rgba16" Width="16" Height="8" Offset="0x11170" />
<Texture Name="gFishingRodSegmentWhiteTex" OutName="tex_011270" Format="rgba16" Width="16" Height="8" Offset="0x11270" />
<DList Name="gFishingRodSetupDL" Offset="0x113D0" />
<DList Name="gFishingRodSegmentDL" Offset="0x11410" />
<Texture Name="object_fish_Tex_011440" OutName="tex_011440" Format="rgba16" Width="32" Height="32" Offset="0x11440" />
<Texture Name="object_fish_Tex_011C40" OutName="tex_011C40" Format="rgba16" Width="32" Height="16" Offset="0x11C40" />
<DList Name="object_fish_DL_012160" Offset="0x12160" />
<DList Name="object_fish_DL_0121F0" Offset="0x121F0" />
<DList Name="gFishingLureHookDL" Offset="0x12160" />
<DList Name="gFishingLureFloatDL" Offset="0x121F0" />
<Texture Name="object_fish_Tex_0122E0" OutName="tex_0122E0" Format="rgba16" Width="32" Height="32" Offset="0x122E0" />
<Texture Name="object_fish_Tex_012AE0" OutName="tex_012AE0" Format="rgba16" Width="32" Height="32" Offset="0x12AE0" />
<DList Name="object_fish_DL_013330" Offset="0x13330" />
<DList Name="object_fish_DL_0133B0" Offset="0x133B0" />
<DList Name="object_fish_DL_013590" Offset="0x13590" />
<DList Name="object_fish_DL_013610" Offset="0x13610" />
<DList Name="gFishingLilyPadSetupDL" Offset="0x13330" />
<DList Name="gFishingLilyPadVtxDL" Offset="0x133B0" />
<DList Name="gFishingRockSetupDL" Offset="0x13590" />
<DList Name="gFishingRockVtxDL" Offset="0x13610" />
<Texture Name="object_fish_Tex_013660" OutName="tex_013660" Format="rgba16" Width="32" Height="32" Offset="0x13660" />
<DList Name="object_fish_DL_013F50" Offset="0x13F50" />
<DList Name="object_fish_DL_013FD0" Offset="0x13FD0" />
<DList Name="object_fish_DL_014030" Offset="0x14030" />
<DList Name="object_fish_DL_0140B0" Offset="0x140B0" />
<DList Name="gFishingWoodPostSetupDL" Offset="0x13F50" />
<DList Name="gFishingWoodPostVtxDL" Offset="0x13FD0" />
<DList Name="gFishingReedSetupDL" Offset="0x14030" />
<DList Name="gFishingReedVtxDL" Offset="0x140B0" />
<Texture Name="object_fish_Tex_0140D0" OutName="tex_0140D0" Format="rgba16" Width="16" Height="16" Offset="0x140D0" />
<Texture Name="object_fish_Tex_0142D0" OutName="tex_0142D0" Format="rgba16" Width="32" Height="32" Offset="0x142D0" />
<Texture Name="object_fish_Tex_014AD0" OutName="tex_014AD0" Format="i8" Width="32" Height="32" Offset="0x14AD0" />
<DList Name="object_fish_DL_0153D0" Offset="0x153D0" />
<DList Name="object_fish_DL_015470" Offset="0x15470" />
<DList Name="gFishingAquariumBottomDL" Offset="0x153D0" />
<DList Name="gFishingAquariumContainerDL" Offset="0x15470" />
</File>
</Root>

8
include/functions.h
View File

@ -1658,7 +1658,7 @@ u32 func_800F5954(u8* param_1, u32 param_2, u32 param_3, u8 param_4, u8 param_5)
f32 func_800F5A8C(u16 arg0, u16 arg1, u16 arg2, GlobalContext* globalContext);
// void func_800F5B10(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5);
// void func_800F5CD0(void);
// void func_800F6834(void);
void func_800F6834(GlobalContext* globalCtx, s32 waterLightsIndex);
// void func_800F694C(void);
// void func_800F6A04(void);
// void func_800F6A40(void);
@ -2672,11 +2672,11 @@ s32 func_8013E7C0(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2);
void func_8013E8F8(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, s32 arg4, s16 arg5, s16 arg6);
s32 func_8013E950(Vec3f* arg0, Vec3f* arg1, s16 arg2, Vec3f* arg3, Vec3f* arg4, s16* arg5, s16* arg6, s16* arg7, s16* arg8, u16 arg9, u16 arg10, u16 arg11, u16 arg12);
// void func_8013EC10(void);
void func_8013EC44(f32 arg0, u8 arg1, u8 arg2, u8 arg3);
void func_8013EC44(f32 a, u8 b, u8 c, u8 d);
void func_8013ECE0(f32 xyzDistToPlayerSq, u8 arg1, u8 arg2, u8 arg3);
void func_8013ED9C(void);
void func_8013EDD0(void);
// void func_8013EE04(void);
u32 func_8013EE04(void);
void func_8013EE24(void);
// void func_8013EE38(void);
// void func_8013EE48(void);
@ -3802,7 +3802,7 @@ void func_8019F570(Vec3f* pos, s8 arg1);
void func_8019F88C(Vec3f* arg0, u16 sfxId, UNK_TYPE arg2);
// void func_8019F900(void);
// void func_8019FA18(void);
void func_8019FAD8(Vec3f* param_1, u16 param_2, f32 param_3);
void func_8019FAD8(Vec3f* param_1, u16 sfxId, f32 param_3);
// void func_8019FB0C(void);
// void func_8019FC20(void);
// void func_8019FCB8(void);

1
include/z64item.h
View File

@ -298,6 +298,7 @@ typedef enum {
/* 0x3C */ GI_KEY_SMALL = 0x3C,
/* 0x3E */ GI_MAP = 0x3E,
/* 0x3F */ GI_COMPASS,
/* 0x52 */ GI_SCALE_GOLD = 0x52, // Assumed, used in En_Fishing
/* 0x59 */ GI_BOTTLE_POTION_RED = 0x59,
/* 0x5B */ GI_POTION_RED = 0x5B,
/* 0x5C */ GI_POTION_GREEN,

6
spec
View File

@ -1328,9 +1328,11 @@ beginseg
name "ovl_En_Fishing"
compress
include "build/src/overlays/actors/ovl_En_Fishing/z_en_fishing.o"
include "build/data/ovl_En_Fishing/ovl_En_Fishing.data.o"
include "build/data/ovl_En_Fishing/ovl_En_Fishing.bss.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_Fishing/ovl_En_Fishing_reloc.o"
#else
include "build/data/ovl_En_Fishing/ovl_En_Fishing.reloc.o"
#endif
endseg
beginseg

5679
src/overlays/actors/ovl_En_Fishing/z_en_fishing.c
View File

File diff suppressed because it is too large Load Diff

51
src/overlays/actors/ovl_En_Fishing/z_en_fishing.h
View File

@ -9,7 +9,56 @@ typedef void (*EnFishingActionFunc)(struct EnFishing*, GlobalContext*);
typedef struct EnFishing {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x404];
/* 0x0144 */ UNK_TYPE1 unk_144[0x004];
/* 0x0148 */ u8 unk_148;
/* 0x0149 */ u8 unk_149;
/* 0x014A */ u8 unk_14A;
/* 0x014C */ s16 unk_14C;
/* 0x014E */ u8 unk_14E;
/* 0x014F */ u8 unk_14F;
/* 0x0150 */ s16 unk_150;
/* 0x0152 */ s16 unk_152;
/* 0x0154 */ s16 unk_154;
/* 0x0156 */ s16 unk_156;
/* 0x0158 */ s16 unk_158;
/* 0x015A */ s16 unk_15A;
/* 0x015C */ s16 unk_15C;
/* 0x015E */ s16 unk_15E;
/* 0x0160 */ s16 unk_160;
/* 0x0162 */ s16 unk_162;
/* 0x0164 */ s16 unk_164;
/* 0x0166 */ s16 unk_166;
/* 0x0168 */ s16 unk_168;
/* 0x016A */ s16 unk_16A;
/* 0x016C */ s16 unk_16C;
/* 0x016E */ s16 unk_16E;
/* 0x0170 */ s16 unk_170;
/* 0x0172 */ s16 unk_172[4];
/* 0x017C */ f32 unk_17C;
/* 0x0180 */ f32 unk_180;
/* 0x0184 */ f32 unk_184;
/* 0x0188 */ f32 unk_188;
/* 0x018C */ f32 unk_18C;
/* 0x0190 */ f32 unk_190;
/* 0x0194 */ f32 unk_194;
/* 0x0198 */ s16 unk_198;
/* 0x019A */ s16 unk_19A;
/* 0x019C */ s16 unk_19C;
/* 0x01A0 */ f32 unk_1A0;
/* 0x01A4 */ f32 unk_1A4;
/* 0x01A8 */ f32 unk_1A8;
/* 0x01AC */ Vec3f unk_1AC;
/* 0x01B8 */ Vec3f fishMouthPos;
/* 0x01C4 */ s16 unk_1C4[3];
/* 0x01CA */ u8 unk_1CA;
/* 0x01CB */ u8 unk_1CB;
/* 0x01CC */ u8 unk_1CC;
/* 0x01CD */ u8 unk_1CD;
/* 0x01D0 */ SkelAnime skelAnime;
/* 0x0214 */ LightNode* lightNode;
/* 0x0218 */ LightInfo lightInfo;
/* 0x0228 */ ColliderJntSph collider;
/* 0x0248 */ ColliderJntSphElement colliderElements[12];
} EnFishing; // size = 0x548
extern const ActorInit En_Fishing_InitVars;

2
src/overlays/actors/ovl_En_Kanban/z_en_kanban.h
View File

@ -10,6 +10,8 @@ typedef struct EnKanban {
/* 0x144 */ char unk_144[0xAC];
} EnKanban; // size = 0x1F0
#define ENKANBAN_FISHING 0x300
extern const ActorInit En_Kanban_InitVars;
#endif // Z_EN_KANBAN_H

78
tools/disasm/functions.txt
View File

@ -6818,52 +6818,52 @@
0x808FC550:("EnFr_Init",),
0x808FC5AC:("EnFr_Destroy",),
0x808FC5BC:("EnFr_Update",),
0x808FC6C0:("func_808FC6C0",),
0x808FC770:("func_808FC770",),
0x808FC790:("func_808FC790",),
0x808FC8B8:("func_808FC8B8",),
0x808FC964:("func_808FC964",),
0x808FCABC:("func_808FCABC",),
0x808FCC0C:("func_808FCC0C",),
0x808FCDBC:("func_808FCDBC",),
0x808FCF60:("func_808FCF60",),
0x808FD054:("func_808FD054",),
0x808FC6C0:("EnFishing_SetColliderElement",),
0x808FC770:("EnFishing_SeedRand",),
0x808FC790:("EnFishing_RandZeroOne",),
0x808FC8B8:("EnFishing_SmoothStepToS",),
0x808FC964:("EnFishing_SpawnRipple",),
0x808FCABC:("EnFishing_SpawnDustSplash",),
0x808FCC0C:("EnFishing_SpawnWaterDust",),
0x808FCDBC:("EnFishing_SpawnBubble",),
0x808FCF60:("EnFishing_SpawnRainDrop",),
0x808FD054:("EnFishing_InitPondProps",),
0x808FD368:("EnFishing_Init",),
0x808FDC64:("EnFishing_Destroy",),
0x808FDCDC:("func_808FDCDC",),
0x808FE3F8:("func_808FE3F8",),
0x808FEE1C:("func_808FEE1C",),
0x808FDCDC:("EnFishing_UpdateEffects",),
0x808FE3F8:("EnFishing_DrawEffects",),
0x808FEE1C:("EnFishing_DrawStreamSplash",),
0x808FEF70:("func_808FEF70",),
0x808FF064:("func_808FF064",),
0x808FF5E0:("func_808FF5E0",),
0x808FF750:("func_808FF750",),
0x808FFC44:("func_808FFC44",),
0x808FFF3C:("func_808FFF3C",),
0x80900228:("func_80900228",),
0x80900A04:("func_80900A04",),
0x80901480:("func_80901480",),
0x808FF064:("EnFishing_UpdateLine",),
0x808FF5E0:("EnFishing_UpdateLinePos",),
0x808FF750:("EnFishing_DrawLureHook",),
0x808FFC44:("EnFishing_UpdateSinkingLure",),
0x808FFF3C:("EnFishing_DrawSinkingLure",),
0x80900228:("EnFishing_DrawLureAndLine",),
0x80900A04:("EnFishing_DrawRod",),
0x80901480:("EnFishing_UpdateLure",),
0x809033F0:("func_809033F0",),
0x809036BC:("func_809036BC",),
0x809038A4:("func_809038A4",),
0x80903C60:("func_80903C60",),
0x80903E20:("func_80903E20",),
0x80903FE0:("EnFishing_Update",),
0x80908554:("func_80908554",),
0x80908674:("func_80908674",),
0x809086B4:("func_809086B4",),
0x80908734:("func_80908734",),
0x80908774:("EnFishing_Draw",),
0x809089B8:("func_809089B8",),
0x80908A64:("func_80908A64",),
0x80908B4C:("func_80908B4C",),
0x80908E08:("func_80908E08",),
0x80909234:("func_80909234",),
0x80909AD0:("func_80909AD0",),
0x80909CC0:("func_80909CC0",),
0x8090AB6C:("func_8090AB6C",),
0x8090C884:("func_8090C884",),
0x8090C8BC:("func_8090C8BC",),
0x8090C96C:("func_8090C96C",),
0x80903E20:("EnFishing_HandleAquariumDialog",),
0x80903FE0:("EnFishing_UpdateFish",),
0x80908554:("EnFishing_FishOverrideLimbDraw",),
0x80908674:("EnFishing_FishPostLimbDraw",),
0x809086B4:("EnFishing_LoachOverrideLimbDraw",),
0x80908734:("EnFishing_LoachPostLimbDraw",),
0x80908774:("EnFishing_DrawFish",),
0x809089B8:("EnFishing_HandleReedContact",),
0x80908A64:("EnFishing_HandleLilyPadContact",),
0x80908B4C:("EnFishing_UpdatePondProps",),
0x80908E08:("EnFishing_DrawPondProps",),
0x80909234:("EnFishing_UpdateGroupFishes",),
0x80909AD0:("EnFishing_DrawGroupFishes",),
0x80909CC0:("EnFishing_HandleOwnerDialog",),
0x8090AB6C:("EnFishing_UpdateOwner",),
0x8090C884:("EnFishing_OwnerOverrideLimbDraw",),
0x8090C8BC:("EnFishing_OwnerPostLimbDraw",),
0x8090C96C:("EnFishing_DrawOwner",),
0x80917290:("func_80917290",),
0x809172E4:("func_809172E4",),
0x8091734C:("func_8091734C",),

113
tools/disasm/variables.txt
View File

@ -7547,12 +7547,11 @@
0x808FC670:("En_Fr_InitVars","UNK_TYPE1","",0x1),
0x8090CCB0:("En_Fishing_InitVars","UNK_TYPE1","",0x1),
0x8090CCD0:("D_8090CCD0","f32","",0x4),
0x8090CCD4:("D_8090CCD4","UNK_TYPE1","",0x1),
0x8090CCD4:("D_8090CCD4","u8","",0x1),
0x8090CCD8:("D_8090CCD8","f32","",0x4),
0x8090CCDC:("D_8090CCDC","UNK_TYPE1","",0x1),
0x8090CCE4:("D_8090CCE4","UNK_TYPE4","",0x4),
0x8090CCE8:("D_8090CCE8","UNK_TYPE4","",0x4),
0x8090CCEC:("D_8090CCEC","UNK_TYPE1","",0x1),
0x8090CCDC:("D_8090CCDC","Vec3f","",0xC),
0x8090CCE8:("D_8090CCE8","f32","",0x4),
0x8090CCEC:("sSinkingLureLocation","u8","",0x1),
0x8090CCF0:("D_8090CCF0","f32","",0x4),
0x8090CCF4:("D_8090CCF4","UNK_TYPE1","",0x1),
0x8090CCF8:("D_8090CCF8","UNK_TYPE2","",0x2),
@ -7563,18 +7562,17 @@
0x8090CD0C:("D_8090CD0C","UNK_TYPE1","",0x1),
0x8090CD10:("D_8090CD10","UNK_TYPE1","",0x1),
0x8090CD14:("D_8090CD14","UNK_TYPE2","",0x2),
0x8090CD18:("D_8090CD18","UNK_TYPE1","",0x1),
0x8090CD1C:("D_8090CD1C","f32","",0x4),
0x8090CD18:("sFishMouthOffset","Vec3f","",0xC),
0x8090CD24:("D_8090CD24","UNK_TYPE1","",0x1),
0x8090CD28:("D_8090CD28","f32","",0x4),
0x8090CD2C:("D_8090CD2C","f32","",0x4),
0x8090CD30:("D_8090CD30","f32","",0x4),
0x8090CD34:("D_8090CD34","f32","",0x4),
0x8090CD38:("D_8090CD38","UNK_TYPE4","",0x4),
0x8090CD38:("D_8090CD38","f32","",0x4),
0x8090CD3C:("D_8090CD3C","f32","",0x4),
0x8090CD40:("D_8090CD40","f32","",0x4),
0x8090CD44:("D_8090CD44","UNK_TYPE2","",0x2),
0x8090CD48:("D_8090CD48","UNK_TYPE2","",0x2),
0x8090CD44:("D_8090CD44","s16","",0x2),
0x8090CD48:("D_8090CD48","s16","",0x2),
0x8090CD4C:("D_8090CD4C","UNK_TYPE1","",0x1),
0x8090CD50:("D_8090CD50","UNK_TYPE1","",0x1),
0x8090CD54:("D_8090CD54","UNK_TYPE1","",0x1),
@ -7584,7 +7582,8 @@
0x8090CD8C:("D_8090CD8C","UNK_TYPE1","",0x1),
0x8090CF08:("D_8090CF08","UNK_TYPE1","",0x1),
0x8090CF18:("D_8090CF18","UNK_TYPE1","",0x1),
0x8090CF1C:("D_8090CF1C","UNK_TYPE4","",0x4),
0x8090CF1C:("sZeroVec","Vec3f","",0xC),
0x8090CF28:("D_8090CF28","Vec3f","",0xC),
0x8090CF34:("D_8090CF34","UNK_TYPE4","",0x4),
0x8090CF40:("D_8090CF40","UNK_TYPE4","",0x4),
0x8090CF4C:("D_8090CF4C","UNK_TYPE4","",0x4),
@ -7598,14 +7597,14 @@
0x8090D508:("D_8090D508","UNK_TYPE1","",0x1),
0x8090D558:("D_8090D558","UNK_TYPE1","",0x1),
0x8090D5B0:("D_8090D5B0","UNK_TYPE4","",0x4),
0x8090D608:("D_8090D608","UNK_TYPE1","",0x1),
0x8090D614:("D_8090D614","UNK_TYPE1","",0x1),
0x8090D620:("D_8090D620","UNK_TYPE4","",0x4),
0x8090D608:("sRodTipOffset","Vec3f","",0xC),
0x8090D614:("D_8090D614","Vec3f","",0xC),
0x8090D620:("D_8090D620","Vec3f","",0xC),
0x8090D62C:("D_8090D62C","UNK_TYPE1","",0x1),
0x8090D638:("D_8090D638","UNK_TYPE1","",0x1),
0x8090D644:("D_8090D644","UNK_TYPE1","",0x1),
0x8090D650:("D_8090D650","UNK_TYPE1","",0x1),
0x8090D65C:("D_8090D65C","UNK_TYPE1","",0x1),
0x8090D644:("D_8090D644","s16","[5]",0xA),
0x8090D650:("sStreamSoundPos","Vec3f","",0xC),
0x8090D65C:("sSinkingLureLocationPos","Vec3s","[4]",0x18),
0x8090D674:("D_8090D674","UNK_TYPE1","",0x1),
0x8090D680:("D_8090D680","f32","",0x4),
0x8090D684:("D_8090D684","f32","",0x4),
@ -7891,46 +7890,37 @@
0x809101C8:("D_809101C8","f32","",0x4),
0x809101CC:("D_809101CC","UNK_TYPE1","",0x1),
0x809101D0:("D_809101D0","UNK_TYPE1","",0x1),
0x809101D8:("D_809101D8","UNK_TYPE1","",0x1),
0x809101E8:("D_809101E8","UNK_TYPE1","",0x1),
0x80910B3C:("D_80910B3C","f32","",0x4),
0x80910B40:("D_80910B40","f32","",0x4),
0x80910B44:("D_80910B44","f32","",0x4),
0x80910B48:("D_80910B48","UNK_TYPE1","",0x1),
0x809114A8:("D_809114A8","UNK_TYPE1","",0x1),
0x80911E08:("D_80911E08","UNK_TYPE1","",0x1),
0x80911E14:("D_80911E14","UNK_TYPE1","",0x1),
0x80911E20:("D_80911E20","UNK_TYPE1","",0x1),
0x809101D8:("sRodTipPos","Vec3f","",0xC),
0x809101E8:("sReelLinePos","Vec3f","[200]",0x960),
0x80910B48:("sReelLineRot","Vec3f","[200]",0x960),
0x809114A8:("sReelLineUnk","Vec3f","[200]",0x960),
0x80911E08:("sLureHookRefPos","Vec3f","[2]",0x18),
0x80911E20:("sLureHookRotY","f32","[2]",0x8),
0x80911E28:("D_80911E28","UNK_TYPE1","",0x1),
0x80911E30:("D_80911E30","UNK_TYPE1","",0x1),
0x80911E3C:("D_80911E3C","UNK_TYPE1","",0x1),
0x80911E30:("sSinkingLurePos","Vec3f","[20]",0xF0),
0x80911F20:("D_80911F20","UNK_TYPE1","",0x1),
0x80911F24:("D_80911F24","UNK_TYPE1","",0x1),
0x80911F28:("D_80911F28","f32","",0x4),
0x80911F2C:("D_80911F2C","f32","",0x4),
0x80911F30:("D_80911F30","UNK_TYPE1","",0x1),
0x80911F38:("D_80911F38","f32","",0x4),
0x80911F3C:("D_80911F3C","f32","",0x4),
0x80911F40:("D_80911F40","f32","",0x4),
0x80911F44:("D_80911F44","UNK_TYPE1","",0x1),
0x80911F24:("sProjectedW","f32","",0x4),
0x80911F28:("sCameraEye","Vec3f","",0xC),
0x80911F38:("sCameraAt","Vec3f","",0xC),
0x80911F44:("sCameraId","s32","",0x4),
0x80911F48:("D_80911F48","f32","",0x4),
0x80911F4C:("D_80911F4C","f32","",0x4),
0x80911F50:("D_80911F50","UNK_TYPE1","",0x1),
0x80911F58:("D_80911F58","UNK_TYPE1","",0x1),
0x80911F58:("sSinkingLureBasePos","Vec3f","",0xC),
0x80911F64:("D_80911F64","f32","",0x4),
0x80911F68:("D_80911F68","UNK_TYPE1","",0x1),
0x80911F6C:("D_80911F6C","UNK_TYPE1","",0x1),
0x80911F70:("D_80911F70","UNK_TYPE1","",0x1),
0x80911F78:("D_80911F78","UNK_TYPE1","",0x1),
0x80914048:("D_80914048","UNK_TYPE1","",0x1),
0x80915128:("D_80915128","f32","",0x4),
0x8091512C:("D_8091512C","f32","",0x4),
0x80915130:("D_80915130","UNK_TYPE1","",0x1),
0x80915138:("D_80915138","UNK_TYPE1","",0x1),
0x809171B8:("D_809171B8","UNK_TYPE1","",0x1),
0x809171C4:("D_809171C4","UNK_TYPE1","",0x1),
0x80911F68:("sRandSeed0","s32","",0x4),
0x80911F6C:("sRandSeed1","s32","",0x4),
0x80911F70:("sRandSeed2","s32","",0x4),
0x80911F78:("sPondProps","UNK_TYPE1","[140]",0x20D0),
0x80914048:("sGroupFishes","UNK_TYPE1","[60]",0x10E0),
0x80915128:("sFishGroupAngle1","f32","",0x4),
0x8091512C:("sFishGroupAngle2","f32","",0x4),
0x80915130:("sFishGroupAngle3","f32","",0x4),
0x80915138:("sFishingEffects","UNK_TYPE1","[130]",0x2080),
0x809171B8:("sStreamSoundProjectedPos","Vec3f","",0xC),
0x809171C4:("sFishingMain","UNK_TYPE","",0x4),
0x809171C8:("D_809171C8","UNK_TYPE1","",0x1),
0x809171C9:("D_809171C9","UNK_TYPE1","",0x1),
0x809171C9:("sLinkAge","UNK_TYPE1","",0x1),
0x809171CA:("D_809171CA","UNK_TYPE1","",0x1),
0x809171CB:("D_809171CB","UNK_TYPE1","",0x1),
0x809171CC:("D_809171CC","f32","",0x4),
@ -7942,29 +7932,23 @@
0x809171D8:("D_809171D8","UNK_TYPE1","",0x1),
0x809171DA:("D_809171DA","UNK_TYPE1","",0x1),
0x809171DC:("D_809171DC","UNK_TYPE1","",0x1),
0x809171E0:("D_809171E0","UNK_TYPE1","",0x1),
0x809171EC:("D_809171EC","UNK_TYPE1","",0x1),
0x809171EE:("D_809171EE","UNK_TYPE1","",0x1),
0x809171F0:("D_809171F0","UNK_TYPE1","",0x1),
0x809171E0:("sOwnerHeadPos","Vec3f","",0xC),
0x809171EC:("sEffOwnerHatRot","Vec3s","",0x6),
0x809171F2:("D_809171F2","UNK_TYPE1","",0x1),
0x809171F4:("D_809171F4","UNK_TYPE1","",0x1),
0x809171F6:("D_809171F6","UNK_TYPE1","",0x1),
0x809171F8:("D_809171F8","UNK_TYPE1","",0x1),
0x809171F8:("sFishingHookedFish","UNK_TYPE","",0x4),
0x809171FC:("D_809171FC","UNK_TYPE1","",0x1),
0x809171FE:("D_809171FE","UNK_TYPE1","",0x1),
0x80917200:("D_80917200","UNK_TYPE1","",0x1),
0x80917202:("D_80917202","UNK_TYPE1","",0x1),
0x80917204:("D_80917204","UNK_TYPE1","",0x1),
0x80917206:("D_80917206","UNK_TYPE1","",0x1),
0x80917208:("D_80917208","f32","",0x4),
0x8091720C:("D_8091720C","f32","",0x4),
0x80917210:("D_80917210","UNK_TYPE1","",0x1),
0x80917208:("sLurePos","Vec3f","",0xC),
0x80917218:("D_80917218","UNK_TYPE1","",0x1),
0x80917228:("D_80917228","UNK_TYPE1","",0x1),
0x8091722C:("D_8091722C","UNK_TYPE1","",0x1),
0x80917238:("D_80917238","UNK_TYPE1","",0x1),
0x8091723C:("D_8091723C","UNK_TYPE1","",0x1),
0x80917248:("D_80917248","UNK_TYPE1","",0x1),
0x80917228:("sLureRot","Vec3f","",0xC),
0x80917238:("D_80917238","Vec3f","",0xC),
0x80917248:("D_80917248","Vec3f","",0xC),
0x80917254:("D_80917254","f32","",0x4),
0x80917258:("D_80917258","UNK_TYPE1","",0x1),
0x8091725C:("D_8091725C","f32","",0x4),
@ -7976,8 +7960,7 @@
0x80917270:("D_80917270","UNK_TYPE1","",0x1),
0x80917272:("D_80917272","UNK_TYPE1","",0x1),
0x80917274:("D_80917274","UNK_TYPE1","",0x1),
0x80917278:("D_80917278","UNK_TYPE1","",0x1),
0x8091727C:("D_8091727C","UNK_TYPE1","",0x1),
0x80917278:("D_80917278","Vec3f","",0xC),
0x80918830:("Obj_Oshihiki_InitVars","UNK_TYPE1","",0x1),
0x80918850:("D_80918850","UNK_TYPE1","",0x1),
0x80918868:("D_80918868","UNK_TYPE1","",0x1),

41
undefined_syms.txt
View File

@ -1488,6 +1488,7 @@ D_06013EA8 = 0x06013EA8;
// ovl_Door_Warp1
D_06003230 = 0x06003230;
D_060044D8 = 0x060044D8;
D_06004690 = 0x06004690;
D_060057D8 = 0x060057D8;
@ -2211,48 +2212,8 @@ D_06006190 = 0x06006190;
// ovl_En_Fishing
D_0600007C = 0x0600007C;
D_060029C0 = 0x060029C0;
D_06003230 = 0x06003230;
D_06003460 = 0x06003460;
D_060034C0 = 0x060034C0;
D_06003610 = 0x06003610;
D_06003680 = 0x06003680;
D_06003710 = 0x06003710;
D_06003760 = 0x06003760;
D_060039A8 = 0x060039A8;
D_06003A18 = 0x06003A18;
D_0600453C = 0x0600453C;
D_06007350 = 0x06007350;
D_060074C8 = 0x060074C8;
D_060085F8 = 0x060085F8;
D_06008610 = 0x06008610;
D_06008678 = 0x06008678;
D_060088C0 = 0x060088C0;
D_06008970 = 0x06008970;
D_0600B950 = 0x0600B950;
D_0600B9C0 = 0x0600B9C0;
D_0600C220 = 0x0600C220;
D_0600C298 = 0x0600C298;
D_0600CFE0 = 0x0600CFE0;
D_06011058 = 0x06011058;
D_06011070 = 0x06011070;
D_06011170 = 0x06011170;
D_06011270 = 0x06011270;
D_060113D0 = 0x060113D0;
D_06011410 = 0x06011410;
D_06012160 = 0x06012160;
D_060121F0 = 0x060121F0;
D_06013330 = 0x06013330;
D_060133B0 = 0x060133B0;
D_06013590 = 0x06013590;
D_06013610 = 0x06013610;
D_06013F50 = 0x06013F50;
D_06013FD0 = 0x06013FD0;
D_06014030 = 0x06014030;
D_060140B0 = 0x060140B0;
D_060153D0 = 0x060153D0;
D_06015470 = 0x06015470;
// ovl_En_Floormas