Merge pull request #788 from kazblox/master

Fix NONMATCHINGs and actual English Debug support

3 files changed, 101 insertions, 82 deletions

diff --git a/data/btl_attrs.s b/data/btl_attrs.s
index 3cee4e1c8..54328e7c7 100644
--- a/data/btl_attrs.s
+++ b/data/btl_attrs.s
@@ -104,11 +104,16 @@ gUnknown_Debug_821F5AC::
 	.byte 0x09, 0x14, 0x00, 0x00, 0x14, 0x00, 0x14, 0x00, 0x0a, 0x00, 0x14, 0x00, 0x00, 0x14, 0x14, 0x00, 0x0b, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00
 	.byte 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x0e, 0x14, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 
+.ifdef ENGLISH
+Str_821F624:: @ 0x821F624
+	.string "ーーーーーーーー$"
+.else @ GERMAN
 Str_821F624:: @ 0x821F624
 	.string "ーーーーーーーーーーーー$"
+.endif @ GERMAN
 
-.if DEBUG_TRANSLATE
-
+.if DEBUG_FIX
+@ TODO: GERMAN translations
 str_821F631:: @ 0x821F631
 	.string "JUNICHI$"
 	.string "STEVEN LOW$"
@@ -119,16 +124,18 @@ Str_821F649:: @ 0x821F649
 	.string "TETSUJI$"
 
 debug_unk_0b::
-@ 0x821F64D
-	.string "　　ON$"
+    .string "  "
+
+Str_821F64D::
+	.string "ON$"
 
-@ 0x821F652
+Str_821F652::
 	.string "OFF$"
 
-@ 0x821F655
+Str_821F655::
 	.string "MONO$"
 
-@ 0x821F65A
+Str_821F65A::
 	.string "STEREO$"
 
 @ 0x821F65F
@@ -139,8 +146,7 @@ debug_unk_0b::
 
 @ 0x821F66D
 	.string "Connection error$"
-
-.else @ !DEBUG_TRANSLATE
+.else @ !DEBUG_FIX
 str_821F631:: @ 0x821F631
 	.string "ジュンイチ$"
 	.string "ダイゴロウ$"
@@ -151,16 +157,18 @@ Str_821F649:: @ 0x821F649
 	.string "てつじ$"
 
 debug_unk_0b::
-@ 0x821F64D
-	.string "　　オン$"
+    .string "  "
+
+Str_821F64D::
+	.string "オン$"
 
-@ 0x821F652
+Str_821F652::
 	.string "オフ$"
 
-@ 0x821F655
+Str_821F655::
 	.string "モノラル$"
 
-@ 0x821F65A
+Str_821F65A::
 	.string "ステレオ$"
 
 @ 0x821F65F
@@ -172,7 +180,7 @@ debug_unk_0b::
 @ 0x821F66D
 	.string "せつぞくエラー$"
 
-.endif @ !DEBUG_TRANSLATE
+.endif @ !DEBUG_FIX
 
 @ 0x821f675
 	.byte 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
@@ -191,7 +199,8 @@ gUnknown_Debug_821F680::
 gUnknown_Debug_821F798::
 	.byte 0xc0, 0x03, 0x00, 0x00, 0xd6, 0x03, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x56, 0x04, 0x00, 0x00, 0xc0, 0x0b, 0x00, 0x00, 0xd6, 0x0b, 0x00, 0x00, 0x40, 0x0c, 0x00, 0x00, 0x56, 0x0c, 0x00, 0x00
 
-.if DEBUG_TRANSLATE
+.if DEBUG_FIX
+@ TODO: GERMAN translations
 Str_821F7B8:: @ 0x821F7B8
 	.string "HEIGHT$"
 
@@ -210,7 +219,7 @@ Str_821F7EA:: @ 0x821F7EA
 gUnknown_Debug_821F7F3::
 	.string "Would you like to save?$"
 
-.else @ !DEBUG_TRANSLATE
+.else @ !DEBUG_FIX
 
 Str_821F7B8:: @ 0x821F7B8
 	.string "たかさ　$"
@@ -229,7 +238,7 @@ Str_821F7EA:: @ 0x821F7EA
 @ 0x821F7F3
 gUnknown_Debug_821F7F3::
 	.string "セーブしますか？$"
-.endif @ DEBUG_TRANSLATE
+.endif @ !DEBUG_FIX
 
 .endif @ DEBUG
 
