diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-06-30 12:47:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 12:47:22 -0400 |
| commit | 56c405de09ce267c4cfbc68a15c37b2ff51c635a (patch) | |
| tree | 47d25c237e9af824f7a57295a2d2e298b194a8e6 /home/trainers.asm | |
| parent | Distinguish single trainer pics section from Pokemon pics (diff) | |
| download | pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.gz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.xz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.zip | |
Replace hardware_constants.asm with hardware.inc (#511)
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 04752cc2..835121e1 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_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN 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 |