through debug_80C689C

1 files changed, 105 insertions, 70 deletions

diff --git a/data/debug_menu_watanabe.s b/data/debug_menu_watanabe.s
index a8bd429a4..e214bb450 100644
--- a/data/debug_menu_watanabe.s
+++ b/data/debug_menu_watanabe.s
@@ -199,168 +199,189 @@ Str_83F8237:
 
 	.align 2
 _83F823C:
-	.4byte 1
-	.byte 0x82, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 1, 0x00000182
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8248:
 	.string "Level$"
 
 	.align 2
 _83F8250:
-	.4byte 1
-	.byte 0x64, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 1, 0x00000064
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F825C:
 	.string "EXP Points$"
 
 	.align 2
 _83F8268:
-	.4byte 1
-	.byte 0x80, 0x84, 0x1E, 0x00, 0x00, 0x07, 0x00, 0x00
+	.4byte 1, 0x001E8480
+	.byte 0x00, 0x07
+	.align 2
 
 Str_83F8274:
 	.string "ID$"
 
 	.align 2
 _83F8278:
-	.4byte 0
-	.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0A, 0x00, 0x00
+	.4byte 0, 0xFFFFFFFF
+	.byte 0x00, 0x0A
+	.align 2
 
 Str_83F8284:
 	.string "Rnd Numbers$"
 
 	.align 2
 _83F8290:
-	.4byte 0
-	.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0A, 0x00, 0x00
+	.4byte 0, 0xFFFFFFFF
+	.byte 0x00, 0x0A
+	.align 2
 
 Str_83F829C:
 	.string "Sex$"
 
 	.align 2
 _83F82A0:
-	.4byte 0
-	.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
+	.4byte 0, 0x00000002
+	.byte 0x00, 0xFF
+	.align 2
 
 Str_83F82AC:
 	.string "Character$"
 
 	.align 2
 _83F82B8:
-	.4byte 0
-	.byte 0x18, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
+	.4byte 0, 0x00000018
+	.byte 0x00, 0xFF
+	.align 2
 
 Str_83F82C4:
 	.string "Move1$"
 
 	.align 2
 _83F82CC:
-	.4byte 0
-	.byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x00000162
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F82D8:
 	.string "Move2$"
 
 	.align 2
 _83F82E0:
-	.4byte 0
-	.byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x00000162
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F82EC:
 	.string "Move3$"
 
 	.align 2
 _83F82F4:
-	.4byte 0
-	.byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x00000162
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8300:
 	.string "Move4$"
 
 	.align 2
 _83F8308:
-	.4byte 0
-	.byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x00000162
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8314:
 	.string "Hold$"
 
 	.align 2
 _83F831C:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8328:
 	.string "SP. Ability$"
 
 	.align 2
 _83F8334:
-	.4byte 0
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
+	.4byte 0, 0x00000001
+	.byte 0x00, 0xFF
+	.align 2
 
 Str_83F8340:
 	.string "HPrnd$"
 
 	.align 2
 _83F8348:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
+	.4byte 0, 0x0000001F
+	.byte 0x00, 0x02
+	.align 2
 
 Str_83F8354:
 	.string "HPexp$"
 
 	.align 2
 _83F835C:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8368:
 	.string "ATKrnd$"
 
 	.align 2
 _83F8370:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
+	.4byte 0, 0x0000001F
+	.byte 0x00, 0x02
+	.align 2
 
 Str_83F837C:
 	.string "ATKexp$"
 
 	.align 2
 _83F8384:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8390:
 	.string "DEFrnd$"
 
 	.align 2
 _83F8398:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
+	.4byte 0, 0x0000001F
+	.byte 0x00, 0x02
+	.align 2
 
 Str_83F83A4:
 	.string "DEFexp$"
 
 	.align 2
 _83F83AC:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F83B8:
 	.string "SPDrnd$"
 
 	.align 2
 _83F83C0:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
+	.4byte 0, 0x0000001F
+	.byte 0x00, 0x02
+	.align 2
 
 Str_83F83CC:
 	.string "SPDexp$"
 
 	.align 2
 _83F83D4:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F83E0:
 	.string "SP. ATK$"
@@ -368,8 +389,9 @@ Str_83F83E0:
 
 	.align 2
 _83F83EC:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
+	.4byte 0, 0x0000001F
+	.byte 0x00, 0x02
+	.align 2
 
 Str_83F83F8:
 	.string "SP. ATK$"
@@ -377,8 +399,9 @@ Str_83F83F8:
 
 	.align 2
 _83F8404:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8410:
 	.string "SP. DEF$"
@@ -386,8 +409,9 @@ Str_83F8410:
 
 	.align 2
 _83F841C:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
+	.4byte 0, 0x0000001F
+	.byte 0x00, 0x02
+	.align 2
 
 Str_83F8428:
 	.string "SP. DEF$"
@@ -395,72 +419,81 @@ Str_83F8428:
 
 	.align 2
 _83F8434:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8440:
 	.string "Cool$"
 
 	.align 2
 _83F8448:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8454:
 	.string "Beauty$"
 
 	.align 2
 _83F845C:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8468:
 	.string "Cute$"
 
 	.align 2
 _83F8470:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F847C:
 	.string "Smart$"
 
 	.align 2
 _83F8484:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F8490:
 	.string "Tough$"
 
 	.align 2
 _83F8498:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F84A4:
 	.string "Sheen$"
 
 	.align 2
 _83F84AC:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F84B8:
 	.string "Tameness$"
 
 	.align 2
 _83F84C4:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F84D0:
 	.string "{PK}RUS$"
 
 	.align 2
 _83F84D8:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
+	.4byte 0, 0x000000FF
+	.byte 0x00, 0x03
+	.align 2
 
 Str_83F84E4:
 	.string "EGG$"
@@ -468,16 +501,18 @@ Str_83F84E4:
 
 	.align 2
 _83F84EC:
-	.4byte 0
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
+	.4byte 0, 0x00000001
+	.byte 0x00, 0xFF
+	.align 2
 
 Str_83F84F8:
 	.string "Status$"
 
 	.align 2
 _83F8500:
-	.4byte 0
-	.byte 0x06, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
+	.4byte 0, 0x00000006
+	.byte 0x00, 0xFF
+	.align 2
 
 
 gUnknown_Debug_083F850A:: @ 0x83F850A