summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/berry_blender.h6
-rw-r--r--include/debug.h4
-rw-r--r--include/mystery_event_script.h4
-rw-r--r--include/safari_zone.h2
-rw-r--r--src/berry_blender.c2
-rw-r--r--src/debug/matsuda_debug_menu.c2
-rw-r--r--src/debug/start_menu_debug.c12
-rw-r--r--src/debug/unk_debug_menu_3.c20
-rw-r--r--src/debug/unknown_debug_menu.c2
-rw-r--r--src/mystery_event_script.c4
-rw-r--r--src/safari_zone.c2
11 files changed, 32 insertions, 28 deletions
diff --git a/include/berry_blender.h b/include/berry_blender.h
new file mode 100644
index 000000000..8aaf934e5
--- /dev/null
+++ b/include/berry_blender.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BERRY_BLENDER_H
+#define GUARD_BERRY_BLENDER_H
+
+void debug_sub_80524BC(void);
+
+#endif //GUARD_BERRY_BLENDER_H
diff --git a/include/debug.h b/include/debug.h
index d725b349f..d090f8bed 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -12,7 +12,7 @@ void DebugMenu_8077048(void);
// matsuda_debug_menu
void sub_80AAF30(void);
void Crash(const u8 *text);
-bool8 unref_sub_80A9B28(void);
+bool8 InitMatsudaDebugMenu(void);
// tomomichi_debug_menu
void debug_nullsub_66(void);
@@ -29,7 +29,7 @@ extern const u8 gUnknown_Debug_842E350;
extern const struct UnkDebugMenu3Items gUnknown_Debug_842E2D0[];
// unknown debug menu
-int unref_sub_814A414(void);
+int InitSogabeDebugMenu(void);
// kagaya_debug_menu
bool8 InitKagayaDebugMenu_A(void);
diff --git a/include/mystery_event_script.h b/include/mystery_event_script.h
index a92bb6667..b86a2eed4 100644
--- a/include/mystery_event_script.h
+++ b/include/mystery_event_script.h
@@ -5,8 +5,8 @@ u32 RunMysteryEventScript(u8 *);
void SetMysteryEventScriptStatus(u32 val);
u16 GetRecordMixingGift(void);
#if DEBUG
-bool8 unref_sub_812620C(u8 *a1, const u8 * _a2);
-bool8 unref_sub_81261B4(u8 *a1, const u8 * _a2);
+bool8 debug_sub_812620C(u8 *a1, const u8 * _a2);
+bool8 debug_sub_81261B4(u8 *a1, const u8 * _a2);
#endif // DEBUG
#endif // GUARD_MYSTERY_EVENT_SCRIPT_H
diff --git a/include/safari_zone.h b/include/safari_zone.h
index 08d635794..dd9ca8088 100644
--- a/include/safari_zone.h
+++ b/include/safari_zone.h
@@ -19,6 +19,6 @@ void SafariZoneGetPokeblockNameInFeeder(void);
struct Pokeblock *unref_sub_80C8418(void);
struct Pokeblock *SafariZoneGetActivePokeblock(void);
void SafariZoneActivatePokeblockFeeder(u8 pokeblock_index);
-bool32 unref_sub_80C853C(void);
+bool32 debug_sub_80C853C(void);
#endif // GUARD_SAFARI_ZONE_H
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 5d40ea321..cde189738 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -3276,7 +3276,7 @@ static bool8 Blender_PrintBlendingRanking(void)
// debug menu goes here
-void unref_sub_80524BC(void)
+void debug_sub_80524BC(void)
{
ResetSpriteData();
FreeAllSpritePalettes();
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c
index 7a66ded57..c936af864 100644
--- a/src/debug/matsuda_debug_menu.c
+++ b/src/debug/matsuda_debug_menu.c
@@ -76,7 +76,7 @@ const struct MenuAction gMatsudaDebugMenuActions[] =
{gMatsudaDebugMenu_ActionSetAllArtMuseumText, MatsudaDebugMenu_SetArtMuseumItems},
};
-u8 unref_sub_80A9B28(void)
+u8 InitMatsudaDebugMenu(void)
{
Menu_EraseScreen();
Menu_DrawStdWindowFrame(0, 0, 17, 18);
diff --git a/src/debug/start_menu_debug.c b/src/debug/start_menu_debug.c
index c1f508ebc..549842c6a 100644
--- a/src/debug/start_menu_debug.c
+++ b/src/debug/start_menu_debug.c
@@ -47,9 +47,7 @@
#include "ewram.h"
#include "gba/flash_internal.h"
#include "gba/m4a_internal.h"
-
-// berry_blender.c
-extern void unref_sub_80524BC(void);
+#include "berry_blender.h"
void debug_sub_8076BB4(u8);
void debug_sub_8077CF4(u8 x, u8 y);
@@ -461,7 +459,7 @@ u8 DebugMenu_8076CD4(void)
u8 DebugMenu_8076CD8(void)
{
- SetMainCallback2(unref_sub_80524BC);
+ SetMainCallback2(debug_sub_80524BC);
return 0;
}
@@ -801,7 +799,7 @@ u8 DebugMenu_Exit(void)
u8 DebugMenu_OpenSogabe(void)
{
- return unref_sub_814A414();
+ return InitSogabeDebugMenu();
}
u8 DebugMenu_OpenTamada(void)
@@ -816,7 +814,7 @@ u8 DebugMenu_OpenKagaya(void)
u8 DebugMenu_OpenMatsuda(void)
{
- return unref_sub_80A9B28();
+ return InitMatsudaDebugMenu();
}
u8 DebugMenu_OpenNohara(void)
@@ -1261,7 +1259,7 @@ const u8 Str_839BF1F[] = _("めのまえには\n"
bool8 DebugMenu_8077B00(void)
{
Menu_EraseScreen();
- if (unref_sub_80C853C())
+ if (debug_sub_80C853C())
sub_8071F40(Str_839BF14);
else
sub_8071F40(Str_839BF1F);
diff --git a/src/debug/unk_debug_menu_3.c b/src/debug/unk_debug_menu_3.c
index 138b99104..aaffca383 100644
--- a/src/debug/unk_debug_menu_3.c
+++ b/src/debug/unk_debug_menu_3.c
@@ -21,7 +21,7 @@ size_t debug_sub_813C404(u8 * dest)
{
size_t size = gUnknown_Debug_845DAE1End - gUnknown_Debug_845DAE1;
memcpy(dest, gUnknown_Debug_845DAE1, size);
- unref_sub_812620C(dest, gUnknown_Debug_845DAE1);
+ debug_sub_812620C(dest, gUnknown_Debug_845DAE1);
return size;
}
@@ -32,7 +32,7 @@ size_t debug_sub_813C430(u8 * dest)
{
size_t size = gUnknown_Debug_845E3E0End - gUnknown_Debug_845E3E0;
memcpy(dest, gUnknown_Debug_845E3E0, size);
- unref_sub_812620C(dest, gUnknown_Debug_845E3E0);
+ debug_sub_812620C(dest, gUnknown_Debug_845E3E0);
return size;
}
@@ -43,7 +43,7 @@ size_t debug_sub_813C45C(u8 * dest)
{
size_t size = gUnknown_Debug_845E422End - gUnknown_Debug_845E422;
memcpy(dest, gUnknown_Debug_845E422, size);
- unref_sub_812620C(dest, gUnknown_Debug_845E422);
+ debug_sub_812620C(dest, gUnknown_Debug_845E422);
return size;
}
@@ -54,7 +54,7 @@ size_t debug_sub_813C488(u8 * dest)
{
size_t size = gUnknown_Debug_845E402End - gUnknown_Debug_845E402;
memcpy(dest, gUnknown_Debug_845E402, size);
- unref_sub_812620C(dest, gUnknown_Debug_845E402);
+ debug_sub_812620C(dest, gUnknown_Debug_845E402);
return size;
}
@@ -75,7 +75,7 @@ size_t debug_sub_813C4D4(u8 * dest)
{
size_t size = gUnknown_Debug_845E619End - gUnknown_Debug_845E619;
memcpy(dest, gUnknown_Debug_845E619, size);
- unref_sub_81261B4(dest, gUnknown_Debug_845E619);
+ debug_sub_81261B4(dest, gUnknown_Debug_845E619);
return size;
}
@@ -86,7 +86,7 @@ size_t debug_sub_813C500(u8 * dest)
{
size_t size = gUnknown_Debug_845E712End - gUnknown_Debug_845E712;
memcpy(dest, gUnknown_Debug_845E712, size);
- unref_sub_812620C(dest, gUnknown_Debug_845E712);
+ debug_sub_812620C(dest, gUnknown_Debug_845E712);
return size;
}
@@ -103,7 +103,7 @@ size_t debug_sub_813C52C(u8 * dest, u16 itemId)
ptr += 3;
ptr[0] = itemId;
ptr[1] = itemId >> 8;
- unref_sub_812620C(dest, gUnknown_Debug_845E797);
+ debug_sub_812620C(dest, gUnknown_Debug_845E797);
return size;
}
@@ -152,7 +152,7 @@ size_t debug_sub_813C5B4(u8 * dest)
berry[i] = saveBerry[i];
ClearEnigmaBerries();
- unref_sub_81261B4(dest, gUnknown_Debug_845DDB2);
+ debug_sub_81261B4(dest, gUnknown_Debug_845DDB2);
return size;
}
@@ -248,7 +248,7 @@ size_t debug_sub_813C810(u8 * dest)
memcpy(gUnknown_Debug_845E4CB - src + dest, &mail, sizeof(struct MailStruct));
- unref_sub_812620C(dest, src);
+ debug_sub_812620C(dest, src);
return size;
}
@@ -270,7 +270,7 @@ size_t debug_sub_813C888(u8 * dest)
memcpy(gUnknown_Debug_845E4CB - src + dest, &mail, sizeof(struct MailStruct));
- unref_sub_812620C(dest, src);
+ debug_sub_812620C(dest, src);
return size;
}
diff --git a/src/debug/unknown_debug_menu.c b/src/debug/unknown_debug_menu.c
index ef3e0e66c..787e456d2 100644
--- a/src/debug/unknown_debug_menu.c
+++ b/src/debug/unknown_debug_menu.c
@@ -30,7 +30,7 @@ const struct MenuAction gUnknown_0842C29C[] = {
{UnknownString_8thRound, sub_814A4B8}
};
-int unref_sub_814A414(void)
+int InitSogabeDebugMenu(void)
{
Menu_EraseScreen();
Menu_DrawStdWindowFrame(0, 0, 16, 18);
diff --git a/src/mystery_event_script.c b/src/mystery_event_script.c
index 83aa90102..58f7f8627 100644
--- a/src/mystery_event_script.c
+++ b/src/mystery_event_script.c
@@ -114,7 +114,7 @@ static void SetWord(u8 *ptr, u32 val)
ptr[3] = val >> 24;
}
-bool8 unref_sub_81261B4(u8 *a1, const u8 * _a2)
+bool8 debug_sub_81261B4(u8 *a1, const u8 * _a2)
{
int a2 = (int)_a2;
if (a1[0x0] == 1 && a1[0x11] == 15 && !GetWord(a1 + 0x12))
@@ -129,7 +129,7 @@ bool8 unref_sub_81261B4(u8 *a1, const u8 * _a2)
return FALSE;
}
-bool8 unref_sub_812620C(u8 *a1, const u8 * _a2)
+bool8 debug_sub_812620C(u8 *a1, const u8 * _a2)
{
int a2 = (int)_a2;
if (a1[0x0] == 1 && a1[0x11] == 16 && !GetWord(a1 + 0x12))
diff --git a/src/safari_zone.c b/src/safari_zone.c
index f4f1d96a6..7cc8e16a0 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -236,7 +236,7 @@ static void DecrementFeederStepCounters(void)
}
}
-bool32 unref_sub_80C853C(void)
+bool32 debug_sub_80C853C(void)
{
SafariZoneGetPokeblockNameInFeeder();
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 00:37:11 +0000