diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /home/trainers.asm | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'home/trainers.asm')
| -rw-r--r-- | home/trainers.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/home/trainers.asm b/home/trainers.asm index 5048a8c5..fa9167fc 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -149,7 +149,7 @@ ENDC xor a ; EXCLAMATION_BUBBLE ld [wWhichEmotionBubble], a predef EmotionBubble - ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_CTRL_PAD ld [wJoyIgnore], a xor a ldh [hJoyHeld], a @@ -349,7 +349,7 @@ PrintEndBattleText:: push af ld a, [wEndBattleTextRomBank] ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a push hl farcall SaveTrainerName ld hl, TrainerEndBattleText @@ -357,7 +357,7 @@ PrintEndBattleText:: pop hl pop af ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a farcall SetEnemyTrainerToStayAndFaceAnyDirection jp WaitForSoundToFinish |