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 /engine/movie/oak_speech | |
| 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 'engine/movie/oak_speech')
| -rw-r--r-- | engine/movie/oak_speech/oak_speech.asm | 4 | ||||
| -rw-r--r-- | engine/movie/oak_speech/oak_speech2.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 5c364435..02826b98 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -118,7 +118,7 @@ OakSpeech: call PlaySound pop af ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a ld c, 4 call DelayFrames ld de, RedSprite @@ -146,7 +146,7 @@ OakSpeech: call PlaySound pop af ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a ld c, 20 call DelayFrames hlcoord 6, 5 diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm index 40c75f62..ceaa6838 100644 --- a/engine/movie/oak_speech/oak_speech2.asm +++ b/engine/movie/oak_speech/oak_speech2.asm @@ -177,7 +177,7 @@ DisplayIntroNameTextBox: ld [wLastMenuItem], a inc a ld [wTopMenuItemX], a - ld [wMenuWatchedKeys], a ; A_BUTTON + ld [wMenuWatchedKeys], a ; PAD_A inc a ld [wTopMenuItemY], a inc a |