diff options
author | dannye <33dannye@gmail.com> | 2020-11-07 14:35:40 -0600 |
---|---|---|
committer | dannye <33dannye@gmail.com> | 2020-11-07 14:35:40 -0600 |
commit | 453107ab8ac6a7b76d21c466e32aa7290643724d (patch) | |
tree | 5b2fd7691446b591fca4c3dc396d5a672299f892 /engine/pikachu | |
parent | 989545f0e03b7e32d8ea80d8ab4455576dbd7116 (diff) |
More debug yellow
only debug menu left
Diffstat (limited to 'engine/pikachu')
-rwxr-xr-x | engine/pikachu/pikachu_emotions.asm | 55 | ||||
-rwxr-xr-x | engine/pikachu/pikachu_pic_animation.asm | 3 |
2 files changed, 55 insertions, 3 deletions
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 |