diff --git a/data/debug_mystery_event_scripts.s b/data/debug_mystery_event_scripts.s
index a64f8351d..830cbeca6 100644
--- a/data/debug_mystery_event_scripts.s
+++ b/data/debug_mystery_event_scripts.s
@@ -17,8 +17,20 @@
 
 	.section .rodata
 
+.ifdef ENGLISH
+    .set unkConstant, 2
+.else @ GERMAN
+    .set unkConstant, 4
+.endif @ GERMAN
+
+.ifdef SAPPHIRE
+    .set versionMask, 0x100
+.else @ RUBY
+    .set versionMask, 0x80
+.endif @ RUBY
+
 gUnknown_Debug_845DAE1::
-	me_checkcompat gUnknown_Debug_845DAE1, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845DAE1, unkConstant, unkConstant, 0x4, versionMask
 	me_crc 0x0, _0845DAFF, _0845DAFFEnd
 _0845DAFF:
 	me_initramscript MAP_PETALBURG_CITY_GYM, 0x1, _845DB56, _845DB56End
@@ -26,15 +38,15 @@ _0845DAFF:
 	me_runscript _0845DD0D
 	me_end
 
-.if DEBUG_TRANSLATE
+.ifdef ENGLISH
 _0845DB16:
-	.string "Run and visit your DAD in the\n"
-	.string "PETALBURG CITY GYM.$"
-.else
+	.string "Go see your father at the GYM in\n"
+	.string "PETALBURG.$"
+.else @ GERMAN
 _0845DB16:
 	.string "Lauf und besuche deinen Vater in der\n"
 	.string "ARENA von BLÜTENBURG CITY.$"
-.endif
+.endif @ GERMAN
 _845DB56:
 	setvaddress _845DB56
 	checkitem ITEM_EON_TICKET, 0x1
@@ -70,22 +82,22 @@ _0845DBB5:
 	release
 	end
 
-.if DEBUG_TRANSLATE
+.ifdef ENGLISH
 _0845DBBE:
-	.string "DAD: {PLAYER}! Nice to see you!\n"
-	.string "Here is a Letter for you, {PLAYER}.$"
+	.string "DAD: {PLAYER}! Good to see you!\n"
+	.string "There's a letter here for you, {PLAYER}.$"
 _0845DC00:
-	.string "DAD: I'm not sure. It could be a\n"
-	.string "TICKET for a Ferry.\p"
-	.string "You should go to LILYCOVE CITY and\n"
-	.string "ask about it there.$"
+	.string "DAD: It appears to be a ferry TICKET,\n"
+	.string "but I've never seen one like it before.\p"
+	.string "You should visit LILYCOVE and ask\n"
+	.string "about it there.$"
 
 _0845DC94:
-	.string "DAD: {PLAYER}, the KEY ITEMS pocket\n"
-	.string "in your BAG is full.\p"
-	.string "Store some of your KEY ITEMS in\n"
-	.string "the PC and come back later.$"
-.else @ !DEBUG_TRANSLATE
+	.string "DAD: {PLAYER}, the KEY ITEMS POCKET in\n"
+	.string "your BAG is full.\p"
+	.string "Move some key items for safekeeping\n"
+	.string "in your PC, then come see me.$"
+.else @ GERMAN
 _0845DBBE:
 	.string "VATER: {PLAYER}! Schön, dich zu sehen!\n"
 	.string "Hier ist ein Brief für dich, {PLAYER}.$"
@@ -100,7 +112,7 @@ _0845DC94:
 	.string "deines BEUTELS ist voll.\p"
 	.string "Lagere einige deiner Basis-Items in\n"
 	.string "deinem PC und komm dann wieder.$"
-.endif @ !DEBUG_TRANSLATE
+.endif @ GERMAN
 
 _845DB56End:
 	.size _845DB56, _845DB56End - _845DB56
@@ -132,26 +144,25 @@ _0845DD5B:
 	setmysteryeventstatus 0x3
 	end
 
-.if DEBUG_TRANSLATE
+.ifdef ENGLISH
 _0845DD63:
-	.string "This GIFT can only be used\n"
-	.string "once.$"
+	.string "This EVENT may be played only once.$"
 _0845DD95:
-	.string "The KEY ITEMS pocket is full.$"
-.else
+	.string "Your BAG's KEY ITEMS POCKET is full.$"
+.else @ GERMAN
 _0845DD63:
 	.string "Dieses GESCHEHEN kann nur einmal\n"
 	.string "gespielt werden.$"
 _0845DD95:
 	.string "Deine BASIS-TASCHE ist voll.$"
