diff options
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 8 | ||||
| -rwxr-xr-x | scripts/vermiliondock.asm | 6 |
4 files changed, 12 insertions, 6 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 5ba6b07f..9fb1361d 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -94,7 +94,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(VermilionMart_h) db BANK(VermilionGym_h) db BANK(VermilionHouse1_h) - db $07 ; db BANK(VermilionDock_h) + db BANK(VermilionDock_h) db $18 ; db BANK(SSAnne1_h) db $18 ; db BANK(SSAnne2_h) db $11 ; db BANK(SSAnne3_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 7f54aecc..65c99b4a 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -94,7 +94,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw VermilionMart_h dw VermilionGym_h dw VermilionHouse1_h - dw $544e ; dw VermilionDock_h + dw VermilionDock_h dw $52a4 ; dw SSAnne1_h dw $53de ; dw SSAnne2_h dw $49bf ; dw SSAnne3_h @@ -364,7 +364,13 @@ INCBIN "maps/bikeshop.blk" INCLUDE "data/mapHeaders/vermilionhouse1.asm" INCLUDE "scripts/vermilionhouse1.asm" INCLUDE "data/mapObjects/vermilionhouse1.asm" - dr $1d44e,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/vermiliondock.asm" +INCLUDE "scripts/vermiliondock.asm" +INCLUDE "data/mapObjects/vermiliondock.asm" +VermilionDockBlocks: +INCBIN "maps/vermiliondock.blk" + dr $1d636,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index 78ada7cf..cef1766e 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -40,8 +40,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) SetEventForceReuseHL EVENT_SS_ANNE_LEFT ld a, $ff ld [wJoyIgnore], a - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld c, BANK(Music_Surfing) ld a, MUSIC_SURFING call PlayMusic @@ -63,6 +62,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) ld [H_AUTOBGTRANSFERENABLED], a ld [wSSAnneSmokeDriftAmount], a ld [rOBP1], a + call UpdateGBCPal_OBP1 ld a, 88 ld [wSSAnneSmokeX], a ld hl, wMapViewVRAMPointer @@ -124,7 +124,7 @@ VermilionDock_1db9b: ; 1db9b (7:5b9b) VermilionDock_AnimSmokePuffDriftRight: ; 1dc42 (7:5c42) push bc push de - ld hl, wOAMBuffer + $11 + ld hl, wOAMBuffer + 4 * $4 + 1 ; x coord ld a, [wSSAnneSmokeDriftAmount] swap a ld c, a |