diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-03 22:10:30 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-03 22:10:30 -0400 |
| commit | 19c517bca455c10e7cba6699084b8cbeb8cc8137 (patch) | |
| tree | 7e9d6d44fc91e6b655c8e63e02880f30ab37260a | |
| parent | 2187d8d8af1ff2372610806539c245657639cf85 (diff) | |
Attempt to make yellow buildable, part 7.
Builds but not to baserom.gbc.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | constants.asm | 2 | ||||
| -rw-r--r-- | constants/predef_constants.asm | 101 | ||||
| -rw-r--r-- | engine/bank3c/main.asm | 5 | ||||
| -rw-r--r-- | engine/bank3d/link_menu.asm | 127 | ||||
| -rw-r--r-- | engine/bank3d/main.asm | 10 | ||||
| -rw-r--r-- | engine/bank3f/data/map_header_banks.asm | 499 | ||||
| -rw-r--r-- | engine/bank3f/data/map_header_pointers.asm | 499 | ||||
| -rw-r--r-- | engine/bank3f/data/map_songs.asm | 500 | ||||
| -rw-r--r-- | engine/bank3f/main.asm | 6 | ||||
| -rw-r--r-- | engine/battle/moveEffects/transform_effect.asm | 8 | ||||
| -rwxr-xr-x | engine/multiply_divide.asm | 2 | ||||
| -rwxr-xr-x | engine/predefs.asm | 10 | ||||
| -rw-r--r-- | hram.asm | 2 | ||||
| -rw-r--r-- | macros.asm | 7 | ||||
| -rwxr-xr-x | wram.asm | 9 | ||||
| -rwxr-xr-x | yellow/main.asm | 70 |
17 files changed, 1015 insertions, 844 deletions
@@ -21,7 +21,7 @@ yellow_opt = $(cgb_opt) -t "POKEMON YELLOW" PYTHON := python # md5sum -c is used to compare rom hashes. The options may vary across platforms. -MD5 := md5sum -c --quiet +MD5 := md5sum -c #--quiet # The compare target is a shortcut to check that the build matches the original roms exactly. diff --git a/constants.asm b/constants.asm index 0b24ea05..f15510c9 100644 --- a/constants.asm +++ b/constants.asm @@ -30,3 +30,5 @@ INCLUDE "constants/credits_constants.asm" INCLUDE "constants/music_constants.asm" INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" + +INCLUDE "constants/predef_constants.asm"
\ No newline at end of file diff --git a/constants/predef_constants.asm b/constants/predef_constants.asm new file mode 100644 index 00000000..07972154 --- /dev/null +++ b/constants/predef_constants.asm @@ -0,0 +1,101 @@ +const_value = 0 + + predef_const DrawPlayerHUDAndHPBar + predef_const Func_3f0c6 + predef_const Func_3f073 + predef_const ScaleSpriteByTwo + predef_const LoadMonBackPic + predef_const Func_79aba + predef_const LoadMissableObjects + predef_const HealParty + predef_const MoveAnimation; 08 play move animation + predef_const DivideBCDPredef + predef_const DivideBCDPredef2 + predef_const AddBCDPredef + predef_const SubBCDPredef + predef_const DivideBCDPredef3 + predef_const DivideBCDPredef4 + predef_const InitPlayerData + predef_const FlagActionPredef + predef_const HideObject + predef_const IsObjectHidden + predef_const ApplyOutOfBattlePoisonDamage + predef_const AnyPartyAlive + predef_const ShowObject + predef_const ShowObject2 + predef_const ReplaceTileBlock + predef_const InitPlayerData2 + predef_const LoadTilesetHeader + predef_const LearnMoveFromLevelUp + predef_const LearnMove + predef_const IsItemInBag_ + predef_const CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0 + predef_const GiveItem + predef_const ChangeBGPalColor0_4Frames + predef_const FindPathToPlayer + predef_const Func_480ff + predef_const CalcPositionOfPlayerRelativeToNPC + predef_const ConvertNPCMovementDirectionsToJoypadMasks + predef_const Func_48125 + predef_const UpdateHPBar + predef_const HPBarLength + predef_const Diploma_TextBoxBorder + predef_const DoubleOrHalveSelectedStats + predef_const ShowPokedexMenu + predef_const EvolutionAfterBattle + predef_const SaveSAVtoSRAM0 + predef_const InitOpponent + predef_const CableClub_Run + predef_const DrawBadges + predef_const ExternalClockTradeAnim + predef_const BattleTransition + predef_const CopyTileIDsFromList + predef_const PlayIntro + predef_const Func_79869 + predef_const FlashScreen + predef_const GetTileAndCoordsInFrontOfPlayer + predef_const StatusScreen + predef_const StatusScreen2 + predef_const InternalClockTradeAnim + predef_const TrainerEngage + predef_const IndexToPokedex + predef_const Predef3B; 3B display pic? + predef_const UsedCut + predef_const ShowPokedexData + predef_const WriteMonMoves + predef_const SaveSAV + predef_const LoadSGB + predef_const MarkTownVisitedAndLoadMissableObjects + predef_const SetPartyMonTypes + predef_const CanLearnTM + predef_const TMToMove + predef_const Func_71ddf + predef_const StarterDex ; 46 + predef_const _AddPartyMon + predef_const UpdateHPBar2 + predef_const DrawEnemyHUDAndHPBar + predef_const LoadTownMap_Nest + predef_const PrintMonType + predef_const EmotionBubble; 4C player exclamation + predef_const EmptyFunc3; return immediately + predef_const AskName + predef_const PewterGuys + predef_const SaveSAVtoSRAM2 + predef_const LoadSAVCheckSum2 + predef_const LoadSAV + predef_const SaveSAVtoSRAM1 + predef_const DoInGameTradeDialogue ; 54 initiate trade + predef_const HallOfFamePC + predef_const DisplayDexRating + predef_const _LeaveMapAnim ; wrong bank + predef_const EnterMapAnim ; wrong bank + predef_const GetTileTwoStepsInFrontOfPlayer + predef_const CheckForCollisionWhenPushingBoulder + predef_const PrintStrengthTxt + predef_const PickupItem + predef_const PrintMoveType + predef_const LoadMovePPs + predef_const DrawHP ; 5F + predef_const DrawHP2 + predef_const Func_1c9c6 + predef_const OaksAideScript
\ No newline at end of file diff --git a/engine/bank3c/main.asm b/engine/bank3c/main.asm index 026c7d48..b6231e3e 100644 --- a/engine/bank3c/main.asm +++ b/engine/bank3c/main.asm @@ -118,6 +118,9 @@ Pointer_f0a76:: ; f0a76 (3c:4a76) db $27,$07,$7b,$4a,$ff db $01,$ec,$02,$ed,$03,$ee,$ff - dr $f0a82,$f25f8 + dr $f0a82,$f220e +BeachHouse_h: ; f220e (3c:620e) +;INCLUDE "data/mapHeaders/beach_house.asm" + dr $f220e,$f25f8 CheckForHiddenObject:: ; f25f8 (3c:65f8) dr $f25f8,$f4000
\ No newline at end of file diff --git a/engine/bank3d/link_menu.asm b/engine/bank3d/link_menu.asm index edd040b0..62387a7b 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/bank3d/link_menu.asm @@ -174,7 +174,7 @@ Func_f531b:: ; f531b (3d:531b) ret Func_f5476:: ; f5476 (3d:5476) - ld hl,Text_f5807 + ld hl,ColosseumEvolvedText call PrintText asm_f547c:: ; f547c (3d:574c) jp Func_f531b @@ -405,73 +405,73 @@ PetitCup:: ; f553a (3d:553a) ret NotThreeMonsInParty:: ; f561d (3d:516d) - ld hl,Text_f57bc + ld hl,Colosseum3MonsText call PrintText ld a,$1 ret MewInParty:: ; f5626 (3d:f5626) - ld hl,Text_f57c1 + ld hl,ColosseumMewText call PrintText ld a,$2 ret DuplicateSpecies:: ; f562f (3d:f562f) - ld hl,Text_f57c6 + ld hl,ColosseumDifferentMonsText call PrintText ld a,$3 ret LevelAbove55:: ; f5638 (3d:5638) - ld hl,Text_f57cb + ld hl,ColosseumMaxL55Text call PrintText ld a,$4 ret LevelUnder50:: ; f5641 (3d:5641) - ld hl,Text_f57d0 + ld hl,ColosseumMinL50Text call PrintText ld a,$5 ret CombinedLevelsGreaterThan155:: ; f5641 (3d:564a) - ld hl,Text_f57d5 + ld hl,ColosseumTotalL155Text call PrintText ld a,$6 ret LevelAbove30:: ; f5653 (3d:5653) - ld hl,Text_f57da + ld hl,ColosseumMaxL30Text call PrintText ld a,$7 ret LevelUnder25:: ; f565c (3d:565c) - ld hl,Text_f57df + ld hl,ColosseumMinL25Text call PrintText ld a,$8 ret CombinedLevelsAbove80:: ; f5665 (3d:5665) - ld hl,Text_f5665 + ld hl,ColosseumTotalL80Text call PrintText ld a,$9 ret LevelAbove20:: ; f566e (3d:566e) - ld hl,Text_f57e9 + ld hl,ColosseumMaxL20Text call PrintText ld a,$a ret LevelUnder15:: ; f5677 (3d:5677) - ld hl,Text_f57ee + ld hl,ColosseumMinL15Text call PrintText ld a,$b ret CombinedLevelsAbove50:: ; f5680 (3d:5680) - ld hl,Text_f57f3 + ld hl,ColosseumTotalL50Text call PrintText ld a,$c ret @@ -482,7 +482,7 @@ asm_f5689:: ; f5689 (3d:5689) pop hl ld [wd11e],a call GetMonName - ld hl,Text_f57f8 + ld hl,ColosseumHeightText call PrintText ld a,$d ret @@ -493,7 +493,7 @@ asm_f569b:: ; f569b (3d:569b) pop hl ld [wd11e],a call GetMonName - ld hl,Text_f57fd + ld hl,ColosseumWeightText call PrintText ld a,$e ret @@ -502,7 +502,7 @@ asm_f56ad:: ; f56ad (3d:56ad) ld a,[hl] ld [wd11e],a call GetMonName - ld hl,Text_f5802 + ld hl,ColosseumEvolvedText call PrintText ld a,$f ret @@ -553,7 +553,7 @@ Text_f5728:: ; f5728 (3d:5728) Text_f575b:: ; f575b (3d:575b) db "3 Basic <pkmn>.LV25-30" next "Sum of LVs:80 MAX" - next "6",$71,"8",$73," and 44lb MAX@" ; 6'8" and 44lb MAX + next "6′8″ and 44lb MAX@" Text_f5791:: ; f5791 (3d:5791) db "View" @@ -565,68 +565,68 @@ Text_f579c:: ; f579c (3d:579c) next "Petit Cup" next "CANCEL@" -Text_f57bc:: ; f57bc (3d:57bc) - TX_FAR _Text_f57bc ; a0a2b +Colosseum3MonsText:: ; f57bc (3d:57bc) + TX_FAR _Colosseum3MonsText ; a0a2b db "@" -Text_f57c1:: ; f57c1 (3d:57c1) - TX_FAR _Text_f57c1 ; a0a46 +ColosseumMewText:: ; f57c1 (3d:57c1) + TX_FAR _ColosseumMewText ; a0a46 db "@" -Text_f57c6:: ; f57c6 (3d:57c6) - TX_FAR _Text_f57c6 ; a0a5f +ColosseumDifferentMonsText:: ; f57c6 (3d:57c6) + TX_FAR _ColosseumDifferentMonsText ; a0a5f db "@" -Text_f57cb:: ; f57cb (3d:57cb) - TX_FAR _Text_f57cb ; a0a81 +ColosseumMaxL55Text:: ; f57cb (3d:57cb) + TX_FAR _ColosseumMaxL55Text ; a0a81 db "@" -Text_f57d0:: ; f57d0 (3d:57d0) - TX_FAR _Text_f57d0 ; a0a9a +ColosseumMinL50Text:: ; f57d0 (3d:57d0) + TX_FAR _ColosseumMinL50Text ; a0a9a db "@" -Text_f57d5:: ; f57d5 (3d:57d5) - TX_FAR _Text_f57d5 ; a0aba +ColosseumTotalL155Text:: ; f57d5 (3d:57d5) + TX_FAR _ColosseumTotalL155Text ; a0aba db "@" -Text_f57da:: ; f57da (3d:57da) - TX_FAR _Text_f57da ; a0ad9 +ColosseumMaxL30Text:: ; f57da (3d:57da) + TX_FAR _ColosseumMaxL30Text ; a0ad9 db "@" -Text_f57df:: ; f57df (3d:57df) - TX_FAR _Text_f57df ; a0af2 +ColosseumMinL25Text:: ; f57df (3d:57df) + TX_FAR _ColosseumMinL25Text ; a0af2 db "@" -Text_f57e4:: ; f57e4 (3d:57e4) - TX_FAR _Text_f57e4 ; a0b12 +ColosseumTotalL80Text:: ; f57e4 (3d:57e4) + TX_FAR _ColosseumTotalL80Text ; a0b12 db "@" -Text_f57e9:: ; f57e9 (3d:57e9) - TX_FAR _Text_f57e9 ; a0b30 +ColosseumMaxL20Text:: ; f57e9 (3d:57e9) + TX_FAR _ColosseumMaxL20Text ; a0b30 db "@" -Text_f57ee:: ; f57ee (3d:57ee) - TX_FAR _Text_f57ee ; a0b49 +ColosseumMinL15Text:: ; f57ee (3d:57ee) + TX_FAR _ColosseumMinL15Text ; a0b49 db "@" -Text_f57f3:: ; f57f3 (3d:57f3) - TX_FAR _Text_f57f3 ; a0b69 +ColosseumTotalL50Text:: ; f57f3 (3d:57f3) + TX_FAR _ColosseumTotalL50Text ; a0b69 db "@" -Text_f57f8:: ; f57f8 (3d:57f8) - TX_FAR _Text_f57f8 ; a0b87 +ColosseumHeightText:: ; f57f8 (3d:57f8) + TX_FAR _ColosseumHeightText ; a0b87 db "@" -Text_f57fd:: ; f57fd (3d:57fd) - TX_FAR _Text_f57fd ; a0b9f +ColosseumWeightText:: ; f57fd (3d:57fd) + TX_FAR _ColosseumWeightText ; a0b9f db "@" -Text_f5802:: ; f5802 (3d:5802) - TX_FAR _Text_f5802 ; a0bbb +ColosseumEvolvedText:: ; f5802 (3d:5802) + TX_FAR _ColosseumEvolvedText ; a0bbb db "@" -Text_f5807:: ; f5807 (3d:5807) - TX_FAR _Text_f5807 ; a0bd4 +ColosseumIneligibleText:: ; f5807 (3d:5807) + TX_FAR _ColosseumIneligibleText ; a0bd4 db "@" LinkMenu: ; f580c (3d:580c) @@ -634,10 +634,10 @@ LinkMenu: ; f580c (3d:580c) ld [wd358], a ld hl, wd72e set 6, [hl] - ld hl, TextTerminator_6b20 + ld hl, TextTerminator_f5a16 call PrintText call SaveScreenTilesToBuffer1 - ld hl, WhereWouldYouLikeText + ld hl, ColosseumPleaseWaitText call PrintText hlCoord 5, 5 ld bc, $80d @@ -768,7 +768,7 @@ LinkMenu: ; f580c (3d:580c) ld a, BATTLE_CENTER .next ld [wd72d], a - ld hl, PleaseWaitText + ld hl, _ColosseumCanceledText call PrintText ld c, $32 call DelayFrames @@ -793,7 +793,7 @@ LinkMenu: ; f580c (3d:580c) ld [wMenuJoypadPollCount], a call Delay3 callab CloseLinkConnection - ld hl, LinkCanceledText + ld hl, ColosseumVersionText call PrintText ld hl, wd72e res 6, [hl] @@ -820,7 +820,7 @@ LinkMenu: ; f580c (3d:580c) call z,DelayFrame dec b jr z,.asm_f59b2 - call SerialExchange_Nybble + call Serial_ExchangeNybble call DelayFrame ld a,[wSerialExchangeNybbleReceiveData] inc a @@ -828,7 +828,7 @@ LinkMenu: ; f580c (3d:580c) .loop2 ld b,$f call DelayFrame - call SerialExchange_Nybble + call Serial_ExchangeNybble dec b jr nz,.loop2 ld b,$f @@ -854,7 +854,7 @@ LinkMenu: ; f580c (3d:580c) jp .choseCancel .asm_f59cd - ld hl,Text_f5a11 + ld hl,ColosseumVersionText call PrintText jp .choseCancel @@ -880,16 +880,19 @@ Func_f59ec:: ; f59ec (3d:59ec) call DelayFrames ret -WhereWouldYouLikeText: ; f5a07 (3d:5a07) - TX_FAR _WhereWouldYouLikeText +ColosseumPleaseWaitText: ; f5a07 (3d:5a07) + TX_FAR _ColosseumPleaseWaitText db "@" -PleaseWaitText: ; f5a0c (3d:5a0c) - TX_FAR _PleaseWaitText +_ColosseumCanceledText: ; f5a0c (3d:5a0c) + TX_FAR _ColosseumCanceledText db "@" -LinkCanceledText: ; f5a11 (3d:5a11) - TX_FAR _LinkCanceledText +ColosseumVersionText: ; f5a11 (3d:5a11) + TX_FAR _ColosseumVersionText ; 28:4c47 + db "@" + +TextTerminator_f5a16: ; f5a16 (3d:5a16) db "@" TradeCenterText: ; f5a17 (3d:5a17) diff --git a/engine/bank3d/main.asm b/engine/bank3d/main.asm index 6e9788d1..bab20f05 100644 --- a/engine/bank3d/main.asm +++ b/engine/bank3d/main.asm @@ -335,7 +335,7 @@ HandleMenuInputPokemonSelectionDouble:: ; f5a44 (3d:5a44) and A_BUTTON | B_BUTTON jr z,.skipPlayingSound .AButtonOrBButtonPressed - ld a,(SFX_02_40 - SFX_Headers_02) / 3 + ld a, $90 ; (SFX_02_40 - SFX_Headers_02) / 3 call PlaySound ; play sound .skipPlayingSound pop af @@ -412,7 +412,7 @@ Func_f5b06:: ; f5b06 (3d:5b06) jp PrintText Text_f5b17:: ; f5b17 (3d:5b17) - TX_FAR _Text_f5b17 ; 2d:417e + TX_FAR _UsedStrengthText ; 2d:417e db $08 ; asm ld a,[wcf91] call PlayCry @@ -420,7 +420,7 @@ Text_f5b17:: ; f5b17 (3d:5b17) jp TextScriptEnd Text_f5b28:: ; f5b28 (3d:5b28) - TX_FAR _Text_f5b28 ; 2d:4193 + TX_FAR _CanMoveBouldersText ; 2d:4193 db "@" Func_f5b2d:: ; f5b2d (3d:5b2d) @@ -454,11 +454,11 @@ CoordsData_f5b64:: ; f5b64 (3d:5b64) db $ff Text_f5b67:: ; f5b67 (3d:5b67) - TX_FAR _Text_f5b67 ; 2d:41ab + TX_FAR _CurrentTooFastText ; 2d:41ab db "@" Text_f5b6c:: ; f5b6c (3d:5b6c) - TX_FAR _Text_f5b6c + TX_FAR _NewBadgeRequiredText ; 2d:412d db "@" AddItemToInventory_:: ; f5b70 (3d:5b70) diff --git a/engine/bank3f/data/map_header_banks.asm b/engine/bank3f/data/map_header_banks.asm index 94a13510..eeff1974 100644 --- a/engine/bank3f/data/map_header_banks.asm +++ b/engine/bank3f/data/map_header_banks.asm @@ -1,251 +1,252 @@ ; see also MapHeaderPointers MapHeaderBanks:: ; fc3e4 (3f:43e4) - db BANK(PalletTown_h) ;PALLET_TOWN - db BANK(ViridianCity_h) ; VIRIDIAN_CITY - db BANK(PewterCity_h) ; PEWTER_CITY - db BANK(CeruleanCity_h) ; CERULEAN_CITY - db BANK(LavenderTown_h) ; LAVENDER_TOWN - db BANK(VermilionCity_h) ; VERMILION_CITY - db BANK(CeladonCity_h) ; CELADON_CITY - db BANK(FuchsiaCity_h) ; FUCHSIA_CITY - db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND - db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU - db BANK(SaffronCity_h) ; SAFFRON_CITY - db $1 ; unused - db BANK(Route1_h) ; ROUTE_1 - db BANK(Route2_h) ; ROUTE_2 - db BANK(Route3_h) ; ROUTE_3 - db BANK(Route4_h) ; ROUTE_4 - db BANK(Route5_h) ; ROUTE_5 - db BANK(Route6_h) ; ROUTE_6 - db BANK(Route7_h) ; ROUTE_7 - db BANK(Route8_h) ; ROUTE_8 - db BANK(Route9_h) ; ROUTE_9 - db BANK(Route10_h) ; ROUTE_10 - db BANK(Route11_h) ; ROUTE_11 - db BANK(Route12_h) ; ROUTE_12 - db BANK(Route13_h) ; ROUTE_13 - db BANK(Route14_h) ; ROUTE_14 - db BANK(Route15_h) ; ROUTE_15 - db BANK(Route16_h) ; ROUTE_16 - db BANK(Route17_h) ; ROUTE_17 - db BANK(Route18_h) ; ROUTE_18 - db BANK(Route19_h) ; ROUTE_19 - db BANK(Route20_h) ; ROUTE_20 - db BANK(Route21_h) ; ROUTE_21 - db BANK(Route22_h) ; ROUTE_22 - db BANK(Route23_h) ; ROUTE_23 - db BANK(Route24_h) ; ROUTE_24 - db BANK(Route25_h) ; ROUTE_25 - db BANK(RedsHouse1F_h) - db BANK(RedsHouse2F_h) - db BANK(BluesHouse_h) - db BANK(OaksLab_h) - db BANK(ViridianPokecenter_h) - db BANK(ViridianMart_h) - db BANK(School_h) - db BANK(ViridianHouse_h) - db BANK(ViridianGym_h) - db BANK(DiglettsCaveRoute2_h) - db BANK(ViridianForestExit_h) - db BANK(Route2House_h) - db BANK(Route2Gate_h) - db BANK(ViridianForestEntrance_h) - db BANK(ViridianForest_h) - db BANK(Museum1F_h) - db BANK(Museum2F_h) - db BANK(PewterGym_h) - db BANK(PewterHouse1_h) - db BANK(PewterMart_h) - db BANK(PewterHouse2_h) - db BANK(PewterPokecenter_h) - db BANK(MtMoon1_h) - db BANK(MtMoon2_h) - db BANK(MtMoon3_h) - db BANK(CeruleanHouseTrashed_h) - db BANK(CeruleanHouse1_h) - db BANK(CeruleanPokecenter_h) - db BANK(CeruleanGym_h) - db BANK(BikeShop_h) - db BANK(CeruleanMart_h) - db BANK(MtMoonPokecenter_h) - db BANK(CeruleanHouseTrashed_h) - db BANK(Route5Gate_h) - db BANK(UndergroundPathEntranceRoute5_h) - db BANK(DayCareM_h) - db BANK(Route6Gate_h) - db BANK(UndergroundPathEntranceRoute6_h) - db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE - db BANK(Route7Gate_h) - db BANK(UndergroundPathEntranceRoute7_h) - db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE - db BANK(Route8Gate_h) - db BANK(UndergroundPathEntranceRoute8_h) - db BANK(RockTunnelPokecenter_h) - db BANK(RockTunnel1_h) - db BANK(PowerPlant_h) - db BANK(Route11Gate_h) - db BANK(DiglettsCaveEntranceRoute11_h) - db BANK(Route11GateUpstairs_h) - db BANK(Route12Gate_h) - db BANK(BillsHouse_h) - db BANK(VermilionPokecenter_h) - db BANK(FanClub_h) - db BANK(VermilionMart_h) - db BANK(VermilionGym_h) - db BANK(VermilionHouse1_h) - db BANK(VermilionDock_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 - db BANK(VictoryRoad1_h) - db $1D ;unused - db $1D ;unused - db $1D ;unused - db $1D ;unused - db BANK(Lance_h) - db $1D ;unused - db $1D ;unused - db $1D ;unused - db $1D ;unused - db BANK(HallofFameRoom_h) - db BANK(UndergroundPathNS_h) - db BANK(Gary_h) - db BANK(UndergroundPathWE_h) - db BANK(CeladonMart1_h) - db BANK(CeladonMart2_h) - db BANK(CeladonMart3_h) - db BANK(CeladonMart4_h) - db BANK(CeladonMartRoof_h) - db BANK(CeladonMartElevator_h) - db BANK(CeladonMansion1_h) - db BANK(CeladonMansion2_h) - db BANK(CeladonMansion3_h) - db BANK(CeladonMansion4_h) - db BANK(CeladonMansion5_h) - db BANK(CeladonPokecenter_h) - db BANK(CeladonGym_h) - db BANK(CeladonGameCorner_h) - db BANK(CeladonMart5_h) - db BANK(CeladonPrizeRoom_h) - db BANK(CeladonDiner_h) - db BANK(CeladonHouse_h) - db BANK(CeladonHotel_h) - db BANK(LavenderPokecenter_h) - db BANK(PokemonTower1_h) - db BANK(PokemonTower2_h) - db BANK(PokemonTower3_h) - db BANK(PokemonTower4_h) - db BANK(PokemonTower5_h) - db BANK(PokemonTower6_h) - db BANK(PokemonTower7_h) - db BANK(LavenderHouse1_h) - db BANK(LavenderMart_h) - db BANK(LavenderHouse2_h) - db BANK(FuchsiaMart_h) - db BANK(FuchsiaHouse1_h) - db BANK(FuchsiaPokecenter_h) - db BANK(FuchsiaHouse2_h) - db BANK(SafariZoneEntrance_h) - db BANK(FuchsiaGym_h) - db BANK(FuchsiaMeetingRoom_h) - db BANK(SeafoamIslands2_h) - db BANK(SeafoamIslands3_h) - db BANK(SeafoamIslands4_h) - db BANK(SeafoamIslands5_h) - db BANK(VermilionHouse2_h) - db BANK(FuchsiaHouse3_h) - db BANK(Mansion1_h) - db BANK(CinnabarGym_h) - db BANK(Lab1_h) - db BANK(Lab2_h) - db BANK(Lab3_h) - db BANK(Lab4_h) - db BANK(CinnabarPokecenter_h) - db BANK(CinnabarMart_h) - db BANK(CinnabarMart_h) - db BANK(IndigoPlateauLobby_h) - db BANK(CopycatsHouse1F_h) - db BANK(CopycatsHouse2F_h) - db BANK(FightingDojo_h) - db BANK(SaffronGym_h) - db BANK(SaffronHouse1_h) - db BANK(SaffronMart_h) - db BANK(SilphCo1_h) - db BANK(SaffronPokecenter_h) - db BANK(SaffronHouse2_h) - db BANK(Route15Gate_h) - db BANK(Route15GateUpstairs_h) - db BANK(Route16Gate_h) - db BANK(Route16GateUpstairs_h) - db BANK(Route16House_h) - db BANK(Route12House_h) - db BANK(Route18Gate_h) - db BANK(Route18GateUpstairs_h) - db BANK(SeafoamIslands1_h) - db BANK(Route22Gate_h) - db BANK(VictoryRoad2_h) - db BANK(Route12GateUpstairs_h) - db BANK(VermilionHouse3_h) - db BANK(DiglettsCave_h) - db BANK(VictoryRoad3_h) - db BANK(RocketHideout1_h) - db BANK(RocketHideout2_h) - db BANK(RocketHideout3_h) - db BANK(RocketHideout4_h) - db BANK(RocketHideoutElevator_h) - db $01 - db $01 - db $01 - db BANK(SilphCo2_h) - db BANK(SilphCo3_h) - db BANK(SilphCo4_h) - db BANK(SilphCo5_h) - db BANK(SilphCo6_h) - db BANK(SilphCo7_h) - db BANK(SilphCo8_h) - db BANK(Mansion2_h) - db BANK(Mansion3_h) - db BANK(Mansion4_h) - db BANK(SafariZoneEast_h) - db BANK(SafariZoneNorth_h) - db BANK(SafariZoneWest_h) - db BANK(SafariZoneCenter_h) - db BANK(SafariZoneRestHouse1_h) - db BANK(SafariZoneSecretHouse_h) - db BANK(SafariZoneRestHouse2_h) - db BANK(SafariZoneRestHouse3_h) - db BANK(SafariZoneRestHouse4_h) - db BANK(UnknownDungeon2_h) - db BANK(UnknownDungeon3_h) - db BANK(UnknownDungeon1_h) - db BANK(NameRater_h) - db BANK(CeruleanHouse2_h) - db $01 - db BANK(RockTunnel2_h) - db BANK(SilphCo9_h) - db BANK(SilphCo10_h) - db BANK(SilphCo11_h) - db BANK(SilphCoElevator_h) - db $11 - db $11 - db BANK(BattleCenterM_h) - db BANK(TradeCenterM_h) - db $11 - db $11 - db $11 - db $11 - db BANK(Lorelei_h) - db BANK(Bruno_h) - db BANK(Agatha_h) - db BANK(BeachHouse_h) + dr $fc3e4,$fc4dd + ;db BANK(PalletTown_h) ;PALLET_TOWN + ;db BANK(ViridianCity_h) ; VIRIDIAN_CITY + ;db BANK(PewterCity_h) ; PEWTER_CITY + ;db BANK(CeruleanCity_h) ; CERULEAN_CITY + ;db BANK(LavenderTown_h) ; LAVENDER_TOWN + ;db BANK(VermilionCity_h) ; VERMILION_CITY + ;db BANK(CeladonCity_h) ; CELADON_CITY + ;db BANK(FuchsiaCity_h) ; FUCHSIA_CITY + ;db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND + ;db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU + ;db BANK(SaffronCity_h) ; SAFFRON_CITY + ;db $1 ; unused + ;db BANK(Route1_h) ; ROUTE_1 + ;db BANK(Route2_h) ; ROUTE_2 + ;db BANK(Route3_h) ; ROUTE_3 + ;db BANK(Route4_h) ; ROUTE_4 + ;db BANK(Route5_h) ; ROUTE_5 + ;db BANK(Route6_h) ; ROUTE_6 + ;db BANK(Route7_h) ; ROUTE_7 + ;db BANK(Route8_h) ; ROUTE_8 + ;db BANK(Route9_h) ; ROUTE_9 + ;db BANK(Route10_h) ; ROUTE_10 + ;db BANK(Route11_h) ; ROUTE_11 + ;db BANK(Route12_h) ; ROUTE_12 + ;db BANK(Route13_h) ; ROUTE_13 + ;db BANK(Route14_h) ; ROUTE_14 + ;db BANK(Route15_h) ; ROUTE_15 + ;db BANK(Route16_h) ; ROUTE_16 + ;db BANK(Route17_h) ; ROUTE_17 + ;db BANK(Route18_h) ; ROUTE_18 + ;db BANK(Route19_h) ; ROUTE_19 + ;db BANK(Route20_h) ; ROUTE_20 + ;db BANK(Route21_h) ; ROUTE_21 + ;db BANK(Route22_h) ; ROUTE_22 + ;db BANK(Route23_h) ; ROUTE_23 + ;db BANK(Route24_h) ; ROUTE_24 + ;db BANK(Route25_h) ; ROUTE_25 + ;db BANK(RedsHouse1F_h) + ;db BANK(RedsHouse2F_h) + ;db BANK(BluesHouse_h) + ;db BANK(OaksLab_h) + ;db BANK(ViridianPokecenter_h) + ;db BANK(ViridianMart_h) + ;db BANK(School_h) + ;db BANK(ViridianHouse_h) + ;db BANK(ViridianGym_h) + ;db BANK(DiglettsCaveRoute2_h) + ;db BANK(ViridianForestExit_h) + ;db BANK(Route2House_h) + ;db BANK(Route2Gate_h) + ;db BANK(ViridianForestEntrance_h) + ;db BANK(ViridianForest_h) + ;db BANK(Museum1F_h) + ;db BANK(Museum2F_h) + ;db BANK(PewterGym_h) + ;db BANK(PewterHouse1_h) + ;db BANK(PewterMart_h) + ;db BANK(PewterHouse2_h) + ;db BANK(PewterPokecenter_h) + ;db BANK(MtMoon1_h) + ;db BANK(MtMoon2_h) + ;db BANK(MtMoon3_h) + ;db BANK(CeruleanHouseTrashed_h) + ;db BANK(CeruleanHouse1_h) + ;db BANK(CeruleanPokecenter_h) + ;db BANK(CeruleanGym_h) + ;db BANK(BikeShop_h) + ;db BANK(CeruleanMart_h) + ;db BANK(MtMoonPokecenter_h) + ;db BANK(CeruleanHouseTrashed_h) + ;db BANK(Route5Gate_h) + ;db BANK(UndergroundPathEntranceRoute5_h) + ;db BANK(DayCareM_h) + ;db BANK(Route6Gate_h) + ;db BANK(UndergroundPathEntranceRoute6_h) + ;db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE + ;db BANK(Route7Gate_h) + ;db BANK(UndergroundPathEntranceRoute7_h) + ;db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE + ;db BANK(Route8Gate_h) + ;db BANK(UndergroundPathEntranceRoute8_h) + ;db BANK(RockTunnelPokecenter_h) + ;db BANK(RockTunnel1_h) + ;db BANK(PowerPlant_h) + ;db BANK(Route11Gate_h) + ;db BANK(DiglettsCaveEntranceRoute11_h) + ;db BANK(Route11GateUpstairs_h) + ;db BANK(Route12Gate_h) + ;db BANK(BillsHouse_h) + ;db BANK(VermilionPokecenter_h) + ;db BANK(FanClub_h) + ;db BANK(VermilionMart_h) + ;db BANK(VermilionGym_h) + ;db BANK(VermilionHouse1_h) + ;db BANK(VermilionDock_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 + ;db BANK(VictoryRoad1_h) + ;db $1D ;unused + ;db $1D ;unused + ;db $1D ;unused + ;db $1D ;unused + ;db BANK(Lance_h) + ;db $1D ;unused + ;db $1D ;unused + ;db $1D ;unused + ;db $1D ;unused + ;db BANK(HallofFameRoom_h) + ;db BANK(UndergroundPathNS_h) + ;db BANK(Gary_h) + ;db BANK(UndergroundPathWE_h) + ;db BANK(CeladonMart1_h) + ;db BANK(CeladonMart2_h) + ;db BANK(CeladonMart3_h) + ;db BANK(CeladonMart4_h) + ;db BANK(CeladonMartRoof_h) + ;db BANK(CeladonMartElevator_h) + ;db BANK(CeladonMansion1_h) + ;db BANK(CeladonMansion2_h) + ;db BANK(CeladonMansion3_h) + ;db BANK(CeladonMansion4_h) + ;db BANK(CeladonMansion5_h) + ;db BANK(CeladonPokecenter_h) + ;db BANK(CeladonGym_h) + ;db BANK(CeladonGameCorner_h) + ;db BANK(CeladonMart5_h) + ;db BANK(CeladonPrizeRoom_h) + ;db BANK(CeladonDiner_h) + ;db BANK(CeladonHouse_h) + ;db BANK(CeladonHotel_h) + ;db BANK(LavenderPokecenter_h) + ;db BANK(PokemonTower1_h) + ;db BANK(PokemonTower2_h) + ;db BANK(PokemonTower3_h) + ;db BANK(PokemonTower4_h) + ;db BANK(PokemonTower5_h) + ;db BANK(PokemonTower6_h) + ;db BANK(PokemonTower7_h) + ;db BANK(LavenderHouse1_h) + ;db BANK(LavenderMart_h) + ;db BANK(LavenderHouse2_h) + ;db BANK(FuchsiaMart_h) + ;db BANK(FuchsiaHouse1_h) + ;db BANK(FuchsiaPokecenter_h) + ;db BANK(FuchsiaHouse2_h) + ;db BANK(SafariZoneEntrance_h) + ;db BANK(FuchsiaGym_h) + ;db BANK(FuchsiaMeetingRoom_h) + ;db BANK(SeafoamIslands2_h) + ;db BANK(SeafoamIslands3_h) + ;db BANK(SeafoamIslands4_h) + ;db BANK(SeafoamIslands5_h) + ;db BANK(VermilionHouse2_h) + ;db BANK(FuchsiaHouse3_h) + ;db BANK(Mansion1_h) + ;db BANK(CinnabarGym_h) + ;db BANK(Lab1_h) + ;db BANK(Lab2_h) + ;db BANK(Lab3_h) + ;db BANK(Lab4_h) + ;db BANK(CinnabarPokecenter_h) + ;db BANK(CinnabarMart_h) + ;db BANK(CinnabarMart_h) + ;db BANK(IndigoPlateauLobby_h) + ;db BANK(CopycatsHouse1F_h) + ;db BANK(CopycatsHouse2F_h) + ;db BANK(FightingDojo_h) + ;db BANK(SaffronGym_h) + ;db BANK(SaffronHouse1_h) + ;db BANK(SaffronMart_h) + ;db BANK(SilphCo1_h) + ;db BANK(SaffronPokecenter_h) + ;db BANK(SaffronHouse2_h) + ;db BANK(Route15Gate_h) + ;db BANK(Route15GateUpstairs_h) + ;db BANK(Route16Gate_h) + ;db BANK(Route16GateUpstairs_h) + ;db BANK(Route16House_h) + ;db BANK(Route12House_h) + ;db BANK(Route18Gate_h) + ;db BANK(Route18GateUpstairs_h) + ;db BANK(SeafoamIslands1_h) + ;db BANK(Route22Gate_h) + ;db BANK(VictoryRoad2_h) + ;db BANK(Route12GateUpstairs_h) + ;db BANK(VermilionHouse3_h) + ;db BANK(DiglettsCave_h) + ;db BANK(VictoryRoad3_h) + ;db BANK(RocketHideout1_h) + ;db BANK(RocketHideout2_h) + ;db BANK(RocketHideout3_h) + ;db BANK(RocketHideout4_h) + ;db BANK(RocketHideoutElevator_h) + ;db $01 + ;db $01 + ;db $01 + ;db BANK(SilphCo2_h) + ;db BANK(SilphCo3_h) + ;db BANK(SilphCo4_h) + ;db BANK(SilphCo5_h) + ;db BANK(SilphCo6_h) + ;db BANK(SilphCo7_h) + ;db BANK(SilphCo8_h) + ;db BANK(Mansion2_h) + ;db BANK(Mansion3_h) + ;db BANK(Mansion4_h) + ;db BANK(SafariZoneEast_h) + ;db BANK(SafariZoneNorth_h) + ;db BANK(SafariZoneWest_h) + ;db BANK(SafariZoneCenter_h) + ;db BANK(SafariZoneRestHouse1_h) + ;db BANK(SafariZoneSecretHouse_h) + ;db BANK(SafariZoneRestHouse2_h) + ;db BANK(SafariZoneRestHouse3_h) + ;db BANK(SafariZoneRestHouse4_h) + ;db BANK(UnknownDungeon2_h) + ;db BANK(UnknownDungeon3_h) + ;db BANK(UnknownDungeon1_h) + ;db BANK(NameRater_h) + ;db BANK(CeruleanHouse2_h) + ;db $01 + ;db BANK(RockTunnel2_h) + ;db BANK(SilphCo9_h) + ;db BANK(SilphCo10_h) + ;db BANK(SilphCo11_h) + ;db BANK(SilphCoElevator_h) + ;db $11 + ;db $11 + ;db BANK(BattleCenterM_h) + ;db BANK(TradeCenterM_h) + ;db $11 + ;db $11 + ;db $11 + ;db $11 + ;db BANK(Lorelei_h) + ;db BANK(Bruno_h) + ;db BANK(Agatha_h) + ;db BANK(BeachHouse_h)
\ No newline at end of file diff --git a/engine/bank3f/data/map_header_pointers.asm b/engine/bank3f/data/map_header_pointers.asm index 5431727e..c7dd0c9f 100644 --- a/engine/bank3f/data/map_header_pointers.asm +++ b/engine/bank3f/data/map_header_pointers.asm @@ -1,251 +1,252 @@ ; see also MapHeaderBanks MapHeaderPointers:: ; fc1f2 (3f:41f2) - dw PalletTown_h - dw ViridianCity_h - dw PewterCity_h - dw CeruleanCity_h - dw LavenderTown_h - dw VermilionCity_h - dw CeladonCity_h - dw FuchsiaCity_h - dw CinnabarIsland_h - dw IndigoPlateau_h - dw SaffronCity_h - dw SaffronCity_h - dw Route1_h - dw Route2_h - dw Route3_h - dw Route4_h - dw Route5_h - dw Route6_h - dw Route7_h - dw Route8_h - dw Route9_h - dw Route10_h - dw Route11_h - dw Route12_h - dw Route13_h - dw Route14_h - dw Route15_h - dw Route16_h - dw Route17_h - dw Route18_h - dw Route19_h - dw Route20_h - dw Route21_h - dw Route22_h - dw Route23_h - dw Route24_h - dw Route25_h - dw RedsHouse1F_h - dw RedsHouse2F_h - dw BluesHouse_h - dw OaksLab_h ;id=40 - dw ViridianPokecenter_h - dw ViridianMart_h - dw School_h - dw ViridianHouse_h - dw ViridianGym_h - dw DiglettsCaveRoute2_h - dw ViridianForestExit_h - dw Route2House_h - dw Route2Gate_h - dw ViridianForestEntrance_h ;id=50 - dw ViridianForest_h - dw Museum1F_h - dw Museum2F_h - dw PewterGym_h - dw PewterHouse1_h - dw PewterMart_h - dw PewterHouse2_h - dw PewterPokecenter_h - dw MtMoon1_h - dw MtMoon2_h ;id=60 - dw MtMoon3_h - dw CeruleanHouseTrashed_h - dw CeruleanHouse1_h - dw CeruleanPokecenter_h - dw CeruleanGym_h - dw BikeShop_h - dw CeruleanMart_h - dw MtMoonPokecenter_h - dw CeruleanHouseTrashed_h ; copy - dw Route5Gate_h - dw UndergroundPathEntranceRoute5_h - dw DayCareM_h - dw Route6Gate_h - dw UndergroundPathEntranceRoute6_h - dw UndergroundPathEntranceRoute6_h ; unused - dw Route7Gate_h - dw UndergroundPathEntranceRoute7_h - dw UndergroundPathEntranceRoute7Copy_h - dw Route8Gate_h - dw UndergroundPathEntranceRoute8_h ;id=80 - dw RockTunnelPokecenter_h - dw RockTunnel1_h - dw PowerPlant_h - dw Route11Gate_h - dw DiglettsCaveEntranceRoute11_h - dw Route11GateUpstairs_h - dw Route12Gate_h - dw BillsHouse_h - dw VermilionPokecenter_h - dw FanClub_h ;id=90 - dw VermilionMart_h - dw VermilionGym_h - dw VermilionHouse1_h - dw VermilionDock_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 Lance_h ; unused - dw Lance_h ; unused - dw Lance_h ; unused - dw VictoryRoad1_h - dw Lance_h ; unused - dw Lance_h ; unused ;id=110 - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h ; unused - dw Lance_h ; unused - dw HallofFameRoom_h - dw UndergroundPathNS_h - dw Gary_h ;id=120 - dw UndergroundPathWE_h - dw CeladonMart1_h - dw CeladonMart2_h - dw CeladonMart3_h - dw CeladonMart4_h - dw CeladonMartRoof_h - dw CeladonMartElevator_h - dw CeladonMansion1_h - dw CeladonMansion2_h - dw CeladonMansion3_h ;id=130 - dw CeladonMansion4_h - dw CeladonMansion5_h - dw CeladonPokecenter_h - dw CeladonGym_h - dw CeladonGameCorner_h - dw CeladonMart5_h - dw CeladonPrizeRoom_h - dw CeladonDiner_h - dw CeladonHouse_h - dw CeladonHotel_h ;id=140 - dw LavenderPokecenter_h - dw PokemonTower1_h - dw PokemonTower2_h - dw PokemonTower3_h - dw PokemonTower4_h - dw PokemonTower5_h - dw PokemonTower6_h - dw PokemonTower7_h - dw LavenderHouse1_h - dw LavenderMart_h ;id=150 - dw LavenderHouse2_h - dw FuchsiaMart_h - dw FuchsiaHouse1_h - dw FuchsiaPokecenter_h - dw FuchsiaHouse2_h - dw SafariZoneEntrance_h - dw FuchsiaGym_h - dw FuchsiaMeetingRoom_h - dw SeafoamIslands2_h - dw SeafoamIslands3_h ;id=160 - dw SeafoamIslands4_h - dw SeafoamIslands5_h - dw VermilionHouse2_h - dw FuchsiaHouse3_h - dw Mansion1_h - dw CinnabarGym_h - dw Lab1_h - dw Lab2_h - dw Lab3_h - dw Lab4_h ;id=170 - dw CinnabarPokecenter_h - dw CinnabarMart_h - dw CinnabarMart_h ; unused - dw IndigoPlateauLobby_h - dw CopycatsHouse1F_h - dw CopycatsHouse2F_h - dw FightingDojo_h - dw SaffronGym_h - dw SaffronHouse1_h - dw SaffronMart_h ;id=180 - dw SilphCo1_h - dw SaffronPokecenter_h - dw SaffronHouse2_h - dw Route15Gate_h - dw Route15GateUpstairs_h - dw Route16Gate_h - dw Route16GateUpstairs_h - dw Route16House_h - dw Route12House_h - dw Route18Gate_h ;id=190 - dw Route18GateUpstairs_h - dw SeafoamIslands1_h - dw Route22Gate_h - dw VictoryRoad2_h - dw Route12GateUpstairs_h - dw VermilionHouse3_h - dw DiglettsCave_h - dw VictoryRoad3_h - dw RocketHideout1_h - dw RocketHideout2_h ;200 - dw RocketHideout3_h - dw RocketHideout4_h - dw RocketHideoutElevator_h - dw RocketHideoutElevator_h ; unused - dw RocketHideoutElevator_h ; unused - dw RocketHideoutElevator_h ; unused - dw SilphCo2_h - dw SilphCo3_h - dw SilphCo4_h - dw SilphCo5_h ;210 - dw SilphCo6_h - dw SilphCo7_h - dw SilphCo8_h - dw Mansion2_h - dw Mansion3_h - dw Mansion4_h - dw SafariZoneEast_h - dw SafariZoneNorth_h - dw SafariZoneWest_h - dw SafariZoneCenter_h ;220 - dw SafariZoneRestHouse1_h - dw SafariZoneSecretHouse_h - dw SafariZoneRestHouse2_h - dw SafariZoneRestHouse3_h - dw SafariZoneRestHouse4_h - dw UnknownDungeon2_h - dw UnknownDungeon3_h - dw UnknownDungeon1_h - dw NameRater_h - dw CeruleanHouse2_h - dw Route16Gate_h ; unused - dw RockTunnel2_h - dw SilphCo9_h - dw SilphCo10_h - dw SilphCo11_h - dw SilphCoElevator_h - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw BattleCenterM_h - dw TradeCenterM_h - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw SilphCo2_h ; unused - dw Lorelei_h - dw Bruno_h - dw Agatha_h ;247 - dw BeachHouse_h + dr $fc1f2,$fc3e4 + ;dw PalletTown_h + ;dw ViridianCity_h + ;dw PewterCity_h + ;dw CeruleanCity_h + ;dw LavenderTown_h + ;dw VermilionCity_h + ;dw CeladonCity_h + ;dw FuchsiaCity_h + ;dw CinnabarIsland_h + ;dw IndigoPlateau_h + ;dw SaffronCity_h + ;dw SaffronCity_h + ;dw Route1_h + ;dw Route2_h + ;dw Route3_h + ;dw Route4_h + ;dw Route5_h + ;dw Route6_h + ;dw Route7_h + ;dw Route8_h + ;dw Route9_h + ;dw Route10_h + ;dw Route11_h + ;dw Route12_h + ;dw Route13_h + ;dw Route14_h + ;dw Route15_h + ;dw Route16_h + ;dw Route17_h + ;dw Route18_h + ;dw Route19_h + ;dw Route20_h + ;dw Route21_h + ;dw Route22_h + ;dw Route23_h + ;dw Route24_h + ;dw Route25_h + ;dw RedsHouse1F_h + ;dw RedsHouse2F_h + ;dw BluesHouse_h + ;dw OaksLab_h ;id=40 + ;dw ViridianPokecenter_h + ;dw ViridianMart_h + ;dw School_h + ;dw ViridianHouse_h + ;dw ViridianGym_h + ;dw DiglettsCaveRoute2_h + ;dw ViridianForestExit_h + ;dw Route2House_h + ;dw Route2Gate_h + ;dw ViridianForestEntrance_h ;id=50 + ;dw ViridianForest_h + ;dw Museum1F_h + ;dw Museum2F_h + ;dw PewterGym_h + ;dw PewterHouse1_h + ;dw PewterMart_h + ;dw PewterHouse2_h + ;dw PewterPokecenter_h + ;dw MtMoon1_h + ;dw MtMoon2_h ;id=60 + ;dw MtMoon3_h + ;dw CeruleanHouseTrashed_h + ;dw CeruleanHouse1_h + ;dw CeruleanPokecenter_h + ;dw CeruleanGym_h + ;dw BikeShop_h + ;dw CeruleanMart_h + ;dw MtMoonPokecenter_h + ;dw CeruleanHouseTrashed_h ; copy + ;dw Route5Gate_h + ;dw UndergroundPathEntranceRoute5_h + ;dw DayCareM_h + ;dw Route6Gate_h + ;dw UndergroundPathEntranceRoute6_h + ;dw UndergroundPathEntranceRoute6_h ; unused + ;dw Route7Gate_h + ;dw UndergroundPathEntranceRoute7_h + ;dw UndergroundPathEntranceRoute7Copy_h + ;dw Route8Gate_h + ;dw UndergroundPathEntranceRoute8_h ;id=80 + ;dw RockTunnelPokecenter_h + ;dw RockTunnel1_h + ;dw PowerPlant_h + ;dw Route11Gate_h + ;dw DiglettsCaveEntranceRoute11_h + ;dw Route11GateUpstairs_h + ;dw Route12Gate_h + ;dw BillsHouse_h + ;dw VermilionPokecenter_h + ;dw FanClub_h ;id=90 + ;dw VermilionMart_h + ;dw VermilionGym_h + ;dw VermilionHouse1_h + ;dw VermilionDock_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 Lance_h ; unused + ;dw Lance_h ; unused + ;dw Lance_h ; unused + ;dw VictoryRoad1_h + ;dw Lance_h ; unused + ;dw Lance_h ; unused ;id=110 + ;dw Lance_h ; unused + ;dw Lance_h ; unused + ;dw Lance_h + ;dw Lance_h ; unused + ;dw Lance_h ; unused + ;dw Lance_h ; unused + ;dw Lance_h ; unused + ;dw HallofFameRoom_h + ;dw UndergroundPathNS_h + ;dw Gary_h ;id=120 + ;dw UndergroundPathWE_h + ;dw CeladonMart1_h + ;dw CeladonMart2_h + ;dw CeladonMart3_h + ;dw CeladonMart4_h + ;dw CeladonMartRoof_h + ;dw CeladonMartElevator_h + ;dw CeladonMansion1_h + ;dw CeladonMansion2_h + ;dw CeladonMansion3_h ;id=130 + ;dw CeladonMansion4_h + ;dw CeladonMansion5_h + ;dw CeladonPokecenter_h + ;dw CeladonGym_h + ;dw CeladonGameCorner_h + ;dw CeladonMart5_h + ;dw CeladonPrizeRoom_h + ;dw CeladonDiner_h + ;dw CeladonHouse_h + ;dw CeladonHotel_h ;id=140 + ;dw LavenderPokecenter_h + ;dw PokemonTower1_h + ;dw PokemonTower2_h + ;dw PokemonTower3_h + ;dw PokemonTower4_h + ;dw PokemonTower5_h + ;dw PokemonTower6_h + ;dw PokemonTower7_h + ;dw LavenderHouse1_h + ;dw LavenderMart_h ;id=150 + ;dw LavenderHouse2_h + ;dw FuchsiaMart_h + ;dw FuchsiaHouse1_h + ;dw FuchsiaPokecenter_h + ;dw FuchsiaHouse2_h + ;dw SafariZoneEntrance_h + ;dw FuchsiaGym_h + ;dw FuchsiaMeetingRoom_h + ;dw SeafoamIslands2_h + ;dw SeafoamIslands3_h ;id=160 + ;dw SeafoamIslands4_h + ;dw SeafoamIslands5_h + ;dw VermilionHouse2_h + ;dw FuchsiaHouse3_h + ;dw Mansion1_h + ;dw CinnabarGym_h + ;dw Lab1_h + ;dw Lab2_h + ;dw Lab3_h + ;dw Lab4_h ;id=170 + ;dw CinnabarPokecenter_h + ;dw CinnabarMart_h + ;dw CinnabarMart_h ; unused + ;dw IndigoPlateauLobby_h + ;dw CopycatsHouse1F_h + ;dw CopycatsHouse2F_h + ;dw FightingDojo_h + ;dw SaffronGym_h + ;dw SaffronHouse1_h + ;dw SaffronMart_h ;id=180 + ;dw SilphCo1_h + ;dw SaffronPokecenter_h + ;dw SaffronHouse2_h + ;dw Route15Gate_h + ;dw Route15GateUpstairs_h + ;dw Route16Gate_h + ;dw Route16GateUpstairs_h + ;dw Route16House_h + ;dw Route12House_h + ;dw Route18Gate_h ;id=190 + ;dw Route18GateUpstairs_h + ;dw SeafoamIslands1_h + ;dw Route22Gate_h + ;dw VictoryRoad2_h + ;dw Route12GateUpstairs_h + ;dw VermilionHouse3_h + ;dw DiglettsCave_h + ;dw VictoryRoad3_h + ;dw RocketHideout1_h + ;dw RocketHideout2_h ;200 + ;dw RocketHideout3_h + ;dw RocketHideout4_h + ;dw RocketHideoutElevator_h + ;dw RocketHideoutElevator_h ; unused + ;dw RocketHideoutElevator_h ; unused + ;dw RocketHideoutElevator_h ; unused + ;dw SilphCo2_h + ;dw SilphCo3_h + ;dw SilphCo4_h + ;dw SilphCo5_h ;210 + ;dw SilphCo6_h + ;dw SilphCo7_h + ;dw SilphCo8_h + ;dw Mansion2_h + ;dw Mansion3_h + ;dw Mansion4_h + ;dw SafariZoneEast_h + ;dw SafariZoneNorth_h + ;dw SafariZoneWest_h + ;dw SafariZoneCenter_h ;220 + ;dw SafariZoneRestHouse1_h + ;dw SafariZoneSecretHouse_h + ;dw SafariZoneRestHouse2_h + ;dw SafariZoneRestHouse3_h + ;dw SafariZoneRestHouse4_h + ;dw UnknownDungeon2_h + ;dw UnknownDungeon3_h + ;dw UnknownDungeon1_h + ;dw NameRater_h + ;dw CeruleanHouse2_h + ;dw Route16Gate_h ; unused + ;dw RockTunnel2_h + ;dw SilphCo9_h + ;dw SilphCo10_h + ;dw SilphCo11_h + ;dw SilphCoElevator_h + ;dw SilphCo2_h ; unused + ;dw SilphCo2_h ; unused + ;dw BattleCenterM_h + ;dw TradeCenterM_h + ;dw SilphCo2_h ; unused + ;dw SilphCo2_h ; unused + ;dw SilphCo2_h ; unused + ;dw SilphCo2_h ; unused + ;dw Lorelei_h + ;dw Bruno_h + ;dw Agatha_h ;247 + ;dw BeachHouse_h
\ No newline at end of file diff --git a/engine/bank3f/data/map_songs.asm b/engine/bank3f/data/map_songs.asm index b7f50c93..ece6d321 100644 --- a/engine/bank3f/data/map_songs.asm +++ b/engine/bank3f/data/map_songs.asm @@ -1,250 +1,252 @@ MapSongBanks: ; fc000 (3f:4000) - 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 + 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 diff --git a/engine/bank3f/main.asm b/engine/bank3f/main.asm index b0d3a808..a17d5138 100644 --- a/engine/bank3f/main.asm +++ b/engine/bank3f/main.asm @@ -188,7 +188,7 @@ Func_fc5fa:: ; fc5fa (3f:45fa) cp ROCK_TUNNEL_1 jr z,.asm_fc645 ld a,[W_CURMAP] - ld hl,Pointer_fc46b + ld hl,Pointer_fc64b call Func_1568 ; similar to IsInArray, but not the same jr c,.asm_fc639 ld a,[W_CURMAP] @@ -292,7 +292,9 @@ Func_fc69a:: ; fc69a (3f:469a) dr $fc6c5,$fc6d5 Func_fc6d5:: ; fc6d5 (3f:46d5) - dr $fc6d5,$fcc08 + dr $fc6d5,$fcb84 +Func_fcb84: ; fcb84 (3f:45bc) + dr $fcb84,$fcc08 Func_fcc08:: ; fcc08 (3f:4c08) dr $fcc08,$fcdb8 Func_fcdb8:: ; fcdb8 (3f:4db8) diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm index 5e0e6b07..e8e4a8b1 100644 --- a/engine/battle/moveEffects/transform_effect.asm +++ b/engine/battle/moveEffects/transform_effect.asm @@ -26,8 +26,8 @@ TransformEffect_: ; f637f (3d:637f) ; animation(s) played are different if target has Substitute up bit HasSubstituteUp, [hl] push af - ld hl, Func_79747 - ld b, BANK(Func_79747) + ld hl, Func_79816 + ld b, BANK(Func_79816) call nz, Bankswitch ld a, [W_OPTIONS] add a @@ -38,8 +38,8 @@ TransformEffect_: ; f637f (3d:637f) ld b, BANK(AnimationTransformMon) .gotAnimToPlay call Bankswitch - ld hl, Func_79771 - ld b, BANK(Func_79771) + ld hl, Func_798b2 + ld b, BANK(Func_798b2) pop af call nz, Bankswitch pop bc diff --git a/engine/multiply_divide.asm b/engine/multiply_divide.asm index 571096b4..a72f1505 100755 --- a/engine/multiply_divide.asm +++ b/engine/multiply_divide.asm @@ -27,7 +27,7 @@ _Multiply: ; f660e (3d:660e) ld c, a ld a, [H_MULTIPLICAND] ; $ff96 adc c - ld [H_MULTIPLYDBUFFER+1], a ; $ff9c + ld [H_MULTIPLYBUFFER+1], a ; $ff9c ld a, [H_MULTIPLYBUFFER] ld c, a ld a, [H_PRODUCT] ; $ff95 diff --git a/engine/predefs.asm b/engine/predefs.asm index 859d4aec..7a629444 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -52,7 +52,7 @@ GetPredefPointer: ; f67ed (3d:67ed) PredefPointers:: ; f681d (3d:681d) ; these are pointers to ASM routines. ; they appear to be used in overworld map scripts. - dr $f681d,$f68a1 + dr $f681d,$f8000 ;add_predef DrawPlayerHUDAndHPBar ;add_predef Func_3f0c6 ;add_predef Func_3f073 @@ -98,8 +98,6 @@ PredefPointers:: ; f681d (3d:681d) ;add_predef EvolutionAfterBattle ;add_predef SaveSAVtoSRAM0 ;add_predef InitOpponent -CableClub_RunPredef:: - dr $f68a1,$f68b9 ;add_predef CableClub_Run ;add_predef DrawBadges ;add_predef ExternalClockTradeAnim @@ -108,8 +106,7 @@ CableClub_RunPredef:: ;add_predef PlayIntro ;add_predef Func_79869 ;add_predef FlashScreen - add_predef GetTileAndCoordsInFrontOfPlayer - dr $f68bc,$f68e9 + ;add_predef GetTileAndCoordsInFrontOfPlayer ;add_predef StatusScreen ;add_predef StatusScreen2 ;add_predef InternalClockTradeAnim @@ -125,8 +122,7 @@ CableClub_RunPredef:: ;add_predef SetPartyMonTypes ;add_predef CanLearnTM ;add_predef TMToMove - add_predef Func_71ddf - dr $f68e9,$f8000 + ;add_predef Func_71ddf ;add_predef StarterDex ; 46 ;add_predef _AddPartyMon ;add_predef UpdateHPBar2 @@ -48,6 +48,8 @@ H_NUMTOPRINT EQU $FF96 ; 3 bytes H_POWEROFTEN EQU $FF99 ; 3 bytes H_SAVEDNUMTOPRINT EQU $FF9C ; 3 bytes +hMoney EQU $FF9F ; 3-byte BCD number +hCoins EQU $FFA0 ; 2-byte BCD number hSerialReceivedNewData EQU $FFA9 @@ -253,7 +253,7 @@ add_predef: MACRO ENDM predef_id: MACRO - ld a, (\1Predef - PredefPointers) / 3 + ld a, (\1Predef) ; - PredefPointers) / 3 ENDM predef: MACRO @@ -266,7 +266,10 @@ predef_jump: MACRO jp Predef ENDM - +predef_const: MACRO + const \1Predef + ENDM + add_tx_pre: MACRO \1_id:: dw \1 ENDM @@ -594,6 +594,8 @@ wPlayerSpinInPlaceAnimFrameDelay:: ; cd3d wPlayerSpinWhileMovingUpOrDownAnimDeltaY:: ; cd3d +wBoxNumString:: ; cd3d + wHiddenObjectFunctionArgument:: ; cd3d wSubtrahend:: ; cd3d @@ -1643,8 +1645,13 @@ wd434:: ds 1 wd435:: ds 1 wd436:: ds 1 - ds 19 + ds 17 + +wExpressionNumber:: + ds 1 + ds 1 + wd44a:: ds 1 wd44b:: ds 1 diff --git a/yellow/main.asm b/yellow/main.asm index c296ad5e..f5ea85d1 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -69,7 +69,9 @@ DisplayTextIDInit:: ; 6f0e (1:6f0e) DrawStartMenu:: ; 6f80 (1:6f80) dr $6f80,$7035 CableClubNPC:: ; 7035 (1:7035) - dr $7035,$71bf + dr $7035,$71ac +CloseLinkConnection: ; 71ac (1:71ac) + dr $71ac,$71bf DisplayTextBoxID_:: ; 71bf (1:71bf) dr $71bf,$778e PlayerPC:: ; 778e (1:778e) @@ -81,7 +83,9 @@ Func_7c18:: ; 7c18 (1:7c18) SECTION "bank02",ROMX,BANK[$02] - dr $8000,$909d + dr $8000,$9064 +PlayBattleMusic: ; 9064 (2:5064) + dr $9064,$909d Music2_UpdateMusic:: ; 909d (2:509d) dr $909d,$984e Func_984e:: ; 984e (2:584e) @@ -357,7 +361,9 @@ UseItem_:: ; d2ed (3:52ed) TossItem_:: ; e635 (3:6635) dr $e635,$e6a8 IsKeyItem_:: ; e6a8 (3:66a8) - dr $e6a8,$e808 + dr $e6a8,$e6e8 +SendNewMonToBox: ; e6e8 (3:66e8) + dr $e6e8,$e808 IsNextTileShoreOrWater:: ; e808 (3:6808) dr $e808,$e848 FindWildLocationsOfMon:: ; e848 (3:6848) @@ -449,7 +455,10 @@ OldAmberSprite: INCBIN "gfx/sprites/old_amber.2bpp" LyingOldManSprite: INCBIN "gfx/sprites/lying_old_man.2bpp" QuestionMarkSprite: INCBIN "gfx/sprites/question_mark.2bpp" - dr $13765,$14000 +EndOfBattle: ; 13765 (4:7765) + dr $13765,$1383a +TryDoWildEncounter: ; 1383a (4:783a) + dr $1383a,$14000 SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] @@ -892,7 +901,9 @@ CryData:: ; 39462 (e:5462) TrainerPicAndMoneyPointers:: ; 39893 (e:5893) dr $39893,$3997e TrainerNames:: ; 3997e (e:597e) - dr $3997e,$3a8df + dr $3997e,$39bb6 +ReadTrainer: ; 39bb6 (e:5bb6) + dr $39bb6,$3a8df DrawAllPokeballs: ; 3a8df (e:68df) dr $3a8df,$3a9e9 SetupPlayerAndEnemyPokeballs: ; 3a9e9 (e:69e9) @@ -906,20 +917,50 @@ TradingAnimationGraphics2: ; Pokeball traveling through the link cable. INCBIN "gfx/trade2.2bpp" - dr $3adb8,$3c000 + dr $3adb8,$3b10f +Func_3b10f: ; 3b01f (e:710f) + dr $3b10f,$3c000 SECTION "bank0F",ROMX,BANK[$0F] - dr $3c000,$3cae8 + dr $3c000,$3c04c +SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) + dr $3c04c,$3c127 +StartBattle: ; 3c127 (f:4127) + dr $3c127,$3cae8 AnyPartyAlive:: ; 3cae8 (f:4ae8) - dr $3cae8,$3ec87 + dr $3cae8,$3ce1f +DrawHUDsAndHPBars: ; 3ce1f (f:4e1f) + dr $3ce1f,$3ceb1 +DrawEnemyHUDAndHPBar: ; 3ceb1 (f:4eb1) + dr $3ceb1,$3d9ac +IsGhostBattle: ; 3d9ac (f:59ac) + dr $3d9ac,$3ddc3 +PrintDoesntAffectText: ; 3ddc3 (f:5dc3) + dr $3ddc3,$3e6f1 +MoveHitTest: ; 3e6f1 (f:66f1) + dr $3e6f1,$3ec87 LoadEnemyMonData: ; 3ec87 (f:6c87) - dr $3ec87,$40000 + dr $3ec87,$3edb8 +DoBattleTransitionAndInitBattleVariables: ; 3edb8 (f:6db8) + dr $3edb8,$3eeb3 +QuarterSpeedDueToParalysis: ; 3eeb3 (f:6eb3) + dr $3eeb3,$3fb2e +PrintButItFailedText_: ; 3fb2e (f:7b2e) + dr $3fb2e,$3fb39 +PrintDidntAffectText: ; 3fb39 (f:7b39) + dr $3fb39,$3fb49 +PrintMayNotAttackText: ; 3fb49 (f:7b49) + dr $3fb49,$3fb83 +PlayCurrentMoveAnimation: ; 3fb83 (f:7b83) + dr $3fb83,$40000 SECTION "bank10",ROMX,BANK[$10] - dr $40000,$44000 + dr $40000,$4050b +Pointer_4050b: ; 4050b (10:450b) + dr $4050b,$44000 SECTION "bank11",ROMX,BANK[$11] @@ -1074,9 +1115,16 @@ SECTION "bank1E",ROMX,BANK[$1E] dr $78000,$78757 AnimationTileset2: ; 78757 (1e:4857) - dr $78757,$798d4 + dr $78757,$79816 +Func_79816: ; 79816 (1e:5816) + dr $79816,$798b2 +Func_798b2: ; 798b2 (1e:58b2) + dr $798b2,$798c8 +AnimationTransformMon: ; 798c8 (1e:58c8) + dr $798c8,$798d4 Func_798d4: ; 798d4 (1e:58d4) dr $798d4,$7a19a + RedFishingTilesFront: INCBIN "gfx/red_fishing_tile_front.2bpp" RedFishingTilesBack: INCBIN "gfx/red_fishing_tile_back.2bpp" RedFishingTilesSide: INCBIN "gfx/red_fishing_tile_side.2bpp" |