mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-21 14:25:22 +00:00
Code Issues Projects Releases Wiki Activity

Move BottleCatchAnimationData declaration

Browse source
This commit is contained in:
Pablo 2024-10-06 20:34:05 +02:00
parent 3d190c2cb9
commit 777b849eb7
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -108,13 +108,6 @@ typedef struct ItemChangeInfo {
/* 0x04 */ u8 changeFrame;
} ItemChangeInfo; // size = 0x08
typedef struct BottleCatchAnimationData {
/* 0x00 */ LinkAnimationHeader* missAnimation;
/* 0x04 */ LinkAnimationHeader* catchAnimation;
/* 0x08 */ u8 firstCatchFrame;
/* 0x09 */ u8 catchFrameCount;
} BottleCatchAnimationData; // size = 0x0C
typedef struct struct_80854190 {
/* 0x00 */ LinkAnimationHeader* unk_00;
/* 0x04 */ LinkAnimationHeader* unk_04;
@ -6489,6 +6482,13 @@ s32 func_8083C61C(PlayState* play, Player* this) {
return 0;
}
typedef struct BottleCatchAnimationData {
/* 0x00 */ LinkAnimationHeader* missAnimation;
/* 0x04 */ LinkAnimationHeader* catchAnimation;
/* 0x08 */ u8 firstCatchFrame;
/* 0x09 */ u8 catchFrameCount;
} BottleCatchAnimationData; // size = 0x0C
/**
* These animations are misleadingly named,
* the first ones are used when not in water (>12 units below water surface)