-.endif
+.endif @ GERMAN
 
 _0845DAFFEnd:
 	.size _0845DAFF, _0845DAFFEnd - _0845DAFF
 gUnknown_Debug_845DAE1End::
 
 gUnknown_Debug_845DDB2::
-	me_checkcompat gUnknown_Debug_845DDB2, 4, 4, 4, 0x80
+	me_checkcompat gUnknown_Debug_845DDB2, unkConstant, unkConstant, 0x4, versionMask
 	me_checksum 0x0, _0845DDD0, _0845DDD0End
 _0845DDD0:
 	me_setenigmaberry gUnknown_Debug_845DDD6
@@ -164,7 +175,7 @@ _0845DDD0End:
 gUnknown_Debug_845DDB2End::
 
 gUnknown_Debug_845E306::
-	me_checkcompat gUnknown_Debug_845E306, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E306, unkConstant, unkConstant, 0x4, versionMask
 	me_runscript _0845E329
 	me_setmsg 0x2, _0845E34F
 	me_setmsg 0x3, _0845E387
@@ -183,16 +194,15 @@ _0845E34C:
 	setmysteryeventstatus 0x3
 	end
 
-.if DEBUG_TRANSLATE
+.ifdef ENGLISH
 _0845E34F:
-	.string "A POKéMON was added to {PLAYER}'s\n"
-	.string "team.$"
+	.string "A POKéMON was added to the\n"
+	.string "player's party.$"
 
 _0845E387:
-	.string "Your team is full.\n"
-	.string "No more POKéMON can be added to your\l"
-	.string "team.$"
-.else
+	.string "The player's party is full.\n"
+	.string "A POKéMON couldn't be added.$"
+.else @ GERMAN
 _0845E34F:
 	.string "Ein POKéMON wurde in das Team des\n"
 	.string "Spielers aufgenommen.$"
@@ -201,10 +211,10 @@ _0845E387:
 	.string "Das Team des Spielers ist vollständig.\n"
 	.string "Es kann kein weiteres POKéMON\l"
 	.string "aufgenommen werden.$"
-.endif
+.endif @ GERMAN
 
 gUnknown_Debug_845E3E0::
-	me_checkcompat gUnknown_Debug_845E3E0, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E3E0, unkConstant, unkConstant, 0x4, versionMask
 	me_crc 0x0, _0845E3FE, _0845E3FEEnd
 _0845E3FE:
 	me_giveribbon 0x0, 0x1
@@ -214,7 +224,7 @@ _0845E3FEEnd:
 gUnknown_Debug_845E3E0End::
 
 gUnknown_Debug_845E402::
-	me_checkcompat gUnknown_Debug_845E402, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E402, unkConstant, unkConstant, 0x4, versionMask
 	me_crc 0x0, _0845E420, _0845E420End
 _0845E420:
 	me_givenationaldex
@@ -224,7 +234,7 @@ _0845E420End:
 gUnknown_Debug_845E402End::
 
 gUnknown_Debug_845E422::
-	me_checkcompat gUnknown_Debug_845E422, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E422, unkConstant, unkConstant, 0x4, versionMask
 	me_crc 0x0, _0845E440, _0845E440End
 _0845E440:
 	me_addrareword 0x1
@@ -234,7 +244,7 @@ _0845E440End:
 gUnknown_Debug_845E422End::
 
 gUnknown_Debug_845E443::
-	me_checkcompat gUnknown_Debug_845E443, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E443, unkConstant, unkConstant, 0x4, versionMask
 	me_crc 0x0, _0845E461, _0845E461End
 _0845E461:
 	me_givepokemon gUnknown_Debug_845E467
@@ -250,7 +260,7 @@ _0845E461End:
 gUnknown_Debug_845E443End::
 
 gUnknown_Debug_845E4EF::
-	me_checkcompat gUnknown_Debug_845E4EF, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E4EF, unkConstant, unkConstant, 0x4, versionMask
 	me_addtrainer gUnknown_Debug_845E506
 	me_end
 
@@ -259,13 +269,13 @@ gUnknown_Debug_845E506::
 gUnknown_Debug_845E4EFEnd::
 
 gUnknown_Debug_845E606::
-	me_checkcompat gUnknown_Debug_845E606, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E606, unkConstant, unkConstant, 0x4, versionMask
 	me_enableresetrtc
 	me_end
 gUnknown_Debug_845E606End::
 
 gUnknown_Debug_845E619::
