dump some debug baseroms

4 files changed, 142 insertions, 80 deletions

diff --git a/data/btl_attrs.s b/data/btl_attrs.s
index 1628f9018..5f44a87b8 100644
--- a/data/btl_attrs.s
+++ b/data/btl_attrs.s
@@ -204,8 +204,64 @@ gSpriteTemplate_81F96D0:: @ 81F96D0
 	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_800F828
 
 .if DEBUG
-UnkDebug0::
-    .include "data/debug_unk_0.inc"
+
+UnkDebug0:: @ 0x821F3B8
+    .incbin "baserom_de_debug.gba", 0x21F3B8, 620
+
+Str_821F624:: @ 0x821F624
+	.string "ーーーーーーーーーーーー$"
+
+str_821F631:: @ 0x821F631
+	.string "ジュンイチ$"
+	.string "ダイゴロウ$"
+	.string "バレンシア$"
+	.string "ハルコマチ$"
+
+Str_821F649:: @ 0x821F649
+	.string "てつじ$"
+
+debug_unk_0b::
+@ 0x821F64D
+	.string "　　オン$"
+
+@ 0x821F652
+	.string "オフ$"
+
+@ 0x821F655
+	.string "モノラル$"
+
+@ 0x821F65A
+	.string "ステレオ$"
+
+@ 0x821F65F
+	.string "テストです$"
+
+@ 0x821F665
+	.string "うけとったって$"
+
+@ 0x821F66D
+	.string "せつぞくエラー$"
+
+.incbin "baserom_de_debug.gba", 0x21F675, 323
+
+Str_821F7B8:: @ 0x821F7B8
+	.string "たかさ　$"
+
+Str_821F7BD:: @ 0x821F7BD
+	.string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}たかさ　　　ひこう\n"
+	.string "ポケモン　　ファイル$"
+
+Str_821F7DA:: @ 0x821F7DA
+	.string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}ロード\n"
+	.string "セーブ$"
+
+Str_821F7EA:: @ 0x821F7EA
+	.string "ロードしますか？$"
+
+@ 0x821F7F3
+gUnknown_Debug_821F7F3::
+	.string "セーブしますか？$"
+
 .endif
 
 	.align 2
diff --git a/data/debug_menu_watanabe.s b/data/debug_menu_watanabe.s
index 3af2f893f..58f9b21fd 100644
--- a/data/debug_menu_watanabe.s
+++ b/data/debug_menu_watanabe.s
@@ -612,19 +612,60 @@ gUnknown_Debug_083F875C:: @ 0x83F875C
 	.string "DebugーG$"
 
 gUnknown_Debug_083F8764::
-	.incbin "baserom_de_debug.gba", 0x3F8764, 4
+	.string " $"
+	.byte 0, 0
 
 gUnknown_Debug_083F8768::
-	.incbin "baserom_de_debug.gba", 0x3F8768, 40
+	.4byte 0x00000001
+	.4byte 0x0000000a
+    .4byte 0x00000064
+    .4byte 0x000003e8
+    .4byte 0x00002710
+    .4byte 0x000186a0
+    .4byte 0x000f4240
+    .4byte 0x00989680
+	.4byte 0x05f5e100
+	.4byte 0x3b9aca00
 
 gUnknown_Debug_083F8790::
-	.incbin "baserom_de_debug.gba", 0x3F8790, 64
+	.2byte 0x0000
+    .2byte 0x0002
+    .2byte 0x0004
+    .2byte 0x0006
+    .2byte 0x0008
+    .2byte 0x000a
+    .2byte 0x000c
+    .2byte 0x000e
+    .2byte 0x0010
+    .2byte 0x0012
+    .2byte 0x0014
+    .2byte 0x0016
+    .2byte 0x0018
+    .2byte 0x001a
+    .2byte 0x001c
+    .2byte 0x001e
+	.2byte 0x001f
+    .2byte 0x001e
+    .2byte 0x001c
+    .2byte 0x001a
+    .2byte 0x0018
+    .2byte 0x0016
+    .2byte 0x0014
+    .2byte 0x0012
+    .2byte 0x0010
+    .2byte 0x000e
+    .2byte 0x000c
+    .2byte 0x000a
+    .2byte 0x0008
+    .2byte 0x0006
+    .2byte 0x0004
+    .2byte 0x0002
 
 gUnknown_Debug_083F87D0:: @ 0x83F87D0
 	.string "{COLOR RED}L{ESCAPE}ロ$"
 
 gUnknown_Debug_083F87D8:: @ 0x83F87D8
-.string "{COLOR RED}{ESCAPE}ワR$"
+	.string "{COLOR RED}{ESCAPE}ワR$"
 
 gUnknown_Debug_083F87E0:: @ 0x83F87E0
 	.string "かいはつナンバー$"
@@ -642,7 +683,24 @@ gUnknown_Debug_083F8813:: @ 0x83F8813
 	.string ":$"
 
 gUnknown_Debug_083F8815::
