summaryrefslogtreecommitdiff
path: root/src/battle_main.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-10-02 12:01:45 -0400
committerGitHub <noreply@github.com>2019-10-02 12:01:45 -0400
commit27070e42f31acc805d7444e840aadbdaa83be6ee (patch)
treeaed3fe304abc22c33c6e4c3e1ca1f233f8b37afc /src/battle_main.c
parent1bd678656c735bbeb603ccb80367c7a85f820f61 (diff)
parent99e6a6639efa5d2113fe2787e5be4f0d98f0bf78 (diff)
Merge pull request #757 from easyaspi314/debug-english
English Debug menu translations!
Diffstat (limited to 'src/battle_main.c')
-rw-r--r--src/battle_main.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/battle_main.c b/src/battle_main.c
index 56eabd515..c0147d11d 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -1402,9 +1402,9 @@ extern const u16 gUnknown_Debug_821F424[][5];
extern const u16 gUnknown_Debug_821F56C[][5];
extern const u32 gUnknown_Debug_821F798[][4];
-extern const u8 gUnusedOldCharmap_Gfx_lz[];
-extern const u8 gUnusedOldCharmap_Tilemap_lz[];
-extern const u8 gUnusedOldCharmap_Pal_lz[];
+extern const u8 gDebugBattleCharmap_Gfx_lz[];
+extern const u8 gDebugBattleCharmap_Tilemap_lz[];
+extern const u8 gDebugBattleCharmap_Pal_lz[];
void debug_sub_8010800(void)
{
@@ -1457,10 +1457,10 @@ void debug_sub_80108B8(void)
REG_BG1CNT = 0x4801;
REG_BLDCNT = 0;
REG_BLDY = 0;
- LZDecompressVram(gUnusedOldCharmap_Gfx_lz, (void *)VRAM);
- LZDecompressWram(gUnusedOldCharmap_Tilemap_lz, gSharedMem);
- LZDecompressVram(gUnusedOldCharmap_Pal_lz, (void *)PLTT);
- LZDecompressVram(gUnusedOldCharmap_Pal_lz, (void *)(PLTT + 0x1E0));
+ LZDecompressVram(gDebugBattleCharmap_Gfx_lz, (void *)VRAM);
+ LZDecompressWram(gDebugBattleCharmap_Tilemap_lz, gSharedMem);
+ LZDecompressVram(gDebugBattleCharmap_Pal_lz, (void *)PLTT);
+ LZDecompressVram(gDebugBattleCharmap_Pal_lz, (void *)(PLTT + 0x1E0));
m4aSoundVSyncOn();
SetVBlankCallback(debug_sub_8011D40);
SetMainCallback2(debug_sub_8010CAC);
@@ -2475,11 +2475,13 @@ void debug_nullsub_3(void)
extern const u32 gUnknown_Debug_821F680[][0x23];
+// Shows a cursor
void debug_sub_80125A0(void)
{
gSharedMem[gUnknown_Debug_821F680[gUnknown_Debug_03004360][gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5]] = 0x6D;
}
+// Hides a cursor
void debug_sub_80125E4(void)
{
gSharedMem[gUnknown_Debug_821F680[gUnknown_Debug_03004360][gUnknown_Debug_030043A0 + gUnknown_Debug_030043A4 * 5]] = 0x81;