diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-11-07 21:28:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-07 21:28:20 -0600 |
| commit | edf375aff14e54bd54e7a25780fe8b714691ccc7 (patch) | |
| tree | 015c63e79e4a245c28f72b18954f2a845d30271c /home | |
| parent | Ignore tools/pcm (diff) | |
| parent | Fix typo (diff) | |
| download | pokeyellow-edf375aff14e54bd54e7a25780fe8b714691ccc7.tar.gz pokeyellow-edf375aff14e54bd54e7a25780fe8b714691ccc7.tar.xz pokeyellow-edf375aff14e54bd54e7a25780fe8b714691ccc7.zip | |
Merge pull request #63 from dannye/debug
Debug Yellow
Diffstat (limited to 'home')
| -rw-r--r-- | home/npc_movement.asm | 8 | ||||
| -rw-r--r-- | home/overworld.asm | 4 | ||||
| -rw-r--r-- | home/text.asm | 4 | ||||
| -rw-r--r-- | home/trainers.asm | 4 |
4 files changed, 20 insertions, 0 deletions
diff --git a/home/npc_movement.asm b/home/npc_movement.asm index 200d3983..40942bf3 100644 --- a/home/npc_movement.asm +++ b/home/npc_movement.asm @@ -49,4 +49,12 @@ EndNPCMovementScript:: farjp _EndNPCMovementScript DebugPressedOrHeldB:: +IF DEF(_DEBUG) + ldh a, [hJoyHeld] + bit BIT_B_BUTTON, a + ret nz + ldh a, [hJoyPressed] + bit BIT_B_BUTTON, a + ret +ENDC 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/home/trainers.asm b/home/trainers.asm index f407652a..468b63f8 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -127,6 +127,10 @@ TalkToTrainer:: ; checks if any trainers are seeing the player and wanting to fight CheckFightingMapTrainers:: +IF DEF(_DEBUG) + call DebugPressedOrHeldB + jr nz, .trainerNotEngaging +ENDC call CheckForEngagingTrainers ld a, [wSpriteIndex] cp $ff |