diff options
| -rw-r--r-- | audio.asm | 6 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 20 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 20 | ||||
| -rw-r--r-- | home/audio.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 16 | ||||
| -rwxr-xr-x | scripts/ssanne7.asm | 12 |
6 files changed, 44 insertions, 34 deletions
@@ -17,6 +17,12 @@ PCM_10 EQU $35 PCM_11 EQU $36 PCM_12 EQU $37 PCM_13 EQU $38 +GLOBAL AUDIO_1, AUDIO_2, AUDIO_3, AUDIO_4 +GLOBAL PCM_1, PCM_2, PCM_3, PCM_4, PCM_5, PCM_6, PCM_7 +GLOBAL PCM_8, PCM_9, PCM_10, PCM_11, PCM_12, PCM_13 + + + INCLUDE "constants.asm" diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 9fb1361d..bbc3034e 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -95,16 +95,16 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(VermilionGym_h) db BANK(VermilionHouse1_h) db BANK(VermilionDock_h) - db $18 ; db BANK(SSAnne1_h) - db $18 ; db BANK(SSAnne2_h) - db $11 ; db BANK(SSAnne3_h) - db $18 ; db BANK(SSAnne4_h) - db $18 ; db BANK(SSAnne5_h) - db $18 ; db BANK(SSAnne6_h) - db $18 ; db BANK(SSAnne7_h) - db $18 ; db BANK(SSAnne8_h) - db $18 ; db BANK(SSAnne9_h) - db $18 ; db BANK(SSAnne10_h) + db BANK(SSAnne1_h) + db BANK(SSAnne2_h) + db BANK(SSAnne3_h) + db BANK(SSAnne4_h) + db BANK(SSAnne5_h) + db BANK(SSAnne6_h) + db BANK(SSAnne7_h) + db BANK(SSAnne8_h) + db BANK(SSAnne9_h) + db BANK(SSAnne10_h) db $1d ; unused db $1d ; unused db $1d ; unused diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 65c99b4a..8037ba29 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -95,16 +95,16 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw VermilionGym_h dw VermilionHouse1_h dw VermilionDock_h - dw $52a4 ; dw SSAnne1_h - dw $53de ; dw SSAnne2_h - dw $49bf ; dw SSAnne3_h - dw $5650 ; dw SSAnne4_h - dw $56d0 ; dw SSAnne5_h - dw $57d5 ; dw SSAnne6_h ;id=100 - dw $58b7 ; dw SSAnne7_h - dw $5993 ; dw SSAnne8_h - dw $5b68 ; dw SSAnne9_h - dw $5d60 ; dw SSAnne10_h + dw SSAnne1_h + dw SSAnne2_h + dw SSAnne3_h + dw SSAnne4_h + dw SSAnne5_h + dw SSAnne6_h ;id=100 + dw SSAnne7_h + dw SSAnne8_h + dw SSAnne9_h + dw SSAnne10_h dw $623d ; dw Lance_h ; unused dw $623d ; dw Lance_h ; unused dw $623d ; dw Lance_h ; unused diff --git a/home/audio.asm b/home/audio.asm index c0dd7b8f..f1daa4f1 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -25,11 +25,11 @@ PlayDefaultMusicCommon:: ; 2118 (0:2118) jr z, .surfing call CheckForNoBikingMusicMap jr c, .walking - ld a, $d2 ; MUSIC_BIKE_RIDING + ld a, MUSIC_BIKE_RIDING jr .next .surfing - ld a, $d6 ; MUSIC_SURFING + ld a, MUSIC_SURFING .next ld b, a @@ -840,8 +840,15 @@ INCLUDE "scripts/rocktunnel1.asm" INCLUDE "data/mapObjects/rocktunnel1.asm" RockTunnel1Blocks: INCBIN "maps/rocktunnel1.blk" + dr $4487e,$449bf + +INCLUDE "data/mapHeaders/ssanne3.asm" +INCLUDE "scripts/ssanne3.asm" +INCLUDE "data/mapObjects/ssanne3.asm" +SSAnne3Blocks: +INCBIN "maps/ssanne3.blk" + dr $44a0d,$45077 - dr $4487e,$45077 LoadSpinnerArrowTiles: ; 45077 (11:5077) dr $45077,$46bf3 @@ -1387,10 +1394,9 @@ INCLUDE "data/mapObjects/ssanne6.asm" SSAnne6Blocks: INCBIN "maps/ssanne6.blk" -; INCLUDE "data/mapHeaders/ssanne7.asm" -; INCLUDE "scripts/ssanne7.asm" -; INCLUDE "data/mapObjects/ssanne7.asm" - dr $618b7,$61987 +INCLUDE "data/mapHeaders/ssanne7.asm" +INCLUDE "scripts/ssanne7.asm" +INCLUDE "data/mapObjects/ssanne7.asm" SSAnne7Blocks: INCBIN "maps/ssanne7.blk" diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index 911dac7f..6d07d308 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -3,7 +3,7 @@ SSAnne7Script: ; 61895 (18:5895) jp EnableAutoTextBoxDrawing SSAnne7Script_6189b: ; 6189b (18:589b) - CheckEvent EVENT_RUBBED_CAPTAINS_BACK + CheckEvent EVENT_GOT_HM01 ret nz ld hl, wd72d set 5, [hl] @@ -28,12 +28,12 @@ SSAnne7Text1: ; 618ad (18:58ad) ld hl, ReceivedHM01Text call PrintText SetEvent EVENT_GOT_HM01 + ld hl, wd72d + res 5, [hl] jr .asm_0faf5 .BagFull ld hl, HM01NoRoomText call PrintText - ld hl, wd72d - set 5, [hl] jr .asm_0faf5 .asm_797c4 ld hl, SSAnne7Text_61932 @@ -45,12 +45,10 @@ SSAnne7RubText: ; 618ec (18:58ec) TX_FAR _SSAnne7RubText TX_ASM ld a, [wAudioROMBank] - cp BANK(Audio3_UpdateMusic) + cp AUDIO_3 ld [wAudioSavedROMBank], a jr nz, .asm_61908 - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld a, Bank(Music_PkmnHealed) ld [wAudioROMBank], a .asm_61908 |