From a5a8364c35eceadf51956dac4212b440290b652c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 9 Dec 2015 18:25:44 -0500 Subject: [PATCH] opentext and breeding --- constants/pokemon_data_constants.asm | 30 +- engine/breeding/egg.asm | 118 ++-- engine/color.asm | 64 +- engine/decorations.asm | 2 +- engine/fruit_trees.asm | 2 +- engine/npc_movement.asm | 572 ++++++++++++++++ engine/scripting.asm | 8 +- engine/selectmenu.asm | 6 +- engine/std_scripts.asm | 26 +- event/daycare.asm | 2 +- event/itemball.asm | 4 +- event/poisonstep.asm | 2 +- home/window.asm | 12 +- macros/event.asm | 6 +- main.asm | 650 ++----------------- maps/AzaleaGym.asm | 18 +- maps/AzaleaMart.asm | 2 +- maps/AzaleaTown.asm | 14 +- maps/BattleTower1F.asm | 10 +- maps/BattleTowerBattleRoom.asm | 16 +- maps/BattleTowerHallway.asm | 2 +- maps/BillsHouse.asm | 2 +- maps/BlackthornCity.asm | 6 +- maps/BlackthornDodrioTradeHouse.asm | 2 +- maps/BlackthornDragonSpeechHouse.asm | 2 +- maps/BlackthornGym1F.asm | 12 +- maps/BlackthornGym2F.asm | 6 +- maps/BlackthornMart.asm | 2 +- maps/BluesHouse.asm | 4 +- maps/BrunosRoom.asm | 4 +- maps/BurnedTower1F.asm | 8 +- maps/BurnedTowerB1F.asm | 2 +- maps/CeladonCafe.asm | 26 +- maps/CeladonCity.asm | 2 +- maps/CeladonDeptStore2F.asm | 4 +- maps/CeladonDeptStore3F.asm | 6 +- maps/CeladonDeptStore4F.asm | 2 +- maps/CeladonDeptStore5F.asm | 4 +- maps/CeladonDeptStore6F.asm | 2 +- maps/CeladonDeptStoreElevator.asm | 2 +- maps/CeladonGameCorner.asm | 12 +- maps/CeladonGameCornerPrizeRoom.asm | 4 +- maps/CeladonGym.asm | 14 +- maps/CeladonMansion1F.asm | 6 +- maps/CeladonMansion3F.asm | 4 +- maps/CeladonMansionRoofHouse.asm | 2 +- maps/CeladonPokeCenter1F.asm | 2 +- maps/CeruleanCity.asm | 18 +- maps/CeruleanGym.asm | 22 +- maps/CeruleanMart.asm | 2 +- maps/CeruleanPoliceStation.asm | 2 +- maps/CeruleanTradeSpeechHouse.asm | 4 +- maps/CharcoalKiln.asm | 6 +- maps/CherrygroveCity.asm | 24 +- maps/CherrygroveEvolutionSpeechHouse.asm | 4 +- maps/CherrygroveMart.asm | 4 +- maps/CherrygrovePokeCenter1F.asm | 2 +- maps/CianwoodCity.asm | 6 +- maps/CianwoodCityPhotoStudio.asm | 2 +- maps/CianwoodGym.asm | 16 +- maps/CianwoodPharmacy.asm | 2 +- maps/CianwoodPokeCenter1F.asm | 4 +- maps/CinnabarIsland.asm | 2 +- maps/Colosseum.asm | 2 +- maps/CopycatsHouse1F.asm | 4 +- maps/CopycatsHouse2F.asm | 18 +- maps/DanceTheatre.asm | 14 +- maps/DarkCaveBlackthornEntrance.asm | 2 +- maps/DayCare.asm | 8 +- maps/DragonShrine.asm | 30 +- maps/DragonsDenB1F.asm | 133 ++-- maps/EarlsPokemonAcademy.asm | 10 +- maps/EcruteakCity.asm | 4 +- maps/EcruteakGym.asm | 16 +- maps/EcruteakHouse.asm | 4 +- maps/EcruteakItemfinderHouse.asm | 4 +- maps/EcruteakMart.asm | 2 +- maps/EcruteakPokeCenter1F.asm | 2 +- maps/ElmsLab.asm | 50 +- maps/FastShip1F.asm | 6 +- maps/FastShipB1F.asm | 22 +- maps/FastShipCabins_NNW_NNE_NE.asm | 16 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 32 +- maps/FastShipCabins_SW_SSW_NW.asm | 18 +- maps/FuchsiaGym.asm | 16 +- maps/FuchsiaMart.asm | 2 +- maps/FuchsiaPokeCenter1F.asm | 4 +- maps/GoldenrodBikeShop.asm | 2 +- maps/GoldenrodBillsHouse.asm | 6 +- maps/GoldenrodCity.asm | 8 +- maps/GoldenrodDeptStore2F.asm | 4 +- maps/GoldenrodDeptStore3F.asm | 2 +- maps/GoldenrodDeptStore4F.asm | 4 +- maps/GoldenrodDeptStore5F.asm | 8 +- maps/GoldenrodDeptStore6F.asm | 2 +- maps/GoldenrodDeptStoreB1F.asm | 2 +- maps/GoldenrodDeptStoreElevator.asm | 2 +- maps/GoldenrodDeptStoreRoof.asm | 8 +- maps/GoldenrodFlowerShop.asm | 6 +- maps/GoldenrodGameCorner.asm | 16 +- maps/GoldenrodGym.asm | 18 +- maps/GoldenrodHappinessRater.asm | 2 +- maps/GoldenrodMagnetTrainStation.asm | 4 +- maps/GoldenrodNameRatersHouse.asm | 2 +- maps/GoldenrodPokeCenter1F.asm | 6 +- maps/GoldenrodPokeComCenter2FMobile.asm | 12 +- maps/HallOfFame.asm | 2 +- maps/IcePathB1F.asm | 2 +- maps/IlexForest.asm | 18 +- maps/IndigoPlateauPokeCenter1F.asm | 10 +- maps/KarensRoom.asm | 4 +- maps/KogasRoom.asm | 4 +- maps/KrissHouse1F.asm | 6 +- maps/KrissHouse2F.asm | 6 +- maps/KrissNeighborsHouse.asm | 4 +- maps/KurtsHouse.asm | 18 +- maps/LakeofRage.asm | 22 +- maps/LakeofRageHiddenPowerHouse.asm | 2 +- maps/LakeofRageMagikarpHouse.asm | 2 +- maps/LancesRoom.asm | 14 +- maps/LavRadioTower1F.asm | 4 +- maps/LavenderMart.asm | 2 +- maps/LavenderNameRater.asm | 2 +- maps/LavenderPokeCenter1F.asm | 2 +- maps/MahoganyGym.asm | 16 +- maps/MahoganyMart1F.asm | 14 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 2 +- maps/MahoganyTown.asm | 6 +- maps/ManiasHouse.asm | 2 +- maps/MountMoon.asm | 4 +- maps/MountMoonGiftShop.asm | 2 +- maps/MountMortar1FInside.asm | 4 +- maps/MountMortar2FInside.asm | 2 +- maps/MountMortarB1F.asm | 4 +- maps/MoveDeletersHouse.asm | 2 +- maps/MrFujisHouse.asm | 6 +- maps/MrPokemonsHouse.asm | 12 +- maps/MrPsychicsHouse.asm | 2 +- maps/NationalPark.asm | 14 +- maps/NationalParkBugContest.asm | 20 +- maps/NewBarkTown.asm | 18 +- maps/OaksLab.asm | 2 +- maps/OlivineCafe.asm | 2 +- maps/OlivineCity.asm | 6 +- maps/OlivineGoodRodHouse.asm | 2 +- maps/OlivineGym.asm | 10 +- maps/OlivineHouseBeta.asm | 2 +- maps/OlivineLighthouse2F.asm | 6 +- maps/OlivineLighthouse3F.asm | 6 +- maps/OlivineLighthouse4F.asm | 4 +- maps/OlivineLighthouse5F.asm | 4 +- maps/OlivineLighthouse6F.asm | 12 +- maps/OlivineMart.asm | 2 +- maps/OlivinePort.asm | 14 +- maps/OlivineVoltorbHouse.asm | 2 +- maps/PewterCity.asm | 2 +- maps/PewterGym.asm | 8 +- maps/PewterMart.asm | 2 +- maps/PewterNidoranSpeechHouse.asm | 2 +- maps/PewterPokeCenter1F.asm | 4 +- maps/PokeCenter2F.asm | 26 +- maps/PokeSeersHouse.asm | 2 +- maps/PokemonFanClub.asm | 6 +- maps/PowerPlant.asm | 18 +- maps/RadioTower1F.asm | 12 +- maps/RadioTower2F.asm | 30 +- maps/RadioTower3F.asm | 14 +- maps/RadioTower4F.asm | 12 +- maps/RadioTower5F.asm | 16 +- maps/RedsHouse1F.asm | 2 +- maps/Route1.asm | 4 +- maps/Route10PokeCenter1F.asm | 2 +- maps/Route10South.asm | 4 +- maps/Route11.asm | 8 +- maps/Route12.asm | 8 +- maps/Route12SuperRodHouse.asm | 2 +- maps/Route13.asm | 10 +- maps/Route14.asm | 8 +- maps/Route15.asm | 12 +- maps/Route16Gate.asm | 2 +- maps/Route17.asm | 8 +- maps/Route1718Gate.asm | 2 +- maps/Route18.asm | 4 +- maps/Route19.asm | 12 +- maps/Route19FuchsiaGate.asm | 2 +- maps/Route2.asm | 6 +- maps/Route20.asm | 6 +- maps/Route21.asm | 6 +- maps/Route24.asm | 4 +- maps/Route25.asm | 22 +- maps/Route26.asm | 12 +- maps/Route26DayofWeekSiblingsHouse.asm | 2 +- maps/Route26HealSpeechHouse.asm | 4 +- maps/Route27.asm | 14 +- maps/Route27SandstormHouse.asm | 2 +- maps/Route28FamousSpeechHouse.asm | 4 +- maps/Route29.asm | 16 +- maps/Route2NuggetSpeechHouse.asm | 2 +- maps/Route3.asm | 8 +- maps/Route30.asm | 14 +- maps/Route30BerrySpeechHouse.asm | 2 +- maps/Route31.asm | 4 +- maps/Route32.asm | 26 +- maps/Route32PokeCenter1F.asm | 2 +- maps/Route33.asm | 2 +- maps/Route34.asm | 24 +- maps/Route34IlexForestGate.asm | 6 +- maps/Route35.asm | 18 +- maps/Route35Goldenrodgate.asm | 4 +- maps/Route35NationalParkgate.asm | 6 +- maps/Route36.asm | 18 +- maps/Route36NationalParkgate.asm | 26 +- maps/Route37.asm | 8 +- maps/Route38.asm | 12 +- maps/Route39.asm | 12 +- maps/Route39Barn.asm | 6 +- maps/Route39Farmhouse.asm | 4 +- maps/Route4.asm | 6 +- maps/Route40.asm | 10 +- maps/Route41.asm | 20 +- maps/Route42.asm | 6 +- maps/Route43.asm | 12 +- maps/Route43Gate.asm | 6 +- maps/Route43MahoganyGate.asm | 2 +- maps/Route44.asm | 16 +- maps/Route45.asm | 18 +- maps/Route46.asm | 8 +- maps/Route5CleanseTagSpeechHouse.asm | 2 +- maps/Route6.asm | 4 +- maps/Route6SaffronGate.asm | 2 +- maps/Route7SaffronGate.asm | 2 +- maps/Route8.asm | 10 +- maps/Route9.asm | 12 +- maps/RuinsofAlphAerodactylChamber.asm | 6 +- maps/RuinsofAlphHoOhChamber.asm | 6 +- maps/RuinsofAlphInnerChamber.asm | 2 +- maps/RuinsofAlphKabutoChamber.asm | 8 +- maps/RuinsofAlphOmanyteChamber.asm | 6 +- maps/RuinsofAlphOutside.asm | 12 +- maps/RuinsofAlphResearchCenter.asm | 14 +- maps/SafariZoneWardensHome.asm | 2 +- maps/SaffronCity.asm | 6 +- maps/SaffronGym.asm | 14 +- maps/SaffronMart.asm | 2 +- maps/SaffronPokeCenter1F.asm | 2 +- maps/SaffronTrainStation.asm | 6 +- maps/SeafoamGym.asm | 6 +- maps/SilphCo1F.asm | 2 +- maps/SilverCaveRoom3.asm | 4 +- maps/SlowpokeWellB1F.asm | 14 +- maps/SlowpokeWellB2F.asm | 2 +- maps/SproutTower1F.asm | 2 +- maps/SproutTower2F.asm | 4 +- maps/SproutTower3F.asm | 16 +- maps/TeamRocketBaseB1F.asm | 10 +- maps/TeamRocketBaseB2F.asm | 36 +- maps/TeamRocketBaseB3F.asm | 20 +- maps/TimeCapsule.asm | 2 +- maps/TinTower1F.asm | 6 +- maps/TinTowerRoof.asm | 2 +- maps/TradeCenter.asm | 2 +- maps/TrainerHouseB1F.asm | 4 +- maps/UndergroundPathSwitchRoomEntrances.asm | 24 +- maps/UndergroundWarehouse.asm | 8 +- maps/UnionCave1F.asm | 10 +- maps/UnionCaveB1F.asm | 8 +- maps/UnionCaveB2F.asm | 6 +- maps/VermilionCity.asm | 8 +- maps/VermilionGym.asm | 12 +- maps/VermilionMart.asm | 2 +- maps/VermilionPokeCenter1F.asm | 2 +- maps/VermilionPort.asm | 8 +- maps/VictoryRoad.asm | 4 +- maps/VictoryRoadGate.asm | 2 +- maps/VioletCity.asm | 4 +- maps/VioletGym.asm | 10 +- maps/VioletMart.asm | 2 +- maps/VioletNicknameSpeechHouse.asm | 2 +- maps/VioletOnixTradeHouse.asm | 2 +- maps/VioletPokeCenter1F.asm | 2 +- maps/ViridianCity.asm | 6 +- maps/ViridianGym.asm | 6 +- maps/ViridianMart.asm | 2 +- maps/ViridianNicknameSpeechHouse.asm | 4 +- maps/ViridianPokeCenter1F.asm | 2 +- maps/WarehouseEntrance.asm | 22 +- maps/WhirlIslandLugiaChamber.asm | 2 +- maps/WillsRoom.asm | 4 +- maps/WiseTriosRoom.asm | 10 +- misc/gfx_41.asm | 61 +- predef/cgb.asm | 8 +- 291 files changed, 1938 insertions(+), 1894 deletions(-) create mode 100755 engine/npc_movement.asm diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 354b86b89..383e9bac2 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -9,21 +9,21 @@ ; egg group constants const_value SET 1 - const MONSTER - const AMPHIBIAN - const INSECT - const AVIAN - const FIELD - const FAIRY - const PLANT - const HUMANSHAPE - const INVERTEBRATE - const INANIMATE - const AMORPHOUS - const FISH - const LADIES_MAN - const REPTILE - const NO_EGGS + const MONSTER ; 1 + const AMPHIBIAN ; 2 + const INSECT ; 3 + const AVIAN ; 4 + const FIELD ; 5 + const FAIRY ; 6 + const PLANT ; 7 + const HUMANSHAPE ; 8 + const INVERTEBRATE ; 9 + const INANIMATE ; a + const AMORPHOUS ; b + const FISH ; c + const LADIES_MAN ; d + const REPTILE ; e + const NO_EGGS ; f ; menu sprites diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 60c5f2f20..1c4bbe86f 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -1,7 +1,7 @@ -Function16e1d: ; 16e1d - call Function16ed6 +CheckBreedmonCompatibility: ; 16e1d + call .CheckBreedingGroupCompatibility ld c, $0 - jp nc, .asm_16eb7 + jp nc, .done ld a, [wBreedMon1Species] ld [CurPartySpecies], a ld a, [wBreedMon1DVs] @@ -11,12 +11,12 @@ Function16e1d: ; 16e1d ld a, $3 ld [MonType], a predef GetGender - jr c, .asm_16e70 + jr c, .genderless ld b, $1 - jr nz, .asm_16e48 + jr nz, .breedmon2 inc b -.asm_16e48 +.breedmon2 push bc ld a, [wBreedMon2Species] ld [CurPartySpecies], a @@ -28,96 +28,105 @@ Function16e1d: ; 16e1d ld [MonType], a predef GetGender pop bc - jr c, .asm_16e70 + jr c, .genderless ld a, $1 - jr nz, .asm_16e6d + jr nz, .compare_gender inc a -.asm_16e6d +.compare_gender cp b - jr nz, .asm_16e89 + jr nz, .compute -.asm_16e70 +.genderless ld c, $0 ld a, [wBreedMon1Species] cp DITTO - jr z, .asm_16e82 + jr z, .ditto1 ld a, [wBreedMon2Species] cp DITTO - jr nz, .asm_16eb7 - jr .asm_16e89 + jr nz, .done + jr .compute -.asm_16e82 +.ditto1 ld a, [wBreedMon2Species] cp DITTO - jr z, .asm_16eb7 + jr z, .done -.asm_16e89 - call Function16ebc - ld c, $ff - jp z, .asm_16eb7 +.compute + call .CheckDVs + ld c, 255 + jp z, .done ld a, [wBreedMon2Species] ld b, a ld a, [wBreedMon1Species] cp b - ld c, $fe - jr z, .asm_16e9f - ld c, $80 -.asm_16e9f + ld c, 254 + jr z, .compare_ids + ld c, 128 +.compare_ids + ; Speed up ld a, [wBreedMon1ID] ld b, a ld a, [wBreedMon2ID] cp b - jr nz, .asm_16eb7 + jr nz, .done ld a, [wBreedMon1ID + 1] ld b, a ld a, [wBreedMon2ID + 1] cp b - jr nz, .asm_16eb7 + jr nz, .done ld a, c - sub $4d + sub 77 ld c, a -.asm_16eb7 +.done ld a, c ld [wd265], a ret ; 16ebc -Function16ebc: ; 16ebc (5:6ebc) +.CheckDVs: ; 16ebc (5:6ebc) +; If Defense DVs match and the lower 3 bits of the Special DVs match, +; maximize the chances of spawning an egg regardless of species. ld a, [wBreedMon1DVs] - and $f + and %1111 ld b, a ld a, [wBreedMon2DVs] - and $f + and %1111 cp b ret nz ld a, [wBreedMon1DVs + 1] - and $7 + and %111 ld b, a ld a, [wBreedMon2DVs + 1] - and $7 + and %111 cp b ret ; 16ed6 -Function16ed6: ; 16ed6 +.CheckBreedingGroupCompatibility: ; 16ed6 +; If either mon is in the No Eggs group, +; they are not compatible. ld a, [wBreedMon2Species] ld [CurSpecies], a call GetBaseData ld a, [BaseEggGroups] - cp $ff - jr z, .asm_16f3a + cp NO_EGGS * $11 + jr z, .Incompatible + ld a, [wBreedMon1Species] ld [CurSpecies], a call GetBaseData ld a, [BaseEggGroups] - cp $ff - jr z, .asm_16f3a + cp NO_EGGS * $11 + jr z, .Incompatible + +; Ditto is automatically compatible with everything. +; If not Ditto, load the breeding groups into b/c and d/e. ld a, [wBreedMon2Species] cp DITTO - jr z, .asm_16f3c + jr z, .Compatible ld [CurSpecies], a call GetBaseData ld a, [BaseEggGroups] @@ -128,9 +137,10 @@ Function16ed6: ; 16ed6 and $f0 swap a ld c, a + ld a, [wBreedMon1Species] cp DITTO - jr z, .asm_16f3c + jr z, .Compatible ld [CurSpecies], a push bc call GetBaseData @@ -143,22 +153,24 @@ Function16ed6: ; 16ed6 and $f0 swap a ld e, a + ld a, d cp b - jr z, .asm_16f3c + jr z, .Compatible cp c - jr z, .asm_16f3c + jr z, .Compatible + ld a, e cp b - jr z, .asm_16f3c + jr z, .Compatible cp c - jr z, .asm_16f3c + jr z, .Compatible -.asm_16f3a +.Incompatible and a ret -.asm_16f3c +.Compatible scf ret ; 16f3e @@ -448,7 +460,7 @@ endr jr .loop .reached_end - call Function1720b + call GetBreedmonMovePointer ld b, NUM_MOVES .loop2 ld a, [de] @@ -613,7 +625,7 @@ GetHeritableMoves: ; 17197 ret ; 1720b -Function1720b: ; 1720b +GetBreedmonMovePointer: ; 1720b ld hl, wBreedMon1Moves ld a, [wBreedMon1Species] cp DITTO @@ -631,7 +643,7 @@ Function1720b: ; 1720b ; 17224 -Function17224: ; 17224 (5:7224) +GetEggFrontpic: ; 17224 (5:7224) push de ld [CurPartySpecies], a ld [CurSpecies], a @@ -641,7 +653,7 @@ Function17224: ; 17224 (5:7224) pop de predef_jump GetFrontpic -Function1723c: ; 1723c (5:723c) +GetHatchlingFrontpic: ; 1723c (5:723c) push de ld [CurPartySpecies], a ld [CurSpecies], a @@ -701,10 +713,10 @@ EggHatch_AnimationSequence: ; 1728f (5:728f) callba ClearSpriteAnims ld de, VTiles2 tile $00 ld a, [wJumptableIndex] - call Function1723c + call GetHatchlingFrontpic ld de, VTiles2 tile $31 ld a, EGG - call Function17224 + call GetEggFrontpic ld de, MUSIC_EVOLUTION call PlayMusic call EnableLCD @@ -915,7 +927,7 @@ Function1746c: ; 1746c ld de, StringBuffer1 ld bc, NAME_LENGTH call CopyBytes - call Function16e1d + call CheckBreedmonCompatibility pop bc ld a, [wd265] ld hl, UnknownText_0x1749c diff --git a/engine/color.asm b/engine/color.asm index 7e7520816..625eb6220 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -137,7 +137,7 @@ Function8ade: ; 8ade SGB layout $fc .asm_8af7 push de ld hl, wcda9 + 10 - ld bc, $0006 + ld bc, $6 ld a, [wcda9] call AddNTimes pop de @@ -150,13 +150,13 @@ Function8b07: ; 8b07 ret z ld hl, Palette8b2f ld de, UnknBGPals - ld bc, $0008 + ld bc, 1 palettes ld a, $5 call FarCopyWRAM ld hl, Palette8b37 ld de, MartPointer - ld bc, $0008 + ld bc, 1 palettes ld a, $5 call FarCopyWRAM @@ -171,6 +171,7 @@ Palette8b2f: ; 8b2f RGB 18, 23, 31 RGB 15, 20, 31 RGB 00, 00, 00 + ; 8b37 Palette8b37: ; 8b37 @@ -178,6 +179,7 @@ Palette8b37: ; 8b37 RGB 31, 31, 12 RGB 08, 16, 28 RGB 00, 00, 00 + ; 8b3f Function8b3f: ; 8b3f @@ -276,7 +278,7 @@ endr asm_8bd7 push hl ld hl, UnknBGPals - ld de, $0008 + ld de, $8 .asm_8bde and a jr z, .asm_8be5 @@ -304,7 +306,7 @@ Function8bec: ; 8bec ld c, a ld a, [EnemyReflectCount] hlcoord 0, 0, AttrMap - ld de, $0014 + ld de, $14 .asm_8c04 and a jr z, .asm_8c0b @@ -357,11 +359,11 @@ Function8c43: ; 8c43 ret .asm_8c52 - ld de, BGPals + $10 + 2 + ld de, BGPals + 2 palettes + 2 jr .asm_8c5a .asm_8c57 - ld de, BGPals + $18 + 2 + ld de, BGPals + 3 palettes + 2 .asm_8c5a ld l, c @@ -371,7 +373,7 @@ rept 2 endr ld bc, Palettes_a8be add hl, bc - ld bc, $0004 + ld bc, $4 ld a, $5 call FarCopyWRAM ld a, $1 @@ -382,7 +384,7 @@ endr ld e, c inc e hlcoord 11, 1, AttrMap - ld bc, $0028 + ld bc, $28 ld a, [CurPartyMon] .asm_8c7b and a @@ -459,7 +461,7 @@ endr .asm_8cf0 ld de, UnknBGPals - ld bc, $0008 + ld bc, 1 palettes ld a, $5 call FarCopyWRAM call Function96a4 @@ -518,6 +520,7 @@ Palettes_8d05: ; 8d05 RGB 31, 31, 00 RGB 00, 21, 00 RGB 00, 00, 00 + ; 8d55 INCLUDE "predef/cgb.asm" @@ -540,6 +543,7 @@ Palette_9608: ; 9608 RGB 09, 31, 31 RGB 10, 12, 31 RGB 00, 03, 19 + ; 9610 @@ -678,7 +682,7 @@ Function9699: ; 9699 Function96a4: ; 96a4 ld hl, UnknBGPals ld de, BGPals - ld bc, $0080 + ld bc, 16 palettes ld a, $5 call FarCopyWRAM ret @@ -740,7 +744,7 @@ Function96f3: ; 96f3 CGB layout $fc inc a ld e, a hlcoord 11, 2, AttrMap - ld bc, $0028 + ld bc, $28 ld a, [wcda9] .asm_970b and a @@ -760,7 +764,7 @@ Function96f3: ; 96f3 CGB layout $fc Function971a: ; 971a ld hl, Palettes_b681 ld de, UnknOBPals - ld bc, $0010 + ld bc, 2 palettes ld a, $5 call FarCopyWRAM ret @@ -844,7 +848,7 @@ Function977a: ; 977a jr nz, .asm_9787 ld hl, Palettes_979c ld de, UnknOBPals + 8 * 2 - ld bc, $0010 + ld bc, 2 palettes ld a, $5 call FarCopyWRAM ret @@ -855,26 +859,32 @@ Palettes_979c: ; 979c RGB 25, 25, 25 RGB 13, 13, 13 RGB 00, 00, 00 + RGB 31, 31, 31 RGB 31, 31, 07 RGB 31, 16, 01 RGB 00, 00, 00 + RGB 31, 31, 31 RGB 31, 19, 24 RGB 30, 10, 06 RGB 00, 00, 00 + RGB 31, 31, 31 RGB 12, 25, 01 RGB 05, 14, 00 RGB 00, 00, 00 + RGB 31, 31, 31 RGB 08, 12, 31 RGB 01, 04, 31 RGB 00, 00, 00 + RGB 31, 31, 31 RGB 24, 18, 07 RGB 20, 15, 03 RGB 00, 00, 00 + ; 97cc Function97cc: ; 97cc @@ -1217,20 +1227,20 @@ Function99d8: ; 99d8 ld b, $12 .asm_99ea push bc - ld bc, $000c + ld bc, $c call CopyData - ld bc, $0028 + ld bc, $28 call ClearBytes - ld bc, $000c + ld bc, $c call CopyData pop bc dec b jr nz, .asm_99ea - ld bc, $0140 + ld bc, $140 call CopyData ld bc, Start call ClearBytes - ld bc, $0080 + ld bc, 16 palettes call CopyData call DrawDefaultTiles ld a, $e3 @@ -1250,9 +1260,9 @@ Function9a24: ; 9a24 ld b, $80 .asm_9a30 push bc - ld bc, $0010 + ld bc, 2 palettes call CopyData - ld bc, $0010 + ld bc, 2 palettes call ClearBytes pop bc dec b @@ -1803,6 +1813,7 @@ Palettes_9df6: ; 9df6 RGB 08, 11, 11 RGB 21, 21, 21 RGB 31, 31, 31 + ; a06e SGBBorderMap: ; a06e @@ -1916,6 +1927,7 @@ SGBBorderPalettes: ; a49e RGB 31, 31, 25 RGB 31, 31, 25 RGB 31, 31, 25 + ; a51e SGBBorder: ; a51e @@ -2085,6 +2097,7 @@ Palette_b309: ; b309 RGB 31, 19, 24 RGB 30, 10, 06 RGB 00, 00, 00 + ; b311 Palette_b311: ; b311 @@ -2092,6 +2105,7 @@ Palette_b311: ; b311 RGB 17, 19, 31 RGB 14, 16, 31 RGB 00, 00, 00 + ; b319 TilesetBGPalette: ; b319 @@ -2143,6 +2157,7 @@ Palettes_b641: ; b641 RGB 11, 11, 19 RGB 07, 07, 12 RGB 00, 00, 00 + ; b681 Palettes_b681: ; b681 @@ -2216,6 +2231,7 @@ Palettes_b681: ; b681 RGB 20, 15, 03 RGB 07, 07, 07 + Palettes_b6f1: ; b6f1 RGB 31, 31, 31 RGB 18, 23, 31 @@ -2242,6 +2258,7 @@ Palettes_b6f1: ; b6f1 RGB 18, 23, 31 RGB 00, 00, 00 + Palettes_b719: ; b719 RGB 31, 31, 31 RGB 07, 06, 03 @@ -2252,6 +2269,7 @@ Palettes_b719: ; b719 RGB 31, 31, 00 RGB 26, 22, 00 RGB 00, 00, 00 + ; b729 Palettes_b729: ; b729 @@ -2284,6 +2302,7 @@ Palettes_b729: ; b729 RGB 00, 31, 00 RGB 15, 07, 00 RGB 31, 00, 00 + ; b759 Palettes_b759: ; b759 @@ -2316,6 +2335,7 @@ Palettes_b759: ; b759 RGB 00, 31, 00 RGB 15, 07, 00 RGB 31, 00, 00 + ; b789 Palettes_b789: ; b789 @@ -2338,6 +2358,7 @@ Palettes_b789: ; b789 RGB 29, 26, 05 RGB 18, 18, 18 RGB 00, 00, 00 + ; b7a9 Palettes_b7a9: ; b7a9 @@ -2420,4 +2441,5 @@ Palettes_b7a9: ; b7a9 RGB 31, 31, 31 RGB 00, 00, 00 RGB 00, 00, 00 + ; b829 diff --git a/engine/decorations.asm b/engine/decorations.asm index 2da9fa48a..ef8ee76dd 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -1244,7 +1244,7 @@ DecorationDesc_PosterPointers: ; 26f84 ; 26f91 DecorationDesc_TownMapPoster: ; 0x26f91 - loadfont + opentext writetext .TownMapText waitbutton special Special_TownMap diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 7a76c5a89..cbbe5faaf 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -1,6 +1,6 @@ FruitTreeScript:: ; 44000 callasm GetCurTreeFruit - loadfont + opentext copybytetovar CurFruit itemtotext $0, $0 writetext FruitBearingTreeText diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm new file mode 100755 index 000000000..bc270305b --- /dev/null +++ b/engine/npc_movement.asm @@ -0,0 +1,572 @@ +Function6ec1: ; 6ec1 + + ld hl, OBJECT_PALETTE + add hl, bc + bit 5, [hl] + jr z, .not_bit_5 + + ld hl, OBJECT_FLAGS1 + add hl, bc + bit 4, [hl] ; lost + push hl + push bc + call Function6f2c + pop bc + pop hl + ret c + jr .resume + +.not_bit_5 + ld hl, OBJECT_FLAGS1 + add hl, bc + bit 4, [hl] + jr nz, .resume + push hl + push bc + call Function6f07 + pop bc + pop hl + ret c + +.resume + bit 6, [hl] + jr nz, .bit_6 + + push hl + push bc + call WillPersonBumpIntoSomeoneElse + pop bc + pop hl + ret c + +.bit_6 + bit 5, [hl] + jr nz, .bit_5 + push hl + call HasPersonReachedMovementLimit + pop hl + ret c + + push hl + call IsPersonMovingOffEdgeOfScreen + pop hl + ret c + +.bit_5 + and a + ret +; 6f07 + + +Function6f07: ; 6f07 + call Function6f5f + ret c + ld hl, OBJECT_NEXT_MAP_X + add hl, bc + ld d, [hl] + ld hl, OBJECT_NEXT_MAP_Y + add hl, bc + ld e, [hl] + ld hl, OBJECT_PALETTE + add hl, bc + bit 7, [hl] + jp nz, Function6fa1 + ld hl, OBJECT_NEXT_TILE + add hl, bc + ld a, [hl] + ld d, a + call GetTileCollision + and a + jr z, Function6f3e + scf + ret +; 6f2c + +Function6f2c: ; 6f2c + call Function6f5f + ret c + ld hl, OBJECT_NEXT_TILE + add hl, bc + ld a, [hl] + call GetTileCollision + cp $1 + jr z, Function6f3e + scf + ret +; 6f3e + +Function6f3e: ; 6f3e + ld hl, OBJECT_NEXT_TILE + add hl, bc + ld a, [hl] + call Function6f7f + ret nc + push af + ld hl, OBJECT_DIRECTION_WALKING + add hl, bc + ld a, [hl] + and 3 + ld e, a + ld d, 0 + ld hl, .data_6f5b + add hl, de + pop af + and [hl] + ret z + scf + ret +; 6f5b + +.data_6f5b + db 1 << DOWN, 1 << UP, 1 << RIGHT, 1 << LEFT +; 6f5f + +Function6f5f: ; 6f5f + ld hl, OBJECT_STANDING_TILE + add hl, bc + ld a, [hl] + call Function6f7f + ret nc + push af + ld hl, OBJECT_DIRECTION_WALKING + add hl, bc + and 3 + ld e, a + ld d, 0 + ld hl, .data_6f7b + add hl, de + pop af + and [hl] + ret z + scf + ret +; 6f7b + +.data_6f7b + db 1 << UP, 1 << DOWN, 1 << LEFT, 1 << RIGHT +; 6f7f + +Function6f7f: ; 6f7f + ld d, a + and $f0 + cp $b0 + jr z, .done + cp $c0 + jr z, .done + xor a + ret + +.done + ld a, d + and 7 + ld e, a + ld d, 0 + ld hl, .data_6f99 + add hl, de + ld a, [hl] + scf + ret +; 6f99 + +.data_6f99 + db 8, 4, 1, 2 + db 10, 6, 9, 5 +; 6fa1 + +Function6fa1: ; 6fa1 + ld hl, OBJECT_DIRECTION_WALKING + add hl, bc + ld a, [hl] + and 3 + jr z, .asm_6fb2 + dec a + jr z, .asm_6fb7 + dec a + jr z, .asm_6fbb + jr .asm_6fbf + +.asm_6fb2 + inc e + push de + inc d + jr .asm_6fc2 + +.asm_6fb7 + push de + inc d + jr .asm_6fc2 + +.asm_6fbb + push de + inc e + jr .asm_6fc2 + +.asm_6fbf + inc d + push de + inc e + +.asm_6fc2 + call GetCoordTile + call GetTileCollision + pop de + and a + jr nz, .asm_6fd7 + call GetCoordTile + call GetTileCollision + and a + jr nz, .asm_6fd7 + xor a + ret + +.asm_6fd7 + scf + ret +; 6fd9 + + + +CheckFacingObject:: ; 6fd9 + + call GetFacingTileCoord + +; Double the distance for counter tiles. + call CheckCounterTile + jr nz, .asm_6ff1 + + ld a, [PlayerNextMapX] + sub d + cpl + inc a + add d + ld d, a + + ld a, [PlayerNextMapY] + sub e + cpl + inc a + add e + ld e, a + +.asm_6ff1 + ld bc, ObjectStructs ; redundant + ld a, 0 + ld [hMapObjectIndexBuffer], a + call IsNPCAtCoord + ret nc + ld hl, OBJECT_DIRECTION_WALKING + add hl, bc + ld a, [hl] + cp STANDING + jr z, .standing + xor a + ret + +.standing + scf + ret +; 7009 + + +WillPersonBumpIntoSomeoneElse: ; 7009 + ld hl, OBJECT_NEXT_MAP_X + add hl, bc + ld d, [hl] + ld hl, OBJECT_NEXT_MAP_Y + add hl, bc + ld e, [hl] + jr IsNPCAtCoord +; 7015 + +Function7015: ; unreferenced + ld a, [hMapObjectIndexBuffer] + call GetObjectStruct + call .CheckWillBeFacingNPC + call IsNPCAtCoord + ret + +.CheckWillBeFacingNPC: ; 7021 + ld hl, OBJECT_NEXT_MAP_X + add hl, bc + ld d, [hl] + ld hl, OBJECT_NEXT_MAP_Y + add hl, bc + ld e, [hl] + call GetSpriteDirection + and a + jr z, .down + cp OW_UP + jr z, .up + cp OW_LEFT + jr z, .left + inc d + ret + +.down + inc e + ret + +.up + dec e + ret + +.left + dec d + ret +; 7041 + +IsNPCAtCoord: ; 7041 + ld bc, ObjectStructs + xor a +.loop + ld [hObjectStructIndexBuffer], a + call GetObjectSprite + jr z, .next + + ld hl, OBJECT_FLAGS1 + add hl, bc + bit 7, [hl] + jr nz, .next + + ld hl, OBJECT_PALETTE + add hl, bc + bit 7, [hl] + jr z, .got + + call Function7171 + jr nc, .ok + jr .ok2 + +.got + ld hl, OBJECT_NEXT_MAP_X + add hl, bc + ld a, [hl] + cp d + jr nz, .ok + ld hl, OBJECT_NEXT_MAP_Y + add hl, bc + ld a, [hl] + cp e + jr nz, .ok + +.ok2 + ld a, [hMapObjectIndexBuffer] + ld l, a + ld a, [hObjectStructIndexBuffer] + cp l + jr nz, .setcarry + +.ok + ld hl, OBJECT_MAP_X + add hl, bc + ld a, [hl] + cp d + jr nz, .next + ld hl, OBJECT_MAP_Y + add hl, bc + ld a, [hl] + cp e + jr nz, .next + ld a, [hMapObjectIndexBuffer] + ld l, a + ld a, [hObjectStructIndexBuffer] + cp l + jr nz, .setcarry + +.next + ld hl, OBJECT_STRUCT_LENGTH + add hl, bc + ld b, h + ld c, l + ld a, [hObjectStructIndexBuffer] + inc a + cp NUM_OBJECT_STRUCTS + jr nz, .loop + and a + ret + +.setcarry + scf + ret +; 70a4 + +HasPersonReachedMovementLimit: ; 70a4 + ld hl, OBJECT_RADIUS + add hl, bc + ld a, [hl] + and a + jr z, .nope + and $f + jr z, .check_y + ld e, a + ld d, a + ld hl, OBJECT_INIT_X + add hl, bc + ld a, [hl] + sub d + ld d, a + ld a, [hl] + add e + ld e, a + ld hl, OBJECT_NEXT_MAP_X + add hl, bc + ld a, [hl] + cp d + jr z, .yes + cp e + jr z, .yes + +.check_y + ld hl, OBJECT_RADIUS + add hl, bc + ld a, [hl] + swap a + and $f + jr z, .nope + ld e, a + ld d, a + ld hl, OBJECT_INIT_Y + add hl, bc + ld a, [hl] + sub d + ld d, a + ld a, [hl] + add e + ld e, a + ld hl, OBJECT_NEXT_MAP_Y + add hl, bc + ld a, [hl] + cp d + jr z, .yes + cp e + jr z, .yes + +.nope + xor a + ret + +.yes + scf + ret +; 70ed + +IsPersonMovingOffEdgeOfScreen: ; 70ed + ld hl, OBJECT_NEXT_MAP_X + add hl, bc + ld a, [XCoord] + cp [hl] + jr z, .check_y + jr nc, .yes + add $9 + cp [hl] + jr c, .yes + +.check_y + ld hl, OBJECT_NEXT_MAP_Y + add hl, bc + ld a, [YCoord] + cp [hl] + jr z, .nope + jr nc, .yes + add $8 + cp [hl] + jr c, .yes + +.nope + and a + ret + +.yes + scf + ret +; 7113 + +Function7113: ; unreferenced + ld a, [PlayerNextMapX] + ld d, a + ld a, [PlayerNextMapY] + ld e, a + ld bc, ObjectStructs + xor a +.loop + ld [hObjectStructIndexBuffer], a + call GetObjectSprite + jr z, .next + ld hl, OBJECT_MOVEMENTTYPE + add hl, bc + ld a, [hl] + cp SPRITEMOVEDATA_SNORLAX + jr nz, .not_snorlax + call Function7171 + jr c, .yes + jr .next + +.not_snorlax + ld hl, OBJECT_NEXT_MAP_Y + add hl, bc + ld a, [hl] + cp e + jr nz, .check_current_coords + ld hl, OBJECT_NEXT_MAP_X + add hl, bc + ld a, [hl] + cp d + jr nz, .check_current_coords + ld a, [hObjectStructIndexBuffer] + cp $0 + jr z, .next + jr .yes + +.check_current_coords + ld hl, OBJECT_MAP_Y + add hl, bc + ld a, [hl] + cp e + jr nz, .next + ld hl, OBJECT_MAP_X + add hl, bc + ld a, [hl] + cp d + jr nz, .next + jr .yes + +.next + ld hl, OBJECT_STRUCT_LENGTH + add hl, bc + ld b, h + ld c, l + ld a, [hObjectStructIndexBuffer] + inc a + cp NUM_OBJECT_STRUCTS + jr nz, .loop + xor a + ret + +.yes + scf + ret +; 7171 + + +Function7171: ; 7171 + ld hl, OBJECT_NEXT_MAP_X + add hl, bc + ld a, d + sub [hl] + jr c, .nope + cp $2 + jr nc, .nope + ld hl, OBJECT_NEXT_MAP_Y + add hl, bc + ld a, e + sub [hl] + jr c, .nope + cp $2 + jr nc, .nope + scf + ret + +.nope + and a + ret +; 718d diff --git a/engine/scripting.asm b/engine/scripting.asm index db56e2f9e..39d42a984 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -141,7 +141,7 @@ ScriptCommandTable: ; 96cb1 dw Script_stringtotext ; 44 dw Script_itemnotify ; 45 dw Script_pocketisfull ; 46 - dw Script_loadfont ; 47 + dw Script_textbox ; 47 dw Script_refreshscreen ; 48 dw Script_closetext ; 49 dw Script_loadbytec2cf ; 4a @@ -345,7 +345,7 @@ Script_jumptext: ; 96e5f JumpTextFacePlayerScript: ; 96e79 faceplayer JumpTextScript: ; 96e7a - loadfont + opentext repeattext -1, -1 waitbutton closetext @@ -3026,10 +3026,10 @@ Script_reloadandreturn: ; 97b16 jp Script_end ; 97b1c -Script_loadfont: ; 97b1c +Script_textbox: ; 97b1c ; script command 0x47 - call LoadFont + call OpenText ret ; 97b20 diff --git a/engine/selectmenu.asm b/engine/selectmenu.asm index 8d23abb66..1298de0f9 100755 --- a/engine/selectmenu.asm +++ b/engine/selectmenu.asm @@ -5,7 +5,7 @@ SelectMenu:: ; 13327 jp UseRegisteredItem .NotRegistered - call LoadFont + call OpenText ld b, BANK(ItemMayBeRegisteredText) ld hl, ItemMayBeRegisteredText call MapTextbox @@ -139,7 +139,7 @@ UseRegisteredItem: ; 133c3 ; 133df .NoFunction ; 133df - call LoadFont + call OpenText call CantUseItem call CloseText and a @@ -147,7 +147,7 @@ UseRegisteredItem: ; 133c3 ; 133ea .Current ; 133ea - call LoadFont + call OpenText call DoItemEffect call CloseText and a diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index b9515b8aa..f0fae969b 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -55,7 +55,7 @@ StdScripts:: PokeCenterNurseScript: ; EVENT_WELCOMED_TO_POKECOM_CENTER is never set - loadfont + opentext checkmorn iftrue .morn checkday @@ -181,7 +181,7 @@ MerchandiseShelfScript: farjumptext MerchandiseShelfText TownMapScript: - loadfont + opentext farwritetext TownMapText waitbutton special Special_TownMap @@ -192,7 +192,7 @@ WindowScript: farjumptext WindowText TVScript: - loadfont + opentext farwritetext TVText waitbutton closetext @@ -202,7 +202,7 @@ HomepageScript: farjumptext HomepageText Radio1Script: - loadfont + opentext writebyte $0 special MapRadio closetext @@ -210,7 +210,7 @@ Radio1Script: Radio2Script: ; Lucky Channel - loadfont + opentext writebyte $4 special MapRadio closetext @@ -220,7 +220,7 @@ TrashCanScript: ; 0xbc1a5 farjumptext TrashCanText PCScript: - loadfont + opentext special PokemonCenterPC closetext end @@ -317,7 +317,7 @@ BugContestResultsScript: clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY clearevent EVENT_CONTEST_OFFICER_HAS_BERRY - loadfont + opentext farwritetext ContestResults_ReadyToJudgeText waitbutton special BugContestJudging @@ -1385,7 +1385,7 @@ PackFullMScript: end RematchGiftMScript: - loadfont + opentext checkcode VAR_CALLERID if_equal PHONE_SAILOR_HUEY, .Huey if_equal PHONE_YOUNGSTER_JOEY, .Joey @@ -1753,14 +1753,14 @@ RematchGiftFScript: if_equal PHONE_PICNICKER_ERIN, .Erin .Erin - loadfont + opentext farwritetext ErinRematchGiftText buttonsound end GymStatue1Script: mapnametotext $0 - loadfont + opentext farwritetext GymStatue_CityGymText waitbutton closetext @@ -1768,7 +1768,7 @@ GymStatue1Script: GymStatue2Script: mapnametotext $0 - loadfont + opentext farwritetext GymStatue_CityGymText buttonsound farwritetext GymStatue_WinningTrainersText @@ -1794,7 +1794,7 @@ ReceiveTogepiEggScript: ; 0xbcdc3 GameCornerCoinVendorScript: ; 0xbcdcd faceplayer - loadfont + opentext farwritetext CoinVendor_WelcomeText buttonsound checkitem COIN_CASE @@ -1887,7 +1887,7 @@ CoinVendor_MenuData2: ; 0xbce5c HappinessCheckScript: faceplayer - loadfont + opentext special GetFirstPokemonHappiness if_less_than 50, .Unhappy if_less_than 150, .KindaHappy diff --git a/event/daycare.asm b/event/daycare.asm index b56e0083d..2d7c9dea3 100755 --- a/event/daycare.asm +++ b/event/daycare.asm @@ -571,7 +571,7 @@ Function16a3b: ; 16a3b ld a, [wDaycareMan] bit 0, a ret z - callab Function16e1d + callab CheckBreedmonCompatibility ld a, [wd265] and a ret z diff --git a/event/itemball.asm b/event/itemball.asm index 6c6f503e1..9c9e03ee7 100755 --- a/event/itemball.asm +++ b/event/itemball.asm @@ -2,7 +2,7 @@ FindItemInBallScript:: ; 0x122ce callasm .TryReceiveItem iffalse .no_room disappear LAST_TALKED - loadfont + opentext writetext .text_found playsound SFX_ITEM pause 60 @@ -12,7 +12,7 @@ FindItemInBallScript:: ; 0x122ce ; 0x122e3 .no_room: ; 0x122e3 - loadfont + opentext writetext .text_found waitbutton writetext .text_bag_full diff --git a/event/poisonstep.asm b/event/poisonstep.asm index 6b2030e9f..c0f2e1b9c 100755 --- a/event/poisonstep.asm +++ b/event/poisonstep.asm @@ -111,7 +111,7 @@ DoPoisonStep:: ; 505da .Script_MonFaintedToPoison: ; 50669 callasm .PlayPoisonSFX - loadfont + opentext callasm .CheckWhitedOut iffalse .whiteout closetext diff --git a/home/window.asm b/home/window.asm index a8eba0bb6..cd6abbd6e 100644 --- a/home/window.asm +++ b/home/window.asm @@ -22,7 +22,7 @@ CloseText:: ; 2dcf ld a, $1 ld [hOAMUpdate], a - call Function2de2 + call .CloseText pop af ld [hOAMUpdate], a @@ -31,7 +31,7 @@ CloseText:: ; 2dcf ret ; 2de2 -Function2de2:: ; 2de2 +.CloseText ; 2de2 call ResetTextRelatedRAM xor a ld [hBGMapMode], a @@ -48,17 +48,17 @@ Function2de2:: ; 2de2 ret ; 2e08 -LoadFont:: ; 2e08 +OpenText:: ; 2e08 call ResetTextRelatedRAM ld a, [hROMBank] push af ld a, BANK(Function6454) ; and BANK(Function64bf) rst Bankswitch - call Function6454 + call Function6454 ; clear bgmap call SpeechTextBox - call Function2e20 - call Function64bf + call Function2e20 ; anchor bgmap + call Function64bf ; load font pop af rst Bankswitch diff --git a/macros/event.asm b/macros/event.asm index 5dfbdf9c3..8bb031e8c 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -476,9 +476,9 @@ pocketisfull: macro db pocketisfull_command endm - enum loadfont_command -loadfont: macro - db loadfont_command + enum opentext_command +opentext: macro + db opentext_command endm enum refreshscreen_command diff --git a/main.asm b/main.asm index d56e872bf..42187cc66 100644 --- a/main.asm +++ b/main.asm @@ -254,581 +254,9 @@ INCLUDE "engine/math.asm" ItemAttributes: ; 67c1 INCLUDE "items/item_attributes.asm" ; 6ec1 +INCLUDE "engine/npc_movement.asm" -Function6ec1: ; 6ec1 - - ld hl, OBJECT_PALETTE - add hl, bc - bit 5, [hl] - jr z, .not_bit_5 - - ld hl, OBJECT_FLAGS1 - add hl, bc - bit 4, [hl] ; lost - push hl - push bc - call Function6f2c - pop bc - pop hl - ret c - jr .resume - -.not_bit_5 - ld hl, OBJECT_FLAGS1 - add hl, bc - bit 4, [hl] - jr nz, .resume - push hl - push bc - call Function6f07 - pop bc - pop hl - ret c - -.resume - bit 6, [hl] - jr nz, .bit_6 - - push hl - push bc - call WillPersonBumpIntoSomeoneElse - pop bc - pop hl - ret c - -.bit_6 - bit 5, [hl] - jr nz, .bit_5 - push hl - call HasPersonReachedMovementLimit - pop hl - ret c - - push hl - call IsPersonMovingOffEdgeOfScreen - pop hl - ret c - -.bit_5 - and a - ret -; 6f07 - - -Function6f07: ; 6f07 - call Function6f5f - ret c - ld hl, OBJECT_NEXT_MAP_X - add hl, bc - ld d, [hl] - ld hl, OBJECT_NEXT_MAP_Y - add hl, bc - ld e, [hl] - ld hl, OBJECT_PALETTE - add hl, bc - bit 7, [hl] - jp nz, Function6fa1 - ld hl, OBJECT_NEXT_TILE - add hl, bc - ld a, [hl] - ld d, a - call GetTileCollision - and a - jr z, Function6f3e - scf - ret -; 6f2c - -Function6f2c: ; 6f2c - call Function6f5f - ret c - ld hl, OBJECT_NEXT_TILE - add hl, bc - ld a, [hl] - call GetTileCollision - cp $1 - jr z, Function6f3e - scf - ret -; 6f3e - -Function6f3e: ; 6f3e - ld hl, OBJECT_NEXT_TILE - add hl, bc - ld a, [hl] - call Function6f7f - ret nc - push af - ld hl, OBJECT_DIRECTION_WALKING - add hl, bc - ld a, [hl] - and 3 - ld e, a - ld d, 0 - ld hl, .data_6f5b - add hl, de - pop af - and [hl] - ret z - scf - ret -; 6f5b - -.data_6f5b - db 1 << DOWN, 1 << UP, 1 << RIGHT, 1 << LEFT -; 6f5f - -Function6f5f: ; 6f5f - ld hl, OBJECT_STANDING_TILE - add hl, bc - ld a, [hl] - call Function6f7f - ret nc - push af - ld hl, OBJECT_DIRECTION_WALKING - add hl, bc - and 3 - ld e, a - ld d, 0 - ld hl, .data_6f7b - add hl, de - pop af - and [hl] - ret z - scf - ret -; 6f7b - -.data_6f7b - db 1 << UP, 1 << DOWN, 1 << LEFT, 1 << RIGHT -; 6f7f - -Function6f7f: ; 6f7f - ld d, a - and $f0 - cp $b0 - jr z, .done - cp $c0 - jr z, .done - xor a - ret - -.done - ld a, d - and 7 - ld e, a - ld d, 0 - ld hl, .data_6f99 - add hl, de - ld a, [hl] - scf - ret -; 6f99 - -.data_6f99 - db 8, 4, 1, 2 - db 10, 6, 9, 5 -; 6fa1 - -Function6fa1: ; 6fa1 - ld hl, OBJECT_DIRECTION_WALKING - add hl, bc - ld a, [hl] - and 3 - jr z, .asm_6fb2 - dec a - jr z, .asm_6fb7 - dec a - jr z, .asm_6fbb - jr .asm_6fbf - -.asm_6fb2 - inc e - push de - inc d - jr .asm_6fc2 - -.asm_6fb7 - push de - inc d - jr .asm_6fc2 - -.asm_6fbb - push de - inc e - jr .asm_6fc2 - -.asm_6fbf - inc d - push de - inc e - -.asm_6fc2 - call GetCoordTile - call GetTileCollision - pop de - and a - jr nz, .asm_6fd7 - call GetCoordTile - call GetTileCollision - and a - jr nz, .asm_6fd7 - xor a - ret - -.asm_6fd7 - scf - ret -; 6fd9 - - - -CheckFacingObject:: ; 6fd9 - - call GetFacingTileCoord - -; Double the distance for counter tiles. - call CheckCounterTile - jr nz, .asm_6ff1 - - ld a, [PlayerNextMapX] - sub d - cpl - inc a - add d - ld d, a - - ld a, [PlayerNextMapY] - sub e - cpl - inc a - add e - ld e, a - -.asm_6ff1 - ld bc, ObjectStructs ; redundant - ld a, 0 - ld [hMapObjectIndexBuffer], a - call IsNPCAtCoord - ret nc - ld hl, OBJECT_DIRECTION_WALKING - add hl, bc - ld a, [hl] - cp STANDING - jr z, .standing - xor a - ret - -.standing - scf - ret -; 7009 - - -WillPersonBumpIntoSomeoneElse: ; 7009 - ld hl, OBJECT_NEXT_MAP_X - add hl, bc - ld d, [hl] - ld hl, OBJECT_NEXT_MAP_Y - add hl, bc - ld e, [hl] - jr IsNPCAtCoord -; 7015 - -Function7015: ; unreferenced - ld a, [hMapObjectIndexBuffer] - call GetObjectStruct - call .CheckWillBeFacingNPC - call IsNPCAtCoord - ret - -.CheckWillBeFacingNPC: ; 7021 - ld hl, OBJECT_NEXT_MAP_X - add hl, bc - ld d, [hl] - ld hl, OBJECT_NEXT_MAP_Y - add hl, bc - ld e, [hl] - call GetSpriteDirection - and a - jr z, .down - cp OW_UP - jr z, .up - cp OW_LEFT - jr z, .left - inc d - ret - -.down - inc e - ret - -.up - dec e - ret - -.left - dec d - ret -; 7041 - -IsNPCAtCoord: ; 7041 - ld bc, ObjectStructs - xor a -.loop - ld [hObjectStructIndexBuffer], a - call GetObjectSprite - jr z, .next - - ld hl, OBJECT_FLAGS1 - add hl, bc - bit 7, [hl] - jr nz, .next - - ld hl, OBJECT_PALETTE - add hl, bc - bit 7, [hl] - jr z, .got - - call Function7171 - jr nc, .ok - jr .ok2 - -.got - ld hl, OBJECT_NEXT_MAP_X - add hl, bc - ld a, [hl] - cp d - jr nz, .ok - ld hl, OBJECT_NEXT_MAP_Y - add hl, bc - ld a, [hl] - cp e - jr nz, .ok - -.ok2 - ld a, [hMapObjectIndexBuffer] - ld l, a - ld a, [hObjectStructIndexBuffer] - cp l - jr nz, .setcarry - -.ok - ld hl, OBJECT_MAP_X - add hl, bc - ld a, [hl] - cp d - jr nz, .next - ld hl, OBJECT_MAP_Y - add hl, bc - ld a, [hl] - cp e - jr nz, .next - ld a, [hMapObjectIndexBuffer] - ld l, a - ld a, [hObjectStructIndexBuffer] - cp l - jr nz, .setcarry - -.next - ld hl, OBJECT_STRUCT_LENGTH - add hl, bc - ld b, h - ld c, l - ld a, [hObjectStructIndexBuffer] - inc a - cp NUM_OBJECT_STRUCTS - jr nz, .loop - and a - ret - -.setcarry - scf - ret -; 70a4 - -HasPersonReachedMovementLimit: ; 70a4 - ld hl, OBJECT_RADIUS - add hl, bc - ld a, [hl] - and a - jr z, .nope - and $f - jr z, .check_y - ld e, a - ld d, a - ld hl, OBJECT_INIT_X - add hl, bc - ld a, [hl] - sub d - ld d, a - ld a, [hl] - add e - ld e, a - ld hl, OBJECT_NEXT_MAP_X - add hl, bc - ld a, [hl] - cp d - jr z, .yes - cp e - jr z, .yes - -.check_y - ld hl, OBJECT_RADIUS - add hl, bc - ld a, [hl] - swap a - and $f - jr z, .nope - ld e, a - ld d, a - ld hl, OBJECT_INIT_Y - add hl, bc - ld a, [hl] - sub d - ld d, a - ld a, [hl] - add e - ld e, a - ld hl, OBJECT_NEXT_MAP_Y - add hl, bc - ld a, [hl] - cp d - jr z, .yes - cp e - jr z, .yes - -.nope - xor a - ret - -.yes - scf - ret -; 70ed - -IsPersonMovingOffEdgeOfScreen: ; 70ed - ld hl, OBJECT_NEXT_MAP_X - add hl, bc - ld a, [XCoord] - cp [hl] - jr z, .check_y - jr nc, .yes - add $9 - cp [hl] - jr c, .yes - -.check_y - ld hl, OBJECT_NEXT_MAP_Y - add hl, bc - ld a, [YCoord] - cp [hl] - jr z, .nope - jr nc, .yes - add $8 - cp [hl] - jr c, .yes - -.nope - and a - ret - -.yes - scf - ret -; 7113 - -Function7113: ; unreferenced - ld a, [PlayerNextMapX] - ld d, a - ld a, [PlayerNextMapY] - ld e, a - ld bc, ObjectStructs - xor a -.loop - ld [hObjectStructIndexBuffer], a - call GetObjectSprite - jr z, .next - ld hl, OBJECT_MOVEMENTTYPE - add hl, bc - ld a, [hl] - cp SPRITEMOVEDATA_SNORLAX - jr nz, .not_snorlax - call Function7171 - jr c, .yes - jr .next - -.not_snorlax - ld hl, OBJECT_NEXT_MAP_Y - add hl, bc - ld a, [hl] - cp e - jr nz, .check_current_coords - ld hl, OBJECT_NEXT_MAP_X - add hl, bc - ld a, [hl] - cp d - jr nz, .check_current_coords - ld a, [hObjectStructIndexBuffer] - cp $0 - jr z, .next - jr .yes - -.check_current_coords - ld hl, OBJECT_MAP_Y - add hl, bc - ld a, [hl] - cp e - jr nz, .next - ld hl, OBJECT_MAP_X - add hl, bc - ld a, [hl] - cp d - jr nz, .next - jr .yes - -.next - ld hl, OBJECT_STRUCT_LENGTH - add hl, bc - ld b, h - ld c, l - ld a, [hObjectStructIndexBuffer] - inc a - cp NUM_OBJECT_STRUCTS - jr nz, .loop - xor a - ret - -.yes - scf - ret -; 7171 - - -Function7171: ; 7171 - ld hl, OBJECT_NEXT_MAP_X - add hl, bc - ld a, d - sub [hl] - jr c, .nope - cp $2 - jr nc, .nope - ld hl, OBJECT_NEXT_MAP_Y - add hl, bc - ld a, e - sub [hl] - jr c, .nope - cp $2 - jr nc, .nope - scf - ret - -.nope - and a - ret -; 718d - GetFirstPokemonHappiness: ; 718d ld hl, PartyMon1Happiness ld bc, PARTYMON_STRUCT_LENGTH @@ -1001,48 +429,48 @@ DaycareStep:: ; 7282 ld a, [wDaycareMan] bit 0, a - jr z, .asm_72a4 + jr z, .daycare_lady ld a, [wBreedMon1Level] ; level cp 100 - jr nc, .asm_72a4 + jr nc, .daycare_lady ld hl, wBreedMon1Exp + 2 ; exp inc [hl] - jr nz, .asm_72a4 + jr nz, .daycare_lady dec hl inc [hl] - jr nz, .asm_72a4 + jr nz, .daycare_lady dec hl inc [hl] ld a, [hl] cp $50 - jr c, .asm_72a4 + jr c, .daycare_lady ld a, $50 ld [hl], a -.asm_72a4 +.daycare_lady ld a, [wDaycareLady] bit 0, a - jr z, .asm_72c6 + jr z, .check_egg ld a, [wBreedMon2Level] ; level cp 100 - jr nc, .asm_72c6 + jr nc, .check_egg ld hl, wBreedMon2Exp + 2 ; exp inc [hl] - jr nz, .asm_72c6 + jr nz, .check_egg dec hl inc [hl] - jr nz, .asm_72c6 + jr nz, .check_egg dec hl inc [hl] ld a, [hl] - cp $50 - jr c, .asm_72c6 - ld a, $50 + cp 5242880 / $10000 + jr c, .check_egg + ld a, 5242880 / $10000 ld [hl], a -.asm_72c6 +.check_egg ld hl, wDaycareMan bit 5, [hl] ; egg ret z @@ -1052,22 +480,22 @@ DaycareStep:: ; 7282 call Random ld [hl], a - callab Function16e1d + callab CheckBreedmonCompatibility ld a, [wd265] - cp $e6 - ld b, $50 - jr nc, .asm_72f8 + cp 230 + ld b, -1 + 32 percent + jr nc, .okay ld a, [wd265] - cp $aa - ld b, $28 - jr nc, .asm_72f8 + cp 170 + ld b, 16 percent + jr nc, .okay ld a, [wd265] - cp $6e - ld b, $1e - jr nc, .asm_72f8 - ld b, $a + cp 110 + ld b, 12 percent + jr nc, .okay + ld b, 4 percent -.asm_72f8 +.okay call Random cp b ret nc @@ -3349,7 +2777,7 @@ TrySurfOW:: ; c9e7 AskSurfScript: ; ca2c - loadfont + opentext writetext AskSurfText yesorno iftrue UsedSurfScript @@ -3574,7 +3002,7 @@ UnknownText_0xcb81: ; 0xcb81 ; 0xcb86 Script_AskWaterfall: ; 0xcb86 - loadfont + opentext writetext UnknownText_0xcb90 yesorno iftrue Script_UsedWaterfall @@ -3924,7 +3352,7 @@ AskStrengthScript: ; 0xcd5f .AskStrength: ; 0xcd5f - loadfont + opentext writetext UnknownText_0xcd69 yesorno iftrue Script_UsedStrength @@ -4127,7 +3555,7 @@ UnknownText_0xce69: ; 0xce69 ; 0xce6e Script_AskWhirlpoolOW: ; 0xce6e - loadfont + opentext writetext UnknownText_0xce78 yesorno iftrue Script_UsedWhirlpool @@ -4219,7 +3647,7 @@ TryHeadbuttOW:: ; cec9 ; cedc AskHeadbuttScript: ; 0xcedc - loadfont + opentext writetext UnknownText_0xcee6 yesorno iftrue HeadbuttScript @@ -4319,7 +3747,7 @@ AskRockSmashScript: ; 0xcf5d callasm HasRockSmash if_equal 1, .no - loadfont + opentext writetext UnknownText_0xcf77 yesorno iftrue RockSmashScript @@ -4758,7 +4186,7 @@ TryCutOW:: ; d186 ; d1a9 AskCutScript: ; 0xd1a9 - loadfont + opentext writetext UnknownText_0xd1c8 yesorno iffalse .script_d1b8 @@ -8601,7 +8029,7 @@ BugCatchingContestBattleScript:: ; 0x135eb BugCatchingContestOverScript:: ; 0x135f8 playsound SFX_ELEVATOR_END - loadfont + opentext writetext UnknownText_0x1360f waitbutton jump BugCatchingContestReturnToGateScript @@ -8609,7 +8037,7 @@ BugCatchingContestOverScript:: ; 0x135f8 BugCatchingContestOutOfBallsScript: ; 0x13603 playsound SFX_ELEVATOR_END - loadfont + opentext writetext UnknownText_0x13614 waitbutton @@ -8631,7 +8059,7 @@ UnknownText_0x13614: ; 0x13614 ; 0x13619 RepelWoreOffScript:: ; 0x13619 - loadfont + opentext writetext .text waitbutton closetext @@ -8645,7 +8073,7 @@ RepelWoreOffScript:: ; 0x13619 ; 0x13625 SignpostItemScript:: ; 0x13625 - loadfont + opentext copybytetovar EngineBuffer3 itemtotext 0, 0 writetext .found_text @@ -20071,7 +19499,7 @@ SeenByTrainerScript:: ; 0xbe675 ; 0xbe68a StartBattleWithMapTrainerScript: ; 0xbe68a - loadfont + opentext trainertext $0 waitbutton closetext diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 64b95f9a1..b7cb3e67e 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -16,7 +16,7 @@ AzaleaGym_MapScriptHeader: BugsyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_BUGSY iftrue .FightDone writetext BugsyText_INeverLose @@ -27,7 +27,7 @@ BugsyScript: startbattle returnafterbattle setevent EVENT_BEAT_BUGSY - loadfont + opentext writetext Text_ReceivedHiveBadge playsound SFX_GET_BADGE waitsfx @@ -74,7 +74,7 @@ TrainerTwinsAmyandmay1: .AfterScript: end_if_just_battled - loadfont + opentext writetext TwinsAmyandmay1AfterBattleText waitbutton closetext @@ -85,7 +85,7 @@ TrainerTwinsAmyandmay2: .AfterScript: end_if_just_battled - loadfont + opentext writetext TwinsAmyandmay2AfterBattleText waitbutton closetext @@ -96,7 +96,7 @@ TrainerBug_catcherbenny: .AfterScript: end_if_just_battled - loadfont + opentext writetext Bug_catcherbennyAfterBattleText waitbutton closetext @@ -107,7 +107,7 @@ TrainerBug_catcherAl: .AfterScript: end_if_just_battled - loadfont + opentext writetext Bug_catcherAlAfterBattleText waitbutton closetext @@ -118,7 +118,7 @@ TrainerBug_catcherJosh: .AfterScript: end_if_just_battled - loadfont + opentext writetext Bug_catcherJoshAfterBattleText waitbutton closetext @@ -128,14 +128,14 @@ AzaleaGymGuyScript: faceplayer checkevent EVENT_BEAT_BUGSY iftrue .AzaleaGymGuyWinScript - loadfont + opentext writetext AzaleaGymGuyText waitbutton closetext end .AzaleaGymGuyWinScript - loadfont + opentext writetext AzaleaGymGuyWinText waitbutton closetext diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index aca1d0e9c..ed88a0fd1 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -11,7 +11,7 @@ AzaleaMart_MapScriptHeader: db 0 ClerkScript_0x18e040: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_AZALEA closetext end diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 78ebf4479..1657557f5 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -61,7 +61,7 @@ UnknownScript_0x198034: spriteface PLAYER, UP UnknownScript_0x198049: playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x19814d waitbutton closetext @@ -98,7 +98,7 @@ UnknownScript_0x198081: UnknownScript_0x198091: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext UnknownText_0x198233 waitbutton closetext @@ -119,7 +119,7 @@ AzaleaRocketScript_0x1980ae: GrampsScript_0x1980b1: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue UnknownScript_0x1980bf writetext UnknownText_0x19841b @@ -140,7 +140,7 @@ YoungsterScript_0x1980c8: jumptextfaceplayer UnknownText_0x19851a SlowpokeScript_0x1980cb: - loadfont + opentext writetext UnknownText_0x1985b0 pause 60 writetext UnknownText_0x1985c3 @@ -152,7 +152,7 @@ SlowpokeScript_0x1980cb: WoosterScript: ; unused faceplayer - loadfont + opentext writetext WoosterText cry QUAGSIRE waitbutton @@ -161,7 +161,7 @@ WoosterScript: UnknownScript_0x1980e5: applymovement PLAYER, MovementData_0x198148 - loadfont + opentext writetext UnknownText_0x1985df buttonsound spriteface AZALEATOWN_KURT_OUTSIDE, RIGHT @@ -180,7 +180,7 @@ UnknownScript_0x1980e5: KurtOutsideScript_0x19810c: faceplayer - loadfont + opentext writetext UnknownText_0x198628 waitbutton spriteface AZALEATOWN_KURT_OUTSIDE, LEFT diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index c33c3fedc..c1d78db50 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -26,7 +26,7 @@ BattleTower1F_MapScriptHeader: if_equal $2, .priorityjump1 if_equal $3, .SkipEverything if_equal $4, .SkipEverything - loadfont + opentext writetext Text_WeveBeenWaitingForYou waitbutton closetext @@ -45,7 +45,7 @@ BattleTower1F_MapScriptHeader: end MapBattleTower1FSignpost0Script: - loadfont + opentext writetext Text_ReadBattleTowerRules yesorno iffalse UnknownScript_0x9e3e0 @@ -59,7 +59,7 @@ ReceptionistScript_0x9e3e2: writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState special BattleTowerAction if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm - loadfont + opentext writetext Text_BattleTowerWelcomesYou buttonsound writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [sbe4f] @@ -244,14 +244,14 @@ UnknownScript_0x9e550: end BattleTower_LeftWithoutSaving: - loadfont + opentext writetext Text_BattleTower_LeftWithoutSaving waitbutton jump Script_BattleTowerHopeToServeYouAgain YoungsterScript_0x9e55d: faceplayer - loadfont + opentext writetext Text_BattleTowerYoungster waitbutton closetext diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index a264f51d5..8626a0021 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -30,7 +30,7 @@ Script_BattleRoomLoop: ; 0x9f425 warpsound waitsfx applymovement BATTLETOWERBATTLEROOM_YOUNGSTER, MovementData_BattleTowerBattleRoomOpponentWalksIn - loadfont + opentext battletowertext 1 buttonsound closetext @@ -45,7 +45,7 @@ Script_BattleRoomLoop: ; 0x9f425 disappear BATTLETOWERBATTLEROOM_YOUNGSTER applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksToPlayer applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceReceptionist - loadfont + opentext writetext Text_YourPkmnWillBeHealedToFullHealth waitbutton closetext @@ -55,7 +55,7 @@ Script_BattleRoomLoop: ; 0x9f425 pause 60 special FadeInPalettes special RestartMapMusic - loadfont + opentext writetext Text_NextUpOpponentNo yesorno iffalse Script_DontBattleNextOpponent @@ -90,7 +90,7 @@ Script_DontSaveAndEndTheSession: ; 0x9f4a3 closetext special FadeOutPalettes warpfacing UP, BATTLE_TOWER_1F, $7, $7 - loadfont + opentext jump Script_BattleTowerHopeToServeYouAgain Script_FailedBattleTowerChallenge: @@ -99,7 +99,7 @@ Script_FailedBattleTowerChallenge: warpfacing UP, BATTLE_TOWER_1F, $7, $7 writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - loadfont + opentext writetext Text_ThanksForVisiting waitbutton closetext @@ -110,14 +110,14 @@ Script_BeatenAllTrainers: ; 0x9f4d9 special Special_BattleTowerFade warpfacing UP, BATTLE_TOWER_1F, $7, $7 Script_BeatenAllTrainers2: - loadfont + opentext writetext Text_CongratulationsYouveBeatenAllTheTrainers jump Script_GivePlayerHisPrize UnreferencedScript_0x9f4eb: writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction - loadfont + opentext writetext Text_TooMuchTimeElapsedNoRegister waitbutton closetext @@ -128,7 +128,7 @@ UnreferencedScript_0x9f4f7: special BattleTowerAction writebyte BATTLETOWERACTION_06 special BattleTowerAction - loadfont + opentext writetext Text_ThanksForVisiting writetext Text_WeHopeToServeYouAgain waitbutton diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index cb075bb0e..f541da05d 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -71,7 +71,7 @@ BattleTowerHallway_MapScriptHeader: .EnterBattleRoom: ; 0x9f61f faceperson PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST - loadfont + opentext writetext Text_PleaseStepThisWay waitbutton closetext diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 264ea53fa..009a8a5af 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -10,7 +10,7 @@ BillsHouse_MapScriptHeader: GrampsScript_0x189538: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x1896ba checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 2f7f9852c..842f1de5c 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -36,7 +36,7 @@ BlackthornCity_MapScriptHeader: SuperNerdScript_0x1a46e8: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CLAIR iftrue UnknownScript_0x1a4702 checkevent EVENT_CLEARED_RADIO_TOWER @@ -66,7 +66,7 @@ GrampsScript_0x1a470b: BlackBeltScript_0x1a470e: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x1a471c writetext UnknownText_0x1a494a @@ -91,7 +91,7 @@ CooltrainerFScript_0x1a4728: SantosScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_SPELL_TAG_FROM_SANTOS iftrue SantosSaturdayScript checkcode VAR_WEEKDAY diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index 1ea8e89c4..c70fcde2a 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -10,7 +10,7 @@ BlackthornDodrioTradeHouse_MapScriptHeader: Emy: faceplayer - loadfont + opentext trade $3 waitbutton closetext diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 12f5e3e8e..1cd07b3cc 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -13,7 +13,7 @@ GrannyScript_0x195949: jumptextfaceplayer UnknownText_0x19595c EkansScript_0x19594c: - loadfont + opentext writetext UnknownText_0x1959ee cry DRATINI waitbutton diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 76d1e4f92..242fa7260 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -32,7 +32,7 @@ BlackthornGym1F_MapScriptHeader: ClairScript_0x194e24: faceplayer - loadfont + opentext checkflag ENGINE_RISINGBADGE iftrue UnknownScript_0x194e69 checkevent EVENT_BEAT_CLAIR @@ -45,7 +45,7 @@ ClairScript_0x194e24: startbattle returnafterbattle setevent EVENT_BEAT_CLAIR - loadfont + opentext writetext UnknownText_0x19500e waitbutton closetext @@ -98,7 +98,7 @@ TrainerCooltrainermPaul: CooltrainermPaulScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1953f1 waitbutton closetext @@ -109,7 +109,7 @@ TrainerCooltrainermMike: CooltrainermMikeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x195467 waitbutton closetext @@ -120,7 +120,7 @@ TrainerCooltrainerfLola: CooltrainerfLolaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x195516 waitbutton closetext @@ -128,7 +128,7 @@ CooltrainerfLolaScript: BlackthornGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CLAIR iftrue .BlackthornGymGuyWinScript writetext BlackthornGymGuyText diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index ecadfd73b..36d53d195 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -53,7 +53,7 @@ BlackthornGym2F_MapScriptHeader: .Fall pause 30 scall .FX - loadfont + opentext writetext BlackthornGym2FBoulderFellText waitbutton closetext @@ -73,7 +73,7 @@ TrainerCooltrainermCody: CooltrainermCodyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1957d5 waitbutton closetext @@ -84,7 +84,7 @@ TrainerCooltrainerfFran: CooltrainerfFranScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x195883 waitbutton closetext diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index f0432031d..e78bd8a74 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -11,7 +11,7 @@ BlackthornMart_MapScriptHeader: db 0 ClerkScript_0x195a5d: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_BLACKTHORN closetext end diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index 25c9766c2..72cd935fc 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -10,7 +10,7 @@ BluesHouse_MapScriptHeader: DaisyScript_0x19b0d0: faceplayer - loadfont + opentext checkcode VAR_HOUR if_equal $f, UnknownScript_0x19b0de writetext UnknownText_0x19b130 @@ -38,7 +38,7 @@ UnknownScript_0x19b0de: pause 60 special FadeInPalettes special RestartMapMusic - loadfont + opentext writetext UnknownText_0x19b296 special PlayCurMonCry buttonsound diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index d6de6db2d..d7e487869 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x1809ad: BrunoScript_0x1809c5: faceplayer - loadfont + opentext checkevent EVENT_BEAT_ELITE_4_BRUNO iftrue UnknownScript_0x1809f3 writetext UnknownText_0x1809fe @@ -60,7 +60,7 @@ BrunoScript_0x1809c5: startbattle returnafterbattle setevent EVENT_BEAT_ELITE_4_BRUNO - loadfont + opentext writetext UnknownText_0x180b3c waitbutton closetext diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index be0d7180b..13742c950 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -46,7 +46,7 @@ UnknownScript_0x185c0d: spriteface BURNEDTOWER1F_SUPER_NERD, DOWN showemote EMOTE_SHOCK, BURNEDTOWER1F_SUPER_NERD, 15 applymovement BURNEDTOWER1F_SUPER_NERD, MovementData_0x185cd3 - loadfont + opentext writetext UnknownText_0x185ecc waitbutton closetext @@ -63,7 +63,7 @@ UnknownScript_0x185c25: applymovement PLAYER, MovementData_0x185ccd applymovement BURNEDTOWER1F_SILVER, MovementData_0x185ccf playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x185cd9 waitbutton closetext @@ -99,7 +99,7 @@ UnknownScript_0x185c70: UnknownScript_0x185c80: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext UnknownText_0x185de2 waitbutton closetext @@ -117,7 +117,7 @@ UnknownScript_0x185c80: applymovement PLAYER, MovementData_0x185cd1 playsound SFX_KINESIS showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 20 - loadfont + opentext writetext UnknownText_0x185e75 waitbutton closetext diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index f3137342a..3c0a331ea 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -106,7 +106,7 @@ UnknownScript_0x18616b: SuperNerdScript_0x186212: faceplayer - loadfont + opentext writetext UnknownText_0x18626a waitbutton closetext diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 3a4044c2d..26e20308a 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -14,19 +14,19 @@ CeladonCafe_MapScriptHeader: SuperNerdScript_0x73049: faceplayer - loadfont + opentext writetext UnknownText_0x730de waitbutton closetext end FisherScript_0x73051: - loadfont + opentext writetext UnknownText_0x73129 waitbutton closetext faceplayer - loadfont + opentext writetext UnknownText_0x7313a waitbutton closetext @@ -34,12 +34,12 @@ FisherScript_0x73051: end FisherScript_0x73062: - loadfont + opentext writetext UnknownText_0x7316a waitbutton closetext faceplayer - loadfont + opentext writetext UnknownText_0x73178 waitbutton closetext @@ -47,12 +47,12 @@ FisherScript_0x73062: end FisherScript_0x73073: - loadfont + opentext writetext UnknownText_0x731ae waitbutton closetext faceplayer - loadfont + opentext writetext UnknownText_0x731bd waitbutton closetext @@ -62,12 +62,12 @@ FisherScript_0x73073: TeacherScript_0x73084: checkitem COIN_CASE iftrue UnknownScript_0x7309a - loadfont + opentext writetext UnknownText_0x73201 waitbutton closetext faceplayer - loadfont + opentext writetext UnknownText_0x73212 waitbutton closetext @@ -75,12 +75,12 @@ TeacherScript_0x73084: end UnknownScript_0x7309a: - loadfont + opentext writetext UnknownText_0x73254 waitbutton closetext spriteface CELADONCAFE_TEACHER, RIGHT - loadfont + opentext writetext UnknownText_0x73278 waitbutton closetext @@ -95,7 +95,7 @@ CeladonCafeTrashcan: iftrue .TrashEmpty giveitem LEFTOVERS iffalse .PackFull - loadfont + opentext itemtotext LEFTOVERS, $0 writetext FoundLeftoversText playsound SFX_ITEM @@ -106,7 +106,7 @@ CeladonCafeTrashcan: end .PackFull - loadfont + opentext itemtotext LEFTOVERS, $0 writetext FoundLeftoversText buttonsound diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 7cac82748..10d64c190 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -27,7 +27,7 @@ FisherScript_0x1a9f43: jumptextfaceplayer UnknownText_0x1a9f7d CeladonCityPoliwrath: - loadfont + opentext writetext CeladonCityPoliwrathText cry POLIWRATH waitbutton diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 67f3fc001..cd93776ab 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -13,14 +13,14 @@ CeladonDeptStore2F_MapScriptHeader: ClerkScript_0x70bad: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_2F_1 closetext end ClerkScript_0x70bb5: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_2F_2 closetext end diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 6aee16254..b40fddf50 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -14,7 +14,7 @@ CeladonDeptStore3F_MapScriptHeader: ClerkScript_0x70d29: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_3F closetext end @@ -24,7 +24,7 @@ YoungsterScript_0x70d31: GameboyKidScript_0x70d34: faceplayer - loadfont + opentext writetext UnknownText_0x70d86 waitbutton closetext @@ -33,7 +33,7 @@ GameboyKidScript_0x70d34: GameboyKidScript_0x70d3f: faceplayer - loadfont + opentext writetext UnknownText_0x70dc7 waitbutton closetext diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index e4b829732..b3cb00655 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -12,7 +12,7 @@ CeladonDeptStore4F_MapScriptHeader: ClerkScript_0x70f0d: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_4F closetext end diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index c67a50dd9..a49c573d1 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -14,14 +14,14 @@ CeladonDeptStore5F_MapScriptHeader: ClerkScript_0x71004: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_5F_1 closetext end ClerkScript_0x7100c: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CELADON_5F_2 closetext end diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index bd02f2b96..0753fb2dc 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -24,7 +24,7 @@ YoungsterScript_0x7117d: jumptextfaceplayer UnknownText_0x71310 CeladonVendingMachine: - loadfont + opentext writetext CeladonVendingText .Start special PlaceMoneyTopRightOW diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index bec3bdb9d..9ce00fb6d 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -8,7 +8,7 @@ CeladonDeptStoreElevator_MapScriptHeader: db 0 MapCeladonDeptStoreElevatorSignpost0Script: - loadfont + opentext elevator Elevator_0x713be closetext iffalse UnknownScript_0x713bd diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 3a9e07870..fd29c3b02 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -24,7 +24,7 @@ ReceptionistScript_0x72120: PokefanMScript_0x72123: faceplayer - loadfont + opentext writetext UnknownText_0x72215 waitbutton closetext @@ -33,7 +33,7 @@ PokefanMScript_0x72123: TeacherScript_0x7212e: faceplayer - loadfont + opentext writetext UnknownText_0x72242 waitbutton closetext @@ -42,7 +42,7 @@ TeacherScript_0x7212e: FishingGuruScript_0x72139: faceplayer - loadfont + opentext writetext UnknownText_0x72295 waitbutton closetext @@ -51,7 +51,7 @@ FishingGuruScript_0x72139: FisherScript_0x72144: faceplayer - loadfont + opentext checkevent EVENT_GOT_COINS_FROM_GAMBLER_AT_CELADON iftrue .UnknownScript_0x72169 writetext UnknownText_0x722dc @@ -97,7 +97,7 @@ CeladonGymGuyScript: GrampsScript_0x72190: faceplayer - loadfont + opentext writetext UnknownText_0x724ad waitbutton closetext @@ -136,7 +136,7 @@ MapCeladonGameCornerSignpost32Script: jumptext UnknownText_0x7254f MapCeladonGameCornerSignpost9Script: - loadfont + opentext writetext UnknownText_0x72567 waitbutton special Special_CardFlip diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 603fcec78..e800c007b 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -17,7 +17,7 @@ PharmacistScript_0x726ec: MapCeladonGameCornerPrizeRoomSignpost0Script: faceplayer - loadfont + opentext writetext UnknownText_0x7293e waitbutton checkitem COIN_CASE @@ -121,7 +121,7 @@ MenuData2_0x72798: MapCeladonGameCornerPrizeRoomSignpost1Script: faceplayer - loadfont + opentext writetext UnknownText_0x7293e waitbutton checkitem COIN_CASE diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 9ef00c103..9724442e6 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -15,7 +15,7 @@ CeladonGym_MapScriptHeader: ErikaScript_0x72a6a: faceplayer - loadfont + opentext checkflag ENGINE_RAINBOWBADGE iftrue .FightDone writetext UnknownText_0x72b28 @@ -30,7 +30,7 @@ ErikaScript_0x72a6a: setevent EVENT_BEAT_PICNICKER_TANYA setevent EVENT_BEAT_BEAUTY_JULIA setevent EVENT_BEAT_TWINS_JO_AND_ZOE - loadfont + opentext writetext UnknownText_0x72c96 playsound SFX_GET_BADGE waitsfx @@ -54,7 +54,7 @@ TrainerLassMichelle: LassMichelleScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x72e30 waitbutton closetext @@ -65,7 +65,7 @@ TrainerPicnickerTanya: PicnickerTanyaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x72e8e waitbutton closetext @@ -76,7 +76,7 @@ TrainerBeautyJulia: BeautyJuliaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x72f01 waitbutton closetext @@ -87,7 +87,7 @@ TrainerTwinsJoandzoe1: TwinsJoandzoe1Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x72f70 waitbutton closetext @@ -98,7 +98,7 @@ TrainerTwinsJoandzoe2: TwinsJoandzoe2Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x72fc0 waitbutton closetext diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index f3ccc6b53..e06fe71cc 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -15,7 +15,7 @@ CeladonMansionManager: jumptextfaceplayer CeladonMansionManagerText CeladonMansion1FMeowth: - loadfont + opentext writetext CeladonMansion1FMeowthText cry MEOWTH waitbutton @@ -23,7 +23,7 @@ CeladonMansion1FMeowth: end CeladonMansion1FClefairy: - loadfont + opentext writetext CeladonMansion1FClefairyText cry CLEFAIRY waitbutton @@ -31,7 +31,7 @@ CeladonMansion1FClefairy: end CeladonMansion1FNidoranF: - loadfont + opentext writetext CeladonMansion1FNidoranFText cry NIDORAN_F waitbutton diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 98e869c0a..10ba88dfe 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -13,7 +13,7 @@ CeladonMansion3F_MapScriptHeader: CooltrainerMScript_0x71670: faceplayer - loadfont + opentext writetext UnknownText_0x716ce checkcode VAR_DEXCAUGHT if_greater_than 248, UnknownScript_0x7167e @@ -37,7 +37,7 @@ UnknownScript_0x7167e: GymGuyScript_0x71696: faceplayer - loadfont + opentext checkevent EVENT_ENABLE_DIPLOMA_PRINTING iftrue UnknownScript_0x716a4 writetext UnknownText_0x717b4 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index 7e95c287a..84a0cb069 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -10,7 +10,7 @@ CeladonMansionRoofHouse_MapScriptHeader: PharmacistScript_0x71afd: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM03_CURSE iftrue UnknownScript_0x71b21 writetext UnknownText_0x71b27 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index 9df8527f7..cb9b99c46 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -26,7 +26,7 @@ PharmacistScript_0x71e2b: SuperNerdScript_0x71e2e: faceplayer - loadfont + opentext writetext UnknownText_0x71f22 buttonsound writebyte SUICUNE diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 7f33b5dee..d54cda1f5 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -22,7 +22,7 @@ CeruleanCity_MapScriptHeader: CooltrainerMScript_0x184009: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184017 writetext UnknownText_0x1840bc @@ -40,7 +40,7 @@ SuperNerdScript_0x18401d: jumptextfaceplayer UnknownText_0x1841a8 CeruleanCitySlowbro: - loadfont + opentext writetext CeruleanCitySlowbroText cry SLOWBRO waitbutton @@ -49,21 +49,21 @@ CeruleanCitySlowbro: CooltrainerFScript_0x18402a: faceplayer - loadfont + opentext writetext UnknownText_0x1841fa waitbutton closetext spriteface CERULEANCITY_COOLTRAINER_F, LEFT - loadfont + opentext writetext UnknownText_0x184229 waitbutton closetext - loadfont + opentext writetext CeruleanCitySlowbroText cry SLOWBRO waitbutton closetext - loadfont + opentext writetext UnknownText_0x18424b waitbutton closetext @@ -71,7 +71,7 @@ CooltrainerFScript_0x18402a: FisherScript_0x18404a: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x184058 checkevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM @@ -90,7 +90,7 @@ UnknownScript_0x18405e: YoungsterScript_0x184064: faceplayer - loadfont + opentext writetext UnknownText_0x1842a9 waitbutton closetext @@ -118,7 +118,7 @@ UnknownScript_0x184072: waitsfx showemote EMOTE_SHOCK, CERULEANCITY_YOUNGSTER, 15 spriteface CERULEANCITY_YOUNGSTER, LEFT - loadfont + opentext writetext UnknownText_0x1842ee waitbutton closetext diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 79c93e98f..496c00023 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -29,18 +29,18 @@ UnknownScript_0x1883de: playsound SFX_TACKLE applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb playmusic MUSIC_ROCKET_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1884fb waitbutton closetext showemote EMOTE_SHOCK, CERULEANGYM_ROCKET, 15 applymovement CERULEANGYM_ROCKET, MovementData_0x1884f7 - loadfont + opentext writetext UnknownText_0x188574 waitbutton closetext applymovement CERULEANGYM_ROCKET, MovementData_0x1884f5 - loadfont + opentext writetext UnknownText_0x1885a5 waitbutton closetext @@ -62,7 +62,7 @@ UnknownScript_0x1883de: MistyScript_0x188432: faceplayer - loadfont + opentext checkflag ENGINE_CASCADEBADGE iftrue .FightDone writetext UnknownText_0x188674 @@ -76,7 +76,7 @@ MistyScript_0x188432: setevent EVENT_BEAT_SWIMMERF_DIANA setevent EVENT_BEAT_SWIMMERF_BRIANA setevent EVENT_BEAT_SWIMMERM_PARKER - loadfont + opentext writetext UnknownText_0x188768 playsound SFX_GET_BADGE waitsfx @@ -92,7 +92,7 @@ TrainerSwimmerfDiana: SwimmerfDianaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x188856 waitbutton closetext @@ -103,7 +103,7 @@ TrainerSwimmerfBriana: SwimmerfBrianaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1888c0 waitbutton closetext @@ -114,7 +114,7 @@ TrainerSwimmermParker: SwimmermParkerScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x188943 waitbutton closetext @@ -122,7 +122,7 @@ SwimmermParkerScript: CeruleanGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_MISTY iftrue .CeruleanGymGuyWinScript writetext CeruleanGymGuyText @@ -143,7 +143,7 @@ MapCeruleanGymSignpostItem0: CeruleanGymStatue1: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM iffalse CeruleanGymStatue - loadfont + opentext writetext CeruleanGymNote1 waitbutton closetext @@ -152,7 +152,7 @@ CeruleanGymStatue1: CeruleanGymStatue2: checkevent EVENT_TRAINERS_IN_CERULEAN_GYM iffalse CeruleanGymStatue - loadfont + opentext writetext CeruleanGymNote2 waitbutton closetext diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 37d9a1db6..993b6b1af 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -11,7 +11,7 @@ CeruleanMart_MapScriptHeader: db 0 ClerkScript_0x188ac0: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_CERULEAN closetext end diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index cedc9ea74..3f4c9d8f7 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -17,7 +17,7 @@ PokefanFScript_0x18804d: jumptextfaceplayer UnknownText_0x1880c3 DiglettScript_0x188050: - loadfont + opentext writetext UnknownText_0x1880e7 cry DIGLETT waitbutton diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 7124abb64..f499d8c1f 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -18,7 +18,7 @@ GrampsScript_0x188136: jumptextfaceplayer UnknownText_0x18818a RhydonScript_0x188139: - loadfont + opentext writetext UnknownText_0x18819c cry KANGASKHAN waitbutton @@ -26,7 +26,7 @@ RhydonScript_0x188139: end ZubatScript_0x188143: - loadfont + opentext writetext UnknownText_0x1881b5 cry ZUBAT waitbutton diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index 84139a4d3..bdf79238b 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -12,7 +12,7 @@ CharcoalKiln_MapScriptHeader: CharcoalKilnBoss: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM01_CUT iftrue .GotCut checkevent EVENT_CLEARED_SLOWPOKE_WELL @@ -36,7 +36,7 @@ CharcoalKilnBoss: CharcoalKilnApprentice: faceplayer - loadfont + opentext checkevent EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN iftrue .YoureTheCoolest checkevent EVENT_GOT_HM01_CUT @@ -64,7 +64,7 @@ CharcoalKilnApprentice: CharcoalKilnFarfetchd: faceplayer - loadfont + opentext writetext FarfetchdText cry FARFETCH_D waitbutton diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 8c286be2a..71eecaf50 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -31,7 +31,7 @@ CherrygroveCity_MapScriptHeader: CherrygroveCityGuideGent: faceplayer - loadfont + opentext writetext GuideGentIntroText yesorno iffalse .No @@ -43,25 +43,25 @@ CherrygroveCityGuideGent: playmusic MUSIC_SHOW_ME_AROUND follow CHERRYGROVECITY_GRAMPS, PLAYER applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c195 - loadfont + opentext writetext GuideGentPokeCenterText waitbutton closetext applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c19b spriteface PLAYER, UP - loadfont + opentext writetext GuideGentMartText waitbutton closetext applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1a3 spriteface PLAYER, UP - loadfont + opentext writetext GuideGentRoute30Text waitbutton closetext applymovement CHERRYGROVECITY_GRAMPS, MovementData_0x19c1ac spriteface PLAYER, LEFT - loadfont + opentext writetext GuideGentSeaText waitbutton closetext @@ -70,7 +70,7 @@ CherrygroveCityGuideGent: pause 60 spriteface CHERRYGROVECITY_GRAMPS, LEFT spriteface PLAYER, RIGHT - loadfont + opentext writetext GuideGentGiftText buttonsound stringtotext .mapcardname, $1 @@ -116,7 +116,7 @@ UnknownScript_0x19c0ae: applymovement CHERRYGROVECITY_SILVER, MovementData_0x19c1ce spriteface PLAYER, RIGHT playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x19c4e2 waitbutton closetext @@ -158,7 +158,7 @@ UnknownScript_0x19c104: UnknownScript_0x19c11a: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext UnknownText_0x19c608 waitbutton closetext @@ -166,7 +166,7 @@ UnknownScript_0x19c11a: UnknownScript_0x19c126: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext UnknownText_0x19c59e waitbutton closetext @@ -183,7 +183,7 @@ UnknownScript_0x19c12f: TeacherScript_0x19c146: faceplayer - loadfont + opentext checkflag ENGINE_MAP_CARD iftrue UnknownScript_0x19c154 writetext UnknownText_0x19c650 @@ -199,7 +199,7 @@ UnknownScript_0x19c154: YoungsterScript_0x19c15a: faceplayer - loadfont + opentext checkflag ENGINE_POKEDEX iftrue UnknownScript_0x19c168 writetext UnknownText_0x19c6d6 @@ -215,7 +215,7 @@ UnknownScript_0x19c168: MysticWaterGuy: faceplayer - loadfont + opentext checkevent EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE iftrue UnknownScript_0x19c183 writetext UnknownText_0x19c766 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 5cba6311f..b737313f9 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -10,14 +10,14 @@ CherrygroveEvolutionSpeechHouse_MapScriptHeader: db 0 YoungsterScript_0x196cb2: - loadfont + opentext writetext UnknownText_0x196cc3 waitbutton closetext end LassScript_0x196cb9: - loadfont + opentext writetext UnknownText_0x196cfc waitbutton closetext diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 8fa56345a..fe8a733eb 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -11,7 +11,7 @@ CherrygroveMart_MapScriptHeader: db 0 ClerkScript_0x19680a: - loadfont + opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196817 pokemart MARTTYPE_STANDARD, MART_CHERRYGROVE @@ -25,7 +25,7 @@ UnknownScript_0x196817: CooltrainerMScript_0x19681d: faceplayer - loadfont + opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x19682b writetext UnknownText_0x196834 diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index 7e22774ed..d3056b177 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -22,7 +22,7 @@ GentlemanScript_0x196973: TeacherScript_0x196976: faceplayer - loadfont + opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x196984 writetext UnknownText_0x1969f1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 54f87d40c..70d7d455d 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -62,7 +62,7 @@ UnknownScript_0x1a001e: playmusic MUSIC_MYSTICALMAN_ENCOUNTER appear CIANWOODCITY_EUSINE applymovement CIANWOODCITY_EUSINE, MovementData_0x1a00e7 - loadfont + opentext writetext UnknownText_0x1a0433 waitbutton closetext @@ -73,7 +73,7 @@ UnknownScript_0x1a001e: reloadmapmusic returnafterbattle playmusic MUSIC_MYSTICALMAN_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1a05c3 waitbutton closetext @@ -88,7 +88,7 @@ UnknownScript_0x1a001e: PokefanFScript_0x1a0084: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM02_FLY iftrue UnknownScript_0x1a00ad writetext UnknownText_0x1a00f1 diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 7db8ddb1a..026050f6a 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -10,7 +10,7 @@ CianwoodCityPhotoStudio_MapScriptHeader: FishingGuruScript_0x9e0e0: faceplayer - loadfont + opentext writetext UnknownText_0x9e0f9 yesorno iffalse UnknownScript_0x9e0f3 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index b3eb9bb7a..e8167cc9a 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -18,14 +18,14 @@ CianwoodGym_MapScriptHeader: ChuckScript_0x9d60f: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CHUCK iftrue .FightDone writetext UnknownText_0x9d6f9 waitbutton closetext spriteface CIANWOODGYM_CHUCK, RIGHT - loadfont + opentext writetext UnknownText_0x9d76f waitbutton closetext @@ -35,7 +35,7 @@ ChuckScript_0x9d60f: disappear CIANWOODGYM_BOULDER1 pause 30 faceplayer - loadfont + opentext writetext UnknownText_0x9d78a waitbutton closetext @@ -44,7 +44,7 @@ ChuckScript_0x9d60f: startbattle returnafterbattle setevent EVENT_BEAT_CHUCK - loadfont + opentext writetext UnknownText_0x9d835 playsound SFX_GET_BADGE waitsfx @@ -91,7 +91,7 @@ TrainerBlackbeltYoshi: BlackbeltYoshiScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x9d9fa waitbutton closetext @@ -102,7 +102,7 @@ TrainerBlackbeltLao: BlackbeltLaoScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x9da61 waitbutton closetext @@ -113,7 +113,7 @@ TrainerBlackbeltNob: BlackbeltNobScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x9dac0 waitbutton closetext @@ -124,7 +124,7 @@ TrainerBlackbeltLung: BlackbeltLungScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x9db14 waitbutton closetext diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 9d3c064cc..f488e8993 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -16,7 +16,7 @@ CianwoodPharmacyTrigger: CianwoodPharmacist: faceplayer - loadfont + opentext checkevent EVENT_GOT_SECRETPOTION_FROM_PHARMACY iftrue .Mart checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index d685ff8ef..3fe7c1ef8 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -21,14 +21,14 @@ CianwoodGymGuyScript: faceplayer checkevent EVENT_BEAT_CHUCK iftrue .CianwoodGymGuyWinScript - loadfont + opentext writetext CianwoodGymGuyText waitbutton closetext end .CianwoodGymGuyWinScript - loadfont + opentext writetext CianwoodGymGuyWinText waitbutton closetext diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 8a56d3c7c..886f8dfb5 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -17,7 +17,7 @@ CinnabarIsland_MapScriptHeader: CinnabarIslandBlue: faceplayer - loadfont + opentext writetext CinnabarIslandBlueText waitbutton closetext diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 46fee275f..a5c109757 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -57,7 +57,7 @@ MapColosseumSignpost1Script: end ChrisScript_0x193499: - loadfont + opentext writetext .FriendReadyText waitbutton closetext diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index c4262b315..cf8bd771c 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -15,7 +15,7 @@ PokefanMScript_0x18ad13: PokefanFScript_0x18ad16: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18ad24 writetext UnknownText_0x18ad95 @@ -30,7 +30,7 @@ UnknownScript_0x18ad24: end ClefairyScript_0x18ad2a: - loadfont + opentext writetext UnknownText_0x18ae4b cry BLISSEY waitbutton diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 8af7b5163..b25ba93be 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -52,7 +52,7 @@ Copycat: special RunCallback_04 checkevent EVENT_RETURNED_MACHINE_PART iftrue .Part7 - loadfont + opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part3 writetext UnknownText_0x18afda @@ -74,14 +74,14 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 - loadfont + opentext writetext UnknownText_0x18b028 waitbutton closetext end .Part7 - loadfont + opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part8 writetext UnknownText_0x18b064 @@ -103,7 +103,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 - loadfont + opentext writetext UnknownText_0x18b116 waitbutton closetext @@ -111,7 +111,7 @@ Copycat: end .Part12 - loadfont + opentext writetext UnknownText_0x18b17f buttonsound takeitem LOST_ITEM @@ -120,7 +120,7 @@ Copycat: jump .Part14 .Part13 - loadfont + opentext .Part14 writetext UnknownText_0x18b1e2 buttonsound @@ -146,7 +146,7 @@ Copycat: variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part17 special RunCallback_04 - loadfont + opentext checkflag ENGINE_PLAYER_IS_FEMALE iftrue .Part18 writetext UnknownText_0x18b298 @@ -168,7 +168,7 @@ Copycat: faceplayer variablesprite SPRITE_COPYCAT, SPRITE_LASS special RunCallback_04 - loadfont + opentext writetext UnknownText_0x18b2f5 waitbutton .Part22 @@ -176,7 +176,7 @@ Copycat: end CopycatsDodrio: - loadfont + opentext writetext CopycatsDodrioText1 cry DODRIO buttonsound diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 33b53e168..d4a647207 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -21,7 +21,7 @@ TrainerKimono_girlNaoko2: Kimono_girlNaoko2Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x99579 waitbutton closetext @@ -32,7 +32,7 @@ TrainerKimono_girlSayo: Kimono_girlSayoScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x9960b waitbutton closetext @@ -43,7 +43,7 @@ TrainerKimono_girlZuki: Kimono_girlZukiScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x99688 waitbutton closetext @@ -54,7 +54,7 @@ TrainerKimono_girlKuni: Kimono_girlKuniScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x99714 waitbutton closetext @@ -65,7 +65,7 @@ TrainerKimono_girlMiki: Kimono_girlMikiScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x997a8 waitbutton closetext @@ -73,7 +73,7 @@ Kimono_girlMikiScript: GentlemanScript_0x994c6: faceplayer - loadfont + opentext writetext UnknownText_0x9980a buttonsound checkevent EVENT_GOT_HM03_SURF @@ -121,7 +121,7 @@ UnknownScript_0x99515: end RhydonScript_0x9951b: - loadfont + opentext writetext UnknownText_0x99a0a cry RHYDON waitbutton diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index 7cc6fd3a9..d28b17eb9 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -12,7 +12,7 @@ DarkCaveBlackthornEntrance_MapScriptHeader: PharmacistScript_0x18c720: faceplayer - loadfont + opentext checkevent EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE iftrue UnknownScript_0x18c735 writetext UnknownText_0x18c73f diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 9ee0f5b24..f194ae7e0 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -27,7 +27,7 @@ UnknownScript_0x62f88: GrampsScript_0x62f8f: faceplayer - loadfont + opentext checkevent EVENT_GOT_ODD_EGG iftrue UnknownScript_0x62fbd writetext UnknownText_0x630ce @@ -36,7 +36,7 @@ GrampsScript_0x62f8f: checkcode VAR_PARTYCOUNT if_equal $6, UnknownScript_0x62fb6 special Function117656 - loadfont + opentext writetext UnknownText_0x631ae playsound SFX_KEY_ITEM waitsfx @@ -47,7 +47,7 @@ GrampsScript_0x62f8f: end UnknownScript_0x62fb6: - loadfont + opentext writetext UnknownText_0x63237 waitbutton closetext @@ -61,7 +61,7 @@ UnknownScript_0x62fbd: GrannyScript_0x62fc3: faceplayer - loadfont + opentext checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x62fd1 special Special_DayCareLady diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index c336e43b5..21b17c640 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -25,7 +25,7 @@ DragonShrine_MapScriptHeader: DragonShrineTestScript: applymovement PLAYER, MovementData_0x18d2bf applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7 - loadfont + opentext writetext UnknownText_0x18d2ea buttonsound .Question1: @@ -96,17 +96,17 @@ DragonShrineTestScript: .WrongAnswer: closetext spriteface DRAGONSHRINE_ELDER1, LEFT - loadfont + opentext writetext UnknownText_0x18d7f6 waitbutton closetext spriteface DRAGONSHRINE_ELDER1, DOWN - loadfont + opentext writetext UnknownText_0x18d816 waitbutton closetext setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG - loadfont + opentext checkevent EVENT_DRAGON_SHRINE_QUESTION_5 iftrue .Question5 checkevent EVENT_DRAGON_SHRINE_QUESTION_4 @@ -132,34 +132,34 @@ DragonShrineTestScript: spriteface DRAGONSHRINE_CLAIR, RIGHT spriteface PLAYER, LEFT spriteface DRAGONSHRINE_ELDER1, LEFT - loadfont + opentext writetext UnknownText_0x18d916 waitbutton closetext special Special_FadeOutMusic applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2da - loadfont + opentext writetext UnknownText_0x18d974 waitbutton closetext applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2dd - loadfont + opentext writetext UnknownText_0x18d983 waitbutton closetext applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c9 spriteface DRAGONSHRINE_CLAIR, UP - loadfont + opentext writetext UnknownText_0x18d520 waitbutton closetext showemote EMOTE_SHOCK, DRAGONSHRINE_CLAIR, 15 - loadfont + opentext writetext UnknownText_0x18d9ae waitbutton closetext applymovement DRAGONSHRINE_CLAIR, MovementData_0x18d2e0 - loadfont + opentext writetext UnknownText_0x18d9bf waitbutton setflag ENGINE_RISINGBADGE @@ -178,11 +178,11 @@ DragonShrineTestScript: spriteface DRAGONSHRINE_CLAIR, UP applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2d1 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x18d5a3 waitbutton closetext - loadfont + opentext writetext UnknownText_0x18dab4 waitbutton closetext @@ -195,7 +195,7 @@ DragonShrineTestScript: ElderScript_0x18d1a5: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue .DontGiveDratiniYet checkevent EVENT_JUST_RECEIVED_DRATINI @@ -253,7 +253,7 @@ ElderScript_0x18d1a5: ElderScript_0x18d205: faceplayer - loadfont + opentext writetext UnknownText_0x18d840 waitbutton closetext @@ -261,7 +261,7 @@ ElderScript_0x18d205: ElderScript_0x18d20d: faceplayer - loadfont + opentext writetext UnknownText_0x18d8b1 waitbutton closetext diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 7016b6fa7..538392c78 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -14,73 +14,73 @@ DragonsDenB1F_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x18c89d, 0 - dw UnknownScript_0x18c89e, 0 + dw .Trigger1, 0 + dw .Trigger2, 0 .MapCallbacks: db 1 ; callbacks - dbw 5, UnknownScript_0x18c89f + dbw 5, .CheckSilver -UnknownScript_0x18c89d: +.Trigger1: end -UnknownScript_0x18c89e: +.Trigger2: end -UnknownScript_0x18c89f: +.CheckSilver: checkevent EVENT_BEAT_RIVAL_IN_MT_MOON - iftrue UnknownScript_0x18c8a8 + iftrue .CheckDay disappear DRAGONSDENB1F_SILVER return -UnknownScript_0x18c8a8: +.CheckDay: checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0x18c8b5 - if_equal THURSDAY, UnknownScript_0x18c8b5 + if_equal TUESDAY, .AppearSilver + if_equal THURSDAY, .AppearSilver disappear DRAGONSDENB1F_SILVER return -UnknownScript_0x18c8b5: +.AppearSilver: appear DRAGONSDENB1F_SILVER return -UnknownScript_0x18c8b8: +DragonsDenB1F_ClairTrigger: appear DRAGONSDENB1F_CLAIR - loadfont - writetext UnknownText_0x18c9b8 + opentext + writetext ClairText_Wait pause 30 closetext showemote EMOTE_SHOCK, PLAYER, 15 spriteface PLAYER, LEFT playmusic MUSIC_CLAIR - applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9ae - loadfont - writetext UnknownText_0x18c9bf + applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksToYou + opentext + writetext ClairText_GiveDragonbreathDragonDen buttonsound giveitem TM_DRAGONBREATH - iffalse UnknownScript_0x18c8f4 + iffalse .BagFull itemtotext TM_DRAGONBREATH, $0 - writetext UnknownText_0x18c9fb + writetext NotifyReceiveDragonbreath playsound SFX_ITEM waitsfx itemnotify setevent EVENT_GOT_TM24_DRAGONBREATH - writetext UnknownText_0x18ca0d + writetext ClairText_DescribeDragonbreathDragonDen buttonsound - writetext UnknownText_0x18caf1 + writetext ClairText_WhatsTheMatterDragonDen waitbutton closetext - jump UnknownScript_0x18c8f9 + jump .FinishClair -UnknownScript_0x18c8f4: - writetext UnknownText_0x18ca8b +.BagFull: + writetext ClairText_NoRoom waitbutton closetext -UnknownScript_0x18c8f9: - applymovement DRAGONSDENB1F_CLAIR, MovementData_0x18c9b3 +.FinishClair: + applymovement DRAGONSDENB1F_CLAIR, MovementDragonsDen_ClairWalksAway special Special_FadeOutMusic pause 30 special RestartMapMusic @@ -93,8 +93,8 @@ TrainerCooltrainermDarin: CooltrainermDarinScript: end_if_just_battled - loadfont - writetext UnknownText_0x18cd82 + opentext + writetext CooltrainermDarinAfterText waitbutton closetext end @@ -104,8 +104,8 @@ TrainerCooltrainerfCara: CooltrainerfCaraScript: end_if_just_battled - loadfont - writetext UnknownText_0x18ce11 + opentext + writetext CooltrainerfCaraAfterText waitbutton closetext end @@ -115,8 +115,8 @@ TrainerTwinsLeaandpia1: TwinsLeaandpia1Script: end_if_just_battled - loadfont - writetext UnknownText_0x18ced3 + opentext + writetext TrinsLeaandpia1AfterText waitbutton closetext end @@ -126,31 +126,34 @@ TrainerTwinsLeaandpia2: TwinsLeaandpia2Script: end_if_just_battled - loadfont - writetext UnknownText_0x18cf0f + opentext + writetext TrinsLeaandpia2AfterText waitbutton closetext end PokeBallScript_0x18c95a: +; This whole script is written out rather than as an +; item fragment because it's left over from the GS +; event. giveitem DRAGON_FANG - iffalse UnknownScript_0x18c970 + iffalse .BagFull disappear DRAGONSDENB1F_POKE_BALL1 - loadfont + opentext itemtotext DRAGON_FANG, $0 - writetext UnknownText_0x18cf41 + writetext Text_FoundDragonFang playsound SFX_ITEM waitsfx itemnotify closetext end -UnknownScript_0x18c970: - loadfont +.BagFull: + opentext itemtotext DRAGON_FANG, $0 - writetext UnknownText_0x18cf41 + writetext Text_FoundDragonFang buttonsound - writetext UnknownText_0x18cf51 + writetext Text_NoRoomForDragonFang waitbutton closetext end @@ -158,25 +161,25 @@ UnknownScript_0x18c970: SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS - iftrue UnknownScript_0x18c995 - writetext UnknownText_0x18cc83 + iftrue .SilverTalkAgain + writetext SilverText_Training1 waitbutton closetext setevent EVENT_GAVE_KURT_APRICORNS special RestartMapMusic end -UnknownScript_0x18c995: - writetext UnknownText_0x18cd2d +.SilverTalkAgain: + writetext SilverText_Training2 waitbutton closetext special RestartMapMusic end MapDragonsDenB1FSignpost0Script: - jumptext UnknownText_0x18cc2e + jumptext DragonShrineSignpostText ItemFragment_0x18c9a1: itemfragment CALCIUM @@ -193,25 +196,25 @@ MapDragonsDenB1FSignpostItem2: MapDragonsDenB1FSignpostItem3: dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER -MovementData_0x18c9ae: +MovementDragonsDen_ClairWalksToYou: slow_step_right slow_step_right slow_step_right slow_step_right step_end -MovementData_0x18c9b3: +MovementDragonsDen_ClairWalksAway: slow_step_left slow_step_left slow_step_left slow_step_left step_end -UnknownText_0x18c9b8: +ClairText_Wait: text "Wait!" done -UnknownText_0x18c9bf: +ClairText_GiveDragonbreathDragonDen: text "CLAIR: I'm sorry" line "about this." @@ -219,12 +222,12 @@ UnknownText_0x18c9bf: line "my apology." done -UnknownText_0x18c9fb: +NotifyReceiveDragonbreath: text " received" line "TM24." done -UnknownText_0x18ca0d: +ClairText_DescribeDragonbreathDragonDen: text "That contains" line "DRAGONBREATH." @@ -237,7 +240,7 @@ UnknownText_0x18ca0d: cont "to take it." done -UnknownText_0x18ca8b: +ClairText_NoRoom: text "Oh? You don't have" line "any room for this." @@ -248,7 +251,7 @@ UnknownText_0x18ca8b: line "see me there." done -UnknownText_0x18caf1: +ClairText_WhatsTheMatterDragonDen: text "CLAIR: What's the" line "matter? Aren't you" @@ -281,7 +284,7 @@ UnknownText_0x18caf1: line "you've got." done -UnknownText_0x18cc2e: +DragonShrineSignpostText: text "DRAGON SHRINE" para "A shrine honoring" @@ -291,7 +294,7 @@ UnknownText_0x18cc2e: line "in DRAGON'S DEN." done -UnknownText_0x18cc83: +SilverText_Training1: text "…" line "What? ?" @@ -311,7 +314,7 @@ UnknownText_0x18cc83: line "MON trainer…" done -UnknownText_0x18cd2d: +SilverText_Training2: text "…" para "Whew…" @@ -329,7 +332,7 @@ CooltrainermDarinBeatenText: text "S-strong!" done -UnknownText_0x18cd82: +CooltrainermDarinAfterText: text "The SHRINE ahead" line "is home to the" @@ -349,7 +352,7 @@ CooltrainerfCaraBeatenText: text "Oh yikes, I lost!" done -UnknownText_0x18ce11: +CooltrainerfCaraAfterText: text "Soon I'm going to" line "get permission" @@ -375,7 +378,7 @@ TwinsLeaandpia1BeatenText: text "Ouchies." done -UnknownText_0x18ced3: +TrinsLeaandpia1AfterText: text "It was like having" line "to battle LANCE." done @@ -388,21 +391,21 @@ TwinsLeaandpia2BeatenText: text "Meanie." done -UnknownText_0x18cf0f: +TrinsLeaandpia2AfterText: text "We'll tell on you." para "MASTER will be" line "angry with you." done -UnknownText_0x18cf41: +Text_FoundDragonFang: text " found" line "@" text_from_ram StringBuffer3 text "!" done -UnknownText_0x18cf51: +Text_NoRoomForDragonFang: text "But can't" line "carry any more" cont "items." @@ -419,7 +422,7 @@ DragonsDenB1F_MapEventHeader: .XYTriggers: db 1 - xy_trigger 1, $1e, $13, $0, UnknownScript_0x18c8b8, $0, $0 + xy_trigger 1, $1e, $13, $0, DragonsDenB1F_ClairTrigger, $0, $0 .Signposts: db 4 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index c77a8afa6..5d92242a2 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -16,7 +16,7 @@ EarlsPokemonAcademy_MapScriptHeader: AcademyEarl: applymovement EARLSPOKEMONACADEMY_FISHER, MovementData_0x68b2d faceplayer - loadfont + opentext writetext UnknownText_0x68b3b yesorno iffalse .Part1 @@ -43,7 +43,7 @@ YoungsterScript_0x68a83: GameboyKidScript_0x68a86: faceplayer - loadfont + opentext writetext UnknownText_0x68dda waitbutton closetext @@ -52,7 +52,7 @@ GameboyKidScript_0x68a86: GameboyKidScript_0x68a91: faceplayer - loadfont + opentext writetext UnknownText_0x68e07 waitbutton closetext @@ -63,7 +63,7 @@ YoungsterScript_0x68a9c: jumptextfaceplayer UnknownText_0x68e39 AcademyBlackboard: - loadfont + opentext writetext AcademyBlackboardText .Loop loadmenudata .MenuHeader @@ -125,7 +125,7 @@ AcademyBlackboard: db "QUIT@" AcademyNotebook: - loadfont + opentext writetext AcademyNotebookText yesorno iffalse .Done diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index 45fc30235..091d070f2 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -35,7 +35,7 @@ LassScript_0x1a4012: LassScript_0x1a4015: faceplayer - loadfont + opentext checkevent EVENT_RELEASED_THE_BEASTS iftrue UnknownScript_0x1a4023 writetext UnknownText_0x1a421a @@ -51,7 +51,7 @@ UnknownScript_0x1a4023: FisherScript_0x1a4029: faceplayer - loadfont + opentext checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x1a4037 writetext UnknownText_0x1a42ac diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index e1940fc22..e31f9077b 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -27,7 +27,7 @@ UnknownScript_0x99d57: MortyScript_0x99d58: faceplayer - loadfont + opentext checkevent EVENT_BEAT_MORTY iftrue .FightDone writetext UnknownText_0x99e65 @@ -38,7 +38,7 @@ MortyScript_0x99d58: startbattle returnafterbattle setevent EVENT_BEAT_MORTY - loadfont + opentext writetext UnknownText_0x9a043 playsound SFX_GET_BADGE waitsfx @@ -86,7 +86,7 @@ EcruteakGymTriggerRockets: UnknownScript_0x99dc6: applymovement PLAYER, MovementData_0x99e5d applymovement ECRUTEAKGYM_GRAMPS, MovementData_0x99e63 - loadfont + opentext writetext UnknownText_0x9a49c waitbutton closetext @@ -104,7 +104,7 @@ TrainerSageJeffrey: SageJeffreyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x9a263 waitbutton closetext @@ -115,7 +115,7 @@ TrainerSagePing: SagePingScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x9a2b7 waitbutton closetext @@ -126,7 +126,7 @@ TrainerMediumMartha: MediumMarthaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x9a318 waitbutton closetext @@ -137,7 +137,7 @@ TrainerMediumGrace: MediumGraceScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x9a38a waitbutton closetext @@ -145,7 +145,7 @@ MediumGraceScript: EcruteakGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_MORTY iftrue .EcruteakGymGuyWinScript writetext EcruteakGymGuyText diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 497eb325c..c7873273d 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -73,7 +73,7 @@ EcruteakHouse_XYTrigger_DontMove: SageScript_0x98062: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue .CheckForClearBell checkflag ENGINE_FOGBADGE @@ -125,7 +125,7 @@ SageScript_0x98062: SageScript_0x980b0: faceplayer - loadfont + opentext checkevent EVENT_GOT_CLEAR_BELL iftrue .GotClearBell writetext UnknownText_0x9840b diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 1fe696683..f053c9442 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -11,7 +11,7 @@ EcruteakItemfinderHouse_MapScriptHeader: CooltrainerMScript_0x9a5fb: faceplayer - loadfont + opentext checkevent EVENT_GOT_ITEMFINDER iftrue UnknownScript_0x9a614 writetext UnknownText_0x9a63c @@ -34,7 +34,7 @@ UnknownScript_0x9a61a: end PokedexScript_0x9a620: - loadfont + opentext writetext UnknownText_0x9a826 yesorno iftrue UnknownScript_0x9a62a diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 69857bebc..052b4c40d 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -11,7 +11,7 @@ EcruteakMart_MapScriptHeader: db 0 ClerkScript_0x99c3b: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_ECRUTEAK closetext end diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 33ad28317..cc116f862 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -40,7 +40,7 @@ UnknownScript_0x98e64: pause 20 spriteface ECRUTEAKPOKECENTER1F_BILL, DOWN pause 10 - loadfont + opentext writetext UnknownText_0x98ed8 buttonsound jump UnknownScript_0x98e95 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index e2940f58f..f24586f31 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -55,7 +55,7 @@ ElmsLab_AutowalkUpToElm: applymovement PLAYER, ElmsLab_WalkUpToElmMovement showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 spriteface ELMSLAB_ELM, RIGHT - loadfont + opentext writetext ElmText_Intro ElmsLab_RefuseLoop: yesorno @@ -73,11 +73,11 @@ ElmsLab_ElmGetsEmail: pause 30 showemote EMOTE_SHOCK, ELMSLAB_ELM, 10 spriteface ELMSLAB_ELM, DOWN - loadfont + opentext writetext ElmText_GotAnEmail waitbutton closetext - loadfont + opentext spriteface ELMSLAB_ELM, RIGHT writetext ElmText_MissionFromMrPokemon waitbutton @@ -86,7 +86,7 @@ ElmsLab_ElmGetsEmail: spriteface PLAYER, UP applymovement ELMSLAB_ELM, ElmsLab_ElmToDefaultPositionMovement2 spriteface PLAYER, RIGHT - loadfont + opentext writetext ElmText_ChooseAPokemon waitbutton dotrigger $1 @@ -95,7 +95,7 @@ ElmsLab_ElmGetsEmail: ProfElmScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_SS_TICKET_FROM_ELM iftrue ElmCheckMasterBall checkevent EVENT_BEAT_ELITE_FOUR @@ -155,7 +155,7 @@ ElmCheckGotEggAgain: LabTryToLeaveScript: spriteface ELMSLAB_ELM, DOWN - loadfont + opentext writetext LabWhereGoingText waitbutton closetext @@ -171,7 +171,7 @@ CyndaquilPokeBallScript: cry CYNDAQUIL waitbutton closepokepic - loadfont + opentext writetext TakeCyndaquilText yesorno iffalse DidntChooseStarterScript @@ -201,7 +201,7 @@ TotodilePokeBallScript: cry TOTODILE waitbutton closepokepic - loadfont + opentext writetext TakeTotodileText yesorno iffalse DidntChooseStarterScript @@ -229,7 +229,7 @@ ChikoritaPokeBallScript: cry CHIKORITA waitbutton closepokepic - loadfont + opentext writetext TakeChikoritaText yesorno iffalse DidntChooseStarterScript @@ -256,24 +256,24 @@ DidntChooseStarterScript: ElmDirectionsScript: spriteface PLAYER, UP - loadfont + opentext writetext ElmDirectionsText1 waitbutton closetext addcellnum PHONE_ELM - loadfont + opentext writetext GotElmsNumberText playsound SFX_REGISTER_PHONE_NUMBER waitsfx waitbutton closetext spriteface ELMSLAB_ELM, LEFT - loadfont + opentext writetext ElmDirectionsText2 waitbutton closetext spriteface ELMSLAB_ELM, DOWN - loadfont + opentext writetext ElmDirectionsText3 waitbutton closetext @@ -290,14 +290,14 @@ ElmDescribesMrPokemonScript: end LookAtElmPokeBallScript: - loadfont + opentext writetext ElmPokeBallText waitbutton closetext end ElmsLabHealingMachine: - loadfont + opentext checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue .CanHeal writetext ElmsLabHealingMachineText1 @@ -379,7 +379,7 @@ ShowElmTogepiScript: closetext showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 setevent EVENT_SHOWED_TOGEPI_TO_ELM - loadfont + opentext writetext ShowElmTogepiText2 buttonsound writetext ShowElmTogepiText3 @@ -444,22 +444,22 @@ ElmJumpBackScript2: ElmJumpUpScript: applymovement ELMSLAB_ELM, ElmJumpUpMovement - loadfont + opentext end ElmJumpDownScript: applymovement ELMSLAB_ELM, ElmJumpDownMovement - loadfont + opentext end ElmJumpLeftScript: applymovement ELMSLAB_ELM, ElmJumpLeftMovement - loadfont + opentext end ElmJumpRightScript: applymovement ELMSLAB_ELM, ElmJumpRightMovement - loadfont + opentext end AideScript_WalkPotions1: @@ -477,7 +477,7 @@ AideScript_WalkPotions2: end AideScript_GivePotions: - loadfont + opentext writetext AideText_GiveYouPotions buttonsound verbosegiveitem POTION @@ -502,7 +502,7 @@ AideScript_WalkBalls2: end AideScript_GiveYouBalls: - loadfont + opentext writetext AideText_GiveYouBalls buttonsound itemtotext POKE_BALL, $1 @@ -521,7 +521,7 @@ AideScript_ReceiveTheBalls: ElmsAideScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE iftrue AideScript_AfterTheft checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM @@ -558,7 +558,7 @@ MeetCopScript: applymovement PLAYER, MeetCopScript_WalkUp CopScript: spriteface ELMSLAB_OFFICER, LEFT - loadfont + opentext writetext ElmsLabOfficerText1 buttonsound special SpecialNameRival @@ -571,7 +571,7 @@ CopScript: end ElmsLabWindow: - loadfont + opentext checkflag ENGINE_FLYPOINT_VIOLET iftrue .Normal checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index d2b687a77..2904f9b7d 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -46,7 +46,7 @@ FastShip1F_MapScriptHeader: SailorScript_0x75160: faceplayer - loadfont + opentext checkevent EVENT_FAST_SHIP_HAS_ARRIVED iftrue .Arrived checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE @@ -104,7 +104,7 @@ SailorScript_0x75160: SailorScript_0x751d0: faceplayer - loadfont + opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue .Vermilion writetext UnknownText_0x752f9 @@ -130,7 +130,7 @@ WorriedGrandpaTriggerLeft: playsound SFX_TACKLE applymovement PLAYER, MovementData_0x7522e applymovement FASTSHIP1F_GENTLEMAN, MovementData_0x75220 - loadfont + opentext writetext UnknownText_0x75412 waitbutton closetext diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index 1e1fdabbb..b5167bfdc 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -54,7 +54,7 @@ UnknownScript_0x76766: SailorScript_0x76767: faceplayer - loadfont + opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x767a0 checkevent EVENT_FAST_SHIP_LAZY_SAILOR @@ -100,7 +100,7 @@ TrainerSailorJeff: SailorJeffScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76a38 waitbutton closetext @@ -111,7 +111,7 @@ TrainerPicnickerDebra: PicnickerDebraScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76a99 waitbutton closetext @@ -122,7 +122,7 @@ TrainerJugglerFritz: JugglerFritzScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76b02 waitbutton closetext @@ -133,7 +133,7 @@ TrainerSailorGarrett: SailorGarrettScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76b7a waitbutton closetext @@ -144,7 +144,7 @@ TrainerFisherJonah: FisherJonahScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76c22 waitbutton closetext @@ -155,7 +155,7 @@ TrainerBlackbeltWai: BlackbeltWaiScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76c9e waitbutton closetext @@ -166,7 +166,7 @@ TrainerSailorKenneth: SailorKennethScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76d5f waitbutton closetext @@ -177,7 +177,7 @@ TrainerTeacherShirley: TeacherShirleyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76de1 waitbutton closetext @@ -188,7 +188,7 @@ TrainerSchoolboyNate: SchoolboyNateScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76e3d waitbutton closetext @@ -199,7 +199,7 @@ TrainerSchoolboyRicky: SchoolboyRickyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76eb6 waitbutton closetext diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 2a94ac073..b19fa8773 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -19,7 +19,7 @@ TrainerCooltrainermSean: CooltrainermSeanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7567b waitbutton closetext @@ -30,7 +30,7 @@ TrainerCooltrainerfCarol: CooltrainerfCarolScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x756f7 waitbutton closetext @@ -41,7 +41,7 @@ TrainerPokemaniacEthan: PokemaniacEthanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7574b waitbutton closetext @@ -52,7 +52,7 @@ TrainerHikerNoland: HikerNolandScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x757d4 waitbutton closetext @@ -63,7 +63,7 @@ TrainerGentlemanEdward: GentlemanEdwardScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x75937 waitbutton closetext @@ -74,7 +74,7 @@ TrainerBurglarCorey: BurglarCoreyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x75996 waitbutton closetext @@ -83,7 +83,7 @@ BurglarCoreyScript: SailorScript_0x755f1: playmusic MUSIC_HIKER_ENCOUNTER faceplayer - loadfont + opentext writetext UnknownText_0x75812 waitbutton closetext @@ -93,7 +93,7 @@ SailorScript_0x755f1: reloadmap special HealParty setevent EVENT_BEAT_SAILOR_STANLY - loadfont + opentext writetext UnknownText_0x758b1 waitbutton closetext diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 7f8a8f3d7..eea6bbc36 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -23,7 +23,7 @@ UnknownScript_0x75ea6: CaptainScript_0x75ea7: faceplayer - loadfont + opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iftrue UnknownScript_0x75eb5 writetext UnknownText_0x76012 @@ -39,12 +39,12 @@ UnknownScript_0x75eb5: TwinScript_0x75ebb: spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, RIGHT - loadfont + opentext writetext UnknownText_0x761e0 waitbutton closetext faceplayer - loadfont + opentext writetext UnknownText_0x7621f waitbutton closetext @@ -63,21 +63,21 @@ TwinScript_0x75ebb: spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT checkflag ENGINE_PLAYER_IS_FEMALE iftrue UnknownScript_0x75f03 - loadfont + opentext writetext UnknownText_0x76284 waitbutton closetext jump UnknownScript_0x75f09 UnknownScript_0x75f03: - loadfont + opentext writetext UnknownText_0x762c6 waitbutton closetext UnknownScript_0x75f09: spriteface FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, MovementData_0x76010 - loadfont + opentext writetext UnknownText_0x76143 buttonsound setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY @@ -86,7 +86,7 @@ UnknownScript_0x75f09: GentlemanScript_0x75f1f: faceplayer - loadfont + opentext checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 checkevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 @@ -108,7 +108,7 @@ UnknownScript_0x75f44: waitsfx playsound SFX_ELEVATOR_END pause 30 - loadfont + opentext writetext UnknownText_0x76645 waitbutton setevent EVENT_FAST_SHIP_HAS_ARRIVED @@ -134,7 +134,7 @@ UnknownScript_0x75f67: TwinScript_0x75f6d: faceplayer - loadfont + opentext writetext UnknownText_0x7630d waitbutton closetext @@ -145,7 +145,7 @@ TrainerPokefanmColin: PokefanmColinScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7635b waitbutton closetext @@ -156,7 +156,7 @@ TrainerTwinsMegandpeg1: TwinsMegandpeg1Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x763c2 waitbutton closetext @@ -167,7 +167,7 @@ TrainerTwinsMegandpeg2: TwinsMegandpeg2Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76428 waitbutton closetext @@ -178,7 +178,7 @@ TrainerPsychicRodney: PsychicRodneyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76497 waitbutton closetext @@ -189,7 +189,7 @@ TrainerPokefanmJeremy: PokefanmJeremyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7651c waitbutton closetext @@ -200,7 +200,7 @@ TrainerPokefanfGeorgia: PokefanfGeorgiaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x76596 waitbutton closetext @@ -211,7 +211,7 @@ TrainerSupernerdShawn: SupernerdShawnScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7660f waitbutton closetext diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 5118d90d4..13f0399c3 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -16,7 +16,7 @@ TrainerFirebreatherLyle: FirebreatherLyleScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x75b52 waitbutton closetext @@ -27,7 +27,7 @@ TrainerBug_catcherKen: Bug_catcherKenScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x75bd5 waitbutton closetext @@ -38,7 +38,7 @@ TrainerBeautyCassie: BeautyCassieScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x75c43 waitbutton closetext @@ -51,21 +51,21 @@ GuitaristClydeScript: end_if_just_battled special Mobile_DummyReturnFalse iftrue .mobile - loadfont + opentext writetext UnknownText_0x75d65 waitbutton closetext end .mobile: - loadfont + opentext writetext UnknownText_0x75cfe waitbutton closetext end FastShipBed: - loadfont + opentext writetext FastShipBedText1 waitbutton closetext @@ -77,7 +77,7 @@ FastShipBed: pause 60 special RestartMapMusic special Special_FadeInQuickly - loadfont + opentext writetext FastShipBedText2 waitbutton closetext @@ -95,7 +95,7 @@ UnknownScript_0x75ae2: pause 30 checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE iftrue UnknownScript_0x75af7 - loadfont + opentext writetext FastShipArrivedVermilionText waitbutton closetext @@ -103,7 +103,7 @@ UnknownScript_0x75ae2: end UnknownScript_0x75af7: - loadfont + opentext writetext FastShipArrivedOlivineText waitbutton closetext diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 530aa21dc..f7319f427 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -18,7 +18,7 @@ JanineScript_0x195db9: iftrue .FightDone applymovement FUCHSIAGYM_JANINE, MovementData_0x195f27 faceplayer - loadfont + opentext writetext UnknownText_0x195f35 waitbutton closetext @@ -36,7 +36,7 @@ JanineScript_0x195db9: variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER special RunCallback_04 - loadfont + opentext writetext UnknownText_0x195feb playsound SFX_GET_BADGE waitsfx @@ -44,7 +44,7 @@ JanineScript_0x195db9: jump UnknownScript_0x195e02 .FightDone faceplayer - loadfont + opentext UnknownScript_0x195e02: checkevent EVENT_GOT_TM06_TOXIC iftrue UnknownScript_0x195e15 @@ -68,7 +68,7 @@ FuschiaGym1Script_0x195e1b: special RunCallback_04 UnknownScript_0x195e2c: faceplayer - loadfont + opentext checkevent EVENT_BEAT_LASS_ALICE iftrue UnknownScript_0x195e4f writetext UnknownText_0x1960e6 @@ -102,7 +102,7 @@ FuschiaGym2Script_0x195e55: special RunCallback_04 UnknownScript_0x195e66: faceplayer - loadfont + opentext checkevent EVENT_BEAT_LASS_LINDA iftrue UnknownScript_0x195e89 writetext UnknownText_0x196166 @@ -136,7 +136,7 @@ FuschiaGym3Script_0x195e8f: special RunCallback_04 UnknownScript_0x195ea0: faceplayer - loadfont + opentext checkevent EVENT_BEAT_PICNICKER_CINDY iftrue UnknownScript_0x195ec3 writetext UnknownText_0x1961bb @@ -170,7 +170,7 @@ FuschiaGym4Script_0x195ec9: special RunCallback_04 UnknownScript_0x195eda: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CAMPER_BARRY iftrue UnknownScript_0x195efd writetext UnknownText_0x196228 @@ -197,7 +197,7 @@ UnknownScript_0x195efd: FuchsiaGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_JANINE iftrue .FuchsiaGymGuyWinScript writetext FuchsiaGymGuyText diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 6d1b8cac8..fdf0bc045 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -11,7 +11,7 @@ FuchsiaMart_MapScriptHeader: db 0 ClerkScript_0x195ce8: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_FUCHSIA closetext end diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index d1cce6712..36557c0ae 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -28,7 +28,7 @@ CooltrainerFScript_0x19645f: JanineImpersonatorScript_0x196462: faceplayer - loadfont + opentext writetext UnknownText_0x19652e waitbutton closetext @@ -36,7 +36,7 @@ JanineImpersonatorScript_0x196462: faceplayer variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE special RunCallback_04 - loadfont + opentext writetext UnknownText_0x19654e waitbutton closetext diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index cdf0a7b04..456f5aaa0 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -13,7 +13,7 @@ UnknownScript_0x5474f: ClerkScript_0x54750: faceplayer - loadfont + opentext checkevent EVENT_GOT_BICYCLE iftrue UnknownScript_0x54775 writetext UnknownText_0x54787 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 49bb5b9e1..6d33b5ce0 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -12,7 +12,7 @@ GoldenrodBillsHouse_MapScriptHeader: BillsHouseBill: faceplayer - loadfont + opentext checkevent EVENT_GOT_EEVEE iftrue UnknownScript_0x54c1f writetext UnknownText_0x54c74 @@ -53,7 +53,7 @@ UnknownScript_0x54c1f: BillsMom: faceplayer - loadfont + opentext checkevent EVENT_MET_BILL iffalse UnknownScript_0x54c33 writetext UnknownText_0x54ea8 @@ -69,7 +69,7 @@ UnknownScript_0x54c33: BillsSister: faceplayer - loadfont + opentext checkcellnum PHONE_BILL iftrue UnknownScript_0x54c58 writetext UnknownText_0x54f9e diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index b0c657427..ef6321a2e 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -56,7 +56,7 @@ GoldenrodCity_MapScriptHeader: MoveTutor: faceplayer - loadfont + opentext writetext UnknownText_0x199042 yesorno iffalse .Refused @@ -170,7 +170,7 @@ YoungsterScript_0x1989e6: CooltrainerFScript_0x1989e9: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue .ClearedRadioTower writetext UnknownText_0x198ae6 @@ -186,7 +186,7 @@ CooltrainerFScript_0x1989e9: CooltrainerFScript_0x1989fd: faceplayer - loadfont + opentext checkflag ENGINE_RADIO_CARD iftrue .GotRadioCard writetext UnknownText_0x198b73 @@ -210,7 +210,7 @@ GrampsScript_0x198a17: jumptextfaceplayer UnknownText_0x198ccf RocketScript_0x198a1a: - loadfont + opentext writetext UnknownText_0x198d0d buttonsound faceplayer diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index fb1e3314f..ba7c74a18 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -14,14 +14,14 @@ GoldenrodDeptStore2F_MapScriptHeader: ClerkScript_0x55b5d: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_1 closetext end ClerkScript_0x55b65: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_2F_2 closetext end diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 5bab013ca..e9db446a0 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -12,7 +12,7 @@ GoldenrodDeptStore3F_MapScriptHeader: ClerkScript_0x55db8: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_3F closetext end diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index bcc4b2a00..61c5ff120 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -13,7 +13,7 @@ GoldenrodDeptStore4F_MapScriptHeader: ClerkScript_0x55ee9: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_GOLDENROD_4F closetext end @@ -26,7 +26,7 @@ BugCatcherScript_0x55ef4: GameboyKidScript_0x55ef7: faceplayer - loadfont + opentext writetext UnknownText_0x55f74 waitbutton closetext diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 29eb2ee91..72d299472 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -29,7 +29,7 @@ GoldenrodDeptStore5F_MapScriptHeader: ClerkScript_0x5609c: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM02_HEADBUTT iftrue .headbutt checkevent EVENT_GOT_TM08_ROCK_SMASH @@ -63,7 +63,7 @@ ClerkScript_0x5609c: ReceptionistScript_0x560ce: faceplayer - loadfont + opentext checkcode VAR_WEEKDAY if_not_equal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT @@ -108,7 +108,7 @@ ReceptionistScript_0x560ce: TwinScript_0x56118: faceplayer - loadfont + opentext special SpecialGameboyCheck if_not_equal $2, .NotGBC ; This is a dummy check from Gold and Silver. In normal gameplay, this would not be checked. writetext UnknownText_0x56241 @@ -128,7 +128,7 @@ LassScript_0x56130: CooltrainerMScript_0x56133: faceplayer - loadfont + opentext trade $0 waitbutton closetext diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index e4cf46c2f..47f5a9a08 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -10,7 +10,7 @@ GoldenrodDeptStore6F_MapScriptHeader: db 0 GoldenrodVendingMachine: - loadfont + opentext writetext GoldenrodVendingText .Start special PlaceMoneyTopRightOW diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 9332be697..87a745600 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -60,7 +60,7 @@ BlackBeltScript_0x7d7b6: jumptextfaceplayer UnknownText_0x7d875 MachopScript_0x7d7b9: - loadfont + opentext writetext UnknownText_0x7d8bb cry MACHOKE waitbutton diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 699349d52..7326fd7b5 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -8,7 +8,7 @@ GoldenrodDeptStoreElevator_MapScriptHeader: db 0 MapGoldenrodDeptStoreElevatorSignpost0Script: - loadfont + opentext elevator Elevator_0x566e0 closetext iffalse .Done diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 9c281b156..6a95af206 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -44,7 +44,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader: return ClerkScript_0x5673f: - loadfont + opentext pokemart MARTTYPE_ROOFTOP, 0 closetext end @@ -54,7 +54,7 @@ PokefanFScript_0x56746: FisherScript_0x56749: faceplayer - loadfont + opentext writetext UnknownText_0x567d2 waitbutton closetext @@ -65,12 +65,12 @@ TwinScript_0x56754: jumptextfaceplayer UnknownText_0x56839 SuperNerdScript_0x56757: - loadfont + opentext writetext UnknownText_0x56867 waitbutton closetext spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, UP - loadfont + opentext writetext UnknownText_0x56871 waitbutton closetext diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 8ddeb016a..4c2dd558e 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -21,7 +21,7 @@ FlowerShopTeacherScript: checkflag ENGINE_PLAINBADGE iffalse .NoPlainBadge faceplayer - loadfont + opentext writetext UnknownText_0x554c2 buttonsound verbosegiveitem SQUIRTBOTTLE @@ -33,7 +33,7 @@ FlowerShopTeacherScript: .Lalala: spriteface GOLDENRODFLOWERSHOP_TEACHER, LEFT - loadfont + opentext writetext UnknownText_0x5552e waitbutton closetext @@ -50,7 +50,7 @@ FlowerShopTeacherScript: FlowerShopFloriaScript: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_SUDOWOODO iftrue .FoughtSudowoodo checkevent EVENT_GOT_SQUIRTBOTTLE diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 2608b09b7..a5c8e9100 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -44,7 +44,7 @@ UnknownScript_0x56c19: ;0x56c19 PokefanMScript_0x56c1a: faceplayer - loadfont + opentext writetext UnknownText_0x5718a waitbutton closetext @@ -56,7 +56,7 @@ ClerkScript_0x56c25: ReceptionistScript_0x56c28: faceplayer - loadfont + opentext writetext UnknownText_0x56e50 waitbutton checkitem COIN_CASE @@ -160,7 +160,7 @@ MenuData2_0x56cd1: ReceptionistScript_0x56d01: faceplayer - loadfont + opentext writetext UnknownText_0x56e50 waitbutton checkitem COIN_CASE @@ -249,7 +249,7 @@ MenuData2_0x56db8: PharmacistScript_0x56df1: faceplayer - loadfont + opentext writetext UnknownText_0x56f55 waitbutton closetext @@ -258,7 +258,7 @@ PharmacistScript_0x56df1: PokefanMScript_0x56dfc: faceplayer - loadfont + opentext writetext UnknownText_0x56f9e waitbutton closetext @@ -267,7 +267,7 @@ PokefanMScript_0x56dfc: CooltrainerMScript_0x56e07: faceplayer - loadfont + opentext writetext UnknownText_0x56ff4 waitbutton closetext @@ -276,7 +276,7 @@ CooltrainerMScript_0x56e07: PokefanFScript_0x56e12: faceplayer - loadfont + opentext writetext UnknownText_0x5702b waitbutton closetext @@ -288,7 +288,7 @@ CooltrainerFScript_0x56e1d: GentlemanScript_0x56e20: faceplayer - loadfont + opentext writetext UnknownText_0x570b1 waitbutton closetext diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index a79002c37..7441bdc9c 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -27,7 +27,7 @@ WhitneyScript_0x5400c: faceplayer checkevent EVENT_BEAT_WHITNEY iftrue .FightDone - loadfont + opentext writetext UnknownText_0x54122 waitbutton closetext @@ -43,7 +43,7 @@ WhitneyScript_0x5400c: setevent EVENT_BEAT_LASS_CARRIE setevent EVENT_BEAT_LASS_BRIDGET .FightDone - loadfont + opentext checkevent EVENT_MADE_WHITNEY_CRY iffalse .StoppedCrying writetext UnknownText_0x541f4 @@ -99,7 +99,7 @@ TrainerLassCarrie: LassCarrieScript: end_if_just_battled - loadfont + opentext writetext LassCarrieOWText waitbutton closetext @@ -109,7 +109,7 @@ WhitneyCriesScript: showemote EMOTE_SHOCK, GOLDENRODGYM_LASS2, 15 applymovement GOLDENRODGYM_LASS2, BridgetWalksUpMovement spriteface PLAYER, DOWN - loadfont + opentext writetext BridgetWhitneyCriesText waitbutton closetext @@ -123,7 +123,7 @@ TrainerLassBridget: LassBridgetScript: end_if_just_battled - loadfont + opentext writetext LassBridgetOWText waitbutton closetext @@ -134,7 +134,7 @@ TrainerBeautyVictoria: BeautyVictoriaScript: end_if_just_battled - loadfont + opentext writetext BeautyVictoriaOWText waitbutton closetext @@ -145,7 +145,7 @@ TrainerBeautySamantha: BeautySamanthaScript: end_if_just_battled - loadfont + opentext writetext BeautySamanthaOWText waitbutton closetext @@ -155,14 +155,14 @@ GoldenrodGymGuyScript: faceplayer checkevent EVENT_BEAT_WHITNEY iftrue .GoldenrodGymGuyWinScript - loadfont + opentext writetext GoldenrodGymGuyText waitbutton closetext end .GoldenrodGymGuyWinScript - loadfont + opentext writetext GoldenrodGymGuyWinText waitbutton closetext diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 9455ec8f7..cebfef9f2 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -12,7 +12,7 @@ GoldenrodHappinessRater_MapScriptHeader: TeacherScript_0x54953: faceplayer - loadfont + opentext special GetFirstPokemonHappiness writetext UnknownText_0x549a3 buttonsound diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 1b49994e0..08ea69c4f 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -17,7 +17,7 @@ GoldenrodMagnetTrainStation_MapScriptHeader: OfficerScript_0x550ec: faceplayer - loadfont + opentext checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToSaffron writetext UnknownText_0x55160 @@ -64,7 +64,7 @@ Script_ArriveFromSaffron: applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x55146 applymovement PLAYER, MovementData_0x55158 applymovement GOLDENRODMAGNETTRAINSTATION_OFFICER, MovementData_0x5514b - loadfont + opentext writetext UnknownText_0x5526a waitbutton closetext diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 9fae3eb09..3b2c5cc3f 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -10,7 +10,7 @@ GoldenrodNameRatersHouse_MapScriptHeader: GentlemanScript_0x5577c: faceplayer - loadfont + opentext special SpecialNameRater waitbutton closetext diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index ab59a3111..b8c7b1b76 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -31,7 +31,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft: playmusic MUSIC_SHOW_ME_AROUND applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x6105a spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x622f0 waitbutton verbosegiveitem GS_BALL @@ -63,7 +63,7 @@ GoldenrodPokeCenter1F_GSBallTriggerRight: playmusic MUSIC_SHOW_ME_AROUND applymovement GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST, MovementData_0x61065 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x622f0 waitbutton verbosegiveitem GS_BALL @@ -87,7 +87,7 @@ LassScript_0x61021: PokefanFScript_0x61024: faceplayer - loadfont + opentext writetext UnknownText_0x623fb waitbutton writetext UnknownText_0x6248c diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index c10395ab0..ae6f2da00 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -20,7 +20,7 @@ ScientistScript_0x625d7: jumptextfaceplayer UnknownText_0x62795 MapGoldenrodPokeComCenter2FMobileSignpost0Script: - loadfont + opentext writetext UnknownText_0x627ee waitbutton UnknownScript_0x625df: @@ -33,13 +33,13 @@ UnknownScript_0x625df: jump UnknownScript_0x62600 UnknownScript_0x625f0: - loadfont + opentext writetext UnknownText_0x62828 waitbutton jump UnknownScript_0x625df UnknownScript_0x625f8: - loadfont + opentext writetext UnknownText_0x628f4 waitbutton jump UnknownScript_0x625df @@ -65,7 +65,7 @@ MenuData2_0x6260a: MapGoldenrodPokeComCenter2FMobileSignpost1Script: - loadfont + opentext writetext UnknownText_0x62989 waitbutton UnknownScript_0x62629: @@ -78,13 +78,13 @@ UnknownScript_0x62629: jump UnknownScript_0x6264a UnknownScript_0x6263a: - loadfont + opentext writetext UnknownText_0x629ae waitbutton jump UnknownScript_0x62629 UnknownScript_0x62642: - loadfont + opentext writetext UnknownText_0x62a5a waitbutton jump UnknownScript_0x62629 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 1b24dca2c..879b4cae7 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -24,7 +24,7 @@ HallOfFameScript: applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance stopfollow spriteface PLAYER, RIGHT - loadfont + opentext writetext HallOfFame_LanceText waitbutton closetext diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 86a69de02..a29a265ee 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -62,7 +62,7 @@ IcePathB1F_MapScriptHeader: .FinishBoulder: pause 30 scall .BoulderFallsThrough - loadfont + opentext writetext UnknownText_0x7e512 waitbutton closetext diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index b6a637205..75730b8a2 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -91,7 +91,7 @@ IlexForest_MapScriptHeader: IlexForestCharcoalApprenticeScript: faceplayer - loadfont + opentext checkevent EVENT_HERDED_FARFETCHD iftrue .DoneFarfetchd writetext UnknownText_0x6ef5c @@ -120,7 +120,7 @@ IlexForestFarfetchdScript: .Position1: faceplayer - loadfont + opentext writetext Text_ItsTheMissingPokemon buttonsound writetext Text_Kwaaaa @@ -330,7 +330,7 @@ IlexForestFarfetchdScript: .Position10: faceplayer - loadfont + opentext writetext Text_Kwaaaa cry FARFETCH_D waitbutton @@ -339,7 +339,7 @@ IlexForestFarfetchdScript: .CryAndCheckFacing: faceplayer - loadfont + opentext writetext Text_Kwaaaa cry FARFETCH_D waitbutton @@ -349,7 +349,7 @@ IlexForestFarfetchdScript: IlexForestCharcoalMasterScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM01_CUT iftrue .AlreadyGotCut writetext Text_CharcoalMasterIntro @@ -375,7 +375,7 @@ IlexForestCharcoalMasterScript: IlexForestHeadbuttGuyScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM02_HEADBUTT iftrue .AlreadyGotHeadbutt writetext Text_HeadbuttIntro @@ -395,7 +395,7 @@ TrainerBug_catcherWayne: Bug_catcherWayneScript: end_if_just_battled - loadfont + opentext writetext Bug_catcherWayneAfterText waitbutton closetext @@ -446,7 +446,7 @@ MapIlexForestSignpost4Script: jumptext Text_IlexForestShrine .AskCelebiEvent: - loadfont + opentext writetext Text_ShrineCelebiEvent yesorno iftrue .CelebiEvent @@ -479,7 +479,7 @@ MapIlexForestSignpost4Script: iffalse .DidntCatchCelebi appear ILEXFOREST_KURT applymovement ILEXFOREST_KURT, MovementData_0x6ef4e - loadfont + opentext writetext Text_KurtCaughtCelebi waitbutton closetext diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 115e61085..fccd88346 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -90,7 +90,7 @@ UnknownScript_0x180094: playmusic MUSIC_RIVAL_ENCOUNTER spriteface PLAYER, LEFT UnknownScript_0x1800ce: - loadfont + opentext writetext UnknownText_0x1801f5 waitbutton closetext @@ -127,7 +127,7 @@ UnknownScript_0x180103: UnknownScript_0x180113: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext UnknownText_0x1802a4 waitbutton closetext @@ -144,7 +144,7 @@ NurseScript_0x18012c: jumpstd pokecenternurse ClerkScript_0x18012f: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_INDIGO_PLATEAU closetext end @@ -154,7 +154,7 @@ CooltrainerMScript_0x180136: TeleportGuyScript: faceplayer - loadfont + opentext writetext TeleportGuyText1 yesorno iffalse .No @@ -174,7 +174,7 @@ TeleportGuyScript: end AbraScript: - loadfont + opentext writetext AbraText cry ABRA waitbutton diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 5ebd78c95..eb92f779a 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x180bd6: KarenScript_0x180bee: faceplayer - loadfont + opentext checkevent EVENT_BEAT_ELITE_4_KAREN iftrue UnknownScript_0x180c1c writetext UnknownText_0x180c27 @@ -60,7 +60,7 @@ KarenScript_0x180bee: startbattle returnafterbattle setevent EVENT_BEAT_ELITE_4_KAREN - loadfont + opentext writetext UnknownText_0x180d29 waitbutton closetext diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index a0b3ea0cd..f9c4f70e8 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x180742: KogaScript_0x18075a: faceplayer - loadfont + opentext checkevent EVENT_BEAT_ELITE_4_KOGA iftrue UnknownScript_0x180788 writetext UnknownText_0x180793 @@ -60,7 +60,7 @@ KogaScript_0x18075a: startbattle returnafterbattle setevent EVENT_BEAT_ELITE_4_KOGA - loadfont + opentext writetext UnknownText_0x1808ca waitbutton closetext diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 99509db54..4538bf41b 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -37,7 +37,7 @@ UnknownScript_0x7a4db: UnknownScript_0x7a4f2: applymovement KRISSHOUSE1F_MOM1, MovementData_0x7a5fe UnknownScript_0x7a4f6: - loadfont + opentext writetext UnknownText_0x7a604 buttonsound stringtotext GearName, $1 @@ -119,7 +119,7 @@ MomScript_0x7a582: setevent EVENT_RECEIVED_BALLS_FROM_KURT checktriggers iffalse UnknownScript_0x7a572 - loadfont + opentext checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM iftrue UnknownScript_0x7a5af checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST @@ -156,7 +156,7 @@ UnknownScript_0x7a5b8: NeighborScript: faceplayer - loadfont + opentext checkmorn iftrue .MornScript checkday diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 1ae6a00df..eb7c827a4 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -63,7 +63,7 @@ KrissHouseRadio: checkevent EVENT_LISTENED_TO_INITIAL_RADIO iftrue .AbbreviatedRadio playmusic MUSIC_POKEMON_TALK - loadfont + opentext writetext KrisRadioText1 pause 45 writetext KrisRadioText2 @@ -81,7 +81,7 @@ KrissHouseRadio: jumpstd radio1 .AbbreviatedRadio - loadfont + opentext writetext KrisRadioText4 pause 45 closetext @@ -91,7 +91,7 @@ KrissHouseBookshelf: jumpstd picturebookshelf KrissHousePC: - loadfont + opentext special Special_KrissHousePC iftrue .Warp closetext diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index ca3c00081..54783779b 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -24,7 +24,7 @@ KrissNeighborsHouseRadio: checkevent EVENT_LISTENED_TO_INITIAL_RADIO iftrue .AbbreviatedRadio playmusic MUSIC_POKEMON_TALK - loadfont + opentext writetext KrisNeighborRadioText1 pause 45 writetext KrisNeighborRadioText2 @@ -40,7 +40,7 @@ KrissNeighborsHouseRadio: .NormalRadio jumpstd radio1 .AbbreviatedRadio - loadfont + opentext writetext KrisNeighborRadioText4 pause 45 closetext diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 881a90b33..e0f4555c9 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -39,7 +39,7 @@ UnknownScript_0x18e177: KurtScript_0x18e178: faceplayer - loadfont + opentext checkevent EVENT_KURT_GAVE_YOU_LURE_BALL iftrue .GotLureBall checkevent EVENT_CLEARED_SLOWPOKE_WELL @@ -319,7 +319,7 @@ KurtScript_0x18e178: KurtScript_0x18e3bd: faceplayer - loadfont + opentext checkevent EVENT_GAVE_GS_BALL_TO_KURT iftrue KurtScript_ImCheckingItNow KurtMakingBallsScript: @@ -362,28 +362,28 @@ KurtsGranddaughter1: iftrue .SlowpokeBack checkevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET iftrue .Lonely - loadfont + opentext writetext KurtsGranddaughterSlowpokeGoneText waitbutton closetext end .SlowpokeBack - loadfont + opentext writetext KurtsGranddaughterSlowpokeBackText waitbutton closetext end .Lonely - loadfont + opentext writetext KurtsGranddaughterLonelyText waitbutton closetext end .Dad - loadfont + opentext writetext KurtsGranddaughterDadText waitbutton closetext @@ -392,7 +392,7 @@ KurtsGranddaughter1: KurtsGranddaughter2: faceplayer KurtsGranddaughter2Subscript: - loadfont + opentext checkevent EVENT_GAVE_GS_BALL_TO_KURT iftrue .GSBall writetext KurtsGranddaughterHelpText @@ -409,7 +409,7 @@ KurtsGranddaughter2Subscript: end KurtsGranddaughterFunScript: - loadfont + opentext writetext KurtsGranddaughterFunText waitbutton closetext @@ -417,7 +417,7 @@ KurtsGranddaughterFunScript: KurtsHouseSlowpoke: faceplayer - loadfont + opentext writetext KurtsHouseSlowpokeText cry SLOWPOKE waitbutton diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 2213b2012..bec992b47 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -51,7 +51,7 @@ LakeofRage_MapScriptHeader: LanceScript_0x70022: checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE iftrue UnknownScript_0x70057 - loadfont + opentext writetext UnknownText_0x70157 buttonsound faceplayer @@ -79,14 +79,14 @@ UnknownScript_0x7004e: UnknownScript_0x70057: faceplayer - loadfont + opentext writetext UnknownText_0x703a5 yesorno iffalse UnknownScript_0x7004e jump UnknownScript_0x70035 GyaradosScript_0x70063: - loadfont + opentext writetext UnknownText_0x703cb pause 15 cry GYARADOS @@ -98,7 +98,7 @@ GyaradosScript_0x70063: disappear LAKEOFRAGE_GYARADOS UnknownScript_0x7007a: returnafterbattle - loadfont + opentext giveitem RED_SCALE waitsfx writetext UnknownText_0x703df @@ -112,7 +112,7 @@ UnknownScript_0x7007a: GrampsScript_0x7008e: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x7009c writetext UnknownText_0x703f8 @@ -136,7 +136,7 @@ MapLakeofRageSignpost0Script: jumptext UnknownText_0x708d7 MapLakeofRageSignpost1Script: - loadfont + opentext writetext UnknownText_0x70903 checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x700b8 @@ -155,7 +155,7 @@ TrainerFisherAndre: FisherAndreScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7058f waitbutton closetext @@ -166,7 +166,7 @@ TrainerFisherRaymond: FisherRaymondScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x70611 waitbutton closetext @@ -177,7 +177,7 @@ TrainerCooltrainermAaron: CooltrainermAaronScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7069c waitbutton closetext @@ -188,7 +188,7 @@ TrainerCooltrainerfLois: CooltrainerfLoisScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x70752 waitbutton closetext @@ -196,7 +196,7 @@ CooltrainerfLoisScript: WesleyScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_BLACKBELT_FROM_WESLEY iftrue WesleyWednesdayScript checkcode VAR_WEEKDAY diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index ef2f95d58..2abb1e1ff 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -10,7 +10,7 @@ LakeofRageHiddenPowerHouse_MapScriptHeader: HiddenPowerGuy: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM10_HIDDEN_POWER iftrue .AlreadyGotItem writetext HiddenPowerGuyText1 diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index bddee208f..417af28d4 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -10,7 +10,7 @@ LakeofRageMagikarpHouse_MapScriptHeader: FishingGuruScript_0x19a6ae: faceplayer - loadfont + opentext checkevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY iftrue UnknownScript_0x19a6fe checkevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 099b98166..d3572ec37 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -58,7 +58,7 @@ UnknownScript_0x180e74: applymovement PLAYER, MovementData_0x180f3c LanceScript_0x180e7b: spriteface LANCESROOM_LANCE, LEFT - loadfont + opentext writetext UnknownText_0x180f67 waitbutton closetext @@ -69,7 +69,7 @@ LanceScript_0x180e7b: reloadmapmusic returnafterbattle setevent EVENT_BEAT_CHAMPION_LANCE - loadfont + opentext writetext UnknownText_0x181132 waitbutton closetext @@ -86,7 +86,7 @@ LanceScript_0x180e7b: spriteface PLAYER, DOWN appear LANCESROOM_MARY applymovement LANCESROOM_MARY, MovementData_0x180f41 - loadfont + opentext writetext UnknownText_0x1811dd waitbutton closetext @@ -97,19 +97,19 @@ LanceScript_0x180e7b: stopfollow spriteface LANCESROOM_OAK, UP spriteface LANCESROOM_LANCE, LEFT - loadfont + opentext writetext UnknownText_0x18121b waitbutton closetext applymovement LANCESROOM_MARY, MovementData_0x180f4c spriteface PLAYER, LEFT - loadfont + opentext writetext UnknownText_0x18134b waitbutton closetext applymovement LANCESROOM_LANCE, MovementData_0x180f4f spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x18137b waitbutton closetext @@ -125,7 +125,7 @@ LanceScript_0x180e7b: disappear PLAYER applymovement LANCESROOM_MARY, MovementData_0x180f57 showemote EMOTE_SHOCK, LANCESROOM_MARY, 15 - loadfont + opentext writetext UnknownText_0x1813c5 pause 30 closetext diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index ad6de3657..e1f967d10 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -23,7 +23,7 @@ SuperNerdScript_0x7ee69: GentlemanScript_0x7ee6c: faceplayer - loadfont + opentext checkflag ENGINE_EXPN_CARD iftrue .UnknownScript_0x7ee8e checkevent EVENT_RETURNED_MACHINE_PART @@ -54,7 +54,7 @@ GentlemanScript_0x7ee6c: SuperNerdScript_0x7eea2: faceplayer - loadfont + opentext checkflag ENGINE_EXPN_CARD iftrue UnknownScript_0x7eeb0 writetext UnknownText_0x7f193 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 0d804e960..fa753ab1b 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -11,7 +11,7 @@ LavenderMart_MapScriptHeader: db 0 ClerkScript_0x7eb1c: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_LAVENDER closetext end diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index c2b046280..3258685b4 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -16,7 +16,7 @@ UnknownScript_0x7eaf1: LavenderNameRater: faceplayer - loadfont + opentext special SpecialNameRater waitbutton closetext diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index 91eb97831..6cf383773 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -22,7 +22,7 @@ TeacherScript_0x7e6a6: YoungsterScript_0x7e6a9: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x7e6b7 writetext UnknownText_0x7e779 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 81dac0a70..070469ce3 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -16,7 +16,7 @@ MahoganyGym_MapScriptHeader: PryceScript_0x199a9e: faceplayer - loadfont + opentext checkevent EVENT_BEAT_PRYCE iftrue .FightDone writetext UnknownText_0x199b8d @@ -27,7 +27,7 @@ PryceScript_0x199a9e: startbattle returnafterbattle setevent EVENT_BEAT_PRYCE - loadfont + opentext writetext UnknownText_0x199d3b playsound SFX_GET_BADGE waitsfx @@ -75,7 +75,7 @@ TrainerSkierRoxanne: SkierRoxanneScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19a116 waitbutton closetext @@ -86,7 +86,7 @@ TrainerSkierClarissa: SkierClarissaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19a18f waitbutton closetext @@ -97,7 +97,7 @@ TrainerBoarderRonald: BoarderRonaldScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x199f2d waitbutton closetext @@ -108,7 +108,7 @@ TrainerBoarderBrad: BoarderBradScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x199fdd waitbutton closetext @@ -119,7 +119,7 @@ TrainerBoarderDouglas: BoarderDouglasScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19a047 waitbutton closetext @@ -127,7 +127,7 @@ BoarderDouglasScript: MahoganyGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_PRYCE iftrue .MahoganyGymGuyWinScript writetext MahoganyGymGuyText diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 1f16c0a54..3bb527c2c 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -38,7 +38,7 @@ UnknownScript_0x6c362: PharmacistScript_0x6c367: faceplayer - loadfont + opentext checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c375 pokemart MARTTYPE_STANDARD, MART_MAHOGANY_1 @@ -53,7 +53,7 @@ UnknownScript_0x6c375: BlackBeltScript_0x6c37b: faceplayer - loadfont + opentext checkevent EVENT_DECIDED_TO_HELP_LANCE iftrue UnknownScript_0x6c389 writetext UnknownText_0x6c494 @@ -69,7 +69,7 @@ UnknownScript_0x6c389: UnknownScript_0x6c38f: pause 15 - loadfont + opentext writetext UnknownText_0x6c52a pause 15 closetext @@ -80,7 +80,7 @@ UnknownScript_0x6c38f: disappear MAHOGANYMART1F_DRAGON pause 15 applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c407 - loadfont + opentext writetext UnknownText_0x6c549 waitbutton closetext @@ -89,7 +89,7 @@ UnknownScript_0x6c38f: applymovement MAHOGANYMART1F_PHARMACIST, MovementData_0x6c403 applymovement MAHOGANYMART1F_LANCE, MovementData_0x6c40e stopfollow - loadfont + opentext writetext UnknownText_0x6c59e waitbutton showemote EMOTE_SHOCK, MAHOGANYMART1F_PHARMACIST, 10 @@ -99,7 +99,7 @@ UnknownScript_0x6c38f: closetext setevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART spriteface MAHOGANYMART1F_LANCE, LEFT - loadfont + opentext writetext UnknownText_0x6c5ba waitbutton closetext @@ -112,7 +112,7 @@ UnknownScript_0x6c38f: GrannyScript_0x6c3ee: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_MAHOGANY_2 closetext end diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index a45177db7..a2681e9bf 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -14,7 +14,7 @@ BlackBeltScript_0x19997f: TeacherScript_0x199982: faceplayer - loadfont + opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x199990 writetext UnknownText_0x199a0e diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 7a254edf7..e56f898e6 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -48,14 +48,14 @@ UnknownScript_0x19002f: end UnknownScript_0x190039: - loadfont + opentext writetext UnknownText_0x1901a6 waitbutton closetext end UnknownScript_0x190040: - loadfont + opentext writetext UnknownText_0x1900b0 special PlaceMoneyTopRightOW yesorno @@ -93,7 +93,7 @@ UnknownScript_0x190078: GrampsScript_0x19007e: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19008c writetext UnknownText_0x1901e5 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 7e95737cb..7c19eed47 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -10,7 +10,7 @@ ManiasHouse_MapScriptHeader: ManiaScript: faceplayer - loadfont + opentext checkevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM iftrue .default_postevent checkevent EVENT_GOT_SHUCKIE diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index c7965dc56..f633b9dce 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -26,7 +26,7 @@ MountMoon_MapScriptHeader: pause 15 applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext MountMoonSilverTextBefore waitbutton closetext @@ -62,7 +62,7 @@ MountMoon_MapScriptHeader: .FinishBattle: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext MountMoonSilverTextAfter waitbutton closetext diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 3ea62bf3f..1df1c2279 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -13,7 +13,7 @@ MountMoonGiftShop_MapScriptHeader: GrampsScript_0x771a8: faceplayer - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_MT_MOON closetext end diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index c34717597..4fed89559 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -22,7 +22,7 @@ TrainerPokemaniacMiller: PokemaniacMillerScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7debd waitbutton closetext @@ -33,7 +33,7 @@ TrainerSupernerdMarkus: SupernerdMarkusScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7df97 waitbutton closetext diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 846aa3180..fe2e8b7c9 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -19,7 +19,7 @@ TrainerSupernerdHugh: SupernerdHughScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7e10e waitbutton closetext diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index f8ea9a10a..56e090454 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -16,7 +16,7 @@ MountMortarB1F_MapScriptHeader: BlackBeltScript_0x7e1f6: faceplayer - loadfont + opentext checkevent EVENT_GOT_TYROGUE_FROM_KIYO iftrue UnknownScript_0x7e231 checkevent EVENT_BEAT_BLACKBELT_KIYO @@ -29,7 +29,7 @@ BlackBeltScript_0x7e1f6: startbattle returnafterbattle setevent EVENT_BEAT_BLACKBELT_KIYO - loadfont + opentext UnknownScript_0x7e217: writetext UnknownText_0x7e2c0 buttonsound diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 7cbdfb74c..1d054f235 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -10,7 +10,7 @@ MoveDeletersHouse_MapScriptHeader: MoveDeleter: faceplayer - loadfont + opentext special MoveDeletion waitbutton closetext diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 5ff009175..243678c9e 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -19,7 +19,7 @@ LassScript_0x7e8cd: jumptextfaceplayer UnknownText_0x7e940 MrFujisPsyduck: - loadfont + opentext writetext MrFujisPsyduckText cry PSYDUCK waitbutton @@ -27,7 +27,7 @@ MrFujisPsyduck: end MrFujisNidorino: - loadfont + opentext writetext MrFujisNidorinoText cry NIDORINO waitbutton @@ -35,7 +35,7 @@ MrFujisNidorino: end MrFujisPidgey: - loadfont + opentext writetext MrFujisPidgeyText cry PIDGEY waitbutton diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index cc2a6e8e8..227a334d9 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -23,12 +23,12 @@ UnknownScript_0x196e55: UnknownScript_0x196e56: showemote EMOTE_SHOCK, MRPOKEMONSHOUSE_GENTLEMAN, 15 spriteface MRPOKEMONSHOUSE_GENTLEMAN, DOWN - loadfont + opentext writetext UnknownText_0x196f66 waitbutton closetext applymovement PLAYER, MovementData_0x196f5a - loadfont + opentext writetext UnknownText_0x196fa8 buttonsound waitsfx @@ -53,7 +53,7 @@ UnknownScript_0x196e56: GentlemanScript_0x196e97: faceplayer - loadfont + opentext checkitem RED_SCALE iftrue UnknownScript_0x196eb0 checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM @@ -89,7 +89,7 @@ UnknownScript_0x196ec9: playmusic MUSIC_PROF_OAK applymovement MRPOKEMONSHOUSE_OAK, MovementData_0x196f5d spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x197185 buttonsound waitsfx @@ -108,7 +108,7 @@ UnknownScript_0x196ec9: special RestartMapMusic pause 15 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x1970ed waitbutton closetext @@ -120,7 +120,7 @@ UnknownScript_0x196ec9: pause 60 special Special_FadeInQuickly special RestartMapMusic - loadfont + opentext writetext UnknownText_0x197134 waitbutton closetext diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 2271cfd12..04deea556 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -10,7 +10,7 @@ MrPsychicsHouse_MapScriptHeader: MrPsychic: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM29_PSYCHIC iftrue .AlreadyGotItem writetext MrPsychicText1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 32397a31e..1c578b9a5 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -29,7 +29,7 @@ PokefanFScript_0x5c005: TeacherScript_0x5c008: faceplayer - loadfont + opentext checkevent EVENT_GOT_QUICK_CLAW iftrue UnknownScript_0x5c01d writetext UnknownText_0x5c265 @@ -55,7 +55,7 @@ TeacherScript_0x5c029: GrowlitheScript_0x5c02c: faceplayer - loadfont + opentext writetext UnknownText_0x5c416 cry PERSIAN waitbutton @@ -64,7 +64,7 @@ GrowlitheScript_0x5c02c: GameboyKidScript_0x5c037: faceplayer - loadfont + opentext writetext UnknownText_0x5c42a waitbutton closetext @@ -77,7 +77,7 @@ TrainerSchoolboyJack1: SchoolboyJack1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_JACK end_if_just_battled - loadfont + opentext checkflag ENGINE_JACK iftrue UnknownScript_0x5c088 checkcellnum PHONE_SCHOOLBOY_JACK @@ -193,7 +193,7 @@ TrainerPokefanmWilliam: PokefanmWilliamScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5c645 waitbutton closetext @@ -205,7 +205,7 @@ TrainerPokefanfBeverly1: PokefanfBeverly1Script: writecode VAR_CALLERID, PHONE_POKEFAN_BEVERLY end_if_just_battled - loadfont + opentext checkflag ENGINE_BEVERLY_HAS_NUGGET iftrue UnknownScript_0x5c177 checkcellnum PHONE_POKEFAN_BEVERLY @@ -283,7 +283,7 @@ TrainerLassKrise: LassKriseScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5c71d waitbutton closetext diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 144cb7036..887a2a6e4 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -21,7 +21,7 @@ NationalParkBugContest_MapScriptHeader: YoungsterScript_0x5c8ec: faceplayer - loadfont + opentext writetext UnknownText_0x5c94c waitbutton closetext @@ -29,7 +29,7 @@ YoungsterScript_0x5c8ec: YoungsterScript_0x5c8f4: faceplayer - loadfont + opentext writetext UnknownText_0x5c973 waitbutton closetext @@ -37,7 +37,7 @@ YoungsterScript_0x5c8f4: RockerScript_0x5c8fc: faceplayer - loadfont + opentext writetext UnknownText_0x5c9a3 waitbutton closetext @@ -45,7 +45,7 @@ RockerScript_0x5c8fc: PokefanMScript_0x5c904: faceplayer - loadfont + opentext writetext UnknownText_0x5c9cc waitbutton closetext @@ -53,7 +53,7 @@ PokefanMScript_0x5c904: YoungsterScript_0x5c90c: faceplayer - loadfont + opentext writetext UnknownText_0x5ca15 waitbutton closetext @@ -61,7 +61,7 @@ YoungsterScript_0x5c90c: YoungsterScript_0x5c914: faceplayer - loadfont + opentext writetext UnknownText_0x5ca52 waitbutton closetext @@ -69,7 +69,7 @@ YoungsterScript_0x5c914: LassScript_0x5c91c: faceplayer - loadfont + opentext writetext UnknownText_0x5ca8f waitbutton closetext @@ -77,7 +77,7 @@ LassScript_0x5c91c: YoungsterScript_0x5c924: faceplayer - loadfont + opentext writetext UnknownText_0x5cac8 waitbutton closetext @@ -85,7 +85,7 @@ YoungsterScript_0x5c924: YoungsterScript_0x5c92c: faceplayer - loadfont + opentext writetext UnknownText_0x5cb25 waitbutton closetext @@ -93,7 +93,7 @@ YoungsterScript_0x5c92c: YoungsterScript_0x5c934: faceplayer - loadfont + opentext writetext UnknownText_0x5cb64 waitbutton closetext diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 3d6aea445..ffb55d97d 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -31,20 +31,20 @@ NewBarkTown_MapScriptHeader: UnknownScript_0x1a8016: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT - loadfont + opentext writetext UnknownText_0x1a8134 waitbutton closetext spriteface PLAYER, RIGHT applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80d4 - loadfont + opentext writetext UnknownText_0x1a813e waitbutton closetext follow NEWBARKTOWN_TEACHER, PLAYER applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80e0 stopfollow - loadfont + opentext writetext UnknownText_0x1a815e waitbutton closetext @@ -54,21 +54,21 @@ UnknownScript_0x1a8016: UnknownScript_0x1a8041: playmusic MUSIC_MOM spriteface NEWBARKTOWN_TEACHER, LEFT - loadfont + opentext writetext UnknownText_0x1a8134 waitbutton closetext spriteface PLAYER, RIGHT applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80d9 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x1a813e waitbutton closetext follow NEWBARKTOWN_TEACHER, PLAYER applymovement NEWBARKTOWN_TEACHER, MovementData_0x1a80e6 stopfollow - loadfont + opentext writetext UnknownText_0x1a815e waitbutton closetext @@ -77,7 +77,7 @@ UnknownScript_0x1a8041: TeacherScript_0x1a806f: faceplayer - loadfont + opentext checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST iftrue UnknownScript_0x1a8095 checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM @@ -111,12 +111,12 @@ FisherScript_0x1a809b: jumptextfaceplayer UnknownText_0x1a8274 SilverScript_0x1a809e: - loadfont + opentext writetext UnknownText_0x1a82a6 waitbutton closetext spriteface NEWBARKTOWN_SILVER, LEFT - loadfont + opentext writetext UnknownText_0x1a82cd waitbutton closetext diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index cfcefa9c6..30f83b29f 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -16,7 +16,7 @@ UnknownScript_0x19b3c7: Oak: faceplayer - loadfont + opentext checkevent EVENT_OPENED_MT_SILVER iftrue .CheckPokedex checkevent EVENT_TALKED_TO_OAK_IN_KANTO diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index c0d718d0a..9cf4e67f6 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -12,7 +12,7 @@ OlivineCafe_MapScriptHeader: SailorScript_0x9c8c1: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM04_STRENGTH iftrue UnknownScript_0x9c8d3 writetext UnknownText_0x9c8df diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 909bfc867..e643524b0 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -38,7 +38,7 @@ UnknownScript_0x1a8833: waitsfx applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d2 playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1a88fa waitbutton closetext @@ -62,7 +62,7 @@ UnknownScript_0x1a886b: waitsfx applymovement OLIVINECITY_OLIVINE_RIVAL, MovementData_0x1a88d6 playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1a88fa waitbutton closetext @@ -81,7 +81,7 @@ SailorScript_0x1a88a3: StandingYoungsterScript_0x1a88a6: faceplayer - loadfont + opentext random $2 if_equal $0, UnknownScript_0x1a88b4 writetext UnknownText_0x1a8b04 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 57c2b1a2c..51b9bd86c 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -10,7 +10,7 @@ OlivineGoodRodHouse_MapScriptHeader: GoodRodGuru: faceplayer - loadfont + opentext checkevent EVENT_GOT_GOOD_ROD iftrue .AlreadyGotItem writetext OfferGoodRodText diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 8fe3273bf..7c7b54c3a 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -11,7 +11,7 @@ OlivineGym_MapScriptHeader: JasmineScript_0x9c12f: faceplayer - loadfont + opentext checkevent EVENT_BEAT_JASMINE iftrue .FightDone writetext UnknownText_0x9c1b9 @@ -22,7 +22,7 @@ JasmineScript_0x9c12f: startbattle returnafterbattle setevent EVENT_BEAT_JASMINE - loadfont + opentext writetext UnknownText_0x9c33a playsound SFX_GET_BADGE waitsfx @@ -66,21 +66,21 @@ OlivineGymGuyScript: iftrue .OlivineGymGuyWinScript checkevent EVENT_JASMINE_RETURNED_TO_GYM iffalse .OlivineGymGuyPreScript - loadfont + opentext writetext OlivineGymGuyText waitbutton closetext end .OlivineGymGuyWinScript - loadfont + opentext writetext OlivineGymGuyWinText waitbutton closetext end .OlivineGymGuyPreScript - loadfont + opentext writetext OlivineGymGuyPreText waitbutton closetext diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index f9b6dbc09..06cffbe27 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -13,7 +13,7 @@ TeacherScript_0x9c58f: jumptextfaceplayer UnknownText_0x9c5a2 RhydonScript_0x9c592: - loadfont + opentext writetext UnknownText_0x9c5f0 cry RHYDON waitbutton diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index b392bff2d..d3095de7a 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -14,7 +14,7 @@ TrainerGentlemanAlfred: GentlemanAlfredScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5b13e waitbutton closetext @@ -26,7 +26,7 @@ TrainerSailorHuey1: SailorHuey1Script: writecode VAR_CALLERID, PHONE_SAILOR_HUEY end_if_just_battled - loadfont + opentext checkflag ENGINE_HUEY iftrue UnknownScript_0x5afc7 checkcellnum PHONE_SAILOR_HUEY @@ -107,7 +107,7 @@ UnknownScript_0x5b03e: end UnknownScript_0x5b03f: - loadfont + opentext writetext UnknownText_0x5b1b6 waitbutton verbosegiveitem PROTEIN diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index aacd8b37a..d4092c640 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -16,7 +16,7 @@ TrainerBird_keeperTheo: Bird_keeperTheoScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5b2df waitbutton closetext @@ -27,7 +27,7 @@ TrainerGentlemanPreston: GentlemanPrestonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5b457 waitbutton closetext @@ -38,7 +38,7 @@ TrainerSailorTerrell: SailorTerrellScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5b384 waitbutton closetext diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index b4f54d550..ae5571dec 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -14,7 +14,7 @@ TrainerLassConnie: LassConnie1Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5b63c waitbutton closetext @@ -25,7 +25,7 @@ TrainerSailorKent: SailorKentScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5b584 waitbutton closetext diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 6577faded..ee02943d5 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -17,7 +17,7 @@ TrainerBird_keeperDenis: Bird_keeperDenisScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x60ac3 waitbutton closetext @@ -28,7 +28,7 @@ TrainerSailorErnest: SailorErnestScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x60a1f waitbutton closetext diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index a2ce7254d..72a0ebb8e 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -12,7 +12,7 @@ OlivineLighthouse6F_MapScriptHeader: JasmineScript_0x60b91: faceplayer - loadfont + opentext checkitem SECRETPOTION iftrue UnknownScript_0x60bab checkevent EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS @@ -39,7 +39,7 @@ UnknownScript_0x60bab: spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT pause 15 spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT - loadfont + opentext playmusic MUSIC_HEAL writetext UnknownText_0x60e44 pause 60 @@ -50,7 +50,7 @@ UnknownScript_0x60bab: special FadeOutPalettes pause 10 special FadeInPalettes - loadfont + opentext writetext UnknownText_0x60f3d waitbutton closetext @@ -63,7 +63,7 @@ UnknownScript_0x60bab: spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT pause 10 faceplayer - loadfont + opentext writetext UnknownText_0x60e6c waitbutton closetext @@ -93,7 +93,7 @@ UnknownScript_0x60c25: spriteface OLIVINELIGHTHOUSE6F_JASMINE, RIGHT pause 15 spriteface OLIVINELIGHTHOUSE6F_MONSTER, LEFT - loadfont + opentext writetext UnknownText_0x60ef1 waitbutton closetext @@ -104,7 +104,7 @@ UnknownScript_0x60c39: MonsterScript_0x60c3a: faceplayer - loadfont + opentext checkevent EVENT_JASMINE_RETURNED_TO_GYM iftrue UnknownScript_0x60c51 writetext UnknownText_0x60f03 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index f8ca67bcf..06c999876 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -11,7 +11,7 @@ OlivineMart_MapScriptHeader: db 0 ClerkScript_0x9cac7: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_OLIVINE closetext end diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 7e42d0313..f8b49bd0a 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -35,7 +35,7 @@ UnknownScript_0x748b1: SailorScript_0x748c0: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 @@ -83,7 +83,7 @@ UnknownScript_0x7491f: checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x7498b spriteface PLAYER, LEFT - loadfont + opentext checkevent EVENT_FAST_SHIP_FIRST_TIME iffalse UnknownScript_0x7494e checkcode VAR_WEEKDAY @@ -146,7 +146,7 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74919 checkevent EVENT_FAST_SHIP_FIRST_TIME @@ -201,7 +201,7 @@ SailorScript_0x749fe: FishingGuruScript_0x74a01: faceplayer - loadfont + opentext writetext UnknownText_0x74bf4 waitbutton closetext @@ -210,7 +210,7 @@ FishingGuruScript_0x74a01: FishingGuruScript_0x74a0c: faceplayer - loadfont + opentext writetext UnknownText_0x74c35 waitbutton closetext @@ -219,7 +219,7 @@ FishingGuruScript_0x74a0c: YoungsterScript_0x74a17: faceplayer - loadfont + opentext writetext UnknownText_0x74c76 waitbutton closetext @@ -228,7 +228,7 @@ YoungsterScript_0x74a17: CooltrainerFScript_0x74a22: faceplayer - loadfont + opentext writetext UnknownText_0x74ca2 waitbutton closetext diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index 499e21c82..acd87e47e 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -10,7 +10,7 @@ OlivineVoltorbHouse_MapScriptHeader: Tim: faceplayer - loadfont + opentext trade $2 waitbutton closetext diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index fbf07f57e..5baaf418d 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -27,7 +27,7 @@ BugCatcherScript_0x18c00c: GrampsScript_0x18c00f: faceplayer - loadfont + opentext checkevent EVENT_GOT_SILVER_WING iftrue UnknownScript_0x18c023 writetext UnknownText_0x18c0c6 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 8ef27b007..57818a9d9 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -12,7 +12,7 @@ PewterGym_MapScriptHeader: BrockScript_0x1a2864: faceplayer - loadfont + opentext checkflag ENGINE_BOULDERBADGE iftrue .FightDone writetext UnknownText_0x1a28d0 @@ -24,7 +24,7 @@ BrockScript_0x1a2864: returnafterbattle setevent EVENT_BEAT_BROCK setevent EVENT_BEAT_CAMPER_JERRY - loadfont + opentext writetext UnknownText_0x1a2a3d playsound SFX_GET_BADGE waitsfx @@ -45,7 +45,7 @@ TrainerCamperJerry: CamperJerryScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a2c0f waitbutton closetext @@ -53,7 +53,7 @@ CamperJerryScript: PewterGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_BROCK iftrue .PewterGymGuyWinScript writetext PewterGymGuyText diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index ca7940576..6ee67b720 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -11,7 +11,7 @@ PewterMart_MapScriptHeader: db 0 ClerkScript_0x1a2dcb: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_PEWTER closetext end diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 541f123d6..47d8a1481 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -13,7 +13,7 @@ SuperNerdScript_0x1a2807: jumptextfaceplayer UnknownText_0x1a2814 GrowlitheScript_0x1a280a: - loadfont + opentext writetext UnknownText_0x1a2825 cry NIDORAN_M waitbutton diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index cf3d55a0e..1ab6012a8 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -19,7 +19,7 @@ TeacherScript_0x1a2eea: jumptextfaceplayer UnknownText_0x1a2f01 JigglypuffScript_0x1a2eed: - loadfont + opentext writetext UnknownText_0x1a2f5d cry JIGGLYPUFF waitbutton @@ -31,7 +31,7 @@ BugCatcherScript_0x1a2ef7: PokefanMScript_0x1a2efa: faceplayer - loadfont + opentext trade $4 waitbutton closetext diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 0c2e6b5da..c9d6922c6 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -57,7 +57,7 @@ PokeCenter2F_AppearMysteryGiftDeliveryGuy: Script_TradeCenterClosed: faceplayer - loadfont + opentext writetext Text_TradeRoomClosed waitbutton closetext @@ -65,7 +65,7 @@ Script_TradeCenterClosed: Script_BattleRoomClosed: faceplayer - loadfont + opentext writetext Text_BattleRoomClosed waitbutton closetext @@ -74,7 +74,7 @@ Script_BattleRoomClosed: LinkReceptionistScript_Trade: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse Script_TradeCenterClosed - loadfont + opentext writetext Text_TradeReceptionistIntro yesorno iffalse .Cancel @@ -176,7 +176,7 @@ BattleTradeMobile_WalkIn: LinkReceptionistScript_Battle: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iffalse Script_BattleRoomClosed - loadfont + opentext writetext Text_BattleReceptionistIntro yesorno iffalse .Cancel @@ -294,7 +294,7 @@ LinkReceptionistScript_Battle: Script_TimeCapsuleClosed: faceplayer - loadfont + opentext writetext Text_TimeCapsuleClosed waitbutton closetext @@ -307,7 +307,7 @@ LinkReceptionistScript_TimeCapsule: iftrue Script_TimeCapsuleClosed special Special_SetBitsForTimeCapsuleRequest faceplayer - loadfont + opentext writetext Text_TimeCapsuleReceptionistIntro yesorno iffalse .Cancel @@ -425,13 +425,13 @@ PokeCenter2F_CheckGender: .Female: applymovement2 MovementData_0x192cd8 applymovement PLAYER, MovementData_0x192ce2 - loadfont + opentext writetext Text_OhPleaseWait waitbutton closetext applymovement2 MovementData_0x192cdc spriteface PLAYER, LEFT - loadfont + opentext writetext Text_ChangeTheLook waitbutton closetext @@ -442,7 +442,7 @@ PokeCenter2F_CheckGender: applymovement PLAYER, MovementData_0x192d1c setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite - loadfont + opentext writetext Text_LikeTheLook waitbutton closetext @@ -531,7 +531,7 @@ TimeCapsuleScript_CheckPlayerGender: applymovement2 MovementData_0x192d33 applymovement PLAYER, MovementData_0x192d31 .FemaleContinue: - loadfont + opentext writetext Text_OhPleaseWait waitbutton closetext @@ -539,7 +539,7 @@ TimeCapsuleScript_CheckPlayerGender: if_not_equal UP, .FemaleChangeApperance spriteface PLAYER, LEFT .FemaleChangeApperance: - loadfont + opentext writetext Text_ChangeTheLook waitbutton closetext @@ -551,7 +551,7 @@ TimeCapsuleScript_CheckPlayerGender: faceperson PLAYER, POKECENTER2F_LINK_RECEPTIONIST3 setflag ENGINE_KRIS_IN_CABLE_CLUB special ReplaceKrisSprite - loadfont + opentext writetext Text_LikeTheLook waitbutton closetext @@ -593,7 +593,7 @@ MapPokeCenter2FSignpost0Script: OfficerScript_0x192c9a: faceplayer - loadfont + opentext checkevent EVENT_MYSTERY_GIFT_DELIVERY_GUY iftrue .AlreadyGotGift writetext Text_MysteryGiftDeliveryGuy_Intro diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index 1a4fdb7dd..40c039f83 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -10,7 +10,7 @@ PokeSeersHouse_MapScriptHeader: SeerScript: faceplayer - loadfont + opentext special SpecialPokeSeer waitbutton closetext diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 6c8399849..9331b6681 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -15,7 +15,7 @@ PokemonFanClub_MapScriptHeader: GentlemanScript_0x1917e9: faceplayer - loadfont + opentext checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT iftrue UnknownScript_0x191815 checkevent EVENT_LISTENED_TO_FAN_CLUB_PRESIDENT_BUT_BAG_WAS_FULL @@ -54,7 +54,7 @@ ReceptionistScript_0x191821: FisherScript_0x191824: faceplayer - loadfont + opentext checkevent EVENT_GOT_LOST_ITEM_FROM_FAN_CLUB iftrue UnknownScript_0x19185f checkevent EVENT_RETURNED_MACHINE_PART @@ -107,7 +107,7 @@ FairyScript_0x19186e: jumptext UnknownText_0x191db1 OddishScript_0x191871: - loadfont + opentext writetext UnknownText_0x191de9 cry BAYLEEF waitbutton diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 2c474a046..41cd2e816 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -32,13 +32,13 @@ UnknownScript_0x188dc5: applymovement POWERPLANT_OFFICER1, MovementData_0x188ed5 spriteface POWERPLANT_GYM_GUY1, DOWN spriteface POWERPLANT_GYM_GUY2, DOWN - loadfont + opentext writetext UnknownText_0x188f22 waitbutton closetext spriteface POWERPLANT_OFFICER1, LEFT spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x188f7f waitbutton closetext @@ -49,7 +49,7 @@ UnknownScript_0x188dc5: OfficerScript_0x188df5: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e0f checkevent EVENT_MET_MANAGER_AT_POWER_PLANT @@ -73,7 +73,7 @@ UnknownScript_0x188e0f: GymGuyScript_0x188e15: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e23 writetext UnknownText_0x188fcf @@ -89,7 +89,7 @@ UnknownScript_0x188e23: GymGuyScript_0x188e29: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e37 writetext UnknownText_0x189079 @@ -105,7 +105,7 @@ UnknownScript_0x188e37: OfficerScript_0x188e3d: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e4b writetext UnknownText_0x18910e @@ -121,7 +121,7 @@ UnknownScript_0x188e4b: GymGuyScript_0x188e51: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188e5f writetext UnknownText_0x1891c2 @@ -137,7 +137,7 @@ UnknownScript_0x188e5f: PowerPlantManager: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188eac checkitem MACHINE_PART @@ -192,7 +192,7 @@ UnknownScript_0x188ec5: GymGuyScript_0x188ecb: faceplayer - loadfont + opentext trade $6 waitbutton closetext diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index a4036f30f..a15cefda5 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -15,7 +15,7 @@ RadioTower1F_MapScriptHeader: ReceptionistScript_0x5cd29: faceplayer - loadfont + opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x5cd37 writetext UnknownText_0x5ce77 @@ -31,7 +31,7 @@ UnknownScript_0x5cd37: GentlemanScript_0x5cd3d: faceplayer - loadfont + opentext writetext UnknownText_0x5ceba buttonsound special Special_CheckLuckyNumberShowFlag @@ -45,7 +45,7 @@ GentlemanScript_0x5cd3d: buttonsound closetext applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce71 - loadfont + opentext writetext UnknownText_0x5cf5a buttonsound waitsfx @@ -56,7 +56,7 @@ GentlemanScript_0x5cd3d: special Special_CheckForLuckyNumberWinners closetext applymovement RADIOTOWER1F_GENTLEMAN, MovementData_0x5ce74 - loadfont + opentext if_equal 1, .FirstPlace if_equal 2, .SecondPlace if_equal 3, .ThirdPlace @@ -115,7 +115,7 @@ GentlemanScript_0x5cd3d: CooltrainerFScript_0x5cdd5: faceplayer - loadfont + opentext checkflag ENGINE_RADIO_CARD iftrue UnknownScript_0x5ce2d writetext UnknownText_0x5d12d @@ -190,7 +190,7 @@ TrainerGruntM3: GruntM3Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5d5a2 waitbutton closetext diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 239a152c7..13835e96b 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -26,7 +26,7 @@ SuperNerdScript_0x5d6fe: TeacherScript_0x5d701: faceplayer - loadfont + opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x5d70f writetext UnknownText_0x5d956 @@ -41,7 +41,7 @@ UnknownScript_0x5d70f: end JigglypuffScript_0x5d715: - loadfont + opentext writetext UnknownText_0x5d9b6 cry JIGGLYPUFF waitbutton @@ -59,7 +59,7 @@ TrainerGruntM4: GruntM4Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5db07 waitbutton closetext @@ -70,7 +70,7 @@ TrainerGruntM5: GruntM5Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5db99 waitbutton closetext @@ -81,7 +81,7 @@ TrainerGruntM6: GruntM6Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5dc00 waitbutton closetext @@ -92,7 +92,7 @@ TrainerGruntF2: GruntF2Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5dcd0 waitbutton closetext @@ -100,7 +100,7 @@ GruntF2Script: Buena: faceplayer - loadfont + opentext checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0x5d865 checkevent EVENT_MET_BUENA @@ -128,7 +128,7 @@ Buena: applymovement PLAYER, MovementData_0x5d921 UnknownScript_0x5d7be: spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x5dedd waitbutton closetext @@ -137,7 +137,7 @@ UnknownScript_0x5d7be: special SpecialBuenasPassword closetext iffalse UnknownScript_0x5d845 - loadfont + opentext writetext UnknownText_0x5dfc1 waitbutton closetext @@ -149,7 +149,7 @@ UnknownScript_0x5d7be: setflag ENGINE_BUENAS_PASSWORD_2 pause 20 spriteface RADIOTOWER2F_BUENA, RIGHT - loadfont + opentext writetext UnknownText_0x5e054 waitbutton closetext @@ -202,13 +202,13 @@ UnknownScript_0x5d83f: UnknownScript_0x5d845: setflag ENGINE_BUENAS_PASSWORD_2 - loadfont + opentext writetext UnknownText_0x5e01c waitbutton closetext spriteface RADIOTOWER2F_BUENA, RIGHT pause 20 - loadfont + opentext writetext UnknownText_0x5e054 waitbutton closetext @@ -272,12 +272,12 @@ UnknownScript_0x5d8a4: showemote EMOTE_SHOCK, RADIOTOWER2F_BUENA, 15 setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER - loadfont + opentext writetext UnknownText_0x5e1ee jump UnknownScript_0x5d8d0 UnknownScript_0x5d8cc: - loadfont + opentext writetext UnknownText_0x5e2bf UnknownScript_0x5d8d0: askforphonenumber PHONE_BUENA @@ -311,7 +311,7 @@ UnknownScript_0x5d8fe: ReceptionistScript_0x5d8ff: faceplayer - loadfont + opentext checkitem BLUE_CARD iffalse UnknownScript_0x5d90f writetext UnknownText_0x5e392 diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 80e2a08e2..d848ddd09 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -33,7 +33,7 @@ SuperNerdScript_0x5e553: GymGuyScript_0x5e556: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue UnknownScript_0x5e564 writetext UnknownText_0x5e682 @@ -49,7 +49,7 @@ UnknownScript_0x5e564: CooltrainerFScript_0x5e56a: faceplayer - loadfont + opentext checkevent EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER iftrue UnknownScript_0x5e59d checkevent EVENT_CLEARED_RADIO_TOWER @@ -90,7 +90,7 @@ TrainerGruntM7: GruntM7Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5e8d0 waitbutton closetext @@ -101,7 +101,7 @@ TrainerGruntM8: GruntM8Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5e944 waitbutton closetext @@ -112,7 +112,7 @@ TrainerGruntM9: GruntM9Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5e9d0 waitbutton closetext @@ -123,14 +123,14 @@ TrainerScientistMarc: ScientistMarcScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5ea61 waitbutton closetext end MapRadioTower3FSignpost2Script:: - loadfont + opentext writetext UnknownText_0x5eaa4 waitbutton checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index cb09744cd..398a9d337 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -19,7 +19,7 @@ FisherScript_0x5eb82: TeacherScript_0x5eb85: faceplayer - loadfont + opentext checkevent EVENT_GOT_PINK_BOW_FROM_MARY iftrue UnknownScript_0x5ebac checkevent EVENT_CLEARED_RADIO_TOWER @@ -48,7 +48,7 @@ UnknownScript_0x5ebb0: end GrowlitheScript_0x5ebb2: - loadfont + opentext writetext UnknownText_0x5ed66 cry MEOWTH waitbutton @@ -60,7 +60,7 @@ TrainerGruntM10: GruntM10Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5ede2 waitbutton closetext @@ -71,7 +71,7 @@ TrainerExecutivem2: Executivem2Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5ee69 waitbutton closetext @@ -82,7 +82,7 @@ TrainerGruntF4: GruntF4Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5ef31 waitbutton closetext @@ -93,7 +93,7 @@ TrainerScientistRich: ScientistRichScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5efcb waitbutton closetext diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index a0c75646c..05483a078 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -29,13 +29,13 @@ RadioTower5F_MapScriptHeader: FakeDirectorScript: spriteface RADIOTOWER5F_DIRECTOR, UP showemote EMOTE_SHOCK, RADIOTOWER5F_DIRECTOR, 15 - loadfont + opentext writetext FakeDirectorTextBefore1 waitbutton closetext applymovement RADIOTOWER5F_DIRECTOR, FakeDirectorMovement playmusic MUSIC_ROCKET_ENCOUNTER - loadfont + opentext writetext FakeDirectorTextBefore2 waitbutton closetext @@ -44,7 +44,7 @@ FakeDirectorScript: loadtrainer EXECUTIVEM, 3 startbattle returnafterbattle - loadfont + opentext writetext FakeDirectorTextAfter buttonsound verbosegiveitem BASEMENT_KEY @@ -55,7 +55,7 @@ FakeDirectorScript: Director: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_RADIO_TOWER iftrue .TrueDirector writetext FakeDirectorTextAfter @@ -74,7 +74,7 @@ TrainerExecutivef1: Executivef1Script: end_if_just_battled - loadfont + opentext writetext Executivef1AfterText waitbutton closetext @@ -84,7 +84,7 @@ RadioTower5FRocketBossTrigger: applymovement PLAYER, MovementData_0x60125 playmusic MUSIC_ROCKET_ENCOUNTER spriteface RADIOTOWER5F_ROCKET, RIGHT - loadfont + opentext writetext RadioTower5FRocketBossBeforeText waitbutton closetext @@ -93,7 +93,7 @@ RadioTower5FRocketBossTrigger: loadtrainer EXECUTIVEM, 1 startbattle returnafterbattle - loadfont + opentext writetext RadioTower5FRocketBossAfterText waitbutton closetext @@ -121,7 +121,7 @@ RadioTower5FRocketBossTrigger: appear RADIOTOWER5F_DIRECTOR applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksIn spriteface PLAYER, RIGHT - loadfont + opentext writetext RadioTower5FDirectorThankYouText buttonsound verbosegiveitem CLEAR_BELL diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 7546416ca..a7e4af0e6 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -16,7 +16,7 @@ RedsHouse1F_MapScriptHeader: RedsMom: faceplayer - loadfont + opentext checkevent EVENT_MET_REDS_MOM iftrue .MetAlready writetext RedsMomText1 diff --git a/maps/Route1.asm b/maps/Route1.asm index 4625a7f6f..79d7190dc 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -15,7 +15,7 @@ TrainerSchoolboyDanny: SchoolboyDannyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ac5d7 waitbutton closetext @@ -26,7 +26,7 @@ TrainerCooltrainerfQuinn: CooltrainerfQuinnScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ac640 waitbutton closetext diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index a2f971b43..720421fda 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -19,7 +19,7 @@ GentlemanScript_0x188bd7: GymGuyScript_0x188bda: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x188be8 writetext UnknownText_0x188c26 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index fc94bbc2f..840895a97 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -14,7 +14,7 @@ TrainerHikerJim: HikerJimScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ae43b waitbutton closetext @@ -25,7 +25,7 @@ TrainerPokefanmRobert: PokefanmRobertScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ae4a9 waitbutton closetext diff --git a/maps/Route11.asm b/maps/Route11.asm index b06dce62c..fe0f274d3 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -17,7 +17,7 @@ TrainerYoungsterOwen: YoungsterOwenScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x680b2 waitbutton closetext @@ -28,7 +28,7 @@ TrainerYoungsterJason: YoungsterJasonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6814a waitbutton closetext @@ -39,7 +39,7 @@ TrainerPsychicHerman: PsychicHermanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6817b waitbutton closetext @@ -50,7 +50,7 @@ TrainerPsychicFidel: PsychicFidelScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x681ec waitbutton closetext diff --git a/maps/Route12.asm b/maps/Route12.asm index 50ef063c0..903aaa9e8 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -18,7 +18,7 @@ TrainerFisherKyle: FisherKyleScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a7238 waitbutton closetext @@ -29,7 +29,7 @@ TrainerFisherMartin: FisherMartinScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a704c waitbutton closetext @@ -40,7 +40,7 @@ TrainerFisherStephen: FisherStephenScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a70d4 waitbutton closetext @@ -51,7 +51,7 @@ TrainerFisherBarney: FisherBarneyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a716d waitbutton closetext diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index bad13a8c1..f19594e20 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -10,7 +10,7 @@ Route12SuperRodHouse_MapScriptHeader: FishingGuruScript_0x7f484: faceplayer - loadfont + opentext checkevent EVENT_GOT_SUPER_ROD iftrue UnknownScript_0x7f4a0 writetext UnknownText_0x7f4af diff --git a/maps/Route13.asm b/maps/Route13.asm index b385f007b..5e25f6ac3 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -17,7 +17,7 @@ TrainerPokefanmAlex: PokefanmAlexScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a24e3 waitbutton closetext @@ -28,7 +28,7 @@ TrainerPokefanmJoshua: PokefanmJoshuaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a254f waitbutton closetext @@ -39,7 +39,7 @@ TrainerBird_keeperPerry: Bird_keeperPerryScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a25db waitbutton closetext @@ -50,7 +50,7 @@ TrainerBird_keeperBret: Bird_keeperBretScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a2662 waitbutton closetext @@ -61,7 +61,7 @@ TrainerHikerKenny: HikerKennyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a26c2 waitbutton closetext diff --git a/maps/Route14.asm b/maps/Route14.asm index cb1095807..bef460b42 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -13,7 +13,7 @@ Route14_MapScriptHeader: TeacherScript_0x1ad47f: faceplayer - loadfont + opentext trade $5 waitbutton closetext @@ -24,7 +24,7 @@ TrainerPokefanmCarter: PokefanmCarterScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ad508 waitbutton closetext @@ -35,7 +35,7 @@ TrainerBird_keeperRoy: Bird_keeperRoyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ad5a4 waitbutton closetext @@ -46,7 +46,7 @@ TrainerPokefanmTrevor: PokefanmTrevorScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ad660 waitbutton closetext diff --git a/maps/Route15.asm b/maps/Route15.asm index 3519945e7..f3019c27d 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -19,7 +19,7 @@ TrainerTeacherColette: TeacherColetteScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1aa60d waitbutton closetext @@ -30,7 +30,7 @@ TrainerTeacherHillary: TeacherHillaryScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1aa6ca waitbutton closetext @@ -41,7 +41,7 @@ TrainerSchoolboyKipp: SchoolboyKippScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1aa740 waitbutton closetext @@ -52,7 +52,7 @@ TrainerSchoolboyTommy: SchoolboyTommyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1aa7bc waitbutton closetext @@ -63,7 +63,7 @@ TrainerSchoolboyJohnny: SchoolboyJohnnyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1aa84a waitbutton closetext @@ -74,7 +74,7 @@ TrainerSchoolboyBilly: SchoolboyBillyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1aa8b0 waitbutton closetext diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index f5168a13d..5ed348e52 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -25,7 +25,7 @@ UnknownScript_0x733ed: UnknownScript_0x733f3: showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x73496 waitbutton closetext diff --git a/maps/Route17.asm b/maps/Route17.asm index b5464f20a..bf32ef2f7 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -25,7 +25,7 @@ TrainerBikerCharles: BikerCharlesScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ad293 waitbutton closetext @@ -36,7 +36,7 @@ TrainerBikerRiley: BikerRileyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ad13b waitbutton closetext @@ -47,7 +47,7 @@ TrainerBikerJoel: BikerJoelScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ad196 waitbutton closetext @@ -58,7 +58,7 @@ TrainerBikerGlenn: BikerGlennScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ad225 waitbutton closetext diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 22edc065e..a09dde909 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -25,7 +25,7 @@ UnknownScript_0x73611: UnknownScript_0x73617: showemote EMOTE_SHOCK, ROUTE1718GATE_OFFICER, 15 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x7364d waitbutton closetext diff --git a/maps/Route18.asm b/maps/Route18.asm index 1e5852cf6..276fa7bea 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -14,7 +14,7 @@ TrainerBird_keeperBoris: Bird_keeperBorisScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1acfa5 waitbutton closetext @@ -25,7 +25,7 @@ TrainerBird_keeperBob: Bird_keeperBobScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ad00d waitbutton closetext diff --git a/maps/Route19.asm b/maps/Route19.asm index 8aee0b309..bf1fc5dcb 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -34,7 +34,7 @@ TrainerSwimmerfDawn: SwimmerfDawnScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19ebad waitbutton closetext @@ -45,7 +45,7 @@ TrainerSwimmermHarold: SwimmermHaroldScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19eab4 waitbutton closetext @@ -56,7 +56,7 @@ TrainerSwimmermJerome: SwimmermJeromeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19ec7e waitbutton closetext @@ -67,7 +67,7 @@ TrainerSwimmermTucker: SwimmermTuckerScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19eb3b waitbutton closetext @@ -75,7 +75,7 @@ SwimmermTuckerScript: FisherScript_0x19ea4d: faceplayer - loadfont + opentext checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue UnknownScript_0x19ea5b writetext UnknownText_0x19ecaf @@ -91,7 +91,7 @@ UnknownScript_0x19ea5b: FisherScript_0x19ea61: faceplayer - loadfont + opentext checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue UnknownScript_0x19ea6f writetext UnknownText_0x19ed45 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index 6e8a8bf4b..a958c7af4 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -10,7 +10,7 @@ Route19FuchsiaGate_MapScriptHeader: OfficerScript_0x1ab3f6: faceplayer - loadfont + opentext checkevent EVENT_CINNABAR_ROCKS_CLEARED iftrue .RocksCleared writetext UnknownText_0x1ab40a diff --git a/maps/Route2.asm b/maps/Route2.asm index 08a309d14..307c842e0 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -20,7 +20,7 @@ TrainerBug_catcherRob: Bug_catcherRobScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ac34d waitbutton closetext @@ -31,7 +31,7 @@ TrainerBug_catcherEd: Bug_catcherEdScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ac3cf waitbutton closetext @@ -42,7 +42,7 @@ TrainerBug_catcherDoug: Bug_catcherDougScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ac423 waitbutton closetext diff --git a/maps/Route20.asm b/maps/Route20.asm index f1c9cc59e..69cfea8eb 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -23,7 +23,7 @@ TrainerSwimmerfNicole: SwimmerfNicoleScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1acd93 waitbutton closetext @@ -34,7 +34,7 @@ TrainerSwimmerfLori: SwimmerfLoriScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ace15 waitbutton closetext @@ -45,7 +45,7 @@ TrainerSwimmermCameron: SwimmermCameronScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ace8b waitbutton closetext diff --git a/maps/Route21.asm b/maps/Route21.asm index 3b3e598b4..bb3a2cb59 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -15,7 +15,7 @@ TrainerSwimmermSeth: SwimmermSethScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ac873 waitbutton closetext @@ -26,7 +26,7 @@ TrainerSwimmerfNikki: SwimmerfNikkiScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ac8f1 waitbutton closetext @@ -37,7 +37,7 @@ TrainerFisherArnold: FisherArnoldScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ac95c waitbutton closetext diff --git a/maps/Route24.asm b/maps/Route24.asm index 9f609eb61..fc6b8a0c4 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -11,7 +11,7 @@ Route24_MapScriptHeader: RocketScript_0x1adbfa: faceplayer playmusic MUSIC_ROCKET_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1adc2e waitbutton closetext @@ -21,7 +21,7 @@ RocketScript_0x1adbfa: reloadmapmusic returnafterbattle playmusic MUSIC_ROCKET_ENCOUNTER - loadfont + opentext writetext UnknownText_0x1addc0 buttonsound special Special_FadeOutMusic diff --git a/maps/Route25.asm b/maps/Route25.asm index 53115d8dc..9743ce17e 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -40,7 +40,7 @@ UnknownScript_0x19eea0: spriteface ROUTE25_MISTY, UP pause 10 applymovement ROUTE25_MISTY, MovementData_0x19efed - loadfont + opentext writetext UnknownText_0x19f006 waitbutton closetext @@ -66,7 +66,7 @@ UnknownScript_0x19eee0: spriteface ROUTE25_MISTY, UP pause 10 applymovement ROUTE25_MISTY, MovementData_0x19eff4 - loadfont + opentext writetext UnknownText_0x19f006 waitbutton closetext @@ -85,7 +85,7 @@ TrainerSchoolboyDudley: SchoolboyDudleyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19f1b5 waitbutton closetext @@ -96,7 +96,7 @@ TrainerLassEllen: LassEllenScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19f208 waitbutton closetext @@ -107,7 +107,7 @@ TrainerSchoolboyJoe: SchoolboyJoeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19f25c waitbutton closetext @@ -118,7 +118,7 @@ TrainerLassLaura: LassLauraScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19f2a6 waitbutton closetext @@ -129,7 +129,7 @@ TrainerCamperLloyd: CamperLloydScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19f2f8 waitbutton closetext @@ -140,7 +140,7 @@ TrainerLassShannon: LassShannonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19f35b waitbutton closetext @@ -151,7 +151,7 @@ TrainerSupernerdPat: SupernerdPatScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19f41a waitbutton closetext @@ -159,7 +159,7 @@ SupernerdPatScript: CooltrainerMScript_0x19efac: faceplayer - loadfont + opentext checkevent EVENT_BEAT_COOLTRAINERM_KEVIN iftrue UnknownScript_0x19efda checkevent EVENT_CLEARED_NUGGET_BRIDGE @@ -178,7 +178,7 @@ UnknownScript_0x19efc7: startbattle returnafterbattle setevent EVENT_BEAT_COOLTRAINERM_KEVIN - loadfont + opentext UnknownScript_0x19efda: writetext UnknownText_0x19f520 waitbutton diff --git a/maps/Route26.asm b/maps/Route26.asm index dc81d71c0..ef03c9f50 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -20,7 +20,7 @@ TrainerCooltrainermJake: CooltrainermJakeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a4f08 waitbutton closetext @@ -32,7 +32,7 @@ TrainerCooltrainermGaven3: CooltrainermGaven3Script: writecode VAR_CALLERID, PHONE_COOLTRAINERM_GAVEN end_if_just_battled - loadfont + opentext checkflag ENGINE_GAVEN iftrue UnknownScript_0x1a4d79 checkcellnum PHONE_COOLTRAINERM_GAVEN @@ -124,7 +124,7 @@ TrainerCooltrainerfJoyce: CooltrainerfJoyceScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a50d7 waitbutton closetext @@ -136,7 +136,7 @@ TrainerCooltrainerfBeth1: CooltrainerfBeth1Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_BETH end_if_just_battled - loadfont + opentext checkflag ENGINE_BETH iftrue UnknownScript_0x1a4e35 checkcellnum PHONE_COOLTRAINERF_BETH @@ -228,7 +228,7 @@ TrainerPsychicRichard: PsychicRichardScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a5278 waitbutton closetext @@ -239,7 +239,7 @@ TrainerFisherScott: FisherScottScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a5326 waitbutton closetext diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index f725ae357..6463ba89e 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -9,7 +9,7 @@ Route26DayofWeekSiblingsHouse_MapScriptHeader: db 0 PokedexScript_0x7b1e4: - loadfont + opentext writetext UnknownText_0x7b1f9 yesorno iffalse UnknownText_0x7b1f7 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 05998cdee..7dd01776a 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -10,7 +10,7 @@ Route26HealSpeechHouse_MapScriptHeader: TeacherScript_0x7b125: faceplayer - loadfont + opentext writetext UnknownText_0x7b14d waitbutton closetext @@ -22,7 +22,7 @@ TeacherScript_0x7b125: pause 60 special Special_FadeInQuickly special RestartMapMusic - loadfont + opentext writetext UnknownText_0x7b18b waitbutton closetext diff --git a/maps/Route27.asm b/maps/Route27.asm index fec3294c7..2b70cd6b0 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -38,7 +38,7 @@ UnknownScript_0x1a0881: applymovement ROUTE27_FISHER, MovementData_0x1a0a69 UnknownScript_0x1a088c: spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x1a0a6b buttonsound writetext UnknownText_0x1a0a71 @@ -55,7 +55,7 @@ TrainerPsychicGilbert: PsychicGilbertScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a0dd2 waitbutton closetext @@ -67,7 +67,7 @@ TrainerBird_keeperJose2: Bird_keeperJose2Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_JOSE end_if_just_battled - loadfont + opentext checkflag ENGINE_JOSE iftrue UnknownScript_0x1a08ff checkflag ENGINE_JOSE_HAS_STAR_PIECE @@ -179,7 +179,7 @@ TrainerCooltrainermBlake: CooltrainermBlakeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a0b0b waitbutton closetext @@ -190,7 +190,7 @@ TrainerCooltrainermBrian: CooltrainermBrianScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a0bac waitbutton closetext @@ -202,7 +202,7 @@ TrainerCooltrainerfReena: CooltrainerfReena1Script: writecode VAR_CALLERID, PHONE_COOLTRAINERF_REENA end_if_just_battled - loadfont + opentext checkflag ENGINE_REENA iftrue UnknownScript_0x1a09e9 checkcellnum PHONE_COOLTRAINERF_REENA @@ -294,7 +294,7 @@ TrainerCooltrainerfMegan: CooltrainerfMeganScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a0cce waitbutton closetext diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index c6225549c..b00862edd 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -10,7 +10,7 @@ Route27SandstormHouse_MapScriptHeader: SandstormHouseWoman: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem special GetFirstPokemonHappiness diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index cb7c7067c..3f30815fd 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -17,7 +17,7 @@ Route28FamousSpeechHouse_MapScriptHeader: Celebrity: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM47_STEEL_WING iftrue .AlreadyGotItem writetext CelebrityText1 @@ -35,7 +35,7 @@ Celebrity: end CelebritysFearow: - loadfont + opentext writetext CelebritysFearowText cry FEAROW waitbutton diff --git a/maps/Route29.asm b/maps/Route29.asm index 72b0d7d03..36cc6c6e5 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -49,7 +49,7 @@ UnknownScript_0x1a0f6d: applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a108d spriteface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU - loadfont + opentext writetext UnknownText_0x1a10df yesorno iffalse UnknownScript_0x1a0fd9 @@ -60,7 +60,7 @@ UnknownScript_0x1a0f6d: loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL spriteface ROUTE29_COOLTRAINER_M1, UP - loadfont + opentext writetext UnknownText_0x1a114d waitbutton closetext @@ -74,7 +74,7 @@ UnknownScript_0x1a0fa3: applymovement ROUTE29_COOLTRAINER_M1, MovementData_0x1a1094 spriteface PLAYER, LEFT setevent EVENT_DUDE_TALKED_TO_YOU - loadfont + opentext writetext UnknownText_0x1a10df yesorno iffalse UnknownScript_0x1a0fe5 @@ -85,7 +85,7 @@ UnknownScript_0x1a0fa3: loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL spriteface ROUTE29_COOLTRAINER_M1, UP - loadfont + opentext writetext UnknownText_0x1a114d waitbutton closetext @@ -111,7 +111,7 @@ UnknownScript_0x1a0fe5: CooltrainerMScript_0x1a0ff1: faceplayer - loadfont + opentext checkcode VAR_BOXSPACE if_equal $0, UnknownScript_0x1a101c checkevent EVENT_LEARNED_TO_CATCH_POKEMON @@ -124,7 +124,7 @@ CooltrainerMScript_0x1a0ff1: closetext loadwildmon RATTATA, 5 catchtutorial BATTLETYPE_TUTORIAL - loadfont + opentext writetext UnknownText_0x1a114d waitbutton closetext @@ -154,7 +154,7 @@ FisherScript_0x1a102e: CooltrainerMScript_0x1a1031: faceplayer - loadfont + opentext checkday iftrue UnknownScript_0x1a103d checknite @@ -173,7 +173,7 @@ UnknownScript_0x1a1043: TuscanyScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_PINK_BOW_FROM_TUSCANY iftrue TuscanyTuesdayScript checkcode VAR_WEEKDAY diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 8feacfc76..3a269d536 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -10,7 +10,7 @@ Route2NuggetSpeechHouse_MapScriptHeader: FisherScript_0x9b847: faceplayer - loadfont + opentext checkevent EVENT_GOT_NUGGET_FROM_GUY iftrue .GotItem writetext UnknownText_0x9b865 diff --git a/maps/Route3.asm b/maps/Route3.asm index 486261c03..b5e08faf9 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -16,7 +16,7 @@ TrainerFirebreatherOtis: FirebreatherOtisScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1adff7 waitbutton closetext @@ -27,7 +27,7 @@ TrainerYoungsterWarren: YoungsterWarrenScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ae051 waitbutton closetext @@ -38,7 +38,7 @@ TrainerYoungsterJimmy: YoungsterJimmyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ae0a9 waitbutton closetext @@ -49,7 +49,7 @@ TrainerFirebreatherBurt: FirebreatherBurtScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ae118 waitbutton closetext diff --git a/maps/Route30.asm b/maps/Route30.asm index 40a66d668..8c55b8d17 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -21,13 +21,13 @@ Route30_MapScriptHeader: YoungsterScript_0x1a1673: waitsfx playmusic MUSIC_JOHTO_TRAINER_BATTLE - loadfont + opentext writetext UnknownText_0x1a1806 pause 30 closetext playsound SFX_TACKLE applymovement ROUTE30_MONSTER2, MovementData_0x1a17fe - loadfont + opentext faceplayer writetext UnknownText_0x1a181c waitbutton @@ -44,7 +44,7 @@ TrainerYoungsterJoey: YoungsterJoey1Script: writecode VAR_CALLERID, PHONE_YOUNGSTER_JOEY end_if_just_battled - loadfont + opentext checkflag ENGINE_JOEY iftrue UnknownScript_0x1a16e0 checkcellnum PHONE_YOUNGSTER_JOEY @@ -139,7 +139,7 @@ UnknownScript_0x1a176e: end UnknownScript_0x1a176f: - loadfont + opentext writetext UnknownText_0x1a1bc0 waitbutton verbosegiveitem HP_UP @@ -190,7 +190,7 @@ TrainerYoungsterMikey: YoungsterMikeyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a197d waitbutton closetext @@ -201,7 +201,7 @@ TrainerBug_catcherDon: Bug_catcherDonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a1a1c waitbutton closetext @@ -209,7 +209,7 @@ Bug_catcherDonScript: YoungsterScript_0x1a17d2: faceplayer - loadfont + opentext checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM iftrue UnknownScript_0x1a17e0 writetext UnknownText_0x1a1a6a diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index cda534288..d05258f3f 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -10,7 +10,7 @@ Route30BerrySpeechHouse_MapScriptHeader: PokefanMScript_0x196d64: faceplayer - loadfont + opentext checkevent EVENT_GOT_BERRY_FROM_ROUTE_30_HOUSE iftrue UnknownScript_0x196d79 writetext UnknownText_0x196d82 diff --git a/maps/Route31.asm b/maps/Route31.asm index b2e615cd7..d068c50d3 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -33,7 +33,7 @@ TrainerBug_catcherWade1: Bug_catcherWade1Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_WADE end_if_just_battled - loadfont + opentext checkflag ENGINE_WADE iftrue .WadeRematch checkflag ENGINE_WADE_HAS_ITEM @@ -187,7 +187,7 @@ Bug_catcherWade1Script: FisherScript_0x1a5570: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM50_NIGHTMARE iftrue .DescribeNightmare checkevent EVENT_GOT_KENYA diff --git a/maps/Route32.asm b/maps/Route32.asm index 642889314..92c4c4507 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -52,7 +52,7 @@ FriedaCallback: CooltrainerMScript_0x19046f: faceplayer UnknownScript_0x190470: - loadfont + opentext checkevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32 iftrue UnknownScript_0x1904a5 checkflag ENGINE_ZEPHYRBADGE @@ -94,7 +94,7 @@ UnknownScript_0x1904a9: UnknownScript_0x1904ab: spriteface ROUTE32_COOLTRAINER_M, LEFT spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x190790 waitbutton closetext @@ -109,7 +109,7 @@ UnknownScript_0x1904ab: FisherScript_0x1904ce: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM05_ROAR iftrue UnknownScript_0x1904e3 writetext UnknownText_0x191133 @@ -133,7 +133,7 @@ FisherScript_0x1904f2: faceplayer UnknownScript_0x1904f3: dotrigger $2 - loadfont + opentext writetext UnknownText_0x190a59 yesorno iffalse UnknownScript_0x190503 @@ -153,7 +153,7 @@ TrainerCamperRoland: CamperRolandScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x190faa waitbutton closetext @@ -164,7 +164,7 @@ TrainerFisherJustin: FisherJustinScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x190b4e waitbutton closetext @@ -176,7 +176,7 @@ TrainerFisherRalph1: FisherRalph1Script: writecode VAR_CALLERID, PHONE_FISHER_RALPH end_if_just_battled - loadfont + opentext checkflag ENGINE_RALPH iftrue UnknownScript_0x19057d checkflag ENGINE_SPECIAL_WILDDATA @@ -300,7 +300,7 @@ TrainerFisherHenry: FisherHenryScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x190df2 waitbutton closetext @@ -312,7 +312,7 @@ TrainerPicnickerLiz1: PicnickerLiz1Script: writecode VAR_CALLERID, PHONE_PICNICKER_LIZ end_if_just_battled - loadfont + opentext checkflag ENGINE_LIZ iftrue UnknownScript_0x19066d checkcellnum PHONE_PICNICKER_LIZ @@ -428,7 +428,7 @@ TrainerYoungsterAlbert: YoungsterAlbertScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x190e82 waitbutton closetext @@ -439,7 +439,7 @@ TrainerYoungsterGordon: YoungsterGordonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x190f49 waitbutton closetext @@ -450,7 +450,7 @@ TrainerBird_keeperPeter: Bird_keeperPeterScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1910d4 waitbutton closetext @@ -458,7 +458,7 @@ Bird_keeperPeterScript: FriedaScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_POISON_BARB_FROM_FRIEDA iftrue FriedaFridayScript checkcode VAR_WEEKDAY diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 97a4ca6ba..ae1b641ff 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -15,7 +15,7 @@ NurseScript_0x69b52: FishingGuruScript_0x69b55: faceplayer - loadfont + opentext checkevent EVENT_GOT_OLD_ROD iftrue UnknownScript_0x69b7a writetext UnknownText_0x69b83 diff --git a/maps/Route33.asm b/maps/Route33.asm index 02b4984ce..1a263b6b9 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -19,7 +19,7 @@ TrainerHikerAnthony: HikerAnthony2Script: writecode VAR_CALLERID, PHONE_HIKER_ANTHONY end_if_just_battled - loadfont + opentext checkflag ENGINE_ANTHONY iftrue UnknownScript_0x1ac051 checkflag ENGINE_DUNSPARCE_SWARM diff --git a/maps/Route34.asm b/maps/Route34.asm index fb82b2556..bfda2fd5a 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -58,7 +58,7 @@ UnknownScript_0x78039: GrampsScript_0x7803d: faceplayer - loadfont + opentext special Special_DayCareManOutside waitbutton closetext @@ -79,13 +79,13 @@ UnknownScript_0x7805b: end DaycareMon1Script_0x78065: - loadfont + opentext special Special_DayCareMon1 closetext end DaycareMon2Script_0x7806b: - loadfont + opentext special Special_DayCareMon2 closetext end @@ -96,7 +96,7 @@ TrainerCamperTodd1: CamperTodd1Script: writecode VAR_CALLERID, PHONE_CAMPER_TODD end_if_just_battled - loadfont + opentext checkflag ENGINE_TODD iftrue UnknownScript_0x780bd checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON @@ -221,7 +221,7 @@ TrainerPicnickerGina1: PicnickerGina1Script: writecode VAR_CALLERID, PHONE_PICNICKER_GINA end_if_just_battled - loadfont + opentext checkflag ENGINE_GINA iftrue UnknownScript_0x7819f checkflag ENGINE_GINA_HAS_LEAF_STONE @@ -355,7 +355,7 @@ UnknownScript_0x78248: OfficerScript_0x7824c: faceplayer - loadfont + opentext checknite iffalse UnknownScript_0x78276 checkevent EVENT_BEAT_OFFICER_KEITH @@ -389,7 +389,7 @@ TrainerYoungsterSamuel: YoungsterSamuelScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x783d8 waitbutton closetext @@ -400,7 +400,7 @@ TrainerYoungsterIan: YoungsterIanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x78469 waitbutton closetext @@ -411,7 +411,7 @@ TrainerPokefanmBrandon: PokefanmBrandonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x786fc waitbutton closetext @@ -422,7 +422,7 @@ TrainerCooltrainerfIrene: CooltrainerfIreneScript: end_if_just_battled - loadfont + opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782d2 writetext UnknownText_0x7877f @@ -441,7 +441,7 @@ TrainerCooltrainerfJenn: CooltrainerfJennScript: end_if_just_battled - loadfont + opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x782f2 writetext UnknownText_0x78836 @@ -460,7 +460,7 @@ TrainerCooltrainerfKate: CooltrainerfKateScript: end_if_just_battled - loadfont + opentext checkevent EVENT_GOT_SOFT_SAND_FROM_KATE iftrue UnknownScript_0x78319 writetext UnknownText_0x788e2 diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index f89059a41..ad3e5c5e0 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -37,7 +37,7 @@ UnknownScript_0x62d3d: applymovement PLAYER, MovementData_0x62d97 stopfollow spriteface PLAYER, DOWN - loadfont + opentext writetext UnknownText_0x62e41 waitbutton closetext @@ -47,7 +47,7 @@ UnknownScript_0x62d62: TeacherScript_0x62d63: faceplayer - loadfont + opentext checkevent EVENT_FOREST_IS_RESTLESS iftrue UnknownScript_0x62d84 checkevent EVENT_GOT_TM12_SWEET_SCENT @@ -71,7 +71,7 @@ UnknownScript_0x62d84: end ButterfreeScript_0x62d8a: - loadfont + opentext writetext UnknownText_0x62e83 cry BUTTERFREE waitbutton diff --git a/maps/Route35.asm b/maps/Route35.asm index bb05388c8..7a634f12f 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -23,7 +23,7 @@ TrainerBird_keeperBryan: Bird_keeperBryanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19cc87 waitbutton closetext @@ -35,7 +35,7 @@ TrainerJugglerIrwin: JugglerIrwin1Script: writecode VAR_CALLERID, PHONE_JUGGLER_IRWIN end_if_just_battled - loadfont + opentext checkcellnum PHONE_JUGGLER_IRWIN iftrue UnknownScript_0x19c90f checkevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER @@ -89,7 +89,7 @@ TrainerCamperIvan: CamperIvanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19cac4 waitbutton closetext @@ -100,7 +100,7 @@ TrainerCamperElliot: CamperElliotScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19cb47 waitbutton closetext @@ -111,7 +111,7 @@ TrainerPicnickerBrooke: PicnickerBrookeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19cbba waitbutton closetext @@ -122,7 +122,7 @@ TrainerPicnickerKim: PicnickerKimScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19cc21 waitbutton closetext @@ -134,7 +134,7 @@ TrainerBug_catcherArnie1: Bug_catcherArnie1Script: writecode VAR_CALLERID, PHONE_BUG_CATCHER_ARNIE end_if_just_battled - loadfont + opentext checkflag ENGINE_ARNIE iftrue UnknownScript_0x19c9bb checkflag ENGINE_YANMA_SWARM @@ -230,7 +230,7 @@ TrainerFirebreatherWalt: FirebreatherWaltScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19cebc waitbutton closetext @@ -238,7 +238,7 @@ FirebreatherWaltScript: OfficerScript_0x19ca49: faceplayer - loadfont + opentext checknite iffalse UnknownScript_0x19ca73 checkevent EVENT_BEAT_OFFICER_DIRK diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 56523fb12..b50ccbd91 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -12,7 +12,7 @@ Route35Goldenrodgate_MapScriptHeader: OfficerScript_0x69d37: faceplayer - loadfont + opentext checkevent EVENT_GOT_HP_UP_FROM_RANDY iftrue .gothpup checkevent EVENT_GAVE_KENYA @@ -77,7 +77,7 @@ GiftSpearowOTName: PokefanFScript_0x69dc6: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_SUDOWOODO iftrue .aftersudowoodo writetext UnknownText_0x6a00a diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 8072507cd..d0a770bbe 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -62,7 +62,7 @@ Route35NationalParkgate_IsContestDay: Route35NationalParkGate_LeavingContestEarly: applymovement PLAYER, MovementData_0x6a2e2 spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT - loadfont + opentext checkcode VAR_CONTESTMINUTES addvar $1 RAM2MEM $0 @@ -92,7 +92,7 @@ OfficerScript_0x6a204: if_equal WEDNESDAY, Route35NationalParkgate_NoContestToday if_equal FRIDAY, Route35NationalParkgate_NoContestToday faceplayer - loadfont + opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route35NationalParkgate_ContestIsOver scall Route35NationalParkgate_GetDayOfWeek @@ -197,7 +197,7 @@ Route35NationalParkgate_NoContestToday: OfficerScript_0x6a2ca: faceplayer - loadfont + opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route35NationalParkgate_ContestIsOver writetext UnknownText_0x6a894 diff --git a/maps/Route36.asm b/maps/Route36.asm index a6a40bbc3..aaa64ffe9 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -63,7 +63,7 @@ WeirdTreeScript_0x19403c: end UnknownScript_0x19404a: - loadfont + opentext writetext UnknownText_0x19426b yesorno iffalse UnknownScript_0x194079 @@ -71,14 +71,14 @@ UnknownScript_0x19404a: ; fallthrough WateredWeirdTreeScript:: - loadfont + opentext writetext UnknownText_0x194290 waitbutton closetext waitsfx playsound SFX_SANDSTORM applymovement ROUTE36_WEIRD_TREE, MovementData_0x194249 - loadfont + opentext writetext UnknownText_0x1942aa waitbutton closetext @@ -106,7 +106,7 @@ UnknownScript_0x19407b: LassScript_0x19408c: faceplayer - loadfont + opentext checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP iftrue UnknownScript_0x1940b3 setevent EVENT_MET_FLORIA @@ -133,7 +133,7 @@ UnknownScript_0x1940b3: FisherScript_0x1940b9: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue UnknownScript_0x1940da checkevent EVENT_FOUGHT_SUDOWOODO @@ -158,7 +158,7 @@ UnknownScript_0x1940de: LassScript_0x1940e0: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_SUDOWOODO iftrue UnknownScript_0x1940ee writetext UnknownText_0x194626 @@ -178,7 +178,7 @@ TrainerSchoolboyAlan1: SchoolboyAlan1Script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN end_if_just_battled - loadfont + opentext checkflag ENGINE_ALAN iftrue UnknownScript_0x194140 checkflag ENGINE_ALAN_HAS_FIRE_STONE @@ -315,7 +315,7 @@ TrainerPsychicMark: PsychicMarkScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19471e waitbutton closetext @@ -323,7 +323,7 @@ PsychicMarkScript: ArthurScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR iftrue ArthurThursdayScript checkcode VAR_WEEKDAY diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index fd9e7ba10..d62f6c4f0 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -71,7 +71,7 @@ Route36NationalParkgate_MapScriptHeader: .LeftTheContestEarly: spriteface PLAYER, UP - loadfont + opentext checkcode VAR_CONTESTMINUTES addvar $1 RAM2MEM $0 @@ -153,7 +153,7 @@ Route36OfficerScriptContest: if_equal WEDNESDAY, _ContestNotOn if_equal FRIDAY, _ContestNotOn faceplayer - loadfont + opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded scall Route36Parkgate_DayToText @@ -299,7 +299,7 @@ _ContestNotOn: OfficerScript_0x6acf4: faceplayer - loadfont + opentext checkflag ENGINE_DAILY_BUG_CONTEST iftrue Route36Officer_ContestHasConcluded writetext UnknownText_0x6b370 @@ -313,7 +313,7 @@ Route36Parkgate_DayToText: YoungsterScript_0x6ad06: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 @@ -329,7 +329,7 @@ UnknownScript_0x6ad14: YoungsterScript_0x6ad1a: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f @@ -345,7 +345,7 @@ UnknownScript_0x6ad28: RockerScript_0x6ad2e: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 @@ -361,7 +361,7 @@ UnknownScript_0x6ad3c: PokefanMScript_0x6ad42: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da @@ -377,7 +377,7 @@ UnknownScript_0x6ad50: YoungsterScript_0x6ad56: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e @@ -393,7 +393,7 @@ UnknownScript_0x6ad64: YoungsterScript_0x6ad6a: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 @@ -409,7 +409,7 @@ UnknownScript_0x6ad78: LassScript_0x6ad7e: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b @@ -425,7 +425,7 @@ UnknownScript_0x6ad8c: YoungsterScript_0x6ad92: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 @@ -441,7 +441,7 @@ UnknownScript_0x6ada0: YoungsterScript_0x6ada6: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b @@ -457,7 +457,7 @@ UnknownScript_0x6adb4: YoungsterScript_0x6adba: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f diff --git a/maps/Route37.asm b/maps/Route37.asm index bedfe01fa..4e7e48f0c 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -33,7 +33,7 @@ TrainerTwinsAnnandanne1: TwinsAnnandanne1Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a8e62 waitbutton closetext @@ -44,7 +44,7 @@ TrainerTwinsAnnandanne2: TwinsAnnandanne2Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a8eec waitbutton closetext @@ -55,7 +55,7 @@ TrainerPsychicGreg: PsychicGregScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a8f80 waitbutton closetext @@ -63,7 +63,7 @@ PsychicGregScript: SunnyScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_MAGNET_FROM_SUNNY iftrue SunnySundayScript checkcode VAR_WEEKDAY diff --git a/maps/Route38.asm b/maps/Route38.asm index 65d146ea2..5946ab582 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -19,7 +19,7 @@ TrainerBird_keeperToby: .script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a1f86 waitbutton closetext @@ -30,7 +30,7 @@ TrainerSailorHarry: .script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a220c waitbutton closetext @@ -42,7 +42,7 @@ TrainerLassDana1: .script: writecode VAR_CALLERID, PHONE_LASS_DANA end_if_just_battled - loadfont + opentext checkflag ENGINE_DANA iftrue .DanaRematch checkflag ENGINE_DANA_HAS_THUNDERSTONE @@ -180,7 +180,7 @@ TrainerSchoolboyChad1: .script: writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD end_if_just_battled - loadfont + opentext checkflag ENGINE_CHAD iftrue .ChadRematch checkcellnum PHONE_SCHOOLBOY_CHAD @@ -296,7 +296,7 @@ TrainerBeautyValerie: .script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a2185 waitbutton closetext @@ -307,7 +307,7 @@ TrainerBeautyOlivia: .script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a229a waitbutton closetext diff --git a/maps/Route39.asm b/maps/Route39.asm index d76bd7dda..809d1f5d7 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -18,7 +18,7 @@ Route39_MapScriptHeader: db 0 TaurosScript_0x1a5af5: - loadfont + opentext writetext UnknownText_0x1a5bf9 cry MILTANK waitbutton @@ -31,7 +31,7 @@ TrainerPokefanmDerek1: PokefanmDerek1Script: writecode VAR_CALLERID, PHONE_POKEFANM_DEREK end_if_just_battled - loadfont + opentext checkflag ENGINE_DEREK_HAS_NUGGET iftrue UnknownScript_0x1a5b4a checkcellnum PHONE_POKEFANM_DEREK @@ -109,7 +109,7 @@ TrainerPokefanfRuth: PokefanfRuthScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a5db2 waitbutton closetext @@ -120,7 +120,7 @@ TrainerSailorEugene: SailorEugeneScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a5c4d waitbutton closetext @@ -131,7 +131,7 @@ TrainerPsychicNorman: PsychicNormanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a5e57 waitbutton closetext @@ -139,7 +139,7 @@ PsychicNormanScript: PokefanFScript_0x1a5bbe: faceplayer - loadfont + opentext checknite iffalse UnknownScript_0x1a5be5 checkevent EVENT_BEAT_POKEFANF_JAIME diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 4e555e012..45cc8f92a 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -12,7 +12,7 @@ Route39Barn_MapScriptHeader: TwinScript_0x9cc76: faceplayer - loadfont + opentext checkevent EVENT_HEALED_MOOMOO iftrue .FeedingMooMoo writetext Text_MoomooIsSick @@ -30,7 +30,7 @@ TwinScript_0x9cc76: TwinScript_0x9cc90: faceplayer - loadfont + opentext checkevent EVENT_HEALED_MOOMOO iftrue .FeedingMooMoo writetext Text_MoomooIsSick @@ -47,7 +47,7 @@ TwinScript_0x9cc90: end TaurosScript_0x9ccaa: - loadfont + opentext checkevent EVENT_HEALED_MOOMOO iftrue .HappyCow writetext Text_WeakMoo diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index fde9043ef..07efecdf6 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -11,7 +11,7 @@ Route39Farmhouse_MapScriptHeader: PokefanMScript_0x9ceb4: faceplayer - loadfont + opentext checkevent EVENT_HEALED_MOOMOO iftrue UnknownScript_0x9cec5 writetext UnknownText_0x9cf38 @@ -67,7 +67,7 @@ UnknownScript_0x9cf08: PokefanFScript_0x9cf0e: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM iftrue UnknownScript_0x9cf2f checkevent EVENT_HEALED_MOOMOO diff --git a/maps/Route4.asm b/maps/Route4.asm index 4b72e3566..fccc7f525 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -16,7 +16,7 @@ TrainerBird_keeperHank: Bird_keeperHankScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ae258 waitbutton closetext @@ -27,7 +27,7 @@ TrainerPicnickerHope: PicnickerHopeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ae320 waitbutton closetext @@ -38,7 +38,7 @@ TrainerPicnickerSharon: PicnickerSharonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ae369 waitbutton closetext diff --git a/maps/Route40.asm b/maps/Route40.asm index 539092c6b..5f5a0b078 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -39,7 +39,7 @@ TrainerSwimmerfElaine: SwimmerfElaineScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a637b waitbutton closetext @@ -50,7 +50,7 @@ TrainerSwimmerfPaula: SwimmerfPaulaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a63f5 waitbutton closetext @@ -61,7 +61,7 @@ TrainerSwimmermSimon: SwimmermSimonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a6282 waitbutton closetext @@ -72,7 +72,7 @@ TrainerSwimmermRandall: SwimmermRandallScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a62fa waitbutton closetext @@ -97,7 +97,7 @@ StandingYoungsterScript_0x1a61d6: MonicaScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_SHARP_BEAK_FROM_MONICA iftrue MonicaMondayScript checkcode VAR_WEEKDAY diff --git a/maps/Route41.asm b/maps/Route41.asm index bf92dd50a..376428d54 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -22,7 +22,7 @@ TrainerSwimmerfKaylee: SwimmerfKayleeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a6c7f waitbutton closetext @@ -33,7 +33,7 @@ TrainerSwimmerfSusie: SwimmerfSusieScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a6d11 waitbutton closetext @@ -44,7 +44,7 @@ TrainerSwimmerfDenise: SwimmerfDeniseScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a6d79 waitbutton closetext @@ -55,7 +55,7 @@ TrainerSwimmerfKara: SwimmerfKaraScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a6e58 waitbutton closetext @@ -66,7 +66,7 @@ TrainerSwimmerfWendy: SwimmerfWendyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a6ec2 waitbutton closetext @@ -77,7 +77,7 @@ TrainerSwimmermCharlie: SwimmermCharlieScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a696e waitbutton closetext @@ -88,7 +88,7 @@ TrainerSwimmermGeorge: SwimmermGeorgeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a69d4 waitbutton closetext @@ -99,7 +99,7 @@ TrainerSwimmermBerke: SwimmermBerkeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a6aa4 waitbutton closetext @@ -110,7 +110,7 @@ TrainerSwimmermKirk: SwimmermKirkScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a6b6c waitbutton closetext @@ -121,7 +121,7 @@ TrainerSwimmermMathew: SwimmermMathewScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a6bed waitbutton closetext diff --git a/maps/Route42.asm b/maps/Route42.asm index 959554f3b..8c3d54b9a 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -44,7 +44,7 @@ TrainerFisherTully1: FisherTully1Script: writecode VAR_CALLERID, PHONE_FISHER_TULLY end_if_just_battled - loadfont + opentext checkflag ENGINE_TULLY iftrue UnknownScript_0x1a927f checkflag ENGINE_TULLY_HAS_WATER_STONE @@ -169,7 +169,7 @@ TrainerPokemaniacShane: PokemaniacShaneScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a94d6 waitbutton closetext @@ -180,7 +180,7 @@ TrainerHikerBenjamin: HikerBenjaminScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a943f waitbutton closetext diff --git a/maps/Route43.asm b/maps/Route43.asm index b2ec20174..569737c16 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -34,7 +34,7 @@ TrainerCamperSpencer: CamperSpencerScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19d57e waitbutton closetext @@ -45,7 +45,7 @@ TrainerPokemaniacBen: PokemaniacBenScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19d2d2 waitbutton closetext @@ -57,7 +57,7 @@ TrainerPokemaniacBrent1: PokemaniacBrent1Script: writecode VAR_CALLERID, PHONE_POKEMANIAC_BRENT end_if_just_battled - loadfont + opentext checkflag ENGINE_BRENT iftrue UnknownScript_0x19d0cf checkcellnum PHONE_POKEMANIAC_BRENT @@ -161,7 +161,7 @@ TrainerPokemaniacRon: PokemaniacRonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19d3f8 waitbutton closetext @@ -172,7 +172,7 @@ TrainerFisherMarvin: FisherMarvinScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19d4d3 waitbutton closetext @@ -184,7 +184,7 @@ TrainerPicnickerTiffany3: PicnickerTiffany3Script: writecode VAR_CALLERID, PHONE_PICNICKER_TIFFANY end_if_just_battled - loadfont + opentext checkflag ENGINE_TIFFANY iftrue UnknownScript_0x19d1c1 checkflag ENGINE_TIFFANY_HAS_PINK_BOW diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 4e369698d..602f016ac 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -50,7 +50,7 @@ UnknownScript_0x19abea: spriteface ROUTE43GATE_ROCKET1, UP showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15 applymovement ROUTE43GATE_ROCKET1, MovementData_0x19aca4 - loadfont + opentext writetext UnknownText_0x19acd2 buttonsound checkmoney $0, 999 @@ -82,7 +82,7 @@ UnknownScript_0x19ac38: spriteface ROUTE43GATE_ROCKET2, DOWN showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15 applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acc7 - loadfont + opentext writetext UnknownText_0x19acd2 buttonsound checkmoney $0, 999 @@ -113,7 +113,7 @@ RocketScript_0x19ac82: OfficerScript_0x19ac85: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM36_SLUDGE_BOMB iftrue UnknownScript_0x19ac9c writetext UnknownText_0x19ad9b diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index a0d4d4ea8..b60e5e160 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -10,7 +10,7 @@ Route43MahoganyGate_MapScriptHeader: OfficerScript_0x19ab0b: faceplayer - loadfont + opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x19ab19 writetext UnknownText_0x19ab1f diff --git a/maps/Route44.asm b/maps/Route44.asm index e7973152e..bb1632855 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -24,7 +24,7 @@ TrainerBird_keeperVance1: Bird_keeperVance1Script: writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE end_if_just_battled - loadfont + opentext checkflag ENGINE_VANCE iftrue UnknownScript_0x19d86a checkcellnum PHONE_BIRDKEEPER_VANCE @@ -95,7 +95,7 @@ UnknownScript_0x19d8ca: end UnknownScript_0x19d8cb: - loadfont + opentext writetext UnknownText_0x19dc67 waitbutton verbosegiveitem CARBOS @@ -154,7 +154,7 @@ TrainerPsychicPhil: PsychicPhilScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19dcfc waitbutton closetext @@ -166,7 +166,7 @@ TrainerFisherWilton1: FisherWilton1Script: writecode VAR_CALLERID, PHONE_FISHER_WILTON end_if_just_battled - loadfont + opentext checkflag ENGINE_WILTON iftrue UnknownScript_0x19d96e checkflag ENGINE_WILTON_HAS_ITEM @@ -260,7 +260,7 @@ TrainerFisherEdgar: FisherEdgarScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19db6f waitbutton closetext @@ -271,7 +271,7 @@ TrainerCooltrainerfCybil: CooltrainerfCybilScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19df4d waitbutton closetext @@ -282,7 +282,7 @@ TrainerPokemaniacZach: PokemaniacZachScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19dd7e waitbutton closetext @@ -293,7 +293,7 @@ TrainerCooltrainermAllen: CooltrainermAllenScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19de66 waitbutton closetext diff --git a/maps/Route45.asm b/maps/Route45.asm index 1abefc471..c63417ceb 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -26,7 +26,7 @@ TrainerBlackbeltKenji: BlackbeltKenji3Script: writecode VAR_CALLERID, PHONE_BLACKBELT_KENJI end_if_just_battled - loadfont + opentext checkcellnum PHONE_BLACKBELT_KENJI iftrue UnknownScript_0x19e0e4 checkevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER @@ -129,7 +129,7 @@ TrainerHikerErik: HikerErikScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19e301 waitbutton closetext @@ -140,7 +140,7 @@ TrainerHikerMichael: HikerMichaelScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19e3b1 waitbutton closetext @@ -152,7 +152,7 @@ TrainerHikerParry: HikerParry3Script: writecode VAR_CALLERID, PHONE_HIKER_PARRY end_if_just_battled - loadfont + opentext checkflag ENGINE_PARRY iftrue UnknownScript_0x19e1b8 checkcellnum PHONE_HIKER_PARRY @@ -223,7 +223,7 @@ UnknownScript_0x19e218: end UnknownScript_0x19e219: - loadfont + opentext writetext UnknownText_0x19e52c waitbutton verbosegiveitem IRON @@ -237,7 +237,7 @@ TrainerHikerTimothy: HikerTimothyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19e4f1 waitbutton closetext @@ -248,7 +248,7 @@ TrainerCooltrainermRyan: CooltrainermRyanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19e70d waitbutton closetext @@ -259,7 +259,7 @@ TrainerCooltrainerfKelly: CooltrainerfKellyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19e7d1 waitbutton closetext @@ -267,7 +267,7 @@ CooltrainerfKellyScript: YoungsterScript_0x19e269: faceplayer - loadfont + opentext checkevent EVENT_BEAT_CAMPER_QUENTIN iftrue UnknownScript_0x19e285 writetext UnknownText_0x19e87f diff --git a/maps/Route46.asm b/maps/Route46.asm index 17f0955c4..722091612 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -18,7 +18,7 @@ TrainerCamperTed: CamperTedScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a9851 waitbutton closetext @@ -30,7 +30,7 @@ TrainerPicnickerErin1: PicnickerErin1Script: writecode VAR_CALLERID, PHONE_PICNICKER_ERIN end_if_just_battled - loadfont + opentext checkflag ENGINE_ERIN iftrue UnknownScript_0x1a96da checkcellnum PHONE_PICNICKER_ERIN @@ -101,7 +101,7 @@ UnknownScript_0x1a973a: end UnknownScript_0x1a973b: - loadfont + opentext writetext UnknownText_0x1a9927 waitbutton verbosegiveitem CALCIUM @@ -152,7 +152,7 @@ TrainerHikerBailey: HikerBaileyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1a97e8 waitbutton closetext diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index d9a4fb1f1..299d80c76 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -11,7 +11,7 @@ Route5CleanseTagSpeechHouse_MapScriptHeader: GrannyScript_0x18b634: faceplayer - loadfont + opentext checkevent EVENT_GOT_CLEANSE_TAG iftrue UnknownScript_0x18b649 writetext UnknownText_0x18b655 diff --git a/maps/Route6.asm b/maps/Route6.asm index 534301966..dea3a1e4e 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -15,7 +15,7 @@ TrainerPokefanmRex: PokefanmRexScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ad9ff waitbutton closetext @@ -26,7 +26,7 @@ TrainerPokefanmAllan: PokefanmAllanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ada88 waitbutton closetext diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 96210fcd7..9e3275d97 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -16,7 +16,7 @@ UnknownScript_0x1926e9: OfficerScript_0x1926ea: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x1926f8 writetext UnknownText_0x1926fe diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 3a36253cb..df494e313 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -10,7 +10,7 @@ Route7SaffronGate_MapScriptHeader: OfficerScript_0x73518: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x73526 writetext UnknownText_0x7352c diff --git a/maps/Route8.asm b/maps/Route8.asm index ce626b879..4d60df521 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -18,7 +18,7 @@ TrainerBikerDwayne: BikerDwayneScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6c0c8 waitbutton closetext @@ -29,7 +29,7 @@ TrainerBikerHarris: BikerHarrisScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6c143 waitbutton closetext @@ -40,7 +40,7 @@ TrainerBikerZeke: BikerZekeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6c1a3 waitbutton closetext @@ -51,7 +51,7 @@ TrainerSupernerdSam: SupernerdSamScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6c219 waitbutton closetext @@ -62,7 +62,7 @@ TrainerSupernerdTom: SupernerdTomScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6c27e waitbutton closetext diff --git a/maps/Route9.asm b/maps/Route9.asm index 2ffdba46e..3a0a71772 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -18,7 +18,7 @@ TrainerCamperDean: CamperDeanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1aafd9 waitbutton closetext @@ -29,7 +29,7 @@ TrainerPicnickerHeidi: PicnickerHeidiScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ab07c waitbutton closetext @@ -40,7 +40,7 @@ TrainerCamperSid: CamperSidScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ab0f6 waitbutton closetext @@ -51,7 +51,7 @@ TrainerPicnickerEdna: PicnickerEdnaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ab15f waitbutton closetext @@ -62,7 +62,7 @@ TrainerHikerTim: HikerTimScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ab210 waitbutton closetext @@ -73,7 +73,7 @@ TrainerHikerSidney: HikerSidneyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1ab278 waitbutton closetext diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index f1f592f15..50fcee10c 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -88,7 +88,7 @@ MapRuinsofAlphAerodactylChamberSignpost3Script: jumptext UnknownText_0x58ee7 MapRuinsofAlphAerodactylChamberSignpost4Script: - loadfont + opentext writetext UnknownText_0x58e4f writebyte $1 special Special_DisplayUnownWords @@ -98,7 +98,7 @@ MapRuinsofAlphAerodactylChamberSignpost4Script: MapRuinsofAlphAerodactylChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER iftrue UnknownScript_0x58e46 - loadfont + opentext writetext UnknownText_0x58e81 writebyte $1 special Special_DisplayUnownWords @@ -106,7 +106,7 @@ MapRuinsofAlphAerodactylChamberSignpost5Script: end UnknownScript_0x58e46: - loadfont + opentext writetext UnknownText_0x58ea2 waitbutton closetext diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 6e1e30968..a039c0b7d 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -89,7 +89,7 @@ MapRuinsofAlphHoOhChamberSignpost3Script: jumptext UnknownText_0x586aa MapRuinsofAlphHoOhChamberSignpost4Script: - loadfont + opentext writetext UnknownText_0x58612 writebyte $3 special Special_DisplayUnownWords @@ -99,7 +99,7 @@ MapRuinsofAlphHoOhChamberSignpost4Script: MapRuinsofAlphHoOhChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER iftrue UnknownScript_0x58609 - loadfont + opentext writetext UnknownText_0x58644 writebyte $3 special Special_DisplayUnownWords @@ -107,7 +107,7 @@ MapRuinsofAlphHoOhChamberSignpost5Script: end UnknownScript_0x58609: - loadfont + opentext writetext UnknownText_0x58665 waitbutton closetext diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 4751a9abe..1f900da9e 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -24,7 +24,7 @@ UnknownScript_0x58f6d: end UnknownScript_0x58f6e: - loadfont + opentext writetext UnknownText_0x58f89 waitbutton closetext diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 7bfae137e..c27f000c3 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -91,7 +91,7 @@ UnknownScript_0x58778: ScientistScript_0x587a8: faceplayer - loadfont + opentext checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x587cf checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER @@ -126,7 +126,7 @@ MapRuinsofAlphKabutoChamberSignpost3Script: jumptext UnknownText_0x58b3f MapRuinsofAlphKabutoChamberSignpost4Script: - loadfont + opentext writetext UnknownText_0x58aa7 writebyte $0 special Special_DisplayUnownWords @@ -136,7 +136,7 @@ MapRuinsofAlphKabutoChamberSignpost4Script: MapRuinsofAlphKabutoChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER iftrue UnknownScript_0x587f7 - loadfont + opentext writetext UnknownText_0x58ad9 writebyte $0 special Special_DisplayUnownWords @@ -144,7 +144,7 @@ MapRuinsofAlphKabutoChamberSignpost5Script: end UnknownScript_0x587f7: - loadfont + opentext writetext UnknownText_0x58afa waitbutton closetext diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index b8180a85e..10609fbb1 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -89,7 +89,7 @@ MapRuinsofAlphOmanyteChamberSignpost3Script: jumptext UnknownText_0x58d26 MapRuinsofAlphOmanyteChamberSignpost4Script: - loadfont + opentext writetext UnknownText_0x58c8e writebyte $2 special Special_DisplayUnownWords @@ -99,7 +99,7 @@ MapRuinsofAlphOmanyteChamberSignpost4Script: MapRuinsofAlphOmanyteChamberSignpost5Script: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER iftrue UnknownScript_0x58c85 - loadfont + opentext writetext UnknownText_0x58cc0 writebyte $2 special Special_DisplayUnownWords @@ -107,7 +107,7 @@ MapRuinsofAlphOmanyteChamberSignpost5Script: end UnknownScript_0x58c85: - loadfont + opentext writetext UnknownText_0x58ce1 waitbutton closetext diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 159a09a3f..6464b409e 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -61,7 +61,7 @@ UnknownScript_0x5803a: ScientistScript_0x58043: faceplayer UnknownScript_0x58044: - loadfont + opentext writetext UnknownText_0x580c7 waitbutton closetext @@ -77,7 +77,7 @@ UnknownScript_0x58044: FisherScript_0x58061: faceplayer - loadfont + opentext checkevent EVENT_TALKED_TO_RUINS_COWARD iftrue .Next setevent EVENT_TALKED_TO_RUINS_COWARD @@ -91,7 +91,7 @@ FisherScript_0x58061: YoungsterScript_0x58076: faceplayer - loadfont + opentext writetext UnknownText_0x58449 waitbutton closetext @@ -99,7 +99,7 @@ YoungsterScript_0x58076: YoungsterScript_0x5807e: faceplayer - loadfont + opentext writetext UnknownText_0x5848e waitbutton closetext @@ -111,7 +111,7 @@ TrainerPsychicNathan: PsychicNathanScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5830e waitbutton closetext @@ -123,7 +123,7 @@ TrainerSuperNerdStan: UnknownScript_0x580a9: end_if_just_battled - loadfont + opentext writetext UnknownText_0x58250 waitbutton closetext diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 520afe0e0..44e67ff83 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -46,12 +46,12 @@ UnknownScript_0x59192: playsound SFX_TRANSACTION pause 30 spriteface RUINSOFALPHRESEARCHCENTER_SCIENTIST3, DOWN - loadfont + opentext writetext UnknownText_0x59278 waitbutton closetext applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x59274 - loadfont + opentext writetext UnknownText_0x592fa playsound SFX_ITEM waitsfx @@ -66,7 +66,7 @@ UnknownScript_0x59192: ScientistScript_0x591d1: faceplayer - loadfont + opentext checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x591df writetext UnknownText_0x59311 @@ -82,7 +82,7 @@ UnknownScript_0x591df: ScientistScript_0x591e5: faceplayer - loadfont + opentext checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x5920b checkflag ENGINE_UNOWN_DEX @@ -115,7 +115,7 @@ UnknownScript_0x5920b: ScientistScript_0x59214: faceplayer - loadfont + opentext checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x5922e checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS @@ -138,7 +138,7 @@ UnknownScript_0x5922e: end MapRuinsofAlphResearchCenterSignpost1Script: - loadfont + opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT @@ -156,7 +156,7 @@ UnknownScript_0x59247: end MapRuinsofAlphResearchCenterSignpost2Script: - loadfont + opentext checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 48d26f21e..56db1e283 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -10,7 +10,7 @@ SafariZoneWardensHome_MapScriptHeader: WardensGranddaughter: faceplayer - loadfont + opentext checkevent EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER iftrue .AlreadyMet writetext WardensGranddaughterText1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index e01956fd4..c3bf50008 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -24,7 +24,7 @@ SaffronCity_MapScriptHeader: LassScript_0x19932a: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199338 writetext UnknownText_0x19938d @@ -40,7 +40,7 @@ UnknownScript_0x199338: PokefanMScript_0x19933e: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x19934c writetext UnknownText_0x199460 @@ -62,7 +62,7 @@ CooltrainerFScript_0x199355: FisherScript_0x199358: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x199366 writetext UnknownText_0x1995fc diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index bd591183b..518e56fae 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -15,7 +15,7 @@ SaffronGym_MapScriptHeader: SabrinaScript_0x189c2e: faceplayer - loadfont + opentext checkflag ENGINE_MARSHBADGE iftrue .FightDone writetext UnknownText_0x189cdf @@ -30,7 +30,7 @@ SabrinaScript_0x189c2e: setevent EVENT_BEAT_MEDIUM_DORIS setevent EVENT_BEAT_PSYCHIC_FRANKLIN setevent EVENT_BEAT_PSYCHIC_JARED - loadfont + opentext writetext UnknownText_0x189e95 playsound SFX_GET_BADGE waitsfx @@ -51,7 +51,7 @@ TrainerMediumRebecca: MediumRebeccaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x18a034 waitbutton closetext @@ -62,7 +62,7 @@ TrainerPsychicFranklin: PsychicFranklinScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x18a0a6 waitbutton closetext @@ -73,7 +73,7 @@ TrainerMediumDoris: MediumDorisScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x18a136 waitbutton closetext @@ -84,7 +84,7 @@ TrainerPsychicJared: PsychicJaredScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x18a1b3 waitbutton closetext @@ -92,7 +92,7 @@ PsychicJaredScript: SaffronGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_SABRINA iftrue .SaffronGymGuyWinScript writetext SaffronGymGuyText diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index f63ae3cf9..ed13ef074 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -11,7 +11,7 @@ SaffronMart_MapScriptHeader: db 0 ClerkScript_0x18a3bf: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_SAFFRON closetext end diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 5c0ad4a17..2b192dfd2 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -24,7 +24,7 @@ TeacherScript_0x18a480: FisherScript_0x18a48c: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue .SolvedKantoPowerCrisis writetext UnknownText_0x18a5d3 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 466409e76..6a5de5a7b 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -19,7 +19,7 @@ SaffronTrainStation_MapScriptHeader: OfficerScript_0x18a81e: faceplayer - loadfont + opentext checkevent EVENT_RESTORED_POWER_TO_KANTO iftrue .MagnetTrainToGoldenrod writetext UnknownText_0x18a8a9 @@ -66,7 +66,7 @@ Script_ArriveFromGoldenrod: applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a88f applymovement PLAYER, MovementData_0x18a8a1 applymovement SAFFRONTRAINSTATION_OFFICER, MovementData_0x18a894 - loadfont + opentext writetext UnknownText_0x18a993 waitbutton closetext @@ -74,7 +74,7 @@ Script_ArriveFromGoldenrod: GymGuyScript_0x18a875: faceplayer - loadfont + opentext checkevent EVENT_RETURNED_MACHINE_PART iftrue UnknownScript_0x18a883 writetext UnknownText_0x18a9ca diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 4aa29455f..73d6f949b 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -17,7 +17,7 @@ UnknownScript_0x1ab4fa: BlaineScript_0x1ab4fb: faceplayer - loadfont + opentext checkflag ENGINE_VOLCANOBADGE iftrue .FightDone writetext UnknownText_0x1ab548 @@ -31,7 +31,7 @@ BlaineScript_0x1ab4fb: .ReturnAfterBattle returnafterbattle setevent EVENT_BEAT_BLAINE - loadfont + opentext writetext UnknownText_0x1ab683 playsound SFX_GET_BADGE waitsfx @@ -49,7 +49,7 @@ BlaineScript_0x1ab4fb: SeafoamGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_TALKED_TO_SEAFOAM_GYM_GUY_ONCE iftrue .TalkedToSeafoamGymGuyScript writetext SeafoamGymGuyWinText diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index 90fd1bc36..be1d1977a 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -14,7 +14,7 @@ ReceptionistScript_0x18abe5: OfficerScript_0x18abe8: faceplayer - loadfont + opentext checkevent EVENT_GOT_UP_GRADE iftrue UnknownScript_0x18abfd writetext UnknownText_0x18ac36 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index a668df025..b1187ab74 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -11,7 +11,7 @@ SilverCaveRoom3_MapScriptHeader: RedScript_0x18c603: special Special_FadeOutMusic faceplayer - loadfont + opentext writetext UnknownText_0x18c637 waitbutton closetext @@ -21,7 +21,7 @@ RedScript_0x18c603: reloadmapmusic returnafterbattle special Special_FadeOutMusic - loadfont + opentext writetext UnknownText_0x18c63f waitbutton closetext diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index f8ffcc94a..47c094ece 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -24,7 +24,7 @@ TrainerGruntM29: GruntM29Script: end_if_just_battled - loadfont + opentext writetext TrainerGruntM29SlowpokeProfitText waitbutton closetext @@ -34,7 +34,7 @@ TrainerGruntM1: trainer EVENT_BEAT_ROCKET_GRUNTM_1, GRUNTM, 1, GruntM1SeenText, GruntM1BeatenText, 0, GruntM1Script GruntM1Script: - loadfont + opentext writetext TrainerGruntM1WhenTalkText waitbutton closetext @@ -51,7 +51,7 @@ GruntM1Script: appear SLOWPOKEWELLB1F_KURT applymovement SLOWPOKEWELLB1F_KURT, KurtSlowpokeWellVictoryMovementData spriteface PLAYER, RIGHT - loadfont + opentext writetext KurtLeaveSlowpokeWellText waitbutton closetext @@ -78,7 +78,7 @@ TrainerGruntM2: GruntM2Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5aaf2 waitbutton closetext @@ -89,7 +89,7 @@ TrainerGruntF1: GruntF1Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5ab8d waitbutton closetext @@ -97,7 +97,7 @@ GruntF1Script: SlowpokeScript_0x5a681: faceplayer - loadfont + opentext cry SLOWPOKE writetext UnknownText_0x5abcb yesorno @@ -113,7 +113,7 @@ UnknownScript_0x5a68f: SlowpokeScript_0x5a695: faceplayer - loadfont + opentext writetext UnknownText_0x5ac61 cry SLOWPOKE waitbutton diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index b8e38800a..ba8f60c6d 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -11,7 +11,7 @@ SlowpokeWellB2F_MapScriptHeader: GymGuyScript_0x5ad0b: faceplayer - loadfont + opentext checkevent EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL iftrue UnknownScript_0x5ad22 writetext UnknownText_0x5ad2a diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index ec86497c9..4a4c1d56e 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -30,7 +30,7 @@ TrainerSageChow: SageChowScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x184583 waitbutton closetext diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 6022c0637..5e9938716 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -15,7 +15,7 @@ TrainerSageNico: SageNicoScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1847ff waitbutton closetext @@ -26,7 +26,7 @@ TrainerSageEdmond: SageEdmondScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x18486f waitbutton closetext diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index b487e2f3e..389b111a7 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -37,7 +37,7 @@ UnknownScript_0x184947: earthquake 79 applymovement PLAYER, MovementData_0x184a1d applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a22 - loadfont + opentext writetext UnknownText_0x184a27 waitbutton closetext @@ -46,12 +46,12 @@ UnknownScript_0x184947: pause 15 applymovement SPROUTTOWER3F_SILVER, MovementData_0x184a24 playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x184aec waitbutton closetext spriteface SPROUTTOWER3F_SILVER, UP - loadfont + opentext writetext UnknownText_0x184bc8 pause 15 closetext @@ -67,7 +67,7 @@ UnknownScript_0x184947: SageLiScript: faceplayer - loadfont + opentext checkevent EVENT_GOT_HM05_FLASH iftrue UnknownScript_0x1849d1 writetext SageLiSeenText @@ -77,7 +77,7 @@ SageLiScript: loadtrainer SAGE, LI startbattle returnafterbattle - loadfont + opentext writetext UnknownText_0x184cc2 buttonsound verbosegiveitem HM_FLASH @@ -99,7 +99,7 @@ TrainerSageJin: SageJinScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x184dfa waitbutton closetext @@ -110,7 +110,7 @@ TrainerSageTroy: SageTroyScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x184ea4 waitbutton closetext @@ -121,7 +121,7 @@ TrainerSageNeal: SageNealScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x184f12 waitbutton closetext diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 3f3064aef..90d846cf8 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -237,7 +237,7 @@ NoSecurityCamera: end TrainerCameraGrunt1: - loadfont + opentext writetext CameraGrunt1SeenText waitbutton closetext @@ -250,7 +250,7 @@ TrainerCameraGrunt1: end TrainerCameraGrunt2: - loadfont + opentext writetext CameraGrunt2SeenText waitbutton closetext @@ -490,7 +490,7 @@ TrainerScientistJed: ScientistJedScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6cc16 waitbutton closetext @@ -501,7 +501,7 @@ TrainerGruntM16: GruntM16Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6cd1b waitbutton closetext @@ -514,7 +514,7 @@ MapTeamRocketBaseB1FSignpost7Script: jumpstd teamrocketoath MapTeamRocketBaseB1FSignpost0Script: - loadfont + opentext checkevent EVENT_TURNED_OFF_SECURITY_CAMERAS iftrue UnknownScript_0x6cabe writetext UnknownText_0x6cdad diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index e70cc37d2..2d92d0a5d 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -64,7 +64,7 @@ UnknownScript_0x6cf9c: UnknownScript_0x6cfac: appear TEAMROCKETBASEB2F_ROCKET_GIRL appear TEAMROCKETBASEB2F_ROCKET1 - loadfont + opentext writetext UnknownText_0x6d2ad waitbutton closetext @@ -75,7 +75,7 @@ UnknownScript_0x6cfac: applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d224 spriteface PLAYER, UP applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d22f - loadfont + opentext writetext UnknownText_0x6d2c3 waitbutton closetext @@ -88,13 +88,13 @@ UnknownScript_0x6cfac: applymovement TEAMROCKETBASEB2F_ROCKET1, MovementData_0x6d24c appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d244 - loadfont + opentext writetext UnknownText_0x6d38c waitbutton closetext spriteface PLAYER, RIGHT applymovement TEAMROCKETBASEB2F_ROCKET_GIRL, MovementData_0x6d241 - loadfont + opentext writetext UnknownText_0x6d3bd waitbutton closetext @@ -110,7 +110,7 @@ UnknownScript_0x6cfac: setevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE returnafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 - loadfont + opentext writetext UnknownText_0x6d4c6 waitbutton closetext @@ -126,13 +126,13 @@ UnknownScript_0x6cfac: dotrigger $2 clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface TEAMROCKETBASEB2F_LANCE, DOWN - loadfont + opentext writetext UnknownText_0x6d5d8 waitbutton closetext applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d250 spriteface PLAYER, UP - loadfont + opentext writetext UnknownText_0x6d64e waitbutton closetext @@ -140,7 +140,7 @@ UnknownScript_0x6cfac: applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d254 stopfollow applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d258 - loadfont + opentext writetext UnknownText_0x6d6cf waitbutton closetext @@ -152,7 +152,7 @@ UnknownScript_0x6d075: end UnknownScript_0x6d07a: - loadfont + opentext writetext UnknownText_0x6d7ea waitbutton closetext @@ -167,7 +167,7 @@ UnknownScript_0x6d08b: spriteface PLAYER, RIGHT spriteface TEAMROCKETBASEB2F_LANCE, LEFT UnknownScript_0x6d091: - loadfont + opentext writetext UnknownText_0x6da97 waitbutton closetext @@ -176,7 +176,7 @@ UnknownScript_0x6d091: playsound SFX_FULL_HEAL special HealParty special FadeInPalettes - loadfont + opentext writetext UnknownText_0x6daf7 waitbutton closetext @@ -198,7 +198,7 @@ TrainerGruntM17: GruntM17Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6db88 waitbutton closetext @@ -209,7 +209,7 @@ TrainerGruntM18: GruntM18Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6dc1a waitbutton closetext @@ -220,7 +220,7 @@ TrainerGruntM19: GruntM19Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6dcd1 waitbutton closetext @@ -289,7 +289,7 @@ UnknownScript_0x6d184: appear TEAMROCKETBASEB2F_LANCE applymovement TEAMROCKETBASEB2F_LANCE, MovementData_0x6d27a spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x6d809 buttonsound verbosegiveitem HM_WHIRLPOOL @@ -298,7 +298,7 @@ UnknownScript_0x6d184: waitbutton closetext spriteface TEAMROCKETBASEB2F_LANCE, DOWN - loadfont + opentext writetext UnknownText_0x6d994 waitbutton closetext @@ -325,7 +325,7 @@ MapTeamRocketBaseB2FSignpostPtr1: MapTeamRocketBaseB2FSignpost1Script: - loadfont + opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue UnknownScript_0x6d1e8 writetext UnknownText_0x6dd39 @@ -345,7 +345,7 @@ UnknownScript_0x6d1e8: end MapTeamRocketBaseB2FSignpost21Script: - loadfont + opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT iftrue UnknownScript_0x6d207 writetext UnknownText_0x6dda7 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 8de459926..06eb0c9ec 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -59,7 +59,7 @@ LanceScript_0x6dffc: spriteface TEAMROCKETBASEB3F_MOLTRES, RIGHT pause 20 applymovement TEAMROCKETBASEB3F_LANCE, MovementData_0x6e12a - loadfont + opentext writetext UnknownText_0x6e179 waitbutton closetext @@ -76,7 +76,7 @@ UnknownScript_0x6e019: applymovement TEAMROCKETBASEB3F_SILVER, MovementData_0x6e164 spriteface PLAYER, LEFT playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x6e267 waitbutton closetext @@ -102,7 +102,7 @@ UnknownScript_0x6e056: showemote EMOTE_SHOCK, TEAMROCKETBASEB3F_ROCKET1, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface TEAMROCKETBASEB3F_ROCKET1, DOWN - loadfont + opentext writetext UnknownText_0x6e400 waitbutton closetext @@ -113,7 +113,7 @@ UnknownScript_0x6e056: startbattle returnafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEM_4 - loadfont + opentext writetext UnknownText_0x6e548 waitbutton closetext @@ -125,7 +125,7 @@ UnknownScript_0x6e056: end MoltresScript_0x6e091: - loadfont + opentext writetext UnknownText_0x6e585 waitbutton closetext @@ -137,7 +137,7 @@ TrainerGruntF5: GruntF5Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6e611 waitbutton closetext @@ -149,7 +149,7 @@ TrainerGruntM28: GruntM28Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6e737 waitbutton closetext @@ -161,7 +161,7 @@ TrainerScientistRoss: ScientistRossScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6e822 waitbutton closetext @@ -172,7 +172,7 @@ TrainerScientistMitch: ScientistMitchScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x6e90a waitbutton closetext @@ -183,7 +183,7 @@ BossDoor: dw .Script .Script - loadfont + opentext checkevent EVENT_LEARNED_SLOWPOKETAIL iffalse .NeedsPassword checkevent EVENT_LEARNED_RATICATE_TAIL diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 85c5a9bf1..682c44aca 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -47,7 +47,7 @@ MapTimeCapsuleSignpost1Script: end ChrisScript_0x19351a: - loadfont + opentext writetext UnknownText_0x193521 waitbutton closetext diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index a77b2475e..6a373b638 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -162,7 +162,7 @@ UnknownScript_0x1850d7: moveperson TINTOWER1F_SAGE2, $9, $d moveperson TINTOWER1F_SAGE3, $b, $d spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x185203 waitbutton closetext @@ -194,7 +194,7 @@ UnknownScript_0x185185: SageScript_0x185188: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_HO_OH iftrue UnknownScript_0x1851b6 checkevent EVENT_GOT_RAINBOW_WING @@ -211,7 +211,7 @@ SageScript_0x185188: reloadmappart setevent EVENT_GOT_RAINBOW_WING closetext - loadfont + opentext UnknownScript_0x1851b0: writetext UnknownText_0x18564a waitbutton diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index e2d05d15f..a24878415 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -29,7 +29,7 @@ UnknownScript_0x77241: HoOhScript_0x77244: faceplayer - loadfont + opentext writetext UnknownText_0x77260 cry HO_OH pause 15 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 96c126dcb..ca889a009 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -47,7 +47,7 @@ MapTradeCenterSignpost1Script: end ChrisScript_0x19340b: - loadfont + opentext writetext .FriendReadyText waitbutton closetext diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 7fae3553d..c06c9ff41 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -17,7 +17,7 @@ Trigger0: TrainerHouseReceptionistScript: spriteface PLAYER, UP - loadfont + opentext checkflag ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY iftrue .FoughtTooManyTimes writetext TrainerHouseB1FIntroText @@ -40,7 +40,7 @@ TrainerHouseReceptionistScript: waitbutton closetext applymovement PLAYER, Movement_EnterTrainerHouseBattleRoom - loadfont + opentext writetext TrainerHouseB1FCalBeforeText waitbutton closetext diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 46597ea57..3f1b05a9f 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -162,7 +162,7 @@ UndergroundSilverBattleScript: domaptrigger BURNED_TOWER_1F, 1 .Continue: playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UndergroundSilverBeforeText waitbutton closetext @@ -199,7 +199,7 @@ UndergroundSilverBattleScript: .FinishRivalBattle: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext UndergroundSilverAfterText waitbutton closetext @@ -210,7 +210,7 @@ TrainerGruntM11: GruntM11Script: end_if_just_battled - loadfont + opentext writetext GruntM11AfterText waitbutton closetext @@ -221,7 +221,7 @@ TrainerGruntM25: GruntM25Script: end_if_just_battled - loadfont + opentext writetext GruntM25AfterText waitbutton closetext @@ -232,7 +232,7 @@ TrainerBurglarDuncan: BurglarDuncanScript: end_if_just_battled - loadfont + opentext writetext BurglarDuncanAfterText waitbutton closetext @@ -243,7 +243,7 @@ TrainerBurglarEddie: BurglarEddieScript: end_if_just_battled - loadfont + opentext writetext BurglarEddieAfterText waitbutton closetext @@ -254,7 +254,7 @@ TrainerGruntM13: GruntM13Script: end_if_just_battled - loadfont + opentext writetext GruntM13AfterText waitbutton closetext @@ -265,14 +265,14 @@ TrainerGruntF3: GruntF3Script: end_if_just_battled - loadfont + opentext writetext GruntF3AfterText waitbutton closetext end Switch1Script: - loadfont + opentext writetext SwitchRoomText_Switch1 buttonsound checkevent EVENT_SWITCH_1 @@ -297,7 +297,7 @@ Switch1Script: jump UndergroundPathSwitchRoomEntrances_UpdateDoors Switch2Script: - loadfont + opentext writetext SwitchRoomText_Switch2 buttonsound checkevent EVENT_SWITCH_2 @@ -322,7 +322,7 @@ Switch2Script: jump UndergroundPathSwitchRoomEntrances_UpdateDoors Switch3Script: - loadfont + opentext writetext SwitchRoomText_Switch3 buttonsound checkevent EVENT_SWITCH_3 @@ -347,7 +347,7 @@ Switch3Script: jump UndergroundPathSwitchRoomEntrances_UpdateDoors EmergencySwitchScript: - loadfont + opentext writetext SwitchRoomText_Emergency buttonsound checkevent EVENT_EMERGENCY_SWITCH diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 677f3aef9..4c0a8833b 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -43,7 +43,7 @@ TrainerGruntM24: GruntM24Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7da48 waitbutton closetext @@ -54,7 +54,7 @@ TrainerGruntM14: GruntM14Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7db01 waitbutton closetext @@ -65,7 +65,7 @@ TrainerGruntM15: GruntM15Script: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7db8e waitbutton closetext @@ -73,7 +73,7 @@ GruntM15Script: GentlemanScript_0x7d9bf: faceplayer - loadfont + opentext checkevent EVENT_RECEIVED_CARD_KEY iftrue UnknownScript_0x7d9de writetext UnknownText_0x7dbc6 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 58b7a5243..95f5be24d 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -21,7 +21,7 @@ TrainerPokemaniacLarry: PokemaniacLarryScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x59d31 waitbutton closetext @@ -32,7 +32,7 @@ TrainerHikerRussell: HikerRussellScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x59c6c waitbutton closetext @@ -43,7 +43,7 @@ TrainerHikerDaniel: HikerDanielScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x59dc9 waitbutton closetext @@ -54,7 +54,7 @@ TrainerFirebreatherBill: FirebreatherBillScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x59e6f waitbutton closetext @@ -65,7 +65,7 @@ TrainerFirebreatherRay: FirebreatherRayScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x59efc waitbutton closetext diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 1030f0186..fb37f0df7 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -19,7 +19,7 @@ TrainerPokemaniacAndrew: PokemaniacAndrewScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5a181 waitbutton closetext @@ -30,7 +30,7 @@ TrainerPokemaniacCalvin: PokemaniacCalvinScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5a230 waitbutton closetext @@ -41,7 +41,7 @@ TrainerHikerPhillip: HikerPhillipScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5a073 waitbutton closetext @@ -52,7 +52,7 @@ TrainerHikerLeonard: HikerLeonardScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5a0fb waitbutton closetext diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index db270174e..3ba88a1e8 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -45,7 +45,7 @@ TrainerCooltrainermNick: CooltrainermNickScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5a3f0 waitbutton closetext @@ -56,7 +56,7 @@ TrainerCooltrainerfGwen: CooltrainerfGwenScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5a488 waitbutton closetext @@ -67,7 +67,7 @@ TrainerCooltrainerfEmma: CooltrainerfEmmaScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x5a52b waitbutton closetext diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 5fe61b03c..3e5fba430 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -27,13 +27,13 @@ GrampsScript_0x1aa986: jumptextfaceplayer UnknownText_0x1aaa6f VermilionMachop: - loadfont + opentext writetext UnknownText_0x1aaaca cry MACHOP waitbutton closetext earthquake 30 - loadfont + opentext writetext UnknownText_0x1aaae2 waitbutton closetext @@ -43,7 +43,7 @@ SuperNerdScript_0x1aa99b: jumptextfaceplayer UnknownText_0x1aab1a VermilionSnorlax: - loadfont + opentext special SpecialSnorlaxAwake iftrue UnknownScript_0x1aa9ab writetext UnknownText_0x1aab64 @@ -66,7 +66,7 @@ UnknownScript_0x1aa9ab: VermilionGymBadgeGuy: faceplayer - loadfont + opentext checkevent EVENT_GOT_HP_UP_FROM_VERMILION_GUY iftrue .AlreadyGotItem checkcode VAR_BADGES diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 069ddfa54..4040997e1 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -14,7 +14,7 @@ VermilionGym_MapScriptHeader: SurgeScript_0x1920a5: faceplayer - loadfont + opentext checkflag ENGINE_THUNDERBADGE iftrue .FightDone writetext UnknownText_0x192142 @@ -28,7 +28,7 @@ SurgeScript_0x1920a5: setevent EVENT_BEAT_GENTLEMAN_GREGORY setevent EVENT_BEAT_GUITARIST_VINCENT setevent EVENT_BEAT_JUGGLER_HORTON - loadfont + opentext writetext UnknownText_0x192277 playsound SFX_GET_BADGE waitsfx @@ -49,7 +49,7 @@ TrainerGentlemanGregory: GentlemanGregoryScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1923b0 waitbutton closetext @@ -60,7 +60,7 @@ TrainerGuitaristVincent: GuitaristVincentScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x19244b waitbutton closetext @@ -71,7 +71,7 @@ TrainerJugglerHorton: JugglerHortonScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x1924d6 waitbutton closetext @@ -79,7 +79,7 @@ JugglerHortonScript: VermilionGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_LTSURGE iftrue .VermilionGymGuyWinScript writetext VermilionGymGuyText diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index d671008b5..7da93f1e2 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -11,7 +11,7 @@ VermilionMart_MapScriptHeader: db 0 ClerkScript_0x191f7e: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_VERMILION closetext end diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index 725567083..f3cc2d248 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -16,7 +16,7 @@ NurseScript_0x191603: FishingGuruScript_0x191606: faceplayer - loadfont + opentext checkevent EVENT_FOUGHT_SNORLAX iftrue UnknownScript_0x191614 writetext UnknownText_0x191620 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 6b67ede24..677de3ab1 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -43,7 +43,7 @@ UnknownScript_0x74da6: SailorScript_0x74dc4: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 @@ -89,7 +89,7 @@ UnknownScript_0x74e20: checkevent EVENT_RECEIVED_BALLS_FROM_KURT iftrue UnknownScript_0x74e86 spriteface PLAYER, LEFT - loadfont + opentext checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74e72 if_equal TUESDAY, UnknownScript_0x74e72 @@ -149,7 +149,7 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer - loadfont + opentext checkevent EVENT_GAVE_KURT_APRICORNS iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY @@ -192,7 +192,7 @@ UnknownScript_0x74ee0: SuperNerdScript_0x74ee6: faceplayer - loadfont + opentext writetext UnknownText_0x750a6 waitbutton closetext diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 1648fd072..542b964f7 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -55,7 +55,7 @@ UnknownScript_0x744b5: UnknownScript_0x744d4: spriteface PLAYER, DOWN playmusic MUSIC_RIVAL_ENCOUNTER - loadfont + opentext writetext UnknownText_0x7455f waitbutton closetext @@ -92,7 +92,7 @@ UnknownScript_0x7450f: UnknownScript_0x7451f: playmusic MUSIC_RIVAL_AFTER - loadfont + opentext writetext UnknownText_0x746ce waitbutton closetext diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 5d17ffac6..8195ac971 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -27,7 +27,7 @@ UnknownScript_0x9b9fd: OfficerScript_0x9ba03: faceplayer UnknownScript_0x9ba04: - loadfont + opentext writetext UnknownText_0x9ba29 buttonsound checkcode VAR_BADGES diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index db42d7f2e..f05fbe8fd 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -25,7 +25,7 @@ VioletCity_MapScriptHeader: FisherScript_0x1a83bb: applymovement VIOLETCITY_FISHER, MovementData_0x1a8465 faceplayer - loadfont + opentext writetext UnknownText_0x1a8473 yesorno iffalse UnknownScript_0x1a83d1 @@ -48,7 +48,7 @@ UnknownScript_0x1a83d1: applymovement VIOLETCITY_FISHER, MovementData_0x1a8465 stopfollow special RestartMapMusic - loadfont + opentext writetext UnknownText_0x1a84f9 waitbutton closetext diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 35f5df9bc..99dfcb184 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -13,7 +13,7 @@ VioletGym_MapScriptHeader: FalknerScript_0x683c2: faceplayer - loadfont + opentext checkevent EVENT_BEAT_FALKNER iftrue .FightDone writetext UnknownText_0x68473 @@ -24,7 +24,7 @@ FalknerScript_0x683c2: startbattle returnafterbattle setevent EVENT_BEAT_FALKNER - loadfont + opentext writetext UnknownText_0x685af playsound SFX_GET_BADGE waitsfx @@ -71,7 +71,7 @@ TrainerBird_keeperRod: Bird_keeperRodScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x68837 waitbutton closetext @@ -82,7 +82,7 @@ TrainerBird_keeperAbe: Bird_keeperAbeScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x688c7 waitbutton closetext @@ -90,7 +90,7 @@ Bird_keeperAbeScript: VioletGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_FALKNER iftrue .VioletGymGuyWinScript writetext VioletGymGuyText diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index f6c47e08f..0513be044 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -11,7 +11,7 @@ VioletMart_MapScriptHeader: db 0 ClerkScript_0x68295: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_VIOLET closetext end diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index d23891e32..7717c7136 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -18,7 +18,7 @@ LassScript_0x693ec: BirdScript_0x693ef: faceplayer - loadfont + opentext writetext UnknownText_0x6947c cry PIDGEY waitbutton diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index 76ce91e2c..eabab4e7d 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -14,7 +14,7 @@ PokefanMScript_0x6998d: YoungsterScript_0x69990: faceplayer - loadfont + opentext trade $1 waitbutton closetext diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 8c6195b38..15d7fb0b1 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -17,7 +17,7 @@ VioletPokeCenterNurse: VioletPokeCenter1F_ElmsAideScript: faceplayer - loadfont + opentext checkevent EVENT_REFUSED_TO_TAKE_EGG_FROM_ELMS_AIDE iftrue .SecondTimeAsking writetext UnknownText_0x69555 diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 15e52bc75..7d725a3aa 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -20,7 +20,7 @@ ViridianCity_MapScriptHeader: GrampsScript_0x1a9a4c: faceplayer - loadfont + opentext writetext UnknownText_0x1a9aa5 yesorno iffalse UnknownScript_0x1a9a5b @@ -37,7 +37,7 @@ UnknownScript_0x1a9a5b: GrampsScript_0x1a9a61: faceplayer - loadfont + opentext checkevent EVENT_BLUE_IN_CINNABAR iftrue .BlueReturned writetext UnknownText_0x1a9c11 @@ -53,7 +53,7 @@ GrampsScript_0x1a9a61: FisherScript_0x1a9a75: faceplayer - loadfont + opentext checkevent EVENT_GOT_TM42_DREAM_EATER iftrue UnknownScript_0x1a9a8a writetext UnknownText_0x1a9cc4 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index f627816f1..fabb3b91d 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -11,7 +11,7 @@ ViridianGym_MapScriptHeader: BlueScript_0x9aa26: faceplayer - loadfont + opentext checkflag ENGINE_EARTHBADGE iftrue .FightDone writetext UnknownText_0x9aa7b @@ -22,7 +22,7 @@ BlueScript_0x9aa26: startbattle returnafterbattle setevent EVENT_BEAT_BLUE - loadfont + opentext writetext UnknownText_0x9ac0f playsound SFX_GET_BADGE waitsfx @@ -40,7 +40,7 @@ BlueScript_0x9aa26: ViridianGymGuyScript: faceplayer - loadfont + opentext checkevent EVENT_BEAT_BLUE iftrue .ViridianGymGuyWinScript writetext ViridianGymGuyText diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 0104cdc7d..25764b0a5 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -11,7 +11,7 @@ ViridianMart_MapScriptHeader: db 0 ClerkScript_0x9b5e7: - loadfont + opentext pokemart MARTTYPE_STANDARD, MART_VIRIDIAN closetext end diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 57943667b..42447d2fa 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -18,7 +18,7 @@ LassScript_0x9ae3d: jumptextfaceplayer UnknownText_0x9aecb MoltresScript_0x9ae40: - loadfont + opentext writetext UnknownText_0x9aefe cry SPEAROW waitbutton @@ -26,7 +26,7 @@ MoltresScript_0x9ae40: end GrowlitheScript_0x9ae4a: - loadfont + opentext writetext UnknownText_0x9af10 cry RATTATA waitbutton diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index 61735b8f0..c8eccee2c 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -16,7 +16,7 @@ NurseScript_0x9b690: CooltrainerMScript_0x9b693: faceplayer - loadfont + opentext checkevent EVENT_BLUE_IN_CINNABAR iftrue .BlueReturned writetext UnknownText_0x9b6ad diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 2abd7462b..a0ecb2a29 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -120,7 +120,7 @@ TrainerSupernerdEric: SupernerdEricScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7c36c waitbutton closetext @@ -131,7 +131,7 @@ TrainerSupernerdTeru: SupernerdTeruScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7c410 waitbutton closetext @@ -142,7 +142,7 @@ TrainerPokemaniacIssac: PokemaniacIssacScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7c498 waitbutton closetext @@ -153,14 +153,14 @@ TrainerPokemaniacDonald: PokemaniacDonaldScript: end_if_just_battled - loadfont + opentext writetext UnknownText_0x7c52f waitbutton closetext end GrannyScript_0x7c132: - loadfont + opentext checkcode VAR_WEEKDAY if_equal SUNDAY, .Open if_equal SATURDAY, .Open @@ -172,7 +172,7 @@ GrannyScript_0x7c132: end GrampsScript_0x7c146: - loadfont + opentext checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED iftrue WarehouseEntranceScript_ShopClosed checkcode VAR_WEEKDAY @@ -187,7 +187,7 @@ GrampsScript_0x7c146: end OlderHaircutBrotherScript: - loadfont + opentext checkcode VAR_WEEKDAY if_equal TUESDAY, .DoHaircut if_equal THURSDAY, .DoHaircut @@ -242,7 +242,7 @@ OlderHaircutBrotherScript: pause 60 special FadeInPalettes special RestartMapMusic - loadfont + opentext writetext UnknownText_0x7c6d8 waitbutton checkevent EVENT_GAVE_KURT_APRICORNS @@ -270,7 +270,7 @@ OlderHaircutBrotherScript: end YoungerHaircutBrotherScript: - loadfont + opentext checkcode VAR_WEEKDAY if_equal SUNDAY, .DoHaircut if_equal WEDNESDAY, .DoHaircut @@ -325,7 +325,7 @@ YoungerHaircutBrotherScript: pause 60 special FadeInPalettes special RestartMapMusic - loadfont + opentext writetext UnknownText_0x7c82a waitbutton checkevent EVENT_GAVE_KURT_APRICORNS @@ -374,7 +374,7 @@ UnknownScript_0x7c2cd: end BasementDoorScript:: - loadfont + opentext checkevent EVENT_USED_BASEMENT_KEY iftrue .Open checkitem BASEMENT_KEY diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 5b4a115b1..26d327faa 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -29,7 +29,7 @@ UnknownScript_0x18c515: LugiaScript_0x18c518: faceplayer - loadfont + opentext writetext UnknownText_0x18c531 cry LUGIA pause 15 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 2fe14012b..b2eb59257 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -49,7 +49,7 @@ UnknownScript_0x1804e0: WillScript_0x1804f8: faceplayer - loadfont + opentext checkevent EVENT_BEAT_ELITE_4_WILL iftrue UnknownScript_0x180526 writetext UnknownText_0x180531 @@ -60,7 +60,7 @@ WillScript_0x1804f8: startbattle returnafterbattle setevent EVENT_BEAT_ELITE_4_WILL - loadfont + opentext writetext UnknownText_0x180644 waitbutton closetext diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 9d63084a4..b906acc31 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -65,7 +65,7 @@ UnknownScript_0x985a3: applymovement PLAYER, MovementData_0x98622 stopfollow spriteface PLAYER, RIGHT - loadfont + opentext writetext UnknownText_0x98712 waitbutton closetext @@ -77,7 +77,7 @@ TrainerSageGaku: trainer EVENT_BEAT_SAGE_GAKU, SAGE, GAKU, SageGakuSeenText, SageGakuBeatenText, 0, SageGakuScript SageGakuScript: - loadfont + opentext writetext UnknownText_0x98938 waitbutton closetext @@ -87,7 +87,7 @@ TrainerSageMasa: trainer EVENT_BEAT_SAGE_MASA, SAGE, MASA, SageMasaSeenText, SageMasaBeatenText, 0, SageMasaScript SageMasaScript: - loadfont + opentext writetext UnknownText_0x98a35 waitbutton closetext @@ -101,7 +101,7 @@ SageKojiScript: iftrue UnknownScript_0x9861b pause 10 showemote EMOTE_SHOCK, WISETRIOSROOM_SAGE6, 20 - loadfont + opentext writetext UnknownText_0x98c6c buttonsound writetext UnknownText_0x98cac @@ -114,7 +114,7 @@ SageKojiScript: end UnknownScript_0x9861b: - loadfont + opentext writetext UnknownText_0x98db5 waitbutton closetext diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index bc49bca11..0ce38a5d1 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -1,15 +1,15 @@ Function104000:: ; 104000 ld hl, Function104006 - jp Function104177 + jp CallInSafeGFXMode ; 104006 Function104006: ; 104006 decoord 0, 0, AttrMap ld hl, wBackupAttrMap - call Function104263 + call CutAndPasteAttrMap decoord 0, 0 ld hl, wBackupTilemap - call Function10425f + call CutAndPasteTilemap ld a, $0 ld [rVBK], a ld hl, wBackupTilemap @@ -23,13 +23,13 @@ Function104006: ; 104006 Function10402d:: ; 10402d ld hl, Function104033 - jp Function104177 + jp CallInSafeGFXMode ; 104033 Function104033: ; 104033 decoord 0, 0 ld hl, wBackupTilemap - call Function10425f + call CutAndPasteTilemap ld a, $0 ld [rVBK], a ld hl, wBackupTilemap @@ -39,13 +39,13 @@ Function104033: ; 104033 Function104047: ; 104047 ld hl, Function10404d - jp Function104177 + jp CallInSafeGFXMode ; 10404d Function10404d: ; 10404d decoord 0, 0, AttrMap ld hl, wBackupAttrMap - call Function104263 + call CutAndPasteAttrMap ld a, $1 ld [rVBK], a ld hl, wBackupAttrMap @@ -55,16 +55,16 @@ Function10404d: ; 10404d ReloadMapPart:: ; 104061 ld hl, Function104067 - jp Function104177 + jp CallInSafeGFXMode ; 104067 Function104067: ; 104067 decoord 0, 0, AttrMap ld hl, wBackupAttrMap - call Function104263 + call CutAndPasteAttrMap decoord 0, 0 ld hl, wBackupTilemap - call Function10425f + call CutAndPasteTilemap call DelayFrame di ld a, [rVBK] @@ -85,16 +85,16 @@ Function104067: ; 104067 Function104099: ; 104099 ld hl, ReloadMapPart ; useless ld hl, Function1040a2 - jp Function104177 + jp CallInSafeGFXMode ; 1040a2 Function1040a2: ; 1040a2 decoord 0, 0, AttrMap ld hl, wBackupAttrMap - call Function104263 + call CutAndPasteAttrMap decoord 0, 0 ld hl, wBackupTilemap - call Function10425f + call CutAndPasteTilemap call DelayFrame di ld a, [rVBK] @@ -115,7 +115,7 @@ Function1040a2: ; 1040a2 Function1040d4: ; 1040d4 ld hl, Function1040da - jp Function104177 + jp CallInSafeGFXMode ; 1040da Function1040da: ; 1040da @@ -140,7 +140,7 @@ Function1040da: ; 1040da Function1040fb: ; 1040fb ld hl, Function104101 - jp Function104177 + jp CallInSafeGFXMode ; 104101 Function104101: ; 104101 @@ -154,18 +154,20 @@ Function104101: ; 104101 ; 104110 Function104110:: ; 104110 +; OpenText ld hl, Function104116 - jp Function104177 + jp CallInSafeGFXMode ; 104116 Function104116: ; 104116 decoord 0, 0, AttrMap ld hl, wBackupAttrMap - call Function104263 + call CutAndPasteAttrMap decoord 0, 0 ld hl, wBackupTilemap - call Function10425f + call CutAndPasteTilemap call DelayFrame + di ld a, [rVBK] push af @@ -185,17 +187,17 @@ Function104116: ; 104116 Function104148: ; 104148 (41:4148) ld hl, Function10414e - jp Function104177 + jp CallInSafeGFXMode ; 10414e (41:414e) Function10414e: ; 10414e decoord 0, 0, AttrMap ld hl, wBackupAttrMap - call Function104263 + call CutAndPasteAttrMap ld c, $ff decoord 0, 0 ld hl, wBackupTilemap - call Function104265 + call CutAndPasteMap ld a, $1 ld [rVBK], a ld hl, wBackupAttrMap @@ -207,7 +209,7 @@ Function10414e: ; 10414e ret ; 104177 -Function104177: ; 104177 +CallInSafeGFXMode: ; 104177 ld a, [hBGMapMode] push af ld a, [hMapAnims] @@ -221,7 +223,9 @@ Function104177: ; 104177 ld [rSVBK], a ld a, [rVBK] push af + call ._hl_ + pop af ld [rVBK], a pop af @@ -260,6 +264,9 @@ Function1041ad: ; 1041ad (41:41ad) jr Function104209 Function1041b7: ; 1041b7 (41:41b7) +; hBGMapAddress -> de +; $24 -> c +; $7b --> b ld a, [hBGMapAddress + 1] ld d, a ld a, [hBGMapAddress] @@ -388,14 +395,14 @@ Function10424e: ; 10424e (41:424e) ld [rHDMA4], a ret -Function10425f: ; 10425f (41:425f) +CutAndPasteTilemap: ; 10425f (41:425f) ld c, " " - jr Function104265 + jr CutAndPasteMap -Function104263: ; 104263 (41:4263) +CutAndPasteAttrMap: ; 104263 (41:4263) ld c, $0 -Function104265: ; 104265 (41:4265) +CutAndPasteMap: ; 104265 (41:4265) ; back up the value of c to hMapObjectIndexBuffer ld a, [hMapObjectIndexBuffer] push af @@ -543,7 +550,7 @@ endr Function104303: ; 104303 ld hl, Function104309 - jp Function104177 + jp CallInSafeGFXMode ; 104309 Function104309: diff --git a/predef/cgb.asm b/predef/cgb.asm index 300ca9f9a..ea5580f8e 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -611,7 +611,7 @@ _CGB0b: ; 91e4 ld a, $1a call GetAthPalletFromPalettes9df6 call LoadHLPaletteIntoDE - jr .asm_921a + jr .got_palette .asm_91f5 ld hl, PartyMon1DVs @@ -624,12 +624,12 @@ _CGB0b: ; 91e4 call Function974b call Function9643 ld hl, Palettes_979c - ld de, UnknOBPals + $10 - ld bc, $0030 + ld de, UnknOBPals + 2 palettes + ld bc, 6 palettes ld a, $5 call FarCopyWRAM -.asm_921a +.got_palette call Function9699 call Function96b3 call Function96a4