-	me_checkcompat gUnknown_Debug_845E619, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E619, unkConstant, unkConstant, 0x4, versionMask
 	me_checksum 0x0, _0845E637, _0845E637End
 _0845E637:
 	me_initramscript MAP_PETALBURG_CITY_GYM, 0x1, _0845E683, _0845E683End
@@ -273,16 +283,15 @@ _0845E637:
 	me_setstatus 0x2
 	me_end
 
-.if DEBUG_TRANSLATE
-
+.ifdef ENGLISH
 _0845E64C:
-	.string "Visit your DAD in the PETALBURG\n"
-	.string "CITY GYM.$"
-.else
+	.string "Go see your dad at the\n"
+	.string "PETALBURG GYM.$"
+.else @ GERMAN
 _0845E64C:
 	.string "Besuche deinen Vater in der ARENA\n"
 	.string "von BLÜTENBURG CITY.$"
-.endif
+.endif @ GERMAN
 
 _0845E683:
 	setvaddress _0845E683
@@ -305,17 +314,17 @@ _0845E683:
 _0845E6BF:
 	gotoram
 
-.if DEBUG_TRANSLATE
+.ifdef ENGLISH
 _0845E6C0:
 	.string "DAD: Hi, {PLAYER}!\p"
-	.string "I have just received this rare\n"
-	.string "BERRY. You can have it!$"
-.else
+	.string "I just received a rare BERRY.\n"
+	.string "I'd like you to have it.$"
+.else @ GERMAN
 _0845E6C0:
 	.string "VATER: Hi, {PLAYER}!\p"
 	.string "Ich habe gerade diese seltene BEERE\n"
 	.string "erhalten. Ich schenke sie dir!$"
-.endif
+.endif @GERMAN
 
 _0845E637End:
 	.size _0845E637, _0845E637End - _0845E637
@@ -324,7 +333,7 @@ _0845E683End:
 gUnknown_Debug_845E619End::
 
 gUnknown_Debug_845E712::
-	me_checkcompat gUnknown_Debug_845E712, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E712, unkConstant, unkConstant, 0x4, versionMask
 	me_crc 0x0, _0845E730, _0845E730End
 _0845E730:
 	me_runscript _0845E736
@@ -345,26 +354,26 @@ _0845E755:
 	setmysteryeventstatus 0x3
 	end
 
-.if DEBUG_TRANSLATE
+.ifdef ENGLISH
 _0845E75D:
-	.string "{STR_VAR_1} was handed over.$"
+	.string "{STR_VAR_1} was received!$"
 _0845E771:
-	.string "There is no room for {STR_VAR_1}\n"
-	.string "available...$"
-.else
+	.string "There was no room to accept\n"
+	.string "{STR_VAR_1}...$"
+.else @ GERMAN
 _0845E75D:
 	.string "{STR_VAR_1} wurde übergeben.$"
 _0845E771:
 	.string "Es ist kein Platz für {STR_VAR_1}\n"
 	.string "vorhanden...$"
-.endif
+.endif @ GERMAN
 
 _0845E730End:
 	.size _0845E730, _0845E730End - _0845E730
 gUnknown_Debug_845E712End::
 
 gUnknown_Debug_845E797::
-	me_checkcompat gUnknown_Debug_845E797, 0x4, 0x4, 0x4, 0x80
+	me_checkcompat gUnknown_Debug_845E797, unkConstant, unkConstant, 0x4, versionMask
 	me_crc 0x0, gUnknown_Debug_845E7B5, gUnknown_Debug_845E7B5End
 gUnknown_Debug_845E7B5::
 	me_setrecordmixinggift 0x1, 0x3, ITEM_POTION
diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s
index e4a4cf95c..361ecf847 100644
--- a/data/pokemon_storage_system.s
+++ b/data/pokemon_storage_system.s
@@ -73,13 +73,14 @@ gSpriteTemplate_83BBC88:: @ 83BBC88
 	spr_template 1, 56006, gOamData_83BBC34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_809CB74
 
 .if DEBUG
-.if DEBUG_TRANSLATE
+.if DEBUG_FIX
 gUnknown_Debug_0x83E6268:: @ 0x83E6268
+@ TODO: translations
 	.string "SET$"
-.else
+.else @ !DEBUG_FIX
 gUnknown_Debug_0x83E6268:: @ 0x83E6268
 	.string "セットする$"
-.endif
+.endif @ !DEBUG_FIX
 .endif
 
 	.align 2