hackern64/HackerOoT
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerOoT.git synced 2026-01-21 10:37:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'decomp/main' into decomp_merge

Browse Source
This commit is contained in:
Yanis002
2025-07-14 18:32:02 +02:00
parent 73f0f09f30 4d2bc68bac
commit 8c76c672f7
3 changed files with 232 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/save.h
View File

@@ -903,7 +903,7 @@ typedef enum LinkAge {
#define INFTABLE_138 0x138
#define INFTABLE_139 0x139
#define INFTABLE_140 0x140
#define INFTABLE_141 0x141
#define INFTABLE_MET_RUTO_FIRST_TIME 0x141
#define INFTABLE_142 0x142
#define INFTABLE_143 0x143
#define INFTABLE_144 0x144

404
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View File

File diff suppressed because it is too large Load Diff

36
src/overlays/actors/ovl_En_Ru1/z_en_ru1.h
View File

@@ -26,12 +26,12 @@ typedef struct EnRu1 {
/* 0x0260 */ s16 mouth;
/* 0x0264 */ s32 action;
/* 0x0268 */ s32 drawConfig;
/* 0x026C */ f32 unk_26C;
/* 0x026C */ f32 walkingFrame;
/* 0x0270 */ f32 treadTimer;
/* 0x0274 */ char unk_274[0x4];
/* 0x0278 */ DoorWarp1* blueWarp;
/* 0x027C */ f32 unk_27C;
/* 0x0280 */ s32 unk_280;
/* 0x027C */ f32 xzDistToPlayerInBlueWarp;
/* 0x0280 */ s32 isFalling;
/* 0x0284 */ s8 roomNum1;
/* 0x0285 */ s8 roomNum2;
/* 0x0286 */ s8 roomNum3;
@@ -68,21 +68,21 @@ typedef enum EnRu1Action {
/* 4 */ ENRU1_ACTION_FOUNTAIN_STARTING_SWIM_BACK,
/* 5 */ ENRU1_ACTION_FOUNTAIN_SWIMMING_BACK,
/* 6 */ ENRU1_ACTION_FOUNTAIN_FINISHING_SWIM_BACK,
/* 7 */ ENRU1_ACTION_07,
/* 8 */ ENRU1_ACTION_08,
/* 9 */ ENRU1_ACTION_09,
/* 10 */ ENRU1_ACTION_10,
/* 11 */ ENRU1_ACTION_11,
/* 12 */ ENRU1_ACTION_12,
/* 13 */ ENRU1_ACTION_13,
/* 14 */ ENRU1_ACTION_14,
/* 15 */ ENRU1_ACTION_15,
/* 16 */ ENRU1_ACTION_16,
/* 17 */ ENRU1_ACTION_17,
/* 18 */ ENRU1_ACTION_18,
/* 19 */ ENRU1_ACTION_19,
/* 20 */ ENRU1_ACTION_20,
/* 21 */ ENRU1_ACTION_21,
/* 7 */ ENRU1_ACTION_MEETING_RANGE_CHECK,
/* 8 */ ENRU1_ACTION_MEETING_INIT_POSITION,
/* 9 */ ENRU1_ACTION_MEETING_FACING_LINK,
/* 10 */ ENRU1_ACTION_MEETING_TURNING_AROUND,
/* 11 */ ENRU1_ACTION_MEETING_WALKING_AWAY_ACCEL,
/* 12 */ ENRU1_ACTION_MEETING_WALKING_AWAY_CONSTANT,
/* 13 */ ENRU1_ACTION_MEETING_FALLING_DOWN_HOLE,
/* 14 */ ENRU1_ACTION_MEETING_END,
/* 15 */ ENRU1_ACTION_PRE_SPAWN_BOSS_ROOM,
/* 16 */ ENRU1_ACTION_SPAWN_BOSS_ROOM,
/* 17 */ ENRU1_ACTION_RISE_THROUGH_BLUE_WARP,
/* 18 */ ENRU1_ACTION_WAIT_INSIDE_BLUE_WARP,
/* 19 */ ENRU1_ACTION_LINK_WALKS_TO_POINT_IN_BLUE_WARP,
/* 20 */ ENRU1_ACTION_WHAT_TOOK_YOU_SO_LONG,
/* 21 */ ENRU1_ACTION_WARPING_OUT,
/* 22 */ ENRU1_ACTION_22,
/* 23 */ ENRU1_ACTION_23,
/* 24 */ ENRU1_ACTION_24,