mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-16 04:44:44 +00:00
Code Issues Projects Releases Wiki Activity

En_Floormas OK (#97)

Browse source 
* EnFloorMas wip

* floormaster formatting

* floormaster wip

* ovl_En_Floormas OK

* pr recommendations

* pr updates
This commit is contained in:
krimtonz 2020-05-07 18:18:09 -05:00 • committed by GitHub
parent 5acc4e2f66
commit 0ebe904d0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
67 changed files with 1110 additions and 3575 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/functions.h
View file

@ -183,10 +183,12 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3
// ? func_80022A10(?);
// ? func_8002389C(?);
void func_80024F0C(UNK_TYPE);
void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3);
void func_80026400(GlobalContext*, Color_RGBA8*, u8, s16);
// ? func_80026608(?);
void func_80026608(GlobalContext*);
void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3);
void func_80026860(GlobalContext*, Color_RGBA8*, u8, s16);
// ? func_80026A6C(?);
void func_80026A6C(GlobalContext* globalCtx);
GlobalContext* func_80026B00(void);
// ? func_80026B0C(?);
// ? func_80026C1C(?);
@ -237,7 +239,7 @@ void func_80029CA4(GlobalContext* globalCtx, s32 a, Vec3f* pos);
// ? func_80029F44(?);
// ? func_8002A32C(?);
// ? func_8002A3C4(?);
void func_8002A65C(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, u32 arg3, u32 arg4);
void func_8002A65C(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 arg3, s16 arg4);
void func_8002A6B8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* arg2, Vec3f* arg3, u32 arg4, s32 arg5, u32 arg6,
u32 arg7, u32 arg8, u32 arg9, u32 arg10, u32 arg11, u32 arg12, u32 arg13, u32 arg14, u32 arg15);
// ? func_8002A894(?);

1
include/math.h
View file

@ -6,6 +6,7 @@
#define FLT_MAX 340282346638528859811704183484516925440.0f
#define SHT_MAX 32767.0f
#define SHT_MINV (1.0f / SHT_MAX)
#define DEGTORAD(x) (x * M_PI / 180.0f)
float sinf(float);
double sin(double);

4
include/sfx.h
View file

@ -627,6 +627,8 @@
#define NA_SE_EV_YOBI24 0x2917
#define NA_SE_EV_YOBI25 0x2918
//------------ENEMY------------
#define NA_SE_EN_FLOORMASTER_SLIDING 0x3034
#define NA_SE_EN_FLOORMASTER_SM_STICK 0x3136
#define NA_SE_EN_DODO_J_WALK 0x3800
#define NA_SE_EN_DODO_J_CRY 0x3801
#define NA_SE_EN_DODO_J_FIRE 0x3802
@ -679,7 +681,6 @@
#define NA_SE_EN_STALKID_ATTACK 0x3831
#define NA_SE_EN_STALKID_DAMAGE 0x3832
#define NA_SE_EN_STALKID_DEAD 0x3833
#define NA_SE_EN_FLOORMASTER_SLIDING 0x3834
#define NA_SE_EN_TEKU_WALK_WATER 0x3835
#define NA_SE_EN_LIGHT_ARROW_HIT 0x3836
#define NA_SE_EN_TUBOOCK_FLY 0x3837
@ -937,7 +938,6 @@
#define NA_SE_EN_FLOORMASTER_RESTORE 0x3933
#define NA_SE_EN_FLOORMASTER_EXPAND 0x3934
#define NA_SE_EN_FLOORMASTER_SPLIT 0x3935
#define NA_SE_EN_FLOORMASTER_SM_STICK 0x3936
#define NA_SE_EN_FLOORMASTER_SM_LAND 0x3937
#define NA_SE_EN_IRONNACK_WAVE_DEMO 0x3938
#define NA_SE_EN_IRONNACK_FINGER_DEMO 0x3939

4
include/z64.h
View file

@ -1047,7 +1047,9 @@ typedef struct GlobalContext {
/* 0x11D30 */ s16 unk_11D30[2];
/* 0x11D34 */ u8 nbTransitionActors;
/* 0x11D38 */ TransitionActorEntry* transitionActorList;
/* 0x11D3C */ char unk_11D3C[0x1C];
/* 0x11D3C */ char unk_11D3C[0x10];
/* 0x11D4C */ void (*unk_11D4C)(struct GlobalContext*, Actor*);
/* 0x11D50 */ char unk_11D50[0x8];
/* 0x11D58 */ void (*unk_11D58)(struct GlobalContext*, s32);
/* 0x11D5C */ char unk_11D5C[0x4];
/* 0x11D60 */ MtxF mf_11D60;

2
include/z64actor.h
View file

@ -125,7 +125,7 @@ typedef struct Actor {
/* 0x078 */ CollisionPoly* floorPoly; // Floor polygon an actor is over/touching
/* 0x07C */ u8 wallPolySource; // Complex Poly Surface Source. 0x32 = Scene
/* 0x07D */ u8 floorPolySource; // Complex Poly Surface Source. 0x32 = Scene. related to 0x80/88
/* 0x07E */ s16 unk_7E;
/* 0x07E */ s16 wallPolyRot; // Rotation of the wall poly
/* 0x080 */ f32 unk_80; // Floor poly height?
/* 0x084 */ f32 unk_84;
/* 0x088 */ u16 bgCheckFlags;