mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-29 00:06:33 +00:00
Code Issues Projects Releases Wiki Activity

ru2 fixes (#2323)

Browse source
This commit is contained in:
fig02 2024-12-06 07:49:00 -05:00 committed by GitHub
parent b2d3c0523d
commit a96ada0bba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -9,9 +9,6 @@
#include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
#include "terminal.h"
#define ENRU2_GET_SWITCH_FLAG(thisx) PARAMS_GET_U(thisx->actor.params, 8, 8)
#define ENRU2_GET_TYPE(thisx) PARAMS_GET_U(thisx->actor.params, 0, 8)
#define FLAGS ACTOR_FLAG_4
void EnRu2_Init(Actor* thisx, PlayState* play);
@ -66,13 +63,13 @@ typedef enum {
/* 16 */ ENRU2_WATER_TEMPLE_ENCOUNTER_BEGINNING,
/* 17 */ ENRU2_WATER_TEMPLE_ENCOUNTER_DIALOG,
/* 18 */ ENRU2_WATER_TEMPLE_ENCOUNTER_END,
/* 19 */ ENRU2_WATER_TEMPLE_SWIMMING_UP,
/* 19 */ ENRU2_WATER_TEMPLE_SWIMMING_UP
} EnRu2Action;
typedef enum {
/* 00 */ ENRU2_DRAW_NOTHING,
/* 01 */ ENRU2_DRAW_OPA,
/* 02 */ ENRU2_DRAW_XLU,
/* 02 */ ENRU2_DRAW_XLU
} EnRu2DrawConfig;
static ColliderCylinderInitType1 sCylinderInit = {

3
src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
View file

@ -4,6 +4,9 @@
#include "ultra64.h"
#include "global.h"
#define ENRU2_GET_SWITCH_FLAG(thisx) PARAMS_GET_U(thisx->actor.params, 8, 8)
#define ENRU2_GET_TYPE(thisx) PARAMS_GET_U(thisx->actor.params, 0, 8)
struct EnRu2;
typedef void (*EnRu2ActionFunc)(struct EnRu2*, PlayState*);