From aa2dcaedbc481ed6ee976b61709259ac9309ea8d Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Thu, 26 May 2016 07:35:25 -0400 Subject: Include Celadon's headers --- data/map_header_pointers.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index c7dd0c9f..8cabbd0d 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -249,4 +249,4 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) ;dw Lorelei_h ;dw Bruno_h ;dw Agatha_h ;247 - ;dw BeachHouse_h \ No newline at end of file + ;dw BeachHouse_h -- cgit v1.3.1-sl0p From c1b46c9bca3039140f052f75af9993ac8b67d64f Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Thu, 26 May 2016 11:34:43 -0400 Subject: No more dr in map header pointer files --- data/map_header_banks.asm | 499 +++++++++++++++++++++---------------------- data/map_header_pointers.asm | 499 +++++++++++++++++++++---------------------- 2 files changed, 498 insertions(+), 500 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 29357dd6..cf97aebb 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -1,252 +1,251 @@ ; 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) + db $06 ; db BANK(PalletTown_h) ;PALLET_TOWN + db $06 ; db BANK(ViridianCity_h) ; VIRIDIAN_CITY + db $06 ; db BANK(PewterCity_h) ; PEWTER_CITY + db $06 ; db BANK(CeruleanCity_h) ; CERULEAN_CITY + db $11 ; db BANK(LavenderTown_h) ; LAVENDER_TOWN + db $06 ; db BANK(VermilionCity_h) ; VERMILION_CITY + db BANK(CeladonCity_h) ; CELADON_CITY + db $06 ; db BANK(FuchsiaCity_h) ; FUCHSIA_CITY + db $07 ; db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND + db $14 ; db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU + db BANK(SaffronCity_h) ; SAFFRON_CITY + db $01 ; db $1 ; unused + db $07 ; db BANK(Route1_h) ; ROUTE_1 + db $15 ; db BANK(Route2_h) ; ROUTE_2 + db $15 ; db BANK(Route3_h) ; ROUTE_3 + db $15 ; db BANK(Route4_h) ; ROUTE_4 + db BANK(Route5_h) ; ROUTE_5 + db $16 ; db BANK(Route6_h) ; ROUTE_6 + db BANK(Route7_h) ; ROUTE_7 + db $16 ; db BANK(Route8_h) ; ROUTE_8 + db $15 ; db BANK(Route9_h) ; ROUTE_9 + db $16 ; db BANK(Route10_h) ; ROUTE_10 + db $16 ; db BANK(Route11_h) ; ROUTE_11 + db $16 ; db BANK(Route12_h) ; ROUTE_12 + db $15 ; db BANK(Route13_h) ; ROUTE_13 + db $15 ; db BANK(Route14_h) ; ROUTE_14 + db $16 ; db BANK(Route15_h) ; ROUTE_15 + db $16 ; db BANK(Route16_h) ; ROUTE_16 + db $15 ; db BANK(Route17_h) ; ROUTE_17 + db $16 ; db BANK(Route18_h) ; ROUTE_18 + db $15 ; db BANK(Route19_h) ; ROUTE_19 + db $14 ; db BANK(Route20_h) ; ROUTE_20 + db $15 ; db BANK(Route21_h) ; ROUTE_21 + db $14 ; db BANK(Route22_h) ; ROUTE_22 + db $14 ; db BANK(Route23_h) ; ROUTE_23 + db $14 ; db BANK(Route24_h) ; ROUTE_24 + db $14 ; db BANK(Route25_h) ; ROUTE_25 + db $12 ; db BANK(RedsHouse1F_h) + db $17 ; db BANK(RedsHouse2F_h) + db $06 ; db BANK(BluesHouse_h) + db $07 ; db BANK(OaksLab_h) + db $11 ; db BANK(ViridianPokecenter_h) + db $07 ; db BANK(ViridianMart_h) + db $07 ; db BANK(School_h) + db $07 ; db BANK(ViridianHouse_h) + db $1d ; db BANK(ViridianGym_h) + db $07 ; db BANK(DiglettsCaveRoute2_h) + db $17 ; db BANK(ViridianForestExit_h) + db $07 ; db BANK(Route2House_h) + db $17 ; db BANK(Route2Gate_h) + db $17 ; db BANK(ViridianForestEntrance_h) + db $18 ; db BANK(ViridianForest_h) + db $17 ; db BANK(Museum1F_h) + db $17 ; db BANK(Museum2F_h) + db $17 ; db BANK(PewterGym_h) + db $07 ; db BANK(PewterHouse1_h) + db $1d ; db BANK(PewterMart_h) + db $07 ; db BANK(PewterHouse2_h) + db $17 ; db BANK(PewterPokecenter_h) + db $12 ; db BANK(MtMoon1_h) + db $14 ; db BANK(MtMoon2_h) + db $12 ; db BANK(MtMoon3_h) + db $07 ; db BANK(CeruleanHouseTrashed_h) + db $07 ; db BANK(CeruleanHouse1_h) + db $17 ; db BANK(CeruleanPokecenter_h) + db $17 ; db BANK(CeruleanGym_h) + db $07 ; db BANK(BikeShop_h) + db $17 ; db BANK(CeruleanMart_h) + db $12 ; db BANK(MtMoonPokecenter_h) + db $07 ; db BANK(CeruleanHouseTrashed_h) + db $07 ; db BANK(Route5Gate_h) + db $17 ; db BANK(UndergroundPathEntranceRoute5_h) + db $15 ; db BANK(DayCareM_h) + db $07 ; db BANK(Route6Gate_h) + db $17 ; db BANK(UndergroundPathEntranceRoute6_h) + db $17 ; db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE + db $07 ; db BANK(Route7Gate_h) + db $17 ; db BANK(UndergroundPathEntranceRoute7_h) + db $17 ; db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE + db $07 ; db BANK(Route8Gate_h) + db $07 ; db BANK(UndergroundPathEntranceRoute8_h) + db $12 ; db BANK(RockTunnelPokecenter_h) + db $11 ; db BANK(RockTunnel1_h) + db $07 ; db BANK(PowerPlant_h) + db $12 ; db BANK(Route11Gate_h) + db $07 ; db BANK(DiglettsCaveEntranceRoute11_h) + db $12 ; db BANK(Route11GateUpstairs_h) + db $12 ; db BANK(Route12Gate_h) + db $07 ; db BANK(BillsHouse_h) + db $17 ; db BANK(VermilionPokecenter_h) + db $16 ; db BANK(FanClub_h) + db $17 ; db BANK(VermilionMart_h) + db $17 ; db BANK(VermilionGym_h) + db $07 ; db BANK(VermilionHouse1_h) + db $07 ; db BANK(VermilionDock_h) + db $18 ; db BANK(SSAnne1_h) + db $18 ; db BANK(SSAnne2_h) + db $11 ; db BANK(SSAnne3_h) + db $18 ; db BANK(SSAnne4_h) + db $18 ; db BANK(SSAnne5_h) + db $18 ; db BANK(SSAnne6_h) + db $18 ; db BANK(SSAnne7_h) + db $18 ; db BANK(SSAnne8_h) + db $18 ; db BANK(SSAnne9_h) + db $18 ; db BANK(SSAnne10_h) + db $1d ; db $1D ;unused + db $1d ; db $1D ;unused + db $1d ; db $1D ;unused + db $17 ; db BANK(VictoryRoad1_h) + db $1d ; db $1D ;unused + db $1d ; db $1D ;unused + db $1d ; db $1D ;unused + db $1d ; db $1D ;unused + db $16 ; db BANK(Lance_h) + db $1d ; db $1D ;unused + db $1d ; db $1D ;unused + db $1d ; db $1D ;unused + db $1d ; db $1D ;unused + db $16 ; db BANK(HallofFameRoom_h) + db $18 ; db BANK(UndergroundPathNS_h) + db $1d ; db BANK(Gary_h) + db $18 ; db BANK(UndergroundPathWE_h) + db $11 ; db BANK(CeladonMart1_h) + db $15 ; db BANK(CeladonMart2_h) + db $12 ; db BANK(CeladonMart3_h) + db $12 ; db BANK(CeladonMart4_h) + db $12 ; db BANK(CeladonMartRoof_h) + db $12 ; db BANK(CeladonMartElevator_h) + db $12 ; db BANK(CeladonMansion1_h) + db $12 ; db BANK(CeladonMansion2_h) + db $12 ; db BANK(CeladonMansion3_h) + db $12 ; db BANK(CeladonMansion4_h) + db $07 ; db BANK(CeladonMansion5_h) + db $12 ; db BANK(CeladonPokecenter_h) + db $12 ; db BANK(CeladonGym_h) + db $12 ; db BANK(CeladonGameCorner_h) + db $12 ; db BANK(CeladonMart5_h) + db $12 ; db BANK(CeladonPrizeRoom_h) + db $12 ; db BANK(CeladonDiner_h) + db $12 ; db BANK(CeladonHouse_h) + db $12 ; db BANK(CeladonHotel_h) + db $17 ; db BANK(LavenderPokecenter_h) + db $18 ; db BANK(PokemonTower1_h) + db $18 ; db BANK(PokemonTower2_h) + db $18 ; db BANK(PokemonTower3_h) + db $18 ; db BANK(PokemonTower4_h) + db $18 ; db BANK(PokemonTower5_h) + db $18 ; db BANK(PokemonTower6_h) + db $18 ; db BANK(PokemonTower7_h) + db $07 ; db BANK(LavenderHouse1_h) + db $17 ; db BANK(LavenderMart_h) + db $07 ; db BANK(LavenderHouse2_h) + db $07 ; db BANK(FuchsiaMart_h) + db $1d ; db BANK(FuchsiaHouse1_h) + db $1d ; db BANK(FuchsiaPokecenter_h) + db $1d ; db BANK(FuchsiaHouse2_h) + db $1d ; db BANK(SafariZoneEntrance_h) + db $1d ; db BANK(FuchsiaGym_h) + db $1d ; db BANK(FuchsiaMeetingRoom_h) + db $11 ; db BANK(SeafoamIslands2_h) + db $11 ; db BANK(SeafoamIslands3_h) + db $11 ; db BANK(SeafoamIslands4_h) + db $11 ; db BANK(SeafoamIslands5_h) + db $15 ; db BANK(VermilionHouse2_h) + db $15 ; db BANK(FuchsiaHouse3_h) + db $11 ; db BANK(Mansion1_h) + db $1d ; db BANK(CinnabarGym_h) + db $1d ; db BANK(Lab1_h) + db $1d ; db BANK(Lab2_h) + db $1d ; db BANK(Lab3_h) + db $1d ; db BANK(Lab4_h) + db $1d ; db BANK(CinnabarPokecenter_h) + db $1d ; db BANK(CinnabarMart_h) + db $1d ; db BANK(CinnabarMart_h) + db $06 ; db BANK(IndigoPlateauLobby_h) + db $1d ; db BANK(CopycatsHouse1F_h) + db $17 ; db BANK(CopycatsHouse2F_h) + db $17 ; db BANK(FightingDojo_h) + db $17 ; db BANK(SaffronGym_h) + db $07 ; db BANK(SaffronHouse1_h) + db $17 ; db BANK(SaffronMart_h) + db $17 ; db BANK(SilphCo1_h) + db $17 ; db BANK(SaffronPokecenter_h) + db $07 ; db BANK(SaffronHouse2_h) + db $12 ; db BANK(Route15Gate_h) + db $12 ; db BANK(Route15GateUpstairs_h) + db $12 ; db BANK(Route16Gate_h) + db $12 ; db BANK(Route16GateUpstairs_h) + db $07 ; db BANK(Route16House_h) + db $15 ; db BANK(Route12House_h) + db $12 ; db BANK(Route18Gate_h) + db $12 ; db BANK(Route18GateUpstairs_h) + db $11 ; db BANK(SeafoamIslands1_h) + db $07 ; db BANK(Route22Gate_h) + db $14 ; db BANK(VictoryRoad2_h) + db $12 ; db BANK(Route12GateUpstairs_h) + db $06 ; db BANK(VermilionHouse3_h) + db $18 ; db BANK(DiglettsCave_h) + db $11 ; db BANK(VictoryRoad3_h) + db $11 ; db BANK(RocketHideout1_h) + db $11 ; db BANK(RocketHideout2_h) + db $11 ; db BANK(RocketHideout3_h) + db $11 ; db BANK(RocketHideout4_h) + db $11 ; db BANK(RocketHideoutElevator_h) + db $01 ; db $01 + db $01 ; db $01 + db $01 ; db $01 + db $16 ; db BANK(SilphCo2_h) + db $16 ; db BANK(SilphCo3_h) + db $06 ; db BANK(SilphCo4_h) + db $06 ; db BANK(SilphCo5_h) + db $06 ; db BANK(SilphCo6_h) + db $14 ; db BANK(SilphCo7_h) + db $15 ; db BANK(SilphCo8_h) + db $14 ; db BANK(Mansion2_h) + db $14 ; db BANK(Mansion3_h) + db $14 ; db BANK(Mansion4_h) + db $11 ; db BANK(SafariZoneEast_h) + db $11 ; db BANK(SafariZoneNorth_h) + db $12 ; db BANK(SafariZoneWest_h) + db $11 ; db BANK(SafariZoneCenter_h) + db $11 ; db BANK(SafariZoneRestHouse1_h) + db $12 ; db BANK(SafariZoneSecretHouse_h) + db $11 ; db BANK(SafariZoneRestHouse2_h) + db $11 ; db BANK(SafariZoneRestHouse3_h) + db $11 ; db BANK(SafariZoneRestHouse4_h) + db $11 ; db BANK(UnknownDungeon2_h) + db $11 ; db BANK(UnknownDungeon3_h) + db $1d ; db BANK(UnknownDungeon1_h) + db $07 ; db BANK(NameRater_h) + db $1d ; db BANK(CeruleanHouse2_h) + db $01 ; db $01 + db $11 ; db BANK(RockTunnel2_h) + db $17 ; db BANK(SilphCo9_h) + db $16 ; db BANK(SilphCo10_h) + db $18 ; db BANK(SilphCo11_h) + db $11 ; db BANK(SilphCoElevator_h) + db $11 ; db $11 + db $11 ; db $11 + db BANK(TradeCenter_h) + db BANK(Colosseum_h) + db $11 ; db $11 + db $11 ; db $11 + db $11 ; db $11 + db $11 ; db $11 + db $1d ; db BANK(Lorelei_h) + db $1d ; db BANK(Bruno_h) + db $1d ; db BANK(Agatha_h) + db BANK(BeachHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 8cabbd0d..d63e7cb7 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -1,252 +1,251 @@ ; 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 + dw $42a1 ; dw PalletTown_h + dw $4357 ; dw ViridianCity_h + dw $455a ; dw PewterCity_h + dw $4754 ; dw CeruleanCity_h + dw $4000 ; dw LavenderTown_h + dw $499e ; dw VermilionCity_h + dw CeladonCity_h + dw $4bb3 ; dw FuchsiaCity_h + dw $4000 ; dw CinnabarIsland_h + dw $4924 ; dw IndigoPlateau_h + dw SaffronCity_h + dw SaffronCity_h + dw $40c3 ; dw Route1_h + dw $4000 ; dw Route2_h + dw $41ee ; dw Route3_h + dw $4398 ; dw Route4_h + dw Route5_h + dw $4000 ; dw Route6_h + dw Route7_h + dw $412d ; dw Route8_h + dw $468e ; dw Route9_h + dw $42d4 ; dw Route10_h + dw $44be ; dw Route11_h + dw $466d ; dw Route12_h + dw $4814 ; dw Route13_h + dw $49a1 ; dw Route14_h + dw $492c ; dw Route15_h + dw $4ada ; dw Route16_h + dw $4b28 ; dw Route17_h + dw $4c38 ; dw Route18_h + dw $4e80 ; dw Route19_h + dw $40f1 ; dw Route20_h + dw $500f ; dw Route21_h + dw $4000 ; dw Route22_h + dw $433f ; dw Route23_h + dw $4682 ; dw Route24_h + dw $47a1 ; dw Route25_h + dw $40f6 ; dw RedsHouse1F_h + dw $40a4 ; dw RedsHouse2F_h + dw $5c2f ; dw BluesHouse_h + dw $4386 ; dw OaksLab_h ;id=40 + dw $4251 ; dw ViridianPokecenter_h + dw $4c6e ; dw ViridianMart_h + dw $4d6d ; dw School_h + dw $4dc6 ; dw ViridianHouse_h + dw $40d4 ; dw ViridianGym_h + dw $57ae ; dw DiglettsCaveRoute2_h + dw $5485 ; dw ViridianForestExit_h + dw $57eb ; dw Route2House_h + dw $54d2 ; dw Route2Gate_h + dw $555a ; dw ViridianForestEntrance_h ;id=50 + dw $50ed ; dw ViridianForest_h + dw $40e3 ; dw Museum1F_h + dw $41b4 ; dw Museum2F_h + dw $4257 ; dw PewterGym_h + dw $4e30 ; dw PewterHouse1_h + dw $44de ; dw PewterMart_h + dw $4e86 ; dw PewterHouse2_h + dw $446e ; dw PewterPokecenter_h + dw $5953 ; dw MtMoon1_h + dw $5a78 ; dw MtMoon2_h ;id=60 + dw $5c7e ; dw MtMoon3_h + dw $4ec3 ; dw CeruleanHouseTrashed_h + dw $4f34 ; dw CeruleanHouse1_h + dw $44f5 ; dw CeruleanPokecenter_h + dw $4577 ; dw CeruleanGym_h + dw $5038 ; dw BikeShop_h + dw $4757 ; dw CeruleanMart_h + dw $52a9 ; dw MtMoonPokecenter_h + dw $4ec3 ; dw CeruleanHouseTrashed_h ; copy + dw $5831 ; dw Route5Gate_h + dw $55a8 ; dw UndergroundPathEntranceRoute5_h + dw $6233 ; dw DayCareM_h + dw $593b ; dw Route6Gate_h + dw $55ee ; dw UndergroundPathEntranceRoute6_h + dw $55ee ; dw UndergroundPathEntranceRoute6_h ; unused + dw $59fe ; dw Route7Gate_h + dw $562b ; dw UndergroundPathEntranceRoute7_h + dw $5668 ; dw UndergroundPathEntranceRoute7Copy_h + dw $5ac5 ; dw Route8Gate_h + dw $5b87 ; dw UndergroundPathEntranceRoute8_h ;id=80 + dw $5330 ; dw RockTunnelPokecenter_h + dw $4571 ; dw RockTunnel1_h + dw $5bc4 ; dw PowerPlant_h + dw $5396 ; dw Route11Gate_h + dw $5eb8 ; dw DiglettsCaveEntranceRoute11_h + dw $53de ; dw Route11GateUpstairs_h + dw $548f ; dw Route12Gate_h + dw $606e ; dw BillsHouse_h + dw $4865 ; dw VermilionPokecenter_h + dw $5a00 ; dw FanClub_h ;id=90 + dw $48cb ; dw VermilionMart_h + dw $4910 ; dw VermilionGym_h + dw $53f8 ; dw VermilionHouse1_h + dw $544e ; dw VermilionDock_h + dw $52a4 ; dw SSAnne1_h + dw $53de ; dw SSAnne2_h + dw $49bf ; dw SSAnne3_h + dw $5650 ; dw SSAnne4_h + dw $56d0 ; dw SSAnne5_h + dw $57d5 ; dw SSAnne6_h ;id=100 + dw $58b7 ; dw SSAnne7_h + dw $5993 ; dw SSAnne8_h + dw $5b68 ; dw SSAnne9_h + dw $5d60 ; dw SSAnne10_h + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $5909 ; dw VictoryRoad1_h + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused ;id=110 + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $623d ; dw Lance_h ; unused + dw $642d ; dw HallofFameRoom_h + dw $5f31 ; dw UndergroundPathNS_h + dw $57a0 ; dw Gary_h ;id=120 + dw $5f55 ; dw UndergroundPathWE_h + dw $42b7 ; dw CeladonMart1_h + dw $60d9 ; dw CeladonMart2_h + dw $4157 ; dw CeladonMart3_h + dw $4251 ; dw CeladonMart4_h + dw $42d0 ; dw CeladonMartRoof_h + dw $44ff ; dw CeladonMartElevator_h + dw $4593 ; dw CeladonMansion1_h + dw $465a ; dw CeladonMansion2_h + dw $46b0 ; dw CeladonMansion3_h ;id=130 + dw $4861 ; dw CeladonMansion4_h + dw $5636 ; dw CeladonMansion5_h + dw $48af ; dw CeladonPokecenter_h + dw $4915 ; dw CeladonGym_h + dw $4bc8 ; dw CeladonGameCorner_h + dw $507f ; dw CeladonMart5_h + dw $5107 ; dw CeladonPrizeRoom_h + dw $5168 ; dw CeladonDiner_h + dw $51e8 ; dw CeladonHouse_h + dw $5243 ; dw CeladonHotel_h ;id=140 + dw $479c ; dw LavenderPokecenter_h + dw $4420 ; dw PokemonTower1_h + dw $44e7 ; dw PokemonTower2_h + dw $46af ; dw PokemonTower3_h + dw $47d9 ; dw PokemonTower4_h + dw $4915 ; dw PokemonTower5_h + dw $4ad2 ; dw PokemonTower6_h + dw $4ce8 ; dw PokemonTower7_h + dw $51a4 ; dw LavenderHouse1_h + dw $4802 ; dw LavenderMart_h ;id=150 + dw $52aa ; dw LavenderHouse2_h + dw $5685 ; dw FuchsiaMart_h + dw $4851 ; dw FuchsiaHouse1_h + dw $489c ; dw FuchsiaPokecenter_h + dw $4902 ; dw FuchsiaHouse2_h + dw $4a1a ; dw SafariZoneEntrance_h + dw $4bd9 ; dw FuchsiaGym_h + dw $4e7f ; dw FuchsiaMeetingRoom_h + dw $6578 ; dw SeafoamIslands2_h + dw $66b4 ; dw SeafoamIslands3_h ;id=160 + dw $67f0 ; dw SeafoamIslands4_h + dw $69fc ; dw SeafoamIslands5_h + dw $6054 ; dw VermilionHouse2_h + dw $6160 ; dw FuchsiaHouse3_h + dw $4344 ; dw Mansion1_h + dw $4ee6 ; dw CinnabarGym_h + dw $53fb ; dw Lab1_h + dw $5490 ; dw Lab2_h + dw $54f6 ; dw Lab3_h + dw $55a0 ; dw Lab4_h ;id=170 + dw $569b ; dw CinnabarPokecenter_h + dw $5701 ; dw CinnabarMart_h + dw $5701 ; dw CinnabarMart_h ; unused + dw $5d45 ; dw IndigoPlateauLobby_h + dw $5746 ; dw CopycatsHouse1F_h + dw $4b5b ; dw CopycatsHouse2F_h + dw $4c47 ; dw FightingDojo_h + dw $4ef7 ; dw SaffronGym_h + dw $56db ; dw SaffronHouse1_h + dw $52f3 ; dw SaffronMart_h ;id=180 + dw $5338 ; dw SilphCo1_h + dw $541f ; dw SaffronPokecenter_h + dw $573a ; dw SaffronHouse2_h + dw $558d ; dw Route15Gate_h + dw $55d5 ; dw Route15GateUpstairs_h + dw $5649 ; dw Route16Gate_h + dw $5796 ; dw Route16GateUpstairs_h + dw $5ef6 ; dw Route16House_h + dw $64a5 ; dw Route12House_h + dw $5801 ; dw Route18Gate_h ;id=190 + dw $5900 ; dw Route18GateUpstairs_h + dw $487e ; dw SeafoamIslands1_h + dw $5f81 ; dw Route22Gate_h + dw $57cc ; dw VictoryRoad2_h + dw $54eb ; dw Route12GateUpstairs_h + dw $5d05 ; dw VermilionHouse3_h + dw $5f79 ; dw DiglettsCave_h + dw $4a0d ; dw VictoryRoad3_h + dw $4c5e ; dw RocketHideout1_h + dw $4ebb ; dw RocketHideout2_h ;200 + dw $52b9 ; dw RocketHideout3_h + dw $54f1 ; dw RocketHideout4_h + dw $5958 ; dw RocketHideoutElevator_h + dw $5958 ; dw RocketHideoutElevator_h ; unused + dw $5958 ; dw RocketHideoutElevator_h ; unused + dw $5958 ; dw RocketHideoutElevator_h ; unused + dw $5c80 ; dw SilphCo2_h + dw $5eea ; dw SilphCo3_h + dw $5e09 ; dw SilphCo4_h + dw $6035 ; dw SilphCo5_h ;210 + dw $62a7 ; dw SilphCo6_h + dw $5b97 ; dw SilphCo7_h + dw $652a ; dw SilphCo8_h + dw $5ff5 ; dw Mansion2_h + dw $620b ; dw Mansion3_h + dw $63d6 ; dw Mansion4_h + dw $5ab3 ; dw SafariZoneEast_h + dw $5bf3 ; dw SafariZoneNorth_h + dw $635a ; dw SafariZoneWest_h + dw $5dfa ; dw SafariZoneCenter_h ;220 + dw $5f35 ; dw SafariZoneRestHouse1_h + dw $64bc ; dw SafariZoneSecretHouse_h + dw $5f72 ; dw SafariZoneRestHouse2_h + dw $5fbd ; dw SafariZoneRestHouse3_h + dw $6008 ; dw SafariZoneRestHouse4_h + dw $6053 ; dw UnknownDungeon2_h + dw $6141 ; dw UnknownDungeon3_h + dw $453d ; dw UnknownDungeon1_h + dw $530e ; dw NameRater_h + dw $4643 ; dw CeruleanHouse2_h + dw $5649 ; dw Route16Gate_h ; unused + dw $624e ; dw RockTunnel2_h + dw $56ba ; dw SilphCo9_h + dw $60c8 ; dw SilphCo10_h + dw $6105 ; dw SilphCo11_h + dw $5a08 ; dw SilphCoElevator_h + dw $5c80 ; dw SilphCo2_h ; unused + dw $5c80 ; dw SilphCo2_h ; unused + dw TradeCenter_h + dw Colosseum_h + dw $5c80 ; dw SilphCo2_h ; unused + dw $5c80 ; dw SilphCo2_h ; unused + dw $5c80 ; dw SilphCo2_h ; unused + dw $5c80 ; dw SilphCo2_h ; unused + dw $59ef ; dw Lorelei_h + dw $5b4a ; dw Bruno_h + dw $5ca1 ; dw Agatha_h ;247 + dw $620e ; dw BeachHouse_h -- cgit v1.3.1-sl0p From a10ddc9c3f94b02ddab6d03fe0121a0e4413b877 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Thu, 26 May 2016 23:11:23 -0400 Subject: Uncomment map header pointers for disassembled maps --- data/map_header_banks.asm | 18 +++++++++--------- data/map_header_pointers.asm | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index cf97aebb..207dc937 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -1,9 +1,9 @@ ; see also MapHeaderPointers MapHeaderBanks:: ; fc3e4 (3f:43e4) - db $06 ; db BANK(PalletTown_h) ;PALLET_TOWN - db $06 ; db BANK(ViridianCity_h) ; VIRIDIAN_CITY - db $06 ; db BANK(PewterCity_h) ; PEWTER_CITY - db $06 ; db BANK(CeruleanCity_h) ; CERULEAN_CITY + 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 $11 ; db BANK(LavenderTown_h) ; LAVENDER_TOWN db $06 ; db BANK(VermilionCity_h) ; VERMILION_CITY db BANK(CeladonCity_h) ; CELADON_CITY @@ -11,11 +11,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $07 ; db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND db $14 ; db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU db BANK(SaffronCity_h) ; SAFFRON_CITY - db $01 ; db $1 ; unused - db $07 ; db BANK(Route1_h) ; ROUTE_1 - db $15 ; db BANK(Route2_h) ; ROUTE_2 - db $15 ; db BANK(Route3_h) ; ROUTE_3 - db $15 ; db BANK(Route4_h) ; ROUTE_4 + db $01 ; 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 $16 ; db BANK(Route6_h) ; ROUTE_6 db BANK(Route7_h) ; ROUTE_7 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index d63e7cb7..adbe374b 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -1,9 +1,9 @@ ; see also MapHeaderBanks MapHeaderPointers:: ; fc1f2 (3f:41f2) - dw $42a1 ; dw PalletTown_h - dw $4357 ; dw ViridianCity_h - dw $455a ; dw PewterCity_h - dw $4754 ; dw CeruleanCity_h + dw PalletTown_h + dw ViridianCity_h + dw PewterCity_h + dw CeruleanCity_h dw $4000 ; dw LavenderTown_h dw $499e ; dw VermilionCity_h dw CeladonCity_h @@ -12,10 +12,10 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4924 ; dw IndigoPlateau_h dw SaffronCity_h dw SaffronCity_h - dw $40c3 ; dw Route1_h - dw $4000 ; dw Route2_h - dw $41ee ; dw Route3_h - dw $4398 ; dw Route4_h + dw Route1_h + dw Route2_h + dw Route3_h + dw Route4_h dw Route5_h dw $4000 ; dw Route6_h dw Route7_h -- cgit v1.3.1-sl0p From 4878c118567df8a97e2a796c1c755f2311d955a7 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 09:38:27 -0400 Subject: Route 25 scripts --- charmap.asm | 1 + constants/hide_show_constants.asm | 264 +++++++++++++++++++------------------- data/map_header_banks.asm | 4 +- data/map_header_pointers.asm | 4 +- main.asm | 9 +- scripts/route25.asm | 23 +++- text/maps/route_24.asm | 5 +- 7 files changed, 161 insertions(+), 149 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/charmap.asm b/charmap.asm index c794549f..1932b39e 100644 --- a/charmap.asm +++ b/charmap.asm @@ -149,6 +149,7 @@ charmap "ー", $E3 charmap "", $4a ; PkMn charmap "@", $50 +charmap "", $52 charmap "#", $54 ;charmap "POKé", $54 charmap "′", $71 diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 9d009f5e..9877fba7 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -104,134 +104,136 @@ const_value = 0 const HS_VICTORY_ROAD_2_ITEM_3 ; 5F X const HS_VICTORY_ROAD_2_ITEM_4 ; 60 const HS_VICTORY_ROAD_2_BOULDER ; 61 - const HS_BILL_POKEMON ; 62 - const HS_BILL_1 ; 63 - const HS_BILL_2 ; 64 X - const HS_VIRIDIAN_FOREST_ITEM_1 ; 65 X - const HS_VIRIDIAN_FOREST_ITEM_2 ; 66 X - const HS_VIRIDIAN_FOREST_ITEM_3 ; 67 X - const HS_MT_MOON_1_ITEM_1 ; 68 X - const HS_MT_MOON_1_ITEM_2 ; 69 X - const HS_MT_MOON_1_ITEM_3 ; 6A X - const HS_MT_MOON_1_ITEM_4 ; 6B X - const HS_MT_MOON_1_ITEM_5 ; 6C X - const HS_MT_MOON_1_ITEM_6 ; 6D - const HS_MT_MOON_3_FOSSIL_1 ; 6E - const HS_MT_MOON_3_FOSSIL_2 ; 6F X - const HS_MT_MOON_3_ITEM_1 ; 70 X - const HS_MT_MOON_3_ITEM_2 ; 71 - const HS_SS_ANNE_2_RIVAL ; 72 X - const HS_SS_ANNE_8_ITEM ; 73 X - const HS_SS_ANNE_9_ITEM_1 ; 74 X - const HS_SS_ANNE_9_ITEM_2 ; 75 X - const HS_SS_ANNE_10_ITEM_1 ; 76 X - const HS_SS_ANNE_10_ITEM_2 ; 77 X - const HS_SS_ANNE_10_ITEM_3 ; 78 X - const HS_VICTORY_ROAD_3_ITEM_1 ; 79 X - const HS_VICTORY_ROAD_3_ITEM_2 ; 7A - const HS_VICTORY_ROAD_3_BOULDER ; 7B X - const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7C X - const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7D X - const HS_ROCKET_HIDEOUT_2_ITEM_1 ; 7E X - const HS_ROCKET_HIDEOUT_2_ITEM_2 ; 7F X - const HS_ROCKET_HIDEOUT_2_ITEM_3 ; 80 X - const HS_ROCKET_HIDEOUT_2_ITEM_4 ; 81 X - const HS_ROCKET_HIDEOUT_3_ITEM_1 ; 82 X - const HS_ROCKET_HIDEOUT_3_ITEM_2 ; 83 - const HS_ROCKET_HIDEOUT_4_GIOVANNI ; 84 X - const HS_ROCKET_HIDEOUT_4_ITEM_1 ; 85 X - const HS_ROCKET_HIDEOUT_4_ITEM_2 ; 86 X - const HS_ROCKET_HIDEOUT_4_ITEM_3 ; 87 - const HS_ROCKET_HIDEOUT_4_ITEM_4 ; 88 - const HS_ROCKET_HIDEOUT_4_ITEM_5 ; 89 XXX never (de)activated? - const HS_SILPH_CO_2F_1 ; 8A - const HS_SILPH_CO_2F_2 ; 8B - const HS_SILPH_CO_2F_3 ; 8C - const HS_SILPH_CO_2F_4 ; 8D - const HS_SILPH_CO_2F_5 ; 8E - const HS_SILPH_CO_3F_1 ; 8F - const HS_SILPH_CO_3F_2 ; 90 X - const HS_SILPH_CO_3F_ITEM ; 91 - const HS_SILPH_CO_4F_1 ; 92 - const HS_SILPH_CO_4F_2 ; 93 - const HS_SILPH_CO_4F_3 ; 94 X - const HS_SILPH_CO_4F_ITEM_1 ; 95 X - const HS_SILPH_CO_4F_ITEM_2 ; 96 X - const HS_SILPH_CO_4F_ITEM_3 ; 97 - const HS_SILPH_CO_5F_1 ; 98 - const HS_SILPH_CO_5F_2 ; 99 - const HS_SILPH_CO_5F_3 ; 9A - const HS_SILPH_CO_5F_4 ; 9B X - const HS_SILPH_CO_5F_ITEM_1 ; 9C X - const HS_SILPH_CO_5F_ITEM_2 ; 9D X - const HS_SILPH_CO_5F_ITEM_3 ; 9E - const HS_SILPH_CO_6F_1 ; 9F - const HS_SILPH_CO_6F_2 ; A0 - const HS_SILPH_CO_6F_3 ; A1 X - const HS_SILPH_CO_6F_ITEM_1 ; A2 X - const HS_SILPH_CO_6F_ITEM_2 ; A3 - const HS_SILPH_CO_7F_1 ; A4 - const HS_SILPH_CO_7F_2 ; A5 - const HS_SILPH_CO_7F_3 ; A6 - const HS_SILPH_CO_7F_4 ; A7 - const HS_SILPH_CO_7F_RIVAL ; A8 X - const HS_SILPH_CO_7F_ITEM_1 ; A9 X - const HS_SILPH_CO_7F_ITEM_2 ; AA XXX sprite doesn't exist - const HS_SILPH_CO_7F_8 ; AB - const HS_SILPH_CO_8F_1 ; AC - const HS_SILPH_CO_8F_2 ; AD - const HS_SILPH_CO_8F_3 ; AE - const HS_SILPH_CO_9F_1 ; AF - const HS_SILPH_CO_9F_2 ; B0 - const HS_SILPH_CO_9F_3 ; B1 - const HS_SILPH_CO_10F_1 ; B2 - const HS_SILPH_CO_10F_2 ; B3 XXX never (de)activated? - const HS_SILPH_CO_10F_3 ; B4 X - const HS_SILPH_CO_10F_ITEM_1 ; B5 X - const HS_SILPH_CO_10F_ITEM_2 ; B6 X - const HS_SILPH_CO_10F_ITEM_3 ; B7 - const HS_SILPH_CO_11F_1 ; B8 - const HS_SILPH_CO_11F_2 ; B9 - const HS_SILPH_CO_11F_3 ; BA XXX sprite doesn't exist - const HS_MAP_F4_1 ; BB X - const HS_MANSION_2_ITEM ; BC X - const HS_MANSION_3_ITEM_1 ; BD X - const HS_MANSION_3_ITEM_2 ; BE X - const HS_MANSION_4_ITEM_1 ; BF X - const HS_MANSION_4_ITEM_2 ; C0 X - const HS_MANSION_4_ITEM_3 ; C1 X - const HS_MANSION_4_ITEM_4 ; C2 X - const HS_MANSION_4_ITEM_5 ; C3 X - const HS_SAFARI_ZONE_EAST_ITEM_1 ; C4 X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; C5 X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; C6 X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; C7 X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C8 X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C9 X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; CA X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; CB X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; CC X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; CD X - const HS_SAFARI_ZONE_CENTER_ITEM ; CE X - const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; CF X - const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; D0 X - const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D1 X - const HS_MEWTWO ; D2 X - const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D3 X - const HS_UNKNOWN_DUNGEON_3_ITEM_2 ; D4 X - const HS_VICTORY_ROAD_1_ITEM_1 ; D5 X - const HS_VICTORY_ROAD_1_ITEM_2 ; D6 - const HS_CHAMPIONS_ROOM_OAK ; D7 - const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; D8 - const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; D9 - const HS_SEAFOAM_ISLANDS_2_BOULDER_1 ; DA - const HS_SEAFOAM_ISLANDS_2_BOULDER_2 ; DB - const HS_SEAFOAM_ISLANDS_3_BOULDER_1 ; DC - const HS_SEAFOAM_ISLANDS_3_BOULDER_2 ; DD - const HS_SEAFOAM_ISLANDS_4_BOULDER_1 ; DE - const HS_SEAFOAM_ISLANDS_4_BOULDER_2 ; DF - const HS_SEAFOAM_ISLANDS_4_BOULDER_3 ; E0 - const HS_SEAFOAM_ISLANDS_4_BOULDER_4 ; E1 - const HS_SEAFOAM_ISLANDS_5_BOULDER_1 ; E2 - const HS_SEAFOAM_ISLANDS_5_BOULDER_2 ; E3 X - const HS_ARTICUNO ; EF + +const_value SET $61 ; something above was deleted, idk what yet + const HS_BILL_POKEMON ; 61 + const HS_BILL_1 ; 62 + const HS_BILL_2 ; 63 + const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X + const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X + const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X + const HS_MT_MOON_1_ITEM_1 ; 67 X + const HS_MT_MOON_1_ITEM_2 ; 68 X + const HS_MT_MOON_1_ITEM_3 ; 69 X + const HS_MT_MOON_1_ITEM_4 ; 6A X + const HS_MT_MOON_1_ITEM_5 ; 6B X + const HS_MT_MOON_1_ITEM_6 ; 6C X + const HS_MT_MOON_3_FOSSIL_1 ; 6D + const HS_MT_MOON_3_FOSSIL_2 ; 6E + const HS_MT_MOON_3_ITEM_1 ; 6F X + const HS_MT_MOON_3_ITEM_2 ; 70 X + const HS_SS_ANNE_2_RIVAL ; 71 + const HS_SS_ANNE_8_ITEM ; 72 X + const HS_SS_ANNE_9_ITEM_1 ; 73 X + const HS_SS_ANNE_9_ITEM_2 ; 74 X + const HS_SS_ANNE_10_ITEM_1 ; 75 X + const HS_SS_ANNE_10_ITEM_2 ; 76 X + const HS_SS_ANNE_10_ITEM_3 ; 77 X + const HS_VICTORY_ROAD_3_ITEM_1 ; 78 X + const HS_VICTORY_ROAD_3_ITEM_2 ; 79 X + const HS_VICTORY_ROAD_3_BOULDER ; 7A + const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7B X + const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7C X + const HS_ROCKET_HIDEOUT_2_ITEM_1 ; 7D X + const HS_ROCKET_HIDEOUT_2_ITEM_2 ; 7E X + const HS_ROCKET_HIDEOUT_2_ITEM_3 ; 7F X + const HS_ROCKET_HIDEOUT_2_ITEM_4 ; 80 X + const HS_ROCKET_HIDEOUT_3_ITEM_1 ; 81 X + const HS_ROCKET_HIDEOUT_3_ITEM_2 ; 82 X + const HS_ROCKET_HIDEOUT_4_GIOVANNI ; 83 + const HS_ROCKET_HIDEOUT_4_ITEM_1 ; 84 X + const HS_ROCKET_HIDEOUT_4_ITEM_2 ; 85 X + const HS_ROCKET_HIDEOUT_4_ITEM_3 ; 86 X + const HS_ROCKET_HIDEOUT_4_ITEM_4 ; 87 + const HS_ROCKET_HIDEOUT_4_ITEM_5 ; 88 + const HS_SILPH_CO_2F_1 ; 89 XXX never (de)activated? + const HS_SILPH_CO_2F_2 ; 8A + const HS_SILPH_CO_2F_3 ; 8B + const HS_SILPH_CO_2F_4 ; 8C + const HS_SILPH_CO_2F_5 ; 8D + const HS_SILPH_CO_3F_1 ; 8E + const HS_SILPH_CO_3F_2 ; 8F + const HS_SILPH_CO_3F_ITEM ; 90 X + const HS_SILPH_CO_4F_1 ; 91 + const HS_SILPH_CO_4F_2 ; 92 + const HS_SILPH_CO_4F_3 ; 93 + const HS_SILPH_CO_4F_ITEM_1 ; 94 X + const HS_SILPH_CO_4F_ITEM_2 ; 95 X + const HS_SILPH_CO_4F_ITEM_3 ; 96 X + const HS_SILPH_CO_5F_1 ; 97 + const HS_SILPH_CO_5F_2 ; 98 + const HS_SILPH_CO_5F_3 ; 99 + const HS_SILPH_CO_5F_4 ; 9A + const HS_SILPH_CO_5F_ITEM_1 ; 9B X + const HS_SILPH_CO_5F_ITEM_2 ; 9C X + const HS_SILPH_CO_5F_ITEM_3 ; 9D X + const HS_SILPH_CO_6F_1 ; 9E + const HS_SILPH_CO_6F_2 ; 9F + const HS_SILPH_CO_6F_3 ; A0 + const HS_SILPH_CO_6F_ITEM_1 ; A1 X + const HS_SILPH_CO_6F_ITEM_2 ; A2 X + const HS_SILPH_CO_7F_1 ; A3 + const HS_SILPH_CO_7F_2 ; A4 + const HS_SILPH_CO_7F_3 ; A5 + const HS_SILPH_CO_7F_4 ; A6 + const HS_SILPH_CO_7F_RIVAL ; A7 + const HS_SILPH_CO_7F_ITEM_1 ; A8 X + const HS_SILPH_CO_7F_ITEM_2 ; A9 X + const HS_SILPH_CO_7F_8 ; AA XXX sprite doesn't exist + const HS_SILPH_CO_8F_1 ; AB + const HS_SILPH_CO_8F_2 ; AC + const HS_SILPH_CO_8F_3 ; AD + const HS_SILPH_CO_9F_1 ; AE + const HS_SILPH_CO_9F_2 ; AF + const HS_SILPH_CO_9F_3 ; B0 + const HS_SILPH_CO_10F_1 ; B1 + const HS_SILPH_CO_10F_2 ; B2 + const HS_SILPH_CO_10F_3 ; B3 XXX never (de)activated? + const HS_SILPH_CO_10F_ITEM_1 ; B4 X + const HS_SILPH_CO_10F_ITEM_2 ; B5 X + const HS_SILPH_CO_10F_ITEM_3 ; B6 X + const HS_SILPH_CO_11F_1 ; B7 + const HS_SILPH_CO_11F_2 ; B8 + const HS_SILPH_CO_11F_3 ; B9 + const HS_MAP_F4_1 ; BA XXX sprite doesn't exist + const HS_MANSION_2_ITEM ; BB X + const HS_MANSION_3_ITEM_1 ; BC X + const HS_MANSION_3_ITEM_2 ; BD X + const HS_MANSION_4_ITEM_1 ; BE X + const HS_MANSION_4_ITEM_2 ; BF X + const HS_MANSION_4_ITEM_3 ; C0 X + const HS_MANSION_4_ITEM_4 ; C1 X + const HS_MANSION_4_ITEM_5 ; C2 X + const HS_SAFARI_ZONE_EAST_ITEM_1 ; C3 X + const HS_SAFARI_ZONE_EAST_ITEM_2 ; C4 X + const HS_SAFARI_ZONE_EAST_ITEM_3 ; C5 X + const HS_SAFARI_ZONE_EAST_ITEM_4 ; C6 X + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C7 X + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C8 X + const HS_SAFARI_ZONE_WEST_ITEM_1 ; C9 X + const HS_SAFARI_ZONE_WEST_ITEM_2 ; CA X + const HS_SAFARI_ZONE_WEST_ITEM_3 ; CB X + const HS_SAFARI_ZONE_WEST_ITEM_4 ; CC X + const HS_SAFARI_ZONE_CENTER_ITEM ; CD X + const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; CE X + const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; CF X + const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D0 X + const HS_MEWTWO ; D1 X + const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D2 X + const HS_UNKNOWN_DUNGEON_3_ITEM_2 ; D3 X + const HS_VICTORY_ROAD_1_ITEM_1 ; D4 X + const HS_VICTORY_ROAD_1_ITEM_2 ; D5 X + const HS_CHAMPIONS_ROOM_OAK ; D6 + const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; D7 + const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; D8 + const HS_SEAFOAM_ISLANDS_2_BOULDER_1 ; D9 + const HS_SEAFOAM_ISLANDS_2_BOULDER_2 ; DA + const HS_SEAFOAM_ISLANDS_3_BOULDER_1 ; DB + const HS_SEAFOAM_ISLANDS_3_BOULDER_2 ; DC + const HS_SEAFOAM_ISLANDS_4_BOULDER_1 ; DD + const HS_SEAFOAM_ISLANDS_4_BOULDER_2 ; DE + const HS_SEAFOAM_ISLANDS_4_BOULDER_3 ; DF + const HS_SEAFOAM_ISLANDS_4_BOULDER_4 ; E0 + const HS_SEAFOAM_ISLANDS_5_BOULDER_1 ; E1 + const HS_SEAFOAM_ISLANDS_5_BOULDER_2 ; E2 + const HS_ARTICUNO ; E3 X diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 7e730780..2fff5f22 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -35,8 +35,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $15 ; db BANK(Route21_h) ; ROUTE_21 db $14 ; db BANK(Route22_h) ; ROUTE_22 db $14 ; db BANK(Route23_h) ; ROUTE_23 - db $14 ; db BANK(Route24_h) ; ROUTE_24 - db $14 ; db BANK(Route25_h) ; ROUTE_25 + db BANK(Route24_h) ; ROUTE_24 + db BANK(Route25_h) ; ROUTE_25 db $12 ; db BANK(RedsHouse1F_h) db $17 ; db BANK(RedsHouse2F_h) db $06 ; db BANK(BluesHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index adbe374b..6721a8a5 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -35,8 +35,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $500f ; dw Route21_h dw $4000 ; dw Route22_h dw $433f ; dw Route23_h - dw $4682 ; dw Route24_h - dw $47a1 ; dw Route25_h + dw Route24_h + dw Route25_h dw $40f6 ; dw RedsHouse1F_h dw $40a4 ; dw RedsHouse2F_h dw $5c2f ; dw BluesHouse_h diff --git a/main.asm b/main.asm index a7e4908e..cfcfa6c0 100755 --- a/main.asm +++ b/main.asm @@ -788,13 +788,12 @@ INCLUDE "data/mapObjects/route24.asm" Route24Blocks: ; 506ed (14:46ed) INCBIN "maps/route24.blk" -; INCLUDE "data/mapHeaders/route25.asm" -; INCLUDE "data/mapObjects/route25.asm" - dr $507a1,$50816 +INCLUDE "data/mapHeaders/route25.asm" +INCLUDE "data/mapObjects/route25.asm" Route25Blocks: ; 50816 (14:4816) INCBIN "maps/route25.blk" - +; victoryroad2 dr $50924,$509aa INCLUDE "data/mapHeaders/saffroncity.asm" @@ -805,7 +804,7 @@ INCLUDE "scripts/saffroncity.asm" dr $50ca9,$51366 INCLUDE "scripts/route24.asm" - dr $515f3,$517cc +INCLUDE "scripts/route25.asm" ; victoryroad2 dr $517cc,$52060 diff --git a/scripts/route25.asm b/scripts/route25.asm index 49580ba6..20dcc890 100755 --- a/scripts/route25.asm +++ b/scripts/route25.asm @@ -1,14 +1,21 @@ Route25Script: ; 515cb (14:55cb) - call Route25Script_515e1 call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeaders ld de, Route25ScriptPointers ld a, [W_ROUTE25CURSCRIPT] call ExecuteCurMapScriptInTable ld [W_ROUTE25CURSCRIPT], a + call Route25Script_515e1 ret Route25Script_515e1: ; 515e1 (14:55e1) + ld hl, wPreventBlackout + res 2, [hl] + res 3, [hl] + res 4, [hl] + res 7, [hl] + xor a + ld [W_BILLSHOUSECURSCRIPT], a ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -16,14 +23,16 @@ Route25Script_515e1: ; 515e1 (14:55e1) CheckEventHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING ret nz CheckEventReuseHL EVENT_MET_BILL_2 - jr nz, .asm_515ff + jr nz, .asm_51638 ResetEventReuseHL EVENT_BILL_SAID_USE_CELL_SEPARATOR ld a, HS_BILL_POKEMON ld [wMissableObjectIndex], a - predef_jump ShowObject -.asm_515ff + predef ShowObject + jr .asm_5165c + +.asm_51638 CheckEventAfterBranchReuseHL EVENT_GOT_SS_TICKET, EVENT_MET_BILL_2 - ret z + jr z, .asm_5165c SetEventReuseHL EVENT_LEFT_BILLS_HOUSE_AFTER_HELPING ld a, HS_NUGGET_BRIDGE_GUY ld [wMissableObjectIndex], a @@ -33,7 +42,9 @@ Route25Script_515e1: ; 515e1 (14:55e1) predef HideObject ld a, HS_BILL_2 ld [wMissableObjectIndex], a - predef_jump ShowObject + predef ShowObject +.asm_5165c + ret Route25ScriptPointers: ; 51622 (14:5622) dw CheckFightingMapTrainers diff --git a/text/maps/route_24.asm b/text/maps/route_24.asm index 26cb4044..475a2602 100644 --- a/text/maps/route_24.asm +++ b/text/maps/route_24.asm @@ -4,13 +4,13 @@ _Route24Text_51510:: cont "contest trainers!@@" _Route24Text_51515:: - db $0 + text "" para "You just earned a" line "fabulous prize!" prompt _Route24Text_5151a:: - text $52, " received" + text " received" line "a @" TX_RAM wcf4b text "!@@" @@ -181,4 +181,3 @@ _Route24DamianText4:: text "How's CHARMANDER" line "doing?" done - -- cgit v1.3.1-sl0p From 7a649c27baca781e4cc3e8e70bc41b66530dd5b5 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 10:08:04 -0400 Subject: Route 22 --- constants/trainer_constants.asm | 2 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- engine/bank3c.asm | 4 +- main.asm | 11 +++- scripts/route22.asm | 133 +++++++++++++--------------------------- 6 files changed, 54 insertions(+), 100 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index a710b5fa..fde4d42a 100755 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -41,7 +41,7 @@ const_value = 1 trainer_const BRUNO ; $21 trainer_const BROCK ; $22 trainer_const MISTY ; $23 - trainer_const LT_SURGE ; $24 + trainer_const LT_SURGE ; $24 trainer_const ERIKA ; $25 trainer_const KOGA ; $26 trainer_const BLAINE ; $27 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 2fff5f22..1f3e4967 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -33,7 +33,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $15 ; db BANK(Route19_h) ; ROUTE_19 db $14 ; db BANK(Route20_h) ; ROUTE_20 db $15 ; db BANK(Route21_h) ; ROUTE_21 - db $14 ; db BANK(Route22_h) ; ROUTE_22 + db BANK(Route22_h) ; ROUTE_22 db $14 ; db BANK(Route23_h) ; ROUTE_23 db BANK(Route24_h) ; ROUTE_24 db BANK(Route25_h) ; ROUTE_25 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 6721a8a5..e93c3def 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -33,7 +33,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4e80 ; dw Route19_h dw $40f1 ; dw Route20_h dw $500f ; dw Route21_h - dw $4000 ; dw Route22_h + dw Route22_h dw $433f ; dw Route23_h dw Route24_h dw Route25_h diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 35be938e..61096d27 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -348,8 +348,8 @@ INCLUDE "scripts/viridiancity2.asm" INCLUDE "scripts/vermilioncity2.asm" INCLUDE "scripts/celadoncity2.asm" INCLUDE "scripts/route1_2.asm" - - dr $f1b27, $f220e +INCLUDE "scripts/route22_2.asm" + dr $f1b73, $f220e INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" diff --git a/main.asm b/main.asm index cfcfa6c0..803dc68c 100755 --- a/main.asm +++ b/main.asm @@ -778,10 +778,13 @@ INCBIN "maps/colosseum.blk" SECTION "bank14",ROMX,BANK[$14] - dr $50000,$5003d +INCLUDE "data/mapHeaders/route22.asm" +INCLUDE "data/mapObjects/route22.asm" Route22Blocks: INCBIN "maps/route22.blk" - dr $500f1,$50682 + dr $500f1,$503b2 +Route23Blocks: +INCBIN "maps/route23.blk" INCLUDE "data/mapHeaders/route24.asm" INCLUDE "data/mapObjects/route24.asm" @@ -802,7 +805,9 @@ SaffronCityBlocks: ; 50a98 (14:4a98) INCBIN "maps/saffroncity.blk" INCLUDE "scripts/saffroncity.asm" - dr $50ca9,$51366 + dr $50ca9,$50eb2 +INCLUDE "scripts/route22.asm" + dr $51193,$51366 INCLUDE "scripts/route24.asm" INCLUDE "scripts/route25.asm" diff --git a/scripts/route22.asm b/scripts/route22.asm index 5c3d2b21..a7c61903 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -22,16 +22,17 @@ Route22Script7: ; 50ed5 (14:4ed5) ret Route22Script_50ed6: ; 50ed6 (14:4ed6) + ld a, OPP_SONY1 + ld [wCurOpponent], a + ld a, $2 + ld [wTrainerNo], a + ret + +Route22Script_50ee1: + ld a, OPP_SONY2 + ld [wCurOpponent], a ld a, [W_RIVALSTARTER] - ld b, a -.asm_50eda - ld a, [hli] - cp b - jr z, .asm_50ee1 - inc hl - jr .asm_50eda -.asm_50ee1 - ld a, [hl] + add 7 ld [wTrainerNo], a ret @@ -88,9 +89,7 @@ Route22Script0: ; 50f00 (14:4f00) ld a, [wWalkBikeSurfState] and a jr z, .asm_50f4e - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic .asm_50f4e ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -131,24 +130,29 @@ Route22Script1: ; 50f62 (14:4f62) ld hl, Route22RivalDefeatedText1 ld de, Route22Text_511bc call SaveEndBattleTextPointers - ld a, OPP_SONY1 - ld [wCurOpponent], a - ld hl, StarterMons_50faf call Route22Script_50ed6 ld a, $2 ld [W_ROUTE22CURSCRIPT], a ret -StarterMons_50faf: ; 50faf (14:4faf) -; starter the rival picked, rival trainer number - db STARTER2,$04 - db STARTER3,$05 - db STARTER1,$06 +Route22RivalDefeatedText1: ; 511b7 (14:51b7) + TX_FAR _Route22RivalDefeatedText1 + db "@" + +Route22Text_511bc: ; 511bc (14:51bc) + TX_FAR _Route22Text_511bc + db "@" Route22Script2: ; 50fb5 (14:4fb5) ld a, [wIsInBattle] cp $ff jp z, Route22Script_50ece + ld a, [W_RIVALSTARTER] + cp 2 + jr nz, .asm_50fc9 + ld a, $1 + ld [W_RIVALSTARTER], a +.asm_50fc9 ld a, [wSpriteStateData1 + 9] and a ; cp SPRITE_FACING_DOWN jr nz, .notDown @@ -167,9 +171,7 @@ Route22Script2: ; 50fb5 (14:4fb5) ld a, $1 ld [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic callba Music_RivalAlternateStart ld a, [wcf0d] cp $1 @@ -241,13 +243,9 @@ Route22Script_5104e: ; 5104e (14:504e) ld a, [wWalkBikeSurfState] and a jr z, .skipYVisibilityTesta - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic .skipYVisibilityTesta - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic callba Music_RivalAlternateTempo ld a, $2 ld [H_SPRITEINDEX], a @@ -287,18 +285,18 @@ Route22Script4: ; 51087 (14:5087) ld hl, Route22RivalDefeatedText2 ld de, Route22Text_511d0 call SaveEndBattleTextPointers - ld a, OPP_SONY2 - ld [wCurOpponent], a - ld hl, StarterMons_510d9 - call Route22Script_50ed6 + call Route22Script_50ee1 ld a, $5 ld [W_ROUTE22CURSCRIPT], a ret -StarterMons_510d9: ; 510d9 (14:50d9) - db STARTER2,$0a - db STARTER3,$0b - db STARTER1,$0c +Route22RivalDefeatedText2: ; 511cb (14:51cb) + TX_FAR _Route22RivalDefeatedText2 + db "@" + +Route22Text_511d0: ; 511d0 (14:51d0) + TX_FAR _Route22Text_511d0 + db "@" Route22Script5: ; 510df (14:50df) ld a, [wIsInBattle] @@ -326,9 +324,7 @@ Route22Script5: ; 510df (14:50df) ld a, $2 ld [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic callba Music_RivalAlternateStartAndTempo ld a, [wcf0d] cp $1 @@ -384,62 +380,15 @@ Route22TextPointers: ; 51175 (14:5175) Route22Text1: ; 5117b (14:517b) TX_ASM - CheckEvent EVENT_BEAT_ROUTE22_RIVAL_1ST_BATTLE - jr z, .asm_5118b - ld hl, Route22RivalAfterBattleText1 - call PrintText - jr .asm_51191 -.asm_5118b - ld hl, Route22RivalBeforeBattleText1 - call PrintText -.asm_51191 + callba Func_f1b27 jp TextScriptEnd Route22Text2: ; 51194 (14:5194) TX_ASM - CheckEvent EVENT_BEAT_ROUTE22_RIVAL_2ND_BATTLE - jr z, .asm_511a4 - ld hl, Route22RivalAfterBattleText2 - call PrintText - jr .asm_511aa -.asm_511a4 - ld hl, Route22RivalBeforeBattleText2 - call PrintText -.asm_511aa + callba Func_f1b47 jp TextScriptEnd -Route22RivalBeforeBattleText1: ; 511ad (14:51ad) - TX_FAR _Route22RivalBeforeBattleText1 - db "@" - -Route22RivalAfterBattleText1: ; 511b2 (14:51b2) - TX_FAR _Route22RivalAfterBattleText1 - db "@" - -Route22RivalDefeatedText1: ; 511b7 (14:51b7) - TX_FAR _Route22RivalDefeatedText1 - db "@" - -Route22Text_511bc: ; 511bc (14:51bc) - TX_FAR _Route22Text_511bc - db "@" - -Route22RivalBeforeBattleText2: ; 511c1 (14:51c1) - TX_FAR _Route22RivalBeforeBattleText2 - db "@" - -Route22RivalAfterBattleText2: ; 511c6 (14:51c6) - TX_FAR _Route22RivalAfterBattleText2 - db "@" - -Route22RivalDefeatedText2: ; 511cb (14:51cb) - TX_FAR _Route22RivalDefeatedText2 - db "@" - -Route22Text_511d0: ; 511d0 (14:51d0) - TX_FAR _Route22Text_511d0 - db "@" - Route22FrontGateText: ; 511d5 (14:51d5) - TX_FAR _Route22FrontGateText - db "@" + TX_ASM + callba Func_f1b67 + jp TextScriptEnd -- cgit v1.3.1-sl0p From 33c2637c16b1af0611d297b7ee9aa79fb5407eaa Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 10:28:02 -0400 Subject: Route 23 --- constants/hide_show_constants.asm | 276 +++++++++++++++++----------------- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- engine/overworld/missable_objects.asm | 2 +- main.asm | 13 +- scripts/route23.asm | 2 +- 6 files changed, 152 insertions(+), 145 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 9877fba7..db37b9d9 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -74,38 +74,38 @@ const_value = 0 const HS_POKEMONTOWER_7_ROCKET_1 ; 41 X const HS_POKEMONTOWER_7_ROCKET_2 ; 42 X const HS_POKEMONTOWER_7_ROCKET_3 ; 43 - const HS_POKEMONTOWER_7_MR_FUJI ; 44 - const HS_LAVENDER_HOUSE_1_MR_FUJI ; 45 - const HS_CELADON_MANSION_5_GIFT ; 46 - const HS_GAME_CORNER_ROCKET ; 47 X - const HS_FUCHSIA_HOUSE_2_ITEM ; 48 X - const HS_MANSION_1_ITEM_1 ; 49 X - const HS_MANSION_1_ITEM_2 ; 4A - const HS_FIGHTING_DOJO_GIFT_1 ; 4B - const HS_FIGHTING_DOJO_GIFT_2 ; 4C - const HS_SILPH_CO_1F_RECEPTIONIST ; 4D X - const HS_VOLTORB_1 ; 4E X - const HS_VOLTORB_2 ; 4F X - const HS_VOLTORB_3 ; 50 X - const HS_ELECTRODE_1 ; 51 X - const HS_VOLTORB_4 ; 52 X - const HS_VOLTORB_5 ; 53 X - const HS_ELECTRODE_2 ; 54 X - const HS_VOLTORB_6 ; 55 X - const HS_ZAPDOS ; 56 X - const HS_POWER_PLANT_ITEM_1 ; 57 X - const HS_POWER_PLANT_ITEM_2 ; 58 X - const HS_POWER_PLANT_ITEM_3 ; 59 X - const HS_POWER_PLANT_ITEM_4 ; 5A X - const HS_POWER_PLANT_ITEM_5 ; 5B X - const HS_MOLTRES ; 5C X - const HS_VICTORY_ROAD_2_ITEM_1 ; 5D X - const HS_VICTORY_ROAD_2_ITEM_2 ; 5E X - const HS_VICTORY_ROAD_2_ITEM_3 ; 5F X - const HS_VICTORY_ROAD_2_ITEM_4 ; 60 - const HS_VICTORY_ROAD_2_BOULDER ; 61 -const_value SET $61 ; something above was deleted, idk what yet +const_value SET $43 ; something above was deleted, idk what yet + const HS_POKEMONTOWER_7_MR_FUJI ; 43 + const HS_LAVENDER_HOUSE_1_MR_FUJI ; 44 + const HS_CELADON_MANSION_5_GIFT ; 45 + const HS_GAME_CORNER_ROCKET ; 46 + const HS_FUCHSIA_HOUSE_2_ITEM ; 47 X + const HS_MANSION_1_ITEM_1 ; 48 X + const HS_MANSION_1_ITEM_2 ; 49 X + const HS_FIGHTING_DOJO_GIFT_1 ; 4A + const HS_FIGHTING_DOJO_GIFT_2 ; 4B + const HS_SILPH_CO_1F_RECEPTIONIST ; 4C + const HS_VOLTORB_1 ; 4D X + const HS_VOLTORB_2 ; 4E X + const HS_VOLTORB_3 ; 4F X + const HS_ELECTRODE_1 ; 50 X + const HS_VOLTORB_4 ; 51 X + const HS_VOLTORB_5 ; 52 X + const HS_ELECTRODE_2 ; 53 X + const HS_VOLTORB_6 ; 54 X + const HS_ZAPDOS ; 55 X + const HS_POWER_PLANT_ITEM_1 ; 56 X + const HS_POWER_PLANT_ITEM_2 ; 57 X + const HS_POWER_PLANT_ITEM_3 ; 58 X + const HS_POWER_PLANT_ITEM_4 ; 59 X + const HS_POWER_PLANT_ITEM_5 ; 5A X + const HS_MOLTRES ; 5B X + const HS_VICTORY_ROAD_2_ITEM_1 ; 5C X + const HS_VICTORY_ROAD_2_ITEM_2 ; 5D X + const HS_VICTORY_ROAD_2_ITEM_3 ; 5E X + const HS_VICTORY_ROAD_2_ITEM_4 ; 5F X + const HS_VICTORY_ROAD_2_BOULDER ; 60 const HS_BILL_POKEMON ; 61 const HS_BILL_1 ; 62 const HS_BILL_2 ; 63 @@ -131,109 +131,111 @@ const_value SET $61 ; something above was deleted, idk what yet const HS_SS_ANNE_10_ITEM_3 ; 77 X const HS_VICTORY_ROAD_3_ITEM_1 ; 78 X const HS_VICTORY_ROAD_3_ITEM_2 ; 79 X - const HS_VICTORY_ROAD_3_BOULDER ; 7A - const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7B X - const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7C X - const HS_ROCKET_HIDEOUT_2_ITEM_1 ; 7D X - const HS_ROCKET_HIDEOUT_2_ITEM_2 ; 7E X - const HS_ROCKET_HIDEOUT_2_ITEM_3 ; 7F X - const HS_ROCKET_HIDEOUT_2_ITEM_4 ; 80 X - const HS_ROCKET_HIDEOUT_3_ITEM_1 ; 81 X - const HS_ROCKET_HIDEOUT_3_ITEM_2 ; 82 X - const HS_ROCKET_HIDEOUT_4_GIOVANNI ; 83 - const HS_ROCKET_HIDEOUT_4_ITEM_1 ; 84 X - const HS_ROCKET_HIDEOUT_4_ITEM_2 ; 85 X - const HS_ROCKET_HIDEOUT_4_ITEM_3 ; 86 X - const HS_ROCKET_HIDEOUT_4_ITEM_4 ; 87 - const HS_ROCKET_HIDEOUT_4_ITEM_5 ; 88 - const HS_SILPH_CO_2F_1 ; 89 XXX never (de)activated? - const HS_SILPH_CO_2F_2 ; 8A - const HS_SILPH_CO_2F_3 ; 8B - const HS_SILPH_CO_2F_4 ; 8C - const HS_SILPH_CO_2F_5 ; 8D - const HS_SILPH_CO_3F_1 ; 8E - const HS_SILPH_CO_3F_2 ; 8F - const HS_SILPH_CO_3F_ITEM ; 90 X - const HS_SILPH_CO_4F_1 ; 91 - const HS_SILPH_CO_4F_2 ; 92 - const HS_SILPH_CO_4F_3 ; 93 - const HS_SILPH_CO_4F_ITEM_1 ; 94 X - const HS_SILPH_CO_4F_ITEM_2 ; 95 X - const HS_SILPH_CO_4F_ITEM_3 ; 96 X - const HS_SILPH_CO_5F_1 ; 97 - const HS_SILPH_CO_5F_2 ; 98 - const HS_SILPH_CO_5F_3 ; 99 - const HS_SILPH_CO_5F_4 ; 9A - const HS_SILPH_CO_5F_ITEM_1 ; 9B X - const HS_SILPH_CO_5F_ITEM_2 ; 9C X - const HS_SILPH_CO_5F_ITEM_3 ; 9D X - const HS_SILPH_CO_6F_1 ; 9E - const HS_SILPH_CO_6F_2 ; 9F - const HS_SILPH_CO_6F_3 ; A0 - const HS_SILPH_CO_6F_ITEM_1 ; A1 X - const HS_SILPH_CO_6F_ITEM_2 ; A2 X - const HS_SILPH_CO_7F_1 ; A3 - const HS_SILPH_CO_7F_2 ; A4 - const HS_SILPH_CO_7F_3 ; A5 - const HS_SILPH_CO_7F_4 ; A6 - const HS_SILPH_CO_7F_RIVAL ; A7 - const HS_SILPH_CO_7F_ITEM_1 ; A8 X - const HS_SILPH_CO_7F_ITEM_2 ; A9 X - const HS_SILPH_CO_7F_8 ; AA XXX sprite doesn't exist - const HS_SILPH_CO_8F_1 ; AB - const HS_SILPH_CO_8F_2 ; AC - const HS_SILPH_CO_8F_3 ; AD - const HS_SILPH_CO_9F_1 ; AE - const HS_SILPH_CO_9F_2 ; AF - const HS_SILPH_CO_9F_3 ; B0 - const HS_SILPH_CO_10F_1 ; B1 - const HS_SILPH_CO_10F_2 ; B2 - const HS_SILPH_CO_10F_3 ; B3 XXX never (de)activated? - const HS_SILPH_CO_10F_ITEM_1 ; B4 X - const HS_SILPH_CO_10F_ITEM_2 ; B5 X - const HS_SILPH_CO_10F_ITEM_3 ; B6 X - const HS_SILPH_CO_11F_1 ; B7 - const HS_SILPH_CO_11F_2 ; B8 - const HS_SILPH_CO_11F_3 ; B9 - const HS_MAP_F4_1 ; BA XXX sprite doesn't exist - const HS_MANSION_2_ITEM ; BB X - const HS_MANSION_3_ITEM_1 ; BC X - const HS_MANSION_3_ITEM_2 ; BD X - const HS_MANSION_4_ITEM_1 ; BE X - const HS_MANSION_4_ITEM_2 ; BF X - const HS_MANSION_4_ITEM_3 ; C0 X - const HS_MANSION_4_ITEM_4 ; C1 X - const HS_MANSION_4_ITEM_5 ; C2 X - const HS_SAFARI_ZONE_EAST_ITEM_1 ; C3 X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; C4 X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; C5 X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; C6 X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C7 X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C8 X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; C9 X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; CA X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; CB X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; CC X - const HS_SAFARI_ZONE_CENTER_ITEM ; CD X - const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; CE X - const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; CF X - const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D0 X - const HS_MEWTWO ; D1 X - const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D2 X - const HS_UNKNOWN_DUNGEON_3_ITEM_2 ; D3 X - const HS_VICTORY_ROAD_1_ITEM_1 ; D4 X - const HS_VICTORY_ROAD_1_ITEM_2 ; D5 X - const HS_CHAMPIONS_ROOM_OAK ; D6 - const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; D7 - const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; D8 - const HS_SEAFOAM_ISLANDS_2_BOULDER_1 ; D9 - const HS_SEAFOAM_ISLANDS_2_BOULDER_2 ; DA - const HS_SEAFOAM_ISLANDS_3_BOULDER_1 ; DB - const HS_SEAFOAM_ISLANDS_3_BOULDER_2 ; DC - const HS_SEAFOAM_ISLANDS_4_BOULDER_1 ; DD - const HS_SEAFOAM_ISLANDS_4_BOULDER_2 ; DE - const HS_SEAFOAM_ISLANDS_4_BOULDER_3 ; DF - const HS_SEAFOAM_ISLANDS_4_BOULDER_4 ; E0 - const HS_SEAFOAM_ISLANDS_5_BOULDER_1 ; E1 - const HS_SEAFOAM_ISLANDS_5_BOULDER_2 ; E2 - const HS_ARTICUNO ; E3 X + +const_value SET $7c ; idk anymore lol + const HS_VICTORY_ROAD_3_BOULDER ; 7C X + const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7D X + const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7E X + const HS_ROCKET_HIDEOUT_2_ITEM_1 ; 7F X + const HS_ROCKET_HIDEOUT_2_ITEM_2 ; 80 X + const HS_ROCKET_HIDEOUT_2_ITEM_3 ; 81 X + const HS_ROCKET_HIDEOUT_2_ITEM_4 ; 82 X + const HS_ROCKET_HIDEOUT_3_ITEM_1 ; 83 + const HS_ROCKET_HIDEOUT_3_ITEM_2 ; 84 X + const HS_ROCKET_HIDEOUT_4_GIOVANNI ; 85 X + const HS_ROCKET_HIDEOUT_4_ITEM_1 ; 86 X + const HS_ROCKET_HIDEOUT_4_ITEM_2 ; 87 + const HS_ROCKET_HIDEOUT_4_ITEM_3 ; 88 + const HS_ROCKET_HIDEOUT_4_ITEM_4 ; 89 XXX never (de)activated? + const HS_ROCKET_HIDEOUT_4_ITEM_5 ; 8A + const HS_SILPH_CO_2F_1 ; 8B + const HS_SILPH_CO_2F_2 ; 8C + const HS_SILPH_CO_2F_3 ; 8D + const HS_SILPH_CO_2F_4 ; 8E + const HS_SILPH_CO_2F_5 ; 8F + const HS_SILPH_CO_3F_1 ; 90 X + const HS_SILPH_CO_3F_2 ; 91 + const HS_SILPH_CO_3F_ITEM ; 92 + const HS_SILPH_CO_4F_1 ; 93 + const HS_SILPH_CO_4F_2 ; 94 X + const HS_SILPH_CO_4F_3 ; 95 X + const HS_SILPH_CO_4F_ITEM_1 ; 96 X + const HS_SILPH_CO_4F_ITEM_2 ; 97 + const HS_SILPH_CO_4F_ITEM_3 ; 98 + const HS_SILPH_CO_5F_1 ; 99 + const HS_SILPH_CO_5F_2 ; 9A + const HS_SILPH_CO_5F_3 ; 9B X + const HS_SILPH_CO_5F_4 ; 9C X + const HS_SILPH_CO_5F_ITEM_1 ; 9D X + const HS_SILPH_CO_5F_ITEM_2 ; 9E + const HS_SILPH_CO_5F_ITEM_3 ; 9F + const HS_SILPH_CO_6F_1 ; A0 + const HS_SILPH_CO_6F_2 ; A1 X + const HS_SILPH_CO_6F_3 ; A2 X + const HS_SILPH_CO_6F_ITEM_1 ; A3 + const HS_SILPH_CO_6F_ITEM_2 ; A4 + const HS_SILPH_CO_7F_1 ; A5 + const HS_SILPH_CO_7F_2 ; A6 + const HS_SILPH_CO_7F_3 ; A7 + const HS_SILPH_CO_7F_4 ; A8 X + const HS_SILPH_CO_7F_RIVAL ; A9 X + const HS_SILPH_CO_7F_ITEM_1 ; AA XXX sprite doesn't exist + const HS_SILPH_CO_7F_ITEM_2 ; AB + const HS_SILPH_CO_7F_8 ; AC + const HS_SILPH_CO_8F_1 ; AD + const HS_SILPH_CO_8F_2 ; AE + const HS_SILPH_CO_8F_3 ; AF + const HS_SILPH_CO_9F_1 ; B0 + const HS_SILPH_CO_9F_2 ; B1 + const HS_SILPH_CO_9F_3 ; B2 + const HS_SILPH_CO_10F_1 ; B3 XXX never (de)activated? + const HS_SILPH_CO_10F_2 ; B4 X + const HS_SILPH_CO_10F_3 ; B5 X + const HS_SILPH_CO_10F_ITEM_1 ; B6 X + const HS_SILPH_CO_10F_ITEM_2 ; B7 + const HS_SILPH_CO_10F_ITEM_3 ; B8 + const HS_SILPH_CO_11F_1 ; B9 + const HS_SILPH_CO_11F_2 ; BA XXX sprite doesn't exist + const HS_SILPH_CO_11F_3 ; BB X + const HS_MAP_F4_1 ; BC X + const HS_MANSION_2_ITEM ; BD X + const HS_MANSION_3_ITEM_1 ; BE X + const HS_MANSION_3_ITEM_2 ; BF X + const HS_MANSION_4_ITEM_1 ; C0 X + const HS_MANSION_4_ITEM_2 ; C1 X + const HS_MANSION_4_ITEM_3 ; C2 X + const HS_MANSION_4_ITEM_4 ; C3 X + const HS_MANSION_4_ITEM_5 ; C4 X + const HS_SAFARI_ZONE_EAST_ITEM_1 ; C5 X + const HS_SAFARI_ZONE_EAST_ITEM_2 ; C6 X + const HS_SAFARI_ZONE_EAST_ITEM_3 ; C7 X + const HS_SAFARI_ZONE_EAST_ITEM_4 ; C8 X + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C9 X + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; CA X + const HS_SAFARI_ZONE_WEST_ITEM_1 ; CB X + const HS_SAFARI_ZONE_WEST_ITEM_2 ; CC X + const HS_SAFARI_ZONE_WEST_ITEM_3 ; CD X + const HS_SAFARI_ZONE_WEST_ITEM_4 ; CE X + const HS_SAFARI_ZONE_CENTER_ITEM ; CF X + const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; D0 X + const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; D1 X + const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D2 X + const HS_MEWTWO ; D3 X + const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D4 X + const HS_UNKNOWN_DUNGEON_3_ITEM_2 ; D5 X + const HS_VICTORY_ROAD_1_ITEM_1 ; D6 + const HS_VICTORY_ROAD_1_ITEM_2 ; D7 + const HS_CHAMPIONS_ROOM_OAK ; D8 + const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; D9 + const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; DA + const HS_SEAFOAM_ISLANDS_2_BOULDER_1 ; DB + const HS_SEAFOAM_ISLANDS_2_BOULDER_2 ; DC + const HS_SEAFOAM_ISLANDS_3_BOULDER_1 ; DD + const HS_SEAFOAM_ISLANDS_3_BOULDER_2 ; DE + const HS_SEAFOAM_ISLANDS_4_BOULDER_1 ; DF + const HS_SEAFOAM_ISLANDS_4_BOULDER_2 ; E0 + const HS_SEAFOAM_ISLANDS_4_BOULDER_3 ; E1 + const HS_SEAFOAM_ISLANDS_4_BOULDER_4 ; E2 + const HS_SEAFOAM_ISLANDS_5_BOULDER_1 ; E3 X + const HS_SEAFOAM_ISLANDS_5_BOULDER_2 ; E4 + const HS_ARTICUNO ; E5 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 1f3e4967..e181c2a3 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -34,7 +34,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $14 ; db BANK(Route20_h) ; ROUTE_20 db $15 ; db BANK(Route21_h) ; ROUTE_21 db BANK(Route22_h) ; ROUTE_22 - db $14 ; db BANK(Route23_h) ; ROUTE_23 + db BANK(Route23_h) ; ROUTE_23 db BANK(Route24_h) ; ROUTE_24 db BANK(Route25_h) ; ROUTE_25 db $12 ; db BANK(RedsHouse1F_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index e93c3def..9909b09f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -34,7 +34,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $40f1 ; dw Route20_h dw $500f ; dw Route21_h dw Route22_h - dw $433f ; dw Route23_h + dw Route23_h dw Route24_h dw Route25_h dw $40f6 ; dw RedsHouse1F_h diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm index f18a0823..65305d30 100644 --- a/engine/overworld/missable_objects.asm +++ b/engine/overworld/missable_objects.asm @@ -209,4 +209,4 @@ MissableObjectFlagAction: ; f062 (3:7062) pop de pop hl ld c, a - ret \ No newline at end of file + ret diff --git a/main.asm b/main.asm index 803dc68c..c0001587 100755 --- a/main.asm +++ b/main.asm @@ -782,7 +782,10 @@ INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" Route22Blocks: INCBIN "maps/route22.blk" - dr $500f1,$503b2 + dr $500f1,$5033f + +INCLUDE "data/mapHeaders/route23.asm" +INCLUDE "data/mapObjects/route23.asm" Route23Blocks: INCBIN "maps/route23.blk" @@ -796,8 +799,10 @@ INCLUDE "data/mapObjects/route25.asm" Route25Blocks: ; 50816 (14:4816) INCBIN "maps/route25.blk" -; victoryroad2 - dr $50924,$509aa +; indigoplateau + dr $50924,$50950 +IndigoPlateauBlocks: ; 50950 (14:4950) +INCBIN "maps/indigoplateau.blk" INCLUDE "data/mapHeaders/saffroncity.asm" INCLUDE "data/mapObjects/saffroncity.asm" @@ -807,7 +812,7 @@ INCLUDE "scripts/saffroncity.asm" dr $50ca9,$50eb2 INCLUDE "scripts/route22.asm" - dr $51193,$51366 +INCLUDE "scripts/route23.asm" INCLUDE "scripts/route24.asm" INCLUDE "scripts/route25.asm" diff --git a/scripts/route23.asm b/scripts/route23.asm index 6fc0eef1..f324963b 100755 --- a/scripts/route23.asm +++ b/scripts/route23.asm @@ -3,7 +3,7 @@ Route23Script: ; 511da (14:51da) call EnableAutoTextBoxDrawing ld hl, Route23ScriptPointers ld a, [W_ROUTE23CURSCRIPT] - jp CallFunctionInTable + jp JumpTable Route23Script_511e9: ; 511e9 (14:51e9) ld hl, wd126 -- cgit v1.3.1-sl0p From 2a0e32ee4e0cd1d432ecb8da822e6b798d6a13c2 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 10:37:49 -0400 Subject: Indigo Plateau (outside) --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index e181c2a3..a8e9e179 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -9,7 +9,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonCity_h) ; CELADON_CITY db $06 ; db BANK(FuchsiaCity_h) ; FUCHSIA_CITY db $07 ; db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND - db $14 ; db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU + db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU db BANK(SaffronCity_h) ; SAFFRON_CITY db $01 ; unused db BANK(Route1_h) ; ROUTE_1 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 9909b09f..0658d880 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -9,7 +9,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonCity_h dw $4bb3 ; dw FuchsiaCity_h dw $4000 ; dw CinnabarIsland_h - dw $4924 ; dw IndigoPlateau_h + dw IndigoPlateau_h dw SaffronCity_h dw SaffronCity_h dw Route1_h diff --git a/main.asm b/main.asm index c0001587..824f91d9 100755 --- a/main.asm +++ b/main.asm @@ -800,7 +800,9 @@ Route25Blocks: ; 50816 (14:4816) INCBIN "maps/route25.blk" ; indigoplateau - dr $50924,$50950 +INCLUDE "data/mapHeaders/indigoplateau.asm" +INCLUDE "scripts/indigoplateau.asm" +INCLUDE "data/mapObjects/indigoplateau.asm" IndigoPlateauBlocks: ; 50950 (14:4950) INCBIN "maps/indigoplateau.blk" @@ -809,7 +811,6 @@ INCLUDE "data/mapObjects/saffroncity.asm" SaffronCityBlocks: ; 50a98 (14:4a98) INCBIN "maps/saffroncity.blk" INCLUDE "scripts/saffroncity.asm" - dr $50ca9,$50eb2 INCLUDE "scripts/route22.asm" INCLUDE "scripts/route23.asm" -- cgit v1.3.1-sl0p From 2b96f4165f01fb41cb8c302a8da9d9a3131ab92e Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 12:32:34 -0400 Subject: Vermilion City scripts --- data/mapObjects/vermilioncity.asm | 19 +++++----- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- home.asm | 7 ++-- main.asm | 17 ++++----- scripts/billshouse.asm | 2 +- scripts/blueshouse.asm | 2 +- scripts/celadongamecorner.asm | 2 +- scripts/cinnabargym.asm | 2 +- scripts/cinnabarisland.asm | 2 +- scripts/gary.asm | 2 +- scripts/halloffameroom.asm | 2 +- scripts/museum1f.asm | 2 +- scripts/oakslab.asm | 2 +- scripts/pallettown.asm | 2 +- scripts/pokemontower2.asm | 2 +- scripts/redshouse2f.asm | 2 +- scripts/route16gate.asm | 2 +- scripts/route18gate.asm | 2 +- scripts/route22.asm | 2 +- scripts/route22gate.asm | 2 +- scripts/route5gate.asm | 2 +- scripts/route6gate.asm | 2 +- scripts/route7gate.asm | 2 +- scripts/route8gate.asm | 2 +- scripts/safarizoneentrance.asm | 2 +- scripts/seafoamislands4.asm | 2 +- scripts/seafoamislands5.asm | 2 +- scripts/ssanne2.asm | 2 +- scripts/vermilioncity.asm | 75 +++++++++++++++++++++++++++------------ scripts/vermilioncity2.asm | 45 ++++++++++++++++++++++- scripts/viridianmart.asm | 2 +- text/maps/vermilion_city.asm | 18 +++++----- 33 files changed, 154 insertions(+), 81 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/vermilioncity.asm b/data/mapObjects/vermilioncity.asm index c5602be1..3bfbc947 100755 --- a/data/mapObjects/vermilioncity.asm +++ b/data/mapObjects/vermilioncity.asm @@ -13,21 +13,22 @@ VermilionCityObject: ; 0x189ba (size=133) db $3, $7, $0, VERMILION_HOUSE_2 db $7 ; signs - db $3, $1b, $7 ; VermilionCityText7 - db $d, $25, $8 ; VermilionCityText8 - db $d, $18, $9 ; MartSignText - db $3, $c, $a ; PokeCenterSignText - db $d, $7, $b ; VermilionCityText11 - db $13, $7, $c ; VermilionCityText12 - db $f, $1d, $d ; VermilionCityText13 + db $3, $1b, $8 ; VermilionCityText7 + db $d, $25, $9 ; VermilionCityText8 + db $d, $18, $a ; MartSignText + db $3, $c, $b ; PokeCenterSignText + db $d, $7, $c ; VermilionCityText11 + db $13, $7, $d ; VermilionCityText12 + db $f, $1d, $e ; VermilionCityText13 - db $6 ; objects - object SPRITE_FOULARD_WOMAN, $13, $7, WALK, $2, $1 ; person + db $7 ; objects + object SPRITE_LASS, $13, $7, WALK, $2, $1 ; person object SPRITE_GAMBLER, $e, $6, STAY, NONE, $2 ; person object SPRITE_SAILOR, $13, $1e, STAY, UP, $3 ; person object SPRITE_GAMBLER, $1e, $7, STAY, NONE, $4 ; person object SPRITE_SLOWBRO, $1d, $9, WALK, $1, $5 ; person object SPRITE_SAILOR, $19, $1b, WALK, $2, $6 ; person + object SPRITE_OFFICER_JENNY, $13, $f, STAY, NONE, $7 ; person ; warp-to EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index a8e9e179..2ad544fb 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -5,7 +5,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(PewterCity_h) ; PEWTER_CITY db BANK(CeruleanCity_h) ; CERULEAN_CITY db $11 ; db BANK(LavenderTown_h) ; LAVENDER_TOWN - db $06 ; db BANK(VermilionCity_h) ; VERMILION_CITY + db BANK(VermilionCity_h) ; VERMILION_CITY db BANK(CeladonCity_h) ; CELADON_CITY db $06 ; db BANK(FuchsiaCity_h) ; FUCHSIA_CITY db $07 ; db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 0658d880..bd644214 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -5,7 +5,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw PewterCity_h dw CeruleanCity_h dw $4000 ; dw LavenderTown_h - dw $499e ; dw VermilionCity_h + dw VermilionCity_h dw CeladonCity_h dw $4bb3 ; dw FuchsiaCity_h dw $4000 ; dw CinnabarIsland_h diff --git a/home.asm b/home.asm index 55f474b7..fd2e1b26 100644 --- a/home.asm +++ b/home.asm @@ -2441,7 +2441,7 @@ RunNPCMovementScript:: ; 30ae (0:30ae) ld a, [wNPCMovementScriptBank] call BankswitchCommon ld a, [wNPCMovementScriptFunctionNum] - call CallFunctionInTable + call JumpTable pop af call BankswitchCommon ret @@ -2484,7 +2484,7 @@ ExecuteCurMapScriptInTable:: ; 30fc (0:30fc) .useProvidedIndex pop hl ld [W_CURMAPSCRIPT], a - call CallFunctionInTable + call JumpTable ld a, [W_CURMAPSCRIPT] ret @@ -4690,8 +4690,7 @@ endm ret -CallFunctionInTable:: ; 3d93 (0:3d93) -JumpTable:: +JumpTable:: ; 3d93 (0:3d93) ; Call function a in jumptable hl. ; de is not preserved. push hl diff --git a/main.asm b/main.asm index 824f91d9..e04d9103 100755 --- a/main.asm +++ b/main.asm @@ -251,12 +251,12 @@ PewterCityBlocks: INCBIN "maps/pewtercity.blk" INCLUDE "data/mapHeaders/ceruleancity.asm" INCLUDE "data/mapObjects/ceruleancity.asm" CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" ; 18836 - dr $1899e,$18dfa ; headers, objects, blocks -; INCLUDE "data/mapHeaders/vermilioncity.asm" -; INCLUDE "data/mapObjects/vermilioncity.asm" -; VermilionCityBlocks: INCBIN "maps/vermilioncity.blk" +INCLUDE "data/mapHeaders/vermilioncity.asm" +INCLUDE "data/mapObjects/vermilioncity.asm" +VermilionCityBlocks: INCBIN "maps/vermilioncity.blk" + dr $18bb3,$18dfa ; headers, objects, blocks ; INCLUDE "data/mapHeaders/fuchsiacity.asm" ; INCLUDE "data/mapObjects/fuchsiacity.asm" ; FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" @@ -266,9 +266,7 @@ INCLUDE "scripts/pallettown.asm" INCLUDE "scripts/viridiancity.asm" INCLUDE "scripts/pewtercity.asm" INCLUDE "scripts/ceruleancity.asm" - - dr $19841,$19a43 ; vermilion scripts -; INCLUDE "scripts/vermilioncity.asm" +INCLUDE "scripts/vermilioncity.asm" INCLUDE "scripts/celadoncity.asm" dr $19b2b,$1a4ea @@ -881,7 +879,10 @@ INCBIN "maps/route6.blk" dr $5812d,$581c6 Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" - dr $582d4,$58b84 + dr $582d4,$5855f +Route11Blocks: ; 5854f +INCBIN "maps/route11.blk" + dr $5866d,$58b84 Route16Blocks: ; 58b84 INCBIN "maps/route16.blk" dr $58c38,$58d99 diff --git a/scripts/billshouse.asm b/scripts/billshouse.asm index 56f2204f..4f01021e 100755 --- a/scripts/billshouse.asm +++ b/scripts/billshouse.asm @@ -2,7 +2,7 @@ BillsHouseScript: ; 1e76a (7:676a) call EnableAutoTextBoxDrawing ld a, [W_BILLSHOUSECURSCRIPT] ld hl, BillsHouseScriptPointers - jp CallFunctionInTable + jp JumpTable BillsHouseScriptPointers: ; 1e776 (7:6776) dw BillsHouseScript0 diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 6aa2eaec..4a23df9e 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -2,7 +2,7 @@ BluesHouseScript: ; 19b3b (6:5b3b) call EnableAutoTextBoxDrawing ld hl,BluesHouseScriptPointers ld a,[W_BLUESHOUSECURSCRIPT] - jp CallFunctionInTable + jp JumpTable BluesHouseScriptPointers: ; 19b47 (6:5b47) dw BluesHouseScript0 diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index c3872bab..5fc9cf97 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -4,7 +4,7 @@ CeladonGameCornerScript: ; 48bbd (12:4bbd) call EnableAutoTextBoxDrawing ld hl, CeladonGameCornerScriptPointers ld a, [W_CELADONGAMECORNERCURSCRIPT] - jp CallFunctionInTable + jp JumpTable CeladonGameCornerScript_48bcf: ; 48bcf (12:4bcf) ld hl, wd126 diff --git a/scripts/cinnabargym.asm b/scripts/cinnabargym.asm index 649609b3..c5d462b3 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/cinnabargym.asm @@ -3,7 +3,7 @@ CinnabarGymScript: ; 7574a (1d:574a) call EnableAutoTextBoxDrawing ld hl, CinnabarGymScriptPointers ld a, [W_CINNABARGYMCURSCRIPT] - jp CallFunctionInTable + jp JumpTable CinnabarGymScript_75759: ; 75759 (1d:5759) ld hl, wd126 diff --git a/scripts/cinnabarisland.asm b/scripts/cinnabarisland.asm index 48ded740..3a2e9a2b 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/cinnabarisland.asm @@ -6,7 +6,7 @@ CinnabarIslandScript: ; 1ca19 (7:4a19) ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL ld hl, CinnabarIslandScriptPointers ld a, [W_CINNABARISLANDCURSCRIPT] - jp CallFunctionInTable + jp JumpTable CinnabarIslandScriptPointers: ; 1ca34 (7:4a34) dw CinnabarIslandScript0 diff --git a/scripts/gary.asm b/scripts/gary.asm index 685e18fe..64734c58 100755 --- a/scripts/gary.asm +++ b/scripts/gary.asm @@ -2,7 +2,7 @@ GaryScript: ; 75f1d (1d:5f1d) call EnableAutoTextBoxDrawing ld hl, GaryScriptPointers ld a, [W_GARYCURSCRIPT] - jp CallFunctionInTable + jp JumpTable GaryScript_75f29: ; 75f29 (1d:5f29) xor a diff --git a/scripts/halloffameroom.asm b/scripts/halloffameroom.asm index 466ce77d..0f975673 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/halloffameroom.asm @@ -2,7 +2,7 @@ HallofFameRoomScript: ; 5a49e (16:649e) call EnableAutoTextBoxDrawing ld hl, HallofFameRoomScriptPointers ld a, [W_HALLOFFAMEROOMCURSCRIPT] - jp CallFunctionInTable + jp JumpTable HallofFameRoomScript_5a4aa: ; 5a4aa (16:64aa) xor a diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index 75dc1ce8..ae5a2b42 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -5,7 +5,7 @@ Museum1FScript: ; 5c0f7 (17:40f7) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, Museum1FScriptPointers ld a, [W_MUSEUM1FCURSCRIPT] - jp CallFunctionInTable + jp JumpTable Museum1FScriptPointers: ; 5c109 (17:4109) dw Museum1FScript0 diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index aff39cbc..2970fa2a 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -7,7 +7,7 @@ OaksLabScript: ; 1cb0e (7:4b0e) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, OaksLabScriptPointers ld a, [W_OAKSLABCURSCRIPT] - jp CallFunctionInTable + jp JumpTable OaksLabScriptPointers: ; 1cb28 (7:4b28) dw OaksLabScript0 diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index 147cbdb6..73f50e3e 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -6,7 +6,7 @@ PalletTownScript: ; 18e5b (6:4e5b) call EnableAutoTextBoxDrawing ld hl, PalletTownScriptPointers ld a, [W_PALLETTOWNCURSCRIPT] - jp CallFunctionInTable + jp JumpTable PalletTownScriptPointers: ; 18e73 (6:4e73) dw PalletTownScript0 diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index d498f88e..7aebf81b 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -2,7 +2,7 @@ PokemonTower2Script: ; 604f2 (18:44f2) call EnableAutoTextBoxDrawing ld hl, PokemonTower2ScriptPointers ld a, [W_POKEMONTOWER2CURSCRIPT] - jp CallFunctionInTable + jp JumpTable PokemonTower2Script_604fe: ; 604fe (18:44fe) xor a diff --git a/scripts/redshouse2f.asm b/scripts/redshouse2f.asm index 2335e6d1..565d09e3 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/redshouse2f.asm @@ -2,7 +2,7 @@ RedsHouse2FScript: ; 5c0b0 (17:40b0) call EnableAutoTextBoxDrawing ld hl,RedsHouse2FScriptPointers ld a,[W_REDSHOUSE2CURSCRIPT] - jp CallFunctionInTable + jp JumpTable RedsHouse2FScriptPointers: ; 5c0bc (17:40bc) dw RedsHouse2FScript0 diff --git a/scripts/route16gate.asm b/scripts/route16gate.asm index 801e577e..197b12b2 100755 --- a/scripts/route16gate.asm +++ b/scripts/route16gate.asm @@ -4,7 +4,7 @@ Route16GateScript: ; 496be (12:56be) call EnableAutoTextBoxDrawing ld a, [W_ROUTE16GATECURSCRIPT] ld hl, Route16GateScriptPointers - jp CallFunctionInTable + jp JumpTable Route16GateScriptPointers: ; 496cf (12:56cf) dw Route16GateScript0 diff --git a/scripts/route18gate.asm b/scripts/route18gate.asm index 060a6bbf..33f67e97 100755 --- a/scripts/route18gate.asm +++ b/scripts/route18gate.asm @@ -4,7 +4,7 @@ Route18GateScript: ; 49876 (12:5876) call EnableAutoTextBoxDrawing ld a, [W_ROUTE18GATECURSCRIPT] ld hl, Route18GateScriptPointers - jp CallFunctionInTable + jp JumpTable Route18GateScriptPointers: ; 49887 (12:5887) dw Route18GateScript0 diff --git a/scripts/route22.asm b/scripts/route22.asm index a7c61903..5ea8178f 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -2,7 +2,7 @@ Route22Script: ; 50eb2 (14:4eb2) call EnableAutoTextBoxDrawing ld hl, Route22ScriptPointers ld a, [W_ROUTE22CURSCRIPT] - jp CallFunctionInTable + jp JumpTable Route22ScriptPointers: ; 50ebe (14:4ebe) dw Route22Script0 diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index f0b5b92d..5fdd70c8 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -2,7 +2,7 @@ Route22GateScript: ; 1e683 (7:6683) call EnableAutoTextBoxDrawing ld hl, Route22GateScriptPointers ld a, [W_ROUTE22GATECURSCRIPT] - call CallFunctionInTable + call JumpTable ld a, [wYCoord] cp $4 ld a, ROUTE_23 diff --git a/scripts/route5gate.asm b/scripts/route5gate.asm index 35f3a020..6442fd83 100755 --- a/scripts/route5gate.asm +++ b/scripts/route5gate.asm @@ -2,7 +2,7 @@ Route5GateScript: ; 1df33 (7:5f33) call EnableAutoTextBoxDrawing ld a, [W_ROUTE5GATECURSCRIPT] ld hl, Route5GateScriptPointers - jp CallFunctionInTable + jp JumpTable Route5GateScriptPointers: ; 1df3f (7:5f3f) dw Route5GateScript0 diff --git a/scripts/route6gate.asm b/scripts/route6gate.asm index a4b6149c..dd179e28 100755 --- a/scripts/route6gate.asm +++ b/scripts/route6gate.asm @@ -2,7 +2,7 @@ Route6GateScript: ; 1e03d (7:603d) call EnableAutoTextBoxDrawing ld hl, Route6GateScriptPointers ld a, [W_ROUTE6GATECURSCRIPT] - call CallFunctionInTable + call JumpTable ret Route6GateScriptPointers: ; 1e04a (7:604a) diff --git a/scripts/route7gate.asm b/scripts/route7gate.asm index b55f813c..7f87b78c 100755 --- a/scripts/route7gate.asm +++ b/scripts/route7gate.asm @@ -2,7 +2,7 @@ Route7GateScript: ; 1e100 (7:6100) call EnableAutoTextBoxDrawing ld a, [W_ROUTE7GATECURSCRIPT] ld hl, Route7GateScriptPointers - call CallFunctionInTable + call JumpTable ret Route7GateScriptPointers: ; 1e10d (7:610d) diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index 96bfa875..fe2e3c3c 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -2,7 +2,7 @@ Route8GateScript: ; 1e1c7 (7:61c7) call EnableAutoTextBoxDrawing ld hl, Route8GateScriptPointers ld a, [W_ROUTE8GATECURSCRIPT] - jp CallFunctionInTable + jp JumpTable Route8GateScriptPointers: ; 1e1d3 (7:61d3) dw Route8GateScript0 diff --git a/scripts/safarizoneentrance.asm b/scripts/safarizoneentrance.asm index 2f8ff34b..a0a0ffda 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/safarizoneentrance.asm @@ -2,7 +2,7 @@ SafariZoneEntranceScript: ; 751cd (1d:51cd) call EnableAutoTextBoxDrawing ld hl, SafariZoneEntranceScriptPointers ld a, [wSafariZoneEntranceCurScript] - jp CallFunctionInTable + jp JumpTable SafariZoneEntranceScriptPointers: ; 751d9 (1d:51d9) dw .SafariZoneEntranceScript0 diff --git a/scripts/seafoamislands4.asm b/scripts/seafoamislands4.asm index e3234b0a..56ccd2e3 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/seafoamislands4.asm @@ -42,7 +42,7 @@ SeafoamIslands4Script: ; 4658d (11:658d) .asm_465ed ld hl, SeafoamIslands4ScriptPointers ld a, [wSeafoamIslands4CurScript] - jp CallFunctionInTable + jp JumpTable Seafoam4HolesCoords: ; 465f6 (11:65f6) db $10,$03 diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index 98c27666..f8b7aed7 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -2,7 +2,7 @@ SeafoamIslands5Script: ; 46799 (11:6799) call EnableAutoTextBoxDrawing ld a, [wSeafoamIslands5CurScript] ld hl, SeafoamIslands5ScriptPointers - jp CallFunctionInTable + jp JumpTable SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) xor a diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index eea27ec9..7bdafe2c 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -2,7 +2,7 @@ SSAnne2Script: ; 6139f (18:539f) call EnableAutoTextBoxDrawing ld hl, SSAnne2ScriptPointers ld a, [W_SSANNE2CURSCRIPT] - jp CallFunctionInTable + jp JumpTable SSAnne2Script_613ab: ; 613ab (18:53ab) xor a diff --git a/scripts/vermilioncity.asm b/scripts/vermilioncity.asm index 67e3cddd..a8fc8ce7 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/vermilioncity.asm @@ -1,5 +1,7 @@ VermilionCityScript: ; 197a1 (6:57a1) call EnableAutoTextBoxDrawing + ld hl, wPreventBlackout + res 7, [hl] ld hl, wd126 bit 6, [hl] res 6, [hl] @@ -11,11 +13,24 @@ VermilionCityScript: ; 197a1 (6:57a1) call nz, VermilionCityScript_197c0 ld hl, VermilionCityScriptPointers ld a, [W_VERMILIONCITYCURSCRIPT] - jp CallFunctionInTable + call JumpTable + call VermilionCityScript_19869 + ret + +VermilionCityScript_19869: + CheckEventHL EVENT_152 + ret nz + CheckEventReuseHL EVENT_GOT_BIKE_VOUCHER + ret z + SetEventReuseHL EVENT_152 + ret VermilionCityScript_197c0: ; 197c0 (6:57c0) call Random - ld a, [$ffd4] + ld a, [hRandomAdd] + ld b, a + ld a, [hRandomSub] + adc b and $e ld [wFirstLockTrashCanIndex], a ret @@ -40,10 +55,10 @@ VermilionCityScriptPointers: ; 197dc (6:57dc) VermilionCityScript0: ; 197e6 (6:57e6) ld a, [wSpriteStateData1 + 9] and a ; cp SPRITE_FACING_DOWN - ret nz + jr nz, .asm_198de ld hl, CoordsData_19823 call ArePlayerCoordsInArray - ret nc + jr nc, .asm_198de xor a ld [hJoyHeld], a ld [wcf0d], a @@ -67,6 +82,9 @@ VermilionCityScript0: ; 197e6 (6:57e6) ld [W_VERMILIONCITYCURSCRIPT], a ret +.asm_198de + ret + CoordsData_19823: ; 19823 (6:5823) db $1e,$12 db $ff @@ -122,11 +140,12 @@ VermilionCityTextPointers: ; 1986f (6:586f) dw VermilionCityText6 dw VermilionCityText7 dw VermilionCityText8 + dw VermilionCityText9 dw MartSignText dw PokeCenterSignText - dw VermilionCityText11 dw VermilionCityText12 dw VermilionCityText13 + dw VermilionCityText14 VermilionCityText1: ; 19889 (6:5889) TX_FAR _VermilionCityText1 @@ -225,33 +244,43 @@ VermilionCityText5: ; 19922 (6:5922) ld a, MACHOP call PlayCry call WaitForSoundToFinish - ld hl, VermilionCityText14 + ld hl, VermilionCityText15 ret -VermilionCityText14: ; 19933 (6:5933) - TX_FAR _VermilionCityText14 +VermilionCityText15: ; 19933 (6:5933) + TX_FAR _VermilionCityText15 db "@" VermilionCityText6: ; 19938 (6:5938) TX_FAR _VermilionCityText6 db "@" -VermilionCityText7: ; 1993d (6:593d) - TX_FAR _VermilionCityText7 - db "@" +VermilionCityText8: ; 1993d (6:593d) + TX_ASM + callba Func_f1a8a + jp TextScriptEnd -VermilionCityText8: ; 19942 (6:5942) - TX_FAR _VermilionCityText8 - db "@" +VermilionCityText9: ; 19942 (6:5942) + TX_ASM + callba Func_f1a96 + jp TextScriptEnd -VermilionCityText11: ; 19947 (6:5947) - TX_FAR _VermilionCityText11 - db "@" +VermilionCityText12: + TX_ASM + callba Func_f1aa2 + jp TextScriptEnd -VermilionCityText12: ; 1994c (6:594c) - TX_FAR _VermilionCityText12 - db "@" +VermilionCityText13: ; 19947 (6:5947) + TX_ASM + callba Func_f1aae + jp TextScriptEnd -VermilionCityText13: ; 19951 (6:5951) - TX_FAR _VermilionCityText13 - db "@" +VermilionCityText14: ; 1994c (6:594c) + TX_ASM + callba Func_f1aba + jp TextScriptEnd + +VermilionCityText7: ; 19951 (6:5951) + TX_ASM + callba Func_f1a0f + jp TextScriptEnd diff --git a/scripts/vermilioncity2.asm b/scripts/vermilioncity2.asm index 4be44db0..eb7ea37a 100755 --- a/scripts/vermilioncity2.asm +++ b/scripts/vermilioncity2.asm @@ -65,4 +65,47 @@ OfficerJennyText5: TX_FAR _OfficerJennyText5 db "@" - dr $f1a8a,$f1ac6 +Func_f1a8a: + ld hl, VermilionCityText_f1a91 + call PrintText + ret + +VermilionCityText_f1a91: + TX_FAR _VermilionCityText8 + db "@" + +Func_f1a96: + ld hl, VermilionCityText_f1a9d + call PrintText + ret + +VermilionCityText_f1a9d: + TX_FAR _VermilionCityText9 + db "@" + +Func_f1aa2: + ld hl, VermilionCityText_f1aa9 + call PrintText + ret + +VermilionCityText_f1aa9: + TX_FAR _VermilionCityText12 + db "@" + +Func_f1aae: + ld hl, VermilionCityText_f1ab5 + call PrintText + ret + +VermilionCityText_f1ab5: + TX_FAR _VermilionCityText13 + db "@" + +Func_f1aba: + ld hl, VermilionCityText_f1ac1 + call PrintText + ret + +VermilionCityText_f1ac1: + TX_FAR _VermilionCityText14 + db "@" diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 4f4b2875..8d974abc 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -3,7 +3,7 @@ ViridianMartScript: ; 1d46e (7:546e) call EnableAutoTextBoxDrawing ld hl, ViridianMartScriptPointers ld a, [W_VIRIDIANMARKETCURSCRIPT] - jp CallFunctionInTable + jp JumpTable ViridianMartScript_1d47d: ; 1d47d (7:547d) CheckEvent EVENT_OAK_GOT_PARCEL diff --git a/text/maps/vermilion_city.asm b/text/maps/vermilion_city.asm index 603b218a..f5e0adba 100644 --- a/text/maps/vermilion_city.asm +++ b/text/maps/vermilion_city.asm @@ -35,7 +35,7 @@ _SSAnneWelcomeText9:: prompt _SSAnneFlashedTicketText:: - text $52, " flashed" + text " flashed" line "the S.S.TICKET!" para "Great! Welcome to" @@ -43,7 +43,7 @@ _SSAnneFlashedTicketText:: done _SSAnneNoTicketText:: - text $52, " doesn't" + text " doesn't" line "have the needed" cont "S.S.TICKET." @@ -70,8 +70,8 @@ _VermilionCityText5:: text "MACHOP: Guoh!" line "Gogogoh!@@" -_VermilionCityText14:: - db $0 +_VermilionCityText15:: + text "" para "A MACHOP is" line "stomping the land" cont "flat." @@ -127,13 +127,13 @@ _OfficerJennyText5:: line "doing?" done -_VermilionCityText7:: +_VermilionCityText8:: text "VERMILION CITY" line "The Port of" cont "Exquisite Sunsets" done -_VermilionCityText8:: +_VermilionCityText9:: text "NOTICE!" para "ROUTE 12 may be" @@ -147,13 +147,13 @@ _VermilionCityText8:: para "VERMILION POLICE" done -_VermilionCityText11:: +_VermilionCityText12:: text "#MON FAN CLUB" line "All #MON fans" cont "welcome!" done -_VermilionCityText12:: +_VermilionCityText13:: text "VERMILION CITY" line "#MON GYM" cont "LEADER: LT.SURGE" @@ -162,7 +162,7 @@ _VermilionCityText12:: line "American!" done -_VermilionCityText13:: +_VermilionCityText14:: text "VERMILION HARBOR" done -- cgit v1.3.1-sl0p From 35ab6056cae9e69b557dffac762ef68c55c8d286 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 12:46:48 -0400 Subject: Route 6 scripts --- data/mapObjects/route6.asm | 4 ++-- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 6 ++++-- scripts/route6.asm | 6 +++++- 5 files changed, 13 insertions(+), 7 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index 19ac2a8a..c854c91f 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -11,8 +11,8 @@ Route6Object: ; 0x58022 (size=87) db $f, $13, $7 ; Route6Text7 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4 - object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2 + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $a + object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $19 object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5 object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 2ad544fb..1dd37cd6 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -17,7 +17,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route3_h) ; ROUTE_3 db BANK(Route4_h) ; ROUTE_4 db BANK(Route5_h) ; ROUTE_5 - db $16 ; db BANK(Route6_h) ; ROUTE_6 + db BANK(Route6_h) ; ROUTE_6 db BANK(Route7_h) ; ROUTE_7 db $16 ; db BANK(Route8_h) ; ROUTE_8 db $15 ; db BANK(Route9_h) ; ROUTE_9 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index bd644214..7aed33ae 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -17,7 +17,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route3_h dw Route4_h dw Route5_h - dw $4000 ; dw Route6_h + dw Route6_h dw Route7_h dw $412d ; dw Route8_h dw $468e ; dw Route9_h diff --git a/main.asm b/main.asm index e04d9103..cb5b2c45 100755 --- a/main.asm +++ b/main.asm @@ -873,7 +873,8 @@ INCLUDE "engine/overworld/trainers.asm" SECTION "bank16",ROMX,BANK[$16] - dr $58000,$58079 +INCLUDE "data/mapHeaders/route6.asm" +INCLUDE "data/mapObjects/route6.asm" Route6Blocks: ; 58079 INCBIN "maps/route6.blk" dr $5812d,$581c6 @@ -893,7 +894,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" - dr $58f47,$5a53a +INCLUDE "scripts/route6.asm" + dr $59052,$5a53a INCLUDE "engine/overworld/saffron_guards.asm" diff --git a/scripts/route6.asm b/scripts/route6.asm index e748fed1..8ef32a42 100755 --- a/scripts/route6.asm +++ b/scripts/route6.asm @@ -36,7 +36,7 @@ Route6TrainerHeader1: ; 590e3 (16:50e3) db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_1 dw Route6BattleText2 ; TextBeforeBattle - dw Route6AfterBattleText1 ; TextAfterBattle + dw Route6AfterBattleText2 ; TextAfterBattle dw Route6EndBattleText2 ; TextEndBattle dw Route6EndBattleText2 ; TextEndBattle @@ -110,6 +110,10 @@ Route6EndBattleText2: ; 59148 (16:5148) TX_FAR _Route6EndBattleText2 db "@" +Route6AfterBattleText2: + TX_FAR _Route6AfterBattleText2 + db "@" + Route6Text3: ; 5914d (16:514d) TX_ASM ld hl, Route6TrainerHeader2 -- cgit v1.3.1-sl0p From 0eed04e6a66df8bef77956e7d7977851ca3a1e7a Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 17:58:43 -0400 Subject: Route 21 and Cinnabar Island --- data/map_header_banks.asm | 4 ++-- data/map_header_pointers.asm | 4 ++-- main.asm | 23 ++++++++++++++++------- 3 files changed, 20 insertions(+), 11 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 1dd37cd6..e75d32b5 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -8,7 +8,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(VermilionCity_h) ; VERMILION_CITY db BANK(CeladonCity_h) ; CELADON_CITY db $06 ; db BANK(FuchsiaCity_h) ; FUCHSIA_CITY - db $07 ; db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND + db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU db BANK(SaffronCity_h) ; SAFFRON_CITY db $01 ; unused @@ -32,7 +32,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route18_h) ; ROUTE_18 db $15 ; db BANK(Route19_h) ; ROUTE_19 db $14 ; db BANK(Route20_h) ; ROUTE_20 - db $15 ; db BANK(Route21_h) ; ROUTE_21 + db BANK(Route21_h) ; ROUTE_21 db BANK(Route22_h) ; ROUTE_22 db BANK(Route23_h) ; ROUTE_23 db BANK(Route24_h) ; ROUTE_24 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 7aed33ae..0de20020 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -8,7 +8,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw VermilionCity_h dw CeladonCity_h dw $4bb3 ; dw FuchsiaCity_h - dw $4000 ; dw CinnabarIsland_h + dw CinnabarIsland_h dw IndigoPlateau_h dw SaffronCity_h dw SaffronCity_h @@ -32,7 +32,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4c38 ; dw Route18_h dw $4e80 ; dw Route19_h dw $40f1 ; dw Route20_h - dw $500f ; dw Route21_h + dw Route21_h dw Route22_h dw Route23_h dw Route24_h diff --git a/main.asm b/main.asm index cb5b2c45..5c85df92 100755 --- a/main.asm +++ b/main.asm @@ -277,9 +277,8 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" SECTION "bank07",ROMX,BANK[$07] -; INCLUDE "data/mapHeaders/cinnabarisland.asm" -; INCLUDE "data/mapObjects/cinnabarisland.asm" - dr $1c000,$1c069 ; headers, objects, blocks +INCLUDE "data/mapHeaders/cinnabarisland.asm" +INCLUDE "data/mapObjects/cinnabarisland.asm" CinnabarIslandBlocks: INCBIN "maps/cinnabarisland.blk" @@ -292,7 +291,8 @@ INCBIN "maps/route1.blk" INCLUDE "engine/clear_save.asm" INCLUDE "engine/predefs7.asm" - dr $1c2c2,$1c358 ; map scripts +INCLUDE "scripts/cinnabarisland.asm" + ; dr $1c2c2,$1c358 ; map scripts INCLUDE "scripts/route1.asm" dr $1c386,$1e2ae ; map scripts @@ -780,7 +780,11 @@ INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" Route22Blocks: INCBIN "maps/route22.blk" - dr $500f1,$5033f +; INCLUDE "data/mapHeaders/route20.asm" +; INCLUDE "data/mapObjects/route20.asm" + dr $500f1,$5017d +Route20Blocks: +INCBIN "maps/route20.blk" INCLUDE "data/mapHeaders/route23.asm" INCLUDE "data/mapObjects/route23.asm" @@ -809,6 +813,7 @@ INCLUDE "data/mapObjects/saffroncity.asm" SaffronCityBlocks: ; 50a98 (14:4a98) INCBIN "maps/saffroncity.blk" INCLUDE "scripts/saffroncity.asm" +; INCLUDE "scripts/route20.asm" dr $50ca9,$50eb2 INCLUDE "scripts/route22.asm" INCLUDE "scripts/route23.asm" @@ -853,7 +858,9 @@ INCBIN "maps/route5.blk" dr $5468e,$54706 Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$5507d + dr $54814,$5500f +INCLUDE "data/mapHeaders/route21.asm" +INCLUDE "data/mapObjects/route21.asm" Route21Blocks: ; 5507d INCBIN "maps/route21.blk" dr $5523f,$5525f @@ -864,7 +871,9 @@ INCLUDE "scripts/route2.asm" INCLUDE "scripts/route3.asm" INCLUDE "scripts/route4.asm" INCLUDE "scripts/route5.asm" - dr $556d0,$56714 + dr $556d0,$55edb +INCLUDE "scripts/route21.asm" + dr $56054,$56714 INCLUDE "engine/menu/diploma_1.asm" -- cgit v1.3.1-sl0p From d9e7b91cb3a77891901974f65104dca2fc286ab7 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 18:13:32 -0400 Subject: Route 20 scripts and route 19 blocks --- constants/hide_show_constants.asm | 2 ++ data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 12 ++++++------ maps/route19.blk | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index db37b9d9..fc8ab90f 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -226,6 +226,8 @@ const_value SET $7c ; idk anymore lol const HS_VICTORY_ROAD_1_ITEM_1 ; D6 const HS_VICTORY_ROAD_1_ITEM_2 ; D7 const HS_CHAMPIONS_ROOM_OAK ; D8 + +const_value SET $df const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; D9 const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; DA const HS_SEAFOAM_ISLANDS_2_BOULDER_1 ; DB diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index e75d32b5..a9de3dff 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -31,7 +31,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $15 ; db BANK(Route17_h) ; ROUTE_17 db $16 ; db BANK(Route18_h) ; ROUTE_18 db $15 ; db BANK(Route19_h) ; ROUTE_19 - db $14 ; db BANK(Route20_h) ; ROUTE_20 + db BANK(Route20_h) ; ROUTE_20 db BANK(Route21_h) ; ROUTE_21 db BANK(Route22_h) ; ROUTE_22 db BANK(Route23_h) ; ROUTE_23 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 0de20020..d6672bbe 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -31,7 +31,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4b28 ; dw Route17_h dw $4c38 ; dw Route18_h dw $4e80 ; dw Route19_h - dw $40f1 ; dw Route20_h + dw Route20_h dw Route21_h dw Route22_h dw Route23_h diff --git a/main.asm b/main.asm index 5c85df92..b988997b 100755 --- a/main.asm +++ b/main.asm @@ -780,9 +780,8 @@ INCLUDE "data/mapHeaders/route22.asm" INCLUDE "data/mapObjects/route22.asm" Route22Blocks: INCBIN "maps/route22.blk" -; INCLUDE "data/mapHeaders/route20.asm" -; INCLUDE "data/mapObjects/route20.asm" - dr $500f1,$5017d +INCLUDE "data/mapHeaders/route20.asm" +INCLUDE "data/mapObjects/route20.asm" Route20Blocks: INCBIN "maps/route20.blk" @@ -813,8 +812,7 @@ INCLUDE "data/mapObjects/saffroncity.asm" SaffronCityBlocks: ; 50a98 (14:4a98) INCBIN "maps/saffroncity.blk" INCLUDE "scripts/saffroncity.asm" -; INCLUDE "scripts/route20.asm" - dr $50ca9,$50eb2 +INCLUDE "scripts/route20.asm" INCLUDE "scripts/route22.asm" INCLUDE "scripts/route23.asm" INCLUDE "scripts/route24.asm" @@ -858,7 +856,9 @@ INCBIN "maps/route5.blk" dr $5468e,$54706 Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$5500f + dr $54814,$54f01 +Route19Blocks: +INCBIN "maps/route19.blk" INCLUDE "data/mapHeaders/route21.asm" INCLUDE "data/mapObjects/route21.asm" Route21Blocks: ; 5507d diff --git a/maps/route19.blk b/maps/route19.blk index 0bd469e7..3fc58494 100644 --- a/maps/route19.blk +++ b/maps/route19.blk @@ -1 +1 @@ -(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file +(,)(,)(,)$W%$W%CCC11111CCC111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file -- cgit v1.3.1-sl0p From 7caa8c4be0a77083a445a1b1d2ace4031f5cb4f0 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 18:33:42 -0400 Subject: Route 19 --- data/mapObjects/route19.asm | 17 ++++++++++------- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 11 +++++++---- scripts/route19.asm | 30 +++++++++++------------------- 5 files changed, 30 insertions(+), 32 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route19.asm b/data/mapObjects/route19.asm index 7377e1e6..ec2b8774 100755 --- a/data/mapObjects/route19.asm +++ b/data/mapObjects/route19.asm @@ -9,13 +9,16 @@ Route19Object: ; 0x54e9a (size=87) db $a ; objects - object SPRITE_BLACK_HAIR_BOY_1, $9, $7, STAY, RIGHT, 1, OPP_SWIMMER, 2 - object SPRITE_BLACK_HAIR_BOY_1, $c, $9, STAY, LEFT, 2, OPP_SWIMMER, 3 - object SPRITE_SWIMMER, $9, $d, STAY, DOWN, $6, OPP_SWIMMER, $7 - object SPRITE_SWIMMER, $8, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c - object SPRITE_SWIMMER, $b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d - object SPRITE_SWIMMER, $9, $2a, STAY, UP, $9, OPP_SWIMMER, $8 - object SPRITE_SWIMMER, $a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e + object SPRITE_BLACK_HAIR_BOY_1, $09, $07, STAY, RIGHT, $1, OPP_SWIMMER, $2 + object SPRITE_BLACK_HAIR_BOY_1, $0c, $09, STAY, LEFT, $2, OPP_SWIMMER, $3 + object SPRITE_SWIMMER, $0d, $19, STAY, LEFT, $3, OPP_SWIMMER, $4 + object SPRITE_SWIMMER, $04, $1b, STAY, RIGHT, $4, OPP_SWIMMER, $5 + object SPRITE_SWIMMER, $10, $1f, STAY, UP, $5, OPP_SWIMMER, $6 + object SPRITE_SWIMMER, $09, $0d, STAY, DOWN, $6, OPP_SWIMMER, $7 + object SPRITE_SWIMMER, $08, $2b, STAY, LEFT, $7, OPP_BEAUTY, $c + object SPRITE_SWIMMER, $0b, $2b, STAY, RIGHT, $8, OPP_BEAUTY, $d + object SPRITE_SWIMMER, $09, $2a, STAY, UP, $9, OPP_SWIMMER, $8 + object SPRITE_SWIMMER, $0a, $2c, STAY, DOWN, $a, OPP_BEAUTY, $e ; warp-to EVENT_DISP ROUTE_19_WIDTH, $9, $5 ; BEACH_HOUSE diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index a9de3dff..22b939d6 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -30,7 +30,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route16_h) ; ROUTE_16 db $15 ; db BANK(Route17_h) ; ROUTE_17 db $16 ; db BANK(Route18_h) ; ROUTE_18 - db $15 ; db BANK(Route19_h) ; ROUTE_19 + db BANK(Route19_h) ; ROUTE_19 db BANK(Route20_h) ; ROUTE_20 db BANK(Route21_h) ; ROUTE_21 db BANK(Route22_h) ; ROUTE_22 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index d6672bbe..7ac1d910 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -30,7 +30,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4ada ; dw Route16_h dw $4b28 ; dw Route17_h dw $4c38 ; dw Route18_h - dw $4e80 ; dw Route19_h + dw Route19_h dw Route20_h dw Route21_h dw Route22_h diff --git a/main.asm b/main.asm index b988997b..8eaf7c9a 100755 --- a/main.asm +++ b/main.asm @@ -256,10 +256,10 @@ INCLUDE "data/mapHeaders/vermilioncity.asm" INCLUDE "data/mapObjects/vermilioncity.asm" VermilionCityBlocks: INCBIN "maps/vermilioncity.blk" - dr $18bb3,$18dfa ; headers, objects, blocks + dr $18bb3,$18c92 ; headers, objects, blocks ; INCLUDE "data/mapHeaders/fuchsiacity.asm" ; INCLUDE "data/mapObjects/fuchsiacity.asm" -; FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" +FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" INCLUDE "scripts/pallettown.asm" @@ -856,7 +856,9 @@ INCBIN "maps/route5.blk" dr $5468e,$54706 Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54f01 + dr $54814,$54e80 +INCLUDE "data/mapHeaders/route19.asm" +INCLUDE "data/mapObjects/route19.asm" Route19Blocks: INCBIN "maps/route19.blk" INCLUDE "data/mapHeaders/route21.asm" @@ -871,7 +873,8 @@ INCLUDE "scripts/route2.asm" INCLUDE "scripts/route3.asm" INCLUDE "scripts/route4.asm" INCLUDE "scripts/route5.asm" - dr $556d0,$55edb + dr $556d0,$55d58 +INCLUDE "scripts/route19.asm" INCLUDE "scripts/route21.asm" dr $56054,$56714 diff --git a/scripts/route19.asm b/scripts/route19.asm index 4a60e40f..9ed6080b 100755 --- a/scripts/route19.asm +++ b/scripts/route19.asm @@ -37,7 +37,7 @@ Route19TrainerHeader0: ; 55d73 (15:5d73) Route19TrainerHeader1: ; 55d7f (15:5d7f) dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_1 - db ($3 << 4) ; trainer's view range + db ($4 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_1 dw Route19BattleText2 ; TextBeforeBattle dw Route19AfterBattleText2 ; TextAfterBattle @@ -121,60 +121,52 @@ Route19TrainerHeader9: ; 55ddf (15:5ddf) Route19Text1: ; 55dec (15:5dec) TX_ASM ld hl, Route19TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd + jr Route19_TalkToTrainer Route19Text2: ; 55df6 (15:5df6) TX_ASM ld hl, Route19TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd + jr Route19_TalkToTrainer Route19Text3: ; 55e00 (15:5e00) TX_ASM ld hl, Route19TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd + jr Route19_TalkToTrainer Route19Text4: ; 55e0a (15:5e0a) TX_ASM ld hl, Route19TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd + jr Route19_TalkToTrainer Route19Text5: ; 55e14 (15:5e14) TX_ASM ld hl, Route19TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd + jr Route19_TalkToTrainer Route19Text6: ; 55e1e (15:5e1e) TX_ASM ld hl, Route19TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd + jr Route19_TalkToTrainer Route19Text7: ; 55e28 (15:5e28) TX_ASM ld hl, Route19TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd + jr Route19_TalkToTrainer Route19Text8: ; 55e32 (15:5e32) TX_ASM ld hl, Route19TrainerHeader7 - call TalkToTrainer - jp TextScriptEnd + jr Route19_TalkToTrainer Route19Text9: ; 55e3c (15:5e3c) TX_ASM ld hl, Route19TrainerHeader8 - call TalkToTrainer - jp TextScriptEnd + jr Route19_TalkToTrainer Route19Text10: ; 55e46 (15:5e46) TX_ASM ld hl, Route19TrainerHeader9 +Route19_TalkToTrainer: call TalkToTrainer jp TextScriptEnd -- cgit v1.3.1-sl0p From f23133ddcc6cb4ec5f974139cd8193b27d146733 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 18:57:15 -0400 Subject: Fuchsia City --- constants/event_constants.asm | 4 ++-- data/mapObjects/fuchsiacity.asm | 2 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 21 ++++++++++++--------- 5 files changed, 17 insertions(+), 14 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/constants/event_constants.asm b/constants/event_constants.asm index b0c67e4b..7fc3b509 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -1400,13 +1400,13 @@ const_value = 0 const EVENT_BEAT_MT_MOON_1_TRAINER_5 ; 575, (D7F5, bit 5) const EVENT_BEAT_MT_MOON_1_TRAINER_6 ; 576, (D7F5, bit 6) const EVENT_BEAT_MT_MOON_1_TRAINER_7 ; 577, (D7F5, bit 7) - const EVENT_578 ; 578, (D7F6, bit 0) + const EVENT_GOT_DOME_FOSSIL ; 578, (D7F6, bit 0) const EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD ; 579, (D7F6, bit 1) const EVENT_BEAT_MT_MOON_3_TRAINER_0 ; 57A, (D7F6, bit 2) const EVENT_BEAT_MT_MOON_3_TRAINER_2 ; 57B, (D7F6, bit 3) const EVENT_BEAT_MT_MOON_3_TRAINER_3 ; 57C, (D7F6, bit 4) const EVENT_BEAT_MT_MOON_3_TRAINER_4 ; 57D, (D7F6, bit 5) - const EVENT_GOT_DOME_FOSSIL ; 57E, (D7F6, bit 6) + const EVENT_57E ; 57E, (D7F6, bit 6) const EVENT_GOT_HELIX_FOSSIL ; 57F, (D7F6, bit 7) const EVENT_580 ; 580, (D7F7, bit 0) const EVENT_581 ; 581, (D7F7, bit 1) diff --git a/data/mapObjects/fuchsiacity.asm b/data/mapObjects/fuchsiacity.asm index 85f801d9..c64760c0 100755 --- a/data/mapObjects/fuchsiacity.asm +++ b/data/mapObjects/fuchsiacity.asm @@ -33,7 +33,7 @@ FuchsiaCityObject: ; 0x18bd4 (size=178) object SPRITE_GAMBLER, $1c, $11, WALK, $2, $2 ; person object SPRITE_FISHER2, $1e, $e, STAY, DOWN, $3 ; person object SPRITE_BUG_CATCHER, $18, $8, STAY, UP, $4 ; person - object SPRITE_CLEFAIRY, $1f, $5, WALK, $0, $5 ; person + object SPRITE_CHANSEY, $1f, $5, STAY, DOWN, $5 ; person object SPRITE_BALL, $19, $6, STAY, NONE, $6 ; person object SPRITE_SLOWBRO, $c, $6, WALK, $2, $7 ; person object SPRITE_SLOWBRO, $1e, $c, WALK, $2, $8 ; person diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 22b939d6..cf1ca6cc 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -7,7 +7,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $11 ; db BANK(LavenderTown_h) ; LAVENDER_TOWN db BANK(VermilionCity_h) ; VERMILION_CITY db BANK(CeladonCity_h) ; CELADON_CITY - db $06 ; db BANK(FuchsiaCity_h) ; FUCHSIA_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 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 7ac1d910..adec78bc 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -7,7 +7,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4000 ; dw LavenderTown_h dw VermilionCity_h dw CeladonCity_h - dw $4bb3 ; dw FuchsiaCity_h + dw FuchsiaCity_h dw CinnabarIsland_h dw IndigoPlateau_h dw SaffronCity_h diff --git a/main.asm b/main.asm index 8eaf7c9a..d5da1a30 100755 --- a/main.asm +++ b/main.asm @@ -255,10 +255,8 @@ CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" ; 18836 INCLUDE "data/mapHeaders/vermilioncity.asm" INCLUDE "data/mapObjects/vermilioncity.asm" VermilionCityBlocks: INCBIN "maps/vermilioncity.blk" - - dr $18bb3,$18c92 ; headers, objects, blocks -; INCLUDE "data/mapHeaders/fuchsiacity.asm" -; INCLUDE "data/mapObjects/fuchsiacity.asm" +INCLUDE "data/mapHeaders/fuchsiacity.asm" +INCLUDE "data/mapObjects/fuchsiacity.asm" FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" @@ -268,9 +266,8 @@ INCLUDE "scripts/pewtercity.asm" INCLUDE "scripts/ceruleancity.asm" INCLUDE "scripts/vermilioncity.asm" INCLUDE "scripts/celadoncity.asm" - - dr $19b2b,$1a4ea -; INCLUDE "scripts/fuchsiacity.asm" +INCLUDE "scripts/fuchsiacity.asm" + dr $19c2f,$1a4ea INCLUDE "engine/overworld/npc_movement.asm" INCLUDE "engine/overworld/doors.asm" @@ -895,10 +892,16 @@ INCBIN "maps/route8.blk" dr $582d4,$5855f Route11Blocks: ; 5854f INCBIN "maps/route11.blk" - dr $5866d,$58b84 + dr $5866d,$589cc +Route15Blocks: +INCBIN "maps/route15.blk" + dr $58ada,$58b84 Route16Blocks: ; 58b84 INCBIN "maps/route16.blk" - dr $58c38,$58d99 + dr $58c38,$58c9c +Route18Blocks: +INCBIN "maps/route18.blk" + dr $58d7d,$58d99 INCLUDE "engine/experience.asm" -- cgit v1.3.1-sl0p From f0125912eaf67644a7c32c18a0ba6940469ee1bb Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:11:47 -0400 Subject: Route 18 scripts --- data/mapObjects/route18.asm | 4 ++-- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 14 +++++++++++--- scripts/route18.asm | 1 + 5 files changed, 16 insertions(+), 7 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm index 88547941..40b50b08 100755 --- a/data/mapObjects/route18.asm +++ b/data/mapObjects/route18.asm @@ -3,9 +3,9 @@ Route18Object: ; 0x58c5a (size=66) db $4 ; warps db $8, $21, $0, ROUTE_18_GATE_1F - db $9, $21, $1, ROUTE_18_GATE_1F + db $9, $21, $0, ROUTE_18_GATE_1F db $8, $28, $2, ROUTE_18_GATE_1F - db $9, $28, $3, ROUTE_18_GATE_1F + db $9, $28, $2, ROUTE_18_GATE_1F db $2 ; signs db $7, $2b, $4 ; Route18Text4 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index cf1ca6cc..214f2466 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -29,7 +29,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route15_h) ; ROUTE_15 db $16 ; db BANK(Route16_h) ; ROUTE_16 db $15 ; db BANK(Route17_h) ; ROUTE_17 - db $16 ; db BANK(Route18_h) ; ROUTE_18 + db BANK(Route18_h) ; ROUTE_18 db BANK(Route19_h) ; ROUTE_19 db BANK(Route20_h) ; ROUTE_20 db BANK(Route21_h) ; ROUTE_21 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index adec78bc..8418f195 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -29,7 +29,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $492c ; dw Route15_h dw $4ada ; dw Route16_h dw $4b28 ; dw Route17_h - dw $4c38 ; dw Route18_h + dw Route18_h dw Route19_h dw Route20_h dw Route21_h diff --git a/main.asm b/main.asm index d5da1a30..2a6fac02 100755 --- a/main.asm +++ b/main.asm @@ -853,7 +853,11 @@ INCBIN "maps/route5.blk" dr $5468e,$54706 Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54e80 + + dr $54814,$54bb0 +Route17Blocks: +INCBIN "maps/route17.blk" + INCLUDE "data/mapHeaders/route19.asm" INCLUDE "data/mapObjects/route19.asm" Route19Blocks: @@ -898,7 +902,9 @@ INCBIN "maps/route15.blk" dr $58ada,$58b84 Route16Blocks: ; 58b84 INCBIN "maps/route16.blk" - dr $58c38,$58c9c + +INCLUDE "data/mapHeaders/route18.asm" +INCLUDE "data/mapObjects/route18.asm" Route18Blocks: INCBIN "maps/route18.blk" dr $58d7d,$58d99 @@ -910,7 +916,9 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$5a53a + dr $59052,$59963 +INCLUDE "scripts/route18.asm" + dr $59a00,$5a53a INCLUDE "engine/overworld/saffron_guards.asm" diff --git a/scripts/route18.asm b/scripts/route18.asm index 9a077faf..9544b1ec 100755 --- a/scripts/route18.asm +++ b/scripts/route18.asm @@ -110,3 +110,4 @@ Route18Text4: ; 59b5a (16:5b5a) Route18Text5: ; 59b5f (16:5b5f) TX_FAR _Route18Text5 db "@" +; 59b64 -- cgit v1.3.1-sl0p From 78c0b78c55efb97739b060801aea89bf1ac3adc0 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:15:16 -0400 Subject: Route 17... that was easy --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 214f2466..1e99ee16 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -28,7 +28,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $15 ; db BANK(Route14_h) ; ROUTE_14 db $16 ; db BANK(Route15_h) ; ROUTE_15 db $16 ; db BANK(Route16_h) ; ROUTE_16 - db $15 ; db BANK(Route17_h) ; ROUTE_17 + db BANK(Route17_h) ; ROUTE_17 db BANK(Route18_h) ; ROUTE_18 db BANK(Route19_h) ; ROUTE_19 db BANK(Route20_h) ; ROUTE_20 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 8418f195..18a0e9c7 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -28,7 +28,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $49a1 ; dw Route14_h dw $492c ; dw Route15_h dw $4ada ; dw Route16_h - dw $4b28 ; dw Route17_h + dw Route17_h dw Route18_h dw Route19_h dw Route20_h diff --git a/main.asm b/main.asm index 2a6fac02..0779c8cd 100755 --- a/main.asm +++ b/main.asm @@ -854,7 +854,10 @@ INCBIN "maps/route5.blk" Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54bb0 + dr $54814,$54b28 + +INCLUDE "data/mapHeaders/route17.asm" +INCLUDE "data/mapObjects/route17.asm" Route17Blocks: INCBIN "maps/route17.blk" @@ -874,7 +877,8 @@ INCLUDE "scripts/route2.asm" INCLUDE "scripts/route3.asm" INCLUDE "scripts/route4.asm" INCLUDE "scripts/route5.asm" - dr $556d0,$55d58 + dr $556d0,$55b8e +INCLUDE "scripts/route17.asm" INCLUDE "scripts/route19.asm" INCLUDE "scripts/route21.asm" dr $56054,$56714 -- cgit v1.3.1-sl0p From d4a0fe908ffae83fd0be6f820df0780f727f2e4b Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:18:01 -0400 Subject: Route 16 --- data/mapObjects/route16.asm | 8 ++++---- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 7 +++++-- 4 files changed, 11 insertions(+), 8 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm index 600dbbf1..529b59bf 100755 --- a/data/mapObjects/route16.asm +++ b/data/mapObjects/route16.asm @@ -3,13 +3,13 @@ Route16Object: ; 0x58afc (size=136) db $9 ; warps db $a, $11, $0, ROUTE_16_GATE_1F - db $b, $11, $1, ROUTE_16_GATE_1F + db $b, $11, $0, ROUTE_16_GATE_1F db $a, $18, $2, ROUTE_16_GATE_1F - db $b, $18, $3, ROUTE_16_GATE_1F + db $b, $18, $2, ROUTE_16_GATE_1F db $4, $11, $4, ROUTE_16_GATE_1F - db $5, $11, $5, ROUTE_16_GATE_1F + db $5, $11, $4, ROUTE_16_GATE_1F db $4, $18, $6, ROUTE_16_GATE_1F - db $5, $18, $7, ROUTE_16_GATE_1F + db $5, $18, $6, ROUTE_16_GATE_1F db $5, $7, $0, ROUTE_16_HOUSE db $2 ; signs diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 1e99ee16..b47d5d8c 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -27,7 +27,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $15 ; db BANK(Route13_h) ; ROUTE_13 db $15 ; db BANK(Route14_h) ; ROUTE_14 db $16 ; db BANK(Route15_h) ; ROUTE_15 - db $16 ; db BANK(Route16_h) ; ROUTE_16 + db BANK(Route16_h) ; ROUTE_16 db BANK(Route17_h) ; ROUTE_17 db BANK(Route18_h) ; ROUTE_18 db BANK(Route19_h) ; ROUTE_19 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 18a0e9c7..413616d9 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -27,7 +27,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4814 ; dw Route13_h dw $49a1 ; dw Route14_h dw $492c ; dw Route15_h - dw $4ada ; dw Route16_h + dw Route16_h dw Route17_h dw Route18_h dw Route19_h diff --git a/main.asm b/main.asm index 0779c8cd..df796ab0 100755 --- a/main.asm +++ b/main.asm @@ -903,7 +903,9 @@ INCBIN "maps/route11.blk" dr $5866d,$589cc Route15Blocks: INCBIN "maps/route15.blk" - dr $58ada,$58b84 + +INCLUDE "data/mapHeaders/route16.asm" +INCLUDE "data/mapObjects/route16.asm" Route16Blocks: ; 58b84 INCBIN "maps/route16.blk" @@ -920,7 +922,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$59963 + dr $59052,$597cf +INCLUDE "scripts/route16.asm" INCLUDE "scripts/route18.asm" dr $59a00,$5a53a -- cgit v1.3.1-sl0p From 02fc3889b255aece1c02a673f7239a03e7a2396f Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:29:01 -0400 Subject: Route 15 --- data/mapObjects/route15.asm | 4 ++-- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 12 +++++++++--- 4 files changed, 13 insertions(+), 7 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm index e0d19e5c..bd6283b0 100755 --- a/data/mapObjects/route15.asm +++ b/data/mapObjects/route15.asm @@ -3,9 +3,9 @@ Route15Object: ; 0x5894e (size=126) db $4 ; warps db $8, $7, $0, ROUTE_15_GATE_1F - db $9, $7, $1, ROUTE_15_GATE_1F + db $9, $7, $0, ROUTE_15_GATE_1F db $8, $e, $2, ROUTE_15_GATE_1F - db $9, $e, $3, ROUTE_15_GATE_1F + db $9, $e, $2, ROUTE_15_GATE_1F db $1 ; signs db $9, $27, $c ; Route15Text12 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index b47d5d8c..69852516 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -26,7 +26,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route12_h) ; ROUTE_12 db $15 ; db BANK(Route13_h) ; ROUTE_13 db $15 ; db BANK(Route14_h) ; ROUTE_14 - db $16 ; db BANK(Route15_h) ; ROUTE_15 + db BANK(Route15_h) ; ROUTE_15 db BANK(Route16_h) ; ROUTE_16 db BANK(Route17_h) ; ROUTE_17 db BANK(Route18_h) ; ROUTE_18 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 413616d9..ff68b4fb 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -26,7 +26,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $466d ; dw Route12_h dw $4814 ; dw Route13_h dw $49a1 ; dw Route14_h - dw $492c ; dw Route15_h + dw Route15_h dw Route16_h dw Route17_h dw Route18_h diff --git a/main.asm b/main.asm index df796ab0..a4d8ec02 100755 --- a/main.asm +++ b/main.asm @@ -854,7 +854,9 @@ INCBIN "maps/route5.blk" Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54b28 + dr $54814,$54a1a +Route14Blocks: +INCBIN "maps/route14.blk" INCLUDE "data/mapHeaders/route17.asm" INCLUDE "data/mapObjects/route17.asm" @@ -900,7 +902,10 @@ INCBIN "maps/route8.blk" dr $582d4,$5855f Route11Blocks: ; 5854f INCBIN "maps/route11.blk" - dr $5866d,$589cc + dr $5866d,$5892c + +INCLUDE "data/mapHeaders/route15.asm" +INCLUDE "data/mapObjects/route15.asm" Route15Blocks: INCBIN "maps/route15.blk" @@ -922,7 +927,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$597cf + dr $59052,$5964a +INCLUDE "scripts/route15.asm" INCLUDE "scripts/route16.asm" INCLUDE "scripts/route18.asm" dr $59a00,$5a53a -- cgit v1.3.1-sl0p From 0c6ecb4054043b8c807065363f3d5d288d03db5d Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:32:45 -0400 Subject: Route 14 --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 69852516..fa275804 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -25,7 +25,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route11_h) ; ROUTE_11 db $16 ; db BANK(Route12_h) ; ROUTE_12 db $15 ; db BANK(Route13_h) ; ROUTE_13 - db $15 ; db BANK(Route14_h) ; ROUTE_14 + db BANK(Route14_h) ; ROUTE_14 db BANK(Route15_h) ; ROUTE_15 db BANK(Route16_h) ; ROUTE_16 db BANK(Route17_h) ; ROUTE_17 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index ff68b4fb..0d36b121 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -25,7 +25,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $44be ; dw Route11_h dw $466d ; dw Route12_h dw $4814 ; dw Route13_h - dw $49a1 ; dw Route14_h + dw Route14_h dw Route15_h dw Route16_h dw Route17_h diff --git a/main.asm b/main.asm index a4d8ec02..37a4dd21 100755 --- a/main.asm +++ b/main.asm @@ -854,7 +854,12 @@ INCBIN "maps/route5.blk" Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54a1a + dr $54814,$54893 +Route13Blocks: +INCBIN "maps/route13.blk" + +INCLUDE "data/mapHeaders/route14.asm" +INCLUDE "data/mapObjects/route14.asm" Route14Blocks: INCBIN "maps/route14.blk" @@ -879,7 +884,8 @@ INCLUDE "scripts/route2.asm" INCLUDE "scripts/route3.asm" INCLUDE "scripts/route4.asm" INCLUDE "scripts/route5.asm" - dr $556d0,$55b8e + dr $556d0,$559e7 +INCLUDE "scripts/route14.asm" INCLUDE "scripts/route17.asm" INCLUDE "scripts/route19.asm" INCLUDE "scripts/route21.asm" -- cgit v1.3.1-sl0p From b580c4c90f243df34042803260161459a1bf4e6e Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:36:09 -0400 Subject: Route 12 --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index fa275804..b4e65ab5 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -24,7 +24,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route10_h) ; ROUTE_10 db $16 ; db BANK(Route11_h) ; ROUTE_11 db $16 ; db BANK(Route12_h) ; ROUTE_12 - db $15 ; db BANK(Route13_h) ; ROUTE_13 + db BANK(Route13_h) ; ROUTE_13 db BANK(Route14_h) ; ROUTE_14 db BANK(Route15_h) ; ROUTE_15 db BANK(Route16_h) ; ROUTE_16 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 0d36b121..be5c8127 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -24,7 +24,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $42d4 ; dw Route10_h dw $44be ; dw Route11_h dw $466d ; dw Route12_h - dw $4814 ; dw Route13_h + dw Route13_h dw Route14_h dw Route15_h dw Route16_h diff --git a/main.asm b/main.asm index 37a4dd21..f227a168 100755 --- a/main.asm +++ b/main.asm @@ -854,7 +854,8 @@ INCBIN "maps/route5.blk" Route9Blocks: ; 54706 INCBIN "maps/route9.blk" - dr $54814,$54893 +INCLUDE "data/mapHeaders/route13.asm" +INCLUDE "data/mapObjects/route13.asm" Route13Blocks: INCBIN "maps/route13.blk" @@ -884,7 +885,8 @@ INCLUDE "scripts/route2.asm" INCLUDE "scripts/route3.asm" INCLUDE "scripts/route4.asm" INCLUDE "scripts/route5.asm" - dr $556d0,$559e7 + dr $556d0,$55832 +INCLUDE "scripts/route13.asm" INCLUDE "scripts/route14.asm" INCLUDE "scripts/route17.asm" INCLUDE "scripts/route19.asm" @@ -902,13 +904,18 @@ INCLUDE "data/mapHeaders/route6.asm" INCLUDE "data/mapObjects/route6.asm" Route6Blocks: ; 58079 INCBIN "maps/route6.blk" + dr $5812d,$581c6 Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" + dr $582d4,$5855f Route11Blocks: ; 5854f INCBIN "maps/route11.blk" - dr $5866d,$5892c + + dr $5866d,$58710 +Route12Blocks: +INCBIN "maps/route12.blk" INCLUDE "data/mapHeaders/route15.asm" INCLUDE "data/mapObjects/route15.asm" -- cgit v1.3.1-sl0p From 807323ed1cc2231d3df93edfaab22dde5de191ea Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:39:40 -0400 Subject: Route 12 --- data/mapObjects/route12.asm | 2 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 11 ++++++++--- 4 files changed, 11 insertions(+), 6 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 8ed43ff4..783fd49b 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -3,7 +3,7 @@ Route12Object: ; 0x5869a (size=118) db $4 ; warps db $f, $a, $0, ROUTE_12_GATE_1F - db $f, $b, $1, ROUTE_12_GATE_1F + db $f, $b, $0, ROUTE_12_GATE_1F db $15, $a, $2, ROUTE_12_GATE_1F db $4d, $b, $0, ROUTE_12_HOUSE diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index b4e65ab5..429cc87d 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -23,7 +23,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $15 ; db BANK(Route9_h) ; ROUTE_9 db $16 ; db BANK(Route10_h) ; ROUTE_10 db $16 ; db BANK(Route11_h) ; ROUTE_11 - db $16 ; db BANK(Route12_h) ; ROUTE_12 + db BANK(Route12_h) ; ROUTE_12 db BANK(Route13_h) ; ROUTE_13 db BANK(Route14_h) ; ROUTE_14 db BANK(Route15_h) ; ROUTE_15 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index be5c8127..9334f585 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -23,7 +23,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $468e ; dw Route9_h dw $42d4 ; dw Route10_h dw $44be ; dw Route11_h - dw $466d ; dw Route12_h + dw Route12_h dw Route13_h dw Route14_h dw Route15_h diff --git a/main.asm b/main.asm index f227a168..29151bc4 100755 --- a/main.asm +++ b/main.asm @@ -679,7 +679,10 @@ INCLUDE "engine/menu/options.asm" SECTION "bank11",ROMX,BANK[$11] - dr $44000,$44169 + dr $44000,$44085 +LavenderTownBlocks: +INCBIN "maps/lavendertown.blk" + dr $440df,$44169 INCLUDE "engine/pokedex_rating.asm" @@ -913,7 +916,8 @@ INCBIN "maps/route8.blk" Route11Blocks: ; 5854f INCBIN "maps/route11.blk" - dr $5866d,$58710 +INCLUDE "data/mapHeaders/route12.asm" +INCLUDE "data/mapObjects/route12.asm" Route12Blocks: INCBIN "maps/route12.blk" @@ -940,7 +944,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$5964a + dr $59052,$5948f +INCLUDE "scripts/route12.asm" INCLUDE "scripts/route15.asm" INCLUDE "scripts/route16.asm" INCLUDE "scripts/route18.asm" -- cgit v1.3.1-sl0p From 8de636993d6d26f2b8a9557a55ce1a96fc29e01b Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:43:06 -0400 Subject: Route 11 --- data/mapObjects/route11.asm | 4 ++-- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 10 +++++++--- 4 files changed, 11 insertions(+), 7 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route11.asm b/data/mapObjects/route11.asm index 4e196b20..d0c9af20 100755 --- a/data/mapObjects/route11.asm +++ b/data/mapObjects/route11.asm @@ -3,9 +3,9 @@ Route11Object: ; 0x584e0 (size=127) db $5 ; warps db $8, $31, $0, ROUTE_11_GATE_1F - db $9, $31, $1, ROUTE_11_GATE_1F + db $9, $31, $0, ROUTE_11_GATE_1F db $8, $3a, $2, ROUTE_11_GATE_1F - db $9, $3a, $3, ROUTE_11_GATE_1F + db $9, $3a, $2, ROUTE_11_GATE_1F db $5, $4, $0, DIGLETTS_CAVE_ENTRANCE db $1 ; signs diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 429cc87d..63802c23 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -22,7 +22,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $16 ; db BANK(Route8_h) ; ROUTE_8 db $15 ; db BANK(Route9_h) ; ROUTE_9 db $16 ; db BANK(Route10_h) ; ROUTE_10 - db $16 ; db BANK(Route11_h) ; ROUTE_11 + db BANK(Route11_h) ; ROUTE_11 db BANK(Route12_h) ; ROUTE_12 db BANK(Route13_h) ; ROUTE_13 db BANK(Route14_h) ; ROUTE_14 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 9334f585..ad526ba8 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -22,7 +22,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $412d ; dw Route8_h dw $468e ; dw Route9_h dw $42d4 ; dw Route10_h - dw $44be ; dw Route11_h + dw Route11_h dw Route12_h dw Route13_h dw Route14_h diff --git a/main.asm b/main.asm index 29151bc4..5ababcd8 100755 --- a/main.asm +++ b/main.asm @@ -912,8 +912,11 @@ INCBIN "maps/route6.blk" Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" - dr $582d4,$5855f -Route11Blocks: ; 5854f + dr $582d4,$584be + +INCLUDE "data/mapHeaders/route11.asm" +INCLUDE "data/mapObjects/route11.asm" +Route11Blocks: ; 5855f INCBIN "maps/route11.blk" INCLUDE "data/mapHeaders/route12.asm" @@ -944,7 +947,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$5948f + dr $59052,$592e8 +INCLUDE "scripts/route11.asm" INCLUDE "scripts/route12.asm" INCLUDE "scripts/route15.asm" INCLUDE "scripts/route16.asm" -- cgit v1.3.1-sl0p From 117c154f56d932ef5fefdce7ed50ad081c5a4f6a Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:46:10 -0400 Subject: Lavender Town; all city overworld maps done --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 63802c23..9b66f8c9 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -4,7 +4,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(ViridianCity_h) ; VIRIDIAN_CITY db BANK(PewterCity_h) ; PEWTER_CITY db BANK(CeruleanCity_h) ; CERULEAN_CITY - db $11 ; db BANK(LavenderTown_h) ; LAVENDER_TOWN + db BANK(LavenderTown_h) ; LAVENDER_TOWN db BANK(VermilionCity_h) ; VERMILION_CITY db BANK(CeladonCity_h) ; CELADON_CITY db BANK(FuchsiaCity_h) ; FUCHSIA_CITY diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index ad526ba8..03aa24f9 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -4,7 +4,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw ViridianCity_h dw PewterCity_h dw CeruleanCity_h - dw $4000 ; dw LavenderTown_h + dw LavenderTown_h dw VermilionCity_h dw CeladonCity_h dw FuchsiaCity_h diff --git a/main.asm b/main.asm index 5ababcd8..cfd855ca 100755 --- a/main.asm +++ b/main.asm @@ -679,10 +679,14 @@ INCLUDE "engine/menu/options.asm" SECTION "bank11",ROMX,BANK[$11] - dr $44000,$44085 +INCLUDE "data/mapHeaders/lavendertown.asm" +INCLUDE "data/mapObjects/lavendertown.asm" LavenderTownBlocks: INCBIN "maps/lavendertown.blk" - dr $440df,$44169 + dr $440df,$4410b + +INCLUDE "scripts/lavendertown.asm" + ; dr $440df,$44169 INCLUDE "engine/pokedex_rating.asm" @@ -912,7 +916,9 @@ INCBIN "maps/route6.blk" Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" - dr $582d4,$584be + dr $582d4,$58356 +Route10Blocks: +INCBIN "maps/route10.blk" INCLUDE "data/mapHeaders/route11.asm" INCLUDE "data/mapObjects/route11.asm" -- cgit v1.3.1-sl0p From a202626b6e1daad2c0d6974cd9663f20e5526e40 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:48:27 -0400 Subject: Route 10 --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 9b66f8c9..338bd71c 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -21,7 +21,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route7_h) ; ROUTE_7 db $16 ; db BANK(Route8_h) ; ROUTE_8 db $15 ; db BANK(Route9_h) ; ROUTE_9 - db $16 ; db BANK(Route10_h) ; ROUTE_10 + db BANK(Route10_h) ; ROUTE_10 db BANK(Route11_h) ; ROUTE_11 db BANK(Route12_h) ; ROUTE_12 db BANK(Route13_h) ; ROUTE_13 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 03aa24f9..5359721f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -21,7 +21,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route7_h dw $412d ; dw Route8_h dw $468e ; dw Route9_h - dw $42d4 ; dw Route10_h + dw Route10_h dw Route11_h dw Route12_h dw Route13_h diff --git a/main.asm b/main.asm index cfd855ca..916f978d 100755 --- a/main.asm +++ b/main.asm @@ -916,7 +916,8 @@ INCBIN "maps/route6.blk" Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" - dr $582d4,$58356 +INCLUDE "data/mapHeaders/route10.asm" +INCLUDE "data/mapObjects/route10.asm" Route10Blocks: INCBIN "maps/route10.blk" @@ -953,7 +954,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$592e8 + dr $59052,$591d2 +INCLUDE "scripts/route10.asm" INCLUDE "scripts/route11.asm" INCLUDE "scripts/route12.asm" INCLUDE "scripts/route15.asm" -- cgit v1.3.1-sl0p From dc8677aa1c1ef9ef8cc3fb217641ae6619a3dae6 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 19:59:12 -0400 Subject: Route 9 incl. AJ fight --- data/mapObjects/route9.asm | 2 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 5 +++-- scripts/route9.asm | 24 ++++++++++++------------ 5 files changed, 18 insertions(+), 17 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route9.asm b/data/mapObjects/route9.asm index 79d0d5ed..6a759608 100755 --- a/data/mapObjects/route9.asm +++ b/data/mapObjects/route9.asm @@ -8,7 +8,7 @@ Route9Object: ; 0x546a8 (size=86) db $a ; objects object SPRITE_LASS, $d, $a, STAY, LEFT, $1, OPP_JR_TRAINER_F, $5 - object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_JR_TRAINER_M, $7 + object SPRITE_BLACK_HAIR_BOY_1, $18, $7, STAY, LEFT, $2, OPP_YOUNGSTER, $e object SPRITE_BLACK_HAIR_BOY_1, $1f, $7, STAY, RIGHT, $3, OPP_JR_TRAINER_M, $8 object SPRITE_LASS, $30, $8, STAY, RIGHT, $4, OPP_JR_TRAINER_F, $6 object SPRITE_HIKER, $10, $f, STAY, LEFT, $5, OPP_HIKER, $b diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 338bd71c..3268cdf8 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -20,7 +20,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route6_h) ; ROUTE_6 db BANK(Route7_h) ; ROUTE_7 db $16 ; db BANK(Route8_h) ; ROUTE_8 - db $15 ; db BANK(Route9_h) ; ROUTE_9 + db BANK(Route9_h) ; ROUTE_9 db BANK(Route10_h) ; ROUTE_10 db BANK(Route11_h) ; ROUTE_11 db BANK(Route12_h) ; ROUTE_12 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 5359721f..70fa7aa0 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -20,7 +20,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route6_h dw Route7_h dw $412d ; dw Route8_h - dw $468e ; dw Route9_h + dw Route9_h dw Route10_h dw Route11_h dw Route12_h diff --git a/main.asm b/main.asm index 916f978d..46696cec 100755 --- a/main.asm +++ b/main.asm @@ -857,7 +857,8 @@ INCLUDE "data/mapObjects/route5.asm" Route5Blocks: ; 545da INCBIN "maps/route5.blk" - dr $5468e,$54706 +INCLUDE "data/mapHeaders/route9.asm" +INCLUDE "data/mapObjects/route9.asm" Route9Blocks: ; 54706 INCBIN "maps/route9.blk" @@ -892,7 +893,7 @@ INCLUDE "scripts/route2.asm" INCLUDE "scripts/route3.asm" INCLUDE "scripts/route4.asm" INCLUDE "scripts/route5.asm" - dr $556d0,$55832 +INCLUDE "scripts/route9.asm" INCLUDE "scripts/route13.asm" INCLUDE "scripts/route14.asm" INCLUDE "scripts/route17.asm" diff --git a/scripts/route9.asm b/scripts/route9.asm index 9d26ee96..5de98173 100755 --- a/scripts/route9.asm +++ b/scripts/route9.asm @@ -14,7 +14,7 @@ Route9ScriptPointers: ; 556cf (15:56cf) Route9TextPointers: ; 556d5 (15:56d5) dw Route9Text1 - dw Route9Text2 + dw Route9TextAJ dw Route9Text3 dw Route9Text4 dw Route9Text5 @@ -39,10 +39,10 @@ Route9TrainerHeader2: ; 556f7 (15:56f7) dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2 db ($2 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2 - dw Route9BattleText2 ; TextBeforeBattle - dw Route9AfterBattleText2 ; TextAfterBattle - dw Route9EndBattleText2 ; TextEndBattle - dw Route9EndBattleText2 ; TextEndBattle + dw Route9BattleTextAJ ; TextBeforeBattle + dw Route9AfterBattleTextAJ ; TextAfterBattle + dw Route9EndBattleTextAJ ; TextEndBattle + dw Route9EndBattleTextAJ ; TextEndBattle Route9TrainerHeader3: ; 55703 (15:5703) dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3 @@ -114,7 +114,7 @@ Route9Text1: ; 55758 (15:5758) ld hl, Route9TrainerHeader0 jr Route9TalkToTrainer -Route9Text2: ; 5575e (15:575e) +Route9TextAJ: ; 5575e (15:575e) TX_ASM ld hl, Route9TrainerHeader2 jr Route9TalkToTrainer @@ -168,16 +168,16 @@ Route9AfterBattleText1: ; 5579c (15:579c) TX_FAR _Route9AfterBattleText1 db "@" -Route9BattleText2: ; 557a1 (15:57a1) - TX_FAR _Route9BattleText2 +Route9BattleTextAJ: ; 557a1 (15:57a1) + TX_FAR _Route9BattleTextAJ db "@" -Route9EndBattleText2: ; 557a6 (15:57a6) - TX_FAR _Route9EndBattleText2 +Route9EndBattleTextAJ: ; 557a6 (15:57a6) + TX_FAR _Route9EndBattleTextAJ db "@" -Route9AfterBattleText2: ; 557ab (15:57ab) - TX_FAR _Route9AfterBattleText2 +Route9AfterBattleTextAJ: ; 557ab (15:57ab) + TX_FAR _Route9AfterBattleTextAJ db "@" Route9BattleText3: ; 557b0 (15:57b0) -- cgit v1.3.1-sl0p From 38d57913867d66d30bca12070d2cbc2bc5fc25ba Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 20:01:27 -0400 Subject: Route 8; all outdoor maps completed --- data/mapObjects/route8.asm | 4 ++-- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route8.asm b/data/mapObjects/route8.asm index 5863129b..38bcca5e 100755 --- a/data/mapObjects/route8.asm +++ b/data/mapObjects/route8.asm @@ -3,9 +3,9 @@ Route8Object: ; 0x5814f (size=119) db $5 ; warps db $9, $1, $0, ROUTE_8_GATE - db $a, $1, $1, ROUTE_8_GATE + db $a, $1, $0, ROUTE_8_GATE db $9, $8, $2, ROUTE_8_GATE - db $a, $8, $3, ROUTE_8_GATE + db $a, $8, $2, ROUTE_8_GATE db $3, $d, $0, PATH_ENTRANCE_ROUTE_8 db $1 ; signs diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 3268cdf8..060ebdc8 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -19,7 +19,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route5_h) ; ROUTE_5 db BANK(Route6_h) ; ROUTE_6 db BANK(Route7_h) ; ROUTE_7 - db $16 ; db BANK(Route8_h) ; ROUTE_8 + db BANK(Route8_h) ; ROUTE_8 db BANK(Route9_h) ; ROUTE_9 db BANK(Route10_h) ; ROUTE_10 db BANK(Route11_h) ; ROUTE_11 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 70fa7aa0..704e7c2d 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -19,7 +19,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route5_h dw Route6_h dw Route7_h - dw $412d ; dw Route8_h + dw Route8_h dw Route9_h dw Route10_h dw Route11_h diff --git a/main.asm b/main.asm index 46696cec..f4e6d582 100755 --- a/main.asm +++ b/main.asm @@ -913,7 +913,8 @@ INCLUDE "data/mapObjects/route6.asm" Route6Blocks: ; 58079 INCBIN "maps/route6.blk" - dr $5812d,$581c6 +INCLUDE "data/mapHeaders/route8.asm" +INCLUDE "data/mapObjects/route8.asm" Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" @@ -955,7 +956,7 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$591d2 +INCLUDE "scripts/route8.asm" INCLUDE "scripts/route10.asm" INCLUDE "scripts/route11.asm" INCLUDE "scripts/route12.asm" -- cgit v1.3.1-sl0p From 9835d77c286b51adbe9cd1606f7a6f06d0ebaf2d Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 27 May 2016 23:08:50 -0400 Subject: Blue's House --- constants/hide_show_constants.asm | 2 +- data/mapObjects/blueshouse.asm | 6 +++--- data/map_header_banks.asm | 6 +++--- data/map_header_pointers.asm | 6 +++--- main.asm | 8 +++++++- scripts/blueshouse.asm | 33 ++++++++++++++++----------------- 6 files changed, 33 insertions(+), 28 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index fc8ab90f..77820f75 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -75,7 +75,7 @@ const_value = 0 const HS_POKEMONTOWER_7_ROCKET_2 ; 42 X const HS_POKEMONTOWER_7_ROCKET_3 ; 43 -const_value SET $43 ; something above was deleted, idk what yet +const_value SET $43 ; replace the tower rockets with jessie/james const HS_POKEMONTOWER_7_MR_FUJI ; 43 const HS_LAVENDER_HOUSE_1_MR_FUJI ; 44 const HS_CELADON_MANSION_5_GIFT ; 45 diff --git a/data/mapObjects/blueshouse.asm b/data/mapObjects/blueshouse.asm index 43ba02e4..3dfce6e1 100755 --- a/data/mapObjects/blueshouse.asm +++ b/data/mapObjects/blueshouse.asm @@ -8,9 +8,9 @@ BluesHouseObject: ; 19bce (6:5bce) db $0 ; signs db $3 ; objects - object SPRITE_DAISY, $2, $3, STAY, RIGHT, $1 ; Daisy, sitting by map - object SPRITE_DAISY, $6, $4, WALK, $1, $2, $0 ; Daisy, walking around - object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $3, $0 ; map on table + object SPRITE_DAISY, $2, $3, STAY, RIGHT, $81, $0 ; Daisy, sitting by map + object SPRITE_DAISY, $6, $4, WALK, $1, $82, $0 ; Daisy, walking around + object SPRITE_BOOK_MAP_DEX, $3, $3, STAY, NONE, $83, $0 ; map on table ; warp-to EVENT_DISP BLUES_HOUSE_WIDTH, $7, $2 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 060ebdc8..94393e3e 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -37,9 +37,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route23_h) ; ROUTE_23 db BANK(Route24_h) ; ROUTE_24 db BANK(Route25_h) ; ROUTE_25 - db $12 ; db BANK(RedsHouse1F_h) - db $17 ; db BANK(RedsHouse2F_h) - db $06 ; db BANK(BluesHouse_h) + db BANK(RedsHouse1F_h) + db BANK(RedsHouse2F_h) + db BANK(BluesHouse_h) db $07 ; db BANK(OaksLab_h) db $11 ; db BANK(ViridianPokecenter_h) db $07 ; db BANK(ViridianMart_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 704e7c2d..eed956bf 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -37,9 +37,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route23_h dw Route24_h dw Route25_h - dw $40f6 ; dw RedsHouse1F_h - dw $40a4 ; dw RedsHouse2F_h - dw $5c2f ; dw BluesHouse_h + dw RedsHouse1F_h + dw RedsHouse2F_h + dw BluesHouse_h dw $4386 ; dw OaksLab_h ;id=40 dw $4251 ; dw ViridianPokecenter_h dw $4c6e ; dw ViridianMart_h diff --git a/main.asm b/main.asm index 8a5d2bae..60a25157 100755 --- a/main.asm +++ b/main.asm @@ -267,7 +267,13 @@ INCLUDE "scripts/ceruleancity.asm" INCLUDE "scripts/vermilioncity.asm" INCLUDE "scripts/celadoncity.asm" INCLUDE "scripts/fuchsiacity.asm" - dr $19c2f,$1a4ea + +INCLUDE "data/mapHeaders/blueshouse.asm" +INCLUDE "scripts/blueshouse.asm" +INCLUDE "data/mapObjects/blueshouse.asm" +BluesHouseBlocks: +INCBIN "maps/blueshouse.blk" + dr $19d05,$1a4ea INCLUDE "engine/overworld/npc_movement.asm" INCLUDE "engine/overworld/doors.asm" diff --git a/scripts/blueshouse.asm b/scripts/blueshouse.asm index 4a23df9e..959fb23e 100755 --- a/scripts/blueshouse.asm +++ b/scripts/blueshouse.asm @@ -1,8 +1,9 @@ BluesHouseScript: ; 19b3b (6:5b3b) call EnableAutoTextBoxDrawing - ld hl,BluesHouseScriptPointers - ld a,[W_BLUESHOUSECURSCRIPT] - jp JumpTable + ld hl, BluesHouseScriptPointers + xor a + call JumpTable + ret BluesHouseScriptPointers: ; 19b47 (6:5b47) dw BluesHouseScript0 @@ -12,10 +13,8 @@ BluesHouseScript0: ; 19b4b (6:5b4b) SetEvent EVENT_ENTERED_BLUES_HOUSE ; trigger the next script - ld a,1 - ld [W_BLUESHOUSECURSCRIPT],a - ret - + ld a, 1 + ld [W_BLUESHOUSECURSCRIPT], a BluesHouseScript1: ; 19b56 (6:5b56) ret @@ -27,31 +26,31 @@ BluesHouseTextPointers: ; 19b57 (6:5b57) BluesHouseText1: ; 19b5d (6:5b5d) TX_ASM CheckEvent EVENT_GOT_TOWN_MAP - jr nz,.GotMap + jr nz, .GotMap CheckEvent EVENT_GOT_POKEDEX - jr nz,.GiveMap - ld hl,DaisyInitialText + jr nz, .GiveMap + ld hl, DaisyInitialText call PrintText jr .done .GiveMap - ld hl,DaisyOfferMapText + ld hl, DaisyOfferMapText call PrintText lb bc, TOWN_MAP, 1 call GiveItem jr nc, .BagFull - ld a,HS_TOWN_MAP - ld [wMissableObjectIndex],a + ld a, HS_TOWN_MAP + ld [wMissableObjectIndex], a predef HideObject ; hide table map object - ld hl,GotMapText + ld hl, GotMapText call PrintText SetEvent EVENT_GOT_TOWN_MAP jr .done .GotMap - ld hl,DaisyUseMapText + ld hl, DaisyUseMapText call PrintText jr .done .BagFull - ld hl,DaisyBagFullText + ld hl, DaisyBagFullText call PrintText .done jp TextScriptEnd @@ -66,7 +65,7 @@ DaisyOfferMapText: ; 19baf (6:5baf) GotMapText: ; 19bb4 (6:5bb4) TX_FAR _GotMapText - db $11,"@" + db $11, "@" DaisyBagFullText: ; 19bba (6:5bba) TX_FAR _DaisyBagFullText -- cgit v1.3.1-sl0p From 40fce3a7d2959eaa2eaf38b3b9ff2bfc583c6e8d Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 28 May 2016 17:16:06 -0400 Subject: Viridian pokecenter --- data/mapObjects/viridianpokecenter.asm | 5 +++-- data/map_header_banks.asm | 4 ++-- data/map_header_pointers.asm | 4 ++-- main.asm | 20 +++++++++++++++++--- maps/celadonpokecenter.blk | 2 +- maps/ceruleanpokecenter.blk | 2 +- maps/cinnabarpokecenter.blk | 2 +- maps/fuchsiapokecenter.blk | 2 +- maps/lavenderpokecenter.blk | 2 +- maps/mtmoonpokecenter.blk | 2 +- maps/pewterpokecenter.blk | 2 +- maps/rocktunnelpokecenter.blk | 2 +- maps/saffronpokecenter.blk | 2 +- maps/vermilionpokecenter.blk | 2 +- maps/viridianpokecenter.blk | 2 +- scripts/viridianpokecenter.asm | 6 ++++++ 16 files changed, 41 insertions(+), 20 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/viridianpokecenter.asm b/data/mapObjects/viridianpokecenter.asm index 652efb97..74c27d46 100755 --- a/data/mapObjects/viridianpokecenter.asm +++ b/data/mapObjects/viridianpokecenter.asm @@ -7,11 +7,12 @@ ViridianPokecenterObject: ; 0x44277 (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $a, $5, WALK, $1, $2 ; person - object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, NONE, $3 ; person + object SPRITE_BLACK_HAIR_BOY_1, $4, $3, STAY, UP, $3 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 94393e3e..2b901ed5 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -40,8 +40,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(RedsHouse1F_h) db BANK(RedsHouse2F_h) db BANK(BluesHouse_h) - db $07 ; db BANK(OaksLab_h) - db $11 ; db BANK(ViridianPokecenter_h) + db BANK(OaksLab_h) + db BANK(ViridianPokecenter_h) db $07 ; db BANK(ViridianMart_h) db $07 ; db BANK(School_h) db $07 ; db BANK(ViridianHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index eed956bf..9d358b2d 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -40,8 +40,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw RedsHouse1F_h dw RedsHouse2F_h dw BluesHouse_h - dw $4386 ; dw OaksLab_h ;id=40 - dw $4251 ; dw ViridianPokecenter_h + dw OaksLab_h ;id=40 + dw ViridianPokecenter_h dw $4c6e ; dw ViridianMart_h dw $4d6d ; dw School_h dw $4dc6 ; dw ViridianHouse_h diff --git a/main.asm b/main.asm index d80a7939..926e8984 100755 --- a/main.asm +++ b/main.asm @@ -696,14 +696,28 @@ INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" LavenderTownBlocks: INCBIN "maps/lavendertown.blk" - dr $440df,$4410b +ViridianPokecenterBlocks: +PewterPokecenterBlocks: +CeruleanPokecenterBlocks: +VermilionPokecenterBlocks: +SaffronPokecenterBlocks: +LavenderPokecenterBlocks: +CeladonPokecenterBlocks: +FuchsiaPokecenterBlocks: +CinnabarPokecenterBlocks: +MtMoonPokecenterBlocks: +RockTunnelPokecenterBlocks: +INCBIN "maps/viridianpokecenter.blk" + dr $440fb,$4410b INCLUDE "scripts/lavendertown.asm" - ; dr $440df,$44169 INCLUDE "engine/pokedex_rating.asm" - dr $44251,$443b7 +INCLUDE "data/mapHeaders/viridianpokecenter.asm" +INCLUDE "scripts/viridianpokecenter.asm" +INCLUDE "data/mapObjects/viridianpokecenter.asm" + dr $442b7,$443b7 Mansion1Script_Switches: dr $443b7,$45077 LoadSpinnerArrowTiles: ; 45077 (11:5077) diff --git a/maps/celadonpokecenter.blk b/maps/celadonpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/celadonpokecenter.blk +++ b/maps/celadonpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/ceruleanpokecenter.blk b/maps/ceruleanpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/ceruleanpokecenter.blk +++ b/maps/ceruleanpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/cinnabarpokecenter.blk b/maps/cinnabarpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/cinnabarpokecenter.blk +++ b/maps/cinnabarpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/fuchsiapokecenter.blk b/maps/fuchsiapokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/fuchsiapokecenter.blk +++ b/maps/fuchsiapokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/lavenderpokecenter.blk b/maps/lavenderpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/lavenderpokecenter.blk +++ b/maps/lavenderpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/mtmoonpokecenter.blk b/maps/mtmoonpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/mtmoonpokecenter.blk +++ b/maps/mtmoonpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/pewterpokecenter.blk b/maps/pewterpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/pewterpokecenter.blk +++ b/maps/pewterpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/rocktunnelpokecenter.blk b/maps/rocktunnelpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/rocktunnelpokecenter.blk +++ b/maps/rocktunnelpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/saffronpokecenter.blk b/maps/saffronpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/saffronpokecenter.blk +++ b/maps/saffronpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/vermilionpokecenter.blk b/maps/vermilionpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/vermilionpokecenter.blk +++ b/maps/vermilionpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/maps/viridianpokecenter.blk b/maps/viridianpokecenter.blk index 9641efe4..dd54efd9 100644 --- a/maps/viridianpokecenter.blk +++ b/maps/viridianpokecenter.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file diff --git a/scripts/viridianpokecenter.asm b/scripts/viridianpokecenter.asm index ae5e32c8..f8aed602 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/viridianpokecenter.asm @@ -7,6 +7,7 @@ ViridianPokecenterTextPointers: ; 44263 (11:4263) dw ViridianPokeCenterText2 dw ViridianPokeCenterText3 dw ViridianPokeCenterText4 + dw ViridianPokeCenterText5 ViridianPokeCenterText1: ; 4426b (11:426b) db $ff @@ -21,3 +22,8 @@ ViridianPokeCenterText3: ; 44271 (11:4271) ViridianPokeCenterText4: ; 44276 (11:4276) db $f6 + +ViridianPokeCenterText5: + TX_ASM + callab Func_f0f12 + jp TextScriptEnd -- cgit v1.3.1-sl0p From c93574436f30106fd2211abea452fe3a96948211 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 28 May 2016 17:43:51 -0400 Subject: Viridian Mart --- constants/event_macros.asm | 21 +++++++++++++++++++++ constants/hide_show_constants.asm | 2 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 15 ++++++++++++++- maps/ceruleanmart.blk | 2 +- maps/cinnabarmart.blk | 2 +- maps/fuchsiamart.blk | 2 +- maps/lavendermart.blk | 2 +- maps/pewtermart.blk | 2 +- maps/saffronmart.blk | 2 +- maps/vermilionmart.blk | 2 +- maps/viridianmart.blk | 2 +- scripts/viridianmart.asm | 16 ++++++++++++++-- 14 files changed, 60 insertions(+), 14 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/constants/event_macros.asm b/constants/event_macros.asm index 9f24ace7..5eb73147 100644 --- a/constants/event_macros.asm +++ b/constants/event_macros.asm @@ -125,6 +125,27 @@ CheckAndResetEventA: MACRO ld [wEventFlags + ((\1) / 8)], a ENDM +CheckAndSetEventReuseHL: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + bit (\1) % 8, [hl] + set (\1) % 8, [hl] + ENDM + +CheckAndResetEventReuseHL: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld hl, wEventFlags + event_byte + ENDC + + bit (\1) % 8, [hl] + res (\1) % 8, [hl] + ENDM + + ;\1 = event index SetEvent: MACRO event_byte = ((\1) / 8) diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 5a6347d5..9481466e 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -8,7 +8,7 @@ const_value = 0 const HS_PALLET_TOWN_OAK ; 00 const HS_LYING_OLD_MAN ; 01 - const HS_PERSON_02 ; 02 + const HS_OLD_MAN_1 ; 02 const HS_OLD_MAN ; 03 const HS_MUSEUM_GUY ; 04 const HS_GYM_GUY ; 05 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 2b901ed5..dbe4d15f 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -42,7 +42,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(BluesHouse_h) db BANK(OaksLab_h) db BANK(ViridianPokecenter_h) - db $07 ; db BANK(ViridianMart_h) + db BANK(ViridianMart_h) db $07 ; db BANK(School_h) db $07 ; db BANK(ViridianHouse_h) db $1d ; db BANK(ViridianGym_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 9d358b2d..e3edc139 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -42,7 +42,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw BluesHouse_h dw OaksLab_h ;id=40 dw ViridianPokecenter_h - dw $4c6e ; dw ViridianMart_h + dw ViridianMart_h dw $4d6d ; dw School_h dw $4dc6 ; dw ViridianHouse_h dw $40d4 ; dw ViridianGym_h diff --git a/main.asm b/main.asm index 926e8984..325bcdbe 100755 --- a/main.asm +++ b/main.asm @@ -304,7 +304,20 @@ INCLUDE "data/mapHeaders/oakslab.asm" INCLUDE "scripts/oakslab.asm" INCLUDE "data/mapObjects/oakslab.asm" - dr $1cc6e,$1e2ae ; map scripts +INCLUDE "data/mapHeaders/viridianmart.asm" +INCLUDE "scripts/viridianmart.asm" +INCLUDE "data/mapObjects/viridianmart.asm" +ViridianMartBlocks: +PewterMartBlocks: +CeruleanMartBlocks: +VermilionMartBlocks: +LavenderMartBlocks: +CeladonMartBlocks: +SaffronMartBlocks: +FuchsiaMartBlocks: +CinnabarMartBlocks: +INCBIN "maps/viridianmart.blk" + dr $1cd6d,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" diff --git a/maps/ceruleanmart.blk b/maps/ceruleanmart.blk index 1da8fffc..62385406 100644 --- a/maps/ceruleanmart.blk +++ b/maps/ceruleanmart.blk @@ -1 +1 @@ -   \ No newline at end of file + %  \ No newline at end of file diff --git a/maps/cinnabarmart.blk b/maps/cinnabarmart.blk index 1da8fffc..62385406 100644 --- a/maps/cinnabarmart.blk +++ b/maps/cinnabarmart.blk @@ -1 +1 @@ -   \ No newline at end of file + %  \ No newline at end of file diff --git a/maps/fuchsiamart.blk b/maps/fuchsiamart.blk index 1da8fffc..62385406 100644 --- a/maps/fuchsiamart.blk +++ b/maps/fuchsiamart.blk @@ -1 +1 @@ -   \ No newline at end of file + %  \ No newline at end of file diff --git a/maps/lavendermart.blk b/maps/lavendermart.blk index 1da8fffc..62385406 100644 --- a/maps/lavendermart.blk +++ b/maps/lavendermart.blk @@ -1 +1 @@ -   \ No newline at end of file + %  \ No newline at end of file diff --git a/maps/pewtermart.blk b/maps/pewtermart.blk index 1da8fffc..62385406 100644 --- a/maps/pewtermart.blk +++ b/maps/pewtermart.blk @@ -1 +1 @@ -   \ No newline at end of file + %  \ No newline at end of file diff --git a/maps/saffronmart.blk b/maps/saffronmart.blk index 1da8fffc..62385406 100644 --- a/maps/saffronmart.blk +++ b/maps/saffronmart.blk @@ -1 +1 @@ -   \ No newline at end of file + %  \ No newline at end of file diff --git a/maps/vermilionmart.blk b/maps/vermilionmart.blk index 1da8fffc..62385406 100644 --- a/maps/vermilionmart.blk +++ b/maps/vermilionmart.blk @@ -1 +1 @@ -   \ No newline at end of file + %  \ No newline at end of file diff --git a/maps/viridianmart.blk b/maps/viridianmart.blk index 1da8fffc..62385406 100644 --- a/maps/viridianmart.blk +++ b/maps/viridianmart.blk @@ -1 +1 @@ -   \ No newline at end of file + %  \ No newline at end of file diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 8d974abc..05e566fb 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -3,7 +3,8 @@ ViridianMartScript: ; 1d46e (7:546e) call EnableAutoTextBoxDrawing ld hl, ViridianMartScriptPointers ld a, [W_VIRIDIANMARKETCURSCRIPT] - jp JumpTable + call JumpTable + ret ViridianMartScript_1d47d: ; 1d47d (7:547d) CheckEvent EVENT_OAK_GOT_PARCEL @@ -57,8 +58,19 @@ ViridianMartScript1: ; 1d4c0 (7:54c0) SetEvent EVENT_GOT_OAKS_PARCEL ld a, $2 ld [W_VIRIDIANMARKETCURSCRIPT], a - ; fallthrough + ret + ViridianMartScript2: ; 1d4df (7:54df) + CheckEventHL EVENT_02D + ret z + CheckAndSetEventReuseHL EVENT_02C + ret nz + ld a, HS_OLD_MAN + ld [wMissableObjectIndex], a + predef HideObject + ld a, HS_OLD_MAN_1 + ld [wMissableObjectIndex], a + predef ShowObject ret ViridianMartTextPointers: ; 1d4e0 (7:54e0) -- cgit v1.3.1-sl0p From ba224a0430f829aa3bc7648f3bc7412fd3a0cea1 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 28 May 2016 18:39:53 -0400 Subject: Viridian Trainer School --- data/mapObjects/school.asm | 3 ++- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- engine/bank3c.asm | 6 +++++- main.asm | 12 ++++++++++-- scripts/school.asm | 14 +++++++++++--- 6 files changed, 30 insertions(+), 9 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/school.asm b/data/mapObjects/school.asm index b60be6c0..4c802e64 100755 --- a/data/mapObjects/school.asm +++ b/data/mapObjects/school.asm @@ -7,9 +7,10 @@ SchoolObject: ; 0x1d55d (size=32) db $0 ; signs - db $2 ; objects + db $3 ; objects object SPRITE_BRUNETTE_GIRL, $3, $5, STAY, UP, $1 ; person object SPRITE_LASS, $4, $1, STAY, DOWN, $2 ; person + object SPRITE_LITTLE_GIRL, $4, $5, STAY, UP, $3 ; person ; warp-to EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index dbe4d15f..2e528fcd 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -43,7 +43,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(OaksLab_h) db BANK(ViridianPokecenter_h) db BANK(ViridianMart_h) - db $07 ; db BANK(School_h) + db BANK(School_h) db $07 ; db BANK(ViridianHouse_h) db $1d ; db BANK(ViridianGym_h) db $07 ; db BANK(DiglettsCaveRoute2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index e3edc139..e7a2c570 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -43,7 +43,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw OaksLab_h ;id=40 dw ViridianPokecenter_h dw ViridianMart_h - dw $4d6d ; dw School_h + dw School_h dw $4dc6 ; dw ViridianHouse_h dw $40d4 ; dw ViridianGym_h dw $57ae ; dw DiglettsCaveRoute2_h diff --git a/engine/bank3c.asm b/engine/bank3c.asm index c3726c5e..6f949238 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -350,7 +350,11 @@ INCLUDE "scripts/route1_2.asm" INCLUDE "scripts/route22_2.asm" INCLUDE "scripts/redshouse1f2.asm" Func_f1be0: - dr $f1be0, $f220e + dr $f1be0, $f1c03 +Func_f1c03: + dr $f1c03, $f1c0f +Func_f1c0f: + dr $f1c0f, $f220e INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" diff --git a/main.asm b/main.asm index 325bcdbe..fa68ed90 100755 --- a/main.asm +++ b/main.asm @@ -292,7 +292,10 @@ INCBIN "maps/route1.blk" dr $1c1b0,$1c1c0 ; headers, objects, blocks OaksLabBlocks: INCBIN "maps/oakslab.blk" - dr $1c1de,$1c21e ; headers, objects, blocks + dr $1c1de,$1c1ee ; headers, objects, blocks +SchoolBlocks: +INCBIN "maps/school.blk" + dr $1c1fe,$1c21e ; headers, objects, blocks INCLUDE "engine/clear_save.asm" INCLUDE "engine/predefs7.asm" @@ -317,7 +320,12 @@ SaffronMartBlocks: FuchsiaMartBlocks: CinnabarMartBlocks: INCBIN "maps/viridianmart.blk" - dr $1cd6d,$1e2ae ; map scripts + +INCLUDE "data/mapHeaders/school.asm" +INCLUDE "scripts/school.asm" +INCLUDE "data/mapObjects/school.asm" + + dr $1cdc6,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" diff --git a/scripts/school.asm b/scripts/school.asm index 57eb58c8..6ee0d36e 100755 --- a/scripts/school.asm +++ b/scripts/school.asm @@ -1,14 +1,22 @@ SchoolScript: ; 1d54c (7:554c) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret SchoolTextPointers: ; 1d54f (7:554f) dw SchoolText1 dw SchoolText2 + dw SchoolText3 SchoolText1: ; 1d553 (7:5553) TX_FAR _SchoolText1 db "@" SchoolText2: ; 1d558 (7:5558) - TX_FAR _SchoolText2 - db "@" + TX_ASM + callba Func_f1c0f + jp TextScriptEnd + +SchoolText3: ; 1d558 (7:5558) + TX_ASM + callba Func_f1c03 + jp TextScriptEnd -- cgit v1.3.1-sl0p From 2ce8f80044038d906ca4c0e09587de1a2f0d4c8f Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 28 May 2016 20:17:56 -0400 Subject: Viridian house --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 2e528fcd..e65ac85a 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -44,7 +44,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(ViridianPokecenter_h) db BANK(ViridianMart_h) db BANK(School_h) - db $07 ; db BANK(ViridianHouse_h) + db BANK(ViridianHouse_h) db $1d ; db BANK(ViridianGym_h) db $07 ; db BANK(DiglettsCaveRoute2_h) db $17 ; db BANK(ViridianForestExit_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index e7a2c570..aeb2b362 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -44,7 +44,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw ViridianPokecenter_h dw ViridianMart_h dw School_h - dw $4dc6 ; dw ViridianHouse_h + dw ViridianHouse_h dw $40d4 ; dw ViridianGym_h dw $57ae ; dw DiglettsCaveRoute2_h dw $5485 ; dw ViridianForestExit_h diff --git a/main.asm b/main.asm index fa68ed90..c2146a37 100755 --- a/main.asm +++ b/main.asm @@ -292,7 +292,8 @@ INCBIN "maps/route1.blk" dr $1c1b0,$1c1c0 ; headers, objects, blocks OaksLabBlocks: INCBIN "maps/oakslab.blk" - dr $1c1de,$1c1ee ; headers, objects, blocks +ViridianHouseBlocks: +INCBIN "maps/viridianhouse.blk" SchoolBlocks: INCBIN "maps/school.blk" dr $1c1fe,$1c21e ; headers, objects, blocks @@ -325,7 +326,10 @@ INCLUDE "data/mapHeaders/school.asm" INCLUDE "scripts/school.asm" INCLUDE "data/mapObjects/school.asm" - dr $1cdc6,$1e2ae ; map scripts +INCLUDE "data/mapHeaders/viridianhouse.asm" +INCLUDE "scripts/viridianhouse.asm" +INCLUDE "data/mapObjects/viridianhouse.asm" + dr $1ce30,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" -- cgit v1.3.1-sl0p From 7c59b94897641af737b6df5e2c2787799c867432 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 28 May 2016 20:24:36 -0400 Subject: Viridian Gym --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index e65ac85a..501b3730 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -45,7 +45,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(ViridianMart_h) db BANK(School_h) db BANK(ViridianHouse_h) - db $1d ; db BANK(ViridianGym_h) + db BANK(ViridianGym_h) db $07 ; db BANK(DiglettsCaveRoute2_h) db $17 ; db BANK(ViridianForestExit_h) db $07 ; db BANK(Route2House_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index aeb2b362..48702db9 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -45,7 +45,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw ViridianMart_h dw School_h dw ViridianHouse_h - dw $40d4 ; dw ViridianGym_h + dw ViridianGym_h dw $57ae ; dw DiglettsCaveRoute2_h dw $5485 ; dw ViridianForestExit_h dw $57eb ; dw Route2House_h diff --git a/main.asm b/main.asm index c2146a37..4e07b604 100755 --- a/main.asm +++ b/main.asm @@ -1096,7 +1096,13 @@ SECTION "bank1D",ROMX,BANK[$1D] INCLUDE "engine/items/itemfinder.asm" INCLUDE "scripts/ceruleancity2.asm" - dr $740d4,$74726 + +INCLUDE "data/mapHeaders/viridiangym.asm" +INCLUDE "scripts/viridiangym.asm" +INCLUDE "data/mapObjects/viridiangym.asm" +ViridianGymBlocks: +INCBIN "maps/viridiangym.blk" + dr $744de,$74726 VendingMachineMenu: ; 74726 (1d:4726) dr $74726,$75dfe PKMNLeaguePC: ; 75dfe (1d:5dfe) -- cgit v1.3.1-sl0p From e48e466f39da7f386417233530c3193249c58d36 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 28 May 2016 22:53:44 -0400 Subject: Various interior maps on route 2 --- data/mapObjects/viridianforestentrance.asm | 2 +- data/map_header_banks.asm | 10 +++---- data/map_header_pointers.asm | 10 +++---- main.asm | 43 ++++++++++++++++++++++++++---- scripts/viridianforestentrance.asm | 3 ++- 5 files changed, 51 insertions(+), 17 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm index fc676a6d..891c0636 100755 --- a/data/mapObjects/viridianforestentrance.asm +++ b/data/mapObjects/viridianforestentrance.asm @@ -3,7 +3,7 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48) db $4 ; warps db $0, $4, $3, VIRIDIAN_FOREST - db $0, $5, $4, VIRIDIAN_FOREST + db $0, $5, $3, VIRIDIAN_FOREST db $7, $4, $5, $ff db $7, $5, $5, $ff diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 501b3730..2d57ccff 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -46,11 +46,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(School_h) db BANK(ViridianHouse_h) db BANK(ViridianGym_h) - db $07 ; db BANK(DiglettsCaveRoute2_h) - db $17 ; db BANK(ViridianForestExit_h) - db $07 ; db BANK(Route2House_h) - db $17 ; db BANK(Route2Gate_h) - db $17 ; db BANK(ViridianForestEntrance_h) + db BANK(DiglettsCaveRoute2_h) + db BANK(ViridianForestExit_h) + db BANK(Route2House_h) + db BANK(Route2Gate_h) + db BANK(ViridianForestEntrance_h) db $18 ; db BANK(ViridianForest_h) db $17 ; db BANK(Museum1F_h) db $17 ; db BANK(Museum2F_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 48702db9..1c151398 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -46,11 +46,11 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw School_h dw ViridianHouse_h dw ViridianGym_h - dw $57ae ; dw DiglettsCaveRoute2_h - dw $5485 ; dw ViridianForestExit_h - dw $57eb ; dw Route2House_h - dw $54d2 ; dw Route2Gate_h - dw $555a ; dw ViridianForestEntrance_h ;id=50 + dw DiglettsCaveRoute2_h + dw ViridianForestExit_h + dw Route2House_h + dw Route2Gate_h + dw ViridianForestEntrance_h ;id=50 dw $50ed ; dw ViridianForest_h dw $40e3 ; dw Museum1F_h dw $41b4 ; dw Museum2F_h diff --git a/main.asm b/main.asm index 4e07b604..457c0e23 100755 --- a/main.asm +++ b/main.asm @@ -289,14 +289,19 @@ INCLUDE "data/mapHeaders/route1.asm" INCLUDE "data/mapObjects/route1.asm" Route1Blocks: ; 1c0fc INCBIN "maps/route1.blk" - dr $1c1b0,$1c1c0 ; headers, objects, blocks +UndergroundPathEntranceRoute8Blocks: +INCBIN "maps/undergroundpathentranceroute8.blk" OaksLabBlocks: INCBIN "maps/oakslab.blk" ViridianHouseBlocks: +Route2HouseBlocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: INCBIN "maps/school.blk" - dr $1c1fe,$1c21e ; headers, objects, blocks +CeruleanHouseTrashedBlocks: +INCBIN "maps/ceruleanhousetrashed.blk" +DiglettsCaveRoute2Blocks: +INCBIN "maps/diglettscaveroute2.blk" INCLUDE "engine/clear_save.asm" INCLUDE "engine/predefs7.asm" @@ -329,7 +334,16 @@ INCLUDE "data/mapObjects/school.asm" INCLUDE "data/mapHeaders/viridianhouse.asm" INCLUDE "scripts/viridianhouse.asm" INCLUDE "data/mapObjects/viridianhouse.asm" - dr $1ce30,$1e2ae ; map scripts + dr $1ce30,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/diglettscaveroute2.asm" +INCLUDE "scripts/diglettscaveroute2.asm" +INCLUDE "data/mapObjects/diglettscaveroute2.asm" + +INCLUDE "data/mapHeaders/route2house.asm" +INCLUDE "scripts/route2house.asm" +INCLUDE "data/mapObjects/route2house.asm" + dr $1d831,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" @@ -1031,11 +1045,30 @@ SECTION "bank17",ROMX,BANK[$17] dr $5c000,$5c010 RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" - dr $5c020,$5c0a4 + dr $5c020,$5c090 +ViridianForestEntranceBlocks: +ViridianForestExitBlocks: +Route2GateBlocks: +INCBIN "maps/viridianforestentrance.blk" + INCLUDE "data/mapHeaders/redshouse2f.asm" INCLUDE "scripts/redshouse2f.asm" INCLUDE "data/mapObjects/redshouse2f.asm" - dr $5c0d4,$5da70 + dr $5c0d4,$5d485 + +INCLUDE "data/mapHeaders/viridianforestexit.asm" +INCLUDE "scripts/viridianforestexit.asm" +INCLUDE "data/mapObjects/viridianforestexit.asm" + +INCLUDE "data/mapHeaders/route2gate.asm" +INCLUDE "scripts/route2gate.asm" +INCLUDE "data/mapObjects/route2gate.asm" + +INCLUDE "data/mapHeaders/viridianforestentrance.asm" +INCLUDE "scripts/viridianforestentrance.asm" +INCLUDE "data/mapObjects/viridianforestentrance.asm" + + dr $5d5a8,$5da70 INCLUDE "engine/evolution.asm" diff --git a/scripts/viridianforestentrance.asm b/scripts/viridianforestentrance.asm index 14b6cf49..dcfa03ba 100755 --- a/scripts/viridianforestentrance.asm +++ b/scripts/viridianforestentrance.asm @@ -1,5 +1,6 @@ ViridianForestEntranceScript: ; 5d65c (17:565c) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret ViridianForestEntranceTextPointers: ; 5d65f (17:565f) dw ViridianForestEntranceText1 -- cgit v1.3.1-sl0p From 17b1752f8bdd75d9cd1bb72bd0d609b69c2d47c4 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 00:28:33 -0400 Subject: More far text scripts --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- engine/bank3c.asm | 67 +++++++++++++++++++++++++++++++++++++++++++- macros.asm | 1 + 4 files changed, 69 insertions(+), 3 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 2d57ccff..fe3a1db1 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -51,7 +51,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route2House_h) db BANK(Route2Gate_h) db BANK(ViridianForestEntrance_h) - db $18 ; db BANK(ViridianForest_h) + db BANK(ViridianForest_h) db $17 ; db BANK(Museum1F_h) db $17 ; db BANK(Museum2F_h) db $17 ; db BANK(PewterGym_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 1c151398..930ce54a 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -51,7 +51,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route2House_h dw Route2Gate_h dw ViridianForestEntrance_h ;id=50 - dw $50ed ; dw ViridianForest_h + dw ViridianForest_h dw $40e3 ; dw Museum1F_h dw $41b4 ; dw Museum2F_h dw $4257 ; dw PewterGym_h diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 964cc0bd..26fcbf61 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -360,7 +360,72 @@ INCBIN "maps/beach_house.blk" INCLUDE "data/mapObjects/beach_house.asm" Func_f23d0: ; f23d0 - dr $f23d0, $f24ae + call SaveScreenTilesToBuffer2 + xor a + ld [wUpdateSpritesEnabled], a + ld hl, wd730 + set 6, [hl] + callab Func_e8c5c + ld hl, wd730 + res 6, [hl] + call GBPalWhiteOutWithDelay3 + call ReloadTilesetTilePatterns + call RestoreScreenTilesAndReloadTilePatterns + call LoadScreenTilesFromBuffer2 + call Delay3 + call GBPalNormal + ld hl, Text_f2412 + ld a, [hOaksAideResult] + and a + jr nz, .asm_f2406 + ld hl, Text_f240c +.asm_f2406 + call PrintText + jp TextScriptEnd + +Text_f240c: + TX_FAR _BeachHousePrinterText5 + TX_SFX_ITEM2 + db "@" + +Text_f2412: + TX_FAR _BeachHousePrinterText6 + TX_SFX_ITEM2 + db "@" + +Func_f2418: + ld hl, BillsHouseText_f243b + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_f2433 +.asm_f2427 + ld hl, BillsHouseText_f2440 + call PrintText + ld a, $2 + ld [W_BILLSHOUSECURSCRIPT], a + ret + +.asm_f2433 + ld hl, BillsHouseText_f2445 + call PrintText + jr .asm_f2427 + +BillsHouseText_f243b: + TX_FAR _BillsHouseText_1e865 + db "@" + +BillsHouseText_f2440: + TX_FAR _BillsHouseText_1e86a + db "@" + +BillsHouseText_f2445: + TX_FAR _BillsHouseText_1e86f + db "@" + +Func_f244a: + dr $f244a, $f24ae Func_f24ae: ; f24ae dr $f24ae, $f2528 diff --git a/macros.asm b/macros.asm index 829841fa..29ca12f3 100644 --- a/macros.asm +++ b/macros.asm @@ -316,6 +316,7 @@ TX_BUTTON_SOUND: MACRO ENDM TX_SFX_ITEM EQUS "db $0b" +TX_SFX_ITEM2 EQUS "db $0d" TX_SFX_CONGRATS EQUS "db $10" TX_SFX_KEY_ITEM EQUS "db $11" -- cgit v1.3.1-sl0p From 9c380e8de747392f4a8308863ac6a49c47f700d8 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 14:14:29 -0400 Subject: Museum 1F local scripts --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 11 ++- scripts/museum1f.asm | 203 +++---------------------------------------- 4 files changed, 22 insertions(+), 196 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index fe3a1db1..eae8a657 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -52,7 +52,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route2Gate_h) db BANK(ViridianForestEntrance_h) db BANK(ViridianForest_h) - db $17 ; db BANK(Museum1F_h) + db BANK(Museum1F_h) db $17 ; db BANK(Museum2F_h) db $17 ; db BANK(PewterGym_h) db $07 ; db BANK(PewterHouse1_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 930ce54a..dcf13fd1 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -52,7 +52,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route2Gate_h dw ViridianForestEntrance_h ;id=50 dw ViridianForest_h - dw $40e3 ; dw Museum1F_h + dw Museum1F_h dw $41b4 ; dw Museum2F_h dw $4257 ; dw PewterGym_h dw $4e30 ; dw PewterHouse1_h diff --git a/main.asm b/main.asm index 0d13baf2..0b5d37f0 100755 --- a/main.asm +++ b/main.asm @@ -1045,7 +1045,9 @@ SECTION "bank17",ROMX,BANK[$17] dr $5c000,$5c010 RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" - dr $5c020,$5c090 +Museum1FBlocks: +INCBIN "maps/museum1f.blk" + dr $5c048,$5c090 ViridianForestEntranceBlocks: ViridianForestExitBlocks: Route2GateBlocks: @@ -1054,7 +1056,12 @@ INCBIN "maps/viridianforestentrance.blk" INCLUDE "data/mapHeaders/redshouse2f.asm" INCLUDE "scripts/redshouse2f.asm" INCLUDE "data/mapObjects/redshouse2f.asm" - dr $5c0d4,$5d485 + dr $5c0d4,$5c0e3 + +INCLUDE "data/mapHeaders/museum1f.asm" +INCLUDE "scripts/museum1f.asm" +INCLUDE "data/mapObjects/museum1f.asm" + dr $5c1b4,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" diff --git a/scripts/museum1f.asm b/scripts/museum1f.asm index ae5a2b42..75c0d74e 100755 --- a/scripts/museum1f.asm +++ b/scripts/museum1f.asm @@ -5,7 +5,8 @@ Museum1FScript: ; 5c0f7 (17:40f7) ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, Museum1FScriptPointers ld a, [W_MUSEUM1FCURSCRIPT] - jp JumpTable + call JumpTable + ret Museum1FScriptPointers: ; 5c109 (17:4109) dw Museum1FScript0 @@ -40,207 +41,25 @@ Museum1FTextPointers: ; 5c12b (17:412b) Museum1FText1: ; 5c135 (17:4135) TX_ASM - ld a, [wYCoord] - cp $4 - jr nz, .asm_8774b - ld a, [wXCoord] - cp $d - jp z, Museum1FScript_5c1f9 - jr .asm_b8709 -.asm_8774b - cp $3 - jr nz, .asm_d49e7 - ld a, [wXCoord] - cp $c - jp z, Museum1FScript_5c1f9 -.asm_d49e7 - CheckEvent EVENT_BOUGHT_MUSEUM_TICKET - jr nz, .asm_31a16 - ld hl, Museum1FText_5c23d - call PrintText - jp Museum1FScriptEnd -.asm_b8709 - CheckEvent EVENT_BOUGHT_MUSEUM_TICKET - jr z, .asm_3ded4 -.asm_31a16 - ld hl, Museum1FText_5c242 - call PrintText - jp Museum1FScriptEnd -.asm_3ded4 - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - xor a - ld [hJoyHeld], a - ld hl, Museum1FText_5c21f - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jr nz, .asm_de133 - xor a - ld [hMoney], a - ld [hMoney + 1], a - ld a, $50 - ld [hMoney + 2], a - call HasEnoughMoney - jr nc, .asm_0f3e3 - ld hl, Museum1FText_5c229 - call PrintText - jp .asm_de133 -.asm_0f3e3 - ld hl, Museum1FText_5c224 - call PrintText - SetEvent EVENT_BOUGHT_MUSEUM_TICKET - xor a - ld [wPriceTemp], a - ld [wPriceTemp + 1], a - ld a, $50 - ld [wPriceTemp + 2], a - ld hl, wPriceTemp + 2 - ld de, wPlayerMoney + 2 - ld c, $3 - predef SubBCDPredef - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - ld a, SFX_PURCHASE - call PlaySoundWaitForCurrent - call WaitForSoundToFinish - jr .asm_0b094 -.asm_de133 - ld hl, Museum1FText_5c21a - call PrintText - ld a, $1 - ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN - ld [wSimulatedJoypadStatesEnd], a - call StartSimulatingJoypadStates - call UpdateSprites - jr Museum1FScriptEnd -.asm_0b094 - ld a, $1 - ld [W_MUSEUM1FCURSCRIPT], a - jr Museum1FScriptEnd - -Museum1FScript_5c1f9: ; 5c1f9 (17:41f9) - ld hl, Museum1FText_5c22e - call PrintText - call YesNoChoice - ld a, [wCurrentMenuItem] - cp $0 - jr nz, .asm_d1144 - ld hl, Museum1FText_5c233 - call PrintText - jr Museum1FScriptEnd -.asm_d1144 - ld hl, Museum1FText_5c238 - call PrintText -Museum1FScriptEnd: ; 5c217 (17:4217) + callba Func_f1c1b jp TextScriptEnd -Museum1FText_5c21a: ; 5c21a (17:421a) - TX_FAR _Museum1FText_5c21a - db "@" - -Museum1FText_5c21f: ; 5c21f (17:421f) - TX_FAR _Museum1FText_5c21f - db "@" - -Museum1FText_5c224: ; 5c224 (17:4224) - TX_FAR _Museum1FText_5c224 - db "@" - -Museum1FText_5c229: ; 5c229 (17:4229) - TX_FAR _Museum1FText_5c229 - db "@" - -Museum1FText_5c22e: ; 5c22e (17:422e) - TX_FAR _Museum1FText_5c22e - db "@" - -Museum1FText_5c233: ; 5c233 (17:4233) - TX_FAR _Museum1FText_5c233 - db "@" - -Museum1FText_5c238: ; 5c238 (17:4238) - TX_FAR _Museum1FText_5c238 - db "@" - -Museum1FText_5c23d: ; 5c23d (17:423d) - TX_FAR _Museum1FText_5c23d - db "@" - -Museum1FText_5c242: ; 5c242 (17:4242) - TX_FAR _Museum1FText_5c242 - db "@" - -Museum1FText2: ; 5c247 (17:4247) +Museum1FText2: ; 5c135 (17:4135) TX_ASM - ld hl, Museum1FText_5c251 - call PrintText + callba Func_f1d2a jp TextScriptEnd -Museum1FText_5c251: ; 5c251 (17:4251) - TX_FAR _Museum1FText_5c251 - db "@" - -Museum1FText3: ; 5c256 (17:4256) +Museum1FText3: ; 5c135 (17:4135) TX_ASM - CheckEvent EVENT_GOT_OLD_AMBER - jr nz, .asm_5c285 - ld hl, Museum1FText_5c28e - call PrintText - lb bc, OLD_AMBER, 1 - call GiveItem - jr nc, .BagFull - SetEvent EVENT_GOT_OLD_AMBER - ld a, HS_OLD_AMBER - ld [wMissableObjectIndex], a - predef HideObject - ld hl, ReceivedOldAmberText - jr .asm_5c288 -.BagFull - ld hl, Museum1FText_5c29e - jr .asm_5c288 -.asm_5c285 - ld hl, Museum1FText_5c299 -.asm_5c288 - call PrintText + callba Func_f1d36 jp TextScriptEnd -Museum1FText_5c28e: ; 5c28e (17:428e) - TX_FAR _Museum1FText_5c28e - db "@" - -ReceivedOldAmberText: ; 5c293 (17:4293) - TX_FAR _ReceivedOldAmberText - db $0B, "@" - -Museum1FText_5c299: ; 5c299 (17:4299) - TX_FAR _Museum1FText_5c299 - db "@" - -Museum1FText_5c29e: ; 5c29e (17:429e) - TX_FAR _Museum1FText_5c29e - db "@" - -Museum1FText4: ; 5c2a3 (17:42a3) +Museum1FText4: ; 5c135 (17:4135) TX_ASM - ld hl, Museum1FText_5c2ad - call PrintText + callba Func_f1d80 jp TextScriptEnd -Museum1FText_5c2ad: ; 5c2ad (17:42ad) - TX_FAR _Museum1FText_5c2ad - db "@" - -Museum1FText5: ; 5c2b2 (17:42b2) +Museum1FText5: ; 5c135 (17:4135) TX_ASM - ld hl, Museum1FText_5c2bc - call PrintText + callba Func_f1d8c jp TextScriptEnd - -Museum1FText_5c2bc: ; 5c2bc (17:42bc) - TX_FAR _Museum1FText_5c2bc - db "@" -- cgit v1.3.1-sl0p From 591752d5ee3bfccf1b003d03f85e21623ebd56ce Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 14:35:16 -0400 Subject: Pewter Gym and Museum 2F --- data/map_header_banks.asm | 4 ++-- data/map_header_pointers.asm | 4 ++-- main.asm | 16 ++++++++++++++-- scripts/museum2f.asm | 34 +++++++++++++++++++++++++++++++++- scripts/pewtergym.asm | 22 ++++++++++++++++++---- 5 files changed, 69 insertions(+), 11 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index eae8a657..d935a5ec 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -53,8 +53,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(ViridianForestEntrance_h) db BANK(ViridianForest_h) db BANK(Museum1F_h) - db $17 ; db BANK(Museum2F_h) - db $17 ; db BANK(PewterGym_h) + db BANK(Museum2F_h) + db BANK(PewterGym_h) db $07 ; db BANK(PewterHouse1_h) db $1d ; db BANK(PewterMart_h) db $07 ; db BANK(PewterHouse2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index dcf13fd1..06df0f27 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -53,8 +53,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw ViridianForestEntrance_h ;id=50 dw ViridianForest_h dw Museum1F_h - dw $41b4 ; dw Museum2F_h - dw $4257 ; dw PewterGym_h + dw Museum2F_h + dw PewterGym_h dw $4e30 ; dw PewterHouse1_h dw $44de ; dw PewterMart_h dw $4e86 ; dw PewterHouse2_h diff --git a/main.asm b/main.asm index 0b5d37f0..9c6ff5ac 100755 --- a/main.asm +++ b/main.asm @@ -1047,7 +1047,9 @@ RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" Museum1FBlocks: INCBIN "maps/museum1f.blk" - dr $5c048,$5c090 +Museum2FBlocks: +INCBIN "maps/museum2f.blk" + dr $5c064,$5c090 ViridianForestEntranceBlocks: ViridianForestExitBlocks: Route2GateBlocks: @@ -1061,7 +1063,17 @@ INCLUDE "data/mapObjects/redshouse2f.asm" INCLUDE "data/mapHeaders/museum1f.asm" INCLUDE "scripts/museum1f.asm" INCLUDE "data/mapObjects/museum1f.asm" - dr $5c1b4,$5d485 + +INCLUDE "data/mapHeaders/museum2f.asm" +INCLUDE "scripts/museum2f.asm" +INCLUDE "data/mapObjects/museum2f.asm" + +INCLUDE "data/mapHeaders/pewtergym.asm" +INCLUDE "scripts/pewtergym.asm" +INCLUDE "data/mapObjects/pewtergym.asm" +PewterGymBlocks: +INCBIN "maps/pewtergym.blk" + dr $5c46e,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" diff --git a/scripts/museum2f.asm b/scripts/museum2f.asm index 0f8a63ec..56d113ae 100755 --- a/scripts/museum2f.asm +++ b/scripts/museum2f.asm @@ -1,5 +1,6 @@ Museum2FScript: ; 5c317 (17:4317) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret Museum2FTextPointers: ; 5c31a (17:431a) dw Museum2FText1 @@ -27,9 +28,40 @@ Museum2FText4: ; 5c337 (17:4337) db "@" Museum2FText5: ; 5c33c (17:433c) + TX_ASM + ld a, [wd472] + bit 7, a + jr nz, .asm_5c1f6 + ld hl, Museum2FText_5c20e + call PrintText + jr .asm_5c20b + +.asm_5c1f6 + ld a, [wPikachuHappiness] + cp 101 + jr c, .asm_5c205 + ld hl, Museum2FText_5c218 + call PrintText + jr .asm_5c20b + +.asm_5c205 + ld hl, Museum2FText_5c213 + call PrintText +.asm_5c20b + jp TextScriptEnd + +Museum2FText_5c20e: TX_FAR _Museum2FText5 db "@" +Museum2FText_5c213: + TX_FAR _Museum2FPikachuText1 + db "@" + +Museum2FText_5c218: + TX_FAR _Museum2FPikachuText2 + db "@" + Museum2FText6: ; 5c341 (17:4341) TX_FAR _Museum2FText6 db "@" diff --git a/scripts/pewtergym.asm b/scripts/pewtergym.asm index 1e6e5476..3e9ab693 100755 --- a/scripts/pewtergym.asm +++ b/scripts/pewtergym.asm @@ -14,7 +14,8 @@ PewterGymScript: ; 5c387 (17:4387) PewterGymScript_5c3a4: ; 5c3a4 (17:43a4) ld hl, Gym1CityName ld de, Gym1LeaderName - jp LoadGymLeaderAndCityName + call LoadGymLeaderAndCityName + ret Gym1CityName: ; 5c3ad (17:43ad) db "PEWTER CITY@" @@ -41,7 +42,6 @@ PewterGymScript3: ; 5c3d2 (17:43d2) jp z, PewterGymScript_5c3bf ld a, $f0 ld [wJoyIgnore], a - PewterGymScript_5c3df: ; 5c3df (17:43df) ld a, $4 ld [hSpriteIndexOrTextID], a @@ -55,6 +55,7 @@ PewterGymScript_5c3df: ; 5c3df (17:43df) call DisplayTextID SetEvent EVENT_GOT_TM34 jr .asm_5c408 + .BagFull ld a, $6 ld [hSpriteIndexOrTextID], a @@ -149,7 +150,7 @@ PewterGymText4: ; 5c4a8 (17:44a8) PewterGymText5: ; 5c4ad (17:44ad) TX_FAR _ReceivedTM34Text - db $0B + TX_SFX_ITEM TX_FAR _TM34ExplanationText db "@" @@ -159,7 +160,7 @@ PewterGymText6: ; 5c4b7 (17:44b7) PewterGymText_5c4bc: ; 5c4bc (17:44bc) TX_FAR _PewterGymText_5c4bc - db $0B + TX_SFX_ITEM TX_FAR _PewterGymText_5c4c1 db "@" @@ -192,6 +193,9 @@ PewterGymText3: ; 5c4df (17:44df) ld a, [wCurrentMenuItem] and a jr nz, .asm_5c4fe + ld a, [wd472] + bit 7, a + jp nz, .asm_5c3fa ld hl, PewterGymText_5c51a call PrintText jr .asm_5c504 @@ -208,6 +212,11 @@ PewterGymText3: ; 5c4df (17:44df) .asm_5c512 jp TextScriptEnd +.asm_5c3fa + ld hl, PewterGymText_5c41c + call PrintText + jp TextScriptEnd + PewterGymText_5c515: ; 5c515 (17:4515) TX_FAR _PewterGymText_5c515 db "@" @@ -227,3 +236,8 @@ PewterGymText_5c524: ; 5c524 (17:4524) PewterGymText_5c529: ; 5c529 (17:4529) TX_FAR _PewterGymText_5c529 db "@" + +PewterGymText_5c41c: + TX_FAR _PewterGymGuyText + db "@" + -- cgit v1.3.1-sl0p From 92f3f9119ee7e0a1c70fcc483888baf048d7e6d9 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 15:29:40 -0400 Subject: Pewter houses, Pewter mart --- data/map_header_banks.asm | 6 +++--- data/map_header_pointers.asm | 6 +++--- main.asm | 27 +++++++++++++++++++++++---- scripts/pewterhouse1.asm | 3 ++- 4 files changed, 31 insertions(+), 11 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index d935a5ec..0dd10719 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -55,9 +55,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Museum1F_h) db BANK(Museum2F_h) db BANK(PewterGym_h) - db $07 ; db BANK(PewterHouse1_h) - db $1d ; db BANK(PewterMart_h) - db $07 ; db BANK(PewterHouse2_h) + db BANK(PewterHouse1_h) + db BANK(PewterMart_h) + db BANK(PewterHouse2_h) db $17 ; db BANK(PewterPokecenter_h) db $12 ; db BANK(MtMoon1_h) db $14 ; db BANK(MtMoon2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 06df0f27..a7a0763d 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -55,9 +55,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Museum1F_h dw Museum2F_h dw PewterGym_h - dw $4e30 ; dw PewterHouse1_h - dw $44de ; dw PewterMart_h - dw $4e86 ; dw PewterHouse2_h + dw PewterHouse1_h + dw PewterMart_h + dw PewterHouse2_h dw $446e ; dw PewterPokecenter_h dw $5953 ; dw MtMoon1_h dw $5a78 ; dw MtMoon2_h ;id=60 diff --git a/main.asm b/main.asm index 9c6ff5ac..3ba53669 100755 --- a/main.asm +++ b/main.asm @@ -295,6 +295,8 @@ OaksLabBlocks: INCBIN "maps/oakslab.blk" ViridianHouseBlocks: Route2HouseBlocks: +PewterHouse1Blocks: +PewterHouse2Blocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: INCBIN "maps/school.blk" @@ -317,7 +319,6 @@ INCLUDE "data/mapHeaders/viridianmart.asm" INCLUDE "scripts/viridianmart.asm" INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: -PewterMartBlocks: CeruleanMartBlocks: VermilionMartBlocks: LavenderMartBlocks: @@ -334,7 +335,16 @@ INCLUDE "data/mapObjects/school.asm" INCLUDE "data/mapHeaders/viridianhouse.asm" INCLUDE "scripts/viridianhouse.asm" INCLUDE "data/mapObjects/viridianhouse.asm" - dr $1ce30,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/pewterhouse1.asm" +INCLUDE "scripts/pewterhouse1.asm" +INCLUDE "data/mapObjects/pewterhouse1.asm" + +INCLUDE "data/mapHeaders/pewterhouse2.asm" +INCLUDE "scripts/pewterhouse2.asm" +INCLUDE "data/mapObjects/pewterhouse2.asm" + + dr $1cec3,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" @@ -1150,7 +1160,11 @@ INCLUDE "engine/save.asm" SECTION "bank1D",ROMX,BANK[$1D] - dr $74000,$7405c + dr $74000,$74010 + +PewterMartBlocks: +INCBIN "maps/pewtermart.blk" + dr $74020,$7405c INCLUDE "engine/items/itemfinder.asm" INCLUDE "scripts/ceruleancity2.asm" @@ -1160,7 +1174,12 @@ INCLUDE "scripts/viridiangym.asm" INCLUDE "data/mapObjects/viridiangym.asm" ViridianGymBlocks: INCBIN "maps/viridiangym.blk" - dr $744de,$74726 + +INCLUDE "data/mapHeaders/pewtermart.asm" +INCLUDE "scripts/pewtermart.asm" +INCLUDE "data/mapObjects/pewtermart.asm" + + dr $7453d,$74726 VendingMachineMenu: ; 74726 (1d:4726) dr $74726,$75dfe PKMNLeaguePC: ; 75dfe (1d:5dfe) diff --git a/scripts/pewterhouse1.asm b/scripts/pewterhouse1.asm index a670f23c..a825b303 100755 --- a/scripts/pewterhouse1.asm +++ b/scripts/pewterhouse1.asm @@ -1,5 +1,6 @@ PewterHouse1Script: ; 1d5f3 (7:55f3) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret PewterHouse1TextPointers: ; 1d5f6 (7:55f6) dw PewterHouse1Text1 -- cgit v1.3.1-sl0p From 9abb62033819774d7b256ee0222f7c6ece987bfe Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 16:24:41 -0400 Subject: Pewter Pokecenter --- data/mapObjects/pewterpokecenter.asm | 6 ++- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- engine/bank3c.asm | 5 ++- engine/bank3f.asm | 6 +-- engine/items/items.asm | 2 +- engine/menu/bills_pc.asm | 2 +- engine/menu/party_menu.asm | 2 +- engine/overworld/cable_club_npc.asm | 2 +- engine/overworld/pokecenter.asm | 8 ++-- engine/pikachu_pic_animation.asm | 10 ++--- home.asm | 2 +- home/overworld.asm | 2 +- home/pikachu.asm | 6 +-- main.asm | 12 ++++-- scripts/billshouse2.asm | 4 +- scripts/pewterpokecenter.asm | 80 ++++++++---------------------------- wram.asm | 4 ++ 18 files changed, 63 insertions(+), 94 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/pewterpokecenter.asm b/data/mapObjects/pewterpokecenter.asm index 86757244..d3f87326 100755 --- a/data/mapObjects/pewterpokecenter.asm +++ b/data/mapObjects/pewterpokecenter.asm @@ -7,11 +7,13 @@ PewterPokecenterObject: ; 0x5c60d (size=44) db $0 ; signs - db $4 ; objects + db $6 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_GENTLEMAN, $b, $7, STAY, LEFT, $2 ; person - object SPRITE_CLEFAIRY, $1, $3, STAY, DOWN, $3 ; person + object SPRITE_JIGGLYPUFF, $1, $3, STAY, DOWN, $3 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + object SPRITE_LASS, $4, $3, STAY, UP, $5 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $6 ; person ; warp-to EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 0dd10719..c840cd82 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -58,7 +58,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(PewterHouse1_h) db BANK(PewterMart_h) db BANK(PewterHouse2_h) - db $17 ; db BANK(PewterPokecenter_h) + db BANK(PewterPokecenter_h) db $12 ; db BANK(MtMoon1_h) db $14 ; db BANK(MtMoon2_h) db $12 ; db BANK(MtMoon3_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index a7a0763d..cc700617 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -58,7 +58,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw PewterHouse1_h dw PewterMart_h dw PewterHouse2_h - dw $446e ; dw PewterPokecenter_h + dw PewterPokecenter_h dw $5953 ; dw MtMoon1_h dw $5a78 ; dw MtMoon2_h ;id=60 dw $5c7e ; dw MtMoon3_h diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 097dfd3e..9274b8b7 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -352,7 +352,10 @@ INCLUDE "scripts/redshouse1f2.asm" INCLUDE "scripts/oakslab2.asm" INCLUDE "scripts/school2.asm" INCLUDE "scripts/museum1f2.asm" - dr $f1d98, $f220e +INCLUDE "scripts/pewterpokecenter2.asm" + +Func_f1e22: + dr $f1e22, $f220e INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" diff --git a/engine/bank3f.asm b/engine/bank3f.asm index c8041a3a..c31fc986 100644 --- a/engine/bank3f.asm +++ b/engine/bank3f.asm @@ -27,7 +27,7 @@ Func_fc4fa:: ; fc4fa (3f:44fa) bit 4, [hl] res 4, [hl] jr nz, .asm_fc515 - call Func_1542 + call ResetPikachuAsleep call Func_fc523 ld a, $ff ld [wSpriteStateData1 + $f2], a @@ -344,7 +344,7 @@ Func_fc6d5:: ; fc6d5 (3f:46d5) ld a, [wFontLoaded] bit 0, a jp nz, asm_fc76a - call Func_154a + call CheckPikachuAsleep jp nz, asm_fc76a ld a, [hl] and $7f @@ -408,7 +408,7 @@ asm_fc745: ; fc745 (3f:4745) ld hl, wSpriteStateData2 - wSpriteStateData1 add hl, bc ld [hl], a - call Func_154a + call CheckPikachuAsleep jr nz, .asm_fc75f ld a, [wSpriteStateData1 + $9] xor $4 diff --git a/engine/items/items.asm b/engine/items/items.asm index 5d76c37e..eca9eaef 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -1765,7 +1765,7 @@ ItemUsePokeflute: ; dfbd (3:5fbd) .notRoute16 cp a,PEWTER_POKECENTER jr nz,.noSnorlaxOrPikachuToWakeUp - call Func_154a + call CheckPikachuAsleep jr z,.noSnorlaxOrPikachuToWakeUp callab Func_fcb01 jr nc,.noSnorlaxOrPikachuToWakeUp diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index ce9ca5a8..97a65517 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -227,7 +227,7 @@ BillsPCDeposit: ; 2156d (8:556d) jp c, BillsPCMenu callab IsThisPartymonStarterPikachu_Party jr nc, .asm_215ad - call Func_154a + call CheckPikachuAsleep jr z, .asm_215ad ld hl, SleepingPikachuText2 call PrintText diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index 3ec0029e..8683d3cb 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -53,7 +53,7 @@ RedrawPartyMenu_: ; 11886 (4:5886) ld [wWhichPokemon],a callab IsThisPartymonStarterPikachu_Party jr nc, .regularMon - call Func_154a + call CheckPikachuAsleep jr z, .regularMon ld a, $ff ld [hPartyMonIndex], a diff --git a/engine/overworld/cable_club_npc.asm b/engine/overworld/cable_club_npc.asm index 8f279759..4170a936 100755 --- a/engine/overworld/cable_club_npc.asm +++ b/engine/overworld/cable_club_npc.asm @@ -1,7 +1,7 @@ CableClubNPC: ; 7035 (1:7035) ld hl, CableClubNPCWelcomeText call PrintText - call Func_154a + call CheckPikachuAsleep jr nz, .asm_7048 CheckEvent EVENT_GOT_POKEDEX jp nz, .receivedPokedex diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index 779d852c..3024ff7b 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -2,7 +2,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) ld a, [wCurMap] cp PEWTER_POKECENTER jr nz, .regularCenter - call Func_154a + call CheckPikachuAsleep jr z, .regularCenter ld hl, LooksContentText ; if pikachu is sleeping, don't heal call PrintText @@ -27,7 +27,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call SetLastBlackoutMap callab IsStarterPikachuInOurParty jr nc, .notHealingPlayerPikachu - call Func_154a + call CheckPikachuAsleep jr nz, .notHealingPlayerPikachu call LoadCurrentMapView call Delay3 @@ -38,7 +38,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) call PrintText ld c, 64 call DelayFrames - call Func_154a + call CheckPikachuAsleep jr nz, .playerPikachuNotOnScreen call Func_152d callab IsStarterPikachuInOurParty @@ -58,7 +58,7 @@ DisplayPokemonCenterDialogue_: ; 6d97 (1:6d97) ld [wLastMusicSoundID], a ld [wNewSoundID], a call PlaySound - call Func_154a + call CheckPikachuAsleep jr nz, .doNotReturnPikachu callab IsStarterPikachuInOurParty call c, Func_6eaa diff --git a/engine/pikachu_pic_animation.asm b/engine/pikachu_pic_animation.asm index d95eb538..c16e3e5f 100755 --- a/engine/pikachu_pic_animation.asm +++ b/engine/pikachu_pic_animation.asm @@ -247,7 +247,7 @@ Func_fd05e: ; fd05e (3f:505e) bit 7, [hl] ld a, $1d jr z, .asm_fd0c9 - call Func_154a + call CheckPikachuAsleep ld a, $1e jr nz, .asm_fd0c9 jr .asm_fd096 @@ -255,7 +255,7 @@ Func_fd05e: ; fd05e (3f:505e) ld a, [wCurMap] cp PEWTER_POKECENTER jr nz, .notPewterPokecenter - call Func_154a + call CheckPikachuAsleep ld a, $1a jr nz, .asm_fd0c9 jr .asm_fd096 @@ -1636,7 +1636,7 @@ PikachuPewterPokecenterCheck: ; fd8d4 (3f:58d4) ld a, [wCurMap] cp PEWTER_POKECENTER ret nz - call Func_1542 + call ResetPikachuAsleep call Func_fcff2 ret @@ -1644,7 +1644,7 @@ PikachuFanClubCheck: ; fd8e1 (3f:58e1) ld a, [wCurMap] cp POKEMON_FAN_CLUB ret nz - call Func_1542 + call ResetPikachuAsleep call Func_fcff2 ret @@ -1652,7 +1652,7 @@ PikachuBillsHouseCheck: ; fd8ee (3f:58ee) ld a, [wCurMap] cp BILLS_HOUSE ret nz - call Func_1542 + call ResetPikachuAsleep ret Pikachu_LoadCurrentMapViewUpdateSpritesAndDelay3: ; fd8f8 (3f:58f8) diff --git a/home.asm b/home.asm index 5f924a40..6fb3e08b 100644 --- a/home.asm +++ b/home.asm @@ -477,7 +477,7 @@ HandlePartyMenuInput:: ; 1226 (0:1226) ld [wWhichPokemon], a callab IsThisPartymonStarterPikachu_Party ; 3f:4e18 jr nc, .asm_1258 - call Func_154a + call CheckPikachuAsleep jr nz, .asm_128f .asm_1258 pop af diff --git a/home/overworld.asm b/home/overworld.asm index 3a9708d9..bc7ae029 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1222,7 +1222,7 @@ CollisionCheckOnLand:: ; 0a1c (0:0a1c) ; if no sprite collision cp $f jr nz,.collision - call Func_154a + call CheckPikachuAsleep jr nz,.collision ld a,[hJoyHeld] and $2 diff --git a/home/pikachu.asm b/home/pikachu.asm index 5239873c..9e0ab541 100755 --- a/home/pikachu.asm +++ b/home/pikachu.asm @@ -30,21 +30,21 @@ Func_152d:: ; 152d (0:152d) pop hl ret -Func_153a:: ; 153a (0:153a) +SetPikachuAsleep:: ; 153a (0:153a) push hl ld hl, wPikachuOverworldStateFlags set 1, [hl] pop hl ret -Func_1542:: ; 1542 (0:1542) +ResetPikachuAsleep:: ; 1542 (0:1542) push hl ld hl, wPikachuOverworldStateFlags res 1, [hl] pop hl ret -Func_154a:: ; 154a (0:154a) +CheckPikachuAsleep:: ; 154a (0:154a) push hl ld hl, wPikachuOverworldStateFlags bit 1, [hl] diff --git a/main.asm b/main.asm index 3ba53669..33332dff 100755 --- a/main.asm +++ b/main.asm @@ -746,7 +746,6 @@ INCLUDE "data/mapObjects/lavendertown.asm" LavenderTownBlocks: INCBIN "maps/lavendertown.blk" ViridianPokecenterBlocks: -PewterPokecenterBlocks: CeruleanPokecenterBlocks: VermilionPokecenterBlocks: SaffronPokecenterBlocks: @@ -1059,7 +1058,9 @@ Museum1FBlocks: INCBIN "maps/museum1f.blk" Museum2FBlocks: INCBIN "maps/museum2f.blk" - dr $5c064,$5c090 +PewterPokecenterBlocks: +INCBIN "maps/pewterpokecenter.blk" + dr $5c080,$5c090 ViridianForestEntranceBlocks: ViridianForestExitBlocks: Route2GateBlocks: @@ -1083,7 +1084,12 @@ INCLUDE "scripts/pewtergym.asm" INCLUDE "data/mapObjects/pewtergym.asm" PewterGymBlocks: INCBIN "maps/pewtergym.blk" - dr $5c46e,$5d485 + +INCLUDE "data/mapHeaders/pewterpokecenter.asm" +INCLUDE "scripts/pewterpokecenter.asm" +INCLUDE "data/mapObjects/pewterpokecenter.asm" + + dr $5c4f5,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" diff --git a/scripts/billshouse2.asm b/scripts/billshouse2.asm index 48205029..6f62a79f 100755 --- a/scripts/billshouse2.asm +++ b/scripts/billshouse2.asm @@ -87,7 +87,7 @@ Func_f24ae: ; f24ae ld a, [wCurMap] cp BILLS_HOUSE jr nz, .asm_f24d2 - call Func_154a + call CheckPikachuAsleep jr z, .asm_f24d2 ld a, [W_BILLSHOUSECURSCRIPT] cp $5 @@ -120,7 +120,7 @@ Func_f24d5: ld a, $1 ld [wWhichEmotionBubble], a predef EmotionBubble - call Func_153a + call SetPikachuAsleep callab InitializePikachuTextID ret diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 46d4d509..90f5e2b9 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -1,12 +1,17 @@ PewterPokecenterScript: ; 5c587 (17:4587) + ld hl, wPreventBlackout + set 7, [hl] call Serial_TryEstablishingExternallyClockedConnection - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret PewterPokecenterTextPointers: ; 5c58d (17:458d) dw PewterPokecenterText1 dw PewterPokecenterText2 dw PewterPokecenterText3 dw PewterPokecenterText4 + dw PewterPokecenterText5 + dw PewterPokecenterText6 PewterPokecenterText1: ; 5c595 (17:4595) db $ff @@ -17,69 +22,18 @@ PewterPokecenterText2: ; 5c596 (17:4596) PewterPokecenterText3: ; 5c59b (17:459b) TX_ASM - ld a, $1 - ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, PewterPokecenterText5 - call PrintText - ld a, $ff - call PlaySound - ld c, 32 - call DelayFrames - ld hl, JigglypuffFacingDirections - ld de, wJigglypuffFacingDirections - ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections - call CopyData - - ld a, [wSpriteStateData1 + 3 * $10 + $2] - ld hl, wJigglypuffFacingDirections -.findMatchingFacingDirectionLoop - cp [hl] - inc hl - jr nz, .findMatchingFacingDirectionLoop - dec hl - push hl - ld c, BANK(Music_JigglypuffSong) - ld a, MUSIC_JIGGLYPUFF_SONG - call PlayMusic - pop hl -.loop - ld a, [hl] - ld [wSpriteStateData1 + 3 * $10 + $2], a - -; rotate the array - push hl - ld hl, wJigglypuffFacingDirections - ld de, wJigglypuffFacingDirections - 1 - ld bc, JigglypuffFacingDirectionsEnd - JigglypuffFacingDirections - call CopyData - ld a, [wJigglypuffFacingDirections - 1] - ld [wJigglypuffFacingDirections + 3], a - pop hl - - ld c, 24 - call DelayFrames - - ld a, [wChannelSoundIDs] - ld b, a - ld a, [wChannelSoundIDs + CH1] - or b - jr nz, .loop - - ld c, 48 - call DelayFrames - call PlayDefaultMusic + callba Func_f1da4 jp TextScriptEnd -PewterPokecenterText5: ; 5c603 (17:4603) - TX_FAR _PewterPokecenterText5 - db "@" - -JigglypuffFacingDirections: ; 5c608 (17:4608) - db $30 | SPRITE_FACING_DOWN - db $30 | SPRITE_FACING_LEFT - db $30 | SPRITE_FACING_UP - db $30 | SPRITE_FACING_RIGHT -JigglypuffFacingDirectionsEnd: - PewterPokecenterText4: ; 5c60c (17:460c) db $f6 + +PewterPokecenterText5: ; 5c603 (17:4603) + TX_ASM + callba Func_f1d98 + jp TextScriptEnd + +PewterPokecenterText6: + TX_ASM + callab Func_f0f12 + jp TextScriptEnd diff --git a/wram.asm b/wram.asm index 64a394ed..821c4957 100755 --- a/wram.asm +++ b/wram.asm @@ -960,6 +960,8 @@ wPlayerSpinWhileMovingUpOrDownAnimMaxY:: ; cd3e wHiddenObjectFunctionRomBank:: ; cd3e wTrainerEngageDistance:: ; cd3e + +wJigglypuffFacingDirections2:: ; cd3e ds 1 wHUDGraphicsTiles:: ; cd3f @@ -1040,6 +1042,8 @@ wHoFTeamNo:: ; cd42 wSlotMachineWheel1MiddleTile:: ; cd42 wFieldMovesLeftmostXCoord:: ; cd42 + +wcd42:: ; cd42 ds 1 wLastFieldMoveID:: ; cd43 -- cgit v1.3.1-sl0p From 873ab5ace17d2c4d68a98e5d3ec2f6b0b248b44e Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 16:49:54 -0400 Subject: Mt Moon B1F --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 9 ++++++++- scripts/mtmoon1.asm | 19 +++++++------------ 4 files changed, 17 insertions(+), 15 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index c840cd82..c51722d6 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -59,7 +59,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(PewterMart_h) db BANK(PewterHouse2_h) db BANK(PewterPokecenter_h) - db $12 ; db BANK(MtMoon1_h) + db BANK(MtMoon1_h) db $14 ; db BANK(MtMoon2_h) db $12 ; db BANK(MtMoon3_h) db $07 ; db BANK(CeruleanHouseTrashed_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index cc700617..10a0216f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -59,7 +59,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw PewterMart_h dw PewterHouse2_h dw PewterPokecenter_h - dw $5953 ; dw MtMoon1_h + dw MtMoon1_h dw $5a78 ; dw MtMoon2_h ;id=60 dw $5c7e ; dw MtMoon3_h dw $4ec3 ; dw CeruleanHouseTrashed_h diff --git a/main.asm b/main.asm index 33332dff..fadf6417 100755 --- a/main.asm +++ b/main.asm @@ -786,7 +786,14 @@ INCLUDE "scripts/redshouse1f.asm" INCLUDE "data/mapObjects/redshouse1f.asm" RedsHouse1FBlocks: INCBIN "maps/redshouse1f.blk" - dr $48157,$4a540 + dr $48157,$49953 + +INCLUDE "data/mapHeaders/mtmoon1.asm" +INCLUDE "scripts/mtmoon1.asm" +INCLUDE "data/mapObjects/mtmoon1.asm" +MtMoon1Blocks: +INCBIN "maps/mtmoon1.blk" + dr $49c7e,$4a540 SECTION "bank13",ROMX,BANK[$13] diff --git a/scripts/mtmoon1.asm b/scripts/mtmoon1.asm index 4a5eeae3..a649481c 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/mtmoon1.asm @@ -97,42 +97,37 @@ MtMoon1TrainerHeader7: ; 49a45 (12:5a45) MtMoon1Text1: ; 49a52 (12:5a52) TX_ASM ld hl, MtMoon1TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd + jr MtMoon1TalkToTrainer MtMoon1Text2: ; 49a5c (12:5a5c) TX_ASM ld hl, MtMoon1TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd + jr MtMoon1TalkToTrainer MtMoon1Text3: ; 49a66 (12:5a66) TX_ASM ld hl, MtMoon1TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd + jr MtMoon1TalkToTrainer MtMoon1Text4: ; 49a70 (12:5a70) TX_ASM ld hl, MtMoon1TrainerHeader4 - call TalkToTrainer - jp TextScriptEnd + jr MtMoon1TalkToTrainer MtMoon1Text5: ; 49a7a (12:5a7a) TX_ASM ld hl, MtMoon1TrainerHeader5 - call TalkToTrainer - jp TextScriptEnd + jr MtMoon1TalkToTrainer MtMoon1Text6: ; 49a84 (12:5a84) TX_ASM ld hl, MtMoon1TrainerHeader6 - call TalkToTrainer - jp TextScriptEnd + jr MtMoon1TalkToTrainer MtMoon1Text7: ; 49a8e (12:5a8e) TX_ASM ld hl, MtMoon1TrainerHeader7 +MtMoon1TalkToTrainer: call TalkToTrainer jp TextScriptEnd -- cgit v1.3.1-sl0p From f17f3f1a06ce8c28f044cdb04c1d6355efc01a8f Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 16:58:17 -0400 Subject: Mt Moon B2F --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index c51722d6..dd088a1b 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -60,7 +60,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(PewterHouse2_h) db BANK(PewterPokecenter_h) db BANK(MtMoon1_h) - db $14 ; db BANK(MtMoon2_h) + db BANK(MtMoon2_h) db $12 ; db BANK(MtMoon3_h) db $07 ; db BANK(CeruleanHouseTrashed_h) db $07 ; db BANK(CeruleanHouse1_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 10a0216f..0e5149e3 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -60,7 +60,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw PewterHouse2_h dw PewterPokecenter_h dw MtMoon1_h - dw $5a78 ; dw MtMoon2_h ;id=60 + dw MtMoon2_h ;id=60 dw $5c7e ; dw MtMoon3_h dw $4ec3 ; dw CeruleanHouseTrashed_h dw $4f34 ; dw CeruleanHouse1_h diff --git a/main.asm b/main.asm index fadf6417..a8c063ba 100755 --- a/main.asm +++ b/main.asm @@ -909,7 +909,15 @@ INCLUDE "scripts/route24.asm" INCLUDE "scripts/route25.asm" ; victoryroad2 - dr $517cc,$52060 + dr $517cc,$51a78 + +INCLUDE "data/mapHeaders/mtmoon2.asm" +INCLUDE "scripts/mtmoon2.asm" +INCLUDE "data/mapObjects/mtmoon2.asm" +MtMoon2Blocks: +INCBIN "maps/mtmoon2.blk" + + dr $51b97,$52060 Mansion2Script_Switches: dr $52060,$522a3 Mansion3Script_Switches: -- cgit v1.3.1-sl0p From b8cced19fce2a212f5cb205039382a63821a3762 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 20:52:05 -0400 Subject: Mt Moon B2F --- constants/event_macros.asm | 32 ++- constants/hide_show_constants.asm | 34 +-- data/mapObjects/mtmoon3.asm | 15 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- macros.asm | 2 +- main.asm | 10 +- scripts/beach_house2.asm | 4 +- scripts/mtmoon3.asm | 562 ++++++++++++++++++++++++++++---------- 9 files changed, 486 insertions(+), 177 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/constants/event_macros.asm b/constants/event_macros.asm index 5eb73147..bf0a95b5 100644 --- a/constants/event_macros.asm +++ b/constants/event_macros.asm @@ -452,6 +452,36 @@ CheckEitherEventSet: MACRO ENDC ENDM +CheckEitherEventSetReuseA: MACRO + IF event_byte != ((\1) / 8) +event_byte = ((\1) / 8) + ld a, [wEventFlags + event_byte] + ENDC + IF ((\1) / 8) == ((\2) / 8) + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) | (1 << ((\2) % 8)) + ELSE + ; This case doesn't happen in the original ROM. + IF ((\1) % 8) == ((\2) % 8) + push hl + ld a, [wEventFlags + ((\1) / 8)] + ld hl, wEventFlags + ((\2) / 8) + or [hl] + bit ((\1) % 8), a + pop hl + ELSE + push bc + ld a, [wEventFlags + ((\1) / 8)] + and (1 << ((\1) % 8)) + ld b, a + ld a, [wEventFlags + ((\2) / 8)] + and (1 << ((\2) % 8)) + or b + pop bc + ENDC + ENDC + ENDM + ; for handling fixed event bits when events are inserted/removed ;\1 = event index ;\2 = fixed flag bit @@ -459,4 +489,4 @@ AdjustEventBit: MACRO IF ((\1) % 8) != (\2) add ((\1) % 8) - (\2) ENDC - ENDM \ No newline at end of file + ENDM diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index ffc4ea08..6fc52187 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -114,27 +114,27 @@ const_value SET $43 ; replace the tower rockets with jessie/james const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X - const HS_MT_MOON_1_ITEM_1 ; 67 X - const HS_MT_MOON_1_ITEM_2 ; 68 X + const HS_MT_MOON_1_ITEM_1 ; 67 + const HS_MT_MOON_1_ITEM_2 ; 68 const HS_MT_MOON_1_ITEM_3 ; 69 X const HS_MT_MOON_1_ITEM_4 ; 6A X const HS_MT_MOON_1_ITEM_5 ; 6B X const HS_MT_MOON_1_ITEM_6 ; 6C X - const HS_MT_MOON_3_FOSSIL_1 ; 6D - const HS_MT_MOON_3_FOSSIL_2 ; 6E - const HS_MT_MOON_3_ITEM_1 ; 6F X - const HS_MT_MOON_3_ITEM_2 ; 70 X - const HS_SS_ANNE_2_RIVAL ; 71 - const HS_SS_ANNE_8_ITEM ; 72 X - const HS_SS_ANNE_9_ITEM_1 ; 73 X - const HS_SS_ANNE_9_ITEM_2 ; 74 X - const HS_SS_ANNE_10_ITEM_1 ; 75 X - const HS_SS_ANNE_10_ITEM_2 ; 76 X - const HS_SS_ANNE_10_ITEM_3 ; 77 X - const HS_VICTORY_ROAD_3_ITEM_1 ; 78 X - const HS_VICTORY_ROAD_3_ITEM_2 ; 79 X - -const_value SET $7c ; idk anymore lol + const HS_MT_MOON_JESSIE ; 6D + const HS_MT_MOON_JAMES ; 6E + const HS_MT_MOON_3_FOSSIL_1 ; 6F X + const HS_MT_MOON_3_FOSSIL_2 ; 70 X + const HS_MT_MOON_3_ITEM_1 ; 71 + const HS_MT_MOON_3_ITEM_2 ; 72 X + const HS_SS_ANNE_2_RIVAL ; 73 X + const HS_SS_ANNE_8_ITEM ; 74 X + const HS_SS_ANNE_9_ITEM_1 ; 75 X + const HS_SS_ANNE_9_ITEM_2 ; 76 X + const HS_SS_ANNE_10_ITEM_1 ; 77 X + const HS_SS_ANNE_10_ITEM_2 ; 78 X + const HS_SS_ANNE_10_ITEM_3 ; 79 X + const HS_VICTORY_ROAD_3_ITEM_1 ; 7A + const HS_VICTORY_ROAD_3_ITEM_2 ; 7B const HS_VICTORY_ROAD_3_BOULDER ; 7C X const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7D X const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7E X diff --git a/data/mapObjects/mtmoon3.asm b/data/mapObjects/mtmoon3.asm index 4f8f911c..4a9b1946 100755 --- a/data/mapObjects/mtmoon3.asm +++ b/data/mapObjects/mtmoon3.asm @@ -9,16 +9,17 @@ MtMoon3Object: ; 0x49fdb (size=102) db $0 ; signs - db $9 ; objects + db $a ; objects object SPRITE_BLACK_HAIR_BOY_2, $c, $8, STAY, RIGHT, $1, OPP_SUPER_NERD, $2 - object SPRITE_ROCKET, $b, $10, STAY, DOWN, $2, OPP_ROCKET, $1 + object SPRITE_JESSIE, $9, $3, STAY, LEFT, $2 object SPRITE_ROCKET, $f, $16, STAY, DOWN, $3, OPP_ROCKET, $2 object SPRITE_ROCKET, $1d, $b, STAY, UP, $4, OPP_ROCKET, $3 - object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $4 - object SPRITE_OMANYTE, $c, $6, STAY, NONE, $6 ; person - object SPRITE_OMANYTE, $d, $6, STAY, NONE, $7 ; person - object SPRITE_BALL, $19, $15, STAY, NONE, $8, HP_UP - object SPRITE_BALL, $1d, $5, STAY, NONE, $9, TM_01 + object SPRITE_ROCKET, $1d, $11, STAY, LEFT, $5, OPP_ROCKET, $1 + object SPRITE_JAMES, $9, $4, STAY, LEFT, $6 + object SPRITE_OMANYTE, $c, $6, STAY, NONE, $7 ; person + object SPRITE_OMANYTE, $d, $6, STAY, NONE, $8 ; person + object SPRITE_BALL, $19, $15, STAY, NONE, $9, HP_UP + object SPRITE_BALL, $1d, $5, STAY, NONE, $a, TM_01 ; warp-to EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index dd088a1b..90ca27f9 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -61,7 +61,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(PewterPokecenter_h) db BANK(MtMoon1_h) db BANK(MtMoon2_h) - db $12 ; db BANK(MtMoon3_h) + db BANK(MtMoon3_h) db $07 ; db BANK(CeruleanHouseTrashed_h) db $07 ; db BANK(CeruleanHouse1_h) db $17 ; db BANK(CeruleanPokecenter_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 0e5149e3..37357204 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -61,7 +61,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw PewterPokecenter_h dw MtMoon1_h dw MtMoon2_h ;id=60 - dw $5c7e ; dw MtMoon3_h + dw MtMoon3_h dw $4ec3 ; dw CeruleanHouseTrashed_h dw $4f34 ; dw CeruleanHouse1_h dw $44f5 ; dw CeruleanPokecenter_h diff --git a/macros.asm b/macros.asm index 29ca12f3..6ee88391 100644 --- a/macros.asm +++ b/macros.asm @@ -316,7 +316,7 @@ TX_BUTTON_SOUND: MACRO ENDM TX_SFX_ITEM EQUS "db $0b" -TX_SFX_ITEM2 EQUS "db $0d" +TX_WAIT_BUTTON EQUS "db $0d" TX_SFX_CONGRATS EQUS "db $10" TX_SFX_KEY_ITEM EQUS "db $11" diff --git a/main.asm b/main.asm index a8c063ba..8b3569e3 100755 --- a/main.asm +++ b/main.asm @@ -793,7 +793,15 @@ INCLUDE "scripts/mtmoon1.asm" INCLUDE "data/mapObjects/mtmoon1.asm" MtMoon1Blocks: INCBIN "maps/mtmoon1.blk" - dr $49c7e,$4a540 + +INCLUDE "data/mapHeaders/mtmoon3.asm" +INCLUDE "scripts/mtmoon3.asm" +INCLUDE "data/mapObjects/mtmoon3.asm" +MtMoon3Blocks: +INCBIN "maps/mtmoon3.blk" + +MtMoon3Script_4a325: ; pikachu-related function? + dr $4a325,$4a540 SECTION "bank13",ROMX,BANK[$13] diff --git a/scripts/beach_house2.asm b/scripts/beach_house2.asm index 918334ab..a2dd2114 100755 --- a/scripts/beach_house2.asm +++ b/scripts/beach_house2.asm @@ -24,10 +24,10 @@ Func_f23d0: ; f23d0 Text_f240c: TX_FAR _BeachHousePrinterText5 - TX_SFX_ITEM2 + TX_WAIT_BUTTON db "@" Text_f2412: TX_FAR _BeachHousePrinterText6 - TX_SFX_ITEM2 + TX_WAIT_BUTTON db "@" diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index b3a994e2..1de3445d 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -1,6 +1,6 @@ MtMoon3Script: ; 49d0b (12:5d0b) call EnableAutoTextBoxDrawing - ld hl, MtMoon3TrainerHeader0 + ld hl, MtMoon3TrainerHeaders ld de, MtMoon3ScriptPointers ld a, [W_MTMOON3CURSCRIPT] call ExecuteCurMapScriptInTable @@ -37,13 +37,23 @@ CoordsData_49d37: ; 49d37 (12:5d37) db $08,$0E db $FF -MtMoon3Script_49d58: ; 49d58 (12:5d58) +MtMoon3Script_49cd7: ; 49d58 (12:5d58) + CheckAndResetEvent EVENT_57E + call nz, MtMoon3Script_49cec xor a ld [wJoyIgnore], a +MtMoon3Script_49ce5: ld [W_MTMOON3CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret +MtMoon3Script_49cec: + ld a, HS_MT_MOON_JESSIE + call MtMoon3Script_49f93 + ld a, HS_MT_MOON_JAMES + call MtMoon3Script_49f93 + ret + MtMoon3ScriptPointers: ; 49d63 (12:5d63) dw MtMoon3Script0 dw DisplayEnemyTrainerTextAndStartBattle @@ -51,23 +61,41 @@ MtMoon3ScriptPointers: ; 49d63 (12:5d63) dw MtMoon3Script3 dw MtMoon3Script4 dw MtMoon3Script5 + dw MtMoon3Script6 + dw MtMoon3Script7 + dw MtMoon3Script8 + dw MtMoon3Script9 + dw MtMoon3Script10 + dw MtMoon3Script11 + dw MtMoon3Script12 + dw MtMoon3Script13 + dw MtMoon3Script14 + dw MtMoon3Script15 MtMoon3Script0: ; 49d6f (12:5d6f) + CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL + call z, MtMoon3Script_49d28 + CheckEvent EVENT_BEAT_MT_MOON_3_TRAINER_0 + call z, MtMoon3Script_49e15 + ret + +MtMoon3Script_49d28: CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD - jp nz, MtMoon3Script_49d91 + jp nz, .asm_49d4b ld a, [wYCoord] cp $8 - jp nz, MtMoon3Script_49d91 + jp nz, .asm_49d4b ld a, [wXCoord] cp $d - jp nz, MtMoon3Script_49d91 + jp nz, .asm_49d4b xor a ld [hJoyHeld], a ld a, $1 ld [hSpriteIndexOrTextID], a - jp DisplayTextID + call DisplayTextID + ret -MtMoon3Script_49d91: ; 49d91 (12:5d91) +.asm_49d4b CheckEitherEventSet EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL jp z, CheckFightingMapTrainers ret @@ -75,57 +103,93 @@ MtMoon3Script_49d91: ; 49d91 (12:5d91) MtMoon3Script3: ; 49d9a (12:5d9a) ld a, [wIsInBattle] cp $ff - jp z, MtMoon3Script_49d58 + jp z, MtMoon3Script_49cd7 call UpdateSprites call Delay3 SetEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD xor a ld [wJoyIgnore], a ld a, $0 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + call MtMoon3Script_49ce5 ret MtMoon3Script4: ; 49dba (12:5dba) ld a, $1 ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF - ld hl, CoordsData_49dea + ld hl, CoordsData_49dc7 + call ArePlayerCoordsInArray + jr c, .asm_49da8 + ld hl, CoordsData_49dc0 call ArePlayerCoordsInArray - jr c, .asm_49dd7 - ld hl, CoordsData_49df1 + jr c, .asm_49db0 + ld hl, CoordsData_49dd5 call ArePlayerCoordsInArray - jp nc, CheckFightingMapTrainers - ld de, MovementData_49df9 - jr .asm_49dda -.asm_49dd7 - ld de, MovementData_49df8 -.asm_49dda + jr c, .asm_49d9b + ld hl, CoordsData_49dce + call ArePlayerCoordsInArray + jr c, .asm_49da3 + jp CheckFightingMapTrainers + +.asm_49d9b + ld b, SPRITE_FACING_LEFT + ld hl, PikachuMovementData_49dd8 + call MtMoon3Script_4a325 +.asm_49da3 + ld de, MovementData_49ddd + jr .asm_49db3 + +.asm_49da8 + ld b, SPRITE_FACING_RIGHT + ld hl, PikachuMovementData_49dca + call MtMoon3Script_4a325 +.asm_49db0 + ld de, MovementData_49ddc +.asm_49db3 ld a, $1 ld [H_SPRITEINDEX], a call MoveSprite ld a, $5 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + call MtMoon3Script_49ce5 ret -CoordsData_49dea: ; 49dea (12:5dea) +CoordsData_49dc0: db $07,$0C db $06,$0B db $05,$0C db $FF -CoordsData_49df1: ; 49df1 (12:5df1) +CoordsData_49dc7: + db $07,$0C + db $FF + +PikachuMovementData_49dca: + db $00 + db $35 + db $33 + db $3f + +CoordsData_49dce: db $07,$0D db $06,$0E db $05,$0E db $FF -MovementData_49df8: ; 49df8 (12:5df8) - db NPC_MOVEMENT_RIGHT +CoordsData_49dd5: + db $07,$0D + db $FF -MovementData_49df9: ; 49df9 (12:5df9) - db NPC_MOVEMENT_UP,$FF +PikachuMovementData_49dd8: + db $00 + db $35 + db $34 + db $3f + +MovementData_49ddc: ; 49df8 (12:5df8) + db NPC_MOVEMENT_RIGHT +MovementData_49ddd: ; 49df9 (12:5df9) + db NPC_MOVEMENT_UP + db $FF MtMoon3Script5: ; 49dfb (12:5dfb) ld a, [wd730] @@ -135,23 +199,213 @@ MtMoon3Script5: ; 49dfb (12:5dfb) ld [wJoyIgnore], a ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld a, $a + ld a, $b ld [hSpriteIndexOrTextID], a call DisplayTextID - CheckEvent EVENT_GOT_DOME_FOSSIL + CheckEvent EVENT_GOT_HELIX_FOSSIL jr z, .asm_49e1d - ld a, HS_MT_MOON_3_FOSSIL_2 + ld a, HS_MT_MOON_3_FOSSIL_1 jr .asm_49e1f .asm_49e1d - ld a, HS_MT_MOON_3_FOSSIL_1 + ld a, HS_MT_MOON_3_FOSSIL_2 .asm_49e1f ld [wMissableObjectIndex], a predef HideObject xor a ld [wJoyIgnore], a ld a, $0 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a + call MtMoon3Script_49ce5 + ret + +MtMoon3Script_49e15: + ld a, [wXCoord] + cp $3 + ret nz + ld a, [wYCoord] + cp $5 + ret nz + call StopAllMusic + ld c, BANK(Music_JessieAndJames) + ld a, MUSIC_JESSIE_AND_JAMES + call PlayMusic + xor a + ld [hJoyHeld], a + ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld [wJoyIgnore], a + ld a, HS_MT_MOON_JESSIE + call MtMoon3Script_49f84 + ld a, HS_MT_MOON_JAMES + call MtMoon3Script_49f84 + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $c + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_UP + ld [wSimulatedJoypadStatesEnd], a + call StartSimulatingJoypadStates + ld a, $ff + ld [wJoyIgnore], a + ld a, $6 + call MtMoon3Script_49ce5 + ret + +MovementData_f9e65: + db $06 +MovementData_f9e66: + db $06 + db $06 + db $06 + db $06 + db $06 + db $FF + +MtMoon3Script6: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + ld a, $2 + ld [H_SPRITEINDEX], a + ld de, MovementData_f9e65 + call MoveSprite + ld a, $ff + ld [wJoyIgnore], a + ld a, $7 + call MtMoon3Script_49ce5 + ret + +MtMoon3Script7: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wd730] + bit 0, a + ret nz +MtMoon3Script8: + ld a, $2 + ld [wSpriteStateData1 + 2 * $10 + 1], a + ld a, SPRITE_FACING_DOWN + ld [wSpriteStateData1 + 2 * $10 + 9], a +MtMoon3Script9: + ld a, $6 + ld [H_SPRITEINDEX], a + ld de, MovementData_f9e66 + call MoveSprite + ld a, $ff + ld [wJoyIgnore], a + ld a, $a + call MtMoon3Script_49ce5 + ret + +MtMoon3Script10: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wd730] + bit 0, a + ret nz +MtMoon3Script11: + ld a, $2 + ld [wSpriteStateData1 + 6 * $10 + 1], a + ld a, SPRITE_FACING_LEFT + ld [wSpriteStateData1 + 6 * $10 + 9], a + call Delay3 + ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld [wJoyIgnore], a + ld a, $d + ld [hSpriteIndexOrTextID], a + call DisplayTextID +MtMoon3Script12: + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, MtMoon3JessieJamesEndBattleText + ld de, MtMoon3JessieJamesEndBattleText + call SaveEndBattleTextPointers + ld a, OPP_ROCKET + ld [wCurOpponent], a + ld a, $2a + ld [wTrainerNo], a + xor a + ld [hJoyHeld], a + ld [wJoyIgnore], a + SetEvent EVENT_57E + ld a, $d + call MtMoon3Script_49ce5 + ret + +MtMoon3Script13: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wIsInBattle] + cp $ff + jp z, MtMoon3Script_49cd7 + ld a, $2 + ld [wSpriteStateData1 + 2 * $10 + 1], a + ld [wSpriteStateData1 + 6 * $10 + 1], a + xor a + ld [wSpriteStateData1 + 2 * $10 + 9], a + ld [wSpriteStateData1 + 6 * $10 + 9], a + ld a, $FF ^ (A_BUTTON | B_BUTTON) + ld [wJoyIgnore], a + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $e + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + call StopAllMusic + ld c, BANK(Music_JessieAndJames) + ld a, MUSIC_JESSIE_AND_JAMES + call PlayMusic + ld a, $ff + ld [wJoyIgnore], a + ld a, $e + call MtMoon3Script_49ce5 + ret + +MtMoon3Script14: + ld a, $ff + ld [wJoyIgnore], a + call GBFadeOutToBlack + ld a, HS_MT_MOON_JESSIE + call MtMoon3Script_49f93 + ld a, HS_MT_MOON_JAMES + call MtMoon3Script_49f93 + call UpdateSprites + call Delay3 + call GBFadeInFromBlack + ld a, $f + call MtMoon3Script_49ce5 + ret + +MtMoon3Script15: + call PlayDefaultMusic + xor a + ld [hJoyHeld], a + ld [wJoyIgnore], a + SetEvent EVENT_BEAT_MT_MOON_3_TRAINER_0 + ResetEventReuseHL EVENT_57E + ld a, $0 + call MtMoon3Script_49ce5 + ret + +MtMoon3Script_49f84: + ld [wMissableObjectIndex], a + predef ShowObject + call UpdateSprites + call Delay3 + ret + +MtMoon3Script_49f93: + ld [wMissableObjectIndex], a + predef HideObject ret MtMoon3TextPointers: ; 49e34 (12:5e34) @@ -162,242 +416,258 @@ MtMoon3TextPointers: ; 49e34 (12:5e34) dw MtMoon3Text5 dw MtMoon3Text6 dw MtMoon3Text7 + dw MtMoon3Text8 dw PickUpItemText dw PickUpItemText - dw MtMoon3Text_49f99 - -MtMoon3TrainerHeaders: ; 49e48 (12:5e48) -MtMoon3TrainerHeader0: ; 49e48 (12:5e48) - dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_0 - dw MtMoon3BattleText2 ; TextBeforeBattle - dw MtMoon3AfterBattleText2 ; TextAfterBattle - dw MtMoon3EndBattleText2 ; TextEndBattle - dw MtMoon3EndBattleText2 ; TextEndBattle - -MtMoon3TrainerHeader2: ; 49e54 (12:5e54) + dw MtMoon3Text11 + dw MtMoon3Text12 + dw MtMoon3Text13 + dw MtMoon3Text14 + +MtMoon3TrainerHeaders: +MtMoon3TrainerHeader0: dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_2 - db ($4 << 4) ; trainer's view range + db ($4 << 4) dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_2 - dw MtMoon3BattleText3 ; TextBeforeBattle - dw MtMoon3AfterBattleText3 ; TextAfterBattle - dw MtMoon3EndBattleText3 ; TextEndBattle - dw MtMoon3EndBattleText3 ; TextEndBattle + dw MtMoon3BattleText3 + dw MtMoon3AfterBattleText3 + dw MtMoon3EndBattleText3 + dw MtMoon3EndBattleText3 -MtMoon3TrainerHeader3: ; 49e60 (12:5e60) +MtMoon3TrainerHeader1: dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_3 - db ($4 << 4) ; trainer's view range + db ($4 << 4) dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_3 - dw MtMoon3BattleText4 ; TextBeforeBattle - dw MtMoon3AfterBattleText4 ; TextAfterBattle - dw MtMoon3EndBattleText4 ; TextEndBattle - dw MtMoon3EndBattleText4 ; TextEndBattle + dw MtMoon3BattleText4 + dw MtMoon3AfterBattleText4 + dw MtMoon3EndBattleText4 + dw MtMoon3EndBattleText4 -MtMoon3TrainerHeader4: ; 49e6c (12:5e6c) +MtMoon3TrainerHeader2: dbEventFlagBit EVENT_BEAT_MT_MOON_3_TRAINER_4 - db ($4 << 4) ; trainer's view range + db ($4 << 4) dwEventFlagAddress EVENT_BEAT_MT_MOON_3_TRAINER_4 - dw MtMoon3BattleText5 ; TextBeforeBattle - dw MtMoon3AfterBattleText5 ; TextAfterBattle - dw MtMoon3EndBattleText5 ; TextEndBattle - dw MtMoon3EndBattleText5 ; TextEndBattle + dw MtMoon3BattleText5 + dw MtMoon3AfterBattleText5 + dw MtMoon3EndBattleText5 + dw MtMoon3EndBattleText5 - db $ff + db $FF + +MtMoon3Text2: +MtMoon3Text6: + db "@" + +MtMoon3Text12: + TX_FAR _MtMoonJessieJamesText1 + TX_ASM + ld c, 10 + call DelayFrames + ld a, PLAYER_DIR_UP + ld [wPlayerMovingDirection], a + ld a, $0 + ld [wEmotionBubbleSpriteIndex], a + ld a, $0 + ld [wWhichEmotionBubble], a + predef EmotionBubble + ld c, 20 + call DelayFrames + jp TextScriptEnd + +MtMoon3Text13: + TX_FAR _MtMoonJessieJamesText2 + db "@" -MtMoon3Text1: ; 49e79 (12:5e79) +MtMoon3JessieJamesEndBattleText: + TX_FAR _MtMoonJessieJamesText3 + db "@" + +MtMoon3Text14: + TX_FAR _MtMoonJessieJamesText4 + TX_ASM + ld c, 64 + call DelayFrames + jp TextScriptEnd + +MtMoon3Text1: TX_ASM CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD - jr z, .asm_49e8d - and $c0 - jr nz, .asm_49eb8 - ld hl, MtMoon3Text_49f8f + jr z, .asm_4a02f + and $81 ; CheckEitherEventSetReuseA EVENT_GOT_DOME_FOSSIL, EVENT_GOT_HELIX_FOSSIL + jr nz, .asm_4a057 + ld hl, MtMoon3Text_4a116 call PrintText - jr .asm_49ebe -.asm_49e8d - ld hl, MtMoon3Text_49f85 + jr .asm_4a05d + +.asm_4a02f + ld hl, MtMoon3Text_4a10c call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, MtMoon3Text_49f8a - ld de, MtMoon3Text_49f8a + ld hl, MtMoon3SuperNerdEndBattleText + ld de, MtMoon3SuperNerdEndBattleText call SaveEndBattleTextPointers ld a, [H_SPRITEINDEX] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a - jr .asm_49ebe -.asm_49eb8 - ld hl, MtMoon3Text_49f94 + call MtMoon3Script_49ce5 + jr .asm_4a05d + +.asm_4a057 + ld hl, MtMoon3Text_4a11b call PrintText -.asm_49ebe +.asm_4a05d jp TextScriptEnd -MtMoon3Text2: ; 49ec1 (12:5ec1) +MtMoon3Text3: TX_ASM ld hl, MtMoon3TrainerHeader0 - call TalkToTrainer - jp TextScriptEnd + jr MtMoon3TalkToTrainer -MtMoon3Text3: ; 49ecb (12:5ecb) +MtMoon3Text4: TX_ASM - ld hl, MtMoon3TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd + ld hl, MtMoon3TrainerHeader1 + jr MtMoon3TalkToTrainer -MtMoon3Text4: ; 49ed5 (12:5ed5) - TX_ASM - ld hl, MtMoon3TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd -MtMoon3Text5: ; 49edf (12:5edf) +MtMoon3Text5: TX_ASM - ld hl, MtMoon3TrainerHeader4 + ld hl, MtMoon3TrainerHeader2 +MtMoon3TalkToTrainer: call TalkToTrainer jp TextScriptEnd -MtMoon3Text6: ; 49ee9 (12:5ee9) +MtMoon3Text7: TX_ASM ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, MtMoon3Text_49f24 + ld hl, MtMoon3Text_4a0ae call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_49f21 + jr nz, .asm_4a0ab lb bc, DOME_FOSSIL, 1 call GiveItem - jp nc, MtMoon3Script_49f76 - call MtMoon3Script_49f69 + jp nc, MtMoon3Script_4a0fd + call MtMoon3Script_4a0f0 ld a, HS_MT_MOON_3_FOSSIL_1 ld [wMissableObjectIndex], a predef HideObject SetEvent EVENT_GOT_DOME_FOSSIL ld a, $4 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a -.asm_49f21 + call MtMoon3Script_49ce5 +.asm_4a0ab jp TextScriptEnd -MtMoon3Text_49f24: ; 49f24 (12:5f24) +MtMoon3Text_4a0ae: TX_FAR _MtMoon3Text_49f24 db "@" -MtMoon3Text7: ; 49f29 (12:5f29) +MtMoon3Text8: TX_ASM ld a, $1 ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, MtMoon3Text_49f64 + ld hl, MtMoon3Text_4a0eb call PrintText call YesNoChoice ld a, [wCurrentMenuItem] and a - jr nz, .asm_49f61 + jr nz, .asm_4a0e8 lb bc, HELIX_FOSSIL, 1 call GiveItem - jp nc, MtMoon3Script_49f76 - call MtMoon3Script_49f69 + jp nc, MtMoon3Script_4a0fd + call MtMoon3Script_4a0f0 ld a, HS_MT_MOON_3_FOSSIL_2 ld [wMissableObjectIndex], a predef HideObject SetEvent EVENT_GOT_HELIX_FOSSIL ld a, $4 - ld [W_MTMOON3CURSCRIPT], a - ld [W_CURMAPSCRIPT], a -.asm_49f61 + call MtMoon3Script_49ce5 +.asm_4a0e8 jp TextScriptEnd -MtMoon3Text_49f64: ; 49f64 (12:5f64) +MtMoon3Text_4a0eb: TX_FAR _MtMoon3Text_49f64 db "@" -MtMoon3Script_49f69: ; 49f69 (12:5f69) - ld hl, MtMoon3Text_49f6f +MtMoon3Script_4a0f0: + ld hl, MtMoon3Text_4a0f6 jp PrintText -MtMoon3Text_49f6f: ; 49f6f (12:5f6f) +MtMoon3Text_4a0f6: TX_FAR _MtMoon3Text_49f6f - db $11, $d, "@" + TX_SFX_KEY_ITEM + TX_WAIT_BUTTON + db "@" -MtMoon3Script_49f76: ; 49f76 (12:5f76) - ld hl, MtMoon3Text_49f7f +MtMoon3Script_4a0fd: + ld hl, MtMoon3Text_4a106 call PrintText jp TextScriptEnd -MtMoon3Text_49f7f: ; 49f7f (12:5f7f) +MtMoon3Text_4a106: TX_FAR _MtMoon3Text_49f7f - db $d, "@" + TX_WAIT_BUTTON + db "@" -MtMoon3Text_49f85: ; 49f85 (12:5f85) +MtMoon3Text_4a10c: TX_FAR _MtMoon3Text_49f85 db "@" -MtMoon3Text_49f8a: ; 49f8a (12:5f8a) +MtMoon3SuperNerdEndBattleText: TX_FAR _MtMoon3Text_49f8a db "@" -MtMoon3Text_49f8f: ; 49f8f (12:5f8f) +MtMoon3Text_4a116: TX_FAR _MtMoon3Text_49f8f db "@" -MtMoon3Text_49f94: ; 49f94 (12:5f94) +MtMoon3Text_4a11b: TX_FAR _MtMoon3Text_49f94 db "@" -MtMoon3Text_49f99: ; 49f99 (12:5f99) +MtMoon3Text11: TX_FAR _MtMoon3Text_49f99 - db $11, "@" - -MtMoon3BattleText2: ; 49f9f (12:5f9f) - TX_FAR _MtMoon3BattleText2 + TX_SFX_KEY_ITEM db "@" -MtMoon3EndBattleText2: ; 49fa4 (12:5fa4) - TX_FAR _MtMoon3EndBattleText2 - db "@" - -MtMoon3AfterBattleText2: ; 49fa9 (12:5fa9) - TX_FAR _MtMoon3AfterBattleText2 - db "@" - -MtMoon3BattleText3: ; 49fae (12:5fae) +MtMoon3BattleText3: TX_FAR _MtMoon3BattleText3 db "@" -MtMoon3EndBattleText3: ; 49fb3 (12:5fb3) +MtMoon3EndBattleText3: TX_FAR _MtMoon3EndBattleText3 db "@" -MtMoon3AfterBattleText3: ; 49fb8 (12:5fb8) +MtMoon3AfterBattleText3: TX_FAR _MtMoon3AfterBattleText3 db "@" -MtMoon3BattleText4: ; 49fbd (12:5fbd) +MtMoon3BattleText4: TX_FAR _MtMoon3BattleText4 db "@" -MtMoon3EndBattleText4: ; 49fc2 (12:5fc2) +MtMoon3EndBattleText4: TX_FAR _MtMoon3EndBattleText4 db "@" -MtMoon3AfterBattleText4: ; 49fc7 (12:5fc7) +MtMoon3AfterBattleText4: TX_FAR _MtMoon3AfterBattleText4 db "@" -MtMoon3BattleText5: ; 49fcc (12:5fcc) +MtMoon3BattleText5: TX_FAR _MtMoon3BattleText5 db "@" -MtMoon3EndBattleText5: ; 49fd1 (12:5fd1) +MtMoon3EndBattleText5: TX_FAR _MtMoon3EndBattleText5 db "@" -MtMoon3AfterBattleText5: ; 49fd6 (12:5fd6) +MtMoon3AfterBattleText5: TX_FAR _MtMoon3AfterBattleText5 db "@" + -- cgit v1.3.1-sl0p From 037dbda5702646ea2f4fb00442071e52f8f03ec0 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 21:55:48 -0400 Subject: Trashed cerulean house --- data/map_header_banks.asm | 4 ++-- data/map_header_pointers.asm | 4 ++-- main.asm | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 90ca27f9..1664cb08 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -62,14 +62,14 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(MtMoon1_h) db BANK(MtMoon2_h) db BANK(MtMoon3_h) - db $07 ; db BANK(CeruleanHouseTrashed_h) + db BANK(CeruleanHouseTrashed_h) db $07 ; db BANK(CeruleanHouse1_h) db $17 ; db BANK(CeruleanPokecenter_h) db $17 ; db BANK(CeruleanGym_h) db $07 ; db BANK(BikeShop_h) db $17 ; db BANK(CeruleanMart_h) db $12 ; db BANK(MtMoonPokecenter_h) - db $07 ; db BANK(CeruleanHouseTrashed_h) + db BANK(CeruleanHouseTrashed_h) db $07 ; db BANK(Route5Gate_h) db $17 ; db BANK(UndergroundPathEntranceRoute5_h) db $15 ; db BANK(DayCareM_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 37357204..4d6a8847 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -62,14 +62,14 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw MtMoon1_h dw MtMoon2_h ;id=60 dw MtMoon3_h - dw $4ec3 ; dw CeruleanHouseTrashed_h + dw CeruleanHouseTrashed_h dw $4f34 ; dw CeruleanHouse1_h dw $44f5 ; dw CeruleanPokecenter_h dw $4577 ; dw CeruleanGym_h dw $5038 ; dw BikeShop_h dw $4757 ; dw CeruleanMart_h dw $52a9 ; dw MtMoonPokecenter_h - dw $4ec3 ; dw CeruleanHouseTrashed_h ; copy + dw CeruleanHouseTrashed_h ; copy dw $5831 ; dw Route5Gate_h dw $55a8 ; dw UndergroundPathEntranceRoute5_h dw $6233 ; dw DayCareM_h diff --git a/main.asm b/main.asm index b12a6b58..91bff12e 100755 --- a/main.asm +++ b/main.asm @@ -344,7 +344,10 @@ INCLUDE "data/mapHeaders/pewterhouse2.asm" INCLUDE "scripts/pewterhouse2.asm" INCLUDE "data/mapObjects/pewterhouse2.asm" - dr $1cec3,$1d7ae ; map scripts +INCLUDE "data/mapHeaders/ceruleanhousetrashed.asm" +INCLUDE "scripts/ceruleanhousetrashed.asm" +INCLUDE "data/mapObjects/ceruleanhousetrashed.asm" + dr $1cf34,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" -- cgit v1.3.1-sl0p From a8b3d3612e43cbcc7e1946c5c1a06f9c54c8d311 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sun, 29 May 2016 22:36:26 -0400 Subject: Bulbasaur house in Cerulean --- constants/event_constants.asm | 2 +- constants/hide_show_constants.asm | 35 ++++++-------- data/mapObjects/ceruleanhouse1.asm | 8 +-- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 7 ++- scripts/ceruleanhouse1.asm | 99 ++++++++++++++++++++++++++++++++++++-- 7 files changed, 123 insertions(+), 32 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 49050dd3..2d1fab45 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -168,7 +168,7 @@ const_value = 0 const EVENT_0A5 ; 0A5, (D75B, bit 5) const EVENT_0A6 ; 0A6, (D75B, bit 6) const EVENT_BEAT_CERULEAN_ROCKET_THIEF ; 0A7, (D75B, bit 7) - const EVENT_0A8 ; 0A8, (D75C, bit 0) + const EVENT_GOT_BULBASAUR_IN_CERULEAN ; 0A8, (D75C, bit 0) const EVENT_0A9 ; 0A9, (D75C, bit 1) const EVENT_0AA ; 0AA, (D75C, bit 2) const EVENT_0AB ; 0AB, (D75C, bit 3) diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 6fc52187..f41477a5 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -51,10 +51,6 @@ const_value = 0 const HS_TOWN_MAP ; 2A const HS_OAKS_LAB_RIVAL ; 2B const HS_STARTER_BALL_1 ; 2C - const HS_STARTER_BALL_2 ; 2D - const HS_STARTER_BALL_3 ; 2E - -const_value SET $2D const HS_OAKS_LAB_OAK_1 ; 2D const HS_POKEDEX_1 ; 2E const HS_POKEDEX_2 ; 2F @@ -62,22 +58,21 @@ const_value SET $2D const HS_VIRIDIAN_GYM_GIOVANNI ; 31 const HS_VIRIDIAN_GYM_ITEM ; 32 const HS_OLD_AMBER ; 33 X - const HS_UNKNOWN_DUNGEON_1_ITEM_1 ; 34 - const HS_UNKNOWN_DUNGEON_1_ITEM_2 ; 35 X - const HS_UNKNOWN_DUNGEON_1_ITEM_3 ; 36 X - const HS_POKEMONTOWER_2_RIVAL ; 37 X - const HS_POKEMONTOWER_3_ITEM ; 38 - const HS_POKEMONTOWER_4_ITEM_1 ; 39 X - const HS_POKEMONTOWER_4_ITEM_2 ; 3A X - const HS_POKEMONTOWER_4_ITEM_3 ; 3B X - const HS_POKEMONTOWER_5_ITEM ; 3C X - const HS_POKEMONTOWER_6_ITEM_1 ; 3D X - const HS_POKEMONTOWER_6_ITEM_2 ; 3E X - const HS_POKEMONTOWER_7_ROCKET_1 ; 3F X - const HS_POKEMONTOWER_7_ROCKET_2 ; 40 X - const HS_POKEMONTOWER_7_ROCKET_3 ; 41 X - -const_value SET $43 ; replace the tower rockets with jessie/james + const HS_CERULEAN_BULBASAUR ; 34 + const HS_UNKNOWN_DUNGEON_1_ITEM_1 ; 35 X + const HS_UNKNOWN_DUNGEON_1_ITEM_2 ; 36 X + const HS_UNKNOWN_DUNGEON_1_ITEM_3 ; 37 X + const HS_POKEMONTOWER_2_RIVAL ; 38 + const HS_POKEMONTOWER_3_ITEM ; 39 X + const HS_POKEMONTOWER_4_ITEM_1 ; 3A X + const HS_POKEMONTOWER_4_ITEM_2 ; 3B X + const HS_POKEMONTOWER_4_ITEM_3 ; 3C X + const HS_POKEMONTOWER_5_ITEM ; 3D X + const HS_POKEMONTOWER_6_ITEM_1 ; 3E X + const HS_POKEMONTOWER_6_ITEM_2 ; 3F X + const HS_POKEMONTOWER_7_ROCKET_1 ; 40 X + const HS_POKEMONTOWER_7_ROCKET_2 ; 41 X + const HS_POKEMONTOWER_7_ROCKET_3 ; 42 const HS_POKEMONTOWER_7_MR_FUJI ; 43 const HS_LAVENDER_HOUSE_1_MR_FUJI ; 44 const HS_CELADON_MANSION_5_GIFT ; 45 diff --git a/data/mapObjects/ceruleanhouse1.asm b/data/mapObjects/ceruleanhouse1.asm index db0be014..aa9f66a4 100755 --- a/data/mapObjects/ceruleanhouse1.asm +++ b/data/mapObjects/ceruleanhouse1.asm @@ -7,9 +7,11 @@ CeruleanHouse1Object: ; 0x1d710 (size=32) db $0 ; signs - db $2 ; objects - object SPRITE_OLD_MEDIUM_WOMAN, $5, $4, STAY, LEFT, $1 ; person - object SPRITE_GAMBLER, $1, $2, STAY, NONE, $2 ; person + db $4 ; objects + object SPRITE_GIRL, $3, $1, STAY, DOWN, $1 ; person + object SPRITE_BULBASAUR, $4, $1, STAY, DOWN, $2 ; person + object SPRITE_ODDISH, $1, $4, STAY, NONE, $3 ; person + object SPRITE_SANDSHREW, $5, $3, STAY, LEFT, $4 ; person ; warp-to EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 1664cb08..bbcdd278 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -63,7 +63,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(MtMoon2_h) db BANK(MtMoon3_h) db BANK(CeruleanHouseTrashed_h) - db $07 ; db BANK(CeruleanHouse1_h) + db BANK(CeruleanHouse1_h) db $17 ; db BANK(CeruleanPokecenter_h) db $17 ; db BANK(CeruleanGym_h) db $07 ; db BANK(BikeShop_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 4d6a8847..9558ca6e 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -63,7 +63,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw MtMoon2_h ;id=60 dw MtMoon3_h dw CeruleanHouseTrashed_h - dw $4f34 ; dw CeruleanHouse1_h + dw CeruleanHouse1_h dw $44f5 ; dw CeruleanPokecenter_h dw $4577 ; dw CeruleanGym_h dw $5038 ; dw BikeShop_h diff --git a/main.asm b/main.asm index 91bff12e..988add14 100755 --- a/main.asm +++ b/main.asm @@ -297,6 +297,7 @@ ViridianHouseBlocks: Route2HouseBlocks: PewterHouse1Blocks: PewterHouse2Blocks: +CeruleanHouse1Blocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: INCBIN "maps/school.blk" @@ -347,7 +348,11 @@ INCLUDE "data/mapObjects/pewterhouse2.asm" INCLUDE "data/mapHeaders/ceruleanhousetrashed.asm" INCLUDE "scripts/ceruleanhousetrashed.asm" INCLUDE "data/mapObjects/ceruleanhousetrashed.asm" - dr $1cf34,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/ceruleanhouse1.asm" +INCLUDE "scripts/ceruleanhouse1.asm" +INCLUDE "data/mapObjects/ceruleanhouse1.asm" + dr $1d038,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" diff --git a/scripts/ceruleanhouse1.asm b/scripts/ceruleanhouse1.asm index e703d830..0b9a9052 100755 --- a/scripts/ceruleanhouse1.asm +++ b/scripts/ceruleanhouse1.asm @@ -1,17 +1,106 @@ CeruleanHouse1Script: ; 1d6f6 (7:56f6) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret CeruleanHouse1TextPointers: ; 1d6f9 (7:56f9) dw CeruleanHouse1Text1 dw CeruleanHouse1Text2 + dw CeruleanHouse1Text3 + dw CeruleanHouse1Text4 CeruleanHouse1Text1: ; 1d6fd (7:56fd) - TX_FAR _CeruleanHouse1Text1 + TX_ASM + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + CheckEvent EVENT_GOT_BULBASAUR_IN_CERULEAN + jr nz, .asm_1cfbf + ld hl, CeruleanHouse1Text_1cfc8 + call PrintText + ld a, [wPikachuHappiness] + cp 147 + jr c, .asm_1cfb3 + ld hl, CeruleanHouse1Text_1cfce + call PrintText + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jr nz, .asm_1cfb6 + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, BULBASAUR + ld [wd11e], a + ld [wcf91], a + call GetMonName + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + lb bc, BULBASAUR, 10 + call GivePokemon + jr nc, .asm_1cfb3 + ld a, [wAddedToParty] + and a + call z, WaitForTextScrollButtonPress + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, CeruleanHouse1Text_1cfd3 + call PrintText + ld a, HS_CERULEAN_BULBASAUR + ld [wMissableObjectIndex], a + predef HideObject + SetEvent EVENT_GOT_BULBASAUR_IN_CERULEAN +.asm_1cfb3 + jp TextScriptEnd + +.asm_1cfb6 + ld hl, CeruleanHouse1Text_1cfdf + call PrintText + jp TextScriptEnd + +.asm_1cfbf + ld hl, CeruleanHouse1Text_1cfd9 + call PrintText + jp TextScriptEnd + +CeruleanHouse1Text_1cfc8: + TX_FAR MelanieText1 + TX_WAIT_BUTTON + db "@" + +CeruleanHouse1Text_1cfce: + TX_FAR MelanieText2 + db "@" + +CeruleanHouse1Text_1cfd3: + TX_FAR MelanieText3 + TX_WAIT_BUTTON + db "@" + +CeruleanHouse1Text_1cfd9: + TX_FAR MelanieText4 + TX_WAIT_BUTTON + db "@" + +CeruleanHouse1Text_1cfdf: + TX_FAR MelanieText5 + TX_WAIT_BUTTON db "@" CeruleanHouse1Text2: ; 1d702 (7:5702) + TX_FAR MelanieBulbasaurText + TX_ASM + ld a, BULBASAUR + call PlayCry + jp TextScriptEnd + +CeruleanHouse1Text3: ; 1d702 (7:5702) + TX_FAR MelanieOddishText + TX_ASM + ld a, ODDISH + call PlayCry + jp TextScriptEnd + +CeruleanHouse1Text4: ; 1d702 (7:5702) + TX_FAR MelanieSandshrewText TX_ASM - ld a, $6 - ld [wWhichTrade], a - predef DoInGameTradeDialogue + ld a, SANDSHREW + call PlayCry jp TextScriptEnd -- cgit v1.3.1-sl0p From 5d6f3ec1d4f24bb2598359402c361f2ec47546da Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 09:36:57 -0400 Subject: Cerulean Pokemon Center; Func_5c0d4; space after comma in engine/menu/pokedex.asm --- constants/pokedex_constants.asm | 2 +- constants/pokemon_constants.asm | 2 +- data/mapObjects/ceruleanpokecenter.asm | 5 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- engine/menu/pokedex.asm | 526 ++++++++++++++++----------------- main.asm | 18 +- scripts/ceruleanpokecenter.asm | 6 + wram.asm | 2 +- 9 files changed, 292 insertions(+), 273 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 07cda548..360fbb4c 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -82,7 +82,7 @@ const_value = 1 const DEX_SLOWBRO ; 80 const DEX_MAGNEMITE ; 81 const DEX_MAGNETON ; 82 - const DEX_FARFETCHD ; 83 + const DEX_FARFETCHD ; 83 const DEX_DODUO ; 84 const DEX_DODRIO ; 85 const DEX_SEEL ; 86 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 773495e3..96d44ef5 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -63,7 +63,7 @@ const_value = 1 const MISSINGNO_3D ; $3D const MISSINGNO_3E ; $3E const MISSINGNO_3F ; $3F - const FARFETCHD ; $40 + const FARFETCHD ; $40 const VENONAT ; $41 const DRAGONITE ; $42 const MISSINGNO_43 ; $43 diff --git a/data/mapObjects/ceruleanpokecenter.asm b/data/mapObjects/ceruleanpokecenter.asm index 930995dd..4b92f0d8 100755 --- a/data/mapObjects/ceruleanpokecenter.asm +++ b/data/mapObjects/ceruleanpokecenter.asm @@ -7,11 +7,12 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_BLACK_HAIR_BOY_2, $a, $5, WALK, $0, $2 ; person - object SPRITE_GENTLEMAN, $4, $3, STAY, DOWN, $3 ; person + object SPRITE_GENTLEMAN, $4, $3, STAY, UP, $3 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index bbcdd278..65579280 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -64,7 +64,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(MtMoon3_h) db BANK(CeruleanHouseTrashed_h) db BANK(CeruleanHouse1_h) - db $17 ; db BANK(CeruleanPokecenter_h) + db BANK(CeruleanPokecenter_h) db $17 ; db BANK(CeruleanGym_h) db $07 ; db BANK(BikeShop_h) db $17 ; db BANK(CeruleanMart_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 9558ca6e..d80f85f5 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -64,7 +64,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw MtMoon3_h dw CeruleanHouseTrashed_h dw CeruleanHouse1_h - dw $44f5 ; dw CeruleanPokecenter_h + dw CeruleanPokecenter_h dw $4577 ; dw CeruleanGym_h dw $5038 ; dw BikeShop_h dw $4757 ; dw CeruleanMart_h diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index c481a20c..298816c1 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -2,54 +2,54 @@ ShowPokedexMenu: ; 40000 (10:4000) call GBPalWhiteOut call ClearScreen call UpdateSprites - ld a,[wListScrollOffset] + ld a, [wListScrollOffset] push af xor a - ld [wCurrentMenuItem],a - ld [wListScrollOffset],a - ld [wLastMenuItem],a + ld [wCurrentMenuItem], a + ld [wListScrollOffset], a + ld [wLastMenuItem], a inc a - ld [wd11e],a - ld [hJoy7],a + ld [wd11e], a + ld [hJoy7], a .setUpGraphics callab LoadPokedexTilePatterns .asm_40025 ld b, SET_PAL_GENERIC call RunPaletteCommand .doPokemonListMenu - ld hl,wTopMenuItemY - ld a,3 - ld [hli],a ; top menu item Y + ld hl, wTopMenuItemY + ld a, 3 + ld [hli], a ; top menu item Y xor a - ld [hli],a ; top menu item X + ld [hli], a ; top menu item X inc a - ld [wMenuWatchMovingOutOfBounds],a + ld [wMenuWatchMovingOutOfBounds], a inc hl inc hl - ld a,6 - ld [hli],a ; max menu item ID - ld [hl],D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON + ld a, 6 + ld [hli], a ; max menu item ID + ld [hl], D_LEFT | D_RIGHT | B_BUTTON | A_BUTTON call HandlePokedexListMenu - jr c,.goToSideMenu ; if the player chose a pokemon from the list + jr c, .goToSideMenu ; if the player chose a pokemon from the list .exitPokedex xor a - ld [wMenuWatchMovingOutOfBounds],a - ld [wCurrentMenuItem],a - ld [wLastMenuItem],a - ld [hJoy7],a - ld [wWastedByteCD3A],a - ld [wOverrideSimulatedJoypadStatesMask],a + ld [wMenuWatchMovingOutOfBounds], a + ld [wCurrentMenuItem], a + ld [wLastMenuItem], a + ld [hJoy7], a + ld [wWastedByteCD3A], a + ld [wOverrideSimulatedJoypadStatesMask], a pop af - ld [wListScrollOffset],a + ld [wListScrollOffset], a call GBPalWhiteOutWithDelay3 call RunDefaultPaletteCommand jp ReloadMapData .goToSideMenu call HandlePokedexSideMenu dec b - jr z,.exitPokedex ; if the player chose Quit + jr z, .exitPokedex ; if the player chose Quit dec b - jr z,.doPokemonListMenu ; if pokemon not seen or player pressed B button + jr z, .doPokemonListMenu ; if pokemon not seen or player pressed B button dec b jr z, .asm_40025 jp .setUpGraphics ; if pokemon data or area was shown @@ -62,73 +62,73 @@ ShowPokedexMenu: ; 40000 (10:4000) ; 02: the pokemon has not been seen yet or the player pressed the B button HandlePokedexSideMenu: ; 40070 (10:4070) call PlaceUnfilledArrowMenuCursor - ld a,[wCurrentMenuItem] + ld a, [wCurrentMenuItem] push af - ld b,a - ld a,[wLastMenuItem] + ld b, a + ld a, [wLastMenuItem] push af - ld a,[wListScrollOffset] + ld a, [wListScrollOffset] push af add b inc a - ld [wd11e],a - ld a,[wd11e] + ld [wd11e], a + ld a, [wd11e] push af - ld a,[wDexMaxSeenMon] + ld a, [wDexMaxSeenMon] push af ; this doesn't need to be preserved - ld hl,wPokedexSeen + ld hl, wPokedexSeen call IsPokemonBitSet - ld b,2 - jr z,.exitSideMenu + ld b, 2 + jr z, .exitSideMenu call PokedexToIndex - ld hl,wTopMenuItemY - ld a,8 - ld [hli],a ; top menu item Y - ld a,15 - ld [hli],a ; top menu item X + ld hl, wTopMenuItemY + ld a, 8 + ld [hli], a ; top menu item Y + ld a, 15 + ld [hli], a ; top menu item X xor a - ld [hli],a ; current menu item ID + ld [hli], a ; current menu item ID inc hl - ld a,4 - ld [hli],a ; max menu item ID + ld a, 4 + ld [hli], a ; max menu item ID ld a, A_BUTTON | B_BUTTON - ld [hli],a ; menu watched keys (A button and B button) + ld [hli], a ; menu watched keys (A button and B button) xor a - ld [hli],a ; old menu item ID - ld [wMenuWatchMovingOutOfBounds],a - ld [hJoy7],a + ld [hli], a ; old menu item ID + ld [wMenuWatchMovingOutOfBounds], a + ld [hJoy7], a .handleMenuInput call HandleMenuInput - bit 1,a ; was the B button pressed? - ld b,2 - jr nz,.buttonBPressed - ld a,[wCurrentMenuItem] + bit 1, a ; was the B button pressed? + ld b, 2 + jr nz, .buttonBPressed + ld a, [wCurrentMenuItem] and a - jr z,.choseData + jr z, .choseData dec a - jr z,.choseCry + jr z, .choseCry dec a - jr z,.choseArea + jr z, .choseArea dec a - jr z,.chosePrint + jr z, .chosePrint .choseQuit - ld b,1 + ld b, 1 .exitSideMenu pop af - ld [wDexMaxSeenMon],a + ld [wDexMaxSeenMon], a pop af - ld [wd11e],a + ld [wd11e], a pop af - ld [wListScrollOffset],a + ld [wListScrollOffset], a pop af - ld [wLastMenuItem],a + ld [wLastMenuItem], a pop af - ld [wCurrentMenuItem],a + ld [wCurrentMenuItem], a ld a, $1 ld [hJoy7], a push bc coord hl, 0, 3 - ld de,20 + ld de, 20 lb bc, " ", 13 call DrawTileLine ; cover up the menu cursor in the pokemon list pop bc @@ -136,24 +136,24 @@ HandlePokedexSideMenu: ; 40070 (10:4070) .buttonBPressed push bc coord hl, 15, 8 - ld de,20 + ld de, 20 lb bc, " ", 9 call DrawTileLine ; cover up the menu cursor in the side menu pop bc jr .exitSideMenu .choseData call ShowPokedexDataInternal - ld b,0 + ld b, 0 jr .exitSideMenu ; play pokemon cry .choseCry - ld a,[wd11e] + ld a, [wd11e] call GetCryData call PlaySound jr .handleMenuInput .choseArea predef LoadTownMap_Nest ; display pokemon areas - ld b,0 + ld b, 0 jr .exitSideMenu .chosePrint ld a, [hTilesetType] @@ -179,63 +179,63 @@ HandlePokedexListMenu: ; 40140 (10:4140) call Func_4027c call GBPalNormal call HandleMenuInput - bit 1,a ; was the B button pressed? - jp nz,.buttonBPressed + bit 1, a ; was the B button pressed? + jp nz, .buttonBPressed bit 0, a ; was the A button pressed? - jp nz,.buttonAPressed + jp nz, .buttonAPressed .checkIfUpPressed - bit 6,a ; was Up pressed? - jr z,.checkIfDownPressed + bit 6, a ; was Up pressed? + jr z, .checkIfDownPressed .upPressed ; scroll up one row - ld a,[wListScrollOffset] + ld a, [wListScrollOffset] and a - jp z,.loop + jp z, .loop dec a - ld [wListScrollOffset],a + ld [wListScrollOffset], a jp .loop .checkIfDownPressed - bit 7,a ; was Down pressed? - jr z,.checkIfRightPressed + bit 7, a ; was Down pressed? + jr z, .checkIfRightPressed .downPressed ; scroll down one row - ld a,[wDexMaxSeenMon] - cp a,7 - jp c,.loop ; can't if the list is shorter than 7 - sub a,7 - ld b,a - ld a,[wListScrollOffset] + ld a, [wDexMaxSeenMon] + cp a, 7 + jp c, .loop ; can't if the list is shorter than 7 + sub a, 7 + ld b, a + ld a, [wListScrollOffset] cp b - jp z,.loop + jp z, .loop inc a - ld [wListScrollOffset],a + ld [wListScrollOffset], a jp .loop .checkIfRightPressed - bit 4,a ; was Right pressed? - jr z,.checkIfLeftPressed + bit 4, a ; was Right pressed? + jr z, .checkIfLeftPressed .rightPressed ; scroll down 7 rows - ld a,[wDexMaxSeenMon] - cp a,7 - jp c,.loop ; can't if the list is shorter than 7 - sub a,6 - ld b,a - ld a,[wListScrollOffset] - add a,7 - ld [wListScrollOffset],a + ld a, [wDexMaxSeenMon] + cp a, 7 + jp c, .loop ; can't if the list is shorter than 7 + sub a, 6 + ld b, a + ld a, [wListScrollOffset] + add a, 7 + ld [wListScrollOffset], a cp b - jp c,.loop + jp c, .loop dec b - ld a,b - ld [wListScrollOffset],a + ld a, b + ld [wListScrollOffset], a jp .loop .checkIfLeftPressed ; scroll up 7 rows - bit 5,a ; was Left pressed? - jr z,.buttonAPressed + bit 5, a ; was Left pressed? + jr z, .buttonAPressed .leftPressed - ld a,[wListScrollOffset] - sub a,7 - ld [wListScrollOffset],a - jp nc,.loop + ld a, [wListScrollOffset] + sub a, 7 + ld [wListScrollOffset], a + jp nc, .loop xor a - ld [wListScrollOffset],a + ld [wListScrollOffset], a jp .loop .buttonAPressed scf @@ -249,72 +249,72 @@ Func_401c2: ; 401c2 (10:41c2) ld [H_AUTOBGTRANSFERENABLED], a ; draw the horizontal line separating the seen and owned amounts from the menu coord hl, 15, 6 - ld a,$7a ; horizontal line tile - ld [hli],a - ld [hli],a - ld [hli],a - ld [hli],a - ld [hli],a + ld a, $7a ; horizontal line tile + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a + ld [hli], a coord hl, 14, 0 - ld [hl],$71 ; vertical line tile + ld [hl], $71 ; vertical line tile coord hl, 14, 1 call DrawPokedexVerticalLine coord hl, 14, 9 call DrawPokedexVerticalLine - ld hl,wPokedexSeen - ld b,wPokedexSeenEnd - wPokedexSeen + ld hl, wPokedexSeen + ld b, wPokedexSeenEnd - wPokedexSeen call CountSetBits ld de, wNumSetBits coord hl, 16, 2 lb bc, 1, 3 call PrintNumber ; print number of seen pokemon - ld hl,wPokedexOwned - ld b,wPokedexOwnedEnd - wPokedexOwned + ld hl, wPokedexOwned + ld b, wPokedexOwnedEnd - wPokedexOwned call CountSetBits ld de, wNumSetBits coord hl, 16, 5 lb bc, 1, 3 call PrintNumber ; print number of owned pokemon coord hl, 16, 1 - ld de,PokedexSeenText + ld de, PokedexSeenText call PlaceString coord hl, 16, 4 - ld de,PokedexOwnText + ld de, PokedexOwnText call PlaceString coord hl, 1, 1 - ld de,PokedexContentsText + ld de, PokedexContentsText call PlaceString coord hl, 16, 8 - ld de,PokedexMenuItemsText + ld de, PokedexMenuItemsText call PlaceString ; find the highest pokedex number among the pokemon the player has seen - ld hl,wPokedexSeenEnd - 1 - ld b,(wPokedexSeenEnd - wPokedexSeen) * 8 + 1 + ld hl, wPokedexSeenEnd - 1 + ld b, (wPokedexSeenEnd - wPokedexSeen) * 8 + 1 .maxSeenPokemonLoop - ld a,[hld] - ld c,8 + ld a, [hld] + ld c, 8 .maxSeenPokemonInnerLoop dec b sla a - jr c,.storeMaxSeenPokemon + jr c, .storeMaxSeenPokemon dec c - jr nz,.maxSeenPokemonInnerLoop + jr nz, .maxSeenPokemonInnerLoop jr .maxSeenPokemonLoop .storeMaxSeenPokemon - ld a,b - ld [wDexMaxSeenMon],a + ld a, b + ld [wDexMaxSeenMon], a ret DrawPokedexVerticalLine: ; 40243 (10:4243) - ld c,9 ; height of line - ld de,SCREEN_WIDTH ; width of screen - ld a,$71 ; vertical line tile + ld c, 9 ; height of line + ld de, SCREEN_WIDTH ; width of screen + ld a, $71 ; vertical line tile .loop - ld [hl],a - add hl,de - xor a,1 ; toggle between vertical line tile and box tile + ld [hl], a + add hl, de + xor a, 1 ; toggle between vertical line tile and box tile dec c - jr nz,.loop + jr nz, .loop ret PokedexSeenText: ; 40252 (10:4252) @@ -335,51 +335,51 @@ PokedexMenuItemsText: ; 40264 (10:4264) Func_4027c: ; 4027c (10:427c) xor a - ld [H_AUTOBGTRANSFERENABLED],a + ld [H_AUTOBGTRANSFERENABLED], a coord hl, 4, 2 lb bc, 14, 10 call ClearScreenArea coord hl, 1, 3 - ld a,[wListScrollOffset] - ld [wd11e],a - ld d,7 - ld a,[wDexMaxSeenMon] - cp a,7 - jr nc,.printPokemonLoop - ld d,a + ld a, [wListScrollOffset] + ld [wd11e], a + ld d, 7 + ld a, [wDexMaxSeenMon] + cp a, 7 + jr nc, .printPokemonLoop + ld d, a dec a - ld [wMaxMenuItem],a + ld [wMaxMenuItem], a ; loop to print pokemon pokedex numbers and names ; if the player has owned the pokemon, it puts a pokeball beside the name .printPokemonLoop - ld a,[wd11e] + ld a, [wd11e] inc a - ld [wd11e],a + ld [wd11e], a push af push de push hl - ld de,-SCREEN_WIDTH - add hl,de - ld de,wd11e + ld de, -SCREEN_WIDTH + add hl, de + ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber ; print the pokedex number - ld de,SCREEN_WIDTH - add hl,de + ld de, SCREEN_WIDTH + add hl, de dec hl push hl - ld hl,wPokedexOwned + ld hl, wPokedexOwned call IsPokemonBitSet pop hl - ld a," " - jr z,.writeTile - ld a,$72 ; pokeball tile + ld a, " " + jr z, .writeTile + ld a, $72 ; pokeball tile .writeTile - ld [hl],a ; put a pokeball next to pokemon that the player has owned + ld [hl], a ; put a pokeball next to pokemon that the player has owned push hl - ld hl,wPokedexSeen + ld hl, wPokedexSeen call IsPokemonBitSet - jr nz,.getPokemonName ; if the player has seen the pokemon - ld de,.dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon + jr nz, .getPokemonName ; if the player has seen the pokemon + ld de, .dashedLine ; print a dashed line in place of the name if the player hasn't seen the pokemon jr .skipGettingName .dashedLine ; for unseen pokemon in the list db "----------@" @@ -391,15 +391,15 @@ Func_4027c: ; 4027c (10:427c) inc hl call PlaceString pop hl - ld bc,2 * 20 - add hl,bc + ld bc, 2 * 20 + add hl, bc pop de pop af - ld [wd11e],a + ld [wd11e], a dec d - jr nz,.printPokemonLoop - ld a,01 - ld [H_AUTOBGTRANSFERENABLED],a + jr nz, .printPokemonLoop + ld a, 01 + ld [H_AUTOBGTRANSFERENABLED], a call Delay3 ret @@ -408,12 +408,12 @@ Func_4027c: ; 4027c (10:427c) ; [wd11e] = pokedex number ; hl = address of bit field IsPokemonBitSet: ; 40303 (10:4303) - ld a,[wd11e] + ld a, [wd11e] dec a - ld c,a - ld b,FLAG_TEST + ld c, a + ld b, FLAG_TEST predef FlagActionPredef - ld a,c + ld a, c and a ret @@ -426,44 +426,44 @@ ShowPokedexData: ; 40312 (10:4312) ; function to display pokedex data from inside the pokedex ShowPokedexDataInternal: ; 40323 (10:4323) - ld hl,wd72c - set 1,[hl] - ld a,$33 ; 3/7 volume - ld [rNR50],a + ld hl, wd72c + set 1, [hl] + ld a, $33 ; 3/7 volume + ld [rNR50], a ld a, [hTilesetType] push af xor a ld [hTilesetType], a call GBPalWhiteOut ; zero all palettes - ld a,[wd11e] ; pokemon ID - ld [wcf91],a + ld a, [wd11e] ; pokemon ID + ld [wcf91], a push af ld b, SET_PAL_POKEDEX call RunPaletteCommand pop af - ld [wd11e],a + ld [wd11e], a call Func_4039c call c, Func_404ae .waitForButtonPress call JoypadLowSensitivity - ld a,[hJoy5] - and a,A_BUTTON | B_BUTTON - jr z,.waitForButtonPress + ld a, [hJoy5] + and a, A_BUTTON | B_BUTTON + jr z, .waitForButtonPress pop af - ld [hTilesetType],a + ld [hTilesetType], a call GBPalWhiteOut call ClearScreen call RunDefaultPaletteCommand call LoadTextBoxTilePatterns call GBPalNormal - ld hl,wd72c - res 1,[hl] - ld a,$77 ; max volume - ld [rNR50],a + ld hl, wd72c + res 1, [hl] + ld a, $77 ; max volume + ld [rNR50], a ret HeightWeightText: ; 40370 (10:4370) - db "HT ?",$60,"??",$61 + db "HT ?", $60, "??", $61 next "WT ???lb@" ; XXX does anything point to this? @@ -472,77 +472,77 @@ PokeText: ; 40385 (10:4385) ; horizontal line that divides the pokedex text description from the rest of the data PokedexDataDividerLine: ; 40387 (10:4387) - db $68,$69,$6B,$69,$6B - db $69,$6B,$69,$6B,$6B - db $6B,$6B,$69,$6B,$69 - db $6B,$69,$6B,$69,$6A + db $68, $69, $6B, $69, $6B + db $69, $6B, $69, $6B, $6B + db $6B, $6B, $69, $6B, $69 + db $6B, $69, $6B, $69, $6A db "@" Func_4039c: ; 4039c (10:439c) call ClearScreen coord hl, 0, 0 - ld de,1 + ld de, 1 lb bc, $64, SCREEN_WIDTH call DrawTileLine ; draw top border coord hl, 0, 17 ld b, $6f call DrawTileLine ; draw bottom border coord hl, 0, 1 - ld de,20 + ld de, 20 lb bc, $66, $10 call DrawTileLine ; draw left border coord hl, 19, 1 - ld b,$67 + ld b, $67 call DrawTileLine ; draw right border - ld a,$63 ; upper left corner tile + ld a, $63 ; upper left corner tile Coorda 0, 0 - ld a,$65 ; upper right corner tile + ld a, $65 ; upper right corner tile Coorda 19, 0 - ld a,$6c ; lower left corner tile + ld a, $6c ; lower left corner tile Coorda 0, 17 - ld a,$6e ; lower right corner tile + ld a, $6e ; lower right corner tile Coorda 19, 17 coord hl, 0, 9 - ld de,PokedexDataDividerLine + ld de, PokedexDataDividerLine call PlaceString ; draw horizontal divider line coord hl, 9, 6 - ld de,HeightWeightText + ld de, HeightWeightText call PlaceString call GetMonName coord hl, 9, 2 call PlaceString - ld hl,PokedexEntryPointers - ld a,[wd11e] + ld hl, PokedexEntryPointers + ld a, [wd11e] dec a - ld e,a - ld d,0 - add hl,de - add hl,de - ld a,[hli] - ld e,a - ld d,[hl] ; de = address of pokedex entry + ld e, a + ld d, 0 + add hl, de + add hl, de + ld a, [hli] + ld e, a + ld d, [hl] ; de = address of pokedex entry coord hl, 9, 4 call PlaceString ; print species name - ld h,b - ld l,c + ld h, b + ld l, c push de - ld a,[wd11e] + ld a, [wd11e] push af call IndexToPokedex coord hl, 2, 8 ld a, "№" - ld [hli],a - ld a,$f2 - ld [hli],a - ld de,wd11e + ld [hli], a + ld a, $f2 + ld [hli], a + ld de, wd11e lb bc, LEADING_ZEROES | 1, 3 call PrintNumber ; print pokedex number - ld hl,wPokedexOwned + ld hl, wPokedexOwned call IsPokemonBitSet pop af - ld [wd11e],a - ld a,[wcf91] - ld [wd0b5],a + ld [wd11e], a + ld a, [wcf91] + ld [wd0b5], a pop de push af push bc @@ -553,65 +553,65 @@ Func_4039c: ; 4039c (10:439c) call GetMonHeader ; load pokemon picture location coord hl, 1, 1 call LoadFlippedFrontSpriteByMonIndex ; draw pokemon picture - ld a,[wcf91] + ld a, [wcf91] call PlayCry ; play pokemon cry pop hl pop de pop bc pop af - ld a,c + ld a, c and a ret z ; if the pokemon has not been owned, don't print the height, weight, or description inc de ; de = address of feet (height) - ld a,[de] ; reads feet, but a is overwritten without being used + ld a, [de] ; reads feet, but a is overwritten without being used coord hl, 12, 6 lb bc, 1, 2 call PrintNumber ; print feet (height) - ld a,$60 ; feet symbol tile (one tick) - ld [hl],a + ld a, $60 ; feet symbol tile (one tick) + ld [hl], a inc de inc de ; de = address of inches (height) coord hl, 15, 6 lb bc, LEADING_ZEROES | 1, 2 call PrintNumber ; print inches (height) - ld a,$61 ; inches symbol tile (two ticks) - ld [hl],a + ld a, $61 ; inches symbol tile (two ticks) + ld [hl], a ; now print the weight (note that weight is stored in tenths of pounds internally) inc de inc de inc de ; de = address of upper byte of weight push de ; put weight in big-endian order at hDexWeight - ld hl,hDexWeight - ld a,[hl] ; save existing value of [hDexWeight] + ld hl, hDexWeight + ld a, [hl] ; save existing value of [hDexWeight] push af - ld a,[de] ; a = upper byte of weight - ld [hli],a ; store upper byte of weight in [hDexWeight] - ld a,[hl] ; save existing value of [hDexWeight + 1] + ld a, [de] ; a = upper byte of weight + ld [hli], a ; store upper byte of weight in [hDexWeight] + ld a, [hl] ; save existing value of [hDexWeight + 1] push af dec de - ld a,[de] ; a = lower byte of weight - ld [hl],a ; store lower byte of weight in [hDexWeight + 1] - ld de,hDexWeight + ld a, [de] ; a = lower byte of weight + ld [hl], a ; store lower byte of weight in [hDexWeight + 1] + ld de, hDexWeight coord hl, 11, 8 lb bc, 2, 5 ; 2 bytes, 5 digits call PrintNumber ; print weight coord hl, 14, 8 - ld a,[hDexWeight + 1] - sub a,10 - ld a,[hDexWeight] - sbc a,0 - jr nc,.next - ld [hl],"0" ; if the weight is less than 10, put a 0 before the decimal point + ld a, [hDexWeight + 1] + sub a, 10 + ld a, [hDexWeight] + sbc a, 0 + jr nc, .next + ld [hl], "0" ; if the weight is less than 10, put a 0 before the decimal point .next inc hl - ld a,[hli] - ld [hld],a ; make space for the decimal point by moving the last digit forward one tile - ld [hl],$f2 ; decimal point tile + ld a, [hli] + ld [hld], a ; make space for the decimal point by moving the last digit forward one tile + ld [hl], $f2 ; decimal point tile pop af - ld [hDexWeight + 1],a ; restore original value of [hDexWeight + 1] + ld [hDexWeight + 1], a ; restore original value of [hDexWeight + 1] pop af - ld [hDexWeight],a ; restore original value of [hDexWeight] + ld [hDexWeight], a ; restore original value of [hDexWeight] pop hl inc hl ; hl = address of pokedex description text scf @@ -620,11 +620,11 @@ Func_4039c: ; 4039c (10:439c) Func_404ae: ; 404ae (10:44ae) coord bc, 1, 11 Func_404b1: ; 404b1 (10:44b1) - ld a,2 - ld [$fff9],a + ld a, 2 + ld [$fff9], a call TextCommandProcessor ; print pokedex description text xor a - ld [$fff9],a + ld [$fff9], a ret Func_404bc: ; 404bc (10:44bc) @@ -667,10 +667,10 @@ DrawTileLine: ; 40501 (10:4501) push bc push de .loop - ld [hl],b - add hl,de + ld [hl], b + add hl, de dec c - jr nz,.loop + jr nz, .loop pop de pop bc ret @@ -681,19 +681,19 @@ PokedexToIndex: ; 41086 (10:5086) ; converts the Pokédex number at wd11e to an index push bc push hl - ld a,[wd11e] - ld b,a - ld c,0 - ld hl,PokedexOrder + ld a, [wd11e] + ld b, a + ld c, 0 + ld hl, PokedexOrder .loop ; go through the list until we find an entry with a matching dex number inc c - ld a,[hli] + ld a, [hli] cp b - jr nz,.loop + jr nz, .loop - ld a,c - ld [wd11e],a + ld a, c + ld [wd11e], a pop hl pop bc ret @@ -702,14 +702,14 @@ IndexToPokedex: ; 4109d (10:509d) ; converts the indexédex number at wd11e to a Pokédex number push bc push hl - ld a,[wd11e] + ld a, [wd11e] dec a - ld hl,PokedexOrder - ld b,0 - ld c,a - add hl,bc - ld a,[hl] - ld [wd11e],a + ld hl, PokedexOrder + ld b, 0 + ld c, a + add hl, bc + ld a, [hl] + ld [wd11e], a pop hl pop bc ret diff --git a/main.asm b/main.asm index 988add14..8db3752e 100755 --- a/main.asm +++ b/main.asm @@ -754,7 +754,6 @@ INCLUDE "data/mapObjects/lavendertown.asm" LavenderTownBlocks: INCBIN "maps/lavendertown.blk" ViridianPokecenterBlocks: -CeruleanPokecenterBlocks: VermilionPokecenterBlocks: SaffronPokecenterBlocks: LavenderPokecenterBlocks: @@ -1128,7 +1127,14 @@ INCBIN "maps/viridianforestentrance.blk" INCLUDE "data/mapHeaders/redshouse2f.asm" INCLUDE "scripts/redshouse2f.asm" INCLUDE "data/mapObjects/redshouse2f.asm" - dr $5c0d4,$5c0e3 + +Func_5c0d4: + ld a, %01001011 + ld [wPokedexOwned], a + predef ShowPokedexData + xor a + ld [wPokedexOwned], a + ret INCLUDE "data/mapHeaders/museum1f.asm" INCLUDE "scripts/museum1f.asm" @@ -1148,7 +1154,13 @@ INCLUDE "data/mapHeaders/pewterpokecenter.asm" INCLUDE "scripts/pewterpokecenter.asm" INCLUDE "data/mapObjects/pewterpokecenter.asm" - dr $5c4f5,$5d485 +INCLUDE "data/mapHeaders/ceruleanpokecenter.asm" +INCLUDE "scripts/ceruleanpokecenter.asm" +INCLUDE "data/mapObjects/ceruleanpokecenter.asm" +CeruleanPokecenterBlocks: +INCBIN "maps/ceruleanpokecenter.blk" + + dr $5c577,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" diff --git a/scripts/ceruleanpokecenter.asm b/scripts/ceruleanpokecenter.asm index 5d888317..f4eb68ae 100755 --- a/scripts/ceruleanpokecenter.asm +++ b/scripts/ceruleanpokecenter.asm @@ -7,6 +7,7 @@ CeruleanPokecenterTextPointers: ; 5c64b (17:464b) dw CeruleanPokecenterText2 dw CeruleanPokecenterText3 dw CeruleanPokecenterText4 + dw CeruleanPokecenterText5 CeruleanPokecenterText4: ; 5c653 (17:4653) db $f6 @@ -21,3 +22,8 @@ CeruleanPokecenterText2: ; 5c655 (17:4655) CeruleanPokecenterText3: ; 5c65a (17:465a) TX_FAR _CeruleanPokecenterText3 db "@" + +CeruleanPokecenterText5: + TX_ASM + callab Func_f0f12 + jp TextScriptEnd diff --git a/wram.asm b/wram.asm index 821c4957..fbfcc288 100755 --- a/wram.asm +++ b/wram.asm @@ -2290,7 +2290,7 @@ wPartyDataEnd:: wMainDataStart:: -wPokedexOwned:: ; d2f7 +wPokedexOwned:: ; d2f6 flag_array NUM_POKEMON wPokedexOwnedEnd:: -- cgit v1.3.1-sl0p From 0cf9f485b14d7431ff2a976e7fac491b2369c726 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 09:47:14 -0400 Subject: Guys we need to disassemble Misty --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 8 +++++++- scripts/ceruleangym.asm | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 65579280..9e0e0e20 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -65,7 +65,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeruleanHouseTrashed_h) db BANK(CeruleanHouse1_h) db BANK(CeruleanPokecenter_h) - db $17 ; db BANK(CeruleanGym_h) + db BANK(CeruleanGym_h) db $07 ; db BANK(BikeShop_h) db $17 ; db BANK(CeruleanMart_h) db $12 ; db BANK(MtMoonPokecenter_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index d80f85f5..599fecb2 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -65,7 +65,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeruleanHouseTrashed_h dw CeruleanHouse1_h dw CeruleanPokecenter_h - dw $4577 ; dw CeruleanGym_h + dw CeruleanGym_h dw $5038 ; dw BikeShop_h dw $4757 ; dw CeruleanMart_h dw $52a9 ; dw MtMoonPokecenter_h diff --git a/main.asm b/main.asm index 8db3752e..277b867f 100755 --- a/main.asm +++ b/main.asm @@ -1160,7 +1160,13 @@ INCLUDE "data/mapObjects/ceruleanpokecenter.asm" CeruleanPokecenterBlocks: INCBIN "maps/ceruleanpokecenter.blk" - dr $5c577,$5d485 +INCLUDE "data/mapHeaders/ceruleangym.asm" +INCLUDE "scripts/ceruleangym.asm" +INCLUDE "data/mapObjects/ceruleangym.asm" +CeruleanGymBlocks: +INCBIN "maps/ceruleangym.blk" + + dr $5c757,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index fe0faea0..f1ef4c43 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -55,6 +55,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) call DisplayTextID SetEvent EVENT_GOT_TM11 jr .asm_5c736 + .BagFull ld a, $7 ld [hSpriteIndexOrTextID], a @@ -158,7 +159,7 @@ CeruleanGymText7: ; 5c7d3 (17:47d3) CeruleanGymText_5c7d8: ; 5c7d8 (17:47d8) TX_FAR _CeruleanGymText_5c7d8 - db $11, $6, "@" + db "@" CeruleanGymText2: ; 5c7df (17:47df) TX_ASM -- cgit v1.3.1-sl0p From ae723a065537be412cd152e81c72e53ebe3aaac3 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 10:04:13 -0400 Subject: Cerulean Bike Shop --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 8 +++++++- scripts/bikeshop.asm | 23 ++++++++++++++--------- text/maps/bike_shop.asm | 2 +- 5 files changed, 24 insertions(+), 13 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 9e0e0e20..70558042 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -66,7 +66,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeruleanHouse1_h) db BANK(CeruleanPokecenter_h) db BANK(CeruleanGym_h) - db $07 ; db BANK(BikeShop_h) + db BANK(BikeShop_h) db $17 ; db BANK(CeruleanMart_h) db $12 ; db BANK(MtMoonPokecenter_h) db BANK(CeruleanHouseTrashed_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 599fecb2..362f9fa2 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -66,7 +66,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeruleanHouse1_h dw CeruleanPokecenter_h dw CeruleanGym_h - dw $5038 ; dw BikeShop_h + dw BikeShop_h dw $4757 ; dw CeruleanMart_h dw $52a9 ; dw MtMoonPokecenter_h dw CeruleanHouseTrashed_h ; copy diff --git a/main.asm b/main.asm index 277b867f..e5100d0e 100755 --- a/main.asm +++ b/main.asm @@ -352,7 +352,13 @@ INCLUDE "data/mapObjects/ceruleanhousetrashed.asm" INCLUDE "data/mapHeaders/ceruleanhouse1.asm" INCLUDE "scripts/ceruleanhouse1.asm" INCLUDE "data/mapObjects/ceruleanhouse1.asm" - dr $1d038,$1d7ae ; map scripts + +INCLUDE "data/mapHeaders/bikeshop.asm" +INCLUDE "scripts/bikeshop.asm" +INCLUDE "data/mapObjects/bikeshop.asm" +BikeShopBlocks: +INCBIN "maps/bikeshop.blk" + dr $1d1a4,$1d7ae ; map scripts INCLUDE "data/mapHeaders/diglettscaveroute2.asm" INCLUDE "scripts/diglettscaveroute2.asm" diff --git a/scripts/bikeshop.asm b/scripts/bikeshop.asm index e639caf9..5723849d 100755 --- a/scripts/bikeshop.asm +++ b/scripts/bikeshop.asm @@ -1,5 +1,6 @@ BikeShopScript: ; 1d73c (7:573c) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret BikeShopTextPointers: ; 1d73f (7:573f) dw BikeShopText1 @@ -13,6 +14,7 @@ BikeShopText1: ; 1d745 (7:5745) ld hl, BikeShopText_1d82f call PrintText jp .Done + .asm_260d4 ld b, BIKE_VOUCHER call IsItemInBag @@ -29,10 +31,12 @@ BikeShopText1: ; 1d745 (7:5745) ld hl, BikeShopText_1d824 call PrintText jr .Done + .BagFull ld hl, BikeShopText_1d834 call PrintText jr .Done + .asm_41190 ld hl, BikeShopText_1d810 call PrintText @@ -50,8 +54,7 @@ BikeShopText1: ; 1d745 (7:5745) ld hl, wd730 set 6, [hl] coord hl, 0, 0 - ld b, $4 - ld c, $f + lb bc, 4, 15 call TextBoxBorder call UpdateSprites coord hl, 2, 2 @@ -62,11 +65,12 @@ BikeShopText1: ; 1d745 (7:5745) call PlaceString ld hl, BikeShopText_1d815 call PrintText - call HandleMenuInput - bit 1, a - jr nz, .cancel + ; This fixes the bike shop instatext glitch ld hl, wd730 res 6, [hl] + call HandleMenuInput + bit BIT_B_BUTTON, a + jr nz, .cancel ld a, [wCurrentMenuItem] and a jr nz, .cancel @@ -94,7 +98,7 @@ BikeShopText_1d815: ; 1d815 (7:5815) db "@" BikeShopCantAffordText: ; 1d81a (7:581a) - TX_FAR _BikeShopCantAffordText + TX_FAR _BikeShopText_1d81a db "@" BikeShopText_1d81f: ; 1d81f (7:581f) @@ -103,10 +107,11 @@ BikeShopText_1d81f: ; 1d81f (7:581f) BikeShopText_1d824: ; 1d824 (7:5824) TX_FAR _BikeShopText_1d824 - db $11, "@" + TX_SFX_KEY_ITEM + db "@" BikeShopComeAgainText: ; 1d82a (7:582a) - TX_FAR _BikeShopComeAgainText + TX_FAR _BikeShopText_1d82a db "@" BikeShopText_1d82f: ; 1d82f (7:582f) diff --git a/text/maps/bike_shop.asm b/text/maps/bike_shop.asm index 252dffdc..723021a1 100644 --- a/text/maps/bike_shop.asm +++ b/text/maps/bike_shop.asm @@ -25,7 +25,7 @@ _BikeShopText_1d81f:: prompt _BikeShopText_1d824:: - text $52, " exchanged" + text " exchanged" line "the BIKE VOUCHER" cont "for a BICYCLE.@@" -- cgit v1.3.1-sl0p From b9df6fe86f1afa711727badee61a5bfa71030c35 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 10:09:42 -0400 Subject: Cerulean Mart --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 70558042..cbc4395c 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -67,7 +67,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeruleanPokecenter_h) db BANK(CeruleanGym_h) db BANK(BikeShop_h) - db $17 ; db BANK(CeruleanMart_h) + db BANK(CeruleanMart_h) db $12 ; db BANK(MtMoonPokecenter_h) db BANK(CeruleanHouseTrashed_h) db $07 ; db BANK(Route5Gate_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 362f9fa2..5131cf67 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -67,7 +67,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeruleanPokecenter_h dw CeruleanGym_h dw BikeShop_h - dw $4757 ; dw CeruleanMart_h + dw CeruleanMart_h dw $52a9 ; dw MtMoonPokecenter_h dw CeruleanHouseTrashed_h ; copy dw $5831 ; dw Route5Gate_h diff --git a/main.asm b/main.asm index e5100d0e..f4f08f0c 100755 --- a/main.asm +++ b/main.asm @@ -320,7 +320,6 @@ INCLUDE "data/mapHeaders/viridianmart.asm" INCLUDE "scripts/viridianmart.asm" INCLUDE "data/mapObjects/viridianmart.asm" ViridianMartBlocks: -CeruleanMartBlocks: VermilionMartBlocks: LavenderMartBlocks: CeladonMartBlocks: @@ -1114,8 +1113,8 @@ INCLUDE "engine/overworld/saffron_guards.asm" SECTION "bank17",ROMX,BANK[$17] - - dr $5c000,$5c010 +CeruleanMartBlocks: +INCBIN "maps/ceruleanmart.blk" RedsHouse2FBlocks: INCBIN "maps/redshouse2f.blk" Museum1FBlocks: @@ -1172,7 +1171,11 @@ INCLUDE "data/mapObjects/ceruleangym.asm" CeruleanGymBlocks: INCBIN "maps/ceruleangym.blk" - dr $5c757,$5d485 +INCLUDE "data/mapHeaders/ceruleanmart.asm" +INCLUDE "scripts/ceruleanmart.asm" +INCLUDE "data/mapObjects/ceruleanmart.asm" + + dr $5c79c,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" -- cgit v1.3.1-sl0p From 6e3581df4b9cbc8cf14fc7948df5df70002cc062 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 11:38:46 -0400 Subject: Mt Moon Pokemon Center --- data/mapObjects/mtmoonpokecenter.asm | 3 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- engine/bank3c.asm | 4 +- home/text.asm | 8 ++-- macros.asm | 90 +++++++++++++++++++++++++----------- main.asm | 13 ++++-- scripts/mtmoonpokecenter.asm | 72 ++++------------------------- scripts/mtmoonpokecenter2.asm | 66 ++++++++++++++++++++++++++ wram.asm | 6 +-- 10 files changed, 159 insertions(+), 107 deletions(-) create mode 100755 scripts/mtmoonpokecenter2.asm (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/mtmoonpokecenter.asm b/data/mapObjects/mtmoonpokecenter.asm index d6cd35ba..935c4a40 100755 --- a/data/mapObjects/mtmoonpokecenter.asm +++ b/data/mapObjects/mtmoonpokecenter.asm @@ -7,13 +7,14 @@ MtMoonPokecenterObject: ; 0x49376 (size=56) db $0 ; signs - db $6 ; objects + db $7 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person object SPRITE_BUG_CATCHER, $4, $3, STAY, UP, $2 ; person object SPRITE_GENTLEMAN, $7, $3, STAY, UP, $3 ; person object SPRITE_FAT_BALD_GUY, $a, $6, WALK, $2, $4 ; person object SPRITE_CLIPBOARD, $7, $2, STAY, NONE, $5 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $6 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $7 ; person ; warp-to EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index cbc4395c..ca060492 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -68,7 +68,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeruleanGym_h) db BANK(BikeShop_h) db BANK(CeruleanMart_h) - db $12 ; db BANK(MtMoonPokecenter_h) + db BANK(MtMoonPokecenter_h) db BANK(CeruleanHouseTrashed_h) db $07 ; db BANK(Route5Gate_h) db $17 ; db BANK(UndergroundPathEntranceRoute5_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 5131cf67..d2ecea33 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -68,7 +68,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeruleanGym_h dw BikeShop_h dw CeruleanMart_h - dw $52a9 ; dw MtMoonPokecenter_h + dw MtMoonPokecenter_h dw CeruleanHouseTrashed_h ; copy dw $5831 ; dw Route5Gate_h dw $55a8 ; dw UndergroundPathEntranceRoute5_h diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 5a18d55b..d176511c 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -485,7 +485,9 @@ CeladonMansion1Text_f1eee: TX_FAR _CeladonMansion1Text12 db "@" - dr $f1ef3, $f220e + dr $f1ef3, $f218c + +INCLUDE "scripts/mtmoonpokecenter2.asm" INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" diff --git a/home/text.asm b/home/text.asm index 437a5c79..a0e860d9 100644 --- a/home/text.asm +++ b/home/text.asm @@ -382,9 +382,9 @@ TextCommandProcessor:: ; 1919 (0:1919) xor e ld [wLetterPrintingDelayFlags], a ld a, c - ld [wUnusedCC3A], a + ld [wTextDestinationTileAddrBuffer], a ld a, b - ld [wUnusedCC3B], a + ld [wTextDestinationTileAddrBuffer + 1], a NextTextCommand:: ; 192e (0:192e) ld a, [hli] @@ -493,10 +493,10 @@ TextCommand02:: ; 197e (0:197e) TextCommand03:: ; 1990 (0:1990) pop hl ld a, [hli] - ld [wUnusedCC3A], a + ld [wTextDestinationTileAddrBuffer], a ld c, a ld a, [hli] - ld [wUnusedCC3B], a + ld [wTextDestinationTileAddrBuffer + 1], a ld b, a jp NextTextCommand diff --git a/macros.asm b/macros.asm index 6ee88391..ef0b9f01 100644 --- a/macros.asm +++ b/macros.asm @@ -153,44 +153,61 @@ bcd3: MACRO coins equs "bcd2" money equs "bcd3" +validateCoords: MACRO + if \1 >= SCREEN_WIDTH + fail "x coord out of range" + endc + if \2 >= SCREEN_HEIGHT + fail "y coord out of range" + endc + endm + ;\1 = r ;\2 = X ;\3 = Y +;\4 = which tilemap (optional) coord: MACRO + validateCoords \2, \3 if _NARG >= 4 - ld \1, \4 + 20 * \3 + \2 + ld \1, \4 + SCREEN_WIDTH * \3 + \2 else - ld \1, wTileMap + 20 * \3 + \2 + ld \1, wTileMap + SCREEN_WIDTH * \3 + \2 endc ENDM ;\1 = X ;\2 = Y +;\3 = which tilemap (optional) aCoord: MACRO + validateCoords \1, \2 if _NARG >= 3 - ld a, [\3 + 20 * \2 + \1] + ld a, [\3 + SCREEN_WIDTH * \2 + \1] else - ld a, [wTileMap + 20 * \2 + \1] + ld a, [wTileMap + SCREEN_WIDTH * \2 + \1] endc ENDM ;\1 = X ;\2 = Y +;\3 = which tilemap (optional) Coorda: MACRO + validateCoords \1, \2 if _NARG >= 3 - ld [\3 + 20 * \2 + \1], a + ld [\3 + SCREEN_WIDTH * \2 + \1], a else - ld [wTileMap + 20 * \2 + \1], a + ld [wTileMap + SCREEN_WIDTH * \2 + \1], a endc ENDM ;\1 = X ;\2 = Y +;\3 = which tilemap (optional) dwCoord: MACRO + validateCoords \1, \2 if _NARG >= 3 - dw \3 + 20 * \2 + \1 + dw \3 + SCREEN_WIDTH * \2 + \1 else - dw wTileMap + 20 * \2 + \1 + dw wTileMap + SCREEN_WIDTH * \2 + \1 endc ENDM @@ -266,6 +283,15 @@ dba: MACRO dbw BANK(\1), \1 ENDM +dwb: MACRO + dw \1 + db \2 + ENDM + +dab: MACRO + dwb \1, BANK(\1) + ENDM + dbbw: MACRO db \1, \2 dw \3 @@ -277,22 +303,6 @@ RGB: MACRO ENDM ; text macros -TX_NUM: MACRO -; print a big-endian decimal number. -; \1: address to read from -; \2: number of bytes to read -; \3: number of digits to display - db $09 - dw \1 - db \2 << 4 | \3 - ENDM - -TX_FAR: MACRO - db $17 - dw \1 - db BANK(\1) - ENDM - ; text engine command $1 TX_RAM: MACRO ; prints text to screen @@ -307,12 +317,26 @@ TX_BCD: MACRO db \2 ENDM -TX_ASM: MACRO - db $08 +TX_CURSOR: MACRO +; Move cursor to (\1, \2) +; \1: X coord (0 - 19) +; \2: Y coord (0 - 17) + db $3 + dwCoord \1, \2 ENDM -TX_BUTTON_SOUND: MACRO - db $06 +TX_LINE EQUS "db $05" +TX_BUTTON_SOUND EQUS "db $06" +TX_ASM EQUS "db $08" + +TX_NUM: MACRO +; print a big-endian decimal number. +; \1: address to read from +; \2: number of bytes to read +; \3: number of digits to display + db $09 + dw \1 + db \2 << 4 | \3 ENDM TX_SFX_ITEM EQUS "db $0b" @@ -320,6 +344,16 @@ TX_WAIT_BUTTON EQUS "db $0d" TX_SFX_CONGRATS EQUS "db $10" TX_SFX_KEY_ITEM EQUS "db $11" +TX_FAR: MACRO +; 17AAAABB (call text at BB:AAAA) + db $17 + dab \1 + ENDM + + +TX_POKECENTER_PC EQUS "db $f6" +TX_POKECENTER_NURSE EQUS "db $ff" + ; Predef macro. add_predef: MACRO \1Predef:: diff --git a/main.asm b/main.asm index f4f08f0c..58846267 100755 --- a/main.asm +++ b/main.asm @@ -765,7 +765,6 @@ LavenderPokecenterBlocks: CeladonPokecenterBlocks: FuchsiaPokecenterBlocks: CinnabarPokecenterBlocks: -MtMoonPokecenterBlocks: RockTunnelPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" dr $440fb,$4410b @@ -790,7 +789,9 @@ INCLUDE "data/mapHeaders/route7.asm" INCLUDE "data/mapObjects/route7.asm" Route7Blocks: ; 48051 INCBIN "maps/route7.blk" - dr $480ab,$480eb +MtMoonPokecenterBlocks: +INCBIN "maps/mtmoonpokecenter.blk" + dr $480c7,$480eb INCLUDE "scripts/route7.asm" INCLUDE "data/mapHeaders/redshouse1f.asm" @@ -798,7 +799,13 @@ INCLUDE "scripts/redshouse1f.asm" INCLUDE "data/mapObjects/redshouse1f.asm" RedsHouse1FBlocks: INCBIN "maps/redshouse1f.blk" - dr $48157,$49953 + dr $48157,$492a9 + +INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" +INCLUDE "scripts/mtmoonpokecenter.asm" +INCLUDE "data/mapObjects/mtmoonpokecenter.asm" + + dr $49330,$49953 INCLUDE "data/mapHeaders/mtmoon1.asm" INCLUDE "scripts/mtmoon1.asm" diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index fd3e4e53..888cab4c 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -9,9 +9,10 @@ MtMoonPokecenterTextPointers: ; 492d5 (12:52d5) dw MtMoonPokecenterText4 dw MtMoonPokecenterText5 dw MtMoonPokecenterText6 + dw MtMoonPokecenterText7 MtMoonPokecenterText1: ; 492e1 (12:52e1) - db $ff + TX_POKECENTER_NURSE MtMoonPokecenterText2: ; 492e2 (12:52e2) TX_FAR _MtMoonPokecenterText1 @@ -23,72 +24,17 @@ MtMoonPokecenterText3: ; 492e7 (12:52e7) MtMoonPokecenterText4: ; 492ec (12:52ec) TX_ASM - CheckEvent EVENT_BOUGHT_MAGIKARP, 1 - jp c, .alreadyBoughtMagikarp - ld hl, MtMoonPokecenterText_4935c - call PrintText - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - call YesNoChoice - ld a, [wCurrentMenuItem] - and a - jp nz, .choseNo - ld [hMoney], a - ld [hMoney + 2], a - ld a, $5 - ld [hMoney + 1], a - call HasEnoughMoney - jr nc, .enoughMoney - ld hl, MtMoonPokecenterText_49366 - jr .printText -.enoughMoney - lb bc, MAGIKARP, 5 - call GivePokemon - jr nc, .done - xor a - ld [wPriceTemp], a - ld [wPriceTemp + 2], a - ld a, $5 - ld [wPriceTemp + 1], a - ld hl, wPriceTemp + 2 - ld de, wPlayerMoney + 2 - ld c, $3 - predef SubBCDPredef - ld a, MONEY_BOX - ld [wTextBoxID], a - call DisplayTextBoxID - SetEvent EVENT_BOUGHT_MAGIKARP - jr .done -.choseNo - ld hl, MtMoonPokecenterText_49361 - jr .printText -.alreadyBoughtMagikarp - ld hl, MtMoonPokecenterText_4936b -.printText - call PrintText -.done + callab Func_f218c jp TextScriptEnd -MtMoonPokecenterText_4935c: ; 4935c (12:535c) - TX_FAR _MtMoonPokecenterText_4935c - db "@" - -MtMoonPokecenterText_49361: ; 49361 (12:5361) - TX_FAR _MtMoonPokecenterText_49361 - db "@" - -MtMoonPokecenterText_49366: ; 49366 (12:5366) - TX_FAR _MtMoonPokecenterText_49366 - db "@" - -MtMoonPokecenterText_4936b: ; 4936b (12:536b) - TX_FAR _MtMoonPokecenterText_4936b - db "@" - MtMoonPokecenterText5: ; 49370 (12:5370) TX_FAR _MtMoonPokecenterText5 db "@" MtMoonPokecenterText6: ; 49375 (12:5375) - db $f6 + TX_POKECENTER_PC + +MtMoonPokecenterText7: + TX_ASM + callab Func_f0f12 + jp TextScriptEnd diff --git a/scripts/mtmoonpokecenter2.asm b/scripts/mtmoonpokecenter2.asm new file mode 100755 index 00000000..fa42f440 --- /dev/null +++ b/scripts/mtmoonpokecenter2.asm @@ -0,0 +1,66 @@ +Func_f218c: + CheckEvent EVENT_BOUGHT_MAGIKARP, 1 + jp c, .alreadyBoughtMagikarp + ld hl, MtMoonPokecenterText_4935c + call PrintText + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jp nz, .choseNo + ; $000500 + xor a + ld [hMoney], a + ld [hMoney + 2], a + ld a, $5 + ld [hMoney + 1], a + call HasEnoughMoney + jr nc, .enoughMoney + ld hl, MtMoonPokecenterText_49366 + jr .printText +.enoughMoney + lb bc, MAGIKARP, 5 + call GivePokemon + jr nc, .done + ; $000500 + xor a + ld [wPriceTemp], a + ld [wPriceTemp + 2], a + ld a, $5 + ld [wPriceTemp + 1], a + ld hl, wPriceTemp + 2 + ld de, wPlayerMoney + 2 + ld c, $3 + predef SubBCDPredef + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + SetEvent EVENT_BOUGHT_MAGIKARP + jr .done +.choseNo + ld hl, MtMoonPokecenterText_49361 + jr .printText +.alreadyBoughtMagikarp + ld hl, MtMoonPokecenterText_4936b +.printText + call PrintText +.done + ret + +MtMoonPokecenterText_4935c: ; 4935c (12:535c) + TX_FAR _MtMoonPokecenterText_4935c + db "@" + +MtMoonPokecenterText_49361: ; 49361 (12:5361) + TX_FAR _MtMoonPokecenterText_49361 + db "@" + +MtMoonPokecenterText_49366: ; 49366 (12:5366) + TX_FAR _MtMoonPokecenterText_49366 + db "@" + +MtMoonPokecenterText_4936b: ; 4936b (12:536b) + TX_FAR _MtMoonPokecenterText_4936b + db "@" diff --git a/wram.asm b/wram.asm index fbfcc288..610574da 100755 --- a/wram.asm +++ b/wram.asm @@ -386,11 +386,7 @@ wTradeCenterPointerTableIndex:: ; cc38 ds 1 -wUnusedCC3A:: ; cc3a - ds 1 - -wUnusedCC3B:: ; cc3b - ds 1 +wTextDestinationTileAddrBuffer:: dw ; cc3a wDoNotWaitForButtonPressAfterDisplayingText:: ; cc3c ; if non-zero, skip waiting for a button press after displaying text in DisplayTextID -- cgit v1.3.1-sl0p From 8b52fbcfb03b559979b6f480d49fd4e9764aee4b Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 11:44:44 -0400 Subject: Route 5 gate --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index ca060492..44795d97 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -70,7 +70,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeruleanMart_h) db BANK(MtMoonPokecenter_h) db BANK(CeruleanHouseTrashed_h) - db $07 ; db BANK(Route5Gate_h) + db BANK(Route5Gate_h) db $17 ; db BANK(UndergroundPathEntranceRoute5_h) db $15 ; db BANK(DayCareM_h) db $07 ; db BANK(Route6Gate_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index d2ecea33..b6ec84ca 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -70,7 +70,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeruleanMart_h dw MtMoonPokecenter_h dw CeruleanHouseTrashed_h ; copy - dw $5831 ; dw Route5Gate_h + dw Route5Gate_h dw $55a8 ; dw UndergroundPathEntranceRoute5_h dw $6233 ; dw DayCareM_h dw $593b ; dw Route6Gate_h diff --git a/main.asm b/main.asm index 58846267..890cb726 100755 --- a/main.asm +++ b/main.asm @@ -366,7 +366,14 @@ INCLUDE "data/mapObjects/diglettscaveroute2.asm" INCLUDE "data/mapHeaders/route2house.asm" INCLUDE "scripts/route2house.asm" INCLUDE "data/mapObjects/route2house.asm" - dr $1d831,$1e2ae ; map scripts + +INCLUDE "data/mapHeaders/route5gate.asm" +INCLUDE "scripts/route5gate.asm" +INCLUDE "data/mapObjects/route5gate.asm" +Route5GateBlocks: ; 1d92f +INCBIN "maps/route5gate.blk" + + dr $1d93b,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" -- cgit v1.3.1-sl0p From a06c558e2cfdeb47dc9af0a2ebeb5906802b4c7e Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 12:02:01 -0400 Subject: Route 5 Underground Path Gate --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 44795d97..29f04f55 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -71,7 +71,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(MtMoonPokecenter_h) db BANK(CeruleanHouseTrashed_h) db BANK(Route5Gate_h) - db $17 ; db BANK(UndergroundPathEntranceRoute5_h) + db BANK(UndergroundPathEntranceRoute5_h) db $15 ; db BANK(DayCareM_h) db $07 ; db BANK(Route6Gate_h) db $17 ; db BANK(UndergroundPathEntranceRoute6_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index b6ec84ca..792fd1a3 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -71,7 +71,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw MtMoonPokecenter_h dw CeruleanHouseTrashed_h ; copy dw Route5Gate_h - dw $55a8 ; dw UndergroundPathEntranceRoute5_h + dw UndergroundPathEntranceRoute5_h dw $6233 ; dw DayCareM_h dw $593b ; dw Route6Gate_h dw $55ee ; dw UndergroundPathEntranceRoute6_h diff --git a/main.asm b/main.asm index 890cb726..34547349 100755 --- a/main.asm +++ b/main.asm @@ -1137,7 +1137,8 @@ Museum2FBlocks: INCBIN "maps/museum2f.blk" PewterPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" - dr $5c080,$5c090 +UndergroundPathEntranceRoute5Blocks: +INCBIN "maps/undergroundpathentranceroute5.blk" ViridianForestEntranceBlocks: ViridianForestExitBlocks: Route2GateBlocks: @@ -1203,7 +1204,11 @@ INCLUDE "data/mapHeaders/viridianforestentrance.asm" INCLUDE "scripts/viridianforestentrance.asm" INCLUDE "data/mapObjects/viridianforestentrance.asm" - dr $5d5a8,$5da70 +INCLUDE "data/mapHeaders/undergroundpathentranceroute5.asm" +INCLUDE "scripts/undergroundpathentranceroute5.asm" +INCLUDE "data/mapObjects/undergroundpathentranceroute5.asm" + + dr $5d5ee,$5da70 INCLUDE "engine/evolution.asm" -- cgit v1.3.1-sl0p From 3eae968b305cbc80fa7d09447046001aa0bd39f6 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 13:59:23 -0400 Subject: Daycare --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 12 ++++++++++-- scripts/daycarem.asm | 29 +++++++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 4 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 29f04f55..1d0e53e5 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -72,7 +72,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeruleanHouseTrashed_h) db BANK(Route5Gate_h) db BANK(UndergroundPathEntranceRoute5_h) - db $15 ; db BANK(DayCareM_h) + db BANK(DayCareM_h) db $07 ; db BANK(Route6Gate_h) db $17 ; db BANK(UndergroundPathEntranceRoute6_h) db $17 ; db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 792fd1a3..edc33a9a 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -72,7 +72,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeruleanHouseTrashed_h ; copy dw Route5Gate_h dw UndergroundPathEntranceRoute5_h - dw $6233 ; dw DayCareM_h + dw DayCareM_h dw $593b ; dw Route6Gate_h dw $55ee ; dw UndergroundPathEntranceRoute6_h dw $55ee ; dw UndergroundPathEntranceRoute6_h ; unused diff --git a/main.asm b/main.asm index 34547349..dcdba3e0 100755 --- a/main.asm +++ b/main.asm @@ -1041,7 +1041,10 @@ INCLUDE "data/mapHeaders/route21.asm" INCLUDE "data/mapObjects/route21.asm" Route21Blocks: ; 5507d INCBIN "maps/route21.blk" - dr $5523f,$5525f + +DayCareMBlocks: +INCBIN "maps/daycarem.blk" + dr $5524f,$5525f INCLUDE "engine/battle/experience.asm" @@ -1057,7 +1060,12 @@ INCLUDE "scripts/route19.asm" INCLUDE "scripts/route21.asm" ; vermilion house 2 - dr $56054,$56714 + dr $56054,$56233 + +INCLUDE "data/mapHeaders/daycarem.asm" +INCLUDE "scripts/daycarem.asm" +INCLUDE "data/mapObjects/daycarem.asm" + dr $564a5,$56714 INCLUDE "engine/menu/diploma_1.asm" diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 4a46e648..b80b3dac 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -50,11 +50,21 @@ DayCareMText1: ; 56254 (15:6254) ld a, PARTY_TO_DAYCARE ld [wMoveMonType], a call MoveMon + callab IsThisPartymonStarterPikachu + push af xor a ld [wRemoveMonFromBox], a call RemovePokemon + pop af + jr c, .depositedPikachuIntoDayCare ld a, [wcf91] call PlayCry + jr .asm_562e3 + +.depositedPikachuIntoDayCare + ldpikacry e, PikachuCry28 + callab PlayPikachuSoundClip +.asm_562e3 ld hl, DayCareComeSeeMeInAWhileText jp .done @@ -197,8 +207,27 @@ DayCareMText1: ; 56254 (15:6254) ld a, [hl] ld [de], a + ld a, [wPartyCount] + dec a + ld [wWhichPokemon], a + callab IsThisPartymonStarterPikachu + jr c, .withdrewPikachuFromDayCare ld a, [wcf91] call PlayCry + jr .asm_56430 + +.withdrewPikachuFromDayCare + ld a, $6 + ld [wd431], a + + ; GameFreak... TriHard + ld hl, Func_fc4fa + ld b, BANK(Func_fc4fa) + ld hl, Bankswitch + + ldpikacry e, PikachuCry35 + callab PlayPikachuSoundClip +.asm_56430 ld hl, DayCareGotMonBackText jr .done -- cgit v1.3.1-sl0p From f2b312778d2227ffe20c983680f0fba2c38a64a8 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 14:46:21 -0400 Subject: Route 6 gate --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 1d0e53e5..1f228386 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -73,7 +73,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route5Gate_h) db BANK(UndergroundPathEntranceRoute5_h) db BANK(DayCareM_h) - db $07 ; db BANK(Route6Gate_h) + db BANK(Route6Gate_h) db $17 ; db BANK(UndergroundPathEntranceRoute6_h) db $17 ; db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE db $07 ; db BANK(Route7Gate_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index edc33a9a..1f3f9a63 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -73,7 +73,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route5Gate_h dw UndergroundPathEntranceRoute5_h dw DayCareM_h - dw $593b ; dw Route6Gate_h + dw Route6Gate_h dw $55ee ; dw UndergroundPathEntranceRoute6_h dw $55ee ; dw UndergroundPathEntranceRoute6_h ; unused dw $59fe ; dw Route7Gate_h diff --git a/main.asm b/main.asm index dcdba3e0..4d069468 100755 --- a/main.asm +++ b/main.asm @@ -373,7 +373,13 @@ INCLUDE "data/mapObjects/route5gate.asm" Route5GateBlocks: ; 1d92f INCBIN "maps/route5gate.blk" - dr $1d93b,$1e2ae ; map scripts +INCLUDE "data/mapHeaders/route6gate.asm" +INCLUDE "scripts/route6gate.asm" +INCLUDE "data/mapObjects/route6gate.asm" +Route6GateBlocks: ; 1d9f2 +INCBIN "maps/route6gate.blk" + + dr $1d9fe,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" -- cgit v1.3.1-sl0p From 76aba242515e5ed5528758f8c5f279e9eefa71cd Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 14:49:09 -0400 Subject: Route 6 underground entrance --- data/map_header_banks.asm | 4 ++-- data/map_header_pointers.asm | 4 ++-- main.asm | 7 ++++++- 3 files changed, 10 insertions(+), 5 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 1f228386..7ff0e938 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -74,8 +74,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(UndergroundPathEntranceRoute5_h) db BANK(DayCareM_h) db BANK(Route6Gate_h) - db $17 ; db BANK(UndergroundPathEntranceRoute6_h) - db $17 ; db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE + db BANK(UndergroundPathEntranceRoute6_h) + db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE db $07 ; db BANK(Route7Gate_h) db $17 ; db BANK(UndergroundPathEntranceRoute7_h) db $17 ; db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 1f3f9a63..7cd69725 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -74,8 +74,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw UndergroundPathEntranceRoute5_h dw DayCareM_h dw Route6Gate_h - dw $55ee ; dw UndergroundPathEntranceRoute6_h - dw $55ee ; dw UndergroundPathEntranceRoute6_h ; unused + dw UndergroundPathEntranceRoute6_h + dw UndergroundPathEntranceRoute6_h ; unused dw $59fe ; dw Route7Gate_h dw $562b ; dw UndergroundPathEntranceRoute7_h dw $5668 ; dw UndergroundPathEntranceRoute7Copy_h diff --git a/main.asm b/main.asm index 4d069468..9c803df4 100755 --- a/main.asm +++ b/main.asm @@ -1152,6 +1152,7 @@ INCBIN "maps/museum2f.blk" PewterPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" UndergroundPathEntranceRoute5Blocks: +UndergroundPathEntranceRoute6Blocks: INCBIN "maps/undergroundpathentranceroute5.blk" ViridianForestEntranceBlocks: ViridianForestExitBlocks: @@ -1222,7 +1223,11 @@ INCLUDE "data/mapHeaders/undergroundpathentranceroute5.asm" INCLUDE "scripts/undergroundpathentranceroute5.asm" INCLUDE "data/mapObjects/undergroundpathentranceroute5.asm" - dr $5d5ee,$5da70 +INCLUDE "data/mapHeaders/undergroundpathentranceroute6.asm" +INCLUDE "scripts/undergroundpathentranceroute6.asm" +INCLUDE "data/mapObjects/undergroundpathentranceroute6.asm" + + dr $5d62b,$5da70 INCLUDE "engine/evolution.asm" -- cgit v1.3.1-sl0p From 31c0460e683aaf52524b086968b535fa5e5c248c Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 14:57:12 -0400 Subject: Route 7 underground path entrance --- data/map_header_banks.asm | 4 ++-- data/map_header_pointers.asm | 4 ++-- main.asm | 12 +++++++++++- 3 files changed, 15 insertions(+), 5 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 7ff0e938..47b49442 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -77,8 +77,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(UndergroundPathEntranceRoute6_h) db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE db $07 ; db BANK(Route7Gate_h) - db $17 ; db BANK(UndergroundPathEntranceRoute7_h) - db $17 ; db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE + db BANK(UndergroundPathEntranceRoute7_h) + db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE db $07 ; db BANK(Route8Gate_h) db $07 ; db BANK(UndergroundPathEntranceRoute8_h) db $12 ; db BANK(RockTunnelPokecenter_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 7cd69725..be1bda24 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -77,8 +77,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw UndergroundPathEntranceRoute6_h dw UndergroundPathEntranceRoute6_h ; unused dw $59fe ; dw Route7Gate_h - dw $562b ; dw UndergroundPathEntranceRoute7_h - dw $5668 ; dw UndergroundPathEntranceRoute7Copy_h + dw UndergroundPathEntranceRoute7_h + dw UndergroundPathEntranceRoute7Copy_h dw $5ac5 ; dw Route8Gate_h dw $5b87 ; dw UndergroundPathEntranceRoute8_h ;id=80 dw $5330 ; dw RockTunnelPokecenter_h diff --git a/main.asm b/main.asm index 9c803df4..93fec92c 100755 --- a/main.asm +++ b/main.asm @@ -1153,6 +1153,8 @@ PewterPokecenterBlocks: INCBIN "maps/pewterpokecenter.blk" UndergroundPathEntranceRoute5Blocks: UndergroundPathEntranceRoute6Blocks: +UndergroundPathEntranceRoute7Blocks: +UndergroundPathEntranceRoute7CopyBlocks: INCBIN "maps/undergroundpathentranceroute5.blk" ViridianForestEntranceBlocks: ViridianForestExitBlocks: @@ -1227,7 +1229,15 @@ INCLUDE "data/mapHeaders/undergroundpathentranceroute6.asm" INCLUDE "scripts/undergroundpathentranceroute6.asm" INCLUDE "data/mapObjects/undergroundpathentranceroute6.asm" - dr $5d62b,$5da70 +INCLUDE "data/mapHeaders/undergroundpathentranceroute7.asm" +INCLUDE "scripts/undergroundpathentranceroute7.asm" +INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm" + +INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm" +INCLUDE "scripts/undergroundpathentranceroute7copy.asm" +INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm" + + dr $5d6ba,$5da70 INCLUDE "engine/evolution.asm" -- cgit v1.3.1-sl0p From 5f729c22b5b8bafc520f4f23f8577bcb18a8a452 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 15:16:58 -0400 Subject: Add missing file; route 7/8 gates and route 8 path entrance --- data/mapObjects/route7gate.asm | 2 +- data/mapObjects/route8gate.asm | 4 +-- data/map_header_banks.asm | 6 ++-- data/map_header_pointers.asm | 6 ++-- main.asm | 18 ++++++++++- scripts/pewterpokecenter2.asm | 72 ++++++++++++++++++++++++++++++++++++++++++ scripts/route8gate.asm | 2 +- 7 files changed, 99 insertions(+), 11 deletions(-) create mode 100755 scripts/pewterpokecenter2.asm (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/route7gate.asm b/data/mapObjects/route7gate.asm index 8c618fc1..9e80ca39 100755 --- a/data/mapObjects/route7gate.asm +++ b/data/mapObjects/route7gate.asm @@ -4,7 +4,7 @@ Route7GateObject: ; 0x1e185 (size=42) db $4 ; warps db $3, $0, $3, $ff db $4, $0, $3, $ff - db $3, $5, $0, $ff + db $3, $5, $1, $ff db $4, $5, $1, $ff db $0 ; signs diff --git a/data/mapObjects/route8gate.asm b/data/mapObjects/route8gate.asm index 8c3fb54f..61d70dfc 100755 --- a/data/mapObjects/route8gate.asm +++ b/data/mapObjects/route8gate.asm @@ -2,9 +2,9 @@ Route8GateObject: ; 0x1e247 (size=42) db $a ; border block db $4 ; warps - db $3, $0, $0, $ff + db $3, $0, $1, $ff db $4, $0, $1, $ff - db $3, $5, $2, $ff + db $3, $5, $3, $ff db $4, $5, $3, $ff db $0 ; signs diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 47b49442..074b5982 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -76,11 +76,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route6Gate_h) db BANK(UndergroundPathEntranceRoute6_h) db BANK(UndergroundPathEntranceRoute6_h) ;FREEZE - db $07 ; db BANK(Route7Gate_h) + db BANK(Route7Gate_h) db BANK(UndergroundPathEntranceRoute7_h) db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE - db $07 ; db BANK(Route8Gate_h) - db $07 ; db BANK(UndergroundPathEntranceRoute8_h) + db BANK(Route8Gate_h) + db BANK(UndergroundPathEntranceRoute8_h) db $12 ; db BANK(RockTunnelPokecenter_h) db $11 ; db BANK(RockTunnel1_h) db $07 ; db BANK(PowerPlant_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index be1bda24..a736462b 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -76,11 +76,11 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route6Gate_h dw UndergroundPathEntranceRoute6_h dw UndergroundPathEntranceRoute6_h ; unused - dw $59fe ; dw Route7Gate_h + dw Route7Gate_h dw UndergroundPathEntranceRoute7_h dw UndergroundPathEntranceRoute7Copy_h - dw $5ac5 ; dw Route8Gate_h - dw $5b87 ; dw UndergroundPathEntranceRoute8_h ;id=80 + dw Route8Gate_h + dw UndergroundPathEntranceRoute8_h ;id=80 dw $5330 ; dw RockTunnelPokecenter_h dw $4571 ; dw RockTunnel1_h dw $5bc4 ; dw PowerPlant_h diff --git a/main.asm b/main.asm index 93fec92c..2b8b5017 100755 --- a/main.asm +++ b/main.asm @@ -379,7 +379,23 @@ INCLUDE "data/mapObjects/route6gate.asm" Route6GateBlocks: ; 1d9f2 INCBIN "maps/route6gate.blk" - dr $1d9fe,$1e2ae ; map scripts +INCLUDE "data/mapHeaders/route7gate.asm" +INCLUDE "scripts/route7gate.asm" +INCLUDE "data/mapObjects/route7gate.asm" +Route7GateBlocks: ; 1dab9 +INCBIN "maps/route7gate.blk" + +INCLUDE "data/mapHeaders/route8gate.asm" +INCLUDE "scripts/route8gate.asm" +INCLUDE "data/mapObjects/route8gate.asm" +Route8GateBlocks: ; 1dab9 +INCBIN "maps/route8gate.blk" + +INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm" +INCLUDE "scripts/undergroundpathentranceroute8.asm" +INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm" + + dr $1dbc4,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" diff --git a/scripts/pewterpokecenter2.asm b/scripts/pewterpokecenter2.asm new file mode 100755 index 00000000..1aae37d1 --- /dev/null +++ b/scripts/pewterpokecenter2.asm @@ -0,0 +1,72 @@ +Func_f1d98: + ld hl, PewterPokecenterText_f1d9f + call PrintText + ret + +PewterPokecenterText_f1d9f: + TX_FAR _PewterPokecenterText2 + db "@" + +Func_f1da4: + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld hl, PewterPokecenterText_f1e19 + call PrintText + call StopAllMusic + ld c, 32 + call DelayFrames + ld hl, JigglypuffSpinData + ld de, wJigglypuffFacingDirections + ld bc, JigglypuffSpinDataEnd - JigglypuffSpinData + call CopyData + ld a, [wSpriteStateData1 + 3 * $10 + 2] + ld hl, wJigglypuffFacingDirections +.asm_f1dc9 + cp [hl] + inc hl + jr nz, .asm_f1dc9 + dec hl + push hl + ld c, BANK(Music_JigglypuffSong) + ld a, MUSIC_JIGGLYPUFF_SONG + call PlayMusic + pop hl +.asm_f1dd7 + ld a, [hl] + ld [wSpriteStateData1 + 3 * $10 + 2], a + push hl + ld hl, wJigglypuffFacingDirections + ld de, wJigglypuffFacingDirections2 + ld bc, JigglypuffSpinDataEnd - JigglypuffSpinData + call CopyData + ld a, [wJigglypuffFacingDirections2] + ld [wcd42], a + pop hl + ld c, 24 + call DelayFrames + ld a, [wChannelSoundIDs] + ld b, a + ld a, [wChannelSoundIDs + 1] + or b + jr nz, .asm_f1dd7 + ld c, 48 + call DelayFrames + call PlayDefaultMusic + ld a, [wd472] + bit 7, a + ret z + callab Func_fce73 + ret c + call SetPikachuAsleep + ret + +PewterPokecenterText_f1e19: + TX_FAR _PewterPokecenterText5 + db "@" + +JigglypuffSpinData: + db $40 | SPRITE_FACING_DOWN + db $40 | SPRITE_FACING_LEFT + db $40 | SPRITE_FACING_UP + db $40 | SPRITE_FACING_RIGHT +JigglypuffSpinDataEnd: diff --git a/scripts/route8gate.asm b/scripts/route8gate.asm index fe2e3c3c..5a26b424 100755 --- a/scripts/route8gate.asm +++ b/scripts/route8gate.asm @@ -27,7 +27,7 @@ Route8GateScript0: ; 1e1ee (7:61ee) ld hl, CoordsData_1e22c call ArePlayerCoordsInArray ret nc - ld a, PLAYER_DIR_LEFT + ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a xor a ld [hJoyHeld], a -- cgit v1.3.1-sl0p From a443384a21060a1077730b08a8981ef707ba8dfa Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 15:53:23 -0400 Subject: Rock Tunnel Pokecenter --- data/mapObjects/rocktunnelpokecenter.asm | 5 +++-- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- macros.asm | 2 +- main.asm | 8 ++++++-- scripts/mtmoonpokecenter.asm | 2 +- scripts/rocktunnelpokecenter.asm | 10 ++++++++-- 7 files changed, 21 insertions(+), 10 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/mapObjects/rocktunnelpokecenter.asm b/data/mapObjects/rocktunnelpokecenter.asm index d2645165..3cd937cf 100755 --- a/data/mapObjects/rocktunnelpokecenter.asm +++ b/data/mapObjects/rocktunnelpokecenter.asm @@ -7,11 +7,12 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44) db $0 ; signs - db $4 ; objects + db $5 ; objects object SPRITE_NURSE, $3, $1, STAY, DOWN, $1 ; person - object SPRITE_GENTLEMAN, $7, $3, WALK, $2, $2 ; person + object SPRITE_GENTLEMAN, $7, $3, STAY, DOWN, $2 ; person object SPRITE_FISHER2, $2, $5, STAY, NONE, $3 ; person object SPRITE_CABLE_CLUB_WOMAN, $b, $2, STAY, DOWN, $4 ; person + object SPRITE_CHANSEY, $4, $1, STAY, DOWN, $5 ; person ; warp-to EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 074b5982..95279061 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -81,7 +81,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(UndergroundPathEntranceRoute7Copy_h) ;FREEZE db BANK(Route8Gate_h) db BANK(UndergroundPathEntranceRoute8_h) - db $12 ; db BANK(RockTunnelPokecenter_h) + db BANK(RockTunnelPokecenter_h) db $11 ; db BANK(RockTunnel1_h) db $07 ; db BANK(PowerPlant_h) db $12 ; db BANK(Route11Gate_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index a736462b..5f74b05a 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -81,7 +81,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw UndergroundPathEntranceRoute7Copy_h dw Route8Gate_h dw UndergroundPathEntranceRoute8_h ;id=80 - dw $5330 ; dw RockTunnelPokecenter_h + dw RockTunnelPokecenter_h dw $4571 ; dw RockTunnel1_h dw $5bc4 ; dw PowerPlant_h dw $5396 ; dw Route11Gate_h diff --git a/macros.asm b/macros.asm index ef0b9f01..54fba2d3 100644 --- a/macros.asm +++ b/macros.asm @@ -351,7 +351,7 @@ TX_FAR: MACRO ENDM -TX_POKECENTER_PC EQUS "db $f6" +TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" TX_POKECENTER_NURSE EQUS "db $ff" ; Predef macro. diff --git a/main.asm b/main.asm index 2b8b5017..4516a772 100755 --- a/main.asm +++ b/main.asm @@ -794,7 +794,6 @@ LavenderPokecenterBlocks: CeladonPokecenterBlocks: FuchsiaPokecenterBlocks: CinnabarPokecenterBlocks: -RockTunnelPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" dr $440fb,$4410b @@ -819,6 +818,7 @@ INCLUDE "data/mapObjects/route7.asm" Route7Blocks: ; 48051 INCBIN "maps/route7.blk" MtMoonPokecenterBlocks: +RockTunnelPokecenterBlocks: INCBIN "maps/mtmoonpokecenter.blk" dr $480c7,$480eb INCLUDE "scripts/route7.asm" @@ -834,7 +834,11 @@ INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" INCLUDE "scripts/mtmoonpokecenter.asm" INCLUDE "data/mapObjects/mtmoonpokecenter.asm" - dr $49330,$49953 +INCLUDE "data/mapHeaders/rocktunnelpokecenter.asm" +INCLUDE "scripts/rocktunnelpokecenter.asm" +INCLUDE "data/mapObjects/rocktunnelpokecenter.asm" + + dr $49396,$49953 INCLUDE "data/mapHeaders/mtmoon1.asm" INCLUDE "scripts/mtmoon1.asm" diff --git a/scripts/mtmoonpokecenter.asm b/scripts/mtmoonpokecenter.asm index 888cab4c..320ed070 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/mtmoonpokecenter.asm @@ -32,7 +32,7 @@ MtMoonPokecenterText5: ; 49370 (12:5370) db "@" MtMoonPokecenterText6: ; 49375 (12:5375) - TX_POKECENTER_PC + TX_CABLE_CLUB_RECEPTIONIST MtMoonPokecenterText7: TX_ASM diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/rocktunnelpokecenter.asm index 5e822bca..7d8f4bf6 100755 --- a/scripts/rocktunnelpokecenter.asm +++ b/scripts/rocktunnelpokecenter.asm @@ -7,9 +7,10 @@ RockTunnelPokecenterTextPointers: ; 493c0 (12:53c0) dw RockTunnelPokecenterText2 dw RockTunnelPokecenterText3 dw RockTunnelPokecenterText4 + dw RockTunnelPokecenterText5 RockTunnelPokecenterText1: ; 493c8 (12:53c8) - db $ff + TX_POKECENTER_NURSE RockTunnelPokecenterText2: ; 493c9 (12:53c9) TX_FAR _RockTunnelPokecenterText1 @@ -20,4 +21,9 @@ RockTunnelPokecenterText3: ; 493ce (12:53ce) db "@" RockTunnelPokecenterText4: ; 493d3 (12:53d3) - db $f6 + TX_CABLE_CLUB_RECEPTIONIST + +RockTunnelPokecenterText5: + TX_ASM + callab Func_f0f12 + jp TextScriptEnd -- cgit v1.3.1-sl0p From 38f3f3b6ea5d81e6eb1a12132759824891099194 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 16:04:45 -0400 Subject: Rock Tunnel 1 --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 95279061..86e7e0e3 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -82,7 +82,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route8Gate_h) db BANK(UndergroundPathEntranceRoute8_h) db BANK(RockTunnelPokecenter_h) - db $11 ; db BANK(RockTunnel1_h) + db BANK(RockTunnel1_h) db $07 ; db BANK(PowerPlant_h) db $12 ; db BANK(Route11Gate_h) db $07 ; db BANK(DiglettsCaveEntranceRoute11_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 5f74b05a..28938fa4 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -82,7 +82,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route8Gate_h dw UndergroundPathEntranceRoute8_h ;id=80 dw RockTunnelPokecenter_h - dw $4571 ; dw RockTunnel1_h + dw RockTunnel1_h dw $5bc4 ; dw PowerPlant_h dw $5396 ; dw Route11Gate_h dw $5eb8 ; dw DiglettsCaveEntranceRoute11_h diff --git a/main.asm b/main.asm index 4516a772..6f9a8568 100755 --- a/main.asm +++ b/main.asm @@ -806,7 +806,15 @@ INCLUDE "scripts/viridianpokecenter.asm" INCLUDE "data/mapObjects/viridianpokecenter.asm" dr $442b7,$443b7 Mansion1Script_Switches: - dr $443b7,$45077 + dr $443b7,$44571 + +INCLUDE "data/mapHeaders/rocktunnel1.asm" +INCLUDE "scripts/rocktunnel1.asm" +INCLUDE "data/mapObjects/rocktunnel1.asm" +RockTunnel1Blocks: +INCBIN "maps/rocktunnel1.blk" + + dr $4487e,$45077 LoadSpinnerArrowTiles: ; 45077 (11:5077) dr $45077,$46bf3 -- cgit v1.3.1-sl0p From f5ba8e618e8a06ab94d46ad001e5266e4465064a Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 16:08:26 -0400 Subject: Power Plant --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 86e7e0e3..6d7f758f 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -83,7 +83,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(UndergroundPathEntranceRoute8_h) db BANK(RockTunnelPokecenter_h) db BANK(RockTunnel1_h) - db $07 ; db BANK(PowerPlant_h) + db BANK(PowerPlant_h) db $12 ; db BANK(Route11Gate_h) db $07 ; db BANK(DiglettsCaveEntranceRoute11_h) db $12 ; db BANK(Route11GateUpstairs_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 28938fa4..1087206b 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -83,7 +83,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw UndergroundPathEntranceRoute8_h ;id=80 dw RockTunnelPokecenter_h dw RockTunnel1_h - dw $5bc4 ; dw PowerPlant_h + dw PowerPlant_h dw $5396 ; dw Route11Gate_h dw $5eb8 ; dw DiglettsCaveEntranceRoute11_h dw $53de ; dw Route11GateUpstairs_h diff --git a/main.asm b/main.asm index 6f9a8568..ef1a9b6d 100755 --- a/main.asm +++ b/main.asm @@ -395,7 +395,12 @@ INCLUDE "data/mapHeaders/undergroundpathentranceroute8.asm" INCLUDE "scripts/undergroundpathentranceroute8.asm" INCLUDE "data/mapObjects/undergroundpathentranceroute8.asm" - dr $1dbc4,$1e2ae ; map scripts +INCLUDE "data/mapHeaders/powerplant.asm" +INCLUDE "scripts/powerplant.asm" +INCLUDE "data/mapObjects/powerplant.asm" +PowerPlantBlocks: +INCBIN "maps/powerplant.blk" + dr $1deb8,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" -- cgit v1.3.1-sl0p From d00b70b33ee909ad163f2cb1c639ce799db118d0 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 30 May 2016 16:12:31 -0400 Subject: Digletts Cave Route 11 Entrance --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'data/map_header_pointers.asm') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 6d7f758f..40cd151f 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -85,7 +85,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(RockTunnel1_h) db BANK(PowerPlant_h) db $12 ; db BANK(Route11Gate_h) - db $07 ; db BANK(DiglettsCaveEntranceRoute11_h) + db BANK(DiglettsCaveEntranceRoute11_h) db $12 ; db BANK(Route11GateUpstairs_h) db $12 ; db BANK(Route12Gate_h) db $07 ; db BANK(BillsHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 1087206b..c8e41d14 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -85,7 +85,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw RockTunnel1_h dw PowerPlant_h dw $5396 ; dw Route11Gate_h - dw $5eb8 ; dw DiglettsCaveEntranceRoute11_h + dw DiglettsCaveEntranceRoute11_h dw $53de ; dw Route11GateUpstairs_h dw $548f ; dw Route12Gate_h dw $606e ; dw BillsHouse_h diff --git a/main.asm b/main.asm index ef1a9b6d..a7b573cb 100755 --- a/main.asm +++ b/main.asm @@ -289,6 +289,7 @@ INCLUDE "data/mapHeaders/route1.asm" INCLUDE "data/mapObjects/route1.asm" Route1Blocks: ; 1c0fc INCBIN "maps/route1.blk" + UndergroundPathEntranceRoute8Blocks: INCBIN "maps/undergroundpathentranceroute8.blk" OaksLabBlocks: @@ -304,6 +305,7 @@ INCBIN "maps/school.blk" CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" DiglettsCaveRoute2Blocks: +DiglettsCaveEntranceRoute11Blocks: INCBIN "maps/diglettscaveroute2.blk" INCLUDE "engine/clear_save.asm" @@ -400,7 +402,11 @@ INCLUDE "scripts/powerplant.asm" INCLUDE "data/mapObjects/powerplant.asm" PowerPlantBlocks: INCBIN "maps/powerplant.blk" - dr $1deb8,$1e2ae ; map scripts + +INCLUDE "data/mapHeaders/diglettscaveroute11.asm" +INCLUDE "scripts/diglettscaveroute11.asm" +INCLUDE "data/mapObjects/diglettscaveroute11.asm" + dr $1def6,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" -- cgit v1.3.1-sl0p