-	.incbin "baserom_de_debug.gba", 0x3F8815, 18
+	.byte 0x00
+    .byte 0x10
+    .byte 0x20
+    .byte 0x20
+    .byte 0x20
+    .byte 0x21
+    .byte 0x20
+    .byte 0x20
+    .byte 0x20
+    .byte 0x21
+    .byte 0x20
+    .byte 0x20
+    .byte 0x20
+    .byte 0x21
+    .byte 0x20
+    .byte 0x20
+    .byte 0x20
+    .byte 0x21
 
 	.align 2
 stru_83F8828::
@@ -653,16 +711,29 @@ stru_83F8838::
 	obj_pal word_83F888C, 0x1000
 	null_obj_pal
 
-@ word_83F8848
-dword_83F8848:
-	.incbin "baserom_de_debug.gba", 0x3F8848, 32
+gOamData_83F8848:
+	.2byte 0x00a0
+	.2byte 0x0000
+	.2byte 0x0000
 
-@ unk_83F8868
-unk_83F8868::
-	.incbin "baserom_de_debug.gba", 0x3F8868, 12
+	.align 2
+gSpriteAnim_83F8850:
+    obj_image_anim_frame 38, 30
+    obj_image_anim_end
+
+gSpriteAnim_83F8858:
+    obj_image_anim_frame 39, 30
+    obj_image_anim_end
+
+gSpriteAnim_83F8860:
+    obj_image_anim_frame 40, 30
+    obj_image_anim_end
+
+gSpriteAnimTable_83F8868::
+	.4byte gSpriteAnim_83F8850, gSpriteAnim_83F8858, gSpriteAnim_83F8860
 
-@ 83F8874
-	spr_template 0x1000, 0x1000, dword_83F8848, unk_83F8868, 0, gDummySpriteAffineAnimTable, debug_80C7584
+gSpriteTemplate_83F8874::
+	spr_template 0x1000, 0x1000, gOamData_83F8848, gSpriteAnimTable_83F8868, 0, gDummySpriteAffineAnimTable, debug_80C7584
 
 word_83F888C::
 	.incbin "graphics/debug/sprite_browser.gbapal"
diff --git a/data/debug_unk_0.inc b/data/debug_unk_0.inc
deleted file mode 100644
index d97e7676f..000000000
--- a/data/debug_unk_0.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-debug_unk_0::
-@ 0x821F3B8
-    .incbin "baserom_de_debug.gba", 0x21F3B8, 620
-
-Str_821F624:: @ 0x821F624
-	.string "ーーーーーーーーーーーー$"
-
-str_821F631:: @ 0x821F631
-	.string "ジュンイチ$"
-	.string "ダイゴロウ$"
-	.string "バレンシア$"
-	.string "ハルコマチ$"
-
-Str_821F649:: @ 0x821F649
-	.string "てつじ$"
-
-debug_unk_0b::
-@ 0x821F64D
-	.string "　　オン$"
-
-@ 0x821F652
-	.string "オフ$"
-
-@ 0x821F655
-	.string "モノラル$"
-
-@ 0x821F65A
-	.string "ステレオ$"
-
-@ 0x821F65F
-	.string "テストです$"
-
-@ 0x821F665
-	.string "うけとったって$"
-
-@ 0x821F66D
-	.string "せつぞくエラー$"
-
-.incbin "baserom_de_debug.gba", 0x21F675, 323
-
-Str_821F7B8:: @ 0x821F7B8
-	.string "たかさ　$"
-
-Str_821F7BD:: @ 0x821F7BD
-	.string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}たかさ　　　ひこう\n"
-	.string "ポケモン　　ファイル$"
-
-Str_821F7DA:: @ 0x821F7DA
-	.string "{PALETTE 1}{COLOR_HIGHLIGHT_SHADOW BLUE YELLOW MAGENTA}ロード\n"
-	.string "セーブ$"
-
-Str_821F7EA:: @ 0x821F7EA
-	.string "ロードしますか？$"
-
-@ 0x821F7F3
-gUnknown_Debug_821F7F3::
-	.string "セーブしますか？$"
diff --git a/data/graphics.s b/data/graphics.s
index e68a2130a..6cc1c2db7 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -1224,11 +1224,7 @@ gUnknown_08D17C3C:: @ 8D17C3C
 
 	.align 2
 gContestMiscGfx:: @ 8D17D6C
-.if DEBUG
-	.incbin "baserom_de_debug.gba", 0xD17DDC, 0xD188DC-0xD17DDC
-.else
 	.incbin "graphics/contest/misc.4bpp.lz"
-.endif
 
 	.align 2
 gContestAudienceGfx:: @ 8D18818
@@ -1251,11 +1247,7 @@ gTiles_8D1975C:: @ 8D1975C
 
 	.align 2
 gUnknown_08D1977C:: @ 8D1977C
-.if DEBUG
-	.incbin "baserom_de_debug.gba", 0xD19840, 0xD1A2E8-0xD19840
-.else
 	.incbin "graphics/contest/misc_2.4bpp.lz"
-.endif
 
 	.align 2
 gUnknown_08D1A250:: @ 8D1A250