mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-08 14:36:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
theo3
2020-08-04 17:18:59 -07:00
parent 7f7b74cfd5 765047808c
commit 2575c0a63d
45 changed files with 759 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/entity.h
+7 -6
View File
@@ -27,7 +27,7 @@ typedef struct {
typedef struct Entity {
/*0x00*/ u32* field_0x0;
/*0x04*/ u32* field_0x4;
/*0x04*/ struct Entity* field_0x4;
/*0x08*/ EntityType entityType;
/*0x0c*/ u8 action;
/*0x0d*/ u8 previousActionFlag;
@@ -124,13 +124,11 @@ typedef struct Entity {
/*0x5c*/ Frame* animPtr;
/*0x60*/ u16 spriteVramOffset;
/*0x62*/ u8 spriteOffsetX;
/*0x64*/ u8 spriteOffsetY;
/*0x63*/ u8 spriteOffsetY;
/*0x64*/ u32* otherEntity;
/*0x68*/ u8 field_0x68;
/*0x69*/ u8 field_0x69;
/*0x68*/ union SplitHWord field_0x68;
/*0x6a*/ union SplitHWord field_0x6a;
/*0x6c*/ u8 field_0x6c;
/*0x6d*/ u8 field_0x6d;
/*0x6c*/ union SplitHWord field_0x6c;
/*0x6e*/ u8 filler4[2];
/*0x70*/ union SplitWord field_0x70;
/*0x74*/ u16 field_0x74;
@@ -171,4 +169,7 @@ extern void SetSpriteSubEntryOffsetData2(Entity*, u32, u32);
extern u32 GetFacingDirection(Entity*, Entity*);
extern void DeleteThisEntity();
extern Entity gUnk_03003DA0;
#endif
include/global.h
+3
View File
@@ -59,6 +59,9 @@ union SplitWord {
struct {
s16 LO, HI;
} HALF;
struct {
u8 byte0, byte1, byte2, byte3;
} BYTES;
};
union SplitHWord {
include/menu.h
+8 -3
View File
@@ -27,9 +27,14 @@ typedef struct {
u8 overlayType;
u8 storyPanelIndex;
u16 transitionTimer;
u8 field_0xa[8];
u8 field_0x11;
u8 field_0x12[0x16];
u8 fillerA[0x6];
u8 unk10[2];
u8 field_0x12;
u8 unk13;
u8 filler14[0x2];
u8 unk16;
u8 filler17[0x13];
u8 unk2a;
u32 field_0x2c;
} Menu;
include/npc.h
+12 -9
View File
@@ -170,19 +170,22 @@ extern void Phonograph(Entity*);
extern void NPC58(Entity*);
extern void NPC58_Head(Entity*);
extern u32 UpdateFuseInteraction(Entity*);
extern void ShowNPCDialogue(Entity*, u32*);
typedef struct {
/*0x000*/ u8 filler[8];
/*0x008*/ u8 unk;
/*0x009*/ u8 filler2[0x47];
/*0x050*/ u32 unk2;
/*0x051*/ u8 filler3[0x54];
/*0x0a8*/ Stats stats;
/*0x0d0*/ u8 filler4[0x3c0];
/*0x490*/ u32 unk3;
/*0x000*/ u8 filler0[0x6];
/*0x006*/ u8 unk6;
/*0x007*/ u8 unk7;
/*0x008*/ u8 unk8;
/*0x009*/ u8 field_0x9[0x34];
/*0x040*/ u32 windcrests;
/*0x044*/ u8 filler44[0xC];
/*0x050*/ u32 unk50;
/*0x054*/ u8 filler54[0x54];
/*0x0A8*/ Stats stats;
/*0x0D0*/ u8 filler4[0x3c0];
/*0x490*/ u32 unk490;
} struct_02002A40;
extern struct_02002A40 gUnk_02002A40;
include/position.h
+1
View File
@@ -9,5 +9,6 @@ void PositionEntityOnTop(Entity*, Entity*);
void PositionRelative(Entity*, Entity*, s32, s32);
void sub_0806FA90(Entity*, Entity*, s32, s32);
void ResolveEntityOnTop(Entity*, Entity*);
void sub_0806FAD8(Entity*, Entity*);
#endif
include/readKeyInput.h
+8 -8
View File
@@ -1,9 +1,9 @@
struct Input {
u16 unk0;
u16 unk1;
u16 unk2;
u8 unk3;
u8 unk4;
};
typedef struct {
u16 heldKeys;
u16 newKeys;
u16 unk4;
u8 unk6;
u8 unk7;
} Input;
// void ReadKeyInput(void);
extern Input gUnk_03000FF0;
include/structures.h
+17 -8
View File
@@ -6,15 +6,14 @@
#include "link.h"
typedef struct {
u8 filler[8];
u8 field_0x8;
u8 field_0x9[0x34];
u32 windcrests;
u8 field_0x44[0x64];
Stats stats;
} struct_02002A40;
char header[4];
u8 saveFile;
u8 field_0x5;
u8 brightnessPref;
u8 gameLanguage;
} struct_02000000;
extern struct_02002A40 gUnk_02002A40;
extern struct_02000000 gUnk_02000000;
typedef struct {
u16 frameCount; // regular frame count? does anything reset it?
@@ -60,4 +59,14 @@ typedef struct {
u16 transitionSFX;
} ScreenTransitionData;
typedef struct {
/*0x00*/ u8 unk0;
/*0x01*/ u8 filler1[0x5];
/*0x06*/ u8 unk6;
/*0x07*/ u8 unk7;
/*0x08*/ s8 unk8[0x10]; // ?? unclear know how large this is
} struct_02019EE0;
extern struct_02019EE0 gUnk_02019EE0;
#endif