mirror of
https://github.com/zeldaret/tmc
synced 2026-07-04 21:35:32 -04:00
merge
This commit is contained in:
+9
-8
@@ -52,7 +52,7 @@ extern void LoadResources(void);
|
||||
extern bool32 LoadSwapGFX(Entity*, u16, u32);
|
||||
extern void MenuFadeIn(u32, u32);
|
||||
extern void ModBombs(s32);
|
||||
extern u32 PlayerInRange(Entity*, u32, u32);
|
||||
extern bool32 PlayerInRange(Entity*, u32, s32);
|
||||
extern bool32 ProcessMovement1(Entity*);
|
||||
extern bool32 ProcessMovement12(Entity*);
|
||||
extern bool32 ProcessMovement2(Entity*);
|
||||
@@ -130,15 +130,16 @@ extern void sub_0803C0AC(Entity*);
|
||||
extern void sub_08049CF4(Entity*);
|
||||
extern Entity* sub_08049DF4(u32);
|
||||
extern u32 sub_08049EE4(Entity*);
|
||||
extern u32 sub_08049F1C(Entity*, Entity*, u32);
|
||||
extern u32 sub_08049F84(Entity*, u32);
|
||||
extern u32 sub_08049FA0(Entity*);
|
||||
extern u32 sub_08049FDC(Entity*, u32);
|
||||
extern bool32 sub_08049F1C(Entity*, Entity*, s32);
|
||||
extern bool32 sub_08049F84(Entity*, s32);
|
||||
extern bool32 sub_08049FA0(Entity*);
|
||||
extern bool32 sub_08049FDC(Entity*, u32);
|
||||
extern u32 sub_0804A024(Entity*, u32, u32);
|
||||
extern u32 sub_0804A044(Entity*, Entity*, u32);
|
||||
extern void sub_0804A4E4(Entity*, Entity*);
|
||||
extern void sub_0804A720(Entity*);
|
||||
extern void sub_0804AA1C(Entity*);
|
||||
extern void sub_0804C128();
|
||||
extern void sub_0804C128(void);
|
||||
extern u32 sub_080542AC(u32);
|
||||
extern void sub_08054564();
|
||||
extern void sub_08054570(void);
|
||||
@@ -163,7 +164,7 @@ extern void sub_08060158(Entity*);
|
||||
extern void sub_0806D02C(Entity*);
|
||||
extern void sub_0806D0B0(Entity*);
|
||||
extern void sub_0806F4E8(Entity*);
|
||||
extern u32 sub_0806F520();
|
||||
extern bool32 sub_0806F520(Entity*);
|
||||
extern u32 sub_0806F5B0(u32);
|
||||
extern u32 sub_0806F824(Entity*, Entity*, s32, s32);
|
||||
extern u32 sub_0806F948(Entity*);
|
||||
@@ -214,7 +215,7 @@ extern u32 sub_08079B24(void);
|
||||
extern void sub_08079BD8(Entity*);
|
||||
extern u32 sub_08079D48();
|
||||
extern void sub_08079D84(void);
|
||||
extern u32 sub_08079F8C(void);
|
||||
extern bool32 sub_08079F8C(void);
|
||||
extern u32 sub_08079FC4(u32);
|
||||
extern void sub_0807A050(void);
|
||||
extern void sub_0807A5B8(u32);
|
||||
|
||||
Reference in New Issue
Block a user