diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/bank3c/main.asm | 4 | ||||
| -rw-r--r-- | engine/bank3c/overworld.asm | 77 | ||||
| -rw-r--r-- | engine/bank3f/data/map_songs.asm | 500 | ||||
| -rwxr-xr-x | engine/items/items.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/cut.asm | 31 |
5 files changed, 305 insertions, 309 deletions
diff --git a/engine/bank3c/main.asm b/engine/bank3c/main.asm index 5e74c61e..c967e93c 100644 --- a/engine/bank3c/main.asm +++ b/engine/bank3c/main.asm @@ -152,9 +152,7 @@ PikachuCriesPointerTable: ; f008e (3c:408e) dbw BANK(PikachuCry41), PikachuCry41 ; 36:6746 dbw BANK(PikachuCry42), PikachuCry42 ; 38:6976 -_AdvancePlayerSprite:: ; f010c (3c:410c) -;INCLUDE "engine/bank3c/overworld.asm" - dr $f010c,$f0274 +INCLUDE "engine/bank3c/overworld.asm" ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) ; Reset player status on blackout. diff --git a/engine/bank3c/overworld.asm b/engine/bank3c/overworld.asm index 778244d6..d7e6274f 100644 --- a/engine/bank3c/overworld.asm +++ b/engine/bank3c/overworld.asm @@ -7,6 +7,8 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) dec [hl] jr nz,.afterUpdateMapCoords ; if it's the end of the animation, update the player's map coordinates + ld hl, wd430 + res 5, [hl] ld a,[W_YCOORD] add b ld [W_YCOORD],a @@ -24,11 +26,11 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) ; moving east ld a,[wMapViewVRAMPointer] ld e,a - and a,$e0 + and $e0 ld d,a ld a,e - add a,$02 - and a,$1f + add $02 + and $1f or d ld [wMapViewVRAMPointer],a jr .adjustXCoordWithinBlock @@ -41,8 +43,8 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) and a,$e0 ld d,a ld a,e - sub a,$02 - and a,$1f + sub $02 + and $1f or d ld [wMapViewVRAMPointer],a jr .adjustXCoordWithinBlock @@ -52,13 +54,13 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) jr nz,.checkIfMovingNorth ; moving south ld a,[wMapViewVRAMPointer] - add a,$40 + add $40 ld [wMapViewVRAMPointer],a jr nc,.adjustXCoordWithinBlock ld a,[wMapViewVRAMPointer + 1] inc a - and a,$03 - or a,$98 + and $03 + or $98 ld [wMapViewVRAMPointer + 1],a jr .adjustXCoordWithinBlock .checkIfMovingNorth @@ -66,13 +68,13 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) jr nz,.adjustXCoordWithinBlock ; moving north ld a,[wMapViewVRAMPointer] - sub a,$40 + sub $40 ld [wMapViewVRAMPointer],a jr nc,.adjustXCoordWithinBlock ld a,[wMapViewVRAMPointer + 1] dec a - and a,$03 - or a,$98 + and $03 + or $98 ld [wMapViewVRAMPointer + 1],a .adjustXCoordWithinBlock ld a,c @@ -83,7 +85,7 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) ld a,[hl] add c ld [hl],a - cp a,$02 + cp $02 jr nz,.checkForMoveToWestBlock ; moved into the tile block to the east xor a @@ -97,7 +99,7 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) cp a,$ff jr nz,.adjustYCoordWithinBlock ; moved into the tile block to the west - ld a,$01 + ld a,$1 ld [hl],a ld hl,wXOffsetSinceLastSpecialWarp dec [hl] @@ -109,7 +111,7 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) ld a,[hl] add b ld [hl],a - cp a,$02 + cp $2 jr nz,.checkForMoveToNorthBlock ; moved into the tile block to the south xor a @@ -124,7 +126,7 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) cp a,$ff jr nz,.updateMapView ; moved into the tile block to the north - ld a,$01 + ld a,$1 ld [hl],a ld hl,wYOffsetSinceLastSpecialWarp dec [hl] @@ -134,49 +136,40 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) .updateMapView call LoadCurrentMapView ld a,[wSpriteStateData1 + 3] ; delta Y - cp a,$01 + cp $1 jr nz,.checkIfMovingNorth2 ; if moving south call ScheduleSouthRowRedraw jr .scrollBackgroundAndSprites .checkIfMovingNorth2 - cp a,$ff + cp $ff jr nz,.checkIfMovingEast2 ; if moving north call ScheduleNorthRowRedraw jr .scrollBackgroundAndSprites .checkIfMovingEast2 ld a,[wSpriteStateData1 + 5] ; delta X - cp a,$01 + cp $1 jr nz,.checkIfMovingWest2 ; if moving east call ScheduleEastColumnRedraw jr .scrollBackgroundAndSprites .checkIfMovingWest2 - cp a,$ff + cp $ff jr nz,.scrollBackgroundAndSprites ; if moving west call ScheduleWestColumnRedraw .scrollBackgroundAndSprites ld a,[wSpriteStateData1 + 3] ; delta Y + add a ld b,a ld a,[wSpriteStateData1 + 5] ; delta X + add a ld c,a - sla b - sla c - ld a,[hSCY] - add b - ld [hSCY],a ; update background scroll Y - ld a,[hSCX] - add c - ld [hSCX],a ; update background scroll X ; shift all the sprites in the direction opposite of the player's motion ; so that the player appears to move relative to them ld hl,wSpriteStateData1 + $14 - ld a,[W_NUMSPRITES] ; number of sprites - and a ; are there any sprites? - jr z,.done - ld e,a + ld e,15 .spriteShiftLoop ld a,[hl] sub b @@ -191,11 +184,17 @@ _AdvancePlayerSprite:: ; f010c (3c:410c) dec e jr nz,.spriteShiftLoop .done + ld a,[hSCY] + add b + ld [hSCY],a ; update background scroll Y + ld a,[hSCX] + add c + ld [hSCX],a ; update background scroll X ret -MoveTileBlockMapPointerEast:: ; 0e65 (0:0e65) +MoveTileBlockMapPointerEast:: ; f0248 (3c:4248) ld a,[de] - add a,$01 + add $1 ld [de],a ret nc inc de @@ -204,9 +203,9 @@ MoveTileBlockMapPointerEast:: ; 0e65 (0:0e65) ld [de],a ret -MoveTileBlockMapPointerWest:: ; 0e6f (0:0e6f) +MoveTileBlockMapPointerWest:: ; f0252 (3c:4252) ld a,[de] - sub a,$01 + sub $1 ld [de],a ret nc inc de @@ -215,8 +214,8 @@ MoveTileBlockMapPointerWest:: ; 0e6f (0:0e6f) ld [de],a ret -MoveTileBlockMapPointerSouth:: ; 0e79 (0:0e79) - add a,$06 +MoveTileBlockMapPointerSouth:: ; f025c (3c:425c) + add $6 ld b,a ld a,[de] add b @@ -228,8 +227,8 @@ MoveTileBlockMapPointerSouth:: ; 0e79 (0:0e79) ld [de],a ret -MoveTileBlockMapPointerNorth:: ; 0e85 (0:0e85) - add a,$06 +MoveTileBlockMapPointerNorth:: ; f0268 (3c:4268) + add $6 ld b,a ld a,[de] sub b diff --git a/engine/bank3f/data/map_songs.asm b/engine/bank3f/data/map_songs.asm index ece6d321..b65822e7 100644 --- a/engine/bank3f/data/map_songs.asm +++ b/engine/bank3f/data/map_songs.asm @@ -1,252 +1,250 @@ MapSongBanks: ; fc000 (3f:4000) - dr $fc000,$fc1f2 - - ;db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY - ;db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_TOWN - ;db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_CITY - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CITY - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_CITY - ;db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND - ;db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; unused - ;db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1 - ;db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_4 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_5 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_6 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_7 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_8 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_9 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_10 - ;db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_11 - ;db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_12 - ;db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_13 - ;db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_14 - ;db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_15 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_16 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_17 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_18 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_19 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_20 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_21 - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_22 - ;db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; ROUTE_23 - ;db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_24 - ;db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_25 - ;db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse1F - ;db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse2F - ;db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BluesHouse - ;db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OaksLab - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianPokecenter - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianMart - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; School - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianHouse - ;db MUSIC_GYM, BANK(Music_Gym) ; ViridianGym - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveRoute2 - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestExit - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2House - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2Gate - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestEntrance - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ViridianForest - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum1F - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum2F - ;db MUSIC_GYM, BANK(Music_Gym) ; PewterGym - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse1 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterMart - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse2 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterPokecenter - ;db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon1 - ;db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon2 - ;db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon3 - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouseTrashed - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse1 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanPokecenter - ;db MUSIC_GYM, BANK(Music_Gym) ; CeruleanGym - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; BikeShop - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanMart - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MtMoonPokecenter - ;db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CeruleanHouseTrashed - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route5Gate - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute5 - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; DayCareM - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route6Gate - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute6 - ;db MUSIC_VERMILION, BANK(Music_Vermilion) ; FREEZE - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route7Gate - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute7 - ;db MUSIC_CELADON, BANK(Music_Celadon) ;FREEZE - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route8Gate - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute8 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; RockTunnelPokecenter - ;db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel1 - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; PowerPlant - ;db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11Gate - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveEntranceRoute11 - ;db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11GateUpstairs - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12Gate - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; BillsHouse - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionPokecenter - ;db MUSIC_VERMILION, BANK(Music_Vermilion) ; FanClub - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionMart - ;db MUSIC_GYM, BANK(Music_Gym) ; VermilionGym - ;db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse1 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VermilionDock - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne1 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne2 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne3 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne4 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne5 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne6 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne7 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne8 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne9 - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne10 - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - ;db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad1 - ;db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ;unused - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ;unused - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused - ;db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Lance - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - ;db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - ;db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HallofFameRoom - ;db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathNS - ;db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Gary - ;db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathWE - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart1 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart2 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart3 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart4 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartRoof - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartElevator - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion1 - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion2 - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion3 - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion4 - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion5 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonPokecenter - ;db MUSIC_GYM, BANK(Music_Gym) ; CeladonGym - ;db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; CeladonGameCorner - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart5 - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonPrizeRoom - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonDiner - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHouse - ;db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHotel - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderPokecenter - ;db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower1 - ;db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower2 - ;db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower3 - ;db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower4 - ;db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower5 - ;db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower6 - ;db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower7 - ;db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse1 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderMart - ;db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse2 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaMart - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse1 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaPokecenter - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse2 - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; SafariZoneEntrance - ;db MUSIC_GYM, BANK(Music_Gym) ; FuchsiaGym - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaMeetingRoom - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands2 - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands3 - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands4 - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands5 - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; VermilionHouse2 - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse3 - ;db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion1 - ;db MUSIC_GYM, BANK(Music_Gym) ; CinnabarGym - ;db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab1 - ;db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab2 - ;db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab3 - ;db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab4 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarPokecenter - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarMart - ;db MUSIC_CINNABAR, BANK(Music_Cinnabar) - ;db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; IndigoPlateauLobby - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse1F - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse2F - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; FightingDojo - ;db MUSIC_GYM, BANK(Music_Gym) ; SaffronGym - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse1 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronMart - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo1 - ;db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronPokecenter - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse2 - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15Gate - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15GateUpstairs - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16Gate - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateUpstairs - ;db MUSIC_CELADON, BANK(Music_Celadon) ; Route16House - ;db MUSIC_CELADON, BANK(Music_Celadon) ; Route12House - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18Gate - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18GateUpstairs - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands1 - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; Route22Gate - ;db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad2 - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12GateUpstairs - ;db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse3 - ;db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCave - ;db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad3 - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout1 - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout2 - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout3 - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout4 - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideoutElevator - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo2 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo3 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo4 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo5 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo6 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo7 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo8 - ;db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion2 - ;db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion3 - ;db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion4 - ;db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneEast - ;db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneNorth - ;db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneWest - ;db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneCenter - ;db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse1 - ;db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneSecretHouse - ;db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse2 - ;db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse3 - ;db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse4 - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon2 - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon3 - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon1 - ;db MUSIC_CITIES2, BANK(Music_Cities2) ; NameRater - ;db MUSIC_CITIES1, BANK(Music_Cities1) ; CeruleanHouse2 - ;db MUSIC_CINNABAR, BANK(Music_Cinnabar) - ;db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel2 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo9 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo10 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo11 - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCoElevator - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) - ;db MUSIC_CELADON, BANK(Music_Celadon) ; BattleCenterM - ;db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenterM - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) - ;db MUSIC_SILPH_CO, BANK(Music_SilphCo) - ;db MUSIC_GYM, BANK(Music_Gym) ; Lorelei - ;db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno - ;db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha - ;db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
\ No newline at end of file + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN + db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY + db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY + db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY + db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_TOWN + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_CITY + db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CITY + db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_CITY + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU + db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY + db MUSIC_CITIES1, BANK(Music_Cities1) ; unused + db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1 + db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_4 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_5 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_6 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_7 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_8 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_9 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_10 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_11 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_12 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_13 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_14 + db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_15 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_16 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_17 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_18 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_19 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_20 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_21 + db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_22 + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; ROUTE_23 + db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_24 + db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_25 + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse1F + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse2F + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BluesHouse + db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OaksLab + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianPokecenter + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianMart + db MUSIC_CITIES1, BANK(Music_Cities1) ; School + db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianHouse + db MUSIC_GYM, BANK(Music_Gym) ; ViridianGym + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveRoute2 + db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestExit + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2House + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2Gate + db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestEntrance + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ViridianForest + db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum2F + db MUSIC_GYM, BANK(Music_Gym) ; PewterGym + db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse1 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterMart + db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse2 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterPokecenter + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon1 + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon2 + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon3 + db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouseTrashed + db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse1 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanPokecenter + db MUSIC_GYM, BANK(Music_Gym) ; CeruleanGym + db MUSIC_CITIES2, BANK(Music_Cities2) ; BikeShop + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanMart + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MtMoonPokecenter + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CeruleanHouseTrashed + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route5Gate + db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute5 + db MUSIC_CITIES1, BANK(Music_Cities1) ; DayCareM + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route6Gate + db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute6 + db MUSIC_VERMILION, BANK(Music_Vermilion) ; FREEZE + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route7Gate + db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute7 + db MUSIC_CELADON, BANK(Music_Celadon) ;FREEZE + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route8Gate + db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute8 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; RockTunnelPokecenter + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel1 + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; PowerPlant + db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11Gate + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveEntranceRoute11 + db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11GateUpstairs + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12Gate + db MUSIC_CITIES2, BANK(Music_Cities2) ; BillsHouse + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionPokecenter + db MUSIC_VERMILION, BANK(Music_Vermilion) ; FanClub + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionMart + db MUSIC_GYM, BANK(Music_Gym) ; VermilionGym + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse1 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VermilionDock + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne1 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne2 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne3 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne4 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne5 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne6 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne7 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne8 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne9 + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne10 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad1 + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ;unused + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ;unused + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Lance + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused + db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused + db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HallofFameRoom + db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathNS + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Gary + db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathWE + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart1 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart2 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart3 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart4 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartRoof + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartElevator + db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion1 + db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion2 + db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion3 + db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion4 + db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion5 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonPokecenter + db MUSIC_GYM, BANK(Music_Gym) ; CeladonGym + db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; CeladonGameCorner + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart5 + db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonPrizeRoom + db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonDiner + db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHouse + db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHotel + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderPokecenter + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower1 + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower2 + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower3 + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower4 + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower5 + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower6 + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower7 + db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse1 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderMart + db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse2 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaMart + db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse1 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaPokecenter + db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse2 + db MUSIC_CITIES2, BANK(Music_Cities2) ; SafariZoneEntrance + db MUSIC_GYM, BANK(Music_Gym) ; FuchsiaGym + db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaMeetingRoom + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands2 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands3 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands4 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands5 + db MUSIC_CITIES2, BANK(Music_Cities2) ; VermilionHouse2 + db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse3 + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion1 + db MUSIC_GYM, BANK(Music_Gym) ; CinnabarGym + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab1 + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab2 + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab3 + db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab4 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarPokecenter + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarMart + db MUSIC_CINNABAR, BANK(Music_Cinnabar) + db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; IndigoPlateauLobby + db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse1F + db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse2F + db MUSIC_CITIES1, BANK(Music_Cities1) ; FightingDojo + db MUSIC_GYM, BANK(Music_Gym) ; SaffronGym + db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse1 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronMart + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo1 + db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronPokecenter + db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse2 + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15Gate + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15GateUpstairs + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16Gate + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateUpstairs + db MUSIC_CELADON, BANK(Music_Celadon) ; Route16House + db MUSIC_CELADON, BANK(Music_Celadon) ; Route12House + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18Gate + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18GateUpstairs + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands1 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; Route22Gate + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad2 + db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12GateUpstairs + db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse3 + db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCave + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad3 + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout1 + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout2 + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout3 + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout4 + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideoutElevator + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo2 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo3 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo4 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo5 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo6 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo7 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo8 + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion2 + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion3 + db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion4 + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneEast + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneNorth + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneWest + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneCenter + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse1 + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneSecretHouse + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse2 + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse3 + db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse4 + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon2 + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon3 + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon1 + db MUSIC_CITIES2, BANK(Music_Cities2) ; NameRater + db MUSIC_CITIES1, BANK(Music_Cities1) ; CeruleanHouse2 + db MUSIC_CINNABAR, BANK(Music_Cinnabar) + db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel2 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo9 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo10 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo11 + db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCoElevator + db MUSIC_SILPH_CO, BANK(Music_SilphCo) + db MUSIC_SILPH_CO, BANK(Music_SilphCo) + db MUSIC_CELADON, BANK(Music_Celadon) ; BattleCenterM + db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenterM + db MUSIC_SILPH_CO, BANK(Music_SilphCo) + db MUSIC_SILPH_CO, BANK(Music_SilphCo) + db MUSIC_SILPH_CO, BANK(Music_SilphCo) + db MUSIC_SILPH_CO, BANK(Music_SilphCo) + db MUSIC_GYM, BANK(Music_Gym) ; Lorelei + db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno + db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha + db MUSIC_ROUTES3, BANK(Music_Routes3) ; BeachHouse
\ No newline at end of file diff --git a/engine/items/items.asm b/engine/items/items.asm index 25c50b4f..533da448 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -709,7 +709,7 @@ ItemUseEvoStone: ; d7d0 (3:57d0) ret Func_d85d: ; d85d (3:585d) - ld hl, Pointer_f1e5 + ld hl, Pointer_3b1e5 ld a, [wLoadedMon] dec a ld c, a diff --git a/engine/overworld/cut.asm b/engine/overworld/cut.asm index 30aedbc1..276ec93e 100755 --- a/engine/overworld/cut.asm +++ b/engine/overworld/cut.asm @@ -1,4 +1,4 @@ -UsedCut: ; ef54 (3:6f54) +UsedCut: ; edd1 (3:6dd1) xor a ld [wActionResultOrTookBattleTurn], a ; initialise to failure value ld a, [W_CURMAPTILESET] @@ -67,15 +67,16 @@ UsedCut: ; ef54 (3:6f54) call UpdateSprites jp RedrawMapView -UsedCutText: ; eff2 (3:6ff2) +UsedCutText: ; ee6f (3:6e6f) TX_FAR _UsedCutText db "@" -InitCutAnimOAM: ; eff7 (3:6ff7) +InitCutAnimOAM: ; ee74 (3:6e74) xor a ld [wWhichAnimationOffsets], a - ld a, $e4 + ld a, %11100100 ld [rOBP1], a + call UpdateGBCPal_OBP1 ld a, [wCutTile] cp $52 jr z, .grass @@ -111,22 +112,22 @@ InitCutAnimOAM: ; eff7 (3:6ff7) jr nz, .loop ret -LoadCutGrassAnimationTilePattern: ; f04c (3:704c) - ld de, AnimationTileset2 + $60 ; tile depicting a leaf +LoadCutGrassAnimationTilePattern: ; eecc (3:6ecc) + ld de, AnimationTileset2 + $30 ; tile depicting a leaf lb bc, BANK(AnimationTileset2), $01 jp CopyVideoData -WriteCutOrBoulderDustAnimationOAMBlock: ; f055 (3:7055) +WriteCutOrBoulderDustAnimationOAMBlock: ; eed5 (3:6ed5) call GetCutOrBoulderDustAnimationOffsets ld a, $9 ld de, CutOrBoulderDustAnimationTilesAndAttributes jp WriteOAMBlock -CutOrBoulderDustAnimationTilesAndAttributes: ; f060 (3:7060) - db $FC,$10,$FD,$10 - db $FE,$10,$FF,$10 +CutOrBoulderDustAnimationTilesAndAttributes: ; eee0 (3:6ee0) + db $FC,$14,$FD,$14 + db $FE,$14,$FF,$14 -GetCutOrBoulderDustAnimationOffsets: ; f068 (3:7068) +GetCutOrBoulderDustAnimationOffsets: ; eee8 (3:6ee8) ld hl, wSpriteStateData1 + 4 ld a, [hli] ; player's sprite screen Y position ld b, a @@ -157,14 +158,14 @@ GetCutOrBoulderDustAnimationOffsets: ; f068 (3:7068) ld c, a ret -CutAnimationOffsets: ; f08f (3:708f) +CutAnimationOffsets: ; ef0f (3:6f0f) ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn db 8, 36 ; player is facing down db 8, 4 ; player is facing up db -8, 20 ; player is facing left db 24, 20 ; player is facing right -BoulderDustAnimationOffsets: ; f097 (3:7097) +BoulderDustAnimationOffsets: ; ef17 (3:6f17) ; Each pair represents the x and y pixels offsets from the player of where the cut tree animation should be drawn ; These offsets represent 2 blocks away from the player db 8, 52 ; player is facing down @@ -172,7 +173,7 @@ BoulderDustAnimationOffsets: ; f097 (3:7097) db -24, 20 ; player is facing left db 40, 20 ; player is facing right -ReplaceTreeTileBlock: ; f09f (3:709f) +ReplaceTreeTileBlock: ; ef1f (3:6f1f) ; Determine the address of the tile block that contains the tile in front of the ; player (i.e. where the tree is) and replace it with the corresponding tile ; block that doesn't have the tree. @@ -248,7 +249,7 @@ ReplaceTreeTileBlock: ; f09f (3:709f) ld [hl], a ret -CutTreeBlockSwaps: ; f100 (3:7100) +CutTreeBlockSwaps: ; ef80 (3:6f80) ; first byte = tileset block containing the cut tree ; second byte = corresponding tileset block after the cut animation happens db $32, $6D |