From 1a8fe435e7deabf06029c8e50201136518e3af73 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Sat, 12 Aug 2017 01:26:29 -0400 Subject: split out src/ directory into categorized subdirectories. --- src/debug/unknown_debug_menu.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/debug/unknown_debug_menu.c (limited to 'src/debug/unknown_debug_menu.c') diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c new file mode 100644 index 000000000..a81625f2a --- /dev/null +++ b/src/debug/unknown_debug_menu.c @@ -0,0 +1,52 @@ +#include "global.h" +#include "menu.h" + +extern u8 gBattleCommunication[]; + +extern u8 (*gCallback_03004AE8)(void); + +extern const struct MenuAction gUnknown_0842C29C[]; + +static u8 sub_814A464(void); + +int unref_sub_814A414(void) +{ + MenuZeroFillScreen(); + MenuDrawTextWindow(0, 0, 16, 18); + PrintMenuItems(2, 1, 8, gUnknown_0842C29C); + InitMenu(0, 1, 1, 8, 0, 15); + gCallback_03004AE8 = sub_814A464; + return 0; +} + +static u8 sub_814A464(void) +{ + s8 result = ProcessMenuInput(); + if (result == -2) + { + return 0; + } + else if (result == -1) + { + CloseMenu(); + return 1; + } + else + { + gBattleCommunication[0] = result; + gCallback_03004AE8 = gUnknown_0842C29C[result].func; + return 0; + } +} + +u8 sub_814A4B8(void) +{ + gSaveBlock2.filler_A8.var_4AE[0] = 3; + gSaveBlock2.filler_A8.var_4AE[1] = 3; + gSaveBlock2.filler_A8.var_4B4 = gBattleCommunication[0] + 1; + gSaveBlock2.filler_A8.var_4B6 = gBattleCommunication[0] + 1; + gSaveBlock2.filler_A8.var_4B0 = 1; + gSaveBlock2.filler_A8.var_4B2 = 1; + CloseMenu(); + return 1; +} -- cgit v1.2.3 From 13c196eda57ebbdb3c7e14bebd2985f1edceae34 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 21 Oct 2017 19:51:28 -0700 Subject: More battle_tower work --- src/debug/unknown_debug_menu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/debug/unknown_debug_menu.c') diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c index a81625f2a..995fb38fc 100644 --- a/src/debug/unknown_debug_menu.c +++ b/src/debug/unknown_debug_menu.c @@ -1,4 +1,5 @@ #include "global.h" +#include "battle_tower.h" #include "menu.h" extern u8 gBattleCommunication[]; @@ -43,10 +44,10 @@ u8 sub_814A4B8(void) { gSaveBlock2.filler_A8.var_4AE[0] = 3; gSaveBlock2.filler_A8.var_4AE[1] = 3; - gSaveBlock2.filler_A8.var_4B4 = gBattleCommunication[0] + 1; - gSaveBlock2.filler_A8.var_4B6 = gBattleCommunication[0] + 1; - gSaveBlock2.filler_A8.var_4B0 = 1; - gSaveBlock2.filler_A8.var_4B2 = 1; + gSaveBlock2.filler_A8.var_4B4[0] = gBattleCommunication[0] + 1; + gSaveBlock2.filler_A8.var_4B4[1] = gBattleCommunication[0] + 1; + gSaveBlock2.filler_A8.var_4B0[0] = 1; + gSaveBlock2.filler_A8.var_4B0[1] = 1; CloseMenu(); return 1; } -- cgit v1.2.3 From b9252e4f2803fe14bd7dd8385da595931b82c8d6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 28 Oct 2017 22:59:19 -0700 Subject: Give more descriptive names for battle tower structs --- src/debug/unknown_debug_menu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/debug/unknown_debug_menu.c') diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c index 995fb38fc..9cc24fc62 100644 --- a/src/debug/unknown_debug_menu.c +++ b/src/debug/unknown_debug_menu.c @@ -42,12 +42,12 @@ static u8 sub_814A464(void) u8 sub_814A4B8(void) { - gSaveBlock2.filler_A8.var_4AE[0] = 3; - gSaveBlock2.filler_A8.var_4AE[1] = 3; - gSaveBlock2.filler_A8.var_4B4[0] = gBattleCommunication[0] + 1; - gSaveBlock2.filler_A8.var_4B4[1] = gBattleCommunication[0] + 1; - gSaveBlock2.filler_A8.var_4B0[0] = 1; - gSaveBlock2.filler_A8.var_4B0[1] = 1; + gSaveBlock2.battleTower.var_4AE[0] = 3; + gSaveBlock2.battleTower.var_4AE[1] = 3; + gSaveBlock2.battleTower.curStreakChallengesCompleted[0] = gBattleCommunication[0] + 1; + gSaveBlock2.battleTower.curStreakChallengesCompleted[1] = gBattleCommunication[0] + 1; + gSaveBlock2.battleTower.curChallengeWins[0] = 1; + gSaveBlock2.battleTower.curChallengeWins[1] = 1; CloseMenu(); return 1; } -- cgit v1.2.3 From c5cda9f16442780794852af54635f6526c4c031a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 1 Nov 2017 23:52:26 -0700 Subject: Use descriptive variable and function names for battle_tower code --- src/debug/unknown_debug_menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/debug/unknown_debug_menu.c') diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c index 9cc24fc62..429f43766 100644 --- a/src/debug/unknown_debug_menu.c +++ b/src/debug/unknown_debug_menu.c @@ -44,10 +44,10 @@ u8 sub_814A4B8(void) { gSaveBlock2.battleTower.var_4AE[0] = 3; gSaveBlock2.battleTower.var_4AE[1] = 3; - gSaveBlock2.battleTower.curStreakChallengesCompleted[0] = gBattleCommunication[0] + 1; - gSaveBlock2.battleTower.curStreakChallengesCompleted[1] = gBattleCommunication[0] + 1; - gSaveBlock2.battleTower.curChallengeWins[0] = 1; - gSaveBlock2.battleTower.curChallengeWins[1] = 1; + gSaveBlock2.battleTower.curStreakChallengesNum[0] = gBattleCommunication[0] + 1; + gSaveBlock2.battleTower.curStreakChallengesNum[1] = gBattleCommunication[0] + 1; + gSaveBlock2.battleTower.curChallengeBattleNum[0] = 1; + gSaveBlock2.battleTower.curChallengeBattleNum[1] = 1; CloseMenu(); return 1; } -- cgit v1.2.3 From fcbcf6f93cf3850bac06c77c49a74c21866ebde8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 17 Dec 2017 21:12:51 -0500 Subject: Decompile data: unknown_debug_menu --- src/debug/unknown_debug_menu.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'src/debug/unknown_debug_menu.c') 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; -- cgit v1.2.3