Merge pull request #63 from dannye/debug

Debug Yellow

8 files changed, 50 insertions, 7 deletions

diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index 5a8ce978..7a8dc63c 100755
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -35,6 +35,10 @@ CeruleanCityScript4:
 	ret
 
 CeruleanCityScript0:
+IF DEF(_DEBUG)
+	call DebugPressedOrHeldB
+	ret nz
+ENDC
 	CheckEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF
 	jr nz, .asm_194f7
 	ld hl, CeruleanCityCoords1
diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm
index 069fc1b3..d121f883 100755
--- a/scripts/MtMoonB2F.asm
+++ b/scripts/MtMoonB2F.asm
@@ -73,6 +73,10 @@ MtMoonB2F_ScriptPointers:
 	dw MtMoon3Script15
 
 MtMoon3Script0:
+IF DEF(_DEBUG)
+	call DebugPressedOrHeldB
+	ret nz
+ENDC
 	CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL
 	call z, MtMoon3Script_49d28
 	CheckEvent EVENT_BEAT_MT_MOON_3_TRAINER_0
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm
index 33d00c07..45a675e7 100755
--- a/scripts/PalletTown.asm
+++ b/scripts/PalletTown.asm
@@ -271,30 +271,45 @@ PalletTownText_19002:
 	text_far _OakWhewText
 	text_end
 
-PalletTownText8: ; girl
+PalletTownText8:
 	text_far _OakGrassText
 	text_end
 
-PalletTownText2: ; fat man
+PalletTownText2: ; girl
 	text_far _PalletTownText2
 	text_end
 
-PalletTownText3: ; sign by lab
+PalletTownText3: ; fat man
 	text_far _PalletTownText3
 	text_end
 
-PalletTownText4: ; sign by fence
+PalletTownText4: ; sign by lab
 	text_far _PalletTownText4
 	text_end
 
-PalletTownText5: ; sign by Red's house
+PalletTownText5: ; sign by fence
+IF DEF(_DEBUG)
+	text_asm
+	ld a, 239
+	inc a
+	ld [wWhichPewterGuy], a
+	ld hl, PalletTownText_502b
+	call PrintText
+	jp TextScriptEnd
+
+PalletTownText_502b:
+	text_decimal wWhichPewterGuy, 1, 3
+	text "bit"
+	done
+ELSE
 	text_far _PalletTownText5
 	text_end
+ENDC
 
-PalletTownText6: ; sign by Blue's house
+PalletTownText6: ; sign by Red's house
 	text_far _PalletTownText6
 	text_end
 
-PalletTownText7:
+PalletTownText7: ; sign by Blue's house
 	text_far _PalletTownText7
 	text_end
diff --git a/scripts/PewterCity.asm b/scripts/PewterCity.asm
index 26827bef..c1c2d190 100755
--- a/scripts/PewterCity.asm
+++ b/scripts/PewterCity.asm
@@ -26,6 +26,10 @@ PewterCityScript0:
 PewterCityScript_1925e:
 	CheckEvent EVENT_BEAT_BROCK
 	ret nz
+IF DEF(_DEBUG)
+	call DebugPressedOrHeldB
+	ret nz
+ENDC
 	ld hl, CoordsData_19277
 	call ArePlayerCoordsInArray
 	ret nc
diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm
index 5065e559..b9a46f85 100755
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -17,6 +17,10 @@ PokemonTower2F_ScriptPointers:
 	dw PokemonTower2Script2
 
 PokemonTower2Script0:
+IF DEF(_DEBUG)
+	call DebugPressedOrHeldB
+	ret nz
+ENDC
 	CheckEvent EVENT_BEAT_POKEMON_TOWER_RIVAL
 	ret nz
 	ld hl, CoordsData_6055e
diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm
index ed128b3d..984322b6 100755
--- a/scripts/PokemonTower7F.asm
+++ b/scripts/PokemonTower7F.asm
@@ -27,6 +27,10 @@ PokemonTower7F_ScriptPointers:
 	dw PokemonTower7Script11
 
 PokemonTower7Script0:
+IF DEF(_DEBUG)
+	call DebugPressedOrHeldB
+	ret nz
+ENDC
 	CheckEvent EVENT_BEAT_POKEMONTOWER_7_TRAINER_0
 	call z, PokemonTower7Script_60d2a
 	ret
diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm
index 663d9345..f0b31d7f 100755
--- a/scripts/RocketHideoutB4F.asm
+++ b/scripts/RocketHideoutB4F.asm
@@ -69,6 +69,10 @@ RocketHideout4Script3:
 	ret
 
 RocketHideout4Script0:
+IF DEF(_DEBUG)
+	call DebugPressedOrHeldB
+	ret nz
+ENDC
 	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0
 	call z, RocketHideout4Script_455a5
 	CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2
diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm
index 725a5ab3..ff8bb85f 100755
--- a/scripts/SilphCo11F.asm
+++ b/scripts/SilphCo11F.asm
@@ -97,6 +97,10 @@ SilphCo11F_ScriptPointers:
 	dw SilphCo11Script14
 
 SilphCo11Script0:
+IF DEF(_DEBUG)
+	call DebugPressedOrHeldB
+	ret nz
+ENDC
 	CheckEvent EVENT_BEAT_SILPH_CO_11F_TRAINER_0
 	call z, SilphCo11Script_6229c
 	CheckEvent EVENT_782