refactor headers a bit

This commit is contained in:
jiangzhengwenjz 2020-05-12 09:47:07 +08:00
parent 57d319999b
commit a385d8cf23
7 changed files with 35 additions and 29 deletions

View File

@ -3,12 +3,7 @@
#include "global.h"
extern void sub_080002C8(void);
extern u32 sub_0800A91C(u16, u16);
extern void sub_0800AC00(u32);
extern void sub_0800AC5C(void);
extern s16 sub_0800ACD4(u32, u16);
void sub_080001CC(void);
void sub_080002C8(void);
extern void CreateLogo(void);
#endif
#endif

View File

@ -11,7 +11,7 @@ extern struct MultiBootParam gMultiBootParam;
extern u32 gUnk_03002440;
extern u32 gUnk_03002E60;
extern u32* gUnk_03003674;
extern const u32* gUnk_03003674;
extern const u32 gUnk_083B909C;

View File

@ -4,28 +4,32 @@
#include "global.h"
void IntrMain(void);
void sub_080001CC(void);
u32 sub_0800A91C(u16, u16);
void sub_0800AC00(u32);
void sub_0800AC5C(void);
s16 sub_0800ACD4(u32, u16);
void sub_08020490(void);
void sub_08031BFC(void);
void sub_08033478(void);
void sub_08030E44(void);
u32 sub_08030FE0(void);
void sub_08032E98(void);
u32 GameStateInit(void);
void GameStateExecute(void);
struct Unk_03003A20* sub_08152DD8(u16);
void sub_08145B64(u16);
void sub_08149CE4(void);
u32 sub_08153184(void);
u32 sub_0815436C(void);
u32 sub_08154B14(void);
void sub_08158870(void);
void nullsub_2(void);
void sub_08157168(void);
void sub_08158334(u16*, u8, u16);
void sub_08158870(void);
void Timer3Intr(void);
void nullsub_2(void);
void sub_08159074(void);
u32 sub_08159088(u16);
void sub_08149CE4(void);
void sub_08145B64(u16);
void Timer3Intr(void);
#endif

View File

@ -2,6 +2,7 @@
#define GUARD_LOGO_H
#include "global.h"
#include "game_state.h"
struct LogoStruct;
@ -47,5 +48,6 @@ extern void LogoClearTiles(u8);
extern void LogoClearTilemap(u8);
extern void LogoCopyGraphics(u8, u16, u16);
extern void LogoCopyPalette(u16, u8, u8, u16);
extern void CreateLogo(void);
#endif

View File

@ -1,7 +1,8 @@
#include "global.h"
#include "code_080001CC.h"
#include "functions.h"
#include "data.h"
#include "functions.h"
#include "logo.h"
#include "gba/m4a_internal.h"
extern const u16 gUnk_082D848C[];
@ -45,7 +46,8 @@ void sub_080001CC(void) {
void sub_080002C8(void) {
s32 i;
u16 ie, dispcnt, bldcnt, bldalpha, ime, *r3, *r2;
u16 ie, dispcnt, bldcnt, bldalpha, ime, *r2;
const u16* r3;
if (!(gUnk_03002440 & 0x1000)) {
m4aSoundVSyncOff();
ie = REG_IE;
@ -74,7 +76,7 @@ void sub_080002C8(void) {
if (REG_VCOUNT == 0xa1
|| REG_VCOUNT == 0xa2
|| REG_VCOUNT == 0xa3) {
break;
break;
}
}
while (REG_VCOUNT <= 0xa3) {}
@ -86,8 +88,8 @@ void sub_080002C8(void) {
if (REG_VCOUNT == 0xa1
|| REG_VCOUNT == 0xa2
|| REG_VCOUNT == 0xa3) {
break;
}
break;
}
}
while (REG_VCOUNT <= 0xa3) {}
} while (!((REG_KEYINPUT ^ 0x3fff) % 2));
@ -96,7 +98,7 @@ void sub_080002C8(void) {
if (REG_VCOUNT == 0xa1
|| REG_VCOUNT == 0xa2
|| REG_VCOUNT == 0xa3) {
break;
break;
}
}
while (REG_VCOUNT <= 0xa3) {}

View File

@ -1,7 +1,7 @@
#include "functions.h"
#include "gba/m4a_internal.h"
#include "gba/syscall.h"
#include "global.h"
#include "code_080001CC.h"
#include "functions.h"
#include "game_state.h"
#include "main.h"
#include "multi_sio.h"

View File

@ -1,8 +1,11 @@
#include "global.h"
#include "data.h"
#include "functions.h"
#include "game_state.h"
#include "main.h"
#include "title_screen.h"
void sub_0814A274(struct TitleStruct*);
void sub_08149CE4(void) {
u16 *r4, *r6;
u8 i;