More debug yellow

only debug menu left

20 files changed, 138 insertions, 53 deletions

diff --git a/audio.asm b/audio.asm
index 2434bf07..15d50c26 100644
--- a/audio.asm
+++ b/audio.asm
@@ -539,7 +539,9 @@ INCLUDE "audio/music/surfingpikachu.asm"
 INCLUDE "audio/music/yellowunusedsong.asm"
 INCLUDE "audio/music/meetjessiejames.asm"
 
-INCBIN "garbage/bank20.bin"
+IF !DEF(_DEBUG)
+    INCBIN "garbage/bank20.bin"
+ENDC
 
 
 ; Pikachu cries are in different banks
diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm
index 826e68fd..2a254ec1 100755
--- a/data/maps/objects/RedsHouse2F.asm
+++ b/data/maps/objects/RedsHouse2F.asm
@@ -3,6 +3,12 @@ RedsHouse2F_Object:
 
 	def_warps
 	warp  7,  1, 2, REDS_HOUSE_1F
+IF DEF(_DEBUG)
+	warp  7,  2, 3, MT_MOON_B2F
+	warp  7,  3, 0, ROCKET_HIDEOUT_ELEVATOR
+	warp  7,  4, 0, POKEMON_TOWER_7F
+	warp  7,  5, 3, SILPH_CO_11F
+ENDC
 
 	def_signs
 
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 01074b74..3957795b 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -2710,6 +2710,14 @@ SelectMenuItem:
 	jp nz, SelectMenuItem_CursorDown ; down
 	bit 2, a
 	jp nz, SwapMovesInMenu ; select
+IF DEF(_DEBUG)
+	bit BIT_START, a
+	jp nz, Func_3d4f5
+	bit BIT_D_RIGHT, a
+	jp nz, Func_3d529
+	bit BIT_D_LEFT, a
+	jp nz, Func_3d523
+ENDC
 	bit 1, a ; B, but was it reset above?
 	push af
 	xor a
@@ -2904,6 +2912,11 @@ NoMovesLeftText:
 	text_end
 
 SwapMovesInMenu:
+IF DEF(_DEBUG)
+	ld a, [wFlags_D733]
+	bit BIT_TEST_BATTLE, a
+	jp nz, Func_3d4f5
+ENDC
 	ld a, [wPlayerBattleStatus3]
 	bit TRANSFORMED, a
 	jp nz, MoveSelectionMenu
diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm
index a85c9c64..5e253fe7 100644
--- a/engine/debug/debug_menu.asm
+++ b/engine/debug/debug_menu.asm
@@ -1,46 +1,2 @@
 DebugMenu:
 	ret
-
-TestBattle:
-.loop
-	call GBPalNormal
-
-	; Don't mess around
-	; with obedience.
-	ld a, 1 << BIT_EARTHBADGE
-	ld [wObtainedBadges], a
-
-	ld hl, wFlags_D733
-	set BIT_TEST_BATTLE, [hl]
-
-	; Reset the party.
-	ld hl, wPartyCount
-	xor a
-	ld [hli], a
-	dec a
-	ld [hl], a
-
-	; Give the player a
-	; level 20 Rhydon.
-	ld a, RHYDON
-	ld [wcf91], a
-	ld a, 20
-	ld [wCurEnemyLVL], a
-	xor a
-	ld [wMonDataLocation], a
-	ld [wCurMap], a
-	call AddPartyMon
-
-	; Fight against a
-	; level 20 Rhydon.
-	ld a, RHYDON
-	ld [wCurOpponent], a
-
-	predef InitOpponent
-
-	; When the battle ends,
-	; do it all again.
-	ld a, 1
-	ld [wUpdateSpritesEnabled], a
-	ldh [hAutoBGTransferEnabled], a
-	jr .loop
diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm
index 5001a5d4..5a267346 100644
--- a/engine/events/hidden_objects/safari_game.asm
+++ b/engine/events/hidden_objects/safari_game.asm
@@ -7,6 +7,10 @@ SafariZoneCheck::
 	jr SafariZoneGameStillGoing
 
 SafariZoneCheckSteps::
+IF DEF(_DEBUG)
+	call DebugPressedOrHeldB
+	ret nz
+ENDC
 	ld a, [wSafariSteps]
 	ld b, a
 	ld a, [wSafariSteps + 1]
diff --git a/engine/gfx/bg_map_attributes.asm b/engine/gfx/bg_map_attributes.asm
index 6f81af63..55313846 100644
--- a/engine/gfx/bg_map_attributes.asm
+++ b/engine/gfx/bg_map_attributes.asm
@@ -1,5 +1,3 @@
-INCLUDE "data/cgb/bg_map_attributes.asm"
-
 LoadBGMapAttributes::
 	ld hl, BGMapAttributesPointers
 	ld a, c ; c = which packet
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index 546b136d..cf1eecdb 100755
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -164,7 +164,11 @@ DisplayTitleScreen:
 	ldh a, [hJoyHeld]
 	cp D_UP | SELECT | B_BUTTON
 	jr z, .go_to_main_menu
+IF DEF(_DEBUG)
+	and A_BUTTON | SELECT | START
+ELSE
 	and A_BUTTON | START
+ENDC
 	jr nz, .go_to_main_menu
 	call DoTitleScreenFunction
 	jr .titleScreenLoop
@@ -194,7 +198,7 @@ IF DEF(_DEBUG)
 	ld a, b
 	bit BIT_SELECT, a
 	jp z, MainMenu
-	callfar Func_fe66e
+	callfar DebugMenu
 	jp hl
 ELSE
 	jp MainMenu
