summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-12-17 21:12:51 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2017-12-17 21:12:51 -0500
commitfcbcf6f93cf3850bac06c77c49a74c21866ebde8 (patch)
tree436512d4015668dcfa30a7e9d31ffb5ea6037a8e
parent72a509b8d9512ba9c5ed42d6a433bb6e0135712d (diff)
Decompile data: unknown_debug_menu
-rw-r--r--data/unknown_debug_menu.s32
-rw-r--r--ld_script.txt1
-rw-r--r--src/debug/unknown_debug_menu.c26
3 files changed, 24 insertions, 35 deletions
diff --git a/data/unknown_debug_menu.s b/data/unknown_debug_menu.s
deleted file mode 100644
index eaa635fa4..000000000
--- a/data/unknown_debug_menu.s
+++ /dev/null
@@ -1,32 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
-UnknownString_1stRound:
- .string "1st round$"
-UnknownString_2ndRound:
- .string "2nd round$"
-UnknownString_3rdRound:
- .string "3rd round$"
-UnknownString_4thRound:
- .string "4th round$"
-UnknownString_5thRound:
- .string "5th round$"
-UnknownString_6thRound:
- .string "6th round$"
-UnknownString_7thRound:
- .string "7th round$"
-UnknownString_8thRound:
- .string "8th round$"
-
- .align 2
-gUnknown_0842C29C:: @ 842C29C
- .4byte UnknownString_1stRound, sub_814A4B8
- .4byte UnknownString_2ndRound, sub_814A4B8
- .4byte UnknownString_3rdRound, sub_814A4B8
- .4byte UnknownString_4thRound, sub_814A4B8
- .4byte UnknownString_5thRound, sub_814A4B8
- .4byte UnknownString_6thRound, sub_814A4B8
- .4byte UnknownString_7thRound, sub_814A4B8
- .4byte UnknownString_8thRound, sub_814A4B8
diff --git a/ld_script.txt b/ld_script.txt
index fa58afbf5..1fdbb1ccd 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -597,6 +597,7 @@ SECTIONS {
data/intro_credits_graphics.o(.rodata);
src/scene/evolution_graphics.o(.rodata);
src/field/bard_music.o(.rodata);
+ src/debug/unknown_debug_menu.o(.rodata);
data/unknown_debug_menu.o(.rodata);
data/strings2.o(.rodata);
src/engine/menu_cursor.o(.rodata);
diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c
index 429f43766..a8c3ad16b 100644
--- a/src/debug/unknown_debug_menu.c
+++ b/src/debug/unknown_debug_menu.c
@@ -6,10 +6,30 @@ extern u8 gBattleCommunication[];
extern u8 (*gCallback_03004AE8)(void);
-extern const struct MenuAction gUnknown_0842C29C[];
-
+static u8 sub_814A4B8(void);
static u8 sub_814A464(void);
+const u8 UnknownString_1stRound[] = _("1st round");
+const u8 UnknownString_2ndRound[] = _("2nd round");
+const u8 UnknownString_3rdRound[] = _("3rd round");
+const u8 UnknownString_4thRound[] = _("4th round");
+const u8 UnknownString_5thRound[] = _("5th round");
+const u8 UnknownString_6thRound[] = _("6th round");
+const u8 UnknownString_7thRound[] = _("7th round");
+const u8 UnknownString_8thRound[] = _("8th round");
+
+
+const struct MenuAction gUnknown_0842C29C[] = {
+ {UnknownString_1stRound, sub_814A4B8},
+ {UnknownString_2ndRound, sub_814A4B8},
+ {UnknownString_3rdRound, sub_814A4B8},
+ {UnknownString_4thRound, sub_814A4B8},
+ {UnknownString_5thRound, sub_814A4B8},
+ {UnknownString_6thRound, sub_814A4B8},
+ {UnknownString_7thRound, sub_814A4B8},
+ {UnknownString_8thRound, sub_814A4B8}
+};
+
int unref_sub_814A414(void)
{
MenuZeroFillScreen();
@@ -40,7 +60,7 @@ static u8 sub_814A464(void)
}
}
-u8 sub_814A4B8(void)
+static u8 sub_814A4B8(void)
{
gSaveBlock2.battleTower.var_4AE[0] = 3;
gSaveBlock2.battleTower.var_4AE[1] = 3;