diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 15:02:53 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-26 15:02:53 -0400 |
| commit | bcf3fe249e1ea815573563a047a5580d2666922a (patch) | |
| tree | c9ec6ffc90645cff95338c59a94241d10ca39922 | |
| parent | 3239ab648c05e39aa84e9d0572ed34dbb63c7054 (diff) | |
Include and fix Cerulean scripts
| -rwxr-xr-x | main.asm | 11 | ||||
| -rwxr-xr-x | scripts/ceruleancity.asm | 27 |
2 files changed, 8 insertions, 30 deletions
@@ -267,12 +267,9 @@ CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" ; 18836 ; INCLUDE "scripts/pallettown.asm" ; INCLUDE "scripts/viridiancity.asm" INCLUDE "scripts/pewtercity.asm" -; INCLUDE "scripts/ceruleancity.asm" -CeruleanCityScript: - dr $1953d,$196cd ; map scripts +INCLUDE "scripts/ceruleancity.asm" -CeruleanCityTextPointers: - dr $196cd,$19a43 ; map scripts + dr $19841,$19a43 ; vermilion scripts ; INCLUDE "scripts/vermilioncity.asm" ; INCLUDE "scripts/celadoncity.asm" CeladonCityScript: @@ -928,8 +925,8 @@ SECTION "bank1D",ROMX,BANK[$1D] dr $74000,$7405c INCLUDE "engine/items/itemfinder.asm" - - dr $740af,$74726 +INCLUDE "scripts/ceruleancity2.asm" + dr $740d4,$74726 VendingMachineMenu: ; 74726 (1d:4726) dr $74726,$75dfe PKMNLeaguePC: ; 75dfe (1d:5dfe) diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index 55254adc..59b0e525 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -2,7 +2,7 @@ CeruleanCityScript: ; 19480 (6:5480) call EnableAutoTextBoxDrawing ld hl, CeruleanCityScriptPointers ld a, [W_CERULEANCITYCURSCRIPT] - jp CallFunctionInTable + jp JumpTable CeruleanCityScript_1948c: ; 1948c (6:548c) xor a @@ -64,9 +64,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8) ld a, [wWalkBikeSurfState] and a jr z, .asm_19512 - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic .asm_19512 ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -136,23 +134,8 @@ CeruleanCityScript1: ; 19567 (6:5567) call SaveEndBattleTextPointers ld a, OPP_SONY1 ld [wCurOpponent], a - - ; select which team to use during the encounter - ld a, [W_RIVALSTARTER] - cp STARTER2 - jr nz, .NotSquirtle - ld a, $7 - jr .done -.NotSquirtle - cp STARTER3 - jr nz, .Charmander - ld a, $8 - jr .done -.Charmander - ld a, $9 -.done + ld a, 3 ld [wTrainerNo], a - xor a ld [hJoyHeld], a call CeruleanCityScript_1955d @@ -171,9 +154,7 @@ CeruleanCityScript2: ; 195b1 (6:55b1) ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic callba Music_RivalAlternateStart ld a, $1 ld [H_SPRITEINDEX], a |