diff --git a/engine/pikachu/pikachu_emotions.asm b/engine/pikachu/pikachu_emotions.asm
index 1378d383..61db6e80 100755
--- a/engine/pikachu/pikachu_emotions.asm
+++ b/engine/pikachu/pikachu_emotions.asm
@@ -164,7 +164,34 @@ StarterPikachuEmotionCommand_subcmd:
 	dw PikachuBillsHouseCheck
 
 StarterPikachuEmotionCommand_nop2:
+IF DEF(_DEBUG)
+	push hl
+	ld hl, wd732
+	bit 1, [hl]
+	pop hl
+	ret z
+	push de
+	ld d, a
+	ld a, [wCurMap]
+	cp REDS_HOUSE_2F
+	ld a, d
+	pop de
+	ret nz
+	push de
+	call Pikachu_LoadCurrentMapViewUpdateSpritesAndDelay3
+	call LoadFontTilePatterns
+	ld hl, ExpressionText
+	call PrintText
+	call Pikachu_LoadCurrentMapViewUpdateSpritesAndDelay3
+	pop de
+	ret
+
+ExpressionText:
+	text_far _ExpressionText
+	text_end
+ELSE
 	ret
+ENDC
 
 StarterPikachuEmotionCommand_9:
 	push de
@@ -184,7 +211,35 @@ DeletedFunction_fcffb:
 REPT 5
 	nop
 ENDR
+IF DEF(_DEBUG)
+	push hl
+	ld hl, wd732
+	bit 1, [hl]
+	pop hl
+	ret z
+	push de
+	ld d, a
+	ld a, [wCurMap]
+	cp REDS_HOUSE_2F
+	ld a, d
+	pop de
+	ret nz
+	ld a, [wExpressionNumber]
+	inc a
+	cp (PikachuEmotion33_id - PikachuEmotionTable) / 2
+	jr c, .valid
+	ldpikaemotion a, PikachuEmotion1
+.valid
+	ld [wExpressionNumber], a
+	ret
+
+HallOfFamePCForever:
+	callfar HallOfFamePC
+	call WaitForTextScrollButtonPress
+	jr HallOfFamePCForever
+ELSE
 	ret
+ENDC
 
 PlaySpecificPikachuEmotion:
 	ld a, e
diff --git a/engine/pikachu/pikachu_pic_animation.asm b/engine/pikachu/pikachu_pic_animation.asm
index 755395ba..4f56d542 100755
--- a/engine/pikachu/pikachu_pic_animation.asm
+++ b/engine/pikachu/pikachu_pic_animation.asm
@@ -850,6 +850,3 @@ PikaPicAnimCommand_thunderbolt:
 	ret
 
 INCLUDE "data/pikachu/pikachu_pic_animation.asm"
-
-Func_fe66e:
-	ret
diff --git a/home/overworld.asm b/home/overworld.asm
index 68d50695..26451bf1 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -2292,7 +2292,11 @@ CheckForUserInterruption::
 	jr z, .input
 
 	ldh a, [hJoy5]
+IF DEF(_DEBUG)
+	and START | SELECT | A_BUTTON
+ELSE
 	and START | A_BUTTON
+ENDC
 	jr nz, .input
 
 	dec c
diff --git a/home/text.asm b/home/text.asm
index adb81425..70fade56 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -629,7 +629,11 @@ TextCommandJumpTable::
 	dw TextCommand_BOX           ; TX_BOX
 	dw TextCommand_LOW           ; TX_LOW
 	dw TextCommand_PROMPT_BUTTON ; TX_PROMPT_BUTTON
+IF DEF(_DEBUG)
+	dw _ContTextNoPause          ; TX_SCROLL
+ELSE
 	dw TextCommand_SCROLL        ; TX_SCROLL
+ENDC
 	dw TextCommand_START_ASM     ; TX_START_ASM
 	dw TextCommand_NUM           ; TX_NUM
 	dw TextCommand_PAUSE         ; TX_PAUSE
diff --git a/layout.link b/layout.link
index ef6da300..40b00dee 100644
--- a/layout.link
+++ b/layout.link
@@ -183,6 +183,7 @@ ROMX $2E
 	"Pokédex Text"
 ROMX $2f
 	"Move Names"
+	"BG Map Attributes (Debug)"
 	org $5000
 	"BG Map Attributes"
 ROMX $30
diff --git a/main.asm b/main.asm
index 795204dd..30ce5825 100755
--- a/main.asm
+++ b/main.asm
@@ -311,15 +311,27 @@ INCLUDE "data/battle_anims/subanimations.asm"
 INCLUDE "data/battle_anims/frame_blocks.asm"
 
 
+SECTION "BG Map Attributes (Debug)", ROMX
+
+IF DEF(_DEBUG)
+    INCLUDE "engine/gfx/bg_map_attributes.asm"
+ENDC
+
+
 SECTION "BG Map Attributes", ROMX
 
-INCLUDE "engine/gfx/bg_map_attributes.asm"
+INCLUDE "data/cgb/bg_map_attributes.asm"
+IF !DEF(_DEBUG)
+    INCLUDE "engine/gfx/bg_map_attributes.asm"
+ENDC
 
 
 SECTION "bank30", ROMX
 
 ; This whole bank is garbage data.
-INCBIN "garbage/bank30.bin"
+IF !DEF(_DEBUG)
+    INCBIN "garbage/bank30.bin"
+ENDC
 
 
 SECTION "bank3A", ROMX
@@ -414,3 +426,4 @@ INCLUDE "engine/pikachu/pikachu_status.asm"
 INCLUDE "engine/pikachu/pikachu_emotions.asm"
 INCLUDE "engine/pikachu/pikachu_movement.asm"
 INCLUDE "engine/pikachu/pikachu_pic_animation.asm"
+INCLUDE "engine/debug/debug_menu.asm"
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/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