mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-03 18:36:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
notyouraveragehooman
2020-08-09 16:20:59 -07:00
committed by GitHub
parent 133984ad5b 001845ba3a
commit 149ae2e2d2
15 changed files with 373 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/entity.h
+1 -1
View File
@@ -70,7 +70,7 @@ typedef struct Entity {
/* */ u8 flipX : 2; //0x10
/* */ u8 flipY : 2; //0x40
/* */ } PACKED spriteOrientation;
/*0x1c*/ u8 filler[1];
/*0x1c*/ u8 field_0x1c;
/*0x1d*/ u8 field_0x1d;
/*0x1e*/ u8 frameIndex;
/*0x1f*/ u8 lastFrameIndex;
include/functions.h
+1 -1
View File
@@ -193,7 +193,7 @@ extern void sub_080A70AC(void*);
extern void sub_080A7114(u32);
extern void sub_08001242(void);
extern u32 sub_08003FC4(Entity*, u32);
extern u8 sub_080043E8(Entity*);
extern u32 sub_080043E8(Entity*);
extern void sub_08001290(Entity*, u32);
extern void sub_08004488(u32);
extern void sub_08004596(Entity*, u32);
include/manager.h
+23
View File
@@ -3,6 +3,29 @@
#include "global.h"
typedef struct {
u8 unk_00[0x0a];
u8 unk_0a;
u8 unk_0b;
u8 unk_0c;
u8 unk_0d;
u8 unk_0e;
u8 unk_0f[0x11];
u16 unk_20;
u16 unk_22;
u16 unk_24;
u16 unk_26;
u8 unk_28[0x0D];
u8 unk_35;
u16 unk_36;
u8 unk_38;
u8 unk_39;
u8 unk_3a;
u8 unk_3b;
u16 unk_3c;
u16 unk_3e;
} Manager;
typedef struct {
u16 field_0x00;
u16 field_0x02;
include/player.h
+3 -1
View File
@@ -35,7 +35,9 @@ typedef struct {
/* */ u32 noMinishCap : 1;
/* */ u32 pullingState : 1;
/* */ u32 windyState : 1;
/* */ u32 filler10 : 4;
/* */ u32 filler6 : 1;
/* */ u32 unk7 : 1;
/* */ u32 filler8 : 2;
/* */ u32 slipperyState : 1;
/* */ u32 filler11 : 5;
/* */ u32 filler11b : 16;