More debug yellow

only debug menu left

7 files changed, 77 insertions, 50 deletions

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