summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-11 20:53:26 -0800
committersceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-11 20:53:26 -0800
commit2db97dde84bf4f0df87054cf45d813e9071f3760 (patch)
treef3fb4a2e0a09c860a0403c924b8e35739576b0dd
parent898824cb67e9de052fb90e767cfa1a4965db7849 (diff)
label functions
-rw-r--r--asm/code_80047E8.s6
-rw-r--r--asm/sprite.s6
-rw-r--r--src/main.c8
3 files changed, 10 insertions, 10 deletions
diff --git a/asm/code_80047E8.s b/asm/code_80047E8.s
index 3c22773..407c747 100644
--- a/asm/code_80047E8.s
+++ b/asm/code_80047E8.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80047E8
-sub_80047E8:
+ thumb_func_start InitInput
+InitInput:
ldr r0, _08004840
movs r3, 0
movs r2, 0
@@ -58,7 +58,7 @@ _0800484C: .4byte 0x004a14c1
_08004850: .4byte gUnknown_2025600
_08004854: .4byte 0x0000ffff
_08004858: .4byte gUnknown_2025668
- thumb_func_end sub_80047E8
+ thumb_func_end InitInput
thumb_func_start sub_800485C
sub_800485C:
diff --git a/asm/sprite.s b/asm/sprite.s
index 1462afb..5081f37 100644
--- a/asm/sprite.s
+++ b/asm/sprite.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8004D78
-sub_8004D78:
+ thumb_func_start InitSprites
+InitSprites:
push {lr}
movs r0, 0x1
bl sub_8004D8C
@@ -14,7 +14,7 @@ sub_8004D78:
bl SetSavingIconCoords
pop {r0}
bx r0
- thumb_func_end sub_8004D78
+ thumb_func_end InitSprites
thumb_func_start sub_8004D8C
sub_8004D8C:
diff --git a/src/main.c b/src/main.c
index a756e28..d05db7f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,10 +27,10 @@ extern char unk_code[];
extern void sub_800CDA8(int);
extern void sub_800B540(void);
-extern void sub_8004D78(void);
+extern void InitSprites(void);
extern void nullsub_9(void);
extern void nullsub_6(void);
-extern void sub_80047E8(void);
+extern void InitInput(void);
extern void InitBGPaletteBuffer(void);
extern void sub_80057E8(void);
extern void InitFileSystem(void);
@@ -91,10 +91,10 @@ void AgbMain(void)
InitFlash();
memcpy(seed, gUnknown_80B9BF1, 6);
SeedRng(seed);
- sub_8004D78();
+ InitSprites();
nullsub_9();
nullsub_6();
- sub_80047E8();
+ InitInput();
InitBGPaletteBuffer();
sub_80057E8();
InitFileSystem();