diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/bank3c.asm (renamed from engine/bank3c/main.asm) | 2 | ||||
| -rw-r--r-- | engine/bank3d.asm (renamed from engine/bank3d/main.asm) | 6 | ||||
| -rw-r--r-- | engine/bank3d/random.asm | 13 | ||||
| -rw-r--r-- | engine/bank3f.asm (renamed from engine/bank3f/main.asm) | 6 | ||||
| -rw-r--r-- | engine/bank3f/data/map_header_banks.asm | 252 | ||||
| -rw-r--r-- | engine/bank3f/data/map_header_pointers.asm | 252 | ||||
| -rw-r--r-- | engine/bank3f/data/map_songs.asm | 250 | ||||
| -rw-r--r-- | engine/battle/bank3d_battle.asm (renamed from engine/bank3d/bank3d_battle.asm) | 0 | ||||
| -rw-r--r-- | engine/menu/link_menu.asm (renamed from engine/bank3d/link_menu.asm) | 50 | ||||
| -rw-r--r-- | engine/overworld/advance_player_sprite.asm (renamed from engine/bank3c/overworld.asm) | 0 | ||||
| -rwxr-xr-x | engine/random.asm | 2 |
11 files changed, 33 insertions, 800 deletions
diff --git a/engine/bank3c/main.asm b/engine/bank3c.asm index 468a6412..fa661614 100644 --- a/engine/bank3c/main.asm +++ b/engine/bank3c.asm @@ -152,7 +152,7 @@ PikachuCriesPointerTable: ; f008e (3c:408e) dbw BANK(PikachuCry41), PikachuCry41 ; 36:6746 dbw BANK(PikachuCry42), PikachuCry42 ; 38:6976 -INCLUDE "engine/bank3c/overworld.asm" +INCLUDE "engine/overworld/advance_player_sprite.asm" ResetStatusAndHalveMoneyOnBlackout:: ; f0274 (3c:4274) ; Reset player status on blackout. diff --git a/engine/bank3d/main.asm b/engine/bank3d.asm index cc78a114..ef848679 100644 --- a/engine/bank3d/main.asm +++ b/engine/bank3d.asm @@ -303,7 +303,7 @@ Pointer_f468f:: ; f468f (3d:468f) PokemonLogoGraphics: INCBIN "gfx/pokemon_logo.2bpp" YellowLogoGraphics: INCBIN "gfx/yellow_titlescreen.2bpp" -INCLUDE "engine/bank3d/link_menu.asm" +INCLUDE "engine/menu/link_menu.asm" HandleMenuInputDouble:: ; f5a40 (3d:5a40) xor a @@ -684,10 +684,10 @@ GenerateRandomFishingEncounter: ; f5ec1 (3d:5ec1) ret INCLUDE "data/super_rod.asm" -INCLUDE "engine/bank3d/bank3d_battle.asm" +INCLUDE "engine/battle/bank3d_battle.asm" INCLUDE "engine/items/tm_prices.asm" INCLUDE "engine/multiply_divide.asm" INCLUDE "engine/give_pokemon.asm" INCLUDE "engine/battle/get_trainer_name.asm" -INCLUDE "engine/bank3d/random.asm" +INCLUDE "engine/random.asm" INCLUDE "engine/predefs.asm"
\ No newline at end of file diff --git a/engine/bank3d/random.asm b/engine/bank3d/random.asm deleted file mode 100644 index ddf042df..00000000 --- a/engine/bank3d/random.asm +++ /dev/null @@ -1,13 +0,0 @@ -Random_:: ; f67dc (3d:67dc) -; Generate a random 16-bit value. - ld a, [rDIV] - ld b, a - ld a, [hRandomAdd] - adc b - ld [hRandomAdd], a - ld a, [rDIV] - ld b, a - ld a, [hRandomSub] - sbc b - ld [hRandomSub], a - ret diff --git a/engine/bank3f/main.asm b/engine/bank3f.asm index 9552e07a..1bc32483 100644 --- a/engine/bank3f/main.asm +++ b/engine/bank3f.asm @@ -1,6 +1,6 @@ -INCLUDE "engine/bank3f/data/map_songs.asm" -INCLUDE "engine/bank3f/data/map_header_pointers.asm" -INCLUDE "engine/bank3f/data/map_header_banks.asm" +INCLUDE "data/map_songs.asm" +INCLUDE "data/map_header_pointers.asm" +INCLUDE "data/map_header_banks.asm" Func_fc4dd:: ; fc4dd (3f:44dd) ; possibly to test if pika should be out? diff --git a/engine/bank3f/data/map_header_banks.asm b/engine/bank3f/data/map_header_banks.asm deleted file mode 100644 index eeff1974..00000000 --- a/engine/bank3f/data/map_header_banks.asm +++ /dev/null @@ -1,252 +0,0 @@ -; see also MapHeaderPointers -MapHeaderBanks:: ; fc3e4 (3f:43e4) - 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 deleted file mode 100644 index c7dd0c9f..00000000 --- a/engine/bank3f/data/map_header_pointers.asm +++ /dev/null @@ -1,252 +0,0 @@ -; see also MapHeaderBanks -MapHeaderPointers:: ; fc1f2 (3f:41f2) - 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 deleted file mode 100644 index b65822e7..00000000 --- a/engine/bank3f/data/map_songs.asm +++ /dev/null @@ -1,250 +0,0 @@ -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
\ No newline at end of file diff --git a/engine/bank3d/bank3d_battle.asm b/engine/battle/bank3d_battle.asm index b9713cec..b9713cec 100644 --- a/engine/bank3d/bank3d_battle.asm +++ b/engine/battle/bank3d_battle.asm diff --git a/engine/bank3d/link_menu.asm b/engine/menu/link_menu.asm index a7b4ea9e..73e19038 100644 --- a/engine/bank3d/link_menu.asm +++ b/engine/menu/link_menu.asm @@ -6,19 +6,19 @@ Func_f531b:: ; f531b (3d:531b) xor a ld [wUnknownSerialFlag_d499],a coord hl, 0,0 - ld bc,$405 + lb bc, 4, 5 call TextBoxBorder ld de,Text_f5791 coord hl, 1,2 call PlaceString coord hl, 8,0 - ld bc,$80a + lb bc, 8, 10 call TextBoxBorder coord hl, 10,2 ld de,Text_f579c call PlaceString coord hl, 0,10 - ld bc,$612 + lb bc, 6, 18 call TextBoxBorder call UpdateSprites xor a @@ -514,7 +514,7 @@ Func_f56bd:: ; f56bd (3d:56bd) xor a ld [H_AUTOBGTRANSFERENABLED],a coord hl, 1,11 - ld bc,$612 + lb bc, 6, 18 call ClearScreenArea ld a,[wCurrentMenuItem] cp $3 @@ -643,7 +643,7 @@ LinkMenu: ; f580c (3d:580c) ld hl, ColosseumWhereToText call PrintText coord hl, 5, 3 - ld bc, $80d + lb bc, 8, 13 call TextBoxBorder call UpdateSprites coord hl, 7, 5 @@ -690,13 +690,13 @@ LinkMenu: ; f580c (3d:580c) ld b, a and $f0 cp $d0 - jr z, .asm_5c7d + jr z, .asm_f5c7d ld a, [wLinkMenuSelectionReceiveBuffer + 1] ld b, a and $f0 cp $d0 jr nz, .exchangeMenuSelectionLoop -.asm_5c7d +.asm_f5c7d ld a, b and $c ; did the enemy press A or B? jr nz, .enemyPressedAOrB @@ -730,10 +730,10 @@ LinkMenu: ; f580c (3d:580c) ld a, START_TRANSFER_INTERNAL_CLOCK ld [rSC], a .skipStartingTransfer - ld b, $7f - ld c, $7f - ld d, $7f - ld e, $ec + ld b, " " + ld c, " " + ld d, " " + ld e, "▷" ld a, [wLinkMenuSelectionSendBuffer] and (B_BUTTON << 2) ; was B button pressed? jr nz, .updateCursorPosition @@ -772,14 +772,14 @@ LinkMenu: ; f580c (3d:580c) ld [wd72d], a ld hl, ColosseumPleaseWaitText call PrintText - ld c, $32 + ld c, 50 call DelayFrames ld hl, wd732 res 1, [hl] ld a, [wAnimationID] ld [wDestinationMap], a callab SpecialWarpIn - ld c, $14 + ld c, 20 call DelayFrames xor a ld [wMenuJoypadPollCount], a @@ -803,10 +803,10 @@ LinkMenu: ; f580c (3d:580c) ld a,[wd11e] and a jr nz,.asm_f5974 - ld b,$7f - ld c,$7f - ld d,$ec - ld e,$7f + ld b," " + ld c," " + ld d,"▷" + ld e," " call Func_f59ec .asm_f5974 xor a @@ -848,10 +848,10 @@ LinkMenu: ; f580c (3d:580c) ld a,[wd11e] and a jr z,.asm_f59cd - ld b,$7f - ld c,$7f - ld d,$7f - ld e,$ec + ld b," " + ld c," " + ld d," " + ld e,"▷" call Func_f59ec jp .choseCancel @@ -861,10 +861,10 @@ LinkMenu: ; f580c (3d:580c) jp .choseCancel .asm_f59d6 - ld b,$7f - ld c,$7f - ld d,$ec - ld e,$7f + ld b," " + ld c," " + ld d,"▷" + ld e," " call Func_f59ec call Func_f531b jp c,.choseCancel diff --git a/engine/bank3c/overworld.asm b/engine/overworld/advance_player_sprite.asm index e02fb129..e02fb129 100644 --- a/engine/bank3c/overworld.asm +++ b/engine/overworld/advance_player_sprite.asm diff --git a/engine/random.asm b/engine/random.asm index 2fc83f6f..ddf042df 100755 --- a/engine/random.asm +++ b/engine/random.asm @@ -1,4 +1,4 @@ -Random_:: +Random_:: ; f67dc (3d:67dc) ; Generate a random 16-bit value. ld a, [rDIV] ld b, a |