mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-11 23:30:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into docs

Browse Source
This commit is contained in:
Marcus Huderle
2020-08-15 16:08:55 -05:00
parent 56a569be4c 0e4397583a
commit 1a6dc8f838
9 changed files with 304 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+6
View File
@@ -7,6 +7,7 @@
#include "position.h"
#include "player.h"
#include "structures.h"
#include "room.h"
// Identified - to be sorted into header files
extern u32 Random(void);
@@ -225,6 +226,7 @@ extern void sub_08033744(Entity*);
extern void sub_0800417E(Entity*, u32);
extern void sub_080784C8();
extern void sub_08017640();
extern u32 sub_0808288C(Entity*, u32, u32, u32);
extern void sub_0806FDA0(Entity*);
extern void sub_080AE008(Entity*, u32, u32);
extern u32 sub_08016A30(Entity*);
@@ -242,4 +244,8 @@ extern void HandleGameplayScreen(void);
extern void HandleGameOverScreen(void);
extern void HandleCreditsScreen(void);
extern void HandleDebugTextScreen(void);
extern void sub_080A2BE4(Entity*, u32);
extern u32 sub_08097ADC(Entity*);
extern void sub_08097B24(Entity*);
extern u32 sub_08079F8C(void);
#endif
include/player.h
+3 -1
View File
@@ -20,7 +20,9 @@ typedef struct {
/*0x0d*/ u8 field_0xd[2];
/*0x0f*/ u8 hurtBlinkSpeed;
/*0x10*/ u8 field_0x10[4];
/*0x14*/ u16 field_0x14[3];
/*0x11*/ u8 field_0x14;
/*0x11*/ u8 field_0x15;
/*0x14*/ u16 field_0x16[2];
/*0x1a*/ u8 field_0x1a[2];
/*0x1c*/ u8 field_0x1c;
/*0x1d*/ u8 field_0x1d[5];