mirror of
https://github.com/zeldaret/tmc
synced 2026-07-09 23:01:43 -04:00
Merge branch 'master' of github.com:zeldaret/tmc
This commit is contained in:
+11
-3
@@ -57,7 +57,7 @@ extern void sub_080791D0();
|
||||
extern void sub_0805EC9C();
|
||||
extern void sub_0805EC60();
|
||||
extern void sub_080873D0();
|
||||
extern void sub_080045D4();
|
||||
extern u8 sub_080045D4(s16, s16, u16, u16);
|
||||
extern void sub_0806F69C();
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern void sub_0806D0B0(Entity*);
|
||||
@@ -124,7 +124,7 @@ extern void sub_080580B0(u32);
|
||||
extern void sub_080751E8(u32, u32, void*);
|
||||
extern void sub_08052CA4(u32, u32, u32, u32);
|
||||
extern void sub_08052878(void);
|
||||
extern void sub_0808091C(u32*, u32);
|
||||
extern void sub_0808091C(ScreenTransitionData*, u32);
|
||||
extern void sub_0805BC4C(void);
|
||||
extern void sub_0807BB68(u32*, u32, u32);
|
||||
extern void sub_08054570(void);
|
||||
@@ -191,7 +191,7 @@ extern void sub_0801E738(u32);
|
||||
extern void sub_080A70AC(void*);
|
||||
extern void sub_080A7114(u32);
|
||||
extern void sub_08001242(void);
|
||||
extern void sub_08003FC4(Entity*, u32);
|
||||
extern u32 sub_08003FC4(Entity*, u32);
|
||||
extern u8 sub_080043E8(Entity*);
|
||||
extern void sub_08001290(Entity*, u32);
|
||||
extern void sub_08004488(u32);
|
||||
@@ -220,4 +220,12 @@ extern void sub_0807CF68(u32);
|
||||
extern void sub_0807D20C(u32, char*, u32);
|
||||
extern u32 sub_0807CF88(u32, u8*);
|
||||
extern u32 sub_0807D008(u32, void*);
|
||||
extern void sub_0807D184(u32, char*);
|
||||
extern void sub_0805E3A0(Entity*, u32);
|
||||
extern u32 sub_0806F520();
|
||||
extern void sub_0806F4E8();
|
||||
extern u32 sub_0806F3E4(Entity*);
|
||||
extern void sub_0804A7D4(Entity*);
|
||||
extern void sub_08033744(Entity*);
|
||||
extern void sub_0800417E(Entity*, u32);
|
||||
#endif
|
||||
+8
-1
@@ -73,7 +73,14 @@ typedef struct {
|
||||
u8 itemOnB;
|
||||
u8 filler2[10];
|
||||
u16 rupees;
|
||||
u8 filler3[12];
|
||||
u8 field_0x1a;
|
||||
u8 field_0x1b;
|
||||
u8 field_0x1c;
|
||||
u8 field_0x1d;
|
||||
u8 field_0x1e;
|
||||
u8 field_0x1f;
|
||||
u16 field_0x20;
|
||||
u8 filler4[4];
|
||||
} Stats;
|
||||
|
||||
typedef struct {
|
||||
|
||||
+28
-22
@@ -14,16 +14,27 @@ typedef struct { // 0x03001000
|
||||
u32 spritePriority;
|
||||
} MainStruct;
|
||||
|
||||
enum {
|
||||
SCREEN_INTRO,
|
||||
SCREEN_CHOOSE_FILE,
|
||||
SCREEN_GAMEPLAY,
|
||||
SCREEN_GAME_OVER,
|
||||
SCREEN_CREDITS,
|
||||
};
|
||||
|
||||
typedef struct {
|
||||
u8 interruptFlag;
|
||||
u8 field_0x1;
|
||||
u8 screen;
|
||||
u8 funcIndex;
|
||||
u8 field_0x3;
|
||||
u8 transition;
|
||||
u8 field_0x5;
|
||||
u8 muteAudio;
|
||||
u8 field_0x8;
|
||||
u8 field_0x7;
|
||||
u8 countdown;
|
||||
u8 field_0x9;
|
||||
u8 field_0xa;
|
||||
u16 ticks;
|
||||
} Main;
|
||||
|
||||
typedef struct {
|
||||
@@ -42,28 +53,23 @@ extern Main gUnk_03001000;
|
||||
extern UI gUnk_02032EC0;
|
||||
|
||||
|
||||
extern void sub_080A3204(void);
|
||||
extern void sub_0807CE90(void);
|
||||
extern void sub_080560B8(void);
|
||||
extern void sub_08056208(void);
|
||||
extern void sub_0804FFE4(void);
|
||||
extern void sub_08056418(void);
|
||||
extern void sub_080ADD30(void);
|
||||
|
||||
extern s32 sub_08055F70();
|
||||
extern s32 sub_080A3204(s32);
|
||||
extern s32 sub_0807CE90(s32);
|
||||
extern s32 sub_080560B8(s32);
|
||||
extern void sub_08056208(s32);
|
||||
extern void sub_0804FFE4();
|
||||
extern s32 sub_08056418();
|
||||
extern void sub_080ADD30(s32);
|
||||
|
||||
extern s32 sub_08056010(s32);
|
||||
extern s32 sub_08016E78(s32);
|
||||
extern s32 ReadKeyInput();
|
||||
extern s32 sub_08055FF4(u8);
|
||||
extern void sub_080560A8();
|
||||
extern s32 sub_08056260();
|
||||
extern void InitScreen(u32);
|
||||
extern void sub_08016E78(void);
|
||||
extern void ReadKeyInput(void);
|
||||
extern void DoSoftReset(void);
|
||||
extern void sub_08056260(void);
|
||||
extern void VBlankIntrWait();
|
||||
extern s32 _call_via_r0(s32);
|
||||
extern s32 sub_08056458(s32);
|
||||
extern s32 sub_08050154(s32);
|
||||
extern s32 sub_080A3480(s32);
|
||||
extern void sub_08056458(void);
|
||||
extern void sub_08050154(void);
|
||||
extern void sub_080A3480(void);
|
||||
|
||||
extern s32 gRand;
|
||||
extern s32 gUnk_08100CBC;
|
||||
#endif
|
||||
+10
-2
@@ -25,6 +25,14 @@ typedef struct {
|
||||
#define gUnk_02000000 ((struct_02000000*)(0x2000000))
|
||||
//extern struct_02000000 gUnk_02000000;
|
||||
|
||||
typedef struct {
|
||||
u8 filler0[0x4];
|
||||
u8 field_0x4;
|
||||
u8 field_0x5;
|
||||
} struct_02000010;
|
||||
|
||||
extern struct_02000010 gUnk_02000010;
|
||||
|
||||
typedef struct {
|
||||
/*0x000*/ u8 filler0[0x6];
|
||||
/*0x006*/ u8 unk6;
|
||||
@@ -43,8 +51,8 @@ typedef struct {
|
||||
extern struct_02002A40 gUnk_02002A40;
|
||||
|
||||
typedef struct {
|
||||
u16 frameCount; // regular frame count? does anything reset it?
|
||||
u8 field_0x2[6];
|
||||
u32 frameCount; // regular frame count? does anything reset it?
|
||||
u8 field_0x4[0x4];
|
||||
bool8 transitioningOut;
|
||||
u8 transitionType; // transition when changing areas
|
||||
u8 field_0xa; // seems to be a tile type
|
||||
|
||||
Reference in New Issue
Block a user