diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 15:06:23 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-01-01 23:33:10 -0500 |
| commit | c7796024590fec48ac79756793c1a6e3b54daf8f (patch) | |
| tree | 0d61caa7ebe429995a61e800d1d78c3a82aec886 /scripts | |
| parent | 90430e6dee9e207dc0b618d07566f83617343f60 (diff) | |
Rename map files, labels, and constants to be consistent and work with Polished Map
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/AgathasRoom.asm (renamed from scripts/agatha.asm) | 22 | ||||
| -rwxr-xr-x | scripts/BikeShop.asm (renamed from scripts/bikeshop.asm) | 4 | ||||
| -rwxr-xr-x | scripts/BillsHouse.asm (renamed from scripts/billshouse.asm) | 8 | ||||
| -rwxr-xr-x | scripts/BluesHouse.asm (renamed from scripts/blueshouse.asm) | 8 | ||||
| -rwxr-xr-x | scripts/BrunosRoom.asm (renamed from scripts/bruno.asm) | 20 | ||||
| -rwxr-xr-x | scripts/CeladonChiefHouse.asm (renamed from scripts/celadonhouse.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonCity.asm (renamed from scripts/celadoncity.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonDiner.asm (renamed from scripts/celadondiner.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonGym.asm (renamed from scripts/celadongym.asm) | 8 | ||||
| -rwxr-xr-x | scripts/CeladonHotel.asm (renamed from scripts/celadonhotel.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMansion1F.asm (renamed from scripts/celadonmansion1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMansion2F.asm (renamed from scripts/celadonmansion2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMansion3F.asm (renamed from scripts/celadonmansion3.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMansionRoof.asm (renamed from scripts/celadonmansion4.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMansionRoofHouse.asm (renamed from scripts/celadonmansion5.asm) | 6 | ||||
| -rwxr-xr-x | scripts/CeladonMart1F.asm (renamed from scripts/celadonmart1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMart2F.asm (renamed from scripts/celadonmart2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMart3F.asm (renamed from scripts/celadonmart3.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMart4F.asm (renamed from scripts/celadonmart4.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMart5F.asm (renamed from scripts/celadonmart5.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonMartElevator.asm (renamed from scripts/celadonmartelevator.asm) | 14 | ||||
| -rwxr-xr-x | scripts/CeladonMartRoof.asm (renamed from scripts/celadonmartroof.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeladonPokecenter.asm (renamed from scripts/celadonpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeruleanBadgeHouse.asm (renamed from scripts/ceruleanhouse2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeruleanCave1F.asm (renamed from scripts/unknowndungeon1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeruleanCave2F.asm (renamed from scripts/unknowndungeon2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeruleanCaveB1F.asm (renamed from scripts/unknowndungeon3.asm) | 12 | ||||
| -rwxr-xr-x | scripts/CeruleanCity.asm (renamed from scripts/ceruleancity.asm) | 8 | ||||
| -rwxr-xr-x | scripts/CeruleanCity_2.asm (renamed from scripts/ceruleancity2.asm) | 0 | ||||
| -rwxr-xr-x | scripts/CeruleanGym.asm (renamed from scripts/ceruleangym.asm) | 8 | ||||
| -rwxr-xr-x | scripts/CeruleanMart.asm (renamed from scripts/ceruleanmart.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeruleanPokecenter.asm (renamed from scripts/ceruleanpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeruleanTradeHouse.asm (renamed from scripts/ceruleanhouse1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CeruleanTrashedHouse.asm (renamed from scripts/ceruleanhousetrashed.asm) | 4 | ||||
| -rwxr-xr-x | scripts/ChampionsRoom.asm (renamed from scripts/gary.asm) | 32 | ||||
| -rwxr-xr-x | scripts/CinnabarGym.asm (renamed from scripts/cinnabargym.asm) | 8 | ||||
| -rwxr-xr-x | scripts/CinnabarIsland.asm (renamed from scripts/cinnabarisland.asm) | 8 | ||||
| -rwxr-xr-x | scripts/CinnabarLab.asm (renamed from scripts/lab1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CinnabarLabFossilRoom.asm (renamed from scripts/lab4.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CinnabarLabMetronomeRoom.asm (renamed from scripts/lab3.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CinnabarLabTradeRoom.asm (renamed from scripts/lab2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CinnabarMart.asm (renamed from scripts/cinnabarmart.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CinnabarPokecenter.asm (renamed from scripts/cinnabarpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Colosseum.asm (renamed from scripts/colosseum.asm) | 6 | ||||
| -rwxr-xr-x | scripts/CopycatsHouse1F.asm (renamed from scripts/copycatshouse1f.asm) | 4 | ||||
| -rwxr-xr-x | scripts/CopycatsHouse2F.asm (renamed from scripts/copycatshouse2f.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Daycare.asm (renamed from scripts/daycarem.asm) | 4 | ||||
| -rwxr-xr-x | scripts/DiglettsCave.asm | 5 | ||||
| -rwxr-xr-x | scripts/DiglettsCaveRoute11.asm (renamed from scripts/diglettscaveroute11.asm) | 4 | ||||
| -rwxr-xr-x | scripts/DiglettsCaveRoute2.asm (renamed from scripts/diglettscaveroute2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/FightingDojo.asm (renamed from scripts/fightingdojo.asm) | 8 | ||||
| -rwxr-xr-x | scripts/FuchsiaBillsGrandpasHouse.asm (renamed from scripts/fuchsiahouse1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/FuchsiaCity.asm (renamed from scripts/fuchsiacity.asm) | 4 | ||||
| -rwxr-xr-x | scripts/FuchsiaGoodRodHouse.asm (renamed from scripts/fuchsiahouse3.asm) | 4 | ||||
| -rwxr-xr-x | scripts/FuchsiaGym.asm (renamed from scripts/fuchsiagym.asm) | 8 | ||||
| -rwxr-xr-x | scripts/FuchsiaMart.asm (renamed from scripts/fuchsiamart.asm) | 4 | ||||
| -rwxr-xr-x | scripts/FuchsiaMeetingRoom.asm (renamed from scripts/fuchsiameetingroom.asm) | 4 | ||||
| -rwxr-xr-x | scripts/FuchsiaPokecenter.asm (renamed from scripts/fuchsiapokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/GameCorner.asm (renamed from scripts/celadongamecorner.asm) | 18 | ||||
| -rwxr-xr-x | scripts/GameCornerPrizeRoom.asm (renamed from scripts/celadonprizeroom.asm) | 4 | ||||
| -rwxr-xr-x | scripts/HallOfFame.asm (renamed from scripts/halloffameroom.asm) | 30 | ||||
| -rwxr-xr-x | scripts/IndigoPlateau.asm | 4 | ||||
| -rwxr-xr-x | scripts/IndigoPlateauLobby.asm (renamed from scripts/indigoplateaulobby.asm) | 4 | ||||
| -rwxr-xr-x | scripts/LancesRoom.asm (renamed from scripts/lance.asm) | 18 | ||||
| -rwxr-xr-x | scripts/LavenderCuboneHouse.asm (renamed from scripts/lavenderhouse2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/LavenderMart.asm (renamed from scripts/lavendermart.asm) | 4 | ||||
| -rwxr-xr-x | scripts/LavenderPokecenter.asm (renamed from scripts/lavenderpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/LavenderTown.asm (renamed from scripts/lavendertown.asm) | 4 | ||||
| -rwxr-xr-x | scripts/LoreleisRoom.asm (renamed from scripts/lorelei.asm) | 20 | ||||
| -rwxr-xr-x | scripts/MrFujisHouse.asm (renamed from scripts/lavenderhouse1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/MrPsychicsHouse.asm (renamed from scripts/saffronhouse2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/MtMoon1F.asm (renamed from scripts/mtmoon1.asm) | 12 | ||||
| -rwxr-xr-x | scripts/MtMoonB1F.asm (renamed from scripts/mtmoon2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/MtMoonB2F.asm (renamed from scripts/mtmoon3.asm) | 34 | ||||
| -rwxr-xr-x | scripts/MtMoonPokecenter.asm (renamed from scripts/mtmoonpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Museum1F.asm (renamed from scripts/museum1f.asm) | 12 | ||||
| -rwxr-xr-x | scripts/Museum2F.asm (renamed from scripts/museum2f.asm) | 4 | ||||
| -rwxr-xr-x | scripts/NameRatersHouse.asm (renamed from scripts/namerater.asm) | 4 | ||||
| -rwxr-xr-x | scripts/OaksLab.asm (renamed from scripts/oakslab.asm) | 12 | ||||
| -rwxr-xr-x | scripts/PalletTown.asm (renamed from scripts/pallettown.asm) | 8 | ||||
| -rwxr-xr-x | scripts/PewterCity.asm (renamed from scripts/pewtercity.asm) | 10 | ||||
| -rwxr-xr-x | scripts/PewterGym.asm (renamed from scripts/pewtergym.asm) | 8 | ||||
| -rwxr-xr-x | scripts/PewterMart.asm (renamed from scripts/pewtermart.asm) | 4 | ||||
| -rwxr-xr-x | scripts/PewterNidoranHouse.asm (renamed from scripts/pewterhouse1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/PewterPokecenter.asm (renamed from scripts/pewterpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/PewterSpeechHouse.asm (renamed from scripts/pewterhouse2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/PokemonFanClub.asm (renamed from scripts/fanclub.asm) | 4 | ||||
| -rwxr-xr-x | scripts/PokemonMansion1F.asm (renamed from scripts/mansion1.asm) | 12 | ||||
| -rwxr-xr-x | scripts/PokemonMansion2F.asm (renamed from scripts/mansion2.asm) | 12 | ||||
| -rwxr-xr-x | scripts/PokemonMansion3F.asm (renamed from scripts/mansion3.asm) | 12 | ||||
| -rwxr-xr-x | scripts/PokemonMansionB1F.asm (renamed from scripts/mansion4.asm) | 12 | ||||
| -rwxr-xr-x | scripts/PokemonTower1F.asm (renamed from scripts/pokemontower1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/PokemonTower2F.asm (renamed from scripts/pokemontower2.asm) | 20 | ||||
| -rwxr-xr-x | scripts/PokemonTower3F.asm (renamed from scripts/pokemontower3.asm) | 12 | ||||
| -rwxr-xr-x | scripts/PokemonTower4F.asm (renamed from scripts/pokemontower4.asm) | 12 | ||||
| -rwxr-xr-x | scripts/PokemonTower5F.asm (renamed from scripts/pokemontower5.asm) | 12 | ||||
| -rwxr-xr-x | scripts/PokemonTower6F.asm (renamed from scripts/pokemontower6.asm) | 22 | ||||
| -rwxr-xr-x | scripts/PokemonTower7F.asm (renamed from scripts/pokemontower7.asm) | 28 | ||||
| -rwxr-xr-x | scripts/PowerPlant.asm (renamed from scripts/powerplant.asm) | 8 | ||||
| -rwxr-xr-x | scripts/RedsHouse1F.asm (renamed from scripts/redshouse1f.asm) | 4 | ||||
| -rwxr-xr-x | scripts/RedsHouse2F.asm (renamed from scripts/redshouse2f.asm) | 12 | ||||
| -rwxr-xr-x | scripts/RockTunnel1F.asm (renamed from scripts/rocktunnel1.asm) | 12 | ||||
| -rwxr-xr-x | scripts/RockTunnelB1F.asm (renamed from scripts/rocktunnel2.asm) | 12 | ||||
| -rwxr-xr-x | scripts/RockTunnelPokecenter.asm (renamed from scripts/rocktunnelpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/RocketHideoutB1F.asm (renamed from scripts/rockethideout1.asm) | 12 | ||||
| -rwxr-xr-x | scripts/RocketHideoutB2F.asm (renamed from scripts/rockethideout2.asm) | 12 | ||||
| -rwxr-xr-x | scripts/RocketHideoutB3F.asm (renamed from scripts/rockethideout3.asm) | 12 | ||||
| -rwxr-xr-x | scripts/RocketHideoutB4F.asm (renamed from scripts/rockethideout4.asm) | 24 | ||||
| -rwxr-xr-x | scripts/RocketHideoutElevator.asm (renamed from scripts/rockethideoutelevator.asm) | 10 | ||||
| -rwxr-xr-x | scripts/Route1.asm (renamed from scripts/route1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route10.asm (renamed from scripts/route10.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route11.asm (renamed from scripts/route11.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route11Gate1F.asm (renamed from scripts/route11gate.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route11Gate2F.asm (renamed from scripts/route11gateupstairs.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route12.asm (renamed from scripts/route12.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route12Gate1F.asm (renamed from scripts/route12gate.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route12Gate2F.asm (renamed from scripts/route12gateupstairs.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route12SuperRodHouse.asm (renamed from scripts/route12house.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route13.asm (renamed from scripts/route13.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route14.asm (renamed from scripts/route14.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route15.asm (renamed from scripts/route15.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route15Gate1F.asm (renamed from scripts/route15gate.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route15Gate2F.asm (renamed from scripts/route15gateupstairs.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route16.asm (renamed from scripts/route16.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route16FlyHouse.asm (renamed from scripts/route16house.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route16Gate1F.asm (renamed from scripts/route16gate.asm) | 18 | ||||
| -rwxr-xr-x | scripts/Route16Gate2F.asm (renamed from scripts/route16gateupstairs.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route17.asm (renamed from scripts/route17.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route18.asm (renamed from scripts/route18.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route18Gate1F.asm (renamed from scripts/route18gate.asm) | 18 | ||||
| -rwxr-xr-x | scripts/Route18Gate2F.asm (renamed from scripts/route18gateupstairs.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route19.asm (renamed from scripts/route19.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route2.asm (renamed from scripts/route2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route20.asm (renamed from scripts/route20.asm) | 32 | ||||
| -rwxr-xr-x | scripts/Route21.asm (renamed from scripts/route21.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route22.asm (renamed from scripts/route22.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route22Gate.asm (renamed from scripts/route22gate.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route23.asm (renamed from scripts/route23.asm) | 12 | ||||
| -rwxr-xr-x | scripts/Route24.asm (renamed from scripts/route24.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route25.asm (renamed from scripts/route25.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route2Gate.asm (renamed from scripts/route2gate.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route2TradeHouse.asm (renamed from scripts/route2house.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route3.asm (renamed from scripts/route3.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route4.asm (renamed from scripts/route4.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route5.asm (renamed from scripts/route5.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route5Gate.asm (renamed from scripts/route5gate.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route6.asm (renamed from scripts/route6.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route6Gate.asm (renamed from scripts/route6gate.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route7.asm (renamed from scripts/route7.asm) | 4 | ||||
| -rwxr-xr-x | scripts/Route7Gate.asm (renamed from scripts/route7gate.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route8.asm (renamed from scripts/route8.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route8Gate.asm (renamed from scripts/route8gate.asm) | 8 | ||||
| -rwxr-xr-x | scripts/Route9.asm (renamed from scripts/route9.asm) | 8 | ||||
| -rwxr-xr-x | scripts/SSAnne1F.asm (renamed from scripts/ssanne1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SSAnne1FRooms.asm (renamed from scripts/ssanne8.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SSAnne2F.asm (renamed from scripts/ssanne2.asm) | 24 | ||||
| -rwxr-xr-x | scripts/SSAnne2FRooms.asm (renamed from scripts/ssanne9.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SSAnne3F.asm (renamed from scripts/ssanne3.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SSAnneB1F.asm | 5 | ||||
| -rwxr-xr-x | scripts/SSAnneB1FRooms.asm (renamed from scripts/ssanne10.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SSAnneBow.asm (renamed from scripts/ssanne5.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SSAnneCaptainsRoom.asm (renamed from scripts/ssanne7.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SSAnneKitchen.asm (renamed from scripts/ssanne6.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SafariZoneCenter.asm (renamed from scripts/safarizonecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SafariZoneCenterRestHouse.asm (renamed from scripts/safarizoneresthouse1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SafariZoneEast.asm (renamed from scripts/safarizoneeast.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SafariZoneEastRestHouse.asm (renamed from scripts/safarizoneresthouse3.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SafariZoneGate.asm (renamed from scripts/safarizoneentrance.asm) | 28 | ||||
| -rwxr-xr-x | scripts/SafariZoneNorth.asm (renamed from scripts/safarizonenorth.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SafariZoneNorthRestHouse.asm (renamed from scripts/safarizoneresthouse4.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SafariZoneSecretHouse.asm (renamed from scripts/safarizonesecrethouse.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SafariZoneWest.asm (renamed from scripts/safarizonewest.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SafariZoneWestRestHouse.asm (renamed from scripts/safarizoneresthouse2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SaffronCity.asm (renamed from scripts/saffroncity.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SaffronGym.asm (renamed from scripts/saffrongym.asm) | 8 | ||||
| -rwxr-xr-x | scripts/SaffronMart.asm (renamed from scripts/saffronmart.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SaffronPidgeyHouse.asm (renamed from scripts/saffronhouse1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SaffronPokecenter.asm (renamed from scripts/saffronpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SeafoamIslands1F.asm (renamed from scripts/seafoamislands1.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SeafoamIslandsB1F.asm (renamed from scripts/seafoamislands2.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SeafoamIslandsB2F.asm (renamed from scripts/seafoamislands3.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SeafoamIslandsB3F.asm (renamed from scripts/seafoamislands4.asm) | 26 | ||||
| -rwxr-xr-x | scripts/SeafoamIslandsB4F.asm (renamed from scripts/seafoamislands5.asm) | 24 | ||||
| -rwxr-xr-x | scripts/SilphCo10F.asm (renamed from scripts/silphco10.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SilphCo11F.asm (renamed from scripts/silphco11.asm) | 14 | ||||
| -rwxr-xr-x | scripts/SilphCo1F.asm (renamed from scripts/silphco1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/SilphCo2F.asm (renamed from scripts/silphco2.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SilphCo3F.asm (renamed from scripts/silphco3.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SilphCo4F.asm (renamed from scripts/silphco4.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SilphCo5F.asm (renamed from scripts/silphco5.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SilphCo6F.asm (renamed from scripts/silphco6.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SilphCo7F.asm (renamed from scripts/silphco7.asm) | 14 | ||||
| -rwxr-xr-x | scripts/SilphCo8F.asm (renamed from scripts/silphco8.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SilphCo9F.asm (renamed from scripts/silphco9.asm) | 12 | ||||
| -rwxr-xr-x | scripts/SilphCoElevator.asm (renamed from scripts/silphcoelevator.asm) | 8 | ||||
| -rwxr-xr-x | scripts/TradeCenter.asm (renamed from scripts/tradecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/UndergroundPathNorthSouth.asm | 5 | ||||
| -rwxr-xr-x | scripts/UndergroundPathRoute5.asm (renamed from scripts/undergroundpathentranceroute5.asm) | 4 | ||||
| -rwxr-xr-x | scripts/UndergroundPathRoute6.asm (renamed from scripts/undergroundpathentranceroute6.asm) | 4 | ||||
| -rwxr-xr-x | scripts/UndergroundPathRoute7.asm (renamed from scripts/undergroundpathentranceroute7.asm) | 4 | ||||
| -rwxr-xr-x | scripts/UndergroundPathRoute7Copy.asm (renamed from scripts/undergroundpathentranceroute7copy.asm) | 4 | ||||
| -rwxr-xr-x | scripts/UndergroundPathRoute8.asm (renamed from scripts/undergroundpathentranceroute8.asm) | 4 | ||||
| -rwxr-xr-x | scripts/UndergroundPathWestEast.asm | 5 | ||||
| -rwxr-xr-x | scripts/VermilionCity.asm (renamed from scripts/vermilioncity.asm) | 8 | ||||
| -rwxr-xr-x | scripts/VermilionDock.asm (renamed from scripts/vermiliondock.asm) | 4 | ||||
| -rwxr-xr-x | scripts/VermilionGym.asm (renamed from scripts/vermiliongym.asm) | 8 | ||||
| -rwxr-xr-x | scripts/VermilionMart.asm (renamed from scripts/vermilionmart.asm) | 4 | ||||
| -rwxr-xr-x | scripts/VermilionOldRodHouse.asm (renamed from scripts/vermilionhouse2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/VermilionPidgeyHouse.asm (renamed from scripts/vermilionhouse1.asm) | 4 | ||||
| -rwxr-xr-x | scripts/VermilionPokecenter.asm (renamed from scripts/vermilionpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/VermilionTradeHouse.asm (renamed from scripts/vermilionhouse3.asm) | 4 | ||||
| -rwxr-xr-x | scripts/VictoryRoad1F.asm (renamed from scripts/victoryroad1.asm) | 12 | ||||
| -rwxr-xr-x | scripts/VictoryRoad2F.asm (renamed from scripts/victoryroad2.asm) | 12 | ||||
| -rwxr-xr-x | scripts/VictoryRoad3F.asm (renamed from scripts/victoryroad3.asm) | 18 | ||||
| -rwxr-xr-x | scripts/ViridianCity.asm (renamed from scripts/viridiancity.asm) | 8 | ||||
| -rwxr-xr-x | scripts/ViridianForest.asm (renamed from scripts/viridianforest.asm) | 8 | ||||
| -rwxr-xr-x | scripts/ViridianForestNorthGate.asm (renamed from scripts/viridianforestexit.asm) | 4 | ||||
| -rwxr-xr-x | scripts/ViridianForestSouthGate.asm (renamed from scripts/viridianforestentrance.asm) | 4 | ||||
| -rwxr-xr-x | scripts/ViridianGym.asm (renamed from scripts/viridiangym.asm) | 8 | ||||
| -rwxr-xr-x | scripts/ViridianMart.asm (renamed from scripts/viridianmart.asm) | 19 | ||||
| -rwxr-xr-x | scripts/ViridianNicknameHouse.asm (renamed from scripts/viridianhouse.asm) | 4 | ||||
| -rwxr-xr-x | scripts/ViridianPokecenter.asm (renamed from scripts/viridianpokecenter.asm) | 4 | ||||
| -rwxr-xr-x | scripts/ViridianSchoolHouse.asm (renamed from scripts/school.asm) | 4 | ||||
| -rwxr-xr-x | scripts/WardensHouse.asm (renamed from scripts/fuchsiahouse2.asm) | 4 | ||||
| -rwxr-xr-x | scripts/diglettscave.asm | 5 | ||||
| -rwxr-xr-x | scripts/indigoplateau.asm | 4 | ||||
| -rwxr-xr-x | scripts/ssanne4.asm | 5 | ||||
| -rwxr-xr-x | scripts/undergroundpathns.asm | 5 | ||||
| -rwxr-xr-x | scripts/undergroundpathwe.asm | 5 |
229 files changed, 915 insertions, 914 deletions
diff --git a/scripts/agatha.asm b/scripts/AgathasRoom.asm index 88d6a8de..a1dba196 100755 --- a/scripts/agatha.asm +++ b/scripts/AgathasRoom.asm @@ -1,11 +1,11 @@ -AgathaScript: +AgathasRoom_Script: call AgathaShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, AgathaTrainerHeader0 - ld de, AgathaScriptPointers - ld a, [wAgathaCurScript] + ld de, AgathasRoom_ScriptPointers + ld a, [wAgathasRoomCurScript] call ExecuteCurMapScriptInTable - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ret AgathaShowOrHideExitBlock: @@ -27,10 +27,10 @@ AgathaShowOrHideExitBlock: ResetAgathaScript: xor a - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ret -AgathaScriptPointers: +AgathasRoom_ScriptPointers: dw AgathaScript0 dw DisplayEnemyTrainerTextAndStartBattle dw AgathaScript2 @@ -54,7 +54,7 @@ AgathaScriptWalkIntoRoom: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -82,7 +82,7 @@ AgathaScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -100,7 +100,7 @@ AgathaScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wAgathaCurScript], a + ld [wAgathasRoomCurScript], a ld [wCurMapScript], a ret @@ -113,10 +113,10 @@ AgathaScript2: ld [hSpriteIndexOrTextID], a call DisplayTextID ld a, $1 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret -AgathaTextPointers: +AgathasRoom_TextPointers: dw AgathaText1 dw AgathaDontRunAwayText diff --git a/scripts/bikeshop.asm b/scripts/BikeShop.asm index 4d6853be..71149759 100755 --- a/scripts/bikeshop.asm +++ b/scripts/BikeShop.asm @@ -1,7 +1,7 @@ -BikeShopScript: +BikeShop_Script: jp EnableAutoTextBoxDrawing -BikeShopTextPointers: +BikeShop_TextPointers: dw BikeShopText1 dw BikeShopText2 dw BikeShopText3 diff --git a/scripts/billshouse.asm b/scripts/BillsHouse.asm index 2b60ef8c..74efc960 100755 --- a/scripts/billshouse.asm +++ b/scripts/BillsHouse.asm @@ -1,10 +1,10 @@ -BillsHouseScript: +BillsHouse_Script: call EnableAutoTextBoxDrawing ld a, [wBillsHouseCurScript] - ld hl, BillsHouseScriptPointers + ld hl, BillsHouse_ScriptPointers jp CallFunctionInTable -BillsHouseScriptPointers: +BillsHouse_ScriptPointers: dw BillsHouseScript0 dw BillsHouseScript1 dw BillsHouseScript2 @@ -115,7 +115,7 @@ BillsHouseScript5: ld [wBillsHouseCurScript], a ret -BillsHouseTextPointers: +BillsHouse_TextPointers: dw BillsHouseText1 dw BillsHouseText2 dw BillsHouseText3 diff --git a/scripts/blueshouse.asm b/scripts/BluesHouse.asm index 2b72ef97..f325049f 100755 --- a/scripts/blueshouse.asm +++ b/scripts/BluesHouse.asm @@ -1,10 +1,10 @@ -BluesHouseScript: +BluesHouse_Script: call EnableAutoTextBoxDrawing - ld hl, BluesHouseScriptPointers + ld hl, BluesHouse_ScriptPointers ld a, [wBluesHouseCurScript] jp CallFunctionInTable -BluesHouseScriptPointers: +BluesHouse_ScriptPointers: dw BluesHouseScript0 dw BluesHouseScript1 @@ -19,7 +19,7 @@ BluesHouseScript0: BluesHouseScript1: ret -BluesHouseTextPointers: +BluesHouse_TextPointers: dw BluesHouseText1 dw BluesHouseText2 dw BluesHouseText3 diff --git a/scripts/bruno.asm b/scripts/BrunosRoom.asm index 02ceebf2..3b6385b7 100755 --- a/scripts/bruno.asm +++ b/scripts/BrunosRoom.asm @@ -1,11 +1,11 @@ -BrunoScript: +BrunosRoom_Script: call BrunoShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, BrunoTrainerHeader0 - ld de, BrunoScriptPointers - ld a, [wBrunoCurScript] + ld de, BrunosRoom_ScriptPointers + ld a, [wBrunosRoomCurScript] call ExecuteCurMapScriptInTable - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ret BrunoShowOrHideExitBlock: @@ -27,10 +27,10 @@ BrunoShowOrHideExitBlock: ResetBrunoScript: xor a - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ret -BrunoScriptPointers: +BrunosRoom_ScriptPointers: dw BrunoScript0 dw DisplayEnemyTrainerTextAndStartBattle dw BrunoScript2 @@ -54,7 +54,7 @@ BrunoScriptWalkIntoRoom: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -82,7 +82,7 @@ BrunoScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -100,7 +100,7 @@ BrunoScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wBrunoCurScript], a + ld [wBrunosRoomCurScript], a ld [wCurMapScript], a ret @@ -113,7 +113,7 @@ BrunoScript2: ld [hSpriteIndexOrTextID], a jp DisplayTextID -BrunoTextPointers: +BrunosRoom_TextPointers: dw BrunoText1 dw BrunoDontRunAwayText diff --git a/scripts/celadonhouse.asm b/scripts/CeladonChiefHouse.asm index 7f2778d1..fc37bd4d 100755 --- a/scripts/celadonhouse.asm +++ b/scripts/CeladonChiefHouse.asm @@ -1,8 +1,8 @@ -CeladonHouseScript: +CeladonChiefHouse_Script: call EnableAutoTextBoxDrawing ret -CeladonHouseTextPointers: +CeladonChiefHouse_TextPointers: dw CeladonHouseText1 dw CeladonHouseText2 dw CeladonHouseText3 diff --git a/scripts/celadoncity.asm b/scripts/CeladonCity.asm index 6ef679dc..e2d7d371 100755 --- a/scripts/celadoncity.asm +++ b/scripts/CeladonCity.asm @@ -1,10 +1,10 @@ -CeladonCityScript: +CeladonCity_Script: call EnableAutoTextBoxDrawing ResetEvents EVENT_1B8, EVENT_1BF ResetEvent EVENT_67F ret -CeladonCityTextPointers: +CeladonCity_TextPointers: dw CeladonCityText1 dw CeladonCityText2 dw CeladonCityText3 diff --git a/scripts/celadondiner.asm b/scripts/CeladonDiner.asm index 6fd594f7..371205de 100755 --- a/scripts/celadondiner.asm +++ b/scripts/CeladonDiner.asm @@ -1,8 +1,8 @@ -CeladonDinerScript: +CeladonDiner_Script: call EnableAutoTextBoxDrawing ret -CeladonDinerTextPointers: +CeladonDiner_TextPointers: dw CeladonDinerText1 dw CeladonDinerText2 dw CeladonDinerText3 diff --git a/scripts/celadongym.asm b/scripts/CeladonGym.asm index ae7e6846..8ceb36ee 100755 --- a/scripts/celadongym.asm +++ b/scripts/CeladonGym.asm @@ -1,11 +1,11 @@ -CeladonGymScript: +CeladonGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeladonGymScript_48927 call EnableAutoTextBoxDrawing ld hl, CeladonGymTrainerHeader0 - ld de, CeladonGymScriptPointers + ld de, CeladonGym_ScriptPointers ld a, [wCeladonGymCurScript] call ExecuteCurMapScriptInTable ld [wCeladonGymCurScript], a @@ -29,7 +29,7 @@ CeladonGymText_48943: ld [wCurMapScript], a ret -CeladonGymScriptPointers: +CeladonGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ CeladonGymText_48963: jp CeladonGymText_48943 -CeladonGymTextPointers: +CeladonGym_TextPointers: dw CeladonGymText1 dw CeladonGymText2 dw CeladonGymText3 diff --git a/scripts/celadonhotel.asm b/scripts/CeladonHotel.asm index 23b9eb55..ee4e140c 100755 --- a/scripts/celadonhotel.asm +++ b/scripts/CeladonHotel.asm @@ -1,7 +1,7 @@ -CeladonHotelScript: +CeladonHotel_Script: jp EnableAutoTextBoxDrawing -CeladonHotelTextPointers: +CeladonHotel_TextPointers: dw CeladonHotelText1 dw CeladonHotelText2 dw CeladonHotelText3 diff --git a/scripts/celadonmansion1.asm b/scripts/CeladonMansion1F.asm index f6ef7669..41524983 100755 --- a/scripts/celadonmansion1.asm +++ b/scripts/CeladonMansion1F.asm @@ -1,7 +1,7 @@ -CeladonMansion1Script: +CeladonMansion1F_Script: jp EnableAutoTextBoxDrawing -CeladonMansion1TextPointers: +CeladonMansion1F_TextPointers: dw CeladonMansion1Text1 dw CeladonMansion1Text2 dw CeladonMansion1Text3 diff --git a/scripts/celadonmansion2.asm b/scripts/CeladonMansion2F.asm index 520615d4..9deb606d 100755 --- a/scripts/celadonmansion2.asm +++ b/scripts/CeladonMansion2F.asm @@ -1,8 +1,8 @@ -CeladonMansion2Script: +CeladonMansion2F_Script: call EnableAutoTextBoxDrawing ret -CeladonMansion2TextPointers: +CeladonMansion2F_TextPointers: dw CeladonMansion2Text1 CeladonMansion2Text1: diff --git a/scripts/celadonmansion3.asm b/scripts/CeladonMansion3F.asm index a1fe048b..43832f63 100755 --- a/scripts/celadonmansion3.asm +++ b/scripts/CeladonMansion3F.asm @@ -1,7 +1,7 @@ -CeladonMansion3Script: +CeladonMansion3F_Script: jp EnableAutoTextBoxDrawing -CeladonMansion3TextPointers: +CeladonMansion3F_TextPointers: dw ProgrammerText dw GraphicArtistText dw WriterText diff --git a/scripts/celadonmansion4.asm b/scripts/CeladonMansionRoof.asm index 80d887e9..d5028537 100755 --- a/scripts/celadonmansion4.asm +++ b/scripts/CeladonMansionRoof.asm @@ -1,7 +1,7 @@ -CeladonMansion4Script: +CeladonMansionRoof_Script: jp EnableAutoTextBoxDrawing -CeladonMansion4TextPointers: +CeladonMansionRoof_TextPointers: dw CeladonMansion4Text1 CeladonMansion4Text1: diff --git a/scripts/celadonmansion5.asm b/scripts/CeladonMansionRoofHouse.asm index 197a0f54..e519d506 100755 --- a/scripts/celadonmansion5.asm +++ b/scripts/CeladonMansionRoofHouse.asm @@ -1,7 +1,7 @@ -CeladonMansion5Script: +CeladonMansionRoofHouse_Script: jp EnableAutoTextBoxDrawing -CeladonMansion5TextPointers: +CeladonMansionRoofHouse_TextPointers: dw CeladonMansion5Text1 dw CeladonMansion5Text2 @@ -14,7 +14,7 @@ CeladonMansion5Text2: lb bc, EEVEE, 25 call GivePokemon jr nc, .asm_24365 - ld a, HS_CELADON_MANSION_5_GIFT + ld a, HS_CELADON_MANSION_EEVEE_GIFT ld [wMissableObjectIndex], a predef HideObject .asm_24365 diff --git a/scripts/celadonmart1.asm b/scripts/CeladonMart1F.asm index 0f67972b..8afd805a 100755 --- a/scripts/celadonmart1.asm +++ b/scripts/CeladonMart1F.asm @@ -1,7 +1,7 @@ -CeladonMart1Script: +CeladonMart1F_Script: jp EnableAutoTextBoxDrawing -CeladonMart1TextPointers: +CeladonMart1F_TextPointers: dw CeladonMart1Text1 dw CeladonMart1Text2 dw CeladonMart1Text3 diff --git a/scripts/celadonmart2.asm b/scripts/CeladonMart2F.asm index c438d6e1..787c186e 100755 --- a/scripts/celadonmart2.asm +++ b/scripts/CeladonMart2F.asm @@ -1,7 +1,7 @@ -CeladonMart2Script: +CeladonMart2F_Script: jp EnableAutoTextBoxDrawing -CeladonMart2TextPointers: +CeladonMart2F_TextPointers: dw CeladonMart2Clerk1Text dw CeladonMart2Clerk2Text dw CeladonMart2Text3 diff --git a/scripts/celadonmart3.asm b/scripts/CeladonMart3F.asm index 6af58f21..e7e216d9 100755 --- a/scripts/celadonmart3.asm +++ b/scripts/CeladonMart3F.asm @@ -1,7 +1,7 @@ -CeladonMart3Script: +CeladonMart3F_Script: jp EnableAutoTextBoxDrawing -CeladonMart3TextPointers: +CeladonMart3F_TextPointers: dw CeladonMart3Text1 dw CeladonMart3Text2 dw CeladonMart3Text3 diff --git a/scripts/celadonmart4.asm b/scripts/CeladonMart4F.asm index 18049dc0..20f817e9 100755 --- a/scripts/celadonmart4.asm +++ b/scripts/CeladonMart4F.asm @@ -1,7 +1,7 @@ -CeladonMart4Script: +CeladonMart4F_Script: jp EnableAutoTextBoxDrawing -CeladonMart4TextPointers: +CeladonMart4F_TextPointers: dw CeladonMart4ClerkText dw CeladonMart4Text2 dw CeladonMart4Text3 diff --git a/scripts/celadonmart5.asm b/scripts/CeladonMart5F.asm index 7b7371a7..9f52f866 100755 --- a/scripts/celadonmart5.asm +++ b/scripts/CeladonMart5F.asm @@ -1,7 +1,7 @@ -CeladonMart5Script: +CeladonMart5F_Script: jp EnableAutoTextBoxDrawing -CeladonMart5TextPointers: +CeladonMart5F_TextPointers: dw CeladonMart5Text1 dw CeladonMart5Text2 dw CeladonMart5Clerk1Text diff --git a/scripts/celadonmartelevator.asm b/scripts/CeladonMartElevator.asm index 60e5210c..34b923f9 100755 --- a/scripts/celadonmartelevator.asm +++ b/scripts/CeladonMartElevator.asm @@ -1,4 +1,4 @@ -CeladonMartElevatorScript: +CeladonMartElevator_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -52,17 +52,17 @@ CeladonMartElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. - db $05, CELADON_MART_1 - db $02, CELADON_MART_2 - db $02, CELADON_MART_3 - db $02, CELADON_MART_4 - db $02, CELADON_MART_5 + db $05, CELADON_MART_1F + db $02, CELADON_MART_2F + db $02, CELADON_MART_3F + db $02, CELADON_MART_4F + db $02, CELADON_MART_5F CeladonMartElevatorWarpMapsEnd: CeladonMartElevatorScript_48654: jpba ShakeElevator -CeladonMartElevatorTextPointers: +CeladonMartElevator_TextPointers: dw CeladonMartElevatorText1 CeladonMartElevatorText1: diff --git a/scripts/celadonmartroof.asm b/scripts/CeladonMartRoof.asm index 9034e8fc..35c740b2 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/CeladonMartRoof.asm @@ -1,4 +1,4 @@ -CeladonMartRoofScript: +CeladonMartRoof_Script: jp EnableAutoTextBoxDrawing CeladonMartRoofScript_GetDrinksInBag: @@ -205,7 +205,7 @@ CeladonMartRoofScript_PrintDrinksInBag: pop hl jr .loop -CeladonMartRoofTextPointers: +CeladonMartRoof_TextPointers: dw CeladonMartRoofText1 dw CeladonMartRoofText2 dw CeladonMartRoofText5 diff --git a/scripts/celadonpokecenter.asm b/scripts/CeladonPokecenter.asm index bd91af20..b5efb7d5 100755 --- a/scripts/celadonpokecenter.asm +++ b/scripts/CeladonPokecenter.asm @@ -1,8 +1,8 @@ -CeladonPokecenterScript: +CeladonPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CeladonPokecenterTextPointers: +CeladonPokecenter_TextPointers: dw CeladonHealNurseText dw CeladonPokecenterText2 dw CeladonPokecenterText3 diff --git a/scripts/ceruleanhouse2.asm b/scripts/CeruleanBadgeHouse.asm index e83c2194..cab2bf23 100755 --- a/scripts/ceruleanhouse2.asm +++ b/scripts/CeruleanBadgeHouse.asm @@ -1,11 +1,11 @@ -CeruleanHouse2Script: +CeruleanBadgeHouse_Script: ld a, $1 ld [wAutoTextBoxDrawingControl], a dec a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ret -CeruleanHouse2TextPointers: +CeruleanBadgeHouse_TextPointers: dw CeruleanHouse2Text1 CeruleanHouse2Text1: diff --git a/scripts/unknowndungeon1.asm b/scripts/CeruleanCave1F.asm index 9d7f120e..6f5c7b13 100755 --- a/scripts/unknowndungeon1.asm +++ b/scripts/CeruleanCave1F.asm @@ -1,7 +1,7 @@ -UnknownDungeon1Script: +CeruleanCave1F_Script: jp EnableAutoTextBoxDrawing -UnknownDungeon1TextPointers: +CeruleanCave1F_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/unknowndungeon2.asm b/scripts/CeruleanCave2F.asm index 3ed00a45..1bc8457b 100755 --- a/scripts/unknowndungeon2.asm +++ b/scripts/CeruleanCave2F.asm @@ -1,7 +1,7 @@ -UnknownDungeon2Script: +CeruleanCave2F_Script: jp EnableAutoTextBoxDrawing -UnknownDungeon2TextPointers: +CeruleanCave2F_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/unknowndungeon3.asm b/scripts/CeruleanCaveB1F.asm index 78b1ab80..a570ab18 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -1,18 +1,18 @@ -UnknownDungeon3Script: +CeruleanCaveB1F_Script: call EnableAutoTextBoxDrawing ld hl, MewtwoTrainerHeader - ld de, .ScriptPointers - ld a, [wUnknownDungeon3CurScript] + ld de, CeruleanCaveB1F_ScriptPointers + ld a, [wCeruleanCaveB1FCurScript] call ExecuteCurMapScriptInTable - ld [wUnknownDungeon3CurScript], a + ld [wCeruleanCaveB1FCurScript], a ret -.ScriptPointers +CeruleanCaveB1F_ScriptPointers dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -UnknownDungeon3TextPointers: +CeruleanCaveB1F_TextPointers: dw MewtwoText dw PickUpItemText dw PickUpItemText diff --git a/scripts/ceruleancity.asm b/scripts/CeruleanCity.asm index 555e75f1..117ec4da 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/CeruleanCity.asm @@ -1,6 +1,6 @@ -CeruleanCityScript: +CeruleanCity_Script: call EnableAutoTextBoxDrawing - ld hl, CeruleanCityScriptPointers + ld hl, CeruleanCity_ScriptPointers ld a, [wCeruleanCityCurScript] jp CallFunctionInTable @@ -12,7 +12,7 @@ CeruleanCityScript_1948c: ld [wMissableObjectIndex], a predef_jump HideObject -CeruleanCityScriptPointers: +CeruleanCity_ScriptPointers: dw CeruleanCityScript0 dw CeruleanCityScript1 dw CeruleanCityScript2 @@ -227,7 +227,7 @@ CeruleanCityScript3: ld [wCeruleanCityCurScript], a ret -CeruleanCityTextPointers: +CeruleanCity_TextPointers: dw CeruleanCityText1 dw CeruleanCityText2 dw CeruleanCityText3 diff --git a/scripts/ceruleancity2.asm b/scripts/CeruleanCity_2.asm index 53ace5c8..53ace5c8 100755 --- a/scripts/ceruleancity2.asm +++ b/scripts/CeruleanCity_2.asm diff --git a/scripts/ceruleangym.asm b/scripts/CeruleanGym.asm index b82b89f6..7d152b4f 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/CeruleanGym.asm @@ -1,11 +1,11 @@ -CeruleanGymScript: +CeruleanGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, CeruleanGymScript_5c6d0 call EnableAutoTextBoxDrawing ld hl, CeruleanGymTrainerHeader0 - ld de, CeruleanGymScriptPointers + ld de, CeruleanGym_ScriptPointers ld a, [wCeruleanGymCurScript] call ExecuteCurMapScriptInTable ld [wCeruleanGymCurScript], a @@ -29,7 +29,7 @@ CeruleanGymScript_5c6ed: ld [wCurMapScript], a ret -CeruleanGymScriptPointers: +CeruleanGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ CeruleanGymScript_5c70d: jp CeruleanGymScript_5c6ed -CeruleanGymTextPointers: +CeruleanGym_TextPointers: dw CeruleanGymText1 dw CeruleanGymText2 dw CeruleanGymText3 diff --git a/scripts/ceruleanmart.asm b/scripts/CeruleanMart.asm index 76d83f90..f812aadd 100755 --- a/scripts/ceruleanmart.asm +++ b/scripts/CeruleanMart.asm @@ -1,7 +1,7 @@ -CeruleanMartScript: +CeruleanMart_Script: jp EnableAutoTextBoxDrawing -CeruleanMartTextPointers: +CeruleanMart_TextPointers: dw CeruleanCashierText dw CeruleanMartText2 dw CeruleanMartText3 diff --git a/scripts/ceruleanpokecenter.asm b/scripts/CeruleanPokecenter.asm index b758f497..82bd04f3 100755 --- a/scripts/ceruleanpokecenter.asm +++ b/scripts/CeruleanPokecenter.asm @@ -1,8 +1,8 @@ -CeruleanPokecenterScript: +CeruleanPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CeruleanPokecenterTextPointers: +CeruleanPokecenter_TextPointers: dw CeruleanHealNurseText dw CeruleanPokecenterText2 dw CeruleanPokecenterText3 diff --git a/scripts/ceruleanhouse1.asm b/scripts/CeruleanTradeHouse.asm index 181a22c3..f80da19a 100755 --- a/scripts/ceruleanhouse1.asm +++ b/scripts/CeruleanTradeHouse.asm @@ -1,7 +1,7 @@ -CeruleanHouse1Script: +CeruleanTradeHouse_Script: jp EnableAutoTextBoxDrawing -CeruleanHouse1TextPointers: +CeruleanTradeHouse_TextPointers: dw CeruleanHouse1Text1 dw CeruleanHouse1Text2 diff --git a/scripts/ceruleanhousetrashed.asm b/scripts/CeruleanTrashedHouse.asm index da848b7c..f249ef01 100755 --- a/scripts/ceruleanhousetrashed.asm +++ b/scripts/CeruleanTrashedHouse.asm @@ -1,8 +1,8 @@ -CeruleanHouseTrashedScript: +CeruleanTrashedHouse_Script: call EnableAutoTextBoxDrawing ret -CeruleanHouseTrashedTextPointers: +CeruleanTrashedHouse_TextPointers: dw CeruleanHouseTrashedText1 dw CeruleanHouseTrashedText2 dw CeruleanHouseTrashedText3 diff --git a/scripts/gary.asm b/scripts/ChampionsRoom.asm index 1fe65fb0..e3cdc6d2 100755 --- a/scripts/gary.asm +++ b/scripts/ChampionsRoom.asm @@ -1,16 +1,16 @@ -GaryScript: +ChampionsRoom_Script: call EnableAutoTextBoxDrawing - ld hl, GaryScriptPointers - ld a, [wGaryCurScript] + ld hl, ChampionsRoom_ScriptPointers + ld a, [wChampionsRoomCurScript] jp CallFunctionInTable ResetGaryScript: xor a ld [wJoyIgnore], a - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret -GaryScriptPointers: +ChampionsRoom_ScriptPointers: dw GaryScript0 dw GaryScript1 dw GaryScript2 @@ -36,7 +36,7 @@ GaryScript1: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $2 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryEntrance_RLEMovement: @@ -86,7 +86,7 @@ GaryScript2: xor a ld [hJoyHeld], a ld a, $3 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript3: @@ -104,7 +104,7 @@ GaryScript3: ld [H_SPRITEINDEX], a call SetSpriteMovementBytesToFF ld a, $4 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript4: @@ -123,7 +123,7 @@ GaryScript4: ld [wMissableObjectIndex], a predef ShowObject ld a, $5 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret OakEntranceAfterVictoryMovement: @@ -154,7 +154,7 @@ GaryScript5: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $6 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript6: @@ -167,7 +167,7 @@ GaryScript6: ld [hSpriteIndexOrTextID], a call GaryScript_760c8 ld a, $7 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript7: @@ -184,7 +184,7 @@ GaryScript7: ld [H_SPRITEINDEX], a call MoveSprite ld a, $8 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret OakExitGaryRoomMovement: @@ -200,7 +200,7 @@ GaryScript8: ld [wMissableObjectIndex], a predef HideObject ld a, $9 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript9: @@ -213,7 +213,7 @@ GaryScript9: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $a - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret WalkToHallOfFame_RLEMovment: @@ -228,7 +228,7 @@ GaryScript10: xor a ld [wJoyIgnore], a ld a, $0 - ld [wGaryCurScript], a + ld [wChampionsRoomCurScript], a ret GaryScript_760c8: @@ -239,7 +239,7 @@ GaryScript_760c8: ld [wJoyIgnore], a ret -GaryTextPointers: +ChampionsRoom_TextPointers: dw GaryText1 dw GaryText2 dw GaryText3 diff --git a/scripts/cinnabargym.asm b/scripts/CinnabarGym.asm index 8af7bbd3..295bd63d 100755 --- a/scripts/cinnabargym.asm +++ b/scripts/CinnabarGym.asm @@ -1,7 +1,7 @@ -CinnabarGymScript: +CinnabarGym_Script: call CinnabarGymScript_75759 call EnableAutoTextBoxDrawing - ld hl, CinnabarGymScriptPointers + ld hl, CinnabarGym_ScriptPointers ld a, [wCinnabarGymCurScript] jp CallFunctionInTable @@ -40,7 +40,7 @@ CinnabarGymScript_757a0: ld [wTrainerHeaderFlagBit], a ret -CinnabarGymScriptPointers: +CinnabarGym_ScriptPointers: dw CinnabarGymScript0 dw CinnabarGymScript1 dw CinnabarGymScript2 @@ -170,7 +170,7 @@ CinnabarGymScript3_75857: jp CinnabarGymScript_75792 -CinnabarGymTextPointers: +CinnabarGym_TextPointers: dw CinnabarGymText1 dw CinnabarGymText2 dw CinnabarGymText3 diff --git a/scripts/cinnabarisland.asm b/scripts/CinnabarIsland.asm index 8549042f..b6346a9c 100755 --- a/scripts/cinnabarisland.asm +++ b/scripts/CinnabarIsland.asm @@ -1,14 +1,14 @@ -CinnabarIslandScript: +CinnabarIsland_Script: call EnableAutoTextBoxDrawing ld hl, wCurrentMapScriptFlags set 5, [hl] ResetEvent EVENT_MANSION_SWITCH_ON ResetEvent EVENT_LAB_STILL_REVIVING_FOSSIL - ld hl, CinnabarIslandScriptPointers + ld hl, CinnabarIsland_ScriptPointers ld a, [wCinnabarIslandCurScript] jp CallFunctionInTable -CinnabarIslandScriptPointers: +CinnabarIsland_ScriptPointers: dw CinnabarIslandScript0 dw CinnabarIslandScript1 @@ -50,7 +50,7 @@ CinnabarIslandScript1: ld [wCinnabarIslandCurScript], a ret -CinnabarIslandTextPointers: +CinnabarIsland_TextPointers: dw CinnabarIslandText1 dw CinnabarIslandText2 dw CinnabarIslandText3 diff --git a/scripts/lab1.asm b/scripts/CinnabarLab.asm index 5b08f4f2..aab3324b 100755 --- a/scripts/lab1.asm +++ b/scripts/CinnabarLab.asm @@ -1,8 +1,8 @@ -Lab1Script: +CinnabarLab_Script: call EnableAutoTextBoxDrawing ret -Lab1TextPointers: +CinnabarLab_TextPointers: dw Lab1Text1 dw Lab1Text2 dw Lab1Text3 diff --git a/scripts/lab4.asm b/scripts/CinnabarLabFossilRoom.asm index 7d0db339..f5f03a19 100755 --- a/scripts/lab4.asm +++ b/scripts/CinnabarLabFossilRoom.asm @@ -1,7 +1,7 @@ -Lab4Script: +CinnabarLabFossilRoom_Script: jp EnableAutoTextBoxDrawing -Lab4TextPointers: +CinnabarLabFossilRoom_TextPointers: dw Lab4Text1 dw Lab4Text2 diff --git a/scripts/lab3.asm b/scripts/CinnabarLabMetronomeRoom.asm index b533d162..6eddceae 100755 --- a/scripts/lab3.asm +++ b/scripts/CinnabarLabMetronomeRoom.asm @@ -1,7 +1,7 @@ -Lab3Script: +CinnabarLabMetronomeRoom_Script: jp EnableAutoTextBoxDrawing -Lab3TextPointers: +CinnabarLabMetronomeRoom_TextPointers: dw Lab3Text1 dw Lab3Text2 dw Lab3Text3 diff --git a/scripts/lab2.asm b/scripts/CinnabarLabTradeRoom.asm index ed9ef1b4..6093ae14 100755 --- a/scripts/lab2.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -1,7 +1,7 @@ -Lab2Script: +CinnabarLabTradeRoom_Script: jp EnableAutoTextBoxDrawing -Lab2TextPointers: +CinnabarLabTradeRoom_TextPointers: dw Lab2Text1 dw Lab2Text2 dw Lab2Text3 diff --git a/scripts/cinnabarmart.asm b/scripts/CinnabarMart.asm index 55b82cf0..898948c7 100755 --- a/scripts/cinnabarmart.asm +++ b/scripts/CinnabarMart.asm @@ -1,7 +1,7 @@ -CinnabarMartScript: +CinnabarMart_Script: jp EnableAutoTextBoxDrawing -CinnabarMartTextPointers: +CinnabarMart_TextPointers: dw CinnabarCashierText dw CinnabarMartText2 dw CinnabarMartText3 diff --git a/scripts/cinnabarpokecenter.asm b/scripts/CinnabarPokecenter.asm index 2f6d5791..a6184bb0 100755 --- a/scripts/cinnabarpokecenter.asm +++ b/scripts/CinnabarPokecenter.asm @@ -1,8 +1,8 @@ -CinnabarPokecenterScript: +CinnabarPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -CinnabarPokecenterTextPointers: +CinnabarPokecenter_TextPointers: dw CinnabarHealNurseText dw CinnabarPokecenterText2 dw CinnabarPokecenterText3 diff --git a/scripts/colosseum.asm b/scripts/Colosseum.asm index bdfa3c44..8cc6b056 100755 --- a/scripts/colosseum.asm +++ b/scripts/Colosseum.asm @@ -1,7 +1,7 @@ -ColosseumScript: - jp TradeCenterScript +Colosseum_Script: + jp TradeCenter_Script -ColosseumTextPointers: +Colosseum_TextPointers: dw ColosseumText1 ColosseumText1: diff --git a/scripts/copycatshouse1f.asm b/scripts/CopycatsHouse1F.asm index 25cd0fc2..a86625fc 100755 --- a/scripts/copycatshouse1f.asm +++ b/scripts/CopycatsHouse1F.asm @@ -1,7 +1,7 @@ -CopycatsHouse1FScript: +CopycatsHouse1F_Script: jp EnableAutoTextBoxDrawing -CopycatsHouse1FTextPointers: +CopycatsHouse1F_TextPointers: dw CopycatsHouse1FText1 dw CopycatsHouse1FText2 dw CopycatsHouse1FText3 diff --git a/scripts/copycatshouse2f.asm b/scripts/CopycatsHouse2F.asm index 87946b8f..b43234c3 100755 --- a/scripts/copycatshouse2f.asm +++ b/scripts/CopycatsHouse2F.asm @@ -1,7 +1,7 @@ -CopycatsHouse2FScript: +CopycatsHouse2F_Script: jp EnableAutoTextBoxDrawing -CopycatsHouse2FTextPointers: +CopycatsHouse2F_TextPointers: dw CopycatsHouse2FText1 dw CopycatsHouse2FText2 dw CopycatsHouse2FText3 diff --git a/scripts/daycarem.asm b/scripts/Daycare.asm index 60daa3d5..81cf5534 100755 --- a/scripts/daycarem.asm +++ b/scripts/Daycare.asm @@ -1,7 +1,7 @@ -DayCareMScript: +Daycare_Script: jp EnableAutoTextBoxDrawing -DayCareMTextPointers: +Daycare_TextPointers: dw DayCareMText1 DayCareMText1: diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm new file mode 100755 index 00000000..1d7b23f9 --- /dev/null +++ b/scripts/DiglettsCave.asm @@ -0,0 +1,5 @@ +DiglettsCave_Script: + jp EnableAutoTextBoxDrawing + +DiglettsCave_TextPointers: + db "@" diff --git a/scripts/diglettscaveroute11.asm b/scripts/DiglettsCaveRoute11.asm index d97a8446..54c3112e 100755 --- a/scripts/diglettscaveroute11.asm +++ b/scripts/DiglettsCaveRoute11.asm @@ -1,10 +1,10 @@ -DiglettsCaveEntranceRoute11Script: +DiglettsCaveRoute11_Script: call EnableAutoTextBoxDrawing ld a, ROUTE_11 ld [wLastMap], a ret -DiglettsCaveEntranceRoute11TextPointers: +DiglettsCaveRoute11_TextPointers: dw DiglettsCaveEntranceRoute11Text1 DiglettsCaveEntranceRoute11Text1: diff --git a/scripts/diglettscaveroute2.asm b/scripts/DiglettsCaveRoute2.asm index 9f061daa..5fe7777c 100755 --- a/scripts/diglettscaveroute2.asm +++ b/scripts/DiglettsCaveRoute2.asm @@ -1,9 +1,9 @@ -DiglettsCaveRoute2Script: +DiglettsCaveRoute2_Script: ld a, ROUTE_2 ld [wLastMap], a jp EnableAutoTextBoxDrawing -DiglettsCaveRoute2TextPointers: +DiglettsCaveRoute2_TextPointers: dw DiglettsCaveRoute2Text1 DiglettsCaveRoute2Text1: diff --git a/scripts/fightingdojo.asm b/scripts/FightingDojo.asm index 5c7704f5..fc691dba 100755 --- a/scripts/fightingdojo.asm +++ b/scripts/FightingDojo.asm @@ -1,7 +1,7 @@ -FightingDojoScript: +FightingDojo_Script: call EnableAutoTextBoxDrawing ld hl, FightingDojoTrainerHeader0 - ld de, FightingDojoScriptPointers + ld de, FightingDojo_ScriptPointers ld a, [wFightingDojoCurScript] call ExecuteCurMapScriptInTable ld [wFightingDojoCurScript], a @@ -14,7 +14,7 @@ FightingDojoScript_5cd70: ld [wCurMapScript], a ret -FightingDojoScriptPointers: +FightingDojo_ScriptPointers: dw FightingDojoScript1 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -80,7 +80,7 @@ FightingDojoScript3: ld [wCurMapScript], a ret -FightingDojoTextPointers: +FightingDojo_TextPointers: dw FightingDojoText1 dw FightingDojoText2 dw FightingDojoText3 diff --git a/scripts/fuchsiahouse1.asm b/scripts/FuchsiaBillsGrandpasHouse.asm index 95e59503..ca5f2c16 100755 --- a/scripts/fuchsiahouse1.asm +++ b/scripts/FuchsiaBillsGrandpasHouse.asm @@ -1,8 +1,8 @@ -FuchsiaHouse1Script: +FuchsiaBillsGrandpasHouse_Script: call EnableAutoTextBoxDrawing ret -FuchsiaHouse1TextPointers: +FuchsiaBillsGrandpasHouse_TextPointers: dw FuchsiaHouse1Text1 dw FuchsiaHouse1Text2 dw FuchsiaHouse1Text3 diff --git a/scripts/fuchsiacity.asm b/scripts/FuchsiaCity.asm index 74d7ee30..d3f0ce32 100755 --- a/scripts/fuchsiacity.asm +++ b/scripts/FuchsiaCity.asm @@ -1,7 +1,7 @@ -FuchsiaCityScript: +FuchsiaCity_Script: jp EnableAutoTextBoxDrawing -FuchsiaCityTextPointers: +FuchsiaCity_TextPointers: dw FuchsiaCityText1 dw FuchsiaCityText2 dw FuchsiaCityText3 diff --git a/scripts/fuchsiahouse3.asm b/scripts/FuchsiaGoodRodHouse.asm index 586d62f5..93a20e80 100755 --- a/scripts/fuchsiahouse3.asm +++ b/scripts/FuchsiaGoodRodHouse.asm @@ -1,7 +1,7 @@ -FuchsiaHouse3Script: +FuchsiaGoodRodHouse_Script: jp EnableAutoTextBoxDrawing -FuchsiaHouse3TextPointers: +FuchsiaGoodRodHouse_TextPointers: dw FuchsiaHouse3Text1 FuchsiaHouse3Text1: diff --git a/scripts/fuchsiagym.asm b/scripts/FuchsiaGym.asm index 3628ebc0..c856c93b 100755 --- a/scripts/fuchsiagym.asm +++ b/scripts/FuchsiaGym.asm @@ -1,8 +1,8 @@ -FuchsiaGymScript: +FuchsiaGym_Script: call FuchsiaGymScript_75453 call EnableAutoTextBoxDrawing ld hl, FuchsiaGymTrainerHeader0 - ld de, FuchsiaGymScriptPointers + ld de, FuchsiaGym_ScriptPointers ld a, [wFuchsiaGymCurScript] call ExecuteCurMapScriptInTable ld [wFuchsiaGymCurScript], a @@ -30,7 +30,7 @@ FuchsiaGymScript_75477: ld [wCurMapScript], a ret -FuchsiaGymScriptPointers: +FuchsiaGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ FuchsiaGymScript3_75497: jp FuchsiaGymScript_75477 -FuchsiaGymTextPointers: +FuchsiaGym_TextPointers: dw FuchsiaGymText1 dw FuchsiaGymText2 dw FuchsiaGymText3 diff --git a/scripts/fuchsiamart.asm b/scripts/FuchsiaMart.asm index 96df9290..f17cac49 100755 --- a/scripts/fuchsiamart.asm +++ b/scripts/FuchsiaMart.asm @@ -1,7 +1,7 @@ -FuchsiaMartScript: +FuchsiaMart_Script: jp EnableAutoTextBoxDrawing -FuchsiaMartTextPointers: +FuchsiaMart_TextPointers: dw FuchsiaCashierText dw FuchsiaMartText2 dw FuchsiaMartText3 diff --git a/scripts/fuchsiameetingroom.asm b/scripts/FuchsiaMeetingRoom.asm index 7995a49b..95ac12fa 100755 --- a/scripts/fuchsiameetingroom.asm +++ b/scripts/FuchsiaMeetingRoom.asm @@ -1,8 +1,8 @@ -FuchsiaMeetingRoomScript: +FuchsiaMeetingRoom_Script: call EnableAutoTextBoxDrawing ret -FuchsiaMeetingRoomTextPointers: +FuchsiaMeetingRoom_TextPointers: dw FuchsiaMeetingRoomText1 dw FuchsiaMeetingRoomText2 dw FuchsiaMeetingRoomText3 diff --git a/scripts/fuchsiapokecenter.asm b/scripts/FuchsiaPokecenter.asm index a6111e84..182ec8c3 100755 --- a/scripts/fuchsiapokecenter.asm +++ b/scripts/FuchsiaPokecenter.asm @@ -1,8 +1,8 @@ -FuchsiaPokecenterScript: +FuchsiaPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -FuchsiaPokecenterTextPointers: +FuchsiaPokecenter_TextPointers: dw FuchsiaHealNurseText dw FuchsiaPokecenterText2 dw FuchsiaPokecenterText3 diff --git a/scripts/celadongamecorner.asm b/scripts/GameCorner.asm index cc81b076..265508e0 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/GameCorner.asm @@ -1,9 +1,9 @@ -CeladonGameCornerScript: +GameCorner_Script: call CeladonGameCornerScript_48bcf call CeladonGameCornerScript_48bec call EnableAutoTextBoxDrawing - ld hl, CeladonGameCornerScriptPointers - ld a, [wCeladonGameCornerCurScript] + ld hl, GameCorner_ScriptPointers + ld a, [wGameCornerCurScript] jp CallFunctionInTable CeladonGameCornerScript_48bcf: @@ -38,11 +38,11 @@ CeladonGameCornerScript_48bec: CeladonGameCornerScript_48c07: xor a ld [wJoyIgnore], a - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ld [wCurMapScript], a ret -CeladonGameCornerScriptPointers: +GameCorner_ScriptPointers: dw CeladonGameCornerScript0 dw CeladonGameCornerScript1 dw CeladonGameCornerScript2 @@ -78,7 +78,7 @@ CeladonGameCornerScript1: ld [H_SPRITEINDEX], a call MoveSprite ld a, $2 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ret MovementData_48c5a: @@ -113,10 +113,10 @@ CeladonGameCornerScript2: set 5, [hl] set 6, [hl] ld a, $0 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a ret -CeladonGameCornerTextPointers: +GameCorner_TextPointers: dw CeladonGameCornerText1 dw CeladonGameCornerText2 dw CeladonGameCornerText3 @@ -427,7 +427,7 @@ CeladonGameCornerText11: ld [hJoyPressed], a ld [hJoyReleased], a ld a, $1 - ld [wCeladonGameCornerCurScript], a + ld [wGameCornerCurScript], a jp TextScriptEnd CeladonGameCornerText_48ece: diff --git a/scripts/celadonprizeroom.asm b/scripts/GameCornerPrizeRoom.asm index a07ce162..e6cf6f0d 100755 --- a/scripts/celadonprizeroom.asm +++ b/scripts/GameCornerPrizeRoom.asm @@ -1,7 +1,7 @@ -CeladonPrizeRoomScript: +GameCornerPrizeRoom_Script: jp EnableAutoTextBoxDrawing -CeladonPrizeRoomTextPointers: +GameCornerPrizeRoom_TextPointers: dw CeladonPrizeRoomText1 dw CeladonPrizeRoomText2 dw CeladonPrizeRoomText3 diff --git a/scripts/halloffameroom.asm b/scripts/HallOfFame.asm index 94e64431..511c9754 100755 --- a/scripts/halloffameroom.asm +++ b/scripts/HallOfFame.asm @@ -1,16 +1,16 @@ -HallofFameRoomScript: +HallOfFame_Script: call EnableAutoTextBoxDrawing - ld hl, HallofFameRoomScriptPointers - ld a, [wHallOfFameRoomCurScript] + ld hl, HallOfFame_ScriptPointers + ld a, [wHallOfFameCurScript] jp CallFunctionInTable HallofFameRoomScript_5a4aa: xor a ld [wJoyIgnore], a - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret -HallofFameRoomScriptPointers: +HallOfFame_ScriptPointers: dw HallofFameRoomScript0 dw HallofFameRoomScript1 dw HallofFameRoomScript2 @@ -33,16 +33,16 @@ HallofFameRoomScript2: inc hl set 0, [hl] xor a - ld hl, wLoreleiCurScript - ld [hli], a - ld [hli], a - ld [hl], a - ld [wLanceCurScript], a - ld [wHallOfFameRoomCurScript], a + ld hl, wLoreleisRoomCurScript + ld [hli], a ; wLoreleisRoomCurScript + ld [hli], a ; wBrunosRoomCurScript + ld [hl], a ; wAgathasRoomCurScript + ld [wLancesRoomCurScript], a + ld [wHallOfFameCurScript], a ; Elite 4 events ResetEventRange ELITE4_EVENTS_START, ELITE4_CHAMPION_EVENTS_END, 1 xor a - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ld a, PALLET_TOWN ld [wLastBlackoutMap], a callba SaveSAVtoSRAM @@ -65,7 +65,7 @@ HallofFameRoomScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret RLEMovement5a528: @@ -98,10 +98,10 @@ HallofFameRoomScript1: ld [wMissableObjectIndex], a predef HideObject ld a, $2 - ld [wHallOfFameRoomCurScript], a + ld [wHallOfFameCurScript], a ret -HallofFameRoomTextPointers: +HallOfFame_TextPointers: dw HallofFameRoomText1 HallofFameRoomText1: diff --git a/scripts/IndigoPlateau.asm b/scripts/IndigoPlateau.asm new file mode 100755 index 00000000..86f38b2a --- /dev/null +++ b/scripts/IndigoPlateau.asm @@ -0,0 +1,4 @@ +IndigoPlateau_Script: + ret + +IndigoPlateau_TextPointers: diff --git a/scripts/indigoplateaulobby.asm b/scripts/IndigoPlateauLobby.asm index c26f6f0c..f83c0ba4 100755 --- a/scripts/indigoplateaulobby.asm +++ b/scripts/IndigoPlateauLobby.asm @@ -1,4 +1,4 @@ -IndigoPlateauLobbyScript: +IndigoPlateauLobby_Script: call Serial_TryEstablishingExternallyClockedConnection call EnableAutoTextBoxDrawing ld hl, wCurrentMapScriptFlags @@ -14,7 +14,7 @@ IndigoPlateauLobbyScript: ResetEventRange ELITE4_EVENTS_START, EVENT_LANCES_ROOM_LOCK_DOOR ret -IndigoPlateauLobbyTextPointers: +IndigoPlateauLobby_TextPointers: dw IndigoHealNurseText dw IndigoPlateauLobbyText2 dw IndigoPlateauLobbyText3 diff --git a/scripts/lance.asm b/scripts/LancesRoom.asm index a0b0e6e7..5e19ea7d 100755 --- a/scripts/lance.asm +++ b/scripts/LancesRoom.asm @@ -1,11 +1,11 @@ -LanceScript: +LancesRoom_Script: call LanceShowOrHideEntranceBlocks call EnableAutoTextBoxDrawing ld hl, LanceTrainerHeader0 - ld de, LanceScriptPointers - ld a, [wLanceCurScript] + ld de, LancesRoom_ScriptPointers + ld a, [wLancesRoomCurScript] call ExecuteCurMapScriptInTable - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ret LanceShowOrHideEntranceBlocks: @@ -39,10 +39,10 @@ LanceSetEntranceBlock: ResetLanceScript: xor a - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ret -LanceScriptPointers: +LancesRoom_ScriptPointers: dw LanceScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LanceScript2 @@ -105,7 +105,7 @@ WalkToLance: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret @@ -123,11 +123,11 @@ LanceScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wLanceCurScript], a + ld [wLancesRoomCurScript], a ld [wCurMapScript], a ret -LanceTextPointers: +LancesRoom_TextPointers: dw LanceText1 LanceTrainerHeader0: diff --git a/scripts/lavenderhouse2.asm b/scripts/LavenderCuboneHouse.asm index b531c047..ff5aa732 100755 --- a/scripts/lavenderhouse2.asm +++ b/scripts/LavenderCuboneHouse.asm @@ -1,8 +1,8 @@ -LavenderHouse2Script: +LavenderCuboneHouse_Script: call EnableAutoTextBoxDrawing ret -LavenderHouse2TextPointers: +LavenderCuboneHouse_TextPointers: dw LavenderHouse2Text1 dw LavenderHouse2Text2 diff --git a/scripts/lavendermart.asm b/scripts/LavenderMart.asm index 51b64992..47330e5d 100755 --- a/scripts/lavendermart.asm +++ b/scripts/LavenderMart.asm @@ -1,7 +1,7 @@ -LavenderMartScript: +LavenderMart_Script: jp EnableAutoTextBoxDrawing -LavenderMartTextPointers: +LavenderMart_TextPointers: dw LavenderCashierText dw LavenderMartText2 dw LavenderMartText3 diff --git a/scripts/lavenderpokecenter.asm b/scripts/LavenderPokecenter.asm index 61d0b887..10482fef 100755 --- a/scripts/lavenderpokecenter.asm +++ b/scripts/LavenderPokecenter.asm @@ -1,8 +1,8 @@ -LavenderPokecenterScript: +LavenderPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -LavenderPokecenterTextPointers: +LavenderPokecenter_TextPointers: dw LavenderHealNurseText dw LavenderPokecenterText2 dw LavenderPokecenterText3 diff --git a/scripts/lavendertown.asm b/scripts/LavenderTown.asm index daf490b1..c23996e9 100755 --- a/scripts/lavendertown.asm +++ b/scripts/LavenderTown.asm @@ -1,7 +1,7 @@ -LavenderTownScript: +LavenderTown_Script: jp EnableAutoTextBoxDrawing -LavenderTownTextPointers: +LavenderTown_TextPointers: dw LavenderTownText1 dw LavenderTownText2 dw LavenderTownText3 diff --git a/scripts/lorelei.asm b/scripts/LoreleisRoom.asm index ec29847a..81142377 100755 --- a/scripts/lorelei.asm +++ b/scripts/LoreleisRoom.asm @@ -1,11 +1,11 @@ -LoreleiScript: +LoreleisRoom_Script: call LoreleiShowOrHideExitBlock call EnableAutoTextBoxDrawing ld hl, LoreleiTrainerHeader0 - ld de, LoreleiScriptPointers - ld a, [wLoreleiCurScript] + ld de, LoreleisRoom_ScriptPointers + ld a, [wLoreleisRoomCurScript] call ExecuteCurMapScriptInTable - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ret LoreleiShowOrHideExitBlock: @@ -29,10 +29,10 @@ LoreleiShowOrHideExitBlock: ResetLoreleiScript: xor a - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ret -LoreleiScriptPointers: +LoreleisRoom_ScriptPointers: dw LoreleiScript0 dw DisplayEnemyTrainerTextAndStartBattle dw LoreleiScript2 @@ -56,7 +56,7 @@ LoreleiScriptWalkIntoRoom: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -84,7 +84,7 @@ LoreleiScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $3 - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -102,7 +102,7 @@ LoreleiScript3: call Delay3 xor a ld [wJoyIgnore], a - ld [wLoreleiCurScript], a + ld [wLoreleisRoomCurScript], a ld [wCurMapScript], a ret @@ -115,7 +115,7 @@ LoreleiScript2: ld [hSpriteIndexOrTextID], a jp DisplayTextID -LoreleiTextPointers: +LoreleisRoom_TextPointers: dw LoreleiText1 dw LoreleiDontRunAwayText diff --git a/scripts/lavenderhouse1.asm b/scripts/MrFujisHouse.asm index 91b9286b..98190cd8 100755 --- a/scripts/lavenderhouse1.asm +++ b/scripts/MrFujisHouse.asm @@ -1,8 +1,8 @@ -LavenderHouse1Script: +MrFujisHouse_Script: call EnableAutoTextBoxDrawing ret -LavenderHouse1TextPointers: +MrFujisHouse_TextPointers: dw LavenderHouse1Text1 dw LavenderHouse1Text2 dw LavenderHouse1Text3 diff --git a/scripts/saffronhouse2.asm b/scripts/MrPsychicsHouse.asm index 10c3d29e..7d4f54c0 100755 --- a/scripts/saffronhouse2.asm +++ b/scripts/MrPsychicsHouse.asm @@ -1,7 +1,7 @@ -SaffronHouse2Script: +MrPsychicsHouse_Script: jp EnableAutoTextBoxDrawing -SaffronHouse2TextPointers: +MrPsychicsHouse_TextPointers: dw SaffronHouse2Text1 SaffronHouse2Text1: diff --git a/scripts/mtmoon1.asm b/scripts/MtMoon1F.asm index 5ee3d025..b05b3f60 100755 --- a/scripts/mtmoon1.asm +++ b/scripts/MtMoon1F.asm @@ -1,18 +1,18 @@ -MtMoon1Script: +MtMoon1F_Script: call EnableAutoTextBoxDrawing ld hl, MtMoon1TrainerHeader0 - ld de, MtMoon1ScriptPointers - ld a, [wMtMoon1CurScript] + ld de, MtMoon1F_ScriptPointers + ld a, [wMtMoon1FCurScript] call ExecuteCurMapScriptInTable - ld [wMtMoon1CurScript], a + ld [wMtMoon1FCurScript], a ret -MtMoon1ScriptPointers: +MtMoon1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -MtMoon1TextPointers: +MtMoon1F_TextPointers: dw MtMoon1Text1 dw MtMoon1Text2 dw MtMoon1Text3 diff --git a/scripts/mtmoon2.asm b/scripts/MtMoonB1F.asm index 6d1e5339..779812c3 100755 --- a/scripts/mtmoon2.asm +++ b/scripts/MtMoonB1F.asm @@ -1,8 +1,8 @@ -MtMoon2Script: +MtMoonB1F_Script: call EnableAutoTextBoxDrawing ret -MtMoon2TextPointers: +MtMoonB1F_TextPointers: dw MtMoonText1 MtMoonText1: diff --git a/scripts/mtmoon3.asm b/scripts/MtMoonB2F.asm index 60cd1ab8..863d9d22 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/MtMoonB2F.asm @@ -1,10 +1,10 @@ -MtMoon3Script: +MtMoonB2F_Script: call EnableAutoTextBoxDrawing ld hl, MtMoon3TrainerHeader0 - ld de, MtMoon3ScriptPointers - ld a, [wMtMoon3CurScript] + ld de, MtMoonB2F_ScriptPointers + ld a, [wMtMoonB2FCurScript] call ExecuteCurMapScriptInTable - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD ret z ld hl, CoordsData_49d37 @@ -40,11 +40,11 @@ CoordsData_49d37: MtMoon3Script_49d58: xor a ld [wJoyIgnore], a - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret -MtMoon3ScriptPointers: +MtMoonB2F_ScriptPointers: dw MtMoon3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -82,7 +82,7 @@ MtMoon3Script3: xor a ld [wJoyIgnore], a ld a, $0 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret @@ -105,7 +105,7 @@ MtMoon3Script4: ld [H_SPRITEINDEX], a call MoveSprite ld a, $5 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret @@ -140,21 +140,21 @@ MtMoon3Script5: call DisplayTextID CheckEvent EVENT_GOT_DOME_FOSSIL jr z, .asm_49e1d - ld a, HS_MT_MOON_3_FOSSIL_2 + ld a, HS_MT_MOON_B2F_FOSSIL_2 jr .asm_49e1f .asm_49e1d - ld a, HS_MT_MOON_3_FOSSIL_1 + ld a, HS_MT_MOON_B2F_FOSSIL_1 .asm_49e1f ld [wMissableObjectIndex], a predef HideObject xor a ld [wJoyIgnore], a ld a, $0 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a ret -MtMoon3TextPointers: +MtMoonB2F_TextPointers: dw MtMoon3Text1 dw MtMoon3Text2 dw MtMoon3Text3 @@ -227,7 +227,7 @@ MtMoon3Text1: call EngageMapTrainer call InitBattleEnemyParameters ld a, $3 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a jr .asm_49ebe .asm_49eb8 @@ -274,12 +274,12 @@ MtMoon3Text6: call GiveItem jp nc, MtMoon3Script_49f76 call MtMoon3Script_49f69 - ld a, HS_MT_MOON_3_FOSSIL_1 + ld a, HS_MT_MOON_B2F_FOSSIL_1 ld [wMissableObjectIndex], a predef HideObject SetEvent EVENT_GOT_DOME_FOSSIL ld a, $4 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a .asm_49f21 jp TextScriptEnd @@ -302,12 +302,12 @@ MtMoon3Text7: call GiveItem jp nc, MtMoon3Script_49f76 call MtMoon3Script_49f69 - ld a, HS_MT_MOON_3_FOSSIL_2 + ld a, HS_MT_MOON_B2F_FOSSIL_2 ld [wMissableObjectIndex], a predef HideObject SetEvent EVENT_GOT_HELIX_FOSSIL ld a, $4 - ld [wMtMoon3CurScript], a + ld [wMtMoonB2FCurScript], a ld [wCurMapScript], a .asm_49f61 jp TextScriptEnd diff --git a/scripts/mtmoonpokecenter.asm b/scripts/MtMoonPokecenter.asm index b5edee8d..969031db 100755 --- a/scripts/mtmoonpokecenter.asm +++ b/scripts/MtMoonPokecenter.asm @@ -1,8 +1,8 @@ -MtMoonPokecenterScript: +MtMoonPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -MtMoonPokecenterTextPointers: +MtMoonPokecenter_TextPointers: dw MtMoonHealNurseText dw MtMoonPokecenterText2 dw MtMoonPokecenterText3 diff --git a/scripts/museum1f.asm b/scripts/Museum1F.asm index 35bfb446..712f1fc4 100755 --- a/scripts/museum1f.asm +++ b/scripts/Museum1F.asm @@ -1,13 +1,13 @@ -Museum1FScript: +Museum1F_Script: ld a, $1 ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, Museum1FScriptPointers - ld a, [wMuseum1fCurScript] + ld hl, Museum1F_ScriptPointers + ld a, [wMuseum1FCurScript] jp CallFunctionInTable -Museum1FScriptPointers: +Museum1F_ScriptPointers: dw Museum1FScript0 dw Museum1FScript1 @@ -31,7 +31,7 @@ Museum1FScript0: Museum1FScript1: ret -Museum1FTextPointers: +Museum1F_TextPointers: dw Museum1FText1 dw Museum1FText2 dw Museum1FText3 @@ -120,7 +120,7 @@ Museum1FText1: jr Museum1FScriptEnd .asm_0b094 ld a, $1 - ld [wMuseum1fCurScript], a + ld [wMuseum1FCurScript], a jr Museum1FScriptEnd Museum1FScript_5c1f9: diff --git a/scripts/museum2f.asm b/scripts/Museum2F.asm index 6ee8d72a..ce4d3d81 100755 --- a/scripts/museum2f.asm +++ b/scripts/Museum2F.asm @@ -1,7 +1,7 @@ -Museum2FScript: +Museum2F_Script: jp EnableAutoTextBoxDrawing -Museum2FTextPointers: +Museum2F_TextPointers: dw Museum2FText1 dw Museum2FText2 dw Museum2FText3 diff --git a/scripts/namerater.asm b/scripts/NameRatersHouse.asm index 160948ac..323cb360 100755 --- a/scripts/namerater.asm +++ b/scripts/NameRatersHouse.asm @@ -1,4 +1,4 @@ -NameRaterScript: +NameRatersHouse_Script: jp EnableAutoTextBoxDrawing NameRaterScript_1da15: @@ -37,7 +37,7 @@ NameRaterScript_1da20: scf ret -NameRaterTextPointers: +NameRatersHouse_TextPointers: dw NameRaterText1 NameRaterText1: diff --git a/scripts/oakslab.asm b/scripts/OaksLab.asm index aa84fab9..364b157b 100755 --- a/scripts/oakslab.asm +++ b/scripts/OaksLab.asm @@ -1,15 +1,15 @@ -OaksLabScript: +OaksLab_Script: CheckEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS_2 call nz, OaksLabScript_1d076 ld a, $1 ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a - ld hl, OaksLabScriptPointers + ld hl, OaksLab_ScriptPointers ld a, [wOaksLabCurScript] jp CallFunctionInTable -OaksLabScriptPointers: +OaksLab_ScriptPointers: dw OaksLabScript0 dw OaksLabScript1 dw OaksLabScript2 @@ -712,14 +712,14 @@ OaksLabScript_1d02b: ret OaksLabScript_1d076: - ld hl, OaksLabTextPointers2 + ld hl, OaksLab_TextPointers2 ld a, l ld [wMapTextPtr], a ld a, h ld [wMapTextPtr+1], a ret -OaksLabTextPointers: +OaksLab_TextPointers: dw OaksLabText1 dw OaksLabText2 dw OaksLabText3 @@ -748,7 +748,7 @@ OaksLabTextPointers: dw OaksLabText26 dw OaksLabText27 -OaksLabTextPointers2: +OaksLab_TextPointers2: dw OaksLabText1 dw OaksLabText2 dw OaksLabText3 diff --git a/scripts/pallettown.asm b/scripts/PalletTown.asm index 5b2d2a35..5ad7d40f 100755 --- a/scripts/pallettown.asm +++ b/scripts/PalletTown.asm @@ -1,14 +1,14 @@ -PalletTownScript: +PalletTown_Script: CheckEvent EVENT_GOT_POKEBALLS_FROM_OAK jr z, .next SetEvent EVENT_PALLET_AFTER_GETTING_POKEBALLS .next call EnableAutoTextBoxDrawing - ld hl, PalletTownScriptPointers + ld hl, PalletTown_ScriptPointers ld a, [wPalletTownCurScript] jp CallFunctionInTable -PalletTownScriptPointers: +PalletTown_ScriptPointers: dw PalletTownScript0 dw PalletTownScript1 dw PalletTownScript2 @@ -148,7 +148,7 @@ PalletTownScript5: PalletTownScript6: ret -PalletTownTextPointers: +PalletTown_TextPointers: dw PalletTownText1 dw PalletTownText2 dw PalletTownText3 diff --git a/scripts/pewtercity.asm b/scripts/PewterCity.asm index 80acede8..dcc449c1 100755 --- a/scripts/pewtercity.asm +++ b/scripts/PewterCity.asm @@ -1,10 +1,10 @@ -PewterCityScript: +PewterCity_Script: call EnableAutoTextBoxDrawing - ld hl, PewterCityScriptPointers + ld hl, PewterCity_ScriptPointers ld a, [wPewterCityCurScript] jp CallFunctionInTable -PewterCityScriptPointers: +PewterCity_ScriptPointers: dw PewterCityScript0 dw PewterCityScript1 dw PewterCityScript2 @@ -15,7 +15,7 @@ PewterCityScriptPointers: PewterCityScript0: xor a - ld [wMuseum1fCurScript], a + ld [wMuseum1FCurScript], a ResetEvent EVENT_BOUGHT_MUSEUM_TICKET call PewterCityScript_1925e ret @@ -176,7 +176,7 @@ PewterCityScript6: ld [wPewterCityCurScript], a ret -PewterCityTextPointers: +PewterCity_TextPointers: dw PewterCityText1 dw PewterCityText2 dw PewterCityText3 diff --git a/scripts/pewtergym.asm b/scripts/PewterGym.asm index 2cfee6c0..6dd24b08 100755 --- a/scripts/pewtergym.asm +++ b/scripts/PewterGym.asm @@ -1,11 +1,11 @@ -PewterGymScript: +PewterGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, PewterGymScript_5c3a4 call EnableAutoTextBoxDrawing ld hl, PewterGymTrainerHeader0 - ld de, PewterGymScriptPointers + ld de, PewterGym_ScriptPointers ld a, [wPewterGymCurScript] call ExecuteCurMapScriptInTable ld [wPewterGymCurScript], a @@ -29,7 +29,7 @@ PewterGymScript_5c3bf: ld [wCurMapScript], a ret -PewterGymScriptPointers: +PewterGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -79,7 +79,7 @@ PewterGymScript_5c3df: jp PewterGymScript_5c3bf -PewterGymTextPointers: +PewterGym_TextPointers: dw PewterGymText1 dw PewterGymText2 dw PewterGymText3 diff --git a/scripts/pewtermart.asm b/scripts/PewterMart.asm index d5281704..c71f8413 100755 --- a/scripts/pewtermart.asm +++ b/scripts/PewterMart.asm @@ -1,10 +1,10 @@ -PewterMartScript: +PewterMart_Script: call EnableAutoTextBoxDrawing ld a, $1 ld [wAutoTextBoxDrawingControl], a ret -PewterMartTextPointers: +PewterMart_TextPointers: dw PewterCashierText dw PewterMartText2 dw PewterMartText3 diff --git a/scripts/pewterhouse1.asm b/scripts/PewterNidoranHouse.asm index 8fa8dc3c..a4e85e08 100755 --- a/scripts/pewterhouse1.asm +++ b/scripts/PewterNidoranHouse.asm @@ -1,7 +1,7 @@ -PewterHouse1Script: +PewterNidoranHouse_Script: jp EnableAutoTextBoxDrawing -PewterHouse1TextPointers: +PewterNidoranHouse_TextPointers: dw PewterHouse1Text1 dw PewterHouse1Text2 dw PewterHouse1Text3 diff --git a/scripts/pewterpokecenter.asm b/scripts/PewterPokecenter.asm index 4dd63559..68115050 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/PewterPokecenter.asm @@ -1,8 +1,8 @@ -PewterPokecenterScript: +PewterPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -PewterPokecenterTextPointers: +PewterPokecenter_TextPointers: dw PewterHealNurseText dw PewterPokecenterText2 dw PewterJigglypuffText diff --git a/scripts/pewterhouse2.asm b/scripts/PewterSpeechHouse.asm index e3bbe01e..943e1759 100755 --- a/scripts/pewterhouse2.asm +++ b/scripts/PewterSpeechHouse.asm @@ -1,7 +1,7 @@ -PewterHouse2Script: +PewterSpeechHouse_Script: jp EnableAutoTextBoxDrawing -PewterHouse2TextPointers: +PewterSpeechHouse_TextPointers: dw PewterHouse2Text1 dw PewterHouse2Text2 diff --git a/scripts/fanclub.asm b/scripts/PokemonFanClub.asm index b6d65586..673d6011 100755 --- a/scripts/fanclub.asm +++ b/scripts/PokemonFanClub.asm @@ -1,4 +1,4 @@ -FanClubScript: +PokemonFanClub_Script: jp EnableAutoTextBoxDrawing FanClubBikeInBag: @@ -11,7 +11,7 @@ FanClubBikeInBag: ld b, BIKE_VOUCHER jp IsItemInBag -FanClubTextPointers: +PokemonFanClub_TextPointers: dw FanClubText1 dw FanClubText2 dw FanClubText3 diff --git a/scripts/mansion1.asm b/scripts/PokemonMansion1F.asm index 2fdc18c6..41f40635 100755 --- a/scripts/mansion1.asm +++ b/scripts/PokemonMansion1F.asm @@ -1,11 +1,11 @@ -Mansion1Script: +PokemonMansion1F_Script: call Mansion1Subscript1 call EnableAutoTextBoxDrawing ld hl, Mansion1TrainerHeader0 - ld de, Mansion1ScriptPointers - ld a, [wMansion1CurScript] + ld de, PokemonMansion1F_ScriptPointers + ld a, [wPokemonMansion1FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion1CurScript], a + ld [wPokemonMansion1FCurScript], a ret Mansion1Subscript1: @@ -55,12 +55,12 @@ Mansion1Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion1ScriptPointers: +PokemonMansion1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion1TextPointers: +PokemonMansion1F_TextPointers: dw Mansion1Text1 dw PickUpItemText dw PickUpItemText diff --git a/scripts/mansion2.asm b/scripts/PokemonMansion2F.asm index ddc1ff7a..a7b90bcd 100755 --- a/scripts/mansion2.asm +++ b/scripts/PokemonMansion2F.asm @@ -1,11 +1,11 @@ -Mansion2Script: +PokemonMansion2F_Script: call Mansion2Script_51fee call EnableAutoTextBoxDrawing ld hl, Mansion2TrainerHeader0 - ld de, Mansion2ScriptPointers - ld a, [wMansion2CurScript] + ld de, PokemonMansion2F_ScriptPointers + ld a, [wPokemonMansion2FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion2CurScript], a + ld [wPokemonMansion2FCurScript], a ret Mansion2Script_51fee: @@ -51,12 +51,12 @@ Mansion2Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion2ScriptPointers: +PokemonMansion2F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion2TextPointers: +PokemonMansion2F_TextPointers: dw Mansion2Text1 dw PickUpItemText dw Mansion2Text3 diff --git a/scripts/mansion3.asm b/scripts/PokemonMansion3F.asm index abe76df8..3edc7bfd 100755 --- a/scripts/mansion3.asm +++ b/scripts/PokemonMansion3F.asm @@ -1,11 +1,11 @@ -Mansion3Script: +PokemonMansion3F_Script: call Mansion3Script_52204 call EnableAutoTextBoxDrawing ld hl, Mansion3TrainerHeader0 - ld de, Mansion3ScriptPointers - ld a, [wMansion3CurScript] + ld de, PokemonMansion3F_ScriptPointers + ld a, [wPokemonMansion3FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion3CurScript], a + ld [wPokemonMansion3FCurScript], a ret Mansion3Script_52204: @@ -31,7 +31,7 @@ Mansion3Script_52204: call Mansion2Script_5202f ret -Mansion3ScriptPointers: +PokemonMansion3F_ScriptPointers: dw Mansion3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -82,7 +82,7 @@ Mansion3Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion3TextPointers: +PokemonMansion3F_TextPointers: dw Mansion3Text1 dw Mansion3Text2 dw PickUpItemText diff --git a/scripts/mansion4.asm b/scripts/PokemonMansionB1F.asm index de8a5d58..887b4762 100755 --- a/scripts/mansion4.asm +++ b/scripts/PokemonMansionB1F.asm @@ -1,11 +1,11 @@ -Mansion4Script: +PokemonMansionB1F_Script: call Mansion4Script_523cf call EnableAutoTextBoxDrawing ld hl, Mansion4TrainerHeader0 - ld de, Mansion4ScriptPointers - ld a, [wMansion4CurScript] + ld de, PokemonMansionB1F_ScriptPointers + ld a, [wPokemonMansionB1FCurScript] call ExecuteCurMapScriptInTable - ld [wMansion4CurScript], a + ld [wPokemonMansionB1FCurScript], a ret Mansion4Script_523cf: @@ -53,12 +53,12 @@ Mansion4Script_Switches: ld [hSpriteIndexOrTextID], a jp DisplayTextID -Mansion4ScriptPointers: +PokemonMansionB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Mansion4TextPointers: +PokemonMansionB1F_TextPointers: dw Mansion4Text1 dw Mansion4Text2 dw PickUpItemText diff --git a/scripts/pokemontower1.asm b/scripts/PokemonTower1F.asm index 6d9d1b3f..66b5505c 100755 --- a/scripts/pokemontower1.asm +++ b/scripts/PokemonTower1F.asm @@ -1,7 +1,7 @@ -PokemonTower1Script: +PokemonTower1F_Script: jp EnableAutoTextBoxDrawing -PokemonTower1TextPointers: +PokemonTower1F_TextPointers: dw PokemonTower1Text1 dw PokemonTower1Text2 dw PokemonTower1Text3 diff --git a/scripts/pokemontower2.asm b/scripts/PokemonTower2F.asm index 383b175d..81f4c0b3 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/PokemonTower2F.asm @@ -1,17 +1,17 @@ -PokemonTower2Script: +PokemonTower2F_Script: call EnableAutoTextBoxDrawing - ld hl, PokemonTower2ScriptPointers - ld a, [wPokemonTower2CurScript] + ld hl, PokemonTower2F_ScriptPointers + ld a, [wPokemonTower2FCurScript] jp CallFunctionInTable PokemonTower2Script_604fe: xor a ld [wJoyIgnore], a - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret -PokemonTower2ScriptPointers: +PokemonTower2F_ScriptPointers: dw PokemonTower2Script0 dw PokemonTower2Script1 dw PokemonTower2Script2 @@ -81,7 +81,7 @@ PokemonTower2Script1: call PlaySound callba Music_RivalAlternateStart ld a, $2 - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret @@ -111,18 +111,18 @@ PokemonTower2Script2: ld a, [wd730] bit 0, a ret nz - ld a, HS_POKEMONTOWER_2_RIVAL + ld a, HS_POKEMON_TOWER_2F_RIVAL ld [wMissableObjectIndex], a predef HideObject xor a ld [wJoyIgnore], a call PlayDefaultMusic ld a, $0 - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a ret -PokemonTower2TextPointers: +PokemonTower2F_TextPointers: dw PokemonTower2Text1 dw PokemonTower2Text2 @@ -162,7 +162,7 @@ PokemonTower2Text1: ld [wTrainerNo], a ld a, $1 - ld [wPokemonTower2CurScript], a + ld [wPokemonTower2FCurScript], a ld [wCurMapScript], a .asm_41852 jp TextScriptEnd diff --git a/scripts/pokemontower3.asm b/scripts/PokemonTower3F.asm index 6027b450..7d8f63e9 100755 --- a/scripts/pokemontower3.asm +++ b/scripts/PokemonTower3F.asm @@ -1,18 +1,18 @@ -PokemonTower3Script: +PokemonTower3F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower3TrainerHeader0 - ld de, PokemonTower3ScriptPointers - ld a, [wPokemonTower3CurScript] + ld de, PokemonTower3F_ScriptPointers + ld a, [wPokemonTower3FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower3CurScript], a + ld [wPokemonTower3FCurScript], a ret -PokemonTower3ScriptPointers: +PokemonTower3F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower3TextPointers: +PokemonTower3F_TextPointers: dw PokemonTower3Text1 dw PokemonTower3Text2 dw PokemonTower3Text3 diff --git a/scripts/pokemontower4.asm b/scripts/PokemonTower4F.asm index a8307c01..b8e0d772 100755 --- a/scripts/pokemontower4.asm +++ b/scripts/PokemonTower4F.asm @@ -1,18 +1,18 @@ -PokemonTower4Script: +PokemonTower4F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower4TrainerHeader0 - ld de, PokemonTower4ScriptPointers - ld a, [wPokemonTower4CurScript] + ld de, PokemonTower4F_ScriptPointers + ld a, [wPokemonTower4FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower4CurScript], a + ld [wPokemonTower4FCurScript], a ret -PokemonTower4ScriptPointers: +PokemonTower4F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PokemonTower4TextPointers: +PokemonTower4F_TextPointers: dw PokemonTower4Text1 dw PokemonTower4Text2 dw PokemonTower4Text3 diff --git a/scripts/pokemontower5.asm b/scripts/PokemonTower5F.asm index 9a13f286..299261e9 100755 --- a/scripts/pokemontower5.asm +++ b/scripts/PokemonTower5F.asm @@ -1,13 +1,13 @@ -PokemonTower5Script: +PokemonTower5F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower5TrainerHeader0 - ld de, PokemonTower5ScriptPointers - ld a, [wPokemonTower5CurScript] + ld de, PokemonTower5F_ScriptPointers + ld a, [wPokemonTower5FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower5CurScript], a + ld [wPokemonTower5FCurScript], a ret -PokemonTower5ScriptPointers: +PokemonTower5F_ScriptPointers: dw PokemonTower5Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -48,7 +48,7 @@ CoordsData_60992: db $09,$0B db $FF -PokemonTower5TextPointers: +PokemonTower5F_TextPointers: dw PokemonTower5Text1 dw PokemonTower5Text2 dw PokemonTower5Text3 diff --git a/scripts/pokemontower6.asm b/scripts/PokemonTower6F.asm index c3118f62..14c07c48 100755 --- a/scripts/pokemontower6.asm +++ b/scripts/PokemonTower6F.asm @@ -1,20 +1,20 @@ -PokemonTower6Script: +PokemonTower6F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower6TrainerHeader0 - ld de, PokemonTower6ScriptPointers - ld a, [wPokemonTower6CurScript] + ld de, PokemonTower6F_ScriptPointers + ld a, [wPokemonTower6FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ret PokemonTower6Script_60b02: xor a ld [wJoyIgnore], a - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret -PokemonTower6ScriptPointers: +PokemonTower6F_ScriptPointers: dw PokemonTower6Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -37,7 +37,7 @@ PokemonTower6Script0: ld a, 30 ld [wCurEnemyLVL], a ld a, $4 - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret @@ -66,7 +66,7 @@ PokemonTower6Script4: xor a ld [wJoyIgnore], a ld a, $0 - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret .asm_60b82 @@ -80,7 +80,7 @@ PokemonTower6Script4: ld hl, wd730 set 7, [hl] ld a, $3 - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret @@ -90,11 +90,11 @@ PokemonTower6Script3: ret nz call Delay3 xor a - ld [wPokemonTower6CurScript], a + ld [wPokemonTower6FCurScript], a ld [wCurMapScript], a ret -PokemonTower6TextPointers: +PokemonTower6F_TextPointers: dw PokemonTower6Text1 dw PokemonTower6Text2 dw PokemonTower6Text3 diff --git a/scripts/pokemontower7.asm b/scripts/PokemonTower7F.asm index 88c62c53..4b2a1827 100755 --- a/scripts/pokemontower7.asm +++ b/scripts/PokemonTower7F.asm @@ -1,20 +1,20 @@ -PokemonTower7Script: +PokemonTower7F_Script: call EnableAutoTextBoxDrawing ld hl, PokemonTower7TrainerHeader0 - ld de, PokemonTower7ScriptPointers - ld a, [wPokemonTower7CurScript] + ld de, PokemonTower7F_ScriptPointers + ld a, [wPokemonTower7FCurScript] call ExecuteCurMapScriptInTable - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ret PokemonTower7Script_60d18: xor a ld [wJoyIgnore], a - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret -PokemonTower7ScriptPointers: +PokemonTower7F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw PokemonTower7Script2 @@ -35,7 +35,7 @@ PokemonTower7Script2: call DisplayTextID call PokemonTower7Script_60db6 ld a, $3 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret @@ -59,19 +59,19 @@ PokemonTower7Script3: ld [wTrainerHeaderFlagBit], a ld [wUnusedDA38], a ld a, $0 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret PokemonTower7Script4: ld a, $ff ld [wJoyIgnore], a - ld a, HS_POKEMONTOWER_7_MR_FUJI + ld a, HS_POKEMON_TOWER_7F_MR_FUJI ld [wMissableObjectIndex], a predef HideObject ld a, SPRITE_FACING_UP ld [wSpriteStateData1 + 9], a - ld a, LAVENDER_HOUSE_1 + ld a, MR_FUJIS_HOUSE ld [hWarpDestinationMap], a ld a, $1 ld [wDestinationWarpID], a @@ -80,7 +80,7 @@ PokemonTower7Script4: ld hl, wd72d set 3, [hl] ld a, $0 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a ret @@ -198,7 +198,7 @@ MovementData_60e37: db NPC_MOVEMENT_DOWN db $FF -PokemonTower7TextPointers: +PokemonTower7F_TextPointers: dw PokemonTower7Text1 dw PokemonTower7Text2 dw PokemonTower7Text3 @@ -257,7 +257,7 @@ PokemonTower7FujiText: call PrintText SetEvent EVENT_RESCUED_MR_FUJI SetEvent EVENT_RESCUED_MR_FUJI_2 - ld a, HS_LAVENDER_HOUSE_1_MR_FUJI + ld a, HS_MR_FUJIS_HOUSE_MR_FUJI ld [wMissableObjectIndex], a predef ShowObject ld a, HS_SAFFRON_CITY_E @@ -267,7 +267,7 @@ PokemonTower7FujiText: ld [wMissableObjectIndex], a predef ShowObject ld a, $4 - ld [wPokemonTower7CurScript], a + ld [wPokemonTower7FCurScript], a ld [wCurMapScript], a jp TextScriptEnd diff --git a/scripts/powerplant.asm b/scripts/PowerPlant.asm index 5391585d..35b4893f 100755 --- a/scripts/powerplant.asm +++ b/scripts/PowerPlant.asm @@ -1,18 +1,18 @@ -PowerPlantScript: +PowerPlant_Script: call EnableAutoTextBoxDrawing ld hl, Voltorb0TrainerHeader - ld de, .ScriptPointers + ld de, PowerPlant_ScriptPointers ld a, [wPowerPlantCurScript] call ExecuteCurMapScriptInTable ld [wPowerPlantCurScript], a ret -.ScriptPointers +PowerPlant_ScriptPointers dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -PowerPlantTextPointers: +PowerPlant_TextPointers: dw Voltorb0Text dw Voltorb1Text dw Voltorb2Text diff --git a/scripts/redshouse1f.asm b/scripts/RedsHouse1F.asm index 59323b8e..b982d71c 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/RedsHouse1F.asm @@ -1,7 +1,7 @@ -RedsHouse1FScript: +RedsHouse1F_Script: jp EnableAutoTextBoxDrawing -RedsHouse1FTextPointers: +RedsHouse1F_TextPointers: dw RedsHouse1FText1 dw RedsHouse1FText2 diff --git a/scripts/redshouse2f.asm b/scripts/RedsHouse2F.asm index 0ec59077..5ec86678 100755 --- a/scripts/redshouse2f.asm +++ b/scripts/RedsHouse2F.asm @@ -1,10 +1,10 @@ -RedsHouse2FScript: +RedsHouse2F_Script: call EnableAutoTextBoxDrawing - ld hl, RedsHouse2FScriptPointers - ld a, [wRedsHouse2CurScript] + ld hl, RedsHouse2F_ScriptPointers + ld a, [wRedsHouse2FCurScript] jp CallFunctionInTable -RedsHouse2FScriptPointers: +RedsHouse2F_ScriptPointers: dw RedsHouse2FScript0 dw RedsHouse2FScript1 @@ -14,11 +14,11 @@ RedsHouse2FScript0: ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a ld a, 1 - ld [wRedsHouse2CurScript], a + ld [wRedsHouse2FCurScript], a ret RedsHouse2FScript1: ret -RedsHouse2FTextPointers: +RedsHouse2F_TextPointers: db "@" diff --git a/scripts/rocktunnel1.asm b/scripts/RockTunnel1F.asm index 390330e8..94620d96 100755 --- a/scripts/rocktunnel1.asm +++ b/scripts/RockTunnel1F.asm @@ -1,18 +1,18 @@ -RockTunnel1Script: +RockTunnel1F_Script: call EnableAutoTextBoxDrawing ld hl, RockTunnel1TrainerHeader0 - ld de, RockTunnel1ScriptPointers - ld a, [wRockTunnel1CurScript] + ld de, RockTunnel1F_ScriptPointers + ld a, [wRockTunnel1FCurScript] call ExecuteCurMapScriptInTable - ld [wRockTunnel1CurScript], a + ld [wRockTunnel1FCurScript], a ret -RockTunnel1ScriptPointers: +RockTunnel1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RockTunnel1TextPointers: +RockTunnel1F_TextPointers: dw RockTunnel1Text1 dw RockTunnel1Text2 dw RockTunnel1Text3 diff --git a/scripts/rocktunnel2.asm b/scripts/RockTunnelB1F.asm index 4385b5f7..7e6fcc8b 100755 --- a/scripts/rocktunnel2.asm +++ b/scripts/RockTunnelB1F.asm @@ -1,18 +1,18 @@ -RockTunnel2Script: +RockTunnelB1F_Script: call EnableAutoTextBoxDrawing ld hl, RockTunnel2TrainerHeader0 - ld de, RockTunnel2ScriptPointers - ld a, [wRockTunnel2CurScript] + ld de, RockTunnelB1F_ScriptPointers + ld a, [wRockTunnelB1FCurScript] call ExecuteCurMapScriptInTable - ld [wRockTunnel2CurScript], a + ld [wRockTunnelB1FCurScript], a ret -RockTunnel2ScriptPointers: +RockTunnelB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RockTunnel2TextPointers: +RockTunnelB1F_TextPointers: dw RockTunnel2Text1 dw RockTunnel2Text2 dw RockTunnel2Text3 diff --git a/scripts/rocktunnelpokecenter.asm b/scripts/RockTunnelPokecenter.asm index 7bcdc1ae..cbcd6318 100755 --- a/scripts/rocktunnelpokecenter.asm +++ b/scripts/RockTunnelPokecenter.asm @@ -1,8 +1,8 @@ -RockTunnelPokecenterScript: +RockTunnelPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -RockTunnelPokecenterTextPointers: +RockTunnelPokecenter_TextPointers: dw RockTunnelHealNurseText dw RockTunnelPokecenterText2 dw RockTunnelPokecenterText3 diff --git a/scripts/rockethideout1.asm b/scripts/RocketHideoutB1F.asm index 88b3a7e9..0cbddb49 100755 --- a/scripts/rockethideout1.asm +++ b/scripts/RocketHideoutB1F.asm @@ -1,11 +1,11 @@ -RocketHideout1Script: +RocketHideoutB1F_Script: call RocketHideout1Script_44be0 call EnableAutoTextBoxDrawing ld hl, RocketHideout1TrainerHeader0 - ld de, RocketHideout1ScriptPointers - ld a, [wRocketHideout1CurScript] + ld de, RocketHideoutB1F_ScriptPointers + ld a, [wRocketHideoutB1FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout1CurScript], a + ld [wRocketHideoutB1FCurScript], a ret RocketHideout1Script_44be0: @@ -30,12 +30,12 @@ RocketHideout1Script_44be0: lb bc, 8, 12 predef_jump ReplaceTileBlock -RocketHideout1ScriptPointers: +RocketHideoutB1F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -RocketHideout1TextPointers: +RocketHideoutB1F_TextPointers: dw RocketHideout1Text1 dw RocketHideout1Text2 dw RocketHideout1Text3 diff --git a/scripts/rockethideout2.asm b/scripts/RocketHideoutB2F.asm index c5f026d5..1b487df2 100755 --- a/scripts/rockethideout2.asm +++ b/scripts/RocketHideoutB2F.asm @@ -1,13 +1,13 @@ -RocketHideout2Script: +RocketHideoutB2F_Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout2TrainerHeader0 - ld de, RocketHideout2ScriptPointers - ld a, [wRocketHideout2CurScript] + ld de, RocketHideoutB2F_ScriptPointers + ld a, [wRocketHideoutB2FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout2CurScript], a + ld [wRocketHideoutB2FCurScript], a ret -RocketHideout2ScriptPointers: +RocketHideoutB2F_ScriptPointers: dw RocketHideout2Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -413,7 +413,7 @@ SpinnerPlayerFacingDirections: SpinnerArrowAnimTiles: INCBIN "gfx/spinner_arrow.2bpp" -RocketHideout2TextPointers: +RocketHideoutB2F_TextPointers: dw RocketHideout2Text1 dw PickUpItemText dw PickUpItemText diff --git a/scripts/rockethideout3.asm b/scripts/RocketHideoutB3F.asm index 00a61568..4dd537b3 100755 --- a/scripts/rockethideout3.asm +++ b/scripts/RocketHideoutB3F.asm @@ -1,13 +1,13 @@ -RocketHideout3Script: +RocketHideoutB3F_Script: call EnableAutoTextBoxDrawing ld hl, RocketHideout3TrainerHeader0 - ld de, RocketHideout3ScriptPointers - ld a, [wRocketHideout3CurScript] + ld de, RocketHideoutB3F_ScriptPointers + ld a, [wRocketHideoutB3FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout3CurScript], a + ld [wRocketHideoutB3FCurScript], a ret -RocketHideout3ScriptPointers: +RocketHideoutB3F_ScriptPointers: dw RocketHideout3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -143,7 +143,7 @@ RocketHideout3Script3: ld [wCurMapScript], a ret -RocketHideout3TextPointers: +RocketHideoutB3F_TextPointers: dw RocketHideout3Text1 dw RocketHideout3Text2 dw PickUpItemText diff --git a/scripts/rockethideout4.asm b/scripts/RocketHideoutB4F.asm index e8361988..b2ce21f4 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/RocketHideoutB4F.asm @@ -1,11 +1,11 @@ -RocketHideout4Script: +RocketHideoutB4F_Script: call RocketHideout4Script_45473 call EnableAutoTextBoxDrawing ld hl, RocketHideout4TrainerHeader0 - ld de, RocketHideout4ScriptPointers - ld a, [wRocketHideout4CurScript] + ld de, RocketHideoutB4F_ScriptPointers + ld a, [wRocketHideoutB4FCurScript] call ExecuteCurMapScriptInTable - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ret RocketHideout4Script_45473: @@ -33,11 +33,11 @@ RocketHideout4Script_45473: RocketHideout4Script_454a3: xor a ld [wJoyIgnore], a - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a ret -RocketHideout4ScriptPointers: +RocketHideoutB4F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -55,10 +55,10 @@ RocketHideout4Script3: ld [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack - ld a, HS_ROCKET_HIDEOUT_4_GIOVANNI + ld a, HS_ROCKET_HIDEOUT_B4F_GIOVANNI ld [wMissableObjectIndex], a predef HideObject - ld a, HS_ROCKET_HIDEOUT_4_ITEM_4 + ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_4 ld [wMissableObjectIndex], a predef ShowObject call UpdateSprites @@ -68,11 +68,11 @@ RocketHideout4Script3: ld hl, wCurrentMapScriptFlags set 5, [hl] ld a, $0 - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a ret -RocketHideout4TextPointers: +RocketHideoutB4F_TextPointers: dw RocketHideout4Text1 dw RocketHideout4Text2 dw RocketHideout4Text3 @@ -132,7 +132,7 @@ RocketHideout4Text1: xor a ld [hJoyHeld], a ld a, $3 - ld [wRocketHideout4CurScript], a + ld [wRocketHideoutB4FCurScript], a ld [wCurMapScript], a jr .asm_209f0 .asm_545571 @@ -209,7 +209,7 @@ RocketHideout4AfterBattleText4: call PrintText CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY jr nz, .asm_455e9 - ld a, HS_ROCKET_HIDEOUT_4_ITEM_5 + ld a, HS_ROCKET_HIDEOUT_B4F_ITEM_5 ld [wMissableObjectIndex], a predef ShowObject .asm_455e9 diff --git a/scripts/rockethideoutelevator.asm b/scripts/RocketHideoutElevator.asm index aed0f0cf..9525db3a 100755 --- a/scripts/rockethideoutelevator.asm +++ b/scripts/RocketHideoutElevator.asm @@ -1,4 +1,4 @@ -RocketHideoutElevatorScript: +RocketHideoutElevator_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -51,9 +51,9 @@ RocketHideoutElevatorWarpMaps: ; first byte is warp number ; second byte is map number ; These specify where the player goes after getting out of the elevator. - db $04, ROCKET_HIDEOUT_1 - db $04, ROCKET_HIDEOUT_2 - db $02, ROCKET_HIDEOUT_4 + db $04, ROCKET_HIDEOUT_B1F + db $04, ROCKET_HIDEOUT_B2F + db $02, ROCKET_HIDEOUT_B4F RocketHideoutElevatorWarpMapsEnd: RocketHideoutElevatorScript_4575f: @@ -61,7 +61,7 @@ RocketHideoutElevatorScript_4575f: callba ShakeElevator ret -RocketHideoutElevatorTextPointers: +RocketHideoutElevator_TextPointers: dw RocketHideoutElevatorText1 RocketHideoutElevatorText1: diff --git a/scripts/route1.asm b/scripts/Route1.asm index 7f988fab..e733b54d 100755 --- a/scripts/route1.asm +++ b/scripts/Route1.asm @@ -1,7 +1,7 @@ -Route1Script: +Route1_Script: jp EnableAutoTextBoxDrawing -Route1TextPointers: +Route1_TextPointers: dw Route1Text1 dw Route1Text2 dw Route1Text3 diff --git a/scripts/route10.asm b/scripts/Route10.asm index 03a1e818..3fffa2c0 100755 --- a/scripts/route10.asm +++ b/scripts/Route10.asm @@ -1,18 +1,18 @@ -Route10Script: +Route10_Script: call EnableAutoTextBoxDrawing ld hl, Route10TrainerHeader0 - ld de, Route10ScriptPointers + ld de, Route10_ScriptPointers ld a, [wRoute10CurScript] call ExecuteCurMapScriptInTable ld [wRoute10CurScript], a ret -Route10ScriptPointers: +Route10_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route10TextPointers: +Route10_TextPointers: dw Route10Text1 dw Route10Text2 dw Route10Text3 diff --git a/scripts/route11.asm b/scripts/Route11.asm index afedfc32..891237cc 100755 --- a/scripts/route11.asm +++ b/scripts/Route11.asm @@ -1,18 +1,18 @@ -Route11Script: +Route11_Script: call EnableAutoTextBoxDrawing ld hl, Route11TrainerHeader0 - ld de, Route11ScriptPointers + ld de, Route11_ScriptPointers ld a, [wRoute11CurScript] call ExecuteCurMapScriptInTable ld [wRoute11CurScript], a ret -Route11ScriptPointers: +Route11_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route11TextPointers: +Route11_TextPointers: dw Route11Text1 dw Route11Text2 dw Route11Text3 diff --git a/scripts/route11gate.asm b/scripts/Route11Gate1F.asm index 9ecfe0ca..8e5f6c03 100755 --- a/scripts/route11gate.asm +++ b/scripts/Route11Gate1F.asm @@ -1,7 +1,7 @@ -Route11GateScript: +Route11Gate1F_Script: jp EnableAutoTextBoxDrawing -Route11GateTextPointers: +Route11Gate1F_TextPointers: dw Route11GateText1 Route11GateText1: diff --git a/scripts/route11gateupstairs.asm b/scripts/Route11Gate2F.asm index 6c8d6e99..c140937d 100755 --- a/scripts/route11gateupstairs.asm +++ b/scripts/Route11Gate2F.asm @@ -1,7 +1,7 @@ -Route11GateUpstairsScript: +Route11Gate2F_Script: jp DisableAutoTextBoxDrawing -Route11GateUpstairsTextPointers: +Route11Gate2F_TextPointers: dw Route11GateUpstairsText1 dw Route11GateUpstairsText2 dw Route11GateUpstairsText3 diff --git a/scripts/route12.asm b/scripts/Route12.asm index 07b5833b..510e7727 100755 --- a/scripts/route12.asm +++ b/scripts/Route12.asm @@ -1,7 +1,7 @@ -Route12Script: +Route12_Script: call EnableAutoTextBoxDrawing ld hl, Route12TrainerHeader0 - ld de, Route12ScriptPointers + ld de, Route12_ScriptPointers ld a, [wRoute12CurScript] call ExecuteCurMapScriptInTable ld [wRoute12CurScript], a @@ -14,7 +14,7 @@ Route12Script_59606: ld [wCurMapScript], a ret -Route12ScriptPointers: +Route12_ScriptPointers: dw Route12Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -60,7 +60,7 @@ Route12Script3: ld [wCurMapScript], a ret -Route12TextPointers: +Route12_TextPointers: dw Route12Text1 dw Route12Text2 dw Route12Text3 diff --git a/scripts/route12gate.asm b/scripts/Route12Gate1F.asm index 8474100d..52d427ee 100755 --- a/scripts/route12gate.asm +++ b/scripts/Route12Gate1F.asm @@ -1,7 +1,7 @@ -Route12GateScript: +Route12Gate1F_Script: jp EnableAutoTextBoxDrawing -Route12GateTextPointers: +Route12Gate1F_TextPointers: dw Route12GateText1 Route12GateText1: diff --git a/scripts/route12gateupstairs.asm b/scripts/Route12Gate2F.asm index cd355265..0cc2768b 100755 --- a/scripts/route12gateupstairs.asm +++ b/scripts/Route12Gate2F.asm @@ -1,7 +1,7 @@ -Route12GateUpstairsScript: +Route12Gate2F_Script: jp DisableAutoTextBoxDrawing -Route12GateUpstairsTextPointers: +Route12Gate2F_TextPointers: dw Route12GateUpstairsText1 dw Route12GateUpstairsText2 dw Route12GateUpstairsText3 diff --git a/scripts/route12house.asm b/scripts/Route12SuperRodHouse.asm index 4b93395f..de8ed8f0 100755 --- a/scripts/route12house.asm +++ b/scripts/Route12SuperRodHouse.asm @@ -1,7 +1,7 @@ -Route12HouseScript: +Route12SuperRodHouse_Script: jp EnableAutoTextBoxDrawing -Route12HouseTextPointers: +Route12SuperRodHouse_TextPointers: dw Route12HouseText1 Route12HouseText1: diff --git a/scripts/route13.asm b/scripts/Route13.asm index 54fb9d68..8f92147e 100755 --- a/scripts/route13.asm +++ b/scripts/Route13.asm @@ -1,18 +1,18 @@ -Route13Script: +Route13_Script: call EnableAutoTextBoxDrawing ld hl, Route13TrainerHeader0 - ld de, Route13ScriptPointers + ld de, Route13_ScriptPointers ld a, [wRoute13CurScript] call ExecuteCurMapScriptInTable ld [wRoute13CurScript], a ret -Route13ScriptPointers: +Route13_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route13TextPointers: +Route13_TextPointers: dw Route13Text1 dw Route13Text2 dw Route13Text3 diff --git a/scripts/route14.asm b/scripts/Route14.asm index c929451f..fdc84d74 100755 --- a/scripts/route14.asm +++ b/scripts/Route14.asm @@ -1,18 +1,18 @@ -Route14Script: +Route14_Script: call EnableAutoTextBoxDrawing ld hl, Route14TrainerHeader0 - ld de, Route14ScriptPointers + ld de, Route14_ScriptPointers ld a, [wRoute14CurScript] call ExecuteCurMapScriptInTable ld [wRoute14CurScript], a ret -Route14ScriptPointers: +Route14_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route14TextPointers: +Route14_TextPointers: dw Route14Text1 dw Route14Text2 dw Route14Text3 diff --git a/scripts/route15.asm b/scripts/Route15.asm index 58c5d0ab..d973eb9c 100755 --- a/scripts/route15.asm +++ b/scripts/Route15.asm @@ -1,18 +1,18 @@ -Route15Script: +Route15_Script: call EnableAutoTextBoxDrawing ld hl, Route15TrainerHeader0 - ld de, Route15ScriptPointers + ld de, Route15_ScriptPointers ld a, [wRoute15CurScript] call ExecuteCurMapScriptInTable ld [wRoute15CurScript], a ret -Route15ScriptPointers: +Route15_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route15TextPointers: +Route15_TextPointers: dw Route15Text1 dw Route15Text2 dw Route15Text3 diff --git a/scripts/route15gate.asm b/scripts/Route15Gate1F.asm index 40db02dd..910eb2a5 100755 --- a/scripts/route15gate.asm +++ b/scripts/Route15Gate1F.asm @@ -1,7 +1,7 @@ -Route15GateScript: +Route15Gate1F_Script: jp EnableAutoTextBoxDrawing -Route15GateTextPointers: +Route15Gate1F_TextPointers: dw Route15GateText1 Route15GateText1: diff --git a/scripts/route15gateupstairs.asm b/scripts/Route15Gate2F.asm index c7f6a2ad..83763762 100755 --- a/scripts/route15gateupstairs.asm +++ b/scripts/Route15Gate2F.asm @@ -1,7 +1,7 @@ -Route15GateUpstairsScript: +Route15Gate2F_Script: jp DisableAutoTextBoxDrawing -Route15GateUpstairsTextPointers: +Route15Gate2F_TextPointers: dw Route15GateUpstairsText1 dw Route15GateUpstairsText2 diff --git a/scripts/route16.asm b/scripts/Route16.asm index 20431608..54f83380 100755 --- a/scripts/route16.asm +++ b/scripts/Route16.asm @@ -1,7 +1,7 @@ -Route16Script: +Route16_Script: call EnableAutoTextBoxDrawing ld hl, Route16TrainerHeader0 - ld de, Route16ScriptPointers + ld de, Route16_ScriptPointers ld a, [wRoute16CurScript] call ExecuteCurMapScriptInTable ld [wRoute16CurScript], a @@ -14,7 +14,7 @@ Route16Script_59946: ld [wCurMapScript], a ret -Route16ScriptPointers: +Route16_ScriptPointers: dw Route16Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -61,7 +61,7 @@ Route16Script3: ld [wCurMapScript], a ret -Route16TextPointers: +Route16_TextPointers: dw Route16Text1 dw Route16Text2 dw Route16Text3 diff --git a/scripts/route16house.asm b/scripts/Route16FlyHouse.asm index 5359248c..1d74ac80 100755 --- a/scripts/route16house.asm +++ b/scripts/Route16FlyHouse.asm @@ -1,7 +1,7 @@ -Route16HouseScript: +Route16FlyHouse_Script: jp EnableAutoTextBoxDrawing -Route16HouseTextPointers: +Route16FlyHouse_TextPointers: dw Route16HouseText1 dw Route16HouseText2 diff --git a/scripts/route16gate.asm b/scripts/Route16Gate1F.asm index e20ba6f7..f814d209 100755 --- a/scripts/route16gate.asm +++ b/scripts/Route16Gate1F.asm @@ -1,12 +1,12 @@ -Route16GateScript: +Route16Gate1F_Script: ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [wRoute16GateCurScript] - ld hl, Route16GateScriptPointers + ld a, [wRoute16Gate1FCurScript] + ld hl, Route16Gate1F_ScriptPointers jp CallFunctionInTable -Route16GateScriptPointers: +Route16Gate1F_ScriptPointers: dw Route16GateScript0 dw Route16GateScript1 dw Route16GateScript2 @@ -36,11 +36,11 @@ Route16GateScript0: call FillMemory call StartSimulatingJoypadStates ld a, $1 - ld [wRoute16GateCurScript], a + ld [wRoute16Gate1FCurScript], a ret .asm_4970e ld a, $2 - ld [wRoute16GateCurScript], a + ld [wRoute16Gate1FCurScript], a ret CoordsData_49714: @@ -67,7 +67,7 @@ Route16GateScript2: ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [wRoute16GateCurScript], a + ld [wRoute16Gate1FCurScript], a ret Route16GateScript3: @@ -79,14 +79,14 @@ Route16GateScript3: ld hl, wd730 res 7, [hl] ld a, $0 - ld [wRoute16GateCurScript], a + ld [wRoute16Gate1FCurScript], a ret Route16GateScript_49755: ld b, BICYCLE jp IsItemInBag -Route16GateTextPointers: +Route16Gate1F_TextPointers: dw Route16GateText1 dw Route16GateText2 dw Route16GateText3 diff --git a/scripts/route16gateupstairs.asm b/scripts/Route16Gate2F.asm index 664976a2..643a5ec7 100755 --- a/scripts/route16gateupstairs.asm +++ b/scripts/Route16Gate2F.asm @@ -1,7 +1,7 @@ -Route16GateUpstairsScript: +Route16Gate2F_Script: jp DisableAutoTextBoxDrawing -Route16GateUpstairsTextPointers: +Route16Gate2F_TextPointers: dw Route16GateUpstairsText1 dw Route16GateUpstairsText2 dw Route16GateUpstairsText3 diff --git a/scripts/route17.asm b/scripts/Route17.asm index fb9f4cd8..dd92ac44 100755 --- a/scripts/route17.asm +++ b/scripts/Route17.asm @@ -1,18 +1,18 @@ -Route17Script: +Route17_Script: call EnableAutoTextBoxDrawing ld hl, Route17TrainerHeader0 - ld de, Route17ScriptPointers + ld de, Route17_ScriptPointers ld a, [wRoute17CurScript] call ExecuteCurMapScriptInTable ld [wRoute17CurScript], a ret -Route17ScriptPointers: +Route17_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route17TextPointers: +Route17_TextPointers: dw Route17Text1 dw Route17Text2 dw Route17Text3 diff --git a/scripts/route18.asm b/scripts/Route18.asm index 687b269c..022d41be 100755 --- a/scripts/route18.asm +++ b/scripts/Route18.asm @@ -1,18 +1,18 @@ -Route18Script: +Route18_Script: call EnableAutoTextBoxDrawing ld hl, Route18TrainerHeader0 - ld de, Route18ScriptPointers + ld de, Route18_ScriptPointers ld a, [wRoute18CurScript] call ExecuteCurMapScriptInTable ld [wRoute18CurScript], a ret -Route18ScriptPointers: +Route18_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route18TextPointers: +Route18_TextPointers: dw Route18Text1 dw Route18Text2 dw Route18Text3 diff --git a/scripts/route18gate.asm b/scripts/Route18Gate1F.asm index 893801a1..812cb3e0 100755 --- a/scripts/route18gate.asm +++ b/scripts/Route18Gate1F.asm @@ -1,12 +1,12 @@ -Route18GateScript: +Route18Gate1F_Script: ld hl, wd732 res 5, [hl] call EnableAutoTextBoxDrawing - ld a, [wRoute18GateCurScript] - ld hl, Route18GateScriptPointers + ld a, [wRoute18Gate1FCurScript] + ld hl, Route18Gate1F_ScriptPointers jp CallFunctionInTable -Route18GateScriptPointers: +Route18Gate1F_ScriptPointers: dw Route18GateScript0 dw Route18GateScript1 dw Route18GateScript2 @@ -36,11 +36,11 @@ Route18GateScript0: call FillMemory call StartSimulatingJoypadStates ld a, $1 - ld [wRoute18GateCurScript], a + ld [wRoute18Gate1FCurScript], a ret .asm_498c6 ld a, $2 - ld [wRoute18GateCurScript], a + ld [wRoute18Gate1FCurScript], a ret CoordsData_498cc: @@ -67,7 +67,7 @@ Route18GateScript2: ld [wSimulatedJoypadStatesEnd], a call StartSimulatingJoypadStates ld a, $3 - ld [wRoute18GateCurScript], a + ld [wRoute18Gate1FCurScript], a ret Route18GateScript3: @@ -79,10 +79,10 @@ Route18GateScript3: ld hl, wd730 res 7, [hl] ld a, $0 - ld [wRoute18GateCurScript], a + ld [wRoute18Gate1FCurScript], a ret -Route18GateTextPointers: +Route18Gate1F_TextPointers: dw Route18GateText1 dw Route18GateText2 diff --git a/scripts/route18gateupstairs.asm b/scripts/Route18Gate2F.asm index 3d623142..6987a099 100755 --- a/scripts/route18gateupstairs.asm +++ b/scripts/Route18Gate2F.asm @@ -1,7 +1,7 @@ -Route18GateUpstairsScript: +Route18Gate2F_Script: jp DisableAutoTextBoxDrawing -Route18GateUpstairsTextPointers: +Route18Gate2F_TextPointers: dw Route18GateUpstairsText1 dw Route18GateUpstairsText2 dw Route18GateUpstairsText3 diff --git a/scripts/route19.asm b/scripts/Route19.asm index 01ea5dce..6f603e05 100755 --- a/scripts/route19.asm +++ b/scripts/Route19.asm @@ -1,18 +1,18 @@ -Route19Script: +Route19_Script: call EnableAutoTextBoxDrawing ld hl, Route19TrainerHeader0 - ld de, Route19ScriptPointers + ld de, Route19_ScriptPointers ld a, [wRoute19CurScript] call ExecuteCurMapScriptInTable ld [wRoute19CurScript], a ret -Route19ScriptPointers: +Route19_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route19TextPointers: +Route19_TextPointers: dw Route19Text1 dw Route19Text2 dw Route19Text3 diff --git a/scripts/route2.asm b/scripts/Route2.asm index 810792ef..f4b1c8c4 100755 --- a/scripts/route2.asm +++ b/scripts/Route2.asm @@ -1,7 +1,7 @@ -Route2Script: +Route2_Script: jp EnableAutoTextBoxDrawing -Route2TextPointers: +Route2_TextPointers: dw PickUpItemText dw PickUpItemText dw Route2Text3 diff --git a/scripts/route20.asm b/scripts/Route20.asm index 53ff5e55..081a723e 100755 --- a/scripts/route20.asm +++ b/scripts/Route20.asm @@ -1,9 +1,9 @@ -Route20Script: +Route20_Script: CheckAndResetEvent EVENT_IN_SEAFOAM_ISLANDS call nz, Route20Script_50cc6 call EnableAutoTextBoxDrawing ld hl, Route20TrainerHeader0 - ld de, Route20ScriptPointers + ld de, Route20_ScriptPointers ld a, [wRoute20CurScript] call ExecuteCurMapScriptInTable ld [wRoute20CurScript], a @@ -12,9 +12,9 @@ Route20Script: Route20Script_50cc6: CheckBothEventsSet EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE jr z, .asm_50cef - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 call Route20Script_50d0c ld hl, .MissableObjectIDs .asm_50cdc @@ -27,24 +27,24 @@ Route20Script_50cc6: jr .asm_50cdc .MissableObjectIDs: - db HS_SEAFOAM_ISLANDS_2_BOULDER_1 - db HS_SEAFOAM_ISLANDS_2_BOULDER_2 - db HS_SEAFOAM_ISLANDS_3_BOULDER_1 - db HS_SEAFOAM_ISLANDS_3_BOULDER_2 - db HS_SEAFOAM_ISLANDS_4_BOULDER_3 - db HS_SEAFOAM_ISLANDS_4_BOULDER_4 + db HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 + db HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 + db HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 + db HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 + db HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 + db HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 db $FF .asm_50cef CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ret z - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 call Route20Script_50d0c - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 call Route20Script_50d14 - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 call Route20Script_50d14 ret @@ -56,12 +56,12 @@ Route20Script_50d14: ld [wMissableObjectIndex], a predef_jump HideObject -Route20ScriptPointers: +Route20_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route20TextPointers: +Route20_TextPointers: dw Route20Text1 dw Route20Text2 dw Route20Text3 diff --git a/scripts/route21.asm b/scripts/Route21.asm index dcdc8022..15dacd5d 100755 --- a/scripts/route21.asm +++ b/scripts/Route21.asm @@ -1,18 +1,18 @@ -Route21Script: +Route21_Script: call EnableAutoTextBoxDrawing ld hl, Route21TrainerHeader0 - ld de, Route21ScriptPointers + ld de, Route21_ScriptPointers ld a, [wRoute21CurScript] call ExecuteCurMapScriptInTable ld [wRoute21CurScript], a ret -Route21ScriptPointers: +Route21_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route21TextPointers: +Route21_TextPointers: dw Route21Text1 dw Route21Text2 dw Route21Text3 diff --git a/scripts/route22.asm b/scripts/Route22.asm index 86c3768b..7226e509 100755 --- a/scripts/route22.asm +++ b/scripts/Route22.asm @@ -1,10 +1,10 @@ -Route22Script: +Route22_Script: call EnableAutoTextBoxDrawing - ld hl, Route22ScriptPointers + ld hl, Route22_ScriptPointers ld a, [wRoute22CurScript] jp CallFunctionInTable -Route22ScriptPointers: +Route22_ScriptPointers: dw Route22Script0 dw Route22Script1 dw Route22Script2 @@ -377,7 +377,7 @@ Route22Script6: ld [wRoute22CurScript], a ret -Route22TextPointers: +Route22_TextPointers: dw Route22Text1 dw Route22Text2 dw Route22FrontGateText diff --git a/scripts/route22gate.asm b/scripts/Route22Gate.asm index ee2e5b6b..86b1220d 100755 --- a/scripts/route22gate.asm +++ b/scripts/Route22Gate.asm @@ -1,6 +1,6 @@ -Route22GateScript: +Route22Gate_Script: call EnableAutoTextBoxDrawing - ld hl, Route22GateScriptPointers + ld hl, Route22Gate_ScriptPointers ld a, [wRoute22GateCurScript] call CallFunctionInTable ld a, [wYCoord] @@ -12,7 +12,7 @@ Route22GateScript: ld [wLastMap], a ret -Route22GateScriptPointers: +Route22Gate_ScriptPointers: dw Route22GateScript0 dw Route22GateScript1 dw Route22GateScript2 @@ -53,7 +53,7 @@ Route22GateScript1: Route22GateScript2: ret -Route22GateTextPointers: +Route22Gate_TextPointers: dw Route22GateText1 Route22GateText1: diff --git a/scripts/route23.asm b/scripts/Route23.asm index 4eb6b5f7..e91e2c98 100755 --- a/scripts/route23.asm +++ b/scripts/Route23.asm @@ -1,7 +1,7 @@ -Route23Script: +Route23_Script: call Route23Script_511e9 call EnableAutoTextBoxDrawing - ld hl, Route23ScriptPointers + ld hl, Route23_ScriptPointers ld a, [wRoute23CurScript] jp CallFunctionInTable @@ -12,14 +12,14 @@ Route23Script_511e9: ret z ResetEvents EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2 ResetEvents EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH1, EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 - ld a, HS_VICTORY_ROAD_3_BOULDER + ld a, HS_VICTORY_ROAD_3F_BOULDER ld [wMissableObjectIndex], a predef ShowObject - ld a, HS_VICTORY_ROAD_2_BOULDER + ld a, HS_VICTORY_ROAD_2F_BOULDER ld [wMissableObjectIndex], a predef_jump HideObject -Route23ScriptPointers: +Route23_ScriptPointers: dw Route23Script0 dw Route23Script1 dw Route23Script2 @@ -131,7 +131,7 @@ Route23Script2: ld [wRoute23CurScript], a ret -Route23TextPointers: +Route23_TextPointers: dw Route23Text1 dw Route23Text2 dw Route23Text3 diff --git a/scripts/route24.asm b/scripts/Route24.asm index f55d2268..a8e16e7d 100755 --- a/scripts/route24.asm +++ b/scripts/Route24.asm @@ -1,7 +1,7 @@ -Route24Script: +Route24_Script: call EnableAutoTextBoxDrawing ld hl, Route24TrainerHeader0 - ld de, Route24ScriptPointers + ld de, Route24_ScriptPointers ld a, [wRoute24CurScript] call ExecuteCurMapScriptInTable ld [wRoute24CurScript], a @@ -14,7 +14,7 @@ Route24Script_513c0: ld [wCurMapScript], a ret -Route24ScriptPointers: +Route24_ScriptPointers: dw Route24Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -75,7 +75,7 @@ Route24Script3: ld [wCurMapScript], a ret -Route24TextPointers: +Route24_TextPointers: dw Route24Text1 dw Route24Text2 dw Route24Text3 diff --git a/scripts/route25.asm b/scripts/Route25.asm index c83c725b..7166919d 100755 --- a/scripts/route25.asm +++ b/scripts/Route25.asm @@ -1,8 +1,8 @@ -Route25Script: +Route25_Script: call Route25Script_515e1 call EnableAutoTextBoxDrawing ld hl, Route25TrainerHeader0 - ld de, Route25ScriptPointers + ld de, Route25_ScriptPointers ld a, [wRoute25CurScript] call ExecuteCurMapScriptInTable ld [wRoute25CurScript], a @@ -35,12 +35,12 @@ Route25Script_515e1: ld [wMissableObjectIndex], a predef_jump ShowObject -Route25ScriptPointers: +Route25_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route25TextPointers: +Route25_TextPointers: dw Route25Text1 dw Route25Text2 dw Route25Text3 diff --git a/scripts/route2gate.asm b/scripts/Route2Gate.asm index 34f1aa35..70d93814 100755 --- a/scripts/route2gate.asm +++ b/scripts/Route2Gate.asm @@ -1,7 +1,7 @@ -Route2GateScript: +Route2Gate_Script: jp EnableAutoTextBoxDrawing -Route2GateTextPointers: +Route2Gate_TextPointers: dw Route2GateText1 dw Route2GateText2 diff --git a/scripts/route2house.asm b/scripts/Route2TradeHouse.asm index 95055aec..a89e2fe9 100755 --- a/scripts/route2house.asm +++ b/scripts/Route2TradeHouse.asm @@ -1,7 +1,7 @@ -Route2HouseScript: +Route2TradeHouse_Script: jp EnableAutoTextBoxDrawing -Route2HouseTextPointers: +Route2TradeHouse_TextPointers: dw Route2HouseText1 dw Route2HouseText2 diff --git a/scripts/route3.asm b/scripts/Route3.asm index e4748b8c..d55831bf 100755 --- a/scripts/route3.asm +++ b/scripts/Route3.asm @@ -1,18 +1,18 @@ -Route3Script: +Route3_Script: call EnableAutoTextBoxDrawing ld hl, Route3TrainerHeader0 - ld de, Route3ScriptPointers + ld de, Route3_ScriptPointers ld a, [wRoute3CurScript] call ExecuteCurMapScriptInTable ld [wRoute3CurScript], a ret -Route3ScriptPointers: +Route3_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route3TextPointers: +Route3_TextPointers: dw Route3Text1 dw Route3Text2 dw Route3Text3 diff --git a/scripts/route4.asm b/scripts/Route4.asm index ee9e2cdf..9b04a47a 100755 --- a/scripts/route4.asm +++ b/scripts/Route4.asm @@ -1,18 +1,18 @@ -Route4Script: +Route4_Script: call EnableAutoTextBoxDrawing ld hl, Route4TrainerHeader0 - ld de, Route4ScriptPointers + ld de, Route4_ScriptPointers ld a, [wRoute4CurScript] call ExecuteCurMapScriptInTable ld [wRoute4CurScript], a ret -Route4ScriptPointers: +Route4_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route4TextPointers: +Route4_TextPointers: dw Route4Text1 dw Route4Text2 dw PickUpItemText diff --git a/scripts/route5.asm b/scripts/Route5.asm index 113212a4..1b2bd242 100755 --- a/scripts/route5.asm +++ b/scripts/Route5.asm @@ -1,7 +1,7 @@ -Route5Script: +Route5_Script: jp EnableAutoTextBoxDrawing -Route5TextPointers: +Route5_TextPointers: dw Route5Text1 Route5Text1: diff --git a/scripts/route5gate.asm b/scripts/Route5Gate.asm index 6072f943..bc763dfd 100755 --- a/scripts/route5gate.asm +++ b/scripts/Route5Gate.asm @@ -1,10 +1,10 @@ -Route5GateScript: +Route5Gate_Script: call EnableAutoTextBoxDrawing ld a, [wRoute5GateCurScript] - ld hl, Route5GateScriptPointers + ld hl, Route5Gate_ScriptPointers jp CallFunctionInTable -Route5GateScriptPointers: +Route5Gate_ScriptPointers: dw Route5GateScript0 dw Route5GateScript1 @@ -60,7 +60,7 @@ Route5GateScript1: ld [wRoute5GateCurScript], a ret -Route5GateTextPointers: +Route5Gate_TextPointers: dw Route5GateText1 dw Route5GateText2 dw Route5GateText3 diff --git a/scripts/route6.asm b/scripts/Route6.asm index ba727adc..9f43b800 100755 --- a/scripts/route6.asm +++ b/scripts/Route6.asm @@ -1,18 +1,18 @@ -Route6Script: +Route6_Script: call EnableAutoTextBoxDrawing ld hl, Route6TrainerHeader0 - ld de, Route6ScriptPointers + ld de, Route6_ScriptPointers ld a, [wRoute6CurScript] call ExecuteCurMapScriptInTable ld [wRoute6CurScript], a ret -Route6ScriptPointers: +Route6_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route6TextPointers: +Route6_TextPointers: dw Route6Text1 dw Route6Text2 dw Route6Text3 diff --git a/scripts/route6gate.asm b/scripts/Route6Gate.asm index cf872f69..348f61ac 100755 --- a/scripts/route6gate.asm +++ b/scripts/Route6Gate.asm @@ -1,11 +1,11 @@ -Route6GateScript: +Route6Gate_Script: call EnableAutoTextBoxDrawing - ld hl, Route6GateScriptPointers + ld hl, Route6Gate_ScriptPointers ld a, [wRoute6GateCurScript] call CallFunctionInTable ret -Route6GateScriptPointers: +Route6Gate_ScriptPointers: dw Route6GateScript0 dw Route6GateScript1 @@ -64,7 +64,7 @@ Route6GateScript_1e0a1: ld [wOverrideSimulatedJoypadStatesMask], a ret -Route6GateTextPointers: +Route6Gate_TextPointers: dw Route6GateText1 dw Route6GateText2 dw Route6GateText3 diff --git a/scripts/route7.asm b/scripts/Route7.asm index 5e8288ea..55774553 100755 --- a/scripts/route7.asm +++ b/scripts/Route7.asm @@ -1,7 +1,7 @@ -Route7Script: +Route7_Script: jp EnableAutoTextBoxDrawing -Route7TextPointers: +Route7_TextPointers: dw Route7Text1 Route7Text1: diff --git a/scripts/route7gate.asm b/scripts/Route7Gate.asm index 6d4e27bb..724172c5 100755 --- a/scripts/route7gate.asm +++ b/scripts/Route7Gate.asm @@ -1,11 +1,11 @@ -Route7GateScript: +Route7Gate_Script: call EnableAutoTextBoxDrawing ld a, [wRoute7GateCurScript] - ld hl, Route7GateScriptPointers + ld hl, Route7Gate_ScriptPointers call CallFunctionInTable ret -Route7GateScriptPointers: +Route7Gate_ScriptPointers: dw Route7GateScript0 dw Route7GateScript1 @@ -67,7 +67,7 @@ Route7GateScript1: ld [wCurMapScript], a ret -Route7GateTextPointers: +Route7Gate_TextPointers: dw Route7GateText1 dw Route7GateText2 dw Route7GateText3 diff --git a/scripts/route8.asm b/scripts/Route8.asm index e05508bb..f3388505 100755 --- a/scripts/route8.asm +++ b/scripts/Route8.asm @@ -1,18 +1,18 @@ -Route8Script: +Route8_Script: call EnableAutoTextBoxDrawing ld hl, Route8TrainerHeader0 - ld de, Route8ScriptPointers + ld de, Route8_ScriptPointers ld a, [wRoute8CurScript] call ExecuteCurMapScriptInTable ld [wRoute8CurScript], a ret -Route8ScriptPointers: +Route8_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route8TextPointers: +Route8_TextPointers: dw Route8Text1 dw Route8Text2 dw Route8Text3 diff --git a/scripts/route8gate.asm b/scripts/Route8Gate.asm index 28835f9d..8ecea68e 100755 --- a/scripts/route8gate.asm +++ b/scripts/Route8Gate.asm @@ -1,10 +1,10 @@ -Route8GateScript: +Route8Gate_Script: call EnableAutoTextBoxDrawing - ld hl, Route8GateScriptPointers + ld hl, Route8Gate_ScriptPointers ld a, [wRoute8GateCurScript] jp CallFunctionInTable -Route8GateScriptPointers: +Route8Gate_ScriptPointers: dw Route8GateScript0 dw Route8GateScript1 @@ -64,7 +64,7 @@ Route8GateScript1: ld [wRoute8GateCurScript], a ret -Route8GateTextPointers: +Route8Gate_TextPointers: dw Route8GateText1 dw Route8GateText2 dw Route8GateText3 diff --git a/scripts/route9.asm b/scripts/Route9.asm index c965d853..a18096f0 100755 --- a/scripts/route9.asm +++ b/scripts/Route9.asm @@ -1,18 +1,18 @@ -Route9Script: +Route9_Script: call EnableAutoTextBoxDrawing ld hl, Route9TrainerHeader0 - ld de, Route9ScriptPointers + ld de, Route9_ScriptPointers ld a, [wRoute9CurScript] call ExecuteCurMapScriptInTable ld [wRoute9CurScript], a ret -Route9ScriptPointers: +Route9_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -Route9TextPointers: +Route9_TextPointers: dw Route9Text1 dw Route9Text2 dw Route9Text3 diff --git a/scripts/ssanne1.asm b/scripts/SSAnne1F.asm index 3f8861d5..5cace6ee 100755 --- a/scripts/ssanne1.asm +++ b/scripts/SSAnne1F.asm @@ -1,8 +1,8 @@ -SSAnne1Script: +SSAnne1F_Script: call EnableAutoTextBoxDrawing ret -SSAnne1TextPointers: +SSAnne1F_TextPointers: dw SSAnne1Text1 dw SSAnne1Text2 diff --git a/scripts/ssanne8.asm b/scripts/SSAnne1FRooms.asm index c684f84b..2371f286 100755 --- a/scripts/ssanne8.asm +++ b/scripts/SSAnne1FRooms.asm @@ -1,18 +1,18 @@ -SSAnne8Script: +SSAnne1FRooms_Script: call EnableAutoTextBoxDrawing ld hl, SSAnne8TrainerHeader0 - ld de, SSAnne8ScriptPointers - ld a, [wSSAnne8CurScript] + ld de, SSAnne1FRooms_ScriptPointers + ld a, [wSSAnne1FRoomsCurScript] call ExecuteCurMapScriptInTable - ld [wSSAnne8CurScript], a + ld [wSSAnne1FRoomsCurScript], a ret -SSAnne8ScriptPointers: +SSAnne1FRooms_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne8TextPointers: +SSAnne1FRooms_TextPointers: dw SSAnne8Text1 dw SSAnne8Text2 dw SSAnne8Text3 diff --git a/scripts/ssanne2.asm b/scripts/SSAnne2F.asm index 654b881a..ba900748 100755 --- a/scripts/ssanne2.asm +++ b/scripts/SSAnne2F.asm @@ -1,16 +1,16 @@ -SSAnne2Script: +SSAnne2F_Script: call EnableAutoTextBoxDrawing - ld hl, SSAnne2ScriptPointers - ld a, [wSSAnne2CurScript] + ld hl, SSAnne2F_ScriptPointers + ld a, [wSSAnne2FCurScript] jp CallFunctionInTable SSAnne2Script_613ab: xor a ld [wJoyIgnore], a - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret -SSAnne2ScriptPointers: +SSAnne2F_ScriptPointers: dw SSAnne2Script0 dw SSAnne2Script1 dw SSAnne2Script2 @@ -32,7 +32,7 @@ SSAnne2Script0: call PlayMusic ld a, [wCoordIndex] ld [$ffdb], a - ld a, HS_SS_ANNE_2_RIVAL + ld a, HS_SS_ANNE_2F_RIVAL ld [wMissableObjectIndex], a predef ShowObject call Delay3 @@ -53,7 +53,7 @@ SSAnne2Script0: .asm_61403 call MoveSprite ld a, $1 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret MovementData_6140c: @@ -118,7 +118,7 @@ SSAnne2Script1: call SSAnne2Script_61416 ld a, $2 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret SSAnne2Script2: @@ -150,7 +150,7 @@ SSAnne2Script2: call PlaySound callba Music_RivalAlternateStart ld a, $3 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret MovementData_614b7: @@ -170,15 +170,15 @@ SSAnne2Script3: ret nz xor a ld [wJoyIgnore], a - ld a, HS_SS_ANNE_2_RIVAL + ld a, HS_SS_ANNE_2F_RIVAL ld [wMissableObjectIndex], a predef HideObject call PlayDefaultMusic ld a, $4 - ld [wSSAnne2CurScript], a + ld [wSSAnne2FCurScript], a ret -SSAnne2TextPointers: +SSAnne2F_TextPointers: dw SSAnne2Text1 dw SSAnne2Text2 dw SSAnne2Text3 diff --git a/scripts/ssanne9.asm b/scripts/SSAnne2FRooms.asm index 1f965e0d..a79e1be8 100755 --- a/scripts/ssanne9.asm +++ b/scripts/SSAnne2FRooms.asm @@ -1,21 +1,21 @@ -SSAnne9Script: +SSAnne2FRooms_Script: ld a, $1 ld [wAutoTextBoxDrawingControl], a xor a ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, SSAnne9TrainerHeader0 - ld de, SSAnne9ScriptPointers - ld a, [wSSAnne9CurScript] + ld de, SSAnne2FRooms_ScriptPointers + ld a, [wSSAnne2FRoomsCurScript] call ExecuteCurMapScriptInTable - ld [wSSAnne9CurScript], a + ld [wSSAnne2FRoomsCurScript], a ret -SSAnne9ScriptPointers: +SSAnne2FRooms_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne9TextPointers: +SSAnne2FRooms_TextPointers: dw SSAnne9Text1 dw SSAnne9Text2 dw SSAnne9Text3 diff --git a/scripts/ssanne3.asm b/scripts/SSAnne3F.asm index e681591a..5da0e0c7 100755 --- a/scripts/ssanne3.asm +++ b/scripts/SSAnne3F.asm @@ -1,7 +1,7 @@ -SSAnne3Script: +SSAnne3F_Script: jp EnableAutoTextBoxDrawing -SSAnne3TextPointers: +SSAnne3F_TextPointers: dw SSAnne3Text1 SSAnne3Text1: diff --git a/scripts/SSAnneB1F.asm b/scripts/SSAnneB1F.asm new file mode 100755 index 00000000..25df076f --- /dev/null +++ b/scripts/SSAnneB1F.asm @@ -0,0 +1,5 @@ +SSAnneB1F_Script: + jp EnableAutoTextBoxDrawing + +SSAnneB1F_TextPointers: + db "@" diff --git a/scripts/ssanne10.asm b/scripts/SSAnneB1FRooms.asm index 12433732..3777852c 100755 --- a/scripts/ssanne10.asm +++ b/scripts/SSAnneB1FRooms.asm @@ -1,18 +1,18 @@ -SSAnne10Script: +SSAnneB1FRooms_Script: call EnableAutoTextBoxDrawing ld hl, SSAnne10TrainerHeader0 - ld de, SSAnne10ScriptPointers - ld a, [wSSAnne10CurScript] + ld de, SSAnneB1FRooms_ScriptPointers + ld a, [wSSAnneB1FRoomsCurScript] call ExecuteCurMapScriptInTable - ld [wSSAnne10CurScript], a + ld [wSSAnneB1FRoomsCurScript], a ret -SSAnne10ScriptPointers: +SSAnneB1FRooms_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne10TextPointers: +SSAnneB1FRooms_TextPointers: dw SSAnne10Text1 dw SSAnne10Text2 dw SSAnne10Text3 diff --git a/scripts/ssanne5.asm b/scripts/SSAnneBow.asm index 0cfef9f4..4569f0f8 100755 --- a/scripts/ssanne5.asm +++ b/scripts/SSAnneBow.asm @@ -1,18 +1,18 @@ -SSAnne5Script: +SSAnneBow_Script: call EnableAutoTextBoxDrawing ld hl, SSAnne5TrainerHeader0 - ld de, SSAnne5ScriptPointers - ld a, [wSSAnne5CurScript] + ld de, SSAnneBow_ScriptPointers + ld a, [wSSAnneBowCurScript] call ExecuteCurMapScriptInTable - ld [wSSAnne5CurScript], a + ld [wSSAnneBowCurScript], a ret -SSAnne5ScriptPointers: +SSAnneBow_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SSAnne5TextPointers: +SSAnneBow_TextPointers: dw SSAnne5Text1 dw SSAnne5Text2 dw SSAnne5Text3 diff --git a/scripts/ssanne7.asm b/scripts/SSAnneCaptainsRoom.asm index 0df842c2..de0272e4 100755 --- a/scripts/ssanne7.asm +++ b/scripts/SSAnneCaptainsRoom.asm @@ -1,4 +1,4 @@ -SSAnne7Script: +SSAnneCaptainsRoom_Script: call SSAnne7Script_6189b jp EnableAutoTextBoxDrawing @@ -9,7 +9,7 @@ SSAnne7Script_6189b: set 5, [hl] ret -SSAnne7TextPointers: +SSAnneCaptainsRoom_TextPointers: dw SSAnne7Text1 dw SSAnne7Text2 dw SSAnne7Text3 diff --git a/scripts/ssanne6.asm b/scripts/SSAnneKitchen.asm index e1998858..137706a0 100755 --- a/scripts/ssanne6.asm +++ b/scripts/SSAnneKitchen.asm @@ -1,8 +1,8 @@ -SSAnne6Script: +SSAnneKitchen_Script: call EnableAutoTextBoxDrawing ret -SSAnne6TextPointers: +SSAnneKitchen_TextPointers: dw SSAnne6Text1 dw SSAnne6Text2 dw SSAnne6Text3 diff --git a/scripts/safarizonecenter.asm b/scripts/SafariZoneCenter.asm index d796c403..0a266887 100755 --- a/scripts/safarizonecenter.asm +++ b/scripts/SafariZoneCenter.asm @@ -1,7 +1,7 @@ -SafariZoneCenterScript: +SafariZoneCenter_Script: jp EnableAutoTextBoxDrawing -SafariZoneCenterTextPointers: +SafariZoneCenter_TextPointers: dw PickUpItemText dw SafariZoneCenterText2 dw SafariZoneCenterText3 diff --git a/scripts/safarizoneresthouse1.asm b/scripts/SafariZoneCenterRestHouse.asm index 1d43890d..a652644b 100755 --- a/scripts/safarizoneresthouse1.asm +++ b/scripts/SafariZoneCenterRestHouse.asm @@ -1,7 +1,7 @@ -SafariZoneRestHouse1Script: +SafariZoneCenterRestHouse_Script: jp EnableAutoTextBoxDrawing -SafariZoneRestHouse1TextPointers: +SafariZoneCenterRestHouse_TextPointers: dw SafariZoneRestHouse1Text1 dw SafariZoneRestHouse1Text2 diff --git a/scripts/safarizoneeast.asm b/scripts/SafariZoneEast.asm index 25d0ee30..7f4a5543 100755 --- a/scripts/safarizoneeast.asm +++ b/scripts/SafariZoneEast.asm @@ -1,7 +1,7 @@ -SafariZoneEastScript: +SafariZoneEast_Script: jp EnableAutoTextBoxDrawing -SafariZoneEastTextPointers: +SafariZoneEast_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/safarizoneresthouse3.asm b/scripts/SafariZoneEastRestHouse.asm index 18c4770f..24141459 100755 --- a/scripts/safarizoneresthouse3.asm +++ b/scripts/SafariZoneEastRestHouse.asm @@ -1,8 +1,8 @@ -SafariZoneRestHouse3Script: +SafariZoneEastRestHouse_Script: call EnableAutoTextBoxDrawing ret -SafariZoneRestHouse3TextPointers: +SafariZoneEastRestHouse_TextPointers: dw SafariZoneRestHouse3Text1 dw SafariZoneRestHouse3Text2 dw SafariZoneRestHouse3Text3 diff --git a/scripts/safarizoneentrance.asm b/scripts/SafariZoneGate.asm index 5c6002a9..f3de556b 100755 --- a/scripts/safarizoneentrance.asm +++ b/scripts/SafariZoneGate.asm @@ -1,10 +1,10 @@ -SafariZoneEntranceScript: +SafariZoneGate_Script: call EnableAutoTextBoxDrawing - ld hl, SafariZoneEntranceScriptPointers - ld a, [wSafariZoneEntranceCurScript] + ld hl, SafariZoneGate_ScriptPointers + ld a, [wSafariZoneGateCurScript] jp CallFunctionInTable -SafariZoneEntranceScriptPointers: +SafariZoneGate_ScriptPointers: dw .SafariZoneEntranceScript0 dw .SafariZoneEntranceScript1 dw .SafariZoneEntranceScript2 @@ -30,7 +30,7 @@ SafariZoneEntranceScriptPointers: cp $1 jr z, .asm_7520f ld a, $2 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .asm_7520f ld a, D_RIGHT @@ -39,7 +39,7 @@ SafariZoneEntranceScriptPointers: ld a, $f0 ld [wJoyIgnore], a ld a, $1 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .CoordsData_75221: @@ -68,7 +68,7 @@ SafariZoneEntranceScriptPointers: xor a ld [wJoyIgnore], a ld a, $5 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .SafariZoneEntranceScript5 @@ -89,7 +89,7 @@ SafariZoneEntranceScriptPointers: ld c, $3 call SafariZoneEntranceAutoWalk ld a, $4 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a jr .asm_75286 .asm_7527f ld a, $5 @@ -104,7 +104,7 @@ SafariZoneEntranceScriptPointers: xor a ld [wJoyIgnore], a ld a, $0 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret .SafariZoneEntranceScript6 @@ -112,7 +112,7 @@ SafariZoneEntranceScriptPointers: ret nz call Delay3 ld a, [wcf0d] - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a ret SafariZoneEntranceAutoWalk: @@ -130,7 +130,7 @@ SafariZoneEntranceScript_752b4: and a ret -SafariZoneEntranceTextPointers: +SafariZoneGate_TextPointers: dw .SafariZoneEntranceText1 dw .SafariZoneEntranceText2 dw .SafariZoneEntranceText1 @@ -192,7 +192,7 @@ SafariZoneEntranceTextPointers: SetEvent EVENT_IN_SAFARI_ZONE ResetEventReuseHL EVENT_SAFARI_GAME_OVER ld a, 3 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a jr .done .PleaseComeAgain @@ -203,7 +203,7 @@ SafariZoneEntranceTextPointers: ld c, 1 call SafariZoneEntranceAutoWalk ld a, 4 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a .done jp TextScriptEnd @@ -251,7 +251,7 @@ SafariZoneEntranceTextPointers: ld [wcf0d], a .asm_753b3 ld a, $6 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a jp TextScriptEnd .SafariZoneEntranceText_753bb diff --git a/scripts/safarizonenorth.asm b/scripts/SafariZoneNorth.asm index b870c99e..734328b4 100755 --- a/scripts/safarizonenorth.asm +++ b/scripts/SafariZoneNorth.asm @@ -1,7 +1,7 @@ -SafariZoneNorthScript: +SafariZoneNorth_Script: jp EnableAutoTextBoxDrawing -SafariZoneNorthTextPointers: +SafariZoneNorth_TextPointers: dw PickUpItemText dw PickUpItemText dw SafariZoneNorthText3 diff --git a/scripts/safarizoneresthouse4.asm b/scripts/SafariZoneNorthRestHouse.asm index 3ff3fa48..fdc438f4 100755 --- a/scripts/safarizoneresthouse4.asm +++ b/scripts/SafariZoneNorthRestHouse.asm @@ -1,8 +1,8 @@ -SafariZoneRestHouse4Script: +SafariZoneNorthRestHouse_Script: call EnableAutoTextBoxDrawing ret -SafariZoneRestHouse4TextPointers: +SafariZoneNorthRestHouse_TextPointers: dw SafariZoneRestHouse4Text1 dw SafariZoneRestHouse4Text2 dw SafariZoneRestHouse4Text3 diff --git a/scripts/safarizonesecrethouse.asm b/scripts/SafariZoneSecretHouse.asm index 44c89281..2d9b2305 100755 --- a/scripts/safarizonesecrethouse.asm +++ b/scripts/SafariZoneSecretHouse.asm @@ -1,7 +1,7 @@ -SafariZoneSecretHouseScript: +SafariZoneSecretHouse_Script: jp EnableAutoTextBoxDrawing -SafariZoneSecretHouseTextPointers: +SafariZoneSecretHouse_TextPointers: dw SafariZoneSecretHouseText1 SafariZoneSecretHouseText1: diff --git a/scripts/safarizonewest.asm b/scripts/SafariZoneWest.asm index 81190c4c..483a92ee 100755 --- a/scripts/safarizonewest.asm +++ b/scripts/SafariZoneWest.asm @@ -1,7 +1,7 @@ -SafariZoneWestScript: +SafariZoneWest_Script: jp EnableAutoTextBoxDrawing -SafariZoneWestTextPointers: +SafariZoneWest_TextPointers: dw PickUpItemText dw PickUpItemText dw PickUpItemText diff --git a/scripts/safarizoneresthouse2.asm b/scripts/SafariZoneWestRestHouse.asm index 4cd512f2..371bd56c 100755 --- a/scripts/safarizoneresthouse2.asm +++ b/scripts/SafariZoneWestRestHouse.asm @@ -1,8 +1,8 @@ -SafariZoneRestHouse2Script: +SafariZoneWestRestHouse_Script: call EnableAutoTextBoxDrawing ret -SafariZoneRestHouse2TextPointers: +SafariZoneWestRestHouse_TextPointers: dw SafariZoneRestHouse2Text1 dw SafariZoneRestHouse2Text2 dw SafariZoneRestHouse2Text3 diff --git a/scripts/saffroncity.asm b/scripts/SaffronCity.asm index 57a1a3a5..02e6e2bb 100755 --- a/scripts/saffroncity.asm +++ b/scripts/SaffronCity.asm @@ -1,7 +1,7 @@ -SaffronCityScript: +SaffronCity_Script: jp EnableAutoTextBoxDrawing -SaffronCityTextPointers: +SaffronCity_TextPointers: dw SaffronCityText1 dw SaffronCityText2 dw SaffronCityText3 diff --git a/scripts/saffrongym.asm b/scripts/SaffronGym.asm index cbf935e7..e51763e5 100755 --- a/scripts/saffrongym.asm +++ b/scripts/SaffronGym.asm @@ -1,11 +1,11 @@ -SaffronGymScript: +SaffronGym_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] call nz, .extra call EnableAutoTextBoxDrawing ld hl, SaffronGymTrainerHeader0 - ld de, SaffronGymScriptPointers + ld de, SaffronGym_ScriptPointers ld a, [wSaffronGymCurScript] call ExecuteCurMapScriptInTable ld [wSaffronGymCurScript], a @@ -29,7 +29,7 @@ SaffronGymText_5d048: ld [wCurMapScript], a ret -SaffronGymScriptPointers: +SaffronGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -70,7 +70,7 @@ SaffronGymText_5d068: jp SaffronGymText_5d048 -SaffronGymTextPointers: +SaffronGym_TextPointers: dw SaffronGymText1 dw SaffronGymText2 dw SaffronGymText3 diff --git a/scripts/saffronmart.asm b/scripts/SaffronMart.asm index 8b140610..ebb3cddf 100755 --- a/scripts/saffronmart.asm +++ b/scripts/SaffronMart.asm @@ -1,7 +1,7 @@ -SaffronMartScript: +SaffronMart_Script: jp EnableAutoTextBoxDrawing -SaffronMartTextPointers: +SaffronMart_TextPointers: dw SaffronCashierText dw SaffronMartText2 dw SaffronMartText3 diff --git a/scripts/saffronhouse1.asm b/scripts/SaffronPidgeyHouse.asm index 5f417978..f38fbfdb 100755 --- a/scripts/saffronhouse1.asm +++ b/scripts/SaffronPidgeyHouse.asm @@ -1,7 +1,7 @@ -SaffronHouse1Script: +SaffronPidgeyHouse_Script: jp EnableAutoTextBoxDrawing -SaffronHouse1TextPointers: +SaffronPidgeyHouse_TextPointers: dw SaffronHouse1Text1 dw SaffronHouse1Text2 dw SaffronHouse1Text3 diff --git a/scripts/saffronpokecenter.asm b/scripts/SaffronPokecenter.asm index 82467215..a1d73628 100755 --- a/scripts/saffronpokecenter.asm +++ b/scripts/SaffronPokecenter.asm @@ -1,8 +1,8 @@ -SaffronPokecenterScript: +SaffronPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -SaffronPokecenterTextPointers: +SaffronPokecenter_TextPointers: dw SaffronHealNurseText dw SaffronPokecenterText2 dw SaffronPokecenterText3 diff --git a/scripts/seafoamislands1.asm b/scripts/SeafoamIslands1F.asm index 52561fa7..dc3b8599 100755 --- a/scripts/seafoamislands1.asm +++ b/scripts/SeafoamIslands1F.asm @@ -1,4 +1,4 @@ -SeafoamIslands1Script: +SeafoamIslands1F_Script: call EnableAutoTextBoxDrawing SetEvent EVENT_IN_SEAFOAM_ISLANDS ld hl, wFlags_0xcd60 @@ -13,16 +13,16 @@ SeafoamIslands1Script: cp $1 jr nz, .asm_44819 SetEventReuseHL EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ld [wObjectToShow], a jr .asm_44825 .asm_44819 SetEventAfterBranchReuseHL EVENT_SEAFOAM1_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM1_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_1_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ld [wObjectToShow], a .asm_44825 ld a, [wObjectToHide] @@ -42,6 +42,6 @@ Seafoam1HolesCoords: db $06,$18 db $ff -SeafoamIslands1TextPointers: +SeafoamIslands1F_TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands2.asm b/scripts/SeafoamIslandsB1F.asm index 50024bad..876c0837 100755 --- a/scripts/seafoamislands2.asm +++ b/scripts/SeafoamIslandsB1F.asm @@ -1,4 +1,4 @@ -SeafoamIslands2Script: +SeafoamIslandsB1F_Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -12,16 +12,16 @@ SeafoamIslands2Script: cp $1 jr nz, .asm_46340 SetEventReuseHL EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ld [wObjectToShow], a jr .asm_4634c .asm_46340 SetEventAfterBranchReuseHL EVENT_SEAFOAM2_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM2_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_2_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ld [wObjectToShow], a .asm_4634c ld a, [wObjectToHide] @@ -41,6 +41,6 @@ Seafoam2HolesCoords: db $06,$17 db $ff -SeafoamIslands2TextPointers: +SeafoamIslandsB1F_TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands3.asm b/scripts/SeafoamIslandsB2F.asm index 4a7848a4..c0141a3e 100755 --- a/scripts/seafoamislands3.asm +++ b/scripts/SeafoamIslandsB2F.asm @@ -1,4 +1,4 @@ -SeafoamIslands3Script: +SeafoamIslandsB2F_Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -12,16 +12,16 @@ SeafoamIslands3Script: cp $1 jr nz, .asm_4647c SetEventReuseHL EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_3 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ld [wObjectToShow], a jr .asm_46488 .asm_4647c SetEventAfterBranchReuseHL EVENT_SEAFOAM3_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM3_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_3_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_4 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ld [wObjectToShow], a .asm_46488 ld a, [wObjectToHide] @@ -41,6 +41,6 @@ Seafoam3HolesCoords: db $06,$16 db $ff -SeafoamIslands3TextPointers: +SeafoamIslandsB2F_TextPointers: dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands4.asm b/scripts/SeafoamIslandsB3F.asm index 34873004..7343b17d 100755 --- a/scripts/seafoamislands4.asm +++ b/scripts/SeafoamIslandsB3F.asm @@ -1,4 +1,4 @@ -SeafoamIslands4Script: +SeafoamIslandsB3F_Script: call EnableAutoTextBoxDrawing ld hl, wFlags_0xcd60 bit 7, [hl] @@ -12,16 +12,16 @@ SeafoamIslands4Script: cp $1 jr nz, .asm_465b8 SetEventReuseHL EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_1 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ld [wObjectToShow], a jr .asm_465c4 .asm_465b8 SetEventAfterBranchReuseHL EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE - ld a, HS_SEAFOAM_ISLANDS_4_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ld [wObjectToHide], a - ld a, HS_SEAFOAM_ISLANDS_5_BOULDER_2 + ld a, HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ld [wObjectToShow], a .asm_465c4 ld a, [wObjectToHide] @@ -40,8 +40,8 @@ SeafoamIslands4Script: bit 4, a ret nz .asm_465ed - ld hl, SeafoamIslands4ScriptPointers - ld a, [wSeafoamIslands4CurScript] + ld hl, SeafoamIslandsB3F_ScriptPointers + ld a, [wSeafoamIslandsB3FCurScript] jp CallFunctionInTable Seafoam4HolesCoords: @@ -49,7 +49,7 @@ Seafoam4HolesCoords: db $10,$06 db $ff -SeafoamIslands4ScriptPointers: +SeafoamIslandsB3F_ScriptPointers: dw SeafoamIslands4Script0 dw SeafoamIslands4Script1 dw SeafoamIslands4Script2 @@ -73,7 +73,7 @@ SeafoamIslands4Script0: ld hl, wFlags_D733 set 2, [hl] ld a, $1 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a ret RLEMovement46632: @@ -87,7 +87,7 @@ SeafoamIslands4Script1: and a ret nz ld a, $0 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a ret SeafoamIslands4Script2: @@ -116,7 +116,7 @@ SeafoamIslands4Script2: set 2, [hl] ld a, $3 .asm_4667b - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a ret RLEData_4667f: @@ -137,10 +137,10 @@ SeafoamIslands4Script3: and a ret nz ld a, $0 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a ret -SeafoamIslands4TextPointers: +SeafoamIslandsB3F_TextPointers: dw BoulderText dw BoulderText dw BoulderText diff --git a/scripts/seafoamislands5.asm b/scripts/SeafoamIslandsB4F.asm index a233fb6a..d08628d0 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -1,16 +1,16 @@ -SeafoamIslands5Script: +SeafoamIslandsB4F_Script: call EnableAutoTextBoxDrawing - ld a, [wSeafoamIslands5CurScript] - ld hl, SeafoamIslands5ScriptPointers + ld a, [wSeafoamIslandsB4FCurScript] + ld hl, SeafoamIslandsB4F_ScriptPointers jp CallFunctionInTable SeafoamIslands5Script_467a5: xor a - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ld [wJoyIgnore], a ret -SeafoamIslands5ScriptPointers: +SeafoamIslandsB4F_ScriptPointers: dw SeafoamIslands5Script0 dw SeafoamIslands5Script1 dw SeafoamIslands5Script2 @@ -23,7 +23,7 @@ SeafoamIslands5Script4: jr z, SeafoamIslands5Script_467a5 call EndTrainerBattle ld a, $0 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret SeafoamIslands5Script0: @@ -49,7 +49,7 @@ SeafoamIslands5Script0: ld hl, wFlags_D733 res 2, [hl] ld a, $1 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret .Coords @@ -66,7 +66,7 @@ SeafoamIslands5Script1: xor a ld [wJoyIgnore], a ld a, $0 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret SeafoamIslands5Script2: @@ -92,7 +92,7 @@ SeafoamIslands5Script2: call StartSimulatingJoypadStates ld a, $3 .asm_46849 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret .Coords @@ -121,7 +121,7 @@ SeafoamIslands5Script3: and a ret nz ld a, $0 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a ret SeaFoamIslands5Script_46872: @@ -130,7 +130,7 @@ SeaFoamIslands5Script_46872: ld [wWalkBikeSurfStateCopy], a jp ForceBikeOrSurf -SeafoamIslands5TextPointers: +SeafoamIslandsB4F_TextPointers: dw BoulderText dw BoulderText dw ArticunoText @@ -153,7 +153,7 @@ ArticunoText: ld hl, ArticunoTrainerHeader call TalkToTrainer ld a, $4 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a jp TextScriptEnd ArticunoBattleText: diff --git a/scripts/silphco10.asm b/scripts/SilphCo10F.asm index 5cfb92b2..40506682 100755 --- a/scripts/silphco10.asm +++ b/scripts/SilphCo10F.asm @@ -1,11 +1,11 @@ -SilphCo10Script: +SilphCo10F_Script: call SilphCo10Script_5a14f call EnableAutoTextBoxDrawing ld hl, SilphCo10TrainerHeader0 - ld de, SilphCo10ScriptPointers - ld a, [wSilphCo10CurScript] + ld de, SilphCo10F_ScriptPointers + ld a, [wSilphCo10FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo10CurScript], a + ld [wSilphCo10FCurScript], a ret SilphCo10Script_5a14f: @@ -34,12 +34,12 @@ SilphCo10Text_5a176: SetEvent EVENT_SILPH_CO_10_UNLOCKED_DOOR ret -SilphCo10ScriptPointers: +SilphCo10F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo10TextPointers: +SilphCo10F_TextPointers: dw SilphCo10Text1 dw SilphCo10Text2 dw SilphCo10Text3 diff --git a/scripts/silphco11.asm b/scripts/SilphCo11F.asm index 342fef07..483082a1 100755 --- a/scripts/silphco11.asm +++ b/scripts/SilphCo11F.asm @@ -1,11 +1,11 @@ -SilphCo11Script: +SilphCo11F_Script: call SilphCo11Script_62110 call EnableAutoTextBoxDrawing ld hl, SilphCo11TrainerHeader0 - ld de, SilphCo11ScriptPointers - ld a, [wSilphCo11CurScript] + ld de, SilphCo11F_ScriptPointers + ld a, [wSilphCo11FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo11CurScript], a + ld [wSilphCo11FCurScript], a ret SilphCo11Script_62110: @@ -150,11 +150,11 @@ SilphCo11Script_621c4: ld [wJoyIgnore], a SilphCo11Script_621c8: - ld [wSilphCo11CurScript], a + ld [wSilphCo11FCurScript], a ld [wCurMapScript], a ret -SilphCo11ScriptPointers: +SilphCo11F_ScriptPointers: dw SilphCo11Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -272,7 +272,7 @@ SilphCo11Script4: ld a, $5 jp SilphCo11Script_621c8 -SilphCo11TextPointers: +SilphCo11F_TextPointers: dw SilphCo11Text1 dw SilphCo11Text2 dw SilphCo11Text3 diff --git a/scripts/silphco1.asm b/scripts/SilphCo1F.asm index c0cb169b..6ccaa29c 100755 --- a/scripts/silphco1.asm +++ b/scripts/SilphCo1F.asm @@ -1,4 +1,4 @@ -SilphCo1Script: +SilphCo1F_Script: call EnableAutoTextBoxDrawing CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI ret z @@ -8,7 +8,7 @@ SilphCo1Script: ld [wMissableObjectIndex], a predef_jump ShowObject -SilphCo1TextPointers: +SilphCo1F_TextPointers: dw SilphCo1Text1 SilphCo1Text1: diff --git a/scripts/silphco2.asm b/scripts/SilphCo2F.asm index e77c45dd..5fd542cb 100755 --- a/scripts/silphco2.asm +++ b/scripts/SilphCo2F.asm @@ -1,11 +1,11 @@ -SilphCo2Script: +SilphCo2F_Script: call SilphCo2Script_59d07 call EnableAutoTextBoxDrawing ld hl, SilphCo2TrainerHeader0 - ld de, SilphCo2ScriptPointers - ld a, [wSilphCo2CurScript] + ld de, SilphCo2F_ScriptPointers + ld a, [wSilphCo2FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo2CurScript], a + ld [wSilphCo2FCurScript], a ret SilphCo2Script_59d07: @@ -86,12 +86,12 @@ SilphCo2Script_59d6f: SetEventAfterBranchReuseHL EVENT_SILPH_CO_2_UNLOCKED_DOOR2, EVENT_SILPH_CO_2_UNLOCKED_DOOR1 ret -SilphCo2ScriptPointers: +SilphCo2F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo2TextPointers: +SilphCo2F_TextPointers: dw SilphCo2Text1 dw SilphCo2Text2 dw SilphCo2Text3 diff --git a/scripts/silphco3.asm b/scripts/SilphCo3F.asm index 0d12b768..42b5d611 100755 --- a/scripts/silphco3.asm +++ b/scripts/SilphCo3F.asm @@ -1,11 +1,11 @@ -SilphCo3Script: +SilphCo3F_Script: call SilphCo3Script_59f71 call EnableAutoTextBoxDrawing ld hl, SilphCo3TrainerHeader0 - ld de, SilphCo3ScriptPointers - ld a, [wSilphCo3CurScript] + ld de, SilphCo3F_ScriptPointers + ld a, [wSilphCo3FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo3CurScript], a + ld [wSilphCo3FCurScript], a ret SilphCo3Script_59f71: @@ -50,12 +50,12 @@ SilphCo3Script_59fad: SetEventAfterBranchReuseHL EVENT_SILPH_CO_3_UNLOCKED_DOOR2, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ret -SilphCo3ScriptPointers: +SilphCo3F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo3TextPointers: +SilphCo3F_TextPointers: dw SilphCo3Text1 dw SilphCo3Text2 dw SilphCo3Text3 diff --git a/scripts/silphco4.asm b/scripts/SilphCo4F.asm index 1cfd1ceb..7d5072f6 100755 --- a/scripts/silphco4.asm +++ b/scripts/SilphCo4F.asm @@ -1,11 +1,11 @@ -SilphCo4Script: +SilphCo4F_Script: call SilphCo4Script_19d21 call EnableAutoTextBoxDrawing ld hl, SilphCo4TrainerHeader0 - ld de, SilphCo4ScriptPointers - ld a, [wSilphCo4CurScript] + ld de, SilphCo4F_ScriptPointers + ld a, [wSilphCo4FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo4CurScript], a + ld [wSilphCo4FCurScript], a ret SilphCo4Script_19d21: @@ -86,12 +86,12 @@ SilphCo4Script_19d89: SetEventAfterBranchReuseHL EVENT_SILPH_CO_4_UNLOCKED_DOOR2, EVENT_SILPH_CO_4_UNLOCKED_DOOR1 ret -SilphCo4ScriptPointers: +SilphCo4F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo4TextPointers: +SilphCo4F_TextPointers: dw SilphCo4Text1 dw SilphCo4Text2 dw SilphCo4Text3 diff --git a/scripts/silphco5.asm b/scripts/SilphCo5F.asm index 45a81b68..d9deda5b 100755 --- a/scripts/silphco5.asm +++ b/scripts/SilphCo5F.asm @@ -1,11 +1,11 @@ -SilphCo5Script: +SilphCo5F_Script: call SilphCo5Script_19f4d call EnableAutoTextBoxDrawing ld hl, SilphCo5TrainerHeader0 - ld de, SilphCo5ScriptPointers - ld a, [wSilphCo5CurScript] + ld de, SilphCo5F_ScriptPointers + ld a, [wSilphCo5FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo5CurScript], a + ld [wSilphCo5FCurScript], a ret SilphCo5Script_19f4d: @@ -65,12 +65,12 @@ SilphCo5Script_19f9e: SetEventAfterBranchReuseHL EVENT_SILPH_CO_5_UNLOCKED_DOOR3, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ret -SilphCo5ScriptPointers: +SilphCo5F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo5TextPointers: +SilphCo5F_TextPointers: dw SilphCo5Text1 dw SilphCo5Text2 dw SilphCo5Text3 diff --git a/scripts/silphco6.asm b/scripts/SilphCo6F.asm index 240b6793..ddbcba79 100755 --- a/scripts/silphco6.asm +++ b/scripts/SilphCo6F.asm @@ -1,11 +1,11 @@ -SilphCo6Script: +SilphCo6F_Script: call SilphCo6Script_1a1bf call EnableAutoTextBoxDrawing ld hl, SilphCo6TrainerHeader0 - ld de, SilphCo6ScriptPointers - ld a, [wSilphCo6CurScript] + ld de, SilphCo6F_ScriptPointers + ld a, [wSilphCo6FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo6CurScript], a + ld [wSilphCo6FCurScript], a ret SilphCo6Script_1a1bf: @@ -34,12 +34,12 @@ SilphCo6Script_1a1e6: SetEvent EVENT_SILPH_CO_6_UNLOCKED_DOOR ret -SilphCo6ScriptPointers: +SilphCo6F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo6TextPointers: +SilphCo6F_TextPointers: dw SilphCo6Text1 dw SilphCo6Text2 dw SilphCo6Text3 diff --git a/scripts/silphco7.asm b/scripts/SilphCo7F.asm index b211c8a9..e7594663 100755 --- a/scripts/silphco7.asm +++ b/scripts/SilphCo7F.asm @@ -1,11 +1,11 @@ -SilphCo7Script: +SilphCo7F_Script: call SilphCo7Script_51b77 call EnableAutoTextBoxDrawing ld hl, SilphCo7TrainerHeader0 - ld de, SilphCo7ScriptPointers - ld a, [wSilphCo7CurScript] + ld de, SilphCo7F_ScriptPointers + ld a, [wSilphCo7FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo7CurScript], a + ld [wSilphCo7FCurScript], a ret SilphCo7Script_51b77: @@ -106,11 +106,11 @@ SilphCo7Text_51c0c: ld [wJoyIgnore], a SilphCo7Text_51c10: - ld [wSilphCo7CurScript], a + ld [wSilphCo7FCurScript], a ld [wCurMapScript], a ret -SilphCo7ScriptPointers: +SilphCo7F_ScriptPointers: dw SilphCo7Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -262,7 +262,7 @@ SilphCo7Script5: ld [wJoyIgnore], a jp SilphCo7Text_51c10 -SilphCo7TextPointers: +SilphCo7F_TextPointers: dw SilphCo7Text1 dw SilphCo7Text2 dw SilphCo7Text3 diff --git a/scripts/silphco8.asm b/scripts/SilphCo8F.asm index 498fd569..ce6579f7 100755 --- a/scripts/silphco8.asm +++ b/scripts/SilphCo8F.asm @@ -1,11 +1,11 @@ -SilphCo8Script: +SilphCo8F_Script: call SilphCo8Script_5651a call EnableAutoTextBoxDrawing ld hl, SilphCo8TrainerHeader0 - ld de, SilphCo8ScriptPointers - ld a, [wSilphCo8CurScript] + ld de, SilphCo8F_ScriptPointers + ld a, [wSilphCo8FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo8CurScript], a + ld [wSilphCo8FCurScript], a ret SilphCo8Script_5651a: @@ -70,12 +70,12 @@ SilphCo8Script_5656d: SetEvent EVENT_SILPH_CO_8_UNLOCKED_DOOR ret -SilphCo8ScriptPointers: +SilphCo8F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo8TextPointers: +SilphCo8F_TextPointers: dw SilphCo8Text1 dw SilphCo8Text2 dw SilphCo8Text3 diff --git a/scripts/silphco9.asm b/scripts/SilphCo9F.asm index 57b8bc89..66291e98 100755 --- a/scripts/silphco9.asm +++ b/scripts/SilphCo9F.asm @@ -1,11 +1,11 @@ -SilphCo9Script: +SilphCo9F_Script: call SilphCo9Script_5d7d1 call EnableAutoTextBoxDrawing ld hl, SilphCo9TrainerHeader0 - ld de, SilphCo9ScriptPointers - ld a, [wSilphCo9CurScript] + ld de, SilphCo9F_ScriptPointers + ld a, [wSilphCo9FCurScript] call ExecuteCurMapScriptInTable - ld [wSilphCo9CurScript], a + ld [wSilphCo9FCurScript], a ret SilphCo9Script_5d7d1: @@ -118,12 +118,12 @@ SilphCo9Script_5d863: SetEventAfterBranchReuseHL EVENT_SILPH_CO_9_UNLOCKED_DOOR4, EVENT_SILPH_CO_9_UNLOCKED_DOOR1 ret -SilphCo9ScriptPointers: +SilphCo9F_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -SilphCo9TextPointers: +SilphCo9F_TextPointers: dw SilphCo9Text1 dw SilphCo9Text2 dw SilphCo9Text3 diff --git a/scripts/silphcoelevator.asm b/scripts/SilphCoElevator.asm index df4d08c7..49de6b27 100755 --- a/scripts/silphcoelevator.asm +++ b/scripts/SilphCoElevator.asm @@ -1,4 +1,4 @@ -SilphCoElevatorScript: +SilphCoElevator_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -32,7 +32,7 @@ SilphCoElevatorScript_457ea: ret SilphCoElevatorScript_457f1: - ld hl, SilphCoElavatorFloors + ld hl, SilphCoElevatorFloors call LoadItemList ld hl, SilphCoElevatorWarpMaps ld de, wElevatorWarpMaps @@ -40,7 +40,7 @@ SilphCoElevatorScript_457f1: call CopyData ret -SilphCoElavatorFloors: +SilphCoElevatorFloors: db $0B ; num elements in list db FLOOR_1F db FLOOR_2F @@ -77,7 +77,7 @@ SilphCoElevatorScript_45827: callba ShakeElevator ret -SilphCoElevatorTextPointers: +SilphCoElevator_TextPointers: dw SilphCoElevatorText1 SilphCoElevatorText1: diff --git a/scripts/tradecenter.asm b/scripts/TradeCenter.asm index 80efe4f9..ddb3061e 100755 --- a/scripts/tradecenter.asm +++ b/scripts/TradeCenter.asm @@ -1,4 +1,4 @@ -TradeCenterScript: +TradeCenter_Script: call EnableAutoTextBoxDrawing ld a, [hSerialConnectionStatus] cp USING_INTERNAL_CLOCK @@ -30,7 +30,7 @@ TradeCenterScript: ld [wSpriteStateData1 + $19], a ret -TradeCenterTextPointers: +TradeCenter_TextPointers: dw TradeCenterText1 TradeCenterText1: diff --git a/scripts/UndergroundPathNorthSouth.asm b/scripts/UndergroundPathNorthSouth.asm new file mode 100755 index 00000000..52b3d8bf --- /dev/null +++ b/scripts/UndergroundPathNorthSouth.asm @@ -0,0 +1,5 @@ +UndergroundPathNorthSouth_Script: + jp EnableAutoTextBoxDrawing + +UndergroundPathNorthSouth_TextPointers: + db "@" diff --git a/scripts/undergroundpathentranceroute5.asm b/scripts/UndergroundPathRoute5.asm index 18707c4a..23d72569 100755 --- a/scripts/undergroundpathentranceroute5.asm +++ b/scripts/UndergroundPathRoute5.asm @@ -1,4 +1,4 @@ -UndergroundPathEntranceRoute5Script: +UndergroundPathRoute5_Script: ld a, ROUTE_5 ld [wLastMap], a ret @@ -6,7 +6,7 @@ UndergroundPathEntranceRoute5Script: UndergroundPathEntranceRoute5_5d6af: db "@" -UndergroundPathEntranceRoute5TextPointers: +UndergroundPathRoute5_TextPointers: dw UndergroundPathEntranceRoute5Text1 UndergroundPathEntranceRoute5Text1: diff --git a/scripts/undergroundpathentranceroute6.asm b/scripts/UndergroundPathRoute6.asm index c6dfdcc9..0a690518 100755 --- a/scripts/undergroundpathentranceroute6.asm +++ b/scripts/UndergroundPathRoute6.asm @@ -1,9 +1,9 @@ -UndergroundPathEntranceRoute6Script: +UndergroundPathRoute6_Script: ld a, ROUTE_6 ld [wLastMap], a jp EnableAutoTextBoxDrawing -UndergroundPathEntranceRoute6TextPointers: +UndergroundPathRoute6_TextPointers: dw UndergroundPathEntranceRoute6Text1 UndergroundPathEntranceRoute6Text1: diff --git a/scripts/undergroundpathentranceroute7.asm b/scripts/UndergroundPathRoute7.asm index 84c8e4d5..3a1f14c7 100755 --- a/scripts/undergroundpathentranceroute7.asm +++ b/scripts/UndergroundPathRoute7.asm @@ -1,9 +1,9 @@ -UndergroundPathEntranceRoute7Script: +UndergroundPathRoute7_Script: ld a, ROUTE_7 ld [wLastMap], a jp EnableAutoTextBoxDrawing -UndergroundPathEntranceRoute7TextPointers: +UndergroundPathRoute7_TextPointers: dw UndergroundPathEntranceRoute7Text1 UndergroundPathEntranceRoute7Text1: diff --git a/scripts/undergroundpathentranceroute7copy.asm b/scripts/UndergroundPathRoute7Copy.asm index c623eeec..8a494caf 100755 --- a/scripts/undergroundpathentranceroute7copy.asm +++ b/scripts/UndergroundPathRoute7Copy.asm @@ -1,9 +1,9 @@ -UndergroundPathEntranceRoute7CopyScript: +UndergroundPathRoute7Copy_Script: ld a, ROUTE_7 ld [wLastMap], a ret -UndergroundPathEntranceRoute7CopyTextPointers: +UndergroundPathRoute7Copy_TextPointers: dw UGPathRoute7EntranceUnusedText_5d773 dw UGPathRoute7EntranceUnusedText_5d77d diff --git a/scripts/undergroundpathentranceroute8.asm b/scripts/UndergroundPathRoute8.asm index ad0b60ab..ab0a9977 100755 --- a/scripts/undergroundpathentranceroute8.asm +++ b/scripts/UndergroundPathRoute8.asm @@ -1,9 +1,9 @@ -UndergroundPathEntranceRoute8Script: +UndergroundPathRoute8_Script: ld a, ROUTE_8 ld [wLastMap], a jp EnableAutoTextBoxDrawing -UndergroundPathEntranceRoute8TextPointers: +UndergroundPathRoute8_TextPointers: dw UndergroundPathEntranceRoute8Text1 UndergroundPathEntranceRoute8Text1: diff --git a/scripts/UndergroundPathWestEast.asm b/scripts/UndergroundPathWestEast.asm new file mode 100755 index 00000000..cb1a7bd8 --- /dev/null +++ b/scripts/UndergroundPathWestEast.asm @@ -0,0 +1,5 @@ +UndergroundPathWestEast_Script: + jp EnableAutoTextBoxDrawing + +UndergroundPathWestEast_TextPointers: + db "@" diff --git a/scripts/vermilioncity.asm b/scripts/VermilionCity.asm index 0a734e25..1ac81521 100755 --- a/scripts/vermilioncity.asm +++ b/scripts/VermilionCity.asm @@ -1,4 +1,4 @@ -VermilionCityScript: +VermilionCity_Script: call EnableAutoTextBoxDrawing ld hl, wCurrentMapScriptFlags bit 6, [hl] @@ -9,7 +9,7 @@ VermilionCityScript: bit 5, [hl] res 5, [hl] call nz, VermilionCityScript_197c0 - ld hl, VermilionCityScriptPointers + ld hl, VermilionCity_ScriptPointers ld a, [wVermilionCityCurScript] jp CallFunctionInTable @@ -30,7 +30,7 @@ VermilionCityScript_197cb: ld [wVermilionCityCurScript], a ret -VermilionCityScriptPointers: +VermilionCity_ScriptPointers: dw VermilionCityScript0 dw VermilionCityScript1 dw VermilionCityScript2 @@ -113,7 +113,7 @@ VermilionCityScript1: ld [wVermilionCityCurScript], a ret -VermilionCityTextPointers: +VermilionCity_TextPointers: dw VermilionCityText1 dw VermilionCityText2 dw VermilionCityText3 diff --git a/scripts/vermiliondock.asm b/scripts/VermilionDock.asm index 5b5d520b..65b66c52 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/VermilionDock.asm @@ -1,4 +1,4 @@ -VermilionDockScript: +VermilionDock_Script: call EnableAutoTextBoxDrawing CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK jr nz, .asm_1db8d @@ -207,7 +207,7 @@ VermilionDock_EraseSSAnne: call DelayFrames ret -VermilionDockTextPointers: +VermilionDock_TextPointers: dw VermilionDockText1 VermilionDockText1: diff --git a/scripts/vermiliongym.asm b/scripts/VermilionGym.asm index c22ce9ce..5755628c 100755 --- a/scripts/vermiliongym.asm +++ b/scripts/VermilionGym.asm @@ -1,4 +1,4 @@ -VermilionGymScript: +VermilionGym_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] @@ -10,7 +10,7 @@ VermilionGymScript: call nz, VermilionGymScript_5ca6d call EnableAutoTextBoxDrawing ld hl, VermilionGymTrainerHeader0 - ld de, VermilionGymScriptPointers + ld de, VermilionGym_ScriptPointers ld a, [wVermilionGymCurScript] call ExecuteCurMapScriptInTable ld [wVermilionGymCurScript], a @@ -48,7 +48,7 @@ VermilionGymScript_5ca8a: ld [wCurMapScript], a ret -VermilionGymScriptPointers: +VermilionGym_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -89,7 +89,7 @@ VermilionGymScript_5caaa: jp VermilionGymScript_5ca8a -VermilionGymTextPointers: +VermilionGym_TextPointers: dw VermilionGymText1 dw VermilionGymText2 dw VermilionGymText3 diff --git a/scripts/vermilionmart.asm b/scripts/VermilionMart.asm index 2d4df78d..00ba0c26 100755 --- a/scripts/vermilionmart.asm +++ b/scripts/VermilionMart.asm @@ -1,7 +1,7 @@ -VermilionMartScript: +VermilionMart_Script: jp EnableAutoTextBoxDrawing -VermilionMartTextPointers: +VermilionMart_TextPointers: dw VermilionCashierText dw VermilionMartText2 dw VermilionMartText3 diff --git a/scripts/vermilionhouse2.asm b/scripts/VermilionOldRodHouse.asm index c0735f32..772158ff 100755 --- a/scripts/vermilionhouse2.asm +++ b/scripts/VermilionOldRodHouse.asm @@ -1,7 +1,7 @@ -VermilionHouse2Script: +VermilionOldRodHouse_Script: jp EnableAutoTextBoxDrawing -VermilionHouse2TextPointers: +VermilionOldRodHouse_TextPointers: dw VermilionHouse2Text1 VermilionHouse2Text1: diff --git a/scripts/vermilionhouse1.asm b/scripts/VermilionPidgeyHouse.asm index d2dac4ca..5004d367 100755 --- a/scripts/vermilionhouse1.asm +++ b/scripts/VermilionPidgeyHouse.asm @@ -1,8 +1,8 @@ -VermilionHouse1Script: +VermilionPidgeyHouse_Script: call EnableAutoTextBoxDrawing ret -VermilionHouse1TextPointers: +VermilionPidgeyHouse_TextPointers: dw VermilionHouse1Text1 dw VermilionHouse1Text2 dw VermilionHouse1Text3 diff --git a/scripts/vermilionpokecenter.asm b/scripts/VermilionPokecenter.asm index f70aed31..60b28c57 100755 --- a/scripts/vermilionpokecenter.asm +++ b/scripts/VermilionPokecenter.asm @@ -1,8 +1,8 @@ -VermilionPokecenterScript: +VermilionPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -VermilionPokecenterTextPointers: +VermilionPokecenter_TextPointers: dw VermilionHealNurseText dw VermilionPokecenterText2 dw VermilionPokecenterText3 diff --git a/scripts/vermilionhouse3.asm b/scripts/VermilionTradeHouse.asm index 1f0af501..828e3716 100755 --- a/scripts/vermilionhouse3.asm +++ b/scripts/VermilionTradeHouse.asm @@ -1,7 +1,7 @@ -VermilionHouse3Script: +VermilionTradeHouse_Script: jp EnableAutoTextBoxDrawing -VermilionHouse3TextPointers: +VermilionTradeHouse_TextPointers: dw VermilionHouse3Text1 VermilionHouse3Text1: diff --git a/scripts/victoryroad1.asm b/scripts/VictoryRoad1F.asm index 5409d733..0a2588a7 100755 --- a/scripts/victoryroad1.asm +++ b/scripts/VictoryRoad1F.asm @@ -1,14 +1,14 @@ -VictoryRoad1Script: +VictoryRoad1F_Script: ld hl, wCurrentMapScriptFlags bit 5, [hl] res 5, [hl] call nz, .next call EnableAutoTextBoxDrawing ld hl, VictoryRoad1TrainerHeader0 - ld de, VictoryRoad1ScriptPointers - ld a, [wVictoryRoad1CurScript] + ld de, VictoryRoad1F_ScriptPointers + ld a, [wVictoryRoad1FCurScript] call ExecuteCurMapScriptInTable - ld [wVictoryRoad1CurScript], a + ld [wVictoryRoad1FCurScript], a ret .next CheckEvent EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH @@ -18,7 +18,7 @@ VictoryRoad1Script: lb bc, 6, 4 predef_jump ReplaceTileBlock -VictoryRoad1ScriptPointers: +VictoryRoad1F_ScriptPointers: dw VictoryRoad1Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -37,7 +37,7 @@ VictoryRoad1Script0: CoordsData_5da5c: db $0D,$11,$FF -VictoryRoad1TextPointers: +VictoryRoad1F_TextPointers: dw VictoryRoad1Text1 dw VictoryRoad1Text2 dw PickUpItemText diff --git a/scripts/victoryroad2.asm b/scripts/VictoryRoad2F.asm index 847573d8..9dfb05ed 100755 --- a/scripts/victoryroad2.asm +++ b/scripts/VictoryRoad2F.asm @@ -1,4 +1,4 @@ -VictoryRoad2Script: +VictoryRoad2F_Script: ld hl, wCurrentMapScriptFlags bit 6, [hl] res 6, [hl] @@ -9,10 +9,10 @@ VictoryRoad2Script: call nz, VictoryRoad2Script_517c9 call EnableAutoTextBoxDrawing ld hl, VictoryRoad2TrainerHeader0 - ld de, VictoryRoad2ScriptPointers - ld a, [wVictoryRoad2CurScript] + ld de, VictoryRoad2F_ScriptPointers + ld a, [wVictoryRoad2FCurScript] call ExecuteCurMapScriptInTable - ld [wVictoryRoad2CurScript], a + ld [wVictoryRoad2FCurScript], a ret VictoryRoad2Script_517c4: @@ -37,7 +37,7 @@ VictoryRoad2Script_517e2: predef ReplaceTileBlock ret -VictoryRoad2ScriptPointers: +VictoryRoad2F_ScriptPointers: dw VictoryRoad2Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -68,7 +68,7 @@ CoordsData_51816: db $10,$09 db $FF -VictoryRoad2TextPointers: +VictoryRoad2F_TextPointers: dw VictoryRoad2Text1 dw VictoryRoad2Text2 dw VictoryRoad2Text3 diff --git a/scripts/victoryroad3.asm b/scripts/VictoryRoad3F.asm index c615091b..d145c4a1 100755 --- a/scripts/victoryroad3.asm +++ b/scripts/VictoryRoad3F.asm @@ -1,11 +1,11 @@ -VictoryRoad3Script: +VictoryRoad3F_Script: call VictoryRoad3Script_44996 call EnableAutoTextBoxDrawing ld hl, VictoryRoad3TrainerHeader0 - ld de, VictoryRoad3ScriptPointers - ld a, [wVictoryRoad3CurScript] + ld de, VictoryRoad3F_ScriptPointers + ld a, [wVictoryRoad3FCurScript] call ExecuteCurMapScriptInTable - ld [wVictoryRoad3CurScript], a + ld [wVictoryRoad3FCurScript], a ret VictoryRoad3Script_44996: @@ -20,7 +20,7 @@ VictoryRoad3Script_44996: lb bc, 5, 3 predef_jump ReplaceTileBlock -VictoryRoad3ScriptPointers: +VictoryRoad3F_ScriptPointers: dw VictoryRoad3Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -43,10 +43,10 @@ VictoryRoad3Script0: .asm_449dc CheckAndSetEvent EVENT_VICTORY_ROAD_3_BOULDER_ON_SWITCH2 jr nz, .asm_449fe - ld a, HS_VICTORY_ROAD_3_BOULDER + ld a, HS_VICTORY_ROAD_3F_BOULDER ld [wMissableObjectIndex], a predef HideObject - ld a, HS_VICTORY_ROAD_2_BOULDER + ld a, HS_VICTORY_ROAD_2F_BOULDER ld [wMissableObjectIndex], a predef_jump ShowObject @@ -56,7 +56,7 @@ VictoryRoad3Script0: db $FF .asm_449fe - ld a, VICTORY_ROAD_2 + ld a, VICTORY_ROAD_2F ld [wDungeonWarpDestinationMap], a ld hl, .coordsData_449f9 call IsPlayerOnDungeonWarp @@ -74,7 +74,7 @@ VictoryRoad3Script0: jp z, CheckFightingMapTrainers ret -VictoryRoad3TextPointers: +VictoryRoad3F_TextPointers: dw VictoryRoad3Text1 dw VictoryRoad3Text2 dw VictoryRoad3Text3 diff --git a/scripts/viridiancity.asm b/scripts/ViridianCity.asm index 3ccdc509..b70927b2 100755 --- a/scripts/viridiancity.asm +++ b/scripts/ViridianCity.asm @@ -1,10 +1,10 @@ -ViridianCityScript: +ViridianCity_Script: call EnableAutoTextBoxDrawing - ld hl, ViridianCityScriptPointers + ld hl, ViridianCity_ScriptPointers ld a, [wViridianCityCurScript] jp CallFunctionInTable -ViridianCityScriptPointers: +ViridianCity_ScriptPointers: dw ViridianCityScript0 dw ViridianCityScript1 dw ViridianCityScript2 @@ -124,7 +124,7 @@ ViridianCityScript_190cf: ld [wJoyIgnore], a ret -ViridianCityTextPointers: +ViridianCity_TextPointers: dw ViridianCityText1 dw ViridianCityText2 dw ViridianCityText3 diff --git a/scripts/viridianforest.asm b/scripts/ViridianForest.asm index bce093a9..acd26b8a 100755 --- a/scripts/viridianforest.asm +++ b/scripts/ViridianForest.asm @@ -1,18 +1,18 @@ -ViridianForestScript: +ViridianForest_Script: call EnableAutoTextBoxDrawing ld hl, ViridianForestTrainerHeader0 - ld de, ViridianForestScriptPointers + ld de, ViridianForest_ScriptPointers ld a, [wViridianForestCurScript] call ExecuteCurMapScriptInTable ld [wViridianForestCurScript], a ret -ViridianForestScriptPointers: +ViridianForest_ScriptPointers: dw CheckFightingMapTrainers dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle -ViridianForestTextPointers: +ViridianForest_TextPointers: dw ViridianForestText1 dw ViridianForestText2 dw ViridianForestText3 diff --git a/scripts/viridianforestexit.asm b/scripts/ViridianForestNorthGate.asm index af7a8523..e421bf5b 100755 --- a/scripts/viridianforestexit.asm +++ b/scripts/ViridianForestNorthGate.asm @@ -1,7 +1,7 @@ -ViridianForestExitScript: +ViridianForestNorthGate_Script: jp EnableAutoTextBoxDrawing -ViridianForestExitTextPointers: +ViridianForestNorthGate_TextPointers: dw ViridianForestExitText1 dw ViridianForestExitText2 diff --git a/scripts/viridianforestentrance.asm b/scripts/ViridianForestSouthGate.asm index e24225ed..397f0eca 100755 --- a/scripts/viridianforestentrance.asm +++ b/scripts/ViridianForestSouthGate.asm @@ -1,7 +1,7 @@ -ViridianForestEntranceScript: +ViridianForestSouthGate_Script: jp EnableAutoTextBoxDrawing -ViridianForestEntranceTextPointers: +ViridianForestSouthGate_TextPointers: dw ViridianForestEntranceText1 dw ViridianForestEntranceText2 diff --git a/scripts/viridiangym.asm b/scripts/ViridianGym.asm index cc8dcb90..44966fef 100755 --- a/scripts/viridiangym.asm +++ b/scripts/ViridianGym.asm @@ -1,10 +1,10 @@ -ViridianGymScript: +ViridianGym_Script: ld hl, Gym8CityName ld de, Gym8LeaderName call LoadGymLeaderAndCityName call EnableAutoTextBoxDrawing ld hl, ViridianGymTrainerHeader0 - ld de, ViridianGymScriptPointers + ld de, ViridianGym_ScriptPointers ld a, [wViridianGymCurScript] call ExecuteCurMapScriptInTable ld [wViridianGymCurScript], a @@ -22,7 +22,7 @@ ViridianGymScript_748d6: ld [wCurMapScript], a ret -ViridianGymScriptPointers: +ViridianGym_ScriptPointers: dw ViridianGymScript0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle @@ -168,7 +168,7 @@ ViridianGymScript3_74995: SetEvents EVENT_2ND_ROUTE22_RIVAL_BATTLE, EVENT_ROUTE22_RIVAL_WANTS_BATTLE jp ViridianGymScript_748d6 -ViridianGymTextPointers: +ViridianGym_TextPointers: dw ViridianGymText1 dw ViridianGymText2 dw ViridianGymText3 diff --git a/scripts/viridianmart.asm b/scripts/ViridianMart.asm index 451ab989..b90d331c 100755 --- a/scripts/viridianmart.asm +++ b/scripts/ViridianMart.asm @@ -1,17 +1,17 @@ -ViridianMartScript: +ViridianMart_Script: call ViridianMartScript_1d47d call EnableAutoTextBoxDrawing - ld hl, ViridianMartScriptPointers - ld a, [wViridianMarketCurScript] + ld hl, ViridianMart_ScriptPointers + ld a, [wViridianMartCurScript] jp CallFunctionInTable ViridianMartScript_1d47d: CheckEvent EVENT_OAK_GOT_PARCEL jr nz, .asm_1d489 - ld hl, ViridianMartTextPointers + ld hl, ViridianMart_TextPointers jr .asm_1d48c .asm_1d489 - ld hl, ViridianMartTextPointers + $a ; starts at ViridianMartText6 + ld hl, ViridianMart_TextPointers2 .asm_1d48c ld a, l ld [wMapTextPtr], a @@ -19,7 +19,7 @@ ViridianMartScript_1d47d: ld [wMapTextPtr+1], a ret -ViridianMartScriptPointers: +ViridianMart_ScriptPointers: dw ViridianMartScript0 dw ViridianMartScript1 dw ViridianMartScript2 @@ -36,7 +36,7 @@ ViridianMartScript0: ld [wSimulatedJoypadStatesIndex], a call StartSimulatingJoypadStates ld a, $1 - ld [wViridianMarketCurScript], a + ld [wViridianMartCurScript], a ret RLEMovement1d4bb: @@ -56,17 +56,18 @@ ViridianMartScript1: call GiveItem SetEvent EVENT_GOT_OAKS_PARCEL ld a, $2 - ld [wViridianMarketCurScript], a + ld [wViridianMartCurScript], a ; fallthrough ViridianMartScript2: ret -ViridianMartTextPointers: +ViridianMart_TextPointers: dw ViridianMartText1 dw ViridianMartText2 dw ViridianMartText3 dw ViridianMartText4 dw ViridianMartText5 +ViridianMart_TextPointers2: dw ViridianCashierText dw ViridianMartText2 dw ViridianMartText3 diff --git a/scripts/viridianhouse.asm b/scripts/ViridianNicknameHouse.asm index 105c8fb6..000fe82b 100755 --- a/scripts/viridianhouse.asm +++ b/scripts/ViridianNicknameHouse.asm @@ -1,7 +1,7 @@ -ViridianHouseScript: +ViridianNicknameHouse_Script: jp EnableAutoTextBoxDrawing -ViridianHouseTextPointers: +ViridianNicknameHouse_TextPointers: dw ViridianHouseText1 dw ViridianHouseText2 dw ViridianHouseText3 diff --git a/scripts/viridianpokecenter.asm b/scripts/ViridianPokecenter.asm index 904ff47f..14c25b9f 100755 --- a/scripts/viridianpokecenter.asm +++ b/scripts/ViridianPokecenter.asm @@ -1,8 +1,8 @@ -ViridianPokeCenterScript: +ViridianPokecenter_Script: call Serial_TryEstablishingExternallyClockedConnection jp EnableAutoTextBoxDrawing -ViridianPokecenterTextPointers: +ViridianPokecenter_TextPointers: dw ViridianHealNurseText dw ViridianPokeCenterText2 dw ViridianPokeCenterText3 diff --git a/scripts/school.asm b/scripts/ViridianSchoolHouse.asm index 2300946b..2d9579b7 100755 --- a/scripts/school.asm +++ b/scripts/ViridianSchoolHouse.asm @@ -1,7 +1,7 @@ -SchoolScript: +ViridianSchoolHouse_Script: jp EnableAutoTextBoxDrawing -SchoolTextPointers: +ViridianSchoolHouse_TextPointers: dw SchoolText1 dw SchoolText2 diff --git a/scripts/fuchsiahouse2.asm b/scripts/WardensHouse.asm index 6d49fb2f..69e199c9 100755 --- a/scripts/fuchsiahouse2.asm +++ b/scripts/WardensHouse.asm @@ -1,7 +1,7 @@ -FuchsiaHouse2Script: +WardensHouse_Script: jp EnableAutoTextBoxDrawing -FuchsiaHouse2TextPointers: +WardensHouse_TextPointers: dw FuchsiaHouse2Text1 dw PickUpItemText dw BoulderText diff --git a/scripts/diglettscave.asm b/scripts/diglettscave.asm deleted file mode 100755 index 593b12a6..00000000 --- a/scripts/diglettscave.asm +++ /dev/null @@ -1,5 +0,0 @@ -DiglettsCaveScript: - jp EnableAutoTextBoxDrawing - -DiglettsCaveTextPointers: - db "@" diff --git a/scripts/indigoplateau.asm b/scripts/indigoplateau.asm deleted file mode 100755 index 6a6fdb6c..00000000 --- a/scripts/indigoplateau.asm +++ /dev/null @@ -1,4 +0,0 @@ -IndigoPlateauScript: - ret - -IndigoPlateauTextPointers: diff --git a/scripts/ssanne4.asm b/scripts/ssanne4.asm deleted file mode 100755 index c9411717..00000000 --- a/scripts/ssanne4.asm +++ /dev/null @@ -1,5 +0,0 @@ -SSAnne4Script: - jp EnableAutoTextBoxDrawing - -SSAnne4TextPointers: - db "@" diff --git a/scripts/undergroundpathns.asm b/scripts/undergroundpathns.asm deleted file mode 100755 index 8c744740..00000000 --- a/scripts/undergroundpathns.asm +++ /dev/null @@ -1,5 +0,0 @@ -UndergroundPathNSScript: - jp EnableAutoTextBoxDrawing - -UndergroundPathNSTextPointers: - db "@" diff --git a/scripts/undergroundpathwe.asm b/scripts/undergroundpathwe.asm deleted file mode 100755 index 921d3dab..00000000 --- a/scripts/undergroundpathwe.asm +++ /dev/null @@ -1,5 +0,0 @@ -UndergroundPathWEScript: - jp EnableAutoTextBoxDrawing - -UndergroundPathWETextPointers: - db "@" |