diff options
| author | IIMarckus <iimarckus@gmail.com> | 2018-06-23 05:15:40 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2018-06-23 05:15:40 -0600 |
| commit | d65cb5004e20387c7c808ccde3ca8407c73f1213 (patch) | |
| tree | b21b7f481d1d65b7bb9e65d4b45e6abf30ca65b5 | |
| parent | 6ecb818d5f1710a650301995a351db71e079411e (diff) | |
Extract a little more from Oak's speech.
| -rw-r--r-- | engine/menu/main_menu.asm | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index e452bbf..27e8f1d 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -60,9 +60,9 @@ MainMenuHeader: MainMenuJumptable: ; 01:5457 dw $547c - dw $555c + dw NewGame dw $5cf3 - dw $555c + dw NewGame dw $5473 CONTINUE EQU 0 @@ -100,6 +100,8 @@ PlayPokemonSetTimeMenu: db -1 SECTION "Oak Speech", ROMX[$555c], BANK[$01] + +NewGame: ld de, 0 call PlayMusic ld de, 3 @@ -116,11 +118,11 @@ SECTION "Oak Speech", ROMX[$555c], BANK[$01] ld [$ffe8], a ld a, [wce63] bit 1, a - jp z, OakSpeechPlayPokemon - call $5715 - jp $568e + jp z, .OakSpeechPlayPokemon + call Function5715 + jp .PlayerShrink -OakSpeechPlayPokemon: +.OakSpeechPlayPokemon ld de, OakPic lb bc, BANK(OakPic), 0 call $5d27 @@ -136,9 +138,9 @@ OakSpeechPlayPokemon: ld a, $d0 ld [$ff48], a call $5849 - jp $568e + jp .PlayerShrink -OakSpeechNewGame: +.OakSpeechNewGame ld de, OakPic lb bc, BANK(OakPic), 0 call $5d27 @@ -214,6 +216,7 @@ OakSpeechNewGame: call Bankswitch ld c, 4 call DelayFrames +.PlayerShrink ld de, $4743 ld bc, $400 call $5d27 @@ -240,10 +243,32 @@ OakSpeechNewGame: ld a, 0 ld [$d638], a ld [$d637], a - call $56e8 + call Function56e8 ld hl, wce63 bit 2, [hl] call z, Function15b5 ld hl, wd4a9 set 0, [hl] jp Function2a85 + +Function56e8: + ld a, 4 + ld [$d65e], a + ld a, $f2 + ld [$ff9a], a + ld hl, $ce63 + bit 2, [hl] + ret nz + ld a, $f1 + ld [$ff9a], a + ld a, 0 + ld [$cc39], a + ld hl, .Data + ld de, $d656 + ld bc, 8 + call CopyBytes + ret +.Data + db $01, $09, $33, $c6, $04, $04, $00, $01 + +Function5715: |