From 249bad9551b1c9c29fd64bc36486eb6612427c3b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 13 Jul 2015 00:16:35 -0400 Subject: Replace EVENT_ALWAYS_THERE with -1 --- constants/event_flags.asm | 50 +- constants/gfx_constants.asm | 79 +- constants/map_constants.asm | 2460 +++++++----------------- constants/music_constants.asm | 207 +- constants/std_constants.asm | 2 +- engine/spawn_points.asm | 2 +- macros.asm | 8 + macros/enum.asm | 5 + macros/map.asm | 14 + maps/AzaleaGym.asm | 14 +- maps/AzaleaMart.asm | 6 +- maps/AzaleaPokeCenter1F.asm | 8 +- maps/AzaleaTown.asm | 8 +- maps/BattleTower1F.asm | 10 +- maps/BattleTowerBattleRoom.asm | 2 +- maps/BattleTowerElevator.asm | 2 +- maps/BattleTowerHallway.asm | 2 +- maps/BattleTowerOutside.asm | 6 +- maps/BillsHouse.asm | 2 +- maps/BlackthornCity.asm | 8 +- maps/BlackthornDodrioTradeHouse.asm | 2 +- maps/BlackthornDragonSpeechHouse.asm | 4 +- maps/BlackthornGym1F.asm | 10 +- maps/BlackthornGym2F.asm | 10 +- maps/BlackthornMart.asm | 6 +- maps/BlackthornPokeCenter1F.asm | 8 +- maps/BluesHouse.asm | 2 +- maps/BrunosRoom.asm | 2 +- maps/BurnedTower1F.asm | 2 +- maps/BurnedTowerB1F.asm | 2 +- maps/CeladonCafe.asm | 10 +- maps/CeladonCity.asm | 18 +- maps/CeladonDeptStore1F.asm | 6 +- maps/CeladonDeptStore2F.asm | 8 +- maps/CeladonDeptStore3F.asm | 10 +- maps/CeladonDeptStore4F.asm | 6 +- maps/CeladonDeptStore5F.asm | 10 +- maps/CeladonDeptStore6F.asm | 4 +- maps/CeladonGameCorner.asm | 18 +- maps/CeladonGameCornerPrizeRoom.asm | 4 +- maps/CeladonGym.asm | 12 +- maps/CeladonMansion1F.asm | 8 +- maps/CeladonMansion3F.asm | 8 +- maps/CeladonMansionRoof.asm | 2 +- maps/CeladonMansionRoofHouse.asm | 2 +- maps/CeladonPokeCenter1F.asm | 8 +- maps/CeruleanCity.asm | 12 +- maps/CeruleanGymBadgeSpeechHouse.asm | 2 +- maps/CeruleanMart.asm | 6 +- maps/CeruleanPokeCenter1F.asm | 6 +- maps/CeruleanPoliceStation.asm | 6 +- maps/CeruleanTradeSpeechHouse.asm | 8 +- maps/CherrygroveCity.asm | 6 +- maps/CherrygroveEvolutionSpeechHouse.asm | 4 +- maps/CherrygroveGymSpeechHouse.asm | 4 +- maps/CherrygroveMart.asm | 6 +- maps/CherrygrovePokeCenter1F.asm | 8 +- maps/CianwoodCity.asm | 20 +- maps/CianwoodCityPhotoStudio.asm | 2 +- maps/CianwoodGym.asm | 18 +- maps/CianwoodLugiaSpeechHouse.asm | 6 +- maps/CianwoodPharmacy.asm | 2 +- maps/CianwoodPokeCenter1F.asm | 8 +- maps/CinnabarPokeCenter1F.asm | 6 +- maps/CopycatsHouse1F.asm | 6 +- maps/CopycatsHouse2F.asm | 6 +- maps/DanceTheatre.asm | 18 +- maps/DarkCaveBlackthornEntrance.asm | 2 +- maps/DarkCaveVioletEntrance.asm | 8 +- maps/DayCare.asm | 2 +- maps/DiglettsCave.asm | 2 +- maps/DragonsDenB1F.asm | 8 +- maps/EarlsPokemonAcademy.asm | 10 +- maps/EcruteakCity.asm | 12 +- maps/EcruteakGym.asm | 12 +- maps/EcruteakItemfinderHouse.asm | 4 +- maps/EcruteakLugiaSpeechHouse.asm | 4 +- maps/EcruteakMart.asm | 6 +- maps/EcruteakPokeCenter1F.asm | 8 +- maps/ElmsHouse.asm | 4 +- maps/ElmsLab.asm | 2 +- maps/FastShip1F.asm | 6 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 2 +- maps/FightingDojo.asm | 2 +- maps/FuchsiaBillSpeechHouse.asm | 4 +- maps/FuchsiaCity.asm | 8 +- maps/FuchsiaGym.asm | 12 +- maps/FuchsiaMart.asm | 6 +- maps/FuchsiaPokeCenter1F.asm | 8 +- maps/GoldenrodBikeShop.asm | 2 +- maps/GoldenrodBillsHouse.asm | 4 +- maps/GoldenrodDeptStore1F.asm | 8 +- maps/GoldenrodDeptStore2F.asm | 10 +- maps/GoldenrodDeptStore3F.asm | 6 +- maps/GoldenrodDeptStore4F.asm | 8 +- maps/GoldenrodDeptStore5F.asm | 10 +- maps/GoldenrodDeptStore6F.asm | 4 +- maps/GoldenrodDeptStoreB1F.asm | 8 +- maps/GoldenrodDeptStoreRoof.asm | 4 +- maps/GoldenrodFlowerShop.asm | 2 +- maps/GoldenrodGameCorner.asm | 22 +- maps/GoldenrodGym.asm | 12 +- maps/GoldenrodHappinessRater.asm | 6 +- maps/GoldenrodMagnetTrainStation.asm | 2 +- maps/GoldenrodNameRatersHouse.asm | 2 +- maps/GoldenrodPPSpeechHouse.asm | 4 +- maps/GoldenrodPokeCenter1F.asm | 10 +- maps/GoldenrodPokeComCenter2FMobile.asm | 6 +- maps/HallOfFame.asm | 2 +- maps/IcePathB3F.asm | 2 +- maps/IlexForest.asm | 4 +- maps/IlexForestAzaleaGate.asm | 4 +- maps/IndigoPlateauPokeCenter1F.asm | 6 +- maps/KarensRoom.asm | 2 +- maps/KogasRoom.asm | 2 +- maps/KrissNeighborsHouse.asm | 2 +- maps/LakeofRage.asm | 6 +- maps/LakeofRageHiddenPowerHouse.asm | 2 +- maps/LakeofRageMagikarpHouse.asm | 2 +- maps/LancesRoom.asm | 2 +- maps/LavRadioTower1F.asm | 10 +- maps/LavenderMart.asm | 6 +- maps/LavenderNameRater.asm | 2 +- maps/LavenderPokeCenter1F.asm | 8 +- maps/LavenderTown.asm | 8 +- maps/LavenderTownSpeechHouse.asm | 2 +- maps/MahoganyGym.asm | 14 +- maps/MahoganyPokeCenter1F.asm | 8 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 4 +- maps/MahoganyTown.asm | 2 +- maps/ManiasHouse.asm | 2 +- maps/MountMoonGiftShop.asm | 8 +- maps/MountMortar1FInside.asm | 6 +- maps/MountMortar2FInside.asm | 2 +- maps/MountMortarB1F.asm | 4 +- maps/MoveDeletersHouse.asm | 2 +- maps/MrFujisHouse.asm | 10 +- maps/MrPokemonsHouse.asm | 2 +- maps/MrPsychicsHouse.asm | 2 +- maps/NationalPark.asm | 24 +- maps/NewBarkTown.asm | 4 +- maps/OaksLab.asm | 8 +- maps/OlivineCafe.asm | 6 +- maps/OlivineCity.asm | 6 +- maps/OlivineGoodRodHouse.asm | 2 +- maps/OlivineGym.asm | 2 +- maps/OlivineHouseBeta.asm | 4 +- maps/OlivineLighthouse1F.asm | 4 +- maps/OlivineLighthouse2F.asm | 4 +- maps/OlivineLighthouse3F.asm | 6 +- maps/OlivineLighthouse4F.asm | 4 +- maps/OlivineLighthouse5F.asm | 4 +- maps/OlivineLighthouse6F.asm | 2 +- maps/OlivineMart.asm | 6 +- maps/OlivinePokeCenter1F.asm | 8 +- maps/OlivinePunishmentSpeechHouse.asm | 4 +- maps/OlivineVoltorbHouse.asm | 2 +- maps/PalletTown.asm | 4 +- maps/PewterCity.asm | 10 +- maps/PewterGym.asm | 6 +- maps/PewterMart.asm | 6 +- maps/PewterNidoranSpeechHouse.asm | 4 +- maps/PewterPokeCenter1F.asm | 10 +- maps/PewterSnoozeSpeechHouse.asm | 2 +- maps/PokeCenter2F.asm | 6 +- maps/PokeSeersHouse.asm | 2 +- maps/PokemonFanClub.asm | 10 +- maps/PowerPlant.asm | 14 +- maps/RadioTower1F.asm | 2 +- maps/RadioTower2F.asm | 6 +- maps/RadioTower3F.asm | 4 +- maps/RadioTower4F.asm | 4 +- maps/RadioTower5F.asm | 2 +- maps/RedsHouse1F.asm | 2 +- maps/Route1.asm | 6 +- maps/Route10PokeCenter1F.asm | 8 +- maps/Route10South.asm | 4 +- maps/Route11.asm | 10 +- maps/Route12.asm | 8 +- maps/Route12SuperRodHouse.asm | 2 +- maps/Route13.asm | 10 +- maps/Route14.asm | 8 +- maps/Route15.asm | 12 +- maps/Route15FuchsiaGate.asm | 2 +- maps/Route16FuchsiaSpeechHouse.asm | 2 +- 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 | 8 +- maps/Route20.asm | 6 +- maps/Route21.asm | 6 +- maps/Route25.asm | 16 +- maps/Route26.asm | 14 +- maps/Route26DayofWeekSiblingsHouse.asm | 2 +- maps/Route26HealSpeechHouse.asm | 2 +- maps/Route27.asm | 14 +- maps/Route27SandstormHouse.asm | 2 +- maps/Route28FamousSpeechHouse.asm | 4 +- maps/Route29.asm | 12 +- maps/Route2946Gate.asm | 4 +- maps/Route2Gate.asm | 2 +- maps/Route2NuggetSpeechHouse.asm | 2 +- maps/Route3.asm | 8 +- maps/Route30.asm | 12 +- maps/Route30BerrySpeechHouse.asm | 2 +- maps/Route31.asm | 10 +- maps/Route31VioletGate.asm | 4 +- maps/Route32.asm | 20 +- maps/Route32PokeCenter1F.asm | 6 +- maps/Route32RuinsofAlphGate.asm | 6 +- maps/Route33.asm | 6 +- maps/Route34.asm | 18 +- maps/Route34IlexForestGate.asm | 2 +- maps/Route35.asm | 20 +- maps/Route35Goldenrodgate.asm | 6 +- maps/Route36.asm | 10 +- maps/Route36RuinsofAlphgate.asm | 4 +- maps/Route37.asm | 12 +- maps/Route38.asm | 14 +- maps/Route38EcruteakGate.asm | 2 +- maps/Route39.asm | 20 +- maps/Route39Barn.asm | 6 +- maps/Route39Farmhouse.asm | 4 +- maps/Route4.asm | 6 +- maps/Route40.asm | 20 +- maps/Route40BattleTowerGate.asm | 2 +- maps/Route41.asm | 20 +- maps/Route42.asm | 12 +- maps/Route42EcruteakGate.asm | 2 +- maps/Route43.asm | 14 +- maps/Route43MahoganyGate.asm | 2 +- maps/Route44.asm | 16 +- maps/Route45.asm | 18 +- maps/Route46.asm | 10 +- maps/Route5CleanseTagSpeechHouse.asm | 4 +- maps/Route5SaffronCityGate.asm | 2 +- maps/Route5UndergroundEntrance.asm | 2 +- maps/Route6.asm | 4 +- maps/Route6SaffronGate.asm | 2 +- maps/Route7SaffronGate.asm | 2 +- maps/Route8.asm | 12 +- maps/Route8SaffronGate.asm | 2 +- maps/Route9.asm | 12 +- maps/RuinsofAlphKabutoChamber.asm | 2 +- maps/RuinsofAlphOutside.asm | 2 +- maps/RuinsofAlphResearchCenter.asm | 4 +- maps/SafariZoneWardensHome.asm | 2 +- maps/SaffronCity.asm | 16 +- maps/SaffronGym.asm | 12 +- maps/SaffronMart.asm | 6 +- maps/SaffronPokeCenter1F.asm | 8 +- maps/SaffronTrainStation.asm | 4 +- maps/SeafoamGym.asm | 2 +- maps/SilphCo1F.asm | 4 +- maps/SilverCavePokeCenter1F.asm | 4 +- maps/SlowpokeWellB1F.asm | 2 +- maps/SlowpokeWellB2F.asm | 2 +- maps/SoulHouse.asm | 8 +- maps/SproutTower1F.asm | 10 +- maps/SproutTower2F.asm | 4 +- maps/SproutTower3F.asm | 8 +- maps/TrainerHouse1F.asm | 10 +- maps/TrainerHouseB1F.asm | 4 +- maps/UndergroundPathSwitchRoomEntrances.asm | 4 +- maps/UnionCave1F.asm | 10 +- maps/UnionCaveB1F.asm | 10 +- maps/UnionCaveB2F.asm | 6 +- maps/VermilionCity.asm | 10 +- maps/VermilionGym.asm | 10 +- maps/VermilionHouseDiglettsCaveSpeechHouse.asm | 2 +- maps/VermilionHouseFishingSpeechHouse.asm | 2 +- maps/VermilionMagnetTrainSpeechHouse.asm | 4 +- maps/VermilionMart.asm | 6 +- maps/VermilionPokeCenter1F.asm | 8 +- maps/VermilionPort.asm | 4 +- maps/VermilionPortPassage.asm | 2 +- maps/VictoryRoadGate.asm | 2 +- maps/VioletCity.asm | 10 +- maps/VioletGym.asm | 8 +- maps/VioletMart.asm | 6 +- maps/VioletNicknameSpeechHouse.asm | 6 +- maps/VioletOnixTradeHouse.asm | 4 +- maps/VioletPokeCenter1F.asm | 8 +- maps/ViridianCity.asm | 8 +- maps/ViridianMart.asm | 6 +- maps/ViridianNicknameSpeechHouse.asm | 8 +- maps/ViridianPokeCenter1F.asm | 8 +- maps/WarehouseEntrance.asm | 8 +- maps/WhirlIslandB1F.asm | 2 +- maps/WillsRoom.asm | 2 +- wram.asm | 2 +- 294 files changed, 1768 insertions(+), 2895 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index a3f3567d7..f94194abe 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -2001,53 +2001,5 @@ const EVENT_7CD const EVENT_7CE const EVENT_7CF - const EVENT_7D0 - const EVENT_7D1 - const EVENT_7D2 - const EVENT_7D3 - const EVENT_7D4 - const EVENT_7D5 - const EVENT_7D6 - const EVENT_7D7 - const EVENT_7D8 - const EVENT_7D9 - const EVENT_7DA - const EVENT_7DB - const EVENT_7DC - const EVENT_7DD - const EVENT_7DE - const EVENT_7DF - const EVENT_7E0 - const EVENT_7E1 - const EVENT_7E2 - const EVENT_7E3 - const EVENT_7E4 - const EVENT_7E5 - const EVENT_7E6 - const EVENT_7E7 - const EVENT_7E8 - const EVENT_7E9 - const EVENT_7EA - const EVENT_7EB - const EVENT_7EC - const EVENT_7ED - const EVENT_7EE - const EVENT_7EF - const EVENT_7F0 - const EVENT_7F1 - const EVENT_7F2 - const EVENT_7F3 - const EVENT_7F4 - const EVENT_7F5 - const EVENT_7F6 - const EVENT_7F7 - const EVENT_7F8 - const EVENT_7F9 - const EVENT_7FA - const EVENT_7FB - const EVENT_7FC - const EVENT_7FD - const EVENT_7FE - const EVENT_7FF -EVENT_ALWAYS_THERE EQU $ffff +NUM_EVENTS EQU const_value diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index b10700d43..6a530d164 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -1,39 +1,40 @@ -ANIM_GFX_HIT EQU 1 -ANIM_GFX_CUT EQU 2 -ANIM_GFX_FIRE EQU 3 -ANIM_GFX_WATER EQU 4 -ANIM_GFX_LIGHTNING EQU 5 -ANIM_GFX_PLANT EQU 6 -ANIM_GFX_SMOKE EQU 7 -ANIM_GFX_EXPLOSION EQU 8 -ANIM_GFX_ROCKS EQU 9 -ANIM_GFX_ICE EQU 10 -ANIM_GFX_POKE_BALL EQU 11 -ANIM_GFX_POISON EQU 12 -ANIM_GFX_BUBBLE EQU 13 -ANIM_GFX_NOISE EQU 14 -ANIM_GFX_POWDER EQU 15 -ANIM_GFX_BEAM EQU 16 -ANIM_GFX_SPEED EQU 17 -ANIM_GFX_CHARGE EQU 18 -ANIM_GFX_WIND EQU 19 -ANIM_GFX_WHIP EQU 20 -ANIM_GFX_EGG EQU 21 -ANIM_GFX_ROPE EQU 22 -ANIM_GFX_PSYCHIC EQU 23 -ANIM_GFX_REFLECT EQU 24 -ANIM_GFX_STATUS EQU 25 -ANIM_GFX_SAND EQU 26 -ANIM_GFX_WEB EQU 27 -ANIM_GFX_HAZE EQU 28 -ANIM_GFX_HORN EQU 29 -ANIM_GFX_FLOWER EQU 30 -ANIM_GFX_MISC EQU 31 -ANIM_GFX_SKY_ATTACK EQU 32 -ANIM_GFX_GLOBE EQU 33 -ANIM_GFX_SHAPES EQU 34 -ANIM_GFX_OBJECTS EQU 35 -ANIM_GFX_SHINE EQU 36 -ANIM_GFX_ANGELS EQU 37 -ANIM_GFX_WAVE EQU 38 -ANIM_GFX_AEROBLAST EQU 39 +const_value = 1 + const ANIM_GFX_HIT + const ANIM_GFX_CUT + const ANIM_GFX_FIRE + const ANIM_GFX_WATER + const ANIM_GFX_LIGHTNING + const ANIM_GFX_PLANT + const ANIM_GFX_SMOKE + const ANIM_GFX_EXPLOSION + const ANIM_GFX_ROCKS + const ANIM_GFX_ICE + const ANIM_GFX_POKE_BALL + const ANIM_GFX_POISON + const ANIM_GFX_BUBBLE + const ANIM_GFX_NOISE + const ANIM_GFX_POWDER + const ANIM_GFX_BEAM + const ANIM_GFX_SPEED + const ANIM_GFX_CHARGE + const ANIM_GFX_WIND + const ANIM_GFX_WHIP + const ANIM_GFX_EGG + const ANIM_GFX_ROPE + const ANIM_GFX_PSYCHIC + const ANIM_GFX_REFLECT + const ANIM_GFX_STATUS + const ANIM_GFX_SAND + const ANIM_GFX_WEB + const ANIM_GFX_HAZE + const ANIM_GFX_HORN + const ANIM_GFX_FLOWER + const ANIM_GFX_MISC + const ANIM_GFX_SKY_ATTACK + const ANIM_GFX_GLOBE + const ANIM_GFX_SHAPES + const ANIM_GFX_OBJECTS + const ANIM_GFX_SHINE + const ANIM_GFX_ANGELS + const ANIM_GFX_WAVE + const ANIM_GFX_AEROBLAST diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 030b89840..ecbcf2102 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -2,1806 +2,698 @@ GROUP_N_A EQU -1 MAP_N_A EQU -1 ; map group ids -GROUP_OLIVINE_POKECENTER_1F EQU $01 -GROUP_OLIVINE_GYM EQU $01 -GROUP_OLIVINE_VOLTORB_HOUSE EQU $01 -GROUP_OLIVINE_HOUSE_BETA EQU $01 -GROUP_OLIVINE_PUNISHMENT_SPEECH_HOUSE EQU $01 -GROUP_OLIVINE_GOOD_ROD_HOUSE EQU $01 -GROUP_OLIVINE_CAFE EQU $01 -GROUP_OLIVINE_MART EQU $01 -GROUP_ROUTE_38_ECRUTEAK_GATE EQU $01 -GROUP_ROUTE_39_BARN EQU $01 -GROUP_ROUTE_39_FARMHOUSE EQU $01 -GROUP_ROUTE_38 EQU $01 -GROUP_ROUTE_39 EQU $01 -GROUP_OLIVINE_CITY EQU $01 -GROUP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE EQU $02 -GROUP_MAHOGANY_GYM EQU $02 -GROUP_MAHOGANY_POKECENTER_1F EQU $02 -GROUP_ROUTE_42_ECRUTEAK_GATE EQU $02 -GROUP_ROUTE_42 EQU $02 -GROUP_ROUTE_44 EQU $02 -GROUP_MAHOGANY_TOWN EQU $02 -GROUP_SPROUT_TOWER_1F EQU $03 -GROUP_SPROUT_TOWER_2F EQU $03 -GROUP_SPROUT_TOWER_3F EQU $03 -GROUP_TIN_TOWER_1F EQU $03 -GROUP_TIN_TOWER_2F EQU $03 -GROUP_TIN_TOWER_3F EQU $03 -GROUP_TIN_TOWER_4F EQU $03 -GROUP_TIN_TOWER_5F EQU $03 -GROUP_TIN_TOWER_6F EQU $03 -GROUP_TIN_TOWER_7F EQU $03 -GROUP_TIN_TOWER_8F EQU $03 -GROUP_TIN_TOWER_9F EQU $03 -GROUP_BURNED_TOWER_1F EQU $03 -GROUP_BURNED_TOWER_B1F EQU $03 -GROUP_NATIONAL_PARK EQU $03 -GROUP_NATIONAL_PARK_BUG_CONTEST EQU $03 -GROUP_RADIO_TOWER_1F EQU $03 -GROUP_RADIO_TOWER_2F EQU $03 -GROUP_RADIO_TOWER_3F EQU $03 -GROUP_RADIO_TOWER_4F EQU $03 -GROUP_RADIO_TOWER_5F EQU $03 -GROUP_RUINS_OF_ALPH_OUTSIDE EQU $03 -GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER EQU $03 -GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER EQU $03 -GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER EQU $03 -GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER EQU $03 -GROUP_RUINS_OF_ALPH_INNER_CHAMBER EQU $03 -GROUP_RUINS_OF_ALPH_RESEARCH_CENTER EQU $03 -GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM EQU $03 -GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM EQU $03 -GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM EQU $03 -GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM EQU $03 -GROUP_RUINS_OF_ALPH_HO_OH_WORD_ROOM EQU $03 -GROUP_RUINS_OF_ALPH_KABUTO_WORD_ROOM EQU $03 -GROUP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM EQU $03 -GROUP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM EQU $03 -GROUP_UNION_CAVE_1F EQU $03 -GROUP_UNION_CAVE_B1F EQU $03 -GROUP_UNION_CAVE_B2F EQU $03 -GROUP_SLOWPOKE_WELL_B1F EQU $03 -GROUP_SLOWPOKE_WELL_B2F EQU $03 -GROUP_OLIVINE_LIGHTHOUSE_1F EQU $03 -GROUP_OLIVINE_LIGHTHOUSE_2F EQU $03 -GROUP_OLIVINE_LIGHTHOUSE_3F EQU $03 -GROUP_OLIVINE_LIGHTHOUSE_4F EQU $03 -GROUP_OLIVINE_LIGHTHOUSE_5F EQU $03 -GROUP_OLIVINE_LIGHTHOUSE_6F EQU $03 -GROUP_MAHOGANY_MART_1F EQU $03 -GROUP_TEAM_ROCKET_BASE_B1F EQU $03 -GROUP_TEAM_ROCKET_BASE_B2F EQU $03 -GROUP_TEAM_ROCKET_BASE_B3F EQU $03 -GROUP_ILEX_FOREST EQU $03 -GROUP_WAREHOUSE_ENTRANCE EQU $03 -GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES EQU $03 -GROUP_GOLDENROD_DEPT_STORE_B1F EQU $03 -GROUP_UNDERGROUND_WAREHOUSE EQU $03 -GROUP_MOUNT_MORTAR_1F_OUTSIDE EQU $03 -GROUP_MOUNT_MORTAR_1F_INSIDE EQU $03 -GROUP_MOUNT_MORTAR_2F_INSIDE EQU $03 -GROUP_MOUNT_MORTAR_B1F EQU $03 -GROUP_ICE_PATH_1F EQU $03 -GROUP_ICE_PATH_B1F EQU $03 -GROUP_ICE_PATH_B2F_MAHOGANY_SIDE EQU $03 -GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE EQU $03 -GROUP_ICE_PATH_B3F EQU $03 -GROUP_WHIRL_ISLAND_NW EQU $03 -GROUP_WHIRL_ISLAND_NE EQU $03 -GROUP_WHIRL_ISLAND_SW EQU $03 -GROUP_WHIRL_ISLAND_CAVE EQU $03 -GROUP_WHIRL_ISLAND_SE EQU $03 -GROUP_WHIRL_ISLAND_B1F EQU $03 -GROUP_WHIRL_ISLAND_B2F EQU $03 -GROUP_WHIRL_ISLAND_LUGIA_CHAMBER EQU $03 -GROUP_SILVER_CAVE_ROOM_1 EQU $03 -GROUP_SILVER_CAVE_ROOM_2 EQU $03 -GROUP_SILVER_CAVE_ROOM_3 EQU $03 -GROUP_SILVER_CAVE_ITEM_ROOMS EQU $03 -GROUP_DARK_CAVE_VIOLET_ENTRANCE EQU $03 -GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE EQU $03 -GROUP_DRAGONS_DEN_1F EQU $03 -GROUP_DRAGONS_DEN_B1F EQU $03 -GROUP_DRAGON_SHRINE EQU $03 -GROUP_TOHJO_FALLS EQU $03 -GROUP_DIGLETTS_CAVE EQU $03 -GROUP_MOUNT_MOON EQU $03 -GROUP_UNDERGROUND EQU $03 -GROUP_ROCK_TUNNEL_1F EQU $03 -GROUP_ROCK_TUNNEL_B1F EQU $03 -GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA EQU $03 -GROUP_SAFARI_ZONE_BETA EQU $03 -GROUP_VICTORY_ROAD EQU $03 -GROUP_ECRUTEAK_HOUSE EQU $04 -GROUP_WISE_TRIOS_ROOM EQU $04 -GROUP_ECRUTEAK_POKECENTER_1F EQU $04 -GROUP_ECRUTEAK_LUGIA_SPEECH_HOUSE EQU $04 -GROUP_DANCE_THEATRE EQU $04 -GROUP_ECRUTEAK_MART EQU $04 -GROUP_ECRUTEAK_GYM EQU $04 -GROUP_ECRUTEAK_ITEMFINDER_HOUSE EQU $04 -GROUP_ECRUTEAK_CITY EQU $04 -GROUP_BLACKTHORN_GYM_1F EQU $05 -GROUP_BLACKTHORN_GYM_2F EQU $05 -GROUP_BLACKTHORN_DRAGON_SPEECH_HOUSE EQU $05 -GROUP_BLACKTHORN_DODRIO_TRADE_HOUSE EQU $05 -GROUP_BLACKTHORN_MART EQU $05 -GROUP_BLACKTHORN_POKECENTER_1F EQU $05 -GROUP_MOVE_DELETERS_HOUSE EQU $05 -GROUP_ROUTE_45 EQU $05 -GROUP_ROUTE_46 EQU $05 -GROUP_BLACKTHORN_CITY EQU $05 -GROUP_CINNABAR_POKECENTER_1F EQU $06 -GROUP_CINNABAR_POKECENTER_2F_BETA EQU $06 -GROUP_ROUTE_19___FUCHSIA_GATE EQU $06 -GROUP_SEAFOAM_GYM EQU $06 -GROUP_ROUTE_19 EQU $06 -GROUP_ROUTE_20 EQU $06 -GROUP_ROUTE_21 EQU $06 -GROUP_CINNABAR_ISLAND EQU $06 -GROUP_CERULEAN_GYM_BADGE_SPEECH_HOUSE EQU $07 -GROUP_CERULEAN_POLICE_STATION EQU $07 -GROUP_CERULEAN_TRADE_SPEECH_HOUSE EQU $07 -GROUP_CERULEAN_POKECENTER_1F EQU $07 -GROUP_CERULEAN_POKECENTER_2F_BETA EQU $07 -GROUP_CERULEAN_GYM EQU $07 -GROUP_CERULEAN_MART EQU $07 -GROUP_ROUTE_10_POKECENTER_1F EQU $07 -GROUP_ROUTE_10_POKECENTER_2F_BETA EQU $07 -GROUP_POWER_PLANT EQU $07 -GROUP_BILLS_HOUSE EQU $07 -GROUP_ROUTE_4 EQU $07 -GROUP_ROUTE_9 EQU $07 -GROUP_ROUTE_10A EQU $07 -GROUP_ROUTE_10_NORTH EQU $07 -GROUP_ROUTE_24 EQU $07 -GROUP_ROUTE_25 EQU $07 -GROUP_CERULEAN_CITY EQU $07 -GROUP_AZALEA_POKECENTER_1F EQU $08 -GROUP_CHARCOAL_KILN EQU $08 -GROUP_AZALEA_MART EQU $08 -GROUP_KURTS_HOUSE EQU $08 -GROUP_AZALEA_GYM EQU $08 -GROUP_ROUTE_33 EQU $08 -GROUP_AZALEA_TOWN EQU $08 -GROUP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE EQU $09 -GROUP_LAKE_OF_RAGE_MAGIKARP_HOUSE EQU $09 -GROUP_ROUTE_43_MAHOGANY_GATE EQU $09 -GROUP_ROUTE_43_GATE EQU $09 -GROUP_ROUTE_43 EQU $09 -GROUP_LAKE_OF_RAGE EQU $09 -GROUP_ROUTE_32 EQU $0a -GROUP_ROUTE_35 EQU $0a -GROUP_ROUTE_36 EQU $0a -GROUP_ROUTE_37 EQU $0a -GROUP_VIOLET_CITY EQU $0a -GROUP_VIOLET_MART EQU $0a -GROUP_VIOLET_GYM EQU $0a -GROUP_EARLS_POKEMON_ACADEMY EQU $0a -GROUP_VIOLET_NICKNAME_SPEECH_HOUSE EQU $0a -GROUP_VIOLET_POKECENTER_1F EQU $0a -GROUP_VIOLET_ONIX_TRADE_HOUSE EQU $0a -GROUP_ROUTE_32_RUINS_OF_ALPH_GATE EQU $0a -GROUP_ROUTE_32_POKECENTER_1F EQU $0a -GROUP_ROUTE_35_GOLDENROD_GATE EQU $0a -GROUP_ROUTE_35_NATIONAL_PARK_GATE EQU $0a -GROUP_ROUTE_36_RUINS_OF_ALPH_GATE EQU $0a -GROUP_ROUTE_36_NATIONAL_PARK_GATE EQU $0a -GROUP_ROUTE_34 EQU $0b -GROUP_GOLDENROD_CITY EQU $0b -GROUP_GOLDENROD_GYM EQU $0b -GROUP_GOLDENROD_BIKE_SHOP EQU $0b -GROUP_GOLDENROD_HAPPINESS_RATER EQU $0b -GROUP_GOLDENROD_BILLS_HOUSE EQU $0b -GROUP_GOLDENROD_MAGNET_TRAIN_STATION EQU $0b -GROUP_GOLDENROD_FLOWER_SHOP EQU $0b -GROUP_GOLDENROD_PP_SPEECH_HOUSE EQU $0b -GROUP_GOLDENROD_NAME_RATERS_HOUSE EQU $0b -GROUP_GOLDENROD_DEPT_STORE_1F EQU $0b -GROUP_GOLDENROD_DEPT_STORE_2F EQU $0b -GROUP_GOLDENROD_DEPT_STORE_3F EQU $0b -GROUP_GOLDENROD_DEPT_STORE_4F EQU $0b -GROUP_GOLDENROD_DEPT_STORE_5F EQU $0b -GROUP_GOLDENROD_DEPT_STORE_6F EQU $0b -GROUP_GOLDENROD_DEPT_STORE_ELEVATOR EQU $0b -GROUP_GOLDENROD_DEPT_STORE_ROOF EQU $0b -GROUP_GOLDENROD_GAME_CORNER EQU $0b -GROUP_GOLDENROD_POKECENTER_1F EQU $0b -GROUP_GOLDENROD_POKECOM_CENTER_2F_MOBILE EQU $0b -GROUP_ILEX_FOREST_AZALEA_GATE EQU $0b -GROUP_ROUTE_34_ILEX_FOREST_GATE EQU $0b -GROUP_DAY_CARE EQU $0b -GROUP_ROUTE_6 EQU $0c -GROUP_ROUTE_11 EQU $0c -GROUP_VERMILION_CITY EQU $0c -GROUP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE EQU $0c -GROUP_VERMILION_POKECENTER_1F EQU $0c -GROUP_VERMILION_POKECENTER_2F_BETA EQU $0c -GROUP_POKEMON_FAN_CLUB EQU $0c -GROUP_VERMILION_MAGNET_TRAIN_SPEECH_HOUSE EQU $0c -GROUP_VERMILION_MART EQU $0c -GROUP_VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE EQU $0c -GROUP_VERMILION_GYM EQU $0c -GROUP_ROUTE_6_SAFFRON_GATE EQU $0c -GROUP_ROUTE_6_UNDERGROUND_ENTRANCE EQU $0c -GROUP_ROUTE_1 EQU $0d -GROUP_PALLET_TOWN EQU $0d -GROUP_REDS_HOUSE_1F EQU $0d -GROUP_REDS_HOUSE_2F EQU $0d -GROUP_BLUES_HOUSE EQU $0d -GROUP_OAKS_LAB EQU $0d -GROUP_ROUTE_3 EQU $0e -GROUP_PEWTER_CITY EQU $0e -GROUP_PEWTER_NIDORAN_SPEECH_HOUSE EQU $0e -GROUP_PEWTER_GYM EQU $0e -GROUP_PEWTER_MART EQU $0e -GROUP_PEWTER_POKECENTER_1F EQU $0e -GROUP_PEWTER_POKECENTER_2F_BETA EQU $0e -GROUP_PEWTER_SNOOZE_SPEECH_HOUSE EQU $0e -GROUP_OLIVINE_PORT EQU $0f -GROUP_VERMILION_PORT EQU $0f -GROUP_FAST_SHIP_1F EQU $0f -GROUP_FAST_SHIP_CABINS_NNW_NNE_NE EQU $0f -GROUP_FAST_SHIP_CABINS_SW_SSW_NW EQU $0f -GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN EQU $0f -GROUP_FAST_SHIP_B1F EQU $0f -GROUP_OLIVINE_PORT_PASSAGE EQU $0f -GROUP_VERMILION_PORT_PASSAGE EQU $0f -GROUP_MOUNT_MOON_SQUARE EQU $0f -GROUP_MOUNT_MOON_GIFT_SHOP EQU $0f -GROUP_TIN_TOWER_ROOF EQU $0f -GROUP_ROUTE_23 EQU $10 -GROUP_INDIGO_PLATEAU_POKECENTER_1F EQU $10 -GROUP_WILLS_ROOM EQU $10 -GROUP_KOGAS_ROOM EQU $10 -GROUP_BRUNOS_ROOM EQU $10 -GROUP_KARENS_ROOM EQU $10 -GROUP_LANCES_ROOM EQU $10 -GROUP_HALL_OF_FAME EQU $10 -GROUP_ROUTE_13 EQU $11 -GROUP_ROUTE_14 EQU $11 -GROUP_ROUTE_15 EQU $11 -GROUP_ROUTE_18 EQU $11 -GROUP_FUCHSIA_CITY EQU $11 -GROUP_FUCHSIA_MART EQU $11 -GROUP_SAFARI_ZONE_MAIN_OFFICE EQU $11 -GROUP_FUCHSIA_GYM EQU $11 -GROUP_FUCHSIA_BILL_SPEECH_HOUSE EQU $11 -GROUP_FUCHSIA_POKECENTER_1F EQU $11 -GROUP_FUCHSIA_POKECENTER_2F_BETA EQU $11 -GROUP_SAFARI_ZONE_WARDENS_HOME EQU $11 -GROUP_ROUTE_15_FUCHSIA_GATE EQU $11 -GROUP_ROUTE_8 EQU $12 -GROUP_ROUTE_12 EQU $12 -GROUP_ROUTE_10B EQU $12 -GROUP_ROUTE_10_SOUTH EQU $12 -GROUP_LAVENDER_TOWN EQU $12 -GROUP_LAVENDER_POKECENTER_1F EQU $12 -GROUP_LAVENDER_POKECENTER_2F_BETA EQU $12 -GROUP_MR_FUJIS_HOUSE EQU $12 -GROUP_LAVENDER_TOWN_SPEECH_HOUSE EQU $12 -GROUP_LAVENDER_NAME_RATER EQU $12 -GROUP_LAVENDER_MART EQU $12 -GROUP_SOUL_HOUSE EQU $12 -GROUP_LAV_RADIO_TOWER_1F EQU $12 -GROUP_ROUTE_8_SAFFRON_GATE EQU $12 -GROUP_ROUTE_12_SUPER_ROD_HOUSE EQU $12 -GROUP_ROUTE_28 EQU $13 -GROUP_SILVER_CAVE_OUTSIDE EQU $13 -GROUP_SILVER_CAVE_POKECENTER_1F EQU $13 -GROUP_ROUTE_28_FAMOUS_SPEECH_HOUSE EQU $13 -GROUP_POKECENTER_2F EQU $14 -GROUP_TRADE_CENTER EQU $14 -GROUP_COLOSSEUM EQU $14 -GROUP_TIME_CAPSULE EQU $14 -GROUP_MOBILE_TRADE_ROOM_MOBILE EQU $14 -GROUP_MOBILE_BATTLE_ROOM EQU $14 -GROUP_ROUTE_7 EQU $15 -GROUP_ROUTE_16 EQU $15 -GROUP_ROUTE_17 EQU $15 -GROUP_CELADON_CITY EQU $15 -GROUP_CELADON_DEPT_STORE_1F EQU $15 -GROUP_CELADON_DEPT_STORE_2F EQU $15 -GROUP_CELADON_DEPT_STORE_3F EQU $15 -GROUP_CELADON_DEPT_STORE_4F EQU $15 -GROUP_CELADON_DEPT_STORE_5F EQU $15 -GROUP_CELADON_DEPT_STORE_6F EQU $15 -GROUP_CELADON_DEPT_STORE_ELEVATOR EQU $15 -GROUP_CELADON_MANSION_1F EQU $15 -GROUP_CELADON_MANSION_2F EQU $15 -GROUP_CELADON_MANSION_3F EQU $15 -GROUP_CELADON_MANSION_ROOF EQU $15 -GROUP_CELADON_MANSION_ROOF_HOUSE EQU $15 -GROUP_CELADON_POKECENTER_1F EQU $15 -GROUP_CELADON_POKECENTER_2F_BETA EQU $15 -GROUP_CELADON_GAME_CORNER EQU $15 -GROUP_CELADON_GAME_CORNER_PRIZE_ROOM EQU $15 -GROUP_CELADON_GYM EQU $15 -GROUP_CELADON_CAFE EQU $15 -GROUP_ROUTE_16_FUCHSIA_SPEECH_HOUSE EQU $15 -GROUP_ROUTE_16_GATE EQU $15 -GROUP_ROUTE_7_SAFFRON_GATE EQU $15 -GROUP_ROUTE_17_18_GATE EQU $15 -GROUP_ROUTE_40 EQU $16 -GROUP_ROUTE_41 EQU $16 -GROUP_CIANWOOD_CITY EQU $16 -GROUP_MANIAS_HOUSE EQU $16 -GROUP_CIANWOOD_GYM EQU $16 -GROUP_CIANWOOD_POKECENTER_1F EQU $16 -GROUP_CIANWOOD_PHARMACY EQU $16 -GROUP_CIANWOOD_CITY_PHOTO_STUDIO EQU $16 -GROUP_CIANWOOD_LUGIA_SPEECH_HOUSE EQU $16 -GROUP_POKE_SEERS_HOUSE EQU $16 -GROUP_BATTLE_TOWER_1F EQU $16 -GROUP_BATTLE_TOWER_BATTLE_ROOM EQU $16 -GROUP_BATTLE_TOWER_ELEVATOR EQU $16 -GROUP_BATTLE_TOWER_HALLWAY EQU $16 -GROUP_ROUTE_40_BATTLE_TOWER_GATE EQU $16 -GROUP_BATTLE_TOWER_OUTSIDE EQU $16 -GROUP_ROUTE_2 EQU $17 -GROUP_ROUTE_22 EQU $17 -GROUP_VIRIDIAN_CITY EQU $17 -GROUP_VIRIDIAN_GYM EQU $17 -GROUP_VIRIDIAN_NICKNAME_SPEECH_HOUSE EQU $17 -GROUP_TRAINER_HOUSE_1F EQU $17 -GROUP_TRAINER_HOUSE_B1F EQU $17 -GROUP_VIRIDIAN_MART EQU $17 -GROUP_VIRIDIAN_POKECENTER_1F EQU $17 -GROUP_VIRIDIAN_POKECENTER_2F_BETA EQU $17 -GROUP_ROUTE_2_NUGGET_SPEECH_HOUSE EQU $17 -GROUP_ROUTE_2_GATE EQU $17 -GROUP_VICTORY_ROAD_GATE EQU $17 -GROUP_ROUTE_26 EQU $18 -GROUP_ROUTE_27 EQU $18 -GROUP_ROUTE_29 EQU $18 -GROUP_NEW_BARK_TOWN EQU $18 -GROUP_ELMS_LAB EQU $18 -GROUP_KRISS_HOUSE_1F EQU $18 -GROUP_KRISS_HOUSE_2F EQU $18 -GROUP_KRISS_NEIGHBORS_HOUSE EQU $18 -GROUP_ELMS_HOUSE EQU $18 -GROUP_ROUTE_26_HEAL_SPEECH_HOUSE EQU $18 -GROUP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE EQU $18 -GROUP_ROUTE_27_SANDSTORM_HOUSE EQU $18 -GROUP_ROUTE_29_46_GATE EQU $18 -GROUP_ROUTE_5 EQU $19 -GROUP_SAFFRON_CITY EQU $19 -GROUP_FIGHTING_DOJO EQU $19 -GROUP_SAFFRON_GYM EQU $19 -GROUP_SAFFRON_MART EQU $19 -GROUP_SAFFRON_POKECENTER_1F EQU $19 -GROUP_SAFFRON_POKECENTER_2F_BETA EQU $19 -GROUP_MR_PSYCHICS_HOUSE EQU $19 -GROUP_SAFFRON_TRAIN_STATION EQU $19 -GROUP_SILPH_CO_1F EQU $19 -GROUP_COPYCATS_HOUSE_1F EQU $19 -GROUP_COPYCATS_HOUSE_2F EQU $19 -GROUP_ROUTE_5_UNDERGROUND_ENTRANCE EQU $19 -GROUP_ROUTE_5_SAFFRON_CITY_GATE EQU $19 -GROUP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE EQU $19 -GROUP_ROUTE_30 EQU $1a -GROUP_ROUTE_31 EQU $1a -GROUP_CHERRYGROVE_CITY EQU $1a -GROUP_CHERRYGROVE_MART EQU $1a -GROUP_CHERRYGROVE_POKECENTER_1F EQU $1a -GROUP_CHERRYGROVE_GYM_SPEECH_HOUSE EQU $1a -GROUP_GUIDE_GENTS_HOUSE EQU $1a -GROUP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE EQU $1a -GROUP_ROUTE_30_BERRY_SPEECH_HOUSE EQU $1a -GROUP_MR_POKEMONS_HOUSE EQU $1a -GROUP_ROUTE_31_VIOLET_GATE EQU $1a + const_def + newgroup + mapgroup OLIVINE_POKECENTER_1F, 4, 5 + mapgroup OLIVINE_GYM, 8, 5 + mapgroup OLIVINE_VOLTORB_HOUSE, 4, 4 + mapgroup OLIVINE_HOUSE_BETA, 4, 4 + mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4 + mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4 + mapgroup OLIVINE_CAFE, 4, 4 + mapgroup OLIVINE_MART, 4, 6 + mapgroup ROUTE_38_ECRUTEAK_GATE, 4, 5 + mapgroup ROUTE_39_BARN, 4, 4 + mapgroup ROUTE_39_FARMHOUSE, 4, 4 + mapgroup ROUTE_38, 9, 20 + mapgroup ROUTE_39, 18, 10 + mapgroup OLIVINE_CITY, 18, 20 -; map ids -MAP_OLIVINE_POKECENTER_1F EQU $01 -MAP_OLIVINE_GYM EQU $02 -MAP_OLIVINE_VOLTORB_HOUSE EQU $03 -MAP_OLIVINE_HOUSE_BETA EQU $04 -MAP_OLIVINE_PUNISHMENT_SPEECH_HOUSE EQU $05 -MAP_OLIVINE_GOOD_ROD_HOUSE EQU $06 -MAP_OLIVINE_CAFE EQU $07 -MAP_OLIVINE_MART EQU $08 -MAP_ROUTE_38_ECRUTEAK_GATE EQU $09 -MAP_ROUTE_39_BARN EQU $0a -MAP_ROUTE_39_FARMHOUSE EQU $0b -MAP_ROUTE_38 EQU $0c -MAP_ROUTE_39 EQU $0d -MAP_OLIVINE_CITY EQU $0e -MAP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE EQU $01 -MAP_MAHOGANY_GYM EQU $02 -MAP_MAHOGANY_POKECENTER_1F EQU $03 -MAP_ROUTE_42_ECRUTEAK_GATE EQU $04 -MAP_ROUTE_42 EQU $05 -MAP_ROUTE_44 EQU $06 -MAP_MAHOGANY_TOWN EQU $07 -MAP_SPROUT_TOWER_1F EQU $01 -MAP_SPROUT_TOWER_2F EQU $02 -MAP_SPROUT_TOWER_3F EQU $03 -MAP_TIN_TOWER_1F EQU $04 -MAP_TIN_TOWER_2F EQU $05 -MAP_TIN_TOWER_3F EQU $06 -MAP_TIN_TOWER_4F EQU $07 -MAP_TIN_TOWER_5F EQU $08 -MAP_TIN_TOWER_6F EQU $09 -MAP_TIN_TOWER_7F EQU $0a -MAP_TIN_TOWER_8F EQU $0b -MAP_TIN_TOWER_9F EQU $0c -MAP_BURNED_TOWER_1F EQU $0d -MAP_BURNED_TOWER_B1F EQU $0e -MAP_NATIONAL_PARK EQU $0f -MAP_NATIONAL_PARK_BUG_CONTEST EQU $10 -MAP_RADIO_TOWER_1F EQU $11 -MAP_RADIO_TOWER_2F EQU $12 -MAP_RADIO_TOWER_3F EQU $13 -MAP_RADIO_TOWER_4F EQU $14 -MAP_RADIO_TOWER_5F EQU $15 -MAP_RUINS_OF_ALPH_OUTSIDE EQU $16 -MAP_RUINS_OF_ALPH_HO_OH_CHAMBER EQU $17 -MAP_RUINS_OF_ALPH_KABUTO_CHAMBER EQU $18 -MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER EQU $19 -MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER EQU $1a -MAP_RUINS_OF_ALPH_INNER_CHAMBER EQU $1b -MAP_RUINS_OF_ALPH_RESEARCH_CENTER EQU $1c -MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM EQU $1d -MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM EQU $1e -MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM EQU $1f -MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM EQU $20 -MAP_RUINS_OF_ALPH_HO_OH_WORD_ROOM EQU $21 -MAP_RUINS_OF_ALPH_KABUTO_WORD_ROOM EQU $22 -MAP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM EQU $23 -MAP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM EQU $24 -MAP_UNION_CAVE_1F EQU $25 -MAP_UNION_CAVE_B1F EQU $26 -MAP_UNION_CAVE_B2F EQU $27 -MAP_SLOWPOKE_WELL_B1F EQU $28 -MAP_SLOWPOKE_WELL_B2F EQU $29 -MAP_OLIVINE_LIGHTHOUSE_1F EQU $2a -MAP_OLIVINE_LIGHTHOUSE_2F EQU $2b -MAP_OLIVINE_LIGHTHOUSE_3F EQU $2c -MAP_OLIVINE_LIGHTHOUSE_4F EQU $2d -MAP_OLIVINE_LIGHTHOUSE_5F EQU $2e -MAP_OLIVINE_LIGHTHOUSE_6F EQU $2f -MAP_MAHOGANY_MART_1F EQU $30 -MAP_TEAM_ROCKET_BASE_B1F EQU $31 -MAP_TEAM_ROCKET_BASE_B2F EQU $32 -MAP_TEAM_ROCKET_BASE_B3F EQU $33 -MAP_ILEX_FOREST EQU $34 -MAP_WAREHOUSE_ENTRANCE EQU $35 -MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES EQU $36 -MAP_GOLDENROD_DEPT_STORE_B1F EQU $37 -MAP_UNDERGROUND_WAREHOUSE EQU $38 -MAP_MOUNT_MORTAR_1F_OUTSIDE EQU $39 -MAP_MOUNT_MORTAR_1F_INSIDE EQU $3a -MAP_MOUNT_MORTAR_2F_INSIDE EQU $3b -MAP_MOUNT_MORTAR_B1F EQU $3c -MAP_ICE_PATH_1F EQU $3d -MAP_ICE_PATH_B1F EQU $3e -MAP_ICE_PATH_B2F_MAHOGANY_SIDE EQU $3f -MAP_ICE_PATH_B2F_BLACKTHORN_SIDE EQU $40 -MAP_ICE_PATH_B3F EQU $41 -MAP_WHIRL_ISLAND_NW EQU $42 -MAP_WHIRL_ISLAND_NE EQU $43 -MAP_WHIRL_ISLAND_SW EQU $44 -MAP_WHIRL_ISLAND_CAVE EQU $45 -MAP_WHIRL_ISLAND_SE EQU $46 -MAP_WHIRL_ISLAND_B1F EQU $47 -MAP_WHIRL_ISLAND_B2F EQU $48 -MAP_WHIRL_ISLAND_LUGIA_CHAMBER EQU $49 -MAP_SILVER_CAVE_ROOM_1 EQU $4a -MAP_SILVER_CAVE_ROOM_2 EQU $4b -MAP_SILVER_CAVE_ROOM_3 EQU $4c -MAP_SILVER_CAVE_ITEM_ROOMS EQU $4d -MAP_DARK_CAVE_VIOLET_ENTRANCE EQU $4e -MAP_DARK_CAVE_BLACKTHORN_ENTRANCE EQU $4f -MAP_DRAGONS_DEN_1F EQU $50 -MAP_DRAGONS_DEN_B1F EQU $51 -MAP_DRAGON_SHRINE EQU $52 -MAP_TOHJO_FALLS EQU $53 -MAP_DIGLETTS_CAVE EQU $54 -MAP_MOUNT_MOON EQU $55 -MAP_UNDERGROUND EQU $56 -MAP_ROCK_TUNNEL_1F EQU $57 -MAP_ROCK_TUNNEL_B1F EQU $58 -MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA EQU $59 -MAP_SAFARI_ZONE_BETA EQU $5a -MAP_VICTORY_ROAD EQU $5b -MAP_ECRUTEAK_HOUSE EQU $01 -MAP_WISE_TRIOS_ROOM EQU $02 -MAP_ECRUTEAK_POKECENTER_1F EQU $03 -MAP_ECRUTEAK_LUGIA_SPEECH_HOUSE EQU $04 -MAP_DANCE_THEATRE EQU $05 -MAP_ECRUTEAK_MART EQU $06 -MAP_ECRUTEAK_GYM EQU $07 -MAP_ECRUTEAK_ITEMFINDER_HOUSE EQU $08 -MAP_ECRUTEAK_CITY EQU $09 -MAP_BLACKTHORN_GYM_1F EQU $01 -MAP_BLACKTHORN_GYM_2F EQU $02 -MAP_BLACKTHORN_DRAGON_SPEECH_HOUSE EQU $03 -MAP_BLACKTHORN_DODRIO_TRADE_HOUSE EQU $04 -MAP_BLACKTHORN_MART EQU $05 -MAP_BLACKTHORN_POKECENTER_1F EQU $06 -MAP_MOVE_DELETERS_HOUSE EQU $07 -MAP_ROUTE_45 EQU $08 -MAP_ROUTE_46 EQU $09 -MAP_BLACKTHORN_CITY EQU $0a -MAP_CINNABAR_POKECENTER_1F EQU $01 -MAP_CINNABAR_POKECENTER_2F_BETA EQU $02 -MAP_ROUTE_19___FUCHSIA_GATE EQU $03 -MAP_SEAFOAM_GYM EQU $04 -MAP_ROUTE_19 EQU $05 -MAP_ROUTE_20 EQU $06 -MAP_ROUTE_21 EQU $07 -MAP_CINNABAR_ISLAND EQU $08 -MAP_CERULEAN_GYM_BADGE_SPEECH_HOUSE EQU $01 -MAP_CERULEAN_POLICE_STATION EQU $02 -MAP_CERULEAN_TRADE_SPEECH_HOUSE EQU $03 -MAP_CERULEAN_POKECENTER_1F EQU $04 -MAP_CERULEAN_POKECENTER_2F_BETA EQU $05 -MAP_CERULEAN_GYM EQU $06 -MAP_CERULEAN_MART EQU $07 -MAP_ROUTE_10_POKECENTER_1F EQU $08 -MAP_ROUTE_10_POKECENTER_2F_BETA EQU $09 -MAP_POWER_PLANT EQU $0a -MAP_BILLS_HOUSE EQU $0b -MAP_ROUTE_4 EQU $0c -MAP_ROUTE_9 EQU $0d -MAP_ROUTE_10A EQU $0e -MAP_ROUTE_10_NORTH EQU $0e -MAP_ROUTE_24 EQU $0f -MAP_ROUTE_25 EQU $10 -MAP_CERULEAN_CITY EQU $11 -MAP_AZALEA_POKECENTER_1F EQU $01 -MAP_CHARCOAL_KILN EQU $02 -MAP_AZALEA_MART EQU $03 -MAP_KURTS_HOUSE EQU $04 -MAP_AZALEA_GYM EQU $05 -MAP_ROUTE_33 EQU $06 -MAP_AZALEA_TOWN EQU $07 -MAP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE EQU $01 -MAP_LAKE_OF_RAGE_MAGIKARP_HOUSE EQU $02 -MAP_ROUTE_43_MAHOGANY_GATE EQU $03 -MAP_ROUTE_43_GATE EQU $04 -MAP_ROUTE_43 EQU $05 -MAP_LAKE_OF_RAGE EQU $06 -MAP_ROUTE_32 EQU $01 -MAP_ROUTE_35 EQU $02 -MAP_ROUTE_36 EQU $03 -MAP_ROUTE_37 EQU $04 -MAP_VIOLET_CITY EQU $05 -MAP_VIOLET_MART EQU $06 -MAP_VIOLET_GYM EQU $07 -MAP_EARLS_POKEMON_ACADEMY EQU $08 -MAP_VIOLET_NICKNAME_SPEECH_HOUSE EQU $09 -MAP_VIOLET_POKECENTER_1F EQU $0a -MAP_VIOLET_ONIX_TRADE_HOUSE EQU $0b -MAP_ROUTE_32_RUINS_OF_ALPH_GATE EQU $0c -MAP_ROUTE_32_POKECENTER_1F EQU $0d -MAP_ROUTE_35_GOLDENROD_GATE EQU $0e -MAP_ROUTE_35_NATIONAL_PARK_GATE EQU $0f -MAP_ROUTE_36_RUINS_OF_ALPH_GATE EQU $10 -MAP_ROUTE_36_NATIONAL_PARK_GATE EQU $11 -MAP_ROUTE_34 EQU $01 -MAP_GOLDENROD_CITY EQU $02 -MAP_GOLDENROD_GYM EQU $03 -MAP_GOLDENROD_BIKE_SHOP EQU $04 -MAP_GOLDENROD_HAPPINESS_RATER EQU $05 -MAP_GOLDENROD_BILLS_HOUSE EQU $06 -MAP_GOLDENROD_MAGNET_TRAIN_STATION EQU $07 -MAP_GOLDENROD_FLOWER_SHOP EQU $08 -MAP_GOLDENROD_PP_SPEECH_HOUSE EQU $09 -MAP_GOLDENROD_NAME_RATERS_HOUSE EQU $0a -MAP_GOLDENROD_DEPT_STORE_1F EQU $0b -MAP_GOLDENROD_DEPT_STORE_2F EQU $0c -MAP_GOLDENROD_DEPT_STORE_3F EQU $0d -MAP_GOLDENROD_DEPT_STORE_4F EQU $0e -MAP_GOLDENROD_DEPT_STORE_5F EQU $0f -MAP_GOLDENROD_DEPT_STORE_6F EQU $10 -MAP_GOLDENROD_DEPT_STORE_ELEVATOR EQU $11 -MAP_GOLDENROD_DEPT_STORE_ROOF EQU $12 -MAP_GOLDENROD_GAME_CORNER EQU $13 -MAP_GOLDENROD_POKECENTER_1F EQU $14 -MAP_GOLDENROD_POKECOM_CENTER_2F_MOBILE EQU $15 -MAP_ILEX_FOREST_AZALEA_GATE EQU $16 -MAP_ROUTE_34_ILEX_FOREST_GATE EQU $17 -MAP_DAY_CARE EQU $18 -MAP_ROUTE_6 EQU $01 -MAP_ROUTE_11 EQU $02 -MAP_VERMILION_CITY EQU $03 -MAP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE EQU $04 -MAP_VERMILION_POKECENTER_1F EQU $05 -MAP_VERMILION_POKECENTER_2F_BETA EQU $06 -MAP_POKEMON_FAN_CLUB EQU $07 -MAP_VERMILION_MAGNET_TRAIN_SPEECH_HOUSE EQU $08 -MAP_VERMILION_MART EQU $09 -MAP_VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE EQU $0a -MAP_VERMILION_GYM EQU $0b -MAP_ROUTE_6_SAFFRON_GATE EQU $0c -MAP_ROUTE_6_UNDERGROUND_ENTRANCE EQU $0d -MAP_ROUTE_1 EQU $01 -MAP_PALLET_TOWN EQU $02 -MAP_REDS_HOUSE_1F EQU $03 -MAP_REDS_HOUSE_2F EQU $04 -MAP_BLUES_HOUSE EQU $05 -MAP_OAKS_LAB EQU $06 -MAP_ROUTE_3 EQU $01 -MAP_PEWTER_CITY EQU $02 -MAP_PEWTER_NIDORAN_SPEECH_HOUSE EQU $03 -MAP_PEWTER_GYM EQU $04 -MAP_PEWTER_MART EQU $05 -MAP_PEWTER_POKECENTER_1F EQU $06 -MAP_PEWTER_POKECENTER_2F_BETA EQU $07 -MAP_PEWTER_SNOOZE_SPEECH_HOUSE EQU $08 -MAP_OLIVINE_PORT EQU $01 -MAP_VERMILION_PORT EQU $02 -MAP_FAST_SHIP_1F EQU $03 -MAP_FAST_SHIP_CABINS_NNW_NNE_NE EQU $04 -MAP_FAST_SHIP_CABINS_SW_SSW_NW EQU $05 -MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN EQU $06 -MAP_FAST_SHIP_B1F EQU $07 -MAP_OLIVINE_PORT_PASSAGE EQU $08 -MAP_VERMILION_PORT_PASSAGE EQU $09 -MAP_MOUNT_MOON_SQUARE EQU $0a -MAP_MOUNT_MOON_GIFT_SHOP EQU $0b -MAP_TIN_TOWER_ROOF EQU $0c -MAP_ROUTE_23 EQU $01 -MAP_INDIGO_PLATEAU_POKECENTER_1F EQU $02 -MAP_WILLS_ROOM EQU $03 -MAP_KOGAS_ROOM EQU $04 -MAP_BRUNOS_ROOM EQU $05 -MAP_KARENS_ROOM EQU $06 -MAP_LANCES_ROOM EQU $07 -MAP_HALL_OF_FAME EQU $08 -MAP_ROUTE_13 EQU $01 -MAP_ROUTE_14 EQU $02 -MAP_ROUTE_15 EQU $03 -MAP_ROUTE_18 EQU $04 -MAP_FUCHSIA_CITY EQU $05 -MAP_FUCHSIA_MART EQU $06 -MAP_SAFARI_ZONE_MAIN_OFFICE EQU $07 -MAP_FUCHSIA_GYM EQU $08 -MAP_FUCHSIA_BILL_SPEECH_HOUSE EQU $09 -MAP_FUCHSIA_POKECENTER_1F EQU $0a -MAP_FUCHSIA_POKECENTER_2F_BETA EQU $0b -MAP_SAFARI_ZONE_WARDENS_HOME EQU $0c -MAP_ROUTE_15_FUCHSIA_GATE EQU $0d -MAP_ROUTE_8 EQU $01 -MAP_ROUTE_12 EQU $02 -MAP_ROUTE_10B EQU $03 -MAP_ROUTE_10_SOUTH EQU $03 -MAP_LAVENDER_TOWN EQU $04 -MAP_LAVENDER_POKECENTER_1F EQU $05 -MAP_LAVENDER_POKECENTER_2F_BETA EQU $06 -MAP_MR_FUJIS_HOUSE EQU $07 -MAP_LAVENDER_TOWN_SPEECH_HOUSE EQU $08 -MAP_LAVENDER_NAME_RATER EQU $09 -MAP_LAVENDER_MART EQU $0a -MAP_SOUL_HOUSE EQU $0b -MAP_LAV_RADIO_TOWER_1F EQU $0c -MAP_ROUTE_8_SAFFRON_GATE EQU $0d -MAP_ROUTE_12_SUPER_ROD_HOUSE EQU $0e -MAP_ROUTE_28 EQU $01 -MAP_SILVER_CAVE_OUTSIDE EQU $02 -MAP_SILVER_CAVE_POKECENTER_1F EQU $03 -MAP_ROUTE_28_FAMOUS_SPEECH_HOUSE EQU $04 -MAP_POKECENTER_2F EQU $01 -MAP_TRADE_CENTER EQU $02 -MAP_COLOSSEUM EQU $03 -MAP_TIME_CAPSULE EQU $04 -MAP_MOBILE_TRADE_ROOM_MOBILE EQU $05 -MAP_MOBILE_BATTLE_ROOM EQU $06 -MAP_ROUTE_7 EQU $01 -MAP_ROUTE_16 EQU $02 -MAP_ROUTE_17 EQU $03 -MAP_CELADON_CITY EQU $04 -MAP_CELADON_DEPT_STORE_1F EQU $05 -MAP_CELADON_DEPT_STORE_2F EQU $06 -MAP_CELADON_DEPT_STORE_3F EQU $07 -MAP_CELADON_DEPT_STORE_4F EQU $08 -MAP_CELADON_DEPT_STORE_5F EQU $09 -MAP_CELADON_DEPT_STORE_6F EQU $0a -MAP_CELADON_DEPT_STORE_ELEVATOR EQU $0b -MAP_CELADON_MANSION_1F EQU $0c -MAP_CELADON_MANSION_2F EQU $0d -MAP_CELADON_MANSION_3F EQU $0e -MAP_CELADON_MANSION_ROOF EQU $0f -MAP_CELADON_MANSION_ROOF_HOUSE EQU $10 -MAP_CELADON_POKECENTER_1F EQU $11 -MAP_CELADON_POKECENTER_2F_BETA EQU $12 -MAP_CELADON_GAME_CORNER EQU $13 -MAP_CELADON_GAME_CORNER_PRIZE_ROOM EQU $14 -MAP_CELADON_GYM EQU $15 -MAP_CELADON_CAFE EQU $16 -MAP_ROUTE_16_FUCHSIA_SPEECH_HOUSE EQU $17 -MAP_ROUTE_16_GATE EQU $18 -MAP_ROUTE_7_SAFFRON_GATE EQU $19 -MAP_ROUTE_17_18_GATE EQU $1a -MAP_ROUTE_40 EQU $01 -MAP_ROUTE_41 EQU $02 -MAP_CIANWOOD_CITY EQU $03 -MAP_MANIAS_HOUSE EQU $04 -MAP_CIANWOOD_GYM EQU $05 -MAP_CIANWOOD_POKECENTER_1F EQU $06 -MAP_CIANWOOD_PHARMACY EQU $07 -MAP_CIANWOOD_CITY_PHOTO_STUDIO EQU $08 -MAP_CIANWOOD_LUGIA_SPEECH_HOUSE EQU $09 -MAP_POKE_SEERS_HOUSE EQU $0a -MAP_BATTLE_TOWER_1F EQU $0b -MAP_BATTLE_TOWER_BATTLE_ROOM EQU $0c -MAP_BATTLE_TOWER_ELEVATOR EQU $0d -MAP_BATTLE_TOWER_HALLWAY EQU $0e -MAP_ROUTE_40_BATTLE_TOWER_GATE EQU $0f -MAP_BATTLE_TOWER_OUTSIDE EQU $10 -MAP_ROUTE_2 EQU $01 -MAP_ROUTE_22 EQU $02 -MAP_VIRIDIAN_CITY EQU $03 -MAP_VIRIDIAN_GYM EQU $04 -MAP_VIRIDIAN_NICKNAME_SPEECH_HOUSE EQU $05 -MAP_TRAINER_HOUSE_1F EQU $06 -MAP_TRAINER_HOUSE_B1F EQU $07 -MAP_VIRIDIAN_MART EQU $08 -MAP_VIRIDIAN_POKECENTER_1F EQU $09 -MAP_VIRIDIAN_POKECENTER_2F_BETA EQU $0a -MAP_ROUTE_2_NUGGET_SPEECH_HOUSE EQU $0b -MAP_ROUTE_2_GATE EQU $0c -MAP_VICTORY_ROAD_GATE EQU $0d -MAP_ROUTE_26 EQU $01 -MAP_ROUTE_27 EQU $02 -MAP_ROUTE_29 EQU $03 -MAP_NEW_BARK_TOWN EQU $04 -MAP_ELMS_LAB EQU $05 -MAP_KRISS_HOUSE_1F EQU $06 -MAP_KRISS_HOUSE_2F EQU $07 -MAP_KRISS_NEIGHBORS_HOUSE EQU $08 -MAP_ELMS_HOUSE EQU $09 -MAP_ROUTE_26_HEAL_SPEECH_HOUSE EQU $0a -MAP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE EQU $0b -MAP_ROUTE_27_SANDSTORM_HOUSE EQU $0c -MAP_ROUTE_29_46_GATE EQU $0d -MAP_ROUTE_5 EQU $01 -MAP_SAFFRON_CITY EQU $02 -MAP_FIGHTING_DOJO EQU $03 -MAP_SAFFRON_GYM EQU $04 -MAP_SAFFRON_MART EQU $05 -MAP_SAFFRON_POKECENTER_1F EQU $06 -MAP_SAFFRON_POKECENTER_2F_BETA EQU $07 -MAP_MR_PSYCHICS_HOUSE EQU $08 -MAP_SAFFRON_TRAIN_STATION EQU $09 -MAP_SILPH_CO_1F EQU $0a -MAP_COPYCATS_HOUSE_1F EQU $0b -MAP_COPYCATS_HOUSE_2F EQU $0c -MAP_ROUTE_5_UNDERGROUND_ENTRANCE EQU $0d -MAP_ROUTE_5_SAFFRON_CITY_GATE EQU $0e -MAP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE EQU $0f -MAP_ROUTE_30 EQU $01 -MAP_ROUTE_31 EQU $02 -MAP_CHERRYGROVE_CITY EQU $03 -MAP_CHERRYGROVE_MART EQU $04 -MAP_CHERRYGROVE_POKECENTER_1F EQU $05 -MAP_CHERRYGROVE_GYM_SPEECH_HOUSE EQU $06 -MAP_GUIDE_GENTS_HOUSE EQU $07 -MAP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE EQU $08 -MAP_ROUTE_30_BERRY_SPEECH_HOUSE EQU $09 -MAP_MR_POKEMONS_HOUSE EQU $0a -MAP_ROUTE_31_VIOLET_GATE EQU $0b + newgroup + mapgroup MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 4, 4 + mapgroup MAHOGANY_GYM, 9, 5 + mapgroup MAHOGANY_POKECENTER_1F, 4, 5 + mapgroup ROUTE_42_ECRUTEAK_GATE, 4, 5 + mapgroup ROUTE_42, 9, 30 + mapgroup ROUTE_44, 9, 30 + mapgroup MAHOGANY_TOWN, 9, 10 -; map dimensions -OLIVINE_POKECENTER_1F_HEIGHT EQU 4 -OLIVINE_POKECENTER_1F_WIDTH EQU 5 -OLIVINE_GYM_HEIGHT EQU 8 -OLIVINE_GYM_WIDTH EQU 5 -OLIVINE_VOLTORB_HOUSE_HEIGHT EQU 4 -OLIVINE_VOLTORB_HOUSE_WIDTH EQU 4 -OLIVINE_HOUSE_BETA_HEIGHT EQU 4 -OLIVINE_HOUSE_BETA_WIDTH EQU 4 -OLIVINE_PUNISHMENT_SPEECH_HOUSE_HEIGHT EQU 4 -OLIVINE_PUNISHMENT_SPEECH_HOUSE_WIDTH EQU 4 -OLIVINE_GOOD_ROD_HOUSE_HEIGHT EQU 4 -OLIVINE_GOOD_ROD_HOUSE_WIDTH EQU 4 -OLIVINE_CAFE_HEIGHT EQU 4 -OLIVINE_CAFE_WIDTH EQU 4 -OLIVINE_MART_HEIGHT EQU 4 -OLIVINE_MART_WIDTH EQU 6 -ROUTE_38_ECRUTEAK_GATE_HEIGHT EQU 4 -ROUTE_38_ECRUTEAK_GATE_WIDTH EQU 5 -ROUTE_39_BARN_HEIGHT EQU 4 -ROUTE_39_BARN_WIDTH EQU 4 -ROUTE_39_FARMHOUSE_HEIGHT EQU 4 -ROUTE_39_FARMHOUSE_WIDTH EQU 4 -ROUTE_38_HEIGHT EQU 9 -ROUTE_38_WIDTH EQU 20 -ROUTE_39_HEIGHT EQU 18 -ROUTE_39_WIDTH EQU 10 -OLIVINE_CITY_HEIGHT EQU 18 -OLIVINE_CITY_WIDTH EQU 20 -MAHOGANY_RED_GYARADOS_SPEECH_HOUSE_HEIGHT EQU 4 -MAHOGANY_RED_GYARADOS_SPEECH_HOUSE_WIDTH EQU 4 -MAHOGANY_GYM_HEIGHT EQU 9 -MAHOGANY_GYM_WIDTH EQU 5 -MAHOGANY_POKECENTER_1F_HEIGHT EQU 4 -MAHOGANY_POKECENTER_1F_WIDTH EQU 5 -ROUTE_42_ECRUTEAK_GATE_HEIGHT EQU 4 -ROUTE_42_ECRUTEAK_GATE_WIDTH EQU 5 -ROUTE_42_HEIGHT EQU 9 -ROUTE_42_WIDTH EQU 30 -ROUTE_44_HEIGHT EQU 9 -ROUTE_44_WIDTH EQU 30 -MAHOGANY_TOWN_HEIGHT EQU 9 -MAHOGANY_TOWN_WIDTH EQU 10 -SPROUT_TOWER_1F_HEIGHT EQU 8 -SPROUT_TOWER_1F_WIDTH EQU 10 -SPROUT_TOWER_2F_HEIGHT EQU 8 -SPROUT_TOWER_2F_WIDTH EQU 10 -SPROUT_TOWER_3F_HEIGHT EQU 8 -SPROUT_TOWER_3F_WIDTH EQU 10 -TIN_TOWER_1F_HEIGHT EQU 9 -TIN_TOWER_1F_WIDTH EQU 10 -TIN_TOWER_2F_HEIGHT EQU 9 -TIN_TOWER_2F_WIDTH EQU 10 -TIN_TOWER_3F_HEIGHT EQU 9 -TIN_TOWER_3F_WIDTH EQU 10 -TIN_TOWER_4F_HEIGHT EQU 9 -TIN_TOWER_4F_WIDTH EQU 10 -TIN_TOWER_5F_HEIGHT EQU 9 -TIN_TOWER_5F_WIDTH EQU 10 -TIN_TOWER_6F_HEIGHT EQU 9 -TIN_TOWER_6F_WIDTH EQU 10 -TIN_TOWER_7F_HEIGHT EQU 9 -TIN_TOWER_7F_WIDTH EQU 10 -TIN_TOWER_8F_HEIGHT EQU 9 -TIN_TOWER_8F_WIDTH EQU 10 -TIN_TOWER_9F_HEIGHT EQU 9 -TIN_TOWER_9F_WIDTH EQU 10 -BURNED_TOWER_1F_HEIGHT EQU 9 -BURNED_TOWER_1F_WIDTH EQU 10 -BURNED_TOWER_B1F_HEIGHT EQU 9 -BURNED_TOWER_B1F_WIDTH EQU 10 -NATIONAL_PARK_HEIGHT EQU 27 -NATIONAL_PARK_WIDTH EQU 20 -NATIONAL_PARK_BUG_CONTEST_HEIGHT EQU 27 -NATIONAL_PARK_BUG_CONTEST_WIDTH EQU 20 -RADIO_TOWER_1F_HEIGHT EQU 4 -RADIO_TOWER_1F_WIDTH EQU 9 -RADIO_TOWER_2F_HEIGHT EQU 4 -RADIO_TOWER_2F_WIDTH EQU 9 -RADIO_TOWER_3F_HEIGHT EQU 4 -RADIO_TOWER_3F_WIDTH EQU 9 -RADIO_TOWER_4F_HEIGHT EQU 4 -RADIO_TOWER_4F_WIDTH EQU 9 -RADIO_TOWER_5F_HEIGHT EQU 4 -RADIO_TOWER_5F_WIDTH EQU 9 -RUINS_OF_ALPH_OUTSIDE_HEIGHT EQU 18 -RUINS_OF_ALPH_OUTSIDE_WIDTH EQU 10 -RUINS_OF_ALPH_HO_OH_CHAMBER_HEIGHT EQU 5 -RUINS_OF_ALPH_HO_OH_CHAMBER_WIDTH EQU 4 -RUINS_OF_ALPH_KABUTO_CHAMBER_HEIGHT EQU 5 -RUINS_OF_ALPH_KABUTO_CHAMBER_WIDTH EQU 4 -RUINS_OF_ALPH_OMANYTE_CHAMBER_HEIGHT EQU 5 -RUINS_OF_ALPH_OMANYTE_CHAMBER_WIDTH EQU 4 -RUINS_OF_ALPH_AERODACTYL_CHAMBER_HEIGHT EQU 5 -RUINS_OF_ALPH_AERODACTYL_CHAMBER_WIDTH EQU 4 -RUINS_OF_ALPH_INNER_CHAMBER_HEIGHT EQU 14 -RUINS_OF_ALPH_INNER_CHAMBER_WIDTH EQU 10 -RUINS_OF_ALPH_RESEARCH_CENTER_HEIGHT EQU 4 -RUINS_OF_ALPH_RESEARCH_CENTER_WIDTH EQU 4 -RUINS_OF_ALPH_HO_OH_ITEM_ROOM_HEIGHT EQU 5 -RUINS_OF_ALPH_HO_OH_ITEM_ROOM_WIDTH EQU 4 -RUINS_OF_ALPH_KABUTO_ITEM_ROOM_HEIGHT EQU 5 -RUINS_OF_ALPH_KABUTO_ITEM_ROOM_WIDTH EQU 4 -RUINS_OF_ALPH_OMANYTE_ITEM_ROOM_HEIGHT EQU 5 -RUINS_OF_ALPH_OMANYTE_ITEM_ROOM_WIDTH EQU 4 -RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM_HEIGHT EQU 5 -RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM_WIDTH EQU 4 -RUINS_OF_ALPH_HO_OH_WORD_ROOM_HEIGHT EQU 12 -RUINS_OF_ALPH_HO_OH_WORD_ROOM_WIDTH EQU 10 -RUINS_OF_ALPH_KABUTO_WORD_ROOM_HEIGHT EQU 7 -RUINS_OF_ALPH_KABUTO_WORD_ROOM_WIDTH EQU 10 -RUINS_OF_ALPH_OMANYTE_WORD_ROOM_HEIGHT EQU 8 -RUINS_OF_ALPH_OMANYTE_WORD_ROOM_WIDTH EQU 10 -RUINS_OF_ALPH_AERODACTYL_WORD_ROOM_HEIGHT EQU 7 -RUINS_OF_ALPH_AERODACTYL_WORD_ROOM_WIDTH EQU 10 -UNION_CAVE_1F_HEIGHT EQU 18 -UNION_CAVE_1F_WIDTH EQU 10 -UNION_CAVE_B1F_HEIGHT EQU 18 -UNION_CAVE_B1F_WIDTH EQU 10 -UNION_CAVE_B2F_HEIGHT EQU 18 -UNION_CAVE_B2F_WIDTH EQU 10 -SLOWPOKE_WELL_B1F_HEIGHT EQU 9 -SLOWPOKE_WELL_B1F_WIDTH EQU 10 -SLOWPOKE_WELL_B2F_HEIGHT EQU 9 -SLOWPOKE_WELL_B2F_WIDTH EQU 10 -OLIVINE_LIGHTHOUSE_1F_HEIGHT EQU 9 -OLIVINE_LIGHTHOUSE_1F_WIDTH EQU 10 -OLIVINE_LIGHTHOUSE_2F_HEIGHT EQU 9 -OLIVINE_LIGHTHOUSE_2F_WIDTH EQU 10 -OLIVINE_LIGHTHOUSE_3F_HEIGHT EQU 9 -OLIVINE_LIGHTHOUSE_3F_WIDTH EQU 10 -OLIVINE_LIGHTHOUSE_4F_HEIGHT EQU 9 -OLIVINE_LIGHTHOUSE_4F_WIDTH EQU 10 -OLIVINE_LIGHTHOUSE_5F_HEIGHT EQU 9 -OLIVINE_LIGHTHOUSE_5F_WIDTH EQU 10 -OLIVINE_LIGHTHOUSE_6F_HEIGHT EQU 9 -OLIVINE_LIGHTHOUSE_6F_WIDTH EQU 10 -MAHOGANY_MART_1F_HEIGHT EQU 4 -MAHOGANY_MART_1F_WIDTH EQU 4 -TEAM_ROCKET_BASE_B1F_HEIGHT EQU 9 -TEAM_ROCKET_BASE_B1F_WIDTH EQU 15 -TEAM_ROCKET_BASE_B2F_HEIGHT EQU 9 -TEAM_ROCKET_BASE_B2F_WIDTH EQU 15 -TEAM_ROCKET_BASE_B3F_HEIGHT EQU 9 -TEAM_ROCKET_BASE_B3F_WIDTH EQU 15 -ILEX_FOREST_HEIGHT EQU 27 -ILEX_FOREST_WIDTH EQU 15 -WAREHOUSE_ENTRANCE_HEIGHT EQU 18 -WAREHOUSE_ENTRANCE_WIDTH EQU 15 -UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HEIGHT EQU 18 -UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_WIDTH EQU 15 -GOLDENROD_DEPT_STORE_B1F_HEIGHT EQU 9 -GOLDENROD_DEPT_STORE_B1F_WIDTH EQU 10 -UNDERGROUND_WAREHOUSE_HEIGHT EQU 9 -UNDERGROUND_WAREHOUSE_WIDTH EQU 10 -MOUNT_MORTAR_1F_OUTSIDE_HEIGHT EQU 18 -MOUNT_MORTAR_1F_OUTSIDE_WIDTH EQU 20 -MOUNT_MORTAR_1F_INSIDE_HEIGHT EQU 27 -MOUNT_MORTAR_1F_INSIDE_WIDTH EQU 20 -MOUNT_MORTAR_2F_INSIDE_HEIGHT EQU 18 -MOUNT_MORTAR_2F_INSIDE_WIDTH EQU 20 -MOUNT_MORTAR_B1F_HEIGHT EQU 18 -MOUNT_MORTAR_B1F_WIDTH EQU 20 -ICE_PATH_1F_HEIGHT EQU 18 -ICE_PATH_1F_WIDTH EQU 20 -ICE_PATH_B1F_HEIGHT EQU 18 -ICE_PATH_B1F_WIDTH EQU 10 -ICE_PATH_B2F_MAHOGANY_SIDE_HEIGHT EQU 9 -ICE_PATH_B2F_MAHOGANY_SIDE_WIDTH EQU 10 -ICE_PATH_B2F_BLACKTHORN_SIDE_HEIGHT EQU 9 -ICE_PATH_B2F_BLACKTHORN_SIDE_WIDTH EQU 5 -ICE_PATH_B3F_HEIGHT EQU 9 -ICE_PATH_B3F_WIDTH EQU 10 -WHIRL_ISLAND_NW_HEIGHT EQU 9 -WHIRL_ISLAND_NW_WIDTH EQU 5 -WHIRL_ISLAND_NE_HEIGHT EQU 9 -WHIRL_ISLAND_NE_WIDTH EQU 10 -WHIRL_ISLAND_SW_HEIGHT EQU 9 -WHIRL_ISLAND_SW_WIDTH EQU 10 -WHIRL_ISLAND_CAVE_HEIGHT EQU 9 -WHIRL_ISLAND_CAVE_WIDTH EQU 5 -WHIRL_ISLAND_SE_HEIGHT EQU 9 -WHIRL_ISLAND_SE_WIDTH EQU 5 -WHIRL_ISLAND_B1F_HEIGHT EQU 18 -WHIRL_ISLAND_B1F_WIDTH EQU 20 -WHIRL_ISLAND_B2F_HEIGHT EQU 18 -WHIRL_ISLAND_B2F_WIDTH EQU 10 -WHIRL_ISLAND_LUGIA_CHAMBER_HEIGHT EQU 9 -WHIRL_ISLAND_LUGIA_CHAMBER_WIDTH EQU 10 -SILVER_CAVE_ROOM_1_HEIGHT EQU 18 -SILVER_CAVE_ROOM_1_WIDTH EQU 10 -SILVER_CAVE_ROOM_2_HEIGHT EQU 18 -SILVER_CAVE_ROOM_2_WIDTH EQU 15 -SILVER_CAVE_ROOM_3_HEIGHT EQU 18 -SILVER_CAVE_ROOM_3_WIDTH EQU 10 -SILVER_CAVE_ITEM_ROOMS_HEIGHT EQU 9 -SILVER_CAVE_ITEM_ROOMS_WIDTH EQU 10 -DARK_CAVE_VIOLET_ENTRANCE_HEIGHT EQU 18 -DARK_CAVE_VIOLET_ENTRANCE_WIDTH EQU 20 -DARK_CAVE_BLACKTHORN_ENTRANCE_HEIGHT EQU 18 -DARK_CAVE_BLACKTHORN_ENTRANCE_WIDTH EQU 15 -DRAGONS_DEN_1F_HEIGHT EQU 9 -DRAGONS_DEN_1F_WIDTH EQU 5 -DRAGONS_DEN_B1F_HEIGHT EQU 18 -DRAGONS_DEN_B1F_WIDTH EQU 20 -DRAGON_SHRINE_HEIGHT EQU 5 -DRAGON_SHRINE_WIDTH EQU 5 -TOHJO_FALLS_HEIGHT EQU 9 -TOHJO_FALLS_WIDTH EQU 15 -DIGLETTS_CAVE_HEIGHT EQU 18 -DIGLETTS_CAVE_WIDTH EQU 10 -MOUNT_MOON_HEIGHT EQU 9 -MOUNT_MOON_WIDTH EQU 15 -UNDERGROUND_HEIGHT EQU 14 -UNDERGROUND_WIDTH EQU 3 -ROCK_TUNNEL_1F_HEIGHT EQU 18 -ROCK_TUNNEL_1F_WIDTH EQU 15 -ROCK_TUNNEL_B1F_HEIGHT EQU 18 -ROCK_TUNNEL_B1F_WIDTH EQU 15 -SAFARI_ZONE_FUCHSIA_GATE_BETA_HEIGHT EQU 4 -SAFARI_ZONE_FUCHSIA_GATE_BETA_WIDTH EQU 5 -SAFARI_ZONE_BETA_HEIGHT EQU 18 -SAFARI_ZONE_BETA_WIDTH EQU 10 -VICTORY_ROAD_HEIGHT EQU 36 -VICTORY_ROAD_WIDTH EQU 10 -ECRUTEAK_HOUSE_HEIGHT EQU 9 -ECRUTEAK_HOUSE_WIDTH EQU 10 -WISE_TRIOS_ROOM_HEIGHT EQU 4 -WISE_TRIOS_ROOM_WIDTH EQU 4 -ECRUTEAK_POKECENTER_1F_HEIGHT EQU 4 -ECRUTEAK_POKECENTER_1F_WIDTH EQU 5 -ECRUTEAK_LUGIA_SPEECH_HOUSE_HEIGHT EQU 4 -ECRUTEAK_LUGIA_SPEECH_HOUSE_WIDTH EQU 4 -DANCE_THEATRE_HEIGHT EQU 7 -DANCE_THEATRE_WIDTH EQU 6 -ECRUTEAK_MART_HEIGHT EQU 4 -ECRUTEAK_MART_WIDTH EQU 6 -ECRUTEAK_GYM_HEIGHT EQU 9 -ECRUTEAK_GYM_WIDTH EQU 5 -ECRUTEAK_ITEMFINDER_HOUSE_HEIGHT EQU 4 -ECRUTEAK_ITEMFINDER_HOUSE_WIDTH EQU 4 -ECRUTEAK_CITY_HEIGHT EQU 18 -ECRUTEAK_CITY_WIDTH EQU 20 -BLACKTHORN_GYM_1F_HEIGHT EQU 9 -BLACKTHORN_GYM_1F_WIDTH EQU 5 -BLACKTHORN_GYM_2F_HEIGHT EQU 9 -BLACKTHORN_GYM_2F_WIDTH EQU 5 -BLACKTHORN_DRAGON_SPEECH_HOUSE_HEIGHT EQU 4 -BLACKTHORN_DRAGON_SPEECH_HOUSE_WIDTH EQU 4 -BLACKTHORN_DODRIO_TRADE_HOUSE_HEIGHT EQU 4 -BLACKTHORN_DODRIO_TRADE_HOUSE_WIDTH EQU 4 -BLACKTHORN_MART_HEIGHT EQU 4 -BLACKTHORN_MART_WIDTH EQU 6 -BLACKTHORN_POKECENTER_1F_HEIGHT EQU 4 -BLACKTHORN_POKECENTER_1F_WIDTH EQU 5 -MOVE_DELETERS_HOUSE_HEIGHT EQU 4 -MOVE_DELETERS_HOUSE_WIDTH EQU 4 -ROUTE_45_HEIGHT EQU 45 -ROUTE_45_WIDTH EQU 10 -ROUTE_46_HEIGHT EQU 18 -ROUTE_46_WIDTH EQU 10 -BLACKTHORN_CITY_HEIGHT EQU 18 -BLACKTHORN_CITY_WIDTH EQU 20 -CINNABAR_POKECENTER_1F_HEIGHT EQU 4 -CINNABAR_POKECENTER_1F_WIDTH EQU 5 -CINNABAR_POKECENTER_2F_BETA_HEIGHT EQU 4 -CINNABAR_POKECENTER_2F_BETA_WIDTH EQU 8 -ROUTE_19___FUCHSIA_GATE_HEIGHT EQU 4 -ROUTE_19___FUCHSIA_GATE_WIDTH EQU 5 -SEAFOAM_GYM_HEIGHT EQU 4 -SEAFOAM_GYM_WIDTH EQU 5 -ROUTE_19_HEIGHT EQU 18 -ROUTE_19_WIDTH EQU 10 -ROUTE_20_HEIGHT EQU 9 -ROUTE_20_WIDTH EQU 30 -ROUTE_21_HEIGHT EQU 18 -ROUTE_21_WIDTH EQU 10 -CINNABAR_ISLAND_HEIGHT EQU 9 -CINNABAR_ISLAND_WIDTH EQU 10 -CERULEAN_GYM_BADGE_SPEECH_HOUSE_HEIGHT EQU 4 -CERULEAN_GYM_BADGE_SPEECH_HOUSE_WIDTH EQU 4 -CERULEAN_POLICE_STATION_HEIGHT EQU 4 -CERULEAN_POLICE_STATION_WIDTH EQU 4 -CERULEAN_TRADE_SPEECH_HOUSE_HEIGHT EQU 4 -CERULEAN_TRADE_SPEECH_HOUSE_WIDTH EQU 4 -CERULEAN_POKECENTER_1F_HEIGHT EQU 4 -CERULEAN_POKECENTER_1F_WIDTH EQU 5 -CERULEAN_POKECENTER_2F_BETA_HEIGHT EQU 4 -CERULEAN_POKECENTER_2F_BETA_WIDTH EQU 8 -CERULEAN_GYM_HEIGHT EQU 8 -CERULEAN_GYM_WIDTH EQU 5 -CERULEAN_MART_HEIGHT EQU 4 -CERULEAN_MART_WIDTH EQU 6 -ROUTE_10_POKECENTER_1F_HEIGHT EQU 4 -ROUTE_10_POKECENTER_1F_WIDTH EQU 5 -ROUTE_10_POKECENTER_2F_BETA_HEIGHT EQU 4 -ROUTE_10_POKECENTER_2F_BETA_WIDTH EQU 8 -POWER_PLANT_HEIGHT EQU 9 -POWER_PLANT_WIDTH EQU 10 -BILLS_HOUSE_HEIGHT EQU 4 -BILLS_HOUSE_WIDTH EQU 4 -ROUTE_4_HEIGHT EQU 9 -ROUTE_4_WIDTH EQU 20 -ROUTE_9_HEIGHT EQU 9 -ROUTE_9_WIDTH EQU 30 -ROUTE_10_NORTH_HEIGHT EQU 9 -ROUTE_10_NORTH_WIDTH EQU 10 -ROUTE_24_HEIGHT EQU 9 -ROUTE_24_WIDTH EQU 10 -ROUTE_25_HEIGHT EQU 9 -ROUTE_25_WIDTH EQU 30 -CERULEAN_CITY_HEIGHT EQU 18 -CERULEAN_CITY_WIDTH EQU 20 -AZALEA_POKECENTER_1F_HEIGHT EQU 4 -AZALEA_POKECENTER_1F_WIDTH EQU 5 -CHARCOAL_KILN_HEIGHT EQU 4 -CHARCOAL_KILN_WIDTH EQU 4 -AZALEA_MART_HEIGHT EQU 4 -AZALEA_MART_WIDTH EQU 6 -KURTS_HOUSE_HEIGHT EQU 4 -KURTS_HOUSE_WIDTH EQU 8 -AZALEA_GYM_HEIGHT EQU 8 -AZALEA_GYM_WIDTH EQU 5 -ROUTE_33_HEIGHT EQU 9 -ROUTE_33_WIDTH EQU 10 -AZALEA_TOWN_HEIGHT EQU 9 -AZALEA_TOWN_WIDTH EQU 20 -LAKE_OF_RAGE_HIDDEN_POWER_HOUSE_HEIGHT EQU 4 -LAKE_OF_RAGE_HIDDEN_POWER_HOUSE_WIDTH EQU 4 -LAKE_OF_RAGE_MAGIKARP_HOUSE_HEIGHT EQU 4 -LAKE_OF_RAGE_MAGIKARP_HOUSE_WIDTH EQU 4 -ROUTE_43_MAHOGANY_GATE_HEIGHT EQU 4 -ROUTE_43_MAHOGANY_GATE_WIDTH EQU 5 -ROUTE_43_GATE_HEIGHT EQU 4 -ROUTE_43_GATE_WIDTH EQU 5 -ROUTE_43_HEIGHT EQU 27 -ROUTE_43_WIDTH EQU 10 -LAKE_OF_RAGE_HEIGHT EQU 18 -LAKE_OF_RAGE_WIDTH EQU 20 -ROUTE_32_HEIGHT EQU 45 -ROUTE_32_WIDTH EQU 10 -ROUTE_35_HEIGHT EQU 18 -ROUTE_35_WIDTH EQU 10 -ROUTE_36_HEIGHT EQU 9 -ROUTE_36_WIDTH EQU 30 -ROUTE_37_HEIGHT EQU 9 -ROUTE_37_WIDTH EQU 10 -VIOLET_CITY_HEIGHT EQU 18 -VIOLET_CITY_WIDTH EQU 20 -VIOLET_MART_HEIGHT EQU 4 -VIOLET_MART_WIDTH EQU 6 -VIOLET_GYM_HEIGHT EQU 8 -VIOLET_GYM_WIDTH EQU 5 -EARLS_POKEMON_ACADEMY_HEIGHT EQU 8 -EARLS_POKEMON_ACADEMY_WIDTH EQU 4 -VIOLET_NICKNAME_SPEECH_HOUSE_HEIGHT EQU 4 -VIOLET_NICKNAME_SPEECH_HOUSE_WIDTH EQU 4 -VIOLET_POKECENTER_1F_HEIGHT EQU 4 -VIOLET_POKECENTER_1F_WIDTH EQU 5 -VIOLET_ONIX_TRADE_HOUSE_HEIGHT EQU 4 -VIOLET_ONIX_TRADE_HOUSE_WIDTH EQU 4 -ROUTE_32_RUINS_OF_ALPH_GATE_HEIGHT EQU 4 -ROUTE_32_RUINS_OF_ALPH_GATE_WIDTH EQU 5 -ROUTE_32_POKECENTER_1F_HEIGHT EQU 4 -ROUTE_32_POKECENTER_1F_WIDTH EQU 5 -ROUTE_35_GOLDENROD_GATE_HEIGHT EQU 4 -ROUTE_35_GOLDENROD_GATE_WIDTH EQU 5 -ROUTE_35_NATIONAL_PARK_GATE_HEIGHT EQU 4 -ROUTE_35_NATIONAL_PARK_GATE_WIDTH EQU 4 -ROUTE_36_RUINS_OF_ALPH_GATE_HEIGHT EQU 4 -ROUTE_36_RUINS_OF_ALPH_GATE_WIDTH EQU 5 -ROUTE_36_NATIONAL_PARK_GATE_HEIGHT EQU 4 -ROUTE_36_NATIONAL_PARK_GATE_WIDTH EQU 5 -ROUTE_34_HEIGHT EQU 27 -ROUTE_34_WIDTH EQU 10 -GOLDENROD_CITY_HEIGHT EQU 18 -GOLDENROD_CITY_WIDTH EQU 20 -GOLDENROD_GYM_HEIGHT EQU 9 -GOLDENROD_GYM_WIDTH EQU 10 -GOLDENROD_BIKE_SHOP_HEIGHT EQU 4 -GOLDENROD_BIKE_SHOP_WIDTH EQU 4 -GOLDENROD_HAPPINESS_RATER_HEIGHT EQU 4 -GOLDENROD_HAPPINESS_RATER_WIDTH EQU 4 -GOLDENROD_BILLS_HOUSE_HEIGHT EQU 4 -GOLDENROD_BILLS_HOUSE_WIDTH EQU 4 -GOLDENROD_MAGNET_TRAIN_STATION_HEIGHT EQU 9 -GOLDENROD_MAGNET_TRAIN_STATION_WIDTH EQU 10 -GOLDENROD_FLOWER_SHOP_HEIGHT EQU 4 -GOLDENROD_FLOWER_SHOP_WIDTH EQU 4 -GOLDENROD_PP_SPEECH_HOUSE_HEIGHT EQU 4 -GOLDENROD_PP_SPEECH_HOUSE_WIDTH EQU 4 -GOLDENROD_NAME_RATERS_HOUSE_HEIGHT EQU 4 -GOLDENROD_NAME_RATERS_HOUSE_WIDTH EQU 4 -GOLDENROD_DEPT_STORE_1F_HEIGHT EQU 4 -GOLDENROD_DEPT_STORE_1F_WIDTH EQU 8 -GOLDENROD_DEPT_STORE_2F_HEIGHT EQU 4 -GOLDENROD_DEPT_STORE_2F_WIDTH EQU 8 -GOLDENROD_DEPT_STORE_3F_HEIGHT EQU 4 -GOLDENROD_DEPT_STORE_3F_WIDTH EQU 8 -GOLDENROD_DEPT_STORE_4F_HEIGHT EQU 4 -GOLDENROD_DEPT_STORE_4F_WIDTH EQU 8 -GOLDENROD_DEPT_STORE_5F_HEIGHT EQU 4 -GOLDENROD_DEPT_STORE_5F_WIDTH EQU 8 -GOLDENROD_DEPT_STORE_6F_HEIGHT EQU 4 -GOLDENROD_DEPT_STORE_6F_WIDTH EQU 8 -GOLDENROD_DEPT_STORE_ELEVATOR_HEIGHT EQU 2 -GOLDENROD_DEPT_STORE_ELEVATOR_WIDTH EQU 2 -GOLDENROD_DEPT_STORE_ROOF_HEIGHT EQU 4 -GOLDENROD_DEPT_STORE_ROOF_WIDTH EQU 8 -GOLDENROD_GAME_CORNER_HEIGHT EQU 7 -GOLDENROD_GAME_CORNER_WIDTH EQU 10 -GOLDENROD_POKECENTER_1F_HEIGHT EQU 4 -GOLDENROD_POKECENTER_1F_WIDTH EQU 5 -GOLDENROD_POKECOM_CENTER_2F_MOBILE_HEIGHT EQU 16 -GOLDENROD_POKECOM_CENTER_2F_MOBILE_WIDTH EQU 16 -ILEX_FOREST_AZALEA_GATE_HEIGHT EQU 4 -ILEX_FOREST_AZALEA_GATE_WIDTH EQU 5 -ROUTE_34_ILEX_FOREST_GATE_HEIGHT EQU 4 -ROUTE_34_ILEX_FOREST_GATE_WIDTH EQU 5 -DAY_CARE_HEIGHT EQU 4 -DAY_CARE_WIDTH EQU 5 -ROUTE_6_HEIGHT EQU 9 -ROUTE_6_WIDTH EQU 10 -ROUTE_11_HEIGHT EQU 9 -ROUTE_11_WIDTH EQU 20 -VERMILION_CITY_HEIGHT EQU 18 -VERMILION_CITY_WIDTH EQU 20 -VERMILION_HOUSE_FISHING_SPEECH_HOUSE_HEIGHT EQU 4 -VERMILION_HOUSE_FISHING_SPEECH_HOUSE_WIDTH EQU 4 -VERMILION_POKECENTER_1F_HEIGHT EQU 4 -VERMILION_POKECENTER_1F_WIDTH EQU 5 -VERMILION_POKECENTER_2F_BETA_HEIGHT EQU 4 -VERMILION_POKECENTER_2F_BETA_WIDTH EQU 8 -POKEMON_FAN_CLUB_HEIGHT EQU 4 -POKEMON_FAN_CLUB_WIDTH EQU 5 -VERMILION_MAGNET_TRAIN_SPEECH_HOUSE_HEIGHT EQU 4 -VERMILION_MAGNET_TRAIN_SPEECH_HOUSE_WIDTH EQU 4 -VERMILION_MART_HEIGHT EQU 4 -VERMILION_MART_WIDTH EQU 6 -VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE_HEIGHT EQU 4 -VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE_WIDTH EQU 4 -VERMILION_GYM_HEIGHT EQU 9 -VERMILION_GYM_WIDTH EQU 5 -ROUTE_6_SAFFRON_GATE_HEIGHT EQU 4 -ROUTE_6_SAFFRON_GATE_WIDTH EQU 5 -ROUTE_6_UNDERGROUND_ENTRANCE_HEIGHT EQU 4 -ROUTE_6_UNDERGROUND_ENTRANCE_WIDTH EQU 4 -ROUTE_1_HEIGHT EQU 18 -ROUTE_1_WIDTH EQU 10 -PALLET_TOWN_HEIGHT EQU 9 -PALLET_TOWN_WIDTH EQU 10 -REDS_HOUSE_1F_HEIGHT EQU 4 -REDS_HOUSE_1F_WIDTH EQU 4 -REDS_HOUSE_2F_HEIGHT EQU 4 -REDS_HOUSE_2F_WIDTH EQU 4 -BLUES_HOUSE_HEIGHT EQU 4 -BLUES_HOUSE_WIDTH EQU 4 -OAKS_LAB_HEIGHT EQU 6 -OAKS_LAB_WIDTH EQU 5 -ROUTE_3_HEIGHT EQU 9 -ROUTE_3_WIDTH EQU 30 -PEWTER_CITY_HEIGHT EQU 18 -PEWTER_CITY_WIDTH EQU 20 -PEWTER_NIDORAN_SPEECH_HOUSE_HEIGHT EQU 4 -PEWTER_NIDORAN_SPEECH_HOUSE_WIDTH EQU 4 -PEWTER_GYM_HEIGHT EQU 7 -PEWTER_GYM_WIDTH EQU 5 -PEWTER_MART_HEIGHT EQU 4 -PEWTER_MART_WIDTH EQU 6 -PEWTER_POKECENTER_1F_HEIGHT EQU 4 -PEWTER_POKECENTER_1F_WIDTH EQU 5 -PEWTER_POKECENTER_2F_BETA_HEIGHT EQU 4 -PEWTER_POKECENTER_2F_BETA_WIDTH EQU 8 -PEWTER_SNOOZE_SPEECH_HOUSE_HEIGHT EQU 4 -PEWTER_SNOOZE_SPEECH_HOUSE_WIDTH EQU 4 -OLIVINE_PORT_HEIGHT EQU 18 -OLIVINE_PORT_WIDTH EQU 10 -VERMILION_PORT_HEIGHT EQU 18 -VERMILION_PORT_WIDTH EQU 10 -FAST_SHIP_1F_HEIGHT EQU 9 -FAST_SHIP_1F_WIDTH EQU 16 -FAST_SHIP_CABINS_NNW_NNE_NE_HEIGHT EQU 16 -FAST_SHIP_CABINS_NNW_NNE_NE_WIDTH EQU 4 -FAST_SHIP_CABINS_SW_SSW_NW_HEIGHT EQU 16 -FAST_SHIP_CABINS_SW_SSW_NW_WIDTH EQU 4 -FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_HEIGHT EQU 17 -FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_WIDTH EQU 5 -FAST_SHIP_B1F_HEIGHT EQU 8 -FAST_SHIP_B1F_WIDTH EQU 16 -OLIVINE_PORT_PASSAGE_HEIGHT EQU 9 -OLIVINE_PORT_PASSAGE_WIDTH EQU 10 -VERMILION_PORT_PASSAGE_HEIGHT EQU 9 -VERMILION_PORT_PASSAGE_WIDTH EQU 10 -MOUNT_MOON_SQUARE_HEIGHT EQU 9 -MOUNT_MOON_SQUARE_WIDTH EQU 15 -MOUNT_MOON_GIFT_SHOP_HEIGHT EQU 4 -MOUNT_MOON_GIFT_SHOP_WIDTH EQU 4 -TIN_TOWER_ROOF_HEIGHT EQU 9 -TIN_TOWER_ROOF_WIDTH EQU 10 -ROUTE_23_HEIGHT EQU 9 -ROUTE_23_WIDTH EQU 10 -INDIGO_PLATEAU_POKECENTER_1F_HEIGHT EQU 7 -INDIGO_PLATEAU_POKECENTER_1F_WIDTH EQU 9 -WILLS_ROOM_HEIGHT EQU 9 -WILLS_ROOM_WIDTH EQU 5 -KOGAS_ROOM_HEIGHT EQU 9 -KOGAS_ROOM_WIDTH EQU 5 -BRUNOS_ROOM_HEIGHT EQU 9 -BRUNOS_ROOM_WIDTH EQU 5 -KARENS_ROOM_HEIGHT EQU 9 -KARENS_ROOM_WIDTH EQU 5 -LANCES_ROOM_HEIGHT EQU 12 -LANCES_ROOM_WIDTH EQU 5 -HALL_OF_FAME_HEIGHT EQU 7 -HALL_OF_FAME_WIDTH EQU 5 -ROUTE_13_HEIGHT EQU 9 -ROUTE_13_WIDTH EQU 30 -ROUTE_14_HEIGHT EQU 18 -ROUTE_14_WIDTH EQU 10 -ROUTE_15_HEIGHT EQU 9 -ROUTE_15_WIDTH EQU 20 -ROUTE_18_HEIGHT EQU 9 -ROUTE_18_WIDTH EQU 10 -FUCHSIA_CITY_HEIGHT EQU 18 -FUCHSIA_CITY_WIDTH EQU 20 -FUCHSIA_MART_HEIGHT EQU 4 -FUCHSIA_MART_WIDTH EQU 6 -SAFARI_ZONE_MAIN_OFFICE_HEIGHT EQU 4 -SAFARI_ZONE_MAIN_OFFICE_WIDTH EQU 4 -FUCHSIA_GYM_HEIGHT EQU 9 -FUCHSIA_GYM_WIDTH EQU 5 -FUCHSIA_BILL_SPEECH_HOUSE_HEIGHT EQU 4 -FUCHSIA_BILL_SPEECH_HOUSE_WIDTH EQU 4 -FUCHSIA_POKECENTER_1F_HEIGHT EQU 4 -FUCHSIA_POKECENTER_1F_WIDTH EQU 5 -FUCHSIA_POKECENTER_2F_BETA_HEIGHT EQU 4 -FUCHSIA_POKECENTER_2F_BETA_WIDTH EQU 8 -SAFARI_ZONE_WARDENS_HOME_HEIGHT EQU 4 -SAFARI_ZONE_WARDENS_HOME_WIDTH EQU 5 -ROUTE_15_FUCHSIA_GATE_HEIGHT EQU 4 -ROUTE_15_FUCHSIA_GATE_WIDTH EQU 5 -ROUTE_8_HEIGHT EQU 9 -ROUTE_8_WIDTH EQU 20 -ROUTE_12_HEIGHT EQU 27 -ROUTE_12_WIDTH EQU 10 -ROUTE_10_SOUTH_HEIGHT EQU 9 -ROUTE_10_SOUTH_WIDTH EQU 10 -LAVENDER_TOWN_HEIGHT EQU 9 -LAVENDER_TOWN_WIDTH EQU 10 -LAVENDER_POKECENTER_1F_HEIGHT EQU 4 -LAVENDER_POKECENTER_1F_WIDTH EQU 5 -LAVENDER_POKECENTER_2F_BETA_HEIGHT EQU 4 -LAVENDER_POKECENTER_2F_BETA_WIDTH EQU 8 -MR_FUJIS_HOUSE_HEIGHT EQU 4 -MR_FUJIS_HOUSE_WIDTH EQU 5 -LAVENDER_TOWN_SPEECH_HOUSE_HEIGHT EQU 4 -LAVENDER_TOWN_SPEECH_HOUSE_WIDTH EQU 4 -LAVENDER_NAME_RATER_HEIGHT EQU 4 -LAVENDER_NAME_RATER_WIDTH EQU 4 -LAVENDER_MART_HEIGHT EQU 4 -LAVENDER_MART_WIDTH EQU 6 -SOUL_HOUSE_HEIGHT EQU 4 -SOUL_HOUSE_WIDTH EQU 5 -LAV_RADIO_TOWER_1F_HEIGHT EQU 4 -LAV_RADIO_TOWER_1F_WIDTH EQU 10 -ROUTE_8_SAFFRON_GATE_HEIGHT EQU 4 -ROUTE_8_SAFFRON_GATE_WIDTH EQU 5 -ROUTE_12_SUPER_ROD_HOUSE_HEIGHT EQU 4 -ROUTE_12_SUPER_ROD_HOUSE_WIDTH EQU 4 -ROUTE_28_HEIGHT EQU 9 -ROUTE_28_WIDTH EQU 20 -SILVER_CAVE_OUTSIDE_HEIGHT EQU 18 -SILVER_CAVE_OUTSIDE_WIDTH EQU 20 -SILVER_CAVE_POKECENTER_1F_HEIGHT EQU 4 -SILVER_CAVE_POKECENTER_1F_WIDTH EQU 5 -ROUTE_28_FAMOUS_SPEECH_HOUSE_HEIGHT EQU 4 -ROUTE_28_FAMOUS_SPEECH_HOUSE_WIDTH EQU 4 -POKECENTER_2F_HEIGHT EQU 4 -POKECENTER_2F_WIDTH EQU 8 -TRADE_CENTER_HEIGHT EQU 4 -TRADE_CENTER_WIDTH EQU 5 -COLOSSEUM_HEIGHT EQU 4 -COLOSSEUM_WIDTH EQU 5 -TIME_CAPSULE_HEIGHT EQU 4 -TIME_CAPSULE_WIDTH EQU 5 -MOBILE_TRADE_ROOM_MOBILE_HEIGHT EQU 4 -MOBILE_TRADE_ROOM_MOBILE_WIDTH EQU 5 -MOBILE_BATTLE_ROOM_HEIGHT EQU 4 -MOBILE_BATTLE_ROOM_WIDTH EQU 5 -ROUTE_7_HEIGHT EQU 9 -ROUTE_7_WIDTH EQU 10 -ROUTE_16_HEIGHT EQU 9 -ROUTE_16_WIDTH EQU 10 -ROUTE_17_HEIGHT EQU 45 -ROUTE_17_WIDTH EQU 10 -CELADON_CITY_HEIGHT EQU 18 -CELADON_CITY_WIDTH EQU 20 -CELADON_DEPT_STORE_1F_HEIGHT EQU 4 -CELADON_DEPT_STORE_1F_WIDTH EQU 8 -CELADON_DEPT_STORE_2F_HEIGHT EQU 4 -CELADON_DEPT_STORE_2F_WIDTH EQU 8 -CELADON_DEPT_STORE_3F_HEIGHT EQU 4 -CELADON_DEPT_STORE_3F_WIDTH EQU 8 -CELADON_DEPT_STORE_4F_HEIGHT EQU 4 -CELADON_DEPT_STORE_4F_WIDTH EQU 8 -CELADON_DEPT_STORE_5F_HEIGHT EQU 4 -CELADON_DEPT_STORE_5F_WIDTH EQU 8 -CELADON_DEPT_STORE_6F_HEIGHT EQU 4 -CELADON_DEPT_STORE_6F_WIDTH EQU 8 -CELADON_DEPT_STORE_ELEVATOR_HEIGHT EQU 2 -CELADON_DEPT_STORE_ELEVATOR_WIDTH EQU 2 -CELADON_MANSION_1F_HEIGHT EQU 5 -CELADON_MANSION_1F_WIDTH EQU 4 -CELADON_MANSION_2F_HEIGHT EQU 5 -CELADON_MANSION_2F_WIDTH EQU 4 -CELADON_MANSION_3F_HEIGHT EQU 5 -CELADON_MANSION_3F_WIDTH EQU 4 -CELADON_MANSION_ROOF_HEIGHT EQU 5 -CELADON_MANSION_ROOF_WIDTH EQU 4 -CELADON_MANSION_ROOF_HOUSE_HEIGHT EQU 4 -CELADON_MANSION_ROOF_HOUSE_WIDTH EQU 4 -CELADON_POKECENTER_1F_HEIGHT EQU 4 -CELADON_POKECENTER_1F_WIDTH EQU 5 -CELADON_POKECENTER_2F_BETA_HEIGHT EQU 4 -CELADON_POKECENTER_2F_BETA_WIDTH EQU 8 -CELADON_GAME_CORNER_HEIGHT EQU 7 -CELADON_GAME_CORNER_WIDTH EQU 10 -CELADON_GAME_CORNER_PRIZE_ROOM_HEIGHT EQU 3 -CELADON_GAME_CORNER_PRIZE_ROOM_WIDTH EQU 3 -CELADON_GYM_HEIGHT EQU 9 -CELADON_GYM_WIDTH EQU 5 -CELADON_CAFE_HEIGHT EQU 4 -CELADON_CAFE_WIDTH EQU 6 -ROUTE_16_FUCHSIA_SPEECH_HOUSE_HEIGHT EQU 4 -ROUTE_16_FUCHSIA_SPEECH_HOUSE_WIDTH EQU 4 -ROUTE_16_GATE_HEIGHT EQU 4 -ROUTE_16_GATE_WIDTH EQU 5 -ROUTE_7_SAFFRON_GATE_HEIGHT EQU 4 -ROUTE_7_SAFFRON_GATE_WIDTH EQU 5 -ROUTE_17_18_GATE_HEIGHT EQU 4 -ROUTE_17_18_GATE_WIDTH EQU 5 -ROUTE_40_HEIGHT EQU 18 -ROUTE_40_WIDTH EQU 10 -ROUTE_41_HEIGHT EQU 27 -ROUTE_41_WIDTH EQU 25 -CIANWOOD_CITY_HEIGHT EQU 27 -CIANWOOD_CITY_WIDTH EQU 15 -MANIAS_HOUSE_HEIGHT EQU 4 -MANIAS_HOUSE_WIDTH EQU 4 -CIANWOOD_GYM_HEIGHT EQU 9 -CIANWOOD_GYM_WIDTH EQU 5 -CIANWOOD_POKECENTER_1F_HEIGHT EQU 4 -CIANWOOD_POKECENTER_1F_WIDTH EQU 5 -CIANWOOD_PHARMACY_HEIGHT EQU 4 -CIANWOOD_PHARMACY_WIDTH EQU 4 -CIANWOOD_CITY_PHOTO_STUDIO_HEIGHT EQU 4 -CIANWOOD_CITY_PHOTO_STUDIO_WIDTH EQU 4 -CIANWOOD_LUGIA_SPEECH_HOUSE_HEIGHT EQU 4 -CIANWOOD_LUGIA_SPEECH_HOUSE_WIDTH EQU 4 -POKE_SEERS_HOUSE_HEIGHT EQU 4 -POKE_SEERS_HOUSE_WIDTH EQU 4 -BATTLE_TOWER_1F_HEIGHT EQU 5 -BATTLE_TOWER_1F_WIDTH EQU 8 -BATTLE_TOWER_BATTLE_ROOM_HEIGHT EQU 4 -BATTLE_TOWER_BATTLE_ROOM_WIDTH EQU 4 -BATTLE_TOWER_ELEVATOR_HEIGHT EQU 2 -BATTLE_TOWER_ELEVATOR_WIDTH EQU 2 -BATTLE_TOWER_HALLWAY_HEIGHT EQU 2 -BATTLE_TOWER_HALLWAY_WIDTH EQU 11 -ROUTE_40_BATTLE_TOWER_GATE_HEIGHT EQU 4 -ROUTE_40_BATTLE_TOWER_GATE_WIDTH EQU 5 -BATTLE_TOWER_OUTSIDE_HEIGHT EQU 14 -BATTLE_TOWER_OUTSIDE_WIDTH EQU 10 -ROUTE_2_HEIGHT EQU 27 -ROUTE_2_WIDTH EQU 10 -ROUTE_22_HEIGHT EQU 9 -ROUTE_22_WIDTH EQU 20 -VIRIDIAN_CITY_HEIGHT EQU 18 -VIRIDIAN_CITY_WIDTH EQU 20 -VIRIDIAN_GYM_HEIGHT EQU 9 -VIRIDIAN_GYM_WIDTH EQU 5 -VIRIDIAN_NICKNAME_SPEECH_HOUSE_HEIGHT EQU 4 -VIRIDIAN_NICKNAME_SPEECH_HOUSE_WIDTH EQU 4 -TRAINER_HOUSE_1F_HEIGHT EQU 7 -TRAINER_HOUSE_1F_WIDTH EQU 5 -TRAINER_HOUSE_B1F_HEIGHT EQU 8 -TRAINER_HOUSE_B1F_WIDTH EQU 5 -VIRIDIAN_MART_HEIGHT EQU 4 -VIRIDIAN_MART_WIDTH EQU 6 -VIRIDIAN_POKECENTER_1F_HEIGHT EQU 4 -VIRIDIAN_POKECENTER_1F_WIDTH EQU 5 -VIRIDIAN_POKECENTER_2F_BETA_HEIGHT EQU 4 -VIRIDIAN_POKECENTER_2F_BETA_WIDTH EQU 8 -ROUTE_2_NUGGET_SPEECH_HOUSE_HEIGHT EQU 4 -ROUTE_2_NUGGET_SPEECH_HOUSE_WIDTH EQU 4 -ROUTE_2_GATE_HEIGHT EQU 4 -ROUTE_2_GATE_WIDTH EQU 5 -VICTORY_ROAD_GATE_HEIGHT EQU 9 -VICTORY_ROAD_GATE_WIDTH EQU 10 -ROUTE_26_HEIGHT EQU 54 -ROUTE_26_WIDTH EQU 10 -ROUTE_27_HEIGHT EQU 9 -ROUTE_27_WIDTH EQU 40 -ROUTE_29_HEIGHT EQU 9 -ROUTE_29_WIDTH EQU 30 -NEW_BARK_TOWN_HEIGHT EQU 9 -NEW_BARK_TOWN_WIDTH EQU 10 -ELMS_LAB_HEIGHT EQU 6 -ELMS_LAB_WIDTH EQU 5 -KRISS_HOUSE_1F_HEIGHT EQU 4 -KRISS_HOUSE_1F_WIDTH EQU 5 -KRISS_HOUSE_2F_HEIGHT EQU 3 -KRISS_HOUSE_2F_WIDTH EQU 4 -KRISS_NEIGHBORS_HOUSE_HEIGHT EQU 4 -KRISS_NEIGHBORS_HOUSE_WIDTH EQU 4 -ELMS_HOUSE_HEIGHT EQU 4 -ELMS_HOUSE_WIDTH EQU 4 -ROUTE_26_HEAL_SPEECH_HOUSE_HEIGHT EQU 4 -ROUTE_26_HEAL_SPEECH_HOUSE_WIDTH EQU 4 -ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE_HEIGHT EQU 4 -ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE_WIDTH EQU 4 -ROUTE_27_SANDSTORM_HOUSE_HEIGHT EQU 4 -ROUTE_27_SANDSTORM_HOUSE_WIDTH EQU 4 -ROUTE_29_46_GATE_HEIGHT EQU 4 -ROUTE_29_46_GATE_WIDTH EQU 5 -ROUTE_5_HEIGHT EQU 9 -ROUTE_5_WIDTH EQU 10 -SAFFRON_CITY_HEIGHT EQU 18 -SAFFRON_CITY_WIDTH EQU 20 -FIGHTING_DOJO_HEIGHT EQU 6 -FIGHTING_DOJO_WIDTH EQU 5 -SAFFRON_GYM_HEIGHT EQU 9 -SAFFRON_GYM_WIDTH EQU 10 -SAFFRON_MART_HEIGHT EQU 4 -SAFFRON_MART_WIDTH EQU 6 -SAFFRON_POKECENTER_1F_HEIGHT EQU 4 -SAFFRON_POKECENTER_1F_WIDTH EQU 5 -SAFFRON_POKECENTER_2F_BETA_HEIGHT EQU 4 -SAFFRON_POKECENTER_2F_BETA_WIDTH EQU 8 -MR_PSYCHICS_HOUSE_HEIGHT EQU 4 -MR_PSYCHICS_HOUSE_WIDTH EQU 4 -SAFFRON_TRAIN_STATION_HEIGHT EQU 9 -SAFFRON_TRAIN_STATION_WIDTH EQU 10 -SILPH_CO_1F_HEIGHT EQU 4 -SILPH_CO_1F_WIDTH EQU 8 -COPYCATS_HOUSE_1F_HEIGHT EQU 4 -COPYCATS_HOUSE_1F_WIDTH EQU 4 -COPYCATS_HOUSE_2F_HEIGHT EQU 3 -COPYCATS_HOUSE_2F_WIDTH EQU 5 -ROUTE_5_UNDERGROUND_ENTRANCE_HEIGHT EQU 4 -ROUTE_5_UNDERGROUND_ENTRANCE_WIDTH EQU 4 -ROUTE_5_SAFFRON_CITY_GATE_HEIGHT EQU 4 -ROUTE_5_SAFFRON_CITY_GATE_WIDTH EQU 5 -ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE_HEIGHT EQU 4 -ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE_WIDTH EQU 4 -ROUTE_30_HEIGHT EQU 27 -ROUTE_30_WIDTH EQU 10 -ROUTE_31_HEIGHT EQU 9 -ROUTE_31_WIDTH EQU 20 -CHERRYGROVE_CITY_HEIGHT EQU 9 -CHERRYGROVE_CITY_WIDTH EQU 20 -CHERRYGROVE_MART_HEIGHT EQU 4 -CHERRYGROVE_MART_WIDTH EQU 6 -CHERRYGROVE_POKECENTER_1F_HEIGHT EQU 4 -CHERRYGROVE_POKECENTER_1F_WIDTH EQU 5 -CHERRYGROVE_GYM_SPEECH_HOUSE_HEIGHT EQU 4 -CHERRYGROVE_GYM_SPEECH_HOUSE_WIDTH EQU 4 -GUIDE_GENTS_HOUSE_HEIGHT EQU 4 -GUIDE_GENTS_HOUSE_WIDTH EQU 4 -CHERRYGROVE_EVOLUTION_SPEECH_HOUSE_HEIGHT EQU 4 -CHERRYGROVE_EVOLUTION_SPEECH_HOUSE_WIDTH EQU 4 -ROUTE_30_BERRY_SPEECH_HOUSE_HEIGHT EQU 4 -ROUTE_30_BERRY_SPEECH_HOUSE_WIDTH EQU 4 -MR_POKEMONS_HOUSE_HEIGHT EQU 4 -MR_POKEMONS_HOUSE_WIDTH EQU 4 -ROUTE_31_VIOLET_GATE_HEIGHT EQU 4 -ROUTE_31_VIOLET_GATE_WIDTH EQU 5 + newgroup + mapgroup SPROUT_TOWER_1F, 8, 10 + mapgroup SPROUT_TOWER_2F, 8, 10 + mapgroup SPROUT_TOWER_3F, 8, 10 + mapgroup TIN_TOWER_1F, 9, 10 + mapgroup TIN_TOWER_2F, 9, 10 + mapgroup TIN_TOWER_3F, 9, 10 + mapgroup TIN_TOWER_4F, 9, 10 + mapgroup TIN_TOWER_5F, 9, 10 + mapgroup TIN_TOWER_6F, 9, 10 + mapgroup TIN_TOWER_7F, 9, 10 + mapgroup TIN_TOWER_8F, 9, 10 + mapgroup TIN_TOWER_9F, 9, 10 + mapgroup BURNED_TOWER_1F, 9, 10 + mapgroup BURNED_TOWER_B1F, 9, 10 + mapgroup NATIONAL_PARK, 27, 20 + mapgroup NATIONAL_PARK_BUG_CONTEST, 27, 20 + mapgroup RADIO_TOWER_1F, 4, 9 + mapgroup RADIO_TOWER_2F, 4, 9 + mapgroup RADIO_TOWER_3F, 4, 9 + mapgroup RADIO_TOWER_4F, 4, 9 + mapgroup RADIO_TOWER_5F, 4, 9 + mapgroup RUINS_OF_ALPH_OUTSIDE, 18, 10 + mapgroup RUINS_OF_ALPH_HO_OH_CHAMBER, 5, 4 + mapgroup RUINS_OF_ALPH_KABUTO_CHAMBER, 5, 4 + mapgroup RUINS_OF_ALPH_OMANYTE_CHAMBER, 5, 4 + mapgroup RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5, 4 + mapgroup RUINS_OF_ALPH_INNER_CHAMBER, 14, 10 + mapgroup RUINS_OF_ALPH_RESEARCH_CENTER, 4, 4 + mapgroup RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 5, 4 + mapgroup RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 5, 4 + mapgroup RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 5, 4 + mapgroup RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 5, 4 + mapgroup RUINS_OF_ALPH_HO_OH_WORD_ROOM, 12, 10 + mapgroup RUINS_OF_ALPH_KABUTO_WORD_ROOM, 7, 10 + mapgroup RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 8, 10 + mapgroup RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 7, 10 + mapgroup UNION_CAVE_1F, 18, 10 + mapgroup UNION_CAVE_B1F, 18, 10 + mapgroup UNION_CAVE_B2F, 18, 10 + mapgroup SLOWPOKE_WELL_B1F, 9, 10 + mapgroup SLOWPOKE_WELL_B2F, 9, 10 + mapgroup OLIVINE_LIGHTHOUSE_1F, 9, 10 + mapgroup OLIVINE_LIGHTHOUSE_2F, 9, 10 + mapgroup OLIVINE_LIGHTHOUSE_3F, 9, 10 + mapgroup OLIVINE_LIGHTHOUSE_4F, 9, 10 + mapgroup OLIVINE_LIGHTHOUSE_5F, 9, 10 + mapgroup OLIVINE_LIGHTHOUSE_6F, 9, 10 + mapgroup MAHOGANY_MART_1F, 4, 4 + mapgroup TEAM_ROCKET_BASE_B1F, 9, 15 + mapgroup TEAM_ROCKET_BASE_B2F, 9, 15 + mapgroup TEAM_ROCKET_BASE_B3F, 9, 15 + mapgroup ILEX_FOREST, 27, 15 + mapgroup WAREHOUSE_ENTRANCE, 18, 15 + mapgroup UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, 18, 15 + mapgroup GOLDENROD_DEPT_STORE_B1F, 9, 10 + mapgroup UNDERGROUND_WAREHOUSE, 9, 10 + mapgroup MOUNT_MORTAR_1F_OUTSIDE, 18, 20 + mapgroup MOUNT_MORTAR_1F_INSIDE, 27, 20 + mapgroup MOUNT_MORTAR_2F_INSIDE, 18, 20 + mapgroup MOUNT_MORTAR_B1F, 18, 20 + mapgroup ICE_PATH_1F, 18, 20 + mapgroup ICE_PATH_B1F, 18, 10 + mapgroup ICE_PATH_B2F_MAHOGANY_SIDE, 9, 10 + mapgroup ICE_PATH_B2F_BLACKTHORN_SIDE, 9, 5 + mapgroup ICE_PATH_B3F, 9, 10 + mapgroup WHIRL_ISLAND_NW, 9, 5 + mapgroup WHIRL_ISLAND_NE, 9, 10 + mapgroup WHIRL_ISLAND_SW, 9, 10 + mapgroup WHIRL_ISLAND_CAVE, 9, 5 + mapgroup WHIRL_ISLAND_SE, 9, 5 + mapgroup WHIRL_ISLAND_B1F, 18, 20 + mapgroup WHIRL_ISLAND_B2F, 18, 10 + mapgroup WHIRL_ISLAND_LUGIA_CHAMBER, 9, 10 + mapgroup SILVER_CAVE_ROOM_1, 18, 10 + mapgroup SILVER_CAVE_ROOM_2, 18, 15 + mapgroup SILVER_CAVE_ROOM_3, 18, 10 + mapgroup SILVER_CAVE_ITEM_ROOMS, 9, 10 + mapgroup DARK_CAVE_VIOLET_ENTRANCE, 18, 20 + mapgroup DARK_CAVE_BLACKTHORN_ENTRANCE, 18, 15 + mapgroup DRAGONS_DEN_1F, 9, 5 + mapgroup DRAGONS_DEN_B1F, 18, 20 + mapgroup DRAGON_SHRINE, 5, 5 + mapgroup TOHJO_FALLS, 9, 15 + mapgroup DIGLETTS_CAVE, 18, 10 + mapgroup MOUNT_MOON, 9, 15 + mapgroup UNDERGROUND, 14, 3 + mapgroup ROCK_TUNNEL_1F, 18, 15 + mapgroup ROCK_TUNNEL_B1F, 18, 15 + mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA, 4, 5 + mapgroup SAFARI_ZONE_BETA, 18, 10 + mapgroup VICTORY_ROAD, 36, 10 + + newgroup + mapgroup ECRUTEAK_HOUSE, 9, 10 + mapgroup WISE_TRIOS_ROOM, 4, 4 + mapgroup ECRUTEAK_POKECENTER_1F, 4, 5 + mapgroup ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4 + mapgroup DANCE_THEATRE, 7, 6 + mapgroup ECRUTEAK_MART, 4, 6 + mapgroup ECRUTEAK_GYM, 9, 5 + mapgroup ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 + mapgroup ECRUTEAK_CITY, 18, 20 + + newgroup + mapgroup BLACKTHORN_GYM_1F, 9, 5 + mapgroup BLACKTHORN_GYM_2F, 9, 5 + mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4 + mapgroup BLACKTHORN_DODRIO_TRADE_HOUSE, 4, 4 + mapgroup BLACKTHORN_MART, 4, 6 + mapgroup BLACKTHORN_POKECENTER_1F, 4, 5 + mapgroup MOVE_DELETERS_HOUSE, 4, 4 + mapgroup ROUTE_45, 45, 10 + mapgroup ROUTE_46, 18, 10 + mapgroup BLACKTHORN_CITY, 18, 20 + + newgroup + mapgroup CINNABAR_POKECENTER_1F, 4, 5 + mapgroup CINNABAR_POKECENTER_2F_BETA, 4, 8 + mapgroup ROUTE_19___FUCHSIA_GATE, 4, 5 + mapgroup SEAFOAM_GYM, 4, 5 + mapgroup ROUTE_19, 18, 10 + mapgroup ROUTE_20, 9, 30 + mapgroup ROUTE_21, 18, 10 + mapgroup CINNABAR_ISLAND, 9, 10 + + newgroup + mapgroup CERULEAN_GYM_BADGE_SPEECH_HOUSE, 4, 4 + mapgroup CERULEAN_POLICE_STATION, 4, 4 + mapgroup CERULEAN_TRADE_SPEECH_HOUSE, 4, 4 + mapgroup CERULEAN_POKECENTER_1F, 4, 5 + mapgroup CERULEAN_POKECENTER_2F_BETA, 4, 8 + mapgroup CERULEAN_GYM, 8, 5 + mapgroup CERULEAN_MART, 4, 6 + mapgroup ROUTE_10_POKECENTER_1F, 4, 5 + mapgroup ROUTE_10_POKECENTER_2F_BETA, 4, 8 + mapgroup POWER_PLANT, 9, 10 + mapgroup BILLS_HOUSE, 4, 4 + mapgroup ROUTE_4, 9, 20 + mapgroup ROUTE_9, 9, 30 + mapgroup ROUTE_10_NORTH, 9, 10 + mapgroup ROUTE_24, 9, 10 + mapgroup ROUTE_25, 9, 30 + mapgroup CERULEAN_CITY, 18, 20 + + newgroup + mapgroup AZALEA_POKECENTER_1F, 4, 5 + mapgroup CHARCOAL_KILN, 4, 4 + mapgroup AZALEA_MART, 4, 6 + mapgroup KURTS_HOUSE, 4, 8 + mapgroup AZALEA_GYM, 8, 5 + mapgroup ROUTE_33, 9, 10 + mapgroup AZALEA_TOWN, 9, 20 + + newgroup + mapgroup LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 4, 4 + mapgroup LAKE_OF_RAGE_MAGIKARP_HOUSE, 4, 4 + mapgroup ROUTE_43_MAHOGANY_GATE, 4, 5 + mapgroup ROUTE_43_GATE, 4, 5 + mapgroup ROUTE_43, 27, 10 + mapgroup LAKE_OF_RAGE, 18, 20 + + newgroup + mapgroup ROUTE_32, 45, 10 + mapgroup ROUTE_35, 18, 10 + mapgroup ROUTE_36, 9, 30 + mapgroup ROUTE_37, 9, 10 + mapgroup VIOLET_CITY, 18, 20 + mapgroup VIOLET_MART, 4, 6 + mapgroup VIOLET_GYM, 8, 5 + mapgroup EARLS_POKEMON_ACADEMY, 8, 4 + mapgroup VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4 + mapgroup VIOLET_POKECENTER_1F, 4, 5 + mapgroup VIOLET_ONIX_TRADE_HOUSE, 4, 4 + mapgroup ROUTE_32_RUINS_OF_ALPH_GATE, 4, 5 + mapgroup ROUTE_32_POKECENTER_1F, 4, 5 + mapgroup ROUTE_35_GOLDENROD_GATE, 4, 5 + mapgroup ROUTE_35_NATIONAL_PARK_GATE, 4, 4 + mapgroup ROUTE_36_RUINS_OF_ALPH_GATE, 4, 5 + mapgroup ROUTE_36_NATIONAL_PARK_GATE, 4, 5 + + newgroup + mapgroup ROUTE_34, 27, 10 + mapgroup GOLDENROD_CITY, 18, 20 + mapgroup GOLDENROD_GYM, 9, 10 + mapgroup GOLDENROD_BIKE_SHOP, 4, 4 + mapgroup GOLDENROD_HAPPINESS_RATER, 4, 4 + mapgroup GOLDENROD_BILLS_HOUSE, 4, 4 + mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10 + mapgroup GOLDENROD_FLOWER_SHOP, 4, 4 + mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4 + mapgroup GOLDENROD_NAME_RATERS_HOUSE, 4, 4 + mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8 + mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8 + mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8 + mapgroup GOLDENROD_DEPT_STORE_4F, 4, 8 + mapgroup GOLDENROD_DEPT_STORE_5F, 4, 8 + mapgroup GOLDENROD_DEPT_STORE_6F, 4, 8 + mapgroup GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2 + mapgroup GOLDENROD_DEPT_STORE_ROOF, 4, 8 + mapgroup GOLDENROD_GAME_CORNER, 7, 10 + mapgroup GOLDENROD_POKECENTER_1F, 4, 5 + mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 + mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 + mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 + mapgroup DAY_CARE, 4, 5 + + newgroup + mapgroup ROUTE_6, 9, 10 + mapgroup ROUTE_11, 9, 20 + mapgroup VERMILION_CITY, 18, 20 + mapgroup VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4 + mapgroup VERMILION_POKECENTER_1F, 4, 5 + mapgroup VERMILION_POKECENTER_2F_BETA, 4, 8 + mapgroup POKEMON_FAN_CLUB, 4, 5 + mapgroup VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4 + mapgroup VERMILION_MART, 4, 6 + mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4 + mapgroup VERMILION_GYM, 9, 5 + mapgroup ROUTE_6_SAFFRON_GATE, 4, 5 + mapgroup ROUTE_6_UNDERGROUND_ENTRANCE, 4, 4 + + newgroup + mapgroup ROUTE_1, 18, 10 + mapgroup PALLET_TOWN, 9, 10 + mapgroup REDS_HOUSE_1F, 4, 4 + mapgroup REDS_HOUSE_2F, 4, 4 + mapgroup BLUES_HOUSE, 4, 4 + mapgroup OAKS_LAB, 6, 5 + + newgroup + mapgroup ROUTE_3, 9, 30 + mapgroup PEWTER_CITY, 18, 20 + mapgroup PEWTER_NIDORAN_SPEECH_HOUSE, 4, 4 + mapgroup PEWTER_GYM, 7, 5 + mapgroup PEWTER_MART, 4, 6 + mapgroup PEWTER_POKECENTER_1F, 4, 5 + mapgroup PEWTER_POKECENTER_2F_BETA, 4, 8 + mapgroup PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 + + newgroup + mapgroup OLIVINE_PORT, 18, 10 + mapgroup VERMILION_PORT, 18, 10 + mapgroup FAST_SHIP_1F, 9, 16 + mapgroup FAST_SHIP_CABINS_NNW_NNE_NE, 16, 4 + mapgroup FAST_SHIP_CABINS_SW_SSW_NW, 16, 4 + mapgroup FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 17, 5 + mapgroup FAST_SHIP_B1F, 8, 16 + mapgroup OLIVINE_PORT_PASSAGE, 9, 10 + mapgroup VERMILION_PORT_PASSAGE, 9, 10 + mapgroup MOUNT_MOON_SQUARE, 9, 15 + mapgroup MOUNT_MOON_GIFT_SHOP, 4, 4 + mapgroup TIN_TOWER_ROOF, 9, 10 + + newgroup + mapgroup ROUTE_23, 9, 10 + mapgroup INDIGO_PLATEAU_POKECENTER_1F, 7, 9 + mapgroup WILLS_ROOM, 9, 5 + mapgroup KOGAS_ROOM, 9, 5 + mapgroup BRUNOS_ROOM, 9, 5 + mapgroup KARENS_ROOM, 9, 5 + mapgroup LANCES_ROOM, 12, 5 + mapgroup HALL_OF_FAME, 7, 5 + + newgroup + mapgroup ROUTE_13, 9, 30 + mapgroup ROUTE_14, 18, 10 + mapgroup ROUTE_15, 9, 20 + mapgroup ROUTE_18, 9, 10 + mapgroup FUCHSIA_CITY, 18, 20 + mapgroup FUCHSIA_MART, 4, 6 + mapgroup SAFARI_ZONE_MAIN_OFFICE, 4, 4 + mapgroup FUCHSIA_GYM, 9, 5 + mapgroup FUCHSIA_BILL_SPEECH_HOUSE, 4, 4 + mapgroup FUCHSIA_POKECENTER_1F, 4, 5 + mapgroup FUCHSIA_POKECENTER_2F_BETA, 4, 8 + mapgroup SAFARI_ZONE_WARDENS_HOME, 4, 5 + mapgroup ROUTE_15_FUCHSIA_GATE, 4, 5 + + newgroup + mapgroup ROUTE_8, 9, 20 + mapgroup ROUTE_12, 27, 10 + mapgroup ROUTE_10_SOUTH, 9, 10 + mapgroup LAVENDER_TOWN, 9, 10 + mapgroup LAVENDER_POKECENTER_1F, 4, 5 + mapgroup LAVENDER_POKECENTER_2F_BETA, 4, 8 + mapgroup MR_FUJIS_HOUSE, 4, 5 + mapgroup LAVENDER_TOWN_SPEECH_HOUSE, 4, 4 + mapgroup LAVENDER_NAME_RATER, 4, 4 + mapgroup LAVENDER_MART, 4, 6 + mapgroup SOUL_HOUSE, 4, 5 + mapgroup LAV_RADIO_TOWER_1F, 4, 10 + mapgroup ROUTE_8_SAFFRON_GATE, 4, 5 + mapgroup ROUTE_12_SUPER_ROD_HOUSE, 4, 4 + + newgroup + mapgroup ROUTE_28, 9, 20 + mapgroup SILVER_CAVE_OUTSIDE, 18, 20 + mapgroup SILVER_CAVE_POKECENTER_1F, 4, 5 + mapgroup ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4 + + newgroup + mapgroup POKECENTER_2F, 4, 8 + mapgroup TRADE_CENTER, 4, 5 + mapgroup COLOSSEUM, 4, 5 + mapgroup TIME_CAPSULE, 4, 5 + mapgroup MOBILE_TRADE_ROOM_MOBILE, 4, 5 + mapgroup MOBILE_BATTLE_ROOM, 4, 5 + + newgroup + mapgroup ROUTE_7, 9, 10 + mapgroup ROUTE_16, 9, 10 + mapgroup ROUTE_17, 45, 10 + mapgroup CELADON_CITY, 18, 20 + mapgroup CELADON_DEPT_STORE_1F, 4, 8 + mapgroup CELADON_DEPT_STORE_2F, 4, 8 + mapgroup CELADON_DEPT_STORE_3F, 4, 8 + mapgroup CELADON_DEPT_STORE_4F, 4, 8 + mapgroup CELADON_DEPT_STORE_5F, 4, 8 + mapgroup CELADON_DEPT_STORE_6F, 4, 8 + mapgroup CELADON_DEPT_STORE_ELEVATOR, 2, 2 + mapgroup CELADON_MANSION_1F, 5, 4 + mapgroup CELADON_MANSION_2F, 5, 4 + mapgroup CELADON_MANSION_3F, 5, 4 + mapgroup CELADON_MANSION_ROOF, 5, 4 + mapgroup CELADON_MANSION_ROOF_HOUSE, 4, 4 + mapgroup CELADON_POKECENTER_1F, 4, 5 + mapgroup CELADON_POKECENTER_2F_BETA, 4, 8 + mapgroup CELADON_GAME_CORNER, 7, 10 + mapgroup CELADON_GAME_CORNER_PRIZE_ROOM, 3, 3 + mapgroup CELADON_GYM, 9, 5 + mapgroup CELADON_CAFE, 4, 6 + mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4 + mapgroup ROUTE_16_GATE, 4, 5 + mapgroup ROUTE_7_SAFFRON_GATE, 4, 5 + mapgroup ROUTE_17_18_GATE, 4, 5 + + newgroup + mapgroup ROUTE_40, 18, 10 + mapgroup ROUTE_41, 27, 25 + mapgroup CIANWOOD_CITY, 27, 15 + mapgroup MANIAS_HOUSE, 4, 4 + mapgroup CIANWOOD_GYM, 9, 5 + mapgroup CIANWOOD_POKECENTER_1F, 4, 5 + mapgroup CIANWOOD_PHARMACY, 4, 4 + mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4 + mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4 + mapgroup POKE_SEERS_HOUSE, 4, 4 + mapgroup BATTLE_TOWER_1F, 5, 8 + mapgroup BATTLE_TOWER_BATTLE_ROOM, 4, 4 + mapgroup BATTLE_TOWER_ELEVATOR, 2, 2 + mapgroup BATTLE_TOWER_HALLWAY, 2, 11 + mapgroup ROUTE_40_BATTLE_TOWER_GATE, 4, 5 + mapgroup BATTLE_TOWER_OUTSIDE, 14, 10 + + newgroup + mapgroup ROUTE_2, 27, 10 + mapgroup ROUTE_22, 9, 20 + mapgroup VIRIDIAN_CITY, 18, 20 + mapgroup VIRIDIAN_GYM, 9, 5 + mapgroup VIRIDIAN_NICKNAME_SPEECH_HOUSE, 4, 4 + mapgroup TRAINER_HOUSE_1F, 7, 5 + mapgroup TRAINER_HOUSE_B1F, 8, 5 + mapgroup VIRIDIAN_MART, 4, 6 + mapgroup VIRIDIAN_POKECENTER_1F, 4, 5 + mapgroup VIRIDIAN_POKECENTER_2F_BETA, 4, 8 + mapgroup ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4 + mapgroup ROUTE_2_GATE, 4, 5 + mapgroup VICTORY_ROAD_GATE, 9, 10 + + newgroup + mapgroup ROUTE_26, 54, 10 + mapgroup ROUTE_27, 9, 40 + mapgroup ROUTE_29, 9, 30 + mapgroup NEW_BARK_TOWN, 9, 10 + mapgroup ELMS_LAB, 6, 5 + mapgroup KRISS_HOUSE_1F, 4, 5 + mapgroup KRISS_HOUSE_2F, 3, 4 + mapgroup KRISS_NEIGHBORS_HOUSE, 4, 4 + mapgroup ELMS_HOUSE, 4, 4 + mapgroup ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4 + mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4 + mapgroup ROUTE_27_SANDSTORM_HOUSE, 4, 4 + mapgroup ROUTE_29_46_GATE, 4, 5 + + newgroup + mapgroup ROUTE_5, 9, 10 + mapgroup SAFFRON_CITY, 18, 20 + mapgroup FIGHTING_DOJO, 6, 5 + mapgroup SAFFRON_GYM, 9, 10 + mapgroup SAFFRON_MART, 4, 6 + mapgroup SAFFRON_POKECENTER_1F, 4, 5 + mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8 + mapgroup MR_PSYCHICS_HOUSE, 4, 4 + mapgroup SAFFRON_TRAIN_STATION, 9, 10 + mapgroup SILPH_CO_1F, 4, 8 + mapgroup COPYCATS_HOUSE_1F, 4, 4 + mapgroup COPYCATS_HOUSE_2F, 3, 5 + mapgroup ROUTE_5_UNDERGROUND_ENTRANCE, 4, 4 + mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5 + mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4 + + newgroup + mapgroup ROUTE_30, 27, 10 + mapgroup ROUTE_31, 9, 20 + mapgroup CHERRYGROVE_CITY, 9, 20 + mapgroup CHERRYGROVE_MART, 4, 6 + mapgroup CHERRYGROVE_POKECENTER_1F, 4, 5 + mapgroup CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4 + mapgroup GUIDE_GENTS_HOUSE, 4, 4 + mapgroup CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4 + mapgroup ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4 + mapgroup MR_POKEMONS_HOUSE, 4, 4 + mapgroup ROUTE_31_VIOLET_GATE, 4, 5 ; elevator floors -_B4F EQU $0 -_B3F EQU $1 -_B2F EQU $2 -_B1F EQU $3 -_1F EQU $4 -_2F EQU $5 -_3F EQU $6 -_4F EQU $7 -_5F EQU $8 -_6F EQU $9 -_7F EQU $a -_8F EQU $b -_9F EQU $c -_10F EQU $d -_11F EQU $e -_ROOF EQU $f + + const_def + const _B4F + const _B3F + const _B2F + const _B1F + const _1F + const _2F + const _3F + const _4F + const _5F + const _6F + const _7F + const _8F + const _9F + const _10F + const _11F + const _ROOF ; connection directions -EAST EQU 1 -WEST EQU 2 -SOUTH EQU 4 -NORTH EQU 8 -; sprites -SPRITE_CHRIS EQU $01 -SPRITE_CHRIS_BIKE EQU $02 -SPRITE_GAMEBOY_KID EQU $03 -SPRITE_SILVER EQU $04 -SPRITE_OAK EQU $05 -SPRITE_RED EQU $06 -SPRITE_BLUE EQU $07 -SPRITE_BILL EQU $08 -SPRITE_ELDER EQU $09 -SPRITE_JANINE EQU $0a -SPRITE_KURT EQU $0b -SPRITE_MOM EQU $0c -SPRITE_BLAINE EQU $0d -SPRITE_REDS_MOM EQU $0e -SPRITE_DAISY EQU $0f -SPRITE_ELM EQU $10 -SPRITE_WILL EQU $11 -SPRITE_FALKNER EQU $12 -SPRITE_WHITNEY EQU $13 -SPRITE_BUGSY EQU $14 -SPRITE_MORTY EQU $15 -SPRITE_CHUCK EQU $16 -SPRITE_JASMINE EQU $17 -SPRITE_PRYCE EQU $18 -SPRITE_CLAIR EQU $19 -SPRITE_BROCK EQU $1a -SPRITE_KAREN EQU $1b -SPRITE_BRUNO EQU $1c -SPRITE_MISTY EQU $1d -SPRITE_LANCE EQU $1e -SPRITE_SURGE EQU $1f -SPRITE_ERIKA EQU $20 -SPRITE_KOGA EQU $21 -SPRITE_SABRINA EQU $22 -SPRITE_COOLTRAINER_M EQU $23 -SPRITE_COOLTRAINER_F EQU $24 -SPRITE_BUG_CATCHER EQU $25 -SPRITE_TWIN EQU $26 -SPRITE_YOUNGSTER EQU $27 -SPRITE_LASS EQU $28 -SPRITE_TEACHER EQU $29 -SPRITE_BUENA EQU $2a -SPRITE_SUPER_NERD EQU $2b -SPRITE_ROCKER EQU $2c -SPRITE_POKEFAN_M EQU $2d -SPRITE_POKEFAN_F EQU $2e -SPRITE_GRAMPS EQU $2f -SPRITE_GRANNY EQU $30 -SPRITE_SWIMMER_GUY EQU $31 -SPRITE_SWIMMER_GIRL EQU $32 -SPRITE_BIG_SNORLAX EQU $33 -SPRITE_SURFING_PIKACHU EQU $34 -SPRITE_ROCKET EQU $35 -SPRITE_ROCKET_GIRL EQU $36 -SPRITE_NURSE EQU $37 -SPRITE_LINK_RECEPTIONIST EQU $38 -SPRITE_CLERK EQU $39 -SPRITE_FISHER EQU $3a -SPRITE_FISHING_GURU EQU $3b -SPRITE_SCIENTIST EQU $3c -SPRITE_KIMONO_GIRL EQU $3d -SPRITE_SAGE EQU $3e -SPRITE_UNUSED_GUY EQU $3f -SPRITE_GENTLEMAN EQU $40 -SPRITE_BLACK_BELT EQU $41 -SPRITE_RECEPTIONIST EQU $42 -SPRITE_OFFICER EQU $43 -SPRITE_CAL EQU $44 -SPRITE_SLOWPOKE EQU $45 -SPRITE_CAPTAIN EQU $46 -SPRITE_BIG_LAPRAS EQU $47 -SPRITE_GYM_GUY EQU $48 -SPRITE_SAILOR EQU $49 -SPRITE_BIKER EQU $4a -SPRITE_PHARMACIST EQU $4b -SPRITE_MONSTER EQU $4c -SPRITE_FAIRY EQU $4d -SPRITE_BIRD EQU $4e -SPRITE_DRAGON EQU $4f -SPRITE_BIG_ONIX EQU $50 -SPRITE_N64 EQU $51 -SPRITE_SUDOWOODO EQU $52 -SPRITE_SURF EQU $53 -SPRITE_POKE_BALL EQU $54 -SPRITE_POKEDEX EQU $55 -SPRITE_PAPER EQU $56 -SPRITE_VIRTUAL_BOY EQU $57 -SPRITE_OLD_LINK_RECEPTIONIST EQU $58 -SPRITE_ROCK EQU $59 -SPRITE_BOULDER EQU $5a -SPRITE_SNES EQU $5b -SPRITE_FAMICOM EQU $5c -SPRITE_FRUIT_TREE EQU $5d -SPRITE_GOLD_TROPHY EQU $5e -SPRITE_SILVER_TROPHY EQU $5f -SPRITE_KRIS EQU $60 -SPRITE_KRIS_BIKE EQU $61 -SPRITE_KURT_OUTSIDE EQU $62 -SPRITE_SUICUNE EQU $63 -SPRITE_ENTEI EQU $64 -SPRITE_RAIKOU EQU $65 -SPRITE_STANDING_YOUNGSTER EQU $66 + const_def + shift_const EAST + shift_const WEST + shift_const SOUTH + shift_const NORTH -SPRITE_POKEMON EQU $80 -SPRITE_UNOWN EQU $80 -SPRITE_GEODUDE EQU $81 -SPRITE_GROWLITHE EQU $82 -SPRITE_WEEDLE EQU $83 -SPRITE_SHELLDER EQU $84 -SPRITE_ODDISH EQU $85 -SPRITE_GENGAR EQU $86 -SPRITE_ZUBAT EQU $87 -SPRITE_MAGIKARP EQU $88 -SPRITE_SQUIRTLE EQU $89 -SPRITE_TOGEPI EQU $8a -SPRITE_BUTTERFREE EQU $8b -SPRITE_DIGLETT EQU $8c -SPRITE_POLIWAG EQU $8d -SPRITE_PIKACHU EQU $8e -SPRITE_CLEFAIRY EQU $8f -SPRITE_CHARMANDER EQU $90 -SPRITE_JYNX EQU $91 -SPRITE_STARMIE EQU $92 -SPRITE_BULBASAUR EQU $93 -SPRITE_JIGGLYPUFF EQU $94 -SPRITE_GRIMER EQU $95 -SPRITE_EKANS EQU $96 -SPRITE_PARAS EQU $97 -SPRITE_TENTACOOL EQU $98 -SPRITE_TAUROS EQU $99 -SPRITE_MACHOP EQU $9a -SPRITE_VOLTORB EQU $9b -SPRITE_LAPRAS EQU $9c -SPRITE_RHYDON EQU $9d -SPRITE_MOLTRES EQU $9e -SPRITE_SNORLAX EQU $9f -SPRITE_GYARADOS EQU $a0 -SPRITE_LUGIA EQU $a1 -SPRITE_HO_OH EQU $a2 +; sprites + const_def + const SPRITE_NONE + const SPRITE_CHRIS + const SPRITE_CHRIS_BIKE + const SPRITE_GAMEBOY_KID + const SPRITE_SILVER + const SPRITE_OAK + const SPRITE_RED + const SPRITE_BLUE + const SPRITE_BILL + const SPRITE_ELDER + const SPRITE_JANINE + const SPRITE_KURT + const SPRITE_MOM + const SPRITE_BLAINE + const SPRITE_REDS_MOM + const SPRITE_DAISY + const SPRITE_ELM + const SPRITE_WILL + const SPRITE_FALKNER + const SPRITE_WHITNEY + const SPRITE_BUGSY + const SPRITE_MORTY + const SPRITE_CHUCK + const SPRITE_JASMINE + const SPRITE_PRYCE + const SPRITE_CLAIR + const SPRITE_BROCK + const SPRITE_KAREN + const SPRITE_BRUNO + const SPRITE_MISTY + const SPRITE_LANCE + const SPRITE_SURGE + const SPRITE_ERIKA + const SPRITE_KOGA + const SPRITE_SABRINA + const SPRITE_COOLTRAINER_M + const SPRITE_COOLTRAINER_F + const SPRITE_BUG_CATCHER + const SPRITE_TWIN + const SPRITE_YOUNGSTER + const SPRITE_LASS + const SPRITE_TEACHER + const SPRITE_BUENA + const SPRITE_SUPER_NERD + const SPRITE_ROCKER + const SPRITE_POKEFAN_M + const SPRITE_POKEFAN_F + const SPRITE_GRAMPS + const SPRITE_GRANNY + const SPRITE_SWIMMER_GUY + const SPRITE_SWIMMER_GIRL + const SPRITE_BIG_SNORLAX + const SPRITE_SURFING_PIKACHU + const SPRITE_ROCKET + const SPRITE_ROCKET_GIRL + const SPRITE_NURSE + const SPRITE_LINK_RECEPTIONIST + const SPRITE_CLERK + const SPRITE_FISHER + const SPRITE_FISHING_GURU + const SPRITE_SCIENTIST + const SPRITE_KIMONO_GIRL + const SPRITE_SAGE + const SPRITE_UNUSED_GUY + const SPRITE_GENTLEMAN + const SPRITE_BLACK_BELT + const SPRITE_RECEPTIONIST + const SPRITE_OFFICER + const SPRITE_CAL + const SPRITE_SLOWPOKE + const SPRITE_CAPTAIN + const SPRITE_BIG_LAPRAS + const SPRITE_GYM_GUY + const SPRITE_SAILOR + const SPRITE_BIKER + const SPRITE_PHARMACIST + const SPRITE_MONSTER + const SPRITE_FAIRY + const SPRITE_BIRD + const SPRITE_DRAGON + const SPRITE_BIG_ONIX + const SPRITE_N64 + const SPRITE_SUDOWOODO + const SPRITE_SURF + const SPRITE_POKE_BALL + const SPRITE_POKEDEX + const SPRITE_PAPER + const SPRITE_VIRTUAL_BOY + const SPRITE_OLD_LINK_RECEPTIONIST + const SPRITE_ROCK + const SPRITE_BOULDER + const SPRITE_SNES + const SPRITE_FAMICOM + const SPRITE_FRUIT_TREE + const SPRITE_GOLD_TROPHY + const SPRITE_SILVER_TROPHY + const SPRITE_KRIS + const SPRITE_KRIS_BIKE + const SPRITE_KURT_OUTSIDE + const SPRITE_SUICUNE + const SPRITE_ENTEI + const SPRITE_RAIKOU + const SPRITE_STANDING_YOUNGSTER +const_value = $80 +SPRITE_POKEMON EQU const_value + const SPRITE_UNOWN + const SPRITE_GEODUDE + const SPRITE_GROWLITHE + const SPRITE_WEEDLE + const SPRITE_SHELLDER + const SPRITE_ODDISH + const SPRITE_GENGAR + const SPRITE_ZUBAT + const SPRITE_MAGIKARP + const SPRITE_SQUIRTLE + const SPRITE_TOGEPI + const SPRITE_BUTTERFREE + const SPRITE_DIGLETT + const SPRITE_POLIWAG + const SPRITE_PIKACHU + const SPRITE_CLEFAIRY + const SPRITE_CHARMANDER + const SPRITE_JYNX + const SPRITE_STARMIE + const SPRITE_BULBASAUR + const SPRITE_JIGGLYPUFF + const SPRITE_GRIMER + const SPRITE_EKANS + const SPRITE_PARAS + const SPRITE_TENTACOOL + const SPRITE_TAUROS + const SPRITE_MACHOP + const SPRITE_VOLTORB + const SPRITE_LAPRAS + const SPRITE_RHYDON + const SPRITE_MOLTRES + const SPRITE_SNORLAX + const SPRITE_GYARADOS + const SPRITE_LUGIA + const SPRITE_HO_OH -SPRITE_DAYCARE_MON_1 EQU $e0 -SPRITE_DAYCARE_MON_2 EQU $e1 +const_value = $e0 + const SPRITE_DAYCARE_MON_1 + const SPRITE_DAYCARE_MON_2 -SPRITE_VARS EQU $f0 -SPRITE_CONSOLE EQU $f0 -SPRITE_DOLL_1 EQU $f1 -SPRITE_DOLL_2 EQU $f2 -SPRITE_BIG_DOLL EQU $f3 -SPRITE_WEIRD_TREE EQU $f4 -SPRITE_OLIVINE_RIVAL EQU $f5 -SPRITE_AZALEA_ROCKET EQU $f6 -SPRITE_FUSCHIA_GYM_1 EQU $f7 -SPRITE_FUSCHIA_GYM_2 EQU $f8 -SPRITE_FUSCHIA_GYM_3 EQU $f9 -SPRITE_FUSCHIA_GYM_4 EQU $fa -SPRITE_COPYCAT EQU $fb -SPRITE_JANINE_IMPERSONATOR EQU $fc +const_value = $f0 +SPRITE_VARS EQU const_value + const SPRITE_CONSOLE + const SPRITE_DOLL_1 + const SPRITE_DOLL_2 + const SPRITE_BIG_DOLL + const SPRITE_WEIRD_TREE + const SPRITE_OLIVINE_RIVAL + const SPRITE_AZALEA_ROCKET + const SPRITE_FUSCHIA_GYM_1 + const SPRITE_FUSCHIA_GYM_2 + const SPRITE_FUSCHIA_GYM_3 + const SPRITE_FUSCHIA_GYM_4 + const SPRITE_COPYCAT + const SPRITE_JANINE_IMPERSONATOR ; sprite types -WALKING_SPRITE EQU 1 -STANDING_SPRITE EQU 2 -STILL_SPRITE EQU 3 +const_value = 1 + const WALKING_SPRITE + const STANDING_SPRITE + const STILL_SPRITE ; sprite palettes -PAL_OW_RED EQU 0 -PAL_OW_BLUE EQU 1 -PAL_OW_GREEN EQU 2 -PAL_OW_BROWN EQU 3 -PAL_OW_PINK EQU 4 -PAL_OW_SILVER EQU 5 -PAL_OW_TREE EQU 6 -PAL_OW_ROCK EQU 7 + const_def + const PAL_OW_RED + const PAL_OW_BLUE + const PAL_OW_GREEN + const PAL_OW_BROWN + const PAL_OW_PINK + const PAL_OW_SILVER + const PAL_OW_TREE + const PAL_OW_ROCK ; permissions -TOWN EQU 1 -ROUTE EQU 2 -INDOOR EQU 3 -CAVE EQU 4 - -GATE EQU 6 -DUNGEON EQU 7 +const_value = 1 + const TOWN + const ROUTE + const INDOOR + const CAVE + const PERM_5 + const GATE + const DUNGEON ; object struct -OBJECT_00 EQU $0 -OBJECT_01 EQU $1 -OBJECT_SPRITE EQU $2 -OBJECT_03 EQU $3 -OBJECT_04 EQU $4 -OBJECT_FLAGS EQU $5 -OBJECT_PALETTE EQU $6 -OBJECT_07 EQU $7 -OBJECT_08 EQU $8 -OBJECT_09 EQU $9 -OBJECT_STEP_DURATION EQU $a -OBJECT_11 EQU $b -OBJECT_12 EQU $c -OBJECT_FACING EQU $d -OBJECT_STANDING_TILE EQU $e -OBJECT_NEXT_TILE EQU $f -OBJECT_MAP_X EQU $10 -OBJECT_MAP_Y EQU $11 -OBJECT_NEXT_MAP_X EQU $12 -OBJECT_NEXT_MAP_Y EQU $13 -OBJECT_20 EQU $14 -OBJECT_21 EQU $15 -OBJECT_22 EQU $16 -OBJECT_SPRITE_X EQU $17 -OBJECT_SPRITE_Y EQU $18 -OBJECT_SPRITE_X_OFFSET EQU $19 -OBJECT_SPRITE_Y_OFFSET EQU $1a -OBJECT_27 EQU $1b -OBJECT_28 EQU $1c -OBJECT_29 EQU $1d -OBJECT_30 EQU $1e -OBJECT_31 EQU $1f -OBJECT_32 EQU $20 + const_def + const OBJECT_00 + const OBJECT_01 + const OBJECT_SPRITE + const OBJECT_03 + const OBJECT_04 + const OBJECT_FLAGS + const OBJECT_PALETTE + const OBJECT_07 + const OBJECT_08 + const OBJECT_09 + const OBJECT_STEP_DURATION + const OBJECT_11 + const OBJECT_12 + const OBJECT_FACING + const OBJECT_STANDING_TILE + const OBJECT_NEXT_TILE + const OBJECT_MAP_X + const OBJECT_MAP_Y + const OBJECT_NEXT_MAP_X + const OBJECT_NEXT_MAP_Y + const OBJECT_20 + const OBJECT_21 + const OBJECT_22 + const OBJECT_SPRITE_X + const OBJECT_SPRITE_Y + const OBJECT_SPRITE_X_OFFSET + const OBJECT_SPRITE_Y_OFFSET + const OBJECT_27 + const OBJECT_28 + const OBJECT_29 + const OBJECT_30 + const OBJECT_31 + const OBJECT_32 ; 33-39 are not used diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 1224456d3..ebf10ec5a 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -1,106 +1,107 @@ -MUSIC_NONE EQU 0 -MUSIC_TITLE EQU 1 -MUSIC_ROUTE_1 EQU 2 -MUSIC_ROUTE_3 EQU 3 -MUSIC_ROUTE_12 EQU 4 -MUSIC_MAGNET_TRAIN EQU 5 -MUSIC_KANTO_GYM_LEADER_BATTLE EQU 6 -MUSIC_KANTO_TRAINER_BATTLE EQU 7 -MUSIC_KANTO_WILD_BATTLE EQU 8 -MUSIC_POKEMON_CENTER EQU 9 -MUSIC_HIKER_ENCOUNTER EQU 10 -MUSIC_LASS_ENCOUNTER EQU 11 -MUSIC_OFFICER_ENCOUNTER EQU 12 -MUSIC_HEAL EQU 13 -MUSIC_LAVENDER_TOWN EQU 14 -MUSIC_ROUTE_2 EQU 15 -MUSIC_MT_MOON EQU 16 -MUSIC_SHOW_ME_AROUND EQU 17 -MUSIC_GAME_CORNER EQU 18 -MUSIC_BICYCLE EQU 19 -MUSIC_HALL_OF_FAME EQU 20 -MUSIC_VIRIDIAN_CITY EQU 21 -MUSIC_CELADON_CITY EQU 22 -MUSIC_TRAINER_VICTORY EQU 23 -MUSIC_WILD_VICTORY EQU 24 -MUSIC_GYM_VICTORY EQU 25 -MUSIC_MT_MOON_SQUARE EQU 26 -MUSIC_GYM EQU 27 -MUSIC_PALLET_TOWN EQU 28 -MUSIC_POKEMON_TALK EQU 29 -MUSIC_PROF_OAK EQU 30 -MUSIC_RIVAL_ENCOUNTER EQU 31 -MUSIC_RIVAL_AFTER EQU 32 -MUSIC_SURF EQU 33 -MUSIC_EVOLUTION EQU 34 -MUSIC_NATIONAL_PARK EQU 35 -MUSIC_CREDITS EQU 36 -MUSIC_AZALEA_TOWN EQU 37 -MUSIC_CHERRYGROVE_CITY EQU 38 -MUSIC_KIMONO_ENCOUNTER EQU 39 -MUSIC_UNION_CAVE EQU 40 -MUSIC_JOHTO_WILD_BATTLE EQU 41 -MUSIC_JOHTO_TRAINER_BATTLE EQU 42 -MUSIC_ROUTE_30 EQU 43 -MUSIC_ECRUTEAK_CITY EQU 44 -MUSIC_VIOLET_CITY EQU 45 -MUSIC_JOHTO_GYM_LEADER_BATTLE EQU 46 -MUSIC_CHAMPION_BATTLE EQU 47 -MUSIC_RIVAL_BATTLE EQU 48 -MUSIC_ROCKET_BATTLE EQU 49 -MUSIC_PROF_ELM EQU 50 -MUSIC_DARK_CAVE EQU 51 -MUSIC_ROUTE_29 EQU 52 -MUSIC_ROUTE_36 EQU 53 -MUSIC_SS_AQUA EQU 54 -MUSIC_YOUNGSTER_ENCOUNTER EQU 55 -MUSIC_BEAUTY_ENCOUNTER EQU 56 -MUSIC_ROCKET_ENCOUNTER EQU 57 -MUSIC_POKEMANIAC_ENCOUNTER EQU 58 -MUSIC_SAGE_ENCOUNTER EQU 59 -MUSIC_NEW_BARK_TOWN EQU 60 -MUSIC_GOLDENROD_CITY EQU 61 -MUSIC_VERMILION_CITY EQU 62 -MUSIC_POKEMON_CHANNEL EQU 63 -MUSIC_POKE_FLUTE_CHANNEL EQU 64 -MUSIC_TIN_TOWER EQU 65 -MUSIC_SPROUT_TOWER EQU 66 -MUSIC_BURNED_TOWER EQU 67 -MUSIC_LIGHTHOUSE EQU 68 -MUSIC_LAKE_OF_RAGE EQU 69 -MUSIC_INDIGO_PLATEAU EQU 70 -MUSIC_ROUTE_37 EQU 71 -MUSIC_ROCKET_HIDEOUT EQU 72 -MUSIC_DRAGONS_DEN EQU 73 -MUSIC_JOHTO_WILD_BATTLE_NIGHT EQU 74 -MUSIC_RUINS_OF_ALPH_RADIO EQU 75 -MUSIC_CAPTURE EQU 76 -MUSIC_ROUTE_26 EQU 77 -MUSIC_MOM EQU 78 -MUSIC_VICTORY_ROAD EQU 79 -MUSIC_POKEMON_LULLABY EQU 80 -MUSIC_POKEMON_MARCH EQU 81 -MUSIC_GS_OPENING EQU 82 -MUSIC_GS_OPENING_2 EQU 83 -MUSIC_MAIN_MENU EQU 84 -MUSIC_RUINS_OF_ALPH_INTERIOR EQU 85 -MUSIC_ROCKET_OVERTURE EQU 86 -MUSIC_DANCING_HALL EQU 87 -MUSIC_BUG_CATCHING_CONTEST_RANKING EQU 88 -MUSIC_BUG_CATCHING_CONTEST EQU 89 -MUSIC_LAKE_OF_RAGE_ROCKET_RADIO EQU 90 -MUSIC_PRINTER EQU 91 -MUSIC_POST_CREDITS EQU 92 + const_def -MUSIC_CLAIR EQU 93 -MUSIC_MOBILE_ADAPTER_MENU EQU 94 -MUSIC_MOBILE_ADAPTER EQU 95 -MUSIC_BUENAS_PASSWORD EQU 96 -MUSIC_MYSTICALMAN_ENCOUNTER EQU 97 -MUSIC_CRYSTAL_OPENING EQU 98 -MUSIC_BATTLE_TOWER_THEME EQU 99 -MUSIC_SUICUNE_BATTLE EQU 100 -MUSIC_BATTLE_TOWER_LOBBY EQU 101 -MUSIC_MOBILE_CENTER EQU 102 + const MUSIC_NONE + const MUSIC_TITLE + const MUSIC_ROUTE_1 + const MUSIC_ROUTE_3 + const MUSIC_ROUTE_12 + const MUSIC_MAGNET_TRAIN + const MUSIC_KANTO_GYM_LEADER_BATTLE + const MUSIC_KANTO_TRAINER_BATTLE + const MUSIC_KANTO_WILD_BATTLE + const MUSIC_POKEMON_CENTER + const MUSIC_HIKER_ENCOUNTER + const MUSIC_LASS_ENCOUNTER + const MUSIC_OFFICER_ENCOUNTER + const MUSIC_HEAL + const MUSIC_LAVENDER_TOWN + const MUSIC_ROUTE_2 + const MUSIC_MT_MOON + const MUSIC_SHOW_ME_AROUND + const MUSIC_GAME_CORNER + const MUSIC_BICYCLE + const MUSIC_HALL_OF_FAME + const MUSIC_VIRIDIAN_CITY + const MUSIC_CELADON_CITY + const MUSIC_TRAINER_VICTORY + const MUSIC_WILD_VICTORY + const MUSIC_GYM_VICTORY + const MUSIC_MT_MOON_SQUARE + const MUSIC_GYM + const MUSIC_PALLET_TOWN + const MUSIC_POKEMON_TALK + const MUSIC_PROF_OAK + const MUSIC_RIVAL_ENCOUNTER + const MUSIC_RIVAL_AFTER + const MUSIC_SURF + const MUSIC_EVOLUTION + const MUSIC_NATIONAL_PARK + const MUSIC_CREDITS + const MUSIC_AZALEA_TOWN + const MUSIC_CHERRYGROVE_CITY + const MUSIC_KIMONO_ENCOUNTER + const MUSIC_UNION_CAVE + const MUSIC_JOHTO_WILD_BATTLE + const MUSIC_JOHTO_TRAINER_BATTLE + const MUSIC_ROUTE_30 + const MUSIC_ECRUTEAK_CITY + const MUSIC_VIOLET_CITY + const MUSIC_JOHTO_GYM_LEADER_BATTLE + const MUSIC_CHAMPION_BATTLE + const MUSIC_RIVAL_BATTLE + const MUSIC_ROCKET_BATTLE + const MUSIC_PROF_ELM + const MUSIC_DARK_CAVE + const MUSIC_ROUTE_29 + const MUSIC_ROUTE_36 + const MUSIC_SS_AQUA + const MUSIC_YOUNGSTER_ENCOUNTER + const MUSIC_BEAUTY_ENCOUNTER + const MUSIC_ROCKET_ENCOUNTER + const MUSIC_POKEMANIAC_ENCOUNTER + const MUSIC_SAGE_ENCOUNTER + const MUSIC_NEW_BARK_TOWN + const MUSIC_GOLDENROD_CITY + const MUSIC_VERMILION_CITY + const MUSIC_POKEMON_CHANNEL + const MUSIC_POKE_FLUTE_CHANNEL + const MUSIC_TIN_TOWER + const MUSIC_SPROUT_TOWER + const MUSIC_BURNED_TOWER + const MUSIC_LIGHTHOUSE + const MUSIC_LAKE_OF_RAGE + const MUSIC_INDIGO_PLATEAU + const MUSIC_ROUTE_37 + const MUSIC_ROCKET_HIDEOUT + const MUSIC_DRAGONS_DEN + const MUSIC_JOHTO_WILD_BATTLE_NIGHT + const MUSIC_RUINS_OF_ALPH_RADIO + const MUSIC_CAPTURE + const MUSIC_ROUTE_26 + const MUSIC_MOM + const MUSIC_VICTORY_ROAD + const MUSIC_POKEMON_LULLABY + const MUSIC_POKEMON_MARCH + const MUSIC_GS_OPENING + const MUSIC_GS_OPENING_2 + const MUSIC_MAIN_MENU + const MUSIC_RUINS_OF_ALPH_INTERIOR + const MUSIC_ROCKET_OVERTURE + const MUSIC_DANCING_HALL + const MUSIC_BUG_CATCHING_CONTEST_RANKING + const MUSIC_BUG_CATCHING_CONTEST + const MUSIC_LAKE_OF_RAGE_ROCKET_RADIO + const MUSIC_PRINTER + const MUSIC_POST_CREDITS + const MUSIC_CLAIR + const MUSIC_MOBILE_ADAPTER_MENU + const MUSIC_MOBILE_ADAPTER + const MUSIC_BUENAS_PASSWORD + const MUSIC_MYSTICALMAN_ENCOUNTER + const MUSIC_CRYSTAL_OPENING + const MUSIC_BATTLE_TOWER_THEME + const MUSIC_SUICUNE_BATTLE + const MUSIC_BATTLE_TOWER_LOBBY + const MUSIC_MOBILE_CENTER MUSIC_MAHOGANY_MART EQU 100 ; leftover from gold diff --git a/constants/std_constants.asm b/constants/std_constants.asm index ef132522c..039b27073 100644 --- a/constants/std_constants.asm +++ b/constants/std_constants.asm @@ -48,6 +48,6 @@ enum gymstatue2 enum receiveitem enum receivetogepiegg - enum pc + enum pcscript enum gamecornercoinvendor enum happinesschecknpc diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm index ce96b0ce5..874faabd7 100644 --- a/engine/spawn_points.asm +++ b/engine/spawn_points.asm @@ -18,7 +18,7 @@ ENDM spawn VIRIDIAN, VIRIDIAN_CITY, 23, 26 spawn PEWTER, PEWTER_CITY, 13, 26 spawn CERULEAN, CERULEAN_CITY, 19, 22 - spawn ROCK_TUNNEL, ROUTE_10A, 11, 2 + spawn ROCK_TUNNEL, ROUTE_10_NORTH, 11, 2 spawn VERMILION, VERMILION_CITY, 9, 6 spawn LAVENDER, LAVENDER_TOWN, 5, 6 spawn SAFFRON, SAFFRON_CITY, 9, 30 diff --git a/macros.asm b/macros.asm index cbd071b8f..de576302a 100644 --- a/macros.asm +++ b/macros.asm @@ -44,6 +44,14 @@ dbwww: MACRO dw \2, \3, \4 ENDM +dbankaddr: MACRO + dbw BANK(\1), \1 + ENDM + +daddrbank: MACRO + dwb \1, BANK(\1) + ENDM + dn: MACRO rept _NARG / 2 db (\1) << 4 + (\2) diff --git a/macros/enum.asm b/macros/enum.asm index 0a72d49d8..aee6ee530 100644 --- a/macros/enum.asm +++ b/macros/enum.asm @@ -29,3 +29,8 @@ const: MACRO \1 EQU const_value const_value = const_value + 1 ENDM + +shift_const: MACRO +\1 EQU 1 << const_value +const_value = const_value + 1 +ENDM diff --git a/macros/map.asm b/macros/map.asm index 2ab981823..54b543c6d 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -162,3 +162,17 @@ if "\1" == "east" endc ENDM + +mapgroup: MACRO +\1\@ EQUS "GROUP_\1" +\1\@2 EQUS "MAP_\1" +\1\@ EQU const_value + enum \1\@2 +\1_HEIGHT EQU \2 +\1_WIDTH EQU \3 +ENDM + +newgroup: MACRO +const_value = const_value + 1 + enum_start 1 +ENDM diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index b41934f2b..df0034df8 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -451,10 +451,10 @@ AzaleaGym_MapEventHeader: ; people-events db 7 - person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, -1 + person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, -1 + person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, -1 + person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, -1 + person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, -1 + person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, -1 + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index 406d29483..bf5decd73 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, -1 + person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, -1 + person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, -1 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index dd23fe9ef..10ce076dc 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, EVENT_ALWAYS_THERE - person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, -1 + person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, -1 + person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, -1 + person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index af257c769..788c9bb9a 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -483,14 +483,14 @@ AzaleaTown_MapEventHeader: ; people-events db 12 person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA - person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, -1 + person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, -1 + person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, -1 person_event SPRITE_SLOWPOKE, 21, 12, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, -1 person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BF person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index abd9e6026..02ee0fb06 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -810,8 +810,8 @@ BattleTower1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, -1 + person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, -1 + person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, -1 + person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, -1 + person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 869436e95..4c78d8871 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -156,4 +156,4 @@ BattleTowerBattleRoom_MapEventHeader: ; people-events db 2 person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_791 - person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 7cb5f0015..b8763f8e0 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader: ; people-events db 1 - person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 6e917f1d0..b68971451 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader: ; people-events db 1 - person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 72ec280fe..8ab5aee94 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -142,7 +142,7 @@ BattleTowerOutside_MapEventHeader: ; people-events db 4 - person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, EVENT_ALWAYS_THERE + person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, -1 + person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, -1 person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, EVENT_7CF - person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 4fc94c08b..1cb348887 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -367,4 +367,4 @@ BillsHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 3c99973c6..c1d872e06 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -337,8 +337,8 @@ BlackthornCity_MapEventHeader: person_event SPRITE_SUPER_NERD, 16, 23, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4 person_event SPRITE_GRAMPS, 6, 24, $6, $0, 255, 255, $0, 0, GrampsScript_0x1a4708, EVENT_74C person_event SPRITE_GRAMPS, 6, 25, $8, $0, 255, 255, $0, 0, GrampsScript_0x1a470b, EVENT_74D - person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, -1 + person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, -1 + person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, -1 person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, SantosScript, EVENT_75D - person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, -1 diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index 3e31f4c22..aae8f3962 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -35,4 +35,4 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, -1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index d627e6404..83fa1fab3 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, EVENT_ALWAYS_THERE - person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, -1 + person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 0aec7b6ea..d68012d35 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -452,8 +452,8 @@ BlackthornGym1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, -1 + person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, -1 + person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, -1 + person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, -1 + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 1107e5f92..f5e2a0c28 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -177,11 +177,11 @@ BlackthornGym2F_MapEventHeader: ; people-events db 8 - person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, -1 + person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, -1 person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 - person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_ALWAYS_THERE - person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_ALWAYS_THERE - person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1 + person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1 + person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 4ccc24828..357e1dee0 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -58,6 +58,6 @@ BlackthornMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, EVENT_ALWAYS_THERE - person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, -1 + person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, -1 + person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, -1 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index fd6ec0c68..a56939915 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -61,7 +61,7 @@ BlackthornPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x195b79, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x195b79, -1 + person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, -1 + person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, -1 + person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index da40c73c8..a27796ec5 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -158,4 +158,4 @@ BluesHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, EVENT_ALWAYS_THERE + person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 32dcb1401..18ecdbb68 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -145,4 +145,4 @@ BrunosRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, EVENT_ALWAYS_THERE + person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index cb771a7e6..b6a447a11 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -311,7 +311,7 @@ BurnedTower1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, -1 person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, EVENT_765 person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, EVENT_6C5 person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, EVENT_764 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 60c561709..2db890d51 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -251,7 +251,7 @@ BurnedTowerB1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, -1 person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, EVENT_74A person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, EVENT_74A person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, EVENT_74A diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 5c01cd78d..277ac39fd 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -219,8 +219,8 @@ CeladonCafe_MapEventHeader: ; people-events db 5 - person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, -1 + person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, -1 + person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, -1 + person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, -1 + person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 6447f1e37..3f1aedd0f 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -258,12 +258,12 @@ CeladonCity_MapEventHeader: ; people-events db 9 - person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, EVENT_ALWAYS_THERE - person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, -1 + person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, -1 + person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, -1 + person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, -1 + person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, -1 + person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, -1 + person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, -1 + person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, -1 + person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 74cff6c86..083d0ea40 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -89,6 +89,6 @@ CeladonDeptStore1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, -1 + person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, -1 + person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index e89c6866e..2db6848ff 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -82,7 +82,7 @@ CeladonDeptStore2F_MapEventHeader: ; people-events db 4 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bad, EVENT_ALWAYS_THERE - person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bad, -1 + person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, -1 + person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, -1 + person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index 629727652..fef442854 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -107,8 +107,8 @@ CeladonDeptStore3F_MapEventHeader: ; people-events db 5 - person_event SPRITE_CLERK, 5, 11, $6, $0, 255, 255, $90, 0, ClerkScript_0x70d29, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x70d31, EVENT_ALWAYS_THERE - person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, EVENT_ALWAYS_THERE - person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 5, 11, $6, $0, 255, 255, $90, 0, ClerkScript_0x70d29, -1 + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x70d31, -1 + person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, -1 + person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, -1 + person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index 6f274d590..ac8aeef06 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -65,6 +65,6 @@ CeladonDeptStore4F_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, -1 + person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, -1 + person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 9fa4ed1da..99fb79d95 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -84,8 +84,8 @@ CeladonDeptStore5F_MapEventHeader: ; people-events db 5 - person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, EVENT_ALWAYS_THERE - person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, EVENT_ALWAYS_THERE - person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, -1 + person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, -1 + person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, -1 + person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, -1 + person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index de5f26531..d3405b873 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -168,5 +168,5 @@ CeladonDeptStore6F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, -1 + person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, -1 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index efa3b9c5d..3b01e2c39 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -325,12 +325,12 @@ CeladonGameCorner_MapEventHeader: ; people-events db 9 - person_event SPRITE_CLERK, 6, 9, $6, $0, 255, 255, $a0, 0, ClerkScript_0x7211d, EVENT_ALWAYS_THERE - person_event SPRITE_RECEPTIONIST, 6, 7, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x72120, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $80, 0, PokefanMScript_0x72123, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 11, 21, $9, $0, 255, 255, $90, 0, TeacherScript_0x7212e, EVENT_ALWAYS_THERE - person_event SPRITE_FISHING_GURU, 11, 15, $9, $0, 255, 255, $a0, 0, FishingGuruScript_0x72139, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 2, $80, 0, FisherScript_0x72144, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 6, 9, $6, $0, 255, 255, $a0, 0, ClerkScript_0x7211d, -1 + person_event SPRITE_RECEPTIONIST, 6, 7, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x72120, -1 + person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $80, 0, PokefanMScript_0x72123, -1 + person_event SPRITE_TEACHER, 11, 21, $9, $0, 255, 255, $90, 0, TeacherScript_0x7212e, -1 + person_event SPRITE_FISHING_GURU, 11, 15, $9, $0, 255, 255, $a0, 0, FishingGuruScript_0x72139, -1 + person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 2, $80, 0, FisherScript_0x72144, -1 + person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, -1 + person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, -1 + person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 7fd74ab7f..3a296f0dc 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -284,5 +284,5 @@ CeladonGameCornerPrizeRoom_MapEventHeader: ; people-events db 2 - person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, EVENT_ALWAYS_THERE - person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, -1 + person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index bd3e79718..55b122e95 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -358,9 +358,9 @@ CeladonGym_MapEventHeader: ; people-events db 6 - person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, EVENT_ALWAYS_THERE + person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, -1 + person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, -1 + person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, -1 + person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, -1 + person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, -1 + person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 8b9914f06..4760e6155 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -91,7 +91,7 @@ CeladonMansion1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, EVENT_ALWAYS_THERE - person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, EVENT_ALWAYS_THERE - person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, EVENT_ALWAYS_THERE - person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, -1 + person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, -1 + person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, -1 + person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, -1 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 3c54cd21d..7c0cf85eb 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -206,7 +206,7 @@ CeladonMansion3F_MapEventHeader: ; people-events db 4 - person_event SPRITE_COOLTRAINER_M, 10, 7, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x71670, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 10, 7, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x71670, -1 + person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, -1 + person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, -1 + person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index 651a71221..cc7d1ddcb 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -49,4 +49,4 @@ CeladonMansionRoof_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index b8e9e2c54..e02041794 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -130,4 +130,4 @@ CeladonMansionRoofHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, EVENT_ALWAYS_THERE + person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index b2c29b383..ef0c091bb 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -156,8 +156,8 @@ CeladonPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x71e22, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 9, 5, $5, $1, 255, 255, $0, 0, GentlemanScript_0x71e25, EVENT_ALWAYS_THERE - person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x71e22, -1 + person_event SPRITE_GENTLEMAN, 9, 5, $5, $1, 255, 255, $0, 0, GentlemanScript_0x71e25, -1 + person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, -1 + person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, -1 person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index c3a6e2421..8c00721ec 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -300,9 +300,9 @@ CeruleanCity_MapEventHeader: ; people-events db 6 - person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, EVENT_ALWAYS_THERE - person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, -1 + person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, -1 + person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, -1 + person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, -1 + person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, -1 + person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, -1 diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 41a4877b3..96aefdb4d 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -30,4 +30,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 545772399..16771b679 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -57,6 +57,6 @@ CeruleanMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, -1 + person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, -1 + person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, -1 diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index e8dd3e3dd..3121f62b5 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -75,6 +75,6 @@ CeruleanPokeCenter1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, -1 + person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, -1 + person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, -1 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index b6277533f..e0b393949 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -55,6 +55,6 @@ CeruleanPoliceStation_MapEventHeader: ; people-events db 3 - person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, EVENT_ALWAYS_THERE - person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, -1 + person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, -1 + person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 8c79c58fb..21f019e7e 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -64,7 +64,7 @@ CeruleanTradeSpeechHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, EVENT_ALWAYS_THERE - person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, EVENT_ALWAYS_THERE - person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, -1 + person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, -1 + person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, -1 + person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, -1 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index e2cc0e6af..d10dbabea 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -572,6 +572,6 @@ CherrygroveCity_MapEventHeader: db 5 person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, EVENT_6FE person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BE - person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, -1 + person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, -1 + person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index 9f10b7965..c437819e2 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -56,5 +56,5 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, -1 + person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 6b8dfe881..d542a42bc 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -59,5 +59,5 @@ CherrygroveGymSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, -1 + person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 720f09eca..79d62d6a2 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -83,6 +83,6 @@ CherrygroveMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, -1 + person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, -1 + person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, -1 diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index e24e8751d..e9152d616 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -80,7 +80,7 @@ CherrygrovePokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19696d, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19696d, -1 + person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, -1 + person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, -1 + person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 8f69b3297..4a75fdb8a 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -403,15 +403,15 @@ CianwoodCity_MapEventHeader: ; people-events db 12 - person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, EVENT_ALWAYS_THERE + person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, -1 + person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, -1 + person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, -1 + person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, -1 person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_7AD person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 9e2fe7f71..054a1aaa5 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -62,4 +62,4 @@ CianwoodCityPhotoStudio_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 2ec66f0fe..249d3ca6f 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -377,12 +377,12 @@ CianwoodGym_MapEventHeader: ; people-events db 9 - person_event SPRITE_CHUCK, 5, 8, $6, $0, 255, 255, $b0, 0, ChuckScript_0x9d60f, EVENT_ALWAYS_THERE - person_event SPRITE_BLACK_BELT, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, EVENT_ALWAYS_THERE - person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, EVENT_ALWAYS_THERE - person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, EVENT_ALWAYS_THERE - person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, EVENT_ALWAYS_THERE - person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE - person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE - person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE - person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_CHUCK, 5, 8, $6, $0, 255, 255, $b0, 0, ChuckScript_0x9d60f, -1 + person_event SPRITE_BLACK_BELT, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, -1 + person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, -1 + person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, -1 + person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, -1 + person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 7d4805e89..37f0dc306 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -75,6 +75,6 @@ CianwoodLugiaSpeechHouse_MapEventHeader: ; people-events db 3 - person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, -1 + person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, -1 + person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index d11d81d9a..7c8a9d415 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -90,4 +90,4 @@ CianwoodPharmacy_MapEventHeader: ; people-events db 1 - person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, EVENT_ALWAYS_THERE + person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index f37264df2..889034366 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -143,7 +143,7 @@ CianwoodPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9dbcf, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9dbcf, -1 + person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, -1 + person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, -1 + person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, -1 diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index c8fedf946..26dfd69af 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -47,6 +47,6 @@ CinnabarPokeCenter1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, -1 + person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, -1 diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index ded5a3dd1..719619420 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -85,6 +85,6 @@ CopycatsHouse1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, EVENT_ALWAYS_THERE - person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, -1 + person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, -1 + person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 1d13c57f2..caa96bf15 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -374,8 +374,8 @@ CopycatsHouse2F_MapEventHeader: ; people-events db 6 person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, Copycat, EVENT_6EE - person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, EVENT_ALWAYS_THERE + person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, -1 person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, CopycatsHouse2FDoll, EVENT_773 - person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, EVENT_ALWAYS_THERE - person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, EVENT_ALWAYS_THERE + person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, -1 + person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, -1 person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, Copycat, EVENT_6EF diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 761c408bd..0f1e99069 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -425,12 +425,12 @@ DanceTheatre_MapEventHeader: ; people-events db 9 - person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, EVENT_ALWAYS_THERE - person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, EVENT_ALWAYS_THERE - person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, EVENT_ALWAYS_THERE - person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, EVENT_ALWAYS_THERE - person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, EVENT_ALWAYS_THERE - person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, EVENT_ALWAYS_THERE + person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, -1 + person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, -1 + person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, -1 + person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, -1 + person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, -1 + person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, -1 + person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, -1 + person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, -1 + person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index fb73734a3..fc890387e 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -73,6 +73,6 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; people-events db 3 - person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, EVENT_ALWAYS_THERE + person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, -1 person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, EVENT_6A1 person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, EVENT_6A2 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 85ece7086..59c558cbd 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -45,10 +45,10 @@ DarkCaveVioletEntrance_MapEventHeader: ; people-events db 8 person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, EVENT_69E - person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, EVENT_69F person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, EVENT_6A0 person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, EVENT_7CE diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 40dc44452..ad4904800 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -176,4 +176,4 @@ DayCare_MapEventHeader: ; people-events db 2 person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, EVENT_6E5 - person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index d96073ca3..539d336fe 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -43,4 +43,4 @@ DiglettsCave_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, -1 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index f3481eeae..4261c1f97 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -489,9 +489,9 @@ DragonsDenB1F_MapEventHeader: person_event SPRITE_POKE_BALL, 20, 39, $1, $0, 255, 255, $0, 0, PokeBallScript_0x18c95a, EVENT_6A8 person_event SPRITE_CLAIR, 34, 18, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_6D8 person_event SPRITE_SILVER, 27, 24, $2, $22, 255, 255, $0, 0, SilverScript_0x18c97e, EVENT_6C6 - person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, -1 + person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, -1 + person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, -1 + person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, -1 person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, EVENT_7BF person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, EVENT_7C0 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 1b4075cc3..a3538d3eb 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -426,8 +426,8 @@ EarlsPokemonAcademy_MapEventHeader: ; people-events db 6 person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, AcademyEarl, EVENT_6CB - person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, EVENT_ALWAYS_THERE - person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, EVENT_ALWAYS_THERE - person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, EVENT_ALWAYS_THERE - person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, -1 + person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, -1 + person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, -1 + person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, -1 + person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index e6e8969c4..d7cbf3234 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -291,10 +291,10 @@ EcruteakCity_MapEventHeader: ; people-events db 7 - person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, -1 + person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, -1 + person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, -1 + person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, -1 + person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, -1 + person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, -1 person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, EVENT_7A9 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 426b55813..1655f9c65 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -493,10 +493,10 @@ EcruteakGym_MapEventHeader: ; people-events db 7 - person_event SPRITE_MORTY, 5, 9, $6, $0, 255, 255, $b0, 0, MortyScript_0x99d58, EVENT_ALWAYS_THERE - person_event SPRITE_SAGE, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, EVENT_ALWAYS_THERE - person_event SPRITE_SAGE, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_MORTY, 5, 9, $6, $0, 255, 255, $b0, 0, MortyScript_0x99d58, -1 + person_event SPRITE_SAGE, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, -1 + person_event SPRITE_SAGE, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, -1 + person_event SPRITE_GRANNY, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, -1 + person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, -1 + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, -1 person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_7A8 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index 31f681311..ddbb1c7fd 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -176,5 +176,5 @@ EcruteakItemfinderHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, EVENT_ALWAYS_THERE - person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, -1 + person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 721ca624b..039f24f41 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -58,5 +58,5 @@ EcruteakLugiaSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, -1 + person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 2749818c8..2da460581 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -57,6 +57,6 @@ EcruteakMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, -1 + person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, -1 + person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, -1 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 2c0cf32f7..6b9919469 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -219,8 +219,8 @@ EcruteakPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x98eb0, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 10, 11, $a, $0, 255, 255, $0, 0, PokefanMScript_0x98eb3, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x98eb0, -1 + person_event SPRITE_POKEFAN_M, 10, 11, $a, $0, 255, 255, $0, 0, PokefanMScript_0x98eb3, -1 + person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, -1 + person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, -1 person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_713 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index fc054e41d..d47a725d8 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -99,5 +99,5 @@ ElmsHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, -1 + person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 3f8a494a4..e2368ab0d 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1408,7 +1408,7 @@ ElmsLab_MapEventHeader: ; people-events db 6 - person_event SPRITE_ELM, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, EVENT_ALWAYS_THERE + person_event SPRITE_ELM, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, -1 person_event SPRITE_SCIENTIST, 13, 6, $3, $0, 255, 255, $90, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, EVENT_640 person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, EVENT_641 diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 25b5d0ab1..45ac8bd38 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -310,7 +310,7 @@ FastShip1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, EVENT_ALWAYS_THERE - person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, EVENT_ALWAYS_THERE - person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, -1 + person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, -1 + person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, -1 person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_72C diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 600caccf1..5e9eb09d9 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -583,7 +583,7 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; people-events db 11 - person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, EVENT_ALWAYS_THERE + person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, -1 person_event SPRITE_GENTLEMAN, 21, 6, $9, $0, 255, 255, $90, 0, GentlemanScript_0x75f1f, EVENT_730 person_event SPRITE_TWIN, 21, 7, $a, $0, 255, 255, $0, 0, TwinScript_0x75f6d, EVENT_731 person_event SPRITE_TWIN, 29, 6, $a, $0, 255, 255, $0, 0, TwinScript_0x75ebb, EVENT_732 diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index e4695ebae..34c909c06 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -57,5 +57,5 @@ FightingDojo_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, -1 person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 1f81e0486..27c4faefb 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -40,5 +40,5 @@ FuchsiaBillSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, -1 + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 7b3e34767..90694e6e7 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -154,7 +154,7 @@ FuchsiaCity_MapEventHeader: ; people-events db 4 - person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, -1 + person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, -1 + person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, -1 + person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 061296784..acc1c3898 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -391,9 +391,9 @@ FuchsiaGym_MapEventHeader: ; people-events db 6 - person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, EVENT_ALWAYS_THERE - person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, EVENT_ALWAYS_THERE - person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, EVENT_ALWAYS_THERE - person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, EVENT_ALWAYS_THERE - person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, -1 + person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, -1 + person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, -1 + person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, -1 + person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, -1 + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 198ad52c4..739fff138 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -49,6 +49,6 @@ FuchsiaMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, -1 + person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, -1 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 96edf99d2..389ea1130 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -102,7 +102,7 @@ FuchsiaPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, EVENT_ALWAYS_THERE - person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, -1 + person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, -1 + person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, -1 + person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index ecd3836ab..f0d33c782 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -125,4 +125,4 @@ GoldenrodBikeShop_MapEventHeader: ; people-events db 1 - person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index ca5deec11..91be3b95e 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -258,5 +258,5 @@ GoldenrodBillsHouse_MapEventHeader: ; people-events db 3 person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillsHouseBill, EVENT_MET_BILL - person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, -1 + person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, -1 diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index 819772671..b4989b651 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -93,7 +93,7 @@ GoldenrodDeptStore1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, -1 + person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, -1 + person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, -1 + person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index cd03146ec..fed8d27e2 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -113,8 +113,8 @@ GoldenrodDeptStore2F_MapEventHeader: ; people-events db 5 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55b5d, EVENT_ALWAYS_THERE - person_event SPRITE_CLERK, 10, 17, $8, $0, 255, 255, $0, 0, ClerkScript_0x55b65, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55b5d, -1 + person_event SPRITE_CLERK, 10, 17, $8, $0, 255, 255, $0, 0, ClerkScript_0x55b65, -1 + person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, -1 + person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 75ff6c73f..8a3b7dce2 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -71,6 +71,6 @@ GoldenrodDeptStore3F_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, EVENT_ALWAYS_THERE - person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, -1 + person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, -1 + person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index a0472e231..3005a16c0 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -91,7 +91,7 @@ GoldenrodDeptStore4F_MapEventHeader: ; people-events db 4 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55ee9, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, EVENT_ALWAYS_THERE - person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55ee9, -1 + person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, -1 + person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, -1 + person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index 53ea5a8ab..a551e86ad 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -232,9 +232,9 @@ GoldenrodDeptStore5F_MapEventHeader: ; people-events db 6 - person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $0, 0, ClerkScript_0x5609c, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 10, 7, $2, $11, 255, 255, $0, 0, LassScript_0x56130, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 7, 10, $3, $0, 255, 255, $0, 0, CooltrainerMScript_0x56133, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $0, 0, ClerkScript_0x5609c, -1 + person_event SPRITE_LASS, 10, 7, $2, $11, 255, 255, $0, 0, LassScript_0x56130, -1 + person_event SPRITE_COOLTRAINER_M, 7, 10, $3, $0, 255, 255, $0, 0, CooltrainerMScript_0x56133, -1 + person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, -1 + person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, -1 person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, EVENT_763 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index 7973d26c1..d04bf62a5 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -169,5 +169,5 @@ GoldenrodDeptStore6F_MapEventHeader: ; people-events db 2 - person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, -1 + person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 72441d379..1d8f9d6d7 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -125,7 +125,7 @@ GoldenrodDeptStoreB1F_MapEventHeader: person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c5, EVENT_676 person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c7, EVENT_677 person_event SPRITE_POKE_BALL, 19, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c9, EVENT_678 - person_event SPRITE_BLACK_BELT, 14, 13, $4, $10, 255, 255, $a0, 0, BlackBeltScript_0x7d7b0, EVENT_ALWAYS_THERE - person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, EVENT_ALWAYS_THERE - person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, EVENT_ALWAYS_THERE - person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 14, 13, $4, $10, 255, 255, $a0, 0, BlackBeltScript_0x7d7b0, -1 + person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, -1 + person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, -1 + person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 360718aa4..6f015ae7c 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -226,8 +226,8 @@ GoldenrodDeptStoreRoof_MapEventHeader: ; people-events db 8 person_event SPRITE_CLERK, 8, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x5673f, EVENT_6F0 - person_event SPRITE_POKEFAN_F, 7, 14, $5, $1, 255, 255, $80, 0, PokefanFScript_0x56746, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 5, 6, $7, $0, 255, 255, $90, 0, FisherScript_0x56749, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 7, 14, $5, $1, 255, 255, $80, 0, PokefanFScript_0x56746, -1 + person_event SPRITE_FISHER, 5, 6, $7, $0, 255, 255, $90, 0, FisherScript_0x56749, -1 person_event SPRITE_TWIN, 8, 7, $2, $11, 255, 255, $a0, 0, TwinScript_0x56754, EVENT_6F1 person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x56757, EVENT_6F1 person_event SPRITE_POKEFAN_M, 4, 11, $5, $1, 255, 255, $0, 0, PokefanMScript_0x5676a, EVENT_6F0 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index e9a889726..1d27d4200 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -172,5 +172,5 @@ GoldenrodFlowerShop_MapEventHeader: ; people-events db 2 - person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, -1 person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, EVENT_768 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index b8e388fa4..102fdd8b6 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -479,15 +479,15 @@ GoldenrodGameCorner_MapEventHeader: ; people-events db 12 - person_event SPRITE_CLERK, 6, 7, $6, $0, 255, 255, $80, 0, ClerkScript_0x56c25, EVENT_ALWAYS_THERE - person_event SPRITE_RECEPTIONIST, 6, 20, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56c28, EVENT_ALWAYS_THERE - person_event SPRITE_RECEPTIONIST, 6, 22, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56d01, EVENT_ALWAYS_THERE - person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 2, $90, 0, PharmacistScript_0x56df1, EVENT_ALWAYS_THERE - person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 4, $90, 0, PharmacistScript_0x56df1, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 14, 15, $9, $0, 255, 255, $b0, 0, PokefanMScript_0x56dfc, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 12, 18, $8, $0, 255, 255, $90, 0, CooltrainerMScript_0x56e07, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 10, 21, $9, $0, 255, 255, $80, 0, PokefanFScript_0x56e12, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 7, 14, $2, $12, 255, 255, $a0, 0, CooltrainerFScript_0x56e1d, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 6, 7, $6, $0, 255, 255, $80, 0, ClerkScript_0x56c25, -1 + person_event SPRITE_RECEPTIONIST, 6, 20, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56c28, -1 + person_event SPRITE_RECEPTIONIST, 6, 22, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56d01, -1 + person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 2, $90, 0, PharmacistScript_0x56df1, -1 + person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 4, $90, 0, PharmacistScript_0x56df1, -1 + person_event SPRITE_POKEFAN_M, 14, 15, $9, $0, 255, 255, $b0, 0, PokefanMScript_0x56dfc, -1 + person_event SPRITE_COOLTRAINER_M, 12, 18, $8, $0, 255, 255, $90, 0, CooltrainerMScript_0x56e07, -1 + person_event SPRITE_POKEFAN_F, 10, 21, $9, $0, 255, 255, $80, 0, PokefanFScript_0x56e12, -1 + person_event SPRITE_COOLTRAINER_F, 7, 14, $2, $12, 255, 255, $a0, 0, CooltrainerFScript_0x56e1d, -1 + person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, -1 + person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, -1 person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, EVENT_76B diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index c56ee77e4..6195a7c5f 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -457,9 +457,9 @@ GoldenrodGym_MapEventHeader: ; people-events db 6 - person_event SPRITE_WHITNEY, 7, 12, $6, $0, 255, 255, $80, 0, WhitneyScript_0x5400c, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_WHITNEY, 7, 12, $6, $0, 255, 255, $80, 0, WhitneyScript_0x5400c, -1 + person_event SPRITE_LASS, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, -1 + person_event SPRITE_LASS, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, -1 + person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, -1 + person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, -1 + person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index bbe08d289..4a8b442bb 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -151,6 +151,6 @@ GoldenrodHappinessRater_MapEventHeader: ; people-events db 3 - person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, -1 + person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, -1 + person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 419c83576..f65d258f8 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -182,5 +182,5 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, -1 person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, EVENT_749 diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 2e58990a7..4f7129328 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -41,4 +41,4 @@ GoldenrodNameRatersHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 1cd094667..869b882df 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -67,5 +67,5 @@ GoldenrodPPSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, -1 + person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, -1 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index f163a714e..04c944702 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -818,8 +818,8 @@ GoldenrodPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x60f91, EVENT_ALWAYS_THERE - person_event SPRITE_LINK_RECEPTIONIST, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, EVENT_ALWAYS_THERE - person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x60f91, -1 + person_event SPRITE_LINK_RECEPTIONIST, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, -1 + person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, -1 + person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, -1 + person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 21c24273b..2179dab30 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -283,6 +283,6 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: ; people-events db 3 - person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, EVENT_ALWAYS_THERE - person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, EVENT_ALWAYS_THERE - person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, -1 + person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, -1 + person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, -1 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index fabd99201..6050cef09 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -126,4 +126,4 @@ HallOfFame_MapEventHeader: ; people-events db 1 - person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_ALWAYS_THERE + person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, -1 diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index 3691fcf99..d1c1450af 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -29,4 +29,4 @@ IcePathB3F_MapEventHeader: ; people-events db 2 person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, EVENT_68E - person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, EVENT_ALWAYS_THERE + person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 16c93c457..79d8f55b8 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -972,11 +972,11 @@ IlexForest_MapEventHeader: person_event SPRITE_BIRD, 35, 18, $3, $0, 255, 255, $b0, 0, BirdScript_0x6eb8f, EVENT_6E9 person_event SPRITE_YOUNGSTER, 32, 11, $6, $0, 255, 255, $a0, 0, YoungsterScript_0x6eb7b, EVENT_6F3 person_event SPRITE_BLACK_BELT, 32, 9, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x6edae, EVENT_6F4 - person_event SPRITE_ROCKER, 18, 19, $9, $0, 255, 255, $0, 0, RockerScript_0x6edde, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKER, 18, 19, $9, $0, 255, 255, $0, 0, RockerScript_0x6edde, -1 person_event SPRITE_POKE_BALL, 36, 24, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee10, EVENT_671 person_event SPRITE_KURT, 33, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_7A5 person_event SPRITE_LASS, 28, 7, $9, $0, 255, 255, $a0, 0, LassScript_0x6ee0d, EVENT_6ED - person_event SPRITE_YOUNGSTER, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, -1 person_event SPRITE_POKE_BALL, 21, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee12, EVENT_7B9 person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, EVENT_7BA person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, EVENT_7BB diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 827adf1f1..1554f4e57 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -45,5 +45,5 @@ IlexForestAzaleaGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, -1 + person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, -1 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index e7f881dc3..03013b174 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -319,9 +319,9 @@ IndigoPlateauPokeCenter1F_MapEventHeader: ; people-events db 6 - person_event SPRITE_NURSE, 11, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18012c, EVENT_ALWAYS_THERE - person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 11, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18012c, -1 + person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, -1 + person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, -1 person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_77B person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, TeleportGuyScript, EVENT_TELEPORT_GUY person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index ec487103a..e26e802dc 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -153,4 +153,4 @@ KarensRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, EVENT_ALWAYS_THERE + person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 46d0b6340..38f29c379 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -150,4 +150,4 @@ KogasRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, EVENT_ALWAYS_THERE + person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, -1 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 9412a9aca..081652ed2 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -114,5 +114,5 @@ KrissNeighborsHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, -1 person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, KrissNeighbor, EVENT_793 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index ef2326fac..0e8c4c184 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -577,9 +577,9 @@ LakeofRage_MapEventHeader: ; people-events db 12 person_event SPRITE_LANCE, 32, 25, $7, $0, 255, 255, $0, 0, LanceScript_0x70022, EVENT_6D4 - person_event SPRITE_GRAMPS, 30, 24, $7, $0, 255, 255, $0, 0, GrampsScript_0x7008e, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 17, 40, $8, $0, 255, 255, $0, 0, SuperNerdScript_0x700a2, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 33, 29, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x700a5, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 30, 24, $7, $0, 255, 255, $0, 0, GrampsScript_0x7008e, -1 + person_event SPRITE_SUPER_NERD, 17, 40, $8, $0, 255, 255, $0, 0, SuperNerdScript_0x700a2, -1 + person_event SPRITE_COOLTRAINER_F, 33, 29, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x700a5, -1 person_event SPRITE_FISHER, 27, 34, $8, $0, 255, 255, $92, 1, TrainerFisherAndre, EVENT_735 person_event SPRITE_FISHER, 30, 28, $7, $0, 255, 255, $92, 1, TrainerFisherRaymond, EVENT_735 person_event SPRITE_COOLTRAINER_M, 19, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermAaron, EVENT_735 diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index 5df41dc83..a36d8d424 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -83,4 +83,4 @@ LakeofRageHiddenPowerHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index 03964ac96..f3195d981 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -221,4 +221,4 @@ LakeofRageMagikarpHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 4bc8a6753..b489a60d4 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -358,6 +358,6 @@ LancesRoom_MapEventHeader: ; people-events db 3 - person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, EVENT_ALWAYS_THERE + person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, -1 person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_75F person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_75F diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 031867a0e..9a6a77116 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -233,8 +233,8 @@ LavRadioTower1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_RECEPTIONIST, 10, 10, $7, $0, 255, 255, $a0, 0, ReceptionistScript_0x7ee63, EVENT_ALWAYS_THERE - person_event SPRITE_OFFICER, 5, 19, $6, $0, 255, 255, $a0, 0, OfficerScript_0x7ee66, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 10, 10, $7, $0, 255, 255, $a0, 0, ReceptionistScript_0x7ee63, -1 + person_event SPRITE_OFFICER, 5, 19, $6, $0, 255, 255, $a0, 0, OfficerScript_0x7ee66, -1 + person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, -1 + person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, -1 + person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index e7025b84f..9d2c2f36b 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -59,6 +59,6 @@ LavenderMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, EVENT_ALWAYS_THERE - person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, -1 + person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, -1 + person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index d8ce14c30..0c1871af2 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -40,4 +40,4 @@ LavenderNameRater_MapEventHeader: ; people-events db 1 - person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index b8ee2481d..b225df217 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -92,7 +92,7 @@ LavenderPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x7e6a0, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x7e6a0, -1 + person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, -1 + person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, -1 + person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 4a1587b37..77f452e9a 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -129,7 +129,7 @@ LavenderTown_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 11, 16, $5, $1, 255, 255, $80, 0, PokefanMScript_0x1ad6e4, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 11, 16, $5, $1, 255, 255, $80, 0, PokefanMScript_0x1ad6e4, -1 + person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, -1 + person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, -1 + person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, -1 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 3ff32dd67..4ad666c16 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -44,4 +44,4 @@ LavenderTownSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 0383e289c..2ea65951a 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -462,10 +462,10 @@ MahoganyGym_MapEventHeader: ; people-events db 7 - person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, EVENT_ALWAYS_THERE - person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, EVENT_ALWAYS_THERE - person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, EVENT_ALWAYS_THERE - person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, -1 + person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, -1 + person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, -1 + person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, -1 + person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, -1 + person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, -1 + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, -1 diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index 8a78f1dc7..750287e4f 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -65,7 +65,7 @@ MahoganyPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19a356, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19a356, -1 + person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, -1 + person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, -1 + person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index 955ad751e..dfc0fc30e 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -73,5 +73,5 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, EVENT_ALWAYS_THERE + person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, -1 + person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 90f6b297f..f3d9f7457 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -269,6 +269,6 @@ MahoganyTown_MapEventHeader: ; people-events db 4 person_event SPRITE_POKEFAN_M, 12, 23, $6, $0, 255, 255, $0, 0, PokefanMScript_0x19002e, EVENT_756 - person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, -1 person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, EVENT_757 person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, EVENT_736 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 3d53e1508..c2b33f088 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -212,4 +212,4 @@ ManiasHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, -1 diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index 150663802..e7a14fce1 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -38,7 +38,7 @@ MountMoonGiftShop_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRAMPS, 7, 8, $6, $0, 255, 1, $0, 0, GrampsScript_0x771a8, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 7, 8, $6, $0, 255, 1, $0, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, -1 + person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, -1 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 6fdf6f011..f95b5d66b 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -160,13 +160,13 @@ MountMortar1FInside_MapEventHeader: ; people-events db 10 - person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, -1 person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, EVENT_67D person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, EVENT_67E person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, EVENT_67F person_event SPRITE_POKE_BALL, 24, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de82, EVENT_7A6 person_event SPRITE_POKE_BALL, 23, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de84, EVENT_7A7 - person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, -1 + person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, -1 person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, EVENT_7C8 person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, EVENT_7C9 diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 90baf5be7..378d90e1b 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -99,4 +99,4 @@ MountMortar2FInside_MapEventHeader: person_event SPRITE_POKE_BALL, 9, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e4, EVENT_683 person_event SPRITE_POKE_BALL, 15, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e6, EVENT_684 person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, EVENT_685 - person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index fe74309f5..6aae2afd0 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -147,8 +147,8 @@ MountMortarB1F_MapEventHeader: db 7 person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, EVENT_686 person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, EVENT_687 - person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, EVENT_ALWAYS_THERE - person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, -1 + person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, -1 person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, EVENT_7CA person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, EVENT_7CB person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, EVENT_7CC diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 71534cedf..1212fd579 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -35,4 +35,4 @@ MoveDeletersHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index a37864af8..7923cc77c 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -91,8 +91,8 @@ MrFujisHouse_MapEventHeader: ; people-events db 5 - person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, EVENT_ALWAYS_THERE - person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, EVENT_ALWAYS_THERE - person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, EVENT_ALWAYS_THERE - person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, -1 + person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, -1 + person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, -1 + person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, -1 + person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index d6d9dd29f..f8a758907 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -392,5 +392,5 @@ MrPokemonsHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, -1 person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C9 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 2e507fb1c..0a4c811aa 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -63,4 +63,4 @@ MrPsychicsHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 06deebd64..dd9f350a1 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -586,17 +586,17 @@ NationalPark_MapEventHeader: ; people-events db 14 - person_event SPRITE_LASS, 28, 19, $5, $1, 255, 255, $a0, 0, LassScript_0x5c002, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 8, 18, $6, $0, 255, 255, $0, 0, PokefanFScript_0x5c005, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 44, 31, $6, $0, 255, 255, $a0, 0, TeacherScript_0x5c008, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 45, 15, $8, $0, 255, 255, $0, 0, YoungsterScript_0x5c023, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 45, 14, $6, $0, 255, 255, $80, 0, YoungsterScript_0x5c026, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 45, 21, $2, $21, 255, 255, $0, 0, TeacherScript_0x5c029, EVENT_ALWAYS_THERE - person_event SPRITE_GROWLITHE, 44, 30, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x5c02c, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 28, 19, $5, $1, 255, 255, $a0, 0, LassScript_0x5c002, -1 + person_event SPRITE_POKEFAN_F, 8, 18, $6, $0, 255, 255, $0, 0, PokefanFScript_0x5c005, -1 + person_event SPRITE_TEACHER, 44, 31, $6, $0, 255, 255, $a0, 0, TeacherScript_0x5c008, -1 + person_event SPRITE_YOUNGSTER, 45, 15, $8, $0, 255, 255, $0, 0, YoungsterScript_0x5c023, -1 + person_event SPRITE_YOUNGSTER, 45, 14, $6, $0, 255, 255, $80, 0, YoungsterScript_0x5c026, -1 + person_event SPRITE_TEACHER, 45, 21, $2, $21, 255, 255, $0, 0, TeacherScript_0x5c029, -1 + person_event SPRITE_GROWLITHE, 44, 30, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x5c02c, -1 + person_event SPRITE_YOUNGSTER, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, -1 + person_event SPRITE_POKEFAN_F, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, -1 + person_event SPRITE_POKEFAN_M, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, -1 + person_event SPRITE_LASS, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, -1 person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1cc, EVENT_658 - person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, EVENT_ALWAYS_THERE + person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, -1 person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, EVENT_659 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index c5c22b1f7..0723dcf73 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -305,6 +305,6 @@ NewBarkTown_MapEventHeader: ; people-events db 3 - person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, -1 + person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, -1 person_event SPRITE_SILVER, 6, 7, $9, $0, 255, 255, $0, 0, SilverScript_0x1a809e, EVENT_6BD diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 88fd61743..2552601cb 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -283,7 +283,7 @@ OaksLab_MapEventHeader: ; people-events db 4 - person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, EVENT_ALWAYS_THERE - person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, EVENT_ALWAYS_THERE - person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, EVENT_ALWAYS_THERE - person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, EVENT_ALWAYS_THERE + person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, -1 + person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, -1 + person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, -1 + person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index b004c1aa4..8630bc424 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -90,6 +90,6 @@ OlivineCafe_MapEventHeader: ; people-events db 3 - person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, EVENT_ALWAYS_THERE - person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, EVENT_ALWAYS_THERE - person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, -1 + person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, -1 + person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 74529a650..302bc8730 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -320,7 +320,7 @@ OlivineCity_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAILOR, 31, 30, $4, $10, 255, 255, $0, 0, SailorScript_0x1a88a3, EVENT_ALWAYS_THERE - person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, EVENT_ALWAYS_THERE - person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 31, 30, $4, $10, 255, 255, $0, 0, SailorScript_0x1a88a3, -1 + person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, -1 + person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, -1 person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C3 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index 499c4d2cb..b001caf4b 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -96,4 +96,4 @@ OlivineGoodRodHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index 80e1d7069..d5bea3769 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -213,4 +213,4 @@ OlivineGym_MapEventHeader: ; people-events db 2 person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, EVENT_6D3 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index c63a94ab2..fa11a91a4 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -54,5 +54,5 @@ OlivineHouseBeta_MapEventHeader: ; people-events db 2 - person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, EVENT_ALWAYS_THERE - person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, -1 + person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 94b5b8cdd..093292b1a 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -52,5 +52,5 @@ OlivineLighthouse1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, -1 + person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index adedbd308..09b7f7db3 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -253,5 +253,5 @@ OlivineLighthouse2F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, -1 + person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index b638988f0..81f718406 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -178,7 +178,7 @@ OlivineLighthouse3F_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAILOR, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, -1 + person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, -1 + person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, -1 person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, EVENT_664 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index dc4b17f00..497917a69 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -134,5 +134,5 @@ OlivineLighthouse4F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, -1 + person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index c334a9834..3d667716f 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -140,8 +140,8 @@ OlivineLighthouse5F_MapEventHeader: ; people-events db 5 - person_event SPRITE_SAILOR, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, -1 + person_event SPRITE_YOUNGSTER, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, -1 person_event SPRITE_POKE_BALL, 16, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x609aa, EVENT_665 person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, EVENT_666 person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, EVENT_667 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 494061e54..2705159d3 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -271,5 +271,5 @@ OlivineLighthouse6F_MapEventHeader: ; people-events db 3 person_event SPRITE_JASMINE, 12, 12, $6, $0, 255, 255, $80, 0, JasmineScript_0x60b91, EVENT_6D2 - person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, EVENT_ALWAYS_THERE + person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, -1 person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, EVENT_668 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index b863ced50..8bcca8c3f 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -57,6 +57,6 @@ OlivineMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, -1 + person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, -1 diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index 3e027c791..714d73e78 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -59,7 +59,7 @@ OlivinePokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9c002, EVENT_ALWAYS_THERE - person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9c002, -1 + person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, -1 + person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, -1 + person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, -1 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 0336d4315..8628ef005 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -54,5 +54,5 @@ OlivinePunishmentSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, -1 + person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index 292b921b3..afa61ee12 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -35,4 +35,4 @@ OlivineVoltorbHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 4546c151a..7e152f5de 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -89,5 +89,5 @@ PalletTown_MapEventHeader: ; people-events db 2 - person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, -1 + person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 796f1ca31..1ee798544 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -174,8 +174,8 @@ PewterCity_MapEventHeader: ; people-events db 5 - person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, -1 + person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, -1 + person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, -1 + person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, -1 + person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index b463de131..4844a22b2 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -238,6 +238,6 @@ PewterGym_MapEventHeader: ; people-events db 3 - person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, -1 + person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, -1 + person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index 7602cc0e8..b086900a1 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -57,6 +57,6 @@ PewterMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, -1 + person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, -1 + person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 2be909c76..29a599206 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -41,5 +41,5 @@ PewterNidoranSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, EVENT_ALWAYS_THERE - person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, -1 + person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, -1 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index bb912252d..1415ad5dc 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -78,8 +78,8 @@ PewterPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, EVENT_ALWAYS_THERE - person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, -1 + person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, -1 + person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, -1 + person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, -1 + person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, -1 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index 985a4323c..b5ce7c400 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -36,4 +36,4 @@ PewterSnoozeSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, -1 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 433a5e85d..60f7310b0 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -1040,7 +1040,7 @@ PokeCenter2F_MapEventHeader: ; people-events db 4 - person_event SPRITE_LINK_RECEPTIONIST, 6, 9, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x19289d, EVENT_ALWAYS_THERE - person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, EVENT_ALWAYS_THERE - person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, EVENT_ALWAYS_THERE + person_event SPRITE_LINK_RECEPTIONIST, 6, 9, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x19289d, -1 + person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, -1 + person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, -1 person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, EVENT_711 diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index d9fd546c7..d02a50549 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -30,4 +30,4 @@ PokeSeersHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 2905ef956..79a58e025 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -307,9 +307,9 @@ PokemonFanClub_MapEventHeader: ; people-events db 6 - person_event SPRITE_GENTLEMAN, 5, 7, $6, $0, 255, 255, $0, 0, GentlemanScript_0x1917e9, EVENT_ALWAYS_THERE - person_event SPRITE_RECEPTIONIST, 5, 8, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x191821, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 7, 6, $9, $0, 255, 255, $0, 0, FisherScript_0x191824, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 5, 7, $6, $0, 255, 255, $0, 0, GentlemanScript_0x1917e9, -1 + person_event SPRITE_RECEPTIONIST, 5, 8, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x191821, -1 + person_event SPRITE_FISHER, 7, 6, $9, $0, 255, 255, $0, 0, FisherScript_0x191824, -1 + person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, -1 person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, EVENT_774 - person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, EVENT_ALWAYS_THERE + person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 06e60921f..0ee68c71d 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -401,10 +401,10 @@ PowerPlant_MapEventHeader: ; people-events db 7 - person_event SPRITE_OFFICER, 18, 8, $6, $0, 255, 255, $a0, 0, OfficerScript_0x188df5, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 13, 6, $3, $0, 255, 255, $90, 0, GymGuyScript_0x188e15, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, EVENT_ALWAYS_THERE - person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 18, 8, $6, $0, 255, 255, $a0, 0, OfficerScript_0x188df5, -1 + person_event SPRITE_GYM_GUY, 13, 6, $3, $0, 255, 255, $90, 0, GymGuyScript_0x188e15, -1 + person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, -1 + person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, -1 + person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, -1 + person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, -1 + person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 57beb1f22..a51b48c13 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -500,7 +500,7 @@ RadioTower1F_MapEventHeader: ; people-events db 6 - person_event SPRITE_RECEPTIONIST, 10, 9, $8, $0, 255, 255, $80, 0, ReceptionistScript_0x5cd29, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 10, 9, $8, $0, 255, 255, $80, 0, ReceptionistScript_0x5cd29, -1 person_event SPRITE_LASS, 8, 20, $8, $0, 255, 255, $80, 0, LassScript_0x5ce51, EVENT_6CF person_event SPRITE_YOUNGSTER, 8, 19, $9, $0, 255, 255, $90, 0, YoungsterScript_0x5ce54, EVENT_6CF person_event SPRITE_ROCKET, 5, 18, $6, $0, 255, 255, $2, 3, TrainerGruntM3, EVENT_6CE diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 826e8a9cb..f0933aae1 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -785,13 +785,13 @@ RadioTower2F_MapEventHeader: ; people-events db 11 person_event SPRITE_SUPER_NERD, 10, 10, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x5d6fe, EVENT_6CF - person_event SPRITE_TEACHER, 6, 21, $5, $1, 255, 255, $80, 0, TeacherScript_0x5d701, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 6, 21, $5, $1, 255, 255, $80, 0, TeacherScript_0x5d701, -1 person_event SPRITE_ROCKET, 8, 5, $7, $0, 255, 255, $2, 3, TrainerGruntM4, EVENT_6CE person_event SPRITE_ROCKET, 8, 12, $6, $0, 255, 255, $2, 3, TrainerGruntM5, EVENT_6CE person_event SPRITE_ROCKET, 5, 8, $6, $0, 255, 255, $2, 2, TrainerGruntM6, EVENT_6CE person_event SPRITE_ROCKET_GIRL, 9, 14, $7, $0, 255, 255, $82, 3, TrainerGruntF2, EVENT_6CE person_event SPRITE_BLACK_BELT, 5, 4, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d71f, EVENT_6D1 person_event SPRITE_BLACK_BELT, 5, 5, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d722, EVENT_6D0 - person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, EVENT_ALWAYS_THERE + person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, -1 + person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, -1 person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, EVENT_6CF diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index a81ab5a86..f504583e1 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -408,8 +408,8 @@ RadioTower3F_MapEventHeader: ; people-events db 7 person_event SPRITE_SUPER_NERD, 8, 11, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x5e553, EVENT_6D0 - person_event SPRITE_GYM_GUY, 8, 7, $a, $0, 255, 255, $80, 0, GymGuyScript_0x5e556, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 7, 15, $2, $11, 255, 255, $a0, 0, CooltrainerFScript_0x5e56a, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 8, 7, $a, $0, 255, 255, $80, 0, GymGuyScript_0x5e556, -1 + person_event SPRITE_COOLTRAINER_F, 7, 15, $2, $11, 255, 255, $a0, 0, CooltrainerFScript_0x5e56a, -1 person_event SPRITE_ROCKET, 5, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM7, EVENT_6CE person_event SPRITE_ROCKET, 6, 10, $6, $0, 255, 255, $2, 3, TrainerGruntM8, EVENT_6CE person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, EVENT_6CE diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 6828c65d4..0bcddf8bb 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -322,8 +322,8 @@ RadioTower4F_MapEventHeader: ; people-events db 7 person_event SPRITE_FISHER, 8, 10, $7, $0, 255, 255, $80, 0, FisherScript_0x5eb82, EVENT_6D0 - person_event SPRITE_TEACHER, 10, 18, $3, $0, 255, 255, $a0, 0, TeacherScript_0x5eb85, EVENT_ALWAYS_THERE - person_event SPRITE_GROWLITHE, 11, 16, $16, $0, 255, 255, $80, 0, GrowlitheScript_0x5ebb2, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 10, 18, $3, $0, 255, 255, $a0, 0, TeacherScript_0x5eb85, -1 + person_event SPRITE_GROWLITHE, 11, 16, $16, $0, 255, 255, $80, 0, GrowlitheScript_0x5ebb2, -1 person_event SPRITE_ROCKET, 10, 9, $1f, $0, 255, 255, $2, 3, TrainerGruntM10, EVENT_6CE person_event SPRITE_ROCKET, 5, 18, $8, $2, 255, 255, $2, 2, TrainerExecutivem2, EVENT_6CE person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, EVENT_6CE diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 57442a0ca..1811692a5 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -455,7 +455,7 @@ RadioTower5F_MapEventHeader: ; people-events db 5 - person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, -1 person_event SPRITE_ROCKET, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6CE person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, EVENT_6CE person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, Ben, EVENT_6D0 diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index cfb28b1d3..80f5ecf59 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -94,4 +94,4 @@ RedsHouse1F_MapEventHeader: ; people-events db 1 - person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, EVENT_ALWAYS_THERE + person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, -1 diff --git a/maps/Route1.asm b/maps/Route1.asm index 1356c16a6..6167b9eef 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -123,6 +123,6 @@ Route1_MapEventHeader: ; people-events db 3 - person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, -1 + person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, -1 + person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, -1 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index e45e9c590..fba6dc384 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -92,7 +92,7 @@ Route10PokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x188bd4, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x188bd4, -1 + person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, -1 + person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, -1 + person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, -1 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 282697549..96c37b4e4 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -120,5 +120,5 @@ Route10South_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, -1 + person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index bbdb1ca05..f18707d0b 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -221,8 +221,8 @@ Route11_MapEventHeader: ; people-events db 5 - person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, -1 + person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, -1 + person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, -1 + person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, -1 + person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index 738863f3e..7500bad90 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -243,9 +243,9 @@ Route12_MapEventHeader: ; people-events db 6 - person_event SPRITE_FISHER, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, -1 + person_event SPRITE_FISHER, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, -1 + person_event SPRITE_FISHER, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, -1 + person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, -1 person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, EVENT_788 person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, EVENT_789 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 2a2d1e6f1..81675c921 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -93,4 +93,4 @@ Route12SuperRodHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 0751af7c1..842580f78 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -285,8 +285,8 @@ Route13_MapEventHeader: ; people-events db 5 - person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, -1 + person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, -1 + person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, -1 + person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, -1 + person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 9e6d51a81..1db2b2738 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -172,7 +172,7 @@ Route14_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, -1 + person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, -1 + person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, -1 + person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index 4b05124d0..6626ae41c 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -306,10 +306,10 @@ Route15_MapEventHeader: ; people-events db 7 - person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, -1 + person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, -1 + person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, -1 + person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, -1 + person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, -1 + person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, -1 person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, EVENT_78A diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index 0a785fcaa..c29e3d558 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -35,4 +35,4 @@ Route15FuchsiaGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, -1 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 1f76b6d9e..261c0af0d 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -38,4 +38,4 @@ Route16FuchsiaSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 137056aa5..98ba1ccf5 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -80,4 +80,4 @@ Route16Gate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index c49958fbc..f3d24c2b3 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -216,7 +216,7 @@ Route17_MapEventHeader: ; people-events db 4 - person_event SPRITE_BIKER, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, EVENT_ALWAYS_THERE - person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, EVENT_ALWAYS_THERE - person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, EVENT_ALWAYS_THERE - person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, EVENT_ALWAYS_THERE + person_event SPRITE_BIKER, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, -1 + person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, -1 + person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, -1 + person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, -1 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 419e9a723..1a89d8951 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -71,4 +71,4 @@ Route1718Gate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 7cee09d74..5724f0535 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -123,5 +123,5 @@ Route18_MapEventHeader: ; people-events db 2 - person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, -1 + person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index 608dbad13..184486610 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -311,9 +311,9 @@ Route19_MapEventHeader: ; people-events db 6 - person_event SPRITE_SWIMMER_GIRL, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GUY, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GUY, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, -1 + person_event SPRITE_SWIMMER_GUY, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, -1 + person_event SPRITE_SWIMMER_GUY, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, -1 + person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, -1 + person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, -1 + person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index d79aafc3a..b6b913376 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -61,4 +61,4 @@ Route19FuchsiaGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 1c7edf586..4b35a30f2 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -218,11 +218,11 @@ Route2_MapEventHeader: ; people-events db 8 - person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, EVENT_ALWAYS_THERE + person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, -1 + person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, -1 + person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, -1 person_event SPRITE_POKE_BALL, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, EVENT_783 person_event SPRITE_POKE_BALL, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, EVENT_784 person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, EVENT_785 person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, EVENT_786 - person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index 1a4dac787..8846fb7ce 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -175,6 +175,6 @@ Route20_MapEventHeader: ; people-events db 3 - person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, -1 + person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, -1 + person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index 1c82fb161..fe96e5bce 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -147,6 +147,6 @@ Route21_MapEventHeader: ; people-events db 3 - person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, EVENT_ALWAYS_THERE + person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, -1 + person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, -1 + person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, -1 diff --git a/maps/Route25.asm b/maps/Route25.asm index a0f257cc3..662dbb7e0 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -554,12 +554,12 @@ Route25_MapEventHeader: db 11 person_event SPRITE_MISTY, 13, 50, $8, $0, 255, 255, $80, 0, ObjectEvent, EVENT_76E person_event SPRITE_COOLTRAINER_M, 14, 50, $8, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_76E - person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, -1 + person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, -1 + person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, -1 + person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, -1 + person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, -1 + person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, -1 + person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, -1 + person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, -1 person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, EVENT_78B diff --git a/maps/Route26.asm b/maps/Route26.asm index 7ae9c6fd1..9daa11e14 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -517,11 +517,11 @@ Route26_MapEventHeader: ; people-events db 8 - person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, -1 + person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, -1 + person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, -1 + person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, -1 + person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, -1 + person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, -1 + person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, -1 person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, EVENT_6AA diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index 0c3378c6a..fdae9b3a8 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -84,4 +84,4 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, EVENT_ALWAYS_THERE + person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, -1 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index c9d14e7ee..ac31d6055 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -64,4 +64,4 @@ Route26HealSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index a653a6338..7ccdb3625 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -575,12 +575,12 @@ Route27_MapEventHeader: ; people-events db 9 - person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, -1 + person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, -1 + person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena, -1 + person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, -1 + person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, -1 + person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, -1 person_event SPRITE_POKE_BALL, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, EVENT_6AB person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, EVENT_6AC - person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index e25cf8331..6e2bec168 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -109,4 +109,4 @@ Route27SandstormHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 181289a86..a95d08063 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -87,5 +87,5 @@ Route28FamousSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, EVENT_ALWAYS_THERE - person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, -1 + person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 6bfeee660..2b5879136 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -430,11 +430,11 @@ Route29_MapEventHeader: ; people-events db 8 - person_event SPRITE_COOLTRAINER_M, 16, 54, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a0ff1, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 20, 31, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x1a1028, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 15, 19, $5, $1, 255, 255, $a0, 0, TeacherScript_0x1a102b, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_M, 16, 54, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a0ff1, -1 + person_event SPRITE_YOUNGSTER, 20, 31, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x1a1028, -1 + person_event SPRITE_TEACHER, 15, 19, $5, $1, 255, 255, $a0, 0, TeacherScript_0x1a102b, -1 + person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, -1 + person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, -1 + person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, -1 person_event SPRITE_TEACHER, 16, 33, $3, $0, 255, 255, $0, 0, TuscanyScript, EVENT_759 person_event SPRITE_POKE_BALL, 6, 52, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a108b, EVENT_6AD diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index 6eca79acb..b0aafb185 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -51,5 +51,5 @@ Route2946Gate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, -1 + person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index 6cc1a1359..a7d74403d 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -41,4 +41,4 @@ Route2Gate_MapEventHeader: ; people-events db 1 - person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, -1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 31910c71d..9ce3a5330 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -66,4 +66,4 @@ Route2NuggetSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index aa2200915..e9b310003 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -207,7 +207,7 @@ Route3_MapEventHeader: ; people-events db 4 - person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, -1 + person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, -1 + person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, -1 + person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index 885c80a69..7b6e4a770 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -467,12 +467,12 @@ Route30_MapEventHeader: db 11 person_event SPRITE_YOUNGSTER, 30, 9, $7, $0, 255, 255, $90, 0, YoungsterScript_0x1a1673, EVENT_714 person_event SPRITE_YOUNGSTER, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey, EVENT_715 - person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, -1 + person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, -1 + person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, -1 person_event SPRITE_MONSTER, 28, 9, $6, $0, 255, 255, $80, 0, ObjectEvent, EVENT_714 person_event SPRITE_MONSTER, 29, 9, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_714 - person_event SPRITE_FRUIT_TREE, 43, 9, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f7, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 43, 9, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f7, -1 + person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, -1 + person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, -1 person_event SPRITE_POKE_BALL, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, EVENT_7B8 diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index 575801af3..e17bd15e2 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -62,4 +62,4 @@ Route30BerrySpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index 4b528f5b6..0845048c7 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -446,10 +446,10 @@ Route31_MapEventHeader: ; people-events db 7 - person_event SPRITE_FISHER, 11, 21, $6, $0, 255, 255, $0, 0, FisherScript_0x1a5570, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 9, 13, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1a55ed, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 12, 37, $2, $11, 255, 255, $0, 0, CooltrainerMScript_0x1a55f6, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 11, 21, $6, $0, 255, 255, $0, 0, FisherScript_0x1a5570, -1 + person_event SPRITE_YOUNGSTER, 9, 13, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1a55ed, -1 + person_event SPRITE_BUG_CATCHER, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, -1 + person_event SPRITE_COOLTRAINER_M, 12, 37, $2, $11, 255, 255, $0, 0, CooltrainerMScript_0x1a55f6, -1 + person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, -1 person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, EVENT_6AE person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, EVENT_6AF diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index 898df844d..a2a2974ff 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -42,5 +42,5 @@ Route31VioletGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, -1 + person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index 9c5f0f9c3..0ef0f9fab 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1076,17 +1076,17 @@ Route32_MapEventHeader: ; people-events db 14 - person_event SPRITE_FISHER, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 12, 23, $8, $0, 255, 255, $0, 0, CooltrainerMScript_0x19046f, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, -1 + person_event SPRITE_FISHER, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, -1 + person_event SPRITE_FISHER, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, -1 + person_event SPRITE_YOUNGSTER, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, -1 + person_event SPRITE_YOUNGSTER, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, -1 + person_event SPRITE_YOUNGSTER, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, -1 + person_event SPRITE_LASS, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, -1 + person_event SPRITE_COOLTRAINER_M, 12, 23, $8, $0, 255, 255, $0, 0, CooltrainerMScript_0x19046f, -1 + person_event SPRITE_YOUNGSTER, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, -1 person_event SPRITE_FISHER, 74, 11, $6, $0, 255, 255, $0, 0, FisherScript_0x1904f2, EVENT_6FC person_event SPRITE_POKE_BALL, 57, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x190773, EVENT_6B0 - person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, -1 person_event SPRITE_LASS, 71, 16, $8, $0, 255, 255, $0, 0, FriedaScript, EVENT_758 person_event SPRITE_POKE_BALL, 34, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x190775, EVENT_6B1 diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 0bf6bc4c2..979f99b3b 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -107,6 +107,6 @@ Route32PokeCenter1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, EVENT_ALWAYS_THERE - person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, -1 + person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, -1 diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 0763577a6..6b3605435 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, -1 + person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, -1 + person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index c253e359d..3554f4189 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -222,6 +222,6 @@ Route33_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony, -1 + person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, -1 + person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index 611fb5cea..035d16bc4 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -905,16 +905,16 @@ Route34_MapEventHeader: ; people-events db 13 - person_event SPRITE_YOUNGSTER, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, EVENT_ALWAYS_THERE - person_event SPRITE_OFFICER, 15, 13, $6, $0, 255, 255, $90, 0, OfficerScript_0x7824c, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, -1 + person_event SPRITE_YOUNGSTER, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, -1 + person_event SPRITE_YOUNGSTER, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, -1 + person_event SPRITE_LASS, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, -1 + person_event SPRITE_OFFICER, 15, 13, $6, $0, 255, 255, $90, 0, OfficerScript_0x7824c, -1 + person_event SPRITE_POKEFAN_M, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, -1 person_event SPRITE_GRAMPS, 20, 19, $6, $0, 255, 255, $0, 0, GrampsScript_0x7803d, EVENT_6E6 person_event SPRITE_DAYCARE_MON_1, 22, 18, $16, $22, 255, 255, $0, 0, DaycareMon1Script_0x78065, EVENT_6E7 person_event SPRITE_DAYCARE_MON_2, 23, 21, $16, $22, 255, 255, $0, 0, DaycareMon2Script_0x7806b, EVENT_6E8 - person_event SPRITE_COOLTRAINER_F, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, EVENT_ALWAYS_THERE + person_event SPRITE_COOLTRAINER_F, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, -1 + person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, -1 + person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, -1 person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, EVENT_7BC diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index da2aecc6d..51e160e08 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -153,6 +153,6 @@ Route34IlexForestGate_MapEventHeader: ; people-events db 4 person_event SPRITE_TEACHER, 7, 13, $8, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EA - person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, EVENT_ALWAYS_THERE + person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, -1 person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, EVENT_6EB person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EC diff --git a/maps/Route35.asm b/maps/Route35.asm index 178662f47..d66302c29 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -597,14 +597,14 @@ Route35_MapEventHeader: ; people-events db 11 - person_event SPRITE_YOUNGSTER, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin, EVENT_ALWAYS_THERE - person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, -1 + person_event SPRITE_YOUNGSTER, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, -1 + person_event SPRITE_LASS, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, -1 + person_event SPRITE_LASS, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, -1 + person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, -1 + person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, -1 + person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, -1 + person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin, -1 + person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, -1 + person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, -1 person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, EVENT_6B2 diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index 91885ee73..c510f82db 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -209,6 +209,6 @@ Route35Goldenrodgate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, -1 + person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, -1 + person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, -1 diff --git a/maps/Route36.asm b/maps/Route36.asm index ea6dd1983..94847c31d 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -711,12 +711,12 @@ Route36_MapEventHeader: ; people-events db 9 - person_event SPRITE_YOUNGSTER, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, -1 + person_event SPRITE_YOUNGSTER, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, -1 person_event SPRITE_WEIRD_TREE, 13, 39, $17, $0, 255, 255, $0, 0, WeirdTreeScript_0x19403c, EVENT_6F8 - person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, -1 + person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, -1 + person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, -1 person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, ArthurScript, EVENT_75A person_event SPRITE_LASS, 16, 37, $6, $0, 255, 255, $90, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO person_event SPRITE_SUICUNE, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 1ea9ea9d1..7afba4134 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -49,5 +49,5 @@ Route36RuinsofAlphgate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, -1 + person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index 0bce00e08..d1a0369b9 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -298,10 +298,10 @@ Route37_MapEventHeader: ; people-events db 7 - person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, EVENT_ALWAYS_THERE - person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, EVENT_ALWAYS_THERE + person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, -1 + person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, -1 + person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, -1 + person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, -1 person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, SunnyScript, EVENT_75B - person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, EVENT_ALWAYS_THERE + person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, -1 + person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index e16c8748d..d7f61b22b 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -578,10 +578,10 @@ Route38_MapEventHeader: ; people-events db 7 - person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, EVENT_ALWAYS_THERE - person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, EVENT_ALWAYS_THERE - person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, EVENT_ALWAYS_THERE + person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, -1 + person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, -1 + person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, -1 + person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, -1 + person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, -1 + person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, -1 + person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index b7dbf4c4c..c0ead38aa 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -40,4 +40,4 @@ Route38EcruteakGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index 0fcdccdff..dc416a395 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -418,13 +418,13 @@ Route39_MapEventHeader: ; people-events db 10 - person_event SPRITE_SAILOR, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, EVENT_ALWAYS_THERE - person_event SPRITE_TAUROS, 16, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE - person_event SPRITE_TAUROS, 15, 10, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE - person_event SPRITE_TAUROS, 19, 8, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE - person_event SPRITE_TAUROS, 17, 12, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE - person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, -1 + person_event SPRITE_POKEFAN_M, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, -1 + person_event SPRITE_POKEFAN_F, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, -1 + person_event SPRITE_TAUROS, 16, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_TAUROS, 15, 10, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_TAUROS, 19, 8, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_TAUROS, 17, 12, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, -1 + person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, -1 + person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 61614638c..305b49f47 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -200,6 +200,6 @@ Route39Barn_MapEventHeader: ; people-events db 3 - person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, EVENT_ALWAYS_THERE - person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, EVENT_ALWAYS_THERE - person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, -1 + person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, -1 + person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index ff07f1bc0..c068cb65c 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -207,5 +207,5 @@ Route39Farmhouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, -1 + person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index d05500032..cb5069682 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -182,7 +182,7 @@ Route4_MapEventHeader: ; people-events db 4 - person_event SPRITE_YOUNGSTER, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, -1 + person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, -1 + person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, -1 person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, EVENT_787 diff --git a/maps/Route40.asm b/maps/Route40.asm index bdc3fdd64..9f8d5ea4e 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -409,15 +409,15 @@ Route40_MapEventHeader: ; people-events db 12 - person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, EVENT_ALWAYS_THERE - person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, EVENT_ALWAYS_THERE - person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, EVENT_ALWAYS_THERE + person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, -1 + person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, -1 + person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, -1 + person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, -1 + person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, -1 + person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, -1 + person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, -1 + person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, -1 person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, EVENT_75E - person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, -1 + person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, -1 person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, $0, 255, 255, $90, 0, StandingYoungsterScript_0x1a61d6, EVENT_7CF diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 2497ff22a..4f0d33d0b 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -89,4 +89,4 @@ Route40BattleTowerGate_MapEventHeader: ; people-events db 2 person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, EVENT_7CF - person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, EVENT_ALWAYS_THERE + person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index b005f9bbb..1c626decb 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -510,13 +510,13 @@ Route41_MapEventHeader: ; people-events db 10 - person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, EVENT_ALWAYS_THERE - person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, EVENT_ALWAYS_THERE - person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, EVENT_ALWAYS_THERE - person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, EVENT_ALWAYS_THERE - person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, EVENT_ALWAYS_THERE - person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, EVENT_ALWAYS_THERE + person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, -1 + person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, -1 + person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, -1 + person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, -1 + person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, -1 + person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, -1 + person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, -1 + person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, -1 + person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, -1 + person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index 51fe3fbd0..0e8aa15b5 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -385,12 +385,12 @@ Route42_MapEventHeader: ; people-events db 9 - person_event SPRITE_FISHER, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 20, 31, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934d, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 20, 32, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934f, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 20, 33, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9351, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, -1 + person_event SPRITE_POKEFAN_M, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, -1 + person_event SPRITE_SUPER_NERD, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, -1 + person_event SPRITE_FRUIT_TREE, 20, 31, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934d, -1 + person_event SPRITE_FRUIT_TREE, 20, 32, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934f, -1 + person_event SPRITE_FRUIT_TREE, 20, 33, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9351, -1 person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a9349, EVENT_6B3 person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, EVENT_6B4 person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 4716ee622..49223e042 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -35,4 +35,4 @@ Route42EcruteakGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index fdc699f36..f0f69247a 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -612,11 +612,11 @@ Route43_MapEventHeader: ; people-events db 8 - person_event SPRITE_SUPER_NERD, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, -1 + person_event SPRITE_SUPER_NERD, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, -1 + person_event SPRITE_SUPER_NERD, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, -1 + person_event SPRITE_FISHER, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, -1 + person_event SPRITE_LASS, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, -1 + person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, -1 + person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, -1 person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, EVENT_6B5 diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 35ca6c7e9..183f7a461 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -54,4 +54,4 @@ Route43MahoganyGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index 9ba4f2766..b8209fc07 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -626,14 +626,14 @@ Route44_MapEventHeader: ; people-events db 11 - person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, EVENT_ALWAYS_THERE + person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, -1 + person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, -1 + person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, -1 + person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, -1 + person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, -1 + person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, -1 + person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, -1 + person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, -1 person_event SPRITE_POKE_BALL, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, EVENT_6B6 person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, EVENT_6B7 person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, EVENT_7BD diff --git a/maps/Route45.asm b/maps/Route45.asm index ea1db1892..71a9ed5e2 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -648,16 +648,16 @@ Route45_MapEventHeader: ; people-events db 13 - person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, EVENT_ALWAYS_THERE - person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, -1 + person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, -1 + person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, -1 + person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, -1 + person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, -1 + person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, -1 + person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, -1 + person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, -1 person_event SPRITE_POKE_BALL, 55, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e296, EVENT_6B8 person_event SPRITE_POKE_BALL, 70, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e298, EVENT_6B9 person_event SPRITE_POKE_BALL, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, EVENT_6BA person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, EVENT_6BB - person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 477daa274..28e7fc957 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -309,9 +309,9 @@ Route46_MapEventHeader: ; people-events db 6 - person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, -1 + person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, -1 + person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, -1 + person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, -1 + person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, -1 person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, EVENT_6BC diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index cdaf384d6..c32ab7162 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -75,5 +75,5 @@ Route5CleanseTagSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, EVENT_ALWAYS_THERE + person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, -1 + person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, -1 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 5503bf9f7..005250c65 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -36,4 +36,4 @@ Route5SaffronCityGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, -1 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index eff082181..fce246121 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -34,4 +34,4 @@ Route5UndergroundEntrance_MapEventHeader: ; people-events db 1 - person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 8399d1648..0b6787dd5 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -137,5 +137,5 @@ Route6_MapEventHeader: ; people-events db 3 person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, EVENT_771 - person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, -1 + person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 290427057..9a0fb3bee 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -75,4 +75,4 @@ Route6SaffronGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, -1 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 830ec2642..51166b707 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -61,4 +61,4 @@ Route7SaffronGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index 83e0a5d4d..c0bf7e8a2 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -263,9 +263,9 @@ Route8_MapEventHeader: ; people-events db 6 - person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, EVENT_ALWAYS_THERE - person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, EVENT_ALWAYS_THERE - person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, EVENT_ALWAYS_THERE + person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, -1 + person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, -1 + person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, -1 + person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, -1 + person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, -1 + person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index f9a806cb6..a19d8ad5e 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -35,4 +35,4 @@ Route8SaffronGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index 5126879d6..47738a798 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -313,9 +313,9 @@ Route9_MapEventHeader: ; people-events db 6 - person_event SPRITE_YOUNGSTER, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, -1 + person_event SPRITE_LASS, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, -1 + person_event SPRITE_YOUNGSTER, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, -1 + person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, -1 + person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, -1 + person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, -1 diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 34950409c..0c46a3b21 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -285,4 +285,4 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; people-events db 2 person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, EVENT_74E - person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index b667ef956..5ce6838e4 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -343,7 +343,7 @@ RuinsofAlphOutside_MapEventHeader: ; people-events db 5 - person_event SPRITE_YOUNGSTER, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, EVENT_ALWAYS_THERE + person_event SPRITE_YOUNGSTER, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, -1 person_event SPRITE_SCIENTIST, 19, 15, $7, $0, 255, 255, $0, 0, ScientistScript_0x58043, EVENT_703 person_event SPRITE_FISHER, 21, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x58061, EVENT_78E person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, EVENT_78F diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 172f2deac..2f663809f 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -412,6 +412,6 @@ RuinsofAlphResearchCenter_MapEventHeader: ; people-events db 3 - person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, EVENT_ALWAYS_THERE - person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, EVENT_ALWAYS_THERE + person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, -1 + person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, -1 person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, EVENT_704 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 9bb07b23a..0ad49c827 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -94,4 +94,4 @@ SafariZoneWardensHome_MapEventHeader: ; people-events db 1 - person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 616a83203..d155c9abe 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -295,11 +295,11 @@ SaffronCity_MapEventHeader: ; people-events db 8 - person_event SPRITE_LASS, 18, 11, $5, $2, 255, 255, $80, 0, LassScript_0x19932a, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 34, 23, $5, $2, 255, 255, $b0, 0, PokefanMScript_0x19933e, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 11, 36, $5, $1, 255, 255, $a0, 0, CooltrainerMScript_0x199352, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 28, 24, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x199355, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 16, 31, $6, $0, 255, 255, $a0, 0, FisherScript_0x199358, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 18, 11, $5, $2, 255, 255, $80, 0, LassScript_0x19932a, -1 + person_event SPRITE_POKEFAN_M, 34, 23, $5, $2, 255, 255, $b0, 0, PokefanMScript_0x19933e, -1 + person_event SPRITE_COOLTRAINER_M, 11, 36, $5, $1, 255, 255, $a0, 0, CooltrainerMScript_0x199352, -1 + person_event SPRITE_COOLTRAINER_F, 28, 24, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x199355, -1 + person_event SPRITE_FISHER, 16, 31, $6, $0, 255, 255, $a0, 0, FisherScript_0x199358, -1 + person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, -1 + person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, -1 + person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 781e65e49..8cc8e535d 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -394,9 +394,9 @@ SaffronGym_MapEventHeader: ; people-events db 6 - person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, -1 + person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, -1 + person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, -1 + person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, -1 + person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, -1 + person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, -1 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index ad42a2d61..41ddde494 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -49,6 +49,6 @@ SaffronMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, -1 + person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, -1 diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index a2d3d8493..ec70aed5f 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -123,7 +123,7 @@ SaffronPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18a47d, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18a47d, -1 + person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, -1 + person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, -1 + person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, -1 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 30abb5c97..eaf819d1a 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -231,7 +231,7 @@ SaffronTrainStation_MapEventHeader: ; people-events db 4 - person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, -1 + person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, -1 person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, EVENT_772 person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, EVENT_772 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 4854ea1bf..ba2721371 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -171,5 +171,5 @@ SeafoamGym_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, EVENT_ALWAYS_THERE + person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, -1 person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, EVENT_777 diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index d835c65d4..c83298920 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -68,5 +68,5 @@ SilphCo1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, EVENT_ALWAYS_THERE - person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, -1 + person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index cf7edbb8e..a9ad58a70 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -43,5 +43,5 @@ SilverCavePokeCenter1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, -1 + person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, -1 diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 4ee14d49a..a27f0cacb 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -397,5 +397,5 @@ SlowpokeWellB1F_MapEventHeader: person_event SPRITE_SLOWPOKE, 8, 11, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a681, EVENT_6FB person_event SPRITE_SLOWPOKE, 6, 10, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a695, EVENT_6FB person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, EVENT_740 - person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, -1 person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, EVENT_662 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index d7ea706d4..7f2b4d8a4 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -73,5 +73,5 @@ SlowpokeWellB2F_MapEventHeader: ; people-events db 2 - person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, EVENT_ALWAYS_THERE + person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, -1 person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, EVENT_663 diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 0228b8e3e..36aea0ce7 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -83,7 +83,7 @@ SoulHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, -1 + person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, -1 + person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, -1 + person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 1efac515b..8a6c625db 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -132,9 +132,9 @@ SproutTower1F_MapEventHeader: ; people-events db 6 - person_event SPRITE_SAGE, 8, 11, $6, $0, 255, 255, $90, 0, SageScript_0x1844fe, EVENT_ALWAYS_THERE - person_event SPRITE_SAGE, 11, 10, $2, $11, 255, 255, $90, 0, SageScript_0x184501, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 16, 15, $8, $0, 255, 255, $0, 0, GrannyScript_0x184504, EVENT_ALWAYS_THERE - person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, EVENT_ALWAYS_THERE - person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 8, 11, $6, $0, 255, 255, $90, 0, SageScript_0x1844fe, -1 + person_event SPRITE_SAGE, 11, 10, $2, $11, 255, 255, $90, 0, SageScript_0x184501, -1 + person_event SPRITE_GRANNY, 16, 15, $8, $0, 255, 255, $0, 0, GrannyScript_0x184504, -1 + person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, -1 + person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, -1 person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, EVENT_647 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 83f73ab92..9d4230ffb 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -131,6 +131,6 @@ SproutTower2F_MapEventHeader: ; people-events db 3 - person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, EVENT_ALWAYS_THERE - person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, -1 + person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, -1 person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, EVENT_648 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 7487a81f5..c7de575fd 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -393,10 +393,10 @@ SproutTower3F_MapEventHeader: ; people-events db 7 - person_event SPRITE_SAGE, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, EVENT_ALWAYS_THERE - person_event SPRITE_SAGE, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, EVENT_ALWAYS_THERE - person_event SPRITE_SAGE, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, EVENT_ALWAYS_THERE - person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, EVENT_ALWAYS_THERE + person_event SPRITE_SAGE, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, -1 + person_event SPRITE_SAGE, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, -1 + person_event SPRITE_SAGE, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, -1 + person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, -1 person_event SPRITE_POKE_BALL, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, EVENT_649 person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, EVENT_64A person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 17f729299..99c36018b 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -151,8 +151,8 @@ TrainerHouse1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, -1 + person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, -1 + person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, -1 + person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 294ca69be..9d947359a 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -184,5 +184,5 @@ TrainerHouseB1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_ALWAYS_THERE - person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, EVENT_ALWAYS_THERE + person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, -1 + person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, -1 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 2329b1320..f5e8b439e 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -1027,8 +1027,8 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: person_event SPRITE_ROCKET, 6, 15, $6, $0, 255, 255, $2, 3, TrainerGruntM11, EVENT_6CE person_event SPRITE_ROCKET, 6, 7, $6, $0, 255, 255, $2, 3, TrainerGruntM25, EVENT_6CE person_event SPRITE_ROCKET_GIRL, 16, 23, $6, $0, 255, 255, $82, 1, TrainerGruntF3, EVENT_6CE - person_event SPRITE_TEACHER, 31, 7, $6, $0, 255, 255, $0, 0, TeacherScript_0x7ca7d, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 31, 23, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7ca7a, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 31, 7, $6, $0, 255, 255, $0, 0, TeacherScript_0x7ca7d, -1 + person_event SPRITE_SUPER_NERD, 31, 23, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7ca7a, -1 person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7d, EVENT_673 person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, EVENT_674 person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C1 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 641b0677c..f11bf3d76 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -287,11 +287,11 @@ UnionCave1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_POKEFAN_M, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, -1 + person_event SPRITE_SUPER_NERD, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, -1 + person_event SPRITE_POKEFAN_M, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, -1 + person_event SPRITE_FISHER, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, -1 + person_event SPRITE_FISHER, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, -1 person_event SPRITE_POKE_BALL, 25, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c00, EVENT_65A person_event SPRITE_POKE_BALL, 6, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c02, EVENT_65B person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, EVENT_65C diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index 400246a67..c3796bf3b 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -227,10 +227,10 @@ UnionCaveB1F_MapEventHeader: ; people-events db 7 - person_event SPRITE_POKEFAN_M, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, EVENT_ALWAYS_THERE - person_event SPRITE_POKEFAN_M, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, -1 + person_event SPRITE_POKEFAN_M, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, -1 + person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, -1 + person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, -1 person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, EVENT_65E - person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, -1 person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, EVENT_65F diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 4d1050cfa..fca0b24db 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -200,9 +200,9 @@ UnionCaveB2F_MapEventHeader: ; people-events db 6 - person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, EVENT_ALWAYS_THERE + person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, -1 + person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, -1 + person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, -1 person_event SPRITE_POKE_BALL, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, EVENT_660 person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, EVENT_661 person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, EVENT_760 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 0c7c7efb6..e5eda8fee 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -295,9 +295,9 @@ VermilionCity_MapEventHeader: ; people-events db 6 - person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, EVENT_ALWAYS_THERE - person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, -1 + person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, -1 + person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, -1 + person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, -1 person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, VermilionSnorlax, EVENT_770 - person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index 5e4f2ef47..ef9246b3d 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -335,8 +335,8 @@ VermilionGym_MapEventHeader: ; people-events db 5 - person_event SPRITE_SURGE, 6, 9, $6, $0, 255, 255, $b0, 0, SurgeScript_0x1920a5, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, EVENT_ALWAYS_THERE - person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_SURGE, 6, 9, $6, $0, 255, 255, $b0, 0, SurgeScript_0x1920a5, -1 + person_event SPRITE_GENTLEMAN, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, -1 + person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, -1 + person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, -1 + person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, -1 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index 40a1043ae..ff19655dd 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -34,4 +34,4 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, EVENT_ALWAYS_THERE + person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 87b5015cc..6f0a824c8 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -65,4 +65,4 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, EVENT_ALWAYS_THERE + person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index ebe8bffb8..745a6c9ed 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -48,5 +48,5 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, -1 + person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 4a5dbc153..08549a33b 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -48,6 +48,6 @@ VermilionMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, EVENT_ALWAYS_THERE - person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, -1 + person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, -1 + person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, -1 diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index bfb076429..da87c15b0 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -88,7 +88,7 @@ VermilionPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x191603, EVENT_ALWAYS_THERE - person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, EVENT_ALWAYS_THERE - person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x191603, -1 + person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, -1 + person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, -1 + person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, -1 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index f79a45cc2..bcd154e8d 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -319,5 +319,5 @@ VermilionPort_MapEventHeader: ; people-events db 3 person_event SPRITE_SAILOR, 21, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x74dc4, EVENT_72B - person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, EVENT_ALWAYS_THERE + person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, -1 + person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 8a439c153..586127cd1 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -35,4 +35,4 @@ VermilionPortPassage_MapEventHeader: ; people-events db 1 - person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, -1 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 304ae51c9..ac00e6926 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -118,6 +118,6 @@ VictoryRoadGate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, EVENT_ALWAYS_THERE + person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, -1 person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index f86b5a66d..2b238af6b 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -303,10 +303,10 @@ VioletCity_MapEventHeader: ; people-events db 8 person_event SPRITE_FISHER, 20, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x1a83bb, EVENT_6CA - person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, EVENT_ALWAYS_THERE - person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, EVENT_ALWAYS_THERE + person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, -1 + person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, -1 + person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, -1 + person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, -1 + person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, -1 person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, EVENT_643 person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, EVENT_644 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 6bb46309a..79dddae6c 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -326,7 +326,7 @@ VioletGym_MapEventHeader: ; people-events db 4 - person_event SPRITE_FALKNER, 5, 9, $6, $0, 255, 255, $90, 0, FalknerScript_0x683c2, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, EVENT_ALWAYS_THERE - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, EVENT_ALWAYS_THERE + person_event SPRITE_FALKNER, 5, 9, $6, $0, 255, 255, $90, 0, FalknerScript_0x683c2, -1 + person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, -1 + person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, -1 + person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index b138d7cdf..7463c18de 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -60,6 +60,6 @@ VioletMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, EVENT_ALWAYS_THERE - person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, -1 + person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, -1 + person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 24a71d3cd..1aa7c7b83 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -56,6 +56,6 @@ VioletNicknameSpeechHouse_MapEventHeader: ; people-events db 3 - person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, EVENT_ALWAYS_THERE - person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, EVENT_ALWAYS_THERE + person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, -1 + person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, -1 + person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index dda589cf2..7d237a77a 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -45,5 +45,5 @@ VioletOnixTradeHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, -1 + person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, -1 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index 0eef444d6..b76c747b1 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -226,8 +226,8 @@ VioletPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x694c9, EVENT_ALWAYS_THERE - person_event SPRITE_GAMEBOY_KID, 10, 11, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x69540, EVENT_ALWAYS_THERE - person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x694c9, -1 + person_event SPRITE_GAMEBOY_KID, 10, 11, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x69540, -1 + person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, -1 + person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, -1 person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index a038b1242..0fb20ff3f 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -237,7 +237,7 @@ ViridianCity_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRAMPS, 9, 22, $2, $22, 255, 255, $0, 0, GrampsScript_0x1a9a4c, EVENT_ALWAYS_THERE - person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, EVENT_ALWAYS_THERE - person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, EVENT_ALWAYS_THERE - person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, EVENT_ALWAYS_THERE + person_event SPRITE_GRAMPS, 9, 22, $2, $22, 255, 255, $0, 0, GrampsScript_0x1a9a4c, -1 + person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, -1 + person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, -1 + person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, -1 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 33578e8b3..4e85c98e5 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -48,6 +48,6 @@ ViridianMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, EVENT_ALWAYS_THERE + person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, -1 + person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, -1 + person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index 8d07ee74d..d5888fedd 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -72,7 +72,7 @@ ViridianNicknameSpeechHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, EVENT_ALWAYS_THERE - person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, EVENT_ALWAYS_THERE - person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, EVENT_ALWAYS_THERE - person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, EVENT_ALWAYS_THERE + person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, -1 + person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, -1 + person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, -1 + person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, -1 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index fb8ee3f73..0baaaa342 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -83,7 +83,7 @@ ViridianPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9b690, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x9b693, EVENT_ALWAYS_THERE - person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, EVENT_ALWAYS_THERE - person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, EVENT_ALWAYS_THERE + person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9b690, -1 + person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x9b693, -1 + person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, -1 + person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, -1 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index b18d3f5cb..383cb172b 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -734,10 +734,10 @@ WarehouseEntrance_MapEventHeader: ; people-events db 9 - person_event SPRITE_SUPER_NERD, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, EVENT_ALWAYS_THERE - person_event SPRITE_SUPER_NERD, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, EVENT_ALWAYS_THERE + person_event SPRITE_SUPER_NERD, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, -1 + person_event SPRITE_SUPER_NERD, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, -1 + person_event SPRITE_SUPER_NERD, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, -1 + person_event SPRITE_SUPER_NERD, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, -1 person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7c306, EVENT_672 person_event SPRITE_GRAMPS, 15, 11, $8, $0, 255, 255, $b0, 0, GrampsScript_0x7c146, EVENT_753 person_event SPRITE_SUPER_NERD, 18, 11, $8, $0, 255, 255, $90, 0, SuperNerdScript_0x7c161, EVENT_754 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 813d98509..342b7e716 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -70,4 +70,4 @@ WhirlIslandB1F_MapEventHeader: person_event SPRITE_POKE_BALL, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, EVENT_693 person_event SPRITE_POKE_BALL, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, EVENT_694 person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, EVENT_695 - person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, EVENT_ALWAYS_THERE + person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 8e8be9f39..646ee8545 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -148,4 +148,4 @@ WillsRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, EVENT_ALWAYS_THERE + person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, -1 diff --git a/wram.asm b/wram.asm index 45e3a6c7a..9bec48548 100644 --- a/wram.asm +++ b/wram.asm @@ -2255,7 +2255,7 @@ EventFlags:: ; da72 ;PoliceAtElmsLabEvent:: ; db52 ;SalesmanMahoganyTownEvent:: ; db5c ;RedGyaradosEvent:: ; db5c - flag_array 2000 + flag_array NUM_EVENTS ; db6c ds 6 -- cgit v1.2.3 From 3a9f537f8a8891957c665c5e0ede645390ec2384 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 13 Jul 2015 01:37:11 -0400 Subject: Enumerate various constants --- constants/battle_constants.asm | 540 ++++++++++++++++++----------------- constants/gfx_constants.asm | 2 +- constants/item_constants.asm | 12 +- constants/map_constants.asm | 10 +- constants/pokemon_constants.asm | 5 +- constants/pokemon_data_constants.asm | 145 +++++----- constants/sfx_constants.asm | 416 +++++++++++++-------------- main.asm | 4 +- 8 files changed, 581 insertions(+), 553 deletions(-) diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 0ef6bb325..0811f6a89 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -5,32 +5,35 @@ NUM_MOVES EQU 4 REST_TURNS EQU 2 -ATTACK EQU 0 -DEFENSE EQU 1 -SPEED EQU 2 -SP_ATTACK EQU 3 -SP_DEFENSE EQU 4 -ACCURACY EQU 5 -EVASION EQU 6 + const_def + const ATTACK + const DEFENSE + const SPEED + const SP_ATTACK + const SP_DEFENSE + const ACCURACY + const EVASION ; move struct -MOVE_LENGTH EQU 7 -MOVE_ANIM EQU 0 -MOVE_EFFECT EQU 1 -MOVE_POWER EQU 2 -MOVE_TYPE EQU 3 -MOVE_ACC EQU 4 -MOVE_PP EQU 5 -MOVE_CHANCE EQU 6 + const_def + const MOVE_ANIM + const MOVE_EFFECT + const MOVE_POWER + const MOVE_TYPE + const MOVE_ACC + const MOVE_PP + const MOVE_CHANCE + const MOVE_LENGTH ; stat constants -NUM_STATS EQU 6 -STAT_HP EQU 1 -STAT_ATK EQU 2 -STAT_DEF EQU 3 -STAT_SPD EQU 4 -STAT_SATK EQU 5 -STAT_SDEF EQU 6 +const_value SET 1 + const STAT_HP + const STAT_ATK + const STAT_DEF + const STAT_SPD + const STAT_SATK + const STAT_SDEF +NUM_STATS EQU const_value STAT_MIN_NORMAL EQU 5 STAT_MIN_HP EQU 10 @@ -39,263 +42,276 @@ ATKDEFDV_SHINY EQU $EA SPDSPCDV_SHINY EQU $AA ; battle classes -WILD_BATTLE EQU 1 -TRAINER_BATTLE EQU 2 +const_value SET 1 + const WILD_BATTLE + const TRAINER_BATTLE ; battle types -BATTLETYPE_NORMAL EQU $00 -BATTLETYPE_CANLOSE EQU $01 -BATTLETYPE_TUTORIAL EQU $03 -BATTLETYPE_FISH EQU $04 -BATTLETYPE_ROAMING EQU $05 -BATTLETYPE_CONTEST EQU $06 -BATTLETYPE_SHINY EQU $07 -BATTLETYPE_TREE EQU $08 -BATTLETYPE_TRAP EQU $09 -BATTLETYPE_FORCEITEM EQU $0a -BATTLETYPE_CELEBI EQU $0b -BATTLETYPE_SUICUNE EQU $0c + const_def + const BATTLETYPE_NORMAL + const BATTLETYPE_CANLOSE + const BATTLETYPE_DEBUG + const BATTLETYPE_TUTORIAL + const BATTLETYPE_FISH + const BATTLETYPE_ROAMING + const BATTLETYPE_CONTEST + const BATTLETYPE_SHINY + const BATTLETYPE_TREE + const BATTLETYPE_TRAP + const BATTLETYPE_FORCEITEM + const BATTLETYPE_CELEBI + const BATTLETYPE_SUICUNE ; battle variables -BATTLE_VARS_SUBSTATUS1 EQU 0 -BATTLE_VARS_SUBSTATUS2 EQU 1 -BATTLE_VARS_SUBSTATUS3 EQU 2 -BATTLE_VARS_SUBSTATUS4 EQU 3 -BATTLE_VARS_SUBSTATUS5 EQU 4 -BATTLE_VARS_SUBSTATUS1_OPP EQU 5 -BATTLE_VARS_SUBSTATUS2_OPP EQU 6 -BATTLE_VARS_SUBSTATUS3_OPP EQU 7 -BATTLE_VARS_SUBSTATUS4_OPP EQU 8 -BATTLE_VARS_SUBSTATUS5_OPP EQU 9 -BATTLE_VARS_STATUS EQU 10 -BATTLE_VARS_STATUS_OPP EQU 11 -BATTLE_VARS_MOVE_ANIM EQU 12 -BATTLE_VARS_MOVE_EFFECT EQU 13 -BATTLE_VARS_MOVE_POWER EQU 14 -BATTLE_VARS_MOVE_TYPE EQU 15 -BATTLE_VARS_MOVE EQU 16 -BATTLE_VARS_LAST_COUNTER_MOVE EQU 17 -BATTLE_VARS_LAST_COUNTER_MOVE_OPP EQU 18 -BATTLE_VARS_LAST_MOVE EQU 19 -BATTLE_VARS_LAST_MOVE_OPP EQU 20 + const_def + const BATTLE_VARS_SUBSTATUS1 + const BATTLE_VARS_SUBSTATUS2 + const BATTLE_VARS_SUBSTATUS3 + const BATTLE_VARS_SUBSTATUS4 + const BATTLE_VARS_SUBSTATUS5 + const BATTLE_VARS_SUBSTATUS1_OPP + const BATTLE_VARS_SUBSTATUS2_OPP + const BATTLE_VARS_SUBSTATUS3_OPP + const BATTLE_VARS_SUBSTATUS4_OPP + const BATTLE_VARS_SUBSTATUS5_OPP + const BATTLE_VARS_STATUS + const BATTLE_VARS_STATUS_OPP + const BATTLE_VARS_MOVE_ANIM + const BATTLE_VARS_MOVE_EFFECT + const BATTLE_VARS_MOVE_POWER + const BATTLE_VARS_MOVE_TYPE + const BATTLE_VARS_MOVE + const BATTLE_VARS_LAST_COUNTER_MOVE + const BATTLE_VARS_LAST_COUNTER_MOVE_OPP + const BATTLE_VARS_LAST_MOVE + const BATTLE_VARS_LAST_MOVE_OPP ; status -SLP EQU 7 ; 7 turns -PSN EQU 3 -BRN EQU 4 -FRZ EQU 5 -PAR EQU 6 +const_value SET 3 + const PSN + const BRN + const FRZ + const PAR + const SLP ; 7 turns ; substatus -SUBSTATUS_IN_LOVE EQU 7 -SUBSTATUS_ROLLOUT EQU 6 -SUBSTATUS_ENDURE EQU 5 -SUBSTATUS_PERISH EQU 4 -SUBSTATUS_IDENTIFIED EQU 3 -SUBSTATUS_PROTECT EQU 2 -SUBSTATUS_CURSE EQU 1 -SUBSTATUS_NIGHTMARE EQU 0 + enum_start 7, -1 + enum SUBSTATUS_IN_LOVE + enum SUBSTATUS_ROLLOUT + enum SUBSTATUS_ENDURE + enum SUBSTATUS_PERISH + enum SUBSTATUS_IDENTIFIED + enum SUBSTATUS_PROTECT + enum SUBSTATUS_CURSE + enum SUBSTATUS_NIGHTMARE SUBSTATUS_CURLED EQU 0 -SUBSTATUS_CONFUSED EQU 7 -SUBSTATUS_FLYING EQU 6 -SUBSTATUS_UNDERGROUND EQU 5 -SUBSTATUS_CHARGED EQU 4 -SUBSTATUS_FLINCHED EQU 3 -SUBSTATUS_IN_LOOP EQU 2 -SUBSTATUS_RAMPAGE EQU 1 -SUBSTATUS_BIDE EQU 0 + enum_start 7, -1 + enum SUBSTATUS_CONFUSED + enum SUBSTATUS_FLYING + enum SUBSTATUS_UNDERGROUND + enum SUBSTATUS_CHARGED + enum SUBSTATUS_FLINCHED + enum SUBSTATUS_IN_LOOP + enum SUBSTATUS_RAMPAGE + enum SUBSTATUS_BIDE -SUBSTATUS_LEECH_SEED EQU 7 -SUBSTATUS_RAGE EQU 6 -SUBSTATUS_RECHARGE EQU 5 -SUBSTATUS_SUBSTITUTE EQU 4 -; EQU 3 -SUBSTATUS_FOCUS_ENERGY EQU 2 -SUBSTATUS_MIST EQU 1 -SUBSTATUS_X_ACCURACY EQU 0 + enum_start 7, -1 + enum SUBSTATUS_LEECH_SEED + enum SUBSTATUS_RAGE + enum SUBSTATUS_RECHARGE + enum SUBSTATUS_SUBSTITUTE + enum SUBSTATUS_UNKNOWN_1 + enum SUBSTATUS_FOCUS_ENERGY + enum SUBSTATUS_MIST + enum SUBSTATUS_X_ACCURACY -SUBSTATUS_CANT_RUN EQU 7 -SUBSTATUS_DESTINY_BOND EQU 6 -SUBSTATUS_LOCK_ON EQU 5 -SUBSTATUS_ENCORED EQU 4 -SUBSTATUS_TRANSFORMED EQU 3 -; EQU 2 -; EQU 1 -SUBSTATUS_TOXIC EQU 0 + enum_start 7, -1 + enum SUBSTATUS_CANT_RUN + enum SUBSTATUS_DESTINY_BOND + enum SUBSTATUS_LOCK_ON + enum SUBSTATUS_ENCORED + enum SUBSTATUS_TRANSFORMED + enum SUBSTATUS_UNKNOWN_2 + enum SUBSTATUS_UNKNOWN_3 + enum SUBSTATUS_TOXIC ; environmental -SCREENS_REFLECT EQU 4 -SCREENS_LIGHT_SCREEN EQU 3 -SCREENS_SAFEGUARD EQU 2 -SCREENS_SPIKES EQU 0 + enum_start 4, -1 + enum SCREENS_REFLECT + enum SCREENS_LIGHT_SCREEN + enum SCREENS_SAFEGUARD + enum SCREENS_UNUSED + enum SCREENS_SPIKES ; weather -WEATHER_NONE EQU 0 -WEATHER_RAIN EQU 1 -WEATHER_SUN EQU 2 -WEATHER_SANDSTORM EQU 3 -WEATHER_RAIN_END EQU 4 -WEATHER_SUN_END EQU 5 -WEATHER_SANDSTORM_END EQU 6 + const_def + const WEATHER_NONE + const WEATHER_RAIN + const WEATHER_SUN + const WEATHER_SANDSTORM + const WEATHER_RAIN_END + const WEATHER_SUN_END + const WEATHER_SANDSTORM_END ; move effects -EFFECT_NORMAL_HIT EQU $00 -EFFECT_SLEEP EQU $01 -EFFECT_POISON_HIT EQU $02 -EFFECT_LEECH_HIT EQU $03 -EFFECT_BURN_HIT EQU $04 -EFFECT_FREEZE_HIT EQU $05 -EFFECT_PARALYZE_HIT EQU $06 -EFFECT_EXPLOSION EQU $07 -EFFECT_DREAM_EATER EQU $08 -EFFECT_MIRROR_MOVE EQU $09 -EFFECT_ATTACK_UP EQU $0a -EFFECT_DEFENSE_UP EQU $0b -EFFECT_SPEED_UP EQU $0c -EFFECT_SP_ATK_UP EQU $0d -EFFECT_SP_DEF_UP EQU $0e -EFFECT_ACCURACY_UP EQU $0f -EFFECT_EVASION_UP EQU $10 -EFFECT_ALWAYS_HIT EQU $11 -EFFECT_ATTACK_DOWN EQU $12 -EFFECT_DEFENSE_DOWN EQU $13 -EFFECT_SPEED_DOWN EQU $14 -EFFECT_SP_ATK_DOWN EQU $15 -EFFECT_SP_DEF_DOWN EQU $16 -EFFECT_ACCURACY_DOWN EQU $17 -EFFECT_EVASION_DOWN EQU $18 -EFFECT_HAZE EQU $19 -EFFECT_BIDE EQU $1a -EFFECT_RAMPAGE EQU $1b -EFFECT_WHIRLWIND EQU $1c -EFFECT_MULTI_HIT EQU $1d -EFFECT_CONVERSION EQU $1e -EFFECT_FLINCH_HIT EQU $1f -EFFECT_HEAL EQU $20 -EFFECT_TOXIC EQU $21 -EFFECT_PAY_DAY EQU $22 -EFFECT_LIGHT_SCREEN EQU $23 -EFFECT_TRI_ATTACK EQU $24 -EFFECT_UNUSED_25 EQU $25 ; unused -EFFECT_OHKO EQU $26 -EFFECT_RAZOR_WIND EQU $27 -EFFECT_SUPER_FANG EQU $28 -EFFECT_STATIC_DAMAGE EQU $29 -EFFECT_BIND EQU $2a -EFFECT_UNUSED_2B EQU $2b ; unused -EFFECT_DOUBLE_HIT EQU $2c -EFFECT_JUMP_KICK EQU $2d -EFFECT_MIST EQU $2e -EFFECT_FOCUS_ENERGY EQU $2f -EFFECT_RECOIL_HIT EQU $30 -EFFECT_CONFUSE EQU $31 -EFFECT_ATTACK_UP_2 EQU $32 -EFFECT_DEFENSE_UP_2 EQU $33 -EFFECT_SPEED_UP_2 EQU $34 -EFFECT_SP_ATK_UP_2 EQU $35 -EFFECT_SP_DEF_UP_2 EQU $36 -EFFECT_ACCURACY_UP_2 EQU $37 -EFFECT_EVASION_UP_2 EQU $38 -EFFECT_TRANSFORM EQU $39 -EFFECT_ATTACK_DOWN_2 EQU $3a -EFFECT_DEFENSE_DOWN_2 EQU $3b -EFFECT_SPEED_DOWN_2 EQU $3c -EFFECT_SP_ATK_DOWN_2 EQU $3d -EFFECT_SP_DEF_DOWN_2 EQU $3e -EFFECT_ACCURACY_DOWN_2 EQU $3f -EFFECT_EVASION_DOWN_2 EQU $40 -EFFECT_REFLECT EQU $41 -EFFECT_POISON EQU $42 -EFFECT_PARALYZE EQU $43 -EFFECT_ATTACK_DOWN_HIT EQU $44 -EFFECT_DEFENSE_DOWN_HIT EQU $45 -EFFECT_SPEED_DOWN_HIT EQU $46 -EFFECT_SP_ATK_DOWN_HIT EQU $47 -EFFECT_SP_DEF_DOWN_HIT EQU $48 -EFFECT_ACCURACY_DOWN_HIT EQU $49 -EFFECT_EVASION_DOWN_HIT EQU $4a -EFFECT_SKY_ATTACK EQU $4b -EFFECT_CONFUSE_HIT EQU $4c -EFFECT_TWINEEDLE EQU $4d -EFFECT_UNUSED_4E EQU $4e ; unused -EFFECT_SUBSTITUTE EQU $4f -EFFECT_HYPER_BEAM EQU $50 -EFFECT_RAGE EQU $51 -EFFECT_MIMIC EQU $52 -EFFECT_METRONOME EQU $53 -EFFECT_LEECH_SEED EQU $54 -EFFECT_SPLASH EQU $55 -EFFECT_DISABLE EQU $56 -EFFECT_LEVEL_DAMAGE EQU $57 -EFFECT_PSYWAVE EQU $58 -EFFECT_COUNTER EQU $59 -EFFECT_ENCORE EQU $5a -EFFECT_PAIN_SPLIT EQU $5b -EFFECT_SNORE EQU $5c -EFFECT_CONVERSION2 EQU $5d -EFFECT_LOCK_ON EQU $5e -EFFECT_SKETCH EQU $5f -EFFECT_DEFROST_OPPONENT EQU $60 -EFFECT_SLEEP_TALK EQU $61 -EFFECT_DESTINY_BOND EQU $62 -EFFECT_REVERSAL EQU $63 -EFFECT_SPITE EQU $64 -EFFECT_FALSE_SWIPE EQU $65 -EFFECT_HEAL_BELL EQU $66 -EFFECT_PRIORITY_HIT EQU $67 -EFFECT_TRIPLE_KICK EQU $68 -EFFECT_THIEF EQU $69 -EFFECT_MEAN_LOOK EQU $6a -EFFECT_NIGHTMARE EQU $6b -EFFECT_FLAME_WHEEL EQU $6c -EFFECT_CURSE EQU $6d -EFFECT_UNUSED_6E EQU $6e ; unused -EFFECT_PROTECT EQU $6f -EFFECT_SPIKES EQU $70 -EFFECT_FORESIGHT EQU $71 -EFFECT_PERISH_SONG EQU $72 -EFFECT_SANDSTORM EQU $73 -EFFECT_ENDURE EQU $74 -EFFECT_ROLLOUT EQU $75 -EFFECT_SWAGGER EQU $76 -EFFECT_FURY_CUTTER EQU $77 -EFFECT_ATTRACT EQU $78 -EFFECT_RETURN EQU $79 -EFFECT_PRESENT EQU $7a -EFFECT_FRUSTRATION EQU $7b -EFFECT_SAFEGUARD EQU $7c -EFFECT_SACRED_FIRE EQU $7d -EFFECT_MAGNITUDE EQU $7e -EFFECT_BATON_PASS EQU $7f -EFFECT_PURSUIT EQU $80 -EFFECT_RAPID_SPIN EQU $81 -EFFECT_UNUSED_82 EQU $82 ; unused -EFFECT_UNUSED_83 EQU $83 ; unused -EFFECT_MORNING_SUN EQU $84 -EFFECT_SYNTHESIS EQU $85 -EFFECT_MOONLIGHT EQU $86 -EFFECT_HIDDEN_POWER EQU $87 -EFFECT_RAIN_DANCE EQU $88 -EFFECT_SUNNY_DAY EQU $89 -EFFECT_STEEL_WING EQU $8a -EFFECT_METAL_CLAW EQU $8b -EFFECT_ANCIENTPOWER EQU $8c -EFFECT_FAKE_OUT EQU $8d -EFFECT_BELLY_DRUM EQU $8e -EFFECT_PSYCH_UP EQU $8f -EFFECT_MIRROR_COAT EQU $90 -EFFECT_SKULL_BASH EQU $91 -EFFECT_TWISTER EQU $92 -EFFECT_EARTHQUAKE EQU $93 -EFFECT_FUTURE_SIGHT EQU $94 -EFFECT_GUST EQU $95 -EFFECT_STOMP EQU $96 -EFFECT_SOLARBEAM EQU $97 -EFFECT_THUNDER EQU $98 -EFFECT_TELEPORT EQU $99 -EFFECT_BEAT_UP EQU $9a -EFFECT_FLY EQU $9b -EFFECT_DEFENSE_CURL EQU $9c + const_def + const EFFECT_NORMAL_HIT + const EFFECT_SLEEP + const EFFECT_POISON_HIT + const EFFECT_LEECH_HIT + const EFFECT_BURN_HIT + const EFFECT_FREEZE_HIT + const EFFECT_PARALYZE_HIT + const EFFECT_EXPLOSION + const EFFECT_DREAM_EATER + const EFFECT_MIRROR_MOVE + const EFFECT_ATTACK_UP + const EFFECT_DEFENSE_UP + const EFFECT_SPEED_UP + const EFFECT_SP_ATK_UP + const EFFECT_SP_DEF_UP + const EFFECT_ACCURACY_UP + const EFFECT_EVASION_UP + const EFFECT_ALWAYS_HIT + const EFFECT_ATTACK_DOWN + const EFFECT_DEFENSE_DOWN + const EFFECT_SPEED_DOWN + const EFFECT_SP_ATK_DOWN + const EFFECT_SP_DEF_DOWN + const EFFECT_ACCURACY_DOWN + const EFFECT_EVASION_DOWN + const EFFECT_HAZE + const EFFECT_BIDE + const EFFECT_RAMPAGE + const EFFECT_WHIRLWIND + const EFFECT_MULTI_HIT + const EFFECT_CONVERSION + const EFFECT_FLINCH_HIT + const EFFECT_HEAL + const EFFECT_TOXIC + const EFFECT_PAY_DAY + const EFFECT_LIGHT_SCREEN + const EFFECT_TRI_ATTACK + const EFFECT_UNUSED_25 + const EFFECT_OHKO + const EFFECT_RAZOR_WIND + const EFFECT_SUPER_FANG + const EFFECT_STATIC_DAMAGE + const EFFECT_BIND + const EFFECT_UNUSED_2B + const EFFECT_DOUBLE_HIT + const EFFECT_JUMP_KICK + const EFFECT_MIST + const EFFECT_FOCUS_ENERGY + const EFFECT_RECOIL_HIT + const EFFECT_CONFUSE + const EFFECT_ATTACK_UP_2 + const EFFECT_DEFENSE_UP_2 + const EFFECT_SPEED_UP_2 + const EFFECT_SP_ATK_UP_2 + const EFFECT_SP_DEF_UP_2 + const EFFECT_ACCURACY_UP_2 + const EFFECT_EVASION_UP_2 + const EFFECT_TRANSFORM + const EFFECT_ATTACK_DOWN_2 + const EFFECT_DEFENSE_DOWN_2 + const EFFECT_SPEED_DOWN_2 + const EFFECT_SP_ATK_DOWN_2 + const EFFECT_SP_DEF_DOWN_2 + const EFFECT_ACCURACY_DOWN_2 + const EFFECT_EVASION_DOWN_2 + const EFFECT_REFLECT + const EFFECT_POISON + const EFFECT_PARALYZE + const EFFECT_ATTACK_DOWN_HIT + const EFFECT_DEFENSE_DOWN_HIT + const EFFECT_SPEED_DOWN_HIT + const EFFECT_SP_ATK_DOWN_HIT + const EFFECT_SP_DEF_DOWN_HIT + const EFFECT_ACCURACY_DOWN_HIT + const EFFECT_EVASION_DOWN_HIT + const EFFECT_SKY_ATTACK + const EFFECT_CONFUSE_HIT + const EFFECT_TWINEEDLE + const EFFECT_UNUSED_4E + const EFFECT_SUBSTITUTE + const EFFECT_HYPER_BEAM + const EFFECT_RAGE + const EFFECT_MIMIC + const EFFECT_METRONOME + const EFFECT_LEECH_SEED + const EFFECT_SPLASH + const EFFECT_DISABLE + const EFFECT_LEVEL_DAMAGE + const EFFECT_PSYWAVE + const EFFECT_COUNTER + const EFFECT_ENCORE + const EFFECT_PAIN_SPLIT + const EFFECT_SNORE + const EFFECT_CONVERSION2 + const EFFECT_LOCK_ON + const EFFECT_SKETCH + const EFFECT_DEFROST_OPPONENT + const EFFECT_SLEEP_TALK + const EFFECT_DESTINY_BOND + const EFFECT_REVERSAL + const EFFECT_SPITE + const EFFECT_FALSE_SWIPE + const EFFECT_HEAL_BELL + const EFFECT_PRIORITY_HIT + const EFFECT_TRIPLE_KICK + const EFFECT_THIEF + const EFFECT_MEAN_LOOK + const EFFECT_NIGHTMARE + const EFFECT_FLAME_WHEEL + const EFFECT_CURSE + const EFFECT_UNUSED_6E + const EFFECT_PROTECT + const EFFECT_SPIKES + const EFFECT_FORESIGHT + const EFFECT_PERISH_SONG + const EFFECT_SANDSTORM + const EFFECT_ENDURE + const EFFECT_ROLLOUT + const EFFECT_SWAGGER + const EFFECT_FURY_CUTTER + const EFFECT_ATTRACT + const EFFECT_RETURN + const EFFECT_PRESENT + const EFFECT_FRUSTRATION + const EFFECT_SAFEGUARD + const EFFECT_SACRED_FIRE + const EFFECT_MAGNITUDE + const EFFECT_BATON_PASS + const EFFECT_PURSUIT + const EFFECT_RAPID_SPIN + const EFFECT_UNUSED_82 + const EFFECT_UNUSED_83 + const EFFECT_MORNING_SUN + const EFFECT_SYNTHESIS + const EFFECT_MOONLIGHT + const EFFECT_HIDDEN_POWER + const EFFECT_RAIN_DANCE + const EFFECT_SUNNY_DAY + const EFFECT_STEEL_WING + const EFFECT_METAL_CLAW + const EFFECT_ANCIENTPOWER + const EFFECT_FAKE_OUT + const EFFECT_BELLY_DRUM + const EFFECT_PSYCH_UP + const EFFECT_MIRROR_COAT + const EFFECT_SKULL_BASH + const EFFECT_TWISTER + const EFFECT_EARTHQUAKE + const EFFECT_FUTURE_SIGHT + const EFFECT_GUST + const EFFECT_STOMP + const EFFECT_SOLARBEAM + const EFFECT_THUNDER + const EFFECT_TELEPORT + const EFFECT_BEAT_UP + const EFFECT_FLY + const EFFECT_DEFENSE_CURL diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 6a530d164..c5f8517ac 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -1,4 +1,4 @@ -const_value = 1 +const_value SET 1 const ANIM_GFX_HIT const ANIM_GFX_CUT const ANIM_GFX_FIRE diff --git a/constants/item_constants.asm b/constants/item_constants.asm index 64c387b2f..b891a2c3e 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -291,7 +291,7 @@ CANT_TOSS EQU 1 << 7 const HELD_7 const HELD_CLEANSE_TAG -const_value = 10 +const_value SET 10 const HELD_HEAL_POISON const HELD_HEAL_FREEZE const HELD_HEAL_BURN @@ -300,7 +300,7 @@ const_value = 10 const HELD_HEAL_STATUS const HELD_HEAL_CONFUSION -const_value = 20 +const_value SET 20 const HELD_PREVENT_POISON const HELD_PREVENT_BURN const HELD_PREVENT_FREEZE @@ -308,7 +308,7 @@ const_value = 20 const HELD_PREVENT_PARALYZE const HELD_PREVENT_CONFUSE -const_value = 30 +const_value SET 30 const HELD_30 const HELD_ATTACK_UP const HELD_DEFENSE_UP @@ -318,12 +318,12 @@ const_value = 30 const HELD_ACCURACY_UP const HELD_EVASION_UP -const_value = 40 +const_value SET 40 const HELD_40 const HELD_41 const HELD_METAL_POWDER -const_value = 50 +const_value SET 50 const HELD_NORMAL_BOOST const HELD_FIGHTING_BOOST const HELD_FLYING_BOOST @@ -342,7 +342,7 @@ const_value = 50 const HELD_DARK_BOOST const HELD_STEEL_BOOST -const_value = 70 +const_value SET 70 const HELD_CATCH_CHANCE const HELD_71 const HELD_ESCAPE diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ecbcf2102..0be01cade 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -576,7 +576,7 @@ MAP_N_A EQU -1 const SPRITE_ENTEI const SPRITE_RAIKOU const SPRITE_STANDING_YOUNGSTER -const_value = $80 +const_value SET $80 SPRITE_POKEMON EQU const_value const SPRITE_UNOWN const SPRITE_GEODUDE @@ -614,11 +614,11 @@ SPRITE_POKEMON EQU const_value const SPRITE_LUGIA const SPRITE_HO_OH -const_value = $e0 +const_value SET $e0 const SPRITE_DAYCARE_MON_1 const SPRITE_DAYCARE_MON_2 -const_value = $f0 +const_value SET $f0 SPRITE_VARS EQU const_value const SPRITE_CONSOLE const SPRITE_DOLL_1 @@ -635,7 +635,7 @@ SPRITE_VARS EQU const_value const SPRITE_JANINE_IMPERSONATOR ; sprite types -const_value = 1 +const_value SET 1 const WALKING_SPRITE const STANDING_SPRITE const STILL_SPRITE @@ -652,7 +652,7 @@ const_value = 1 const PAL_OW_ROCK ; permissions -const_value = 1 +const_value SET 1 const TOWN const ROUTE const INDOOR diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index ba106611a..c4fde4e75 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,4 +1,3 @@ -NUM_POKEMON EQU 251 const_value set 1 const BULBASAUR @@ -253,4 +252,8 @@ const_value set 1 const HO_OH const CELEBI +const_value SET const_value + -1 + +NUM_POKEMON EQU const_value + EGG EQU 253 diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 449447b5b..fd84c727c 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -1,75 +1,80 @@ ; growth rate -MEDIUM_FAST EQU 0 -MEDIUM_SLOW EQU 3 -SLOW EQU 4 -FAST EQU 5 + const_def + const MEDIUM_FAST + const SLIGHTLY_FAST + const SLIGHTLY_SLOW + const MEDIUM_SLOW + const SLOW + const FAST ; egg group constants - -MONSTER EQU $01 -AMPHIBIAN EQU $02 -INSECT EQU $03 -AVIAN EQU $04 -FIELD EQU $05 -FAIRY EQU $06 -PLANT EQU $07 -HUMANSHAPE EQU $08 -INVERTEBRATE EQU $09 -INANIMATE EQU $0A -AMORPHOUS EQU $0B -FISH EQU $0C -LADIES_MAN EQU $0D -REPTILE EQU $0E -NO_EGGS EQU $0F +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 ; menu sprites -ICON_POLIWAG EQU $01 -ICON_JIGGLYPUFF EQU $02 -ICON_DIGLETT EQU $03 -ICON_PIKACHU EQU $04 -ICON_STARYU EQU $05 -ICON_FISH EQU $06 -ICON_BIRD EQU $07 -ICON_MONSTER EQU $08 -ICON_CLEFAIRY EQU $09 -ICON_ODDISH EQU $0a -ICON_BUG EQU $0b -ICON_GHOST EQU $0c -ICON_LAPRAS EQU $0d -ICON_HUMANSHAPE EQU $0e -ICON_FOX EQU $0f -ICON_EQUINE EQU $10 -ICON_SHELL EQU $11 -ICON_BLOB EQU $12 -ICON_SERPENT EQU $13 -ICON_VOLTORB EQU $14 -ICON_SQUIRTLE EQU $15 -ICON_BULBASAUR EQU $16 -ICON_CHARMANDER EQU $17 -ICON_CATERPILLAR EQU $18 -ICON_UNOWN EQU $19 -ICON_GEODUDE EQU $1a -ICON_FIGHTER EQU $1b -ICON_EGG EQU $1c -ICON_JELLYFISH EQU $1d -ICON_MOTH EQU $1e -ICON_BAT EQU $1f -ICON_SNORLAX EQU $20 -ICON_HO_OH EQU $21 -ICON_LUGIA EQU $22 -ICON_GYARADOS EQU $23 -ICON_SLOWPOKE EQU $24 -ICON_SUDOWOODO EQU $25 -ICON_BIGMON EQU $26 +const_value SET 1 + const ICON_POLIWAG + const ICON_JIGGLYPUFF + const ICON_DIGLETT + const ICON_PIKACHU + const ICON_STARYU + const ICON_FISH + const ICON_BIRD + const ICON_MONSTER + const ICON_CLEFAIRY + const ICON_ODDISH + const ICON_BUG + const ICON_GHOST + const ICON_LAPRAS + const ICON_HUMANSHAPE + const ICON_FOX + const ICON_EQUINE + const ICON_SHELL + const ICON_BLOB + const ICON_SERPENT + const ICON_VOLTORB + const ICON_SQUIRTLE + const ICON_BULBASAUR + const ICON_CHARMANDER + const ICON_CATERPILLAR + const ICON_UNOWN + const ICON_GEODUDE + const ICON_FIGHTER + const ICON_EGG + const ICON_JELLYFISH + const ICON_MOTH + const ICON_BAT + const ICON_SNORLAX + const ICON_HO_OH + const ICON_LUGIA + const ICON_GYARADOS + const ICON_SLOWPOKE + const ICON_SUDOWOODO + const ICON_BIGMON ; evolution types -EVOLVE_LEVEL EQU 1 -EVOLVE_ITEM EQU 2 -EVOLVE_TRADE EQU 3 -EVOLVE_HAPPINESS EQU 4 -EVOLVE_STAT EQU 5 +const_value SET 1 + const EVOLVE_LEVEL + const EVOLVE_ITEM + const EVOLVE_TRADE + const EVOLVE_HAPPINESS + const EVOLVE_STAT BASE_HAPPINESS EQU 70 @@ -77,12 +82,14 @@ FRIEND_BALL_HAPPINESS EQU 200 ; happiness evolution triggers HAPPINESS_TO_EVOLVE EQU 220 -TR_ANYTIME EQU 1 -TR_MORNDAY EQU 2 -TR_NITE EQU 3 +const_value SET 1 + const TR_ANYTIME + const TR_MORNDAY + const TR_NITE ; stat evolution triggers -ATK_GT_DEF EQU 1 -ATK_LT_DEF EQU 2 -ATK_EQ_DEF EQU 3 +const_value SET 1 + const ATK_GT_DEF + const ATK_LT_DEF + const ATK_EQ_DEF diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index 8107d56c5..d68f39cb0 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -1,208 +1,210 @@ -SFX_DEX_FANFARE_50_79 EQU $00 -SFX_ITEM EQU $01 -SFX_CAUGHT_MON EQU $02 -SFX_POKEBALLS_PLACED_ON_TABLE EQU $03 -SFX_POTION EQU $04 -SFX_FULL_HEAL EQU $05 -SFX_MENU EQU $06 -SFX_READ_TEXT EQU $07 -SFX_READ_TEXT_2 EQU $08 -SFX_DEX_FANFARE_20_49 EQU $09 -SFX_DEX_FANFARE_80_109 EQU $0a -SFX_POISON EQU $0b -SFX_GOT_SAFARI_BALLS EQU $0c -SFX_BOOT_PC EQU $0d -SFX_SHUT_DOWN_PC EQU $0e -SFX_CHOOSE_PC_OPTION EQU $0f -SFX_ESCAPE_ROPE EQU $10 -SFX_PUSH_BUTTON EQU $11 -SFX_SECOND_PART_OF_ITEMFINDER EQU $12 -SFX_WARP_TO EQU $13 -SFX_WARP_FROM EQU $14 -SFX_CHANGE_DEX_MODE EQU $15 -SFX_JUMP_OVER_LEDGE EQU $16 -SFX_GRASS_RUSTLE EQU $17 -SFX_FLY EQU $18 -SFX_WRONG EQU $19 -SFX_SQUEAK EQU $1a -SFX_STRENGTH EQU $1b -SFX_BOAT EQU $1c -SFX_WALL_OPEN EQU $1d -SFX_PLACE_PUZZLE_PIECE_DOWN EQU $1e -SFX_ENTER_DOOR EQU $1f -SFX_SWITCH_POKEMON EQU $20 -SFX_TALLY EQU $21 -SFX_TRANSACTION EQU $22 -SFX_EXIT_BUILDING EQU $23 -SFX_BUMP EQU $24 -SFX_SAVE EQU $25 -SFX_POKEFLUTE EQU $26 -SFX_ELEVATOR_END EQU $27 -SFX_THROW_BALL EQU $28 -SFX_BALL_POOF EQU $29 -SFX_UNKNOWN_2A EQU $2a -SFX_RUN EQU $2b -SFX_SLOT_MACHINE_START EQU $2c -SFX_FANFARE EQU $2d -SFX_PECK EQU $2e -SFX_KINESIS EQU $2f -SFX_LICK EQU $30 -SFX_POUND EQU $31 -SFX_MOVE_PUZZLE_PIECE EQU $32 -SFX_COMET_PUNCH EQU $33 -SFX_MEGA_PUNCH EQU $34 -SFX_SCRATCH EQU $35 -SFX_VICEGRIP EQU $36 -SFX_RAZOR_WIND EQU $37 -SFX_CUT EQU $38 -SFX_WING_ATTACK EQU $39 -SFX_WHIRLWIND EQU $3a -SFX_BIND EQU $3b -SFX_VINE_WHIP EQU $3c -SFX_DOUBLE_KICK EQU $3d -SFX_MEGA_KICK EQU $3e -SFX_HEADBUTT EQU $3f -SFX_HORN_ATTACK EQU $40 -SFX_TACKLE EQU $41 -SFX_POISON_STING EQU $42 -SFX_POWDER EQU $43 -SFX_DOUBLESLAP EQU $44 -SFX_BITE EQU $45 -SFX_JUMP_KICK EQU $46 -SFX_STOMP EQU $47 -SFX_TAIL_WHIP EQU $48 -SFX_KARATE_CHOP EQU $49 -SFX_SUBMISSION EQU $4a -SFX_WATER_GUN EQU $4b -SFX_SWORDS_DANCE EQU $4c -SFX_THUNDER EQU $4d -SFX_SUPERSONIC EQU $4e -SFX_LEER EQU $4f -SFX_EMBER EQU $50 -SFX_BUBBLEBEAM EQU $51 -SFX_HYDRO_PUMP EQU $52 -SFX_SURF EQU $53 -SFX_PSYBEAM EQU $54 -SFX_CHARGE EQU $55 -SFX_THUNDERSHOCK EQU $56 -SFX_PSYCHIC EQU $57 -SFX_SCREECH EQU $58 -SFX_BONE_CLUB EQU $59 -SFX_SHARPEN EQU $5a -SFX_EGG_BOMB EQU $5b -SFX_SING EQU $5c -SFX_HYPER_BEAM EQU $5d -SFX_SHINE EQU $5e -SFX_UNKNOWN_5F EQU $5f -SFX_UNKNOWN_60 EQU $60 -SFX_UNKNOWN_61 EQU $61 -SFX_UNKNOWN_62 EQU $62 -SFX_UNKNOWN_63 EQU $63 -SFX_BURN EQU $64 -SFX_TITLE_SCREEN_ENTRANCE EQU $65 -SFX_UNKNOWN_66 EQU $66 -SFX_GET_COIN_FROM_SLOTS EQU $67 -SFX_PAY_DAY EQU $68 -SFX_METRONOME EQU $69 -SFX_CALL EQU $6a -SFX_HANG_UP EQU $6b -SFX_NO_SIGNAL EQU $6c -SFX_SANDSTORM EQU $6d -SFX_ELEVATOR EQU $6e -SFX_PROTECT EQU $6f -SFX_SKETCH EQU $70 -SFX_RAIN_DANCE EQU $71 -SFX_AEROBLAST EQU $72 -SFX_SPARK EQU $73 -SFX_CURSE EQU $74 -SFX_RAGE EQU $75 -SFX_THIEF EQU $76 -SFX_THIEF_2 EQU $77 -SFX_SPIDER_WEB EQU $78 -SFX_MIND_READER EQU $79 -SFX_NIGHTMARE EQU $7a -SFX_SNORE EQU $7b -SFX_SWEET_KISS EQU $7c -SFX_SWEET_KISS_2 EQU $7d -SFX_BELLY_DRUM EQU $7e -SFX_UNKNOWN_7F EQU $7f -SFX_SLUDGE_BOMB EQU $80 -SFX_FORESIGHT EQU $81 -SFX_SPITE EQU $82 -SFX_OUTRAGE EQU $83 -SFX_PERISH_SONG EQU $84 -SFX_GIGA_DRAIN EQU $85 -SFX_ATTRACT EQU $86 -SFX_KINESIS_2 EQU $87 -SFX_ZAP_CANNON EQU $88 -SFX_MEAN_LOOK EQU $89 -SFX_HEAL_BELL EQU $8a -SFX_RETURN EQU $8b -SFX_EXP_BAR EQU $8c -SFX_MILK_DRINK EQU $8d -SFX_PRESENT EQU $8e -SFX_MORNING_SUN EQU $8f -SFX_LEVEL_UP EQU $90 -SFX_KEY_ITEM EQU $91 -SFX_FANFARE_2 EQU $92 -SFX_REGISTER_PHONE_NUMBER EQU $93 -SFX_3RD_PLACE EQU $94 -SFX_GET_EGG_FROM_DAYCARE_MAN EQU $95 -SFX_GET_EGG_FROM_DAYCARE_LADY EQU $96 -SFX_MOVE_DELETED EQU $97 -SFX_2ND_PLACE EQU $98 -SFX_1ST_PLACE EQU $99 -SFX_CHOOSE_A_CARD EQU $9a -SFX_GET_TM EQU $9b -SFX_GET_BADGE EQU $9c -SFX_QUIT_SLOTS EQU $9d -SFX_EGG_CRACK EQU $9e -SFX_DEX_FANFARE_LESS_THAN_20 EQU $9f -SFX_DEX_FANFARE_140_169 EQU $a0 -SFX_DEX_FANFARE_170_199 EQU $a1 -SFX_DEX_FANFARE_200_229 EQU $a2 -SFX_DEX_FANFARE_230_PLUS EQU $a3 -SFX_EVOLVED EQU $a4 -SFX_MASTER_BALL EQU $a5 -SFX_EGG_HATCH EQU $a6 -SFX_GS_INTRO_CHARIZARD_FIREBALL EQU $a7 -SFX_GS_INTRO_POKEMON_APPEARS EQU $a8 -SFX_FLASH EQU $a9 -SFX_GAME_FREAK_LOGO_GS EQU $aa -SFX_NOT_VERY_EFFECTIVE EQU $ab -SFX_DAMAGE EQU $ac -SFX_SUPER_EFFECTIVE EQU $ad -SFX_BALL_BOUNCE EQU $ae -SFX_MOONLIGHT EQU $af -SFX_ENCORE EQU $b0 -SFX_BEAT_UP EQU $b1 -SFX_BATON_PASS EQU $b2 -SFX_BALL_WIGGLE EQU $b3 -SFX_SWEET_SCENT EQU $b4 -SFX_SWEET_SCENT_2 EQU $b5 -SFX_HIT_END_OF_EXP_BAR EQU $b6 -SFX_GIVE_TRADEMON EQU $b7 -SFX_GET_TRADEMON EQU $b8 -SFX_TRAIN_ARRIVED EQU $b9 -SFX_STOP_SLOT EQU $ba -SFX_2_BOOPS EQU $bb -SFX_GLASS_TING EQU $bc -SFX_GLASS_TING_2 EQU $bd + const_def -SFX_INTRO_UNOWN_1 EQU $be -SFX_INTRO_UNOWN_2 EQU $bf -SFX_INTRO_UNOWN_3 EQU $c0 -SFX_DITTO_POP_UP EQU $c1 -SFX_DITTO_TRANSFORM EQU $c2 -SFX_INTRO_SUICUNE_1 EQU $c3 -SFX_INTRO_PICHU EQU $c4 -SFX_INTRO_SUICUNE_2 EQU $c5 -SFX_INTRO_SUICUNE_3 EQU $c6 -SFX_DITTO_BOUNCE EQU $c7 -SFX_INTRO_SUICUNE_4 EQU $c8 -SFX_GAME_FREAK_PRESENTS EQU $c9 -SFX_TINGLE EQU $ca -SFX_UNKNOWN_CB EQU $cb -SFX_TWO_PC_BEEPS EQU $cc -SFX_4_NOTE_DITTY EQU $cd -SFX_TWINKLE EQU $ce + const SFX_DEX_FANFARE_50_79 + const SFX_ITEM + const SFX_CAUGHT_MON + const SFX_POKEBALLS_PLACED_ON_TABLE + const SFX_POTION + const SFX_FULL_HEAL + const SFX_MENU + const SFX_READ_TEXT + const SFX_READ_TEXT_2 + const SFX_DEX_FANFARE_20_49 + const SFX_DEX_FANFARE_80_109 + const SFX_POISON + const SFX_GOT_SAFARI_BALLS + const SFX_BOOT_PC + const SFX_SHUT_DOWN_PC + const SFX_CHOOSE_PC_OPTION + const SFX_ESCAPE_ROPE + const SFX_PUSH_BUTTON + const SFX_SECOND_PART_OF_ITEMFINDER + const SFX_WARP_TO + const SFX_WARP_FROM + const SFX_CHANGE_DEX_MODE + const SFX_JUMP_OVER_LEDGE + const SFX_GRASS_RUSTLE + const SFX_FLY + const SFX_WRONG + const SFX_SQUEAK + const SFX_STRENGTH + const SFX_BOAT + const SFX_WALL_OPEN + const SFX_PLACE_PUZZLE_PIECE_DOWN + const SFX_ENTER_DOOR + const SFX_SWITCH_POKEMON + const SFX_TALLY + const SFX_TRANSACTION + const SFX_EXIT_BUILDING + const SFX_BUMP + const SFX_SAVE + const SFX_POKEFLUTE + const SFX_ELEVATOR_END + const SFX_THROW_BALL + const SFX_BALL_POOF + const SFX_UNKNOWN_2A + const SFX_RUN + const SFX_SLOT_MACHINE_START + const SFX_FANFARE + const SFX_PECK + const SFX_KINESIS + const SFX_LICK + const SFX_POUND + const SFX_MOVE_PUZZLE_PIECE + const SFX_COMET_PUNCH + const SFX_MEGA_PUNCH + const SFX_SCRATCH + const SFX_VICEGRIP + const SFX_RAZOR_WIND + const SFX_CUT + const SFX_WING_ATTACK + const SFX_WHIRLWIND + const SFX_BIND + const SFX_VINE_WHIP + const SFX_DOUBLE_KICK + const SFX_MEGA_KICK + const SFX_HEADBUTT + const SFX_HORN_ATTACK + const SFX_TACKLE + const SFX_POISON_STING + const SFX_POWDER + const SFX_DOUBLESLAP + const SFX_BITE + const SFX_JUMP_KICK + const SFX_STOMP + const SFX_TAIL_WHIP + const SFX_KARATE_CHOP + const SFX_SUBMISSION + const SFX_WATER_GUN + const SFX_SWORDS_DANCE + const SFX_THUNDER + const SFX_SUPERSONIC + const SFX_LEER + const SFX_EMBER + const SFX_BUBBLEBEAM + const SFX_HYDRO_PUMP + const SFX_SURF + const SFX_PSYBEAM + const SFX_CHARGE + const SFX_THUNDERSHOCK + const SFX_PSYCHIC + const SFX_SCREECH + const SFX_BONE_CLUB + const SFX_SHARPEN + const SFX_EGG_BOMB + const SFX_SING + const SFX_HYPER_BEAM + const SFX_SHINE + const SFX_UNKNOWN_5F + const SFX_UNKNOWN_60 + const SFX_UNKNOWN_61 + const SFX_UNKNOWN_62 + const SFX_UNKNOWN_63 + const SFX_BURN + const SFX_TITLE_SCREEN_ENTRANCE + const SFX_UNKNOWN_66 + const SFX_GET_COIN_FROM_SLOTS + const SFX_PAY_DAY + const SFX_METRONOME + const SFX_CALL + const SFX_HANG_UP + const SFX_NO_SIGNAL + const SFX_SANDSTORM + const SFX_ELEVATOR + const SFX_PROTECT + const SFX_SKETCH + const SFX_RAIN_DANCE + const SFX_AEROBLAST + const SFX_SPARK + const SFX_CURSE + const SFX_RAGE + const SFX_THIEF + const SFX_THIEF_2 + const SFX_SPIDER_WEB + const SFX_MIND_READER + const SFX_NIGHTMARE + const SFX_SNORE + const SFX_SWEET_KISS + const SFX_SWEET_KISS_2 + const SFX_BELLY_DRUM + const SFX_UNKNOWN_7F + const SFX_SLUDGE_BOMB + const SFX_FORESIGHT + const SFX_SPITE + const SFX_OUTRAGE + const SFX_PERISH_SONG + const SFX_GIGA_DRAIN + const SFX_ATTRACT + const SFX_KINESIS_2 + const SFX_ZAP_CANNON + const SFX_MEAN_LOOK + const SFX_HEAL_BELL + const SFX_RETURN + const SFX_EXP_BAR + const SFX_MILK_DRINK + const SFX_PRESENT + const SFX_MORNING_SUN + const SFX_LEVEL_UP + const SFX_KEY_ITEM + const SFX_FANFARE_2 + const SFX_REGISTER_PHONE_NUMBER + const SFX_3RD_PLACE + const SFX_GET_EGG_FROM_DAYCARE_MAN + const SFX_GET_EGG_FROM_DAYCARE_LADY + const SFX_MOVE_DELETED + const SFX_2ND_PLACE + const SFX_1ST_PLACE + const SFX_CHOOSE_A_CARD + const SFX_GET_TM + const SFX_GET_BADGE + const SFX_QUIT_SLOTS + const SFX_EGG_CRACK + const SFX_DEX_FANFARE_LESS_THAN_20 + const SFX_DEX_FANFARE_140_169 + const SFX_DEX_FANFARE_170_199 + const SFX_DEX_FANFARE_200_229 + const SFX_DEX_FANFARE_230_PLUS + const SFX_EVOLVED + const SFX_MASTER_BALL + const SFX_EGG_HATCH + const SFX_GS_INTRO_CHARIZARD_FIREBALL + const SFX_GS_INTRO_POKEMON_APPEARS + const SFX_FLASH + const SFX_GAME_FREAK_LOGO_GS + const SFX_NOT_VERY_EFFECTIVE + const SFX_DAMAGE + const SFX_SUPER_EFFECTIVE + const SFX_BALL_BOUNCE + const SFX_MOONLIGHT + const SFX_ENCORE + const SFX_BEAT_UP + const SFX_BATON_PASS + const SFX_BALL_WIGGLE + const SFX_SWEET_SCENT + const SFX_SWEET_SCENT_2 + const SFX_HIT_END_OF_EXP_BAR + const SFX_GIVE_TRADEMON + const SFX_GET_TRADEMON + const SFX_TRAIN_ARRIVED + const SFX_STOP_SLOT + const SFX_2_BOOPS + const SFX_GLASS_TING + const SFX_GLASS_TING_2 + + const SFX_INTRO_UNOWN_1 + const SFX_INTRO_UNOWN_2 + const SFX_INTRO_UNOWN_3 + const SFX_DITTO_POP_UP + const SFX_DITTO_TRANSFORM + const SFX_INTRO_SUICUNE_1 + const SFX_INTRO_PICHU + const SFX_INTRO_SUICUNE_2 + const SFX_INTRO_SUICUNE_3 + const SFX_DITTO_BOUNCE + const SFX_INTRO_SUICUNE_4 + const SFX_GAME_FREAK_PRESENTS + const SFX_TINGLE + const SFX_UNKNOWN_CB + const SFX_TWO_PC_BEEPS + const SFX_4_NOTE_DITTY + const SFX_TWINKLE diff --git a/main.asm b/main.asm index d8679216d..2f3b9db0d 100644 --- a/main.asm +++ b/main.asm @@ -50503,8 +50503,8 @@ growth_rate: MACRO ENDM growth_rate 1, 1, 0, 0, 0 ; Medium Fast - growth_rate 3, 4, 10, 0, 30 - growth_rate 3, 4, 20, 0, 70 + growth_rate 3, 4, 10, 0, 30 ; Slightly Fast + growth_rate 3, 4, 20, 0, 70 ; Slightly Slow growth_rate 6, 5, -15, 100, 140 ; Medium Slow growth_rate 4, 5, 0, 0, 0 ; Fast growth_rate 5, 4, 0, 0, 0 ; Slow -- cgit v1.2.3 From 8fa8e29170fe78a7f9ed1b2396935af47e16c0c1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 13 Jul 2015 02:23:48 -0400 Subject: - Update variable sprites to use constants rather than fixed values --- constants/map_constants.asm | 8 ++++---- engine/std_scripts.asm | 18 +++++++++--------- macros.asm | 8 -------- macros/event.asm | 2 +- maps/CopycatsHouse2F.asm | 14 +++++++------- maps/FuchsiaGym.asm | 32 ++++++++++++++++---------------- maps/FuchsiaPokeCenter1F.asm | 4 ++-- maps/OlivineCity.asm | 4 ++-- maps/Route36.asm | 4 ++-- maps/SlowpokeWellB1F.asm | 2 +- 10 files changed, 44 insertions(+), 52 deletions(-) diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0be01cade..0067ca9ed 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -627,10 +627,10 @@ SPRITE_VARS EQU const_value const SPRITE_WEIRD_TREE const SPRITE_OLIVINE_RIVAL const SPRITE_AZALEA_ROCKET - const SPRITE_FUSCHIA_GYM_1 - const SPRITE_FUSCHIA_GYM_2 - const SPRITE_FUSCHIA_GYM_3 - const SPRITE_FUSCHIA_GYM_4 + const SPRITE_FUCHSIA_GYM_1 + const SPRITE_FUCHSIA_GYM_2 + const SPRITE_FUCHSIA_GYM_3 + const SPRITE_FUCHSIA_GYM_4 const SPRITE_COPYCAT const SPRITE_JANINE_IMPERSONATOR diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 763ae0908..4315a07f1 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -597,15 +597,15 @@ InitializeEventsScript: setevent EVENT_7CF setflag ENGINE_ROCKET_SIGNAL_ON_CH20 setflag ENGINE_ROCKETS_IN_MAHOGANY - variablesprite $4, $52 - variablesprite $5, $4 - variablesprite $6, $35 - variablesprite $7, $a - variablesprite $8, $a - variablesprite $9, $a - variablesprite $a, $a - variablesprite $b, $28 - variablesprite $c, $28 + variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO + variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SILVER + variablesprite SPRITE_AZALEA_ROCKET, SPRITE_ROCKET + variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE + variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE + variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_JANINE + variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_JANINE + variablesprite SPRITE_COPYCAT, SPRITE_LASS + variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS setevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM setevent EVENT_76D setevent EVENT_76C diff --git a/macros.asm b/macros.asm index de576302a..cbd071b8f 100644 --- a/macros.asm +++ b/macros.asm @@ -44,14 +44,6 @@ dbwww: MACRO dw \2, \3, \4 ENDM -dbankaddr: MACRO - dbw BANK(\1), \1 - ENDM - -daddrbank: MACRO - dwb \1, BANK(\1) - ENDM - dn: MACRO rept _NARG / 2 db (\1) << 4 + (\2) diff --git a/macros/event.asm b/macros/event.asm index 893d55fe6..678648a04 100644 --- a/macros/event.asm +++ b/macros/event.asm @@ -690,7 +690,7 @@ faceperson: macro enum variablesprite_command variablesprite: macro db variablesprite_command - db \1 ; byte + db \1 - SPRITE_VARS ; byte db \2 ; sprite endm diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index caa96bf15..fc95f7ecb 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -33,13 +33,13 @@ Copycat: iftrue .Part1 applymovement $2, MovementData_0x18afd0 faceplayer - variablesprite $b, $1 + variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part2 .Part1 applymovement $7, MovementData_0x18afd0 faceplayer - variablesprite $b, $60 + variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part2 special Function14209 checkevent EVENT_RETURNED_MACHINE_PART @@ -64,7 +64,7 @@ Copycat: applymovement $7, MovementData_0x18afd0 .Part6 faceplayer - variablesprite $b, $28 + variablesprite SPRITE_COPYCAT, SPRITE_LASS special Function14209 loadfont writetext UnknownText_0x18b028 @@ -93,7 +93,7 @@ Copycat: applymovement $7, MovementData_0x18afd0 .Part11 faceplayer - variablesprite $b, $28 + variablesprite SPRITE_COPYCAT, SPRITE_LASS special Function14209 loadfont writetext UnknownText_0x18b116 @@ -129,13 +129,13 @@ Copycat: iftrue .Part16 applymovement $2, MovementData_0x18afd0 faceplayer - variablesprite $b, $1 + variablesprite SPRITE_COPYCAT, SPRITE_CHRIS jump .Part17 .Part16 applymovement $7, MovementData_0x18afd0 faceplayer - variablesprite $b, $60 + variablesprite SPRITE_COPYCAT, SPRITE_KRIS .Part17 special Function14209 loadfont @@ -158,7 +158,7 @@ Copycat: applymovement $7, MovementData_0x18afd0 .Part21 faceplayer - variablesprite $b, $28 + variablesprite SPRITE_COPYCAT, SPRITE_LASS special Function14209 loadfont writetext UnknownText_0x18b2f5 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index acc1c3898..550edb6d0 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -23,10 +23,10 @@ JanineScript_0x195db9: setevent EVENT_BEAT_LASS_LINDA setevent EVENT_BEAT_PICNICKER_CINDY setevent EVENT_BEAT_CAMPER_BARRY - variablesprite $7, $28 - variablesprite $8, $28 - variablesprite $9, $28 - variablesprite $a, $27 + variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS + variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS + variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS + variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER special Function14209 loadfont writetext UnknownText_0x195feb @@ -56,7 +56,7 @@ FuschiaGym1Script_0x195e1b: iftrue UnknownScript_0x195e2c applymovement $3, MovementData_0x195f27 faceplayer - variablesprite $7, $28 + variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS special Function14209 UnknownScript_0x195e2c: faceplayer @@ -75,7 +75,7 @@ UnknownScript_0x195e2c: end UnknownScript_0x195e4a: - variablesprite $7, $a + variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE returnafterbattle end @@ -90,7 +90,7 @@ FuschiaGym2Script_0x195e55: iftrue UnknownScript_0x195e66 applymovement $4, MovementData_0x195f27 faceplayer - variablesprite $8, $28 + variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS special Function14209 UnknownScript_0x195e66: faceplayer @@ -109,7 +109,7 @@ UnknownScript_0x195e66: end UnknownScript_0x195e84: - variablesprite $8, $a + variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE returnafterbattle end @@ -124,7 +124,7 @@ FuschiaGym3Script_0x195e8f: iftrue UnknownScript_0x195ea0 applymovement $5, MovementData_0x195f27 faceplayer - variablesprite $9, $28 + variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS special Function14209 UnknownScript_0x195ea0: faceplayer @@ -143,7 +143,7 @@ UnknownScript_0x195ea0: end UnknownScript_0x195ebe: - variablesprite $9, $a + variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_JANINE returnafterbattle end @@ -158,7 +158,7 @@ FuschiaGym4Script_0x195ec9: iftrue UnknownScript_0x195eda applymovement $6, MovementData_0x195f27 faceplayer - variablesprite $a, $27 + variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER special Function14209 UnknownScript_0x195eda: faceplayer @@ -177,7 +177,7 @@ UnknownScript_0x195eda: end UnknownScript_0x195ef8: - variablesprite $a, $a + variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_JANINE returnafterbattle end @@ -392,8 +392,8 @@ FuchsiaGym_MapEventHeader: ; people-events db 6 person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, -1 - person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, -1 - person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, -1 - person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, -1 - person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, -1 + person_event SPRITE_FUCHSIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, -1 + person_event SPRITE_FUCHSIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, -1 + person_event SPRITE_FUCHSIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, -1 + person_event SPRITE_FUCHSIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, -1 person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 389ea1130..c962cc0cf 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -28,7 +28,7 @@ JanineImpersonatorScript_0x196462: loadmovesprites applymovement $5, MovementData_0x196486 faceplayer - variablesprite $c, $a + variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE special Function14209 loadfont writetext UnknownText_0x19654e @@ -36,7 +36,7 @@ JanineImpersonatorScript_0x196462: loadmovesprites applymovement $5, MovementData_0x196486 faceplayer - variablesprite $c, $28 + variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS special Function14209 end diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 302bc8730..a6b03a426 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -42,7 +42,7 @@ UnknownScript_0x1a8833: dotrigger $1 disappear $5 special RestartMapMusic - variablesprite $5, $31 + variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY special Function14209 end @@ -66,7 +66,7 @@ UnknownScript_0x1a886b: disappear $5 dotrigger $1 special RestartMapMusic - variablesprite $5, $31 + variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY special Function14209 end diff --git a/maps/Route36.asm b/maps/Route36.asm index 94847c31d..f63cad50a 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -76,7 +76,7 @@ WateredWeirdTreeScript:: setevent EVENT_FOUGHT_SUDOWOODO if_equal $2, UnknownScript_0x19407b disappear $4 - variablesprite $4, $26 + variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN returnafterbattle end @@ -88,7 +88,7 @@ UnknownScript_0x19407b: returnafterbattle applymovement $4, MovementData_0x19424b disappear $4 - variablesprite $4, $26 + variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN special Function14209 special Function14168 end diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index a27f0cacb..1f2e0fcb6 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -77,7 +77,7 @@ GruntM1Script: closetext loadmovesprites setevent EVENT_CLEARED_SLOWPOKE_WELL - variablesprite $6, $4 + variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1 clearevent EVENT_6F3 clearevent EVENT_6E9 -- cgit v1.2.3 From 39524cdb766660a7bf6d60379040349652cecc04 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 15 Jul 2015 15:48:44 -0400 Subject: More enumeration of constants, more annotations of scripts. --- battle/core.asm | 20 +- battle/effect_commands.asm | 6 +- constants.asm | 1 + constants/engine_flags.asm | 2 +- constants/event_flags.asm | 14 +- constants/item_constants.asm | 1 + constants/map_constants.asm | 258 +++--- constants/misc_constants.asm | 1 + constants/wram_constants.asm | 5 + engine/buena_phone_scripts.asm | 44 +- engine/color.asm | 11 +- engine/events.asm | 235 +++--- engine/events_2.asm | 4 +- engine/map_objects.asm | 1071 ++++++++++++----------- engine/map_setup.asm | 2 +- engine/pack.asm | 26 +- engine/phone_scripts.asm | 24 +- engine/scripting.asm | 342 ++++---- engine/spawn_points.asm | 35 +- engine/specials.asm | 25 +- engine/std_scripts.asm | 592 ++++++------- home.asm | 4 +- home/battle.asm | 2 +- home/joypad.asm | 4 +- home/map.asm | 32 +- home/map_objects.asm | 240 +++--- home/menu.asm | 26 +- home/movement.asm | 4 +- home/text.asm | 18 +- home/window.asm | 2 +- macros.asm | 6 + macros/map.asm | 1 + macros/movement.asm | 227 +++-- main.asm | 1172 +++++++++++++------------- maps/AzaleaTown.asm | 4 +- maps/BurnedTower1F.asm | 8 +- maps/CeruleanCity.asm | 2 +- maps/CeruleanGym.asm | 2 +- maps/CherrygroveCity.asm | 2 +- maps/CianwoodCity.asm | 2 +- maps/DragonShrine.asm | 4 +- maps/DragonsDenB1F.asm | 2 +- maps/ElmsLab.asm | 278 +++--- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 2 +- maps/FastShipCabins_SW_SSW_NW.asm | 2 +- maps/GoldenrodDeptStore5F.asm | 2 +- maps/GoldenrodGym.asm | 2 +- maps/GoldenrodHappinessRater.asm | 2 +- maps/HallOfFame.asm | 36 +- maps/IlexForest.asm | 2 +- maps/IndigoPlateauPokeCenter1F.asm | 4 +- maps/KrissHouse1F.asm | 2 +- maps/KurtsHouse.asm | 2 +- maps/LancesRoom.asm | 4 +- maps/MahoganyMart1F.asm | 2 +- maps/MahoganyTown.asm | 2 +- maps/MobileBattleRoom.asm | 2 +- maps/MountMoon.asm | 2 +- maps/MountMoonSquare.asm | 2 +- maps/MrPokemonsHouse.asm | 4 +- maps/OlivineCity.asm | 4 +- maps/OlivinePort.asm | 12 +- maps/PokeCenter2F.asm | 4 +- maps/PowerPlant.asm | 2 +- maps/RadioTower2F.asm | 2 +- maps/RadioTower5F.asm | 2 +- maps/Route16Gate.asm | 2 +- maps/Route1718Gate.asm | 2 +- maps/Route25.asm | 4 +- maps/Route26HealSpeechHouse.asm | 2 +- maps/Route27.asm | 4 +- maps/Route27SandstormHouse.asm | 2 +- maps/Route29.asm | 4 +- maps/Route34IlexForestGate.asm | 2 +- maps/Route35NationalParkgate.asm | 8 +- maps/Route36.asm | 2 +- maps/Route36NationalParkgate.asm | 26 +- maps/Route42.asm | 2 +- maps/Route43Gate.asm | 8 +- maps/RuinsofAlphAerodactylChamber.asm | 4 +- maps/RuinsofAlphHoOhChamber.asm | 4 +- maps/RuinsofAlphKabutoChamber.asm | 4 +- maps/RuinsofAlphOmanyteChamber.asm | 4 +- maps/SproutTower3F.asm | 4 +- maps/TeamRocketBaseB1F.asm | 32 +- maps/TeamRocketBaseB2F.asm | 4 +- maps/TeamRocketBaseB3F.asm | 4 +- maps/UndergroundPathSwitchRoomEntrances.asm | 4 +- maps/VictoryRoad.asm | 4 +- maps/WiseTriosRoom.asm | 4 +- misc/mobile_40.asm | 28 +- misc/mobile_45.asm | 16 +- misc/mobile_5f.asm | 10 +- text/common.asm | 36 +- text/common_3.asm | 12 +- wram.asm | 34 +- 96 files changed, 2635 insertions(+), 2502 deletions(-) diff --git a/battle/core.asm b/battle/core.asm index 0d2f5f6d7..7c16f5934 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2452,7 +2452,7 @@ Function3cfa4: ; 3cfa4 and a ld a, b call z, Function3d0ea - callab Function39939 + callab Battle_GetTrainerName ld hl, BattleText_0x809da call StdBattleTextBox call IsMobileBattle @@ -2493,7 +2493,7 @@ Function3cfa4: ; 3cfa4 call DelayFrames call EmptyBattleTextBox ld c, $3 - callba Function11c000 + callba StoreText call Functiona80 ld hl, wPayDayMoney ld a, [hli] @@ -2903,7 +2903,7 @@ Function3d227: ; 3d227 call ClearPalettes call DelayFrame call Function3eda6 - call Function1c17 + call WriteBackup call ClearSGB call Function32f9 call Function3f26d @@ -3100,7 +3100,7 @@ LostBattle: ; 3d38e call EmptyBattleTextBox ld c, 2 - callba Function11c000 + callba StoreText call Functiona80 call ClearTileMap call WhiteBGMap @@ -3644,7 +3644,7 @@ Function3d714: ; 3d714 Function3d74b: ; 3d74b ld a, [CurPartyMon] push af - callab Function39939 + callab Battle_GetTrainerName ld hl, BattleText_0x80aca call StdBattleTextBox lb bc, 1, 7 @@ -3695,7 +3695,7 @@ Function3d7a0: ; 3d7a0 ; 3d7b8 Function3d7b8: ; 3d7b8 - callab Function39939 + callab Battle_GetTrainerName ld hl, BattleText_0x80af8 call StdBattleTextBox jp WaitBGMap @@ -5312,7 +5312,7 @@ Function3e299: call ClearPalettes call DelayFrame call Function3eda6 - call Function1c17 + call WriteBackup call Function309d call ClearSGB call Function32f9 @@ -5395,7 +5395,7 @@ Function3e358: ; 3e358 call DelayFrame call ClearSprites call Function3eda6 - call Function1c17 + call WriteBackup call ClearSGB call Function32f9 ld a, [CurPartyMon] @@ -5411,7 +5411,7 @@ Function3e3ad: ; 3e3ad jr z, .asm_3e3c1 call Function1d6e call Function3e8e4 - call Function1c17 + call WriteBackup .asm_3e3c1 call Function3e7c1 @@ -9455,7 +9455,7 @@ BattleStartMessage: ; 3fc8b ld c, 20 call DelayFrames - callba Function39939 + callba Battle_GetTrainerName ld hl, WantsToBattleText jr .asm_3fd0e diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index 7c1fa738a..30376ea98 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -9710,7 +9710,7 @@ BattleCommand67: ; 379c9 ; Return to battle scene call ClearPalettes callba Function3ed9f - call Function1c17 + call WriteBackup call ClearSprites hlcoord 1, 0 lb bc, 4, 10 @@ -9779,7 +9779,7 @@ BatonPass_LinkPlayerSwitch: ; 37a67 call Function1d6e ld hl, Function3e8e4 call CallBattleCore - call Function1c17 + call WriteBackup xor a ld [wd0ec], a @@ -9810,7 +9810,7 @@ BatonPass_LinkEnemySwitch: ; 37a82 add NUM_MOVES ld [wBattleAction], a .asm_37aa8 - jp Function1c17 + jp WriteBackup ; 37aab diff --git a/constants.asm b/constants.asm index 1876c591b..430ff4c97 100644 --- a/constants.asm +++ b/constants.asm @@ -19,6 +19,7 @@ INCLUDE "constants/engine_flags.asm" INCLUDE "constants/music_constants.asm" INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/animation_constants.asm" +INCLUDE "constants/phone_constants.asm" INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" INCLUDE "constants/misc_constants.asm" diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index b0933e860..a2291e3c6 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -81,7 +81,7 @@ const ENGINE_LUCKY_NUMBER_SHOW const ENGINE_4F const ENGINE_KURT_MAKING_BALLS - const ENGINE_51 + const ENGINE_DAILY_BUG_CONTEST const ENGINE_SPECIAL_WILDDATA const ENGINE_TIME_CAPSULE const ENGINE_ALL_FRUIT_TREES diff --git a/constants/event_flags.asm b/constants/event_flags.asm index f94194abe..c158a5278 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -777,7 +777,7 @@ const EVENT_WAREHOUSE_LAYOUT_2 const EVENT_WAREHOUSE_LAYOUT_3 const EVENT_WAREHOUSE_BLOCKED_OFF - const EVENT_308 + const EVENT_LEFT_MONS_WITH_CONTEST_OFFICER const EVENT_309 const EVENT_WILLS_ROOM_EXIT_OPEN const EVENT_WILLS_ROOM_ENTRANCE_CLOSED @@ -788,10 +788,10 @@ const EVENT_KARENS_ROOM_EXIT_OPEN const EVENT_LANCES_ROOM_ENTRANCE_CLOSED const EVENT_312 - const EVENT_313 - const EVENT_314 - const EVENT_315 - const EVENT_316 + const EVENT_CONTEST_OFFICER_HAS_SUN_STONE + const EVENT_CONTEST_OFFICER_HAS_EVERSTONE + const EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY + const EVENT_CONTEST_OFFICER_HAS_BERRY const EVENT_FOUGHT_HO_OH const EVENT_FOUGHT_LUGIA const EVENT_BEAT_RIVAL_IN_MT_MOON @@ -1848,8 +1848,8 @@ const EVENT_734 const EVENT_735 const EVENT_736 - const EVENT_737 - const EVENT_738 + const EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + const EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME const EVENT_739 const EVENT_73A const EVENT_73B diff --git a/constants/item_constants.asm b/constants/item_constants.asm index b891a2c3e..a14856d3c 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -266,6 +266,7 @@ SAFARI_BALL EQU 8 ; MOON_STONE MOON_STONE_RED EQU 10 ; BURN_HEAL FULL_HEAL_RED EQU 52 ; X_SPEED +MAIL_MAX_LENGTH EQU $20 ; pockets ITEM EQU 1 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0067ca9ed..75b9b5e76 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -473,110 +473,112 @@ MAP_N_A EQU -1 ; sprites const_def - const SPRITE_NONE - const SPRITE_CHRIS - const SPRITE_CHRIS_BIKE - const SPRITE_GAMEBOY_KID - const SPRITE_SILVER - const SPRITE_OAK - const SPRITE_RED - const SPRITE_BLUE - const SPRITE_BILL - const SPRITE_ELDER - const SPRITE_JANINE - const SPRITE_KURT - const SPRITE_MOM - const SPRITE_BLAINE - const SPRITE_REDS_MOM - const SPRITE_DAISY - const SPRITE_ELM - const SPRITE_WILL - const SPRITE_FALKNER - const SPRITE_WHITNEY - const SPRITE_BUGSY - const SPRITE_MORTY - const SPRITE_CHUCK - const SPRITE_JASMINE - const SPRITE_PRYCE - const SPRITE_CLAIR - const SPRITE_BROCK - const SPRITE_KAREN - const SPRITE_BRUNO - const SPRITE_MISTY - const SPRITE_LANCE - const SPRITE_SURGE - const SPRITE_ERIKA - const SPRITE_KOGA - const SPRITE_SABRINA - const SPRITE_COOLTRAINER_M - const SPRITE_COOLTRAINER_F - const SPRITE_BUG_CATCHER - const SPRITE_TWIN - const SPRITE_YOUNGSTER - const SPRITE_LASS - const SPRITE_TEACHER - const SPRITE_BUENA - const SPRITE_SUPER_NERD - const SPRITE_ROCKER - const SPRITE_POKEFAN_M - const SPRITE_POKEFAN_F - const SPRITE_GRAMPS - const SPRITE_GRANNY - const SPRITE_SWIMMER_GUY - const SPRITE_SWIMMER_GIRL - const SPRITE_BIG_SNORLAX - const SPRITE_SURFING_PIKACHU - const SPRITE_ROCKET - const SPRITE_ROCKET_GIRL - const SPRITE_NURSE - const SPRITE_LINK_RECEPTIONIST - const SPRITE_CLERK - const SPRITE_FISHER - const SPRITE_FISHING_GURU - const SPRITE_SCIENTIST - const SPRITE_KIMONO_GIRL - const SPRITE_SAGE - const SPRITE_UNUSED_GUY - const SPRITE_GENTLEMAN - const SPRITE_BLACK_BELT - const SPRITE_RECEPTIONIST - const SPRITE_OFFICER - const SPRITE_CAL - const SPRITE_SLOWPOKE - const SPRITE_CAPTAIN - const SPRITE_BIG_LAPRAS - const SPRITE_GYM_GUY - const SPRITE_SAILOR - const SPRITE_BIKER - const SPRITE_PHARMACIST - const SPRITE_MONSTER - const SPRITE_FAIRY - const SPRITE_BIRD - const SPRITE_DRAGON - const SPRITE_BIG_ONIX - const SPRITE_N64 - const SPRITE_SUDOWOODO - const SPRITE_SURF - const SPRITE_POKE_BALL - const SPRITE_POKEDEX - const SPRITE_PAPER - const SPRITE_VIRTUAL_BOY - const SPRITE_OLD_LINK_RECEPTIONIST - const SPRITE_ROCK - const SPRITE_BOULDER - const SPRITE_SNES - const SPRITE_FAMICOM - const SPRITE_FRUIT_TREE - const SPRITE_GOLD_TROPHY - const SPRITE_SILVER_TROPHY - const SPRITE_KRIS - const SPRITE_KRIS_BIKE - const SPRITE_KURT_OUTSIDE - const SPRITE_SUICUNE - const SPRITE_ENTEI - const SPRITE_RAIKOU - const SPRITE_STANDING_YOUNGSTER + const SPRITE_NONE ; 00 + const SPRITE_CHRIS ; 01 + const SPRITE_CHRIS_BIKE ; 02 + const SPRITE_GAMEBOY_KID ; 03 + const SPRITE_SILVER ; 04 + const SPRITE_OAK ; 05 + const SPRITE_RED ; 06 + const SPRITE_BLUE ; 07 + const SPRITE_BILL ; 08 + const SPRITE_ELDER ; 09 + const SPRITE_JANINE ; 0a + const SPRITE_KURT ; 0b + const SPRITE_MOM ; 0c + const SPRITE_BLAINE ; 0d + const SPRITE_REDS_MOM ; 0e + const SPRITE_DAISY ; 0f + const SPRITE_ELM ; 10 + const SPRITE_WILL ; 11 + const SPRITE_FALKNER ; 12 + const SPRITE_WHITNEY ; 13 + const SPRITE_BUGSY ; 14 + const SPRITE_MORTY ; 15 + const SPRITE_CHUCK ; 16 + const SPRITE_JASMINE ; 17 + const SPRITE_PRYCE ; 18 + const SPRITE_CLAIR ; 19 + const SPRITE_BROCK ; 1a + const SPRITE_KAREN ; 1b + const SPRITE_BRUNO ; 1c + const SPRITE_MISTY ; 1d + const SPRITE_LANCE ; 1e + const SPRITE_SURGE ; 1f + const SPRITE_ERIKA ; 20 + const SPRITE_KOGA ; 21 + const SPRITE_SABRINA ; 22 + const SPRITE_COOLTRAINER_M ; 23 + const SPRITE_COOLTRAINER_F ; 24 + const SPRITE_BUG_CATCHER ; 25 + const SPRITE_TWIN ; 26 + const SPRITE_YOUNGSTER ; 27 + const SPRITE_LASS ; 28 + const SPRITE_TEACHER ; 29 + const SPRITE_BUENA ; 2a + const SPRITE_SUPER_NERD ; 2b + const SPRITE_ROCKER ; 2c + const SPRITE_POKEFAN_M ; 2d + const SPRITE_POKEFAN_F ; 2e + const SPRITE_GRAMPS ; 2f + const SPRITE_GRANNY ; 30 + const SPRITE_SWIMMER_GUY ; 31 + const SPRITE_SWIMMER_GIRL ; 32 + const SPRITE_BIG_SNORLAX ; 33 + const SPRITE_SURFING_PIKACHU ; 34 + const SPRITE_ROCKET ; 35 + const SPRITE_ROCKET_GIRL ; 36 + const SPRITE_NURSE ; 37 + const SPRITE_LINK_RECEPTIONIST ; 38 + const SPRITE_CLERK ; 39 + const SPRITE_FISHER ; 3a + const SPRITE_FISHING_GURU ; 3b + const SPRITE_SCIENTIST ; 3c + const SPRITE_KIMONO_GIRL ; 3d + const SPRITE_SAGE ; 3e + const SPRITE_UNUSED_GUY ; 3f + const SPRITE_GENTLEMAN ; 40 + const SPRITE_BLACK_BELT ; 41 + const SPRITE_RECEPTIONIST ; 42 + const SPRITE_OFFICER ; 43 + const SPRITE_CAL ; 44 + const SPRITE_SLOWPOKE ; 45 + const SPRITE_CAPTAIN ; 46 + const SPRITE_BIG_LAPRAS ; 47 + const SPRITE_GYM_GUY ; 48 + const SPRITE_SAILOR ; 49 + const SPRITE_BIKER ; 4a + const SPRITE_PHARMACIST ; 4b + const SPRITE_MONSTER ; 4c + const SPRITE_FAIRY ; 4d + const SPRITE_BIRD ; 4e + const SPRITE_DRAGON ; 4f + const SPRITE_BIG_ONIX ; 50 + const SPRITE_N64 ; 51 + const SPRITE_SUDOWOODO ; 52 + const SPRITE_SURF ; 53 + const SPRITE_POKE_BALL ; 54 + const SPRITE_POKEDEX ; 55 + const SPRITE_PAPER ; 56 + const SPRITE_VIRTUAL_BOY ; 57 + const SPRITE_OLD_LINK_RECEPTIONIST ; 58 + const SPRITE_ROCK ; 59 + const SPRITE_BOULDER ; 5a + const SPRITE_SNES ; 5b + const SPRITE_FAMICOM ; 5c + const SPRITE_FRUIT_TREE ; 5d + const SPRITE_GOLD_TROPHY ; 5e + const SPRITE_SILVER_TROPHY ; 5f + const SPRITE_KRIS ; 60 + const SPRITE_KRIS_BIKE ; 61 + const SPRITE_KURT_OUTSIDE ; 62 + const SPRITE_SUICUNE ; 63 + const SPRITE_ENTEI ; 64 + const SPRITE_RAIKOU ; 65 + const SPRITE_STANDING_YOUNGSTER ; 66 + const_value SET $80 + SPRITE_POKEMON EQU const_value const SPRITE_UNOWN const SPRITE_GEODUDE @@ -663,20 +665,20 @@ const_value SET 1 ; object struct const_def - const OBJECT_00 - const OBJECT_01 const OBJECT_SPRITE + const OBJECT_MAP_OBJECT_INDEX + const OBJECT_SPRITE_TILE const OBJECT_03 const OBJECT_04 const OBJECT_FLAGS const OBJECT_PALETTE - const OBJECT_07 - const OBJECT_08 + const OBJECT_DIRECTION_WALKING + const OBJECT_FACING const OBJECT_09 const OBJECT_STEP_DURATION const OBJECT_11 const OBJECT_12 - const OBJECT_FACING + const OBJECT_FACING_STEP const OBJECT_STANDING_TILE const OBJECT_NEXT_TILE const OBJECT_MAP_X @@ -697,3 +699,43 @@ const_value SET 1 const OBJECT_31 const OBJECT_32 ; 33-39 are not used + + + const_def + const MAPOBJECT_VRAM_ID ; 0 + const MAPOBJECT_SPRITE ; 1 + const MAPOBJECT_Y_COORD ; 2 + const MAPOBJECT_X_COORD ; 3 + const MAPOBJECT_FACING ; 4 + const MAPOBJECT_MOVEMENT ; 5 + const MAPOBJECT_HOUR ; 6 + const MAPOBJECT_TIMEOFDAY ; 7 + const MAPOBJECT_COLOR ; 8 + const MAPOBJECT_RANGE ; 9 + const MAPOBJECT_POINTER_LO ; a + const MAPOBJECT_POINTER_HI ; b + const MAPOBJECT_FLAG_LO ; c + const MAPOBJECT_FLAG_HI ; d + const MAPOBJECT_E + const MAPOBJECT_F + +MAPOBJECT_NOT_VISIBLE EQU -1 +MAPOBJECT_SCREEN_HEIGHT EQU 11 +MAPOBJECT_SCREEN_WIDTH EQU 12 +OBJECT_STRUCT_3_DATA_WIDTH EQU 6 +OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 + + + const_def + const EMOTE_SHOCK ; 0 + const EMOTE_QUESTION ; 1 + const EMOTE_HAPPY ; 2 + const EMOTE_SAD ; 3 + const EMOTE_HEART ; 4 + const EMOTE_BOLT ; 5 + const EMOTE_SLEEP ; 6 + const EMOTE_FISH ; 7 + const EMOTE_ROD_DOWN ; 8 + const EMOTE_ROD_UP ; 9 + const EMOTE_ROD_LEFT ; a + const EMOTE_ROD_RIGHT ; b diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 31f2ad561..6b69713e1 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -96,3 +96,4 @@ ALWAYS_USE EQU 1 << ALWAYS_USE_F SWITCH_SOMETIMES EQU 1 << SWITCH_SOMETIMES_F SWITCH_RARELY EQU 1 << SWITCH_RARELY_F SWITCH_OFTEN EQU 1 << SWITCH_OFTEN_F +SPRITE_GFX_LIST_CAPACITY EQU $20 diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index baed9fc56..e5430b431 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -68,3 +68,8 @@ PLAYER_BIKE EQU 1 PLAYER_SLIP EQU 2 PLAYER_SURF EQU 4 PLAYER_SURF_PIKA EQU 8 + +OBJECT_STRUCT_LENGTH EQU 40 +NUM_OBJECT_STRUCTS EQU 13 + +PARTYMON_STRUCT_LENGTH EQU 48 diff --git a/engine/buena_phone_scripts.asm b/engine/buena_phone_scripts.asm index 4d0c79b61..0a278ca03 100644 --- a/engine/buena_phone_scripts.asm +++ b/engine/buena_phone_scripts.asm @@ -2,7 +2,7 @@ UnknownScript_0xa0b14: checkflag ENGINE_ROCKETS_IN_RADIO_TOWER iftrue UnknownScript_0xa0b73 checkcode VAR_HOUR - if_greater_than $11, UnknownScript_0xa0b4b + if_greater_than 17, UnknownScript_0xa0b4b scall UnknownScript_0xa0b32 jump UnknownScript_0xa0c0e @@ -37,7 +37,7 @@ UnknownScript_0xa0b4b: UnknownScript_0xa0b4f: checkcode VAR_HOUR - if_greater_than $11, UnknownScript_0xa0b6e + if_greater_than 17, UnknownScript_0xa0b6e checkmorn iftrue UnknownScript_0xa0b64 checkday @@ -68,27 +68,27 @@ UnknownScript_0xa0b73: UnknownScript_0xa0b77: checkevent EVENT_BEAT_ELITE_FOUR iftrue UnknownScript_0xa0b82 - random $b + random 11 jump UnknownScript_0xa0b84 UnknownScript_0xa0b82: - random $e + random 14 UnknownScript_0xa0b84: - if_equal $0, UnknownScript_0xa0bbc - if_equal $1, UnknownScript_0xa0bc2 - if_equal $2, UnknownScript_0xa0bc8 - if_equal $3, UnknownScript_0xa0bce - if_equal $4, UnknownScript_0xa0bd4 - if_equal $5, UnknownScript_0xa0bda - if_equal $6, UnknownScript_0xa0be0 - if_equal $7, UnknownScript_0xa0be6 - if_equal $8, UnknownScript_0xa0bec - if_equal $9, UnknownScript_0xa0bf2 - if_equal $a, UnknownScript_0xa0bf8 - if_equal $b, UnknownScript_0xa0bfe - if_equal $c, UnknownScript_0xa0c04 - if_equal $d, UnknownScript_0xa0c0a + if_equal 0, UnknownScript_0xa0bbc + if_equal 1, UnknownScript_0xa0bc2 + if_equal 2, UnknownScript_0xa0bc8 + if_equal 3, UnknownScript_0xa0bce + if_equal 4, UnknownScript_0xa0bd4 + if_equal 5, UnknownScript_0xa0bda + if_equal 6, UnknownScript_0xa0be0 + if_equal 7, UnknownScript_0xa0be6 + if_equal 8, UnknownScript_0xa0bec + if_equal 9, UnknownScript_0xa0bf2 + if_equal 10, UnknownScript_0xa0bf8 + if_equal 11, UnknownScript_0xa0bfe + if_equal 12, UnknownScript_0xa0c04 + if_equal 13, UnknownScript_0xa0c0a UnknownScript_0xa0bbc: writetext UnknownText_0xa0efb @@ -149,10 +149,10 @@ UnknownScript_0xa0c0d: end UnknownScript_0xa0c0e: - random $3 - if_equal $0, UnknownScript_0xa0c1c - if_equal $1, UnknownScript_0xa0c20 - if_equal $2, UnknownScript_0xa0c24 + random 3 + if_equal 0, UnknownScript_0xa0c1c + if_equal 1, UnknownScript_0xa0c20 + if_equal 2, UnknownScript_0xa0c24 UnknownScript_0xa0c1c: writetext UnknownText_0xa1c88 diff --git a/engine/color.asm b/engine/color.asm index 314bf2981..e922b8849 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -806,8 +806,7 @@ Function9764: ; 9764 Function976b: ; 976b ld l, a ld h, 0 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ld bc, TrainerPalettes add hl, bc ret @@ -1975,9 +1974,7 @@ Functionb1de: ; b1de push hl ld l, a ld h, 0 - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 3 ld de, TilesetBGPalette add hl, de ld e, l @@ -2017,9 +2014,7 @@ Functionb1de: ; b1de ld a, [MapGroup] ld l, a ld h, 0 - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 3 ld de, RoofPals add hl, de ld a, [TimeOfDayPal] diff --git a/engine/events.asm b/engine/events.asm index cf2d4f3e4..b37f53d39 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -24,91 +24,91 @@ OverworldLoop:: ; 966b0 ; 966cb -Function966cb: ; 966cb +ClearAllScriptFlags3: ; 966cb xor a ld [ScriptFlags3], a ret ; 966d0 -Function966d0:: ; 966d0 +SetAll_ScriptFlags3:: ; 966d0 ld a, $ff ld [ScriptFlags3], a ret ; 966d6 -Function966d6: ; 966d6 +CheckBit5_ScriptFlags3: ; 966d6 ld hl, ScriptFlags3 bit 5, [hl] ret ; 966dc -Function966dc: ; 966dc +ResetBit2_ScriptFlags3: ; 966dc ld hl, ScriptFlags3 res 2, [hl] ret ; 966e2 -Function966e2: ; 966e2 +ResetBit1_ScriptFlags3: ; 966e2 ld hl, ScriptFlags3 res 1, [hl] ret ; 966e8 -Function966e8: ; 966e8 +ResetBit0_ScriptFlags3: ; 966e8 ld hl, ScriptFlags3 res 0, [hl] ret ; 966ee -Function966ee: ; 966ee +ResetBit4_ScriptFlags3: ; 966ee ld hl, ScriptFlags3 res 4, [hl] ret ; 966f4 -Function966f4: ; 966f4 +SetBit2_ScriptFlags3: ; 966f4 ld hl, ScriptFlags3 set 2, [hl] ret ; 966fa -Function966fa: ; 966fa +SetBit1_ScriptFlags3: ; 966fa ld hl, ScriptFlags3 set 1, [hl] ret ; 96700 -Function96700: ; 96700 +SetBit0_ScriptFlags3: ; 96700 ld hl, ScriptFlags3 set 0, [hl] ret ; 96706 -Function96706: ; 96706 +SetBit4_ScriptFlags3: ; 96706 ld hl, ScriptFlags3 set 4, [hl] ret ; 9670c -Function9670c: ; 9670c +CheckBit2_ScriptFlags3: ; 9670c ld hl, ScriptFlags3 bit 2, [hl] ret ; 96712 -Function96712: ; 96712 +CheckBit1_ScriptFlags3: ; 96712 ld hl, ScriptFlags3 bit 1, [hl] ret ; 96718 -Function96718: ; 96718 +CheckBit0_ScriptFlags3: ; 96718 ld hl, ScriptFlags3 bit 0, [hl] ret ; 9671e -Function9671e: ; 9671e +CheckBit4_ScriptFlags3: ; 9671e ld hl, ScriptFlags3 bit 4, [hl] ret @@ -135,20 +135,20 @@ EnterMap: ; 9673e ld [wd454], a call Function968d1 callba RunMapSetupScript - call Function966cb + call ClearAllScriptFlags3 ld a, [$ff9f] cp $f7 - jr nz, .asm_9675a - call Function966d0 -.asm_9675a + jr nz, .dontset + call SetAll_ScriptFlags3 +.dontset ld a, [$ff9f] cp $f3 - jr nz, .asm_96764 + jr nz, .dontresetpoison xor a ld [PoisonStepCount], a -.asm_96764 +.dontresetpoison xor a ld [$ff9f], a @@ -197,7 +197,7 @@ MapEvents: ; 96795 .events ; 967a1 call PlayerEvents - call Function966cb + call ClearAllScriptFlags3 callba ScriptEvents ret ; 967ae @@ -254,19 +254,19 @@ Function967e1: ; 967e1 Function967f4: ; 967f4 ld a, [wd150] bit 5, a - jr z, .asm_96806 + jr z, .events bit 6, a - jr z, .asm_9680c + jr z, .noevents bit 4, a - jr nz, .asm_9680c - call Function966d0 + jr nz, .noevents + call SetAll_ScriptFlags3 -.asm_96806 +.events ld a, 0 ; events ld [MapEventStatus], a ret -.asm_9680c +.noevents ld a, 1 ; no events ld [MapEventStatus], a ret @@ -293,44 +293,44 @@ PlayerEvents: ; 9681f call Function968e4 call CheckTrainerBattle3 - jr c, .asm_96848 + jr c, .ok call CheckTileEvent - jr c, .asm_96848 + jr c, .ok call Function97c30 - jr c, .asm_96848 + jr c, .ok call Function968ec - jr c, .asm_96848 + jr c, .ok call Function9693a - jr c, .asm_96848 + jr c, .ok call OWPlayerInput - jr c, .asm_96848 + jr c, .ok xor a ret -.asm_96848 +.ok push af - callba Function96c56 + callba EnableScriptMode pop af ld [ScriptRunning], a call Function96beb ld a, [ScriptRunning] cp 4 - jr z, .asm_96865 + jr z, .ok2 cp 9 - jr z, .asm_96865 + jr z, .ok2 xor a ld [wc2da], a -.asm_96865 +.ok2 scf ret ; 96867 @@ -340,13 +340,13 @@ CheckTrainerBattle3: ; 96867 nop nop call CheckTrainerBattle2 - jr nc, .asm_96872 + jr nc, .nope ld a, 1 scf ret -.asm_96872 +.nope xor a ret ; 96874 @@ -355,47 +355,47 @@ CheckTrainerBattle3: ; 96867 CheckTileEvent: ; 96874 ; Check for warps, tile triggers or wild battles. - call Function9670c - jr z, .asm_96886 + call CheckBit2_ScriptFlags3 + jr z, .bit2 callba Function104820 - jr c, .asm_968a6 + jr c, .return4 call Function2238 - jr c, .asm_968aa + jr c, .return6 -.asm_96886 - call Function96712 - jr z, .asm_96890 +.bit2 + call CheckBit1_ScriptFlags3 + jr z, .bit1 call Function2ad4 - jr c, .asm_968ba + jr c, .movement -.asm_96890 - call Function96718 - jr z, .asm_96899 +.bit1 + call CheckBit0_ScriptFlags3 + jr z, .bit0 call CountStep ret c -.asm_96899 - call Function9671e - jr z, .asm_968a4 +.bit0 + call CheckBit4_ScriptFlags3 + jr z, .ok call Function97cc0 ret c - jr .asm_968a4 + jr .ok -.asm_968a4 +.ok xor a ret -.asm_968a6 +.return4 ld a, 4 scf ret -.asm_968aa +.return6 ld a, [StandingTile] call CheckPitTile jr nz, .asm_968b6 @@ -408,7 +408,7 @@ CheckTileEvent: ; 96874 scf ret -.asm_968ba +.movement ld hl, MovementAnimation ld a, [hli] ld h, [hl] @@ -450,7 +450,7 @@ Function968d8: ; 968d8 ; 968e4 Function968e4: ; 968e4 - call Function966d6 + call CheckBit5_ScriptFlags3 ret z call Function2f3e ret @@ -459,12 +459,12 @@ Function968e4: ; 968e4 Function968ec: ; 968ec ld a, [wdc07] and a - jr z, .asm_96938 + jr z, .nope ld c, a - call Function211b + call CheckTriggers cp c - jr nc, .asm_96938 + jr nc, .nope ld e, a ld d, 0 @@ -472,11 +472,8 @@ Function968ec: ; 968ec ld a, [hli] ld h, [hl] ld l, a - add hl, de - add hl, de - add hl, de - add hl, de - + add_n_times hl, de, 4 + call GetMapScriptHeaderBank call GetFarHalfword call GetMapScriptHeaderBank @@ -485,12 +482,12 @@ Function968ec: ; 968ec ld hl, ScriptFlags res 3, [hl] - callba Function96c56 + callba EnableScriptMode callba ScriptEvents ld hl, ScriptFlags bit 3, [hl] - jr z, .asm_96938 + jr z, .nope ld hl, ScriptDelay + 2 ld a, [hli] @@ -501,7 +498,7 @@ Function968ec: ; 968ec scf ret -.asm_96938 +.nope xor a ret ; 9693a @@ -608,25 +605,25 @@ TryObjectEvent: ; 969b5 .IsObject call PlayTalkObject ld a, [hConnectedMapWidth] - call Function1ae5 - ld hl, $0001 + call GetObjectStruct + ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc ld a, [hl] ld [$ffe0], a ld a, [$ffe0] call GetMapObject - ld hl, $0008 + ld hl, MAPOBJECT_COLOR add hl, bc ld a, [hl] - and $f + and %00001111 ; Bug: If IsInArray returns nc, data at bc will be executed as code. push bc ld de, 3 - ld hl, .data_969ee + ld hl, .pointers call IsInArray - jr nc, .asm_969ec + jr nc, .nope_bugged pop bc inc hl @@ -635,11 +632,11 @@ TryObjectEvent: ; 969b5 ld l, a jp [hl] -.asm_969ec +.nope_bugged xor a ret -.data_969ee +.pointers dbw 0, .zero dbw 1, .one dbw 2, .two @@ -647,11 +644,11 @@ TryObjectEvent: ; 969b5 dbw 4, .four dbw 5, .five dbw 6, .six - db $ff + db -1 ; 96a04 .zero ; 96a04 - ld hl, $000a + ld hl, MAPOBJECT_POINTER_LO add hl, bc ld a, [hli] ld h, [hl] @@ -663,7 +660,7 @@ TryObjectEvent: ; 969b5 ; 96a12 .one ; 96a12 - ld hl, $000a + ld hl, MAPOBJECT_POINTER_LO add hl, bc ld a, [hli] ld h, [hl] @@ -712,7 +709,7 @@ TryReadSign: ; 96a38 ret .IsSign - ld a, [MartPointer] + ld a, [wd040] ld hl, .signs rst JumpTable ret @@ -726,7 +723,7 @@ TryReadSign: ; 96a38 dw .ifset dw .ifnotset dw .itemifset - dw .asm_96aa2 + dw .copy ; 96a59 .up @@ -773,7 +770,7 @@ TryReadSign: ; 96a38 scf ret -.asm_96aa2 +.copy call CheckSignFlag jr nz, .dontread call GetMapScriptHeaderBank @@ -785,13 +782,13 @@ TryReadSign: ; 96a38 .ifset call CheckSignFlag jr z, .dontread - jr .asm_96ac1 + jr .thenread .ifnotset call CheckSignFlag jr nz, .dontread -.asm_96ac1 +.thenread push hl call PlayTalkObject pop hl @@ -878,8 +875,8 @@ PlayerMovement: ; 96af0 .three ; 96b20 ; force the player to move in some direction - ld a, BANK(UnknownScript_0x1253d) - ld hl, UnknownScript_0x1253d + ld a, BANK(Script_ForcedMovement) + ld hl, Script_ForcedMovement call CallScript ; ld a, -1 ld c, a @@ -941,8 +938,8 @@ SelectMenuScript: ; 96b5f StartMenuCallback: SelectMenuCallback: ; 96b66 copybytetovar $ffa0 - if_equal $80, .Script - if_equal $ff, .Asm + if_equal %10000000, .Script + if_equal -1, .Asm end ; 96b72 @@ -959,13 +956,13 @@ SelectMenuCallback: ; 96b66 CountStep: ; 96b79 ld a, [InLinkBattle] and a - jr nz, .asm_96bc9 + jr nz, .done callba Function90136 - jr c, .asm_96bcb + jr c, .setminus1 call Function96bd7 - jr c, .asm_96bcb + jr c, .setminus1 ld hl, PoisonStepCount inc [hl] @@ -981,7 +978,7 @@ CountStep: ; 96b79 jr nz, .asm_96bab callba Function16f3e - jr nz, .asm_96bcf + jr nz, .set8 .asm_96bab callba DaycareStep @@ -989,25 +986,25 @@ CountStep: ; 96b79 ld hl, PoisonStepCount ld a, [hl] cp 4 - jr c, .asm_96bc3 + jr c, .poisoned ld [hl], 0 callba Function505da - jr c, .asm_96bcb + jr c, .setminus1 -.asm_96bc3 +.poisoned callba Function97db3 -.asm_96bc9 +.done xor a ret -.asm_96bcb +.setminus1 ld a, -1 scf ret -.asm_96bcf +.set8 ld a, 8 scf ret @@ -1015,7 +1012,7 @@ CountStep: ; 96b79 Function96bd3: ; 96bd3 - ld a, $7 + ld a, 7 scf ret ; 96bd7 @@ -1038,17 +1035,15 @@ Function96beb: ; 96beb ld a, [ScriptRunning] and a ret z - cp $ff + cp -1 ret z - cp $a + cp 10 ret nc ld c, a ld b, 0 ld hl, ScriptPointers96c0c - add hl, bc - add hl, bc - add hl, bc + add_n_times hl, bc, 3 ld a, [hli] ld [ScriptBank], a ld a, [hli] @@ -1059,20 +1054,20 @@ Function96beb: ; 96beb ; 96c0c ScriptPointers96c0c: ; 96c0c - dbw BANK(UnknownScript_0x96c2d), UnknownScript_0x96c2d - dbw BANK(UnknownScript_0xbe675), UnknownScript_0xbe675 - dbw BANK(UnknownScript_0xbe66a), UnknownScript_0xbe66a - dbw BANK(UnknownScript_0x122ce), UnknownScript_0x122ce + dbw BANK(Invalid_0x96c2d), Invalid_0x96c2d + dbw BANK(SeenByTrainerScript), SeenByTrainerScript + dbw BANK(TalkToTrainerScript), TalkToTrainerScript + dbw BANK(FindItemInBallScript), FindItemInBallScript dbw BANK(UnknownScript_0x96c4d), UnknownScript_0x96c4d - dbw BANK(UnknownScript_0x96c34), UnknownScript_0x96c34 + dbw BANK(WarpToNewMapScript), WarpToNewMapScript dbw BANK(FallIntoMapScript), FallIntoMapScript dbw BANK(UnknownScript_0x124c8), UnknownScript_0x124c8 - dbw BANK(UnknownScript_0x96c2f), UnknownScript_0x96c2f + dbw BANK(HatchEggScript), HatchEggScript dbw BANK(UnknownScript_0x96c4f), UnknownScript_0x96c4f - dbw BANK(UnknownScript_0x96c2d), UnknownScript_0x96c2d + dbw BANK(Invalid_0x96c2d), Invalid_0x96c2d ; 96c2d -UnknownScript_0x96c2d: ; 96c2d +Invalid_0x96c2d: ; 96c2d end ; 96c2e @@ -1080,12 +1075,12 @@ UnknownScript_0x96c2e: ; 96c2e end ; 96c2f -UnknownScript_0x96c2f: ; 96c2f - callasm Function16f5e +HatchEggScript: ; 96c2f + callasm OverworldHatchEgg end ; 96c34 -UnknownScript_0x96c34: ; 96c34 +WarpToNewMapScript: ; 96c34 warpsound newloadmap $f5 end @@ -1116,7 +1111,7 @@ UnknownScript_0x96c4d: ; 96c4d UnknownScript_0x96c4f: ; 96c4f deactivatefacing $3 - callasm Function96706 + callasm SetBit4_ScriptFlags3 end ; 96c56 diff --git a/engine/events_2.asm b/engine/events_2.asm index 433c7caea..506075c52 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -125,8 +125,8 @@ Function97cc0:: ; 97cc0 jr .asm_97cf4 .asm_97ced - ld a, BANK(UnknownScript_0x135eb) - ld hl, UnknownScript_0x135eb + ld a, BANK(BugCatchingContestBattleScript) + ld hl, BugCatchingContestBattleScript jr .asm_97cf4 .asm_97cf4 diff --git a/engine/map_objects.asm b/engine/map_objects.asm index d7c1b6581..c44d40df7 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1,7 +1,7 @@ INCLUDE "engine/facings.asm" -Data4273:: ; 4273 +ObjectStruct3_Data:: ; 4273 db $00, $00, $01, $02, $00, $00 db $06, $00, $01, $0c, $00, $00 db $03, $00, $01, $00, $00, $00 @@ -45,26 +45,26 @@ Data4273:: ; 4273 Function4357:: ; 4357 push bc - ld hl, OBJECT_01 + ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc ld a, [hl] push af ld h, b ld l, c - ld bc, ObjectStruct2 - ObjectStruct1 + ld bc, OBJECT_STRUCT_LENGTH xor a call ByteFill pop af - cp $ff - jr z, .asm_4379 + cp -1 + jr z, .ok bit 7, a - jr nz, .asm_4379 + jr nz, .ok call GetMapObject - ld hl, OBJECT_00 + ld hl, OBJECT_SPRITE add hl, bc - ld [hl], $ff + ld [hl], -1 -.asm_4379 +.ok pop bc ret ; 437b @@ -86,24 +86,24 @@ Function4386: ; 4386 ld hl, OBJECT_MAP_X add hl, bc ld a, [hl] - add $1 + add 1 sub e - jr c, .asm_43b2 - cp $c - jr nc, .asm_43b2 + jr c, .ok + cp MAPOBJECT_SCREEN_WIDTH + jr nc, .ok ld a, [YCoord] ld e, a ld hl, OBJECT_MAP_Y add hl, bc ld a, [hl] - add $1 + add 1 sub e - jr c, .asm_43b2 - cp $b - jr nc, .asm_43b2 - jr .asm_43dc + jr c, .ok + cp MAPOBJECT_SCREEN_HEIGHT + jr nc, .ok + jr .yes -.asm_43b2 +.ok ld hl, OBJECT_FLAGS add hl, bc set 6, [hl] @@ -112,36 +112,36 @@ Function4386: ; 4386 ld hl, OBJECT_20 add hl, bc ld a, [hl] - add $1 + add 1 sub e - jr c, .asm_43de - cp $c - jr nc, .asm_43de + jr c, .ok2 + cp MAPOBJECT_SCREEN_WIDTH + jr nc, .ok2 ld a, [YCoord] ld e, a ld hl, OBJECT_21 add hl, bc ld a, [hl] - add $1 + add 1 sub e - jr c, .asm_43de - cp $b - jr nc, .asm_43de + jr c, .ok2 + cp MAPOBJECT_SCREEN_HEIGHT + jr nc, .ok2 -.asm_43dc +.yes and a ret -.asm_43de +.ok2 ld hl, OBJECT_04 add hl, bc bit 1, [hl] - jr nz, .asm_43eb + jr nz, .yes2 call Function4357 scf ret -.asm_43eb +.yes2 ld hl, OBJECT_FLAGS add hl, bc set 6, [hl] @@ -154,38 +154,38 @@ Function43f3: ; 43f3 add hl, bc ld a, [hl] and a - jr z, .asm_4409 + jr z, .zero ld hl, OBJECT_FLAGS add hl, bc bit 5, [hl] - jr nz, .asm_4426 - cp $1 - jr z, .asm_4414 - jr .asm_4421 + jr nz, .not_bit5 + cp 1 + jr z, .one + jr .ok -.asm_4409 +.zero call Function47bc ld hl, OBJECT_FLAGS add hl, bc bit 5, [hl] - jr nz, .asm_4426 + jr nz, .not_bit5 -.asm_4414 +.one call Function47dd ld hl, OBJECT_09 add hl, bc ld a, [hl] and a ret z - cp $1 + cp 1 ret z -.asm_4421 +.ok ld hl, Pointers4b45 rst JumpTable ret -.asm_4426 +.not_bit5 ret ; 4427 @@ -226,8 +226,7 @@ Function444d: ; 444d ld a, [hl] ld l, a ld h, 0 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 add hl, de ld a, [hli] ld h, [hl] @@ -274,26 +273,26 @@ Pointers445f: ; 445f ; 44a3 Function44a3: ; 44a3 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc - ld [hl], $ff + ld [hl], -1 ret ; 44aa Function44aa: ; 44aa call GetSpriteDirection - or $0 - ld hl, OBJECT_FACING + or 0 + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], a ret ; 44b5 Function44b5: ; 44b5 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld a, [hl] - and $1 + and 1 jr nz, Function44c1 jp Function44aa ; 44c1 @@ -307,16 +306,16 @@ Function44c1: ; 44c1 add hl, bc ld a, [hl] inc a - and $f + and %00001111 ld [hl], a rrca rrca - and $3 + and %00000011 ld d, a call GetSpriteDirection - or $0 + or 0 or d - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], a ret @@ -330,17 +329,17 @@ Function44e4: ; 44e4 ld hl, OBJECT_12 add hl, bc ld a, [hl] - add $2 - and $f + add 2 + and %00001111 ld [hl], a rrca rrca - and $3 + and %00000011 ld d, a call GetSpriteDirection - or $0 + or 0 or d - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], a ret @@ -358,12 +357,12 @@ Function4508: ; 4508 rrca rrca rrca - and $3 + and %00000011 ld d, a call GetSpriteDirection - or $0 + or 0 or d - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], a ret @@ -371,11 +370,11 @@ Function4508: ; 4508 Function4529: ; 4529 call Function453f - ld hl, OBJECT_08 + ld hl, OBJECT_FACING add hl, bc ld a, [hl] - or $0 - ld hl, OBJECT_FACING + or 0 + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], a ret @@ -390,21 +389,21 @@ Function453f: ; 453f ld hl, OBJECT_12 add hl, bc ld a, [hl] - and $f0 + and %11110000 ld e, a ld a, [hl] inc a - and $f + and %00001111 ld d, a - cp $4 - jr c, .asm_4558 + cp 4 + jr c, .ok ld d, 0 ld a, e add $10 - and $30 + and %00110000 ld e, a -.asm_4558 +.ok ld a, d or e ld [hl], a @@ -413,14 +412,14 @@ Function453f: ; 453f ld hl, .Directions add hl, de ld a, [hl] - ld hl, OBJECT_08 + ld hl, OBJECT_FACING add hl, bc ld [hl], a ret ; 456a .Directions ; 456a - db $00, $0c, $04, $08 + db DOWN << 2, RIGHT << 2, UP << 2, LEFT << 2 ; 456e Function456e: ; 456e @@ -428,28 +427,28 @@ Function456e: ; 456e rrca rrca add $10 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], a ret ; 457b Function457b: ; 457b - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], $15 ret ; 4582 Function4582: ; 4582 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], $14 ret ; 4589 Function4589: ; 4589 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], $17 ret @@ -460,20 +459,20 @@ Function4590: ; 4590 add hl, bc ld a, [hl] inc a - and $f + and %00001111 ld [hl], a - and $8 + and %00001000 jr z, Function45a4 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], $4 ret ; 45a4 Function45a4: ; 45a4 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc - ld [hl], $0 + ld [hl], 0 ret ; 45ab @@ -483,34 +482,34 @@ Function45ab: ; 45ab ld a, [hl] inc a ld [hl], a - and $c + and %00001100 rrca rrca add $18 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], a ret ; 45be Function45be: ; 45be - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], $16 ret ; 45c5 Function45c5: ; 45c5 - ld a, [VariableSprites + 3] + ld a, [VariableSprites + SPRITE_BIG_DOLL - SPRITE_VARS] ld d, $17 - cp $33 - jr z, .asm_45d4 - cp $47 - jr z, .asm_45d4 + cp SPRITE_BIG_SNORLAX + jr z, .ok + cp SPRITE_BIG_LAPRAS + jr z, .ok ld d, $16 -.asm_45d4 - ld hl, OBJECT_FACING +.ok + ld hl, OBJECT_FACING_STEP add hl, bc ld [hl], d ret @@ -522,13 +521,13 @@ Function45da: ; 45da inc [hl] ld a, [hl] - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc and 2 ld a, $1c - jr z, .asm_45eb + jr z, .ok inc a -.asm_45eb +.ok ld [hl], a ret ; 45ed @@ -538,14 +537,14 @@ Function45ed: ; 45ed add hl, bc inc [hl] ld a, [hl] - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc and 4 ld a, $1e - jr z, .asm_45fe + jr z, .ok inc a -.asm_45fe +.ok ld [hl], a ret ; 4600 @@ -605,13 +604,13 @@ Function463f: ; 463f ld hl, OBJECT_FLAGS add hl, bc bit 3, [hl] - jr z, .asm_464f + jr z, .ok ld hl, OBJECT_STANDING_TILE add hl, bc ld a, [hl] call Function4661 -.asm_464f +.ok ld hl, OBJECT_STANDING_TILE add hl, bc ld a, [hl] @@ -626,17 +625,17 @@ Function463f: ; 463f Function4661: ; 4661 call Function188e - jr z, .asm_466b + jr z, .set call Function1875 - jr c, .asm_4672 + jr c, .reset -.asm_466b +.set ld hl, OBJECT_FLAGS add hl, bc set 3, [hl] ret -.asm_4672 +.reset ld hl, OBJECT_FLAGS add hl, bc res 3, [hl] @@ -659,29 +658,29 @@ Function467b: ; 467b ld [hli], a ld [hli], a ld [hl], a - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ret ; 4690 Function4690: ; 4690 - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld [hl], a ld hl, OBJECT_04 add hl, bc bit 2, [hl] - jr nz, .asm_46a6 + jr nz, .ok add a add a - and $c - ld hl, OBJECT_08 + and %00001100 + ld hl, OBJECT_FACING add hl, bc ld [hl], a -.asm_46a6 +.ok ; fallthrough ; 46a6 @@ -745,10 +744,10 @@ Function46d7: ; 46d7 GetStepVector: ; 46e9 ; Return (x, y, duration, speed) in (d, e, a, h). - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld a, [hl] - and $f + and %00001111 add a add a ld l, a @@ -793,10 +792,10 @@ Function4730: ; 4730 ; 4738 Function4738: ; 4738 - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld a, [hl] - and $3 + and %00000011 ld [wd151], a call Function46d7 ld a, [wd14e] @@ -814,7 +813,7 @@ Function4759: ; 4759 push bc ld e, a ld d, 0 - ld hl, OBJECT_01 + ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc ld a, [hl] call GetMapObject @@ -825,46 +824,46 @@ Function4759: ; 4759 ; 4769 Function4769: ; 4769 - ld hl, OBJECT_01 + ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc ld a, [hl] - cp $ff - jr z, .asm_477d + cp -1 + jr z, .ok push bc call GetMapObject - ld hl, $0004 + ld hl, MAPOBJECT_FACING add hl, bc ld a, [hl] pop bc ret -.asm_477d - ld a, $6 +.ok + ld a, 6 ret ; 4780 -Function4780: ; 4780 +ClearObjectStructField27: ; 4780 ld hl, OBJECT_27 add hl, bc - ld [hl], $0 + ld [hl], 0 ret ; 4787 -Function4787: ; 4787 +IncrementObjectStructField27: ; 4787 ld hl, OBJECT_27 add hl, bc inc [hl] ret ; 478d -Function478d: ; 478d +DecrementObjectStructField27: ; 478d ld hl, OBJECT_27 add hl, bc dec [hl] ret ; 4793 -Function4793: ; 4793 +JumptoObjectStructField27: ; 4793 ld hl, OBJECT_27 add hl, bc ld a, [hl] @@ -873,21 +872,21 @@ Function4793: ; 4793 ret ; 479b -Function479b: ; 479b +ClearObjectStructField28: ; 479b ld hl, OBJECT_28 add hl, bc - ld [hl], $0 + ld [hl], 0 ret ; 47a2 -Function47a2: ; 47a2 +IncrementObjectStructField28: ; 47a2 ld hl, OBJECT_28 add hl, bc inc [hl] ret ; 47a8 -Function47a8: ; 47a8 +JumptoObjectStructField28: ; 47a8 ld hl, OBJECT_28 add hl, bc ld a, [hl] @@ -896,14 +895,14 @@ Function47a8: ; 47a8 ret ; 47b0 -Function47b0: ; 47b0 +GetValueObjectStructField28: ; 47b0 ld hl, OBJECT_28 add hl, bc ld a, [hl] ret ; 47b6 -Function47b6: ; 47b6 +SetValueObjectStructField28: ; 47b6 ld hl, OBJECT_28 add hl, bc ld [hl], a @@ -927,12 +926,12 @@ Function47bc: ; 47bc call Function467b ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 47dd Function47dd: ; 47dd - call Function479b + call ClearObjectStructField28 call Function1a2f ld a, [hl] ld hl, .Pointers @@ -978,49 +977,49 @@ Function4821: ; 4821 Function4822: ; 4822 call Random ld a, [hRandomAdd] - and 1 + and %00000001 jp Function4af0 ; 482c Function482c: ; 482c call Random ld a, [hRandomAdd] - and 1 - or 2 + and %00000001 + or %00000010 jp Function4af0 ; 4838 Function4838: ; 4838 call Random ld a, [hRandomAdd] - and 3 + and %00000011 jp Function4af0 ; 4842 Function4842: ; 4842 call Random ld a, [hRandomAdd] - and $c - ld hl, OBJECT_08 + and %00001100 + ld hl, OBJECT_FACING add hl, bc ld [hl], a jp Function4b1d ; 4851 Function4851: ; 4851 - ld hl, OBJECT_08 + ld hl, OBJECT_FACING add hl, bc ld a, [hl] - and $c + and %00001100 ld d, a call Random ld a, [hRandomAdd] - and $c + and %00001100 cp d - jr nz, .asm_4865 - xor $c + jr nz, .keep + xor %00001100 -.asm_4865 +.keep ld [hl], a jp Function4b26 ; 4869 @@ -1030,10 +1029,10 @@ Function4869: ; 4869 call Function467b ld hl, OBJECT_11 add hl, bc - ld [hl], $1 + ld [hl], 1 ld hl, OBJECT_09 add hl, bc - ld [hl], $5 + ld [hl], 5 ret ; 487c @@ -1084,7 +1083,7 @@ Function48a6: ; 48a6 ; 48ac Function48ac: ; 48ac - call Function4793 + call JumptoObjectStructField27 dw Function48b3 dw Function48f8 ; 48b3 @@ -1094,20 +1093,20 @@ Function48b3: ; 48b3 add hl, bc ld a, [hl] call CheckPitTile - jr z, .asm_48f5 + jr z, .on_pit ld hl, OBJECT_FLAGS add hl, bc bit 2, [hl] res 2, [hl] - jr z, .asm_48ee + jr z, .ok ld hl, OBJECT_32 add hl, bc ld a, [hl] - and $3 - or $0 + and %00000011 + or 0 call Function4690 call Function6ec1 - jr c, .asm_48eb + jr c, .ok2 ld de, SFX_STRENGTH call PlaySFX call Function5538 @@ -1117,24 +1116,24 @@ Function48b3: ; 48b3 ld [hl], $f ret -.asm_48eb +.ok2 call Function462a -.asm_48ee - ld hl, OBJECT_07 +.ok + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ret -.asm_48f5 - call Function4787 +.on_pit + call IncrementObjectStructField27 ; fallthrough ; 48f8 Function48f8: ; 48f8 - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ret ; 48ff @@ -1149,96 +1148,96 @@ Function48ff: ; 48ff add hl, bc ld a, [hl] push bc - call Function1ae5 - ld hl, OBJECT_07 + call GetObjectStruct + ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld a, [hl] - cp $ff - jr z, .asm_494a + cp STANDING + jr z, .standing ld hl, OBJECT_NEXT_MAP_X add hl, bc ld a, [hl] cp d - jr z, .asm_492d - jr c, .asm_4929 - ld a, $3 - jr .asm_493d + jr z, .equal + jr c, .less + ld a, 3 + jr .done -.asm_4929 - ld a, $2 - jr .asm_493d +.less + ld a, 2 + jr .done -.asm_492d +.equal ld hl, OBJECT_NEXT_MAP_Y add hl, bc ld a, [hl] cp e - jr z, .asm_494a - jr c, .asm_493b - ld a, $0 - jr .asm_493d + jr z, .standing + jr c, .less2 + ld a, 0 + jr .done -.asm_493b - ld a, $1 +.less2 + ld a, 1 -.asm_493d +.done ld d, a - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld a, [hl] - and $c + and %00001100 or d pop bc jp Function5412 -.asm_494a +.standing pop bc - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_11 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4958 Function4958: ; 4958 call Function467b - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_11 add hl, bc - ld [hl], $9 + ld [hl], 9 ld hl, OBJECT_09 add hl, bc - ld [hl], $4 + ld [hl], 4 ret ; 496e Function496e: ; 496e call Function467b - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_11 add hl, bc - ld [hl], $a + ld [hl], 10 ld hl, OBJECT_09 add hl, bc - ld [hl], $4 + ld [hl], 4 ret ; 4984 Function4984: ; 4984 - call Function4793 + call JumptoObjectStructField27 dw Function4996 dw Function499c dw Function49b8 ; 498d Function498d: ; 498d - call Function4793 + call JumptoObjectStructField27 dw Function4996 dw Function499c dw Function49c4 @@ -1246,14 +1245,14 @@ Function498d: ; 498d Function4996: ; 4996 call Function467b - call Function4787 + call IncrementObjectStructField27 ; fallthrough ; 499c Function499c: ; 499c ld hl, OBJECT_11 add hl, bc - ld [hl], $1 + ld [hl], 1 ld hl, OBJECT_32 add hl, bc ld a, [hl] @@ -1263,46 +1262,46 @@ Function499c: ; 499c ld [hl], a ld hl, OBJECT_09 add hl, bc - ld [hl], $3 - call Function4787 + ld [hl], 3 + call IncrementObjectStructField27 ret ; 49b8 Function49b8: ; 49b8 - ld de, .data_49c0 + ld de, .DirectionData_49c0 call Function49d0 jr Function4984 ; 49c0 -.data_49c0 ; 49c0 - db $0c, $08, $00, $04 +.DirectionData_49c0 ; 49c0 + db RIGHT << 2, LEFT << 2, DOWN << 2, UP << 2 ; 49c4 Function49c4: ; 49c4 - ld de, .data_49cc + ld de, .DirectionData_49cc call Function49d0 jr Function498d ; 49cc -.data_49cc ; 49cc - db $08, $0c, $04, $00 +.DirectionData_49cc ; 49cc + db LEFT << 2, RIGHT << 2, UP << 2, DOWN << 2 ; 49d0 Function49d0: ; 49d0 - ld hl, OBJECT_08 + ld hl, OBJECT_FACING add hl, bc ld a, [hl] - and $c + and %00001100 rrca rrca push hl ld l, a - ld h, $0 + ld h, 0 add hl, de ld a, [hl] pop hl ld [hl], a - call Function478d + call DecrementObjectStructField27 ret ; 49e5 @@ -1316,28 +1315,28 @@ Function49e5: ; 49e5 ld a, [hl] inc a add a - add $0 + add 0 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], a - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, de ld a, [hl] and 3 ld d, $e - cp 0 - jr z, .asm_4a0f - cp 1 - jr z, .asm_4a0f + cp DOWN + jr z, .ok + cp UP + jr z, .ok ld d, $c -.asm_4a0f +.ok ld hl, OBJECT_SPRITE_Y_OFFSET add hl, bc ld [hl], d ld hl, OBJECT_SPRITE_X_OFFSET add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_09 add hl, bc ld [hl], $13 @@ -1349,16 +1348,16 @@ Function4a21: ; 4a21 call Function4aa8 ld hl, OBJECT_11 add hl, bc - ld [hl], $8 + ld [hl], 8 ld hl, OBJECT_STEP_DURATION add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_SPRITE_Y_OFFSET add hl, bc ld [hl], $f0 ld hl, OBJECT_SPRITE_X_OFFSET add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_09 add hl, bc ld [hl], $13 @@ -1379,15 +1378,14 @@ Function4a46: ; 4a46 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], a - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, de ld a, [hl] - and 3 + and %00000011 ld e, a ld d, 0 ld hl, .data_4a81 - add hl, de - add hl, de + add_n_times hl, de, 2 ld d, [hl] inc hl ld e, [hl] @@ -1420,7 +1418,7 @@ Function4a89: ; 4a89 ld hl, OBJECT_STEP_DURATION add hl, de ld a, [hl] - add $ff + add -1 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], a @@ -1435,7 +1433,7 @@ Function4aa8: ; 4aa8 add hl, bc ld a, [hl] push bc - call Function1ae5 + call GetObjectStruct ld d, b ld e, c pop bc @@ -1451,7 +1449,7 @@ Function4abc: ; 4abc call Function467b ld hl, OBJECT_11 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_32 add hl, bc ld a, [hl] @@ -1470,20 +1468,20 @@ Function4abc: ; 4abc Function4ade: ; 4ade ld d, a - and $3f + and %00111111 ld e, a ld a, d rlca rlca - and $3 + and %00000011 ld d, a inc d - ld a, $1 -.asm_4aeb + ld a, 1 +.loop dec d ret z add a - jr .asm_4aeb + jr .loop ; 4af0 Function4af0: ; 4af0 @@ -1493,20 +1491,20 @@ Function4af0: ; 4af0 call Function463f ld hl, OBJECT_11 add hl, bc - ld [hl], $2 + ld [hl], 2 ld hl, wd4cf ld a, [$ffaf] cp [hl] - jr z, .asm_4b10 + jr z, .ok ld hl, OBJECT_09 add hl, bc ld [hl], $7 ret -.asm_4b10 +.ok ld hl, OBJECT_09 add hl, bc - ld [hl], $6 + ld [hl], 6 ret Function4b17: ; 4b17 @@ -1518,14 +1516,14 @@ Function4b17: ; 4b17 Function4b1d: ; 4b1d call Random ld a, [hRandomAdd] - and $7f + and %01111111 jr Function4b2d ; 4b26 Function4b26: ; 4b26 call Random ld a, [hRandomAdd] - and $1f + and %00011111 ; fallthrough ; 4b2d @@ -1533,15 +1531,15 @@ Function4b2d: ; 4b2d ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], a - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_11 add hl, bc - ld [hl], $1 + ld [hl], 1 ld hl, OBJECT_09 add hl, bc - ld [hl], $3 + ld [hl], 3 ret ; 4b45 @@ -1581,12 +1579,12 @@ Function4b79: ; 4b79 ret nz ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4b86 Function4b86: ; 4b86 - call Function47a8 + call JumptoObjectStructField28 dw Function4b8d dw Function4ba9 ; 4b8d @@ -1603,7 +1601,7 @@ Function4b8d: ; 4b8d ld hl, OBJECT_FLAGS add hl, bc res 3, [hl] - call Function47a2 + call IncrementObjectStructField28 ret ; 4ba9 @@ -1617,12 +1615,12 @@ Function4ba9: ; 4ba9 call Function4600 ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4bbf Function4bbf: ; 4bbf - call Function47a8 + call JumptoObjectStructField28 dw Function4bca dw Function4bd2 dw Function4bf2 @@ -1632,7 +1630,7 @@ Function4bbf: ; 4bbf Function4bca: ; 4bca ld hl, wd150 set 7, [hl] - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4bd2 @@ -1650,7 +1648,7 @@ Function4bd2: ; 4bd2 ld hl, wd150 set 6, [hl] set 4, [hl] - call Function47a2 + call IncrementObjectStructField28 ret ; 4bf2 @@ -1658,7 +1656,7 @@ Function4bf2: ; 4bf2 call Function46a6 ld hl, wd150 set 7, [hl] - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4bfd @@ -1674,12 +1672,12 @@ Function4bfd: ; 4bfd call Function4600 ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4c18 Function4c18: ; 4c18 - call Function47a8 + call JumptoObjectStructField28 dw Function4c23 dw Function4c32 dw Function4c42 @@ -1689,30 +1687,30 @@ Function4c18: ; 4c18 Function4c23: ; 4c23 ld hl, OBJECT_12 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], $10 - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4c32 Function4c32: ; 4c32 ld hl, OBJECT_11 add hl, bc - ld [hl], $4 + ld [hl], 4 ld hl, OBJECT_STEP_DURATION add hl, bc dec [hl] ret nz - call Function47a2 + call IncrementObjectStructField28 ret ; 4c42 Function4c42: ; 4c42 ld hl, OBJECT_12 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_31 add hl, bc ld [hl], $10 @@ -1722,14 +1720,14 @@ Function4c42: ; 4c42 ld hl, OBJECT_FLAGS add hl, bc res 3, [hl] - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4c5d Function4c5d: ; 4c5d ld hl, OBJECT_11 add hl, bc - ld [hl], $4 + ld [hl], 4 ld hl, OBJECT_31 add hl, bc inc [hl] @@ -1747,15 +1745,15 @@ Function4c5d: ; 4c5d ret nz ld hl, OBJECT_12 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4c89 Function4c89: ; 4c89 - call Function47a8 + call JumptoObjectStructField28 dw Function4c9a dw Function4caa dw Function4cb3 @@ -1768,11 +1766,11 @@ Function4c89: ; 4c89 Function4c9a: ; 4c9a ld hl, OBJECT_11 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], $10 - call Function47a2 + call IncrementObjectStructField28 ret ; 4caa @@ -1781,28 +1779,28 @@ Function4caa: ; 4caa add hl, bc dec [hl] ret nz - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4cb3 Function4cb3: ; 4cb3 ld hl, OBJECT_12 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_31 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], $10 - call Function47a2 + call IncrementObjectStructField28 ret ; 4cc9 Function4cc9: ; 4cc9 ld hl, OBJECT_11 add hl, bc - ld [hl], $4 + ld [hl], 4 ld hl, OBJECT_31 add hl, bc inc [hl] @@ -1818,7 +1816,7 @@ Function4cc9: ; 4cc9 add hl, bc dec [hl] ret nz - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4ceb @@ -1826,14 +1824,14 @@ Function4ceb: ; 4ceb ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], $10 - call Function47a2 + call IncrementObjectStructField28 ret ; 4cf5 Function4cf5: ; 4cf5 ld hl, OBJECT_11 add hl, bc - ld [hl], $4 + ld [hl], 4 ld hl, OBJECT_STEP_DURATION add hl, bc dec [hl] @@ -1843,18 +1841,18 @@ Function4cf5: ; 4cf5 Function4d01: ; 4d01 ld hl, OBJECT_12 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_SPRITE_Y_OFFSET add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4d14 Function4d14: ; 4d14 - call Function47a8 + call JumptoObjectStructField28 dw Function4d1f dw Function4d2e dw Function4d4f @@ -1864,11 +1862,11 @@ Function4d14: ; 4d14 Function4d1f: ; 4d1f ld hl, OBJECT_11 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], $10 - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4d2e @@ -1879,17 +1877,17 @@ Function4d2e: ; 4d2e ret nz ld hl, OBJECT_11 add hl, bc - ld [hl], $2 + ld [hl], 2 ld hl, OBJECT_12 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_31 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], $10 - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4d4f @@ -1909,25 +1907,25 @@ Function4d4f: ; 4d4f add hl, bc dec [hl] ret nz - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4d6b Function4d6b: ; 4d6b ld hl, OBJECT_12 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_SPRITE_Y_OFFSET add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4d7e Function4d7e: ; 4d7e - call Function47a8 + call JumptoObjectStructField28 dw Function4d85 dw Function4d94 ; 4d85 @@ -1935,11 +1933,11 @@ Function4d7e: ; 4d7e Function4d85: ; 4d85 ld hl, OBJECT_STEP_DURATION add hl, bc - ld [hl], $8 + ld [hl], 8 ld hl, OBJECT_SPRITE_Y_OFFSET add hl, bc - ld [hl], $0 - call Function47a2 + ld [hl], 0 + call IncrementObjectStructField28 ; fallthrough ; 4d94 @@ -1955,10 +1953,10 @@ Function4d94: ; 4d94 ret nz ld hl, OBJECT_SPRITE_Y_OFFSET add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4daf @@ -1971,12 +1969,12 @@ Function4db5: ; 4db5 ld hl, OBJECT_STEP_DURATION add hl, bc ld a, [hl] - and $1 - ld a, $1 - jr z, .asm_4dc2 - ld a, $0 + and %00000001 + ld a, 1 + jr z, .yes + ld a, 0 -.asm_4dc2 +.yes ld hl, OBJECT_11 add hl, bc ld [hl], a @@ -1987,12 +1985,12 @@ Function4dc8: ; 4dc8 ld hl, OBJECT_STEP_DURATION add hl, bc ld a, [hl] - and $1 - ld a, $4 - jr z, .asm_4dd5 - ld a, $5 + and %00000001 + ld a, 4 + jr z, .yes + ld a, 5 -.asm_4dd5 +.yes ld hl, OBJECT_11 add hl, bc ld [hl], a @@ -2000,23 +1998,23 @@ Function4dc8: ; 4dc8 ; 4ddd Function4ddd: ; 4ddd - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_STEP_DURATION add hl, bc dec [hl] ret nz ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4df0 Function4df0: ; 4df0 - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_STEP_DURATION add hl, bc dec [hl] @@ -2031,12 +2029,12 @@ Function4dff: ; 4dff ret nz ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4e0c Function4e0c: ; 4e0c - call Function47a8 + call JumptoObjectStructField28 dw Function4e13 dw Function4e21 ; 4e13 @@ -2044,18 +2042,18 @@ Function4e0c: ; 4e0c Function4e13: ; 4e13 call Function4769 call Function1a47 - ld hl, OBJECT_08 + ld hl, OBJECT_FACING add hl, bc ld [hl], a - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4e21 Function4e21: ; 4e21 call Function4fb2 - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ret ; 4e2b @@ -2067,12 +2065,12 @@ Function4e2b: ; 4e2b dec [hl] ret nz call Function4600 - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4e47 @@ -2088,7 +2086,7 @@ Function4e47: ; 4e47 Function4e56: ; 4e56 ; AnimateStep? - call Function47a8 + call JumptoObjectStructField28 dw Function4e5d dw Function4e65 ; 4e5d @@ -2096,7 +2094,7 @@ Function4e56: ; 4e56 Function4e5d: ; 4e5d ld hl, wd150 set 7, [hl] - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4e65 @@ -2109,17 +2107,17 @@ Function4e65: ; 4e65 ld hl, wd150 set 6, [hl] call Function4600 - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4e83 Function4e83: ; 4e83 - call Function47a8 + call JumptoObjectStructField28 dw Function4e8e dw Function4ea4 dw Function4ead @@ -2127,17 +2125,17 @@ Function4e83: ; 4e83 ; 4e8e Function4e8e: ; 4e8e - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_12 add hl, bc ld a, [hl] - ld [hl], $2 + ld [hl], 2 ld hl, OBJECT_STEP_DURATION add hl, bc - ld [hl], $2 - call Function47a2 + ld [hl], 2 + call IncrementObjectStructField28 ; fallthrough ; 4ea4 @@ -2146,7 +2144,7 @@ Function4ea4: ; 4ea4 add hl, bc dec [hl] ret nz - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4ead @@ -2154,13 +2152,13 @@ Function4ead: ; 4ead ld hl, OBJECT_29 add hl, bc ld a, [hl] - ld hl, OBJECT_08 + ld hl, OBJECT_FACING add hl, bc ld [hl], a ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], $2 - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4ec0 @@ -2171,7 +2169,7 @@ Function4ec0: ; 4ec0 ret nz ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4ecd @@ -2188,7 +2186,7 @@ Function4ecd: ; 4ecd ld hl, OBJECT_MAP_Y add hl, bc ld e, [hl] - ld hl, OBJECT_01 + ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc ld a, [hl] ld b, a @@ -2198,12 +2196,12 @@ Function4ecd: ; 4ecd add hl, bc res 2, [hl] call Function4600 - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc - ld [hl], $ff + ld [hl], STANDING ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4f04 @@ -2213,11 +2211,11 @@ Function4f04: ; 4f04 ld e, [hl] inc hl ld d, [hl] - ld hl, OBJECT_00 + ld hl, OBJECT_SPRITE add hl, de ld a, [hl] and a - jr z, .asm_4f30 + jr z, .nope ld hl, OBJECT_SPRITE_X add hl, de ld a, [hl] @@ -2238,12 +2236,12 @@ Function4f04: ; 4f04 dec [hl] ret nz -.asm_4f30 +.nope jp Function4357 ; 4f33 Function4f33: ; 4f33 - call Function47a8 + call JumptoObjectStructField28 dw Function4f3a dw Function4f43 ; 4f3a @@ -2253,7 +2251,7 @@ Function4f3a: ; 4f3a ld hl, OBJECT_29 add hl, bc ld [hl], a - call Function47a2 + call IncrementObjectStructField28 ; fallthrough ; 4f43 @@ -2267,7 +2265,7 @@ Function4f43: ; 4f43 ld hl, OBJECT_STEP_DURATION add hl, bc dec [hl] - jr z, .asm_4f68 + jr z, .ok ld a, [hl] call Function4f6c ld hl, OBJECT_29 @@ -2279,7 +2277,7 @@ Function4f43: ; 4f43 ld [wd14f], a ret -.asm_4f68 +.ok call Function4357 ret ; 4f6c @@ -2296,18 +2294,18 @@ Function4f6c: ; 4f6c ; 4f77 Function4f77: ; 4f77 - call Function47a8 ; ???? + call JumptoObjectStructField28 ; ???? ; 4f7a Function4f7a: ; 4f7a - call Function47a8 + call JumptoObjectStructField28 dw Function4f83 dw Function4f83 dw Function4f83 ; 4f83 Function4f83: ; 4f83 - call Function47a8 + call JumptoObjectStructField28 dw Function4f8a dw Function4f99 ; 4f8a @@ -2319,7 +2317,7 @@ Function4f8a: ; 4f8a ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], $10 - call Function47a2 + call IncrementObjectStructField28 ; 4f99 Function4f99: ; 4f99 @@ -2332,10 +2330,10 @@ Function4f99: ; 4f99 ld [hl], $60 ld hl, OBJECT_12 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, OBJECT_09 add hl, bc - ld [hl], $1 + ld [hl], 1 ret ; 4fb2 @@ -2350,7 +2348,7 @@ Function4fb3: ; 4fb3 ld a, [hl] srl a srl a - and 7 + and %00000111 ld l, a ld h, 0 ld de, .y @@ -2449,14 +2447,14 @@ Function503d: ; 503d Function5041: ; 5041 call Function5055 -.asm_5044 +.loop xor a ld [wc2ea], a call Function505e call Function506b ld a, [wc2ea] and a - jr nz, .asm_5044 + jr nz, .loop ret ; 5055 @@ -2477,7 +2475,7 @@ Function505e: ; 505e ; 5065 Function5065: ; 5065 - ld a, $1 + ld a, 1 ld [wc2ea], a ret ; 506b @@ -2500,7 +2498,7 @@ INCLUDE "engine/movement.asm" Function54b8: ; 54b8 ld e, a ld a, [wd4ce] - cp $ff + cp -1 ret z ld a, [wd4cd] ld d, a @@ -2534,25 +2532,25 @@ Function54e6: ; 54e6 ld hl, wd4d0 ld a, [hl] and a - jr z, .asm_5503 - cp $ff - jr z, .asm_5503 + jr z, .done + cp -1 + jr z, .done dec [hl] ld e, a ld d, 0 ld hl, wd4d1 add hl, de inc e - ld a, $ff -.asm_54fc + ld a, -1 +.loop ld d, [hl] ld [hld], a ld a, d dec e - jr nz, .asm_54fc + jr nz, .loop ret -.asm_5503 +.done call Function550a ret c ld a, $3e @@ -2561,20 +2559,20 @@ Function54e6: ; 54e6 Function550a: ; 550a ld a, [wd4cd] - cp $ff - jr z, .asm_5520 + cp -1 + jr z, .nope push bc - call Function1ae5 - ld hl, OBJECT_00 + call GetObjectStruct + ld hl, OBJECT_SPRITE add hl, bc ld a, [hl] pop bc and a - jr z, .asm_5520 + jr z, .nope and a ret -.asm_5520 +.nope ld a, $ff ld [wd4ce], a ld a, $47 @@ -2657,31 +2655,31 @@ Function5579: ; 5579 Function5582: ; 5582 ld de, ObjectStructs ld a, $d -.asm_5587 +.loop push af ld hl, OBJECT_04 add hl, de bit 7, [hl] - jr z, .asm_55a1 - ld hl, OBJECT_00 + jr z, .next + ld hl, OBJECT_SPRITE add hl, de ld a, [hl] and a - jr z, .asm_55a1 + jr z, .next push bc xor a - ld bc, ObjectStruct2 - ObjectStruct1 + ld bc, OBJECT_STRUCT_LENGTH call ByteFill pop bc -.asm_55a1 - ld hl, ObjectStruct2 - ObjectStruct1 +.next + ld hl, OBJECT_STRUCT_LENGTH add hl, de ld d, h ld e, l pop af dec a - jr nz, .asm_5587 + jr nz, .loop ret ; 55ac @@ -2696,9 +2694,9 @@ Function55ac: ; 55ac Function55b9: ; 55b9 ld hl, wc2f0 - ld [hl], $ff + ld [hl], -1 inc hl - ld [hl], $ff + ld [hl], -1 inc hl ld a, [de] inc de @@ -2722,7 +2720,7 @@ Function55b9: ; 55b9 inc hl ld [hl], e inc hl - ld [hl], $ff + ld [hl], -1 ret ; 55e0 @@ -2732,44 +2730,44 @@ Function55e0:: ; 55e0 ret z ld bc, ObjectStructs xor a -.asm_55ea +.loop ld [$ffaf], a - call Function1af1 - jr z, .asm_55f4 + call GetObjectSprite + jr z, .ok call Function565c -.asm_55f4 - ld hl, ObjectStruct2 - ObjectStruct1 +.ok + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l ld a, [$ffaf] inc a - cp $d - jr nz, .asm_55ea + cp NUM_OBJECT_STRUCTS + jr nz, .loop ret ; 5602 Function5602: ; 5602 call Function5645 - ld a, $0 + ld a, 0 call Function5629 ld a, [wd459] bit 7, a - jr z, .asm_5619 + jr z, .ok ld a, [$ffe0] and a - jr z, .asm_5619 + jr z, .ok call Function5629 -.asm_5619 +.ok call Function5920 ret ; 561d Function561d: ; 561d call Function5645 - ld a, $0 + ld a, 0 call Function5629 call Function5920 ret @@ -2779,15 +2777,15 @@ Function5629: ; 5629 cp $10 ret nc call GetMapObject - ld hl, $0000 + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld a, [hl] - cp $ff + cp MAPOBJECT_NOT_VISIBLE ret z cp $d ret nc - call Function1ae5 - call Function1af1 + call GetObjectStruct + call GetObjectSprite ret z call Function5673 ret @@ -2796,17 +2794,17 @@ Function5629: ; 5629 Function5645: ; 5645 xor a ld bc, ObjectStructs -.asm_5649 +.loop ld [$ffaf], a call Function5680 - ld hl, ObjectStruct2 - ObjectStruct1 + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l ld a, [$ffaf] inc a - cp $d - jr nz, .asm_5649 + cp NUM_OBJECT_STRUCTS + jr nz, .loop ret ; 565c @@ -2832,9 +2830,9 @@ Function5673: ; 5673 ; 5680 Function5680: ; 5680 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc - ld [hl], $ff + ld [hl], STANDING scf ret ; 5688 @@ -2867,26 +2865,26 @@ Function56a3: ; 56a3 inc e ld a, [XCoord] cp d - jr z, .asm_56bc - jr nc, .asm_56cb + jr z, .equal_x + jr nc, .nope add $b cp d - jr c, .asm_56cb + jr c, .nope -.asm_56bc +.equal_x ld a, [YCoord] cp e - jr z, .asm_56c9 - jr nc, .asm_56cb + jr z, .equal_y + jr nc, .nope add $a cp e - jr c, .asm_56cb + jr c, .nope -.asm_56c9 +.equal_y xor a ret -.asm_56cb +.nope scf ret ; 56cd @@ -2902,27 +2900,27 @@ Function56cd: ; 56cd add [hl] add d cp $f0 - jr nc, .asm_56e5 + jr nc, .ok1 cp $a0 - jp nc, .asm_5768 + jp nc, .nope -.asm_56e5 - and $7 - ld d, $2 - cp $4 - jr c, .asm_56ef - ld d, $3 +.ok1 + and %00000111 + ld d, 2 + cp 4 + jr c, .ok2 + ld d, 3 -.asm_56ef +.ok2 ld a, [hl] srl a srl a srl a cp $14 - jr c, .asm_56fc + jr c, .ok3 sub $20 -.asm_56fc +.ok3 ld [$ffbd], a ld a, [wd14d] ld e, a @@ -2934,76 +2932,76 @@ Function56cd: ; 56cd add [hl] add e cp $f0 - jr nc, .asm_5715 + jr nc, .ok4 cp $90 - jr nc, .asm_5768 + jr nc, .nope -.asm_5715 - and $7 - ld e, $2 - cp $4 - jr c, .asm_571f - ld e, $3 +.ok4 + and %00000111 + ld e, 2 + cp 4 + jr c, .ok5 + ld e, 3 -.asm_571f +.ok5 ld a, [hl] srl a srl a srl a cp $12 - jr c, .asm_572c + jr c, .ok6 sub $20 -.asm_572c +.ok6 ld [$ffbe], a ld hl, OBJECT_PALETTE add hl, bc bit 7, [hl] - jr z, .asm_573e + jr z, .ok7 ld a, d - add $2 + add 2 ld d, a ld a, e - add $2 + add 2 ld e, a -.asm_573e +.ok7 ld a, d ld [$ffbf], a -.asm_5741 +.loop ld a, [$ffbf] ld d, a ld a, [$ffbe] add e dec a cp $12 - jr nc, .asm_5763 + jr nc, .ok9 ld b, a -.asm_574d +.next ld a, [$ffbd] add d dec a cp $14 - jr nc, .asm_5760 + jr nc, .ok8 ld c, a push bc call GetTileCoord pop bc ld a, [hl] cp $60 - jr nc, .asm_5768 + jr nc, .nope -.asm_5760 +.ok8 dec d - jr nz, .asm_574d + jr nz, .next -.asm_5763 +.ok9 dec e - jr nz, .asm_5741 + jr nz, .loop and a ret -.asm_5768 +.nope scf ret ; 576a @@ -3019,7 +3017,7 @@ Function5771: ; 5771 ld [wd14e], a ld [wd14f], a ld [wd150], a - ld a, $ff + ld a, -1 ld [wd151], a ret ; 5781 @@ -3027,21 +3025,21 @@ Function5771: ; 5771 Function5781: ; 5781 ld bc, ObjectStructs xor a -.asm_5785 +.loop ld [$ffaf], a - call Function1af1 - jr z, .asm_578f + call GetObjectSprite + jr z, .next call Function437b -.asm_578f - ld hl, ObjectStruct2 - ObjectStruct1 +.next + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l ld a, [$ffaf] inc a - cp $d - jr nz, .asm_5785 + cp NUM_OBJECT_STRUCTS + jr nz, .loop ret ; 579d @@ -3062,11 +3060,11 @@ Function579d: ; 579d Function57bc: ; 57bc ld hl, wd45b bit 7, [hl] - jr nz, .asm_57c4 + jr nz, .ok ret -.asm_57c4 - ld a, $0 +.ok + ld a, 0 ld [PlayerAction], a ret ; 57ca @@ -3076,20 +3074,20 @@ Function57ca: ; 57ca bit 5, [hl] ret z ld a, [wd45b] - and $3 + and 3 add a add a jr Function57db ; 57d9 Function57d9: ; 57d9 - ld a, $0 + ld a, 0 ; fallthrough ; 57db Function57db: ; 57db ld bc, PlayerStruct - call Function1af8 + call SetSpriteDirection ret ; 57e2 @@ -3098,20 +3096,20 @@ Function57e2: ; 57e2 and $80 ret z ld bc, $0000 ; debug? - ld hl, OBJECT_08 + ld hl, OBJECT_FACING add hl, bc ld a, [hl] or d ld [hl], a ld a, d swap a - and $7 + and %00000111 ld d, a ld bc, PlayerStruct ld hl, OBJECT_PALETTE add hl, bc ld a, [hl] - and $f8 + and %11111000 or d ld [hl], a ret @@ -3144,7 +3142,7 @@ Function581f:: ; 581f ; 5826 Function5826: ; 5826 - ld a, $ff + ld a, -1 ld [wd4cd], a ret ; 582c @@ -3160,7 +3158,7 @@ Function582c: ; 582c ld [hl], $13 ld hl, OBJECT_09 add hl, bc - ld [hl], $0 + ld [hl], 0 ld a, [$ffb0] ld [wd4ce], a ret @@ -3168,16 +3166,16 @@ Function582c: ; 582c Function5847: ; 5847 ld a, [wd4ce] - cp $ff + cp -1 ret z - call Function1ae5 + call GetObjectStruct callba Function58e3 - ld a, $ff + ld a, -1 ld [wd4ce], a ret ; 585c -Function585c:: ; 585c +SetFlagsForMovement_1:: ; 585c ld a, c call Function18de ret c @@ -3204,42 +3202,42 @@ Function586e: ; 586e Function587a: ; 587a ld bc, ObjectStructs xor a -.asm_587e +.loop push af - call Function1af1 - jr z, .asm_588a + call GetObjectSprite + jr z, .next ld hl, OBJECT_FLAGS add hl, bc set 5, [hl] -.asm_588a - ld hl, ObjectStruct2 - ObjectStruct1 +.next + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l pop af inc a - cp $d - jr nz, .asm_587e + cp NUM_OBJECT_STRUCTS + jr nz, .loop ret ; 5897 -Function5897:: ; 5897 +_SetFlagsForMovement_2:: ; 5897 ld a, [wd4cd] - cp $ff + cp -1 ret z push bc - call Function1ae5 - ld hl, OBJECT_01 + call GetObjectStruct + ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc ld a, [hl] pop bc cp c ret nz ld a, [wd4ce] - cp $ff + cp -1 ret z - call Function1ae5 + call GetObjectStruct ld hl, OBJECT_FLAGS add hl, bc res 5, [hl] @@ -3250,23 +3248,23 @@ Function58b9:: ; 58b9 push bc ld bc, ObjectStructs xor a -.asm_58be +.loop push af - call Function1af1 - jr z, .asm_58ca + call GetObjectSprite + jr z, .next ld hl, OBJECT_FLAGS add hl, bc res 5, [hl] -.asm_58ca - ld hl, ObjectStruct2 - ObjectStruct1 +.next + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l pop af inc a - cp $d - jr nz, .asm_58be + cp NUM_OBJECT_STRUCTS + jr nz, .loop pop bc ret ; 58d8 @@ -3281,14 +3279,14 @@ Function58d8: ; 58d8 ; 58e3 Function58e3: ; 58e3 - ld hl, OBJECT_01 + ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc ld a, [hl] - cp $ff + cp -1 jp z, Function5903 push bc call GetMapObject - ld hl, $0004 + ld hl, MAPOBJECT_FACING add hl, bc ld a, [hl] pop bc @@ -3297,7 +3295,7 @@ Function58e3: ; 58e3 ld [hl], a ld hl, OBJECT_09 add hl, bc - ld [hl], $0 + ld [hl], 0 ret ; 5903 @@ -3315,7 +3313,7 @@ Function5903: ; 5903 ld [hl], a ld hl, OBJECT_09 add hl, bc - ld [hl], $0 + ld [hl], 0 ret .data_591c @@ -3330,7 +3328,7 @@ Function5920:: ; 5920 ld [$ffbd], a ld a, [hOAMUpdate] push af - ld a, $1 + ld a, 1 ld [hOAMUpdate], a call Function5991 call Function593a @@ -3343,10 +3341,10 @@ Function593a: ; 593a ld a, [VramState] bit 1, a ld b, $a0 - jr z, .asm_5945 + jr z, .ok ld b, $70 -.asm_5945 +.ok ld a, [$ffbd] cp b ret nc @@ -3355,11 +3353,11 @@ Function593a: ; 593a ld de, OBJECT_04 ld a, b ld c, $a0 -.asm_5952 +.loop ld [hl], c add hl, de cp l - jr nz, .asm_5952 + jr nz, .loop ret ; 5958 @@ -3372,12 +3370,12 @@ Function5958: ; 5958 ld a, [wd14d] ld e, a ld bc, ObjectStructs - ld a, $d + ld a, NUM_OBJECT_STRUCTS -.asm_5968 +.loop push af - call Function1af1 - jr z, .asm_597c + call GetObjectSprite + jr z, .skip ld hl, OBJECT_SPRITE_X add hl, bc @@ -3391,14 +3389,14 @@ Function5958: ; 5958 add e ld [hl], a -.asm_597c - ld hl, ObjectStruct2 - ObjectStruct1 +.skip + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l pop af dec a - jr nz, .asm_5968 + jr nz, .loop xor a ld [wd14c], a @@ -3431,10 +3429,10 @@ Function59a4: ; 59a4 ld hl, wc2eb .loop push hl - call Function1af1 + call GetObjectSprite jr z, .skip - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld a, [hl] cp -1 @@ -3453,7 +3451,7 @@ Function59a4: ; 59a4 jr .add .skip - ld hl, ObjectStruct2 - ObjectStruct1 + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l @@ -3461,7 +3459,7 @@ Function59a4: ; 59a4 jr .next .add - ld hl, ObjectStruct2 - ObjectStruct1 + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l @@ -3473,7 +3471,7 @@ Function59a4: ; 59a4 .next inc d ld a, d - cp $d + cp NUM_OBJECT_STRUCTS jr nz, .loop ret ; 59f3 @@ -3483,7 +3481,7 @@ Function59f3: ; 59f3 .next ld a, [hli] ld d, a - and $f0 + and %11110000 ret z cp c jr nz, .next @@ -3491,7 +3489,7 @@ Function59f3: ; 59f3 push bc push hl ld a, d - and $f + and %00001111 call Function5ac2 call Function5a0d pop hl @@ -3500,44 +3498,44 @@ Function59f3: ; 59f3 ; 5a0d Function5a0d: ; 5a0d - ld hl, OBJECT_SPRITE + ld hl, OBJECT_SPRITE_TILE add hl, bc ld a, [hl] - and $7f + and %01111111 ld [$ffc1], a xor a bit 7, [hl] - jr nz, .asm_5a1d - or 8 -.asm_5a1d + jr nz, .skip1 + or %00001000 +.skip1 ld hl, OBJECT_FLAGS add hl, bc ld e, [hl] bit 7, e - jr z, .asm_5a28 - or $80 -.asm_5a28 + jr z, .skip2 + or %10000000 +.skip2 bit 4, e - jr z, .asm_5a2e - or $10 -.asm_5a2e + jr z, .skip3 + or %00010000 +.skip3 ld hl, OBJECT_PALETTE add hl, bc ld d, a ld a, [hl] - and 7 + and %00000111 or d ld d, a xor a bit 3, e - jr z, .asm_5a3f - or $80 -.asm_5a3f + jr z, .skip4 + or %10000000 +.skip4 ld [$ffc2], a ld hl, OBJECT_SPRITE_X @@ -3570,7 +3568,7 @@ Function5a0d: ; 5a0d add e ld [$ffc0], a - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, bc ld a, [hl] cp -1 @@ -3616,9 +3614,9 @@ Function5a0d: ; 5a0d ld a, [$ffc1] bit 2, e - jr z, .asm_5aa3 + jr z, .nope1 xor a -.asm_5aa3 +.nope1 add [hl] inc hl @@ -3627,11 +3625,11 @@ Function5a0d: ; 5a0d ld a, e bit 1, a - jr z, .asm_5aaf + jr z, .nope2 ld a, [$ffc2] or e -.asm_5aaf - and $f0 +.nope2 + and %11110000 or d ld [bc], a inc c @@ -3657,8 +3655,7 @@ Function5ac2: ; 5ac2 ld c, a ld b, 0 ld hl, .Addresses - add hl, bc - add hl, bc + add_n_times hl, bc, 2 ld c, [hl] inc hl ld b, [hl] diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 8c10954b3..f1a5db01a 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -306,7 +306,7 @@ MapSetupCommands: ; 15440 dbw BANK(Function24cd), Function24cd dbw BANK(Function28e3), Function28e3 dbw BANK(Function289d), Function289d - dbw BANK(Function2879), Function2879 + dbw BANK(BufferScreen), BufferScreen dbw BANK(Function1047cf), Function1047cf dbw BANK(LoadTilesetHeader), LoadTilesetHeader dbw BANK(Function104750), Function104750 diff --git a/engine/pack.asm b/engine/pack.asm index e765bab7e..79794098a 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -62,7 +62,7 @@ Function10056: ; 10056 (4:4056) Function10067: ; 10067 (4:4067) ld hl, MenuDataHeader_0x10a4f - call Function1d3c + call CopyMenuDataHeader ld a, [wd0d9] ld [wcf88], a ld a, [wd0df] @@ -90,7 +90,7 @@ Function10094: ; 10094 (4:4094) Function100a6: ; 100a6 (4:40a6) ld hl, MenuDataHeader_0x10a7f - call Function1d3c + call CopyMenuDataHeader ld a, [wd0da] ld [wcf88], a ld a, [wd0e0] @@ -137,7 +137,7 @@ Function100e8: ; 100e8 (4:40e8) .asm_10110 push de call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 call Function1c07 pop hl ret c @@ -220,7 +220,7 @@ Function10186: ; 10186 (4:4186) Function10198: ; 10198 (4:4198) ld hl, MenuDataHeader_0x10aaf - call Function1d3c + call CopyMenuDataHeader ld a, [wd0db] ld [wcf88], a ld a, [wd0e1] @@ -289,7 +289,7 @@ Function101c5: ; 101c5 (4:41c5) .asm_10235 push de call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 call Function1c07 pop hl ret c @@ -709,7 +709,7 @@ Function104e9: ; 104e9 (4:44e9) Function104fa: ; 104fa (4:44fa) ld hl, MenuDataHeader_0x10a4f - call Function1d3c + call CopyMenuDataHeader ld a, [wd0d9] ld [wcf88], a ld a, [wd0df] @@ -737,7 +737,7 @@ Function10527: ; 10527 (4:4527) Function10539: ; 10539 (4:4539) ld hl, MenuDataHeader_0x10a7f - call Function1d3c + call CopyMenuDataHeader ld a, [wd0da] ld [wcf88], a ld a, [wd0e0] @@ -788,7 +788,7 @@ Function10594: ; 10594 (4:4594) Function105a6: ; 105a6 (4:45a6) ld hl, MenuDataHeader_0x10aaf - call Function1d3c + call CopyMenuDataHeader ld a, [wd0db] ld [wcf88], a ld a, [wd0e1] @@ -821,7 +821,7 @@ Function105dc: ; 105dc (4:45dc) .asm_105ed push de call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 call Function1c07 pop hl ret c @@ -992,7 +992,7 @@ Function106d9: ; 106d9 (4:46d9) xor a call Function10762 ld hl, MenuDataHeader_0x10a67 - call Function1d3c + call CopyMenuDataHeader ld a, [wd0d9] ld [wcf88], a ld a, [wd0df] @@ -1008,7 +1008,7 @@ Function106ff: ; 106ff (4:46ff) ld a, $2 call Function10762 ld hl, MenuDataHeader_0x10a97 - call Function1d3c + call CopyMenuDataHeader ld a, [wd0da] ld [wcf88], a ld a, [wd0e0] @@ -1033,7 +1033,7 @@ Function1073b: ; 1073b (4:473b) ld a, $1 call Function10762 ld hl, MenuDataHeader_0x10ac7 - call Function1d3c + call CopyMenuDataHeader ld a, [wd0db] ld [wcf88], a ld a, [wd0e1] @@ -1223,7 +1223,7 @@ Function1085a: ; 1085a (4:485a) push hl call Function10762 pop hl - call Function1d3c + call CopyMenuDataHeader call Function350c ret diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index c712e4d7a..f68e1166e 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -654,7 +654,7 @@ UnknownScript_0xbd3d1: UnknownScript_0xbd3f6: farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd412 - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0xbd412 checkcode VAR_WEEKDAY if_equal $2, UnknownScript_0xbd416 @@ -680,7 +680,7 @@ UnknownScript_0xbd428: farscall UnknownScript_0xbe1b6 farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbd44c - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0xbd44c checkcode VAR_WEEKDAY if_equal $2, UnknownScript_0xbd480 @@ -1381,7 +1381,7 @@ UnknownScript_0xbda35: iftrue UnknownScript_0xbda67 farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbda5f - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0xbda5f checkcode VAR_WEEKDAY if_equal $2, UnknownScript_0xbda63 @@ -1403,7 +1403,7 @@ UnknownScript_0xbda6e: farscall UnknownScript_0xbe1b6 farscall UnknownScript_0xbde3f if_equal $0, UnknownScript_0xbda92 - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0xbda92 checkcode VAR_WEEKDAY if_equal $2, UnknownScript_0xbda9e @@ -3104,27 +3104,27 @@ String_be65b: db "Sister@" String_be662: db "Brother@" -UnknownScript_0xbe66a:: ; 0xbe66a +TalkToTrainerScript:: ; 0xbe66a faceplayer trainerstatus $2 - iftrue UnknownScript_0xbe698 + iftrue AlreadyBeatenTrainerScript loadtrainerdata playrammusic - jump UnknownScript_0xbe68a + jump StartBattleWithMapTrainerScript ; 0xbe675 -UnknownScript_0xbe675:: ; 0xbe675 +SeenByTrainerScript:: ; 0xbe675 loadtrainerdata playrammusic - showemote $0, $fe, 30 + showemote EMOTE_SHOCK, $fe, 30 callasm Function831e applymovement2 MovementBuffer writepersonxy $fe faceperson $0, $fe - jump UnknownScript_0xbe68a + jump StartBattleWithMapTrainerScript ; 0xbe68a -UnknownScript_0xbe68a: ; 0xbe68a +StartBattleWithMapTrainerScript: ; 0xbe68a loadfont trainertext $0 closetext @@ -3135,6 +3135,6 @@ UnknownScript_0xbe68a: ; 0xbe68a trainerstatus $1 loadvar wd04d, $ff -UnknownScript_0xbe698: +AlreadyBeatenTrainerScript: scripttalkafter ; 0xbe699 diff --git a/engine/scripting.asm b/engine/scripting.asm index 3012d14b3..6fd683fb7 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1,9 +1,9 @@ ; Event scripting commands. -Function96c56:: ; 96c56 +EnableScriptMode:: ; 96c56 push af - ld a, 1 + ld a, SCRIPT_READ ld [ScriptMode], a pop af ret @@ -346,7 +346,7 @@ JumpTextFacePlayerScript: ; 0x96e79 faceplayer JumpTextScript: ; 0x96e7a loadfont - repeattext $ff, $ff + repeattext -1, -1 closetext loadmovesprites end @@ -385,7 +385,7 @@ Script_2writetext: ; 0x96e9b ld h, a ld a, [ScriptBank] ld b, a - call Function269a + call MapTextbox ret ; 0x96eab @@ -400,7 +400,7 @@ Script_3writetext: ; 0x96eab ld l, a call GetScriptByte ld h, a - call Function269a + call MapTextbox ret ; 0x96ebb @@ -414,27 +414,27 @@ Script_repeattext: ; 0x96ebb ld l, a call GetScriptByte ld h, a - cp $ff - jr nz, .asm_96ed8 ; 0x96ec5 $11 + cp -1 + jr nz, .done ; 0x96ec5 $11 ld a, l - cp $ff - jr nz, .asm_96ed8 ; 0x96eca $c + cp -1 + jr nz, .done ; 0x96eca $c ld hl, wd44e ld a, [hli] ld b, a ld a, [hli] ld h, [hl] ld l, a - call Function269a + call MapTextbox ret -.asm_96ed8 +.done ret ; 0x96ed9 Script_closetext: ; 0x96ed9 ; script command 0x54 - jp Functiona46 + jp CloseText ; 0x96edc Script_keeptextopen: ; 0x96edc @@ -445,7 +445,7 @@ Script_keeptextopen: ; 0x96edc ld a, $1 ld [$ffd8], a call WaitBGMap - call Functionaaf + call KeepTextOpen pop af ld [$ffd8], a ret @@ -456,9 +456,9 @@ Script_yesorno: ; 0x96eed call YesNoBox ld a, 0 - jr c, .asm_96ef6 ; 0x96ef2 $2 + jr c, .no ; 0x96ef2 $2 ld a, 1 -.asm_96ef6 +.no ld [ScriptVar], a ret ; 0x96efa @@ -474,16 +474,16 @@ Script_loadmenudata: ; 0x96efa ld h, a ld de, LoadMenuDataHeader ld a, [ScriptBank] - call Function26b7 - call Function1ad2 + call Call_a_de + call DrawOnMap ret ; 0x96f0f Script_writebackup: ; 0x96f0f ; script command 0x50 - call Function1c17 - call Function1ad2 + call WriteBackup + call DrawOnMap ret ; 0x96f16 @@ -498,14 +498,14 @@ Script_pokepic: ; 0x96f16 ld a, [ScriptVar] .ok ld [CurPartySpecies], a - callba Function244e3 + callba Pokepic ret ; 0x96f29 Script_pokepicyesorno: ; 0x96f29 ; script command 0x57 - callba Function24528 + callba PokepicYesOrNo ret ; 0x96f30 @@ -513,7 +513,7 @@ Script_interpretmenu2: ; 0x96f30 ; script command 0x59 ld a, [ScriptBank] - ld hl, Function1d81 + ld hl, InterpretMenu2 rst FarCall ld a, [wcfa9] jr nc, .ok @@ -527,7 +527,7 @@ Script_interpretmenu: ; 0x96f41 ; script command 0x58 ld a, [ScriptBank] - ld hl, Function202a + ld hl, InterpretMenu rst FarCall ld a, [wcf88] jr nc, .ok @@ -543,10 +543,10 @@ Script_storetext: ; 0x96f52 ; pointer (PointerLabelBeforeBank) ; memory (SingleByteParam) - call Function106c + call SetUpTextBox call GetScriptByte ld c, a - callba Function11c000 + callba StoreText ret ; 0x96f60 @@ -559,8 +559,8 @@ Script_verbosegiveitem: ; 0x96f60 call Script_giveitem call CurItemName ld de, StringBuffer1 - ld a, $1 - call Function976c8 + ld a, 1 + call CopyConvertedText ld b, BANK(GiveItemScript) ld de, GiveItemScript jp ScriptCall @@ -600,26 +600,26 @@ Script_verbosegiveitem2: ; 0x96f8e ; var (SingleByteParam) call GetScriptByte - cp $ff + cp -1 jr nz, .ok ld a, [ScriptVar] .ok ld [CurItem], a call GetScriptByte - call Function9769e + call GetVarAction ld a, [de] ld [wd10c], a ld hl, NumItems call ReceiveItem - ld a, $1 + ld a, 1 jr c, .ok2 xor a .ok2 ld [ScriptVar], a call CurItemName ld de, StringBuffer1 - ld a, $1 - call Function976c8 + ld a, 1 + call CopyConvertedText ld b, BANK(GiveItemScript) ld de, GiveItemScript jp ScriptCall @@ -632,7 +632,7 @@ Script_itemnotify: ; 0x96fc6 call CurItemName ld b, BANK(PutItemInPocketText) ld hl, PutItemInPocketText - call Function269a + call MapTextbox ret ; 0x96fd5 @@ -643,7 +643,7 @@ Script_pocketisfull: ; 0x96fd5 call CurItemName ld b, BANK(PocketIsFullText) ld hl, PocketIsFullText - call Function269a + call MapTextbox ret ; 0x96fe4 @@ -746,7 +746,7 @@ Script_elevator: ; 0x9707c ld d, a ld a, [ScriptBank] ld b, a - callba Function1342d + callba Elevator ret c ld a, $1 ld [ScriptVar], a @@ -775,14 +775,14 @@ Script_phonecall: ; 0x970a4 ld d, a ld a, [ScriptBank] ld b, a - callba Function9029a + callba PhoneCall ret ; 0x970b7 Script_hangup: ; 0x970b7 ; script command 0x99 - callba Function902eb + callba HangUp ret ; 0x970be @@ -792,20 +792,20 @@ Script_askforphonenumber: ; 0x970be ; number (SingleByteParam) call YesNoBox - jr c, .asm_970d6 ; 0x970c1 $13 + jr c, .refused ; 0x970c1 $13 call GetScriptByte ld c, a - callba Function90000 - jr c, .asm_970d2 ; 0x970cd $3 + callba AddPhoneNumber + jr c, .phonefull ; 0x970cd $3 xor a - jr .asm_970db ; 0x970d0 $9 -.asm_970d2 - ld a, $1 - jr .asm_970db ; 0x970d4 $5 -.asm_970d6 + jr .done ; 0x970d0 $9 +.phonefull + ld a, 1 + jr .done ; 0x970d4 $5 +.refused call GetScriptByte - ld a, $2 -.asm_970db + ld a, 2 +.done ld [ScriptVar], a ret ; 0x970df @@ -817,7 +817,7 @@ Script_describedecoration: ; 0x970df call GetScriptByte ld b, a - callba Function26f59 + callba DescribeDecoration ld h, d ld l, e jp ScriptJump @@ -848,7 +848,7 @@ Script_loadwilddata: ; 0x970fc ld d, a call GetScriptByte ld e, a - callba Functionc403 + callba LoadWildData ret ; 0x9710f @@ -859,7 +859,7 @@ Script_trainertext: ; 0x9710f call GetScriptByte ld c, a - ld b, $0 + ld b, 0 ld hl, WalkingX add hl, bc add hl, bc @@ -868,7 +868,7 @@ Script_trainertext: ; 0x9710f ld l, a ld a, [EngineBuffer1] ld b, a - call Function269a + call MapTextbox ret ; 0x97125 @@ -901,7 +901,7 @@ Script_trainerstatus: ; 0x97132 ld a, c and a ret z - ld a, $1 + ld a, 1 ld [ScriptVar], a ret ; 0x9714c @@ -937,7 +937,7 @@ Script_talkaftercancel: ; 0x97163 Script_talkaftercheck: ; 0x9716b ; script command 0x67 - ld a, $1 + ld a, 1 ld [ScriptVar], a ld a, [wd04d] and a @@ -1042,7 +1042,7 @@ Script_cry: ; 0x971d1 ret ; 0x971e3 -Function971e3: ; 0x971e3 +GetScriptPerson: ; 0x971e3 and a ret z cp $fe @@ -1057,7 +1057,7 @@ Script_setlasttalked: ; 0x971ea ; person (SingleByteParam) call GetScriptByte - call Function971e3 + call GetScriptPerson ld [$ffe0], a ret ; 0x971f3 @@ -1069,17 +1069,17 @@ Script_applymovement: ; 0x971f3 ; data (MovementPointerLabelParam) call GetScriptByte - call Function971e3 + call GetScriptPerson ld c, a ; 971fa -Function971fa: ; 971fa +ApplyMovement: ; 971fa push bc ld a, c - callba Function585c + callba SetFlagsForMovement_1 pop bc push bc - call Function97221 + call SetFlagsForMovement_2 pop bc call GetScriptByte ld l, a @@ -1087,7 +1087,7 @@ Function971fa: ; 971fa ld h, a ld a, [ScriptBank] ld b, a - call Function26c7 + call GetMovementData ret c ld a, SCRIPT_WAIT_MOVEMENT ld [ScriptMode], a @@ -1095,8 +1095,8 @@ Function971fa: ; 971fa ret ; 0x97221 -Function97221: ; 0x97221 - callba Function5897 +SetFlagsForMovement_2: ; 0x97221 + callba _SetFlagsForMovement_2 ret ; 0x97228 @@ -1107,7 +1107,7 @@ Script_applymovement2: ; 0x97228 ld a, [$ffe0] ld c, a - jp Function971fa + jp ApplyMovement ; 0x9722e Script_faceplayer: ; 0x9722e @@ -1119,14 +1119,14 @@ Script_faceplayer: ; 0x9722e ld d, $0 ld a, [$ffe0] ld e, a - callba Function8417 + callba GetRelativeFacing ld a, d add a add a ld e, a ld a, [$ffe0] ld d, a - call Function9728b + call ApplyPersonFacing ret ; 0x97248 @@ -1137,21 +1137,21 @@ Script_faceperson: ; 0x97248 ; person2 (SingleByteParam) call GetScriptByte - call Function971e3 + call GetScriptPerson cp $fe jr c, .asm_97254 ; 0x97250 $2 ld a, [$ffe0] .asm_97254 ld e, a call GetScriptByte - call Function971e3 + call GetScriptPerson cp $fe jr nz, .asm_97261 ; 0x9725d $2 ld a, [$ffe0] .asm_97261 ld d, a push de - callba Function8417 + callba GetRelativeFacing pop bc ret c ld a, d @@ -1159,7 +1159,7 @@ Script_faceperson: ; 0x97248 add a ld e, a ld d, c - call Function9728b + call ApplyPersonFacing ret ; 0x97274 @@ -1170,7 +1170,7 @@ Script_spriteface: ; 0x97274 ; facing (SingleByteParam) call GetScriptByte - call Function971e3 + call GetScriptPerson cp $fe jr nz, .asm_97280 ; 0x9727c $2 ld a, [$ffe0] @@ -1180,37 +1180,37 @@ Script_spriteface: ; 0x97274 add a add a ld e, a - call Function9728b + call ApplyPersonFacing ret ; 0x9728b -Function9728b: ; 0x9728b +ApplyPersonFacing: ; 0x9728b ld a, d push de call Function18de - jr c, .asm_972b9 ; 0x97290 $27 - ld hl, $0000 + jr c, .not_visible ; 0x97290 $27 + ld hl, OBJECT_SPRITE add hl, bc ld a, [hl] push bc call Function1836 pop bc - jr c, .asm_972b9 ; 0x9729c $1b - ld hl, $0004 + jr c, .not_visible ; 0x9729c $1b + ld hl, OBJECT_04 add hl, bc bit 2, [hl] - jr nz, .asm_972b9 ; 0x972a4 $13 + jr nz, .not_visible ; 0x972a4 $13 pop de ld a, e - call Function1af8 + call SetSpriteDirection ld hl, VramState bit 6, [hl] jr nz, .asm_972b5 ; 0x972b0 $3 call Function972bc .asm_972b5 - call Function1ad2 + call DrawOnMap ret -.asm_972b9 +.not_visible pop de scf ret @@ -1252,7 +1252,7 @@ Script_appear: ; 0x972dd ; person (SingleByteParam) call GetScriptByte - call Function971e3 + call GetScriptPerson call Function1956 ld a, [$ffaf] ld b, $0 @@ -1266,7 +1266,7 @@ Script_disappear: ; 0x972ee ; person (SingleByteParam) call GetScriptByte - call Function971e3 + call GetScriptPerson cp $fe jr nz, .asm_972fa ; 0x972f6 $2 ld a, [$ffe0] @@ -1307,10 +1307,10 @@ Script_follow: ; 0x97325 ; person1 (SingleByteParam) call GetScriptByte - call Function971e3 + call GetScriptPerson ld b, a call GetScriptByte - call Function971e3 + call GetScriptPerson ld c, a callba Function5803 ret @@ -1331,7 +1331,7 @@ Script_moveperson: ; 0x97341 ; y (SingleByteParam) call GetScriptByte - call Function971e3 + call GetScriptPerson ld b, a call GetScriptByte add $4 @@ -1349,7 +1349,7 @@ Script_writepersonxy: ; 0x9735b ; person (SingleByteParam) call GetScriptByte - call Function971e3 + call GetScriptPerson cp $fe jr nz, .asm_97367 ; 0x97363 $2 ld a, [$ffe0] @@ -1366,10 +1366,10 @@ Script_follownotexact: ; 0x9736f ; person1 (SingleByteParam) call GetScriptByte - call Function971e3 + call GetScriptPerson ld b, a call GetScriptByte - call Function971e3 + call GetScriptPerson ld c, a callba Function839e ret @@ -1400,7 +1400,7 @@ Script_showemote: ; 0x97396 call GetScriptByte ld [ScriptVar], a call GetScriptByte - call Function971e3 + call GetScriptPerson cp $fe jr z, .asm_973a8 ; 0x973a4 $2 ld [$ffe0], a @@ -1525,7 +1525,7 @@ Script_loadtrainer: ; 0x97424 Script_startbattle: ; 0x97436 ; script command 0x5f - call Function2879 + call BufferScreen predef StartBattle ld a, [wd0ee] and $3f @@ -1540,7 +1540,7 @@ Script_catchtutorial: ; 0x97447 call GetScriptByte ld [BattleType], a - call Function2879 + call BufferScreen callba Function4e554 jp Script_reloadmap ; 0x97459 @@ -1582,7 +1582,7 @@ Script_reloadmap: ; 0x97491 ld a, $f3 ld [$ff9f], a ld a, $1 - call Function261b + call LoadMapStatus call StopScript ret ; 0x974a2 @@ -1858,7 +1858,7 @@ Script_priorityjump: ; 0x975aa Script_checktriggers: ; 0x975c2 ; script command 0x13 - call Function211b + call CheckTriggers jr z, .asm_975cb ; 0x975c5 $4 ld [ScriptVar], a ret @@ -2051,7 +2051,7 @@ Script_checkcode: ; 0x9767d ; variable_id (SingleByteParam) call GetScriptByte - call Function9769e + call GetVarAction ld a, [de] ld [ScriptVar], a ret @@ -2063,7 +2063,7 @@ Script_writevarcode: ; 0x97688 ; variable_id (SingleByteParam) call GetScriptByte - call Function9769e + call GetVarAction ld a, [ScriptVar] ld [de], a ret @@ -2076,15 +2076,15 @@ Script_writecode: ; 0x97693 ; value (SingleByteParam) call GetScriptByte - call Function9769e + call GetVarAction call GetScriptByte ld [de], a ret ; 0x9769e -Function9769e: ; 0x9769e +GetVarAction: ; 0x9769e ld c, a - callba Function80648 + callba _GetVarAction ret ; 0x976a6 @@ -2103,26 +2103,26 @@ Version: ; 976ad Script_pokenamemem: ; 0x976ae ; script command 0x40 ; parameters: -; pokemon (PokemonParam) +; pokemon (PokemonParam); leave $0 to draw from script var ; memory (SingleByteParam) call GetScriptByte and a - jr nz, .asm_976b7 ; 0x976b2 $3 + jr nz, .gotit ; 0x976b2 $3 ld a, [ScriptVar] -.asm_976b7 +.gotit ld [wd265], a call GetPokemonName ld de, StringBuffer1 -Unknown_976c0: ; 0x976c0 +ConvertMemToText: ; 0x976c0 call GetScriptByte cp 3 jr c, .ok xor a .ok -Function976c8: ; 976c8 +CopyConvertedText: ; 976c8 ld hl, StringBuffer3 ld bc, 19 call AddNTimes @@ -2138,13 +2138,13 @@ Script_itemtotext: ; 0x976d5 call GetScriptByte and a - jr nz, .asm_976de ; 0x976d9 $3 + jr nz, .ok ; 0x976d9 $3 ld a, [ScriptVar] -.asm_976de +.ok ld [wd265], a call GetItemName ld de, StringBuffer1 - jr Unknown_976c0 ; 0x976e7 $d7 + jr ConvertMemToText ; 0x976e7 $d7 ; 0x976e9 Script_mapnametotext: ; 0x976e9 @@ -2158,11 +2158,11 @@ Script_mapnametotext: ; 0x976e9 ld c, a call GetWorldMapLocation -Unknown_976f4: ; 0x976f4 +ConvertLandmarkToText: ; 0x976f4 ld e, a callba GetLandmarkName ld de, StringBuffer1 - jp Unknown_976c0 + jp ConvertMemToText ; 0x97701 Script_displaylocation: ; 0x97701 @@ -2172,7 +2172,7 @@ Script_displaylocation: ; 0x97701 ; memory (SingleByteParam) call GetScriptByte - jr Unknown_976f4 ; 0x97704 $ee + jr ConvertLandmarkToText ; 0x97704 $ee ; 0x97706 Script_trainertotext: ; 0x97706 @@ -2186,8 +2186,8 @@ Script_trainertotext: ; 0x97706 ld c, a call GetScriptByte ld b, a - callba Function3994c - jr Unknown_976c0 ; 0x97714 $aa + callba GetTrainerName + jr ConvertMemToText ; 0x97714 $aa ; 0x97716 Script_name: ; 0x97716 @@ -2205,7 +2205,7 @@ Unknown_9771c: ; 0x9771c ld [CurSpecies], a call GetName ld de, StringBuffer1 - jp Unknown_976c0 + jp ConvertMemToText ; 0x9772b Script_trainerclassname: ; 0x9772b @@ -2225,13 +2225,13 @@ Script_readmoney: ; 0x97732 ; account (SingleByteParam) ; memory (SingleByteParam) - call Function97771 - call Function97861 + call ResetStringBuffer1 + call GetMoneyAccount ld hl, StringBuffer1 ld bc, $4306 call PrintNum ld de, StringBuffer1 - jp Unknown_976c0 + jp ConvertMemToText ; 0x97747 Script_readcoins: ; 0x97747 @@ -2239,13 +2239,13 @@ Script_readcoins: ; 0x97747 ; parameters: ; memory (SingleByteParam) - call Function97771 + call ResetStringBuffer1 ld hl, StringBuffer1 ld de, Coins ld bc, $4206 call PrintNum ld de, StringBuffer1 - jp Unknown_976c0 + jp ConvertMemToText ; 0x9775c Script_RAM2MEM: ; 0x9775c @@ -2253,18 +2253,18 @@ Script_RAM2MEM: ; 0x9775c ; parameters: ; memory (SingleByteParam) - call Function97771 + call ResetStringBuffer1 ld de, ScriptVar ld hl, StringBuffer1 ld bc, $4103 call PrintNum ld de, StringBuffer1 - jp Unknown_976c0 + jp ConvertMemToText ; 0x97771 -Function97771: ; 0x97771 +ResetStringBuffer1: ; 0x97771 ld hl, StringBuffer1 - ld bc, $000b + ld bc, NAME_LENGTH ld a, "@" call ByteFill ret @@ -2284,7 +2284,7 @@ Script_stringtotext: ; 0x9777d ld hl, CopyName1 rst FarCall ld de, StringBuffer2 - jp Unknown_976c0 + jp ConvertMemToText ; 0x97792 Script_givepokeitem: ; 0x97792 @@ -2301,12 +2301,12 @@ Script_givepokeitem: ; 0x97792 ld b, a push bc inc hl - ld bc, $0020 + ld bc, MAIL_MAX_LENGTH ld de, wd002 ld a, [ScriptBank] call FarCopyBytes pop bc - callba Function446cc + callba GivePokeItem ret ; 0x977b7 @@ -2332,20 +2332,20 @@ Script_giveitem: ; 0x977ca ; quantity (SingleByteParam) call GetScriptByte - cp $ff - jr nz, .asm_977d4 ; 0x977cf $3 + cp -1 + jr nz, .ok ; 0x977cf $3 ld a, [ScriptVar] -.asm_977d4 +.ok ld [CurItem], a call GetScriptByte ld [wd10c], a ld hl, NumItems call ReceiveItem - jr nc, .asm_977eb ; 0x977e3 $6 + jr nc, .full ; 0x977e3 $6 ld a, $1 ld [ScriptVar], a ret -.asm_977eb +.full xor a ld [ScriptVar], a ret @@ -2396,9 +2396,9 @@ Script_givemoney: ; 0x97829 ; account (SingleByteParam) ; money (MoneyByteParam) - call Function97861 - call Function9786d - callba Function15fd7 + call GetMoneyAccount + call LoadMoneyAmountToMem + callba GiveMoney ret ; 0x97836 @@ -2408,9 +2408,9 @@ Script_takemoney: ; 0x97836 ; account (SingleByteParam) ; money (MoneyByteParam) - call Function97861 - call Function9786d - callba Function15ffa + call GetMoneyAccount + call LoadMoneyAmountToMem + callba TakeMoney ret ; 0x97843 @@ -2420,12 +2420,12 @@ Script_checkmoney: ; 0x97843 ; account (SingleByteParam) ; money (MoneyByteParam) - call Function97861 - call Function9786d - callba Function1600b + call GetMoneyAccount + call LoadMoneyAmountToMem + callba CheckMoney ; 0x9784f -Unknown_9784f: ; 0x9784f +CheckMoneyAction: ; 0x9784f jr c, .two jr z, .one ld a, 0 @@ -2440,7 +2440,7 @@ Unknown_9784f: ; 0x9784f ret ; 0x97861 -Function97861: ; 0x97861 +GetMoneyAccount: ; 0x97861 call GetScriptByte and a ld de, Money @@ -2449,7 +2449,7 @@ Function97861: ; 0x97861 ret ; 0x9786d -Function9786d: ; 0x9786d +LoadMoneyAmountToMem: ; 0x9786d ld bc, $ffc3 push bc call GetScriptByte @@ -2469,8 +2469,8 @@ Script_givecoins: ; 0x97881 ; parameters: ; coins (CoinByteParam) - call Function978a0 - callba Function1606f + call LoadCoinAmountToMem + callba GiveCoins ret ; 0x9788b @@ -2479,8 +2479,8 @@ Script_takecoins: ; 0x9788b ; parameters: ; coins (CoinByteParam) - call Function978a0 - callba Function1608f + call LoadCoinAmountToMem + callba TakeCoins ret ; 0x97895 @@ -2489,12 +2489,12 @@ Script_checkcoins: ; 0x97895 ; parameters: ; coins (CoinByteParam) - call Function978a0 - callba Function160a1 - jr Unknown_9784f + call LoadCoinAmountToMem + callba CheckCoins + jr CheckMoneyAction ; 978a0 -Function978a0: ; 978a0 +LoadCoinAmountToMem: ; 978a0 call GetScriptByte ld [$ffc4], a call GetScriptByte @@ -2510,7 +2510,7 @@ Script_checktime: ; 0x978ae xor a ld [ScriptVar], a - callba Functionc000 + callba CheckTime call GetScriptByte and c ret z @@ -2545,7 +2545,7 @@ Script_addcellnum: ; 0x978da ld [ScriptVar], a call GetScriptByte ld c, a - callba Function90000 + callba AddPhoneNumber ret nc ld a, $1 ld [ScriptVar], a @@ -2561,7 +2561,7 @@ Script_delcellnum: ; 0x978ef ld [ScriptVar], a call GetScriptByte ld c, a - callba Function9000f + callba DelCellNum ret nc ld a, $1 ld [ScriptVar], a @@ -2577,7 +2577,7 @@ Script_checkcellnum: ; 0x97904 ld [ScriptVar], a call GetScriptByte ld c, a - callba Function90019 + callba CheckCellNum ret nc ld a, $1 ld [ScriptVar], a @@ -2637,7 +2637,7 @@ Script_givepoke: ; 0x97932 call GetScriptByte call GetScriptByte .ok - callba Functione277 + callba GivePoke ld a, b ld [ScriptVar], a ret @@ -2721,7 +2721,7 @@ Script_setflag: ; 0x979bb call GetScriptByte ld d, a ld b, $1 - call Function979ee + call _EngineFlagAction ret ; 0x979c9 @@ -2735,7 +2735,7 @@ Script_clearflag: ; 0x979c9 call GetScriptByte ld d, a ld b, $0 - call Function979ee + call _EngineFlagAction ret ; 0x979d7 @@ -2749,7 +2749,7 @@ Script_checkflag: ; 0x979d7 call GetScriptByte ld d, a ld b, $2 - call Function979ee + call _EngineFlagAction ld a, c and a jr z, .asm_979ea ; 0x979e6 $2 @@ -2759,7 +2759,7 @@ Script_checkflag: ; 0x979d7 ret ; 0x979ee -Function979ee: ; 0x979ee +_EngineFlagAction: ; 0x979ee callba EngineFlagAction ret ; 0x979f5 @@ -2820,7 +2820,7 @@ Script_warp: ; 0x97a1d call GetScriptByte and a - jr z, .asm_97a4a ; 0x97a21 $27 + jr z, .not_ok ; 0x97a21 $27 ld [MapGroup], a call GetScriptByte ld [MapNumber], a @@ -2833,10 +2833,10 @@ Script_warp: ; 0x97a1d ld a, $f1 ld [$ff9f], a ld a, $1 - call Function261b + call LoadMapStatus call StopScript ret -.asm_97a4a +.not_ok call GetScriptByte call GetScriptByte call GetScriptByte @@ -2845,7 +2845,7 @@ Script_warp: ; 0x97a1d ld a, $fb ld [$ff9f], a ld a, $1 - call Function261b + call LoadMapStatus call StopScript ret ; 0x97a65 @@ -2929,8 +2929,8 @@ Script_changemap: ; 0x97ab3 ld [MapBlockDataPointer], a call GetScriptByte ld [MapBlockDataPointer + 1], a - call Function24e4 - call Function2879 + call ChangeMap + call BufferScreen ret ; 0x97acc @@ -2947,10 +2947,10 @@ Script_changeblock: ; 0x97acc call GetScriptByte add $4 ld e, a - call Function2a66 + call GetBlockLocation call GetScriptByte ld [hl], a - call Function2879 + call BufferScreen ret ; 0x97ae3 @@ -2962,7 +2962,7 @@ Script_reloadmappart:: ; 0x97ae3 call Function2173 call Function2914 callba Function104061 - call Function1ad2 + call DrawOnMap ret ; 0x97af6 @@ -2971,12 +2971,12 @@ Script_warpcheck: ; 0x97af6 call Function224a ret nc - callba Function966d0 + callba SetAll_ScriptFlags3 ret ; 0x97b01 Function97b01: ; 0x97b01 - callba Function966d0 + callba SetAll_ScriptFlags3 ret ; 0x97b08 @@ -2988,7 +2988,7 @@ Script_newloadmap: ; 0x97b08 call GetScriptByte ld [$ff9f], a ld a, $1 - call Function261b + call LoadMapStatus call StopScript ret ; 0x97b16 @@ -3196,7 +3196,7 @@ Script_credits: ; 0x97bf3 DisplayCredits: call Script_resetfuncs ld a, $3 - call Function261b + call LoadMapStatus call StopScript ret ; 0x97c051 diff --git a/engine/spawn_points.asm b/engine/spawn_points.asm index 874faabd7..dba86c582 100644 --- a/engine/spawn_points.asm +++ b/engine/spawn_points.asm @@ -41,22 +41,22 @@ ENDM spawn BLACKTHORN, BLACKTHORN_CITY, 21, 30 spawn MT_SILVER, SILVER_CAVE_OUTSIDE, 23, 20 spawn FAST_SHIP, FAST_SHIP_CABINS_SW_SSW_NW, 6, 2 +const_value = -1 + spawn N_A, N_A, -1, -1 - db -1, -1, -1, -1 - - const NUM_SPAWNS +NUM_SPAWNS EQU const_value LoadSpawnPoint: ; 1531f + ; loads the spawn point in wd001 push hl push de ld a, [wd001] - cp -1 - jr z, .asm_15341 + cp SPAWN_N_A + jr z, .spawn_n_a ld l, a ld h, 0 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ; multiply hl by 4 ld de, SpawnPoints add hl, de ld a, [hli] @@ -67,7 +67,7 @@ LoadSpawnPoint: ; 1531f ld [XCoord], a ld a, [hli] ld [YCoord], a -.asm_15341 +.spawn_n_a pop de pop hl ret @@ -75,32 +75,33 @@ LoadSpawnPoint: ; 1531f IsSpawnPoint: ; 15344 +; Checks if the map loaded in de is a spawn point. Returns carry if it's a spawn point. ld hl, SpawnPoints ld c, 0 -.asm_15349 +.loop ld a, [hl] - cp -1 - jr z, .asm_1535f + cp SPAWN_N_A + jr z, .nope cp d - jr nz, .asm_15356 + jr nz, .next inc hl ld a, [hld] cp e - jr z, .asm_15361 + jr z, .yes -.asm_15356 +.next push bc ld bc, 4 add hl, bc pop bc inc c - jr .asm_15349 + jr .loop -.asm_1535f +.nope and a ret -.asm_15361 +.yes scf ret ; 15363 diff --git a/engine/specials.asm b/engine/specials.asm index 35af3160d..949cf8b1b 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -36,10 +36,10 @@ SpecialsPointers:: ; c029 add_special Functionc2f6 add_special Functionc309 add_special Function1050b9 - add_special Functionc34a - add_special Function4d9e5 + add_special BugContestJudging + add_special CheckPartyFullAfterContest add_special Function13a12 - add_special Function13a31 + add_special ContestReturnMons add_special Function135db add_special Functionfbb32 add_special Functionfbcd2 @@ -71,7 +71,7 @@ SpecialsPointers:: ; c029 add_special WhiteBGMap add_special UpdateTimePals add_special ClearTileMap - add_special Function1ad2 + add_special DrawOnMap add_special Functione4a add_special Functionc230 add_special SpecialSeenMon @@ -105,7 +105,7 @@ SpecialsPointers:: ; c029 add_special Function88018 add_special SpecialNameRater add_special Functionc2da - add_special Function718d + add_special GetFirstPokemonHappiness add_special Function71ac add_special Function2a4ab add_special Function2a51f @@ -173,7 +173,7 @@ SpecialsPointers:: ; c029 add_special Function10366e add_special Function1037eb add_special Function10383c - add_special Function1060a2 + add_special Mobile_HealParty add_special Function14168 add_special Function1037c2 add_special Function10630f @@ -358,8 +358,8 @@ UnknownText_0xc345: ; 0xc345 db "@" ; 0xc34a -Functionc34a: ; c34a - callba Function1369d +BugContestJudging: ; c34a + callba _BugContestJudging ld a, b ld [ScriptVar], a ret @@ -463,7 +463,7 @@ UnknownText_0xc3d6: ; 0xc3d6 Functionc3db: ; c3db call WhiteBGMap - call Function2879 + call BufferScreen ret ; c3e2 @@ -492,17 +492,18 @@ Functionc3fc: ; c3fc ; c403 -Functionc403:: ; c403 +LoadWildData:: ; c403 ld a, c and a - jr nz, .asm_c410 + jr nz, .swarm_route35 +; swarm dark cave violet entrance ld a, d ld [wdfcc], a ld a, e ld [wdfcd], a ret -.asm_c410 +.swarm_route35 ld a, d ld [wdc5a], a ld a, e diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 4315a07f1..885bde7e9 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -46,10 +46,10 @@ StdScripts:: dbw BANK(RematchGiftFScript), RematchGiftFScript dbw BANK(GymStatue1Script), GymStatue1Script dbw BANK(GymStatue2Script), GymStatue2Script - dbw BANK(UnknownScript_0xbcdb9), UnknownScript_0xbcdb9 - dbw BANK(UnknownScript_0xbcdc3), UnknownScript_0xbcdc3 + dbw BANK(ReceiveItemScript), ReceiveItemScript + dbw BANK(ReceiveTogepiEggScript), ReceiveTogepiEggScript dbw BANK(PCScript), PCScript - dbw BANK(UnknownScript_0xbcdcd), UnknownScript_0xbcdcd + dbw BANK(GameCornerCoinVendorScript), GameCornerCoinVendorScript dbw BANK(HappinessCheckScript), HappinessCheckScript PokeCenterNurseScript: @@ -107,12 +107,12 @@ PokeCenterNurseScript: farwritetext UnknownText_0x1b01bd pause 20 - special Function1060a2 + special Mobile_HealParty spriteface $fe, LEFT pause 10 special HealParty playmusic MUSIC_NONE - writebyte 0 + writebyte 0 ; Machine is at a Pokemon Center special HealMachineAnim pause 30 special RestartMapMusic @@ -303,57 +303,57 @@ RadioTowerRocketsScript: BugContestResultsWarpScript: special WhiteBGMap - scall UnknownScript_0xbc380 + scall BugContestResults_EnsureNoDuplicateSprites setevent EVENT_747 clearevent EVENT_748 setevent EVENT_2D2 warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4 - applymovement $0, MovementData_0xbcea1 + applymovement $0, Movement_ContestResults_WalkAfterWarp BugContestResultsScript: clearflag ENGINE_BUG_CONTEST_TIMER clearevent EVENT_2D2 - clearevent EVENT_313 - clearevent EVENT_314 - clearevent EVENT_315 - clearevent EVENT_316 + clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE + clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE + clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY + clearevent EVENT_CONTEST_OFFICER_HAS_BERRY loadfont - farwritetext UnknownText_0x1b05bf + farwritetext ContestResults_ReadyToJudgeText closetext - special Functionc34a + special BugContestJudging RAM2MEM $0 - if_equal $1, UnknownScript_0xbc31e - if_equal $2, UnknownScript_0xbc332 - if_equal $3, UnknownScript_0xbc343 - farwritetext UnknownText_0x1b0681 + if_equal 1, BugContestResults_FirstPlace + if_equal 2, BugContestResults_SecondPlace + if_equal 3, BugContestResults_ThirdPlace + farwritetext ContestResults_ConsolationPrizeText keeptextopen waitbutton verbosegiveitem BERRY, 1 - iffalse UnknownScript_0xbc375 + iffalse BugContestResults_NoRoomForBerry -UnknownScript_0xbc2a9: - farwritetext UnknownText_0x1b06b7 +BugContestResults_DidNotWin + farwritetext ContestResults_DidNotWinText keeptextopen - jump UnknownScript_0xbc2b6 + jump BugContestResults_FinishUp ; 0xbc2b1 -UnknownScript_0xbc2b1: ; 0xbc2b1 - farwritetext UnknownText_0x1b065b +BugContestResults_ReturnAfterWinnersPrize ; 0xbc2b1 + farwritetext ContestResults_JoinUsNextTimeText keeptextopen -UnknownScript_0xbc2b6: - checkevent EVENT_308 - iffalse UnknownScript_0xbc2c4 - farwritetext UnknownText_0x1b06d9 +BugContestResults_FinishUp + checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER + iffalse BugContestResults_DidNotLeaveMons + farwritetext ContestResults_ReturnPartyText closetext - special Function13a31 -UnknownScript_0xbc2c4: - special Function4d9e5 - if_equal $0, UnknownScript_0xbc2d4 - if_equal $2, UnknownScript_0xbc2d4 - farwritetext UnknownText_0x1b070d + special ContestReturnMons +BugContestResults_DidNotLeaveMons + special CheckPartyFullAfterContest + if_equal $0, BugContestResults_CleanUp + if_equal $2, BugContestResults_CleanUp + farwritetext ContestResults_PartyFullText closetext -UnknownScript_0xbc2d4: +BugContestResults_CleanUp loadmovesprites dotrigger $0 domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0 @@ -377,68 +377,68 @@ UnknownScript_0xbc2d4: setevent EVENT_727 setevent EVENT_728 setevent EVENT_729 - setflag ENGINE_51 + setflag ENGINE_DAILY_BUG_CONTEST special PlayMapMusic end ; 0xbc31e -UnknownScript_0xbc31e: ; 0xbc31e +BugContestResults_FirstPlace ; 0xbc31e setevent EVENT_000 itemtotext SUN_STONE, $1 - farwritetext UnknownText_0x1b0621 + farwritetext ContestResults_PlayerWonAPrizeText closetext verbosegiveitem SUN_STONE, 1 - iffalse UnknownScript_0xbc354 - jump UnknownScript_0xbc2b1 + iffalse BugContestResults_NoRoomForSunStone + jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc332 -UnknownScript_0xbc332: ; 0xbc332 +BugContestResults_SecondPlace ; 0xbc332 itemtotext EVERSTONE, $1 - farwritetext UnknownText_0x1b0621 + farwritetext ContestResults_PlayerWonAPrizeText closetext verbosegiveitem EVERSTONE, 1 - iffalse UnknownScript_0xbc35f - jump UnknownScript_0xbc2b1 + iffalse BugContestResults_NoRoomForEverstone + jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc343 -UnknownScript_0xbc343: ; 0xbc343 +BugContestResults_ThirdPlace ; 0xbc343 itemtotext GOLD_BERRY, $1 - farwritetext UnknownText_0x1b0621 + farwritetext ContestResults_PlayerWonAPrizeText closetext verbosegiveitem GOLD_BERRY, 1 - iffalse UnknownScript_0xbc36a - jump UnknownScript_0xbc2b1 + iffalse BugContestResults_NoRoomForGoldBerry + jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc354 -UnknownScript_0xbc354: ; 0xbc354 +BugContestResults_NoRoomForSunStone ; 0xbc354 farwritetext UnknownText_0x1b08cc keeptextopen - setevent EVENT_313 - jump UnknownScript_0xbc2b1 + setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE + jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc35f -UnknownScript_0xbc35f: ; 0xbc35f +BugContestResults_NoRoomForEverstone ; 0xbc35f farwritetext UnknownText_0x1b08cc keeptextopen - setevent EVENT_314 - jump UnknownScript_0xbc2b1 + setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE + jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc36a -UnknownScript_0xbc36a: ; 0xbc36a +BugContestResults_NoRoomForGoldBerry ; 0xbc36a farwritetext UnknownText_0x1b08cc keeptextopen - setevent EVENT_315 - jump UnknownScript_0xbc2b1 + setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY + jump BugContestResults_ReturnAfterWinnersPrize ; 0xbc375 -UnknownScript_0xbc375: ; 0xbc375 +BugContestResults_NoRoomForBerry ; 0xbc375 farwritetext UnknownText_0x1b08cc keeptextopen - setevent EVENT_316 - jump UnknownScript_0xbc2a9 + setevent EVENT_CONTEST_OFFICER_HAS_BERRY + jump BugContestResults_DidNotWin ; 0xbc380 -UnknownScript_0xbc380: ; 0xbc380 +BugContestResults_EnsureNoDuplicateSprites ; 0xbc380 checkevent EVENT_716 iftrue .skip1 clearevent EVENT_720 @@ -561,7 +561,7 @@ InitializeEventsScript: setevent EVENT_731 setevent EVENT_74A setevent EVENT_RED_IN_MT_SILVER - setevent EVENT_738 + setevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME setevent EVENT_73A setevent EVENT_73B setevent EVENT_733 @@ -623,26 +623,26 @@ InitializeEventsScript: AskNumber1MScript: special RandomPhoneMon checkcode VAR_CALLERID - if_equal $5, .Jack - if_equal $7, .Huey - if_equal $b, .Gaven - if_equal $d, .Jose - if_equal $f, .Joey - if_equal $10, .Wade - if_equal $11, .Ralph - if_equal $13, .Anthony - if_equal $14, .Todd - if_equal $16, .Irwin - if_equal $17, .Arnie - if_equal $18, .Alan - if_equal $1b, .Chad - if_equal $1c, .Derek - if_equal $1d, .Tully - if_equal $1e, .Brent - if_equal $20, .Vance - if_equal $21, .Wilton - if_equal $22, .Kenji - if_equal $23, .Parry + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry .Jack farwritetext JackAskNumber1Text @@ -708,26 +708,26 @@ AskNumber1MScript: AskNumber2MScript: special RandomPhoneMon checkcode VAR_CALLERID - if_equal $5, .Jack - if_equal $7, .Huey - if_equal $b, .Gaven - if_equal $d, .Jose - if_equal $f, .Joey - if_equal $10, .Wade - if_equal $11, .Ralph - if_equal $13, .Anthony - if_equal $14, .Todd - if_equal $16, .Irwin - if_equal $17, .Arnie - if_equal $18, .Alan - if_equal $1b, .Chad - if_equal $1c, .Derek - if_equal $1d, .Tully - if_equal $1e, .Brent - if_equal $20, .Vance - if_equal $21, .Wilton - if_equal $22, .Kenji - if_equal $23, .Parry + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry .Jack farwritetext JackAskNumber2Text @@ -799,26 +799,26 @@ RegisteredNumberMScript: NumberAcceptedMScript: checkcode VAR_CALLERID - if_equal $5, .Jack - if_equal $7, .Huey - if_equal $b, .Gaven - if_equal $d, .Jose - if_equal $f, .Joey - if_equal $10, .Wade - if_equal $11, .Ralph - if_equal $13, .Anthony - if_equal $14, .Todd - if_equal $16, .Irwin - if_equal $17, .Arnie - if_equal $18, .Alan - if_equal $1b, .Chad - if_equal $1c, .Derek - if_equal $1d, .Tully - if_equal $1e, .Brent - if_equal $20, .Vance - if_equal $21, .Wilton - if_equal $22, .Kenji - if_equal $23, .Parry + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry .Jack farwritetext JackNumberAcceptedText @@ -923,26 +923,26 @@ NumberAcceptedMScript: NumberDeclinedMScript: checkcode VAR_CALLERID - if_equal $5, .Jack - if_equal $7, .Huey - if_equal $b, .Gaven - if_equal $d, .Jose - if_equal $f, .Joey - if_equal $10, .Wade - if_equal $11, .Ralph - if_equal $13, .Anthony - if_equal $14, .Todd - if_equal $16, .Irwin - if_equal $17, .Arnie - if_equal $18, .Alan - if_equal $1b, .Chad - if_equal $1c, .Derek - if_equal $1d, .Tully - if_equal $1e, .Brent - if_equal $20, .Vance - if_equal $21, .Wilton - if_equal $22, .Kenji - if_equal $23, .Parry + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry .Jack farwritetext JackNumberDeclinedText @@ -1047,26 +1047,26 @@ NumberDeclinedMScript: PhoneFullMScript: checkcode VAR_CALLERID - if_equal $5, .Jack - if_equal $7, .Huey - if_equal $b, .Gaven - if_equal $d, .Jose - if_equal $f, .Joey - if_equal $10, .Wade - if_equal $11, .Ralph - if_equal $13, .Anthony - if_equal $14, .Todd - if_equal $16, .Irwin - if_equal $17, .Arnie - if_equal $18, .Alan - if_equal $1b, .Chad - if_equal $1c, .Derek - if_equal $1d, .Tully - if_equal $1e, .Brent - if_equal $20, .Vance - if_equal $21, .Wilton - if_equal $22, .Kenji - if_equal $23, .Parry + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_JUGGLER_IRWIN, .Irwin + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry .Jack farwritetext JackPhoneFullText @@ -1171,23 +1171,23 @@ PhoneFullMScript: RematchMScript: checkcode VAR_CALLERID - if_equal $5, .Jack - if_equal $7, .Huey - if_equal $b, .Gaven - if_equal $d, .Jose - if_equal $f, .Joey - if_equal $10, .Wade - if_equal $11, .Ralph - if_equal $13, .Anthony - if_equal $14, .Todd - if_equal $17, .Arnie - if_equal $18, .Alan - if_equal $1b, .Chad - if_equal $1d, .Tully - if_equal $1e, .Brent - if_equal $20, .Vance - if_equal $21, .Wilton - if_equal $23, .Parry + if_equal PHONE_SCHOOLBOY_JACK, .Jack + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_COOLTRAINERM_GAVEN, .Gaven + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_FISHER_RALPH, .Ralph + if_equal PHONE_HIKER_ANTHONY, .Anthony + if_equal PHONE_CAMPER_TODD, .Todd + if_equal PHONE_BUG_CATCHER_ARNIE, .Arnie + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_SCHOOLBOY_CHAD, .Chad + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_POKEMANIAC_BRENT, .Brent + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_HIKER_PARRY, .Parry .Jack farwritetext JackRematchText @@ -1277,13 +1277,13 @@ RematchMScript: GiftMScript: checkcode VAR_CALLERID - if_equal $d, .Jose - if_equal $10, .Wade - if_equal $18, .Alan - if_equal $1c, .Derek - if_equal $1d, .Tully - if_equal $21, .Wilton - if_equal $22, .Kenji + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji .Jose farwritetext JoseGiftText @@ -1316,17 +1316,17 @@ GiftMScript: PackFullMScript: checkcode VAR_CALLERID - if_equal $7, .Huey - if_equal $d, .Jose - if_equal $f, .Joey - if_equal $10, .Wade - if_equal $18, .Alan - if_equal $1c, .Derek - if_equal $1d, .Tully - if_equal $20, .Vance - if_equal $21, .Wilton - if_equal $22, .Kenji - if_equal $23, .Parry + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_BIRDKEEPER_JOSE, .Jose + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BUG_CATCHER_WADE, .Wade + if_equal PHONE_SCHOOLBOY_ALAN, .Alan + if_equal PHONE_POKEFANM_DEREK, .Derek + if_equal PHONE_FISHER_TULLY, .Tully + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_FISHER_WILTON, .Wilton + if_equal PHONE_BLACKBELT_KENJI, .Kenji + if_equal PHONE_HIKER_PARRY, .Parry .Huey farwritetext HueyPackFullText @@ -1387,10 +1387,10 @@ PackFullMScript: RematchGiftMScript: loadfont checkcode VAR_CALLERID - if_equal $7, .Huey - if_equal $f, .Joey - if_equal $20, .Vance - if_equal $23, .Parry + if_equal PHONE_SAILOR_HUEY, .Huey + if_equal PHONE_YOUNGSTER_JOEY, .Joey + if_equal PHONE_BIRDKEEPER_VANCE, .Vance + if_equal PHONE_HIKER_PARRY, .Parry .Huey farwritetext HueyRematchGiftText @@ -1411,14 +1411,14 @@ RematchGiftMScript: AskNumber1FScript: checkcode VAR_CALLERID - if_equal $6, .Beverly - if_equal $c, .Beth - if_equal $e, .Reena - if_equal $12, .Liz - if_equal $15, .Gina - if_equal $1a, .Dana - if_equal $1f, .Tiffany - if_equal $24, .Erin + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin .Beverly farwritetext BeverlyAskNumber1Text @@ -1447,14 +1447,14 @@ AskNumber1FScript: AskNumber2FScript: checkcode VAR_CALLERID - if_equal $6, .Beverly - if_equal $c, .Beth - if_equal $e, .Reena - if_equal $12, .Liz - if_equal $15, .Gina - if_equal $1a, .Dana - if_equal $1f, .Tiffany - if_equal $24, .Erin + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin .Beverly farwritetext BeverlyAskNumber2Text @@ -1490,14 +1490,14 @@ RegisteredNumberFScript: NumberAcceptedFScript: ; 0xbcbd3 checkcode VAR_CALLERID - if_equal $6, .Beverly - if_equal $c, .Beth - if_equal $e, .Reena - if_equal $12, .Liz - if_equal $15, .Gina - if_equal $1a, .Dana - if_equal $1f, .Tiffany - if_equal $24, .Erin + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin .Beverly farwritetext BeverlyNumberAcceptedText @@ -1542,14 +1542,14 @@ NumberAcceptedFScript: ; 0xbcbd3 NumberDeclinedFScript: checkcode VAR_CALLERID - if_equal $6, .Beverly - if_equal $c, .Beth - if_equal $e, .Reena - if_equal $12, .Liz - if_equal $15, .Gina - if_equal $1a, .Dana - if_equal $1f, .Tiffany - if_equal $24, .Erin + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin .Beverly farwritetext BeverlyNumberDeclinedText @@ -1594,14 +1594,14 @@ NumberDeclinedFScript: PhoneFullFScript: checkcode VAR_CALLERID - if_equal $6, .Beverly - if_equal $c, .Beth - if_equal $e, .Reena - if_equal $12, .Liz - if_equal $15, .Gina - if_equal $1a, .Dana - if_equal $1f, .Tiffany - if_equal $24, .Erin + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin .Beverly farwritetext BeverlyPhoneFullText @@ -1646,13 +1646,13 @@ PhoneFullFScript: RematchFScript: checkcode VAR_CALLERID - if_equal $c, .Beth - if_equal $e, .Reena - if_equal $12, .Liz - if_equal $15, .Gina - if_equal $1a, .Dana - if_equal $1f, .Tiffany - if_equal $24, .Erin + if_equal PHONE_COOLTRAINERF_BETH, .Beth + if_equal PHONE_COOLTRAINERF_REENA, .Reena + if_equal PHONE_PICNICKER_LIZ, .Liz + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin .Beth farwritetext BethRematchText @@ -1692,10 +1692,10 @@ RematchFScript: GiftFScript: checkcode VAR_CALLERID - if_equal $6, .Beverly - if_equal $15, .Gina - if_equal $1a, .Dana - if_equal $1f, .Tiffany + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany .Beverly farwritetext BeverlyGiftText @@ -1716,11 +1716,11 @@ GiftFScript: PackFullFScript: checkcode VAR_CALLERID - if_equal $6, .Beverly - if_equal $15, .Gina - if_equal $1a, .Dana - if_equal $1f, .Tiffany - if_equal $24, .Erin + if_equal PHONE_POKEFAN_BEVERLY, .Beverly + if_equal PHONE_PICNICKER_GINA, .Gina + if_equal PHONE_LASS_DANA, .Dana + if_equal PHONE_PICNICKER_TIFFANY, .Tiffany + if_equal PHONE_PICNICKER_ERIN, .Erin .Beverly farwritetext BeverlyPackFullText @@ -1750,7 +1750,7 @@ PackFullFScript: RematchGiftFScript: checkcode VAR_CALLERID - if_equal $24, .Erin + if_equal PHONE_PICNICKER_ERIN, .Erin .Erin loadfont @@ -1761,7 +1761,7 @@ RematchGiftFScript: GymStatue1Script: mapnametotext $0 loadfont - farwritetext UnknownText_0x1b074e + farwritetext GymStatue_CityGymText closetext loadmovesprites end @@ -1769,114 +1769,114 @@ GymStatue1Script: GymStatue2Script: mapnametotext $0 loadfont - farwritetext UnknownText_0x1b074e + farwritetext GymStatue_CityGymText keeptextopen - farwritetext UnknownText_0x1b075c + farwritetext GymStatue_WinningTrainersText closetext loadmovesprites end -UnknownScript_0xbcdb9: ; 0xbcdb9 +ReceiveItemScript: ; 0xbcdb9 waitbutton - farwritetext UnknownText_0x1b0648 + farwritetext ReceivedItemText playsound SFX_ITEM waitbutton end ; 0xbcdc3 -UnknownScript_0xbcdc3: ; 0xbcdc3 +ReceiveTogepiEggScript: ; 0xbcdc3 waitbutton - farwritetext UnknownText_0x1b0648 + farwritetext ReceivedItemText playsound SFX_GET_EGG_FROM_DAYCARE_LADY waitbutton end ; 0xbcdcd -UnknownScript_0xbcdcd: ; 0xbcdcd +GameCornerCoinVendorScript: ; 0xbcdcd faceplayer loadfont - farwritetext UnknownText_0x1b077f + farwritetext CoinVendor_WelcomeText keeptextopen checkitem COIN_CASE - iftrue UnknownScript_0xbcde0 - farwritetext UnknownText_0x1b079c + iftrue CoinVendor_IntroScript + farwritetext CoinVendor_NoCoinCaseText closetext loadmovesprites end ; 0xbcde0 -UnknownScript_0xbcde0: ; 0xbcde0 - farwritetext UnknownText_0x1b07e3 +CoinVendor_IntroScript: ; 0xbcde0 + farwritetext CoinVendor_IntroText -UnknownScript_0xbcde4: ; 0xbcde4 +CoinVendor_SellCoinsMenuScript: ; 0xbcde4 special Function24b4e - loadmenudata MenuDataHeader_0xbce54 + loadmenudata CoinVendor_MenuDataHeader interpretmenu2 writebackup - if_equal $1, UnknownScript_0xbcdf7 - if_equal $2, UnknownScript_0xbce1b - jump UnknownScript_0xbce4d + if_equal $1, CoinVendor_Buy50CoinsScript + if_equal $2, CoinVendor_Buy500CoinsScript + jump CoinVendor_CancelScript ; 0xbcdf7 -UnknownScript_0xbcdf7: ; 0xbcdf7 +CoinVendor_Buy50CoinsScript: ; 0xbcdf7 checkcoins 9949 - if_equal $0, UnknownScript_0xbce46 + if_equal $0, CoinVendor_CoinCaseFullScript checkmoney $0, 1000 - if_equal $2, UnknownScript_0xbce3f + if_equal $2, CoinVendor_NotEnoughMoneyScript givecoins 50 takemoney $0, 1000 waitbutton playsound SFX_TRANSACTION - farwritetext UnknownText_0x1b0830 + farwritetext CoinVendor_Buy50CoinsText closetext - jump UnknownScript_0xbcde4 + jump CoinVendor_SellCoinsMenuScript ; 0xbce1b -UnknownScript_0xbce1b: ; 0xbce1b +CoinVendor_Buy500CoinsScript: ; 0xbce1b checkcoins 9499 - if_equal $0, UnknownScript_0xbce46 + if_equal $0, CoinVendor_CoinCaseFullScript checkmoney $0, 10000 - if_equal $2, UnknownScript_0xbce3f + if_equal $2, CoinVendor_NotEnoughMoneyScript givecoins 500 takemoney $0, 10000 waitbutton playsound SFX_TRANSACTION - farwritetext UnknownText_0x1b084f + farwritetext CoinVendor_Buy500CoinsText closetext - jump UnknownScript_0xbcde4 + jump CoinVendor_SellCoinsMenuScript ; 0xbce3f -UnknownScript_0xbce3f: ; 0xbce3f - farwritetext UnknownText_0x1b086f +CoinVendor_NotEnoughMoneyScript: ; 0xbce3f + farwritetext CoinVendor_NotEnoughMoneyText closetext loadmovesprites end ; 0xbce46 -UnknownScript_0xbce46: ; 0xbce46 - farwritetext UnknownText_0x1b088c +CoinVendor_CoinCaseFullScript: ; 0xbce46 + farwritetext CoinVendor_CoinCaseFullText closetext loadmovesprites end ; 0xbce4d -UnknownScript_0xbce4d: ; 0xbce4d - farwritetext UnknownText_0x1b08ad +CoinVendor_CancelScript: ; 0xbce4d + farwritetext CoinVendor_CancelText closetext loadmovesprites end ; 0xbce54 -MenuDataHeader_0xbce54: ; 0xbce54 +CoinVendor_MenuDataHeader: ; 0xbce54 db $40 ; flags db 04, 00 ; start coords db 11, 15 ; end coords - dw MenuData2_0xbce5c + dw CoinVendor_MenuData2 db 1 ; default option ; 0xbce5c -MenuData2_0xbce5c: ; 0xbce5c +CoinVendor_MenuData2: ; 0xbce5c db $80 ; flags db 3 ; items db " 50 : ¥1000@" @@ -1888,7 +1888,7 @@ MenuData2_0xbce5c: ; 0xbce5c HappinessCheckScript: faceplayer loadfont - special Function718d + special GetFirstPokemonHappiness if_less_than 50, .Unhappy if_less_than 150, .KindaHappy farwritetext HappinessText3 @@ -1908,7 +1908,7 @@ HappinessCheckScript: loadmovesprites end -MovementData_0xbcea1: ; bcea1 +Movement_ContestResults_WalkAfterWarp: ; bcea1 step_right step_down turn_head_up diff --git a/home.asm b/home.asm index 9f8dd4fd1..a8f74dffe 100644 --- a/home.asm +++ b/home.asm @@ -1235,7 +1235,7 @@ Function3574:: ; 3574 call Function35de jr nc, .asm_3597 call Function2631 - callba Function96c56 + callba EnableScriptMode scf ret @@ -1402,7 +1402,7 @@ CheckTrainerBattle:: ; 360d jr z, .next ; Is facing the player... - call Function1ae5 + call GetObjectStruct call FacingPlayerDistance_bc jr nc, .next diff --git a/home/battle.asm b/home/battle.asm index 758c15ae1..fa72d75a0 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -310,7 +310,7 @@ BattleTextBox:: ; 3ac3 push hl call SpeechTextBox call MobileTextBorder - call Function1ad2 + call DrawOnMap call Function321c pop hl call PrintTextBoxText diff --git a/home/joypad.asm b/home/joypad.asm index 5a161fb14..42a61cd5d 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -312,7 +312,7 @@ Functiona36:: ; a36 jr Functiona36 ; a46 -Functiona46:: ; a46 +CloseText:: ; a46 ld a, [hOAMUpdate] push af ld a, 1 @@ -387,7 +387,7 @@ Functionaa5:: ; aa5 ret ; aaf -Functionaaf:: ; aaf +KeepTextOpen:: ; aaf ld a, [InLinkBattle] and a jr nz, .asm_ac1 diff --git a/home/map.asm b/home/map.asm index 259ed9503..e800a8d12 100644 --- a/home/map.asm +++ b/home/map.asm @@ -8,7 +8,7 @@ Function210f:: ; 210f ret ; 211b -Function211b:: ; 211b +CheckTriggers:: ; 211b push hl ld hl, BikeFlags + 2 ld a, [hli] @@ -17,7 +17,7 @@ Function211b:: ; 211b or h ld a, [hl] jr nz, .asm_2128 - ld a, $ff + ld a, -1 .asm_2128 pop hl @@ -702,7 +702,7 @@ Function24cd:: ; 24cd ld bc, OverworldMapEnd - OverworldMap ld a, 0 call ByteFill - call Function24e4 + call ChangeMap call FillMapConnections ld a, $1 call Function263b @@ -711,7 +711,7 @@ Function24cd:: ; 24cd -Function24e4:: ; 24e4 +ChangeMap:: ; 24e4 ld a, [hROMBank] push af @@ -938,7 +938,7 @@ FillEastConnectionStrip:: ; 25f6 ret ; 261b -Function261b:: ; 261b +LoadMapStatus:: ; 261b ld [MapStatus], a ret ; 261f @@ -1027,7 +1027,7 @@ Function2674:: ; 2674 ld a, [hl] push af set 1, [hl] - callba Function96c56 + callba EnableScriptMode callba ScriptEvents pop af ld [ScriptFlags], a @@ -1036,7 +1036,7 @@ Function2674:: ; 2674 ret ; 269a -Function269a:: ; 269a +MapTextbox:: ; 269a ld a, [hROMBank] push af @@ -1059,7 +1059,7 @@ Function269a:: ; 269a ret ; 26b7 -Function26b7:: ; 26b7 +Call_a_de:: ; 26b7 ; Call a:de. ld [hBuffer], a @@ -1079,7 +1079,7 @@ Function26b7:: ; 26b7 ret ; 26c7 -Function26c7:: ; 26c7 +GetMovementData:: ; 26c7 ld a, [hROMBank] push af ld a, b @@ -1412,7 +1412,7 @@ Function2821:: ; 2821 ret ; 2879 -Function2879:: ; 2879 +BufferScreen:: ; 2879 ld hl, wd194 ld a, [hli] ld h, [hl] @@ -1733,7 +1733,7 @@ GetFacingTileCoord:: ; 2a07 Function2a3c:: ; 2a3c - call Function2a66 + call GetBlockLocation ld a, [hl] and a jr z, .asm_2a63 @@ -1766,7 +1766,7 @@ Function2a3c:: ; 2a3c ret ; 2a66 -Function2a66:: ; 2a66 +GetBlockLocation:: ; 2a66 ld a, [MapWidth] add $6 ld c, a @@ -1878,7 +1878,7 @@ Function2ae7:: ; 2ae7 ld a, [hli] ld h, [hl] ld l, a - call Function211b + call CheckTriggers ld b, a ld a, [MapX] sub $4 @@ -1941,7 +1941,7 @@ FadeToMenu:: ; 2b29 Function2b3c:: ; 2b3c call WhiteBGMap call Function2bae - call Function1ad2 + call DrawOnMap call Function1d7d call Functiond90 jr Function2b5c @@ -1951,7 +1951,7 @@ Function2b4d:: ; 2b4d call WhiteBGMap call Function1d7d call Function2bae - call Function1ad2 + call DrawOnMap call Functiond90 ; 2b5c @@ -1978,7 +1978,7 @@ Function2b74:: ; 0x2b74 call TextBox ld hl, VramState set 0, [hl] - call Function1ad2 + call DrawOnMap call Function3200 ld b, $9 call GetSGBLayout diff --git a/home/map_objects.asm b/home/map_objects.asm index 4a2b58712..509492033 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -19,33 +19,33 @@ Function180e:: ; 180e push hl push bc ld hl, UsedSprites + 2 - ld c, $1f + ld c, SPRITE_GFX_LIST_CAPACITY - 1 ld b, a ld a, [hConnectionStripLength] cp $0 - jr z, .asm_182b + jr z, .nope ld a, b -.asm_181d +.loop cp [hl] - jr z, .asm_1830 + jr z, .found inc hl inc hl dec c - jr nz, .asm_181d + jr nz, .loop ld a, [UsedSprites + 1] scf - jr .asm_1833 + jr .done -.asm_182b +.nope ld a, [UsedSprites + 1] - jr .asm_1833 + jr .done -.asm_1830 +.found inc hl xor a ld a, [hl] -.asm_1833 +.done pop bc pop hl ret @@ -125,20 +125,20 @@ Function1875:: ; 1875 ld d, a and $f0 cp $10 - jr z, .asm_1882 + jr z, .ok_10 cp $20 - jr z, .asm_1888 + jr z, .ok_20 scf ret -.asm_1882 +.ok_10 ld a, d and 7 ret z scf ret -.asm_1888 +.ok_20 ld a, d and 7 ret z @@ -223,7 +223,7 @@ CheckStandingOnEntrance:: ; 18c3 GetMapObject:: ; 18d2 ; Return the location of map object a in bc. ld hl, MapObjects - ld bc, $10 + ld bc, OBJECT_LENGTH call AddNTimes ld b, h ld c, l @@ -232,93 +232,94 @@ GetMapObject:: ; 18d2 Function18de:: ; 18de +; Sets carry if the object is not visible on the screen. ld [hConnectionStripLength], a call GetMapObject - ld hl, $0000 + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld a, [hl] - cp $ff - jr z, .asm_18f3 + cp MAPOBJECT_NOT_VISIBLE + jr z, .not_visible ld [hConnectedMapWidth], a - call Function1ae5 + call GetObjectStruct and a ret -.asm_18f3 +.not_visible scf ret ; 18f5 Function18f5:: ; 18f5 - ld hl, $0006 + ld hl, MAPOBJECT_HOUR add hl, bc ld a, [hl] - cp $ff - jr nz, .asm_1921 - ld hl, $0007 + cp -1 + jr nz, .check_hour + ld hl, MAPOBJECT_TIMEOFDAY add hl, bc ld a, [hl] - cp $ff - jr z, .asm_191c - ld hl, .data_191e + cp -1 + jr z, .timeofday_always + ld hl, .TimeOfDayValues_191e ld a, [TimeOfDay] add l ld l, a - jr nc, .asm_1912 + jr nc, .ok inc h -.asm_1912 +.ok ld a, [hl] - ld hl, $0007 + ld hl, MAPOBJECT_TIMEOFDAY add hl, bc and [hl] - jr nz, .asm_191c + jr nz, .timeofday_always scf ret -.asm_191c +.timeofday_always and a ret -.data_191e - db $1 - db $2 - db $4 +.TimeOfDayValues_191e + db 1 << MORN ; 1 + db 1 << DAY ; 2 + db 1 << NITE ; 4 -.asm_1921 - ld hl, $0006 +.check_hour + ld hl, MAPOBJECT_HOUR add hl, bc ld d, [hl] - ld hl, $0007 + ld hl, MAPOBJECT_TIMEOFDAY add hl, bc ld e, [hl] ld hl, hHours ld a, d cp e - jr z, .asm_1949 - jr c, .asm_193f + jr z, .yes + jr c, .check_timeofday ld a, [hl] cp d - jr nc, .asm_1949 + jr nc, .yes cp e - jr c, .asm_1949 - jr z, .asm_1949 - jr .asm_194b + jr c, .yes + jr z, .yes + jr .no -.asm_193f +.check_timeofday ld a, e cp [hl] - jr c, .asm_194b + jr c, .no ld a, [hl] cp d - jr nc, .asm_1949 - jr .asm_194b + jr nc, .yes + jr .no -.asm_1949 +.yes and a ret -.asm_194b +.no scf ret ; 194d @@ -344,16 +345,16 @@ Function1956:: ; 1956 Function1967:: ; 1967 ld [hConnectionStripLength], a call GetMapObject - ld hl, $0000 + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld a, [hl] - cp $ff + cp MAPOBJECT_NOT_VISIBLE ret z - ld [hl], $ff + ld [hl], MAPOBJECT_NOT_VISIBLE push af call Function1985 pop af - call Function1ae5 + call GetObjectStruct callba Function4357 ret ; 1985 @@ -361,14 +362,14 @@ Function1967:: ; 1967 Function1985:: ; 1985 ld hl, wd4cd cp [hl] - jr z, .asm_1990 + jr z, .ok ld hl, wd4ce cp [hl] ret nz -.asm_1990 +.ok callba Function581f - ld a, $ff + ld a, -1 ld [wd4cd], a ld [wd4ce], a ret @@ -385,41 +386,41 @@ Function19a6:: ; 19a6 call GetMapObject ld d, b ld e, c - ld a, $ff + ld a, MAPOBJECT_NOT_VISIBLE ld [de], a inc de pop hl - ld bc, $000f + ld bc, OBJECT_LENGTH - 1 call CopyBytes ret ; 19b8 Function19b8:: ; 19b8 call GetMapObject - ld hl, $0000 + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld a, [hl] push af - ld [hl], $ff + ld [hl], MAPOBJECT_NOT_VISIBLE inc hl - ld bc, $000f + ld bc, OBJECT_LENGTH - 1 xor a call ByteFill pop af - cp $ff + cp MAPOBJECT_NOT_VISIBLE ret z cp $d ret nc ld b, a ld a, [wd4cd] cp b - jr nz, .asm_19de - ld a, $ff + jr nz, .ok + ld a, -1 ld [wd4cd], a -.asm_19de +.ok ld a, b - call Function1ae5 + call GetObjectStruct callba Function4357 ret ; 19e9 @@ -437,12 +438,12 @@ Function19e9:: ; 19e9 ld a, [wc2e2] call Function18de ret c - ld hl, $0003 + ld hl, OBJECT_03 add hl, bc ld [hl], $14 - ld hl, $0009 + ld hl, OBJECT_09 add hl, bc - ld [hl], $0 + ld [hl], 0 ld hl, VramState set 7, [hl] and a @@ -455,24 +456,24 @@ Function1a13:: ; 1a13 push bc push de ld hl, ObjectStructs - ld de, $0028 - ld c, $d -.asm_1a1d + ld de, OBJECT_STRUCT_LENGTH + ld c, NUM_OBJECT_STRUCTS +.loop ld a, [hl] and a - jr z, .asm_1a28 + jr z, .empty add hl, de dec c - jr nz, .asm_1a1d + jr nz, .loop xor a - jr .asm_1a2c + jr .done -.asm_1a28 +.empty ld a, $d sub c scf -.asm_1a2c +.done pop de pop bc ret @@ -481,23 +482,18 @@ Function1a13:: ; 1a13 Function1a2f:: ; 1a2f - ld hl, $0003 + ld hl, OBJECT_03 add hl, bc ld a, [hl] - cp $25 - jr c, .asm_1a39 + cp OBJECT_STRUCT_3_DATA_HEIGHT + jr c, .ok xor a -.asm_1a39 - ld hl, Data4273 +.ok + ld hl, ObjectStruct3_Data ld e, a ld d, 0 - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de + add_n_times hl, de, OBJECT_STRUCT_3_DATA_WIDTH ld a, [hl] ret ; 1a47 @@ -507,14 +503,9 @@ Function1a47:: ; 1a47 push de ld e, a ld d, 0 - ld hl, Data4273 + 1 - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de - ld a, BANK(Data4273) + ld hl, ObjectStruct3_Data + 1 + add_n_times hl, de, OBJECT_STRUCT_3_DATA_WIDTH + ld a, BANK(ObjectStruct3_Data) call GetFarByte add a add a @@ -529,7 +520,7 @@ Function1a61:: ; 1a61 ld l, a ld a, [hROMBank] push af - ld a, BANK(Data4273) + ld a, BANK(ObjectStruct3_Data) rst Bankswitch ld a, l push bc @@ -544,19 +535,14 @@ Function1a61:: ; 1a61 ; 1a71 Function1a71:: ; 1a71 - ld hl, $0003 + ld hl, OBJECT_03 add hl, de ld [hl], a push de ld e, a ld d, 0 - ld hl, Data4273 + 1 - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de + ld hl, ObjectStruct3_Data + 1 + add_n_times hl, de, OBJECT_STRUCT_3_DATA_WIDTH ld b, h ld c, l pop de @@ -565,27 +551,27 @@ Function1a71:: ; 1a71 rlca rlca and $c - ld hl, $0008 + ld hl, OBJECT_FACING add hl, de ld [hl], a ld a, [bc] inc bc - ld hl, $000b + ld hl, OBJECT_11 add hl, de ld [hl], a ld a, [bc] inc bc - ld hl, $0004 + ld hl, OBJECT_04 add hl, de ld [hl], a ld a, [bc] inc bc - ld hl, $0005 + ld hl, OBJECT_FLAGS add hl, de ld [hl], a ld a, [bc] inc bc - ld hl, $0006 + ld hl, OBJECT_PALETTE add hl, de ld [hl], a ret @@ -599,12 +585,12 @@ Function1aae:: ; 1aae ld a, [hli] ld d, [hl] - ld hl, $001b + ld hl, OBJECT_27 add hl, bc add [hl] ld e, a ld a, d - adc $0 + adc 0 ld d, a inc [hl] ld a, [de] @@ -616,20 +602,20 @@ Function1aae:: ; 1aae ret ; 1ac6 -Function1ac6:: ; 1ac6 +SetVramState_Bit0:: ; 1ac6 ld hl, VramState set 0, [hl] ret ; 1acc -Function1acc:: ; 1acc +ResetVramState_Bit0:: ; 1acc ld hl, VramState res 0, [hl] ret ; 1ad2 -Function1ad2:: ; 1ad2 +DrawOnMap:: ; 1ad2 ld a, [VramState] bit 0, a ret z @@ -639,8 +625,8 @@ Function1ad2:: ; 1ad2 ; 1ae5 -Function1ae5:: ; 1ae5 - ld bc, $0028 +GetObjectStruct:: ; 1ae5 + ld bc, OBJECT_STRUCT_LENGTH ld hl, ObjectStructs call AddNTimes ld b, h @@ -648,23 +634,23 @@ Function1ae5:: ; 1ae5 ret ; 1af1 -Function1af1:: ; 1af1 - ld hl, $0000 +GetObjectSprite:: ; 1af1 + ld hl, OBJECT_SPRITE add hl, bc ld a, [hl] and a ret ; 1af8 -Function1af8:: ; 1af8 +SetSpriteDirection:: ; 1af8 push af - ld hl, $0008 + ld hl, OBJECT_FACING add hl, bc ld a, [hl] - and $f3 + and %11110011 ld e, a pop af - and $c + and %00001100 or e ld [hl], a ret @@ -672,9 +658,9 @@ Function1af8:: ; 1af8 GetSpriteDirection:: ; 1b07 - ld hl, $0008 + ld hl, OBJECT_FACING add hl, bc ld a, [hl] - and $c + and %00001100 ret ; 1b0f diff --git a/home/menu.asm b/home/menu.asm index 21ce9c515..3c28b95e5 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -2,11 +2,11 @@ LoadMenuDataHeader:: ; 0x1d35 - call Function1d3c + call CopyMenuDataHeader call Function1c00 ret -Function1d3c:: ; 0x1d3c +CopyMenuDataHeader:: ; 0x1d3c ld de, wcf81 ld bc, $0010 call CopyBytes @@ -48,7 +48,7 @@ MenuDataHeader_0x1d5f:: ; 1d5f Function1d67:: ; 1d67 call Function1d4f - call Function1c17 + call WriteBackup ret ; 1d6e @@ -71,11 +71,11 @@ Function1d7d:: ; 1d7d ret ; 1d81 -Function1d81:: ; 0x1d81 +InterpretMenu2:: ; 0x1d81 xor a ld [hBGMapMode], a call Function1cbb - call Function1ad2 + call DrawOnMap call Function1c89 call Function321c call Function1c66 @@ -97,8 +97,8 @@ Function1d81:: ; 0x1d81 Function1dab:: ; 1dab call LoadMenuDataHeader - call Function1d81 - call Function1c17 + call InterpretMenu2 + call WriteBackup ld a, [wcfa9] ret ; 1db8 @@ -138,7 +138,7 @@ _YesNoBox:: ; 1dd9 ; Return nc (yes) or c (no). push bc ld hl, YesNoMenuDataHeader - call Function1d3c + call CopyMenuDataHeader pop bc ld a, b cp $e @@ -158,11 +158,11 @@ _YesNoBox:: ; 1dd9 call Function1c00 Function1dfe:: ; 1dfe - call Function1d81 + call InterpretMenu2 push af ld c, $f call DelayFrames - call Function1c17 + call WriteBackup pop af jr c, .asm_1e16 ld a, [wcfa9] @@ -201,7 +201,7 @@ Function1e2e:: ; 1e2e Function1e35:: ; 1e35 push de - call Function1d3c + call CopyMenuDataHeader pop de ld a, [wcf83] ld h, a @@ -540,7 +540,7 @@ PlayClickSFX:: ; 2009 Function2012:: ; 2012 call Function1d4f - call Functiona46 + call CloseText call Function1c07 ret ; 201c @@ -559,7 +559,7 @@ Function201c:: ; 201c ret ; 202a -Function202a:: ; 202a +InterpretMenu:: ; 202a ld a, [hROMBank] ld [wcf94], a callba Function2400e diff --git a/home/movement.asm b/home/movement.asm index f0869aa99..0cbb14f5d 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -203,11 +203,11 @@ Function1c10:: ; 0x1c10 callab Function2446d ret -Function1c17:: ; 0x1c17 +WriteBackup:: ; 0x1c17 push af call Function1c07 call Function321c - call Function1ad2 + call DrawOnMap pop af ret diff --git a/home/text.asm b/home/text.asm index feb3eb734..4cb581bcb 100644 --- a/home/text.asm +++ b/home/text.asm @@ -169,7 +169,7 @@ Function1052:: ; 1052 PrintText:: ; 1057 - call Function106c + call SetUpTextBox Function105a:: ; 105a push hl hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY @@ -183,10 +183,10 @@ PrintTextBoxText:: ; 1065 ret ; 106c -Function106c:: ; 106c +SetUpTextBox:: ; 106c push hl call SpeechTextBox - call Function1ad2 + call DrawOnMap call Function321c pop hl ret @@ -385,7 +385,7 @@ Char3F:: ; 121b ld de, String12a2 call PlaceString push bc - callab Function39939 + callab Battle_GetTrainerName pop hl ld de, StringBuffer1 jr Function126a @@ -517,7 +517,7 @@ Paragraph:: ; 12f2 .asm_1301 call Function13b6 - call Functionaaf + call KeepTextOpen hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY lb bc, TEXTBOX_INNERH - 1, TEXTBOX_INNERW call ClearBox @@ -540,7 +540,7 @@ Char4B:: ; 131f call Function13b6 push de - call Functionaaf + call KeepTextOpen pop de ld a, [InLinkBattle] @@ -590,7 +590,7 @@ PromptText:: ; 135a .ok call Function13b6 - call Functionaaf + call KeepTextOpen ld a, [InLinkBattle] cp $3 jr z, DoneText @@ -904,7 +904,7 @@ Text_06:: ; 149f push hl call Function13c7 push bc - call Functionaaf + call KeepTextOpen pop bc call Function13cd pop hl @@ -1066,7 +1066,7 @@ Text_0D:: ; 1562 ; display arrow push hl push bc - call Functionaaf + call KeepTextOpen pop bc pop hl ret diff --git a/home/window.asm b/home/window.asm index 8c1e95134..31e299827 100644 --- a/home/window.asm +++ b/home/window.asm @@ -83,7 +83,7 @@ Function2e31:: ; 2e31 ld [hBGMapMode], a ld a, $1 ld [hOAMUpdate], a - call Function1ad2 + call DrawOnMap xor a ld [hOAMUpdate], a call DelayFrame diff --git a/macros.asm b/macros.asm index cbd071b8f..ccbc4ed22 100644 --- a/macros.asm +++ b/macros.asm @@ -136,3 +136,9 @@ bcd: MACRO shift endr ENDM + +add_n_times: MACRO + rept \3 + add \1, \2 + endr +ENDM diff --git a/macros/map.asm b/macros/map.asm index 54b543c6d..570205517 100644 --- a/macros/map.asm +++ b/macros/map.asm @@ -164,6 +164,7 @@ endc ENDM mapgroup: MACRO +; map id, height, width \1\@ EQUS "GROUP_\1" \1\@2 EQUS "MAP_\1" \1\@ EQU const_value diff --git a/macros/movement.asm b/macros/movement.asm index 1d556f922..71eb01339 100644 --- a/macros/movement.asm +++ b/macros/movement.asm @@ -1,285 +1,370 @@ + enum_start + + enum movement_turn_head_down turn_head_down: macro - db $00 + db movement_turn_head_down ; $00 endm + enum movement_turn_head_up turn_head_up: macro - db $01 + db movement_turn_head_up ; $01 endm + enum movement_turn_head_left turn_head_left: macro - db $02 + db movement_turn_head_left ; $02 endm + enum movement_turn_head_right turn_head_right: macro - db $03 + db movement_turn_head_right ; $03 endm + enum movement_half_step_down half_step_down: macro - db $04 + db movement_half_step_down ; $04 endm + enum movement_half_step_up half_step_up: macro - db $05 + db movement_half_step_up ; $05 endm + enum movement_half_step_left half_step_left: macro - db $06 + db movement_half_step_left ; $06 endm + enum movement_half_step_right half_step_right: macro - db $07 + db movement_half_step_right ; $07 endm + enum movement_slow_step_down slow_step_down: macro - db $08 + db movement_slow_step_down ; $08 endm + enum movement_slow_step_up slow_step_up: macro - db $09 + db movement_slow_step_up ; $09 endm + enum movement_slow_step_left slow_step_left: macro - db $0a + db movement_slow_step_left ; $0a endm + enum movement_slow_step_right slow_step_right: macro - db $0b + db movement_slow_step_right ; $0b endm + enum movement_step_down step_down: macro - db $0c + db movement_step_down ; $0c endm + enum movement_step_up step_up: macro - db $0d + db movement_step_up ; $0d endm + enum movement_step_left step_left: macro - db $0e + db movement_step_left ; $0e endm + enum movement_step_right step_right: macro - db $0f + db movement_step_right ; $0f endm + enum movement_big_step_down big_step_down: macro - db $10 + db movement_big_step_down ; $10 endm + enum movement_big_step_up big_step_up: macro - db $11 + db movement_big_step_up ; $11 endm + enum movement_big_step_left big_step_left: macro - db $12 + db movement_big_step_left ; $12 endm + enum movement_big_step_right big_step_right: macro - db $13 + db movement_big_step_right ; $13 endm + enum movement_slow_slide_step_down slow_slide_step_down: macro - db $14 + db movement_slow_slide_step_down ; $14 endm + enum movement_slow_slide_step_up slow_slide_step_up: macro - db $15 + db movement_slow_slide_step_up ; $15 endm + enum movement_slow_slide_step_left slow_slide_step_left: macro - db $16 + db movement_slow_slide_step_left ; $16 endm + enum movement_slow_slide_step_right slow_slide_step_right: macro - db $17 + db movement_slow_slide_step_right ; $17 endm + enum movement_slide_step_down slide_step_down: macro - db $18 + db movement_slide_step_down ; $18 endm + enum movement_slide_step_up slide_step_up: macro - db $19 + db movement_slide_step_up ; $19 endm + enum movement_slide_step_left slide_step_left: macro - db $1a + db movement_slide_step_left ; $1a endm + enum movement_slide_step_right slide_step_right: macro - db $1b + db movement_slide_step_right ; $1b endm + enum movement_fast_slide_step_down fast_slide_step_down: macro - db $1c + db movement_fast_slide_step_down ; $1c endm + enum movement_fast_slide_step_up fast_slide_step_up: macro - db $1d + db movement_fast_slide_step_up ; $1d endm + enum movement_fast_slide_step_left fast_slide_step_left: macro - db $1e + db movement_fast_slide_step_left ; $1e endm + enum movement_fast_slide_step_right fast_slide_step_right: macro - db $1f + db movement_fast_slide_step_right ; $1f endm + enum movement_turn_away_down turn_away_down: macro - db $20 + db movement_turn_away_down ; $20 endm + enum movement_turn_away_up turn_away_up: macro - db $21 + db movement_turn_away_up ; $21 endm + enum movement_turn_away_left turn_away_left: macro - db $22 + db movement_turn_away_left ; $22 endm + enum movement_turn_away_right turn_away_right: macro - db $23 + db movement_turn_away_right ; $23 endm + enum movement_turn_in_down turn_in_down: macro - db $24 + db movement_turn_in_down ; $24 endm + enum movement_turn_in_up turn_in_up: macro - db $25 + db movement_turn_in_up ; $25 endm + enum movement_turn_in_left turn_in_left: macro - db $26 + db movement_turn_in_left ; $26 endm + enum movement_turn_in_right turn_in_right: macro - db $27 + db movement_turn_in_right ; $27 endm + enum movement_turn_waterfall_down turn_waterfall_down: macro - db $28 + db movement_turn_waterfall_down ; $28 endm + enum movement_turn_waterfall_up turn_waterfall_up: macro - db $29 + db movement_turn_waterfall_up ; $29 endm + enum movement_turn_waterfall_left turn_waterfall_left: macro - db $2a + db movement_turn_waterfall_left ; $2a endm + enum movement_turn_waterfall_right turn_waterfall_right: macro - db $2b + db movement_turn_waterfall_right ; $2b endm + enum movement_slow_jump_step_down slow_jump_step_down: macro - db $2c + db movement_slow_jump_step_down ; $2c endm + enum movement_slow_jump_step_up slow_jump_step_up: macro - db $2d + db movement_slow_jump_step_up ; $2d endm + enum movement_slow_jump_step_left slow_jump_step_left: macro - db $2e + db movement_slow_jump_step_left ; $2e endm + enum movement_slow_jump_step_right slow_jump_step_right: macro - db $2f + db movement_slow_jump_step_right ; $2f endm + enum movement_jump_step_down jump_step_down: macro - db $30 + db movement_jump_step_down ; $30 endm + enum movement_jump_step_up jump_step_up: macro - db $31 + db movement_jump_step_up ; $31 endm + enum movement_jump_step_left jump_step_left: macro - db $32 + db movement_jump_step_left ; $32 endm + enum movement_jump_step_right jump_step_right: macro - db $33 + db movement_jump_step_right ; $33 endm + enum movement_fast_jump_step_down fast_jump_step_down: macro - db $34 + db movement_fast_jump_step_down ; $34 endm + enum movement_fast_jump_step_up fast_jump_step_up: macro - db $35 + db movement_fast_jump_step_up ; $35 endm + enum movement_fast_jump_step_left fast_jump_step_left: macro - db $36 + db movement_fast_jump_step_left ; $36 endm + enum movement_fast_jump_step_right fast_jump_step_right: macro - db $37 + db movement_fast_jump_step_right ; $37 endm +__enum__ = $3a + + enum movement_remove_fixed_facing remove_fixed_facing: macro - db $3a + db movement_remove_fixed_facing ; $3a endm + enum movement_fix_facing fix_facing: macro - db $3b + db movement_fix_facing ; $3b endm +__enum__ = $3d + + enum movement_hide_person hide_person: macro - db $3d + db movement_hide_person ; $3d endm + enum movement_show_person show_person: macro - db $3e + db movement_show_person ; $3e endm +__enum__ = $45 + + enum movement_accelerate_last accelerate_last: macro - db $45 + db movement_accelerate_last ; $45 endm + enum movement_step_sleep step_sleep: macro - db $46 + db movement_step_sleep ; $46 db \1 ; duration endm + enum movement_step_end step_end: macro - db $47 + db movement_step_end ; $47 endm +__enum__ = $49 + + enum movement_remove_person remove_person: macro - db $49 + db movement_remove_person ; $49 endm +__enum__ = $4c + + enum movement_teleport_from teleport_from: macro - db $4c + db movement_teleport_from ; $4c endm + enum movement_teleport_to teleport_to: macro - db $4d + db movement_teleport_to ; $4d endm + enum movement_skyfall skyfall: macro - db $4e + db movement_skyfall ; $4e endm + enum movement_step_wait5 step_wait5: macro - db $4f + db movement_step_wait5 ; $4f endm +__enum__ = $53 + + enum movement_hide_emote hide_emote: macro - db $53 + db movement_hide_emote ; $53 endm + enum movement_show_emote show_emote: macro - db $54 + db movement_show_emote ; $54 endm + enum movement_step_shake step_shake: macro - db $55 + db movement_step_shake ; $55 db \1 ; displacement endm diff --git a/main.asm b/main.asm index 2f3b9db0d..42ea98d34 100644 --- a/main.asm +++ b/main.asm @@ -118,7 +118,7 @@ Function5b44: ; 5b44 MysteryGift: ; 5b54 call UpdateTime callba Function11548 - callba Function1048ba + callba DoMysteryGift ret ; 5b64 @@ -134,7 +134,7 @@ NewGame: ; 5b6b call Function5b44 call Function5b8f call OakSpeech - call Function5d23 + call InitializeWorld ld a, $1 ld [wc2d8], a @@ -376,7 +376,7 @@ Function5ce9: ; 5ce9 .Mom db "MOM@" ; 5d23 -Function5d23: ; 5d23 +InitializeWorld: ; 5d23 call Function610f callba Function8029 callba Function113d6 @@ -422,13 +422,13 @@ Continue: ; 5d65 call DelayFrames call Function5e34 jr nc, .asm_5d8c - call Function1c17 + call WriteBackup jr .asm_5dd6 .asm_5d8c call Function5e48 jr nc, .asm_5d96 - call Function1c17 + call WriteBackup jr .asm_5dd6 .asm_5d96 @@ -440,7 +440,7 @@ Continue: ; 5d65 ld [MusicFadeIDHi], a call WhiteBGMap call Function5df0 - call Function1c17 + call WriteBackup call ClearTileMap ld c, $14 call DelayFrames @@ -582,7 +582,7 @@ Function5e9f: ; 5e9f call Function5f1c call Function5f40 call Functione5f - call Function1ad2 + call DrawOnMap ret ; 5eaf @@ -591,7 +591,7 @@ Function5eaf: ; 5eaf call Function5f1c call Function5f48 call Functione5f - call Function1ad2 + call DrawOnMap ret ; 5ebf @@ -884,11 +884,11 @@ NamePlayer: ; 0x6074 Function60e9: ; 60e9 call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 ld a, [wcfa9] dec a call Function1db8 - call Function1c17 + call WriteBackup ret ; 60fa @@ -2201,7 +2201,7 @@ Function6f3e: ; 6f3e call Function6f7f ret nc push af - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld a, [hl] and 3 @@ -2227,7 +2227,7 @@ Function6f5f: ; 6f5f call Function6f7f ret nc push af - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc and 3 ld e, a @@ -2273,7 +2273,7 @@ Function6f7f: ; 6f7f ; 6fa1 Function6fa1: ; 6fa1 - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld a, [hl] and 3 @@ -2353,7 +2353,7 @@ CheckFacingObject:: ; 6fd9 ld [$ffaf], a call Function7041 ret nc - ld hl, OBJECT_07 + ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld a, [hl] cp $ff @@ -2379,7 +2379,7 @@ Function7009: ; 7009 Function7015: ; 7015 ld a, [$ffaf] - call Function1ae5 + call GetObjectStruct call Function7021 call Function7041 ret @@ -2419,7 +2419,7 @@ Function7041: ; 7041 xor a .asm_7045 ld [$ffb0], a - call Function1af1 + call GetObjectSprite jr z, .asm_7093 ld hl, OBJECT_04 add hl, bc @@ -2586,7 +2586,7 @@ Function7113: ; 7113 xor a .asm_711f ld [$ffb0], a - call Function1af1 + call GetObjectSprite jr z, .asm_7160 ld hl, OBJECT_03 add hl, bc @@ -2667,24 +2667,24 @@ Function7171: ; 7171 ret ; 718d -Function718d: ; 718d +GetFirstPokemonHappiness: ; 718d ld hl, PartyMon1Happiness ld bc, PartyMon2 - PartyMon1 ld de, PartySpecies -.asm_7196 +.loop ld a, [de] cp EGG - jr nz, .asm_719f + jr nz, .done inc de add hl, bc - jr .asm_7196 + jr .loop -.asm_719f +.done ld [wd265], a ld a, [hl] ld [ScriptVar], a call GetPokemonName - jp Function746e + jp CopyPokemonName_Buffer1_Buffer3 ; 71ac Function71ac: ; 71ac @@ -2692,13 +2692,13 @@ Function71ac: ; 71ac ld [wd265], a cp EGG ld a, $1 - jr z, .asm_71b9 + jr z, .egg xor a -.asm_71b9 +.egg ld [ScriptVar], a call GetPokemonName - jp Function746e + jp CopyPokemonName_Buffer1_Buffer3 ; 71c2 @@ -3069,7 +3069,7 @@ Function73f7: ; 73f7 ld [ScriptVar], a ld [wd265], a call GetPokemonName - jp Function746e + jp CopyPokemonName_Buffer1_Buffer3 .asm_740e xor a @@ -3098,7 +3098,7 @@ Function7420: ; 7420 jr z, .asm_7453 push hl call GetCurNick - call Function746e + call CopyPokemonName_Buffer1_Buffer3 pop hl call Random .next @@ -3142,10 +3142,10 @@ Data746b: ; 746b db $ff, $02, $12 ; 746e -Function746e: ; 746e +CopyPokemonName_Buffer1_Buffer3: ; 746e ld hl, StringBuffer1 ld de, StringBuffer3 - ld bc, $000b + ld bc, PKMN_NAME_LENGTH jp CopyBytes ; 747a @@ -3187,7 +3187,7 @@ Function8029: ; 8029 call Function808f ld a, $0 call GetMapObject - ld hl, $0008 + ld hl, MAPOBJECT_COLOR add hl, bc ld e, $80 ld a, [wd45b] @@ -3216,7 +3216,8 @@ PlayerObjectTemplate: ; 8071 ; A dummy map object used to initialize the player object. ; Shorter than the actual amount copied by two bytes. ; Said bytes seem to be unused. - db $01, $00, $00, $0b, $ff, $ff, $ff, $00, $00, $00, $00, $ff, $ff + person_event SPRITE_CHRIS, 0, 0, LEFT << 2 | $3, $ff, -1, -1, PAL_OW_RED << 4 | $0, 0, $0000, -1 + ; db $01, $00, $00, $0b, $ff, $ff, $ff, $00, $00, $00, $00, $ff, $ff ; 807e Function807e:: ; 807e @@ -3224,10 +3225,10 @@ Function807e:: ; 807e ld a, b call GetMapObject pop de - ld hl, $0003 + ld hl, MAPOBJECT_X_COORD add hl, bc ld [hl], d - ld hl, $0002 + ld hl, MAPOBJECT_Y_COORD add hl, bc ld [hl], e ret @@ -3298,23 +3299,23 @@ Function80e7:: ; 80e7 call Function2707 and a ret nz - ld hl, ObjectStructs + (ObjectStruct2 - ObjectStruct1) * 1 + ld hl, ObjectStructs + OBJECT_STRUCT_LENGTH * 1 ld a, 1 - ld de, ObjectStruct2 - ObjectStruct1 -.asm_80f4 + ld de, OBJECT_STRUCT_LENGTH +.loop ld [$ffb0], a ld a, [hl] and a - jr z, .asm_8104 + jr z, .done add hl, de ld a, [$ffb0] inc a - cp $d - jr nz, .asm_80f4 + cp NUM_OBJECT_STRUCTS + jr nz, .loop scf ret -.asm_8104 +.done ld d, h ld e, l call Function8116 @@ -3335,12 +3336,12 @@ Function8116: ; 8116 Function811d: ; 811d ld a, [$ffb0] - ld hl, OBJECT_00 + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld [hl], a ld a, [$ffaf] ld [wc2f0], a - ld hl, OBJECT_01 + ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] ld [wc2f1], a @@ -3349,7 +3350,7 @@ Function811d: ; 811d ld a, [hl] call GetSpritePalette ld [wc2f3], a - ld hl, OBJECT_08 + ld hl, MAPOBJECT_COLOR add hl, bc ld a, [hl] and $f0 @@ -3359,23 +3360,23 @@ Function811d: ; 811d ld [wc2f3], a .asm_814e - ld hl, OBJECT_04 + ld hl, MAPOBJECT_FACING add hl, bc ld a, [hl] ld [wc2f4], a - ld hl, OBJECT_09 + ld hl, MAPOBJECT_RANGE add hl, bc ld a, [hl] ld [wc2f5], a - ld hl, OBJECT_03 + ld hl, MAPOBJECT_X_COORD add hl, bc ld a, [hl] ld [wc2f6], a - ld hl, OBJECT_SPRITE + ld hl, MAPOBJECT_Y_COORD add hl, bc ld a, [hl] ld [wc2f7], a - ld hl, OBJECT_FLAGS + ld hl, MAPOBJECT_MOVEMENT add hl, bc ld a, [hl] ld [wc2f8], a @@ -3384,53 +3385,53 @@ Function811d: ; 811d Function8177: ; 8177 ld bc, MapObjects + OBJECT_LENGTH - ld a, $1 -.asm_817c + ld a, 1 +.loop ld [$ffaf], a - ld hl, $0001 + ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] and a - jr z, .asm_81bb - ld hl, $0000 + jr z, .next + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld a, [hl] - cp $ff - jr nz, .asm_81bb + cp MAPOBJECT_NOT_VISIBLE + jr nz, .next ld a, [XCoord] ld d, a ld a, [YCoord] ld e, a - ld hl, $0003 + ld hl, MAPOBJECT_X_COORD add hl, bc ld a, [hl] - add $1 + add 1 sub d - jr c, .asm_81bb - cp $c - jr nc, .asm_81bb - ld hl, $0002 + jr c, .next + cp MAPOBJECT_SCREEN_WIDTH + jr nc, .next + ld hl, MAPOBJECT_Y_COORD add hl, bc ld a, [hl] - add $1 + add 1 sub e - jr c, .asm_81bb - cp $b - jr nc, .asm_81bb + jr c, .next + cp MAPOBJECT_SCREEN_HEIGHT + jr nc, .next push bc call Function80e7 pop bc jp c, Function81c9 -.asm_81bb +.next ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l ld a, [$ffaf] inc a - cp $10 - jr nz, .asm_817c + cp NUM_OBJECTS + jr nz, .loop ret ; 81c9 @@ -3469,53 +3470,53 @@ Function81ea: ; 81ea ld a, [XCoord] ld e, a ld bc, MapObjects + OBJECT_LENGTH - ld a, $1 -.asm_81f4 + ld a, 1 +.loop ld [$ffaf], a - ld hl, $0001 + ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] and a - jr z, .asm_8224 - ld hl, $0002 + jr z, .next + ld hl, MAPOBJECT_Y_COORD add hl, bc ld a, d cp [hl] - jr nz, .asm_8224 - ld hl, $0000 + jr nz, .next + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld a, [hl] - cp $ff - jr nz, .asm_8224 - ld hl, $0003 + cp MAPOBJECT_NOT_VISIBLE + jr nz, .next + ld hl, MAPOBJECT_X_COORD add hl, bc ld a, [hl] - add $1 + add 1 sub e - jr c, .asm_8224 - cp $c - jr nc, .asm_8224 + jr c, .next + cp MAPOBJECT_SCREEN_WIDTH + jr nc, .next push de push bc call Function80e7 pop bc pop de -.asm_8224 +.next ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l ld a, [$ffaf] inc a - cp $10 - jr nz, .asm_81f4 + cp NUM_OBJECTS + jr nz, .loop ret ; 8232 Function8232: ; 8232 ld a, [XCoord] - sub $1 + sub 1 jr Function823e Function8239: ; 8239 @@ -3527,54 +3528,54 @@ Function823e: ; 823e ld a, [YCoord] ld d, a ld bc, MapObjects + OBJECT_LENGTH - ld a, $1 -.asm_8248 + ld a, 1 +.loop ld [$ffaf], a - ld hl, $0001 + ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] and a - jr z, .asm_8278 - ld hl, $0003 + jr z, .next + ld hl, MAPOBJECT_X_COORD add hl, bc ld a, e cp [hl] - jr nz, .asm_8278 - ld hl, $0000 + jr nz, .next + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld a, [hl] - cp $ff - jr nz, .asm_8278 - ld hl, $0002 + cp MAPOBJECT_NOT_VISIBLE + jr nz, .next + ld hl, MAPOBJECT_Y_COORD add hl, bc ld a, [hl] - add $1 + add 1 sub d - jr c, .asm_8278 - cp $b - jr nc, .asm_8278 + jr c, .next + cp MAPOBJECT_SCREEN_HEIGHT + jr nc, .next push de push bc call Function80e7 pop bc pop de -.asm_8278 +.next ld hl, OBJECT_LENGTH add hl, bc ld b, h ld c, l ld a, [$ffaf] inc a - cp $10 - jr nz, .asm_8248 + cp NUM_OBJECTS + jr nz, .loop ret ; 8286 Function8286: ; 8286 ld a, [wc2f0] - ld hl, OBJECT_01 + ld hl, OBJECT_MAP_OBJECT_INDEX add hl, de ld [hl], a ld a, [wc2f4] @@ -3589,17 +3590,17 @@ Function8286: ; 8286 ld a, [wc2f6] call Function82f1 ld a, [wc2f1] - ld hl, OBJECT_00 + ld hl, OBJECT_SPRITE add hl, de ld [hl], a ld a, [wc2f2] - ld hl, OBJECT_SPRITE + ld hl, OBJECT_SPRITE_TILE add hl, de ld [hl], a ld hl, OBJECT_09 add hl, de ld [hl], $0 - ld hl, OBJECT_FACING + ld hl, OBJECT_FACING_STEP add hl, de ld [hl], $ff ld a, [wc2f8] @@ -3675,8 +3676,8 @@ Function831e: ; 831e jr z, Function833b ld a, [$ffe0] ld b, a - ld c, $0 - ld d, $1 + ld c, 0 + ld d, 1 call Function8341 call Function1b35 @@ -3691,19 +3692,19 @@ Function8341: ; 8341 push bc ld a, c call GetMapObject - ld hl, $0000 + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld a, [hl] - call Function1ae5 + call GetObjectStruct ld d, b ld e, c pop bc ld a, b call GetMapObject - ld hl, $0000 + ld hl, MAPOBJECT_VRAM_ID add hl, bc ld a, [hl] - call Function1ae5 + call GetObjectStruct ld hl, OBJECT_MAP_X add hl, bc ld a, [hl] @@ -3834,10 +3835,10 @@ Function839e:: ; 839e ret ; 8417 -Function8417:: ; 8417 +GetRelativeFacing:: ; 8417 ld a, d call GetMapObject - ld hl, $0000 + ld hl, OBJECT_SPRITE add hl, bc ld a, [hl] cp $d @@ -3845,7 +3846,7 @@ Function8417:: ; 8417 ld d, a ld a, e call GetMapObject - ld hl, $0000 + ld hl, OBJECT_SPRITE add hl, bc ld a, [hl] cp $d @@ -3861,7 +3862,7 @@ Function8417:: ; 8417 Function8439: ; 8439 ld a, d - call Function1ae5 + call GetObjectStruct ld hl, OBJECT_MAP_X add hl, bc ld a, [hl] @@ -3871,7 +3872,7 @@ Function8439: ; 8439 ld b, a push bc ld a, e - call Function1ae5 + call GetObjectStruct ld hl, OBJECT_MAP_X add hl, bc ld d, [hl] @@ -3948,7 +3949,7 @@ Function848a: ; 848a Function849d: ; 849d ld a, [wd4cd] - call Function1ae5 + call GetObjectStruct ld hl, OBJECT_MAP_X add hl, bc ld d, [hl] @@ -3956,7 +3957,7 @@ Function849d: ; 849d add hl, bc ld e, [hl] ld a, [wd4ce] - call Function1ae5 + call GetObjectStruct ld hl, OBJECT_MAP_X add hl, bc ld a, d @@ -4163,9 +4164,9 @@ INCLUDE "engine/color.asm" SECTION "bank3", ROMX, BANK[$3] -Functionc000:: ; c000 +CheckTime:: ; c000 ld a, [TimeOfDay] - ld hl, Datac012 + ld hl, TimeOfDayTable ld de, 2 call IsInArray inc hl @@ -4177,7 +4178,7 @@ Functionc000:: ; c000 ret ; c012 -Datac012: ; c012 +TimeOfDayTable: ; c012 db MORN, 1 db DAY, 2 db NITE, 4 @@ -4800,7 +4801,7 @@ Functionc7ce: ; c7ce callba Function149f5 pop de jr nc, .asm_c7fc - call Function2a66 + call GetBlockLocation ld c, [hl] push hl ld hl, Unknown_c862 @@ -4846,14 +4847,14 @@ Functionc810: ; c810 xor a ld [hBGMapMode], a call Function2173 - call Function1ad2 + call DrawOnMap call DelayFrame ld a, [wd1ef] ld e, a callba Function8c940 - call Function2879 + call BufferScreen call Function2914 - call Function1ad2 + call DrawOnMap call DelayFrame call Functione51 ret @@ -5280,7 +5281,7 @@ Functionca52: ; ca52 jr nc, .asm_ca8b ld [wd001], a - call Function1c17 + call WriteBackup ld a, $1 ret @@ -5293,7 +5294,7 @@ Functionca52: ; ca52 ret .asm_ca8b - call Function1c17 + call WriteBackup call WaitBGMap ld a, $80 ret @@ -5544,7 +5545,7 @@ Functioncc06: ; cc06 ld hl, UnknownText_0xcc26 call Function1d4f call Functiona80 - call Function1c17 + call WriteBackup .asm_cc19 ld a, $80 @@ -5628,22 +5629,22 @@ Tablecc72: ; cc72 Functioncc78: ; cc78 call GetMapPermission call CheckOutdoorMap - jr z, .asm_cc82 - jr .asm_cc99 + jr z, .CheckIfSpawnPoint + jr .nope -.asm_cc82 +.CheckIfSpawnPoint ld a, [wdcb2] ld d, a ld a, [wdcb3] ld e, a callba IsSpawnPoint - jr nc, .asm_cc99 + jr nc, .nope ld a, c ld [wd001], a ld a, $1 ret -.asm_cc99 +.nope ld a, $2 ret ; cc9c @@ -5917,7 +5918,7 @@ Functioncdde: ; cdde call CheckWhirlpoolTile pop de jr c, .asm_ce09 - call Function2a66 + call GetBlockLocation ld c, [hl] push hl ld hl, Unknown_c8a4 @@ -5966,7 +5967,7 @@ Functionce1d: ; ce1d ld a, [wd1ef] ld e, a callba Function8c7d4 - call Function2879 + call BufferScreen call Function2914 ret ; ce3e @@ -6141,7 +6142,7 @@ Functioncf0d: ; cf0d jr nc, .asm_cf2c ld a, [$ffb0] - call Function1ae5 + call GetObjectStruct ld hl, $0001 add hl, bc ld a, [hl] @@ -6431,7 +6432,7 @@ Functiond095: ; d095 ld [hBGMapMode], a ld a, $1 ld [PlayerAction], a - call Function1ad2 + call DrawOnMap call Functione4a ret ; d0a4 @@ -7364,7 +7365,7 @@ Functiond4e5: ; d4e5 (3:54e5) Jumptable_d4f2: ; d4f2 (3:54f2) dw Function2914 - dw Function2879 + dw BufferScreen dw Functiond509 dw Functiond510 dw Functiond508 @@ -9529,7 +9530,7 @@ Functione17b: ; e17b ret ; e277 -Functione277:: ; e277 +GivePoke:: ; e277 push de push bc xor a @@ -9810,7 +9811,7 @@ Functione443: ; e443 (3:6443) ld a, b jr nc, .asm_e44b .asm_e46b - call Function1c17 + call WriteBackup ret ; e46f (3:646f) @@ -9876,7 +9877,7 @@ Functione4cd: ; e4cd call ClearPCItemScreen .asm_e4f4 - call Function1c17 + call WriteBackup and a ret ; e4f9 @@ -9892,7 +9893,7 @@ Functione4fe: ; e4fe (3:64fe) callba Functione2391 call Function222a call ClearPCItemScreen - call Function1c17 + call WriteBackup and a ret ; e512 (3:6512) @@ -9968,7 +9969,7 @@ Functione559: ; e559 (3:6559) callba Functione2583 call Function222a call ClearPCItemScreen - call Function1c17 + call WriteBackup and a ret ; e56d (3:656d) @@ -12386,15 +12387,15 @@ String_1224f: ; 1224f UnknownScript_0x122c1: ; 0x122c1 checkflag ENGINE_BUG_CONTEST_TIMER iffalse .script_122cd - setflag ENGINE_51 - special Function13a31 + setflag ENGINE_DAILY_BUG_CONTEST + special ContestReturnMons .script_122cd end ; 0x122ce -UnknownScript_0x122ce:: ; 0x122ce +FindItemInBallScript:: ; 0x122ce callasm Function122f8 - iffalse UnknownScript_0x122e3 + iffalse NoRoomForItemInBallScript disappear $fe loadfont writetext UnknownText_0x122ee @@ -12405,7 +12406,7 @@ UnknownScript_0x122ce:: ; 0x122ce end ; 0x122e3 -UnknownScript_0x122e3: ; 0x122e3 +NoRoomForItemInBallScript: ; 0x122e3 loadfont writetext UnknownText_0x122ee closetext @@ -12448,9 +12449,14 @@ Function122f8: ; 122f8 ; 12324 HealMachineAnim: ; 12324 + ; If you have no Pokemon, don't change the buffer. This can lead to some glitchy effects if you have no Pokemon. ld a, [PartyCount] and a ret z + ; The location of the healing machine relative to the player is stored in ScriptVar. + ; 0: Up and left (Pokemon Center) + ; 1: Left (Elm's Lab) + ; 2: Up (Hall of Fame) ld a, [ScriptVar] ld [Buffer1], a ld a, [rOBP1] @@ -12783,20 +12789,20 @@ Function12527: ; 12527 ld e, a callba IsSpawnPoint ld a, c - jr c, .asm_12539 + jr c, .yes xor a -.asm_12539 +.yes ld [wd001], a ret ; 1253d -UnknownScript_0x1253d:: ; 0x1253d +Script_ForcedMovement:: ; 0x1253d checkcode VAR_FACING - if_equal $0, UnknownScript_0x12555 - if_equal $1, UnknownScript_0x12550 - if_equal $2, UnknownScript_0x1255f - if_equal $3, UnknownScript_0x1255a + if_equal DOWN, UnknownScript_0x12555 + if_equal UP, UnknownScript_0x12550 + if_equal LEFT, UnknownScript_0x1255f + if_equal RIGHT, UnknownScript_0x1255a end ; 0x12550 @@ -12952,7 +12958,7 @@ StartMenu:: ; 125cd jr .Select .Reopen - call Function1ad2 + call DrawOnMap call UpdateTimePals call .SetUpMenuItems ld a, [wd0d2] @@ -13067,7 +13073,7 @@ StartMenu:: ; 125cd call .DrawMenuAccount_ call MenuFunc_1e7f call .DrawBugContestStatus - call Function1ad2 + call DrawOnMap call Functiond90 call Function2b5c ret @@ -13367,7 +13373,7 @@ StartMenu_Quit: ; 128f0 StartMenu_Save: ; 1290b ; Save the game. - call Function2879 + call BufferScreen callba Function14a1a jr nc, .asm_12919 ld a, 0 @@ -13503,7 +13509,7 @@ Function129d5: ; 129d5 and a ret nz ld hl, TMsHMs - ld b, $39 + ld b, NUM_TMS + NUM_HMS .asm_129e9 ld a, [hli] and a @@ -13527,7 +13533,7 @@ Function129f4: ; 129f4 call Function1d4f callba Function24fbf push af - call Function1c17 + call WriteBackup call Function1c07 pop af jr c, .asm_12a42 @@ -13722,7 +13728,7 @@ GiveTakePartyMonItem: ; 12b60 ld hl, GiveTakeItemMenuData call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 call Function1c07 jr c, .asm_12ba6 @@ -14027,7 +14033,7 @@ Function12d45: ; 12d45 jr z, .asm_12d6d ld hl, MenuDataHeader_0x12dc9 call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 call Function1c07 jp c, .asm_12dc6 ld a, [wcfa9] @@ -14889,8 +14895,8 @@ SelectMenu:: ; 13327 call Function2e08 ld b, BANK(ItemMayBeRegisteredText) ld hl, ItemMayBeRegisteredText - call Function269a - call Functiona46 + call MapTextbox + call CloseText jp Function2dcf ; 13340 @@ -15070,7 +15076,7 @@ UseRegisteredItem: ; 133c3 ; 1342d -Function1342d:: ; 1342d +Elevator:: ; 1342d call Function1344a call Function1347d jr c, .asm_13448 @@ -15193,17 +15199,17 @@ Function134c0: ; 134c0 Function134dd: ; 134dd call Function1d6e - ld hl, UnknownText_0x1350d + ld hl, Elevator_WhichFloorText call PrintText - call Function13512 - ld hl, MenuDataHeader_0x13550 - call Function1d3c + call Elevator_GetCurrentFloorText + ld hl, Elevator_MenuDataHeader + call CopyMenuDataHeader call Function352f - call Function1ad2 + call DrawOnMap xor a ld [wd0e4], a call Function350c - call Function1c17 + call WriteBackup ld a, [wcf73] cp $2 jr z, .asm_1350b @@ -15216,14 +15222,14 @@ Function134dd: ; 134dd ret ; 1350d -UnknownText_0x1350d: ; 0x1350d +Elevator_WhichFloorText: ; 0x1350d ; Which floor? text_jump UnknownText_0x1bd2bc db "@" ; 0x13512 -Function13512: ; 13512 +Elevator_GetCurrentFloorText: ; 13512 ld hl, Options ld a, [hl] push af @@ -15233,21 +15239,21 @@ Function13512: ; 13512 ld c, $8 call TextBox hlcoord 1, 2 - ld de, String_13537 + ld de, Elevator_CurrentFloorText call PlaceString hlcoord 4, 4 - call Function1353f + call Elevator_GetCurrentFloorString pop af ld [Options], a ret ; 13537 -String_13537: ; 13537 +Elevator_CurrentFloorText: ; 13537 db "Now on:@" ; 1353f -Function1353f: ; 1353f +Elevator_GetCurrentFloorString: ; 1353f push hl ld a, [wd041] ld e, a @@ -15256,41 +15262,41 @@ Function1353f: ; 1353f add hl, de ld a, [hl] pop de - call Function1356b + call GetFloorString ret ; 13550 -MenuDataHeader_0x13550: ; 0x13550 +Elevator_MenuDataHeader: ; 0x13550 db $40 ; flags db 01, 12 ; start coords db 09, 18 ; end coords - dw MenuData2_0x13558 + dw Elevator_MenuData2 db 1 ; default option ; 0x13558 -MenuData2_0x13558: ; 0x13558 +Elevator_MenuData2: ; 0x13558 db $10 ; flags db 4, 0 ; rows, columns db 1 ; horizontal spacing dbw 0, OBPals + 8 * 6 - dbw BANK(Function13568), Function13568 + dbw BANK(GetElevatorFlorStrings), GetElevatorFlorStrings dbw BANK(NULL), NULL dbw BANK(NULL), NULL ; 13568 -Function13568: ; 13568 +GetElevatorFlorStrings: ; 13568 ld a, [MenuSelection] -Function1356b: ; 1356b +GetFloorString: ; 1356b push de - call Function13575 + call FloorToString ld d, h ld e, l pop hl jp PlaceString ; 13575 -Function13575: ; 13575 +FloorToString: ; 13575 push de ld e, a ld d, 0 @@ -15366,7 +15372,7 @@ Function135db: ; 135db ret ; 135eb -UnknownScript_0x135eb:: ; 0x135eb +BugCatchingContestBattleScript:: ; 0x135eb writecode VAR_BATTLETYPE, BATTLETYPE_CONTEST battlecheck startbattle @@ -15471,7 +15477,7 @@ Function1365b:: ; 1365b ld de, .table2 - .table1 ld hl, .table1 call IsInArray - jr nc, .asm_1367f + jr nc, .notintable ld a, jumpstd_command ld [wd03f], a @@ -15480,13 +15486,13 @@ Function1365b:: ; 1365b ld [wd03f + 1], a ld a, [hli] ld [wd03f + 2], a - ld a, BANK(UnknownScript_0x1369a) - ld hl, UnknownScript_0x1369a + ld a, BANK(Script_JumpStdFromRAM) + ld hl, Script_JumpStdFromRAM call CallScript scf ret -.asm_1367f +.notintable xor a ret ; 13681 @@ -15494,7 +15500,7 @@ Function1365b:: ; 1365b .table1 dbw $91, magazinebookshelf .table2 - dbw $93, $0031 ; pc + dbw $93, pcscript dbw $94, radio1 dbw $95, townmap dbw $96, merchandiseshelf @@ -15504,104 +15510,104 @@ Function1365b:: ; 1365b db $ff ; end ; 1369a -UnknownScript_0x1369a: ; 0x1369a +Script_JumpStdFromRAM: ; 0x1369a jump wd03f ; 0x1369d -Function1369d: ; 1369d +_BugContestJudging: ; 1369d call ContestScore callba Function105f79 call Function13819 ld a, [wd00a] - call Function13730 + call LoadContestantData ld a, [wd00b] ld [wd265], a call GetPokemonName - ld hl, UnknownText_0x13719 + ld hl, BugContest_ThirdPlaceText call PrintText ld a, [EndFlypoint] - call Function13730 + call LoadContestantData ld a, [MovementBuffer] ld [wd265], a call GetPokemonName - ld hl, UnknownText_0x13702 + ld hl, BugContest_SecondPlaceText call PrintText ld a, [DefaultFlypoint] - call Function13730 + call LoadContestantData ld a, [wd003] ld [wd265], a call GetPokemonName - ld hl, UnknownText_0x136eb + ld hl, BugContest_FirstPlaceText call PrintText jp Function13807 ; 136eb -UnknownText_0x136eb: ; 0x136eb - text_jump UnknownText_0x1c10fa +BugContest_FirstPlaceText: ; 0x136eb + text_jump ContestJudging_FirstPlaceText start_asm ; 0x136f0 -Function136f0: ; 136f0 +BugContest_FirstPlace: ; 136f0 ld de, SFX_1ST_PLACE call PlaySFX call WaitSFX - ld hl, UnknownText_0x136fd + ld hl, BugContest_FirstPlaceScoreText ret ; 136fd -UnknownText_0x136fd: ; 0x136fd +BugContest_FirstPlaceScoreText: ; 0x136fd ; The winning score was @ points! - text_jump UnknownText_0x1c113f + text_jump ContestJudging_FirstPlaceScoreText db "@" ; 0x13702 -UnknownText_0x13702: ; 0x13702 +BugContest_SecondPlaceText: ; 0x13702 ; Placing second was @ , who caught a @ !@ @ - text_jump UnknownText_0x1c1166 + text_jump ContestJudging_SecondPlaceText start_asm ; 0x13707 -Function13707: ; 13707 +BugContest_SecondPlace: ; 13707 ld de, SFX_2ND_PLACE call PlaySFX call WaitSFX - ld hl, UnknownText_0x13714 + ld hl, BugContest_SecondPlaceScoreText ret ; 13714 -UnknownText_0x13714: ; 0x13714 +BugContest_SecondPlaceScoreText: ; 0x13714 ; The score was @ points! - text_jump UnknownText_0x1c1196 + text_jump ContestJudging_SecondPlaceScoreText db "@" ; 0x13719 -UnknownText_0x13719: ; 0x13719 +BugContest_ThirdPlaceText: ; 0x13719 ; Placing third was @ , who caught a @ !@ @ - text_jump UnknownText_0x1c11b5 + text_jump ContestJudging_ThirdPlaceText start_asm ; 0x1371e -Function1371e: ; 1371e +BugContest_ThirdPlace: ; 1371e ld de, SFX_3RD_PLACE call PlaySFX call WaitSFX - ld hl, UnknownText_0x1372b + ld hl, BugContest_ThirdPlaceScoreText ret ; 1372b -UnknownText_0x1372b: ; 0x1372b +BugContest_ThirdPlaceScoreText: ; 0x1372b ; The score was @ points! - text_jump UnknownText_0x1c11e4 + text_jump ContestJudging_ThirdPlaceScoreText db "@" ; 0x13730 -Function13730: ; 13730 +LoadContestantData: ; 13730 dec a jr z, .asm_13777 ld c, a ld b, 0 - ld hl, Unknown_13783 + ld hl, BugContestantPointers add hl, bc add hl, bc ld a, [hli] @@ -15631,7 +15637,7 @@ Function13730: ; 13730 push de ld a, [hl] ld b, a - callab Function3994c + callab GetTrainerName ld hl, StringBuffer1 pop de ld bc, $000a @@ -15644,75 +15650,75 @@ Function13730: ; 13730 jp CopyBytes ; 13783 -Unknown_13783: ; 13783 - dw Unknown_13799 - dw Unknown_13799 - dw Unknown_137a4 - dw Unknown_137af - dw Unknown_137ba - dw Unknown_137c5 - dw Unknown_137d0 - dw Unknown_137db - dw Unknown_137e6 - dw Unknown_137f1 - dw Unknown_137fc +BugContestantPointers: ; 13783 + dw BugContestant_BugCatcherDon + dw BugContestant_BugCatcherDon + dw BugContestant_BugCatcherEd + dw BugContestant_CooltrainerMNick + dw BugContestant_PokefanMWilliam + dw BugContestant_BugCatcherBenny + dw BugContestant_CamperBarry + dw BugContestant_PicnickerCindy + dw BugContestant_BugCatcherJosh + dw BugContestant_YoungsterSamuel + dw BugContestant_SchoolboyKipp ; 13799 -Unknown_13799: +BugContestant_BugCatcherDon: db BUG_CATCHER, DON dbw KAKUNA, 300 dbw METAPOD, 285 dbw CATERPIE, 226 -Unknown_137a4: +BugContestant_BugCatcherEd: db BUG_CATCHER, ED dbw BUTTERFREE, 286 dbw BUTTERFREE, 251 dbw CATERPIE, 237 -Unknown_137af: +BugContestant_CooltrainerMNick: db COOLTRAINERM, NICK dbw SCYTHER, 357 dbw BUTTERFREE, 349 dbw PINSIR, 368 -Unknown_137ba: +BugContestant_PokefanMWilliam: db POKEFANM, WILLIAM dbw PINSIR, 332 dbw BUTTERFREE, 324 dbw VENONAT, 321 -Unknown_137c5: +BugContestant_BugCatcherBenny: db BUG_CATCHER, BUG_CATCHER_BENNY dbw BUTTERFREE, 318 dbw WEEDLE, 295 dbw CATERPIE, 285 -Unknown_137d0: +BugContestant_CamperBarry: db CAMPER, BARRY dbw PINSIR, 366 dbw VENONAT, 329 dbw KAKUNA, 314 -Unknown_137db: +BugContestant_PicnickerCindy: db PICNICKER, CINDY dbw BUTTERFREE, 341 dbw METAPOD, 301 dbw CATERPIE, 264 -Unknown_137e6: +BugContestant_BugCatcherJosh: db BUG_CATCHER, JOSH dbw SCYTHER, 326 dbw BUTTERFREE, 292 dbw METAPOD, 282 -Unknown_137f1: +BugContestant_YoungsterSamuel: db YOUNGSTER, SAMUEL dbw WEEDLE, 270 dbw PINSIR, 282 dbw CATERPIE, 251 -Unknown_137fc: +BugContestant_SchoolboyKipp: db SCHOOLBOY, KIPP dbw VENONAT, 267 dbw PARAS, 254 @@ -15838,7 +15844,7 @@ Function138b0: ; 138b0 dec a ld c, a ld b, 0 - ld hl, Unknown_13783 + ld hl, BugContestantPointers add hl, bc add hl, bc ld a, [hli] @@ -16105,7 +16111,7 @@ Function13a12: ; 13a12 ret ; 13a31 -Function13a31: ; 13a31 +ContestReturnMons: ; 13a31 ld hl, PartySpecies + 1 ld a, [wdf9b] ld [hl], a @@ -16808,21 +16814,25 @@ GetSprite: ; 1423c call GetMonSprite ret c - ld hl, SpriteHeaders + ld hl, SpriteHeaders ; address dec a ld c, a ld b, 0 ld a, 6 call AddNTimes + ; load the address into de ld a, [hli] ld e, a ld a, [hli] ld d, a + ; load the length into c ld a, [hli] swap a ld c, a + ; load the sprite bank into both b and h ld b, [hl] ld a, [hli] + ; load the sprite type into l ld l, [hl] ld h, a ret @@ -16865,7 +16875,7 @@ GetMonSprite: ; 14259 .Mon ld e, a and a - jr z, .asm_1429f + jr z, .NoBreedmon callba Function8e82b @@ -16884,7 +16894,7 @@ GetMonSprite: ; 14259 and a jp nz, GetMonSprite -.asm_1429f +.NoBreedmon ld a, 1 ld l, 1 ld h, 0 @@ -16895,11 +16905,11 @@ GetMonSprite: ; 14259 Function142a7:: ; 142a7 cp SPRITE_POKEMON - jr nc, .asm_142c2 + jr nc, .is_pokemon push hl push bc - ld hl, SpriteHeaders + 4 + ld hl, SpriteHeaders + 4 ; type dec a ld c, a ld b, 0 @@ -16909,11 +16919,11 @@ Function142a7:: ; 142a7 pop bc pop hl cp 3 - jr nz, .asm_142c2 + jr nz, .is_pokemon scf ret -.asm_142c2 +.is_pokemon and a ret ; 142c4 @@ -16922,7 +16932,7 @@ Function142a7:: ; 142a7 _GetSpritePalette:: ; 142c4 ld a, c call GetMonSprite - jr c, .asm_142d8 + jr c, .is_pokemon ld hl, SpriteHeaders + 5 ; palette dec a @@ -16933,7 +16943,7 @@ _GetSpritePalette:: ; 142c4 ld c, [hl] ret -.asm_142d8 +.is_pokemon xor a ld c, a ret @@ -16956,7 +16966,7 @@ AddSpriteGFX: ; 142e5 push bc ld b, a ld hl, UsedSprites + 2 - ld c, $1f + ld c, SPRITE_GFX_LIST_CAPACITY - 1 .loop ld a, [hl] cp b @@ -16993,7 +17003,7 @@ LoadSpriteGFX: ; 14306 ; it's useless as a loop count. ld hl, UsedSprites - ld b, $20 + ld b, SPRITE_GFX_LIST_CAPACITY .loop ld a, [hli] and a @@ -17020,8 +17030,8 @@ SortUsedSprites: ; 1431e ; Run backwards through UsedSprites to find the last one. - ld c, $20 - ld de, UsedSprites + ($20 - 1) * 2 + ld c, SPRITE_GFX_LIST_CAPACITY + ld de, UsedSprites + (SPRITE_GFX_LIST_CAPACITY - 1) * 2 .FindLastSprite ld a, [de] and a @@ -17092,7 +17102,7 @@ ArrangeUsedSprites: ; 14355 ; Crystal introduces a second table in VRAM bank 0. ld hl, UsedSprites - ld c, $20 + ld c, SPRITE_GFX_LIST_CAPACITY ld b, 0 .FirstTableLength ; Keep going until the end of the list. @@ -17172,7 +17182,7 @@ GetSpriteLength: ; 14386 Function1439b: ; 1439b ld hl, UsedSprites - ld c, $20 + ld c, SPRITE_GFX_LIST_CAPACITY .asm_143a0 ld a, [wd13e] res 5, a @@ -18212,7 +18222,7 @@ Function14a1a: ; 14a1a call Function1d6e callba Function5e9a call SpeechTextBox - call Function1ad2 + call DrawOnMap callba Function4cf45 ld hl, UnknownText_0x15283 call Function14baf @@ -18418,13 +18428,13 @@ Function14b89: ; 14b89 Function14baf: ; 14baf ld b, BANK(UnknownText_0x15283) - call Function269a + call MapTextbox call Function1d58 lb bc, 0, 7 call PlaceYesNoBox ld a, [wcfa9] dec a - call Function1c17 + call WriteBackup push af call Functiond90 pop af @@ -19401,7 +19411,7 @@ Function1559a: ; 1559a .asm_155cc call Function156b8 call Function1c07 - call Function1c17 + call WriteBackup ret ; 155d6 @@ -19559,7 +19569,7 @@ Function156d9: ; 156d9 jr nz, .asm_156f9 call Function2173 call Function321c - call Function1ad2 + call DrawOnMap call Function156b8 ld c, $0 ret @@ -19951,7 +19961,7 @@ Function15985: ; 0x15985 ld a, $0 ld [wc2ce], a ld hl, MenuData15a08 - call Function1d3c + call CopyMenuDataHeader hlcoord 0, 0 ld b, $a ld c, $12 @@ -20239,8 +20249,8 @@ Function15b62: ; 15b62 Function15b6e: ; 15b6e ld hl, MenuDataHeader_0x15f88 - call Function1d3c - call Function1d81 + call CopyMenuDataHeader + call InterpretMenu2 jr c, .asm_15b84 ld a, [wcfa9] cp $1 @@ -20508,9 +20518,9 @@ Unknown_15ce3: ; 15ce3 Function15cef: ; 15cef callba Function24ae8 - call Function1ad2 + call DrawOnMap ld hl, MenuDataHeader_0x15e18 - call Function1d3c + call CopyMenuDataHeader ld a, [WalkingX] ld [wcf88], a ld a, [WalkingY] @@ -20535,7 +20545,7 @@ Function15cef: ; 15cef ld de, Money ld bc, $ffc3 ld a, $3 - call Function1600b + call CheckMoney jr c, .asm_15d79 ld hl, NumItems call ReceiveItem @@ -20549,7 +20559,7 @@ Function15cef: ; 15cef call Function15fc3 ld de, Money ld bc, $ffc3 - call Function15ffa + call TakeMoney ld a, $4 call Function15c7d call Functiona36 @@ -20925,7 +20935,7 @@ Function15efd: ; 15efd jr c, .asm_15f6e ld de, Money ld bc, $ffc3 - call Function15fd7 + call GiveMoney ld a, [wd107] ld hl, NumItems call TossItem @@ -21036,15 +21046,15 @@ Function15fcd: ; 15fcd ret ; 15fd7 -Function15fd7:: ; 15fd7 +GiveMoney:: ; 15fd7 ld a, $3 call Function16053 - ld bc, Unknown_15ff7 + ld bc, MaxMoney ld a, $3 - call Function1600b + call CheckMoney jr z, .asm_15ff5 jr c, .asm_15ff5 - ld hl, Unknown_15ff7 + ld hl, MaxMoney ld a, [hli] ld [de], a inc de @@ -21061,12 +21071,12 @@ Function15fd7:: ; 15fd7 ret ; 15ff7 -Unknown_15ff7: ; 15ff7 +MaxMoney: ; 15ff7 dt 999999 ; 15ffa -Function15ffa:: ; 15ffa +TakeMoney:: ; 15ffa ld a, $3 call Function16035 jr nc, .asm_16009 @@ -21084,9 +21094,9 @@ Function15ffa:: ; 15ffa ret ; 1600b -Function1600b:: ; 1600b +CheckMoney:: ; 1600b ld a, $3 -Function1600d: ; 1600d +CheckFunds: ; 1600d push hl push de push bc @@ -21196,13 +21206,13 @@ Function16055: ; 16055 ret ; 1606f -Function1606f:: ; 1606f +GiveCoins:: ; 1606f ld a, $2 ld de, Coins call Function16055 ld a, $2 ld bc, Unknown_1608d - call Function1600d + call CheckFunds jr c, .asm_1608b ld hl, Unknown_1608d ld a, [hli] @@ -21223,7 +21233,7 @@ Unknown_1608d: ; 1608d ; 1608f -Function1608f:: ; 1608f +TakeCoins:: ; 1608f ld a, $2 ld de, Coins call Function16037 @@ -21240,10 +21250,10 @@ Function1608f:: ; 1608f ret ; 160a1 -Function160a1:: ; 160a1 +CheckCoins:: ; 160a1 ld a, $2 ld de, Coins - jp Function1600d + jp CheckFunds ; 160a9 @@ -21356,9 +21366,9 @@ Function162a8: ; 162a8 call PrintText call Function1d6e ld hl, MenuDataHeader_0x166b5 - call Function1d3c - call Function1d81 - call Function1c17 + call CopyMenuDataHeader + call InterpretMenu2 + call WriteBackup jr c, .asm_162ce ld a, [wcfa9] cp $1 @@ -21402,7 +21412,7 @@ Function162e0: ; 162e0 call Function16517 call Function1656b call Function16571 - call Function1c17 + call WriteBackup jr c, .asm_1636d ld hl, StringBuffer2 ld a, [hli] @@ -21412,7 +21422,7 @@ Function162e0: ; 162e0 jr z, .asm_1636d ld de, Money ld bc, StringBuffer2 - callba Function1600b + callba CheckMoney jr c, .asm_1635f ld hl, StringBuffer2 ld de, StringBuffer2 + 3 @@ -21420,11 +21430,11 @@ Function162e0: ; 162e0 call CopyBytes ld bc, wd851 ld de, StringBuffer2 - callba Function15fd7 + callba GiveMoney jr c, .asm_16366 ld bc, StringBuffer2 + 3 ld de, Money - callba Function15ffa + callba TakeMoney ld hl, StringBuffer2 ld de, wd851 ld bc, $0003 @@ -21469,7 +21479,7 @@ Function16373: ; 16373 call Function16512 call Function1656b call Function16571 - call Function1c17 + call WriteBackup jr c, .asm_16400 ld hl, StringBuffer2 ld a, [hli] @@ -21483,15 +21493,15 @@ Function16373: ; 16373 call CopyBytes ld de, wd851 ld bc, StringBuffer2 - callba Function1600b + callba CheckMoney jr c, .asm_163f2 ld bc, Money ld de, StringBuffer2 - callba Function15fd7 + callba GiveMoney jr c, .asm_163f9 ld bc, StringBuffer2 + 3 ld de, wd851 - callba Function15ffa + callba TakeMoney ld hl, StringBuffer2 ld de, Money ld bc, $0003 @@ -21727,7 +21737,7 @@ Function1651a: ; 1651a ld de, StringBuffer2 ld bc, $a306 call PrintNum - call Function1ad2 + call DrawOnMap call Function3238 ret ; 1656b @@ -21821,7 +21831,7 @@ Function165b9: ; 165b9 ld c, l ld b, h ld de, StringBuffer2 - callba Function15fd7 + callba GiveMoney ret .asm_165f5 @@ -21830,7 +21840,7 @@ Function165b9: ; 165b9 ld c, l ld b, h ld de, StringBuffer2 - callba Function15ffa + callba TakeMoney ret ; 16607 @@ -22188,7 +22198,7 @@ Function16807: ; 16807 .asm_1682d ld de, Money ld bc, StringBuffer2 + 2 - callba Function1600b + callba CheckMoney jr c, .asm_16848 ld a, [PartyCount] cp $6 @@ -22215,7 +22225,7 @@ Function16807: ; 16807 Function16850: ; 16850 ld bc, StringBuffer2 + 2 ld de, Money - callba Function15ffa + callba TakeMoney ld a, $d call Function1689b ld a, [CurPartySpecies] @@ -23234,7 +23244,7 @@ Function16f3e:: ; 16f3e .loop ld a, [de] inc de - cp $ff + cp -1 ret z cp EGG jr nz, .next @@ -23252,7 +23262,7 @@ Function16f3e:: ; 16f3e jr .loop ; 16f5e -Function16f5e:: ; 16f5e +OverworldHatchEgg:: ; 16f5e call ResetWindow call Function1d6e call Function16f70 @@ -23270,7 +23280,7 @@ Function16f70: ; 16f70 (5:6f70) Function16f7a: ; 16f7a (5:6f7a) ld a, [de] inc de - cp $ff + cp -1 jp z, Function1708a push de push hl @@ -23296,11 +23306,12 @@ Function16f7a: ; 16f7a (5:6f7a) ld a, [CurPartySpecies] cp TOGEPI - jr nz, .asm_16fbf - ld de, $54 + jr nz, .nottogepi + ; set the event flag for hatching togepi + ld de, EVENT_TOGEPI_HATCHED ld b, $1 call EventFlagAction -.asm_16fbf +.nottogepi pop de @@ -23361,7 +23372,7 @@ Function16f7a: ; 16f7a (5:6f7a) ld [hl], a ld a, [CurPartyMon] ld hl, PartyMonOT ; wddff (aliases: PartyMonOT) - ld bc, $b + ld bc, NAME_LENGTH call AddNTimes ld d, h ld e, l @@ -23380,7 +23391,7 @@ Function16f7a: ; 16f7a (5:6f7a) call PrintText call YesNoBox pop de - jr c, .asm_17074 + jr c, .nonickname ld a, $1 ld [wd26b], a xor a @@ -23392,9 +23403,9 @@ Function16f7a: ; 16f7a (5:6f7a) ld de, StringBuffer1 call InitName jr Function1707d -.asm_17074 +.nonickname ld hl, StringBuffer1 - ld bc, $b + ld bc, PKMN_NAME_LENGTH call CopyBytes Function1707d: ; 1707d (5:707d) @@ -23459,29 +23470,29 @@ Function170bf: ; 170bf ld d, h ld e, l ld b, NUM_MOVES -.asm_170c6 +.loop ld a, [de] and a - jr z, .asm_170e3 + jr z, .done ld hl, wEggMonMoves ld c, NUM_MOVES -.asm_170cf +.next ld a, [de] cp [hl] - jr z, .asm_170df + jr z, .skip inc hl dec c - jr nz, .asm_170cf + jr nz, .next call Function170e4 - jr nc, .asm_170df + jr nc, .skip call Function17169 -.asm_170df +.skip inc de dec b - jr nz, .asm_170c6 + jr nz, .loop -.asm_170e3 +.done ret ; 170e4 @@ -23498,31 +23509,31 @@ GLOBAL EggMoves add hl, bc ld a, BANK(EggMovePointers) call GetFarHalfword -.asm_170f6 +.loop ld a, BANK(EggMoves) call GetFarByte - cp $ff - jr z, .asm_17107 + cp -1 + jr z, .found_mon ld b, a ld a, [de] cp b - jr z, .asm_17163 + jr z, .done_carry inc hl - jr .asm_170f6 + jr .loop -.asm_17107 +.found_mon call Function1720b ld b, NUM_MOVES -.asm_1710c +.loop2 ld a, [de] cp [hl] - jr z, .asm_17116 + jr z, .found_eggmove inc hl dec b - jr z, .asm_17146 - jr .asm_1710c + jr z, .inherit_tmhm + jr .loop2 -.asm_17116 +.found_eggmove ld a, [wEggMonSpecies] dec a ld c, a @@ -23532,51 +23543,51 @@ GLOBAL EggMoves add hl, bc ld a, BANK(EvosAttacksPointers) call GetFarHalfword -.asm_17127 +.loop3 ld a, BANK(EvosAttacks) call GetFarByte inc hl and a - jr nz, .asm_17127 -.asm_17130 + jr nz, .loop3 +.loop4 ld a, BANK(EvosAttacks) call GetFarByte and a - jr z, .asm_17146 + jr z, .inherit_tmhm inc hl ld a, BANK(EvosAttacks) call GetFarByte ld b, a ld a, [de] cp b - jr z, .asm_17163 + jr z, .done_carry inc hl - jr .asm_17130 + jr .loop4 -.asm_17146 +.inherit_tmhm ld hl, TMHMMoves -.asm_17149 +.loop5 ld a, BANK(TMHMMoves) call GetFarByte inc hl and a - jr z, .asm_17166 + jr z, .done ld b, a ld a, [de] cp b - jr nz, .asm_17149 + jr nz, .loop5 ld [wd262], a predef CanLearnTMHMMove ld a, c and a - jr z, .asm_17166 + jr z, .done -.asm_17163 +.done_carry pop bc scf ret -.asm_17166 +.done pop bc and a ret @@ -23589,12 +23600,12 @@ Function17169: ; 17169 ld b, a ld hl, wEggMonMoves ld c, NUM_MOVES -.asm_17172 +.loop ld a, [hli] and a - jr z, .asm_17187 + jr z, .done dec c - jr nz, .asm_17172 + jr nz, .loop ld de, wEggMonMoves ld hl, wEggMonMoves + 1 ld a, [hli] @@ -23606,7 +23617,7 @@ Function17169: ; 17169 ld a, [hli] ld [de], a -.asm_17187 +.done dec hl ld [hl], b ld hl, wEggMonMoves @@ -23621,17 +23632,17 @@ Function17197: ; 17197 ld hl, wBreedMon2Moves ld a, [wBreedMon1Species] cp DITTO - jr z, .asm_171b1 + jr z, .ditto1 ld a, [wBreedMon2Species] cp DITTO - jr z, .asm_171d7 + jr z, .ditto2 ld a, [wDittoInDaycare] and a ret z ld hl, wBreedMon1Moves ret -.asm_171b1 +.ditto1 ld a, [CurPartySpecies] push af ld a, [wBreedMon2Species] @@ -23643,11 +23654,11 @@ Function17197: ; 17197 ld a, $3 ld [MonType], a predef GetGender - jr c, .asm_171fb - jr nz, .asm_171fb - jr .asm_17203 + jr c, .inherit_mon2_moves + jr nz, .inherit_mon2_moves + jr .inherit_mon1_moves -.asm_171d7 +.ditto2 ld a, [CurPartySpecies] push af ld a, [wBreedMon1Species] @@ -23659,16 +23670,16 @@ Function17197: ; 17197 ld a, $3 ld [MonType], a predef GetGender - jr c, .asm_17203 - jr nz, .asm_17203 + jr c, .inherit_mon1_moves + jr nz, .inherit_mon1_moves -.asm_171fb +.inherit_mon2_moves ld hl, wBreedMon2Moves pop af ld [CurPartySpecies], a ret -.asm_17203 +.inherit_mon1_moves ld hl, wBreedMon1Moves pop af ld [CurPartySpecies], a @@ -23682,12 +23693,12 @@ Function1720b: ; 1720b ret z ld a, [wBreedMon2Species] cp DITTO - jr z, .asm_17220 + jr z, .ditto ld a, [wDittoInDaycare] and a ret z -.asm_17220 +.ditto ld hl, wBreedMon2Moves ret ; 17224 @@ -23936,7 +23947,7 @@ Function17421: ; 17421 ld a, [wDaycareLady] bit 0, a jr z, Function1745f - call Functionaaf + call KeepTextOpen ld hl, wBreedMon2Nick call Function1746c jp PrintText @@ -23949,7 +23960,7 @@ Function17440: ; 17440 ld a, [wDaycareMan] bit 0, a jr z, Function1745f - call Functionaaf + call KeepTextOpen ld hl, wBreedMon1Nick call Function1746c jp PrintText @@ -24320,7 +24331,7 @@ Function2400e:: ; 2400e ld a, [wcf94] rst FarCall call Function24085 - call Function1ad2 + call DrawOnMap call Function321c call Function2408f ret @@ -24332,7 +24343,7 @@ Function24022:: ; 24022 rst FarCall call Function24085 callba MobileTextBorder - call Function1ad2 + call DrawOnMap call Function321c call Function2408f ret @@ -24344,7 +24355,7 @@ Function2403c:: ; 2403c rst FarCall call Function24085 callba MobileTextBorder - call Function1ad2 + call DrawOnMap call Function321c call Function2411a ld hl, wcfa5 @@ -25160,11 +25171,11 @@ Function244c3: ; 0x244c3 ret ; 0x244e3 -Function244e3:: ; 244e3 +Pokepic:: ; 244e3 ld hl, MenuDataHeader_0x24547 - call Function1d3c + call CopyMenuDataHeader call Function1cbb - call Function1ad2 + call DrawOnMap call Function321c ld b, $12 call GetSGBLayout @@ -25190,9 +25201,9 @@ Function244e3:: ; 244e3 ret ; 24528 -Function24528:: ; 24528 +PokepicYesOrNo:: ; 24528 ld hl, MenuDataHeader_0x24547 - call Function1d3c + call CopyMenuDataHeader call Function1ce1 call WaitBGMap call ClearSGB @@ -25200,7 +25211,7 @@ Function24528:: ; 24528 ld [hBGMapMode], a call Function2173 call Function321c - call Function1ad2 + call DrawOnMap call Functione51 ret ; 24547 @@ -26130,12 +26141,12 @@ Function24ac3: ; 0x24ac3 Function24ae8: ; 24ae8 ld hl, MenuDataHeader_0x24b15 - call Function1d3c + call CopyMenuDataHeader jr Function24b01 Function24af0: ; 24af0 ld hl, MenuDataHeader_0x24b1d - call Function1d3c + call CopyMenuDataHeader jr Function24b01 Function24af8: ; 24af8 @@ -26674,11 +26685,11 @@ Function24e83: ; 24e83 Function24e99: ; 24e99 ; BattleMonMenu ld hl, MenuDataHeader_0x24ed4 - call Function1d3c + call CopyMenuDataHeader xor a ld [hBGMapMode], a call Function1cbb - call Function1ad2 + call DrawOnMap call Function1c89 call WaitBGMap call Function1c66 @@ -26750,7 +26761,7 @@ ContestBattleMenu: ; 24f13 Function24f19: ; 24f19 ld a, [wd0d2] ld [wcf88], a - call Function202a + call InterpretMenu ld a, [wcf88] ld [wd0d2], a call Function1c07 @@ -28326,7 +28337,7 @@ Function2695b: ; 2695b ld [hl], $ff call Function1d6e ld hl, MenuDataHeader_0x269c5 - call Function1d3c + call CopyMenuDataHeader xor a ld [hBGMapMode], a call Function352f @@ -29079,33 +29090,33 @@ Unknown_26f2b: ; 26f2b db $ff ; 26f59 -Function26f59:: ; 26f59 +DescribeDecoration:: ; 26f59 ld a, b - ld hl, Table26f5f + ld hl, JumpTable_DecorationDesc rst JumpTable ret ; 26f5f -Table26f5f: ; 26f5f - dw Function26f69 - dw Function26fb9 - dw Function26fbe - dw Function26fdd - dw Function26fc3 +JumpTable_DecorationDesc: ; 26f5f + dw DecorationDesc_Poster + dw DecorationDesc_LeftOrnament + dw DecorationDesc_RightOrnament + dw DecorationDesc_GiantDoll + dw DecorationDesc_Console ; 26f69 -Function26f69: ; 26f69 +DecorationDesc_Poster: ; 26f69 ld a, [Poster] - ld hl, Unknown_26f84 + ld hl, DecorationDesc_PosterPointers ld de, 3 call IsInArray jr c, .asm_26f7d - ld de, UnknownScript_0x26fb8 - ld b, BANK(UnknownScript_0x26fb8) + ld de, DecorationDesc_NullPoster + ld b, BANK(DecorationDesc_NullPoster) ret .asm_26f7d - ld b, BANK(UnknownScript_0x26f91) + ld b, BANK(DecorationDesc_TownMapPoster) inc hl ld a, [hli] ld d, [hl] @@ -29113,15 +29124,15 @@ Function26f69: ; 26f69 ret ; 26f84 -Unknown_26f84: ; 26f84 - dbw $10, UnknownScript_0x26f91 - dbw $11, UnknownScript_0x26fa0 - dbw $12, UnknownScript_0x26fa8 - dbw $13, UnknownScript_0x26fb0 +DecorationDesc_PosterPointers: ; 26f84 + dbw $10, DecorationDesc_TownMapPoster + dbw $11, DecorationDesc_PikachuPoster + dbw $12, DecorationDesc_ClefairyPoster + dbw $13, DecorationDesc_JigglypuffPoster db $ff ; 26f91 -UnknownScript_0x26f91: ; 0x26f91 +DecorationDesc_TownMapPoster: ; 0x26f91 loadfont writetext UnknownText_0x26f9b closetext @@ -29136,7 +29147,7 @@ UnknownText_0x26f9b: ; 0x26f9b db "@" ; 0x26fa0 -UnknownScript_0x26fa0: ; 0x26fa0 +DecorationDesc_PikachuPoster: ; 0x26fa0 jumptext UnknownText_0x26fa3 ; 0x26fa3 @@ -29146,7 +29157,7 @@ UnknownText_0x26fa3: ; 0x26fa3 db "@" ; 0x26fa8 -UnknownScript_0x26fa8: ; 0x26fa8 +DecorationDesc_ClefairyPoster: ; 0x26fa8 jumptext UnknownText_0x26fab ; 0x26fab @@ -29156,7 +29167,7 @@ UnknownText_0x26fab: ; 0x26fab db "@" ; 0x26fb0 -UnknownScript_0x26fb0: ; 0x26fb0 +DecorationDesc_JigglypuffPoster: ; 0x26fb0 jumptext UnknownText_0x26fb3 ; 0x26fb3 @@ -29166,23 +29177,23 @@ UnknownText_0x26fb3: ; 0x26fb3 db "@" ; 0x26fb8 -UnknownScript_0x26fb8: ; 26fb8 +DecorationDesc_NullPoster: ; 26fb8 end ; 26fb9 -Function26fb9: ; 26fb9 +DecorationDesc_LeftOrnament: ; 26fb9 ld a, [LeftOrnament] - jr Function26fc8 + jr DecorationDesc_OrnamentOrConsole -Function26fbe: ; 26fbe +DecorationDesc_RightOrnament: ; 26fbe ld a, [RightOrnament] - jr Function26fc8 + jr DecorationDesc_OrnamentOrConsole -Function26fc3: ; 26fc3 +DecorationDesc_Console: ; 26fc3 ld a, [Console] - jr Function26fc8 + jr DecorationDesc_OrnamentOrConsole -Function26fc8: ; 26fc8 +DecorationDesc_OrnamentOrConsole: ; 26fc8 ld c, a ld de, StringBuffer3 call Function26eea @@ -29201,7 +29212,7 @@ UnknownText_0x26fd8: ; 0x26fd8 db "@" ; 0x26fdd -Function26fdd: ; 26fdd +DecorationDesc_GiantDoll: ; 26fdd ld b, BANK(Unknown_26fe3) ld de, Unknown_26fe3 ret @@ -29322,7 +29333,7 @@ Function27092: ; 27092 ld a, e add $4 ld e, a - call Function2a66 + call GetBlockLocation ret ; 2709e @@ -29367,7 +29378,7 @@ Function2715c: ; 2715c callba Function3f47c callba Function3ed9f call ClearSGB - call Function1c17 + call WriteBackup call Function1d6e call WaitBGMap jp Function32f9 @@ -29477,14 +29488,14 @@ Function28000: ; 28000 call DelayFrames call ClearScreen call ClearSprites - call Function1ad2 + call DrawOnMap xor a ld [hSCX], a ld [hSCY], a ld c, $50 call DelayFrames call ClearScreen - call Function1ad2 + call DrawOnMap call Functione51 call Functione58 callba Function16d69a @@ -36947,36 +36958,36 @@ Function3991b: ; 3991b (e:591b) ret -Function39939:: ; 39939 +Battle_GetTrainerName:: ; 39939 ld a, [wcfc0] bit 0, a ld hl, wd26b - jp nz, Function39984 + jp nz, CopyTrainerName ld a, [OtherTrainerID] ld b, a ld a, [OtherTrainerClass] ld c, a -Function3994c:: ; 3994c +GetTrainerName:: ; 3994c ld a, c cp CAL - jr nz, .asm_3996d + jr nz, .not_cal2 ld a, $0 call GetSRAMBank ld a, [$abfd] and a call CloseSRAM - jr z, .asm_3996d + jr z, .not_cal2 ld a, $0 call GetSRAMBank ld hl, $abfe - call Function39984 + call CopyTrainerName jp CloseSRAM -.asm_3996d +.not_cal2 dec c push bc ld b, 0 @@ -36988,29 +36999,30 @@ Function3994c:: ; 3994c ld l, a pop bc -.asm_3997a +.loop dec b - jr z, Function39984 + jr z, CopyTrainerName -.asm_3997d +.skip ld a, [hli] cp $ff - jr nz, .asm_3997d - jr .asm_3997a + jr nz, .skip + jr .loop -Function39984: ; 39984 +CopyTrainerName: ; 39984 ld de, StringBuffer1 push de - ld bc, $000b + ld bc, NAME_LENGTH call CopyBytes pop de ret ; 39990 Function39990: ; 39990 +; This function is useless. ld de, StringBuffer1 push de - ld bc, $000b + ld bc, NAME_LENGTH pop de ret ; 39999 @@ -38488,7 +38500,7 @@ Function44654:: ; 44654 ret ; 446cc -Function446cc:: ; 446cc +GivePokeItem:: ; 446cc ld a, [PartyCount] dec a push af @@ -38608,7 +38620,7 @@ _KrisMailBoxMenu: ; 0x447a0 jr z, .nomail call Function1d6e call Function44806 - jp Function1c17 + jp WriteBackup .nomail ld hl, .EmptyMailboxText @@ -38682,11 +38694,11 @@ Function44806: ; 0x44806 .asm_4480f call InitMail ld hl, MenuData4494c - call Function1d3c + call CopyMenuDataHeader xor a ld [hBGMapMode], a call Function352f - call Function1ad2 + call DrawOnMap ld a, [wd0f1] ld [wcf88], a ld a, [OBPals + 8 * 6] @@ -38710,7 +38722,7 @@ Function44806: ; 0x44806 Function4484a: ; 0x4484a ld hl, MenuData44964 call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 call Function1c07 jr c, .asm_44860 ld a, [wcfa9] @@ -40742,8 +40754,8 @@ Function48dcb: ; 48dcb (12:4dcb) ld hl, MenuDataHeader_0x48dfc call LoadMenuDataHeader call Function3200 - call Function1d81 - call Function1c17 + call InterpretMenu2 + call WriteBackup ld a, [wcfa9] dec a ld [PlayerGender], a @@ -41957,7 +41969,7 @@ MainMenu: ; 49cdc ld hl, MenuDataHeader_0x49d14 call LoadMenuDataHeader call Function49de4 - call Function1c17 + call WriteBackup jr c, .quit call ClearTileMap ld a, [MenuSelection] @@ -42736,7 +42748,7 @@ Function4a28a: ; 4a28a (12:628a) callba Function104148 ld hl, MenuDataHeader_0x4a362 call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 bit 1, a jr nz, .asm_4a338 ld a, [wcfa9] @@ -43297,7 +43309,7 @@ CheckOwnMonAnywhere: ; 0x4a721 jr z, .nextbox ; Load the box. - ld hl, Unknown_4a810 + ld hl, BoxAddressTable1 ld b, 0 add hl, bc add hl, bc @@ -43430,7 +43442,7 @@ CheckOwnMon: ; 0x4a7ba ret ; 0x4a810 -Unknown_4a810: ; 4a810 +BoxAddressTable1: ; 4a810 ; bank, address dbw $02, $a000 dbw $02, $a450 @@ -43459,7 +43471,7 @@ UpdateOTPointer: ; 0x4a83a ; 0x4a843 -Function4a843: ; 4a843 +MobileCheckOwnMonAnywhere: ; 4a843 ; Like CheckOwnMonAnywhere, but only check for species. ; OT/ID don't matter. @@ -43512,7 +43524,7 @@ Function4a843: ; 4a843 and $f cp c jr z, .asm_4a8d1 - ld hl, Unknown_4a8f4 + ld hl, BoxAddressTable2 ld b, 0 add hl, bc add hl, bc @@ -43593,7 +43605,7 @@ Function4a8dc: ; 4a8dc ret ; 4a8f4 -Unknown_4a8f4: ; 4a8f4 +BoxAddressTable2: ; 4a8f4 ; bank, address dbw $02, $a000 dbw $02, $a450 @@ -44413,7 +44425,7 @@ Function4ae1f: ; 4ae1f ld bc, $0e07 push bc ld hl, YesNoMenuDataHeader - call Function1d3c + call CopyMenuDataHeader pop bc ld a, b ld [wcf83], a @@ -44424,7 +44436,7 @@ Function4ae1f: ; 4ae1f add $4 ld [wcf84], a call Function1c00 - call Function1d81 + call InterpretMenu2 push af ld c, $f call DelayFrames @@ -44448,7 +44460,7 @@ Function4ae5e: ; 4ae5e ld a, [hOAMUpdate] push af call Function1c07 - call Function1ad2 + call DrawOnMap xor a ld [hOAMUpdate], a call DelayFrame @@ -45107,8 +45119,8 @@ Function4d3b1: ; 4d3b1 ld hl, UnknownText_0x4d408 call PrintText ld hl, MenuDataHeader_0x4d40d - call Function1d3c - call Function1d81 + call CopyMenuDataHeader + call InterpretMenu2 ret c ld a, [wcfa9] cp $1 @@ -45385,8 +45397,8 @@ Function4d54c: ; 4d54c ld hl, UnknownText_0x4d580 call PrintText ld hl, MenuDataHeader_0x4d585 - call Function1d3c - call Function1d81 + call CopyMenuDataHeader + call InterpretMenu2 ret c ld a, [wcfa9] cp $1 @@ -45794,7 +45806,7 @@ Function4d9d3: ; 4d9d3 ret ; 4d9e5 -Function4d9e5: ; 4d9e5 +CheckPartyFullAfterContest: ; 4d9e5 ld a, [wdf9c] and a jp z, Function4db35 @@ -46226,7 +46238,7 @@ StatsScreenInit_gotaddress: ; 4dc94 push hl call WhiteBGMap call ClearTileMap - call Function1ad2 + call DrawOnMap callba Functionfb53e pop hl call _hl_ @@ -49276,7 +49288,7 @@ UnknownScript_0x506c8: ; 0x506c8 ; 0x506e5 UnknownScript_0x506e5: ; 0x506e5 - farjump UnknownScript_0x135eb + farjump BugCatchingContestBattleScript ; 0x506e9 UnknownScript_0x506e9: ; 0x506e9 @@ -52277,7 +52289,7 @@ INCLUDE "engine/engine_flags.asm" -Function80648:: ; 80648 (20:4648) +_GetVarAction:: ; 80648 (20:4648) ld a, c cp NUM_VARS jr c, .asm_8064e @@ -52285,7 +52297,7 @@ Function80648:: ; 80648 (20:4648) .asm_8064e ld c, a ld b, 0 - ld hl, Unknown_80671 + ld hl, VarActionTable add hl, bc add hl, bc add hl, bc @@ -52312,7 +52324,7 @@ Function8066c: ; 8066c (20:466c) ret ; 80671 (20:4671) -Unknown_80671: ; 80671 +VarActionTable: ; 80671 ; $00: return address ; $40: return at StringBuffer2 ; $80: return function result at StringBuffer2 @@ -53689,14 +53701,14 @@ Function82236: ; 82236 ld hl, $ffa9 ld a, [hl] and $4 - jr nz, .asm_82247 + jr nz, .next7 ld a, [hl] and $2 jr nz, .asm_82299 call Function822f0 ret -.asm_82247 +.next7 ld hl, wcf64 ld a, [hl] inc a @@ -56118,13 +56130,13 @@ Function88055: ; 88055 callba Function24c64 jr c, .asm_88083 ld hl, MenuDataHeader_0x88086 - call Function1d3c + call CopyMenuDataHeader ld a, [MenuSelection] ld [wcf88], a xor a ld [hBGMapMode], a call Function352f - call Function1ad2 + call DrawOnMap call Function350c ld a, [wcf73] cp $2 @@ -56194,7 +56206,7 @@ Function880c2: ; 880c2 xor a ld [hBGMapMode], a call Function1cbb - call Function1ad2 + call DrawOnMap call Function88116 call Function88126 call Function321c @@ -56211,7 +56223,7 @@ Function880c2: ; 880c2 scf .asm_88109 - call Function1c17 + call WriteBackup ret ; 8810d @@ -56524,11 +56536,11 @@ ShowPlayerNamingChoices: ; 88297 ld hl, KrisNameMenuHeader .GotGender call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 ld a, [wcfa9] dec a call Function1db8 - call Function1c17 + call WriteBackup ret ; 882b5 @@ -56981,7 +56993,7 @@ Function89261: ; 89261 push af push bc ld hl, MenuDataHeader_0x892a3 - call Function1d3c + call CopyMenuDataHeader pop bc ld hl, wcf82 ld a, c @@ -56999,11 +57011,11 @@ Function89261: ; 89261 call Function1c00 call Function8923c call Function89209 - call Function1d81 + call InterpretMenu2 push af ld c, $a call DelayFrames - call Function1c17 + call WriteBackup call Function8920f pop af jr c, .asm_892a1 @@ -58929,7 +58941,7 @@ Palette_89d56: ; 89d56 Function89d5e: ; 89d5e (22:5d5e) push af - call Function1d3c + call CopyMenuDataHeader pop af ld [wcf88], a call Function8923c @@ -59551,7 +59563,7 @@ Function8a116: ; 8a116 (22:6116) ret .asm_8a16b call Function89209 - call Function1c17 + call WriteBackup call Function8920f scf ret @@ -59734,7 +59746,7 @@ Function8a2aa: ; 8a2aa (22:62aa) and a ret .asm_8a2ea - call Function1c17 + call WriteBackup .asm_8a2ed scf ret @@ -59870,7 +59882,7 @@ Function8a3b2: ; 8a3b2 (22:63b2) call Function89b3b ld hl, MenuDataHeader_0x8a40f .asm_8a3db - call Function1d3c + call CopyMenuDataHeader ret Function8a3df: ; 8a3df (22:63df) @@ -60634,7 +60646,7 @@ Function8a999: ; 8a999 (22:6999) jr .asm_8a9a1 .asm_8a9bb call Function89209 - call Function1c17 + call WriteBackup call Function8920f ret @@ -61295,7 +61307,7 @@ Function8ae68: ; 8ae68 xor a ld [hBGMapMode], a call Function1cbb - call Function1ad2 + call DrawOnMap call Function321c call Function1cfd inc hl @@ -61324,7 +61336,7 @@ Function8ae68: ; 8ae68 call Function3200 call Functiona36 call PlayClickSFX - call Function1c17 + call WriteBackup ret ; 8aebc @@ -61472,7 +61484,7 @@ SpecialBuenasPassword: ; 8af6b xor a ld [wcf76], a ld hl, MenuDataHeader_0x8afa9 - call Function1d3c + call CopyMenuDataHeader ld a, [wdc4a] ld c, a callba Functionb8f8f @@ -61550,7 +61562,7 @@ SpecialBuenaPrize: ; 8afd4 .asm_8aff1 call DelayFrame - call Function1ad2 + call DrawOnMap call Function8b097 call Function8b0e2 jr z, .asm_8b05f @@ -61606,8 +61618,8 @@ SpecialBuenaPrize: ; 8afd4 jr .asm_8afeb .asm_8b05f - call Function1c17 - call Function1c17 + call WriteBackup + call WriteBackup ld hl, UnknownText_0x8b08b call PrintText call Functiona36 @@ -61668,9 +61680,9 @@ Function8b09e: ; 8b09e xor a ld [hBGMapMode], a ld hl, MenuDataHeader_0x8b0d1 - call Function1d3c + call CopyMenuDataHeader call Function1cbb - call Function1ad2 + call DrawOnMap call Function1cfd ld bc, $0015 add hl, bc @@ -61712,14 +61724,14 @@ MenuDataHeader_0x8b0dd: ; 0x8b0dd Function8b0e2: ; 8b0e2 ld hl, MenuDataHeader_0x8b113 - call Function1d3c + call CopyMenuDataHeader ld a, [MenuSelection] ld [wcf88], a xor a ld [wcf76], a ld [hBGMapMode], a call Function352f - call Function1ad2 + call DrawOnMap call Function350c ld a, [MenuSelection] ld c, a @@ -62948,7 +62960,7 @@ Function8b79e: ; 8b79e Function8b7bd: ; 8b7bd call Function8b855 ld hl, MenuDataHeader_0x8b867 - call Function1d3c + call CopyMenuDataHeader ld a, [wd030] ld [wcf88], a ld a, [wd031] @@ -62973,7 +62985,7 @@ Function8b7bd: ; 8b7bd ld c, $12 call Function8b703 call Function8b75d - call Function1ad2 + call DrawOnMap call Function89209 call Function350c call Function8920f @@ -63776,7 +63788,7 @@ Function8c26d: ; 8c26d cp $4 jr z, .asm_8c288 callba Function6454 - call Function1ad2 + call DrawOnMap call DelayFrame call Function8c2a0 call Function8cf4f @@ -68782,8 +68794,8 @@ INCLUDE "menu/mon_icons.asm" SECTION "bank24", ROMX, BANK[$24] -Function90000:: ; 90000 - call Function9001c +AddPhoneNumber:: ; 90000 + call _CheckCellNum jr c, .asm_9000d call Function9002d jr nc, .asm_9000d @@ -68797,8 +68809,8 @@ Function90000:: ; 90000 ; 9000f -Function9000f:: ; 9000f - call Function9001c +DelCellNum:: ; 9000f + call _CheckCellNum jr nc, .asm_90017 xor a ld [hl], a @@ -68809,11 +68821,11 @@ Function9000f:: ; 9000f ret ; 90019 -Function90019:: ; 90019 - jp Function9001c +CheckCellNum:: ; 90019 + jp _CheckCellNum ; 9001c -Function9001c: ; 9001c +_CheckCellNum: ; 9001c ld hl, wdc7c ld b, $a .asm_90021 @@ -68863,7 +68875,7 @@ Function90040: ; 90040 push bc push hl ld c, a - call Function9001c + call _CheckCellNum jr c, .asm_9005b ld hl, Buffer1 inc [hl] @@ -68946,7 +68958,7 @@ Function900ad: ; 900ad (24:40ad) push bc push de push af - callba Functionc000 + callba CheckTime pop af and $7 and c @@ -68977,7 +68989,7 @@ Function900bf: ; 900bf (24:40bf) ret Function900de: ; 900de (24:40de) - callba Functionc000 + callba CheckTime ld a, c ld [EngineBuffer1], a ; wd03e (aliases: MenuItemsList, CurFruitTree, CurInput) ld hl, wd040 @@ -69208,7 +69220,7 @@ UnknownScript_0x90241: ; 0x90241 callasm Function9026f ptcall wd048 closetext - callasm Function902eb + callasm HangUp loadmovesprites callasm Function113e5 end @@ -69243,84 +69255,84 @@ Function9026f: ; 9026f ; 9027c Function9027c: ; 9027c (24:427c) - call Function9033f - call Function90357 - call Function90292 - call Function90357 - call Function90375 - call Function90357 - call Function90292 + call Phone_StartRinging + call Phone_Wait20Frames + call Phone_CallerTextboxWithName + call Phone_Wait20Frames + call Phone_CallerTextbox + call Phone_Wait20Frames + call Phone_CallerTextboxWithName ret -Function90292: ; 90292 (24:4292) +Phone_CallerTextboxWithName: ; 90292 (24:4292) ld a, [wdbf9] ld b, a call Function90363 ret -Function9029a:: ; 9029a +PhoneCall:: ; 9029a ld a, b - ld [DefaultFlypoint], a + ld [PhoneScriptBank], a ld a, e - ld [wd003], a + ld [PhoneCallerLo], a ld a, d - ld [wd004], a - call Function902b3 - call Function902b3 + ld [PhoneCallerHi], a + call Phone_FirstOfTwoRings + call Phone_FirstOfTwoRings callba Function1060d3 ret ; 902b3 -Function902b3: ; 902b3 - call Function9033f - call Function90357 - call Function902c9 - call Function90357 - call Function90375 - call Function90357 - call Function902c9 +Phone_FirstOfTwoRings: ; 902b3 + call Phone_StartRinging + call Phone_Wait20Frames + call Phone_CallerTextboxWithName2 + call Phone_Wait20Frames + call Phone_CallerTextbox + call Phone_Wait20Frames + call Phone_CallerTextboxWithName2 ret ; 902c9 -Function902c9: ; 902c9 - call Function90375 +Phone_CallerTextboxWithName2: ; 902c9 + call Phone_CallerTextbox hlcoord 1, 2 ld [hl], $62 inc hl inc hl - ld a, [wd002] + ld a, [PhoneScriptBank] ld b, a - ld a, [wd003] + ld a, [PhoneCallerLo] ld e, a - ld a, [wd004] + ld a, [PhoneCallerHi] ld d, a call Function90069 ret ; 902e3 -Function902e3: ; 902e3 (24:42e3) +Phone_NoSignal: ; 902e3 (24:42e3) ld de, SFX_NO_SIGNAL call PlaySFX - jr Function902f1 - -Function902eb:: ; 902eb - call Function9031d - call Function90355 -Function902f1: - call Function9032f - call Function90355 - call Function9033b - call Function90355 - call Function9032f - call Function90355 - call Function9033b - call Function90355 - call Function9032f - call Function90355 - call Function9033b - call Function90355 + jr Phone_CallEnd + +HangUp:: ; 902eb + call HangUp_Beep + call HangUp_Wait20Frames +Phone_CallEnd: + call HangUp_BoopOn + call HangUp_Wait20Frames + call HangUp_BoopOff + call HangUp_Wait20Frames + call HangUp_BoopOn + call HangUp_Wait20Frames + call HangUp_BoopOff + call HangUp_Wait20Frames + call HangUp_BoopOn + call HangUp_Wait20Frames + call HangUp_BoopOff + call HangUp_Wait20Frames ret ; 90316 @@ -69330,7 +69342,7 @@ Function90316: ; 90316 ret ; 9031d -Function9031d: ; 9031d +HangUp_Beep: ; 9031d ld hl, UnknownText_0x9032a call PrintText ld de, SFX_HANG_UP @@ -69344,7 +69356,7 @@ UnknownText_0x9032a: ; 9032a ; 9032f -Function9032f: ; 9032f +HangUp_BoopOn: ; 9032f ld hl, UnknownText_0x90336 call PrintText ret @@ -69356,25 +69368,25 @@ UnknownText_0x90336: ; 0x90336 ; 0x9033b -Function9033b: ; 9033b +HangUp_BoopOff: ; 9033b call SpeechTextBox ret ; 9033f -Function9033f: ; 9033f +Phone_StartRinging: ; 9033f call WaitSFX ld de, SFX_CALL call PlaySFX - call Function90375 - call Function1ad2 + call Phone_CallerTextbox + call DrawOnMap callba Function4d188 ret ; 90355 -Function90355: ; 90355 - jr Function90357 +HangUp_Wait20Frames: ; 90355 + jr Phone_Wait20Frames -Function90357 +Phone_Wait20Frames ld c, 20 call DelayFrames callba Function4d188 @@ -69384,7 +69396,7 @@ Function90357 Function90363: ; 90363 (24:4363) push bc - call Function90375 + call Phone_CallerTextbox hlcoord 1, 1 ld [hl], $62 inc hl @@ -69396,7 +69408,7 @@ Function90363: ; 90363 (24:4363) ret -Function90375: ; 90375 +Phone_CallerTextbox: ; 90375 ld hl, TileMap ld b, $2 ld c, $12 @@ -69492,7 +69504,7 @@ String_9040d: db "BUENA:", $22, " DISC JOCKEY@" Function90423: ; 90423 (24:4423) push hl push bc - callba Function3994c + callba GetTrainerName pop bc pop hl ret @@ -70080,7 +70092,7 @@ Function90913: ; 90913 call Function90993 jr nc, .asm_9096a call Function1c07 - call Function1ad2 + call DrawOnMap ld hl, UnknownText_0x90a44 call PrintText call YesNoBox @@ -71343,7 +71355,7 @@ Function911eb: ; 911eb (24:51eb) inc [hl] ret .asm_91234 - callba Function902e3 + callba Phone_NoSignal ld hl, OutOfServiceAreaText call PrintText ld a, $8 @@ -71369,7 +71381,7 @@ Function91256: ; 91256 (24:5256) ld a, [hJoyPressed] ; $ff00+$a7 and $3 ret z - callba Function902eb + callba HangUp ld a, $8 ld [wcf63], a ld hl, UnknownText_0x914ce @@ -75194,8 +75206,8 @@ Function9307c: ; 9307c (24:707c) call PrintText ld hl, MenuDataHeader_0x930d6 call LoadMenuDataHeader - call Function1d81 - call Function1c17 + call InterpretMenu2 + call WriteBackup ret c ld a, [wcfa9] ld b, a @@ -75282,7 +75294,7 @@ Function930e9: ; 930e9 (24:70e9) call PlaceYesNoBox ld a, [wcfa9] dec a - call Function1c17 + call WriteBackup and a jr nz, .asm_93118 and a @@ -77809,7 +77821,7 @@ Functionb8cf2: ; b8cf2 (2e:4cf2) call CopyName1 pop bc ld b, $1 - callab Function3994c + callab GetTrainerName ld hl, UnknownText_0xb8d51 ld a, $2f jp Functionb9221 @@ -83389,10 +83401,10 @@ Functione245d: ; e245d (38:645d) Functione247d: ; e247d (38:647d) ld hl, BillsPCDepositMenuDataHeader - call Function1d3c + call CopyMenuDataHeader ld a, [wcfa9] call Function1d4b - call Function1d81 + call InterpretMenu2 jp c, BillsPCDepositFuncCancel ld a, [wcfa9] dec a @@ -83653,10 +83665,10 @@ Functione2655: ; e2655 (38:6655) Functione2675: ; e2675 (38:6675) ld hl, BillsPCWithdrawMenuDataHeader - call Function1d3c + call CopyMenuDataHeader ld a, [wcfa9] call Function1d4b - call Function1d81 + call InterpretMenu2 jp c, BillsPCWithdrawFuncCancel ld a, [wcfa9] dec a @@ -83914,10 +83926,10 @@ Functione283d: ; e283d Functione285d: ; e285d ld hl, MenuDataHeader_0xe28c3 - call Function1d3c + call CopyMenuDataHeader ld a, [wcfa9] call Function1d4b - call Function1d81 + call InterpretMenu2 jp c, Functione28bd ld a, [wcfa9] dec a @@ -85591,7 +85603,7 @@ Functione35aa: ; e35aa (38:75aa) call Functione36cf call Functione379c ld hl, MenuDataHeader_0xe35f1 - call Function1d3c + call CopyMenuDataHeader xor a ld [wd0e4], a hlcoord 0, 4 @@ -85605,7 +85617,7 @@ Functione35aa: ; e35aa (38:75aa) call Functione36f9 jr .asm_e35b0 .asm_e35de - call Function1c17 + call WriteBackup ret Functione35e2: ; e35e2 (38:75e2) @@ -85774,7 +85786,7 @@ String_e36f1: ; e36f1 Functione36f9: ; e36f9 (38:76f9) ld hl, MenuDataHeader_0xe377b call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 call Function1c07 ret c ld a, [wcfa9] @@ -89575,7 +89587,7 @@ Functionfb877: ; fb877 call LowVolume call WhiteBGMap call ClearTileMap - call Function1ad2 + call DrawOnMap call ClearSprites ld a, [wPokedexStatus] push af @@ -91087,7 +91099,7 @@ Functionfd044: ; fd044 ld [$ffc5], a ld de, wd851 ld bc, $ffc3 - callba Function1600b + callba CheckMoney jr nc, .asm_fd067 .asm_fd065 @@ -91107,7 +91119,7 @@ Functionfd044: ; fd044 .asm_fd074 ld de, wdc19 ld bc, wd851 - callba Function1600b + callba CheckMoney jr z, .asm_fd08b jr nc, .asm_fd089 call Functionfd099 @@ -91147,7 +91159,7 @@ Functionfd0a6: ; fd0a6 (3f:50a6) ld [$ffc5], a ld de, wd851 ld bc, $ffc3 - callba Function15ffa + callba TakeMoney ret @@ -92313,7 +92325,7 @@ Function10486d:: ; 10486d ; 1048ba -Function1048ba: ; 1048ba (41:48ba) +DoMysteryGift: ; 1048ba (41:48ba) call ClearTileMap call ClearSprites call WaitBGMap @@ -92417,7 +92429,7 @@ Function1049af: ; 1049af (41:49af) Function1049b4: ; 1049b4 (41:49b4) ld hl, UnknownText_0x104a02 call PrintText - jp Function1048ba + jp DoMysteryGift Function1049bd: ; 1049bd (41:49bd) ld hl, UnknownText_0x104a07 @@ -94660,7 +94672,7 @@ Function10609b: mobile ; 10609b ld hl, $a036 jp Function10611d -Function1060a2: mobile ; 1060a2 +Mobile_HealParty: mobile ; 1060a2 ld hl, $a039 jp Function10611d diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 788c9bb9a..97a104ba5 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -29,7 +29,7 @@ AzaleaTown_MapScriptHeader: UnknownScript_0x198018: moveperson $b, $b, $b spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $b @@ -39,7 +39,7 @@ UnknownScript_0x198018: UnknownScript_0x198034: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $b diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index b6a447a11..1d5765bd6 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -37,7 +37,7 @@ UnknownScript_0x185bf8: UnknownScript_0x185c0d: spriteface $3, DOWN - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 applymovement $3, MovementData_0x185cd3 loadfont writetext UnknownText_0x185ecc @@ -48,7 +48,7 @@ UnknownScript_0x185c0d: end UnknownScript_0x185c25: - showemote $0, $4, 15 + showemote EMOTE_SHOCK, $4, 15 special Functionc48f pause 15 spriteface $4, RIGHT @@ -101,7 +101,7 @@ UnknownScript_0x185c80: special Functionc48f pause 15 earthquake 50 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playsound SFX_ENTER_DOOR waitbutton changeblock $a, $8, $25 @@ -109,7 +109,7 @@ UnknownScript_0x185c80: pause 15 applymovement $0, MovementData_0x185cd1 playsound SFX_KINESIS - showemote $0, $4, 20 + showemote EMOTE_SHOCK, $4, 20 loadfont writetext UnknownText_0x185e75 closetext diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 8c00721ec..24d67e23e 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -108,7 +108,7 @@ UnknownScript_0x184072: waitbutton playsound SFX_TRANSACTION waitbutton - showemote $0, $7, 15 + showemote EMOTE_SHOCK, $7, 15 spriteface $7, LEFT loadfont writetext UnknownText_0x1842ee diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index aaada87fb..912d49b7f 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -25,7 +25,7 @@ UnknownScript_0x1883de: writetext UnknownText_0x1884fb closetext loadmovesprites - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 applymovement $2, MovementData_0x1884f7 loadfont writetext UnknownText_0x188574 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index d10dbabea..1c0d24386 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -102,7 +102,7 @@ UnknownScript_0x19c0aa: UnknownScript_0x19c0ae: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $3 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 4a75fdb8a..f9d444f9b 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -29,7 +29,7 @@ UnknownScript_0x1a001d: UnknownScript_0x1a001e: spriteface $0, UP - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 pause 15 playsound SFX_WARP_FROM applymovement $d, MovementData_0x1a00da diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 5cde05b25..12b61b4ee 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -116,7 +116,7 @@ UnknownScript_0x18d100: closetext loadmovesprites playsound SFX_ENTER_DOOR - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_CLAIR appear $5 waitbutton @@ -147,7 +147,7 @@ UnknownScript_0x18d100: writetext UnknownText_0x18d520 closetext loadmovesprites - showemote $0, $5, 15 + showemote EMOTE_SHOCK, $5, 15 loadfont writetext UnknownText_0x18d9ae closetext diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 4261c1f97..fbbbdfb37 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -42,7 +42,7 @@ UnknownScript_0x18c8b8: writetext UnknownText_0x18c9b8 pause 30 loadmovesprites - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 spriteface $0, LEFT playmusic MUSIC_CLAIR applymovement $3, MovementData_0x18c9ae diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index e2368ab0d..4760b403d 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -15,10 +15,10 @@ ElmsLab_MapScriptHeader: ; callbacks - dbw 2, UnknownScript_0x78b83 + dbw 2, ElmsLab_PutElmAtLaptop UnknownScript_0x78b7a: - priorityjump UnknownScript_0x78b8c + priorityjump ElmsLab_AutowalkUpToElm end UnknownScript_0x78b7e: @@ -36,50 +36,50 @@ UnknownScript_0x78b81: UnknownScript_0x78b82: end -UnknownScript_0x78b83: +ElmsLab_PutElmAtLaptop: checktriggers - iftrue UnknownScript_0x78b8b + iftrue .Skip moveperson $2, $3, $4 -UnknownScript_0x78b8b: +.Skip: return -UnknownScript_0x78b8c: - applymovement $0, MovementData_0x78f67 - showemote $0, $2, 15 +ElmsLab_AutowalkUpToElm: + applymovement $0, ElmsLab_WalkUpToElmMovement + showemote EMOTE_SHOCK, $2, 15 spriteface $2, RIGHT loadfont - writetext UnknownText_0x78fb6 -UnknownScript_0x78b9b: + writetext ElmText_Intro +ElmsLab_RefuseLoop: yesorno - iftrue UnknownScript_0x78ba5 - writetext UnknownText_0x7911a - jump UnknownScript_0x78b9b + iftrue ElmsLab_ElmGetsEmail + writetext ElmText_Refused + jump ElmsLab_RefuseLoop -UnknownScript_0x78ba5: - writetext UnknownText_0x790fa +ElmsLab_ElmGetsEmail: + writetext ElmText_Accepted keeptextopen - writetext UnknownText_0x7913a + writetext ElmText_ResearchAmbitions closetext loadmovesprites playsound SFX_GLASS_TING pause 30 - showemote $0, $2, 10 + showemote EMOTE_SHOCK, $2, 10 spriteface $2, DOWN loadfont - writetext UnknownText_0x791ae + writetext ElmText_GotAnEmail closetext loadmovesprites loadfont spriteface $2, RIGHT - writetext UnknownText_0x791df + writetext ElmText_MissionFromMrPokemon closetext loadmovesprites - applymovement $2, MovementData_0x78fa0 + applymovement $2, ElmsLab_ElmToDefaultPositionMovement1 spriteface $0, UP - applymovement $2, MovementData_0x78fa2 + applymovement $2, ElmsLab_ElmToDefaultPositionMovement2 spriteface $0, RIGHT loadfont - writetext UnknownText_0x792ff + writetext ElmText_ChooseAPokemon closetext dotrigger $1 loadmovesprites @@ -89,21 +89,21 @@ ProfElmScript: faceplayer loadfont checkevent EVENT_GOT_SS_TICKET_FROM_ELM - iftrue UnknownScript_0x78bee + iftrue ElmCheckMasterBall checkevent EVENT_BEAT_ELITE_FOUR iftrue ElmGiveTicketScript -UnknownScript_0x78bee: +ElmCheckMasterBall: checkevent EVENT_GOT_MASTER_BALL_FROM_ELM - iftrue UnknownScript_0x78bfa + iftrue ElmCheckEverstone checkflag ENGINE_RISINGBADGE iftrue ElmGiveMasterBallScript -UnknownScript_0x78bfa: +ElmCheckEverstone: checkevent EVENT_GOT_EVERSTONE_FROM_ELM - iftrue UnknownScript_0x78e16 + iftrue ElmScript_CallYou checkevent EVENT_SHOWED_TOGEPI_TO_ELM - iftrue UnknownScript_0x78e03 + iftrue ElmGiveEverstoneScript checkevent EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE - iffalse UnknownScript_0x78c35 + iffalse ElmCheckTogepiEgg writebyte TOGEPI special Functionc284 iftrue ShowElmTogepiScript @@ -115,21 +115,21 @@ UnknownScript_0x78bfa: loadmovesprites end -UnknownScript_0x78c22: +ElmEggHatchedScript: writebyte TOGEPI special Functionc284 iftrue ShowElmTogepiScript writebyte TOGETIC special Functionc284 iftrue ShowElmTogepiScript - jump UnknownScript_0x78c41 + jump ElmCheckGotEggAgain -UnknownScript_0x78c35: +ElmCheckTogepiEgg: checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE - iffalse UnknownScript_0x78c41 + iffalse ElmCheckGotEggAgain checkevent EVENT_TOGEPI_HATCHED - iftrue UnknownScript_0x78c22 -UnknownScript_0x78c41: + iftrue ElmEggHatchedScript +ElmCheckGotEggAgain: checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE ; why are we checking it again? iftrue ElmWaitingEggHatchScript checkflag ENGINE_ZEPHYRBADGE @@ -140,7 +140,7 @@ UnknownScript_0x78c41: iftrue ElmAfterTheftScript checkevent EVENT_GOT_A_POKEMON_FROM_ELM iftrue ElmDescribesMrPokemonScript - writetext UnknownText_0x79375 + writetext ElmText_LetYourMonBattleIt closetext loadmovesprites end @@ -300,15 +300,15 @@ ElmsLabHealingMachine: .CanHeal writetext ElmsLabHealingMachineText2 yesorno - iftrue UnknownScript_0x78d8a + iftrue ElmsLabHealingMachine_HealParty loadmovesprites end -UnknownScript_0x78d8a: - special Function1060a2 +ElmsLabHealingMachine_HealParty: + special Mobile_HealParty special HealParty playmusic MUSIC_NONE - writebyte $1 + writebyte 1 ; Machine is in Elm's Lab special HealMachineAnim pause 30 special RestartMapMusic @@ -369,28 +369,28 @@ ShowElmTogepiScript: writetext ShowElmTogepiText1 closetext loadmovesprites - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 setevent EVENT_SHOWED_TOGEPI_TO_ELM loadfont writetext ShowElmTogepiText2 keeptextopen writetext ShowElmTogepiText3 keeptextopen -UnknownScript_0x78e03: +ElmGiveEverstoneScript: writetext ElmGiveEverstoneText1 keeptextopen verbosegiveitem EVERSTONE, 1 - iffalse UnknownScript_0x78e1a + iffalse ElmScript_NoRoomForEverstone writetext ElmGiveEverstoneText2 closetext loadmovesprites setevent EVENT_GOT_EVERSTONE_FROM_ELM end -UnknownScript_0x78e16: - writetext UnknownText_0x79c37 +ElmScript_CallYou: + writetext ElmText_CallYou closetext -UnknownScript_0x78e1a: +ElmScript_NoRoomForEverstone: loadmovesprites end @@ -419,95 +419,95 @@ ElmGiveTicketScript: ElmJumpBackScript1: loadmovesprites checkcode VAR_FACING - if_equal $0, UnknownScript_0x78e6d - if_equal $1, UnknownScript_0x78e67 - if_equal $2, UnknownScript_0x78e73 - if_equal $3, UnknownScript_0x78e79 + if_equal DOWN, ElmJumpDownScript + if_equal UP, ElmJumpUpScript + if_equal LEFT, ElmJumpLeftScript + if_equal RIGHT, ElmJumpRightScript end ElmJumpBackScript2: loadmovesprites checkcode VAR_FACING - if_equal $0, UnknownScript_0x78e67 - if_equal $1, UnknownScript_0x78e6d - if_equal $2, UnknownScript_0x78e79 - if_equal $3, UnknownScript_0x78e73 + if_equal DOWN, ElmJumpUpScript + if_equal UP, ElmJumpDownScript + if_equal LEFT, ElmJumpRightScript + if_equal RIGHT, ElmJumpLeftScript end -UnknownScript_0x78e67: - applymovement $2, MovementData_0x78f90 +ElmJumpUpScript: + applymovement $2, ElmJumpUpMovement loadfont end -UnknownScript_0x78e6d: - applymovement $2, MovementData_0x78f94 +ElmJumpDownScript: + applymovement $2, ElmJumpDownMovement loadfont end -UnknownScript_0x78e73: - applymovement $2, MovementData_0x78f98 +ElmJumpLeftScript: + applymovement $2, ElmJumpLeftMovement loadfont end -UnknownScript_0x78e79: - applymovement $2, MovementData_0x78f9c +ElmJumpRightScript: + applymovement $2, ElmJumpRightMovement loadfont end -UnknownScript_0x78e7f: - applymovement $3, MovementData_0x78f7e +AideScript_WalkPotions1: + applymovement $3, AideWalksRight1 spriteface $0, DOWN - scall UnknownScript_0x78e9d - applymovement $3, MovementData_0x78f87 + scall AideScript_GivePotions + applymovement $3, AideWalksLeft1 end -UnknownScript_0x78e8e: - applymovement $3, MovementData_0x78f82 +AideScript_WalkPotions2: + applymovement $3, AideWalksRight2 spriteface $0, DOWN - scall UnknownScript_0x78e9d - applymovement $3, MovementData_0x78f8b + scall AideScript_GivePotions + applymovement $3, AideWalksLeft2 end -UnknownScript_0x78e9d: +AideScript_GivePotions: loadfont - writetext UnknownText_0x79f38 + writetext AideText_GiveYouPotions keeptextopen verbosegiveitem POTION, 1 - writetext UnknownText_0x79f65 + writetext AideText_AlwaysBusy closetext loadmovesprites dotrigger $2 end -UnknownScript_0x78ead: - applymovement $3, MovementData_0x78f7e +AideScript_WalkBalls1: + applymovement $3, AideWalksRight1 spriteface $0, DOWN - scall UnknownScript_0x78ecb - applymovement $3, MovementData_0x78f87 + scall AideScript_GiveYouBalls + applymovement $3, AideWalksLeft1 end -UnknownScript_0x78ebc: - applymovement $3, MovementData_0x78f82 +AideScript_WalkBalls2: + applymovement $3, AideWalksRight2 spriteface $0, DOWN - scall UnknownScript_0x78ecb - applymovement $3, MovementData_0x78f8b + scall AideScript_GiveYouBalls + applymovement $3, AideWalksLeft2 end -UnknownScript_0x78ecb: +AideScript_GiveYouBalls: loadfont - writetext UnknownText_0x7a078 + writetext AideText_GiveYouBalls keeptextopen itemtotext POKE_BALL, $1 - scall UnknownScript_0x78ee2 + scall AideScript_ReceiveTheBalls giveitem POKE_BALL, $5 - writetext UnknownText_0x7a09a + writetext AideText_ExplainBalls keeptextopen itemnotify loadmovesprites dotrigger $2 end -UnknownScript_0x78ee2: +AideScript_ReceiveTheBalls: jumpstd receiveitem end @@ -515,49 +515,49 @@ ElmsAideScript: faceplayer loadfont checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE - iftrue UnknownScript_0x78f0c + iftrue AideScript_AfterTheft checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iftrue UnknownScript_0x78f06 + iftrue AideScript_ExplainBalls checkevent EVENT_GOT_MYSTERY_EGG_FROM_MR_POKEMON - iftrue UnknownScript_0x78f00 - writetext UnknownText_0x79f65 + iftrue AideScript_TheftTestimony + writetext AideText_AlwaysBusy closetext loadmovesprites end -UnknownScript_0x78f00: - writetext UnknownText_0x79f95 +AideScript_TheftTestimony: + writetext AideText_TheftTestimony closetext loadmovesprites end -UnknownScript_0x78f06: - writetext UnknownText_0x7a09a +AideScript_ExplainBalls: + writetext AideText_ExplainBalls closetext loadmovesprites end -UnknownScript_0x78f0c: - writetext UnknownText_0x79c65 +AideScript_AfterTheft: + writetext AideText_AfterTheft closetext loadmovesprites end -UnknownScript_0x78f12: - applymovement $0, MovementData_0x78f72 +MeetCopScript2: + applymovement $0, MeetCopScript2_StepLeft MeetCopScript: - applymovement $0, MovementData_0x78f74 + applymovement $0, MeetCopScript_WalkUp CopScript: spriteface $7, LEFT loadfont - writetext UnknownText_0x7a0f0 + writetext ElmsLabOfficerText1 keeptextopen special SpecialNameRival - writetext UnknownText_0x7a1c0 + writetext ElmsLabOfficerText2 closetext loadmovesprites - applymovement $7, MovementData_0x78f78 + applymovement $7, OfficerLeavesMovement disappear $7 dotrigger $2 end @@ -607,7 +607,7 @@ ElmsLabTrashcan2: ElmsLabBookshelf: jumpstd difficultbookshelf -MovementData_0x78f67: +ElmsLab_WalkUpToElmMovement: step_up step_up step_up @@ -622,17 +622,17 @@ MovementData_0x78f70: step_up step_end -MovementData_0x78f72: +MeetCopScript2_StepLeft: step_left step_end -MovementData_0x78f74: +MeetCopScript_WalkUp: step_up step_up turn_head_right step_end -MovementData_0x78f78: +OfficerLeavesMovement: step_down step_down step_down @@ -640,61 +640,61 @@ MovementData_0x78f78: step_down step_end -MovementData_0x78f7e: +AideWalksRight1: step_right step_right turn_head_up step_end -MovementData_0x78f82: +AideWalksRight2: step_right step_right step_right turn_head_up step_end -MovementData_0x78f87: +AideWalksLeft1: step_left step_left turn_head_down step_end -MovementData_0x78f8b: +AideWalksLeft2: step_left step_left step_left turn_head_down step_end -MovementData_0x78f90: +ElmJumpUpMovement: fix_facing big_step_up remove_fixed_facing step_end -MovementData_0x78f94: +ElmJumpDownMovement: fix_facing big_step_down remove_fixed_facing step_end -MovementData_0x78f98: +ElmJumpLeftMovement: fix_facing big_step_left remove_fixed_facing step_end -MovementData_0x78f9c: +ElmJumpRightMovement: fix_facing big_step_right remove_fixed_facing step_end -MovementData_0x78fa0: +ElmsLab_ElmToDefaultPositionMovement1: step_up step_end -MovementData_0x78fa2: +ElmsLab_ElmToDefaultPositionMovement2: step_right step_right step_up @@ -722,7 +722,7 @@ AfterChikoritaMovement: turn_head_up step_end -UnknownText_0x78fb6: +ElmText_Intro: text "ELM: !" line "There you are!" @@ -761,19 +761,19 @@ UnknownText_0x78fb6: line "caught." done -UnknownText_0x790fa: +ElmText_Accepted: text "Thanks, !" para "You're a great" line "help!" done -UnknownText_0x7911a: +ElmText_Refused: text "But… Please, I" line "need your help!" done -UnknownText_0x7913a: +ElmText_ResearchAmbitions: text "When I announce my" line "findings, I'm sure" @@ -787,7 +787,7 @@ UnknownText_0x7913a: line "it!" done -UnknownText_0x791ae: +ElmText_GotAnEmail: text "Oh, hey! I got an" line "e-mail!" @@ -797,7 +797,7 @@ UnknownText_0x791ae: para "Okay…" done -UnknownText_0x791df: +ElmText_MissionFromMrPokemon: text "Hey, listen." para "I have an acquain-" @@ -830,7 +830,7 @@ UnknownText_0x791df: line "go in our place?" done -UnknownText_0x792ff: +ElmText_ChooseAPokemon: text "I want you to" line "raise one of the" @@ -844,7 +844,7 @@ UnknownText_0x792ff: para "Go on. Pick one!" done -UnknownText_0x79375: +ElmText_LetYourMonBattleIt: text "If a wild #MON" line "appears, let your" cont "#MON battle it!" @@ -1125,13 +1125,13 @@ ElmGiveEverstoneText2: cont "to evolve." done -UnknownText_0x79c37: +ElmText_CallYou: text "ELM: , I'll" line "call you if any-" cont "thing comes up." done -UnknownText_0x79c65: +AideText_AfterTheft: text "…sigh… That" line "stolen #MON." @@ -1208,25 +1208,25 @@ ElmGiveTicketText2: line "PROF.OAK in KANTO!" done -UnknownText_0x79f0b: +ElmsLabSignpostText_Egg: text "It's the #MON" line "EGG being studied" cont "by PROF.ELM." done -UnknownText_0x79f38: +AideText_GiveYouPotions: text ", I want" line "you to have this" cont "for your errand." done -UnknownText_0x79f65: +AideText_AlwaysBusy: text "There are only two" line "of us, so we're" cont "always busy." done -UnknownText_0x79f95: +AideText_TheftTestimony: text "There was a loud" line "noise outside…" @@ -1251,14 +1251,14 @@ UnknownText_0x79f95: line "itself." done -UnknownText_0x7a078: +AideText_GiveYouBalls: text "!" para "Use these on your" line "#DEX quest!" done -UnknownText_0x7a09a: +AideText_ExplainBalls: text "To add to your" line "#DEX, you have" cont "to catch #MON." @@ -1268,7 +1268,7 @@ UnknownText_0x7a09a: cont "to get them." done -UnknownText_0x7a0f0: +ElmsLabOfficerText1: text "I heard a #MON" line "was stolen here…" @@ -1289,7 +1289,7 @@ UnknownText_0x7a0f0: line "get his name?" done -UnknownText_0x7a1c0: +ElmsLabOfficerText2: text "OK! So " line "was his name." @@ -1381,11 +1381,11 @@ ElmsLab_MapEventHeader: xy_trigger 1, $6, $4, $0, LabTryToLeaveScript, $0, $0 xy_trigger 1, $6, $5, $0, LabTryToLeaveScript, $0, $0 xy_trigger 3, $5, $4, $0, MeetCopScript, $0, $0 - xy_trigger 3, $5, $5, $0, UnknownScript_0x78f12, $0, $0 - xy_trigger 5, $8, $4, $0, UnknownScript_0x78e7f, $0, $0 - xy_trigger 5, $8, $5, $0, UnknownScript_0x78e8e, $0, $0 - xy_trigger 6, $8, $4, $0, UnknownScript_0x78ead, $0, $0 - xy_trigger 6, $8, $5, $0, UnknownScript_0x78ebc, $0, $0 + xy_trigger 3, $5, $5, $0, MeetCopScript2, $0, $0 + xy_trigger 5, $8, $4, $0, AideScript_WalkPotions1, $0, $0 + xy_trigger 5, $8, $5, $0, AideScript_WalkPotions2, $0, $0 + xy_trigger 6, $8, $4, $0, AideScript_WalkBalls1, $0, $0 + xy_trigger 6, $8, $5, $0, AideScript_WalkBalls2, $0, $0 ; signposts db 16 diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 5e9eb09d9..562917910 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -45,7 +45,7 @@ TwinScript_0x75ebb: spriteface $4, UP special Function8c0ab spriteface $3, DOWN - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 applymovement $4, MovementData_0x7600c spriteface $3, RIGHT checkflag ENGINE_PLAYER_IS_FEMALE diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 5c3b58a4a..08c1d8fda 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -129,7 +129,7 @@ FastShipBed: loadmovesprites special Function8c0b6 special Functiond91 - special Function1060a2 + special Mobile_HealParty special HealParty playmusic MUSIC_HEAL pause 60 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index a551e86ad..fde98406a 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -60,7 +60,7 @@ ReceptionistScript_0x560ce: if_not_equal SUNDAY, UnknownScript_0x56112 checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT iftrue UnknownScript_0x56112 - special Function718d + special GetFirstPokemonHappiness writetext UnknownText_0x56143 keeptextopen if_greater_than $95, UnknownScript_0x560ee diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 6195a7c5f..462e899c2 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -114,7 +114,7 @@ LassCarrieScript: end WhitneyCriesScript: - showemote $0, $4, 15 + showemote EMOTE_SHOCK, $4, 15 applymovement $4, BridgetWalksUpMovement spriteface $0, DOWN loadfont diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 4a8b442bb..492345d55 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -8,7 +8,7 @@ GoldenrodHappinessRater_MapScriptHeader: TeacherScript_0x54953: faceplayer loadfont - special Function718d + special GetFirstPokemonHappiness writetext UnknownText_0x549a3 keeptextopen if_greater_than $f9, UnknownScript_0x54973 diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index 6050cef09..a50361a17 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -3,50 +3,50 @@ HallOfFame_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x18144f, $0000 - dw UnknownScript_0x181453, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 0 -UnknownScript_0x18144f: - priorityjump UnknownScript_0x181454 +.Trigger1: + priorityjump HallOfFameScript end -UnknownScript_0x181453: +.Trigger2: end -UnknownScript_0x181454: +HallOfFameScript: follow $2, $0 - applymovement $2, MovementData_0x181499 + applymovement $2, HallOfFame_WalkUpWithLance stopfollow spriteface $0, RIGHT loadfont - writetext UnknownText_0x1814a6 + writetext HallOfFame_LanceText closetext loadmovesprites spriteface $2, UP - applymovement $0, MovementData_0x1814a4 + applymovement $0, HallOfFame_SlowlyApproachMachine dotrigger $1 pause 15 - writebyte $2 + writebyte 2 ; Machine is in the Hall of Fame special HealMachineAnim setevent EVENT_BEAT_ELITE_FOUR setevent EVENT_TELEPORT_GUY setevent EVENT_RIVAL_SPROUT_TOWER clearevent EVENT_RED_IN_MT_SILVER - setevent EVENT_737 - clearevent EVENT_738 + setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM - iftrue UnknownScript_0x181497 + iftrue HallOfFame_SkipPhoneCall specialphonecall $5 -UnknownScript_0x181497: +HallOfFame_SkipPhoneCall: halloffame end -MovementData_0x181499: +HallOfFame_WalkUpWithLance: step_up step_up step_up @@ -59,11 +59,11 @@ MovementData_0x181499: turn_head_left step_end -MovementData_0x1814a4: +HallOfFame_SlowlyApproachMachine: slow_step_up step_end -UnknownText_0x1814a6: +HallOfFame_LanceText: text "LANCE: It's been a" line "long time since I" cont "last came here." @@ -126,4 +126,4 @@ HallOfFame_MapEventHeader: ; people-events db 1 - person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, -1 + person_event SPRITE_LANCE, 16, 8, UP << 2 | $3, $0, -1, -1, PAL_OW_RED << 4 | $0, 0, ObjectEvent, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 79d8f55b8..409291535 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -467,7 +467,7 @@ UnknownScript_0x6ee42: closetext loadmovesprites pause 20 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 special Functionc48f applymovement $0, MovementData_0x6ef58 pause 30 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 03013b174..f1ff2f719 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -54,7 +54,7 @@ UnknownScript_0x180053: moveperson $5, $11, $9 appear $5 spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 applymovement $5, MovementData_0x180164 @@ -75,7 +75,7 @@ UnknownScript_0x180094: if_equal SATURDAY, UnknownScript_0x18012b appear $5 spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 applymovement $5, MovementData_0x18016b diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index eb0e121fb..31ee9737b 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -20,7 +20,7 @@ UnknownScript_0x7a4d8: UnknownScript_0x7a4db: playmusic MUSIC_MOM - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $0, LEFT checkevent EVENT_000 iffalse UnknownScript_0x7a4f2 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 43479f6e4..3f5ca6fba 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -295,7 +295,7 @@ UnknownScript_0x18e378: clearevent EVENT_GAVE_GS_BALL_TO_KURT special Functionc48f pause 20 - showemote $0, $2, 30 + showemote EMOTE_SHOCK, $2, 30 checkcode VAR_FACING if_equal $1, UnknownScript_0x18e3a2 spriteface $0, DOWN diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index b489a60d4..ce2043ea0 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -75,7 +75,7 @@ LanceScript_0x180e7b: setevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED musicfadeout MUSIC_BEAUTY_ENCOUNTER, $10 pause 30 - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $2, DOWN pause 10 spriteface $0, DOWN @@ -119,7 +119,7 @@ LanceScript_0x180e7b: playsound SFX_EXIT_BUILDING disappear $0 applymovement $3, MovementData_0x180f57 - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 loadfont writetext UnknownText_0x1813c5 pause 30 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index e74d77437..9a186ad19 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -85,7 +85,7 @@ UnknownScript_0x6c38f: loadfont writetext UnknownText_0x6c59e closetext - showemote $0, $2, 10 + showemote EMOTE_SHOCK, $2, 10 playsound SFX_UNKNOWN_2A changeblock $6, $2, $1e reloadmappart diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index f3d9f7457..9f271af91 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -23,7 +23,7 @@ MahoganyTown_MapScriptHeader: return UnknownScript_0x190013: - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 applymovement $2, MovementData_0x1900a9 follow $0, $2 applymovement $0, MovementData_0x1900a7 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index b0ef957be..bace21c16 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -43,7 +43,7 @@ UnknownScript_0x1935f4: special RestartMapMusic refreshscreen $0 UnknownScript_0x19360d: - special Function1060a2 + special Mobile_HealParty special HealParty special Function10383c iftrue UnknownScript_0x193624 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 4e1701e17..e2be9902a 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -18,7 +18,7 @@ UnknownScript_0x7408d: UnknownScript_0x7408e: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 applymovement $2, MovementData_0x740f9 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index cd424a320..64c49f749 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -59,7 +59,7 @@ UnknownScript_0x7709a: stopfollow spriteface $2, DOWN pause 10 - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $2, DOWN cry CLEFAIRY pause 15 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index f8a758907..779783a5c 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -17,7 +17,7 @@ UnknownScript_0x196e55: end UnknownScript_0x196e56: - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $2, DOWN loadfont writetext UnknownText_0x196f66 @@ -111,7 +111,7 @@ UnknownScript_0x196ec9: special Function8c0b6 special Functiond91 playmusic MUSIC_HEAL - special Function1060a2 + special Mobile_HealParty special HealParty pause 60 special Function8c0ab diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index a6b03a426..932bd1a3f 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -24,7 +24,7 @@ OlivineCity_MapScriptHeader: UnknownScript_0x1a8833: spriteface $0, LEFT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 playsound SFX_ENTER_DOOR @@ -48,7 +48,7 @@ UnknownScript_0x1a8833: UnknownScript_0x1a886b: spriteface $0, LEFT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 playsound SFX_ENTER_DOOR diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index aac3ba7c4..ea0edc48e 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -399,9 +399,9 @@ OlivinePort_MapEventHeader: ; people-events db 7 person_event SPRITE_SAILOR, 27, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x748c0, EVENT_72A - person_event SPRITE_SAILOR, 19, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x749fe, EVENT_737 - person_event SPRITE_SAILOR, 19, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x7499c, EVENT_738 - person_event SPRITE_FISHING_GURU, 18, 8, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a01, EVENT_737 - person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, EVENT_737 - person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, EVENT_738 - person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, EVENT_738 + person_event SPRITE_SAILOR, 19, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_SAILOR, 19, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + person_event SPRITE_FISHING_GURU, 18, 8, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 60f7310b0..59a9acf8f 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -440,7 +440,7 @@ UnknownScript_0x192b12: writetext UnknownText_0x19329a closetext loadmovesprites - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 applymovement $0, MovementData_0x192ce5 end @@ -549,7 +549,7 @@ UnknownScript_0x192c20: writetext UnknownText_0x19329a closetext loadmovesprites - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 applymovement $0, MovementData_0x192d2d end diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 0ee68c71d..b534b7fb3 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -17,7 +17,7 @@ UnknownScript_0x188dc4: UnknownScript_0x188dc5: playsound SFX_CALL - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 waitbutton pause 30 applymovement $2, MovementData_0x188ed5 diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index f0933aae1..1942202d0 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -320,7 +320,7 @@ UnknownScript_0x5d8a4: pause 15 checkevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD iftrue UnknownScript_0x5d8cc - showemote $0, $b, 15 + showemote EMOTE_SHOCK, $b, 15 setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER loadfont diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 1811692a5..e4a130ef0 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -21,7 +21,7 @@ UnknownScript_0x60010: UnknownScript_0x60011: spriteface $2, UP - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 loadfont writetext UnknownText_0x60128 closetext diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 98ba1ccf5..2b62fee86 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -20,7 +20,7 @@ UnknownScript_0x733ed: end UnknownScript_0x733f3: - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $0, UP loadfont writetext UnknownText_0x73496 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 1a89d8951..46daed8b1 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -20,7 +20,7 @@ UnknownScript_0x73611: end UnknownScript_0x73617: - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 spriteface $0, UP loadfont writetext UnknownText_0x7364d diff --git a/maps/Route25.asm b/maps/Route25.asm index 662dbb7e0..f5867764c 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -18,7 +18,7 @@ UnknownScript_0x19ee9f: UnknownScript_0x19eea0: showemote $4, $2, 15 pause 30 - showemote $0, $3, 10 + showemote EMOTE_SHOCK, $3, 10 spriteface $2, DOWN applymovement $3, MovementData_0x19efe8 disappear $3 @@ -44,7 +44,7 @@ UnknownScript_0x19eea0: UnknownScript_0x19eee0: showemote $4, $2, 15 pause 30 - showemote $0, $3, 10 + showemote EMOTE_SHOCK, $3, 10 spriteface $2, DOWN applymovement $3, MovementData_0x19efea disappear $3 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index ac31d6055..62814fd28 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -13,7 +13,7 @@ TeacherScript_0x7b125: loadmovesprites special Function8c0b6 special Functiond91 - special Function1060a2 + special Mobile_HealParty playmusic MUSIC_HEAL special HealParty pause 60 diff --git a/maps/Route27.asm b/maps/Route27.asm index 7ccdb3625..a1302d70c 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -17,13 +17,13 @@ UnknownScript_0x1a0872: UnknownScript_0x1a0873: spriteface $a, LEFT - showemote $0, $a, 15 + showemote EMOTE_SHOCK, $a, 15 applymovement $a, MovementData_0x1a0a66 jump UnknownScript_0x1a088c UnknownScript_0x1a0881: spriteface $a, LEFT - showemote $0, $a, 15 + showemote EMOTE_SHOCK, $a, 15 applymovement $a, MovementData_0x1a0a69 UnknownScript_0x1a088c: spriteface $0, RIGHT diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index 6e2bec168..a6994be7a 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -10,7 +10,7 @@ SandstormHouseWoman: loadfont checkevent EVENT_GOT_TM37_SANDSTORM iftrue .AlreadyGotItem - special Function718d + special GetFirstPokemonHappiness writetext SandstormHouseWomanText1 keeptextopen if_greater_than $95, .Loyal diff --git a/maps/Route29.asm b/maps/Route29.asm index 2b5879136..984dce1f6 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -35,7 +35,7 @@ TuscanyCallback: UnknownScript_0x1a0f6d: spriteface $2, UP - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 applymovement $2, MovementData_0x1a108d spriteface $0, LEFT setevent EVENT_DUDE_TALKED_TO_YOU @@ -60,7 +60,7 @@ UnknownScript_0x1a0f6d: UnknownScript_0x1a0fa3: spriteface $2, UP - showemote $0, $2, 15 + showemote EMOTE_SHOCK, $2, 15 applymovement $2, MovementData_0x1a1094 spriteface $0, LEFT setevent EVENT_DUDE_TALKED_TO_YOU diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 51e160e08..29fba0540 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -24,7 +24,7 @@ UnknownScript_0x62d38: UnknownScript_0x62d3d: checkevent EVENT_FOREST_IS_RESTLESS iffalse UnknownScript_0x62d62 - showemote $0, $5, 20 + showemote EMOTE_SHOCK, $5, 20 spriteface $5, LEFT spriteface $0, RIGHT follow $0, $5 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index 0f454c405..dc1f0c437 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -88,7 +88,7 @@ OfficerScript_0x6a204: if_equal FRIDAY, UnknownScript_0x6a2c7 faceplayer loadfont - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0x6a2c1 scall UnknownScript_0x6a2de writetext UnknownText_0x6a2eb @@ -97,7 +97,7 @@ OfficerScript_0x6a204: checkcode VAR_PARTYCOUNT if_greater_than $1, UnknownScript_0x6a271 special Function13a12 - clearevent EVENT_308 + clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER UnknownScript_0x6a234: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic @@ -142,7 +142,7 @@ UnknownScript_0x6a27d: ; 6a27d iffalse UnknownScript_0x6a2a9 special Function13a12 iftrue UnknownScript_0x6a2af - setevent EVENT_308 + setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 keeptextopen writetext UnknownText_0x6a56b @@ -193,7 +193,7 @@ UnknownScript_0x6a2c7: OfficerScript_0x6a2ca: faceplayer loadfont - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0x6a2c1 writetext UnknownText_0x6a894 closetext diff --git a/maps/Route36.asm b/maps/Route36.asm index f63cad50a..3a5c1f0d3 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -30,7 +30,7 @@ ArthurCallback: return UnknownScript_0x19401b: - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 pause 15 playsound SFX_WARP_FROM spriteface $0, UP diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index d7fe698a7..145f4067f 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -129,7 +129,7 @@ UnknownScript_0x6abd4: iftrue UnknownScript_0x6abdc appear $c UnknownScript_0x6abdc: - special Function1ad2 + special DrawOnMap end OfficerScript_0x6abe0: @@ -140,7 +140,7 @@ OfficerScript_0x6abe0: if_equal FRIDAY, UnknownScript_0x6acf1 faceplayer loadfont - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0x6ac91 scall UnknownScript_0x6ad02 writetext UnknownText_0x6add5 @@ -149,7 +149,7 @@ OfficerScript_0x6abe0: checkcode VAR_PARTYCOUNT if_greater_than $1, UnknownScript_0x6ac41 special Function13a12 - clearevent EVENT_308 + clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER UnknownScript_0x6ac10: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic @@ -185,7 +185,7 @@ UnknownScript_0x6ac4d: iffalse UnknownScript_0x6ac79 special Function13a12 iftrue UnknownScript_0x6ac7f - setevent EVENT_308 + setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 keeptextopen writetext UnknownText_0x6b055 @@ -225,13 +225,13 @@ UnknownScript_0x6ac8b: end UnknownScript_0x6ac91: - checkevent EVENT_313 + checkevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE iftrue UnknownScript_0x6acaf - checkevent EVENT_314 + checkevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE iftrue UnknownScript_0x6acbe - checkevent EVENT_315 + checkevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY iftrue UnknownScript_0x6accd - checkevent EVENT_316 + checkevent EVENT_CONTEST_OFFICER_HAS_BERRY iftrue UnknownScript_0x6acdc writetext UnknownText_0x6b32b closetext @@ -243,7 +243,7 @@ UnknownScript_0x6acaf: keeptextopen verbosegiveitem SUN_STONE, 1 iffalse UnknownScript_0x6aceb - clearevent EVENT_313 + clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE loadmovesprites end @@ -252,7 +252,7 @@ UnknownScript_0x6acbe: keeptextopen verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x6aceb - clearevent EVENT_314 + clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE loadmovesprites end @@ -261,7 +261,7 @@ UnknownScript_0x6accd: keeptextopen verbosegiveitem GOLD_BERRY, 1 iffalse UnknownScript_0x6aceb - clearevent EVENT_315 + clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY loadmovesprites end @@ -270,7 +270,7 @@ UnknownScript_0x6acdc: keeptextopen verbosegiveitem BERRY, 1 iffalse UnknownScript_0x6aceb - clearevent EVENT_316 + clearevent EVENT_CONTEST_OFFICER_HAS_BERRY loadmovesprites end @@ -286,7 +286,7 @@ UnknownScript_0x6acf1: OfficerScript_0x6acf4: faceplayer loadfont - checkflag ENGINE_51 + checkflag ENGINE_DAILY_BUG_CONTEST iftrue UnknownScript_0x6ac91 writetext UnknownText_0x6b370 closetext diff --git a/maps/Route42.asm b/maps/Route42.asm index 0e8aa15b5..3c6cf7528 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -16,7 +16,7 @@ UnknownScript_0x1a9217: end UnknownScript_0x1a9218: - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 pause 15 playsound SFX_WARP_FROM applymovement $a, MovementData_0x1a9356 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 9067119ce..61eda0bad 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -40,10 +40,10 @@ UnknownScript_0x19abda: UnknownScript_0x19abea: applymovement $0, MovementData_0x19aca2 - showemote $0, $4, 15 + showemote EMOTE_SHOCK, $4, 15 applymovement $4, MovementData_0x19acbb spriteface $3, UP - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 applymovement $3, MovementData_0x19aca4 loadfont writetext UnknownText_0x19acd2 @@ -72,10 +72,10 @@ UnknownScript_0x19ac28: end UnknownScript_0x19ac38: - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 applymovement $3, MovementData_0x19acaf spriteface $4, DOWN - showemote $0, $4, 15 + showemote EMOTE_SHOCK, $4, 15 applymovement $4, MovementData_0x19acc7 loadfont writetext UnknownText_0x19acd2 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index d9fd82bd4..102f9540d 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -42,7 +42,7 @@ UnknownScript_0x58dca: UnknownScript_0x58dd3: pause 30 earthquake 30 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 pause 30 playsound SFX_STRENGTH changeblock $4, $0, $30 @@ -66,7 +66,7 @@ UnknownScript_0x58df7: setflag ENGINE_UNLOCKED_UNOWNS_3 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 changeblock $4, $2, $19 reloadmappart diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index ec375ecb6..9ab9517be 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -43,7 +43,7 @@ UnknownScript_0x5858d: UnknownScript_0x58596: pause 30 earthquake 30 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 pause 30 playsound SFX_STRENGTH changeblock $4, $0, $30 @@ -67,7 +67,7 @@ UnknownScript_0x585ba: setflag ENGINE_UNLOCKED_UNOWNS_4 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 changeblock $4, $2, $19 reloadmappart diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 0c46a3b21..808ba0a4a 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -44,7 +44,7 @@ UnknownScript_0x58748: UnknownScript_0x58751: pause 30 earthquake 30 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 pause 30 playsound SFX_STRENGTH changeblock $4, $0, $30 @@ -72,7 +72,7 @@ UnknownScript_0x58778: setevent EVENT_74E domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 changeblock $4, $2, $19 reloadmappart diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 8f5cae4d8..917c8e2eb 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -43,7 +43,7 @@ UnknownScript_0x58c09: UnknownScript_0x58c12: pause 30 earthquake 30 - showemote $0, $0, 20 + showemote EMOTE_SHOCK, $0, 20 pause 30 playsound SFX_STRENGTH changeblock $4, $0, $30 @@ -67,7 +67,7 @@ UnknownScript_0x58c36: setflag ENGINE_UNLOCKED_UNOWNS_2 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 changeblock $2, $2, $18 changeblock $4, $2, $19 reloadmappart diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index c7de575fd..05c6ec486 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -17,7 +17,7 @@ UnknownScript_0x184946: UnknownScript_0x184947: spriteface $0, UP - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f playsound SFX_TACKLE playsound SFX_ELEVATOR @@ -32,7 +32,7 @@ UnknownScript_0x184947: writetext UnknownText_0x184a27 closetext loadmovesprites - showemote $0, $8, 15 + showemote EMOTE_SHOCK, $8, 15 spriteface $8, DOWN pause 15 applymovement $8, MovementData_0x184a24 diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index 21881ef03..e658be5d3 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -25,7 +25,7 @@ SecurityCamera1a: scall PlaySecurityCameraSounds checkevent EVENT_6DA iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $2 appear $2 @@ -34,7 +34,7 @@ SecurityCamera1a: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $2 appear $2 @@ -50,7 +50,7 @@ SecurityCamera1b: scall PlaySecurityCameraSounds checkevent EVENT_6DA iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $3 appear $2 @@ -59,7 +59,7 @@ SecurityCamera1b: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $3 appear $2 @@ -75,7 +75,7 @@ SecurityCamera2a: scall PlaySecurityCameraSounds checkevent EVENT_6DA iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $4, $7 appear $2 @@ -84,7 +84,7 @@ SecurityCamera2a: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $c, $5 @@ -101,7 +101,7 @@ SecurityCamera2b: scall PlaySecurityCameraSounds checkevent EVENT_6DA iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $4, $8 appear $2 @@ -110,7 +110,7 @@ SecurityCamera2b: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $c, $5 @@ -127,7 +127,7 @@ SecurityCamera3a: scall PlaySecurityCameraSounds checkevent EVENT_6DA iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $6 appear $2 @@ -136,7 +136,7 @@ SecurityCamera3a: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $19, $b @@ -153,7 +153,7 @@ SecurityCamera3b: scall PlaySecurityCameraSounds checkevent EVENT_6DA iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $13, $7 appear $2 @@ -162,7 +162,7 @@ SecurityCamera3b: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $19, $c @@ -179,7 +179,7 @@ SecurityCamera4: scall PlaySecurityCameraSounds checkevent EVENT_6DA iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $11, $10 appear $2 @@ -188,7 +188,7 @@ SecurityCamera4: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $19, $b @@ -205,7 +205,7 @@ SecurityCamera5: scall PlaySecurityCameraSounds checkevent EVENT_6DA iftrue NoSecurityCamera - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER moveperson $2, $3, $10 appear $2 @@ -214,7 +214,7 @@ SecurityCamera5: scall TrainerCameraGrunt1 if_equal $1, NoSecurityCamera scall PlaySecurityCameraSounds - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $0, RIGHT moveperson $2, $e, $10 diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 7b0b7bb39..7b503ecaf 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -53,7 +53,7 @@ UnknownScript_0x6cfac: closetext loadmovesprites spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 applymovement $0, MovementData_0x6d21f playmusic MUSIC_ROCKET_ENCOUNTER applymovement $3, MovementData_0x6d224 @@ -156,7 +156,7 @@ UnknownScript_0x6d091: closetext loadmovesprites special Function8c084 - special Function1060a2 + special Mobile_HealParty playsound SFX_FULL_HEAL special HealParty special Function8c079 diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 71b883128..4725368c0 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -54,7 +54,7 @@ LanceScript_0x6dffc: UnknownScript_0x6e019: spriteface $0, LEFT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f appear $a applymovement $a, MovementData_0x6e164 @@ -83,7 +83,7 @@ UnknownScript_0x6e052: applymovement $0, MovementData_0x6e13a UnknownScript_0x6e056: pause 30 - showemote $0, $3, 15 + showemote EMOTE_SHOCK, $3, 15 playmusic MUSIC_ROCKET_ENCOUNTER spriteface $3, DOWN loadfont diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index f5e8b439e..24d9c01e4 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -79,7 +79,7 @@ TeacherScript_0x7ca7d: UnknownScript_0x7ca80: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 playsound SFX_EXIT_BUILDING @@ -98,7 +98,7 @@ UnknownScript_0x7ca80: UnknownScript_0x7caaa: spriteface $0, RIGHT - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 playsound SFX_EXIT_BUILDING diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index c858b1192..103e511dc 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -18,7 +18,7 @@ UnknownScript_0x74491: UnknownScript_0x74492: moveperson $2, $12, $b spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $2 @@ -32,7 +32,7 @@ UnknownScript_0x74492: UnknownScript_0x744b5: spriteface $0, DOWN - showemote $0, $0, 15 + showemote EMOTE_SHOCK, $0, 15 special Functionc48f pause 15 appear $2 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index e8dafe2d1..d23619947 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -52,7 +52,7 @@ SageScript_0x985a0: UnknownScript_0x985a3: spriteface $4, UP spriteface $0, DOWN - showemote $0, $4, 20 + showemote EMOTE_SHOCK, $4, 20 follow $0, $4 applymovement $0, MovementData_0x98622 stopfollow @@ -140,7 +140,7 @@ SageKojiScript: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x9861b pause 10 - showemote $0, $7, 20 + showemote EMOTE_SHOCK, $7, 20 loadfont writetext UnknownText_0x98c6c keeptextopen diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 84c86c8ee..c2548e867 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -326,7 +326,7 @@ Function100232: ; 100232 push de callba Function106464 call Function3f20 - call Function1ad2 + call DrawOnMap hlcoord 1, 2 pop de call PlaceString @@ -796,7 +796,7 @@ Function1004f4: ; 1004f4 Function100504: ; 100504 push de call Function3f20 - call Function1ad2 + call DrawOnMap pop de hlcoord 4, 2 call PlaceString @@ -829,7 +829,7 @@ Jumptable_10052a: ; 10052a Function100534: ; 100534 call Function100513 - call Function1ad2 + call DrawOnMap call Function321c ld a, [wcd28] inc a @@ -1828,7 +1828,7 @@ Function100b7a: ; 100b7a rst FarCall callba Function24085 callba MobileTextBorder - call Function1ad2 + call DrawOnMap call Function321c callba Function2411a ld hl, wcfa5 @@ -2078,11 +2078,11 @@ Function100d22: ; 100d22 Function100d67: ; 100d67 ld hl, MenuDataHeader_100d88 - call Function1d3c + call CopyMenuDataHeader xor a ld [hBGMapMode], a call Function1cbb - call Function1ad2 + call DrawOnMap call Function1c89 call WaitBGMap call Function1c66 @@ -2809,7 +2809,7 @@ Jumptable_101247: ; 101247 ; 101251 Function101251: ; 101251 - call Function1ad2 + call DrawOnMap call ResetWindow ld hl, UnknownText_0x1021f4 call Function1021e0 @@ -2826,7 +2826,7 @@ Function101265: ; 101265 ; 10126c Function10126c: ; 10126c - call Function1ad2 + call DrawOnMap callba Script_reloadmappart ld hl, UnknownText_0x1021f4 call Function1021e0 @@ -3015,7 +3015,7 @@ Function1013aa: ; 1013aa call Function1d7d call Function2bae callba Function106464 - call Function1ad2 + call DrawOnMap call Function2b5c ret ; 1013c0 @@ -4171,7 +4171,7 @@ Function101b70: ; 101b70 call Function101ee4 ld hl, wcd29 set 5, [hl] - call Function1ad2 + call DrawOnMap ld a, [wcd25] inc a ld [wcd25], a @@ -7316,7 +7316,7 @@ Function103309: ; 103309 ld a, [hl] ld [wd1ee], a call Function1034be - call Function1ad2 + call DrawOnMap callba Function104000 ld a, $1 ld [wd1f0], a @@ -7685,8 +7685,8 @@ Function103612: ; 103612 ld [wcf88], a .asm_103622 - call Function1d81 - call Function1c17 + call InterpretMenu2 + call WriteBackup jr c, .asm_10363b ld a, [wcfa9] ld [ScriptVar], a @@ -7773,7 +7773,7 @@ Function10366e: ; 10366e jr c, .asm_1036f4 ld hl, MenuDataHeader_103747 call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 call Function1c07 jr c, .asm_1036f4 ld a, [wcfa9] diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index c894f3610..1b83268d1 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -5919,7 +5919,7 @@ Function11636e: ; 11636e call ByteFill ld a, $90 ld [hWY], a - call Function1ad2 + call DrawOnMap pop af ld [rSVBK], a callba Function104061 @@ -5962,7 +5962,7 @@ Function1163c0: ; 1163c0 call DelayFrame ld a, $90 ld [hWY], a - call Function1ad2 + call DrawOnMap callba Function14157 pop af ld [rSVBK], a @@ -9861,7 +9861,7 @@ Function118982: push af ld a, $1 ld [rSVBK], a - call Function1c17 + call WriteBackup pop af ld [rSVBK], a ld a, [wcd38] @@ -9885,7 +9885,7 @@ Function118982: push af ld a, $1 ld [rSVBK], a - call Function1c17 + call WriteBackup pop af ld [rSVBK], a ld a, $7 @@ -13714,7 +13714,7 @@ Function11a5b9: ; 11a5b9 ld c, $12 call Function3eea callba Function104061 - call Function1ad2 + call DrawOnMap ld c, $0 callba Function115e18 ld a, $1 @@ -14130,7 +14130,7 @@ Function11a9ce: ; 11a9ce callba Function106464 call Functiond90 callba Function2b5c - call Function1ad2 + call DrawOnMap ret ; 11a9f0 @@ -16469,7 +16469,7 @@ Unknown_11bb7d: SECTION "bank47", ROMX, BANK[$47] -Function11c000:: ; 11c000 +StoreText:: ; 11c000 ld a, [rSVBK] push af ld a, $3 @@ -22777,7 +22777,7 @@ Function17024d: ; 17024d ld [wcfc0], a xor a ld [InLinkBattle], a - callba Function1060a2 + callba Mobile_HealParty callba HealParty call Function1702b7 call Function170bf7 diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 74a50eb62..8bf27e378 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -442,12 +442,12 @@ Function17d224: ; 17d224 .asm_17d23c call LoadMenuDataHeader call Function17d246 - call Function1c17 + call WriteBackup ret ; 17d246 Function17d246: ; 17d246 - call Function1d81 + call InterpretMenu2 jr c, .asm_17d264 ld a, [ScriptVar] cp $5 @@ -1909,13 +1909,13 @@ Function17dc1f: ; 17dc1f ld [wc70f], a ld hl, wc708 call LoadMenuDataHeader - call Function1d81 + call InterpretMenu2 jr nc, .asm_17dc6e ld a, $2 ld [wcfa9], a .asm_17dc6e - call Function1c17 + call WriteBackup pop af ld [rSVBK], a ld a, [wcfa9] @@ -2701,7 +2701,7 @@ Function17e133: ; 17e133 ld a, [hli] ld [ScriptVar], a push hl - callba Function4a843 + callba MobileCheckOwnMonAnywhere pop hl jr c, .asm_17e159 inc hl diff --git a/text/common.asm b/text/common.asm index 74e143b13..896fdfe24 100644 --- a/text/common.asm +++ b/text/common.asm @@ -230,7 +230,7 @@ MartSignText: para "#MON MART" done -UnknownText_0x1b05bf: ; 0x1b05bf +ContestResults_ReadyToJudgeText: ; 0x1b05bf text "We will now judge" line "the #MON you've" cont "caught." @@ -246,7 +246,7 @@ UnknownText_0x1b05bf: ; 0x1b05bf done ; 0x1b0621 -UnknownText_0x1b0621: ; 0x1b0621 +ContestResults_PlayerWonAPrizeText: ; 0x1b0621 text ", the No.@" text_from_ram StringBuffer3 text "" @@ -257,7 +257,7 @@ UnknownText_0x1b0621: ; 0x1b0621 done ; 0x1b0648 -UnknownText_0x1b0648: ; 0x1b0648 +ReceivedItemText: ; 0x1b0648 text " received" line "@" text_from_ram StringBuffer4 @@ -265,26 +265,26 @@ UnknownText_0x1b0648: ; 0x1b0648 done ; 0x1b065b -UnknownText_0x1b065b: ; 0x1b065b +ContestResults_JoinUsNextTimeText: ; 0x1b065b text "Please join us for" line "the next Contest!" done ; 0x1b0681 -UnknownText_0x1b0681: ; 0x1b0681 +ContestResults_ConsolationPrizeText: ; 0x1b0681 text "Everyone else gets" line "a BERRY as a con-" cont "solation prize!" done ; 0x1b06b7 -UnknownText_0x1b06b7: ; 0x1b06b7 +ContestResults_DidNotWinText: ; 0x1b06b7 text "We hope you do" line "better next time." done ; 0x1b06d9 -UnknownText_0x1b06d9: ; 0x1b06d9 +ContestResults_ReturnPartyText: ; 0x1b06d9 text "We'll return the" line "#MON we kept" @@ -293,7 +293,7 @@ UnknownText_0x1b06d9: ; 0x1b06d9 done ; 0x1b070d -UnknownText_0x1b070d: ; 0x1b070d +ContestResults_PartyFullText: ; 0x1b070d text "Your party's full," line "so the #MON was" @@ -302,14 +302,14 @@ UnknownText_0x1b070d: ; 0x1b070d done ; 0x1b074e -UnknownText_0x1b074e: ; 0x1b074e +GymStatue_CityGymText: ; 0x1b074e text_from_ram StringBuffer3 text "" line "#MON GYM" done ; 0x1b075c -UnknownText_0x1b075c: ; 0x1b075c +GymStatue_WinningTrainersText: ; 0x1b075c text "LEADER: @" text_from_ram StringBuffer4 text "" @@ -318,13 +318,13 @@ UnknownText_0x1b075c: ; 0x1b075c done ; 0x1b077f -UnknownText_0x1b077f: ; 0x1b077f +CoinVendor_WelcomeText: ; 0x1b077f text "Welcome to the" line "GAME CORNER." done ; 0x1b079c -UnknownText_0x1b079c: ; 0x1b079c +CoinVendor_NoCoinCaseText: ; 0x1b079c text "Do you need game" line "coins?" @@ -334,7 +334,7 @@ UnknownText_0x1b079c: ; 0x1b079c done ; 0x1b07e3 -UnknownText_0x1b07e3: ; 0x1b07e3 +CoinVendor_IntroText: ; 0x1b07e3 text "Do you need some" line "game coins?" @@ -344,31 +344,31 @@ UnknownText_0x1b07e3: ; 0x1b07e3 done ; 0x1b0830 -UnknownText_0x1b0830: ; 0x1b0830 +CoinVendor_Buy50CoinsText: ; 0x1b0830 text "Thank you!" line "Here are 50 coins." done ; 0x1b084f -UnknownText_0x1b084f: ; 0x1b084f +CoinVendor_Buy500CoinsText: ; 0x1b084f text "Thank you! Here" line "are 500 coins." done ; 0x1b086f -UnknownText_0x1b086f: ; 0x1b086f +CoinVendor_NotEnoughMoneyText: ; 0x1b086f text "You don't have" line "enough money." done ; 0x1b088c -UnknownText_0x1b088c: ; 0x1b088c +CoinVendor_CoinCaseFullText: ; 0x1b088c text "Whoops! Your COIN" line "CASE is full." done ; 0x1b08ad -UnknownText_0x1b08ad: ; 0x1b08ad +CoinVendor_CancelText: ; 0x1b08ad text "No coins for you?" line "Come again!" done diff --git a/text/common_3.asm b/text/common_3.asm index 7b15baf5e..c73e91d74 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -1139,7 +1139,7 @@ UnknownText_0x1c10dd: ; 1c10dd prompt ; 1c10fa -UnknownText_0x1c10fa: ; 1c10fa +ContestJudging_FirstPlaceText: ; 1c10fa text "This Bug-Catching" line "Contest winner is@" interpret_data @@ -1154,7 +1154,7 @@ UnknownText_0x1c10fa: ; 1c10fa db "@" ; 1c113f -UnknownText_0x1c113f: ; 1c113f +ContestJudging_FirstPlaceScoreText: ; 1c113f text "" para "The winning score" line "was @" @@ -1163,7 +1163,7 @@ UnknownText_0x1c113f: ; 1c113f prompt ; 1c1166 -UnknownText_0x1c1166: ; 1c1166 +ContestJudging_SecondPlaceText: ; 1c1166 text "Placing second was" line "@" text_from_ram wd016 @@ -1175,7 +1175,7 @@ UnknownText_0x1c1166: ; 1c1166 db "@" ; 1c1196 -UnknownText_0x1c1196: ; 1c1196 +ContestJudging_SecondPlaceScoreText: ; 1c1196 text "" para "The score was" line "@" @@ -1184,7 +1184,7 @@ UnknownText_0x1c1196: ; 1c1196 prompt ; 1c11b5 -UnknownText_0x1c11b5: ; 1c11b5 +ContestJudging_ThirdPlaceText: ; 1c11b5 text "Placing third was" line "@" text_from_ram wd016 @@ -1196,7 +1196,7 @@ UnknownText_0x1c11b5: ; 1c11b5 db "@" ; 1c11e4 -UnknownText_0x1c11e4: ; 1c11e4 +ContestJudging_ThirdPlaceScoreText: ; 1c11e4 text "" para "The score was" line "@" diff --git a/wram.asm b/wram.asm index 9bec48548..188233bc8 100644 --- a/wram.asm +++ b/wram.asm @@ -1320,10 +1320,15 @@ SECTION "WRAM 1", WRAMX, BANK [1] wd000:: ds 1 wd001:: ds 1 wd002:: +PhoneScriptBank:: DefaultFlypoint:: ; d002 ds 1 -wd003:: ds 1 -wd004:: ds 1 +wd003:: +PhoneCallerLo:: + ds 1 +wd004:: +PhoneCallerHi:: + ds 1 wd005:: StartFlypoint:: ; d005 ds 1 @@ -1952,7 +1957,6 @@ wd4cf:: ds 1 wd4d0:: ds 1 wd4d1:: ds 5 - ObjectStructs:: PlayerStruct:: ; d4d6 @@ -2002,29 +2006,29 @@ PlayerSpriteY:: ; d4ee ds 15 ObjectStruct1:: ; d4fe - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct2:: ; d526 - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct3:: ; d54e - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct4:: ; d576 - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct5:: ; d59e - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct6:: ; d5c6 - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct7:: ; d5ee - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct8:: ; d616 - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct9:: ; d63e - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct10:: ; d666 - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct11:: ; d68e - ds 40 + ds OBJECT_STRUCT_LENGTH ObjectStruct12:: ; d6b6 - ds 40 + ds OBJECT_STRUCT_LENGTH ; d6de wd6de:: -- cgit v1.2.3 From 7054bfe71718d5b327bbd3725c82d2431c7fcfb1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 15 Jul 2015 21:40:23 -0400 Subject: More annotations --- main.asm | 701 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 356 insertions(+), 345 deletions(-) diff --git a/main.asm b/main.asm index 42ea98d34..baee2e48a 100644 --- a/main.asm +++ b/main.asm @@ -2217,7 +2217,7 @@ Function6f3e: ; 6f3e ; 6f5b .data_6f5b - db 1, 2, 8, 4 + db 1 << DOWN, 1 << UP, 1 << RIGHT, 1 << LEFT ; 6f5f Function6f5f: ; 6f5f @@ -2242,20 +2242,20 @@ Function6f5f: ; 6f5f ; 6f7b .data_6f7b - db 2, 1, 4, 8 + db 1 << UP, 1 << DOWN, 1 << LEFT, 1 << RIGHT ; 6f7f Function6f7f: ; 6f7f ld d, a and $f0 cp $b0 - jr z, .asm_6f8c + jr z, .done cp $c0 - jr z, .asm_6f8c + jr z, .done xor a ret -.asm_6f8c +.done ld a, d and 7 ld e, a @@ -2356,12 +2356,12 @@ CheckFacingObject:: ; 6fd9 ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld a, [hl] - cp $ff - jr z, .asm_7007 + cp STANDING + jr z, .standing xor a ret -.asm_7007 +.standing scf ret ; 7009 @@ -2393,23 +2393,23 @@ Function7021: ; 7021 ld e, [hl] call GetSpriteDirection and a - jr z, .asm_703b - cp $4 - jr z, .asm_703d - cp $8 - jr z, .asm_703f + jr z, .down + cp UP << 2 + jr z, .up + cp LEFT << 2 + jr z, .left inc d ret -.asm_703b +.down inc e ret -.asm_703d +.up dec e ret -.asm_703f +.left dec d ret ; 7041 @@ -2417,71 +2417,71 @@ Function7021: ; 7021 Function7041: ; 7041 ld bc, ObjectStructs xor a -.asm_7045 +.loop ld [$ffb0], a call GetObjectSprite - jr z, .asm_7093 + jr z, .nope ld hl, OBJECT_04 add hl, bc bit 7, [hl] - jr nz, .asm_7093 + jr nz, .nope ld hl, OBJECT_PALETTE add hl, bc bit 7, [hl] - jr z, .asm_7063 + jr z, .got call Function7171 - jr nc, .asm_707b - jr .asm_7073 + jr nc, .ok + jr .ok2 -.asm_7063 +.got ld hl, OBJECT_MAP_X add hl, bc ld a, [hl] cp d - jr nz, .asm_707b + jr nz, .ok ld hl, OBJECT_MAP_Y add hl, bc ld a, [hl] cp e - jr nz, .asm_707b + jr nz, .ok -.asm_7073 +.ok2 ld a, [$ffaf] ld l, a ld a, [$ffb0] cp l - jr nz, .asm_70a2 + jr nz, .setcarry -.asm_707b +.ok ld hl, OBJECT_NEXT_MAP_X add hl, bc ld a, [hl] cp d - jr nz, .asm_7093 + jr nz, .nope ld hl, OBJECT_NEXT_MAP_Y add hl, bc ld a, [hl] cp e - jr nz, .asm_7093 + jr nz, .nope ld a, [$ffaf] ld l, a ld a, [$ffb0] cp l - jr nz, .asm_70a2 + jr nz, .setcarry -.asm_7093 - ld hl, ObjectStruct2 - ObjectStruct1 +.nope + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l ld a, [$ffb0] inc a - cp $d - jr nz, .asm_7045 + cp NUM_OBJECT_STRUCTS + jr nz, .loop and a ret -.asm_70a2 +.setcarry scf ret ; 70a4 @@ -2584,7 +2584,7 @@ Function7113: ; 7113 ld e, a ld bc, ObjectStructs xor a -.asm_711f +.loop ld [$ffb0], a call GetObjectSprite jr z, .asm_7160 @@ -2627,14 +2627,14 @@ Function7113: ; 7113 jr .asm_716f .asm_7160 - ld hl, ObjectStruct2 - ObjectStruct1 + ld hl, OBJECT_STRUCT_LENGTH add hl, bc ld b, h ld c, l ld a, [$ffb0] inc a - cp $d - jr nz, .asm_711f + cp NUM_OBJECT_STRUCTS + jr nz, .loop xor a ret @@ -2729,13 +2729,13 @@ ChangeHappiness: ; 71c2 ld a, [de] cp 100 ld e, 0 - jr c, .asm_71ef + jr c, .ok inc e cp 200 - jr c, .asm_71ef + jr c, .ok inc e -.asm_71ef +.ok dec c ld b, 0 ld hl, .Actions @@ -2751,16 +2751,16 @@ ChangeHappiness: ; 71c2 ld a, [de] jr nc, .negative add [hl] - jr nc, .asm_720d - ld a, $ff - jr .asm_720d + jr nc, .done + ld a, -1 + jr .done .negative add [hl] - jr c, .asm_720d + jr c, .done xor a -.asm_720d +.done ld [de], a ld a, [IsInBattle] and a @@ -2776,23 +2776,23 @@ ChangeHappiness: ; 71c2 ; 7221 .Actions - db +5, +3, +2 - db +5, +3, +2 - db +1, +1, +0 + db +5, +3, +2 ; Gained a level + db +5, +3, +2 ; Used a stat-boosting item (vitamin or X-item) + db +1, +1, +0 db +3, +2, +1 ; Battled a Gym Leader db +1, +1, +0 ; Learned a move - db -1, -1, -1 - db -5, -5, -10 - db -5, -5, -10 - db +1, +1, +1 - db +3, +3, +1 - db +5, +5, +2 - db +1, +1, +1 - db +3, +3, +1 - db +10, +10, +4 - db -5, -5, -10 - db -10, -10, -15 - db -15, -15, -20 + db -1, -1, -1 ; Lost to an enemy + db -5, -5, -10 + db -5, -5, -10 ; Lost to a much weaker enemy + db +1, +1, +1 + db +3, +3, +1 + db +5, +5, +2 + db +1, +1, +1 + db +3, +3, +1 + db +10, +10, +4 + db -5, -5, -10 ; Used Heal Powder or Energypowder (bitter) + db -10, -10, -15 ; Used Energy Root (bitter) + db -15, -15, -20 ; Used Revival Herb (bitter) db +3, +3, +1 db +10, +6, +4 ; 725a @@ -3095,21 +3095,21 @@ Function7420: ; 7420 jr c, .asm_744e ld a, [CurPartySpecies] cp EGG - jr z, .asm_7453 + jr z, .egg push hl call GetCurNick call CopyPokemonName_Buffer1_Buffer3 pop hl call Random -.next +.loop sub [hl] - jr c, .asm_7444 + jr c, .ok inc hl inc hl inc hl - jr .next + jr .loop -.asm_7444 +.ok inc hl ld a, [hli] ld [ScriptVar], a @@ -3122,7 +3122,7 @@ Function7420: ; 7420 ld [ScriptVar], a ret -.asm_7453 +.egg ld a, $1 ld [ScriptVar], a ret @@ -4147,7 +4147,7 @@ PredefPointers:: ; 856b add_predef GetTrainerPic add_predef DecompressPredef ; $40 add_predef Function347d3 - add_predef Functionfb908 + add_predef ConvertMon_1to2 add_predef Functionfb877 add_predef Functiond0000 add_predef Function50d0a @@ -7834,7 +7834,7 @@ Functiond784: ; d784 .asm_d795 push hl add hl, de - ld a, $7f + ld a, " " ld [hli], a ld [hli], a ld [hld], a @@ -11981,7 +11981,7 @@ Function11f84: ; 11f84 (4:5f84) call ByteFill hlcoord 0, 6 ld bc, $f0 - ld a, $7f + ld a, " " call ByteFill hlcoord 1, 1 ld bc, $412 @@ -11990,21 +11990,21 @@ Function11f84: ; 11f84 (4:5f84) Function11fa9: ; 11fa9 (4:5fa9) hlcoord 1, 7 - ld b, $6 -.asm_11fae - ld c, $13 -.asm_11fb0 + ld b, 6 +.next + ld c, SCREEN_WIDTH - 1 +.loop ld a, [de] ld [hli], a inc de dec c - jr nz, .asm_11fb0 + jr nz, .loop push de - ld de, $15 + ld de, 21 add hl, de pop de dec b - jr nz, .asm_11fae + jr nz, .next ret Function11fc0: ; 11fc0 (4:5fc0) @@ -12048,8 +12048,7 @@ Function12008: ; 12008 (4:6008) ld e, a ld d, 0 ld hl, Jumptable_12017 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -13202,12 +13201,7 @@ StartMenu:: ; 125cd ld a, [hli] ld h, [hl] ld l, a - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 6 ret ; 12829 @@ -17000,7 +16994,7 @@ AddSpriteGFX: ; 142e5 LoadSpriteGFX: ; 14306 ; Bug: b is not preserved, so -; it's useless as a loop count. +; it's useless as a next count. ld hl, UsedSprites ld b, SPRITE_GFX_LIST_CAPACITY @@ -17058,7 +17052,7 @@ SortUsedSprites: ; 1431e .CheckFollowing ld a, [de] cp [hl] - jr nc, .next + jr nc, .loop ; Swap the two sprites. @@ -17078,7 +17072,7 @@ SortUsedSprites: ; 1431e ; Keep doing this until everything's in order. -.next +.loop dec de dec de dec c @@ -17116,10 +17110,10 @@ ArrangeUsedSprites: ; 14355 ; Spill over into the second table after $80 tiles. add b cp $80 - jr z, .next + jr z, .loop jr nc, .SecondTable -.next +.loop ld [hl], b inc hl ld b, a @@ -21571,11 +21565,11 @@ DSTChecks: ; 16439 jr z, .asm_16447 and a ; within one hour of 00:00? jr z, .LostBooklet - jr .next + jr .loop .asm_16447 cp 23 ; within one hour of 23:00? - jr nz, .next + jr nz, .loop ; fallthrough .LostBooklet @@ -21591,7 +21585,7 @@ DSTChecks: ; 16439 call Function13e5 ret -.next +.loop call Function164ea bccoord 1, 14 ld a, [wDST] @@ -29634,7 +29628,7 @@ Function2805d: ; 2805d ld [wd265], a push hl push de - callab Functionfb908 + callab ConvertMon_1to2 pop de pop hl ld a, [wd265] @@ -30141,7 +30135,7 @@ Function28499: ; 28499 ld [wd265], a push hl push de - callab Functionfb8f1 + callab ConvertMon_2to1 pop de pop hl ld a, [wd265] @@ -30181,7 +30175,7 @@ Function284f6: ; 284f6 push bc ld a, [hl] ld [wd265], a - callab Functionfb8f1 + callab ConvertMon_2to1 pop bc pop de ld a, [wd265] @@ -30461,7 +30455,7 @@ Function286ba: ; 286ba push bc push de ld [wd265], a - callab Functionfb908 + callab ConvertMon_1to2 pop de pop bc ld a, [wd265] @@ -33845,13 +33839,13 @@ Function2a138:: ; 2a138 ld de, PartyMon2 - PartyMon1 ld a, [PartyCount] ld c, a -.next +.loop ld a, [hl] cp CLEANSE_TAG jr z, .asm_2a14c add hl, de dec c - jr nz, .next + jr nz, .loop ret .asm_2a14c @@ -36254,14 +36248,14 @@ ConvertBerriesToBerryJuice: ; 2ede6 push hl ld a, [hl] cp SHUCKLE - jr nz, .nextMon + jr nz, .loopMon ld bc, PartyMon1Item - PartyMon1Species add hl, bc ld a, [hl] cp BERRY jr z, .convertToJuice -.nextMon +.loopMon pop hl ld bc, PartyMon2 - PartyMon1 add hl, bc @@ -36673,10 +36667,10 @@ ReadTrainerParty: ; 39771 .skip_trainer dec b jr z, .got_trainer -.next +.loop ld a, [hli] cp $ff - jr nz, .next + jr nz, .loop jr .skip_trainer .got_trainer @@ -43281,13 +43275,13 @@ CheckOwnMonAnywhere: ; 0x4a721 ld bc, sBoxMonOT .openboxmon call CheckOwnMon - jr nc, .next + jr nc, .loop ; found! call CloseSRAM ret -.next +.loop push bc ld bc, sBoxMon2 - sBoxMon1 add hl, bc @@ -43306,7 +43300,7 @@ CheckOwnMonAnywhere: ; 0x4a721 ld a, [wCurBox] and $f cp c - jr z, .nextbox + jr z, .loopbox ; Load the box. ld hl, BoxAddressTable1 @@ -43323,7 +43317,7 @@ CheckOwnMonAnywhere: ; 0x4a721 ; Number of monsters in the box ld a, [hl] and a - jr z, .nextbox + jr z, .loopbox push bc @@ -43344,14 +43338,14 @@ CheckOwnMonAnywhere: ; 0x4a721 .boxmon call CheckOwnMon - jr nc, .nextboxmon + jr nc, .loopboxmon ; found! pop bc call CloseSRAM ret -.nextboxmon +.loopboxmon push bc ld bc, sBoxMon2 - sBoxMon1 add hl, bc @@ -43361,7 +43355,7 @@ CheckOwnMonAnywhere: ; 0x4a721 jr nz, .boxmon pop bc -.nextbox +.loopbox inc c ld a, c cp NUM_BOXES @@ -49499,7 +49493,7 @@ CheckAnyFaintedMon: ; 507fb ld a, [hli] or [hl] - jr z, .asm_5081d + jr z, .done .next pop hl @@ -49510,7 +49504,7 @@ CheckAnyFaintedMon: ; 507fb xor a ret -.asm_5081d +.done pop hl pop af scf @@ -53701,14 +53695,14 @@ Function82236: ; 82236 ld hl, $ffa9 ld a, [hl] and $4 - jr nz, .next7 + jr nz, .loop7 ld a, [hl] and $2 jr nz, .asm_82299 call Function822f0 ret -.next7 +.loop7 ld hl, wcf64 ld a, [hl] inc a @@ -56532,9 +56526,9 @@ ShowPlayerNamingChoices: ; 88297 ld hl, ChrisNameMenuHeader ld a, [PlayerGender] bit 0, a - jr z, .GotGender + jr z, .GotClass ld hl, KrisNameMenuHeader -.GotGender +.GotClass call LoadMenuDataHeader call InterpretMenu2 ld a, [wcfa9] @@ -56588,15 +56582,15 @@ Unknown_882f9: ; 882f9 db " NAME @" ; title ; 88318 -Function88318: ; 88318 +GetPlayerNameArray: ; 88318 This Function is never called ld hl, PlayerName ld de, Unknown_882c9 ld a, [PlayerGender] bit 0, a - jr z, .asm_88328 + jr z, .done ld de, Unknown_882f9 -.asm_88328 +.done call InitName ret ; 8832c @@ -56624,9 +56618,9 @@ Function8833e: ; 8833e ld hl, ChrisCardPic ld a, [PlayerGender] bit 0, a - jr z, .asm_8834b + jr z, .GotClass ld hl, KrisCardPic -.asm_8834b +.GotClass ld de, $9000 ld bc, $230 ld a, BANK(ChrisCardPic) ; BANK(KrisCardPic) @@ -56663,7 +56657,7 @@ GetChrisBackpic: ; 88830 ld hl, ChrisBackpic ld b, BANK(ChrisBackpic) ld de, $9310 - ld c, $31 + ld c, 7 * 7 predef DecompressPredef ret ; 88840 @@ -56675,22 +56669,22 @@ Function88840: ; 88840 ld e, 0 ld a, [PlayerGender] bit 0, a - jr z, .asm_88851 + jr z, .GotClass ld e, 1 -.asm_88851 +.GotClass ld a, e ld [TrainerClass], a ld de, ChrisPic ld a, [PlayerGender] bit 0, a - jr z, .asm_88862 + jr z, .GotPic ld de, KrisPic -.asm_88862 +.GotPic ld hl, VTiles2 ld b, BANK(ChrisPic) ; BANK(KrisPic) - ld c, $31 + ld c, 7 * 7 call Get2bpp call WaitBGMap ld a, $1 @@ -56808,30 +56802,32 @@ Function8917a: ; 8917a (22:517a) ret Function89185: ; 89185 (22:5185) +; Compares c bytes starting at de and hl and incrementing together until a match is found. push de push hl -.asm_89187 +.loop ld a, [de] inc de cp [hl] - jr nz, .asm_89190 + jr nz, .done inc hl dec c - jr nz, .asm_89187 -.asm_89190 + jr nz, .loop +.done pop hl pop de ret Function89193: ; 89193 +; Copies c bytes from hl to de. push de push hl -.asm_89195 +.loop ld a, [hli] ld [de], a inc de dec c - jr nz, .asm_89195 + jr nz, .loop pop hl pop de ret @@ -56839,16 +56835,17 @@ Function89193: ; 89193 Function8919e: ; 8919e (22:519e) +; Searches for the c'th string starting at de. Returns the pointer in de. ld a, c and a ret z -.asm_891a1 +.loop ld a, [de] inc de - cp $50 - jr nz, .asm_891a1 + cp "@" + jr nz, .loop dec c - jr nz, .asm_891a1 + jr nz, .loop ret Function891ab: ; 891ab @@ -56909,13 +56906,13 @@ Function891fe: ; 891fe ; 89209 Function89209: ; 89209 - ld a, $1 + ld a, 1 ld [wc2ce], a ret ; 8920f Function8920f: ; 8920f - ld a, $0 + ld a, 0 ld [wc2ce], a ret ; 89215 @@ -56934,11 +56931,11 @@ Function89215: ; 89215 Function8921f: ; 8921f (22:521f) push de - ld de, $14 + ld de, SCREEN_WIDTH add hl, de inc hl ld a, $7f -.asm_89227 +.loop push bc push hl .asm_89229 @@ -56949,7 +56946,7 @@ Function8921f: ; 8921f (22:521f) add hl, de pop bc dec b - jr nz, .asm_89227 + jr nz, .loop pop de ret @@ -57018,14 +57015,14 @@ Function89261: ; 89261 call WriteBackup call Function8920f pop af - jr c, .asm_892a1 + jr c, .done ld a, [wcfa9] cp $2 - jr z, .asm_892a1 + jr z, .done and a ret -.asm_892a1 +.done scf ret ; 892a3 @@ -57051,49 +57048,49 @@ Function892b4: ; 892b4 (22:52b4) Function892b7: ; 892b7 ld d, b ld e, c - ld hl, $0000 + ld hl, 0 add hl, bc - ld a, $50 - ld bc, $0006 + ld a, "@" + ld bc, 6 call ByteFill ld b, d ld c, e - ld hl, $0006 + ld hl, 6 add hl, bc - ld a, $50 - ld bc, $0006 + ld a, "@" + ld bc, 6 call ByteFill ld b, d ld c, e - ld hl, $000c + ld hl, 12 add hl, bc xor a ld [hli], a ld [hl], a - ld hl, $000e + ld hl, 14 add hl, bc ld [hli], a ld [hl], a - ld hl, $0010 + ld hl, 16 add hl, bc ld [hl], a - ld hl, $0011 + ld hl, 17 add hl, bc - ld a, $ff - ld bc, $0008 + ld a, -1 + ld bc, 8 call ByteFill ld b, d ld c, e - ld e, $6 - ld hl, $0019 + ld e, 6 + ld hl, 25 add hl, bc -.asm_892fb - ld a, $ff +.loop + ld a, -1 ld [hli], a - ld a, $ff + ld a, -1 ld [hli], a dec e - jr nz, .asm_892fb + jr nz, .loop ret ; 89305 @@ -57101,8 +57098,8 @@ Function892b7: ; 892b7 Function89305: ; 89305 (22:5305) xor a ld [MenuSelection], a - ld c, $28 -.asm_8930b + ld c, 40 +.loop ld a, [MenuSelection] inc a ld [MenuSelection], a @@ -57110,7 +57107,7 @@ Function89305: ; 89305 (22:5305) call Function892b4 pop bc dec c - jr nz, .asm_8930b + jr nz, .loop ret Function8931b: ; 8931b @@ -57127,29 +57124,30 @@ Function8931b: ; 8931b ; 8932d Function8932d: ; 8932d - ld hl, $0000 + ld hl, 0 add hl, bc Function89331: ; 89331 +; Scans up to 5 characters starting at hl, looking for a nonspace character up to the next terminator. Sets carry if it does not find a nonspace character. Returns the location of the following character in hl. push bc - ld c, $5 -.asm_89334 + ld c, 5 +.loop ld a, [hli] - cp $50 - jr z, .asm_89340 - cp $7f - jr nz, .asm_89343 + cp "@" + jr z, .terminator + cp " " + jr nz, .nonspace dec c - jr nz, .asm_89334 + jr nz, .loop -.asm_89340 +.terminator scf - jr .asm_89344 + jr .done -.asm_89343 +.nonspace and a -.asm_89344 +.done pop bc ret ; 89346 @@ -57158,62 +57156,64 @@ Function89331: ; 89331 Function89346: ; 89346 (22:5346) ld h, b ld l, c - jr asm_8934e + jr _continue Function8934a: ; 8934a - ld hl, $0006 + ld hl, 6 add hl, bc -asm_8934e: +_continue: +; Scans up to 5 characters starting at hl, looking for a nonspace character up to the next terminator. Sets carry if it does not find a nonspace character. Returns the location of the following character in hl. push bc - ld c, $5 -.asm_89351 + ld c, 5 +.loop ld a, [hli] - cp $50 - jr z, .asm_8935d - cp $7f - jr nz, .asm_89360 + cp "@" + jr z, .terminator + cp " " + jr nz, .nonspace dec c - jr nz, .asm_89351 + jr nz, .loop -.asm_8935d +.terminator scf - jr .asm_89361 + jr .done -.asm_89360 +.nonspace and a -.asm_89361 +.done pop bc ret ; 89363 Function89363: ; 89363 +; Scans six byte pairs starting at bc to find $ff. Sets carry if it does not find a $ff. Returns the location of the byte after the first $ff found in hl. ld h, b ld l, c - jr .asm_8936b + jr ._continue - ld hl, $0019 + ld hl, 25 add hl, bc -.asm_8936b +._continue push de - ld e, $6 -.asm_8936e + ld e, 6 +.loop ld a, [hli] - cp $ff - jr nz, .asm_8937e + cp -1 + jr nz, .ok ld a, [hli] - cp $ff - jr nz, .asm_8937e + cp -1 + jr nz, .ok dec e - jr nz, .asm_8936e + jr nz, .loop scf - jr .asm_8937f + jr .done -.asm_8937e +.ok and a -.asm_8937f +.done pop de ret ; 89381 @@ -57222,16 +57222,16 @@ Function89381: ; 89381 push bc push de call Function89b45 - jr c, .asm_89392 + jr c, .ok push hl - ld a, $ff - ld bc, $0008 + ld a, -1 + ld bc, 8 call ByteFill pop hl -.asm_89392 +.ok pop de - ld c, $8 + ld c, 8 call Function89193 pop bc ret @@ -57239,13 +57239,13 @@ Function89381: ; 89381 Function8939a: ; 8939a push bc - ld hl, $0000 + ld hl, 0 add hl, bc ld de, DefaultFlypoint - ld c, $6 + ld c, 6 call Function89193 pop bc - ld hl, $0011 + ld hl, 17 add hl, bc ld de, wd008 call Function89381 @@ -57286,7 +57286,7 @@ Function893e2: ; 893e2 (22:53e2) Function893ef: ; 893ef ld de, VTiles0 ld hl, GFX_8940b - ld bc, $0020 + ld bc, $20 ld a, BANK(GFX_8940b) call FarCopyBytes ret @@ -57318,14 +57318,15 @@ Function8942b: ; 8942b (22:542b) ret Function89448: ; 89448 (22:5448) +; Clears the Sprites array push af ld hl, Sprites - ld d, $60 + ld d, $10 * 6 xor a -.asm_8944f +.loop ld [hli], a dec d - jr nz, .asm_8944f + jr nz, .loop pop af ret @@ -57352,11 +57353,11 @@ Function89464: ; 89464 ; 89481 Function89481: ; 89481 - ld d, $2 + ld d, 2 call Function8934a ret c - ld d, $0 - ld hl, $0010 + ld d, 0 + ld hl, 16 add hl, bc bit 0, [hl] ret z @@ -57366,7 +57367,7 @@ Function89481: ; 89481 Function89492: ; 89492 (22:5492) - ld d, $0 + ld d, 0 ld a, [PlayerGender] bit 0, a ret z @@ -57376,11 +57377,11 @@ Function89492: ; 89492 (22:5492) Function8949c: ; 8949c ld a, [rSVBK] push af - ld a, $5 + ld a, 5 ld [rSVBK], a ld hl, Palette_894b3 ld de, Unkn1Pals + 8 * 7 - ld bc, $0008 + ld bc, 8 call CopyBytes pop af ld [rSVBK], a @@ -57419,22 +57420,21 @@ Function894dc: ; 894dc push bc ld a, [rSVBK] push af - ld a, $5 + ld a, 5 ld [rSVBK], a ld c, d ld b, 0 ld hl, Unknown_89509 - add hl, bc - add hl, bc + add_n_times hl, bc, 2 ld a, [hli] ld h, [hl] ld l, a ld de, Unkn1Pals - ld bc, $0018 + ld bc, 24 call CopyBytes ld hl, Palette_89557 ld de, wd018 - ld bc, $0018 + ld bc, 24 call CopyBytes pop af ld [rSVBK], a @@ -57515,7 +57515,7 @@ Palette_89557: ; 89557 Function8956f: ; 8956f push bc - ld hl, $0010 + ld hl, 16 add hl, bc ld d, h ld e, l @@ -57528,20 +57528,19 @@ Function8956f: ; 8956f ld [TrainerClass], a ld a, [rSVBK] push af - ld a, $5 + ld a, 5 ld [rSVBK], a ld hl, wd030 - ld a, $ff + ld a, -1 ld [hli], a - ld a, $7f + ld a, " " ld [hl], a pop af ld [rSVBK], a ld a, [TrainerClass] - ld h, $0 + ld h, 0 ld l, a - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ld de, TrainerPalettes add hl, de ld a, [rSVBK] @@ -57549,15 +57548,15 @@ Function8956f: ; 8956f ld a, $5 ld [rSVBK], a ld de, wd032 - ld c, $4 -.asm_895b1 + ld c, 4 +.loop ld a, BANK(TrainerPalettes) call GetFarByte ld [de], a inc de inc hl dec c - jr nz, .asm_895b1 + jr nz, .loop ld hl, wd036 xor a ld [hli], a @@ -57572,11 +57571,11 @@ Function8956f: ; 8956f Function895c7: ; 895c7 (22:55c7) ld a, [rSVBK] ; $ff00+$70 push af - ld a, $5 + ld a, 5 ld [rSVBK], a ; $ff00+$70 ld hl, Palette_895de ld de, wd030 - ld bc, $8 + ld bc, 8 call CopyBytes pop af ld [rSVBK], a ; $ff00+$70 @@ -57591,7 +57590,7 @@ Palette_895de: ; 895de ; 895e6 Function895e6: ; 895e6 - ld a, $7 + ld a, 7 ld hl, AttrMap ld bc, $0168 call ByteFill @@ -57612,77 +57611,77 @@ Function895f2: ; 895f2 Function89605: ; 89605 hlcoord 19, 2, AttrMap - ld a, $1 - ld de, $0014 - ld c, $e -.asm_8960f + ld a, 1 + ld de, SCREEN_WIDTH + ld c, 14 +.loop ld [hl], a dec c - jr z, .asm_8961b + jr z, .done add hl, de inc a ld [hl], a dec a add hl, de dec c - jr nz, .asm_8960f + jr nz, .loop -.asm_8961b +.done hlcoord 0, 16, AttrMap - ld c, $a - ld a, $2 -.asm_89622 + ld c, 10 + ld a, 2 +.loop2 ld [hli], a dec a ld [hli], a inc a dec c - jr nz, .asm_89622 + jr nz, .loop2 hlcoord 1, 11, AttrMap - ld a, $4 - ld bc, $0004 + ld a, 4 + ld bc, 4 call ByteFill - ld a, $5 - ld bc, $000e + ld a, 5 + ld bc, 14 call ByteFill ret ; 8963d Function8963d: ; 8963d hlcoord 12, 3, AttrMap - ld a, $6 - ld de, $0014 + ld a, 6 + ld de, SCREEN_WIDTH ld bc, $0707 -.asm_89648 +.loop push hl - ld c, $7 -.asm_8964b + ld c, 7 +.next ld [hli], a dec c - jr nz, .asm_8964b + jr nz, .next pop hl add hl, de dec b - jr nz, .asm_89648 + jr nz, .loop ret ; 89655 Function89655: ; 89655 - ld hl, AttrMap + SCREEN_WIDTH * 12 + 1 + hlcoord 1, 12, AttrMap ld de, SCREEN_WIDTH ld a, 5 ld b, 4 -.asm_8965f +.loop ld c, 18 push hl -.asm_89662 +.next ld [hli], a dec c - jr nz, .asm_89662 + jr nz, .next pop hl add hl, de dec b - jr nz, .asm_8965f + jr nz, .loop ret ; 8966c @@ -57690,7 +57689,7 @@ Function8966c: ; 8966c push bc call Function89688 hlcoord 4, 0 - ld c, $8 + ld c, 8 call Function896f5 pop bc ret @@ -57701,73 +57700,73 @@ Function8967a: ; 8967a (22:567a) push bc call Function89688 hlcoord 2, 0 - ld c, $c + ld c, 12 call Function896f5 pop bc ret Function89688: ; 89688 ld hl, TileMap - ld a, $1 - ld e, $14 + ld a, 1 + ld e, SCREEN_WIDTH call Function896e1 - ld a, $2 - ld e, $14 + ld a, 2 + ld e, SCREEN_WIDTH call Function896eb - ld a, $3 + ld a, 3 ld [hli], a - ld a, $4 - ld e, $12 + ld a, 4 + ld e, SCREEN_HEIGHT call Function896e1 - ld a, $6 + ld a, 6 ld [hli], a push bc - ld c, $d -.asm_896a9 + ld c, 13 +.loop call Function896cb dec c - jr z, .asm_896b5 + jr z, .done call Function896d6 dec c - jr nz, .asm_896a9 + jr nz, .loop -.asm_896b5 +.done pop bc - ld a, $19 + ld a, 25 ld [hli], a - ld a, $1a - ld e, $12 + ld a, 26 + ld e, SCREEN_HEIGHT call Function896e1 - ld a, $1c + ld a, 28 ld [hli], a - ld a, $2 - ld e, $14 + ld a, 2 + ld e, SCREEN_WIDTH call Function896eb ret ; 896cb Function896cb: ; 896cb - ld de, $0013 - ld a, $7 + ld de, SCREEN_WIDTH - 1 + ld a, 7 ld [hl], a add hl, de - ld a, $9 + ld a, 9 ld [hli], a ret ; 896d6 Function896d6: ; 896d6 - ld de, $0013 - ld a, $a + ld de, SCREEN_WIDTH - 1 + ld a, 10 ld [hl], a add hl, de - ld a, $b + ld a, 11 ld [hli], a ret ; 896e1 Function896e1: ; 896e1 -.asm_896e1 +.loop ld [hli], a inc a dec e @@ -57775,12 +57774,12 @@ Function896e1: ; 896e1 ld [hli], a dec a dec e - jr nz, .asm_896e1 + jr nz, .loop ret ; 896eb Function896eb: ; 896eb -.asm_896eb +.loop ld [hli], a dec a dec e @@ -57788,7 +57787,7 @@ Function896eb: ; 896eb ld [hli], a inc a dec e - jr nz, .asm_896eb + jr nz, .loop ret ; 896f5 @@ -76756,21 +76755,21 @@ Functionb8762: ; b8762 (2e:4762) ld a, BANK(WildMons1) call GetFarByte cp $ff - jr z, .asm_b87ec + jr z, .done2 inc hl cp b jr nz, .next ld a, BANK(WildMons1) call GetFarByte cp c - jr z, .asm_b8796 + jr z, .done .next dec hl ld de, $2f add hl, de jr .loop -.asm_b8796 +.done inc hl inc hl inc hl @@ -76784,13 +76783,13 @@ Functionb8762: ; b8762 (2e:4762) ld bc, $e call AddNTimes -.asm_b87a9 +.loop2 call Random and 7 cp 2 - jr c, .asm_b87a9 + jr c, .loop2 cp 5 - jr nc, .asm_b87a9 + jr nc, .loop2 ld e, a ld d, 0 add hl, de @@ -76815,7 +76814,7 @@ Functionb8762: ; b8762 (2e:4762) ld a, $e jp Functionb86ea -.asm_b87ec +.done2 pop bc ld a, $0 jp Functionb86ea @@ -85938,7 +85937,7 @@ _OptionsMenu: ; e41d0 xor a ld [wcf63], a ld c, $6 ;number of items on the menu minus 1 (for cancel) -.asm_e41f3 ;this loop will display the settings of each option when the menu is opened +.asm_e41f3 ;this next will display the settings of each option when the menu is opened push bc xor a ld [$ffa9], a @@ -89632,18 +89631,19 @@ Functionfb8c8: ; fb8c8 ret ; fb8f1 -Functionfb8f1: ; fb8f1 +ConvertMon_2to1: ; fb8f1 +; Takes the Gen-2 Pokemon number stored in wd265, finds it in the Pokered_MonIndices table, and returns its index in wd265. push bc push hl ld a, [wd265] ld b, a ld c, 0 - ld hl, Unknown_fb91c -.asm_fb8fc + ld hl, Pokered_MonIndices +.loop inc c ld a, [hli] cp b - jr nz, .asm_fb8fc + jr nz, .loop ld a, c ld [wd265], a pop hl @@ -89651,12 +89651,13 @@ Functionfb8f1: ; fb8f1 ret ; fb908 -Functionfb908: ; fb908 +ConvertMon_1to2: ; fb908 +; Takes the Gen-1 Pokemon number stored in wd265 and returns the corresponding value from Pokered_MonIndices in wd265. push bc push hl ld a, [wd265] dec a - ld hl, Unknown_fb91c + ld hl, Pokered_MonIndices ld b, 0 ld c, a add hl, bc @@ -89667,7 +89668,7 @@ Functionfb908: ; fb908 ret ; fb91c -Unknown_fb91c: ; fb91c +Pokered_MonIndices: ; fb91c db RHYDON db KANGASKHAN db NIDORAN_M @@ -90004,32 +90005,42 @@ UnownWords: ; fba5a dw UnownWord26 ; fba90 -UnownWord1: db $40, $4d, $46, $51, $58, $ff ; ANGRY -UnownWord2: db $41, $44, $40, $51, $ff ; BEAR -UnownWord3: db $42, $47, $40, $52, $44, $ff ; CHASE -UnownWord4: db $43, $48, $51, $44, $42, $53, $ff ; DIRECT -UnownWord5: db $44, $4d, $46, $40, $46, $44, $ff ; ENGAGE -UnownWord6: db $45, $48, $4d, $43, $ff ; FIND -UnownWord7: db $46, $48, $55, $44, $ff ; GIVE -UnownWord8: db $47, $44, $4b, $4f, $ff ; HELP -UnownWord9: db $48, $4d, $42, $51, $44, $40, $52, $44, $ff ; INCREASE -UnownWord10: db $49, $4e, $48, $4d, $ff ; JOIN -UnownWord11: db $4a, $44, $44, $4f, $ff ; KEEP -UnownWord12: db $4b, $40, $54, $46, $47, $ff ; LAUGH -UnownWord13: db $4c, $40, $4a, $44, $ff ; MAKE -UnownWord14: db $4d, $54, $59, $59, $4b, $44, $ff ; NUZZLE -UnownWord15: db $4e, $41, $52, $44, $51, $55, $44, $ff ; OBSERVE -UnownWord16: db $4f, $44, $51, $45, $4e, $51, $4c, $ff ; PERFORM -UnownWord17: db $50, $54, $48, $42, $4a, $44, $4d, $ff ; QUICKEN -UnownWord18: db $51, $44, $40, $52, $52, $54, $51, $44, $ff ; REASSURE -UnownWord19: db $52, $44, $40, $51, $42, $47, $ff ; SEARCH -UnownWord20: db $53, $44, $4b, $4b, $ff ; TELL -UnownWord21: db $54, $4d, $43, $4e, $ff ; UNDO -UnownWord22: db $55, $40, $4d, $48, $52, $47, $ff ; VANISH -UnownWord23: db $56, $40, $4d, $53, $ff ; WANT -UnownWord24: db $57, $57, $57, $57, $57, $ff ; XXXXX -UnownWord25: db $58, $48, $44, $4b, $43, $ff ; YIELD -UnownWord26: db $59, $4e, $4e, $4c, $ff ; ZOOM +unownword: macro +x = 1 + rept STRLEN(\1) + db STRSUB(\1, x, 1) - $40 +x = x + 1 + endr + db -1 +endm + + +UnownWord1: unownword "ANGRY" +UnownWord2: unownword "BEAR" +UnownWord3: unownword "CHASE" +UnownWord4: unownword "DIRECT" +UnownWord5: unownword "ENGAGE" +UnownWord6: unownword "FIND" +UnownWord7: unownword "GIVE" +UnownWord8: unownword "HELP" +UnownWord9: unownword "INCREASE" +UnownWord10: unownword "JOIN" +UnownWord11: unownword "KEEP" +UnownWord12: unownword "LAUGH" +UnownWord13: unownword "MAKE" +UnownWord14: unownword "NUZZLE" +UnownWord15: unownword "OBSERVE" +UnownWord16: unownword "PERFORM" +UnownWord17: unownword "QUICKEN" +UnownWord18: unownword "REASSURE" +UnownWord19: unownword "SEARCH" +UnownWord20: unownword "TELL" +UnownWord21: unownword "UNDO" +UnownWord22: unownword "VANISH" +UnownWord23: unownword "WANT" +UnownWord24: unownword "XXXXX" +UnownWord25: unownword "YIELD" +UnownWord26: unownword "ZOOM" ; fbb32 Functionfbb32: ; fbb32 @@ -90811,10 +90822,10 @@ GetTradeMonNames: ; fce1b call Functionfcdf4 ld hl, StringBuffer1 -.next +.loop ld a, [hli] cp "@" - jr nz, .next + jr nz, .loop dec hl push hl @@ -94334,7 +94345,7 @@ UpdateUsedMoves: ; 105ed0 ld hl, PlayerUsedMoves ; get move id ld b, a -; loop count +; next count ld c, NUM_MOVES .loop -- cgit v1.2.3 From 894955f9d922de5fc33e6c0aa7af9795dbcbc158 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 16 Jul 2015 18:10:10 -0400 Subject: Special script annotation, trainer constant enumeration, person-event structure update --- constants/event_flags.asm | 345 ++++--- constants/map_constants.asm | 11 + constants/misc_constants.asm | 1 + constants/pokemon_constants.asm | 56 ++ constants/trainer_constants.asm | 1232 ++++++++++++------------ constants/wram_constants.asm | 2 - engine/events.asm | 22 +- engine/events_2.asm | 24 +- engine/specials.asm | 66 +- engine/std_scripts.asm | 126 +-- home.asm | 13 +- home/map.asm | 210 ++-- macros.asm | 1 + macros/charmap.asm | 1 + main.asm | 438 +++++---- maps/AzaleaGym.asm | 18 +- maps/AzaleaMart.asm | 6 +- maps/AzaleaPokeCenter1F.asm | 8 +- maps/AzaleaTown.asm | 42 +- maps/BattleTower1F.asm | 18 +- maps/BattleTowerBattleRoom.asm | 4 +- maps/BattleTowerElevator.asm | 2 +- maps/BattleTowerHallway.asm | 2 +- maps/BattleTowerOutside.asm | 10 +- maps/BillsHouse.asm | 12 +- maps/BlackthornCity.asm | 32 +- maps/BlackthornDodrioTradeHouse.asm | 6 +- maps/BlackthornDragonSpeechHouse.asm | 4 +- maps/BlackthornGym1F.asm | 14 +- maps/BlackthornGym2F.asm | 16 +- maps/BlackthornMart.asm | 6 +- maps/BlackthornPokeCenter1F.asm | 8 +- maps/BluesHouse.asm | 2 +- maps/BrunosRoom.asm | 6 +- maps/BurnedTower1F.asm | 14 +- maps/BurnedTowerB1F.asm | 18 +- maps/CeladonCafe.asm | 14 +- maps/CeladonCity.asm | 34 +- maps/CeladonDeptStore1F.asm | 10 +- maps/CeladonDeptStore2F.asm | 12 +- maps/CeladonDeptStore3F.asm | 14 +- maps/CeladonDeptStore4F.asm | 10 +- maps/CeladonDeptStore5F.asm | 14 +- maps/CeladonDeptStore6F.asm | 16 +- maps/CeladonDeptStoreElevator.asm | 2 +- maps/CeladonGameCorner.asm | 94 +- maps/CeladonGameCornerPrizeRoom.asm | 8 +- maps/CeladonGym.asm | 16 +- maps/CeladonMansion1F.asm | 14 +- maps/CeladonMansion2F.asm | 6 +- maps/CeladonMansion3F.asm | 16 +- maps/CeladonMansionRoof.asm | 4 +- maps/CeladonMansionRoofHouse.asm | 2 +- maps/CeladonPokeCenter1F.asm | 10 +- maps/CeruleanCity.asm | 30 +- maps/CeruleanGym.asm | 18 +- maps/CeruleanGymBadgeSpeechHouse.asm | 2 +- maps/CeruleanMart.asm | 6 +- maps/CeruleanPokeCenter1F.asm | 6 +- maps/CeruleanPoliceStation.asm | 6 +- maps/CeruleanTradeSpeechHouse.asm | 8 +- maps/CharcoalKiln.asm | 12 +- maps/CherrygroveCity.asm | 18 +- maps/CherrygroveEvolutionSpeechHouse.asm | 8 +- maps/CherrygroveGymSpeechHouse.asm | 8 +- maps/CherrygroveMart.asm | 6 +- maps/CherrygrovePokeCenter1F.asm | 8 +- maps/CianwoodCity.asm | 40 +- maps/CianwoodCityPhotoStudio.asm | 2 +- maps/CianwoodGym.asm | 22 +- maps/CianwoodLugiaSpeechHouse.asm | 10 +- maps/CianwoodPharmacy.asm | 6 +- maps/CianwoodPokeCenter1F.asm | 8 +- maps/CinnabarIsland.asm | 10 +- maps/CinnabarPokeCenter1F.asm | 6 +- maps/Colosseum.asm | 44 +- maps/CopycatsHouse1F.asm | 6 +- maps/CopycatsHouse2F.asm | 16 +- maps/DanceTheatre.asm | 22 +- maps/DarkCaveBlackthornEntrance.asm | 6 +- maps/DarkCaveVioletEntrance.asm | 18 +- maps/DayCare.asm | 8 +- maps/DiglettsCave.asm | 4 +- maps/DragonShrine.asm | 18 +- maps/DragonsDenB1F.asm | 30 +- maps/EarlsPokemonAcademy.asm | 20 +- maps/EcruteakCity.asm | 30 +- maps/EcruteakGym.asm | 18 +- maps/EcruteakHouse.asm | 12 +- maps/EcruteakItemfinderHouse.asm | 6 +- maps/EcruteakLugiaSpeechHouse.asm | 6 +- maps/EcruteakMart.asm | 6 +- maps/EcruteakPokeCenter1F.asm | 10 +- maps/ElmsHouse.asm | 10 +- maps/ElmsLab.asm | 44 +- maps/FastShip1F.asm | 8 +- maps/FastShipB1F.asm | 26 +- maps/FastShipCabins_NNW_NNE_NE.asm | 20 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 24 +- maps/FastShipCabins_SW_SSW_NW.asm | 14 +- maps/FightingDojo.asm | 8 +- maps/FuchsiaBillSpeechHouse.asm | 4 +- maps/FuchsiaCity.asm | 24 +- maps/FuchsiaGym.asm | 16 +- maps/FuchsiaMart.asm | 6 +- maps/FuchsiaPokeCenter1F.asm | 8 +- maps/GoldenrodBikeShop.asm | 20 +- maps/GoldenrodBillsHouse.asm | 12 +- maps/GoldenrodCity.asm | 54 +- maps/GoldenrodDeptStore1F.asm | 12 +- maps/GoldenrodDeptStore2F.asm | 14 +- maps/GoldenrodDeptStore3F.asm | 10 +- maps/GoldenrodDeptStore4F.asm | 12 +- maps/GoldenrodDeptStore5F.asm | 74 +- maps/GoldenrodDeptStore6F.asm | 16 +- maps/GoldenrodDeptStoreB1F.asm | 16 +- maps/GoldenrodDeptStoreElevator.asm | 2 +- maps/GoldenrodDeptStoreRoof.asm | 24 +- maps/GoldenrodFlowerShop.asm | 4 +- maps/GoldenrodGameCorner.asm | 86 +- maps/GoldenrodGym.asm | 16 +- maps/GoldenrodHappinessRater.asm | 12 +- maps/GoldenrodMagnetTrainStation.asm | 4 +- maps/GoldenrodNameRatersHouse.asm | 8 +- maps/GoldenrodPPSpeechHouse.asm | 10 +- maps/GoldenrodPokeCenter1F.asm | 10 +- maps/GoldenrodPokeComCenter2FMobile.asm | 16 +- maps/GuideGentsHouse.asm | 6 +- maps/IcePath1F.asm | 6 +- maps/IcePathB1F.asm | 12 +- maps/IcePathB2FBlackthornSide.asm | 4 +- maps/IcePathB2FMahoganySide.asm | 14 +- maps/IcePathB3F.asm | 4 +- maps/IlexForest.asm | 32 +- maps/IlexForestAzaleaGate.asm | 4 +- maps/IndigoPlateauPokeCenter1F.asm | 20 +- maps/KarensRoom.asm | 2 +- maps/KogasRoom.asm | 6 +- maps/KrissHouse1F.asm | 28 +- maps/KrissHouse2F.asm | 16 +- maps/KrissNeighborsHouse.asm | 10 +- maps/KurtsHouse.asm | 38 +- maps/LakeofRage.asm | 34 +- maps/LakeofRageHiddenPowerHouse.asm | 6 +- maps/LakeofRageMagikarpHouse.asm | 8 +- maps/LancesRoom.asm | 8 +- maps/LavRadioTower1F.asm | 14 +- maps/LavenderMart.asm | 6 +- maps/LavenderNameRater.asm | 2 +- maps/LavenderPokeCenter1F.asm | 8 +- maps/LavenderTown.asm | 20 +- maps/LavenderTownSpeechHouse.asm | 6 +- maps/MahoganyGym.asm | 18 +- maps/MahoganyMart1F.asm | 10 +- maps/MahoganyPokeCenter1F.asm | 8 +- maps/MahoganyRedGyaradosSpeechHouse.asm | 4 +- maps/MahoganyTown.asm | 16 +- maps/ManiasHouse.asm | 2 +- maps/MobileBattleRoom.asm | 42 +- maps/MobileTradeRoomMobile.asm | 18 +- maps/MountMoon.asm | 2 +- maps/MountMoonGiftShop.asm | 8 +- maps/MountMoonSquare.asm | 10 +- maps/MountMortar1FInside.asm | 22 +- maps/MountMortar1FOutside.asm | 6 +- maps/MountMortar2FInside.asm | 16 +- maps/MountMortarB1F.asm | 16 +- maps/MoveDeletersHouse.asm | 6 +- maps/MrFujisHouse.asm | 14 +- maps/MrPokemonsHouse.asm | 22 +- maps/MrPsychicsHouse.asm | 6 +- maps/NationalPark.asm | 36 +- maps/NationalParkBugContest.asm | 32 +- maps/NewBarkTown.asm | 14 +- maps/OaksLab.asm | 40 +- maps/OlivineCafe.asm | 6 +- maps/OlivineCity.asm | 22 +- maps/OlivineGoodRodHouse.asm | 2 +- maps/OlivineGym.asm | 8 +- maps/OlivineHouseBeta.asm | 8 +- maps/OlivineLighthouse1F.asm | 4 +- maps/OlivineLighthouse2F.asm | 4 +- maps/OlivineLighthouse3F.asm | 8 +- maps/OlivineLighthouse4F.asm | 4 +- maps/OlivineLighthouse5F.asm | 12 +- maps/OlivineLighthouse6F.asm | 6 +- maps/OlivineMart.asm | 6 +- maps/OlivinePokeCenter1F.asm | 8 +- maps/OlivinePort.asm | 30 +- maps/OlivinePortPassage.asm | 2 +- maps/OlivinePunishmentSpeechHouse.asm | 8 +- maps/OlivineVoltorbHouse.asm | 6 +- maps/PalletTown.asm | 12 +- maps/PewterCity.asm | 24 +- maps/PewterGym.asm | 10 +- maps/PewterMart.asm | 6 +- maps/PewterNidoranSpeechHouse.asm | 4 +- maps/PewterPokeCenter1F.asm | 10 +- maps/PewterSnoozeSpeechHouse.asm | 6 +- maps/PokeCenter2F.asm | 604 ++++++------ maps/PokeSeersHouse.asm | 2 +- maps/PokemonFanClub.asm | 16 +- maps/PowerPlant.asm | 18 +- maps/RadioTower1F.asm | 16 +- maps/RadioTower2F.asm | 34 +- maps/RadioTower3F.asm | 20 +- maps/RadioTower4F.asm | 18 +- maps/RadioTower5F.asm | 20 +- maps/RedsHouse1F.asm | 8 +- maps/RedsHouse2F.asm | 4 +- maps/RockTunnel1F.asm | 8 +- maps/RockTunnelB1F.asm | 8 +- maps/Route1.asm | 8 +- maps/Route10North.asm | 4 +- maps/Route10PokeCenter1F.asm | 8 +- maps/Route10South.asm | 6 +- maps/Route11.asm | 14 +- maps/Route12.asm | 18 +- maps/Route12SuperRodHouse.asm | 2 +- maps/Route13.asm | 18 +- maps/Route14.asm | 8 +- maps/Route15.asm | 16 +- maps/Route15FuchsiaGate.asm | 2 +- maps/Route16.asm | 2 +- maps/Route16FuchsiaSpeechHouse.asm | 6 +- maps/Route16Gate.asm | 2 +- maps/Route17.asm | 12 +- maps/Route1718Gate.asm | 2 +- maps/Route18.asm | 6 +- maps/Route19.asm | 16 +- maps/Route19FuchsiaGate.asm | 2 +- maps/Route2.asm | 28 +- maps/Route20.asm | 8 +- maps/Route21.asm | 6 +- maps/Route22.asm | 2 +- maps/Route23.asm | 2 +- maps/Route24.asm | 2 +- maps/Route25.asm | 26 +- maps/Route26.asm | 18 +- maps/Route26DayofWeekSiblingsHouse.asm | 2 +- maps/Route26HealSpeechHouse.asm | 6 +- maps/Route27.asm | 22 +- maps/Route27SandstormHouse.asm | 6 +- maps/Route28.asm | 4 +- maps/Route28FamousSpeechHouse.asm | 8 +- maps/Route29.asm | 20 +- maps/Route2946Gate.asm | 4 +- maps/Route2Gate.asm | 2 +- maps/Route2NuggetSpeechHouse.asm | 2 +- maps/Route3.asm | 10 +- maps/Route30.asm | 32 +- maps/Route30BerrySpeechHouse.asm | 6 +- maps/Route31.asm | 20 +- maps/Route31VioletGate.asm | 4 +- maps/Route32.asm | 40 +- maps/Route32PokeCenter1F.asm | 6 +- maps/Route32RuinsofAlphGate.asm | 6 +- maps/Route33.asm | 8 +- maps/Route34.asm | 36 +- maps/Route34IlexForestGate.asm | 8 +- maps/Route35.asm | 26 +- maps/Route35Goldenrodgate.asm | 6 +- maps/Route35NationalParkgate.asm | 120 +-- maps/Route36.asm | 26 +- maps/Route36NationalParkgate.asm | 74 +- maps/Route36RuinsofAlphgate.asm | 4 +- maps/Route37.asm | 18 +- maps/Route38.asm | 18 +- maps/Route38EcruteakGate.asm | 2 +- maps/Route39.asm | 28 +- maps/Route39Barn.asm | 6 +- maps/Route39Farmhouse.asm | 8 +- maps/Route4.asm | 12 +- maps/Route40.asm | 28 +- maps/Route40BattleTowerGate.asm | 4 +- maps/Route41.asm | 22 +- maps/Route42.asm | 28 +- maps/Route42EcruteakGate.asm | 2 +- maps/Route43.asm | 22 +- maps/Route43Gate.asm | 6 +- maps/Route43MahoganyGate.asm | 2 +- maps/Route44.asm | 28 +- maps/Route45.asm | 30 +- maps/Route46.asm | 14 +- maps/Route5.asm | 6 +- maps/Route5CleanseTagSpeechHouse.asm | 8 +- maps/Route5SaffronCityGate.asm | 2 +- maps/Route5UndergroundEntrance.asm | 2 +- maps/Route6.asm | 8 +- maps/Route6SaffronGate.asm | 2 +- maps/Route7.asm | 4 +- maps/Route7SaffronGate.asm | 2 +- maps/Route8.asm | 16 +- maps/Route8SaffronGate.asm | 2 +- maps/Route9.asm | 16 +- maps/RuinsofAlphAerodactylChamber.asm | 12 +- maps/RuinsofAlphAerodactylItemRoom.asm | 12 +- maps/RuinsofAlphHoOhChamber.asm | 12 +- maps/RuinsofAlphHoOhItemRoom.asm | 12 +- maps/RuinsofAlphInnerChamber.asm | 58 +- maps/RuinsofAlphKabutoChamber.asm | 16 +- maps/RuinsofAlphKabutoItemRoom.asm | 12 +- maps/RuinsofAlphOmanyteChamber.asm | 12 +- maps/RuinsofAlphOmanyteItemRoom.asm | 12 +- maps/RuinsofAlphOutside.asm | 16 +- maps/RuinsofAlphResearchCenter.asm | 12 +- maps/SafariZoneWardensHome.asm | 10 +- maps/SaffronCity.asm | 32 +- maps/SaffronGym.asm | 14 +- maps/SaffronMart.asm | 6 +- maps/SaffronPokeCenter1F.asm | 8 +- maps/SaffronTrainStation.asm | 8 +- maps/SeafoamGym.asm | 4 +- maps/SilphCo1F.asm | 4 +- maps/SilverCaveItemRooms.asm | 4 +- maps/SilverCaveOutside.asm | 6 +- maps/SilverCavePokeCenter1F.asm | 4 +- maps/SilverCaveRoom1.asm | 12 +- maps/SilverCaveRoom2.asm | 8 +- maps/SilverCaveRoom3.asm | 2 +- maps/SlowpokeWellB1F.asm | 20 +- maps/SlowpokeWellB2F.asm | 4 +- maps/SoulHouse.asm | 8 +- maps/SproutTower1F.asm | 16 +- maps/SproutTower2F.asm | 8 +- maps/SproutTower3F.asm | 26 +- maps/TeamRocketBaseB1F.asm | 32 +- maps/TeamRocketBaseB2F.asm | 80 +- maps/TeamRocketBaseB3F.asm | 50 +- maps/TimeCapsule.asm | 32 +- maps/TinTower1F.asm | 20 +- maps/TinTower3F.asm | 2 +- maps/TinTower4F.asm | 8 +- maps/TinTower5F.asm | 6 +- maps/TinTower6F.asm | 2 +- maps/TinTower7F.asm | 2 +- maps/TinTower8F.asm | 6 +- maps/TinTower9F.asm | 2 +- maps/TinTowerRoof.asm | 2 +- maps/TohjoFalls.asm | 2 +- maps/TradeCenter.asm | 38 +- maps/TrainerHouse1F.asm | 16 +- maps/TrainerHouseB1F.asm | 4 +- maps/Underground.asm | 4 +- maps/UndergroundPathSwitchRoomEntrances.asm | 38 +- maps/UndergroundWarehouse.asm | 20 +- maps/UnionCave1F.asm | 18 +- maps/UnionCaveB1F.asm | 14 +- maps/UnionCaveB2F.asm | 12 +- maps/VermilionCity.asm | 28 +- maps/VermilionGym.asm | 44 +- maps/VermilionHouseDiglettsCaveSpeechHouse.asm | 2 +- maps/VermilionHouseFishingSpeechHouse.asm | 4 +- maps/VermilionMagnetTrainSpeechHouse.asm | 8 +- maps/VermilionMart.asm | 6 +- maps/VermilionPokeCenter1F.asm | 8 +- maps/VermilionPort.asm | 22 +- maps/VermilionPortPassage.asm | 2 +- maps/VictoryRoad.asm | 16 +- maps/VictoryRoadGate.asm | 6 +- maps/VioletCity.asm | 30 +- maps/VioletGym.asm | 12 +- maps/VioletMart.asm | 6 +- maps/VioletNicknameSpeechHouse.asm | 6 +- maps/VioletOnixTradeHouse.asm | 4 +- maps/VioletPokeCenter1F.asm | 10 +- maps/ViridianCity.asm | 20 +- maps/ViridianGym.asm | 8 +- maps/ViridianMart.asm | 6 +- maps/ViridianNicknameSpeechHouse.asm | 8 +- maps/ViridianPokeCenter1F.asm | 8 +- maps/WarehouseEntrance.asm | 60 +- maps/WhirlIslandB1F.asm | 18 +- maps/WhirlIslandB2F.asm | 6 +- maps/WhirlIslandLugiaChamber.asm | 2 +- maps/WhirlIslandNE.asm | 2 +- maps/WhirlIslandSW.asm | 2 +- maps/WillsRoom.asm | 6 +- maps/WiseTriosRoom.asm | 12 +- misc/mobile_40.asm | 2 +- misc/mobile_45.asm | 86 +- wram.asm | 8 +- 382 files changed, 4220 insertions(+), 4076 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index c158a5278..3df321a82 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1,8 +1,8 @@ const_def - const EVENT_000 - const EVENT_001 + const EVENT_CHRIS1_IN_CABLE_CLUB + const EVENT_CHRIS2_IN_CABLE_CLUB const EVENT_002 const EVENT_003 const EVENT_004 @@ -778,16 +778,16 @@ const EVENT_WAREHOUSE_LAYOUT_3 const EVENT_WAREHOUSE_BLOCKED_OFF const EVENT_LEFT_MONS_WITH_CONTEST_OFFICER - const EVENT_309 - const EVENT_WILLS_ROOM_EXIT_OPEN const EVENT_WILLS_ROOM_ENTRANCE_CLOSED - const EVENT_KOGAS_ROOM_EXIT_OPEN + const EVENT_WILLS_ROOM_EXIT_OPEN const EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + const EVENT_KOGAS_ROOM_EXIT_OPEN + const EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED const EVENT_BRUNOS_ROOM_EXIT_OPEN const EVENT_KARENS_ROOM_ENTRANCE_CLOSED const EVENT_KARENS_ROOM_EXIT_OPEN const EVENT_LANCES_ROOM_ENTRANCE_CLOSED - const EVENT_312 + const EVENT_LANCES_ROOM_EXIT_OPEN const EVENT_CONTEST_OFFICER_HAS_SUN_STONE const EVENT_CONTEST_OFFICER_HAS_EVERSTONE const EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY @@ -1001,6 +1001,8 @@ const EVENT_3E5 const EVENT_3E6 const EVENT_3E7 +; Trainer Flags +; Swimmer F const EVENT_BEAT_SWIMMERF_ELAINE const EVENT_BEAT_SWIMMERF_PAULA const EVENT_BEAT_SWIMMERF_KAYLEE @@ -1008,18 +1010,19 @@ const EVENT_BEAT_SWIMMERF_DENISE const EVENT_BEAT_SWIMMERF_KARA const EVENT_BEAT_SWIMMERF_WENDY - const EVENT_3EF - const EVENT_3F0 - const EVENT_3F1 - const EVENT_3F2 + const EVENT_BEAT_SWIMMERF_LISA + const EVENT_BEAT_SWIMMERF_JILL + const EVENT_BEAT_SWIMMERF_MARY + const EVENT_BEAT_SWIMMERF_KATIE const EVENT_BEAT_SWIMMERF_DAWN - const EVENT_3F4 + const EVENT_BEAT_SWIMMERF_TARA const EVENT_BEAT_SWIMMERF_NICOLE const EVENT_BEAT_SWIMMERF_LORI - const EVENT_3F7 + const EVENT_BEAT_SWIMMERF_JODY const EVENT_BEAT_SWIMMERF_NIKKI const EVENT_BEAT_SWIMMERF_DIANA const EVENT_BEAT_SWIMMERF_BRIANA +; Bird Keeper const EVENT_BEAT_BIRD_KEEPER_ROD const EVENT_BEAT_BIRD_KEEPER_ABE const EVENT_BEAT_BIRD_KEEPER_BRYAN @@ -1031,17 +1034,19 @@ const EVENT_BEAT_BIRD_KEEPER_ROY const EVENT_BEAT_BIRD_KEEPER_BORIS const EVENT_BEAT_BIRD_KEEPER_BOB - const EVENT_406 - const EVENT_BEAT_BIRD_KEEPER_PETER const EVENT_BEAT_BIRD_KEEPER_JOSE + const EVENT_BEAT_BIRD_KEEPER_PETER + const EVENT_BEAT_BIRD_KEEPER_JOSE2 const EVENT_BEAT_BIRD_KEEPER_PERRY const EVENT_BEAT_BIRD_KEEPER_BRET - const EVENT_40B - const EVENT_40C - const EVENT_40D + const EVENT_BEAT_BIRD_KEEPER_JOSE3 + const EVENT_BEAT_BIRD_KEEPER_VANCE2 + const EVENT_BEAT_BIRD_KEEPER_VANCE3 +; Boarder const EVENT_BEAT_BOARDER_RONALD const EVENT_BEAT_BOARDER_BRAD const EVENT_BEAT_BOARDER_DOUGLAS +; Sage const EVENT_BEAT_SAGE_CHOW const EVENT_BEAT_SAGE_NICO const EVENT_BEAT_SAGE_JIN @@ -1051,6 +1056,7 @@ const EVENT_BEAT_SAGE_EDMOND const EVENT_BEAT_SAGE_NEAL const EVENT_BEAT_SAGE_LI +; Camper const EVENT_BEAT_CAMPER_ROLAND const EVENT_BEAT_CAMPER_TODD const EVENT_BEAT_CAMPER_IVAN @@ -1059,23 +1065,26 @@ const EVENT_BEAT_CAMPER_LLOYD const EVENT_BEAT_CAMPER_DEAN const EVENT_BEAT_CAMPER_SID - const EVENT_422 - const EVENT_423 + const EVENT_BEAT_CAMPER_HERVEY + const EVENT_BEAT_CAMPER_DALE const EVENT_BEAT_CAMPER_TED - const EVENT_425 - const EVENT_426 - const EVENT_427 - const EVENT_428 - const EVENT_429 - const EVENT_42A + const EVENT_BEAT_CAMPER_TODD2 + const EVENT_BEAT_CAMPER_TODD3 + const EVENT_BEAT_CAMPER_THOMAS + const EVENT_BEAT_CAMPER_LEROY + const EVENT_BEAT_CAMPER_DAVID + const EVENT_BEAT_CAMPER_JOHN const EVENT_BEAT_CAMPER_JERRY const EVENT_BEAT_CAMPER_SPENCER +; Burglar const EVENT_BEAT_BURGLAR_DUNCAN const EVENT_BEAT_BURGLAR_EDDIE const EVENT_BEAT_BURGLAR_COREY +; Unknown const EVENT_430 - const EVENT_431 - const EVENT_432 +; Biker + const EVENT_BEAT_BIKER_BENNY + const EVENT_BEAT_BIKER_KAZU const EVENT_BEAT_BIKER_DWAYNE const EVENT_BEAT_BIKER_HARRIS const EVENT_BEAT_BIKER_ZEKE @@ -1083,6 +1092,7 @@ const EVENT_BEAT_BIKER_RILEY const EVENT_BEAT_BIKER_JOEL const EVENT_BEAT_BIKER_GLENN +; Psychic const EVENT_BEAT_PSYCHIC_NATHAN const EVENT_BEAT_PSYCHIC_FRANKLIN const EVENT_BEAT_PSYCHIC_HERMAN @@ -1095,14 +1105,16 @@ const EVENT_BEAT_PSYCHIC_GILBERT const EVENT_BEAT_PSYCHIC_JARED const EVENT_BEAT_PSYCHIC_RODNEY +; Firebreather const EVENT_BEAT_FIREBREATHER_OTIS - const EVENT_447 - const EVENT_448 + const EVENT_BEAT_FIREBREATHER_DICK + const EVENT_BEAT_FIREBREATHER_NED const EVENT_BEAT_FIREBREATHER_BURT const EVENT_BEAT_FIREBREATHER_BILL const EVENT_BEAT_FIREBREATHER_WALT const EVENT_BEAT_FIREBREATHER_RAY const EVENT_BEAT_FIREBREATHER_LYLE +; Fisher const EVENT_BEAT_FISHER_JUSTIN const EVENT_BEAT_FISHER_RALPH const EVENT_BEAT_FISHER_ARNOLD @@ -1118,21 +1130,23 @@ const EVENT_BEAT_FISHER_MARTIN const EVENT_BEAT_FISHER_STEPHEN const EVENT_BEAT_FISHER_BARNEY - const EVENT_45D - const EVENT_45E - const EVENT_45F - const EVENT_460 - const EVENT_461 + const EVENT_BEAT_FISHER_RALPH2 + const EVENT_BEAT_FISHER_RALPH3 + const EVENT_BEAT_FISHER_TULLY2 + const EVENT_BEAT_FISHER_TULLY3 + const EVENT_BEAT_FISHER_WILTON2 const EVENT_BEAT_FISHER_SCOTT - const EVENT_463 + const EVENT_BEAT_FISHER_WILTON3 +; Twins const EVENT_BEAT_TWINS_AMY_AND_MAY const EVENT_BEAT_TWINS_ANN_AND_ANNE - const EVENT_466 - const EVENT_467 + const EVENT_BEAT_TWINS_ANN_AND_ANNE2 + const EVENT_BEAT_TWINS_AMY_AND_MAY2 const EVENT_BEAT_TWINS_JO_AND_ZOE - const EVENT_469 + const EVENT_BEAT_TWINS_JO_AND_ZOE2 const EVENT_BEAT_TWINS_MEG_AND_PEG - const EVENT_46B + const EVENT_BEAT_TWINS_MEG_AND_PEG2 +; Schoolboy const EVENT_BEAT_SCHOOLBOY_JACK const EVENT_BEAT_SCHOOLBOY_KIP const EVENT_BEAT_SCHOOLBOY_ALAN @@ -1145,12 +1159,13 @@ const EVENT_BEAT_SCHOOLBOY_CHAD const EVENT_BEAT_SCHOOLBOY_NATE const EVENT_BEAT_SCHOOLBOY_RICKY - const EVENT_478 - const EVENT_479 - const EVENT_47A - const EVENT_47B - const EVENT_47C - const EVENT_47D + const EVENT_BEAT_SCHOOLBOY_JACK2 + const EVENT_BEAT_SCHOOLBOY_JACK3 + const EVENT_BEAT_SCHOOLBOY_ALAN2 + const EVENT_BEAT_SCHOOLBOY_ALAN3 + const EVENT_BEAT_SCHOOLBOY_CHAD2 + const EVENT_BEAT_SCHOOLBOY_CHAD3 +; Picnicker const EVENT_BEAT_PICNICKER_LIZ const EVENT_BEAT_PICNICKER_GINA const EVENT_BEAT_PICNICKER_BROOKE @@ -1159,61 +1174,68 @@ const EVENT_BEAT_PICNICKER_HOPE const EVENT_BEAT_PICNICKER_SHARON const EVENT_BEAT_PICNICKER_DEBRA - const EVENT_486 + const EVENT_BEAT_PICNICKER_GINA2 const EVENT_BEAT_PICNICKER_ERIN - const EVENT_488 - const EVENT_489 + const EVENT_BEAT_PICNICKER_LIZ2 + const EVENT_BEAT_PICNICKER_LIZ3 const EVENT_BEAT_PICNICKER_HEIDI const EVENT_BEAT_PICNICKER_EDNA - const EVENT_48C - const EVENT_48D - const EVENT_48E - const EVENT_48F + const EVENT_BEAT_PICNICKER_GINA3 + const EVENT_BEAT_PICNICKER_TIFFANY2 + const EVENT_BEAT_PICNICKER_TIFFANY3 + const EVENT_BEAT_PICNICKER_ERIN2 const EVENT_BEAT_PICNICKER_TANYA const EVENT_BEAT_PICNICKER_TIFFANY - const EVENT_492 + const EVENT_BEAT_PICNICKER_ERIN3 +; Guitarist const EVENT_BEAT_GUITARIST_CLYDE const EVENT_BEAT_GUITARIST_VINCENT +; Juggler const EVENT_BEAT_JUGGLER_IRWIN const EVENT_BEAT_JUGGLER_FRITZ const EVENT_BEAT_JUGGLER_HORTON - const EVENT_498 - const EVENT_499 + const EVENT_BEAT_JUGGLER_IRWIN2 + const EVENT_BEAT_JUGGLER_IRWIN3 +; Gentleman const EVENT_BEAT_GENTLEMAN_PRESTON const EVENT_BEAT_GENTLEMAN_EDWARD const EVENT_BEAT_GENTLEMAN_GREGORY - const EVENT_49D + const EVENT_BEAT_GENTLEMAN_VIRGIL const EVENT_BEAT_GENTLEMAN_ALFRED +; Scientist const EVENT_BEAT_SCIENTIST_ROSS const EVENT_BEAT_SCIENTIST_MITCH const EVENT_BEAT_SCIENTIST_JED const EVENT_BEAT_SCIENTIST_MARC const EVENT_BEAT_SCIENTIST_RICH - const EVENT_4A4 +; Blackbelt + const EVENT_BEAT_BLACKBELT_KENJI2 const EVENT_BEAT_BLACKBELT_YOSHI - const EVENT_4A6 + const EVENT_BEAT_BLACKBELT_KENJI3 const EVENT_BEAT_BLACKBELT_LAO const EVENT_BEAT_BLACKBELT_NOB const EVENT_BEAT_BLACKBELT_KIYO const EVENT_BEAT_BLACKBELT_LUNG const EVENT_BEAT_BLACKBELT_KENJI const EVENT_BEAT_BLACKBELT_WAI +; Beauti const EVENT_BEAT_BEAUTY_VICTORIA const EVENT_BEAT_BEAUTY_SAMANTHA - const EVENT_4AF - const EVENT_4B0 - const EVENT_4B1 + const EVENT_BEAT_BEAUTY_JULIE + const EVENT_BEAT_BEAUTY_JACLYN + const EVENT_BEAT_BEAUTY_BRENDA const EVENT_BEAT_BEAUTY_CASSIE - const EVENT_4B3 - const EVENT_4B4 - const EVENT_4B5 - const EVENT_4B6 - const EVENT_4B7 - const EVENT_4B8 - const EVENT_4B9 + const EVENT_BEAT_BEAUTY_CAROLINE + const EVENT_BEAT_BEAUTY_CARLENE + const EVENT_BEAT_BEAUTY_JESSICA + const EVENT_BEAT_BEAUTY_RACHAEL + const EVENT_BEAT_BEAUTY_ANGELICA + const EVENT_BEAT_BEAUTY_KENDRA + const EVENT_BEAT_BEAUTY_VERONICA const EVENT_BEAT_BEAUTY_JULIA - const EVENT_4BB + const EVENT_BEAT_BEAUTY_THERESA const EVENT_BEAT_BEAUTY_VALERIE +; Johto Gym Leaders const EVENT_BEAT_FALKNER const EVENT_BEAT_BUGSY const EVENT_BEAT_WHITNEY @@ -1222,6 +1244,7 @@ const EVENT_BEAT_CHUCK const EVENT_BEAT_PRYCE const EVENT_BEAT_CLAIR +; Kanto Gym Leaders const EVENT_BEAT_BROCK const EVENT_BEAT_MISTY const EVENT_BEAT_LTSURGE @@ -1230,6 +1253,7 @@ const EVENT_BEAT_SABRINA const EVENT_BEAT_BLAINE const EVENT_BEAT_BLUE +; PokefanM const EVENT_BEAT_POKEFANM_WILLIAM const EVENT_BEAT_POKEFANM_DEREK const EVENT_BEAT_POKEFANM_ROBERT @@ -1239,20 +1263,24 @@ const EVENT_BEAT_POKEFANM_BRANDON const EVENT_BEAT_POKEFANM_JEREMY const EVENT_BEAT_POKEFANM_COLIN - const EVENT_4D6 - const EVENT_4D7 + const EVENT_BEAT_POKEFANM_DEREK2 + const EVENT_BEAT_POKEFANM_DEREK3 const EVENT_BEAT_POKEFANM_ALEX +; PokefanF const EVENT_BEAT_POKEFANF_BEVERLY const EVENT_BEAT_POKEFANF_RUTH - const EVENT_4DB - const EVENT_4DC + const EVENT_BEAT_POKEFANF_BEVERLY2 + const EVENT_BEAT_POKEFANF_BEVERLY3 const EVENT_BEAT_POKEFANF_GEORGIA +; Unknown const EVENT_4DE +; Kimono Girl const EVENT_BEAT_KIMONO_GIRL_NAOKO const EVENT_BEAT_KIMONO_GIRL_SAYO const EVENT_BEAT_KIMONO_GIRL_ZUKI const EVENT_BEAT_KIMONO_GIRL_KUNI const EVENT_BEAT_KIMONO_GIRL_MIKI +; Pokemaniac const EVENT_BEAT_POKEMANIAC_LARRY const EVENT_BEAT_POKEMANIAC_ANDREW const EVENT_BEAT_POKEMANIAC_CALVIN @@ -1261,11 +1289,12 @@ const EVENT_BEAT_POKEMANIAC_BRENT const EVENT_BEAT_POKEMANIAC_RON const EVENT_BEAT_POKEMANIAC_ETHAN - const EVENT_4EC - const EVENT_4ED + const EVENT_BEAT_POKEMANIAC_BRENT2 + const EVENT_BEAT_POKEMANIAC_BRENT3 const EVENT_BEAT_POKEMANIAC_ISSAC const EVENT_BEAT_POKEMANIAC_DONALD const EVENT_BEAT_POKEMANIAC_ZACH +; GruntM const EVENT_BEAT_ROCKET_GRUNTM_1 const EVENT_BEAT_ROCKET_GRUNTM_2 const EVENT_BEAT_ROCKET_GRUNTM_3 @@ -1277,7 +1306,6 @@ const EVENT_BEAT_ROCKET_GRUNTM_9 const EVENT_BEAT_ROCKET_GRUNTM_10 const EVENT_BEAT_ROCKET_GRUNTM_11 - const EVENT_4FC const EVENT_BEAT_ROCKET_GRUNTM_12 const EVENT_BEAT_ROCKET_GRUNTM_13 const EVENT_BEAT_ROCKET_GRUNTM_14 @@ -1285,23 +1313,26 @@ const EVENT_BEAT_ROCKET_GRUNTM_16 const EVENT_BEAT_ROCKET_GRUNTM_17 const EVENT_BEAT_ROCKET_GRUNTM_18 - const EVENT_504 - const EVENT_505 - const EVENT_506 - const EVENT_507 const EVENT_BEAT_ROCKET_GRUNTM_19 const EVENT_BEAT_ROCKET_GRUNTM_20 - const EVENT_50A - const EVENT_50B const EVENT_BEAT_ROCKET_GRUNTM_21 const EVENT_BEAT_ROCKET_GRUNTM_22 - const EVENT_50E - const EVENT_50F + const EVENT_BEAT_ROCKET_GRUNTM_23 + const EVENT_BEAT_ROCKET_GRUNTM_24 + const EVENT_BEAT_ROCKET_GRUNTM_25 + const EVENT_BEAT_ROCKET_GRUNTM_26 + const EVENT_BEAT_ROCKET_GRUNTM_27 + const EVENT_BEAT_ROCKET_GRUNTM_28 + const EVENT_BEAT_ROCKET_GRUNTM_29 + const EVENT_BEAT_ROCKET_GRUNTM_30 + const EVENT_BEAT_ROCKET_GRUNTM_31 +; GruntF const EVENT_BEAT_ROCKET_GRUNTF_1 const EVENT_BEAT_ROCKET_GRUNTF_2 const EVENT_BEAT_ROCKET_GRUNTF_3 const EVENT_BEAT_ROCKET_GRUNTF_4 const EVENT_BEAT_ROCKET_GRUNTF_5 +; Lass const EVENT_BEAT_LASS_CARRIE const EVENT_BEAT_LASS_BRIDGET const EVENT_BEAT_LASS_ALICE @@ -1313,11 +1344,12 @@ const EVENT_BEAT_LASS_MICHELLE const EVENT_BEAT_LASS_DANA const EVENT_BEAT_LASS_ELLEN - const EVENT_520 - const EVENT_521 - const EVENT_522 - const EVENT_523 - const EVENT_524 + const EVENT_BEAT_LASS_CONNIE2 + const EVENT_BEAT_LASS_CONNIE3 + const EVENT_BEAT_LASS_DANA2 + const EVENT_BEAT_LASS_DANA3 +; Hiker + const EVENT_BEAT_HIKER_ANTHONY2 const EVENT_BEAT_HIKER_RUSSELL const EVENT_BEAT_HIKER_PHILLIP const EVENT_BEAT_HIKER_LEONARD @@ -1328,15 +1360,16 @@ const EVENT_BEAT_HIKER_PARRY const EVENT_BEAT_HIKER_TIMOTHY const EVENT_BEAT_HIKER_BAILEY - const EVENT_52F + const EVENT_BEAT_HIKER_ANTHONY3 const EVENT_BEAT_HIKER_TIM const EVENT_BEAT_HIKER_NOLAND const EVENT_BEAT_HIKER_SIDNEY const EVENT_BEAT_HIKER_KENNY const EVENT_BEAT_HIKER_JIM const EVENT_BEAT_HIKER_DANIEL - const EVENT_536 - const EVENT_537 + const EVENT_BEAT_HIKER_PARRY2 + const EVENT_BEAT_HIKER_PARRY3 +; Bug Catcher const EVENT_BEAT_BUG_CATCHER_DON const EVENT_BEAT_BUG_CATCHER_ROB const EVENT_BEAT_BUG_CATCHER_ED @@ -1346,32 +1379,35 @@ const EVENT_BEAT_BUG_CATCHER_JOSH const EVENT_BEAT_BUG_CATCHER_ARNIE const EVENT_BEAT_BUG_CATCHER_KEN - const EVENT_541 - const EVENT_542 + const EVENT_BEAT_BUG_CATCHER_WADE2 + const EVENT_BEAT_BUG_CATCHER_WADE3 const EVENT_BEAT_BUG_CATCHER_DOUG - const EVENT_544 - const EVENT_545 + const EVENT_BEAT_BUG_CATCHER_ARNIE2 + const EVENT_BEAT_BUG_CATCHER_ARNIE3 +; Officer const EVENT_BEAT_OFFICER_KEITH const EVENT_BEAT_OFFICER_DIRK +; CooltrainerM const EVENT_BEAT_COOLTRAINERM_NICK const EVENT_BEAT_COOLTRAINERM_AARON const EVENT_BEAT_COOLTRAINERM_PAUL const EVENT_BEAT_COOLTRAINERM_CODY const EVENT_BEAT_COOLTRAINERM_MIKE - const EVENT_54D - const EVENT_54E + const EVENT_BEAT_COOLTRAINERM_GAVEN2 + const EVENT_BEAT_COOLTRAINERM_GAVEN3 const EVENT_BEAT_COOLTRAINERM_RYAN const EVENT_BEAT_COOLTRAINERM_JAKE const EVENT_BEAT_COOLTRAINERM_GAVEN const EVENT_BEAT_COOLTRAINERM_BLAKE const EVENT_BEAT_COOLTRAINERM_BRIAN - const EVENT_554 - const EVENT_555 - const EVENT_556 + const EVENT_BEAT_COOLTRAINERM_ERICK + const EVENT_BEAT_COOLTRAINERM_ANDY + const EVENT_BEAT_COOLTRAINERM_TYLER const EVENT_BEAT_COOLTRAINERM_SEAN const EVENT_BEAT_COOLTRAINERM_KEVIN - const EVENT_559 + const EVENT_BEAT_COOLTRAINERM_STEVE const EVENT_BEAT_COOLTRAINERM_ALLEN +; CooltrainerF const EVENT_BEAT_COOLTRAINERF_GWEN const EVENT_BEAT_COOLTRAINERF_LOIS const EVENT_BEAT_COOLTRAINERF_FRAN @@ -1383,21 +1419,24 @@ const EVENT_BEAT_COOLTRAINERF_BETH const EVENT_BEAT_COOLTRAINERF_REENA const EVENT_BEAT_COOLTRAINERF_MEGAN - const EVENT_566 + const EVENT_BEAT_COOLTRAINERF_BETH2 const EVENT_BEAT_COOLTRAINERF_CAROL const EVENT_BEAT_COOLTRAINERF_QUINN const EVENT_BEAT_COOLTRAINERF_EMMA const EVENT_BEAT_COOLTRAINERF_CYBIL const EVENT_BEAT_COOLTRAINERF_JENN - const EVENT_56C - const EVENT_56D - const EVENT_56E + const EVENT_BEAT_COOLTRAINERF_BETH3 + const EVENT_BEAT_COOLTRAINERF_REENA2 + const EVENT_BEAT_COOLTRAINERF_REENA3 +; ExecutiveF const EVENT_BEAT_ROCKET_EXECUTIVEF_1 const EVENT_BEAT_ROCKET_EXECUTIVEF_2 +; ExecutiveM const EVENT_BEAT_ROCKET_EXECUTIVEM_1 const EVENT_BEAT_ROCKET_EXECUTIVEM_2 const EVENT_BEAT_ROCKET_EXECUTIVEM_3 const EVENT_BEAT_ROCKET_EXECUTIVEM_4 +; Sailor const EVENT_BEAT_SAILOR_EUGENE const EVENT_BEAT_SAILOR_HUEY const EVENT_BEAT_SAILOR_TERRELL @@ -1408,27 +1447,31 @@ const EVENT_BEAT_SAILOR_KENNETH const EVENT_BEAT_SAILOR_STANLY const EVENT_BEAT_SAILOR_HARRY - const EVENT_57F - const EVENT_580 + const EVENT_BEAT_SAILOR_HUEY2 + const EVENT_BEAT_SAILOR_HUEY3 +; Super Nerd const EVENT_BEAT_SUPER_NERD_STAN const EVENT_BEAT_SUPER_NERD_ERIC - const EVENT_583 - const EVENT_584 - const EVENT_585 + const EVENT_BEAT_SUPER_NERD_GREGG + const EVENT_BEAT_SUPER_NERD_JAY + const EVENT_BEAY_SUPER_NERD_DAVE const EVENT_BEAT_SUPER_NERD_SAM const EVENT_BEAT_SUPER_NERD_TOM const EVENT_BEAT_SUPER_NERD_PAT const EVENT_BEAT_SUPER_NERD_SHAWN const EVENT_BEAT_SUPER_NERD_TERU +; Medium const EVENT_BEAT_MEDIUM_MARTHA const EVENT_BEAT_MEDIUM_GRACE - const EVENT_58D - const EVENT_58E - const EVENT_58F + const EVENT_BEAT_MEDIUM_BETHANY + const EVENT_BEAT_MEDIUM_MARGRET + const EVENT_BEAT_MEDIUM_ETHEL const EVENT_BEAT_MEDIUM_REBECCA const EVENT_BEAT_MEDIUM_DORIS +; Skier const EVENT_BEAT_SKIER_ROXANNE const EVENT_BEAT_SKIER_CLARISSA +; SwimmerM const EVENT_BEAT_SWIMMERM_HAROLD const EVENT_BEAT_SWIMMERM_SIMON const EVENT_BEAT_SWIMMERM_RANDALL @@ -1437,39 +1480,43 @@ const EVENT_BEAT_SWIMMERM_BERKE const EVENT_BEAT_SWIMMERM_KIRK const EVENT_BEAT_SWIMMERM_MATHEW - const EVENT_59C - const EVENT_59D - const EVENT_59E - const EVENT_59F - const EVENT_5A0 + const EVENT_BEAT_SWIMMERM_HAL + const EVENT_BEAT_SWIMMERM_PATON + const EVENT_BEAT_SWIMMERM_DARYL + const EVENT_BEAT_SWIMMERM_WALTER + const EVENT_BEAT_SWIMMERM_TONY const EVENT_BEAT_SWIMMERM_JEROME const EVENT_BEAT_SWIMMERM_TUCKER - const EVENT_5A3 + const EVENT_BEAT_SWIMMERM_RICK const EVENT_BEAT_SWIMMERM_CAMERON const EVENT_BEAT_SWIMMERM_SETH - const EVENT_5A6 - const EVENT_5A7 + const EVENT_BEAT_SWIMMERM_JAMES + const EVENT_BEAT_SWIMMERM_LEWIS const EVENT_BEAT_SWIMMERM_PARKER +; Youngster const EVENT_BEAT_YOUNGSTER_JOEY const EVENT_BEAT_YOUNGSTER_MIKEY const EVENT_BEAT_YOUNGSTER_ALBERT const EVENT_BEAT_YOUNGSTER_GORDON const EVENT_BEAT_YOUNGSTER_SAMUEL const EVENT_BEAT_YOUNGSTER_IAN - const EVENT_5AF - const EVENT_5B0 + const EVENT_BEAT_YOUNGSTER_JOEY2 + const EVENT_BEAT_YOUNGSTER_JOEY3 const EVENT_BEAT_YOUNGSTER_WARREN const EVENT_BEAT_YOUNGSTER_JIMMY const EVENT_BEAT_YOUNGSTER_OWEN const EVENT_BEAT_YOUNGSTER_JASON +; Teacher const EVENT_BEAT_TEACHER_COLETTE const EVENT_BEAT_TEACHER_HILLARY const EVENT_BEAT_TEACHER_SHIRLEY +; Elite Four and Champion const EVENT_BEAT_ELITE_4_WILL const EVENT_BEAT_ELITE_4_KOGA const EVENT_BEAT_ELITE_4_BRUNO const EVENT_BEAT_ELITE_4_KAREN const EVENT_BEAT_CHAMPION_LANCE +; New to Crystal const EVENT_BEAT_COOLTRAINERM_DARIN const EVENT_BEAT_COOLTRAINERF_CARA const EVENT_BEAT_TWINS_LEA_AND_PIA @@ -1601,9 +1648,9 @@ const EVENT_63D const EVENT_63E const EVENT_63F - const EVENT_640 - const EVENT_641 - const EVENT_642 + const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB + const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB const EVENT_643 const EVENT_644 const EVENT_645 @@ -1795,7 +1842,7 @@ const EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE const EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER const EVENT_ELMS_AIDE_IN_LAB - const EVENT_702 + const EVENT_COP_IN_ELMS_LAB const EVENT_703 const EVENT_704 const EVENT_705 @@ -1810,31 +1857,31 @@ const EVENT_BOULDER_IN_ICE_PATH_2 const EVENT_BOULDER_IN_ICE_PATH_3 const EVENT_BOULDER_IN_ICE_PATH_4 - const EVENT_711 + const EVENT_MYSTERY_GIFT_DELIVERY_GUY const EVENT_MET_BILL const EVENT_713 const EVENT_714 const EVENT_715 - const EVENT_716 - const EVENT_717 - const EVENT_718 - const EVENT_719 - const EVENT_71A - const EVENT_71B - const EVENT_71C - const EVENT_71D - const EVENT_71E - const EVENT_71F - const EVENT_720 - const EVENT_721 - const EVENT_722 - const EVENT_723 - const EVENT_724 - const EVENT_725 - const EVENT_726 - const EVENT_727 - const EVENT_728 - const EVENT_729 + const EVENT_BUG_CATCHING_CONTESTANT_1A + const EVENT_BUG_CATCHING_CONTESTANT_2A + const EVENT_BUG_CATCHING_CONTESTANT_3A + const EVENT_BUG_CATCHING_CONTESTANT_4A + const EVENT_BUG_CATCHING_CONTESTANT_5A + const EVENT_BUG_CATCHING_CONTESTANT_6A + const EVENT_BUG_CATCHING_CONTESTANT_7A + const EVENT_BUG_CATCHING_CONTESTANT_8A + const EVENT_BUG_CATCHING_CONTESTANT_9A + const EVENT_BUG_CATCHING_CONTESTANT_10A + const EVENT_BUG_CATCHING_CONTESTANT_1B + const EVENT_BUG_CATCHING_CONTESTANT_2B + const EVENT_BUG_CATCHING_CONTESTANT_3B + const EVENT_BUG_CATCHING_CONTESTANT_4B + const EVENT_BUG_CATCHING_CONTESTANT_5B + const EVENT_BUG_CATCHING_CONTESTANT_6B + const EVENT_BUG_CATCHING_CONTESTANT_7B + const EVENT_BUG_CATCHING_CONTESTANT_8B + const EVENT_BUG_CATCHING_CONTESTANT_9B + const EVENT_BUG_CATCHING_CONTESTANT_10B const EVENT_72A const EVENT_72B const EVENT_72C diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 75b9b5e76..6e793ef6a 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -739,3 +739,14 @@ OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 const EMOTE_ROD_UP ; 9 const EMOTE_ROD_LEFT ; a const EMOTE_ROD_RIGHT ; b + + const_def + const SIGNPOST_READ + const SIGNPOST_UP + const SIGNPOST_DOWN + const SIGNPOST_RIGHT + const SIGNPOST_LEFT + const SIGNPOST_IFSET + const SIGNPOST_IFNOTSET + const SIGNPOST_ITEMIFSET + const SIGNPOST_COPY diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 6b69713e1..9346ae0e6 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -12,6 +12,7 @@ PLAYER_NAME_LENGTH EQU 8 PKMN_NAME_LENGTH EQU 11 MOVE_NAME_LENGTH EQU 13 ITEM_NAME_LENGTH EQU 13 +TRAINER_CLASS_NAME_LENGTH EQU 13 NAME_LENGTH EQU 11 LV_CHAR EQU $6e diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index c4fde4e75..1d354263f 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -1,4 +1,5 @@ +; pokemon const_value set 1 const BULBASAUR const IVYSAUR @@ -257,3 +258,58 @@ const_value SET const_value + -1 NUM_POKEMON EQU const_value EGG EQU 253 + +; pokemon structure in RAM + const_def + + const MON_SPECIES + const MON_ITEM + const MON_MOVE1 + const MON_MOVE2 + const MON_MOVE3 + const MON_MOVE4 + const MON_ID + const MON_07 + const MON_EXP + const MON_09 + const MON_0A + const MON_HP_EXP + const MON_0C + const MON_ATK_EXP + const MON_0E + const MON_DEF_EXP + const MON_10 + const MON_SPD_EXP + const MON_12 + const MON_SPC_EXP + const MON_14 + const MON_DVS + const MON_16 + const MON_PP1 + const MON_PP2 + const MON_PP3 + const MON_PP4 + const MON_HAPPINESS + const MON_PKRUS + const MON_CAUGHTTIME + const MON_CAUGHTGENDER + const MON_LEVEL +BOXMON_STRUCT_LENGTH EQU const_value + + const MON_STATUS + const MON_21 + const MON_HP + const MON_23 + const MON_MAXHP + const MON_25 + const MON_ATK + const MON_27 + const MON_DEF + const MON_29 + const MON_SPD + const MON_2B + const MON_SAT + const MON_2D + const MON_SDF + const MON_2F +PARTYMON_STRUCT_LENGTH EQU const_value diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index d546adde4..6eaff4e53 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -1,625 +1,609 @@ -NUM_TRAINER_CLASSES EQU $44 - ; trainer groups -FALKNER EQU $01 -WHITNEY EQU $02 -BUGSY EQU $03 -MORTY EQU $04 -PRYCE EQU $05 -JASMINE EQU $06 -CHUCK EQU $07 -CLAIR EQU $08 -RIVAL1 EQU $09 -POKEMON_PROF EQU $0A -WILL EQU $0B -CAL EQU $0C -BRUNO EQU $0D -KAREN EQU $0E -KOGA EQU $0F -CHAMPION EQU $10 -BROCK EQU $11 -MISTY EQU $12 -LT_SURGE EQU $13 -SCIENTIST EQU $14 -ERIKA EQU $15 -YOUNGSTER EQU $16 -SCHOOLBOY EQU $17 -BIRD_KEEPER EQU $18 -LASS EQU $19 -JANINE EQU $1A -COOLTRAINERM EQU $1B -COOLTRAINERF EQU $1C -BEAUTY EQU $1D -POKEMANIAC EQU $1E -GRUNTM EQU $1F -GENTLEMAN EQU $20 -SKIER EQU $21 -TEACHER EQU $22 -SABRINA EQU $23 -BUG_CATCHER EQU $24 -FISHER EQU $25 -SWIMMERM EQU $26 -SWIMMERF EQU $27 -SAILOR EQU $28 -SUPER_NERD EQU $29 -RIVAL2 EQU $2A -GUITARIST EQU $2B -HIKER EQU $2C -BIKER EQU $2D -BLAINE EQU $2E -BURGLAR EQU $2F -FIREBREATHER EQU $30 -JUGGLER EQU $31 -BLACKBELT_T EQU $32 -EXECUTIVEM EQU $33 -PSYCHIC_T EQU $34 -PICNICKER EQU $35 -CAMPER EQU $36 -EXECUTIVEF EQU $37 -SAGE EQU $38 -MEDIUM EQU $39 -BOARDER EQU $3A -POKEFANM EQU $3B -KIMONO_GIRL EQU $3C -TWINS EQU $3D -POKEFANF EQU $3E -RED EQU $3F -BLUE EQU $40 -OFFICER EQU $41 -GRUNTF EQU $42 -MYSTICALMAN EQU $43 - -; Rival1 -RIVAL1_1 EQU $01 -RIVAL1_2 EQU $02 -RIVAL1_3 EQU $03 -RIVAL1_4 EQU $04 -RIVAL1_5 EQU $05 -RIVAL1_6 EQU $06 -RIVAL1_7 EQU $07 -RIVAL1_8 EQU $08 -RIVAL1_9 EQU $09 -RIVAL1_10 EQU $0a -RIVAL1_11 EQU $0b -RIVAL1_12 EQU $0c -RIVAL1_13 EQU $0d -RIVAL1_14 EQU $0e -RIVAL1_15 EQU $0f - -; PokemonProf -; no trainers - -; SpecialPKMN1 -CAL1 EQU $01 -CAL2 EQU $02 -CAL3 EQU $03 - -; Champion -LANCE EQU $01 - -; Scientist -ROSS EQU $01 -MITCH EQU $02 -JED EQU $03 -MARC EQU $04 -RICH EQU $05 - -; Youngster -JOEY1 EQU $01 -MIKEY EQU $02 -ALBERT EQU $03 -GORDON EQU $04 -SAMUEL EQU $05 -IAN EQU $06 -JOEY2 EQU $07 -JOEY3 EQU $08 -WARREN EQU $09 -JIMMY EQU $0a -OWEN EQU $0b -JASON EQU $0c -JOEY4 EQU $0d -JOEY5 EQU $0e - -; Schoolboy -JACK1 EQU $01 -KIPP EQU $02 -ALAN1 EQU $03 -JOHNNY EQU $04 -DANNY EQU $05 -TOMMY EQU $06 -DUDLEY EQU $07 -JOE EQU $08 -BILLY EQU $09 -CHAD1 EQU $0a -NATE EQU $0b -RICKY EQU $0c -JACK2 EQU $0d -JACK3 EQU $0e -ALAN2 EQU $0f -ALAN3 EQU $10 -CHAD2 EQU $11 -CHAD3 EQU $12 -JACK4 EQU $13 -JACK5 EQU $14 -ALAN4 EQU $15 -ALAN5 EQU $16 -CHAD4 EQU $17 -CHAD5 EQU $18 - -; BirdKeeper -ROD EQU $01 -ABE EQU $02 -BRYAN EQU $03 -THEO EQU $04 -TOBY EQU $05 -DENIS EQU $06 -VANCE1 EQU $07 -HANK EQU $08 -ROY EQU $09 -BORIS EQU $0a -BOB EQU $0b -JOSE1 EQU $0c -PETER EQU $0d -JOSE2 EQU $0e -PERRY EQU $0f -BRET EQU $10 -JOSE3 EQU $11 -VANCE2 EQU $12 -VANCE3 EQU $13 - -; Lass -CARRIE EQU $01 -BRIDGET EQU $02 -ALICE EQU $03 -KRISE EQU $04 -CONNIE1 EQU $05 -LINDA EQU $06 -LAURA EQU $07 -SHANNON EQU $08 -MICHELLE EQU $09 -DANA1 EQU $0a -ELLEN EQU $0b -CONNIE2 EQU $0c -CONNIE3 EQU $0d -DANA2 EQU $0e -DANA3 EQU $0f -DANA4 EQU $10 -DANA5 EQU $11 - -; CooltrainerM -NICK EQU $01 -AARON EQU $02 -PAUL EQU $03 -CODY EQU $04 -MIKE EQU $05 -GAVEN1 EQU $06 -GAVEN2 EQU $07 -RYAN EQU $08 -JAKE EQU $09 -GAVEN3 EQU $0a -BLAKE EQU $0b -BRIAN EQU $0c -ERICK EQU $0d -ANDY EQU $0e -TYLER EQU $0f -SEAN EQU $10 -KEVIN EQU $11 -STEVE EQU $12 -ALLEN EQU $13 -DARIN EQU $14 - -; CooltrainerF -GWEN EQU $01 -LOIS EQU $02 -FRAN EQU $03 -LOLA EQU $04 -KATE EQU $05 -IRENE EQU $06 -KELLY EQU $07 -JOYCE EQU $08 -BETH1 EQU $09 -REENA1 EQU $0a -MEGAN EQU $0b -BETH2 EQU $0c -CAROL EQU $0d -QUINN EQU $0e -EMMA EQU $0f -CYBIL EQU $10 -JENN EQU $11 -BETH3 EQU $12 -REENA2 EQU $13 -REENA3 EQU $14 -CARA EQU $15 - -; Beauty -VICTORIA EQU $01 -SAMANTHA EQU $02 -JULIE EQU $03 -JACLYN EQU $04 -BRENDA EQU $05 -CASSIE EQU $06 -CAROLINE EQU $07 -CARLENE EQU $08 -JESSICA EQU $09 -RACHAEL EQU $0a -ANGELICA EQU $0b -KENDRA EQU $0c -VERONICA EQU $0d -JULIA EQU $0e -THERESA EQU $0f -VALERIE EQU $10 -OLIVIA EQU $11 - -; Pokemaniac -LARRY EQU $01 -ANDREW EQU $02 -CALVIN EQU $03 -SHANE EQU $04 -BEN EQU $05 -BRENT1 EQU $06 -RON EQU $07 -ETHAN EQU $08 -BRENT2 EQU $09 -BRENT3 EQU $0a -ISSAC EQU $0b -DONALD EQU $0c -ZACH EQU $0d -BRENT4 EQU $0e -MILLER EQU $0f - -; Gentleman -PRESTON EQU $01 -EDWARD EQU $02 -GREGORY EQU $03 -VIRGIL EQU $04 -ALFRED EQU $05 - -; Skier -ROXANNE EQU $01 -CLARISSA EQU $02 - -; Teacher -COLETTE EQU $01 -HILLARY EQU $02 -SHIRLEY EQU $03 - -; BugCatcher -DON EQU $01 -ROB EQU $02 -ED EQU $03 -WADE1 EQU $04 -BUG_CATCHER_BENNY EQU $05 -AL EQU $06 -JOSH EQU $07 -ARNIE1 EQU $08 -KEN EQU $09 -WADE2 EQU $0a -WADE3 EQU $0b -DOUG EQU $0c -ARNIE2 EQU $0d -ARNIE3 EQU $0e -WADE4 EQU $0f -WADE5 EQU $10 -ARNIE4 EQU $11 -ARNIE5 EQU $12 -WAYNE EQU $13 - -; Fisher -JUSTIN EQU $01 -RALPH1 EQU $02 -ARNOLD EQU $03 -KYLE EQU $04 -HENRY EQU $05 -MARVIN EQU $06 -TULLY1 EQU $07 -ANDRE EQU $08 -RAYMOND EQU $09 -WILTON1 EQU $0a -EDGAR EQU $0b -JONAH EQU $0c -MARTIN EQU $0d -STEPHEN EQU $0e -BARNEY EQU $0f -RALPH2 EQU $10 -RALPH3 EQU $11 -TULLY2 EQU $12 -TULLY3 EQU $13 -WILTON2 EQU $14 -SCOTT EQU $15 -WILTON3 EQU $16 -RALPH4 EQU $17 -RALPH5 EQU $18 -TULLY4 EQU $19 - -; SwimmerM -HAROLD EQU $01 -SIMON EQU $02 -RANDALL EQU $03 -CHARLIE EQU $04 -GEORGE EQU $05 -BERKE EQU $06 -KIRK EQU $07 -MATHEW EQU $08 -HAL EQU $09 -PATON EQU $0a -DARYL EQU $0b -WALTER EQU $0c -TONY EQU $0d -JEROME EQU $0e -TUCKER EQU $0f -RICK EQU $10 -CAMERON EQU $11 -SETH EQU $12 -JAMES EQU $13 -LEWIS EQU $14 -PARKER EQU $15 - -; SwimmerF -ELAINE EQU $01 -PAULA EQU $02 -KAYLEE EQU $03 -SUSIE EQU $04 -DENISE EQU $05 -KARA EQU $06 -WENDY EQU $07 -LISA EQU $08 -JILL EQU $09 -MARY EQU $0a -KATIE EQU $0b -DAWN EQU $0c -TARA EQU $0d -NICOLE EQU $0e -LORI EQU $0f -JODY EQU $10 -NIKKI EQU $11 -DIANA EQU $12 -BRIANA EQU $13 - -; Sailor -EUGENE EQU $01 -HUEY1 EQU $02 -TERRELL EQU $03 -KENT EQU $04 -ERNEST EQU $05 -JEFF EQU $06 -GARRETT EQU $07 -KENNETH EQU $08 -STANLY EQU $09 -HARRY EQU $0a -HUEY2 EQU $0b -HUEY3 EQU $0c -HUEY4 EQU $0d - -; SuperNerd -STAN EQU $01 -ERIC EQU $02 -GREGG EQU $03 -JAY EQU $04 -DAVE EQU $05 -SAM EQU $06 -TOM EQU $07 -PAT EQU $08 -SHAWN EQU $09 -TERU EQU $0a -RUSS EQU $0b -NORTON EQU $0c -HUGH EQU $0d -MARKUS EQU $0e - -; Guitarist -CLYDE EQU $01 -VINCENT EQU $02 - -; Hiker -ANTHONY1 EQU $01 -RUSSELL EQU $02 -PHILLIP EQU $03 -LEONARD EQU $04 -ANTHONY2 EQU $05 -BENJAMIN EQU $06 -ERIK EQU $07 -MICHAEL EQU $08 -PARRY1 EQU $09 -TIMOTHY EQU $0a -BAILEY EQU $0b -ANTHONY3 EQU $0c -TIM EQU $0d -NOLAND EQU $0e -SIDNEY EQU $0f -KENNY EQU $10 -JIM EQU $11 -DANIEL EQU $12 -PARRY2 EQU $13 -PARRY3 EQU $14 -ANTHONY4 EQU $15 -ANTHONY5 EQU $16 - -; Biker -BIKER_BENNY EQU $01 -KAZU EQU $02 -DWAYNE EQU $03 -HARRIS EQU $04 -ZEKE EQU $05 -CHARLES EQU $06 -RILEY EQU $07 -JOEL EQU $08 -GLENN EQU $09 - -; Burglar -DUNCAN EQU $01 -EDDIE EQU $02 -COREY EQU $03 - -; Firebreather -OTIS EQU $01 -DICK EQU $02 -NED EQU $03 -BURT EQU $04 -BILL EQU $05 -WALT EQU $06 -RAY EQU $07 -LYLE EQU $08 - -; Juggler -IRWIN1 EQU $01 -FRITZ EQU $02 -HORTON EQU $03 -IRWIN2 EQU $04 -IRWIN3 EQU $05 -IRWIN4 EQU $06 - -; Blackbelt -KENJI1 EQU $01 -YOSHI EQU $02 -KENJI2 EQU $03 -LAO EQU $04 -NOB EQU $05 -KIYO EQU $06 -LUNG EQU $07 -KENJI3 EQU $08 -WAI EQU $09 - -; Psychic -NATHAN EQU $01 -FRANKLIN EQU $02 -HERMAN EQU $03 -FIDEL EQU $04 -GREG EQU $05 -NORMAN EQU $06 -MARK EQU $07 -PHIL EQU $08 -RICHARD EQU $09 -GILBERT EQU $0a -JARED EQU $0b -RODNEY EQU $0c - -; Picnicker -LIZ1 EQU $01 -GINA1 EQU $02 -BROOKE EQU $03 -KIM EQU $04 -CINDY EQU $05 -HOPE EQU $06 -SHARON EQU $07 -DEBRA EQU $08 -GINA2 EQU $09 -ERIN1 EQU $0a -LIZ2 EQU $0b -LIZ3 EQU $0c -HEIDI EQU $0d -EDNA EQU $0e -GINA3 EQU $0f -TIFFANY1 EQU $10 -TIFFANY2 EQU $11 -ERIN2 EQU $12 -TANYA EQU $13 -TIFFANY3 EQU $14 -ERIN3 EQU $15 -LIZ4 EQU $16 -LIZ5 EQU $17 -GINA4 EQU $18 -GINA5 EQU $19 -TIFFANY4 EQU $1a - -; Camper -ROLAND EQU $01 -TODD1 EQU $02 -IVAN EQU $03 -ELLIOT EQU $04 -BARRY EQU $05 -LLOYD EQU $06 -DEAN EQU $07 -SID EQU $08 -HARVEY EQU $09 -DALE EQU $0a -TED EQU $0b -TODD2 EQU $0c -TODD3 EQU $0d -THOMAS EQU $0e -LEROY EQU $0f -DAVID EQU $10 -JOHN EQU $11 -JERRY EQU $12 -SPENCER EQU $13 -TODD4 EQU $14 -TODD5 EQU $15 -QUENTIN EQU $16 - -; Sage -CHOW EQU $01 -NICO EQU $02 -JIN EQU $03 -TROY EQU $04 -JEFFREY EQU $05 -PING EQU $06 -EDMOND EQU $07 -NEAL EQU $08 -LI EQU $09 -GAKU EQU $0a -MASA EQU $0b -KOJI EQU $0c - -; Medium -MARTHA EQU $01 -GRACE EQU $02 -BETHANY EQU $03 -MARGRET EQU $04 -ETHEL EQU $05 -REBECCA EQU $06 -DORIS EQU $07 - -; Boarder -RONALD EQU $01 -BRAD EQU $02 -DOUGLAS EQU $03 - -; PokefanM -WILLIAM EQU $01 -DEREK1 EQU $02 -ROBERT EQU $03 -JOSHUA EQU $04 -CARTER EQU $05 -TREVOR EQU $06 -BRANDON EQU $07 -JEREMY EQU $08 -COLIN EQU $09 -DEREK2 EQU $0a -DEREK3 EQU $0b -ALEX EQU $0c -REX EQU $0d -ALLAN EQU $0e - -; KimonoGirl -NAOKO1 EQU $01 -NAOKO2 EQU $02 -SAYO EQU $03 -ZUKI EQU $04 -KUNI EQU $05 -MIKI EQU $06 - -; Twins -AMYANDMAY1 EQU $01 -ANNANDANNE1 EQU $02 -ANNANDANNE2 EQU $03 -AMYANDMAY2 EQU $04 -JOANDZOE1 EQU $05 -JOANDZOE2 EQU $06 -MEGANDPEG1 EQU $07 -MEGANDPEG2 EQU $08 -LEAANDPIA1 EQU $09 -LEAANDPIA2 EQU $0a - -; PokefanF -BEVERLY1 EQU $01 -RUTH EQU $02 -BEVERLY2 EQU $03 -BEVERLY3 EQU $04 -GEORGIA EQU $05 -JAIME EQU $06 - -; Officer -KEITH EQU $01 -DIRK EQU $02 - -; Mysticalman -EUSINE EQU $01 + enum_start 1 + trainerclass FALKNER + + trainerclass WHITNEY + + trainerclass BUGSY + + trainerclass MORTY + + trainerclass PRYCE + + trainerclass JASMINE + + trainerclass CHUCK + + trainerclass CLAIR + + trainerclass RIVAL1 + const RIVAL1_1 + const RIVAL1_2 + const RIVAL1_3 + const RIVAL1_4 + const RIVAL1_5 + const RIVAL1_6 + const RIVAL1_7 + const RIVAL1_8 + const RIVAL1_9 + const RIVAL1_10 + const RIVAL1_11 + const RIVAL1_12 + const RIVAL1_13 + const RIVAL1_14 + const RIVAL1_15 + + trainerclass POKEMON_PROF + + trainerclass WILL + + trainerclass CAL + const CAL1 + const CAL2 + const CAL3 + + trainerclass BRUNO + + trainerclass KAREN + + trainerclass KOGA + + trainerclass CHAMPION + const LANCE + + trainerclass BROCK + + trainerclass MISTY + + trainerclass LT_SURGE + + trainerclass SCIENTIST + const ROSS + const MITCH + const JED + const MARC + const RICH + + trainerclass ERIKA + + trainerclass YOUNGSTER + const JOEY1 + const MIKEY + const ALBERT + const GORDON + const SAMUEL + const IAN + const JOEY2 + const JOEY3 + const WARREN + const JIMMY + const OWEN + const JASON + const JOEY4 + const JOEY5 + + trainerclass SCHOOLBOY + const JACK1 + const KIPP + const ALAN1 + const JOHNNY + const DANNY + const TOMMY + const DUDLEY + const JOE + const BILLY + const CHAD1 + const NATE + const RICKY + const JACK2 + const JACK3 + const ALAN2 + const ALAN3 + const CHAD2 + const CHAD3 + const JACK4 + const JACK5 + const ALAN4 + const ALAN5 + const CHAD4 + const CHAD5 + + trainerclass BIRD_KEEPER + const ROD + const ABE + const BRYAN + const THEO + const TOBY + const DENIS + const VANCE1 + const HANK + const ROY + const BORIS + const BOB + const JOSE1 + const PETER + const JOSE2 + const PERRY + const BRET + const JOSE3 + const VANCE2 + const VANCE3 + + trainerclass LASS + const CARRIE + const BRIDGET + const ALICE + const KRISE + const CONNIE1 + const LINDA + const LAURA + const SHANNON + const MICHELLE + const DANA1 + const ELLEN + const CONNIE2 + const CONNIE3 + const DANA2 + const DANA3 + const DANA4 + const DANA5 + + trainerclass JANINE + + trainerclass COOLTRAINERM + const NICK + const AARON + const PAUL + const CODY + const MIKE + const GAVEN1 + const GAVEN2 + const RYAN + const JAKE + const GAVEN3 + const BLAKE + const BRIAN + const ERICK + const ANDY + const TYLER + const SEAN + const KEVIN + const STEVE + const ALLEN + const DARIN + + trainerclass COOLTRAINERF + const GWEN + const LOIS + const FRAN + const LOLA + const KATE + const IRENE + const KELLY + const JOYCE + const BETH1 + const REENA1 + const MEGAN + const BETH2 + const CAROL + const QUINN + const EMMA + const CYBIL + const JENN + const BETH3 + const REENA2 + const REENA3 + const CARA + + trainerclass BEAUTY + const VICTORIA + const SAMANTHA + const JULIE + const JACLYN + const BRENDA + const CASSIE + const CAROLINE + const CARLENE + const JESSICA + const RACHAEL + const ANGELICA + const KENDRA + const VERONICA + const JULIA + const THERESA + const VALERIE + const OLIVIA + + trainerclass POKEMANIAC + const LARRY + const ANDREW + const CALVIN + const SHANE + const BEN + const BRENT1 + const RON + const ETHAN + const BRENT2 + const BRENT3 + const ISSAC + const DONALD + const ZACH + const BRENT4 + const MILLER + + trainerclass GRUNTM + + trainerclass GENTLEMAN + const PRESTON + const EDWARD + const GREGORY + const VIRGIL + const ALFRED + + trainerclass SKIER + const ROXANNE + const CLARISSA + + trainerclass TEACHER + const COLETTE + const HILLARY + const SHIRLEY + + trainerclass SABRINA + + trainerclass BUG_CATCHER + const DON + const ROB + const ED + const WADE1 + const BUG_CATCHER_BENNY + const AL + const JOSH + const ARNIE1 + const KEN + const WADE2 + const WADE3 + const DOUG + const ARNIE2 + const ARNIE3 + const WADE4 + const WADE5 + const ARNIE4 + const ARNIE5 + const WAYNE + + trainerclass FISHER + const JUSTIN + const RALPH1 + const ARNOLD + const KYLE + const HENRY + const MARVIN + const TULLY1 + const ANDRE + const RAYMOND + const WILTON1 + const EDGAR + const JONAH + const MARTIN + const STEPHEN + const BARNEY + const RALPH2 + const RALPH3 + const TULLY2 + const TULLY3 + const WILTON2 + const SCOTT + const WILTON3 + const RALPH4 + const RALPH5 + const TULLY4 + + trainerclass SWIMMERM + const HAROLD + const SIMON + const RANDALL + const CHARLIE + const GEORGE + const BERKE + const KIRK + const MATHEW + const HAL + const PATON + const DARYL + const WALTER + const TONY + const JEROME + const TUCKER + const RICK + const CAMERON + const SETH + const JAMES + const LEWIS + const PARKER + + trainerclass SWIMMERF + const ELAINE + const PAULA + const KAYLEE + const SUSIE + const DENISE + const KARA + const WENDY + const LISA + const JILL + const MARY + const KATIE + const DAWN + const TARA + const NICOLE + const LORI + const JODY + const NIKKI + const DIANA + const BRIANA + + trainerclass SAILOR + const EUGENE + const HUEY1 + const TERRELL + const KENT + const ERNEST + const JEFF + const GARRETT + const KENNETH + const STANLY + const HARRY + const HUEY2 + const HUEY3 + const HUEY4 + + trainerclass SUPER_NERD + const STAN + const ERIC + const GREGG + const JAY + const DAVE + const SAM + const TOM + const PAT + const SHAWN + const TERU + const RUSS + const NORTON + const HUGH + const MARKUS + + trainerclass RIVAL2 + + trainerclass GUITARIST + const CLYDE + const VINCENT + + trainerclass HIKER + const ANTHONY1 + const RUSSELL + const PHILLIP + const LEONARD + const ANTHONY2 + const BENJAMIN + const ERIK + const MICHAEL + const PARRY1 + const TIMOTHY + const BAILEY + const ANTHONY3 + const TIM + const NOLAND + const SIDNEY + const KENNY + const JIM + const DANIEL + const PARRY2 + const PARRY3 + const ANTHONY4 + const ANTHONY5 + + trainerclass BIKER + const BIKER_BENNY + const KAZU + const DWAYNE + const HARRIS + const ZEKE + const CHARLES + const RILEY + const JOEL + const GLENN + + trainerclass BLAINE + + trainerclass BURGLAR + const DUNCAN + const EDDIE + const COREY + + trainerclass FIREBREATHER + const OTIS + const DICK + const NED + const BURT + const BILL + const WALT + const RAY + const LYLE + + trainerclass JUGGLER + const IRWIN1 + const FRITZ + const HORTON + const IRWIN2 + const IRWIN3 + const IRWIN4 + + trainerclass BLACKBELT_T + const KENJI1 + const YOSHI + const KENJI2 + const LAO + const NOB + const KIYO + const LUNG + const KENJI3 + const WAI + + trainerclass EXECUTIVEM + + trainerclass PSYCHIC_T + const NATHAN + const FRANKLIN + const HERMAN + const FIDEL + const GREG + const NORMAN + const MARK + const PHIL + const RICHARD + const GILBERT + const JARED + const RODNEY + + trainerclass PICNICKER + const LIZ1 + const GINA1 + const BROOKE + const KIM + const CINDY + const HOPE + const SHARON + const DEBRA + const GINA2 + const ERIN1 + const LIZ2 + const LIZ3 + const HEIDI + const EDNA + const GINA3 + const TIFFANY1 + const TIFFANY2 + const ERIN2 + const TANYA + const TIFFANY3 + const ERIN3 + const LIZ4 + const LIZ5 + const GINA4 + const GINA5 + const TIFFANY4 + + trainerclass CAMPER + const ROLAND + const TODD1 + const IVAN + const ELLIOT + const BARRY + const LLOYD + const DEAN + const SID + const HARVEY + const DALE + const TED + const TODD2 + const TODD3 + const THOMAS + const LEROY + const DAVID + const JOHN + const JERRY + const SPENCER + const TODD4 + const TODD5 + const QUENTIN + + trainerclass EXECUTIVEF + + trainerclass SAGE + const CHOW + const NICO + const JIN + const TROY + const JEFFREY + const PING + const EDMOND + const NEAL + const LI + const GAKU + const MASA + const KOJI + + trainerclass MEDIUM + const MARTHA + const GRACE + const BETHANY + const MARGRET + const ETHEL + const REBECCA + const DORIS + + trainerclass BOARDER + const RONALD + const BRAD + const DOUGLAS + + trainerclass POKEFANM + const WILLIAM + const DEREK1 + const ROBERT + const JOSHUA + const CARTER + const TREVOR + const BRANDON + const JEREMY + const COLIN + const DEREK2 + const DEREK3 + const ALEX + const REX + const ALLAN + + trainerclass KIMONO_GIRL + const NAOKO1 + const NAOKO2 + const SAYO + const ZUKI + const KUNI + const MIKI + + trainerclass TWINS + const AMYANDMAY1 + const ANNANDANNE1 + const ANNANDANNE2 + const AMYANDMAY2 + const JOANDZOE1 + const JOANDZOE2 + const MEGANDPEG1 + const MEGANDPEG2 + const LEAANDPIA1 + const LEAANDPIA2 + + trainerclass POKEFANF + const BEVERLY1 + const RUTH + const BEVERLY2 + const BEVERLY3 + const GEORGIA + const JAIME + + trainerclass RED + + trainerclass BLUE + + trainerclass OFFICER + const KEITH + const DIRK + + trainerclass GRUNTF + + trainerclass MYSTICALMAN + const EUSINE + +NUM_TRAINER_CLASSES EQU __enum__ diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index e5430b431..8fe8284f2 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -71,5 +71,3 @@ PLAYER_SURF_PIKA EQU 8 OBJECT_STRUCT_LENGTH EQU 40 NUM_OBJECT_STRUCTS EQU 13 - -PARTYMON_STRUCT_LENGTH EQU 48 diff --git a/engine/events.asm b/engine/events.asm index b37f53d39..9435b4c49 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -358,7 +358,7 @@ CheckTileEvent: ; 96874 call CheckBit2_ScriptFlags3 jr z, .bit2 - callba Function104820 + callba CheckMovingOffEdgeOfMap jr c, .return4 call Function2238 @@ -368,7 +368,7 @@ CheckTileEvent: ; 96874 call CheckBit1_ScriptFlags3 jr z, .bit1 - call Function2ad4 + call CheckCurrentMapXYTriggers jr c, .movement .bit1 @@ -398,12 +398,12 @@ CheckTileEvent: ; 96874 .return6 ld a, [StandingTile] call CheckPitTile - jr nz, .asm_968b6 + jr nz, .pittile ld a, 6 scf ret -.asm_968b6 +.pittile ld a, 5 scf ret @@ -528,8 +528,8 @@ Function9693a: ; 9693a ret .elevator - ld a, BANK(UnknownScript_0x135f8) - ld hl, UnknownScript_0x135f8 + ld a, BANK(BugCatchingContestOverScript) + ld hl, BugCatchingContestOverScript call CallScript scf ret @@ -764,8 +764,8 @@ TryReadSign: ; 96a38 ld de, EngineBuffer1 ld bc, 3 call FarCopyBytes - ld a, BANK(UnknownScript_0x13625) - ld hl, UnknownScript_0x13625 + ld a, BANK(SignpostItemScript) + ld hl, SignpostItemScript call CallScript scf ret @@ -817,7 +817,7 @@ CheckSignFlag: ; 96ad8 call GetFarHalfword ld e, l ld d, h - ld b, $2 + ld b, $2 ; check call EventFlagAction ld a, c and a @@ -1024,8 +1024,8 @@ Function96bd7: ; 96bd7 dec a ld [wdca1], a ret nz - ld a, BANK(UnknownScript_0x13619) - ld hl, UnknownScript_0x13619 + ld a, BANK(RepelWoreOffScript) + ld hl, RepelWoreOffScript call CallScript scf ret diff --git a/engine/events_2.asm b/engine/events_2.asm index 506075c52..bbc883b56 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -1,7 +1,7 @@ ; More overworld event handling. -Function97c28:: ; 97c28 +WarpToLastSpawn:: ; 97c28 ld hl, StatusFlags2 res 1, [hl] res 2, [hl] @@ -48,46 +48,46 @@ Function97c5f:: ; 97c5f call GetFacingTileCoord ld [EngineBuffer1], a ld c, a - callba Function1365b - jr c, .asm_97cb9 + callba CheckFacingTileForStd + jr c, .done call CheckCutTreeTile jr nz, .whirlpool callba TryCutOW - jr .asm_97cb9 + jr .done .whirlpool ld a, [EngineBuffer1] call CheckWhirlpoolTile jr nz, .waterfall callba TryWhirlpoolOW - jr .asm_97cb9 + jr .done .waterfall ld a, [EngineBuffer1] call CheckWaterfallTile jr nz, .headbutt callba TryWaterfallOW - jr .asm_97cb9 + jr .done .headbutt ld a, [EngineBuffer1] call CheckHeadbuttTreeTile jr nz, .surf callba TryHeadbuttOW - jr c, .asm_97cb9 - jr .asm_97cb7 + jr c, .done + jr .noevent .surf callba TrySurfOW - jr nc, .asm_97cb7 - jr .asm_97cb9 + jr nc, .noevent + jr .done -.asm_97cb7 +.noevent xor a ret -.asm_97cb9 +.done call PlayClickSFX ld a, $ff scf diff --git a/engine/specials.asm b/engine/specials.asm index 949cf8b1b..2aa38b166 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -2,9 +2,7 @@ Special:: ; c01b ; Run script special de. ld hl, SpecialsPointers - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ld b, [hl] inc hl ld a, [hli] @@ -16,32 +14,36 @@ Special:: ; c01b ; c029 SpecialsPointers:: ; c029 - add_special Function97c28 - add_special Function29ce8 - add_special Function29d11 - add_special Function29d92 - add_special Function29e66 - add_special Function29e82 - add_special Function29efa - add_special Function29eee - add_special Function29c92 - add_special Function29cf1 - add_special Function29cfa - add_special Function29bfb - add_special Function29c7b - add_special Function29ec4 - add_special Function29ed9 - add_special Function29eaf - add_special Function29f47 - add_special Functionc2f6 - add_special Functionc309 - add_special Function1050b9 + add_special WarpToLastSpawn + +; Communications + add_special Special_SetBitsForLinkTradeRequest + add_special Special_WaitForLinkedFriend + add_special Special_CheckLinkTimeout + add_special Special_TryQuickSave + add_special Special_CheckBothSelectedSameRoom + add_special Special_FailedLinkToPast + add_special Special_CloseLink + add_special Special_AbortLink + add_special Special_SetBitsForBattleRequest + add_special Special_SetBitsForTimeCapsuleRequest + add_special Special_CheckTimeCapsuleCompatibility + add_special Special_EnterTimeCapsule + add_special Special_TradeCenter + add_special Special_Colosseum + add_special Special_TimeCapsule + add_special Special_CableClubCheckWhichChris + add_special Special_CheckMysteryGift + add_special Special_GetMysteryGiftItem + add_special Special_UnlockMysteryGift + +; Bug Catching Contest add_special BugContestJudging add_special CheckPartyFullAfterContest - add_special Function13a12 + add_special CheckFirstMonFainted add_special ContestReturnMons - add_special Function135db - add_special Functionfbb32 + add_special Special_GiveParkBalls + add_special Special_CheckMagikarpLength add_special Functionfbcd2 add_special HealParty add_special Function1559a @@ -87,7 +89,7 @@ SpecialsPointers:: ; c029 add_special Functionc3ef add_special Function17421 add_special Function17440 - add_special Function139a8 + add_special Special_SelectRandomBugContestContestants add_special Functionc3fc add_special Function26feb add_special Function27043 @@ -170,7 +172,7 @@ SpecialsPointers:: ; c029 add_special SpecialMonCheck add_special Functionc225 add_special Function170bd2 - add_special Function10366e + add_special Mobile_SelectThreeMons add_special Function1037eb add_special Function10383c add_special Mobile_HealParty @@ -309,21 +311,21 @@ Functionc2e7: ; c2e7 ret ; c2f6 -Functionc2f6: ; c2f6 +Special_CheckMysteryGift: ; c2f6 ld a, $0 call GetSRAMBank ld a, [$abe2] and a - jr z, .asm_c302 + jr z, .no inc a -.asm_c302 +.no ld [ScriptVar], a call CloseSRAM ret ; c309 -Functionc309: ; c309 +Special_GetMysteryGiftItem: ; c309 ld a, $0 call GetSRAMBank ld a, [$abe2] diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 885bde7e9..108579fa1 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -357,33 +357,33 @@ BugContestResults_CleanUp loadmovesprites dotrigger $0 domaptrigger GROUP_ROUTE_35_NATIONAL_PARK_GATE, MAP_ROUTE_35_NATIONAL_PARK_GATE, $0 - setevent EVENT_716 - setevent EVENT_717 - setevent EVENT_718 - setevent EVENT_719 - setevent EVENT_71A - setevent EVENT_71B - setevent EVENT_71C - setevent EVENT_71D - setevent EVENT_71E - setevent EVENT_71F - setevent EVENT_720 - setevent EVENT_721 - setevent EVENT_722 - setevent EVENT_723 - setevent EVENT_724 - setevent EVENT_725 - setevent EVENT_726 - setevent EVENT_727 - setevent EVENT_728 - setevent EVENT_729 + setevent EVENT_BUG_CATCHING_CONTESTANT_1A + setevent EVENT_BUG_CATCHING_CONTESTANT_2A + setevent EVENT_BUG_CATCHING_CONTESTANT_3A + setevent EVENT_BUG_CATCHING_CONTESTANT_4A + setevent EVENT_BUG_CATCHING_CONTESTANT_5A + setevent EVENT_BUG_CATCHING_CONTESTANT_6A + setevent EVENT_BUG_CATCHING_CONTESTANT_7A + setevent EVENT_BUG_CATCHING_CONTESTANT_8A + setevent EVENT_BUG_CATCHING_CONTESTANT_9A + setevent EVENT_BUG_CATCHING_CONTESTANT_10A + setevent EVENT_BUG_CATCHING_CONTESTANT_1B + setevent EVENT_BUG_CATCHING_CONTESTANT_2B + setevent EVENT_BUG_CATCHING_CONTESTANT_3B + setevent EVENT_BUG_CATCHING_CONTESTANT_4B + setevent EVENT_BUG_CATCHING_CONTESTANT_5B + setevent EVENT_BUG_CATCHING_CONTESTANT_6B + setevent EVENT_BUG_CATCHING_CONTESTANT_7B + setevent EVENT_BUG_CATCHING_CONTESTANT_8B + setevent EVENT_BUG_CATCHING_CONTESTANT_9B + setevent EVENT_BUG_CATCHING_CONTESTANT_10B setflag ENGINE_DAILY_BUG_CONTEST special PlayMapMusic end ; 0xbc31e BugContestResults_FirstPlace ; 0xbc31e - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB itemtotext SUN_STONE, $1 farwritetext ContestResults_PlayerWonAPrizeText closetext @@ -439,45 +439,45 @@ BugContestResults_NoRoomForBerry ; 0xbc375 ; 0xbc380 BugContestResults_EnsureNoDuplicateSprites ; 0xbc380 - checkevent EVENT_716 + checkevent EVENT_BUG_CATCHING_CONTESTANT_1A iftrue .skip1 - clearevent EVENT_720 + clearevent EVENT_BUG_CATCHING_CONTESTANT_1B .skip1 - checkevent EVENT_717 + checkevent EVENT_BUG_CATCHING_CONTESTANT_2A iftrue .skip2 - clearevent EVENT_721 + clearevent EVENT_BUG_CATCHING_CONTESTANT_2B .skip2 - checkevent EVENT_718 + checkevent EVENT_BUG_CATCHING_CONTESTANT_3A iftrue .skip3 - clearevent EVENT_722 + clearevent EVENT_BUG_CATCHING_CONTESTANT_3B .skip3 - checkevent EVENT_719 + checkevent EVENT_BUG_CATCHING_CONTESTANT_4A iftrue .skip4 - clearevent EVENT_723 + clearevent EVENT_BUG_CATCHING_CONTESTANT_4B .skip4 - checkevent EVENT_71A + checkevent EVENT_BUG_CATCHING_CONTESTANT_5A iftrue .skip5 - clearevent EVENT_724 + clearevent EVENT_BUG_CATCHING_CONTESTANT_5B .skip5 - checkevent EVENT_71B + checkevent EVENT_BUG_CATCHING_CONTESTANT_6A iftrue .skip6 - clearevent EVENT_725 + clearevent EVENT_BUG_CATCHING_CONTESTANT_6B .skip6 - checkevent EVENT_71C + checkevent EVENT_BUG_CATCHING_CONTESTANT_7A iftrue .skip7 - clearevent EVENT_726 + clearevent EVENT_BUG_CATCHING_CONTESTANT_7B .skip7 - checkevent EVENT_71D + checkevent EVENT_BUG_CATCHING_CONTESTANT_8A iftrue .skip8 - clearevent EVENT_727 + clearevent EVENT_BUG_CATCHING_CONTESTANT_8B .skip8 - checkevent EVENT_71E + checkevent EVENT_BUG_CATCHING_CONTESTANT_9A iftrue .skip9 - clearevent EVENT_728 + clearevent EVENT_BUG_CATCHING_CONTESTANT_9B .skip9 - checkevent EVENT_71F + checkevent EVENT_BUG_CATCHING_CONTESTANT_10A iftrue .skip10 - clearevent EVENT_729 + clearevent EVENT_BUG_CATCHING_CONTESTANT_10B .skip10 end @@ -503,7 +503,7 @@ InitializeEventsScript: setevent EVENT_6FD setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE setevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER - setevent EVENT_702 + setevent EVENT_COP_IN_ELMS_LAB setevent EVENT_703 setevent EVENT_704 setevent EVENT_BOULDER_IN_ICE_PATH_1 @@ -511,26 +511,26 @@ InitializeEventsScript: setevent EVENT_BOULDER_IN_ICE_PATH_3 setevent EVENT_BOULDER_IN_ICE_PATH_4 setevent EVENT_715 - setevent EVENT_716 - setevent EVENT_717 - setevent EVENT_718 - setevent EVENT_719 - setevent EVENT_71A - setevent EVENT_71B - setevent EVENT_71C - setevent EVENT_71D - setevent EVENT_71E - setevent EVENT_71F - setevent EVENT_720 - setevent EVENT_721 - setevent EVENT_722 - setevent EVENT_723 - setevent EVENT_724 - setevent EVENT_725 - setevent EVENT_726 - setevent EVENT_727 - setevent EVENT_728 - setevent EVENT_729 + setevent EVENT_BUG_CATCHING_CONTESTANT_1A + setevent EVENT_BUG_CATCHING_CONTESTANT_2A + setevent EVENT_BUG_CATCHING_CONTESTANT_3A + setevent EVENT_BUG_CATCHING_CONTESTANT_4A + setevent EVENT_BUG_CATCHING_CONTESTANT_5A + setevent EVENT_BUG_CATCHING_CONTESTANT_6A + setevent EVENT_BUG_CATCHING_CONTESTANT_7A + setevent EVENT_BUG_CATCHING_CONTESTANT_8A + setevent EVENT_BUG_CATCHING_CONTESTANT_9A + setevent EVENT_BUG_CATCHING_CONTESTANT_10A + setevent EVENT_BUG_CATCHING_CONTESTANT_1B + setevent EVENT_BUG_CATCHING_CONTESTANT_2B + setevent EVENT_BUG_CATCHING_CONTESTANT_3B + setevent EVENT_BUG_CATCHING_CONTESTANT_4B + setevent EVENT_BUG_CATCHING_CONTESTANT_5B + setevent EVENT_BUG_CATCHING_CONTESTANT_6B + setevent EVENT_BUG_CATCHING_CONTESTANT_7B + setevent EVENT_BUG_CATCHING_CONTESTANT_8B + setevent EVENT_BUG_CATCHING_CONTESTANT_9B + setevent EVENT_BUG_CATCHING_CONTESTANT_10B setevent EVENT_72C setevent EVENT_72F setevent EVENT_72D @@ -549,7 +549,7 @@ InitializeEventsScript: setevent EVENT_74D setevent EVENT_MET_BILL setevent EVENT_713 - setevent EVENT_711 + setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY setevent EVENT_6D4 setevent EVENT_WAREHOUSE_LAYOUT_1 setevent EVENT_WAREHOUSE_BLOCKED_OFF diff --git a/home.asm b/home.asm index a8f74dffe..cd6267436 100644 --- a/home.asm +++ b/home.asm @@ -499,13 +499,14 @@ Function31cf:: ; 31cf StringCmp:: ; 31db ; Compare c bytes at de and hl. ; Return z if they all match. +.loop ld a, [de] cp [hl] ret nz inc de inc hl dec c - jr nz, StringCmp + jr nz, .loop ret ; 0x31e4 @@ -866,9 +867,7 @@ GetName:: ; 33c3 ld e, a ld d, 0 ld hl, NamesPointers - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ld a, [hli] rst Bankswitch ld a, [hli] @@ -880,7 +879,7 @@ GetName:: ; 33c3 call GetNthString ld de, StringBuffer1 - ld bc, $000d + ld bc, ITEM_NAME_LENGTH call CopyBytes .done @@ -1209,7 +1208,7 @@ Function3567:: ; 3567 ld a, [hROMBank] push af - call Function2c52 + call SwitchToMapScriptHeaderBank call Function3574 pop bc @@ -1355,7 +1354,7 @@ CheckTrainerBattle2:: ; 3600 ld a, [hROMBank] push af - call Function2c52 + call SwitchToMapScriptHeaderBank call CheckTrainerBattle pop bc diff --git a/home/map.asm b/home/map.asm index e800a8d12..78ec839c5 100644 --- a/home/map.asm +++ b/home/map.asm @@ -9,40 +9,48 @@ Function210f:: ; 210f ; 211b CheckTriggers:: ; 211b +; Checks wCurrentMapTriggerPointer. If it's empty, returns -1 in a. Otherwise, returns the active trigger ID in a. push hl - ld hl, BikeFlags + 2 + ld hl, wCurrentMapTriggerPointer ld a, [hli] ld h, [hl] ld l, a or h ld a, [hl] - jr nz, .asm_2128 + jr nz, .triggerexists ld a, -1 -.asm_2128 +.triggerexists pop hl ret ; 212a GetCurrentMapTrigger:: ; 212a +; Grabs the wram map trigger pointer for the current map and loads it into wCurrentMapTriggerPointer. +; If there are no triggers, both bytes of wCurrentMapTriggerPointer are wiped clean. +; Copy the current map group and number into bc. This is needed for GetMapTrigger. ld a, [MapGroup] ld b, a ld a, [MapNumber] ld c, a +; Blank out wCurrentMapTriggerPointer; this is the default scenario. xor a - ld [BikeFlags + 2], a - ld [BikeFlags + 3], a + ld [wCurrentMapTriggerPointer], a + ld [wCurrentMapTriggerPointer + 1], a call GetMapTrigger - ret c + ret c ; The map is not in the trigger table +; Load the trigger table pointer from de into wCurrentMapTriggerPointer ld a, e - ld [BikeFlags + 2], a + ld [wCurrentMapTriggerPointer], a ld a, d - ld [BikeFlags + 3], a + ld [wCurrentMapTriggerPointer + 1], a xor a ret ; 2147 GetMapTrigger:: ; 2147 +; Searches the trigger table for the map group and number loaded in bc, and returns the wram pointer in de. +; If the map is not in the trigger table, returns carry. push bc ld a, [hROMBank] push af @@ -50,34 +58,34 @@ GetMapTrigger:: ; 2147 rst Bankswitch ld hl, MapTriggers -.asm_2151 +.loop push hl - ld a, [hli] - cp $ff - jr z, .asm_2167 + ld a, [hli] ; map group, or terminator + cp -1 + jr z, .end ; the current map is not in the trigger table cp b - jr nz, .asm_2160 - ld a, [hli] + jr nz, .next ; map group did not match + ld a, [hli] ; map number cp c - jr nz, .asm_2160 - jr .asm_216a + jr nz, .next ; map number did not match + jr .found ; we found our map -.asm_2160 +.next pop hl - ld de, $0004 + ld de, 4 ; size of an entry in the trigger table add hl, de - jr .asm_2151 + jr .loop -.asm_2167 +.end scf - jr .asm_216d + jr .done -.asm_216a +.found ld e, [hl] inc hl ld d, [hl] -.asm_216d +.done pop hl pop bc ld a, b @@ -234,7 +242,7 @@ Function2252:: ; 2252 ld a, [hROMBank] push af - call Function2c52 + call SwitchToMapScriptHeaderBank call Function2266 pop de @@ -305,7 +313,7 @@ Function22a7:: ; 22a7 ld a, [hROMBank] push af - call Function2c52 + call SwitchToMapScriptHeaderBank call Function22b4 pop af @@ -381,7 +389,7 @@ Function2300:: ; 2300 Function2309:: ; 2309 call Function2326 - call Function2c52 + call SwitchToMapScriptHeaderBank call Function234f xor a call Function2336 @@ -390,7 +398,7 @@ Function2309:: ; 2309 Function2317:: ; 2317 call Function2326 - call Function2c52 + call SwitchToMapScriptHeaderBank call Function234f ld a, $1 call Function2336 @@ -548,7 +556,7 @@ Function23da:: ; 23da Function23f1:: ; 23f1 ld a, [hli] ld c, a - ld [wdbfe], a + ld [wCurrentMapXYTriggerCount], a ld a, l ld [wdbff], a ld a, h @@ -564,7 +572,7 @@ Function23f1:: ; 23f1 Function2408:: ; 2408 ld a, [hli] ld c, a - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld a, l ld [wdc02], a ld a, h @@ -972,7 +980,7 @@ Function263b:: ; 263b ld b, a ld a, [hROMBank] push af - call Function2c52 + call SwitchToMapScriptHeaderBank call Function2653 jr nc, .done @@ -1607,13 +1615,13 @@ Function298b:: ; 298b ld a, [TileDown] and $7 cp $2 - jr z, .asm_299f + jr z, .ok cp $6 - jr z, .asm_299f + jr z, .ok cp $7 ret nz -.asm_299f +.ok ld a, [TilePermissions] or $8 ld [TilePermissions], a @@ -1626,13 +1634,13 @@ Function29a8:: ; 29a8 ld a, [TileUp] and $7 cp $3 - jr z, .asm_29bc + jr z, .ok cp $4 - jr z, .asm_29bc + jr z, .ok cp $5 ret nz -.asm_29bc +.ok ld a, [TilePermissions] or $4 ld [TilePermissions], a @@ -1645,13 +1653,13 @@ Function29c5:: ; 29c5 ld a, [TileRight] and $7 cp $1 - jr z, .asm_29d9 + jr z, .ok cp $5 - jr z, .asm_29d9 + jr z, .ok cp $7 ret nz -.asm_29d9 +.ok ld a, [TilePermissions] or $1 ld [TilePermissions], a @@ -1664,13 +1672,13 @@ Function29e2:: ; 29e2 ld a, [TileLeft] and $7 cp $0 - jr z, .asm_29f6 + jr z, .ok cp $4 - jr z, .asm_29f6 + jr z, .ok cp $6 ret nz -.asm_29f6 +.ok ld a, [TilePermissions] or $2 ld [TilePermissions], a @@ -1696,8 +1704,7 @@ GetFacingTileCoord:: ; 2a07 srl a ld l, a ld h, 0 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ld de, .Directions add hl, de @@ -1736,33 +1743,32 @@ Function2a3c:: ; 2a3c call GetBlockLocation ld a, [hl] and a - jr z, .asm_2a63 + jr z, .nope ld l, a ld h, $0 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ld a, [TilesetCollisionAddress] ld c, a ld a, [TilesetCollisionAddress + 1] ld b, a add hl, bc rr d - jr nc, .asm_2a56 + jr nc, .nocarry inc hl -.asm_2a56 +.nocarry rr e - jr nc, .asm_2a5c + jr nc, .nocarry2 inc hl inc hl -.asm_2a5c +.nocarry2 ld a, [TilesetCollisionBank] call GetFarByte ret -.asm_2a63 - ld a, $ff +.nope + ld a, -1 ret ; 2a66 @@ -1775,20 +1781,20 @@ GetBlockLocation:: ; 2a66 add hl, bc ld a, e srl a - jr z, .asm_2a84 + jr z, .nope and a -.asm_2a78 +.loop srl a - jr nc, .asm_2a7d + jr nc, .ok add hl, bc -.asm_2a7d +.ok sla c rl b and a - jr nz, .asm_2a78 + jr nz, .loop -.asm_2a84 +.nope ld c, d srl c ld b, $0 @@ -1799,128 +1805,138 @@ GetBlockLocation:: ; 2a66 CheckFacingSign:: ; 2a8b call GetFacingTileCoord +; Load facing into b. ld b, a +; Convert the coordinates at de to within-boundaries coordinates. ld a, d sub 4 ld d, a ld a, e sub 4 ld e, a - ld a, [wdc01] +; If there are no signposts, we don't need to be here. + ld a, [wCurrentMapSignpostCount] and a ret z ld c, a ld a, [hROMBank] push af - call Function2c52 - call Function2aaa + call SwitchToMapScriptHeaderBank + call CheckIfFacingTileCoordIsSign pop hl ld a, h rst Bankswitch ret ; 2aaa -Function2aaa:: ; 2aaa +CheckIfFacingTileCoordIsSign:: ; 2aaa +; Checks to see if you are facing a signpost. If so, copies it into EngineBuffer1 and sets carry. ld hl, wdc02 ld a, [hli] ld h, [hl] ld l, a -.asm_2ab0 +.loop push hl ld a, [hli] cp e - jr nz, .asm_2abb + jr nz, .next ld a, [hli] cp d - jr nz, .asm_2abb - jr .asm_2ac8 + jr nz, .next + jr .copysign -.asm_2abb +.next pop hl - ld a, 5 + ld a, 5 ; signpost event length add l ld l, a - jr nc, .asm_2ac3 + jr nc, .nocarry inc h -.asm_2ac3 +.nocarry dec c - jr nz, .asm_2ab0 + jr nz, .loop xor a ret -.asm_2ac8 +.copysign pop hl ld de, EngineBuffer1 - ld bc, 5 + ld bc, 5 ; signpost event length call CopyBytes scf ret ; 2ad4 -Function2ad4:: ; 2ad4 - ld a, [wdbfe] +CheckCurrentMapXYTriggers:: ; 2ad4 +; If there are no xy triggers, we don't need to be here. + ld a, [wCurrentMapXYTriggerCount] and a ret z +; Copy the trigger count into c. ld c, a ld a, [hROMBank] push af - call Function2c52 - call Function2ae7 + call SwitchToMapScriptHeaderBank + call CheckStandingOnXYTrigger pop hl ld a, h rst Bankswitch ret ; 2ae7 -Function2ae7:: ; 2ae7 +CheckStandingOnXYTrigger:: ; 2ae7 +; Checks to see if you are standing on an xy-trigger. If yes, copies the trigger to EngineBuffer1 and sets carry. ld hl, wdbff ld a, [hli] ld h, [hl] ld l, a +; Load the active trigger ID into b call CheckTriggers ld b, a +; Load your current coordinates into de. This will be used to check if your position is in the xy-trigger table for the current map. ld a, [MapX] - sub $4 + sub 4 ld d, a ld a, [MapY] - sub $4 + sub 4 ld e, a -.asm_2afd + +.loop push hl ld a, [hli] cp b - jr z, .asm_2b06 - cp $ff - jr nz, .asm_2b10 + jr z, .got_id + cp -1 + jr nz, .next -.asm_2b06 +.got_id ld a, [hli] cp e - jr nz, .asm_2b10 + jr nz, .next ld a, [hli] cp d - jr nz, .asm_2b10 - jr .asm_2b1d + jr nz, .next + jr .copytrigger -.asm_2b10 +.next pop hl - ld a, $8 + ld a, $8 ; xy-trigger size add l ld l, a - jr nc, .asm_2b18 + jr nc, .nocarry inc h -.asm_2b18 +.nocarry dec c - jr nz, .asm_2afd + jr nz, .loop xor a ret -.asm_2b1d +.copytrigger pop hl ld de, EngineBuffer1 - ld bc, $0008 + ld bc, $0008 ; xy-trigger size call CopyBytes scf ret @@ -2139,7 +2155,7 @@ Function2c3d:: ; 2c3d ret ; 2c52 -Function2c52:: ; 2c52 +SwitchToMapScriptHeaderBank:: ; 2c52 ld a, [MapScriptHeaderBank] rst Bankswitch ret diff --git a/macros.asm b/macros.asm index ccbc4ed22..7b81469bc 100644 --- a/macros.asm +++ b/macros.asm @@ -13,6 +13,7 @@ INCLUDE "macros/pic.asm" INCLUDE "macros/predef.asm" INCLUDE "macros/rst.asm" INCLUDE "macros/mobile.asm" +INCLUDE "macros/trainer.asm" diff --git a/macros/charmap.asm b/macros/charmap.asm index b6344a1fa..bc5f16c4f 100644 --- a/macros/charmap.asm +++ b/macros/charmap.asm @@ -281,5 +281,6 @@ charmap "", $59 charmap "", $5a charmap "", $3f + charmap "", $4a charmap "", $14 ; + gender diff --git a/main.asm b/main.asm index baee2e48a..08f453fc3 100644 --- a/main.asm +++ b/main.asm @@ -3216,7 +3216,7 @@ PlayerObjectTemplate: ; 8071 ; A dummy map object used to initialize the player object. ; Shorter than the actual amount copied by two bytes. ; Said bytes seem to be unused. - person_event SPRITE_CHRIS, 0, 0, LEFT << 2 | $3, $ff, -1, -1, PAL_OW_RED << 4 | $0, 0, $0000, -1 + person_event SPRITE_CHRIS, 0, 0, LEFT << 2 | $3, $ff, -1, -1, $0, 0, $0000, -1 ; db $01, $00, $00, $0b, $ff, $ff, $ff, $00, $00, $00, $00, $ff, $ff ; 807e @@ -5319,7 +5319,7 @@ UnknownScript_0xcaa3: ; 0xcaa3 special UpdateTimePals callasm Function8caed farscall UnknownScript_0x122c1 - special Function97c28 + special WarpToLastSpawn callasm Function154f1 writecode VAR_MOVEMENT, $0 newloadmap $fc @@ -5588,7 +5588,7 @@ UnknownScript_0xcc3c: ; 0xcc3c playsound SFX_WARP_TO applymovement $0, MovementData_0xcc59 farscall UnknownScript_0x122c1 - special Function97c28 + special WarpToLastSpawn writecode VAR_MOVEMENT, $0 newloadmap $f5 playsound SFX_WARP_FROM @@ -5686,7 +5686,7 @@ UnknownScript_0xccbb: ; 0xccbb playsound SFX_WARP_TO applymovement $0, MovementData_0xcce1 farscall UnknownScript_0x122c1 - special Function97c28 + special WarpToLastSpawn writecode VAR_MOVEMENT, $0 newloadmap $f4 playsound SFX_WARP_FROM @@ -12731,7 +12731,7 @@ UnknownScript_0x124ce: ; 0x124ce callasm HalveMoney callasm Function12527 farscall UnknownScript_0x122c1 - special Function97c28 + special WarpToLastSpawn newloadmap $f1 resetfuncs @@ -13349,8 +13349,8 @@ StartMenu_Quit: ; 128f0 ld hl, .EndTheContestText call Function12cf5 jr c, .asm_12903 - ld a, BANK(UnknownScript_0x1360b) - ld hl, UnknownScript_0x1360b + ld a, BANK(BugCatchingContestReturnToGateScript) + ld hl, BugCatchingContestReturnToGateScript call Function31cf ld a, 4 ret @@ -15357,10 +15357,10 @@ FloorToString: ; 13575 ; 135db -Function135db: ; 135db +Special_GiveParkBalls: ; 135db xor a ld [wdf9c], a - ld a, $14 + ld a, 20 ld [wdc79], a callba Function11490 ret @@ -15372,25 +15372,25 @@ BugCatchingContestBattleScript:: ; 0x135eb startbattle returnafterbattle copybytetovar wdc79 - iffalse UnknownScript_0x13603 + iffalse BugCatchingContestOutOfBallsScript end ; 0x135f8 -UnknownScript_0x135f8:: ; 0x135f8 +BugCatchingContestOverScript:: ; 0x135f8 playsound SFX_ELEVATOR_END loadfont writetext UnknownText_0x1360f closetext - jump UnknownScript_0x1360b + jump BugCatchingContestReturnToGateScript ; 0x13603 -UnknownScript_0x13603: ; 0x13603 +BugCatchingContestOutOfBallsScript: ; 0x13603 playsound SFX_ELEVATOR_END loadfont writetext UnknownText_0x13614 closetext -UnknownScript_0x1360b: ; 0x1360b +BugCatchingContestReturnToGateScript: ; 0x1360b loadmovesprites jumpstd bugcontestresultswarp ; 0x1360f @@ -15407,7 +15407,7 @@ UnknownText_0x13614: ; 0x13614 db "@" ; 0x13619 -UnknownScript_0x13619:: ; 0x13619 +RepelWoreOffScript:: ; 0x13619 loadfont writetext UnknownText_0x13620 closetext @@ -15421,14 +15421,14 @@ UnknownText_0x13620: ; 0x13620 db "@" ; 0x13625 -UnknownScript_0x13625:: ; 0x13625 +SignpostItemScript:: ; 0x13625 loadfont copybytetovar Unkn2Pals - itemtotext $0, $0 + itemtotext 0, 0 writetext UnknownText_0x13645 - giveitem $ff, $1 + giveitem -1, 1 iffalse UnknownScript_0x1363e - callasm Function1364f + callasm SetMemEvent specialsound itemnotify jump UnknownScript_0x13643 @@ -15456,19 +15456,20 @@ UnknownText_0x1364a: ; 0x1364a db "@" ; 0x1364f -Function1364f: ; 1364f +SetMemEvent: ; 1364f ld hl, EngineBuffer1 ; wd03e (aliases: MenuItemsList, CurFruitTree, CurInput) ld a, [hli] ld d, [hl] ld e, a - ld b, $1 + ld b, $1 ; set call EventFlagAction ret -Function1365b:: ; 1365b +CheckFacingTileForStd:: ; 1365b +; Checks to see if the tile you're facing has a std script associated with it. If so, executes the script and returns carry. ld a, c - ld de, .table2 - .table1 + ld de, 3 ld hl, .table1 call IsInArray jr nc, .notintable @@ -15493,7 +15494,6 @@ Function1365b:: ; 1365b .table1 dbw $91, magazinebookshelf -.table2 dbw $93, pcscript dbw $94, radio1 dbw $95, townmap @@ -15514,21 +15514,21 @@ _BugContestJudging: ; 1369d callba Function105f79 call Function13819 ld a, [wd00a] - call LoadContestantData + call LoadContestantName ld a, [wd00b] ld [wd265], a call GetPokemonName ld hl, BugContest_ThirdPlaceText call PrintText ld a, [EndFlypoint] - call LoadContestantData + call LoadContestantName ld a, [MovementBuffer] ld [wd265], a call GetPokemonName ld hl, BugContest_SecondPlaceText call PrintText ld a, [DefaultFlypoint] - call LoadContestantData + call LoadContestantName ld a, [wd003] ld [wd265], a call GetPokemonName @@ -15596,56 +15596,65 @@ BugContest_ThirdPlaceScoreText: ; 0x1372b db "@" ; 0x13730 -LoadContestantData: ; 13730 +LoadContestantName: ; 13730 + +; If a = 0, get your name. dec a - jr z, .asm_13777 + jr z, .done +; Find the pointer for the trainer class of the Bug Catching Contestant whose ID is in a. ld c, a ld b, 0 ld hl, BugContestantPointers - add hl, bc - add hl, bc + add_n_times hl, bc, 2 ld a, [hli] ld h, [hl] ld l, a +; Copy the Trainer Class to c. ld a, [hli] ld c, a +; Save hl and bc for later. push hl push bc +; Get the Trainer Class name and copy it into wd016. callab Function3952d ld hl, StringBuffer1 ld de, wd016 - ld bc, $000d + ld bc, TRAINER_CLASS_NAME_LENGTH call CopyBytes ld hl, wd016 -.asm_13757 +; Delete the trailing terminator and replace it with a space. +.next ld a, [hli] - cp $50 - jr nz, .asm_13757 + cp "@" + jr nz, .next dec hl - ld [hl], $7f + ld [hl], " " inc hl ld d, h ld e, l +; Restore the Trainer Class ID and Trainer ID pointer. Save de for later. pop bc pop hl push de +; Get the name of the trainer with class c and ID b. ld a, [hl] ld b, a callab GetTrainerName +; Append the name to wd016. ld hl, StringBuffer1 pop de - ld bc, $000a + ld bc, NAME_LENGTH - 1 jp CopyBytes -.asm_13777 +.done ld hl, PlayerName ld de, wd016 - ld bc, $000b + ld bc, NAME_LENGTH jp CopyBytes ; 13783 BugContestantPointers: ; 13783 - dw BugContestant_BugCatcherDon + dw BugContestant_BugCatcherDon ; This reverts back to the player dw BugContestant_BugCatcherDon dw BugContestant_BugCatcherEd dw BugContestant_CooltrainerMNick @@ -15721,17 +15730,17 @@ BugContestant_SchoolboyKipp: Function13807: ; 13807 ld hl, wd00a - ld de, $fffc - ld b, $3 -.asm_1380f + ld de, -4 + ld b, 3 +.loop ld a, [hl] - cp $1 - jr z, .asm_13818 + cp 1 + jr z, .done add hl, de dec b - jr nz, .asm_1380f + jr nz, .loop -.asm_13818 +.done ret ; 13819 @@ -15739,7 +15748,7 @@ Function13819: ; 13819 call Function13833 call Function138b0 ld hl, wd00e - ld a, $1 + ld a, 1 ld [hli], a ld a, [wdf9c] ld [hli], a @@ -15753,57 +15762,57 @@ Function13819: ; 13819 Function13833: ; 13833 ld hl, DefaultFlypoint - ld b, $c + ld b, 12 xor a -.asm_13839 +.loop ld [hli], a dec b - jr nz, .asm_13839 + jr nz, .loop ret ; 1383e Function1383e: ; 1383e ld de, wd010 ld hl, wd004 - ld c, $2 + ld c, 2 call StringCmp - jr c, .asm_1386b + jr c, .next ld hl, EndFlypoint ld de, wd00a ld bc, $0004 call CopyBytes ld hl, DefaultFlypoint ld de, EndFlypoint - ld bc, $0004 + ld bc, 4 call CopyBytes ld hl, DefaultFlypoint call Function138a0 - jr .asm_1389f + jr .done -.asm_1386b +.next ld de, wd010 ld hl, wd008 - ld c, $2 + ld c, 2 call StringCmp - jr c, .asm_1388c + jr c, .next2 ld hl, EndFlypoint ld de, wd00a - ld bc, $0004 + ld bc, 4 call CopyBytes ld hl, EndFlypoint call Function138a0 - jr .asm_1389f + jr .done -.asm_1388c +.next2 ld de, wd010 ld hl, wd00c - ld c, $2 + ld c, 2 call StringCmp - jr c, .asm_1389f + jr c, .done ld hl, wd00a call Function138a0 -.asm_1389f +.done ret ; 138a0 @@ -15825,12 +15834,12 @@ Function138a0: ; 138a0 ; 138b0 Function138b0: ; 138b0 - ld e, $0 -.asm_138b2 + ld e, 0 +.loop push de - call Function139ed + call Special_CheckBugContestContestantFlag pop de - jr nz, .asm_138f9 + jr nz, .done ld a, e inc a inc a @@ -15839,32 +15848,29 @@ Function138b0: ; 138b0 ld c, a ld b, 0 ld hl, BugContestantPointers - add hl, bc - add hl, bc + add_n_times hl, bc, 2 ld a, [hli] ld h, [hl] ld l, a inc hl inc hl -.asm_138cd +.loop2 call Random - and $3 - cp $3 - jr z, .asm_138cd + and 3 + cp 3 + jr z, .loop2 ld c, a - ld b, $0 - add hl, bc - add hl, bc - add hl, bc + ld b, 0 + add_n_times hl, bc, 3 ld a, [hli] ld [wd00f], a ld a, [hli] ld h, [hl] ld l, a call Random - and $7 + and 7 ld c, a - ld b, $0 + ld b, 0 add hl, bc ld a, h ld [wd010], a @@ -15874,11 +15880,11 @@ Function138b0: ; 138b0 call Function1383e pop de -.asm_138f9 +.done inc e ld a, e - cp $a - jr nz, .asm_138b2 + cp 10 + jr nz, .loop ret ; 13900 @@ -15979,115 +15985,126 @@ ContestScore: ; 13900 ; decreases all pokemon's pokerus counter by b. if the lower nybble reaches zero, the pokerus is cured. ApplyPokerusTick: ; 13988 - ld hl, PartyMon1PokerusStatus + ld hl, PartyMon1PokerusStatus ; PartyMon1 + MON_PKRS ld a, [PartyCount] and a ret z ld c, a -.asm_13991 +.loop ld a, [hl] and $f - jr z, .asm_139a0 + jr z, .does_not_have_pokerus sub b - jr nc, .asm_1399a + jr nc, .ok xor a -.asm_1399a +.ok ld d, a ld a, [hl] and $f0 add d ld [hl], a -.asm_139a0 +.does_not_have_pokerus ld de, PartyMon2 - PartyMon1 add hl, de dec c - jr nz, .asm_13991 + jr nz, .loop ret ; 139a8 -Function139a8: ; 139a8 - ld c, $a - ld hl, Unknown_139fe -.asm_139ad +Special_SelectRandomBugContestContestants: ; 139a8 +; Select five random people to participate in the current contest. + +; First we have to make sure that any old data is cleared away. + ld c, 10 ; Number of people to choose from. + ld hl, BugCatchingContestantEventFlagTable +.loop1 push bc push hl ld e, [hl] inc hl ld d, [hl] - ld b, $0 + ld b, $0 ; clear call EventFlagAction pop hl inc hl inc hl pop bc dec c - jr nz, .asm_139ad - ld c, $5 -.asm_139c0 + jr nz, .loop1 + +; Now that that's out of the way, we can get on to the good stuff. + ld c, 5 +.loop2 push bc -.asm_139c1 +.next +; Choose a flag at uniform random to be set. call Random - cp $fa - jr nc, .asm_139c1 - ld c, $19 + cp $fa ; 250 + jr nc, .next + ld c, $19 ; 25 call SimpleDivide ld e, b ld d, 0 - ld hl, Unknown_139fe - add hl, de - add hl, de + ld hl, BugCatchingContestantEventFlagTable + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] push de - ld b, $2 +; If we've already set it, it doesn't count. + ld b, $2 ; check call EventFlagAction pop de ld a, c and a - jr nz, .asm_139c1 - ld b, $1 + jr nz, .next +; Set the flag. This will cause that sprite to not be visible in the contest. + ld b, $1 ; set call EventFlagAction pop bc +; Check if we're done. If so, return. Otherwise, choose the next victim. dec c - jr nz, .asm_139c0 + jr nz, .loop2 ret ; 139ed -Function139ed: ; 139ed - ld hl, Unknown_139fe +Special_CheckBugContestContestantFlag: ; 139ed +; Checks the flag of the Bug Catching Contestant whose index is loaded in a. + +; Bug: If a >= 10 when this is called, it will read beyond the table. + + ld hl, BugCatchingContestantEventFlagTable ld e, a ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] - ld b, $2 + ld b, $2 ; check call EventFlagAction ret ; 139fe -Unknown_139fe: ; 139fe - dw $0716 - dw $0717 - dw $0718 - dw $0719 - dw $071a - dw $071b - dw $071c - dw $071d - dw $071e - dw $071f +BugCatchingContestantEventFlagTable: ; 139fe + dw EVENT_BUG_CATCHING_CONTESTANT_1A + dw EVENT_BUG_CATCHING_CONTESTANT_2A + dw EVENT_BUG_CATCHING_CONTESTANT_3A + dw EVENT_BUG_CATCHING_CONTESTANT_4A + dw EVENT_BUG_CATCHING_CONTESTANT_5A + dw EVENT_BUG_CATCHING_CONTESTANT_6A + dw EVENT_BUG_CATCHING_CONTESTANT_7A + dw EVENT_BUG_CATCHING_CONTESTANT_8A + dw EVENT_BUG_CATCHING_CONTESTANT_9A + dw EVENT_BUG_CATCHING_CONTESTANT_10A ; 13a12 -Function13a12: ; 13a12 +CheckFirstMonFainted: ; 13a12 ld hl, PartyMon1HP ld a, [hli] or [hl] - jr z, .asm_13a2b + jr z, .fainted ld hl, PartyCount ld a, 1 ld [hli], a @@ -16099,7 +16116,7 @@ Function13a12: ; 13a12 ld [ScriptVar], a ret -.asm_13a2b +.fainted ld a, $1 ld [ScriptVar], a ret @@ -33045,60 +33062,69 @@ TradeGameBoyLZ: INCBIN "gfx/trade/game_boy.2bpp.lz" TradeBallGFX: INCBIN "gfx/trade/ball.2bpp" TradePoofGFX: INCBIN "gfx/trade/poof.2bpp" -Function29bfb: ; 29bfb +Special_CheckTimeCapsuleCompatibility: ; 29bfb +; Checks to see if your Party is compatible with the generation 1 games. Returns the following in ScriptVar: +; 0: Party is okay +; 1: At least one Pokemon was introduced in GS +; 2: At least one Pokemon has a move that was introduced in GS +; 3: At least one Pokemon is holding mail + +; If any party Pokemon was introduced in the generation 2 games, don't let it in. ld hl, PartySpecies - ld b, PARTY_LENGTH -.asm_29c00 + ld b, PARTY_LENGTH ; 6 +.loop ld a, [hli] cp $ff - jr z, .asm_29c0c - cp 151 + 1 - jr nc, .asm_29c42 + jr z, .checkitem + cp CHIKORITA ; MEW + 1 ; 151 + 1 + jr nc, .mon_too_new dec b - jr nz, .asm_29c00 + jr nz, .loop -.asm_29c0c +; If any party Pokemon is holding mail, don't let it in. +.checkitem ld a, [PartyCount] ld b, a ld hl, PartyMon1Item -.asm_29c13 +.itemloop push hl push bc ld d, [hl] callba ItemIsMail pop bc pop hl - jr c, .asm_29c5e + jr c, .mon_has_mail ld de, PartyMon2 - PartyMon1 add hl, de dec b - jr nz, .asm_29c13 + jr nz, .itemloop +; If any party Pokemon has a move that was introduced in the generation 2 games, don't let it in. ld hl, PartyMon1Moves ld a, [PartyCount] ld b, a -.asm_29c2e +.move_loop ld c, NUM_MOVES -.asm_29c30 +.move_next ld a, [hli] cp STRUGGLE + 1 - jr nc, .asm_29c4c + jr nc, .move_too_new dec c - jr nz, .asm_29c30 + jr nz, .move_next ld de, PartyMon2 - (PartyMon1 + NUM_MOVES) add hl, de dec b - jr nz, .asm_29c2e + jr nz, .move_loop xor a - jr .asm_29c63 + jr .done -.asm_29c42 +.mon_too_new ld [wd265], a call GetPokemonName ld a, $1 - jr .asm_29c63 + jr .done -.asm_29c4c +.move_too_new push bc ld [wd265], a call GetMoveName @@ -33106,13 +33132,13 @@ Function29bfb: ; 29bfb pop bc call Function29c67 ld a, $2 - jr .asm_29c63 + jr .done -.asm_29c5e +.mon_has_mail call Function29c67 ld a, $3 -.asm_29c63 +.done ld [ScriptVar], a ret ; 29c67 @@ -33131,7 +33157,7 @@ Function29c67: ; 29c67 ret ; 29c7b -Function29c7b: ; 29c7b +Special_EnterTimeCapsule: ; 29c7b ld c, $a call DelayFrames ld a, $4 @@ -33145,7 +33171,7 @@ Function29c7b: ; 29c7b ret ; 29c92 -Function29c92: ; 29c92 +Special_AbortLink: ; 29c92 ld c, $3 call DelayFrames ld a, $ff @@ -33193,21 +33219,21 @@ Function29c92: ; 29c92 ret ; 29ce8 -Function29ce8: ; 29ce8 +Special_SetBitsForLinkTradeRequest: ; 29ce8 ld a, $1 ld [wcf56], a ld [wd265], a ret ; 29cf1 -Function29cf1: ; 29cf1 +Special_SetBitsForBattleRequest: ; 29cf1 ld a, $2 ld [wcf56], a ld [wd265], a ret ; 29cfa -Function29cfa: ; 29cfa +Special_SetBitsForTimeCapsuleRequest: ; 29cfa ld a, $2 ld [rSB], a xor a @@ -33222,7 +33248,7 @@ Function29cfa: ; 29cfa ret ; 29d11 -Function29d11: ; 29d11 +Special_WaitForLinkedFriend: ; 29d11 ld a, [wcf56] and a jr z, .asm_29d2f @@ -33294,7 +33320,7 @@ Function29d11: ; 29d11 ret ; 29d92 -Function29d92: ; 29d92 +Special_CheckLinkTimeout: ; 29d92 ld a, $1 ld [wcf56], a ld hl, wcf5b @@ -33430,7 +33456,7 @@ Function29e53: ; 29e53 ret ; 29e66 -Function29e66: ; 29e66 +Special_TryQuickSave: ; 29e66 ld a, [wd265] push af callba Function14ab2 @@ -33447,7 +33473,7 @@ Function29e66: ; 29e66 ret ; 29e82 -Function29e82: ; 29e82 +Special_CheckBothSelectedSameRoom: ; 29e82 ld a, [wd265] call Function29f17 push af @@ -33474,7 +33500,7 @@ Function29e82: ; 29e82 ret ; 29eaf -Function29eaf: ; 29eaf +Special_TimeCapsule: ; 29eaf ld a, $1 ld [InLinkBattle], a call Function2ed3 @@ -33485,7 +33511,7 @@ Function29eaf: ; 29eaf ret ; 29ec4 -Function29ec4: ; 29ec4 +Special_TradeCenter: ; 29ec4 ld a, $2 ld [InLinkBattle], a call Function2ed3 @@ -33496,7 +33522,7 @@ Function29ec4: ; 29ec4 ret ; 29ed9 -Function29ed9: ; 29ed9 +Special_Colosseum: ; 29ed9 ld a, $3 ld [InLinkBattle], a call Function2ed3 @@ -33507,7 +33533,7 @@ Function29ed9: ; 29ed9 ret ; 29eee -Function29eee: ; 29eee +Special_CloseLink: ; 29eee xor a ld [InLinkBattle], a ld c, $3 @@ -33515,7 +33541,7 @@ Function29eee: ; 29eee jp Function29f04 ; 29efa -Function29efa: ; 29efa +Special_FailedLinkToPast: ; 29efa ld c, $28 call DelayFrames ld a, $e @@ -33564,14 +33590,14 @@ Function29f17: ; 29f17 ret ; 29f47 -Function29f47: ; 29f47 +Special_CableClubCheckWhichChris: ; 29f47 ld a, [$ffcb] cp $1 ld a, $1 - jr z, .asm_29f50 + jr z, .yes dec a -.asm_29f50 +.yes ld [ScriptVar], a ret ; 29f54 @@ -35089,7 +35115,7 @@ TrainerClassNames:: ; 2c1ef db "RIVAL@" db "#MON PROF.@" db "ELITE FOUR@" - db $4a, " TRAINER@" + db " TRAINER@" db "ELITE FOUR@" db "ELITE FOUR@" db "ELITE FOUR@" @@ -35140,7 +35166,7 @@ TrainerClassNames:: ; 2c1ef db "KIMONO GIRL@" db "TWINS@" db "#FAN@" - db $4a, " TRAINER@" + db " TRAINER@" db "LEADER@" db "OFFICER@" db "ROCKET@" @@ -75984,7 +76010,7 @@ Functionb8172: ; b8172 ld a, [hli] ld h, [hl] ld l, a - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] and a jr z, .asm_b81dd .asm_b8194 @@ -90043,23 +90069,23 @@ UnownWord25: unownword "YIELD" UnownWord26: unownword "ZOOM" ; fbb32 -Functionfbb32: ; fbb32 +Special_CheckMagikarpLength: ; fbb32 callba Function50000 - jr c, .asm_fbb9e + jr c, .declined ld a, [CurPartySpecies] cp MAGIKARP - jr nz, .asm_fbba4 + jr nz, .not_magikarp ld a, [CurPartyMon] ld hl, PartyMon1Species ld bc, PartyMon2 - PartyMon1 call AddNTimes push hl - ld bc, $0015 + ld bc, MON_DVS add hl, bc ld d, h ld e, l pop hl - ld bc, $0006 + ld bc, MON_ID add hl, bc ld b, h ld c, l @@ -90072,7 +90098,7 @@ Functionfbb32: ; fbb32 ld de, wdfe8 ld c, $2 call StringCmp - jr nc, .asm_fbb98 + jr nc, .not_long_enough ld hl, Buffer1 ld de, wdfe8 ld a, [hli] @@ -90089,17 +90115,17 @@ Functionfbb32: ; fbb32 ld [ScriptVar], a ret -.asm_fbb98 +.not_long_enough ld a, $2 ld [ScriptVar], a ret -.asm_fbb9e +.declined ld a, $1 ld [ScriptVar], a ret -.asm_fbba4 +.not_magikarp xor a ld [ScriptVar], a ret @@ -92235,55 +92261,55 @@ Function1047f0: ; 1047f0 ld [wd45b], a ret -Function104820:: ; 104820 (41:4820) +CheckMovingOffEdgeOfMap:: ; 104820 (41:4820) ld a, [wd151] - cp $ff + cp STANDING ret z and a - jr z, .asm_104837 - cp $1 - jr z, .asm_104846 - cp $2 - jr z, .asm_104851 - cp $3 - jr z, .asm_10485c + jr z, .down + cp UP + jr z, .up + cp LEFT + jr z, .left + cp RIGHT + jr z, .right and a ret -.asm_104837 +.down ld a, [MapY] - sub $4 + sub 4 ld b, a ld a, [MapHeight] add a cp b - jr z, .asm_10486b + jr z, .ok and a ret -.asm_104846 +.up ld a, [MapY] - sub $4 - cp $ff - jr z, .asm_10486b + sub 4 + cp -1 + jr z, .ok and a ret -.asm_104851 +.left ld a, [MapX] sub $4 - cp $ff - jr z, .asm_10486b + cp -1 + jr z, .ok and a ret -.asm_10485c +.right ld a, [MapX] - sub $4 + sub 4 ld b, a ld a, [MapWidth] add a cp b - jr z, .asm_10486b + jr z, .ok and a ret -.asm_10486b +.ok scf ret @@ -93468,16 +93494,16 @@ Function105091: ; 105091 (41:5091) jr c, .asm_105096 jp CloseSRAM -Function1050b9: ; 1050b9 +Special_UnlockMysteryGift: ; 1050b9 call Function105106 ld hl, $abe3 ld a, [hl] inc a - jr nz, .asm_1050c5 + jr nz, .ok ld [hld], a ld [hl], a -.asm_1050c5 +.ok jp CloseSRAM ; 1050c8 diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index df0034df8..f1f78ba9a 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -446,15 +446,15 @@ AzaleaGym_MapEventHeader: ; signposts db 2 - signpost 13, 3, $0, AzaleaGymStatue - signpost 13, 6, $0, AzaleaGymStatue + signpost 13, 3, SIGNPOST_READ, AzaleaGymStatue + signpost 13, 6, SIGNPOST_READ, AzaleaGymStatue ; people-events db 7 - person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, -1 - person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, -1 - person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, -1 - person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, -1 - person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, -1 - person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, -1 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, -1 + person_event SPRITE_BUGSY, 11, 9, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugsyScript_0x18ec1e, -1 + person_event SPRITE_BUG_CATCHER, 7, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherBug_catcher_benny, -1 + person_event SPRITE_BUG_CATCHER, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherAl, -1 + person_event SPRITE_BUG_CATCHER, 6, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherJosh, -1 + person_event SPRITE_TWIN, 14, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay1, -1 + person_event SPRITE_TWIN, 14, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAmyandmay2, -1 + person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, AzaleaGymGuyScript, -1 diff --git a/maps/AzaleaMart.asm b/maps/AzaleaMart.asm index bf5decd73..87d82b23a 100644 --- a/maps/AzaleaMart.asm +++ b/maps/AzaleaMart.asm @@ -57,6 +57,6 @@ AzaleaMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, -1 - person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, -1 - person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x18e040, -1 + person_event SPRITE_COOLTRAINER_M, 9, 6, UP << 2 | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x18e047, -1 + person_event SPRITE_BUG_CATCHER, 6, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18e04a, -1 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 10ce076dc..f3d12b052 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -90,7 +90,7 @@ AzaleaPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, -1 - person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, -1 - person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, -1 - person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x18db28, -1 + person_event SPRITE_GENTLEMAN, 10, 13, UP << 2 | $0, $10, -1, -1, $0, 0, GentlemanScript_0x18db2b, -1 + person_event SPRITE_FISHING_GURU, 5, 10, UP << 2 | $2, $0, -1, -1, $0, 0, FishingGuruScript_0x18db2e, -1 + person_event SPRITE_POKEFAN_F, 8, 5, DOWN << 2 | $2, $21, -1, -1, $0, 0, PokefanFScript_0x18db31, -1 diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 97a104ba5..bd1e506ba 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -470,27 +470,27 @@ AzaleaTown_MapEventHeader: ; signposts db 9 - signpost 9, 19, $0, AzaleaTownSign - signpost 9, 10, $0, KurtsHouseSign - signpost 15, 14, $0, AzaleaGymSign - signpost 7, 29, $0, SlowpokeWellSign - signpost 13, 19, $0, CharcoalKilnSign - signpost 9, 16, $0, AzaleaTownPokeCenterSign - signpost 5, 22, $0, AzaleaTownMartSign - signpost 9, 3, $0, AzaleaTownIlextForestSign - signpost 6, 31, $7, MapAzaleaTownSignpostItem8 + signpost 9, 19, SIGNPOST_READ, AzaleaTownSign + signpost 9, 10, SIGNPOST_READ, KurtsHouseSign + signpost 15, 14, SIGNPOST_READ, AzaleaGymSign + signpost 7, 29, SIGNPOST_READ, SlowpokeWellSign + signpost 13, 19, SIGNPOST_READ, CharcoalKilnSign + signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign + signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign + signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign + signpost 6, 31, SIGNPOST_ITEMIFSET, MapAzaleaTownSignpostItem8 ; people-events db 12 - person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA - person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, -1 - person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, -1 - person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, -1 - person_event SPRITE_SLOWPOKE, 21, 12, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, -1 - person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BF - person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC - person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4 + person_event SPRITE_AZALEA_ROCKET, 13, 35, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA + person_event SPRITE_GRAMPS, 13, 25, DOWN << 2 | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1 + person_event SPRITE_TEACHER, 17, 19, UP << 2 | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1 + person_event SPRITE_YOUNGSTER, 13, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1 + person_event SPRITE_SLOWPOKE, 21, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_SLOWPOKE, 13, 22, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_SLOWPOKE, 13, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_SLOWPOKE, 19, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_FRUIT_TREE, 6, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1 + person_event SPRITE_AZALEA_ROCKET, 14, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6BF + person_event SPRITE_AZALEA_ROCKET, 20, 14, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC + person_event SPRITE_KURT_OUTSIDE, 9, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4 diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 02ee0fb06..b9be5f460 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -79,7 +79,7 @@ UnknownScript_0x9e40f: yesorno iffalse UnknownScript_0x9e3fc dotrigger $0 - special Function29e66 + special Special_TryQuickSave iffalse UnknownScript_0x9e3fc dotrigger $1 writebyte $1 @@ -168,7 +168,7 @@ UnknownScript_0x9e4be: writetext UnknownText_0x9ef1f yesorno iffalse UnknownScript_0x9e3fc - special Function29e66 + special Special_TryQuickSave iffalse UnknownScript_0x9e3fc writebyte $1 special Function170687 @@ -207,7 +207,7 @@ UnknownScript_0x9e515: yesorno iffalse UnknownScript_0x9e3fc dotrigger $0 - special Function29e66 + special Special_TryQuickSave iffalse UnknownScript_0x9e3fc dotrigger $1 writebyte $6 @@ -806,12 +806,12 @@ BattleTower1F_MapEventHeader: ; signposts db 1 - signpost 6, 6, $0, MapBattleTower1FSignpost0Script + signpost 6, 6, SIGNPOST_READ, MapBattleTower1FSignpost0Script ; people-events db 5 - person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, -1 - person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, -1 - person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, -1 - person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, -1 - person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, -1 + person_event SPRITE_RECEPTIONIST, 10, 11, UP << 2 | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x9e3e2, -1 + person_event SPRITE_YOUNGSTER, 13, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x9e55d, -1 + person_event SPRITE_COOLTRAINER_F, 13, 8, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x9e568, -1 + person_event SPRITE_BUG_CATCHER, 7, 5, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BugCatcherScript_0x9e56b, -1 + person_event SPRITE_GRANNY, 7, 18, UP << 2 | $0, $10, -1, -1, $0, 0, GrannyScript_0x9e56e, -1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 4c78d8871..f2c19cc93 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader: ; people-events db 2 - person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_791 - person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, -1 + person_event SPRITE_YOUNGSTER, 4, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_791 + person_event SPRITE_RECEPTIONIST, 10, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index b8763f8e0..86db6c415 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -60,4 +60,4 @@ BattleTowerElevator_MapEventHeader: ; people-events db 1 - person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, -1 + person_event SPRITE_RECEPTIONIST, 6, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, MovementData_0x9f58f, -1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index b68971451..48d656895 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -96,4 +96,4 @@ BattleTowerHallway_MapEventHeader: ; people-events db 1 - person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, -1 + person_event SPRITE_RECEPTIONIST, 6, 15, UP << 2 | $2, $0, -1, -1, $0, 0, BattleTowerHallway_MapEventHeader, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 8ab5aee94..7542f2131 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -138,11 +138,11 @@ BattleTowerOutside_MapEventHeader: ; signposts db 1 - signpost 10, 10, $0, MapBattleTowerOutsideSignpost0Script + signpost 10, 10, SIGNPOST_READ, MapBattleTowerOutsideSignpost0Script ; people-events db 4 - person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, -1 - person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, -1 - person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, EVENT_7CF - person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, -1 + person_event SPRITE_STANDING_YOUNGSTER, 16, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1 + person_event SPRITE_BUENA, 15, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1 + person_event SPRITE_SAILOR, 22, 16, UP << 2 | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_7CF + person_event SPRITE_LASS, 28, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1 diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 1cb348887..6445a439a 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader: GrampsScript_0x189538: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x1896ba checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1896c0 @@ -120,7 +120,7 @@ UnknownScript_0x18963b: verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB loadmovesprites end @@ -131,7 +131,7 @@ UnknownScript_0x189652: verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB loadmovesprites end @@ -142,7 +142,7 @@ UnknownScript_0x189669: verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB loadmovesprites end @@ -153,7 +153,7 @@ UnknownScript_0x189680: verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB loadmovesprites end @@ -367,4 +367,4 @@ BillsHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, -1 + person_event SPRITE_GRAMPS, 7, 6, UP << 2 | $3, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x189538, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index c1d872e06..49f850a4e 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -323,22 +323,22 @@ BlackthornCity_MapEventHeader: ; signposts db 7 - signpost 24, 34, $0, BlackthornCitySign - signpost 13, 17, $0, BlackthornGymSign - signpost 31, 7, $0, MoveDeletersHouseSign - signpost 3, 21, $0, DragonDensSign - signpost 25, 5, $0, BlackthornCityTrainerTips - signpost 29, 16, $0, BlackthornCityMartSign - signpost 29, 22, $0, BlackthornCityPokeCenterSign + signpost 24, 34, SIGNPOST_READ, BlackthornCitySign + signpost 13, 17, SIGNPOST_READ, BlackthornGymSign + signpost 31, 7, SIGNPOST_READ, MoveDeletersHouseSign + signpost 3, 21, SIGNPOST_READ, DragonDensSign + signpost 25, 5, SIGNPOST_READ, BlackthornCityTrainerTips + signpost 29, 16, SIGNPOST_READ, BlackthornCityMartSign + signpost 29, 22, SIGNPOST_READ, BlackthornCityPokeCenterSign ; people-events db 9 - person_event SPRITE_SUPER_NERD, 16, 22, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E3 - person_event SPRITE_SUPER_NERD, 16, 23, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4 - person_event SPRITE_GRAMPS, 6, 24, $6, $0, 255, 255, $0, 0, GrampsScript_0x1a4708, EVENT_74C - person_event SPRITE_GRAMPS, 6, 25, $8, $0, 255, 255, $0, 0, GrampsScript_0x1a470b, EVENT_74D - person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, -1 - person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, -1 - person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, -1 - person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, SantosScript, EVENT_75D - person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, -1 + person_event SPRITE_SUPER_NERD, 16, 22, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E3 + person_event SPRITE_SUPER_NERD, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4 + person_event SPRITE_GRAMPS, 6, 24, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_74C + person_event SPRITE_GRAMPS, 6, 25, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_74D + person_event SPRITE_BLACK_BELT, 35, 28, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x1a470e, -1 + person_event SPRITE_COOLTRAINER_F, 29, 13, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1a4722, -1 + person_event SPRITE_YOUNGSTER, 19, 17, UP << 2 | $1, $1, -1, -1, $0, 0, YoungsterScript_0x1a4725, -1 + person_event SPRITE_YOUNGSTER, 24, 26, UP << 2 | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_75D + person_event SPRITE_COOLTRAINER_F, 23, 39, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1a4728, -1 diff --git a/maps/BlackthornDodrioTradeHouse.asm b/maps/BlackthornDodrioTradeHouse.asm index aae8f3962..1145a73b7 100644 --- a/maps/BlackthornDodrioTradeHouse.asm +++ b/maps/BlackthornDodrioTradeHouse.asm @@ -30,9 +30,9 @@ BlackthornDodrioTradeHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, EmysHouseBookshelf - signpost 1, 1, $0, EmysHouseBookshelf + signpost 1, 0, SIGNPOST_READ, EmysHouseBookshelf + signpost 1, 1, SIGNPOST_READ, EmysHouseBookshelf ; people-events db 1 - person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, -1 + person_event SPRITE_LASS, 7, 6, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Emy, -1 diff --git a/maps/BlackthornDragonSpeechHouse.asm b/maps/BlackthornDragonSpeechHouse.asm index 83fa1fab3..0882fd317 100644 --- a/maps/BlackthornDragonSpeechHouse.asm +++ b/maps/BlackthornDragonSpeechHouse.asm @@ -58,5 +58,5 @@ BlackthornDragonSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, -1 - person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, -1 + person_event SPRITE_GRANNY, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, GrannyScript_0x195949, -1 + person_event SPRITE_EKANS, 9, 9, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, EkansScript_0x19594c, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index d68012d35..5c9d7acf3 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -447,13 +447,13 @@ BlackthornGym1F_MapEventHeader: ; signposts db 2 - signpost 15, 3, $0, BlackthornGymStatue - signpost 15, 6, $0, BlackthornGymStatue + signpost 15, 3, SIGNPOST_READ, BlackthornGymStatue + signpost 15, 6, SIGNPOST_READ, BlackthornGymStatue ; people-events db 5 - person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, -1 - person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, -1 - person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, -1 - person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, -1 + person_event SPRITE_CLAIR, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClairScript_0x194e24, -1 + person_event SPRITE_COOLTRAINER_M, 10, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermMike, -1 + person_event SPRITE_COOLTRAINER_M, 18, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermPaul, -1 + person_event SPRITE_COOLTRAINER_F, 6, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfLola, -1 + person_event SPRITE_GYM_GUY, 19, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BlackthornGymGuyScript, -1 diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index f5e2a0c28..74605ec54 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -177,11 +177,11 @@ BlackthornGym2F_MapEventHeader: ; people-events db 8 - person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, -1 - person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, -1 - person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 - person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 - person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 - person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1 - person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1 - person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1 + person_event SPRITE_COOLTRAINER_M, 5, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermCody, -1 + person_event SPRITE_COOLTRAINER_F, 15, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfFran, -1 + person_event SPRITE_BOULDER, 6, 12, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1 + person_event SPRITE_BOULDER, 7, 6, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2 + person_event SPRITE_BOULDER, 20, 10, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3 + person_event SPRITE_BOULDER, 7, 7, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1 + person_event SPRITE_BOULDER, 5, 10, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1 + person_event SPRITE_BOULDER, 18, 12, LEFT << 2 | $11, $0, -1, -1, $0, 0, BlackthornGymBoulder, -1 diff --git a/maps/BlackthornMart.asm b/maps/BlackthornMart.asm index 357e1dee0..8c3147e27 100644 --- a/maps/BlackthornMart.asm +++ b/maps/BlackthornMart.asm @@ -58,6 +58,6 @@ BlackthornMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, -1 - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, -1 - person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x195a5d, -1 + person_event SPRITE_COOLTRAINER_M, 10, 11, UP << 2 | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x195a64, -1 + person_event SPRITE_BLACK_BELT, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x195a67, -1 diff --git a/maps/BlackthornPokeCenter1F.asm b/maps/BlackthornPokeCenter1F.asm index a56939915..707ddda85 100644 --- a/maps/BlackthornPokeCenter1F.asm +++ b/maps/BlackthornPokeCenter1F.asm @@ -61,7 +61,7 @@ BlackthornPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x195b79, -1 - person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, -1 - person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, -1 - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x195b79, -1 + person_event SPRITE_GENTLEMAN, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, GentlemanScript_0x195b7c, -1 + person_event SPRITE_TWIN, 8, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x195b7f, -1 + person_event SPRITE_COOLTRAINER_M, 10, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x195b82, -1 diff --git a/maps/BluesHouse.asm b/maps/BluesHouse.asm index a27796ec5..69f18cfa4 100644 --- a/maps/BluesHouse.asm +++ b/maps/BluesHouse.asm @@ -158,4 +158,4 @@ BluesHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, -1 + person_event SPRITE_DAISY, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, DaisyScript_0x19b0d0, -1 diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index 18ecdbb68..60a1a5f17 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -21,7 +21,7 @@ UnknownScript_0x180997: end UnknownScript_0x180998: - checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + checkevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x1809a2 changeblock $4, $e, $2a UnknownScript_0x1809a2: @@ -40,7 +40,7 @@ UnknownScript_0x1809ad: reloadmappart loadmovesprites dotrigger $1 - setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED waitbutton end @@ -145,4 +145,4 @@ BrunosRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, -1 + person_event SPRITE_BRUNO, 11, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrunoScript_0x1809c5, -1 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 1d5765bd6..4843820ff 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -306,13 +306,13 @@ BurnedTower1F_MapEventHeader: ; signposts db 2 - signpost 7, 8, $7, MapBurnedTower1FSignpostItem0 - signpost 11, 13, $7, MapBurnedTower1FSignpostItem1 + signpost 7, 8, SIGNPOST_ITEMIFSET, MapBurnedTower1FSignpostItem0 + signpost 11, 13, SIGNPOST_ITEMIFSET, MapBurnedTower1FSignpostItem1 ; people-events db 5 - person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, -1 - person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, EVENT_765 - person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, EVENT_6C5 - person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, EVENT_764 - person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ccb, EVENT_656 + person_event SPRITE_ROCK, 8, 19, LEFT << 2 | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1 + person_event SPRITE_SUPER_NERD, 16, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_765 + person_event SPRITE_SILVER, 13, 12, LEFT << 2 | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_6C5 + person_event SPRITE_MORTY, 18, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_764 + person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_656 diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 2db890d51..7bb1bdb02 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -251,12 +251,12 @@ BurnedTowerB1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, -1 - person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, EVENT_74A - person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, EVENT_74A - person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, EVENT_74A - person_event SPRITE_RAIKOU, 7, 11, $6, $0, 255, 255, $d0, 0, ObjectEvent, EVENT_74B - person_event SPRITE_ENTEI, 7, 16, $6, $0, 255, 255, $d0, 0, ObjectEvent, EVENT_74B - person_event SPRITE_SUICUNE, 8, 14, $6, $0, 255, 255, $d0, 0, ObjectEvent, EVENT_74B - person_event SPRITE_POKE_BALL, 8, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x186231, EVENT_657 - person_event SPRITE_SUPER_NERD, 16, 14, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER + person_event SPRITE_BOULDER, 12, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, BurnedTowerB1FBoulder, -1 + person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_74A + person_event SPRITE_ENTEI, 7, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_74A + person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_74A + person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B + person_event SPRITE_ENTEI, 7, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B + person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B + person_event SPRITE_POKE_BALL, 8, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_657 + person_event SPRITE_SUPER_NERD, 16, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 277ac39fd..de1c334ac 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -214,13 +214,13 @@ CeladonCafe_MapEventHeader: ; signposts db 2 - signpost 0, 5, $0, EatathonContestPoster - signpost 1, 7, $0, CeladonCafeTrashcan + signpost 0, 5, SIGNPOST_READ, EatathonContestPoster + signpost 1, 7, SIGNPOST_READ, CeladonCafeTrashcan ; people-events db 5 - person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, -1 - person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, -1 - person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, -1 - person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, -1 - person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, -1 + person_event SPRITE_SUPER_NERD, 7, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SuperNerdScript_0x73049, -1 + person_event SPRITE_FISHER, 10, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, FisherScript_0x73051, -1 + person_event SPRITE_FISHER, 11, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x73062, -1 + person_event SPRITE_FISHER, 6, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, FisherScript_0x73073, -1 + person_event SPRITE_TEACHER, 7, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, TeacherScript_0x73084, -1 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 3f1aedd0f..988e54ede 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -247,23 +247,23 @@ CeladonCity_MapEventHeader: ; signposts db 8 - signpost 21, 23, $0, CeladonCitySign - signpost 31, 11, $0, CeladonGymSign - signpost 9, 6, $0, CeladonCityDeptStoreSign - signpost 9, 13, $0, CeladonCityMansionSign - signpost 21, 19, $0, CeladonCityGameCornerSign - signpost 21, 29, $0, CeladonCityTrainerTips - signpost 9, 30, $0, CeladonCityPokeCenterSign - signpost 21, 37, $7, MapCeladonCitySignpostItem7 + signpost 21, 23, SIGNPOST_READ, CeladonCitySign + signpost 31, 11, SIGNPOST_READ, CeladonGymSign + signpost 9, 6, SIGNPOST_READ, CeladonCityDeptStoreSign + signpost 9, 13, SIGNPOST_READ, CeladonCityMansionSign + signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign + signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips + signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign + signpost 21, 37, SIGNPOST_ITEMIFSET, MapCeladonCitySignpostItem7 ; people-events db 9 - person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, -1 - person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, -1 - person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, -1 - person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, -1 - person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, -1 - person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, -1 - person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, -1 - person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, -1 - person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, -1 + person_event SPRITE_FISHER, 15, 30, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a9f43, -1 + person_event SPRITE_POLIWAG, 15, 31, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonCityPoliwrath, -1 + person_event SPRITE_TEACHER, 28, 24, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x1a9f50, -1 + person_event SPRITE_GRAMPS, 20, 18, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x1a9f53, -1 + person_event SPRITE_GRAMPS, 35, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrampsScript_0x1a9f56, -1 + person_event SPRITE_YOUNGSTER, 17, 22, UP << 2 | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a9f59, -1 + person_event SPRITE_YOUNGSTER, 37, 28, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a9f5c, -1 + person_event SPRITE_TEACHER, 18, 10, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a9f5f, -1 + person_event SPRITE_LASS, 26, 11, UP << 2 | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x1a9f62, -1 diff --git a/maps/CeladonDeptStore1F.asm b/maps/CeladonDeptStore1F.asm index 083d0ea40..3cb524134 100644 --- a/maps/CeladonDeptStore1F.asm +++ b/maps/CeladonDeptStore1F.asm @@ -84,11 +84,11 @@ CeladonDeptStore1F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, CeladonDeptStore1FDirectory - signpost 0, 3, $0, CeladonDeptStore1FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore1FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton ; people-events db 3 - person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, -1 - person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, -1 - person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, -1 + person_event SPRITE_RECEPTIONIST, 5, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x709e0, -1 + person_event SPRITE_GENTLEMAN, 8, 15, DOWN << 2 | $2, $11, -1, -1, $0, 0, GentlemanScript_0x709e3, -1 + person_event SPRITE_TEACHER, 7, 9, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x709e6, -1 diff --git a/maps/CeladonDeptStore2F.asm b/maps/CeladonDeptStore2F.asm index 2db6848ff..3ef1b56b4 100644 --- a/maps/CeladonDeptStore2F.asm +++ b/maps/CeladonDeptStore2F.asm @@ -77,12 +77,12 @@ CeladonDeptStore2F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, CeladonDeptStore2FDirectory - signpost 0, 3, $0, CeladonDeptStore2FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore2FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore2FElevatorButton ; people-events db 4 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bad, -1 - person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, -1 - person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, -1 - person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, -1 + person_event SPRITE_CLERK, 9, 17, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bad, -1 + person_event SPRITE_CLERK, 9, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70bb5, -1 + person_event SPRITE_POKEFAN_M, 6, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x70bbd, -1 + person_event SPRITE_YOUNGSTER, 6, 10, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70bc0, -1 diff --git a/maps/CeladonDeptStore3F.asm b/maps/CeladonDeptStore3F.asm index fef442854..15b4baea5 100644 --- a/maps/CeladonDeptStore3F.asm +++ b/maps/CeladonDeptStore3F.asm @@ -102,13 +102,13 @@ CeladonDeptStore3F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, CeladonDeptStore3FDirectory - signpost 0, 3, $0, CeladonDeptStore3FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore3FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore3FElevatorButton ; people-events db 5 - person_event SPRITE_CLERK, 5, 11, $6, $0, 255, 255, $90, 0, ClerkScript_0x70d29, -1 - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x70d31, -1 - person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, -1 - person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, -1 - person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, -1 + person_event SPRITE_CLERK, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70d29, -1 + person_event SPRITE_YOUNGSTER, 8, 10, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x70d31, -1 + person_event SPRITE_GAMEBOY_KID, 5, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x70d34, -1 + person_event SPRITE_GAMEBOY_KID, 5, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GameboyKidScript_0x70d3f, -1 + person_event SPRITE_SUPER_NERD, 8, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x70d4a, -1 diff --git a/maps/CeladonDeptStore4F.asm b/maps/CeladonDeptStore4F.asm index ac8aeef06..f3eeb3d60 100644 --- a/maps/CeladonDeptStore4F.asm +++ b/maps/CeladonDeptStore4F.asm @@ -60,11 +60,11 @@ CeladonDeptStore4F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, CeladonDeptStore4FDirectory - signpost 0, 3, $0, CeladonDeptStore4FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore4FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore4FElevatorButton ; people-events db 3 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, -1 - person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, -1 - person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, -1 + person_event SPRITE_CLERK, 9, 17, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x70f0d, -1 + person_event SPRITE_SUPER_NERD, 10, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x70f15, -1 + person_event SPRITE_YOUNGSTER, 6, 12, UP << 2 | $3, $0, -1, -1, $0, 0, YoungsterScript_0x70f18, -1 diff --git a/maps/CeladonDeptStore5F.asm b/maps/CeladonDeptStore5F.asm index 99fb79d95..38df64cb7 100644 --- a/maps/CeladonDeptStore5F.asm +++ b/maps/CeladonDeptStore5F.asm @@ -79,13 +79,13 @@ CeladonDeptStore5F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, CeladonDeptStore5FDirectory - signpost 0, 3, $0, CeladonDeptStore5FElevatorButton + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore5FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore5FElevatorButton ; people-events db 5 - person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, -1 - person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, -1 - person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, -1 - person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, -1 - person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, -1 + person_event SPRITE_CLERK, 9, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x71004, -1 + person_event SPRITE_CLERK, 9, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ClerkScript_0x7100c, -1 + person_event SPRITE_GENTLEMAN, 9, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x71014, -1 + person_event SPRITE_SAILOR, 8, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x71017, -1 + person_event SPRITE_TEACHER, 11, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x7101a, -1 diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index d3405b873..63c03e8fb 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -159,14 +159,14 @@ CeladonDeptStore6F_MapEventHeader: ; signposts db 6 - signpost 0, 14, $0, CeladonDeptStore6FDirectory - signpost 0, 3, $0, CeladonDeptStore1FElevatorButton - signpost 1, 8, $1, CeladonVendingMachine - signpost 1, 9, $1, CeladonVendingMachine - signpost 1, 10, $1, CeladonVendingMachine - signpost 1, 11, $1, CeladonVendingMachine + signpost 0, 14, SIGNPOST_READ, CeladonDeptStore6FDirectory + signpost 0, 3, SIGNPOST_READ, CeladonDeptStore1FElevatorButton + signpost 1, 8, SIGNPOST_UP, CeladonVendingMachine + signpost 1, 9, SIGNPOST_UP, CeladonVendingMachine + signpost 1, 10, SIGNPOST_UP, CeladonVendingMachine + signpost 1, 11, SIGNPOST_UP, CeladonVendingMachine ; people-events db 2 - person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, -1 - person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, -1 + person_event SPRITE_SUPER_NERD, 6, 13, UP << 2 | $3, $0, -1, -1, $0, 0, SuperNerdScript_0x7117a, -1 + person_event SPRITE_YOUNGSTER, 9, 16, DOWN << 2 | $2, $12, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x7117d, -1 diff --git a/maps/CeladonDeptStoreElevator.asm b/maps/CeladonDeptStoreElevator.asm index b23dcf91c..39df686fc 100644 --- a/maps/CeladonDeptStoreElevator.asm +++ b/maps/CeladonDeptStoreElevator.asm @@ -43,7 +43,7 @@ CeladonDeptStoreElevator_MapEventHeader: ; signposts db 1 - signpost 0, 3, $0, MapCeladonDeptStoreElevatorSignpost0Script + signpost 0, 3, SIGNPOST_READ, MapCeladonDeptStoreElevatorSignpost0Script ; people-events db 0 diff --git a/maps/CeladonGameCorner.asm b/maps/CeladonGameCorner.asm index 3b01e2c39..93a98c9fb 100644 --- a/maps/CeladonGameCorner.asm +++ b/maps/CeladonGameCorner.asm @@ -284,53 +284,53 @@ CeladonGameCorner_MapEventHeader: ; signposts db 38 - signpost 6, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 7, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 8, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 9, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 10, 1, $0, MapCeladonGameCornerSignpost11Script - signpost 11, 1, $4, MapCeladonGameCornerSignpost11Script - signpost 6, 6, $0, MapCeladonGameCornerSignpost11Script - signpost 7, 6, $0, MapCeladonGameCornerSignpost11Script - signpost 8, 6, $0, MapCeladonGameCornerSignpost11Script - signpost 9, 6, $0, MapCeladonGameCornerSignpost9Script - signpost 10, 6, $0, MapCeladonGameCornerSignpost11Script - signpost 11, 6, $3, MapCeladonGameCornerSignpost11Script - signpost 6, 7, $0, MapCeladonGameCornerSignpost35Script - signpost 7, 7, $0, MapCeladonGameCornerSignpost35Script - signpost 8, 7, $0, MapCeladonGameCornerSignpost35Script - signpost 9, 7, $0, MapCeladonGameCornerSignpost35Script - signpost 10, 7, $0, MapCeladonGameCornerSignpost16Script - signpost 11, 7, $4, MapCeladonGameCornerSignpost35Script - signpost 6, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 7, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 8, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 9, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 10, 12, $0, MapCeladonGameCornerSignpost35Script - signpost 11, 12, $3, MapCeladonGameCornerSignpost35Script - signpost 6, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 7, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 8, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 9, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 10, 13, $0, MapCeladonGameCornerSignpost35Script - signpost 11, 13, $4, MapCeladonGameCornerSignpost35Script - signpost 6, 18, $0, MapCeladonGameCornerSignpost35Script - signpost 7, 18, $0, MapCeladonGameCornerSignpost35Script - signpost 8, 18, $0, MapCeladonGameCornerSignpost32Script - signpost 9, 18, $0, MapCeladonGameCornerSignpost35Script - signpost 10, 18, $0, MapCeladonGameCornerSignpost35Script - signpost 11, 18, $3, MapCeladonGameCornerSignpost35Script - signpost 0, 15, $0, MapCeladonGameCornerSignpost36Script - signpost 0, 9, $0, MapCeladonGameCornerSignpost37Script + signpost 6, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 7, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 8, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 9, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 10, 1, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 11, 1, SIGNPOST_LEFT, MapCeladonGameCornerSignpost11Script + signpost 6, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 7, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 8, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 9, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost9Script + signpost 10, 6, SIGNPOST_READ, MapCeladonGameCornerSignpost11Script + signpost 11, 6, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost11Script + signpost 6, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 7, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 8, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 9, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 10, 7, SIGNPOST_READ, MapCeladonGameCornerSignpost16Script + signpost 11, 7, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script + signpost 6, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 7, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 8, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 9, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 10, 12, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 11, 12, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script + signpost 6, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 7, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 8, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 9, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 10, 13, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 11, 13, SIGNPOST_LEFT, MapCeladonGameCornerSignpost35Script + signpost 6, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 7, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 8, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost32Script + signpost 9, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 10, 18, SIGNPOST_READ, MapCeladonGameCornerSignpost35Script + signpost 11, 18, SIGNPOST_RIGHT, MapCeladonGameCornerSignpost35Script + signpost 0, 15, SIGNPOST_READ, MapCeladonGameCornerSignpost36Script + signpost 0, 9, SIGNPOST_READ, MapCeladonGameCornerSignpost37Script ; people-events db 9 - person_event SPRITE_CLERK, 6, 9, $6, $0, 255, 255, $a0, 0, ClerkScript_0x7211d, -1 - person_event SPRITE_RECEPTIONIST, 6, 7, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x72120, -1 - person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $80, 0, PokefanMScript_0x72123, -1 - person_event SPRITE_TEACHER, 11, 21, $9, $0, 255, 255, $90, 0, TeacherScript_0x7212e, -1 - person_event SPRITE_FISHING_GURU, 11, 15, $9, $0, 255, 255, $a0, 0, FishingGuruScript_0x72139, -1 - person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 2, $80, 0, FisherScript_0x72144, -1 - person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, -1 - person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, -1 - person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, -1 + person_event SPRITE_CLERK, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ClerkScript_0x7211d, -1 + person_event SPRITE_RECEPTIONIST, 6, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x72120, -1 + person_event SPRITE_POKEFAN_M, 14, 18, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x72123, -1 + person_event SPRITE_TEACHER, 11, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7212e, -1 + person_event SPRITE_FISHING_GURU, 11, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x72139, -1 + person_event SPRITE_FISHER, 14, 12, LEFT << 2 | $0, $0, -1, 2, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1 + person_event SPRITE_FISHER, 14, 12, LEFT << 2 | $0, $0, -1, 4, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x72144, -1 + person_event SPRITE_GYM_GUY, 7, 15, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CeladonGymGuyScript, -1 + person_event SPRITE_GRAMPS, 12, 6, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x72190, -1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 3a296f0dc..08493a535 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -279,10 +279,10 @@ CeladonGameCornerPrizeRoom_MapEventHeader: ; signposts db 2 - signpost 1, 2, $0, MapCeladonGameCornerPrizeRoomSignpost0Script - signpost 1, 4, $0, MapCeladonGameCornerPrizeRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost0Script + signpost 1, 4, SIGNPOST_READ, MapCeladonGameCornerPrizeRoomSignpost1Script ; people-events db 2 - person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, -1 - person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, -1 + person_event SPRITE_GENTLEMAN, 6, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x726e9, -1 + person_event SPRITE_PHARMACIST, 8, 8, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x726ec, -1 diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 55b122e95..0419b6184 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -353,14 +353,14 @@ CeladonGym_MapEventHeader: ; signposts db 2 - signpost 15, 3, $0, CeladonGymStatue - signpost 15, 6, $0, CeladonGymStatue + signpost 15, 3, SIGNPOST_READ, CeladonGymStatue + signpost 15, 6, SIGNPOST_READ, CeladonGymStatue ; people-events db 6 - person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, -1 - person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, -1 - person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, -1 - person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, -1 - person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, -1 - person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, -1 + person_event SPRITE_ERIKA, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ErikaScript_0x72a6a, -1 + person_event SPRITE_LASS, 12, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerLassMichelle, -1 + person_event SPRITE_LASS, 12, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerTanya, -1 + person_event SPRITE_BUENA, 9, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBeautyJulia, -1 + person_event SPRITE_TWIN, 14, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe1, -1 + person_event SPRITE_TWIN, 14, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsJoandzoe2, -1 diff --git a/maps/CeladonMansion1F.asm b/maps/CeladonMansion1F.asm index 4760e6155..0db32fae9 100644 --- a/maps/CeladonMansion1F.asm +++ b/maps/CeladonMansion1F.asm @@ -85,13 +85,13 @@ CeladonMansion1F_MapEventHeader: ; signposts db 3 - signpost 8, 5, $1, CeladonMansionManagersSuiteSign - signpost 3, 0, $0, CeladonMansion1fBookshelf - signpost 3, 2, $0, CeladonMansion1fBookshelf + signpost 8, 5, SIGNPOST_UP, CeladonMansionManagersSuiteSign + signpost 3, 0, SIGNPOST_READ, CeladonMansion1fBookshelf + signpost 3, 2, SIGNPOST_READ, CeladonMansion1fBookshelf ; people-events db 4 - person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, -1 - person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, -1 - person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, -1 - person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, -1 + person_event SPRITE_GRANNY, 9, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, CeladonMansionManager, -1 + person_event SPRITE_GROWLITHE, 10, 6, UP << 2 | $12, $0, -1, -1, $0, 0, CeladonMansion1FMeowth, -1 + person_event SPRITE_CLEFAIRY, 8, 7, UP << 2 | $12, $0, -1, -1, $0, 0, CeladonMansion1FClefairy, -1 + person_event SPRITE_GROWLITHE, 8, 8, UP << 2 | $12, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeladonMansion1FNidoranF, -1 diff --git a/maps/CeladonMansion2F.asm b/maps/CeladonMansion2F.asm index e20c6ce89..7304996fa 100644 --- a/maps/CeladonMansion2F.asm +++ b/maps/CeladonMansion2F.asm @@ -65,9 +65,9 @@ CeladonMansion2F_MapEventHeader: ; signposts db 3 - signpost 3, 0, $0, CeladonMansion2FComputer - signpost 8, 5, $1, CeladonMansion2FSign - signpost 3, 2, $0, CeladonMansion2FBookshelf + signpost 3, 0, SIGNPOST_READ, CeladonMansion2FComputer + signpost 8, 5, SIGNPOST_UP, CeladonMansion2FSign + signpost 3, 2, SIGNPOST_READ, CeladonMansion2FBookshelf ; people-events db 0 diff --git a/maps/CeladonMansion3F.asm b/maps/CeladonMansion3F.asm index 7c0cf85eb..a9587c9ff 100644 --- a/maps/CeladonMansion3F.asm +++ b/maps/CeladonMansion3F.asm @@ -199,14 +199,14 @@ CeladonMansion3F_MapEventHeader: ; signposts db 4 - signpost 8, 5, $1, MapCeladonMansion3FSignpost0Script - signpost 3, 4, $1, MapCeladonMansion3FSignpost1Script - signpost 6, 1, $1, MapCeladonMansion3FSignpost2Script - signpost 3, 1, $1, MapCeladonMansion3FSignpost3Script + signpost 8, 5, SIGNPOST_UP, MapCeladonMansion3FSignpost0Script + signpost 3, 4, SIGNPOST_UP, MapCeladonMansion3FSignpost1Script + signpost 6, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost2Script + signpost 3, 1, SIGNPOST_UP, MapCeladonMansion3FSignpost3Script ; people-events db 4 - person_event SPRITE_COOLTRAINER_M, 10, 7, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x71670, -1 - person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, -1 - person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, -1 - person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, -1 + person_event SPRITE_COOLTRAINER_M, 10, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x71670, -1 + person_event SPRITE_GYM_GUY, 8, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x71696, -1 + person_event SPRITE_SUPER_NERD, 11, 4, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x716bc, -1 + person_event SPRITE_FISHER, 8, 4, UP << 2 | $3, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x716bf, -1 diff --git a/maps/CeladonMansionRoof.asm b/maps/CeladonMansionRoof.asm index cc7d1ddcb..74fdcaf4a 100644 --- a/maps/CeladonMansionRoof.asm +++ b/maps/CeladonMansionRoof.asm @@ -45,8 +45,8 @@ CeladonMansionRoof_MapEventHeader: ; signposts db 1 - signpost 1, 6, $4, MapCeladonMansionRoofSignpost0Script + signpost 1, 6, SIGNPOST_LEFT, MapCeladonMansionRoofSignpost0Script ; people-events db 1 - person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, -1 + person_event SPRITE_FISHER, 9, 11, UP << 2 | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x71a39, -1 diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm index e02041794..0d0c83b07 100644 --- a/maps/CeladonMansionRoofHouse.asm +++ b/maps/CeladonMansionRoofHouse.asm @@ -130,4 +130,4 @@ CeladonMansionRoofHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, -1 + person_event SPRITE_PHARMACIST, 6, 7, UP << 2 | $2, $20, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PharmacistScript_0x71afd, -1 diff --git a/maps/CeladonPokeCenter1F.asm b/maps/CeladonPokeCenter1F.asm index ef0c091bb..306118fe4 100644 --- a/maps/CeladonPokeCenter1F.asm +++ b/maps/CeladonPokeCenter1F.asm @@ -156,8 +156,8 @@ CeladonPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x71e22, -1 - person_event SPRITE_GENTLEMAN, 9, 5, $5, $1, 255, 255, $0, 0, GentlemanScript_0x71e25, -1 - person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, -1 - person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, -1 - person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x71e22, -1 + person_event SPRITE_GENTLEMAN, 9, 5, UP << 2 | $1, $1, -1, -1, $0, 0, GentlemanScript_0x71e25, -1 + person_event SPRITE_PHARMACIST, 7, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PharmacistScript_0x71e2b, -1 + person_event SPRITE_COOLTRAINER_F, 10, 12, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x71e28, -1 + person_event SPRITE_SUPER_NERD, 7, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 24d67e23e..3a60b2230 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -288,21 +288,21 @@ CeruleanCity_MapEventHeader: ; signposts db 9 - signpost 23, 23, $0, CeruleanCitySign - signpost 25, 27, $0, CeruleanGymSign - signpost 29, 11, $0, CeruleanBikeShopSign - signpost 17, 25, $0, CeruleanPoliceSign - signpost 7, 23, $0, CeruleanCapeSign - signpost 29, 14, $0, CeruleanLockedDoor - signpost 21, 20, $0, CeruleanCityPokeCenterSign - signpost 29, 26, $0, CeruleanCityMartSign - signpost 12, 2, $7, MapCeruleanCitySignpostItem8 + signpost 23, 23, SIGNPOST_READ, CeruleanCitySign + signpost 25, 27, SIGNPOST_READ, CeruleanGymSign + signpost 29, 11, SIGNPOST_READ, CeruleanBikeShopSign + signpost 17, 25, SIGNPOST_READ, CeruleanPoliceSign + signpost 7, 23, SIGNPOST_READ, CeruleanCapeSign + signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor + signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign + signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign + signpost 12, 2, SIGNPOST_ITEMIFSET, MapCeruleanCitySignpostItem8 ; people-events db 6 - person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, -1 - person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, -1 - person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, -1 - person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, -1 - person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, -1 - person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, -1 + person_event SPRITE_COOLTRAINER_M, 27, 19, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerMScript_0x184009, -1 + person_event SPRITE_SUPER_NERD, 19, 27, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x18401d, -1 + person_event SPRITE_SLOWPOKE, 28, 24, DOWN << 2 | $1, $0, -1, -1, $0, 0, CeruleanCitySlowbro, -1 + person_event SPRITE_COOLTRAINER_F, 28, 25, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18402a, -1 + person_event SPRITE_FISHER, 30, 34, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x18404a, -1 + person_event SPRITE_YOUNGSTER, 16, 10, DOWN << 2 | $3, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x184064, -1 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 912d49b7f..952e3251e 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -420,15 +420,15 @@ CeruleanGym_MapEventHeader: ; signposts db 3 - signpost 8, 3, $7, MapCeruleanGymSignpostItem0 - signpost 13, 2, $0, CeruleanGymStatue1 - signpost 13, 6, $0, CeruleanGymStatue2 + signpost 8, 3, SIGNPOST_ITEMIFSET, MapCeruleanGymSignpostItem0 + signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1 + signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2 ; people-events db 6 - person_event SPRITE_ROCKET, 14, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_76D - person_event SPRITE_MISTY, 7, 9, $6, $0, 255, 255, $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 10, 8, $9, $0, 255, 255, $a2, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GIRL, 13, 5, $9, $0, 255, 255, $a2, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_SWIMMER_GUY, 13, 12, $8, $0, 255, 255, $82, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_ROCKET, 14, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_76D + person_event SPRITE_MISTY, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GIRL, 10, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GIRL, 13, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_SWIMMER_GUY, 13, 12, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermParker, EVENT_TRAINERS_IN_CERULEAN_GYM + person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CeruleanGymGuyScript, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CeruleanGymBadgeSpeechHouse.asm b/maps/CeruleanGymBadgeSpeechHouse.asm index 96aefdb4d..efca2c7a9 100644 --- a/maps/CeruleanGymBadgeSpeechHouse.asm +++ b/maps/CeruleanGymBadgeSpeechHouse.asm @@ -30,4 +30,4 @@ CeruleanGymBadgeSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, -1 + person_event SPRITE_POKEFAN_M, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, PokefanMScript_0x188002, -1 diff --git a/maps/CeruleanMart.asm b/maps/CeruleanMart.asm index 16771b679..4d4fe3be4 100644 --- a/maps/CeruleanMart.asm +++ b/maps/CeruleanMart.asm @@ -57,6 +57,6 @@ CeruleanMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, -1 - person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, -1 - person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x188ac0, -1 + person_event SPRITE_COOLTRAINER_M, 10, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerMScript_0x188ac7, -1 + person_event SPRITE_COOLTRAINER_F, 6, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x188aca, -1 diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 3121f62b5..656791698 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -75,6 +75,6 @@ CeruleanPokeCenter1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, -1 - person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, -1 - person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x18820f, -1 + person_event SPRITE_SUPER_NERD, 8, 12, UP << 2 | $1, $1, -1, -1, $0, 0, SuperNerdScript_0x188212, -1 + person_event SPRITE_GYM_GUY, 9, 5, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x18821e, -1 diff --git a/maps/CeruleanPoliceStation.asm b/maps/CeruleanPoliceStation.asm index e0b393949..1dbc8044f 100644 --- a/maps/CeruleanPoliceStation.asm +++ b/maps/CeruleanPoliceStation.asm @@ -55,6 +55,6 @@ CeruleanPoliceStation_MapEventHeader: ; people-events db 3 - person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, -1 - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, -1 - person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, -1 + person_event SPRITE_FISHING_GURU, 5, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x18804a, -1 + person_event SPRITE_POKEFAN_F, 8, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x18804d, -1 + person_event SPRITE_DIGLETT, 9, 7, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, DiglettScript_0x188050, -1 diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 21f019e7e..35876618b 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -64,7 +64,7 @@ CeruleanTradeSpeechHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, -1 - person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, -1 - person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, -1 - person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, -1 + person_event SPRITE_GRANNY, 8, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrannyScript_0x188133, -1 + person_event SPRITE_GRAMPS, 6, 5, DOWN << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x188136, -1 + person_event SPRITE_RHYDON, 6, 9, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, RhydonScript_0x188139, -1 + person_event SPRITE_ZUBAT, 10, 9, UP << 2 | $12, $0, -1, -1, $0, 0, ZubatScript_0x188143, -1 diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm index cd167320f..ace5e5663 100644 --- a/maps/CharcoalKiln.asm +++ b/maps/CharcoalKiln.asm @@ -157,12 +157,12 @@ CharcoalKiln_MapEventHeader: ; signposts db 3 - signpost 1, 0, $0, CharcoalKilnBookshelf - signpost 1, 1, $0, CharcoalKilnBookshelf - signpost 1, 7, $0, CharcoalKilnRadio + signpost 1, 0, SIGNPOST_READ, CharcoalKilnBookshelf + signpost 1, 1, SIGNPOST_READ, CharcoalKilnBookshelf + signpost 1, 7, SIGNPOST_READ, CharcoalKilnRadio ; people-events db 3 - person_event SPRITE_BLACK_BELT, 7, 6, $3, $0, 255, 255, $0, 0, CharcoalKilnBoss, EVENT_6F7 - person_event SPRITE_YOUNGSTER, 7, 9, $2, $11, 255, 255, $0, 0, CharcoalKilnApprentice, EVENT_6F6 - person_event SPRITE_MOLTRES, 10, 9, $16, $22, 255, 255, $b0, 0, CharcoalKilnFarfetchd, EVENT_6F5 + person_event SPRITE_BLACK_BELT, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_6F7 + person_event SPRITE_YOUNGSTER, 7, 9, DOWN << 2 | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_6F6 + person_event SPRITE_MOLTRES, 10, 9, UP << 2 | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_6F5 diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 1c0d24386..0429f25a8 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -563,15 +563,15 @@ CherrygroveCity_MapEventHeader: ; signposts db 4 - signpost 8, 30, $0, CherrygroveCitySign - signpost 9, 23, $0, GuideGentsHouseSign - signpost 3, 24, $0, CherrygroveCityMartSign - signpost 3, 30, $0, CherrygroveCityPokeCenterSign + signpost 8, 30, SIGNPOST_READ, CherrygroveCitySign + signpost 9, 23, SIGNPOST_READ, GuideGentsHouseSign + signpost 3, 24, SIGNPOST_READ, CherrygroveCityMartSign + signpost 3, 30, SIGNPOST_READ, CherrygroveCityPokeCenterSign ; people-events db 5 - person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, EVENT_6FE - person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BE - person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, -1 - person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, -1 - person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, -1 + person_event SPRITE_GRAMPS, 10, 36, UP << 2 | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_6FE + person_event SPRITE_SILVER, 10, 43, DOWN << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6BE + person_event SPRITE_TEACHER, 16, 31, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x19c146, -1 + person_event SPRITE_YOUNGSTER, 11, 27, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x19c15a, -1 + person_event SPRITE_FISHER, 16, 11, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MysticWaterGuy, -1 diff --git a/maps/CherrygroveEvolutionSpeechHouse.asm b/maps/CherrygroveEvolutionSpeechHouse.asm index c437819e2..e1a6f30e6 100644 --- a/maps/CherrygroveEvolutionSpeechHouse.asm +++ b/maps/CherrygroveEvolutionSpeechHouse.asm @@ -51,10 +51,10 @@ CherrygroveEvolutionSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, CherrygroveEvolutionSpeechHouseBookshelf - signpost 1, 1, $0, CherrygroveEvolutionSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, CherrygroveEvolutionSpeechHouseBookshelf ; people-events db 2 - person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, -1 - person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, -1 + person_event SPRITE_LASS, 9, 7, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x196cb9, -1 + person_event SPRITE_YOUNGSTER, 9, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196cb2, -1 diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index d542a42bc..3c3b71ba1 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -54,10 +54,10 @@ CherrygroveGymSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, CherrygroveGymSpeechHouseBookshelf - signpost 1, 1, $0, CherrygroveGymSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf ; people-events db 2 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, -1 - person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, -1 + person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x196ae1, -1 + person_event SPRITE_BUG_CATCHER, 9, 9, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x196ae4, -1 diff --git a/maps/CherrygroveMart.asm b/maps/CherrygroveMart.asm index 79d62d6a2..7b6ee7f7b 100644 --- a/maps/CherrygroveMart.asm +++ b/maps/CherrygroveMart.asm @@ -83,6 +83,6 @@ CherrygroveMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, -1 - person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, -1 - person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x19680a, -1 + person_event SPRITE_COOLTRAINER_M, 10, 11, UP << 2 | $1, $2, -1, -1, $0, 0, CooltrainerMScript_0x19681d, -1 + person_event SPRITE_YOUNGSTER, 9, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x196831, -1 diff --git a/maps/CherrygrovePokeCenter1F.asm b/maps/CherrygrovePokeCenter1F.asm index e9152d616..01f86b409 100644 --- a/maps/CherrygrovePokeCenter1F.asm +++ b/maps/CherrygrovePokeCenter1F.asm @@ -80,7 +80,7 @@ CherrygrovePokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19696d, -1 - person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, -1 - person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, -1 - person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x19696d, -1 + person_event SPRITE_FISHER, 7, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x196970, -1 + person_event SPRITE_GENTLEMAN, 10, 12, UP << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x196973, -1 + person_event SPRITE_TEACHER, 10, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x196976, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index f9d444f9b..80886aa07 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -392,26 +392,26 @@ CianwoodCity_MapEventHeader: ; signposts db 8 - signpost 34, 20, $0, CianwoodCitySign - signpost 45, 7, $0, CianwoodGymSign - signpost 43, 24, $0, CianwoodPokeCenterSign - signpost 47, 19, $0, CianwoodPharmacySign - signpost 32, 8, $0, CianwoodPhotoStudioSign - signpost 24, 8, $0, CianwoodPokeSeerSign - signpost 19, 4, $7, MapCianwoodCitySignpostItem6 - signpost 29, 5, $7, MapCianwoodCitySignpostItem7 + signpost 34, 20, SIGNPOST_READ, CianwoodCitySign + signpost 45, 7, SIGNPOST_READ, CianwoodGymSign + signpost 43, 24, SIGNPOST_READ, CianwoodPokeCenterSign + signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign + signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign + signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign + signpost 19, 4, SIGNPOST_ITEMIFSET, MapCianwoodCitySignpostItem6 + signpost 29, 5, SIGNPOST_ITEMIFSET, MapCianwoodCitySignpostItem7 ; people-events db 12 - person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, -1 - person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, -1 - person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, -1 - person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1 - person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, -1 - person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_7AD - person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY + person_event SPRITE_STANDING_YOUNGSTER, 41, 25, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, StandingYoungsterScript_0x1a00b3, -1 + person_event SPRITE_POKEFAN_M, 37, 21, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanMScript_0x1a00b6, -1 + person_event SPRITE_LASS, 46, 18, UP << 2 | $0, $20, -1, -1, $0, 0, LassScript_0x1a00b9, -1 + person_event SPRITE_ROCK, 20, 12, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 21, 13, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 29, 8, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 33, 9, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 31, 14, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_ROCK, 23, 8, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 + person_event SPRITE_POKEFAN_F, 50, 14, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanFScript_0x1a0084, -1 + person_event SPRITE_SUPER_NERD, 25, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_7AD + person_event SPRITE_SUICUNE, 18, 14, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CianwoodCityPhotoStudio.asm b/maps/CianwoodCityPhotoStudio.asm index 054a1aaa5..1634a203b 100644 --- a/maps/CianwoodCityPhotoStudio.asm +++ b/maps/CianwoodCityPhotoStudio.asm @@ -62,4 +62,4 @@ CianwoodCityPhotoStudio_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, -1 + person_event SPRITE_FISHING_GURU, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x9e0e0, -1 diff --git a/maps/CianwoodGym.asm b/maps/CianwoodGym.asm index 249d3ca6f..c5d93d1ba 100644 --- a/maps/CianwoodGym.asm +++ b/maps/CianwoodGym.asm @@ -372,17 +372,17 @@ CianwoodGym_MapEventHeader: ; signposts db 2 - signpost 15, 3, $0, CianwoodGymStatue - signpost 15, 6, $0, CianwoodGymStatue + signpost 15, 3, SIGNPOST_READ, CianwoodGymStatue + signpost 15, 6, SIGNPOST_READ, CianwoodGymStatue ; people-events db 9 - person_event SPRITE_CHUCK, 5, 8, $6, $0, 255, 255, $b0, 0, ChuckScript_0x9d60f, -1 - person_event SPRITE_BLACK_BELT, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, -1 - person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, -1 - person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, -1 - person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, -1 - person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 - person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_CHUCK, 5, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ChuckScript_0x9d60f, -1 + person_event SPRITE_BLACK_BELT, 16, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltYoshi, -1 + person_event SPRITE_BLACK_BELT, 16, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltLao, -1 + person_event SPRITE_BLACK_BELT, 13, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBlackbeltNob, -1 + person_event SPRITE_BLACK_BELT, 9, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerBlackbeltLung, -1 + person_event SPRITE_BOULDER, 5, 9, LEFT << 2 | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_BOULDER, 11, 7, LEFT << 2 | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_BOULDER, 11, 8, LEFT << 2 | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1 + person_event SPRITE_BOULDER, 11, 9, LEFT << 2 | $11, $0, -1, -1, $0, 0, CianwoodGymBoulder, -1 diff --git a/maps/CianwoodLugiaSpeechHouse.asm b/maps/CianwoodLugiaSpeechHouse.asm index 37f0dc306..e3c92b89b 100644 --- a/maps/CianwoodLugiaSpeechHouse.asm +++ b/maps/CianwoodLugiaSpeechHouse.asm @@ -70,11 +70,11 @@ CianwoodLugiaSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, CianwoodLugiaSpeechHouseBookshelf - signpost 1, 1, $0, CianwoodLugiaSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, CianwoodLugiaSpeechHouseBookshelf ; people-events db 3 - person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, -1 - person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, -1 - person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, -1 + person_event SPRITE_TEACHER, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, TeacherScript_0x9e1b0, -1 + person_event SPRITE_LASS, 9, 10, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9e1b3, -1 + person_event SPRITE_TWIN, 6, 4, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TwinScript_0x9e1b6, -1 diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 7c8a9d415..578b54ace 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -85,9 +85,9 @@ CianwoodPharmacy_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, CianwoodPharmacyBookshelf - signpost 1, 1, $0, CianwoodPharmacyBookshelf + signpost 1, 0, SIGNPOST_READ, CianwoodPharmacyBookshelf + signpost 1, 1, SIGNPOST_READ, CianwoodPharmacyBookshelf ; people-events db 1 - person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, -1 + person_event SPRITE_PHARMACIST, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CianwoodPharmacist, -1 diff --git a/maps/CianwoodPokeCenter1F.asm b/maps/CianwoodPokeCenter1F.asm index 889034366..5dae6f8c9 100644 --- a/maps/CianwoodPokeCenter1F.asm +++ b/maps/CianwoodPokeCenter1F.asm @@ -143,7 +143,7 @@ CianwoodPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9dbcf, -1 - person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, -1 - person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, -1 - person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x9dbcf, -1 + person_event SPRITE_LASS, 9, 5, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9dbd2, -1 + person_event SPRITE_GYM_GUY, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CianwoodGymGuyScript, -1 + person_event SPRITE_SUPER_NERD, 10, 12, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x9dbea, -1 diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 1a5c8663b..fd154f439 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -140,11 +140,11 @@ CinnabarIsland_MapEventHeader: ; signposts db 4 - signpost 11, 12, $0, CinnabarIslandPokeCenterSign - signpost 11, 9, $0, CinnabarIslandGymSign - signpost 7, 7, $0, CinnabarIslandSign - signpost 1, 9, $7, MapCinnabarIslandSignpostItem3 + signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign + signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign + signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign + signpost 1, 9, SIGNPOST_ITEMIFSET, MapCinnabarIslandSignpostItem3 ; people-events db 1 - person_event SPRITE_BLUE, 10, 13, $3, $0, 255, 255, $0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR + person_event SPRITE_BLUE, 10, 13, DOWN << 2 | $3, $0, -1, -1, $0, 0, CinnabarIslandBlue, EVENT_BLUE_IN_CINNABAR diff --git a/maps/CinnabarPokeCenter1F.asm b/maps/CinnabarPokeCenter1F.asm index 26dfd69af..de1f301b3 100644 --- a/maps/CinnabarPokeCenter1F.asm +++ b/maps/CinnabarPokeCenter1F.asm @@ -47,6 +47,6 @@ CinnabarPokeCenter1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, -1 - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, -1 - person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x1ab32c, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1ab32f, -1 + person_event SPRITE_FISHER, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1ab332, -1 diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 1eeaae128..070bde484 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -3,63 +3,63 @@ Colosseum_MapScriptHeader: db 3 ; triggers - dw UnknownScript_0x193471, $0000 - dw UnknownScript_0x193475, $0000 - dw UnknownScript_0x193476, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 ; callback count db 2 ; callbacks - dbw 2, UnknownScript_0x193477 + dbw 2, ColosseumScript_SetWhichChris - dbw 5, UnknownScript_0x193487 + dbw 5, ColosseumScript_InitializeCB -UnknownScript_0x193471: - priorityjump UnknownScript_0x19348c +.Trigger1: + priorityjump ColosseumScript_Initialize end -UnknownScript_0x193475: +.Trigger2: end -UnknownScript_0x193476: +.Trigger3: end -UnknownScript_0x193477: - special Function29f47 - iffalse UnknownScript_0x193482 +ColosseumScript_SetWhichChris: + special Special_CableClubCheckWhichChris + iffalse .Chris2 disappear $3 appear $2 return -UnknownScript_0x193482: +.Chris2: disappear $2 appear $3 return -UnknownScript_0x193487: +ColosseumScript_InitializeCB: domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 return -UnknownScript_0x19348c: +ColosseumScript_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $2 end MapColosseumSignpost1Script: - special Function29ed9 + special Special_Colosseum newloadmap $f8 end ChrisScript_0x193499: loadfont - writetext UnknownText_0x1934a0 + writetext .FriendReadyText closetext loadmovesprites end -UnknownText_0x1934a0: +.FriendReadyText: text "Your friend is" line "ready." done @@ -78,10 +78,10 @@ Colosseum_MapEventHeader: ; signposts db 2 - signpost 4, 4, $3, MapColosseumSignpost1Script - signpost 4, 5, $4, MapColosseumSignpost1Script + signpost 4, 4, SIGNPOST_RIGHT, MapColosseumSignpost1Script + signpost 4, 5, SIGNPOST_LEFT, MapColosseumSignpost1Script ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_001 + person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS2_IN_CABLE_CLUB diff --git a/maps/CopycatsHouse1F.asm b/maps/CopycatsHouse1F.asm index 719619420..462192d17 100644 --- a/maps/CopycatsHouse1F.asm +++ b/maps/CopycatsHouse1F.asm @@ -85,6 +85,6 @@ CopycatsHouse1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, -1 - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, -1 - person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, -1 + person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x18ad13, -1 + person_event SPRITE_POKEFAN_F, 8, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, PokefanFScript_0x18ad16, -1 + person_event SPRITE_CLEFAIRY, 10, 10, UP << 2 | $12, $0, -1, -1, $0, 0, ClefairyScript_0x18ad2a, -1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index fc95f7ecb..d38321a88 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -368,14 +368,14 @@ CopycatsHouse2F_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, CopycatsHouse2FBookshelf - signpost 1, 1, $0, CopycatsHouse2FBookshelf + signpost 1, 0, SIGNPOST_READ, CopycatsHouse2FBookshelf + signpost 1, 1, SIGNPOST_READ, CopycatsHouse2FBookshelf ; people-events db 6 - person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, Copycat, EVENT_6EE - person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, -1 - person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, CopycatsHouse2FDoll, EVENT_773 - person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, Copycat, EVENT_6EF + person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Copycat, EVENT_6EE + person_event SPRITE_MOLTRES, 8, 10, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CopycatsDodrio, -1 + person_event SPRITE_FAIRY, 5, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CopycatsHouse2FDoll, EVENT_773 + person_event SPRITE_MONSTER, 5, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CopycatsHouse2FDoll, -1 + person_event SPRITE_BIRD, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopycatsHouse2FDoll, -1 + person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, Copycat, EVENT_6EF diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm index 0f1e99069..ae6732323 100644 --- a/maps/DanceTheatre.asm +++ b/maps/DanceTheatre.asm @@ -420,17 +420,17 @@ DanceTheatre_MapEventHeader: ; signposts db 2 - signpost 6, 5, $1, MapDanceTheatreSignpost1Script - signpost 6, 6, $1, MapDanceTheatreSignpost1Script + signpost 6, 5, SIGNPOST_UP, MapDanceTheatreSignpost1Script + signpost 6, 6, SIGNPOST_UP, MapDanceTheatreSignpost1Script ; people-events db 9 - person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, -1 - person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, -1 - person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, -1 - person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, -1 - person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, -1 - person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, -1 - person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, -1 - person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, -1 - person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, -1 + person_event SPRITE_KIMONO_GIRL, 6, 4, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlNaoko2, -1 + person_event SPRITE_KIMONO_GIRL, 5, 6, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlSayo, -1 + person_event SPRITE_KIMONO_GIRL, 6, 10, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerKimono_girlZuki, -1 + person_event SPRITE_KIMONO_GIRL, 5, 13, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerKimono_girlKuni, -1 + person_event SPRITE_KIMONO_GIRL, 6, 15, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerKimono_girlMiki, -1 + person_event SPRITE_GENTLEMAN, 14, 11, UP << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x994c6, -1 + person_event SPRITE_RHYDON, 12, 10, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RhydonScript_0x9951b, -1 + person_event SPRITE_COOLTRAINER_M, 14, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x99525, -1 + person_event SPRITE_GRANNY, 10, 7, UP << 2 | $3, $0, -1, -1, $0, 0, GrannyScript_0x99528, -1 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index fc890387e..aed85322e 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -73,6 +73,6 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; people-events db 3 - person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, -1 - person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, EVENT_6A1 - person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, EVENT_6A2 + person_event SPRITE_PHARMACIST, 7, 11, DOWN << 2 | $3, $0, -1, -1, $0, 0, PharmacistScript_0x18c720, -1 + person_event SPRITE_POKE_BALL, 28, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73b, EVENT_6A1 + person_event SPRITE_POKE_BALL, 26, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73d, EVENT_6A2 diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 59c558cbd..6bc09411b 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -40,15 +40,15 @@ DarkCaveVioletEntrance_MapEventHeader: ; signposts db 1 - signpost 3, 26, $7, MapDarkCaveVioletEntranceSignpostItem0 + signpost 3, 26, SIGNPOST_ITEMIFSET, MapDarkCaveVioletEntranceSignpostItem0 ; people-events db 8 - person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, EVENT_69E - person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, EVENT_69F - person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, EVENT_6A0 - person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, EVENT_7CE + person_event SPRITE_POKE_BALL, 12, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c68e, EVENT_69E + person_event SPRITE_ROCK, 18, 20, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_ROCK, 10, 31, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_ROCK, 18, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_ROCK, 35, 40, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 + person_event SPRITE_POKE_BALL, 26, 40, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c690, EVENT_69F + person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c692, EVENT_6A0 + person_event SPRITE_POKE_BALL, 32, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c694, EVENT_7CE diff --git a/maps/DayCare.asm b/maps/DayCare.asm index ad4904800..f6d03dada 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -170,10 +170,10 @@ DayCare_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, DayCareBookshelf - signpost 1, 1, $0, DayCareBookshelf + signpost 1, 0, SIGNPOST_READ, DayCareBookshelf + signpost 1, 1, SIGNPOST_READ, DayCareBookshelf ; people-events db 2 - person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, EVENT_6E5 - person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, -1 + person_event SPRITE_GRAMPS, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrampsScript_0x62f8f, EVENT_6E5 + person_event SPRITE_GRANNY, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrannyScript_0x62fc3, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 539d336fe..62c2cd46e 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -39,8 +39,8 @@ DiglettsCave_MapEventHeader: ; signposts db 1 - signpost 11, 6, $7, MapDiglettsCaveSignpostItem0 + signpost 11, 6, SIGNPOST_ITEMIFSET, MapDiglettsCaveSignpostItem0 ; people-events db 1 - person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, -1 + person_event SPRITE_POKEFAN_M, 35, 7, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x74002, -1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 12b61b4ee..6c6ac51c3 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -23,7 +23,7 @@ UnknownScript_0x18d023: writetext UnknownText_0x18d2ea keeptextopen UnknownScript_0x18d030: - setevent EVENT_001 + setevent EVENT_CHRIS2_IN_CABLE_CLUB writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 @@ -85,7 +85,7 @@ UnknownScript_0x18d0a9: iftrue UnknownScript_0x18d079 checkevent EVENT_002 iftrue UnknownScript_0x18d061 - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x18d049 UnknownScript_0x18d0cb: loadmovesprites @@ -109,7 +109,7 @@ UnknownScript_0x18d0cb: iftrue UnknownScript_0x18d061 checkevent EVENT_002 iftrue UnknownScript_0x18d049 - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x18d030 UnknownScript_0x18d100: writetext UnknownText_0x18d47c @@ -184,13 +184,13 @@ UnknownScript_0x18d100: playsound SFX_ENTER_DOOR disappear $5 waitbutton - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB end ElderScript_0x18d1a5: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x18d1f9 checkevent EVENT_006 iftrue UnknownScript_0x18d1ff @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader: ; people-events db 4 - person_event SPRITE_ELDER, 5, 9, $6, $0, 255, 255, $0, 0, ElderScript_0x18d1a5, EVENT_000 - person_event SPRITE_ELDER, 8, 6, $9, $0, 255, 255, $0, 0, ElderScript_0x18d205, EVENT_000 - person_event SPRITE_ELDER, 8, 11, $8, $0, 255, 255, $0, 0, ElderScript_0x18d20d, EVENT_000 - person_event SPRITE_CLAIR, 12, 8, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_790 + person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index fbbbdfb37..21bb85fe3 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -212,12 +212,12 @@ SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x18c995 writetext UnknownText_0x18cc83 closetext loadmovesprites - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB special RestartMapMusic end @@ -479,19 +479,19 @@ DragonsDenB1F_MapEventHeader: ; signposts db 4 - signpost 24, 18, $0, MapDragonsDenB1FSignpost0Script - signpost 29, 33, $7, MapDragonsDenB1FSignpostItem1 - signpost 17, 21, $7, MapDragonsDenB1FSignpostItem2 - signpost 15, 31, $7, MapDragonsDenB1FSignpostItem3 + signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script + signpost 29, 33, SIGNPOST_ITEMIFSET, MapDragonsDenB1FSignpostItem1 + signpost 17, 21, SIGNPOST_ITEMIFSET, MapDragonsDenB1FSignpostItem2 + signpost 15, 31, SIGNPOST_ITEMIFSET, MapDragonsDenB1FSignpostItem3 ; people-events db 9 - person_event SPRITE_POKE_BALL, 20, 39, $1, $0, 255, 255, $0, 0, PokeBallScript_0x18c95a, EVENT_6A8 - person_event SPRITE_CLAIR, 34, 18, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_6D8 - person_event SPRITE_SILVER, 27, 24, $2, $22, 255, 255, $0, 0, SilverScript_0x18c97e, EVENT_6C6 - person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, -1 - person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, -1 - person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, -1 - person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, -1 - person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, EVENT_7BF - person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, EVENT_7C0 + person_event SPRITE_POKE_BALL, 20, 39, DOWN << 2 | $1, $0, -1, -1, $0, 0, PokeBallScript_0x18c95a, EVENT_6A8 + person_event SPRITE_CLAIR, 34, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_6D8 + person_event SPRITE_SILVER, 27, 24, DOWN << 2 | $2, $22, -1, -1, $0, 0, SilverScript_0x18c97e, EVENT_6C6 + person_event SPRITE_COOLTRAINER_M, 12, 24, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainermDarin, -1 + person_event SPRITE_COOLTRAINER_F, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCara, -1 + person_event SPRITE_TWIN, 21, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia1, -1 + person_event SPRITE_TWIN, 22, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia2, -1 + person_event SPRITE_POKE_BALL, 8, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a1, EVENT_7BF + person_event SPRITE_POKE_BALL, 24, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a3, EVENT_7C0 diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index a3538d3eb..841804c4d 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -418,16 +418,16 @@ EarlsPokemonAcademy_MapEventHeader: ; signposts db 4 - signpost 1, 0, $0, AcademyBookshelf - signpost 1, 1, $0, AcademyBookshelf - signpost 0, 3, $0, AcademyBlackboard - signpost 0, 4, $0, AcademyBlackboard + signpost 1, 0, SIGNPOST_READ, AcademyBookshelf + signpost 1, 1, SIGNPOST_READ, AcademyBookshelf + signpost 0, 3, SIGNPOST_READ, AcademyBlackboard + signpost 0, 4, SIGNPOST_READ, AcademyBlackboard ; people-events db 6 - person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, AcademyEarl, EVENT_6CB - person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, -1 - person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, -1 - person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, -1 - person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, -1 - person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, -1 + person_event SPRITE_FISHER, 6, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, AcademyEarl, EVENT_6CB + person_event SPRITE_YOUNGSTER, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x68a83, -1 + person_event SPRITE_GAMEBOY_KID, 15, 7, UP << 2 | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x68a86, -1 + person_event SPRITE_GAMEBOY_KID, 15, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x68a91, -1 + person_event SPRITE_YOUNGSTER, 11, 8, UP << 2 | $3, $0, -1, -1, $0, 0, YoungsterScript_0x68a9c, -1 + person_event SPRITE_POKEDEX, 8, 6, DOWN << 2 | $1, $0, -1, -1, $0, 0, AcademyNotebook, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index d7cbf3234..ce7d15d97 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -280,21 +280,21 @@ EcruteakCity_MapEventHeader: ; signposts db 8 - signpost 21, 15, $0, EcruteakCitySign - signpost 10, 38, $0, TinTowerSign - signpost 28, 8, $0, EcruteakGymSign - signpost 21, 21, $0, EcruteakDanceTheaterSign - signpost 10, 2, $0, BurnedTowerSign - signpost 27, 24, $0, EcruteakCityPokeCenterSign - signpost 21, 30, $0, EcruteakCityMartSign - signpost 14, 23, $7, MapEcruteakCitySignpostItem7 + signpost 21, 15, SIGNPOST_READ, EcruteakCitySign + signpost 10, 38, SIGNPOST_READ, TinTowerSign + signpost 28, 8, SIGNPOST_READ, EcruteakGymSign + signpost 21, 21, SIGNPOST_READ, EcruteakDanceTheaterSign + signpost 10, 2, SIGNPOST_READ, BurnedTowerSign + signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign + signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign + signpost 14, 23, SIGNPOST_ITEMIFSET, MapEcruteakCitySignpostItem7 ; people-events db 7 - person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, -1 - person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, -1 - person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, -1 - person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, -1 - person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, -1 - person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, -1 - person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, EVENT_7A9 + person_event SPRITE_GRAMPS, 19, 22, DOWN << 2 | $2, $11, -1, -1, $0, 0, GrampsScript_0x1a4009, -1 + person_event SPRITE_GRAMPS, 25, 24, DOWN << 2 | $3, $0, -1, -1, $0, 0, GrampsScript_0x1a400c, -1 + person_event SPRITE_LASS, 33, 25, UP << 2 | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x1a4012, -1 + person_event SPRITE_LASS, 13, 7, UP << 2 | $3, $0, -1, -1, $0, 0, LassScript_0x1a4015, -1 + person_event SPRITE_FISHER, 26, 13, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a4029, -1 + person_event SPRITE_YOUNGSTER, 18, 14, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a403d, -1 + person_event SPRITE_GRAMPS, 11, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x1a400f, EVENT_7A9 diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 1655f9c65..a30fbe9a4 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -488,15 +488,15 @@ EcruteakGym_MapEventHeader: ; signposts db 2 - signpost 15, 3, $0, EcruteakGymStatue - signpost 15, 6, $0, EcruteakGymStatue + signpost 15, 3, SIGNPOST_READ, EcruteakGymStatue + signpost 15, 6, SIGNPOST_READ, EcruteakGymStatue ; people-events db 7 - person_event SPRITE_MORTY, 5, 9, $6, $0, 255, 255, $b0, 0, MortyScript_0x99d58, -1 - person_event SPRITE_SAGE, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, -1 - person_event SPRITE_SAGE, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, -1 - person_event SPRITE_GRANNY, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, -1 - person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, -1 - person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_7A8 + person_event SPRITE_MORTY, 5, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x99d58, -1 + person_event SPRITE_SAGE, 11, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSageJeffrey, -1 + person_event SPRITE_SAGE, 17, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSagePing, -1 + person_event SPRITE_GRANNY, 9, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumMartha, -1 + person_event SPRITE_GRANNY, 13, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumGrace, -1 + person_event SPRITE_GYM_GUY, 19, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, EcruteakGymGuyScript, -1 + person_event SPRITE_GRAMPS, 18, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_7A8 diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 31e2f6d42..183a44a08 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -86,7 +86,7 @@ UnknownScript_0x98076: UnknownScript_0x9807c: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x980a4 - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x980aa checkitem CLEAR_BELL iftrue UnknownScript_0x98093 @@ -102,7 +102,7 @@ UnknownScript_0x98093: dotrigger $1 setevent EVENT_RANG_CLEAR_BELL clearevent EVENT_766 - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB end UnknownScript_0x980a4: @@ -298,7 +298,7 @@ EcruteakHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAGE, 10, 8, $6, $0, 255, 255, $0, 0, SageScript_0x98062, EVENT_766 - person_event SPRITE_SAGE, 10, 9, $6, $0, 255, 255, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL - person_event SPRITE_SAGE, 13, 10, $2, $11, 255, 255, $0, 0, SageScript_0x980b0, EVENT_7B1 - person_event SPRITE_GRAMPS, 15, 7, $2, $11, 255, 255, $0, 0, GrampsScript_0x980c4, EVENT_7B1 + person_event SPRITE_SAGE, 10, 8, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_766 + person_event SPRITE_SAGE, 10, 9, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL + person_event SPRITE_SAGE, 13, 10, DOWN << 2 | $2, $11, -1, -1, $0, 0, SageScript_0x980b0, EVENT_7B1 + person_event SPRITE_GRAMPS, 15, 7, DOWN << 2 | $2, $11, -1, -1, $0, 0, GrampsScript_0x980c4, EVENT_7B1 diff --git a/maps/EcruteakItemfinderHouse.asm b/maps/EcruteakItemfinderHouse.asm index ddbb1c7fd..f0431bc6c 100644 --- a/maps/EcruteakItemfinderHouse.asm +++ b/maps/EcruteakItemfinderHouse.asm @@ -172,9 +172,9 @@ EcruteakItemfinderHouse_MapEventHeader: ; signposts db 1 - signpost 1, 2, $0, ItemFinderHouseRadio + signpost 1, 2, SIGNPOST_READ, ItemFinderHouseRadio ; people-events db 2 - person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, -1 - person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, -1 + person_event SPRITE_COOLTRAINER_M, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x9a5fb, -1 + person_event SPRITE_POKEDEX, 7, 7, DOWN << 2 | $1, $0, -1, -1, $0, 0, PokedexScript_0x9a620, -1 diff --git a/maps/EcruteakLugiaSpeechHouse.asm b/maps/EcruteakLugiaSpeechHouse.asm index 039f24f41..f3f1b6d8d 100644 --- a/maps/EcruteakLugiaSpeechHouse.asm +++ b/maps/EcruteakLugiaSpeechHouse.asm @@ -54,9 +54,9 @@ EcruteakLugiaSpeechHouse_MapEventHeader: ; signposts db 1 - signpost 1, 2, $0, LugiaSpeechHouseRadio + signpost 1, 2, SIGNPOST_READ, LugiaSpeechHouseRadio ; people-events db 2 - person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, -1 - person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, -1 + person_event SPRITE_GRAMPS, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, GrampsScript_0x99334, -1 + person_event SPRITE_YOUNGSTER, 8, 9, LEFT << 2 | $0, $0, -1, -1, $0, 0, YoungsterScript_0x99337, -1 diff --git a/maps/EcruteakMart.asm b/maps/EcruteakMart.asm index 2da460581..76e15c811 100644 --- a/maps/EcruteakMart.asm +++ b/maps/EcruteakMart.asm @@ -57,6 +57,6 @@ EcruteakMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, -1 - person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, -1 - person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x99c3b, -1 + person_event SPRITE_SUPER_NERD, 6, 9, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x99c42, -1 + person_event SPRITE_GRANNY, 10, 10, UP << 2 | $3, $0, -1, -1, $0, 0, GrannyScript_0x99c45, -1 diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index 6b9919469..c6981b7f2 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -219,8 +219,8 @@ EcruteakPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x98eb0, -1 - person_event SPRITE_POKEFAN_M, 10, 11, $a, $0, 255, 255, $0, 0, PokefanMScript_0x98eb3, -1 - person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, -1 - person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, -1 - person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_713 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x98eb0, -1 + person_event SPRITE_POKEFAN_M, 10, 11, LEFT << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x98eb3, -1 + person_event SPRITE_COOLTRAINER_F, 8, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, CooltrainerFScript_0x98ebf, -1 + person_event SPRITE_GYM_GUY, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x98ec2, -1 + person_event SPRITE_BILL, 11, 4, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_713 diff --git a/maps/ElmsHouse.asm b/maps/ElmsHouse.asm index d47a725d8..4c6e3d579 100644 --- a/maps/ElmsHouse.asm +++ b/maps/ElmsHouse.asm @@ -93,11 +93,11 @@ ElmsHouse_MapEventHeader: ; signposts db 3 - signpost 1, 0, $0, ElmsHousePC - signpost 1, 6, $0, ElmsHouseBookshelf - signpost 1, 7, $0, ElmsHouseBookshelf + signpost 1, 0, SIGNPOST_READ, ElmsHousePC + signpost 1, 6, SIGNPOST_READ, ElmsHouseBookshelf + signpost 1, 7, SIGNPOST_READ, ElmsHouseBookshelf ; people-events db 2 - person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, -1 - person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, -1 + person_event SPRITE_TEACHER, 9, 5, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ElmsWife, -1 + person_event SPRITE_BUG_CATCHER, 8, 9, UP << 2 | $3, $0, -1, -1, $0, 0, ElmsSon, -1 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 4760b403d..663b08ff3 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -1389,28 +1389,28 @@ ElmsLab_MapEventHeader: ; signposts db 16 - signpost 1, 2, $0, ElmsLabHealingMachine - signpost 1, 6, $0, ElmsLabBookshelf - signpost 1, 7, $0, ElmsLabBookshelf - signpost 1, 8, $0, ElmsLabBookshelf - signpost 1, 9, $0, ElmsLabBookshelf - signpost 7, 0, $0, ElmsLabTravelTip1 - signpost 7, 1, $0, ElmsLabTravelTip2 - signpost 7, 2, $0, ElmsLabTravelTip3 - signpost 7, 3, $0, ElmsLabTravelTip4 - signpost 7, 6, $0, ElmsLabBookshelf - signpost 7, 7, $0, ElmsLabBookshelf - signpost 7, 8, $0, ElmsLabBookshelf - signpost 7, 9, $0, ElmsLabBookshelf - signpost 3, 9, $0, ElmsLabTrashcan - signpost 0, 5, $0, ElmsLabWindow - signpost 5, 3, $2, ElmsLabPC + signpost 1, 2, SIGNPOST_READ, ElmsLabHealingMachine + signpost 1, 6, SIGNPOST_READ, ElmsLabBookshelf + signpost 1, 7, SIGNPOST_READ, ElmsLabBookshelf + signpost 1, 8, SIGNPOST_READ, ElmsLabBookshelf + signpost 1, 9, SIGNPOST_READ, ElmsLabBookshelf + signpost 7, 0, SIGNPOST_READ, ElmsLabTravelTip1 + signpost 7, 1, SIGNPOST_READ, ElmsLabTravelTip2 + signpost 7, 2, SIGNPOST_READ, ElmsLabTravelTip3 + signpost 7, 3, SIGNPOST_READ, ElmsLabTravelTip4 + signpost 7, 6, SIGNPOST_READ, ElmsLabBookshelf + signpost 7, 7, SIGNPOST_READ, ElmsLabBookshelf + signpost 7, 8, SIGNPOST_READ, ElmsLabBookshelf + signpost 7, 9, SIGNPOST_READ, ElmsLabBookshelf + signpost 3, 9, SIGNPOST_READ, ElmsLabTrashcan + signpost 0, 5, SIGNPOST_READ, ElmsLabWindow + signpost 5, 3, SIGNPOST_DOWN, ElmsLabPC ; people-events db 6 - person_event SPRITE_ELM, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, -1 - person_event SPRITE_SCIENTIST, 13, 6, $3, $0, 255, 255, $90, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB - person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, EVENT_640 - person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, EVENT_641 - person_event SPRITE_POKE_BALL, 7, 12, $1, $0, 255, 255, $0, 0, ChikoritaPokeBallScript, EVENT_642 - person_event SPRITE_OFFICER, 7, 9, $7, $0, 255, 255, $90, 0, CopScript, EVENT_702 + person_event SPRITE_ELM, 6, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ProfElmScript, -1 + person_event SPRITE_SCIENTIST, 13, 6, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB + person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $0, 0, CyndaquilPokeBallScript, EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB + person_event SPRITE_POKE_BALL, 7, 11, DOWN << 2 | $1, $0, -1, -1, $0, 0, TotodilePokeBallScript, EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB + person_event SPRITE_POKE_BALL, 7, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, ChikoritaPokeBallScript, EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB + person_event SPRITE_OFFICER, 7, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopScript, EVENT_COP_IN_ELMS_LAB diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 45ac8bd38..a1aaa629a 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -310,7 +310,7 @@ FastShip1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, -1 - person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, -1 - person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, -1 - person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_72C + person_event SPRITE_SAILOR, 6, 29, UP << 2 | $2, $0, -1, -1, $0, 0, SailorScript_0x75160, -1 + person_event SPRITE_SAILOR, 11, 18, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x751d0, -1 + person_event SPRITE_SAILOR, 21, 26, UP << 2 | $1, $2, -1, -1, $0, 0, SailorScript_0x751e4, -1 + person_event SPRITE_GENTLEMAN, 10, 23, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_72C diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index b33d9ff16..e0942c54f 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -612,19 +612,19 @@ FastShipB1F_MapEventHeader: ; signposts db 1 - signpost 9, 27, $0, FashShipB1FTrashcan + signpost 9, 27, SIGNPOST_READ, FashShipB1FTrashcan ; people-events db 12 - person_event SPRITE_SAILOR, 10, 34, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, EVENT_72E - person_event SPRITE_SAILOR, 10, 35, $6, $0, 255, 255, $90, 0, SailorScript_0x76767, EVENT_72F - person_event SPRITE_SAILOR, 15, 13, $7, $0, 255, 255, $92, 3, TrainerSailorJeff, EVENT_739 - person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a2, 1, TrainerPicnickerDebra, EVENT_739 - person_event SPRITE_SUPER_NERD, 13, 30, $9, $0, 255, 255, $92, 1, TrainerJugglerFritz, EVENT_739 - person_event SPRITE_SAILOR, 8, 21, $9, $0, 255, 255, $92, 4, TrainerSailorGarrett, EVENT_73A - person_event SPRITE_FISHER, 12, 29, $7, $0, 255, 255, $a2, 3, TrainerFisherJonah, EVENT_73A - person_event SPRITE_BLACK_BELT, 15, 19, $1f, $0, 255, 255, $b2, 3, TrainerBlackbeltWai, EVENT_73A - person_event SPRITE_SAILOR, 8, 27, $9, $0, 255, 255, $92, 4, TrainerSailorKenneth, EVENT_73B - person_event SPRITE_TEACHER, 15, 13, $7, $0, 255, 255, $82, 3, TrainerTeacherShirley, EVENT_73B - person_event SPRITE_YOUNGSTER, 13, 18, $3, $0, 255, 255, $92, 1, TrainerSchoolboyNate, EVENT_73B - person_event SPRITE_YOUNGSTER, 15, 18, $a, $0, 255, 255, $92, 1, TrainerSchoolboyRicky, EVENT_73B + person_event SPRITE_SAILOR, 10, 34, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_72E + person_event SPRITE_SAILOR, 10, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_72F + person_event SPRITE_SAILOR, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorJeff, EVENT_739 + person_event SPRITE_LASS, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerDebra, EVENT_739 + person_event SPRITE_SUPER_NERD, 13, 30, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerJugglerFritz, EVENT_739 + person_event SPRITE_SAILOR, 8, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorGarrett, EVENT_73A + person_event SPRITE_FISHER, 12, 29, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherJonah, EVENT_73A + person_event SPRITE_BLACK_BELT, 15, 19, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltWai, EVENT_73A + person_event SPRITE_SAILOR, 8, 27, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorKenneth, EVENT_73B + person_event SPRITE_TEACHER, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherShirley, EVENT_73B + person_event SPRITE_YOUNGSTER, 13, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyNate, EVENT_73B + person_event SPRITE_YOUNGSTER, 15, 18, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyRicky, EVENT_73B diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index baea1925d..1cfce4c95 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -368,16 +368,16 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; signposts db 3 - signpost 13, 6, $0, FastShipCabins_NNW_NNE_NETrashcan - signpost 19, 7, $0, FastShipCabins_NNW_NNE_NETrashcan - signpost 31, 7, $0, FastShipCabins_NNW_NNE_NETrashcan + signpost 13, 6, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan + signpost 19, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan + signpost 31, 7, SIGNPOST_READ, FastShipCabins_NNW_NNE_NETrashcan ; people-events db 7 - person_event SPRITE_COOLTRAINER_M, 7, 8, $a, $0, 255, 255, $82, 2, TrainerCooltrainermSean, EVENT_73A - person_event SPRITE_COOLTRAINER_F, 9, 5, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfCarol, EVENT_73A - person_event SPRITE_SUPER_NERD, 9, 5, $7, $0, 255, 255, $92, 3, TrainerPokemaniacEthan, EVENT_73B - person_event SPRITE_POKEFAN_M, 21, 8, $7, $0, 255, 255, $b2, 3, TrainerHikerNoland, EVENT_739 - person_event SPRITE_SAILOR, 30, 8, $3, $0, 255, 255, $90, 0, SailorScript_0x755f1, EVENT_72D - person_event SPRITE_GENTLEMAN, 34, 11, $3, $0, 255, 255, $92, 1, TrainerGentlemanEdward, EVENT_73A - person_event SPRITE_PHARMACIST, 34, 6, $7, $0, 255, 255, $a2, 4, TrainerBurglarCorey, EVENT_73B + person_event SPRITE_COOLTRAINER_M, 7, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermSean, EVENT_73A + person_event SPRITE_COOLTRAINER_F, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCarol, EVENT_73A + person_event SPRITE_SUPER_NERD, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacEthan, EVENT_73B + person_event SPRITE_POKEFAN_M, 21, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerNoland, EVENT_739 + person_event SPRITE_SAILOR, 30, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x755f1, EVENT_72D + person_event SPRITE_GENTLEMAN, 34, 11, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerGentlemanEdward, EVENT_73A + person_event SPRITE_PHARMACIST, 34, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerBurglarCorey, EVENT_73B diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index 562917910..a3c9ed360 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -579,18 +579,18 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; signposts db 1 - signpost 25, 4, $0, FastShipCaptainsCabinTrashcan + signpost 25, 4, SIGNPOST_READ, FastShipCaptainsCabinTrashcan ; people-events db 11 - person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, -1 - person_event SPRITE_GENTLEMAN, 21, 6, $9, $0, 255, 255, $90, 0, GentlemanScript_0x75f1f, EVENT_730 - person_event SPRITE_TWIN, 21, 7, $a, $0, 255, 255, $0, 0, TwinScript_0x75f6d, EVENT_731 - person_event SPRITE_TWIN, 29, 6, $a, $0, 255, 255, $0, 0, TwinScript_0x75ebb, EVENT_732 - person_event SPRITE_POKEFAN_M, 10, 9, $8, $0, 255, 255, $82, 5, TrainerPokefanmColin, EVENT_739 - person_event SPRITE_TWIN, 8, 6, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg1, EVENT_739 - person_event SPRITE_TWIN, 8, 7, $6, $0, 255, 255, $82, 1, TrainerTwinsMegandpeg2, EVENT_739 - person_event SPRITE_SUPER_NERD, 9, 9, $8, $0, 255, 255, $92, 5, TrainerPsychicRodney, EVENT_73A - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $82, 3, TrainerPokefanmJeremy, EVENT_73B - person_event SPRITE_POKEFAN_F, 9, 9, $9, $0, 255, 255, $82, 1, TrainerPokefanfGeorgia, EVENT_73B - person_event SPRITE_SUPER_NERD, 19, 5, $3, $0, 255, 255, $b2, 2, TrainerSupernerdShawn, EVENT_73A + person_event SPRITE_CAPTAIN, 29, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CaptainScript_0x75ea7, -1 + person_event SPRITE_GENTLEMAN, 21, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x75f1f, EVENT_730 + person_event SPRITE_TWIN, 21, 7, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75f6d, EVENT_731 + person_event SPRITE_TWIN, 29, 6, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75ebb, EVENT_732 + person_event SPRITE_POKEFAN_M, 10, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerPokefanmColin, EVENT_739 + person_event SPRITE_TWIN, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg1, EVENT_739 + person_event SPRITE_TWIN, 8, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg2, EVENT_739 + person_event SPRITE_SUPER_NERD, 9, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerPsychicRodney, EVENT_73A + person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJeremy, EVENT_73B + person_event SPRITE_POKEFAN_F, 9, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerPokefanfGeorgia, EVENT_73B + person_event SPRITE_SUPER_NERD, 19, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdShawn, EVENT_73A diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 08c1d8fda..cc199c381 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -297,13 +297,13 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; signposts db 3 - signpost 1, 7, $0, FastShipBed - signpost 2, 7, $0, FastShipBed - signpost 7, 7, $0, FastShipCabinsNorthwestCabinTrashcan + signpost 1, 7, SIGNPOST_READ, FastShipBed + signpost 2, 7, SIGNPOST_READ, FastShipBed + signpost 7, 7, SIGNPOST_READ, FastShipCabinsNorthwestCabinTrashcan ; people-events db 4 - person_event SPRITE_FISHER, 19, 5, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherLyle, EVENT_739 - person_event SPRITE_BUG_CATCHER, 19, 10, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherKen, EVENT_73B - person_event SPRITE_BUENA, 30, 5, $a, $0, 255, 255, $92, 3, TrainerBeautyCassie, EVENT_73A - person_event SPRITE_ROCKER, 32, 7, $1e, $0, 255, 255, $82, 2, TrainerGuitaristClyde, EVENT_73B + person_event SPRITE_FISHER, 19, 5, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherLyle, EVENT_739 + person_event SPRITE_BUG_CATCHER, 19, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherKen, EVENT_73B + person_event SPRITE_BUENA, 30, 5, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyCassie, EVENT_73A + person_event SPRITE_ROCKER, 32, 7, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerGuitaristClyde, EVENT_73B diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 34c909c06..ccf6123ff 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -52,10 +52,10 @@ FightingDojo_MapEventHeader: ; signposts db 2 - signpost 0, 4, $0, MapFightingDojoSignpost0Script - signpost 0, 5, $0, MapFightingDojoSignpost1Script + signpost 0, 4, SIGNPOST_READ, MapFightingDojoSignpost0Script + signpost 0, 5, SIGNPOST_READ, MapFightingDojoSignpost1Script ; people-events db 2 - person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, -1 - person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND + person_event SPRITE_BLACK_BELT, 8, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x189b61, -1 + person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND diff --git a/maps/FuchsiaBillSpeechHouse.asm b/maps/FuchsiaBillSpeechHouse.asm index 27c4faefb..5a5f1a3c8 100644 --- a/maps/FuchsiaBillSpeechHouse.asm +++ b/maps/FuchsiaBillSpeechHouse.asm @@ -40,5 +40,5 @@ FuchsiaBillSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, -1 - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, -1 + person_event SPRITE_POKEFAN_F, 7, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x1963bd, -1 + person_event SPRITE_YOUNGSTER, 8, 10, UP << 2 | $0, $10, -1, -1, $0, 0, YoungsterScript_0x1963c0, -1 diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 90694e6e7..f181a0c0d 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -143,18 +143,18 @@ FuchsiaCity_MapEventHeader: ; signposts db 8 - signpost 15, 21, $0, FuchsiaCitySign - signpost 29, 5, $0, FuchsiaGymSign - signpost 15, 25, $0, SafariZoneOfficeSign - signpost 29, 27, $0, WardensHomeSign - signpost 5, 17, $0, SafariZoneClosedSign - signpost 15, 13, $0, NoLitteringSign - signpost 27, 20, $0, FuchsiaCityPokeCenterSign - signpost 13, 6, $0, FuchsiaCityMartSign + signpost 15, 21, SIGNPOST_READ, FuchsiaCitySign + signpost 29, 5, SIGNPOST_READ, FuchsiaGymSign + signpost 15, 25, SIGNPOST_READ, SafariZoneOfficeSign + signpost 29, 27, SIGNPOST_READ, WardensHomeSign + signpost 5, 17, SIGNPOST_READ, SafariZoneClosedSign + signpost 15, 13, SIGNPOST_READ, NoLitteringSign + signpost 27, 20, SIGNPOST_READ, FuchsiaCityPokeCenterSign + signpost 13, 6, SIGNPOST_READ, FuchsiaCityMartSign ; people-events db 4 - person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, -1 - person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, -1 - person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, -1 - person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, -1 + person_event SPRITE_YOUNGSTER, 22, 27, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x194b22, -1 + person_event SPRITE_POKEFAN_M, 12, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x194b25, -1 + person_event SPRITE_TEACHER, 18, 20, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x194b28, -1 + person_event SPRITE_FRUIT_TREE, 5, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x194b43, -1 diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm index 550edb6d0..91e96e826 100644 --- a/maps/FuchsiaGym.asm +++ b/maps/FuchsiaGym.asm @@ -386,14 +386,14 @@ FuchsiaGym_MapEventHeader: ; signposts db 2 - signpost 15, 3, $0, FuchsiaGymStatue - signpost 15, 6, $0, FuchsiaGymStatue + signpost 15, 3, SIGNPOST_READ, FuchsiaGymStatue + signpost 15, 6, SIGNPOST_READ, FuchsiaGymStatue ; people-events db 6 - person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, -1 - person_event SPRITE_FUCHSIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, -1 - person_event SPRITE_FUCHSIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, -1 - person_event SPRITE_FUCHSIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, -1 - person_event SPRITE_FUCHSIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, -1 + person_event SPRITE_JANINE, 14, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, JanineScript_0x195db9, -1 + person_event SPRITE_FUCHSIA_GYM_1, 11, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym1Script_0x195e1b, -1 + person_event SPRITE_FUCHSIA_GYM_2, 15, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym2Script_0x195e55, -1 + person_event SPRITE_FUCHSIA_GYM_3, 8, 13, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym3Script_0x195e8f, -1 + person_event SPRITE_FUCHSIA_GYM_4, 6, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuschiaGym4Script_0x195ec9, -1 + person_event SPRITE_GYM_GUY, 19, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FuchsiaGymGuyScript, -1 diff --git a/maps/FuchsiaMart.asm b/maps/FuchsiaMart.asm index 739fff138..f4c0d64f4 100644 --- a/maps/FuchsiaMart.asm +++ b/maps/FuchsiaMart.asm @@ -49,6 +49,6 @@ FuchsiaMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, -1 - person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, -1 - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x195ce8, -1 + person_event SPRITE_FISHER, 6, 7, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x195cef, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x195cf2, -1 diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index c962cc0cf..e78ef4f1a 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -102,7 +102,7 @@ FuchsiaPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, -1 - person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, -1 - person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, -1 - person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, NurseScript_0x196459, -1 + person_event SPRITE_COOLTRAINER_M, 8, 12, UP << 2 | $1, $1, -1, -1, $0, 0, CooltrainerMScript_0x19645c, -1 + person_event SPRITE_COOLTRAINER_F, 8, 5, UP << 2 | $1, $1, -1, -1, $0, 0, CooltrainerFScript_0x19645f, -1 + person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, JanineImpersonatorScript_0x196462, -1 diff --git a/maps/GoldenrodBikeShop.asm b/maps/GoldenrodBikeShop.asm index f0d33c782..c6dad48cf 100644 --- a/maps/GoldenrodBikeShop.asm +++ b/maps/GoldenrodBikeShop.asm @@ -113,16 +113,16 @@ GoldenrodBikeShop_MapEventHeader: ; signposts db 9 - signpost 2, 1, $0, MapGoldenrodBikeShopSignpost8Script - signpost 3, 0, $0, MapGoldenrodBikeShopSignpost8Script - signpost 3, 1, $0, MapGoldenrodBikeShopSignpost8Script - signpost 5, 0, $0, MapGoldenrodBikeShopSignpost8Script - signpost 5, 1, $0, MapGoldenrodBikeShopSignpost8Script - signpost 6, 0, $0, MapGoldenrodBikeShopSignpost8Script - signpost 6, 1, $0, MapGoldenrodBikeShopSignpost8Script - signpost 6, 6, $0, MapGoldenrodBikeShopSignpost8Script - signpost 6, 7, $0, MapGoldenrodBikeShopSignpost8Script + signpost 2, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 3, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 3, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 5, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 5, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 6, 0, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 6, 1, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 6, 6, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script + signpost 6, 7, SIGNPOST_READ, MapGoldenrodBikeShopSignpost8Script ; people-events db 1 - person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, -1 + person_event SPRITE_CLERK, 6, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ClerkScript_0x54750, -1 diff --git a/maps/GoldenrodBillsHouse.asm b/maps/GoldenrodBillsHouse.asm index 91be3b95e..748e08d50 100644 --- a/maps/GoldenrodBillsHouse.asm +++ b/maps/GoldenrodBillsHouse.asm @@ -251,12 +251,12 @@ GoldenrodBillsHouse_MapEventHeader: ; signposts db 3 - signpost 1, 0, $0, BillsHouseBookshelf2 - signpost 1, 1, $0, BillsHouseBookshelf1 - signpost 1, 7, $0, BillsHouseRadio + signpost 1, 0, SIGNPOST_READ, BillsHouseBookshelf2 + signpost 1, 1, SIGNPOST_READ, BillsHouseBookshelf1 + signpost 1, 7, SIGNPOST_READ, BillsHouseRadio ; people-events db 3 - person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillsHouseBill, EVENT_MET_BILL - person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, -1 - person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, -1 + person_event SPRITE_BILL, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, BillsHouseBill, EVENT_MET_BILL + person_event SPRITE_POKEFAN_F, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, BillsMom, -1 + person_event SPRITE_TWIN, 8, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BillsSister, -1 diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 7384c16f2..e1c6d62d8 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -566,33 +566,33 @@ GoldenrodCity_MapEventHeader: ; signposts db 12 - signpost 14, 10, $0, GoldenrodCityStationSign - signpost 17, 4, $0, GoldenrodCityRadioTowerSign - signpost 27, 26, $0, GoldenrodDeptStoreSign - signpost 9, 26, $0, GoldenrodGymSign - signpost 18, 22, $0, GoldenrodCitySign - signpost 30, 28, $0, GoldenrodCityBikeShopSign - signpost 22, 16, $0, GoldenrodCityGameCornerSign - signpost 7, 12, $0, GoldenrodCityNameRaterSign - signpost 6, 8, $0, GoldenrodCityUndergroundSignNorth - signpost 30, 12, $0, GoldenrodCityUndergroundSignSouth - signpost 27, 16, $1, GoldenrodCityPokeCenterSign - signpost 6, 30, $0, GoldenrodCityFlowerShopSign + signpost 14, 10, SIGNPOST_READ, GoldenrodCityStationSign + signpost 17, 4, SIGNPOST_READ, GoldenrodCityRadioTowerSign + signpost 27, 26, SIGNPOST_READ, GoldenrodDeptStoreSign + signpost 9, 26, SIGNPOST_READ, GoldenrodGymSign + signpost 18, 22, SIGNPOST_READ, GoldenrodCitySign + signpost 30, 28, SIGNPOST_READ, GoldenrodCityBikeShopSign + signpost 22, 16, SIGNPOST_READ, GoldenrodCityGameCornerSign + signpost 7, 12, SIGNPOST_READ, GoldenrodCityNameRaterSign + signpost 6, 8, SIGNPOST_READ, GoldenrodCityUndergroundSignNorth + signpost 30, 12, SIGNPOST_READ, GoldenrodCityUndergroundSignSouth + signpost 27, 16, SIGNPOST_UP, GoldenrodCityPokeCenterSign + signpost 6, 30, SIGNPOST_READ, GoldenrodCityFlowerShopSign ; people-events db 15 - person_event SPRITE_POKEFAN_M, 22, 11, $7, $0, 255, 255, $0, 0, PokefanMScript_0x1989e3, EVENT_6CF - person_event SPRITE_YOUNGSTER, 21, 34, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1989e6, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 20, 16, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1989e9, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 30, 24, $2, $21, 255, 255, $0, 0, CooltrainerFScript_0x1989fd, EVENT_6CF - person_event SPRITE_YOUNGSTER, 21, 23, $2, $11, 255, 255, $80, 0, YoungsterScript_0x198a11, EVENT_6CF - person_event SPRITE_LASS, 14, 21, $5, $2, 255, 255, $a0, 0, LassScript_0x198a14, EVENT_6CF - person_event SPRITE_GRAMPS, 31, 15, $5, $1, 255, 255, $0, 0, GrampsScript_0x198a17, EVENT_6CF - person_event SPRITE_ROCKET, 20, 8, $7, $0, 255, 255, $0, 0, RocketScript_0x198a1a, EVENT_6CC - person_event SPRITE_ROCKET, 24, 32, $7, $0, 255, 255, $0, 0, RocketScript_0x198a29, EVENT_6CD - person_event SPRITE_ROCKET, 19, 12, $6, $0, 255, 255, $0, 0, RocketScript_0x198a2c, EVENT_6CD - person_event SPRITE_ROCKET, 27, 20, $9, $0, 255, 255, $0, 0, RocketScript_0x198a2f, EVENT_6CE - person_event SPRITE_ROCKET, 24, 33, $7, $0, 255, 255, $0, 0, RocketScript_0x198a32, EVENT_6CE - person_event SPRITE_ROCKET, 11, 33, $6, $0, 255, 255, $0, 0, RocketScript_0x198a35, EVENT_6CE - person_event SPRITE_ROCKET, 14, 35, $8, $0, 255, 255, $0, 0, RocketScript_0x198a38, EVENT_6CE - person_event SPRITE_POKEFAN_M, 26, 16, $3, $0, 255, 255, $80, 0, MoveTutor, EVENT_76A + person_event SPRITE_POKEFAN_M, 22, 11, UP << 2 | $3, $0, -1, -1, $0, 0, PokefanMScript_0x1989e3, EVENT_6CF + person_event SPRITE_YOUNGSTER, 21, 34, DOWN << 2 | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1989e6, EVENT_6CF + person_event SPRITE_COOLTRAINER_F, 20, 16, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1989e9, EVENT_6CF + person_event SPRITE_COOLTRAINER_F, 30, 24, DOWN << 2 | $2, $21, -1, -1, $0, 0, CooltrainerFScript_0x1989fd, EVENT_6CF + person_event SPRITE_YOUNGSTER, 21, 23, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x198a11, EVENT_6CF + person_event SPRITE_LASS, 14, 21, UP << 2 | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x198a14, EVENT_6CF + person_event SPRITE_GRAMPS, 31, 15, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x198a17, EVENT_6CF + person_event SPRITE_ROCKET, 20, 8, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a1a, EVENT_6CC + person_event SPRITE_ROCKET, 24, 32, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a29, EVENT_6CD + person_event SPRITE_ROCKET, 19, 12, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a2c, EVENT_6CD + person_event SPRITE_ROCKET, 27, 20, LEFT << 2 | $1, $0, -1, -1, $0, 0, RocketScript_0x198a2f, EVENT_6CE + person_event SPRITE_ROCKET, 24, 33, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a32, EVENT_6CE + person_event SPRITE_ROCKET, 11, 33, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a35, EVENT_6CE + person_event SPRITE_ROCKET, 14, 35, LEFT << 2 | $0, $0, -1, -1, $0, 0, RocketScript_0x198a38, EVENT_6CE + person_event SPRITE_POKEFAN_M, 26, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MoveTutor, EVENT_76A diff --git a/maps/GoldenrodDeptStore1F.asm b/maps/GoldenrodDeptStore1F.asm index b4989b651..3b2d2bbb0 100644 --- a/maps/GoldenrodDeptStore1F.asm +++ b/maps/GoldenrodDeptStore1F.asm @@ -88,12 +88,12 @@ GoldenrodDeptStore1F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, GoldenrodDeptStore1FDirectory - signpost 0, 3, $0, GoldenrodDeptStore1FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore1FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore1FElevatorButton ; people-events db 4 - person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, -1 - person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, -1 - person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, -1 - person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, -1 + person_event SPRITE_RECEPTIONIST, 5, 14, UP << 2 | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x55981, -1 + person_event SPRITE_POKEFAN_F, 8, 9, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanFScript_0x55987, -1 + person_event SPRITE_BUG_CATCHER, 9, 9, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugCatcherScript_0x5598a, -1 + person_event SPRITE_GENTLEMAN, 9, 15, DOWN << 2 | $2, $11, -1, -1, $0, 0, GentlemanScript_0x55984, -1 diff --git a/maps/GoldenrodDeptStore2F.asm b/maps/GoldenrodDeptStore2F.asm index fed8d27e2..fd4f7ddce 100644 --- a/maps/GoldenrodDeptStore2F.asm +++ b/maps/GoldenrodDeptStore2F.asm @@ -108,13 +108,13 @@ GoldenrodDeptStore2F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, GoldenrodDeptStore2FDirectory - signpost 0, 3, $0, GoldenrodDeptStore2FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore2FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore2FElevatorButton ; people-events db 5 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55b5d, -1 - person_event SPRITE_CLERK, 10, 17, $8, $0, 255, 255, $0, 0, ClerkScript_0x55b65, -1 - person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, -1 - person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, -1 - person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, -1 + person_event SPRITE_CLERK, 9, 17, UP << 2 | $3, $0, -1, -1, $0, 0, ClerkScript_0x55b5d, -1 + person_event SPRITE_CLERK, 10, 17, LEFT << 2 | $0, $0, -1, -1, $0, 0, ClerkScript_0x55b65, -1 + person_event SPRITE_YOUNGSTER, 10, 13, UP << 2 | $0, $10, -1, -1, $0, 0, YoungsterScript_0x55b6d, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x55b70, -1 + person_event SPRITE_GENTLEMAN, 10, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x55b73, -1 diff --git a/maps/GoldenrodDeptStore3F.asm b/maps/GoldenrodDeptStore3F.asm index 8a3b7dce2..257d1af22 100644 --- a/maps/GoldenrodDeptStore3F.asm +++ b/maps/GoldenrodDeptStore3F.asm @@ -66,11 +66,11 @@ GoldenrodDeptStore3F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, GoldenrodDeptStore3FDirectory - signpost 0, 3, $0, GoldenrodDeptStore3FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore3FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore3FElevatorButton ; people-events db 3 - person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, -1 - person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, -1 - person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, -1 + person_event SPRITE_CLERK, 5, 10, UP << 2 | $2, $0, -1, -1, $0, 0, ClerkScript_0x55db8, -1 + person_event SPRITE_SUPER_NERD, 9, 16, LEFT << 2 | $2, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x55dc0, -1 + person_event SPRITE_ROCKER, 9, 6, UP << 2 | $0, $10, -1, -1, $0, 0, RockerScript_0x55dc3, -1 diff --git a/maps/GoldenrodDeptStore4F.asm b/maps/GoldenrodDeptStore4F.asm index 3005a16c0..9bef6228f 100644 --- a/maps/GoldenrodDeptStore4F.asm +++ b/maps/GoldenrodDeptStore4F.asm @@ -86,12 +86,12 @@ GoldenrodDeptStore4F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, GoldenrodDeptStore4FDirectory - signpost 0, 3, $0, GoldenrodDeptStore4FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore4FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore4FElevatorButton ; people-events db 4 - person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55ee9, -1 - person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, -1 - person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, -1 - person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, -1 + person_event SPRITE_CLERK, 9, 17, UP << 2 | $3, $0, -1, -1, $0, 0, ClerkScript_0x55ee9, -1 + person_event SPRITE_COOLTRAINER_M, 11, 15, LEFT << 2 | $1, $0, -1, -1, $0, 0, CooltrainerMScript_0x55ef1, -1 + person_event SPRITE_BUG_CATCHER, 6, 11, UP << 2 | $1, $1, -1, -1, $0, 0, BugCatcherScript_0x55ef4, -1 + person_event SPRITE_GAMEBOY_KID, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x55ef7, -1 diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index fde98406a..f134c10d8 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -7,15 +7,15 @@ GoldenrodDeptStore5F_MapScriptHeader: ; callbacks - dbw 2, UnknownScript_0x56090 + dbw 2, .CheckIfSunday -UnknownScript_0x56090: +.CheckIfSunday: checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x56099 + if_equal SUNDAY, .yes disappear $7 return -UnknownScript_0x56099: +.yes: appear $7 return @@ -23,32 +23,32 @@ ClerkScript_0x5609c: faceplayer loadfont checkevent EVENT_GOT_TM02_HEADBUTT - iftrue UnknownScript_0x560ad + iftrue .headbutt checkevent EVENT_GOT_TM08_ROCK_SMASH - iftrue UnknownScript_0x560c2 - jump UnknownScript_0x560b6 + iftrue .onlyrocksmash + jump .neither -UnknownScript_0x560ad: +.headbutt: checkevent EVENT_GOT_TM08_ROCK_SMASH - iftrue UnknownScript_0x560c8 - jump UnknownScript_0x560bc + iftrue .both + jump .onlyheadbutt -UnknownScript_0x560b6: +.neither: pokemart $0, $0009 loadmovesprites end -UnknownScript_0x560bc: +.onlyheadbutt: pokemart $0, $000a loadmovesprites end -UnknownScript_0x560c2: +.onlyrocksmash: pokemart $0, $000b loadmovesprites end -UnknownScript_0x560c8: +.both: pokemart $0, $000c loadmovesprites end @@ -57,44 +57,44 @@ ReceptionistScript_0x560ce: faceplayer loadfont checkcode VAR_WEEKDAY - if_not_equal SUNDAY, UnknownScript_0x56112 + if_not_equal SUNDAY, .EventIsOver checkflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT - iftrue UnknownScript_0x56112 + iftrue .EventIsOver special GetFirstPokemonHappiness writetext UnknownText_0x56143 keeptextopen - if_greater_than $95, UnknownScript_0x560ee - if_greater_than $31, UnknownScript_0x560fd - jump UnknownScript_0x56103 + if_greater_than $95, .VeryHappy + if_greater_than $31, .SomewhatHappy + jump .NotVeryHappy -UnknownScript_0x560ee: +.VeryHappy: writetext UnknownText_0x5615a keeptextopen verbosegiveitem TM_RETURN, 1 - iffalse UnknownScript_0x56116 + iffalse .Done setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT loadmovesprites end -UnknownScript_0x560fd: +.SomewhatHappy: writetext UnknownText_0x561a6 closetext loadmovesprites end -UnknownScript_0x56103: +.NotVeryHappy: writetext UnknownText_0x561d8 keeptextopen verbosegiveitem TM_FRUSTRATION, 1 - iffalse UnknownScript_0x56116 + iffalse .Done setflag ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT loadmovesprites end -UnknownScript_0x56112: +.EventIsOver: writetext UnknownText_0x56202 closetext -UnknownScript_0x56116: +.Done: loadmovesprites end @@ -102,14 +102,14 @@ TwinScript_0x56118: faceplayer loadfont special SpecialGameboyCheck - if_not_equal $2, UnknownScript_0x5612a + 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 closetext loadmovesprites - special Function1050b9 + special Special_UnlockMysteryGift end -UnknownScript_0x5612a: +.NotGBC: writetext UnknownText_0x56279 closetext loadmovesprites @@ -227,14 +227,14 @@ GoldenrodDeptStore5F_MapEventHeader: ; signposts db 2 - signpost 0, 14, $0, GoldenrodDeptStore5FDirectory - signpost 0, 3, $0, GoldenrodDeptStore5FElevatorButton + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore5FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore5FElevatorButton ; people-events db 6 - person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $0, 0, ClerkScript_0x5609c, -1 - person_event SPRITE_LASS, 10, 7, $2, $11, 255, 255, $0, 0, LassScript_0x56130, -1 - person_event SPRITE_COOLTRAINER_M, 7, 10, $3, $0, 255, 255, $0, 0, CooltrainerMScript_0x56133, -1 - person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, -1 - person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, -1 - person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, EVENT_763 + person_event SPRITE_CLERK, 9, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ClerkScript_0x5609c, -1 + person_event SPRITE_LASS, 10, 7, DOWN << 2 | $2, $11, -1, -1, $0, 0, LassScript_0x56130, -1 + person_event SPRITE_COOLTRAINER_M, 7, 10, DOWN << 2 | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x56133, -1 + person_event SPRITE_POKEFAN_M, 9, 17, DOWN << 2 | $2, $22, -1, -1, $0, 0, PokefanMScript_0x5613a, -1 + person_event SPRITE_TWIN, 5, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56118, -1 + person_event SPRITE_RECEPTIONIST, 9, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x560ce, EVENT_763 diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm index d04bf62a5..209a9abbf 100644 --- a/maps/GoldenrodDeptStore6F.asm +++ b/maps/GoldenrodDeptStore6F.asm @@ -160,14 +160,14 @@ GoldenrodDeptStore6F_MapEventHeader: ; signposts db 6 - signpost 0, 14, $0, GoldenrodDeptStore6FDirectory - signpost 0, 3, $0, GoldenrodDeptStore6FElevatorButton - signpost 1, 8, $1, GoldenrodVendingMachine - signpost 1, 9, $1, GoldenrodVendingMachine - signpost 1, 10, $1, GoldenrodVendingMachine - signpost 1, 11, $1, GoldenrodVendingMachine + signpost 0, 14, SIGNPOST_READ, GoldenrodDeptStore6FDirectory + signpost 0, 3, SIGNPOST_READ, GoldenrodDeptStore6FElevatorButton + signpost 1, 8, SIGNPOST_UP, GoldenrodVendingMachine + signpost 1, 9, SIGNPOST_UP, GoldenrodVendingMachine + signpost 1, 10, SIGNPOST_UP, GoldenrodVendingMachine + signpost 1, 11, SIGNPOST_UP, GoldenrodVendingMachine ; people-events db 2 - person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, -1 - person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, -1 + person_event SPRITE_LASS, 6, 14, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x564bf, -1 + person_event SPRITE_SUPER_NERD, 6, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x564c2, -1 diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 1d8f9d6d7..7a5ce8806 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -121,11 +121,11 @@ GoldenrodDeptStoreB1F_MapEventHeader: ; people-events db 8 - person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c3, EVENT_675 - person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c5, EVENT_676 - person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c7, EVENT_677 - person_event SPRITE_POKE_BALL, 19, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c9, EVENT_678 - person_event SPRITE_BLACK_BELT, 14, 13, $4, $10, 255, 255, $a0, 0, BlackBeltScript_0x7d7b0, -1 - person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, -1 - person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, -1 - person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, -1 + person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c3, EVENT_675 + person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c5, EVENT_676 + person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c7, EVENT_677 + person_event SPRITE_POKE_BALL, 19, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c9, EVENT_678 + person_event SPRITE_BLACK_BELT, 14, 13, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x7d7b0, -1 + person_event SPRITE_BLACK_BELT, 12, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BlackBeltScript_0x7d7b3, -1 + person_event SPRITE_BLACK_BELT, 17, 10, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x7d7b6, -1 + person_event SPRITE_MACHOP, 11, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MachopScript_0x7d7b9, -1 diff --git a/maps/GoldenrodDeptStoreElevator.asm b/maps/GoldenrodDeptStoreElevator.asm index 040e82e37..bb4750472 100644 --- a/maps/GoldenrodDeptStoreElevator.asm +++ b/maps/GoldenrodDeptStoreElevator.asm @@ -70,7 +70,7 @@ GoldenrodDeptStoreElevator_MapEventHeader: ; signposts db 1 - signpost 0, 3, $0, MapGoldenrodDeptStoreElevatorSignpost0Script + signpost 0, 3, SIGNPOST_READ, MapGoldenrodDeptStoreElevatorSignpost0Script ; people-events db 0 diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index 6f015ae7c..c04ded152 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -218,18 +218,18 @@ GoldenrodDeptStoreRoof_MapEventHeader: ; signposts db 4 - signpost 3, 15, $3, MapGoldenrodDeptStoreRoofSignpost0Script - signpost 5, 15, $3, MapGoldenrodDeptStoreRoofSignpost1Script - signpost 6, 15, $3, MapGoldenrodDeptStoreRoofSignpost2Script - signpost 0, 3, $1, MapGoldenrodDeptStoreRoofSignpost3Script + signpost 3, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost0Script + signpost 5, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost1Script + signpost 6, 15, SIGNPOST_RIGHT, MapGoldenrodDeptStoreRoofSignpost2Script + signpost 0, 3, SIGNPOST_UP, MapGoldenrodDeptStoreRoofSignpost3Script ; people-events db 8 - person_event SPRITE_CLERK, 8, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x5673f, EVENT_6F0 - person_event SPRITE_POKEFAN_F, 7, 14, $5, $1, 255, 255, $80, 0, PokefanFScript_0x56746, -1 - person_event SPRITE_FISHER, 5, 6, $7, $0, 255, 255, $90, 0, FisherScript_0x56749, -1 - person_event SPRITE_TWIN, 8, 7, $2, $11, 255, 255, $a0, 0, TwinScript_0x56754, EVENT_6F1 - person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x56757, EVENT_6F1 - person_event SPRITE_POKEFAN_M, 4, 11, $5, $1, 255, 255, $0, 0, PokefanMScript_0x5676a, EVENT_6F0 - person_event SPRITE_TEACHER, 7, 9, $2, $11, 255, 255, $a0, 0, TeacherScript_0x5676d, EVENT_6F0 - person_event SPRITE_BUG_CATCHER, 10, 5, $7, $0, 255, 255, $80, 0, BugCatcherScript_0x56770, EVENT_6F0 + person_event SPRITE_CLERK, 8, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x5673f, EVENT_6F0 + person_event SPRITE_POKEFAN_F, 7, 14, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x56746, -1 + person_event SPRITE_FISHER, 5, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x56749, -1 + person_event SPRITE_TWIN, 8, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56754, EVENT_6F1 + person_event SPRITE_SUPER_NERD, 10, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x56757, EVENT_6F1 + person_event SPRITE_POKEFAN_M, 4, 11, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanMScript_0x5676a, EVENT_6F0 + person_event SPRITE_TEACHER, 7, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5676d, EVENT_6F0 + person_event SPRITE_BUG_CATCHER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x56770, EVENT_6F0 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 1d27d4200..335668ae0 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -172,5 +172,5 @@ GoldenrodFlowerShop_MapEventHeader: ; people-events db 2 - person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, -1 - person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, EVENT_768 + person_event SPRITE_TEACHER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, TeacherScript_0x5535d, -1 + person_event SPRITE_LASS, 10, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_768 diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 102fdd8b6..81a96e61a 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -445,49 +445,49 @@ GoldenrodGameCorner_MapEventHeader: ; signposts db 31 - signpost 6, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 7, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 8, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 9, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 10, 6, $0, MapGoldenrodGameCornerSignpost17Script - signpost 11, 6, $3, MapGoldenrodGameCornerSignpost17Script - signpost 6, 7, $0, MapGoldenrodGameCornerSignpost17Script - signpost 7, 7, $0, MapGoldenrodGameCornerSignpost7Script - signpost 8, 7, $0, MapGoldenrodGameCornerSignpost17Script - signpost 9, 7, $0, MapGoldenrodGameCornerSignpost17Script - signpost 10, 7, $0, MapGoldenrodGameCornerSignpost17Script - signpost 11, 7, $4, MapGoldenrodGameCornerSignpost17Script - signpost 6, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 7, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 8, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 9, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 10, 12, $0, MapGoldenrodGameCornerSignpost17Script - signpost 11, 12, $3, MapGoldenrodGameCornerSignpost17Script - signpost 6, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 7, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 8, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 9, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 10, 13, $0, MapGoldenrodGameCornerSignpost29Script - signpost 11, 13, $4, MapGoldenrodGameCornerSignpost29Script - signpost 6, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 7, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 8, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 9, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 10, 18, $0, MapGoldenrodGameCornerSignpost29Script - signpost 11, 18, $3, MapGoldenrodGameCornerSignpost29Script - signpost 1, 12, $4, MapGoldenrodGameCornerSignpost30Script + signpost 6, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 7, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 8, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 9, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 10, 6, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 11, 6, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost17Script + signpost 6, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 7, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost7Script + signpost 8, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 9, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 10, 7, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 11, 7, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost17Script + signpost 6, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 7, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 8, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 9, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 10, 12, SIGNPOST_READ, MapGoldenrodGameCornerSignpost17Script + signpost 11, 12, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost17Script + signpost 6, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 7, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 8, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 9, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 10, 13, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 11, 13, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost29Script + signpost 6, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 7, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 8, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 9, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 10, 18, SIGNPOST_READ, MapGoldenrodGameCornerSignpost29Script + signpost 11, 18, SIGNPOST_RIGHT, MapGoldenrodGameCornerSignpost29Script + signpost 1, 12, SIGNPOST_LEFT, MapGoldenrodGameCornerSignpost30Script ; people-events db 12 - person_event SPRITE_CLERK, 6, 7, $6, $0, 255, 255, $80, 0, ClerkScript_0x56c25, -1 - person_event SPRITE_RECEPTIONIST, 6, 20, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56c28, -1 - person_event SPRITE_RECEPTIONIST, 6, 22, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56d01, -1 - person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 2, $90, 0, PharmacistScript_0x56df1, -1 - person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 4, $90, 0, PharmacistScript_0x56df1, -1 - person_event SPRITE_POKEFAN_M, 14, 15, $9, $0, 255, 255, $b0, 0, PokefanMScript_0x56dfc, -1 - person_event SPRITE_COOLTRAINER_M, 12, 18, $8, $0, 255, 255, $90, 0, CooltrainerMScript_0x56e07, -1 - person_event SPRITE_POKEFAN_F, 10, 21, $9, $0, 255, 255, $80, 0, PokefanFScript_0x56e12, -1 - person_event SPRITE_COOLTRAINER_F, 7, 14, $2, $12, 255, 255, $a0, 0, CooltrainerFScript_0x56e1d, -1 - person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, -1 - person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, -1 - person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, EVENT_76B + person_event SPRITE_CLERK, 6, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ClerkScript_0x56c25, -1 + person_event SPRITE_RECEPTIONIST, 6, 20, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x56c28, -1 + person_event SPRITE_RECEPTIONIST, 6, 22, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x56d01, -1 + person_event SPRITE_PHARMACIST, 11, 12, LEFT << 2 | $0, $0, -1, 2, (PAL_OW_BLUE << 4) | $80, 0, PharmacistScript_0x56df1, -1 + person_event SPRITE_PHARMACIST, 11, 12, LEFT << 2 | $0, $0, -1, 4, (PAL_OW_BLUE << 4) | $80, 0, PharmacistScript_0x56df1, -1 + person_event SPRITE_POKEFAN_M, 14, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x56dfc, -1 + person_event SPRITE_COOLTRAINER_M, 12, 18, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerMScript_0x56e07, -1 + person_event SPRITE_POKEFAN_F, 10, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x56e12, -1 + person_event SPRITE_COOLTRAINER_F, 7, 14, DOWN << 2 | $2, $12, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x56e1d, -1 + person_event SPRITE_GENTLEMAN, 14, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x56e20, -1 + person_event SPRITE_POKEFAN_M, 13, 6, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x56e2b, -1 + person_event SPRITE_POKEFAN_M, 14, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x56c1a, EVENT_76B diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index 462e899c2..2b26752b5 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -452,14 +452,14 @@ GoldenrodGym_MapEventHeader: ; signposts db 2 - signpost 15, 1, $0, GoldenrodGymStatue - signpost 15, 4, $0, GoldenrodGymStatue + signpost 15, 1, SIGNPOST_READ, GoldenrodGymStatue + signpost 15, 4, SIGNPOST_READ, GoldenrodGymStatue ; people-events db 6 - person_event SPRITE_WHITNEY, 7, 12, $6, $0, 255, 255, $80, 0, WhitneyScript_0x5400c, -1 - person_event SPRITE_LASS, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, -1 - person_event SPRITE_LASS, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, -1 - person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, -1 - person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, -1 - person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, -1 + person_event SPRITE_WHITNEY, 7, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, WhitneyScript_0x5400c, -1 + person_event SPRITE_LASS, 17, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerLassCarrie, -1 + person_event SPRITE_LASS, 10, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassBridget, -1 + person_event SPRITE_BUENA, 6, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyVictoria, -1 + person_event SPRITE_BUENA, 9, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautySamantha, -1 + person_event SPRITE_GYM_GUY, 19, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GoldenrodGymGuyScript, -1 diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm index 492345d55..490d97a8d 100644 --- a/maps/GoldenrodHappinessRater.asm +++ b/maps/GoldenrodHappinessRater.asm @@ -145,12 +145,12 @@ GoldenrodHappinessRater_MapEventHeader: ; signposts db 3 - signpost 1, 0, $0, HappinessRatersHouseBookshelf - signpost 1, 1, $0, HappinessRatersHouseBookshelf - signpost 1, 7, $0, HappinessRatersHouseRadio + signpost 1, 0, SIGNPOST_READ, HappinessRatersHouseBookshelf + signpost 1, 1, SIGNPOST_READ, HappinessRatersHouseBookshelf + signpost 1, 7, SIGNPOST_READ, HappinessRatersHouseRadio ; people-events db 3 - person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, -1 - person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, -1 - person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, -1 + person_event SPRITE_TEACHER, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x54953, -1 + person_event SPRITE_POKEFAN_M, 7, 9, LEFT << 2 | $0, $0, -1, -1, $0, 0, PokefanMScript_0x54997, -1 + person_event SPRITE_TWIN, 10, 9, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x5499a, -1 diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index f65d258f8..8a020c2e7 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -182,5 +182,5 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, -1 - person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, EVENT_749 + person_event SPRITE_OFFICER, 13, 13, UP << 2 | $2, $0, -1, -1, $0, 0, OfficerScript_0x550ec, -1 + person_event SPRITE_GENTLEMAN, 18, 15, DOWN << 2 | $2, $22, -1, -1, $0, 0, GentlemanScript_0x55143, EVENT_749 diff --git a/maps/GoldenrodNameRatersHouse.asm b/maps/GoldenrodNameRatersHouse.asm index 4f7129328..aa71d1cd4 100644 --- a/maps/GoldenrodNameRatersHouse.asm +++ b/maps/GoldenrodNameRatersHouse.asm @@ -35,10 +35,10 @@ GoldenrodNameRatersHouse_MapEventHeader: ; signposts db 3 - signpost 1, 0, $0, GoldenrodNameRatersHouseBookshelf - signpost 1, 1, $0, GoldenrodNameRatersHouseBookshelf - signpost 1, 7, $0, GoldenrodNameRatersHouseRadio + signpost 1, 0, SIGNPOST_READ, GoldenrodNameRatersHouseBookshelf + signpost 1, 1, SIGNPOST_READ, GoldenrodNameRatersHouseBookshelf + signpost 1, 7, SIGNPOST_READ, GoldenrodNameRatersHouseRadio ; people-events db 1 - person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, -1 + person_event SPRITE_GENTLEMAN, 8, 6, UP << 2 | $2, $2, -1, -1, $0, 0, GentlemanScript_0x5577c, -1 diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 869b882df..65b8a147f 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -61,11 +61,11 @@ GoldenrodPPSpeechHouse_MapEventHeader: ; signposts db 3 - signpost 1, 0, $0, GoldenrodPPSpeechHouseBookshelf1 - signpost 1, 1, $0, GoldenrodPPSpeechHouseBookshelf2 - signpost 1, 7, $0, GoldenrodPPSpeechHouseRadio + signpost 1, 0, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf1 + signpost 1, 1, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf2 + signpost 1, 7, SIGNPOST_READ, GoldenrodPPSpeechHouseRadio ; people-events db 2 - person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, -1 - person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, -1 + person_event SPRITE_FISHER, 8, 6, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x5564a, -1 + person_event SPRITE_LASS, 7, 9, LEFT << 2 | $0, $10, -1, -1, $0, 0, LassScript_0x5564d, -1 diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index 04c944702..ea5eb8bc9 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -818,8 +818,8 @@ GoldenrodPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x60f91, -1 - person_event SPRITE_LINK_RECEPTIONIST, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, -1 - person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, -1 - person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, -1 - person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x60f91, -1 + person_event SPRITE_LINK_RECEPTIONIST, 12, 20, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, -1 + person_event SPRITE_GAMEBOY_KID, 5, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GameboyKidScript_0x6101e, -1 + person_event SPRITE_LASS, 8, 5, UP << 2 | $1, $1, -1, -1, $0, 0, LassScript_0x61021, -1 + person_event SPRITE_POKEFAN_F, 9, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanFScript_0x61024, -1 diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 2179dab30..f9054e98e 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -99,8 +99,8 @@ MenuDataHeader_0x6264c: MenuData2_0x62654: db $80 ; flags db 3 ; items - db "でんわ",$1f,"つかうとき@" ; Use phone - db "でんわ",$4a,"つながらないとき@" ; Don't use phone + db "でんわ", $1f,"つかうとき@" ; Use phone + db "でんわ", $4a,"つながらないとき@" ; Don't use phone db "やめる@" ; QUIT @@ -277,12 +277,12 @@ GoldenrodPokeComCenter2FMobile_MapEventHeader: ; signposts db 3 - signpost 26, 6, $1, MapGoldenrodPokeComCenter2FMobileSignpost0Script - signpost 28, 6, $1, MapGoldenrodPokeComCenter2FMobileSignpost1Script - signpost 26, 3, $1, MapGoldenrodPokeComCenter2FMobileSignpost2Script + signpost 26, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost0Script + signpost 28, 6, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost1Script + signpost 26, 3, SIGNPOST_UP, MapGoldenrodPokeComCenter2FMobileSignpost2Script ; people-events db 3 - person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, -1 - person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, -1 - person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, -1 + person_event SPRITE_SCIENTIST, 32, 8, UP << 2 | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, ScientistScript_0x625d1, -1 + person_event SPRITE_SCIENTIST, 31, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x625d4, -1 + person_event SPRITE_SCIENTIST, 33, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ScientistScript_0x625d7, -1 diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index e0bb35286..97e04e8a3 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -38,9 +38,9 @@ GuideGentsHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, GuideGentsHouseBookshelf - signpost 1, 1, $0, GuideGentsHouseBookshelf + signpost 1, 0, SIGNPOST_READ, GuideGentsHouseBookshelf + signpost 1, 1, SIGNPOST_READ, GuideGentsHouseBookshelf ; people-events db 1 - person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE + person_event SPRITE_GRAMPS, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index 9ed1bb265..c3ffce2f8 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -33,6 +33,6 @@ IcePath1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 11, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e472, EVENT_688 - person_event SPRITE_POKE_BALL, 27, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e474, EVENT_689 - person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e476, EVENT_7BE + person_event SPRITE_POKE_BALL, 11, 35, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_688 + person_event SPRITE_POKE_BALL, 27, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_689 + person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e476, EVENT_7BE diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 90f574d36..34d9bef47 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -104,12 +104,12 @@ IcePathB1F_MapEventHeader: ; signposts db 1 - signpost 30, 17, $7, MapIcePathB1FSignpostItem0 + signpost 30, 17, SIGNPOST_ITEMIFSET, MapIcePathB1FSignpostItem0 ; people-events db 5 - person_event SPRITE_BOULDER, 11, 15, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_709 - person_event SPRITE_BOULDER, 12, 11, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70A - person_event SPRITE_BOULDER, 13, 12, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70B - person_event SPRITE_BOULDER, 11, 21, $19, $0, 255, 255, $0, 0, IcePathB1FBoulder, EVENT_70C - person_event SPRITE_POKE_BALL, 39, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e50d, EVENT_68A + person_event SPRITE_BOULDER, 11, 15, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_709 + person_event SPRITE_BOULDER, 12, 11, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_70A + person_event SPRITE_BOULDER, 13, 12, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_70B + person_event SPRITE_BOULDER, 11, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_70C + person_event SPRITE_POKE_BALL, 39, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e50d, EVENT_68A diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index b7643ab56..623a50ad8 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -27,8 +27,8 @@ IcePathB2FBlackthornSide_MapEventHeader: ; signposts db 1 - signpost 10, 2, $7, MapIcePathB2FBlackthornSideSignpostItem0 + signpost 10, 2, SIGNPOST_ITEMIFSET, MapIcePathB2FBlackthornSideSignpostItem0 ; people-events db 1 - person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e646, EVENT_68D + person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e646, EVENT_68D diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 1f6c826d3..00dab155b 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -42,13 +42,13 @@ IcePathB2FMahoganySide_MapEventHeader: ; signposts db 1 - signpost 17, 0, $7, MapIcePathB2FMahoganySideSignpostItem0 + signpost 17, 0, SIGNPOST_ITEMIFSET, MapIcePathB2FMahoganySideSignpostItem0 ; people-events db 6 - person_event SPRITE_BOULDER, 7, 15, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1 - person_event SPRITE_BOULDER, 11, 8, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2 - person_event SPRITE_BOULDER, 16, 7, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3 - person_event SPRITE_BOULDER, 17, 16, $1, $0, 255, 255, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4 - person_event SPRITE_POKE_BALL, 13, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a6, EVENT_68B - person_event SPRITE_POKE_BALL, 6, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e5a8, EVENT_68C + person_event SPRITE_BOULDER, 7, 15, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1 + person_event SPRITE_BOULDER, 11, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2 + person_event SPRITE_BOULDER, 16, 7, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3 + person_event SPRITE_BOULDER, 17, 16, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4 + person_event SPRITE_POKE_BALL, 13, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a6, EVENT_68B + person_event SPRITE_POKE_BALL, 6, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a8, EVENT_68C diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index d1c1450af..a8fca6f09 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -28,5 +28,5 @@ IcePathB3F_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, EVENT_68E - person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, -1 + person_event SPRITE_POKE_BALL, 11, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e66f, EVENT_68E + person_event SPRITE_ROCK, 10, 10, LEFT << 2 | $10, $0, -1, -1, $0, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index 409291535..a0e40c51f 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -961,22 +961,22 @@ IlexForest_MapEventHeader: ; signposts db 5 - signpost 17, 3, $0, MapIlexForestSignpost0Script - signpost 7, 11, $7, MapIlexForestSignpostItem1 - signpost 14, 22, $7, MapIlexForestSignpostItem2 - signpost 17, 1, $7, MapIlexForestSignpostItem3 - signpost 22, 8, $1, MapIlexForestSignpost4Script + signpost 17, 3, SIGNPOST_READ, MapIlexForestSignpost0Script + signpost 7, 11, SIGNPOST_ITEMIFSET, MapIlexForestSignpostItem1 + signpost 14, 22, SIGNPOST_ITEMIFSET, MapIlexForestSignpostItem2 + signpost 17, 1, SIGNPOST_ITEMIFSET, MapIlexForestSignpostItem3 + signpost 22, 8, SIGNPOST_UP, MapIlexForestSignpost4Script ; people-events db 11 - person_event SPRITE_BIRD, 35, 18, $3, $0, 255, 255, $b0, 0, BirdScript_0x6eb8f, EVENT_6E9 - person_event SPRITE_YOUNGSTER, 32, 11, $6, $0, 255, 255, $a0, 0, YoungsterScript_0x6eb7b, EVENT_6F3 - person_event SPRITE_BLACK_BELT, 32, 9, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x6edae, EVENT_6F4 - person_event SPRITE_ROCKER, 18, 19, $9, $0, 255, 255, $0, 0, RockerScript_0x6edde, -1 - person_event SPRITE_POKE_BALL, 36, 24, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee10, EVENT_671 - person_event SPRITE_KURT, 33, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_7A5 - person_event SPRITE_LASS, 28, 7, $9, $0, 255, 255, $a0, 0, LassScript_0x6ee0d, EVENT_6ED - person_event SPRITE_YOUNGSTER, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, -1 - person_event SPRITE_POKE_BALL, 21, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee12, EVENT_7B9 - person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, EVENT_7BA - person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, EVENT_7BB + person_event SPRITE_BIRD, 35, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x6eb8f, EVENT_6E9 + person_event SPRITE_YOUNGSTER, 32, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6eb7b, EVENT_6F3 + person_event SPRITE_BLACK_BELT, 32, 9, LEFT << 2 | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x6edae, EVENT_6F4 + person_event SPRITE_ROCKER, 18, 19, LEFT << 2 | $1, $0, -1, -1, $0, 0, RockerScript_0x6edde, -1 + person_event SPRITE_POKE_BALL, 36, 24, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee10, EVENT_671 + person_event SPRITE_KURT, 33, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_7A5 + person_event SPRITE_LASS, 28, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x6ee0d, EVENT_6ED + person_event SPRITE_YOUNGSTER, 5, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerBug_catcherWayne, -1 + person_event SPRITE_POKE_BALL, 21, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee12, EVENT_7B9 + person_event SPRITE_POKE_BALL, 11, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee14, EVENT_7BA + person_event SPRITE_POKE_BALL, 5, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee16, EVENT_7BB diff --git a/maps/IlexForestAzaleaGate.asm b/maps/IlexForestAzaleaGate.asm index 1554f4e57..a55989b26 100644 --- a/maps/IlexForestAzaleaGate.asm +++ b/maps/IlexForestAzaleaGate.asm @@ -45,5 +45,5 @@ IlexForestAzaleaGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, -1 - person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x62c7a, -1 + person_event SPRITE_GRANNY, 7, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x62c7d, -1 diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index f1ff2f719..be28f2155 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -22,16 +22,16 @@ UnknownScript_0x18000a: domaptrigger GROUP_KARENS_ROOM, MAP_KARENS_ROOM, $0 domaptrigger GROUP_LANCES_ROOM, MAP_LANCES_ROOM, $0 domaptrigger GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $0 - clearevent EVENT_309 - clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - clearevent EVENT_KOGAS_ROOM_EXIT_OPEN + clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED + clearevent EVENT_KOGAS_ROOM_EXIT_OPEN + clearevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED clearevent EVENT_BRUNOS_ROOM_EXIT_OPEN clearevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED clearevent EVENT_KARENS_ROOM_EXIT_OPEN clearevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - clearevent EVENT_312 + clearevent EVENT_LANCES_ROOM_EXIT_OPEN clearevent EVENT_BEAT_ELITE_4_WILL clearevent EVENT_BEAT_ELITE_4_KOGA clearevent EVENT_BEAT_ELITE_4_BRUNO @@ -319,9 +319,9 @@ IndigoPlateauPokeCenter1F_MapEventHeader: ; people-events db 6 - person_event SPRITE_NURSE, 11, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18012c, -1 - person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, -1 - person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, -1 - person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_77B - person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, TeleportGuyScript, EVENT_TELEPORT_GUY - person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, AbraScript, EVENT_TELEPORT_GUY + person_event SPRITE_NURSE, 11, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x18012c, -1 + person_event SPRITE_CLERK, 11, 15, UP << 2 | $2, $0, -1, -1, $0, 0, ClerkScript_0x18012f, -1 + person_event SPRITE_COOLTRAINER_M, 15, 15, DOWN << 2 | $2, $22, -1, -1, $0, 0, CooltrainerMScript_0x180136, -1 + person_event SPRITE_SILVER, 13, 20, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_77B + person_event SPRITE_GRAMPS, 13, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeleportGuyScript, EVENT_TELEPORT_GUY + person_event SPRITE_JYNX, 13, 4, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index e26e802dc..aa7d1ded0 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -153,4 +153,4 @@ KarensRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, -1 + person_event SPRITE_KAREN, 11, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KarenScript_0x180bee, -1 diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 38f29c379..217e7c57b 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -21,7 +21,7 @@ UnknownScript_0x18072c: end UnknownScript_0x18072d: - checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED + checkevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x180737 changeblock $4, $e, $2a UnknownScript_0x180737: @@ -40,7 +40,7 @@ UnknownScript_0x180742: reloadmappart loadmovesprites dotrigger $1 - setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED + setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED waitbutton end @@ -150,4 +150,4 @@ KogasRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, -1 + person_event SPRITE_KOGA, 11, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, KogaScript_0x18075a, -1 diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 31ee9737b..680ccfef5 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -16,13 +16,13 @@ UnknownScript_0x7a4d7: end UnknownScript_0x7a4d8: - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB UnknownScript_0x7a4db: playmusic MUSIC_MOM showemote EMOTE_SHOCK, $2, 15 spriteface $0, LEFT - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x7a4f2 applymovement $2, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 @@ -77,9 +77,9 @@ UnknownScript_0x7a549: writetext UnknownText_0x7a850 closetext loadmovesprites - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x7a55d - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iffalse UnknownScript_0x7a564 jump UnknownScript_0x7a56b @@ -109,7 +109,7 @@ UnknownScript_0x7a57e: MomScript_0x7a582: faceplayer - setevent EVENT_001 + setevent EVENT_CHRIS2_IN_CABLE_CLUB checktriggers iffalse UnknownScript_0x7a572 loadfont @@ -397,15 +397,15 @@ KrissHouse1F_MapEventHeader: ; signposts db 4 - signpost 1, 0, $0, StoveScript - signpost 1, 1, $0, SinkScript - signpost 1, 2, $0, FridgeScript - signpost 1, 4, $0, TVScript + signpost 1, 0, SIGNPOST_READ, StoveScript + signpost 1, 1, SIGNPOST_READ, SinkScript + signpost 1, 2, SIGNPOST_READ, FridgeScript + signpost 1, 4, SIGNPOST_READ, TVScript ; people-events db 5 - person_event SPRITE_MOM, 8, 11, $8, $0, 255, 255, $0, 0, MomScript_0x7a582, EVENT_6C7 - person_event SPRITE_MOM, 6, 6, $7, $0, 255, 1, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_MOM, 8, 11, $8, $0, 255, 2, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_MOM, 6, 4, $7, $0, 255, 4, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_POKEFAN_F, 8, 8, $9, $0, 255, 255, $80, 0, NeighborScript, EVENT_792 + person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, MomScript_0x7a582, EVENT_6C7 + person_event SPRITE_MOM, 6, 6, UP << 2 | $3, $0, -1, 1, $0, 0, MomScript_0x7a582, EVENT_6C8 + person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, 2, $0, 0, MomScript_0x7a582, EVENT_6C8 + person_event SPRITE_MOM, 6, 4, UP << 2 | $3, $0, -1, 4, $0, 0, MomScript_0x7a582, EVENT_6C8 + person_event SPRITE_POKEFAN_F, 8, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, NeighborScript, EVENT_792 diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index ff0ea80c3..17a55ba6d 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -125,14 +125,14 @@ KrissHouse2F_MapEventHeader: ; signposts db 4 - signpost 1, 2, $1, KrissHousePC - signpost 1, 3, $0, KrissHouseRadio - signpost 1, 5, $0, KrissHouseBookshelf - signpost 0, 6, $5, KrissHousePoster + signpost 1, 2, SIGNPOST_UP, KrissHousePC + signpost 1, 3, SIGNPOST_READ, KrissHouseRadio + signpost 1, 5, SIGNPOST_READ, KrissHouseBookshelf + signpost 0, 6, SIGNPOST_IFSET, KrissHousePoster ; people-events db 4 - person_event SPRITE_CONSOLE, 6, 8, $1, $0, 255, 255, $0, 0, GameConsole, EVENT_741 - person_event SPRITE_DOLL_1, 8, 8, $1, $0, 255, 255, $0, 0, Doll1, EVENT_742 - person_event SPRITE_DOLL_2, 8, 9, $1, $0, 255, 255, $0, 0, Doll2, EVENT_743 - person_event SPRITE_BIG_DOLL, 5, 4, $21, $0, 255, 255, $0, 0, BigDoll, EVENT_744 + person_event SPRITE_CONSOLE, 6, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, GameConsole, EVENT_741 + person_event SPRITE_DOLL_1, 8, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll1, EVENT_742 + person_event SPRITE_DOLL_2, 8, 9, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll2, EVENT_743 + person_event SPRITE_BIG_DOLL, 5, 4, DOWN << 2 | $21, $0, -1, -1, $0, 0, BigDoll, EVENT_744 diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index 081652ed2..cda93dd3d 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -108,11 +108,11 @@ KrissNeighborsHouse_MapEventHeader: ; signposts db 3 - signpost 1, 0, $0, KrissNeighborsHouseBookshelf - signpost 1, 1, $0, KrissNeighborsHouseBookshelf - signpost 1, 7, $0, KrissNeighborsHouseRadio + signpost 1, 0, SIGNPOST_READ, KrissNeighborsHouseBookshelf + signpost 1, 1, SIGNPOST_READ, KrissNeighborsHouseBookshelf + signpost 1, 7, SIGNPOST_READ, KrissNeighborsHouseRadio ; people-events db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, -1 - person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, KrissNeighbor, EVENT_793 + person_event SPRITE_COOLTRAINER_F, 7, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighborsDaughter, -1 + person_event SPRITE_POKEFAN_F, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighbor, EVENT_793 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 3f5ca6fba..df36a7877 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -70,7 +70,7 @@ UnknownScript_0x18e1bf: iffalse UnknownScript_0x18e2b2 setevent EVENT_035 UnknownScript_0x18e1cc: - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x18e29f checkevent EVENT_258 iftrue UnknownScript_0x18e2b4 @@ -89,7 +89,7 @@ UnknownScript_0x18e1cc: checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT iftrue UnknownScript_0x18e34e UnknownScript_0x18e202: - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x18e212 checkevent EVENT_002 iftrue UnknownScript_0x18e212 @@ -110,7 +110,7 @@ UnknownScript_0x18e212: iftrue UnknownScript_0x18e249 checkitem PNK_APRICORN iftrue UnknownScript_0x18e249 - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x18e2ae checkevent EVENT_002 iftrue UnknownScript_0x18e243 @@ -163,7 +163,7 @@ UnknownScript_0x18e293: jump UnknownScript_0x18e299 UnknownScript_0x18e299: - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB setflag ENGINE_KURT_MAKING_BALLS UnknownScript_0x18e29f: writetext UnknownText_0x18e779 @@ -178,7 +178,7 @@ UnknownScript_0x18e2a5: end UnknownScript_0x18e2ab: - setevent EVENT_001 + setevent EVENT_CHRIS2_IN_CABLE_CLUB UnknownScript_0x18e2ae: writetext UnknownText_0x18e82a closetext @@ -349,9 +349,9 @@ UnknownScript_0x18e3e0: KurtsGranddaughter1: faceplayer - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue KurtsGranddaughter2Subscript - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue KurtsGranddaughterFunScript checkevent EVENT_FOREST_IS_RESTLESS iftrue .Lonely @@ -692,18 +692,18 @@ KurtsHouse_MapEventHeader: ; signposts db 7 - signpost 1, 6, $0, KurtsHouseRadio - signpost 0, 8, $0, KurtsHouseOakPhoto - signpost 0, 9, $0, KurtsHouseOakPhoto - signpost 1, 5, $0, KurtsHouseBookshelf - signpost 1, 2, $0, KurtsHouseBookshelf - signpost 1, 3, $0, KurtsHouseBookshelf - signpost 1, 4, $0, KurtsHouseCelebiStatue + signpost 1, 6, SIGNPOST_READ, KurtsHouseRadio + signpost 0, 8, SIGNPOST_READ, KurtsHouseOakPhoto + signpost 0, 9, SIGNPOST_READ, KurtsHouseOakPhoto + signpost 1, 5, SIGNPOST_READ, KurtsHouseBookshelf + signpost 1, 2, SIGNPOST_READ, KurtsHouseBookshelf + signpost 1, 3, SIGNPOST_READ, KurtsHouseBookshelf + signpost 1, 4, SIGNPOST_READ, KurtsHouseCelebiStatue ; people-events db 5 - person_event SPRITE_KURT, 6, 7, $6, $0, 255, 255, $0, 0, KurtScript_0x18e178, EVENT_73E - person_event SPRITE_TWIN, 7, 9, $3, $0, 255, 255, $0, 0, KurtsGranddaughter1, EVENT_78C - person_event SPRITE_SLOWPOKE, 7, 10, $1, $0, 255, 255, $0, 0, KurtsHouseSlowpoke, EVENT_6FD - person_event SPRITE_KURT, 7, 18, $7, $0, 255, 255, $0, 0, KurtScript_0x18e3bd, EVENT_73F - person_event SPRITE_TWIN, 8, 15, $9, $0, 255, 255, $0, 0, KurtsGranddaughter2, EVENT_78D + person_event SPRITE_KURT, 6, 7, UP << 2 | $2, $0, -1, -1, $0, 0, KurtScript_0x18e178, EVENT_73E + person_event SPRITE_TWIN, 7, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, KurtsGranddaughter1, EVENT_78C + person_event SPRITE_SLOWPOKE, 7, 10, DOWN << 2 | $1, $0, -1, -1, $0, 0, KurtsHouseSlowpoke, EVENT_6FD + person_event SPRITE_KURT, 7, 18, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x18e3bd, EVENT_73F + person_event SPRITE_TWIN, 8, 15, LEFT << 2 | $1, $0, -1, -1, $0, 0, KurtsGranddaughter2, EVENT_78D diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index 0e8c4c184..b4514695d 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -568,23 +568,23 @@ LakeofRage_MapEventHeader: ; signposts db 5 - signpost 27, 21, $0, MapLakeofRageSignpost0Script - signpost 31, 25, $0, MapLakeofRageSignpost1Script - signpost 28, 11, $7, MapLakeofRageSignpostItem2 - signpost 4, 4, $7, MapLakeofRageSignpostItem3 - signpost 5, 35, $7, MapLakeofRageSignpostItem4 + signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script + signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script + signpost 28, 11, SIGNPOST_ITEMIFSET, MapLakeofRageSignpostItem2 + signpost 4, 4, SIGNPOST_ITEMIFSET, MapLakeofRageSignpostItem3 + signpost 5, 35, SIGNPOST_ITEMIFSET, MapLakeofRageSignpostItem4 ; people-events db 12 - person_event SPRITE_LANCE, 32, 25, $7, $0, 255, 255, $0, 0, LanceScript_0x70022, EVENT_6D4 - person_event SPRITE_GRAMPS, 30, 24, $7, $0, 255, 255, $0, 0, GrampsScript_0x7008e, -1 - person_event SPRITE_SUPER_NERD, 17, 40, $8, $0, 255, 255, $0, 0, SuperNerdScript_0x700a2, -1 - person_event SPRITE_COOLTRAINER_F, 33, 29, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x700a5, -1 - person_event SPRITE_FISHER, 27, 34, $8, $0, 255, 255, $92, 1, TrainerFisherAndre, EVENT_735 - person_event SPRITE_FISHER, 30, 28, $7, $0, 255, 255, $92, 1, TrainerFisherRaymond, EVENT_735 - person_event SPRITE_COOLTRAINER_M, 19, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermAaron, EVENT_735 - person_event SPRITE_COOLTRAINER_F, 11, 40, $8, $0, 255, 255, $82, 0, TrainerCooltrainerfLois, EVENT_735 - person_event SPRITE_GYARADOS, 26, 22, $16, $0, 255, 255, $80, 0, GyaradosScript_0x70063, EVENT_751 - person_event SPRITE_SUPER_NERD, 8, 8, $6, $0, 255, 255, $0, 0, WesleyScript, EVENT_75C - person_event SPRITE_POKE_BALL, 14, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x70148, EVENT_645 - person_event SPRITE_POKE_BALL, 6, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7014a, EVENT_646 + person_event SPRITE_LANCE, 32, 25, UP << 2 | $3, $0, -1, -1, $0, 0, LanceScript_0x70022, EVENT_6D4 + person_event SPRITE_GRAMPS, 30, 24, UP << 2 | $3, $0, -1, -1, $0, 0, GrampsScript_0x7008e, -1 + person_event SPRITE_SUPER_NERD, 17, 40, LEFT << 2 | $0, $0, -1, -1, $0, 0, SuperNerdScript_0x700a2, -1 + person_event SPRITE_COOLTRAINER_F, 33, 29, UP << 2 | $1, $1, -1, -1, $0, 0, CooltrainerFScript_0x700a5, -1 + person_event SPRITE_FISHER, 27, 34, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherAndre, EVENT_735 + person_event SPRITE_FISHER, 30, 28, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherRaymond, EVENT_735 + person_event SPRITE_COOLTRAINER_M, 19, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermAaron, EVENT_735 + person_event SPRITE_COOLTRAINER_F, 11, 40, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerCooltrainerfLois, EVENT_735 + person_event SPRITE_GYARADOS, 26, 22, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GyaradosScript_0x70063, EVENT_751 + person_event SPRITE_SUPER_NERD, 8, 8, UP << 2 | $2, $0, -1, -1, $0, 0, WesleyScript, EVENT_75C + person_event SPRITE_POKE_BALL, 14, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x70148, EVENT_645 + person_event SPRITE_POKE_BALL, 6, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7014a, EVENT_646 diff --git a/maps/LakeofRageHiddenPowerHouse.asm b/maps/LakeofRageHiddenPowerHouse.asm index a36d8d424..ebcfe345a 100644 --- a/maps/LakeofRageHiddenPowerHouse.asm +++ b/maps/LakeofRageHiddenPowerHouse.asm @@ -78,9 +78,9 @@ LakeofRageHiddenPowerHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, HiddenPowerHouseBookshelf - signpost 1, 1, $0, HiddenPowerHouseBookshelf + signpost 1, 0, SIGNPOST_READ, HiddenPowerHouseBookshelf + signpost 1, 1, SIGNPOST_READ, HiddenPowerHouseBookshelf ; people-events db 1 - person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, -1 + person_event SPRITE_FISHER, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, HiddenPowerGuy, -1 diff --git a/maps/LakeofRageMagikarpHouse.asm b/maps/LakeofRageMagikarpHouse.asm index f3195d981..3888dcce8 100644 --- a/maps/LakeofRageMagikarpHouse.asm +++ b/maps/LakeofRageMagikarpHouse.asm @@ -41,7 +41,7 @@ UnknownScript_0x19a6e0: iffalse UnknownScript_0x19a6d7 writetext UnknownText_0x19a93e closetext - special Functionfbb32 + special Special_CheckMagikarpLength if_equal $0, UnknownScript_0x19a71c if_equal $1, UnknownScript_0x19a722 if_equal $2, UnknownScript_0x19a716 @@ -216,9 +216,9 @@ LakeofRageMagikarpHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, MagikarpHouseBookshelf - signpost 1, 1, $0, MagikarpHouseBookshelf + signpost 1, 0, SIGNPOST_READ, MagikarpHouseBookshelf + signpost 1, 1, SIGNPOST_READ, MagikarpHouseBookshelf ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, -1 + person_event SPRITE_FISHING_GURU, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, FishingGuruScript_0x19a6ae, -1 diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index ce2043ea0..29cb5bc70 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -25,7 +25,7 @@ UnknownScript_0x180e3e: iffalse UnknownScript_0x180e48 changeblock $4, $16, $34 UnknownScript_0x180e48: - checkevent EVENT_312 + checkevent EVENT_LANCES_ROOM_EXIT_OPEN iffalse UnknownScript_0x180e52 changeblock $4, $0, $b UnknownScript_0x180e52: @@ -358,6 +358,6 @@ LancesRoom_MapEventHeader: ; people-events db 3 - person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, -1 - person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_75F - person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_75F + person_event SPRITE_LANCE, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, LanceScript_0x180e7b, -1 + person_event SPRITE_TEACHER, 11, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_75F + person_event SPRITE_OAK, 11, 8, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_75F diff --git a/maps/LavRadioTower1F.asm b/maps/LavRadioTower1F.asm index 9a6a77116..aaff578d6 100644 --- a/maps/LavRadioTower1F.asm +++ b/maps/LavRadioTower1F.asm @@ -228,13 +228,13 @@ LavRadioTower1F_MapEventHeader: ; signposts db 2 - signpost 0, 11, $0, MapLavRadioTower1FSignpost0Script - signpost 0, 5, $0, MapLavRadioTower1FSignpost1Script + signpost 0, 11, SIGNPOST_READ, MapLavRadioTower1FSignpost0Script + signpost 0, 5, SIGNPOST_READ, MapLavRadioTower1FSignpost1Script ; people-events db 5 - person_event SPRITE_RECEPTIONIST, 10, 10, $7, $0, 255, 255, $a0, 0, ReceptionistScript_0x7ee63, -1 - person_event SPRITE_OFFICER, 5, 19, $6, $0, 255, 255, $a0, 0, OfficerScript_0x7ee66, -1 - person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, -1 - person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, -1 - person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, -1 + person_event SPRITE_RECEPTIONIST, 10, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x7ee63, -1 + person_event SPRITE_OFFICER, 5, 19, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x7ee66, -1 + person_event SPRITE_SUPER_NERD, 7, 5, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x7ee69, -1 + person_event SPRITE_GENTLEMAN, 5, 13, UP << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x7ee6c, -1 + person_event SPRITE_SUPER_NERD, 10, 18, LEFT << 2 | $1, $0, -1, -1, $0, 0, SuperNerdScript_0x7eea2, -1 diff --git a/maps/LavenderMart.asm b/maps/LavenderMart.asm index 9d2c2f36b..45537ac38 100644 --- a/maps/LavenderMart.asm +++ b/maps/LavenderMart.asm @@ -59,6 +59,6 @@ LavenderMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, -1 - person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, -1 - person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x7eb1c, -1 + person_event SPRITE_POKEFAN_M, 10, 10, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x7eb23, -1 + person_event SPRITE_ROCKER, 6, 13, DOWN << 2 | $3, $0, -1, -1, $0, 0, RockerScript_0x7eb26, -1 diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 0c1871af2..83b21d747 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -40,4 +40,4 @@ LavenderNameRater_MapEventHeader: ; people-events db 1 - person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, -1 + person_event SPRITE_GENTLEMAN, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LavenderNameRater, -1 diff --git a/maps/LavenderPokeCenter1F.asm b/maps/LavenderPokeCenter1F.asm index b225df217..0c32b2af7 100644 --- a/maps/LavenderPokeCenter1F.asm +++ b/maps/LavenderPokeCenter1F.asm @@ -92,7 +92,7 @@ LavenderPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x7e6a0, -1 - person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, -1 - person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, -1 - person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x7e6a0, -1 + person_event SPRITE_GENTLEMAN, 10, 11, UP << 2 | $1, $1, -1, -1, $0, 0, GentlemanScript_0x7e6a3, -1 + person_event SPRITE_TEACHER, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x7e6a6, -1 + person_event SPRITE_YOUNGSTER, 9, 5, UP << 2 | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x7e6a9, -1 diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 77f452e9a..9df49acc1 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -120,16 +120,16 @@ LavenderTown_MapEventHeader: ; signposts db 6 - signpost 3, 11, $0, LavenderTownSign - signpost 7, 15, $0, KantoRadioStationSign - signpost 9, 3, $0, VolunteerPokemonHouseSign - signpost 13, 15, $0, SoulHouseSign - signpost 5, 6, $0, LavenderPokeCenterSignText - signpost 5, 2, $0, LavenderMartSignText + signpost 3, 11, SIGNPOST_READ, LavenderTownSign + signpost 7, 15, SIGNPOST_READ, KantoRadioStationSign + signpost 9, 3, SIGNPOST_READ, VolunteerPokemonHouseSign + signpost 13, 15, SIGNPOST_READ, SoulHouseSign + signpost 5, 6, SIGNPOST_READ, LavenderPokeCenterSignText + signpost 5, 2, SIGNPOST_READ, LavenderMartSignText ; people-events db 4 - person_event SPRITE_POKEFAN_M, 11, 16, $5, $1, 255, 255, $80, 0, PokefanMScript_0x1ad6e4, -1 - person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, -1 - person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, -1 - person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, -1 + person_event SPRITE_POKEFAN_M, 11, 16, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1ad6e4, -1 + person_event SPRITE_TEACHER, 19, 6, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1ad6e7, -1 + person_event SPRITE_GRAMPS, 16, 18, UP << 2 | $3, $0, -1, -1, $0, 0, GrampsScript_0x1ad6ea, -1 + person_event SPRITE_YOUNGSTER, 15, 10, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 1, YoungsterScript_0x1ad6ed, -1 diff --git a/maps/LavenderTownSpeechHouse.asm b/maps/LavenderTownSpeechHouse.asm index 4ad666c16..3d1ac4f88 100644 --- a/maps/LavenderTownSpeechHouse.asm +++ b/maps/LavenderTownSpeechHouse.asm @@ -39,9 +39,9 @@ LavenderTownSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, LavenderTownSpeechHouseBookshelf - signpost 1, 1, $0, LavenderTownSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, LavenderTownSpeechHouseBookshelf ; people-events db 1 - person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, -1 + person_event SPRITE_POKEFAN_F, 7, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x7ea47, -1 diff --git a/maps/MahoganyGym.asm b/maps/MahoganyGym.asm index 2ea65951a..4fd966938 100644 --- a/maps/MahoganyGym.asm +++ b/maps/MahoganyGym.asm @@ -457,15 +457,15 @@ MahoganyGym_MapEventHeader: ; signposts db 2 - signpost 15, 3, $0, MahoganyGymStatue - signpost 15, 6, $0, MahoganyGymStatue + signpost 15, 3, SIGNPOST_READ, MahoganyGymStatue + signpost 15, 6, SIGNPOST_READ, MahoganyGymStatue ; people-events db 7 - person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, -1 - person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, -1 - person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, -1 - person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, -1 - person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, -1 - person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, -1 + person_event SPRITE_PRYCE, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PryceScript_0x199a9e, -1 + person_event SPRITE_BUENA, 10, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerSkierRoxanne, -1 + person_event SPRITE_ROCKER, 21, 4, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBoarderRonald, -1 + person_event SPRITE_BUENA, 21, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerSkierClarissa, -1 + person_event SPRITE_ROCKER, 13, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBoarderBrad, -1 + person_event SPRITE_ROCKER, 8, 6, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBoarderDouglas, -1 + person_event SPRITE_GYM_GUY, 19, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MahoganyGymGuyScript, -1 diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 9a186ad19..ae938c099 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -236,8 +236,8 @@ MahoganyMart1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_PHARMACIST, 7, 8, $6, $0, 255, 255, $0, 0, PharmacistScript_0x6c367, EVENT_6DA - person_event SPRITE_BLACK_BELT, 10, 5, $3, $0, 255, 255, $0, 0, BlackBeltScript_0x6c37b, EVENT_6DA - person_event SPRITE_LANCE, 10, 8, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D5 - person_event SPRITE_DRAGON, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D5 - person_event SPRITE_GRANNY, 7, 5, $9, $0, 255, 255, $0, 0, GrannyScript_0x6c3ee, EVENT_736 + person_event SPRITE_PHARMACIST, 7, 8, UP << 2 | $2, $0, -1, -1, $0, 0, PharmacistScript_0x6c367, EVENT_6DA + person_event SPRITE_BLACK_BELT, 10, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, BlackBeltScript_0x6c37b, EVENT_6DA + person_event SPRITE_LANCE, 10, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D5 + person_event SPRITE_DRAGON, 10, 7, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D5 + person_event SPRITE_GRANNY, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrannyScript_0x6c3ee, EVENT_736 diff --git a/maps/MahoganyPokeCenter1F.asm b/maps/MahoganyPokeCenter1F.asm index 750287e4f..4a0694dc4 100644 --- a/maps/MahoganyPokeCenter1F.asm +++ b/maps/MahoganyPokeCenter1F.asm @@ -65,7 +65,7 @@ MahoganyPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19a356, -1 - person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, -1 - person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, -1 - person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x19a356, -1 + person_event SPRITE_POKEFAN_M, 6, 11, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x19a359, -1 + person_event SPRITE_YOUNGSTER, 7, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x19a35c, -1 + person_event SPRITE_COOLTRAINER_F, 7, 6, LEFT << 2 | $0, $0, -1, -1, $0, 0, CooltrainerFScript_0x19a35f, -1 diff --git a/maps/MahoganyRedGyaradosSpeechHouse.asm b/maps/MahoganyRedGyaradosSpeechHouse.asm index dfc0fc30e..1659e0bb0 100644 --- a/maps/MahoganyRedGyaradosSpeechHouse.asm +++ b/maps/MahoganyRedGyaradosSpeechHouse.asm @@ -73,5 +73,5 @@ MahoganyRedGyaradosSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, -1 - person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, -1 + person_event SPRITE_BLACK_BELT, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x19997f, -1 + person_event SPRITE_TEACHER, 9, 10, UP << 2 | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x199982, -1 diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 9f271af91..afa02f1c9 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -261,14 +261,14 @@ MahoganyTown_MapEventHeader: ; signposts db 4 - signpost 5, 1, $0, MahoganyTownSign - signpost 7, 9, $0, MahoganyTownRagecandybarSign - signpost 13, 3, $0, MahoganyGymSign - signpost 13, 16, $0, MahoganyTownPokeCenterSign + signpost 5, 1, SIGNPOST_READ, MahoganyTownSign + signpost 7, 9, SIGNPOST_READ, MahoganyTownRagecandybarSign + signpost 13, 3, SIGNPOST_READ, MahoganyGymSign + signpost 13, 16, SIGNPOST_READ, MahoganyTownPokeCenterSign ; people-events db 4 - person_event SPRITE_POKEFAN_M, 12, 23, $6, $0, 255, 255, $0, 0, PokefanMScript_0x19002e, EVENT_756 - person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, -1 - person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, EVENT_757 - person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, EVENT_736 + person_event SPRITE_POKEFAN_M, 12, 23, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x19002e, EVENT_756 + person_event SPRITE_GRAMPS, 13, 10, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x19007e, -1 + person_event SPRITE_FISHER, 18, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x190092, EVENT_757 + person_event SPRITE_LASS, 12, 16, UP << 2 | $2, $0, -1, -1, $0, 0, LassScript_0x190095, EVENT_736 diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index c2b33f088..b9e123fc4 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -212,4 +212,4 @@ ManiasHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, -1 + person_event SPRITE_ROCKER, 8, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, RockerScript_0x9d278, -1 diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index bace21c16..451b4f15f 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -3,20 +3,20 @@ MobileBattleRoom_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1935ce, $0000 - dw UnknownScript_0x1935d2, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 0 -UnknownScript_0x1935ce: - priorityjump UnknownScript_0x1935d3 +.Trigger1: + priorityjump MobileBattleRoom_Initialize end -UnknownScript_0x1935d2: +.Trigger2: end -UnknownScript_0x1935d3: +MobileBattleRoom_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $5 end @@ -24,15 +24,15 @@ UnknownScript_0x1935d3: MapMobileBattleRoomSignpost0Script: refreshscreen $0 special Function1037c2 - if_equal $1, UnknownScript_0x193619 + if_equal $1, .one special Function1037eb - iffalse UnknownScript_0x193624 - if_equal $1, UnknownScript_0x1935f4 - if_equal $2, UnknownScript_0x19360d - jump UnknownScript_0x193624 + iffalse .false + if_equal $1, .one_ + if_equal $2, .two_ + jump .false -UnknownScript_0x1935f4: - writetext UnknownText_0x193644 +.one_: + writetext MobileBattleRoom_HealText pause 20 loadmovesprites special Function8c084 @@ -42,27 +42,27 @@ UnknownScript_0x1935f4: special Function8c079 special RestartMapMusic refreshscreen $0 -UnknownScript_0x19360d: +.two_: special Mobile_HealParty special HealParty special Function10383c - iftrue UnknownScript_0x193624 -UnknownScript_0x193619: + iftrue .false +.one: special Function10387b - writetext UnknownText_0x193626 + writetext MobileBattleRoom_EstablishingCommsText closetext reloadmappart special Function101225 -UnknownScript_0x193624: +.false: loadmovesprites end -UnknownText_0x193626: +MobileBattleRoom_EstablishingCommsText: text "Establishing" line "communications…" done -UnknownText_0x193644: +MobileBattleRoom_HealText: text "Your #MON will" line "be fully healed" cont "before battle." @@ -82,7 +82,7 @@ MobileBattleRoom_MapEventHeader: ; signposts db 1 - signpost 2, 4, $1, MapMobileBattleRoomSignpost0Script + signpost 2, 4, SIGNPOST_UP, MapMobileBattleRoomSignpost0Script ; people-events db 0 diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 18da1ad0f..f5e87057c 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -3,20 +3,20 @@ MobileTradeRoomMobile_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x193576, $0000 - dw UnknownScript_0x19357a, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 0 -UnknownScript_0x193576: - priorityjump UnknownScript_0x19357b +.Trigger1: + priorityjump MobileTradeRoomMobile_Initialize end -UnknownScript_0x19357a: +.Trigger2: end -UnknownScript_0x19357b: +MobileTradeRoomMobile_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $4 end @@ -24,14 +24,14 @@ UnknownScript_0x19357b: MapMobileTradeRoomMobileSignpost0Script: refreshscreen $0 special Function1037c2 - writetext UnknownText_0x193591 + writetext MobileTradeRoomMobile_EstablishingCommsText closetext reloadmappart special Function101231 loadmovesprites end -UnknownText_0x193591: +MobileTradeRoomMobile_EstablishingCommsText: text "Establishing" line "communications…" done @@ -50,7 +50,7 @@ MobileTradeRoomMobile_MapEventHeader: ; signposts db 1 - signpost 2, 4, $1, MapMobileTradeRoomMobileSignpost0Script + signpost 2, 4, SIGNPOST_UP, MapMobileTradeRoomMobileSignpost0Script ; people-events db 0 diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index e2be9902a..ebd064561 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -182,4 +182,4 @@ MountMoon_MapEventHeader: ; people-events db 1 - person_event SPRITE_SILVER, 7, 11, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_77A + person_event SPRITE_SILVER, 7, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_77A diff --git a/maps/MountMoonGiftShop.asm b/maps/MountMoonGiftShop.asm index e7a14fce1..6a865cae5 100644 --- a/maps/MountMoonGiftShop.asm +++ b/maps/MountMoonGiftShop.asm @@ -38,7 +38,7 @@ MountMoonGiftShop_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRAMPS, 7, 8, $6, $0, 255, 1, $0, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, -1 - person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, -1 - person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, -1 + person_event SPRITE_GRAMPS, 7, 8, UP << 2 | $2, $0, -1, 1, $0, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_GRAMPS, 6, 5, LEFT << 2 | $1, $0, -1, 2, $0, 0, GrampsScript_0x771a8, -1 + person_event SPRITE_LASS, 10, 5, UP << 2 | $1, $1, -1, 1, $0, 0, LassScript_0x771b0, -1 + person_event SPRITE_LASS, 8, 9, UP << 2 | $0, $10, -1, 2, $0, 0, LassScript_0x771b0, -1 diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 64c49f749..a6359c118 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -151,11 +151,11 @@ MountMoonSquare_MapEventHeader: ; signposts db 2 - signpost 7, 7, $7, MapMountMoonSquareSignpostItem0 - signpost 7, 17, $0, MapMountMoonSquareSignpost1Script + signpost 7, 7, SIGNPOST_ITEMIFSET, MapMountMoonSquareSignpostItem0 + signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script ; people-events db 3 - person_event SPRITE_FAIRY, 10, 10, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_779 - person_event SPRITE_FAIRY, 10, 11, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_779 - person_event SPRITE_ROCK, 11, 11, $18, $0, 255, 255, $0, 0, MtMoonSquareRock, EVENT_778 + person_event SPRITE_FAIRY, 10, 10, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_779 + person_event SPRITE_FAIRY, 10, 11, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_779 + person_event SPRITE_ROCK, 11, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, MtMoonSquareRock, EVENT_778 diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index f95b5d66b..6501b70ef 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -156,17 +156,17 @@ MountMortar1FInside_MapEventHeader: ; signposts db 1 - signpost 11, 30, $7, MapMountMortar1FInsideSignpostItem0 + signpost 11, 30, SIGNPOST_ITEMIFSET, MapMountMortar1FInsideSignpostItem0 ; people-events db 10 - person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, -1 - person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, EVENT_67D - person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, EVENT_67E - person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, EVENT_67F - person_event SPRITE_POKE_BALL, 24, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de82, EVENT_7A6 - person_event SPRITE_POKE_BALL, 23, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de84, EVENT_7A7 - person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, -1 - person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, -1 - person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, EVENT_7C8 - person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, EVENT_7C9 + person_event SPRITE_BOULDER, 47, 25, LEFT << 2 | $11, $0, -1, -1, $0, 0, MountMortar1FBoulder, -1 + person_event SPRITE_POKE_BALL, 42, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7c, EVENT_67D + person_event SPRITE_POKE_BALL, 14, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7e, EVENT_67E + person_event SPRITE_POKE_BALL, 31, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de80, EVENT_67F + person_event SPRITE_POKE_BALL, 24, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de82, EVENT_7A6 + person_event SPRITE_POKE_BALL, 23, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de84, EVENT_7A7 + person_event SPRITE_SUPER_NERD, 47, 37, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacMiller, -1 + person_event SPRITE_SUPER_NERD, 32, 28, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdMarkus, -1 + person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de86, EVENT_7C8 + person_event SPRITE_POKE_BALL, 21, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de88, EVENT_7C9 diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 838a2bbf2..4d5ba3a2d 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -37,9 +37,9 @@ MountMortar1FOutside_MapEventHeader: ; signposts db 1 - signpost 22, 25, $7, MapMountMortar1FOutsideSignpostItem0 + signpost 22, 25, SIGNPOST_ITEMIFSET, MapMountMortar1FOutsideSignpostItem0 ; people-events db 2 - person_event SPRITE_POKE_BALL, 19, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf6, EVENT_67B - person_event SPRITE_POKE_BALL, 22, 35, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ddf8, EVENT_67C + person_event SPRITE_POKE_BALL, 19, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf6, EVENT_67B + person_event SPRITE_POKE_BALL, 22, 35, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf8, EVENT_67C diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 378d90e1b..560da0b01 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -89,14 +89,14 @@ MountMortar2FInside_MapEventHeader: ; signposts db 1 - signpost 8, 24, $7, MapMountMortar2FInsideSignpostItem0 + signpost 8, 24, SIGNPOST_ITEMIFSET, MapMountMortar2FInsideSignpostItem0 ; people-events db 7 - person_event SPRITE_POKE_BALL, 26, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0de, EVENT_680 - person_event SPRITE_POKE_BALL, 37, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e0, EVENT_681 - person_event SPRITE_POKE_BALL, 21, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e2, EVENT_682 - person_event SPRITE_POKE_BALL, 9, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e4, EVENT_683 - person_event SPRITE_POKE_BALL, 15, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e6, EVENT_684 - person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, EVENT_685 - person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, -1 + person_event SPRITE_POKE_BALL, 26, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0de, EVENT_680 + person_event SPRITE_POKE_BALL, 37, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e0, EVENT_681 + person_event SPRITE_POKE_BALL, 21, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e2, EVENT_682 + person_event SPRITE_POKE_BALL, 9, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e4, EVENT_683 + person_event SPRITE_POKE_BALL, 15, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e6, EVENT_684 + person_event SPRITE_POKE_BALL, 9, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e8, EVENT_685 + person_event SPRITE_SUPER_NERD, 30, 17, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index 6aae2afd0..d8d42a630 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -141,14 +141,14 @@ MountMortarB1F_MapEventHeader: ; signposts db 1 - signpost 6, 4, $7, MapMountMortarB1FSignpostItem0 + signpost 6, 4, SIGNPOST_ITEMIFSET, MapMountMortarB1FSignpostItem0 ; people-events db 7 - person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, EVENT_686 - person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, EVENT_687 - person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, -1 - person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, -1 - person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, EVENT_7CA - person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, EVENT_7CB - person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, EVENT_7CC + person_event SPRITE_POKE_BALL, 16, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e240, EVENT_686 + person_event SPRITE_POKE_BALL, 20, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e242, EVENT_687 + person_event SPRITE_BOULDER, 14, 13, LEFT << 2 | $11, $0, -1, -1, $0, 0, MountMortarB1FBoulder, -1 + person_event SPRITE_BLACK_BELT, 8, 20, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlackBeltScript_0x7e1f6, -1 + person_event SPRITE_POKE_BALL, 28, 38, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e244, EVENT_7CA + person_event SPRITE_POKE_BALL, 7, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e246, EVENT_7CB + person_event SPRITE_POKE_BALL, 30, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e248, EVENT_7CC diff --git a/maps/MoveDeletersHouse.asm b/maps/MoveDeletersHouse.asm index 1212fd579..260e90111 100644 --- a/maps/MoveDeletersHouse.asm +++ b/maps/MoveDeletersHouse.asm @@ -30,9 +30,9 @@ MoveDeletersHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, MoveDeletersHouseBookshelf - signpost 1, 1, $0, MoveDeletersHouseBookshelf + signpost 1, 0, SIGNPOST_READ, MoveDeletersHouseBookshelf + signpost 1, 1, SIGNPOST_READ, MoveDeletersHouseBookshelf ; people-events db 1 - person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, -1 + person_event SPRITE_SUPER_NERD, 7, 6, UP << 2 | $2, $0, -1, -1, $0, 0, MoveDeleter, -1 diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 7923cc77c..f497a9933 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -86,13 +86,13 @@ MrFujisHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, MrFujisHouseBookshelf - signpost 1, 1, $0, MrFujisHouseBookshelf + signpost 1, 0, SIGNPOST_READ, MrFujisHouseBookshelf + signpost 1, 1, SIGNPOST_READ, MrFujisHouseBookshelf ; people-events db 5 - person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, -1 - person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, -1 - person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, -1 - person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, -1 - person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, -1 + person_event SPRITE_SUPER_NERD, 5, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x7e8ca, -1 + person_event SPRITE_LASS, 8, 7, DOWN << 2 | $2, $11, -1, -1, $0, 0, LassScript_0x7e8cd, -1 + person_event SPRITE_RHYDON, 8, 11, UP << 2 | $12, $0, -1, -1, $0, 0, MrFujisPsyduck, -1 + person_event SPRITE_GROWLITHE, 9, 9, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MrFujisNidorino, -1 + person_event SPRITE_MOLTRES, 7, 5, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MrFujisPidgey, -1 diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 779783a5c..fa9ac1206 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -127,20 +127,20 @@ UnknownScript_0x196ec9: domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 specialphonecall $2 - clearevent EVENT_702 + clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x196f49 checkevent EVENT_GOT_CHIKORITA_FROM_ELM iftrue UnknownScript_0x196f4d - setevent EVENT_641 + setevent EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB end UnknownScript_0x196f49: - setevent EVENT_642 + setevent EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB end UnknownScript_0x196f4d: - setevent EVENT_640 + setevent EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB end MapMrPokemonsHouseSignpost1Script: @@ -384,13 +384,13 @@ MrPokemonsHouse_MapEventHeader: ; signposts db 5 - signpost 1, 0, $0, MapMrPokemonsHouseSignpost1Script - signpost 1, 1, $0, MapMrPokemonsHouseSignpost1Script - signpost 1, 6, $0, MapMrPokemonsHouseSignpost3Script - signpost 1, 7, $0, MapMrPokemonsHouseSignpost3Script - signpost 4, 6, $0, MapMrPokemonsHouseSignpost4Script + signpost 1, 0, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script + signpost 1, 1, SIGNPOST_READ, MapMrPokemonsHouseSignpost1Script + signpost 1, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script + signpost 1, 7, SIGNPOST_READ, MapMrPokemonsHouseSignpost3Script + signpost 4, 6, SIGNPOST_READ, MapMrPokemonsHouseSignpost4Script ; people-events db 2 - person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, -1 - person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C9 + person_event SPRITE_GENTLEMAN, 9, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, GentlemanScript_0x196e97, -1 + person_event SPRITE_OAK, 9, 10, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C9 diff --git a/maps/MrPsychicsHouse.asm b/maps/MrPsychicsHouse.asm index 0a4c811aa..cf55f0deb 100644 --- a/maps/MrPsychicsHouse.asm +++ b/maps/MrPsychicsHouse.asm @@ -58,9 +58,9 @@ MrPsychicsHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, MrPsychicsHouseBookshelf - signpost 1, 1, $0, MrPsychicsHouseBookshelf + signpost 1, 0, SIGNPOST_READ, MrPsychicsHouseBookshelf + signpost 1, 1, SIGNPOST_READ, MrPsychicsHouseBookshelf ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, -1 + person_event SPRITE_FISHING_GURU, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MrPsychic, -1 diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index dd9f350a1..43ea38f40 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -579,24 +579,24 @@ NationalPark_MapEventHeader: ; signposts db 4 - signpost 44, 14, $0, MapNationalParkSignpost0Script - signpost 31, 27, $0, MapNationalParkSignpost1Script - signpost 47, 6, $7, MapNationalParkSignpostItem2 - signpost 4, 12, $0, MapNationalParkSignpost3Script + signpost 44, 14, SIGNPOST_READ, MapNationalParkSignpost0Script + signpost 31, 27, SIGNPOST_READ, MapNationalParkSignpost1Script + signpost 47, 6, SIGNPOST_ITEMIFSET, MapNationalParkSignpostItem2 + signpost 4, 12, SIGNPOST_READ, MapNationalParkSignpost3Script ; people-events db 14 - person_event SPRITE_LASS, 28, 19, $5, $1, 255, 255, $a0, 0, LassScript_0x5c002, -1 - person_event SPRITE_POKEFAN_F, 8, 18, $6, $0, 255, 255, $0, 0, PokefanFScript_0x5c005, -1 - person_event SPRITE_TEACHER, 44, 31, $6, $0, 255, 255, $a0, 0, TeacherScript_0x5c008, -1 - person_event SPRITE_YOUNGSTER, 45, 15, $8, $0, 255, 255, $0, 0, YoungsterScript_0x5c023, -1 - person_event SPRITE_YOUNGSTER, 45, 14, $6, $0, 255, 255, $80, 0, YoungsterScript_0x5c026, -1 - person_event SPRITE_TEACHER, 45, 21, $2, $21, 255, 255, $0, 0, TeacherScript_0x5c029, -1 - person_event SPRITE_GROWLITHE, 44, 30, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x5c02c, -1 - person_event SPRITE_YOUNGSTER, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, -1 - person_event SPRITE_POKEFAN_F, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, -1 - person_event SPRITE_POKEFAN_M, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, -1 - person_event SPRITE_LASS, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, -1 - person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1cc, EVENT_658 - person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, -1 - person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, EVENT_659 + person_event SPRITE_LASS, 28, 19, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x5c002, -1 + person_event SPRITE_POKEFAN_F, 8, 18, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanFScript_0x5c005, -1 + person_event SPRITE_TEACHER, 44, 31, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5c008, -1 + person_event SPRITE_YOUNGSTER, 45, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, YoungsterScript_0x5c023, -1 + person_event SPRITE_YOUNGSTER, 45, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c026, -1 + person_event SPRITE_TEACHER, 45, 21, DOWN << 2 | $2, $21, -1, -1, $0, 0, TeacherScript_0x5c029, -1 + person_event SPRITE_GROWLITHE, 44, 30, UP << 2 | $12, $0, -1, -1, $0, 0, GrowlitheScript_0x5c02c, -1 + person_event SPRITE_YOUNGSTER, 27, 31, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyJack1, -1 + person_event SPRITE_POKEFAN_F, 33, 22, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerPokefanfBeverly1, -1 + person_event SPRITE_POKEFAN_M, 13, 20, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerPokefanmWilliam, -1 + person_event SPRITE_LASS, 18, 12, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassKrise, -1 + person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1cc, EVENT_658 + person_event SPRITE_GAMEBOY_KID, 10, 30, UP << 2 | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x5c037, -1 + person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1ce, EVENT_659 diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index 990a26a99..a965a436b 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -224,22 +224,22 @@ NationalParkBugContest_MapEventHeader: ; signposts db 4 - signpost 44, 14, $0, MapNationalParkBugContestSignpost0Script - signpost 31, 27, $0, MapNationalParkBugContestSignpost1Script - signpost 47, 6, $7, MapNationalParkBugContestSignpostItem2 - signpost 4, 12, $0, MapNationalParkBugContestSignpost3Script + signpost 44, 14, SIGNPOST_READ, MapNationalParkBugContestSignpost0Script + signpost 31, 27, SIGNPOST_READ, MapNationalParkBugContestSignpost1Script + signpost 47, 6, SIGNPOST_ITEMIFSET, MapNationalParkBugContestSignpostItem2 + signpost 4, 12, SIGNPOST_READ, MapNationalParkBugContestSignpost3Script ; people-events db 12 - person_event SPRITE_YOUNGSTER, 33, 23, $2, $22, 255, 255, $80, 0, YoungsterScript_0x5c8ec, EVENT_716 - person_event SPRITE_YOUNGSTER, 26, 32, $2, $22, 255, 255, $a0, 0, YoungsterScript_0x5c8f4, EVENT_717 - person_event SPRITE_ROCKER, 22, 13, $7, $0, 255, 255, $90, 0, RockerScript_0x5c8fc, EVENT_718 - person_event SPRITE_POKEFAN_M, 17, 11, $4, $1, 255, 255, $b0, 0, PokefanMScript_0x5c904, EVENT_719 - person_event SPRITE_YOUNGSTER, 13, 27, $3, $0, 255, 255, $80, 0, YoungsterScript_0x5c90c, EVENT_71A - person_event SPRITE_YOUNGSTER, 17, 31, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x5c914, EVENT_71B - person_event SPRITE_LASS, 27, 11, $5, $2, 255, 255, $90, 0, LassScript_0x5c91c, EVENT_71C - person_event SPRITE_YOUNGSTER, 31, 15, $2, $11, 255, 255, $80, 0, YoungsterScript_0x5c924, EVENT_71D - person_event SPRITE_YOUNGSTER, 12, 20, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x5c92c, EVENT_71E - person_event SPRITE_YOUNGSTER, 38, 21, $2, $33, 255, 255, $90, 0, YoungsterScript_0x5c934, EVENT_71F - person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c945, EVENT_658 - person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c947, EVENT_659 + person_event SPRITE_YOUNGSTER, 33, 23, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c8ec, EVENT_BUG_CATCHING_CONTESTANT_1A + person_event SPRITE_YOUNGSTER, 26, 32, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x5c8f4, EVENT_BUG_CATCHING_CONTESTANT_2A + person_event SPRITE_ROCKER, 22, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RockerScript_0x5c8fc, EVENT_BUG_CATCHING_CONTESTANT_3A + person_event SPRITE_POKEFAN_M, 17, 11, UP << 2 | $0, $1, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x5c904, EVENT_BUG_CATCHING_CONTESTANT_4A + person_event SPRITE_YOUNGSTER, 13, 27, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c90c, EVENT_BUG_CATCHING_CONTESTANT_5A + person_event SPRITE_YOUNGSTER, 17, 31, DOWN << 2 | $2, $33, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x5c914, EVENT_BUG_CATCHING_CONTESTANT_6A + person_event SPRITE_LASS, 27, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x5c91c, EVENT_BUG_CATCHING_CONTESTANT_7A + person_event SPRITE_YOUNGSTER, 31, 15, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A + person_event SPRITE_YOUNGSTER, 12, 20, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A + person_event SPRITE_YOUNGSTER, 38, 21, DOWN << 2 | $2, $33, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A + person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c945, EVENT_658 + person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c947, EVENT_659 diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 0723dcf73..4b459cbbd 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -298,13 +298,13 @@ NewBarkTown_MapEventHeader: ; signposts db 4 - signpost 8, 8, $0, MapNewBarkTownSignpost0Script - signpost 5, 11, $0, MapNewBarkTownSignpost1Script - signpost 3, 3, $0, MapNewBarkTownSignpost2Script - signpost 13, 9, $0, MapNewBarkTownSignpost3Script + signpost 8, 8, SIGNPOST_READ, MapNewBarkTownSignpost0Script + signpost 5, 11, SIGNPOST_READ, MapNewBarkTownSignpost1Script + signpost 3, 3, SIGNPOST_READ, MapNewBarkTownSignpost2Script + signpost 13, 9, SIGNPOST_READ, MapNewBarkTownSignpost3Script ; people-events db 3 - person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, -1 - person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, -1 - person_event SPRITE_SILVER, 6, 7, $9, $0, 255, 255, $0, 0, SilverScript_0x1a809e, EVENT_6BD + person_event SPRITE_TEACHER, 12, 10, DOWN << 2 | $3, $1, -1, -1, $0, 0, TeacherScript_0x1a806f, -1 + person_event SPRITE_FISHER, 13, 16, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a809b, -1 + person_event SPRITE_SILVER, 6, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, SilverScript_0x1a809e, EVENT_6BD diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm index 2552601cb..a336d3bcf 100644 --- a/maps/OaksLab.asm +++ b/maps/OaksLab.asm @@ -264,26 +264,26 @@ OaksLab_MapEventHeader: ; signposts db 16 - signpost 1, 6, $0, OaksLabBookshelf - signpost 1, 7, $0, OaksLabBookshelf - signpost 1, 8, $0, OaksLabBookshelf - signpost 1, 9, $0, OaksLabBookshelf - signpost 7, 0, $0, OaksLabBookshelf - signpost 7, 1, $0, OaksLabBookshelf - signpost 7, 2, $0, OaksLabBookshelf - signpost 7, 3, $0, OaksLabBookshelf - signpost 7, 6, $0, OaksLabBookshelf - signpost 7, 7, $0, OaksLabBookshelf - signpost 7, 8, $0, OaksLabBookshelf - signpost 7, 9, $0, OaksLabBookshelf - signpost 0, 4, $0, OaksLabPoster1 - signpost 0, 5, $0, OaksLabPoster2 - signpost 3, 9, $0, OaksLabTrashcan - signpost 1, 0, $0, OaksLabPC + signpost 1, 6, SIGNPOST_READ, OaksLabBookshelf + signpost 1, 7, SIGNPOST_READ, OaksLabBookshelf + signpost 1, 8, SIGNPOST_READ, OaksLabBookshelf + signpost 1, 9, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 0, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 1, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 2, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 3, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 6, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 7, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 8, SIGNPOST_READ, OaksLabBookshelf + signpost 7, 9, SIGNPOST_READ, OaksLabBookshelf + signpost 0, 4, SIGNPOST_READ, OaksLabPoster1 + signpost 0, 5, SIGNPOST_READ, OaksLabPoster2 + signpost 3, 9, SIGNPOST_READ, OaksLabTrashcan + signpost 1, 0, SIGNPOST_READ, OaksLabPC ; people-events db 4 - person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, -1 - person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, -1 - person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, -1 - person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, -1 + person_event SPRITE_OAK, 6, 8, UP << 2 | $2, $0, -1, -1, $0, 0, Oak, -1 + person_event SPRITE_SCIENTIST, 12, 5, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b40f, -1 + person_event SPRITE_SCIENTIST, 13, 12, UP << 2 | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b412, -1 + person_event SPRITE_SCIENTIST, 8, 5, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x19b415, -1 diff --git a/maps/OlivineCafe.asm b/maps/OlivineCafe.asm index 8630bc424..b3b237560 100644 --- a/maps/OlivineCafe.asm +++ b/maps/OlivineCafe.asm @@ -90,6 +90,6 @@ OlivineCafe_MapEventHeader: ; people-events db 3 - person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, -1 - person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, -1 - person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, -1 + person_event SPRITE_SAILOR, 7, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, SailorScript_0x9c8c1, -1 + person_event SPRITE_FISHING_GURU, 7, 11, UP << 2 | $0, $10, -1, -1, $0, 0, FishingGuruScript_0x9c8d9, -1 + person_event SPRITE_SAILOR, 10, 10, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x9c8dc, -1 diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 932bd1a3f..c98c79fd5 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -310,17 +310,17 @@ OlivineCity_MapEventHeader: ; signposts db 7 - signpost 11, 17, $0, OlivineCitySign - signpost 24, 20, $0, OlivineCityPortSign - signpost 11, 7, $0, OlivineGymSign - signpost 28, 30, $0, OlivineLighthouseSign - signpost 23, 3, $0, OlivineCityBattleTowerSign - signpost 21, 14, $0, OlivineCityPokeCenterSign - signpost 17, 20, $0, OlivineCityMartSign + signpost 11, 17, SIGNPOST_READ, OlivineCitySign + signpost 24, 20, SIGNPOST_READ, OlivineCityPortSign + signpost 11, 7, SIGNPOST_READ, OlivineGymSign + signpost 28, 30, SIGNPOST_READ, OlivineLighthouseSign + signpost 23, 3, SIGNPOST_READ, OlivineCityBattleTowerSign + signpost 21, 14, SIGNPOST_READ, OlivineCityPokeCenterSign + signpost 17, 20, SIGNPOST_READ, OlivineCityMartSign ; people-events db 4 - person_event SPRITE_SAILOR, 31, 30, $4, $10, 255, 255, $0, 0, SailorScript_0x1a88a3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, -1 - person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, -1 - person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C3 + person_event SPRITE_SAILOR, 31, 30, UP << 2 | $0, $10, -1, -1, $0, 0, SailorScript_0x1a88a3, -1 + person_event SPRITE_STANDING_YOUNGSTER, 17, 24, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x1a88a6, -1 + person_event SPRITE_SAILOR, 25, 21, DOWN << 2 | $2, $11, -1, -1, $0, 0, SailorScript_0x1a88ba, -1 + person_event SPRITE_OLIVINE_RIVAL, 15, 14, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C3 diff --git a/maps/OlivineGoodRodHouse.asm b/maps/OlivineGoodRodHouse.asm index b001caf4b..cbe2a3ab6 100644 --- a/maps/OlivineGoodRodHouse.asm +++ b/maps/OlivineGoodRodHouse.asm @@ -96,4 +96,4 @@ OlivineGoodRodHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, -1 + person_event SPRITE_FISHING_GURU, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GoodRodGuru, -1 diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index d5bea3769..c97e22ffe 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -207,10 +207,10 @@ OlivineGym_MapEventHeader: ; signposts db 2 - signpost 13, 3, $0, OlivineGymStatue - signpost 13, 6, $0, OlivineGymStatue + signpost 13, 3, SIGNPOST_READ, OlivineGymStatue + signpost 13, 6, SIGNPOST_READ, OlivineGymStatue ; people-events db 2 - person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, EVENT_6D3 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, -1 + person_event SPRITE_JASMINE, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x9c12f, EVENT_6D3 + person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineHouseBeta.asm b/maps/OlivineHouseBeta.asm index fa11a91a4..2e9dedd45 100644 --- a/maps/OlivineHouseBeta.asm +++ b/maps/OlivineHouseBeta.asm @@ -49,10 +49,10 @@ OlivineHouseBeta_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, OlivineHouseBetaBookshelf1 - signpost 1, 1, $0, OlivineHouseBetaBookshelf2 + signpost 1, 0, SIGNPOST_READ, OlivineHouseBetaBookshelf1 + signpost 1, 1, SIGNPOST_READ, OlivineHouseBetaBookshelf2 ; people-events db 2 - person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, -1 - person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, -1 + person_event SPRITE_TEACHER, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, TeacherScript_0x9c58f, -1 + person_event SPRITE_RHYDON, 8, 10, UP << 2 | $0, $20, -1, -1, $0, 0, RhydonScript_0x9c592, -1 diff --git a/maps/OlivineLighthouse1F.asm b/maps/OlivineLighthouse1F.asm index 093292b1a..b1ca45f12 100644 --- a/maps/OlivineLighthouse1F.asm +++ b/maps/OlivineLighthouse1F.asm @@ -52,5 +52,5 @@ OlivineLighthouse1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, -1 - person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, -1 + person_event SPRITE_SAILOR, 6, 12, UP << 2 | $2, $0, -1, -1, $0, 0, SailorScript_0x5ae67, -1 + person_event SPRITE_POKEFAN_F, 13, 20, UP << 2 | $0, $20, -1, -1, $0, 0, PokefanFScript_0x5ae6a, -1 diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm index 09b7f7db3..3b8578c35 100644 --- a/maps/OlivineLighthouse2F.asm +++ b/maps/OlivineLighthouse2F.asm @@ -253,5 +253,5 @@ OlivineLighthouse2F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, -1 - person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, -1 + person_event SPRITE_SAILOR, 7, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorHuey1, -1 + person_event SPRITE_GENTLEMAN, 12, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerGentlemanAlfred, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index 81f718406..f7fac288c 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -178,7 +178,7 @@ OlivineLighthouse3F_MapEventHeader: ; people-events db 4 - person_event SPRITE_SAILOR, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, -1 - person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, -1 - person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, -1 - person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, EVENT_664 + person_event SPRITE_SAILOR, 6, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSailorTerrell, -1 + person_event SPRITE_GENTLEMAN, 9, 17, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerGentlemanPreston, -1 + person_event SPRITE_YOUNGSTER, 13, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperTheo, -1 + person_event SPRITE_POKE_BALL, 6, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5b279, EVENT_664 diff --git a/maps/OlivineLighthouse4F.asm b/maps/OlivineLighthouse4F.asm index 497917a69..e764fa535 100644 --- a/maps/OlivineLighthouse4F.asm +++ b/maps/OlivineLighthouse4F.asm @@ -134,5 +134,5 @@ OlivineLighthouse4F_MapEventHeader: ; people-events db 2 - person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, -1 - person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie, -1 + person_event SPRITE_SAILOR, 18, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorKent, -1 + person_event SPRITE_LASS, 6, 15, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassConnie, -1 diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 3d667716f..9210bd164 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -136,12 +136,12 @@ OlivineLighthouse5F_MapEventHeader: ; signposts db 1 - signpost 13, 3, $7, MapOlivineLighthouse5FSignpostItem0 + signpost 13, 3, SIGNPOST_ITEMIFSET, MapOlivineLighthouse5FSignpostItem0 ; people-events db 5 - person_event SPRITE_SAILOR, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, -1 - person_event SPRITE_YOUNGSTER, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, -1 - person_event SPRITE_POKE_BALL, 16, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x609aa, EVENT_665 - person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, EVENT_666 - person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, EVENT_667 + person_event SPRITE_SAILOR, 15, 12, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorErnest, -1 + person_event SPRITE_YOUNGSTER, 7, 12, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerBird_keeperDenis, -1 + person_event SPRITE_POKE_BALL, 16, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609aa, EVENT_665 + person_event SPRITE_POKE_BALL, 19, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ac, EVENT_666 + person_event SPRITE_POKE_BALL, 17, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ae, EVENT_667 diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 2705159d3..2cd2d3f41 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -270,6 +270,6 @@ OlivineLighthouse6F_MapEventHeader: ; people-events db 3 - person_event SPRITE_JASMINE, 12, 12, $6, $0, 255, 255, $80, 0, JasmineScript_0x60b91, EVENT_6D2 - person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, -1 - person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, EVENT_668 + person_event SPRITE_JASMINE, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x60b91, EVENT_6D2 + person_event SPRITE_MONSTER, 12, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MonsterScript_0x60c3a, -1 + person_event SPRITE_POKE_BALL, 8, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x60c66, EVENT_668 diff --git a/maps/OlivineMart.asm b/maps/OlivineMart.asm index 8bcca8c3f..c9ddaf55c 100644 --- a/maps/OlivineMart.asm +++ b/maps/OlivineMart.asm @@ -57,6 +57,6 @@ OlivineMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, -1 - person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, -1 - person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x9cac7, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, UP << 2 | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x9cace, -1 + person_event SPRITE_LASS, 10, 5, LEFT << 2 | $0, $0, -1, -1, $0, 0, LassScript_0x9cad1, -1 diff --git a/maps/OlivinePokeCenter1F.asm b/maps/OlivinePokeCenter1F.asm index 714d73e78..3948d9f55 100644 --- a/maps/OlivinePokeCenter1F.asm +++ b/maps/OlivinePokeCenter1F.asm @@ -59,7 +59,7 @@ OlivinePokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9c002, -1 - person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, -1 - person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, -1 - person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x9c002, -1 + person_event SPRITE_FISHING_GURU, 8, 12, UP << 2 | $1, $1, -1, -1, $0, 0, FishingGuruScript_0x9c005, -1 + person_event SPRITE_FISHER, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x9c008, -1 + person_event SPRITE_TEACHER, 5, 11, UP << 2 | $2, $0, -1, -1, $0, 0, TeacherScript_0x9c00b, -1 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index ea0edc48e..3d559e7ba 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -20,14 +20,14 @@ UnknownScript_0x748b1: applymovement $0, MovementData_0x74a32 appear $2 dotrigger $0 - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY end SailorScript_0x748c0: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 closetext @@ -69,9 +69,9 @@ UnknownScript_0x74919: UnknownScript_0x7491f: spriteface $4, RIGHT - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x7498b - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x7498b spriteface $0, LEFT loadfont @@ -94,7 +94,7 @@ UnknownScript_0x7494e: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_CHRIS2_IN_CABLE_CLUB applymovement $0, MovementData_0x74a37 jump SailorScript_0x748c0 @@ -138,7 +138,7 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x74919 checkevent EVENT_030 iffalse UnknownScript_0x749c0 @@ -159,7 +159,7 @@ UnknownScript_0x749c0: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_CHRIS2_IN_CABLE_CLUB checkcode VAR_FACING if_equal $3, UnknownScript_0x749e5 applymovement $0, MovementData_0x74a3f @@ -394,14 +394,14 @@ OlivinePort_MapEventHeader: ; signposts db 1 - signpost 22, 1, $7, MapOlivinePortSignpostItem0 + signpost 22, 1, SIGNPOST_ITEMIFSET, MapOlivinePortSignpostItem0 ; people-events db 7 - person_event SPRITE_SAILOR, 27, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x748c0, EVENT_72A - person_event SPRITE_SAILOR, 19, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - person_event SPRITE_SAILOR, 19, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - person_event SPRITE_FISHING_GURU, 18, 8, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - person_event SPRITE_FISHING_GURU, 18, 17, $7, $0, 255, 255, $0, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME - person_event SPRITE_YOUNGSTER, 19, 8, $6, $0, 255, 255, $0, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - person_event SPRITE_COOLTRAINER_F, 19, 15, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + person_event SPRITE_SAILOR, 27, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x748c0, EVENT_72A + person_event SPRITE_SAILOR, 19, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_SAILOR, 19, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + person_event SPRITE_FISHING_GURU, 18, 8, UP << 2 | $3, $0, -1, -1, $0, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_FISHING_GURU, 18, 17, UP << 2 | $3, $0, -1, -1, $0, 0, FishingGuruScript_0x74a0c, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME + person_event SPRITE_YOUNGSTER, 19, 8, UP << 2 | $2, $0, -1, -1, $0, 0, YoungsterScript_0x74a17, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME + person_event SPRITE_COOLTRAINER_F, 19, 15, UP << 2 | $2, $0, -1, -1, $0, 0, CooltrainerFScript_0x74a22, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 8c9ad1538..0d28c1df3 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -36,4 +36,4 @@ OlivinePortPassage_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 5, 21, $8, $0, 255, 255, $0, 0, PokefanMScript_0x76fac, EVENT_733 + person_event SPRITE_POKEFAN_M, 5, 21, LEFT << 2 | $0, $0, -1, -1, $0, 0, PokefanMScript_0x76fac, EVENT_733 diff --git a/maps/OlivinePunishmentSpeechHouse.asm b/maps/OlivinePunishmentSpeechHouse.asm index 8628ef005..c45c88b50 100644 --- a/maps/OlivinePunishmentSpeechHouse.asm +++ b/maps/OlivinePunishmentSpeechHouse.asm @@ -49,10 +49,10 @@ OlivinePunishmentSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, OlivinePunishmentSpeechHouseBookshelf1 - signpost 1, 1, $0, OlivinePunishmentSpeechHouseBookshelf2 + signpost 1, 0, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf1 + signpost 1, 1, SIGNPOST_READ, OlivinePunishmentSpeechHouseBookshelf2 ; people-events db 2 - person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, -1 - person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, -1 + person_event SPRITE_POKEFAN_M, 6, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, OlivinePunishmentSpeechHouseDad, -1 + person_event SPRITE_LASS, 9, 9, UP << 2 | $1, $2, -1, -1, $0, 0, OlivinePunishmentSpeechHouseDaughter, -1 diff --git a/maps/OlivineVoltorbHouse.asm b/maps/OlivineVoltorbHouse.asm index afa61ee12..db7356ad3 100644 --- a/maps/OlivineVoltorbHouse.asm +++ b/maps/OlivineVoltorbHouse.asm @@ -30,9 +30,9 @@ OlivineVoltorbHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, TimsHouseBookshelf - signpost 1, 1, $0, TimsHouseBookshelf + signpost 1, 0, SIGNPOST_READ, TimsHouseBookshelf + signpost 1, 1, SIGNPOST_READ, TimsHouseBookshelf ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, -1 + person_event SPRITE_FISHING_GURU, 7, 6, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Tim, -1 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 7e152f5de..aaf877d83 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -82,12 +82,12 @@ PalletTown_MapEventHeader: ; signposts db 4 - signpost 9, 7, $0, PalletTownSign - signpost 5, 3, $0, RedsHouseSign - signpost 13, 13, $0, OaksLabSign - signpost 5, 11, $0, BluesHouseSign + signpost 9, 7, SIGNPOST_READ, PalletTownSign + signpost 5, 3, SIGNPOST_READ, RedsHouseSign + signpost 13, 13, SIGNPOST_READ, OaksLabSign + signpost 5, 11, SIGNPOST_READ, BluesHouseSign ; people-events db 2 - person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, -1 - person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, -1 + person_event SPRITE_TEACHER, 12, 7, DOWN << 2 | $2, $22, -1, -1, $0, 0, TeacherScript_0x1ac6d5, -1 + person_event SPRITE_FISHER, 18, 16, UP << 2 | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1ac6d8, -1 diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index 1ee798544..795be33de 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -164,18 +164,18 @@ PewterCity_MapEventHeader: ; signposts db 7 - signpost 23, 25, $0, PewterCitySign - signpost 17, 11, $0, PewterGymSign - signpost 9, 15, $0, PewterMuseumSign - signpost 19, 33, $0, PewterCityMtMoonGiftShopSign - signpost 29, 19, $0, PewterCityWelcomeSign - signpost 25, 14, $0, PewterCityPokeCenterSign - signpost 17, 24, $0, PewterCityMartSign + signpost 23, 25, SIGNPOST_READ, PewterCitySign + signpost 17, 11, SIGNPOST_READ, PewterGymSign + signpost 9, 15, SIGNPOST_READ, PewterMuseumSign + signpost 19, 33, SIGNPOST_READ, PewterCityMtMoonGiftShopSign + signpost 29, 19, SIGNPOST_READ, PewterCityWelcomeSign + signpost 25, 14, SIGNPOST_READ, PewterCityPokeCenterSign + signpost 17, 24, SIGNPOST_READ, PewterCityMartSign ; people-events db 5 - person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, -1 - person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, -1 - person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, -1 - person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, -1 - person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, -1 + person_event SPRITE_COOLTRAINER_F, 15, 23, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18c009, -1 + person_event SPRITE_BUG_CATCHER, 33, 18, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x18c00c, -1 + person_event SPRITE_GRAMPS, 21, 33, UP << 2 | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x18c00f, -1 + person_event SPRITE_FRUIT_TREE, 7, 36, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x18c03e, -1 + person_event SPRITE_FRUIT_TREE, 7, 34, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x18c040, -1 diff --git a/maps/PewterGym.asm b/maps/PewterGym.asm index 4844a22b2..fcac4b8ec 100644 --- a/maps/PewterGym.asm +++ b/maps/PewterGym.asm @@ -233,11 +233,11 @@ PewterGym_MapEventHeader: ; signposts db 2 - signpost 11, 2, $0, PewterGymStatue - signpost 11, 7, $0, PewterGymStatue + signpost 11, 2, SIGNPOST_READ, PewterGymStatue + signpost 11, 7, SIGNPOST_READ, PewterGymStatue ; people-events db 3 - person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, -1 - person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, -1 - person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, -1 + person_event SPRITE_BROCK, 5, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BrockScript_0x1a2864, -1 + person_event SPRITE_YOUNGSTER, 9, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperJerry, -1 + person_event SPRITE_GYM_GUY, 15, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 1, PewterGymGuyScript, -1 diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm index b086900a1..d12f8654a 100644 --- a/maps/PewterMart.asm +++ b/maps/PewterMart.asm @@ -57,6 +57,6 @@ PewterMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, -1 - person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, -1 - person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x1a2dcb, -1 + person_event SPRITE_YOUNGSTER, 6, 13, UP << 2 | $1, $2, -1, -1, $0, 0, YoungsterScript_0x1a2dd2, -1 + person_event SPRITE_SUPER_NERD, 10, 10, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a2dd5, -1 diff --git a/maps/PewterNidoranSpeechHouse.asm b/maps/PewterNidoranSpeechHouse.asm index 29a599206..09c34cb61 100644 --- a/maps/PewterNidoranSpeechHouse.asm +++ b/maps/PewterNidoranSpeechHouse.asm @@ -41,5 +41,5 @@ PewterNidoranSpeechHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, -1 - person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, -1 + person_event SPRITE_SUPER_NERD, 9, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x1a2807, -1 + person_event SPRITE_GROWLITHE, 9, 8, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrowlitheScript_0x1a280a, -1 diff --git a/maps/PewterPokeCenter1F.asm b/maps/PewterPokeCenter1F.asm index 1415ad5dc..931833bfc 100644 --- a/maps/PewterPokeCenter1F.asm +++ b/maps/PewterPokeCenter1F.asm @@ -78,8 +78,8 @@ PewterPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, -1 - person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, -1 - person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, -1 - person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, -1 - person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x1a2ee7, -1 + person_event SPRITE_TEACHER, 10, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a2eea, -1 + person_event SPRITE_JIGGLYPUFF, 7, 5, UP << 2 | $12, $0, -1, -1, $0, 0, JigglypuffScript_0x1a2eed, -1 + person_event SPRITE_BUG_CATCHER, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BugCatcherScript_0x1a2ef7, -1 + person_event SPRITE_POKEFAN_M, 6, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1a2efa, -1 diff --git a/maps/PewterSnoozeSpeechHouse.asm b/maps/PewterSnoozeSpeechHouse.asm index b5ce7c400..79cbbb83b 100644 --- a/maps/PewterSnoozeSpeechHouse.asm +++ b/maps/PewterSnoozeSpeechHouse.asm @@ -31,9 +31,9 @@ PewterSnoozeSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, PewterSnoozeSpeechHouseBookshelf - signpost 1, 1, $0, PewterSnoozeSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, PewterSnoozeSpeechHouseBookshelf ; people-events db 1 - person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, -1 + person_event SPRITE_GRAMPS, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x1a3059, -1 diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 59a9acf8f..97fcc6c0e 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -3,430 +3,430 @@ PokeCenter2F_MapScriptHeader: db 6 ; triggers - dw UnknownScript_0x19285f, $0000 - dw UnknownScript_0x192873, $0000 - dw UnknownScript_0x192877, $0000 - dw UnknownScript_0x19287b, $0000 - dw UnknownScript_0x19287f, $0000 - dw UnknownScript_0x192883, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 + dw .Trigger3, $0000 + dw .Trigger4, $0000 + dw .Trigger5, $0000 + dw .Trigger6, $0000 ; callback count db 0 -UnknownScript_0x19285f: - special Functionc2f6 - if_equal $0, UnknownScript_0x192872 - clearevent EVENT_711 - checkevent EVENT_001 - iftrue UnknownScript_0x192872 - priorityjump UnknownScript_0x192887 +.Trigger1: + special Special_CheckMysteryGift + if_equal $0, .Trigger1Done + clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY + checkevent EVENT_CHRIS2_IN_CABLE_CLUB + iftrue .Trigger1Done + priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy -UnknownScript_0x192872: +.Trigger1Done: end -UnknownScript_0x192873: - priorityjump UnknownScript_0x192ab6 +.Trigger2: + priorityjump Script_LeftCableTradeCenter end -UnknownScript_0x192877: - priorityjump UnknownScript_0x192add +.Trigger3: + priorityjump Script_LeftCableColosseum end -UnknownScript_0x19287b: - priorityjump UnknownScript_0x192c4e +.Trigger4: + priorityjump Script_LeftTimeCapsule end -UnknownScript_0x19287f: - priorityjump UnknownScript_0x192ac3 +.Trigger5: + priorityjump Script_LeftMobileTradeRoom end -UnknownScript_0x192883: - priorityjump UnknownScript_0x192aea +.Trigger6: + priorityjump Script_LeftMobileBattleRoom end -UnknownScript_0x192887: +PokeCenter2F_AppearMysteryGiftDeliveryGuy: appear $5 - setevent EVENT_001 + setevent EVENT_CHRIS2_IN_CABLE_CLUB end -UnknownScript_0x19288d: +Script_TradeCenterClosed: faceplayer loadfont - writetext UnknownText_0x19312f + writetext Text_TradeRoomClosed closetext loadmovesprites end -UnknownScript_0x192895: +Script_BattleRoomClosed: faceplayer loadfont - writetext UnknownText_0x19315f + writetext Text_BattleRoomClosed closetext loadmovesprites end -LinkReceptionistScript_0x19289d: +LinkReceptionistScript_Trade: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iffalse UnknownScript_0x19288d + iffalse Script_TradeCenterClosed loadfont - writetext UnknownText_0x192e3a + writetext Text_TradeReceptionistIntro yesorno - iffalse UnknownScript_0x19291d + iffalse .Cancel special Function10630f - iffalse UnknownScript_0x1928be - writetext UnknownText_0x192d7e + iffalse .NoMobile + writetext Text_TradeReceptionistMobile special Function103612 - iffalse UnknownScript_0x19291d - if_equal $1, UnknownScript_0x19291f -UnknownScript_0x1928be: - special Function29ce8 - writetext UnknownText_0x192f67 - special Function29d11 - iffalse UnknownScript_0x1928f6 - writetext UnknownText_0x192f34 + iffalse .Cancel + if_equal $1, .Mobile +.NoMobile: + special Special_SetBitsForLinkTradeRequest + writetext Text_PleaseWait + special Special_WaitForLinkedFriend + iffalse .FriendNotReady + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x192917 - special Function29e66 - iffalse UnknownScript_0x192917 - writetext UnknownText_0x192f67 - special Function29d92 - iffalse UnknownScript_0x192911 + iffalse .DidNotSave + special Special_TryQuickSave + iffalse .DidNotSave + writetext Text_PleaseWait + special Special_CheckLinkTimeout + iffalse .LinkTimedOut copybytetovar wcf51 - iffalse UnknownScript_0x1928fe - special Function29e82 - iffalse UnknownScript_0x192909 - writetext UnknownText_0x19306b + iffalse .LinkedToFirstGen + special Special_CheckBothSelectedSameRoom + iffalse .IncompatibleRooms + writetext Text_PleaseComeIn2 closetext loadmovesprites - scall UnknownScript_0x192b04 + scall PokeCenter2F_CheckGender warpcheck end -UnknownScript_0x1928f6: - special Function29c92 - writetext UnknownText_0x192f19 +.FriendNotReady: + special Special_AbortLink + writetext Text_FriendNotReady loadmovesprites end -UnknownScript_0x1928fe: - special Function29efa - writetext UnknownText_0x193029 - special Function29eee +.LinkedToFirstGen: + special Special_FailedLinkToPast + writetext Text_CantLinkToThePast + special Special_CloseLink loadmovesprites end -UnknownScript_0x192909: - writetext UnknownText_0x19304a - special Function29eee +.IncompatibleRooms: + writetext Text_IncompatibleRooms + special Special_CloseLink loadmovesprites end -UnknownScript_0x192911: - writetext UnknownText_0x192f75 - jump UnknownScript_0x19291a +.LinkTimedOut: + writetext Text_LinkTimedOut + jump .AbortLink -UnknownScript_0x192917: - writetext UnknownText_0x192fd1 -UnknownScript_0x19291a: - special Function29c92 -UnknownScript_0x19291d: +.DidNotSave: + writetext Text_PleaseComeAgain +.AbortLink: + special Special_AbortLink +.Cancel: loadmovesprites end -UnknownScript_0x19291f: - scall UnknownScript_0x19292b - iftrue UnknownScript_0x19292a - scall UnknownScript_0x19294a +.Mobile: + scall .Mobile_TrySave + iftrue .Mobile_Abort + scall BattleTradeMobile_WalkIn warpcheck end -UnknownScript_0x19292a: +.Mobile_Abort: end -UnknownScript_0x19292b: - writetext UnknownText_0x192f34 +.Mobile_TrySave: + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x192943 - special Function29e66 - iffalse UnknownScript_0x192943 + iffalse .Mobile_DidNotSave + special Special_TryQuickSave + iffalse .Mobile_DidNotSave special Function1011f1 - writetext UnknownText_0x19306b + writetext Text_PleaseComeIn2 closetext loadmovesprites writebyte $0 end -UnknownScript_0x192943: - writetext UnknownText_0x192fd1 +.Mobile_DidNotSave: + writetext Text_PleaseComeAgain loadmovesprites writebyte $1 end -UnknownScript_0x19294a: +BattleTradeMobile_WalkIn: applymovement2 MovementData_0x192cce applymovement $0, MovementData_0x192ce7 end -LinkReceptionistScript_0x192952: +LinkReceptionistScript_Battle: checkevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - iffalse UnknownScript_0x192895 + iffalse Script_BattleRoomClosed loadfont - writetext UnknownText_0x192de0 + writetext Text_BattleReceptionistIntro yesorno - iffalse UnknownScript_0x1929d2 + iffalse .Cancel special Function10630f - iffalse UnknownScript_0x192973 - writetext UnknownText_0x192d39 + iffalse .NoMobile + writetext Text_BattleReceptionistMobile special Function103612 - iffalse UnknownScript_0x1929d2 - if_equal $1, UnknownScript_0x1929d4 -UnknownScript_0x192973: - special Function29cf1 - writetext UnknownText_0x192f67 - special Function29d11 - iffalse UnknownScript_0x1929ab - writetext UnknownText_0x192f34 + iffalse .Cancel + if_equal $1, .Mobile +.NoMobile: + special Special_SetBitsForBattleRequest + writetext Text_PleaseWait + special Special_WaitForLinkedFriend + iffalse .FriendNotReady + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x1929cc - special Function29e66 - iffalse UnknownScript_0x1929cc - writetext UnknownText_0x192f67 - special Function29d92 - iffalse UnknownScript_0x1929c6 + iffalse .DidNotSave + special Special_TryQuickSave + iffalse .DidNotSave + writetext Text_PleaseWait + special Special_CheckLinkTimeout + iffalse .LinkTimedOut copybytetovar wcf51 - iffalse UnknownScript_0x1929b3 - special Function29e82 - iffalse UnknownScript_0x1929be - writetext UnknownText_0x19306b + iffalse .LinkedToFirstGen + special Special_CheckBothSelectedSameRoom + iffalse .IncompatibleRooms + writetext Text_PleaseComeIn2 closetext loadmovesprites - scall UnknownScript_0x192b04 + scall PokeCenter2F_CheckGender warpcheck end -UnknownScript_0x1929ab: - special Function29c92 - writetext UnknownText_0x192f19 +.FriendNotReady: + special Special_AbortLink + writetext Text_FriendNotReady loadmovesprites end -UnknownScript_0x1929b3: - special Function29efa - writetext UnknownText_0x193029 - special Function29eee +.LinkedToFirstGen: + special Special_FailedLinkToPast + writetext Text_CantLinkToThePast + special Special_CloseLink loadmovesprites end -UnknownScript_0x1929be: - writetext UnknownText_0x19304a - special Function29eee +.IncompatibleRooms: + writetext Text_IncompatibleRooms + special Special_CloseLink loadmovesprites end -UnknownScript_0x1929c6: - writetext UnknownText_0x192f75 - jump UnknownScript_0x1929cf +.LinkTimedOut: + writetext Text_LinkTimedOut + jump .AbortLink -UnknownScript_0x1929cc: - writetext UnknownText_0x192fd1 -UnknownScript_0x1929cf: - special Function29c92 -UnknownScript_0x1929d2: +.DidNotSave: + writetext Text_PleaseComeAgain +.AbortLink: + special Special_AbortLink +.Cancel: loadmovesprites end -UnknownScript_0x1929d4: - scall UnknownScript_0x192a05 - iffalse UnknownScript_0x1929e5 - scall UnknownScript_0x1929e6 - iftrue UnknownScript_0x1929e5 - scall UnknownScript_0x19294a +.Mobile: + scall .SelectThreeMons + iffalse .Mobile_Abort + scall .Mobile_TrySave + iftrue .Mobile_Abort + scall BattleTradeMobile_WalkIn warpcheck end -UnknownScript_0x1929e5: +.Mobile_Abort: end -UnknownScript_0x1929e6: - writetext UnknownText_0x192f34 +.Mobile_TrySave: + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x1929fe + iffalse .Mobile_DidNotSave special Function103780 - iffalse UnknownScript_0x1929fe + iffalse .Mobile_DidNotSave special Function1011f1 - writetext UnknownText_0x19306b + writetext Text_PleaseComeIn2 closetext loadmovesprites writebyte $0 end -UnknownScript_0x1929fe: - writetext UnknownText_0x192fd1 +.Mobile_DidNotSave: + writetext Text_PleaseComeAgain loadmovesprites writebyte $1 end -UnknownScript_0x192a05: - special Function10366e - iffalse UnknownScript_0x192a1e - if_equal $1, UnknownScript_0x192a22 - if_equal $2, UnknownScript_0x192a22 - if_equal $3, UnknownScript_0x192a1a - jump UnknownScript_0x192a1e +.SelectThreeMons: + special Mobile_SelectThreeMons + iffalse .Mobile_DidNotSelect + if_equal $1, .Mobile_OK + if_equal $2, .Mobile_OK + if_equal $3, .Mobile_InvalidParty + jump .Mobile_DidNotSelect -UnknownScript_0x192a1a: - writetext UnknownText_0x1932bc +.Mobile_InvalidParty: + writetext Text_BrokeStadiumRules closetext -UnknownScript_0x192a1e: +.Mobile_DidNotSelect: loadmovesprites writebyte $0 end -UnknownScript_0x192a22: +.Mobile_OK: writebyte $1 end -UnknownScript_0x192a25: +Script_TimeCapsuleClosed: faceplayer loadfont - writetext UnknownText_0x193100 + writetext Text_TimeCapsuleClosed closetext loadmovesprites end -LinkReceptionistScript_0x192a2d: +LinkReceptionistScript_TimeCapsule: checkevent EVENT_MET_BILL - iftrue UnknownScript_0x192a25 + iftrue Script_TimeCapsuleClosed checkflag ENGINE_TIME_CAPSULE - iftrue UnknownScript_0x192a25 - special Function29cfa + iftrue Script_TimeCapsuleClosed + special Special_SetBitsForTimeCapsuleRequest faceplayer loadfont - writetext UnknownText_0x192e9f + writetext Text_TimeCapsuleRecptionistIntro yesorno - iffalse UnknownScript_0x192aa2 - special Function29bfb - if_equal $1, UnknownScript_0x192aa7 - if_equal $2, UnknownScript_0x192aac - if_equal $3, UnknownScript_0x192ab1 - writetext UnknownText_0x192f67 - special Function29d11 - iffalse UnknownScript_0x192a91 - writetext UnknownText_0x192f34 + iffalse .Cancel + special Special_CheckTimeCapsuleCompatibility + if_equal $1, .MonTooNew + if_equal $2, .MonMoveTooNew + if_equal $3, .MonHasMail + writetext Text_PleaseWait + special Special_WaitForLinkedFriend + iffalse .FriendNotReady + writetext Text_MustSaveGame yesorno - iffalse UnknownScript_0x192a9f - special Function29e66 - iffalse UnknownScript_0x192a9f - writetext UnknownText_0x192f67 - special Function29d92 - iffalse UnknownScript_0x192a99 + iffalse .DidNotSave + special Special_TryQuickSave + iffalse .DidNotSave + writetext Text_PleaseWait + special Special_CheckLinkTimeout + iffalse .LinkTimedOut copybytetovar wcf51 - iffalse UnknownScript_0x192a84 - special Function29e82 - writetext UnknownText_0x19304a - special Function29eee + iffalse .OK + special Special_CheckBothSelectedSameRoom + writetext Text_IncompatibleRooms + special Special_CloseLink loadmovesprites end -UnknownScript_0x192a84: - special Function29c7b - writetext UnknownText_0x19306b +.OK: + special Special_EnterTimeCapsule + writetext Text_PleaseComeIn2 closetext loadmovesprites - scall UnknownScript_0x192bc4 + scall TimeCapsuleScript_CheckPlayerGender warpcheck end -UnknownScript_0x192a91: - special Function29c92 - writetext UnknownText_0x192f19 +.FriendNotReady: + special Special_AbortLink + writetext Text_FriendNotReady loadmovesprites end -UnknownScript_0x192a99: - writetext UnknownText_0x192f75 - jump UnknownScript_0x192aa2 +.LinkTimedOut: + writetext Text_LinkTimedOut + jump .Cancel -UnknownScript_0x192a9f: - writetext UnknownText_0x192fd1 -UnknownScript_0x192aa2: - special Function29c92 +.DidNotSave: + writetext Text_PleaseComeAgain +.Cancel: + special Special_AbortLink loadmovesprites end -UnknownScript_0x192aa7: - writetext UnknownText_0x19308b +.MonTooNew: + writetext Text_RejectNewMon loadmovesprites end -UnknownScript_0x192aac: - writetext UnknownText_0x1930a8 +.MonMoveTooNew: + writetext Text_RejectMonWithNewMove loadmovesprites end -UnknownScript_0x192ab1: - writetext UnknownText_0x1930cf +.MonHasMail: + writetext Text_RejectMonWithMail loadmovesprites end -UnknownScript_0x192ab6: - special Function29c92 - scall UnknownScript_0x192b50 +Script_LeftCableTradeCenter: + special Special_AbortLink + scall Script_CleanUpFemaleFlagAfterTrade dotrigger $0 domaptrigger GROUP_TRADE_CENTER, MAP_TRADE_CENTER, $0 end -UnknownScript_0x192ac3: +Script_LeftMobileTradeRoom: special Function101220 - scall UnknownScript_0x192ad0 + scall Script_WalkOutOfMobileTradeRoom dotrigger $0 domaptrigger GROUP_MOBILE_TRADE_ROOM_MOBILE, MAP_MOBILE_TRADE_ROOM_MOBILE, $0 end -UnknownScript_0x192ad0: +Script_WalkOutOfMobileTradeRoom: applymovement $2, MovementData_0x192d0b applymovement $0, MovementData_0x192d0f applymovement $2, MovementData_0x192d14 end -UnknownScript_0x192add: - special Function29c92 - scall UnknownScript_0x192b8a +Script_LeftCableColosseum: + special Special_AbortLink + scall Script_CleanUpFemaleFlagAfterBattle dotrigger $0 domaptrigger GROUP_COLOSSEUM, MAP_COLOSSEUM, $0 end -UnknownScript_0x192aea: +Script_LeftMobileBattleRoom: special Function101220 - scall UnknownScript_0x192af7 + scall Script_WalkOutOfMobileBattleRoom dotrigger $0 domaptrigger GROUP_MOBILE_BATTLE_ROOM, MAP_MOBILE_BATTLE_ROOM, $0 end -UnknownScript_0x192af7: +Script_WalkOutOfMobileBattleRoom: applymovement $3, MovementData_0x192d0b applymovement $0, MovementData_0x192d0f applymovement $3, MovementData_0x192d14 end -UnknownScript_0x192b04: +PokeCenter2F_CheckGender: checkflag ENGINE_PLAYER_IS_FEMALE - iftrue UnknownScript_0x192b12 + iftrue .Female applymovement2 MovementData_0x192cca applymovement $0, MovementData_0x192cde end -UnknownScript_0x192b12: +.Female: applymovement2 MovementData_0x192cd8 applymovement $0, MovementData_0x192ce2 loadfont - writetext UnknownText_0x193266 + writetext Text_OhPleaseWait closetext loadmovesprites applymovement2 MovementData_0x192cdc spriteface $0, LEFT loadfont - writetext UnknownText_0x193278 + writetext Text_ChangeTheLook closetext loadmovesprites playsound SFX_TINGLE @@ -437,22 +437,22 @@ UnknownScript_0x192b12: setflag ENGINE_KRIS_IN_CABLE_CLUB special Functione4a loadfont - writetext UnknownText_0x19329a + writetext Text_LikeTheLook closetext loadmovesprites showemote EMOTE_SHOCK, $0, 15 applymovement $0, MovementData_0x192ce5 end -UnknownScript_0x192b50: +Script_CleanUpFemaleFlagAfterTrade: checkflag ENGINE_KRIS_IN_CABLE_CLUB - iftrue UnknownScript_0x192b63 + iftrue .Female applymovement $2, MovementData_0x192d04 applymovement $0, MovementData_0x192cf5 applymovement $2, MovementData_0x192cfe end -UnknownScript_0x192b63: +.Female: applymovement $2, MovementData_0x192d04 applymovement $0, MovementData_0x192d28 clearflag ENGINE_KRIS_IN_CABLE_CLUB @@ -466,15 +466,15 @@ UnknownScript_0x192b63: applymovement $2, MovementData_0x192cfe end -UnknownScript_0x192b8a: +Script_CleanUpFemaleFlagAfterBattle: checkflag ENGINE_KRIS_IN_CABLE_CLUB - iftrue UnknownScript_0x192b9d + iftrue .Female applymovement $3, MovementData_0x192d04 applymovement $0, MovementData_0x192cf5 applymovement $3, MovementData_0x192cfe end -UnknownScript_0x192b9d: +.Female: applymovement $3, MovementData_0x192d04 applymovement $0, MovementData_0x192d28 clearflag ENGINE_KRIS_IN_CABLE_CLUB @@ -488,53 +488,53 @@ UnknownScript_0x192b9d: applymovement $3, MovementData_0x192cfe end -UnknownScript_0x192bc4: +TimeCapsuleScript_CheckPlayerGender: checkflag ENGINE_PLAYER_IS_FEMALE - iftrue UnknownScript_0x192bec + iftrue .Female checkcode VAR_FACING - if_equal $2, UnknownScript_0x192bdc - if_equal $3, UnknownScript_0x192be4 + if_equal LEFT, .MaleFacingLeft + if_equal RIGHT, .MaleFacingRight applymovement2 MovementData_0x192cd2 applymovement $0, MovementData_0x192cec end -UnknownScript_0x192bdc: +.MaleFacingLeft: applymovement2 MovementData_0x192cd2 applymovement $0, MovementData_0x192cef end -UnknownScript_0x192be4: +.MaleFacingRight: applymovement2 MovementData_0x192cd5 applymovement $0, MovementData_0x192cf2 end -UnknownScript_0x192bec: +.Female: checkcode VAR_FACING - if_equal $3, UnknownScript_0x192c00 - if_equal $2, UnknownScript_0x192c0a + if_equal RIGHT, .FemaleFacingRight + if_equal LEFT, .FemaleFacingLeft applymovement2 MovementData_0x192d33 applymovement $0, MovementData_0x192d2d - jump UnknownScript_0x192c11 + jump .FemaleContinue -UnknownScript_0x192c00: +.FemaleFacingRight: applymovement2 MovementData_0x192d36 applymovement $0, MovementData_0x192d2f - jump UnknownScript_0x192c11 + jump .FemaleContinue -UnknownScript_0x192c0a: +.FemaleFacingLeft: applymovement2 MovementData_0x192d33 applymovement $0, MovementData_0x192d31 -UnknownScript_0x192c11: +.FemaleContinue: loadfont - writetext UnknownText_0x193266 + writetext Text_OhPleaseWait closetext loadmovesprites checkcode VAR_FACING - if_not_equal $1, UnknownScript_0x192c20 + if_not_equal UP, .FemaleChangeApperance spriteface $0, LEFT -UnknownScript_0x192c20: +.FemaleChangeApperance: loadfont - writetext UnknownText_0x193278 + writetext Text_ChangeTheLook closetext loadmovesprites playsound SFX_TINGLE @@ -546,23 +546,23 @@ UnknownScript_0x192c20: setflag ENGINE_KRIS_IN_CABLE_CLUB special Functione4a loadfont - writetext UnknownText_0x19329a + writetext Text_LikeTheLook closetext loadmovesprites showemote EMOTE_SHOCK, $0, 15 applymovement $0, MovementData_0x192d2d end -UnknownScript_0x192c4e: - special Function29c92 +Script_LeftTimeCapsule: + special Special_AbortLink checkflag ENGINE_KRIS_IN_CABLE_CLUB - iftrue UnknownScript_0x192c66 + iftrue .Female applymovement $4, MovementData_0x192d08 applymovement $0, MovementData_0x192cf9 applymovement $4, MovementData_0x192d01 - jump UnknownScript_0x192c8c + jump .Done -UnknownScript_0x192c66: +.Female: applymovement $4, MovementData_0x192d08 applymovement $0, MovementData_0x192cfc clearflag ENGINE_KRIS_IN_CABLE_CLUB @@ -574,7 +574,7 @@ UnknownScript_0x192c66: special Functione4a applymovement $0, MovementData_0x192cfc applymovement $4, MovementData_0x192d01 -UnknownScript_0x192c8c: +.Done: dotrigger $0 domaptrigger GROUP_TIME_CAPSULE, MAP_TIME_CAPSULE, $0 end @@ -588,32 +588,32 @@ MapPokeCenter2FSignpost0Script: OfficerScript_0x192c9a: faceplayer loadfont - checkevent EVENT_711 - iftrue UnknownScript_0x192cb8 - writetext UnknownText_0x193190 + checkevent EVENT_MYSTERY_GIFT_DELIVERY_GUY + iftrue .AlreadyGotGift + writetext Text_MysteryGiftDeliveryGuy_Intro yesorno - iffalse UnknownScript_0x192cc4 - writetext UnknownText_0x1931c4 + iffalse .RefusedGift + writetext Text_MysteryGiftDeliveryGuy_HereYouGo keeptextopen waitbutton - special Functionc309 - iffalse UnknownScript_0x192cbe + special Special_GetMysteryGiftItem + iffalse .BagIsFull itemnotify - setevent EVENT_711 -UnknownScript_0x192cb8: - writetext UnknownText_0x1931d2 + setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY +.AlreadyGotGift: + writetext Text_MysteryGiftDeliveryGuy_Outro closetext loadmovesprites end -UnknownScript_0x192cbe: - writetext UnknownText_0x1931ef +.BagIsFull: + writetext Text_MysteryGiftDeliveryGuy_NoRoom closetext loadmovesprites end -UnknownScript_0x192cc4: - writetext UnknownText_0x19324d +.RefusedGift: + writetext Text_MysteryGiftDeliveryGuy_SaidNo closetext loadmovesprites end @@ -795,7 +795,7 @@ MovementData_0x192d36: turn_head_left step_end -UnknownText_0x192d39: +Text_BattleReceptionistMobile: text "Would you like to" line "battle over a GAME" @@ -803,7 +803,7 @@ UnknownText_0x192d39: line "mobile phone?" done -UnknownText_0x192d7e: +Text_TradeReceptionistMobile: text "Would you like to" line "trade over a GAME" @@ -811,12 +811,12 @@ UnknownText_0x192d7e: line "mobile phone?" done -UnknownText_0x192dc2: +Text_ThisWayToMobileRoom: text "This way to the" line "MOBILE ROOM." done -UnknownText_0x192de0: +Text_BattleReceptionistIntro: text "Welcome to CABLE" line "CLUB COLOSSEUM." @@ -827,7 +827,7 @@ UnknownText_0x192de0: line "battle?" done -UnknownText_0x192e3a: +Text_TradeReceptionistIntro: text "Welcome to CABLE" line "TRADE CENTER." @@ -839,7 +839,7 @@ UnknownText_0x192e3a: line "trade?" done -UnknownText_0x192e9f: +Text_TimeCapsuleRecptionistIntro: text "Welcome to CABLE" line "CLUB TIME CAPSULE." @@ -851,22 +851,22 @@ UnknownText_0x192e9f: line "trade across time?" done -UnknownText_0x192f19: +Text_FriendNotReady: text "Your friend is not" line "ready." prompt -UnknownText_0x192f34: +Text_MustSaveGame: text "Before opening the" line "link, you must" cont "save your game." done -UnknownText_0x192f67: +Text_PleaseWait: text "Please wait." done -UnknownText_0x192f75: +Text_LinkTimedOut: text "The link has been" line "closed because of" cont "inactivity." @@ -876,46 +876,46 @@ UnknownText_0x192f75: cont "come again." prompt -UnknownText_0x192fd1: +Text_PleaseComeAgain: text "Please come again." prompt -UnknownText_0x192fe5: +Text_PleaseComeIn: text "Please come in." prompt -UnknownText_0x192ff6: +Text_TemporaryStagingInLinkRoom: text "We'll put you in" line "the link room for" cont "the time being." done -UnknownText_0x193029: +Text_CantLinkToThePast: text "You can't link to" line "the past here." prompt -UnknownText_0x19304a: +Text_IncompatibleRooms: text "Incompatible rooms" line "were chosen." prompt -UnknownText_0x19306b: +Text_PleaseComeIn2: text "Please come in." done -UnknownText_0x19307c: +Text_PleaseEnter: text "Please enter." prompt -UnknownText_0x19308b: +Text_RejectNewMon: text "Sorry--@" text_from_ram StringBuffer1 text "" line "can't be taken." prompt -UnknownText_0x1930a8: +Text_RejectMonWithNewMove: text "You can't take the" line "@" text_from_ram StringBuffer1 @@ -925,7 +925,7 @@ UnknownText_0x1930a8: text "." prompt -UnknownText_0x1930cf: +Text_RejectMonWithMail: text "You can't take the" line "@" text_from_ram StringBuffer1 @@ -933,25 +933,25 @@ UnknownText_0x1930cf: cont "has MAIL with you." prompt -UnknownText_0x193100: +Text_TimeCapsuleClosed: text "I'm sorry--the" line "TIME CAPSULE is" cont "being adjusted." done -UnknownText_0x19312f: +Text_TradeRoomClosed: text "I'm sorry--the" line "TRADE MACHINE is" cont "being adjusted." done -UnknownText_0x19315f: +Text_BattleRoomClosed: text "I'm sorry--the" line "BATTLE MACHINE is" cont "being adjusted." done -UnknownText_0x193190: +Text_MysteryGiftDeliveryGuy_Intro: text "Hello! You're" line ", right?" @@ -959,16 +959,16 @@ UnknownText_0x193190: line "thing for you." done -UnknownText_0x1931c4: +Text_MysteryGiftDeliveryGuy_HereYouGo: text "Here you go!" done -UnknownText_0x1931d2: +Text_MysteryGiftDeliveryGuy_Outro: text "We hope to serve" line "you again." done -UnknownText_0x1931ef: +Text_MysteryGiftDeliveryGuy_NoRoom: text "Oh, you have no" line "space for this." @@ -979,26 +979,26 @@ UnknownText_0x1931ef: line "to pick it up." done -UnknownText_0x19324d: +Text_MysteryGiftDeliveryGuy_SaidNo: text "No? That's very" line "strange…" done -UnknownText_0x193266: +Text_OhPleaseWait: text "Oh, please wait." done -UnknownText_0x193278: +Text_ChangeTheLook: text "We need to change" line "the look here…" done -UnknownText_0x19329a: +Text_LikeTheLook: text "How does this" line "style look to you?" done -UnknownText_0x1932bc: +Text_BrokeStadiumRules: text "Excuse me!" para "For STADIUM rules," @@ -1024,7 +1024,7 @@ PokeCenter2F_MapEventHeader: ; warps db 6 - warp_def $7, $0, 255, GROUP_POKECENTER_2F, MAP_POKECENTER_2F + warp_def $7, $0, -1, GROUP_POKECENTER_2F, MAP_POKECENTER_2F warp_def $0, $5, 1, GROUP_TRADE_CENTER, MAP_TRADE_CENTER warp_def $0, $9, 1, GROUP_COLOSSEUM, MAP_COLOSSEUM warp_def $2, $d, 1, GROUP_TIME_CAPSULE, MAP_TIME_CAPSULE @@ -1036,11 +1036,11 @@ PokeCenter2F_MapEventHeader: ; signposts db 1 - signpost 3, 7, $0, MapPokeCenter2FSignpost0Script + signpost 3, 7, SIGNPOST_READ, MapPokeCenter2FSignpost0Script ; people-events db 4 - person_event SPRITE_LINK_RECEPTIONIST, 6, 9, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x19289d, -1 - person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, -1 - person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, -1 - person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, EVENT_711 + person_event SPRITE_LINK_RECEPTIONIST, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LinkReceptionistScript_Trade, -1 + person_event SPRITE_LINK_RECEPTIONIST, 6, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LinkReceptionistScript_Battle, -1 + person_event SPRITE_LINK_RECEPTIONIST, 7, 17, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LinkReceptionistScript_TimeCapsule, -1 + person_event SPRITE_OFFICER, 5, 5, UP << 2 | $2, $0, -1, -1, $0, 0, OfficerScript_0x192c9a, EVENT_MYSTERY_GIFT_DELIVERY_GUY diff --git a/maps/PokeSeersHouse.asm b/maps/PokeSeersHouse.asm index d02a50549..07a3eec00 100644 --- a/maps/PokeSeersHouse.asm +++ b/maps/PokeSeersHouse.asm @@ -30,4 +30,4 @@ PokeSeersHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, -1 + person_event SPRITE_GRANNY, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SeerScript, -1 diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 79a58e025..5b8df0ede 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -302,14 +302,14 @@ PokemonFanClub_MapEventHeader: ; signposts db 2 - signpost 0, 7, $0, MapPokemonFanClubSignpost0Script - signpost 0, 9, $0, MapPokemonFanClubSignpost1Script + signpost 0, 7, SIGNPOST_READ, MapPokemonFanClubSignpost0Script + signpost 0, 9, SIGNPOST_READ, MapPokemonFanClubSignpost1Script ; people-events db 6 - person_event SPRITE_GENTLEMAN, 5, 7, $6, $0, 255, 255, $0, 0, GentlemanScript_0x1917e9, -1 - person_event SPRITE_RECEPTIONIST, 5, 8, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x191821, -1 - person_event SPRITE_FISHER, 7, 6, $9, $0, 255, 255, $0, 0, FisherScript_0x191824, -1 - person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, -1 - person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, EVENT_774 - person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, -1 + person_event SPRITE_GENTLEMAN, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, GentlemanScript_0x1917e9, -1 + person_event SPRITE_RECEPTIONIST, 5, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x191821, -1 + person_event SPRITE_FISHER, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, FisherScript_0x191824, -1 + person_event SPRITE_TEACHER, 6, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, TeacherScript_0x19186b, -1 + person_event SPRITE_FAIRY, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, FairyScript_0x19186e, EVENT_774 + person_event SPRITE_ODDISH, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OddishScript_0x191871, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index b534b7fb3..409a51395 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -396,15 +396,15 @@ PowerPlant_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, PowerPlantBookshelf - signpost 1, 1, $0, PowerPlantBookshelf + signpost 1, 0, SIGNPOST_READ, PowerPlantBookshelf + signpost 1, 1, SIGNPOST_READ, PowerPlantBookshelf ; people-events db 7 - person_event SPRITE_OFFICER, 18, 8, $6, $0, 255, 255, $a0, 0, OfficerScript_0x188df5, -1 - person_event SPRITE_GYM_GUY, 13, 6, $3, $0, 255, 255, $90, 0, GymGuyScript_0x188e15, -1 - person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, -1 - person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, -1 - person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, -1 - person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, -1 - person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, -1 + person_event SPRITE_OFFICER, 18, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x188df5, -1 + person_event SPRITE_GYM_GUY, 13, 6, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e15, -1 + person_event SPRITE_GYM_GUY, 15, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e29, -1 + person_event SPRITE_OFFICER, 7, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x188e3d, -1 + person_event SPRITE_GYM_GUY, 6, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188e51, -1 + person_event SPRITE_FISHER, 14, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PowerPlantManager, -1 + person_event SPRITE_GYM_GUY, 9, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GymGuyScript_0x188ecb, -1 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index a51b48c13..35eaa8e94 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -495,14 +495,14 @@ RadioTower1F_MapEventHeader: ; signposts db 2 - signpost 0, 3, $0, MapRadioTower1FSignpost0Script - signpost 0, 13, $0, MapRadioTower1FSignpost1Script + signpost 0, 3, SIGNPOST_READ, MapRadioTower1FSignpost0Script + signpost 0, 13, SIGNPOST_READ, MapRadioTower1FSignpost1Script ; people-events db 6 - person_event SPRITE_RECEPTIONIST, 10, 9, $8, $0, 255, 255, $80, 0, ReceptionistScript_0x5cd29, -1 - person_event SPRITE_LASS, 8, 20, $8, $0, 255, 255, $80, 0, LassScript_0x5ce51, EVENT_6CF - person_event SPRITE_YOUNGSTER, 8, 19, $9, $0, 255, 255, $90, 0, YoungsterScript_0x5ce54, EVENT_6CF - person_event SPRITE_ROCKET, 5, 18, $6, $0, 255, 255, $2, 3, TrainerGruntM3, EVENT_6CE - person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $90, 0, GentlemanScript_0x5cd3d, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 10, 16, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x5cdd5, EVENT_6CF + person_event SPRITE_RECEPTIONIST, 10, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x5cd29, -1 + person_event SPRITE_LASS, 8, 20, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x5ce51, EVENT_6CF + person_event SPRITE_YOUNGSTER, 8, 19, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5ce54, EVENT_6CF + person_event SPRITE_ROCKET, 5, 18, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM3, EVENT_6CE + person_event SPRITE_GENTLEMAN, 10, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x5cd3d, EVENT_6CF + person_event SPRITE_COOLTRAINER_F, 10, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5cdd5, EVENT_6CF diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 1942202d0..0363e1afe 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -775,23 +775,23 @@ RadioTower2F_MapEventHeader: ; signposts db 6 - signpost 0, 3, $0, MapRadioTower2FSignpost0Script - signpost 0, 5, $0, MapRadioTower2FSignpost1Script - signpost 1, 9, $0, RadioTower2FBookshelf - signpost 1, 10, $0, RadioTower2FBookshelf - signpost 1, 11, $0, RadioTower2FBookshelf - signpost 0, 13, $0, MapRadioTower2FSignpost5Script + signpost 0, 3, SIGNPOST_READ, MapRadioTower2FSignpost0Script + signpost 0, 5, SIGNPOST_READ, MapRadioTower2FSignpost1Script + signpost 1, 9, SIGNPOST_READ, RadioTower2FBookshelf + signpost 1, 10, SIGNPOST_READ, RadioTower2FBookshelf + signpost 1, 11, SIGNPOST_READ, RadioTower2FBookshelf + signpost 0, 13, SIGNPOST_READ, MapRadioTower2FSignpost5Script ; people-events db 11 - person_event SPRITE_SUPER_NERD, 10, 10, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x5d6fe, EVENT_6CF - person_event SPRITE_TEACHER, 6, 21, $5, $1, 255, 255, $80, 0, TeacherScript_0x5d701, -1 - person_event SPRITE_ROCKET, 8, 5, $7, $0, 255, 255, $2, 3, TrainerGruntM4, EVENT_6CE - person_event SPRITE_ROCKET, 8, 12, $6, $0, 255, 255, $2, 3, TrainerGruntM5, EVENT_6CE - person_event SPRITE_ROCKET, 5, 8, $6, $0, 255, 255, $2, 2, TrainerGruntM6, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 9, 14, $7, $0, 255, 255, $82, 3, TrainerGruntF2, EVENT_6CE - person_event SPRITE_BLACK_BELT, 5, 4, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d71f, EVENT_6D1 - person_event SPRITE_BLACK_BELT, 5, 5, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d722, EVENT_6D0 - person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, -1 - person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, -1 - person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, EVENT_6CF + person_event SPRITE_SUPER_NERD, 10, 10, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x5d6fe, EVENT_6CF + person_event SPRITE_TEACHER, 6, 21, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x5d701, -1 + person_event SPRITE_ROCKET, 8, 5, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM4, EVENT_6CE + person_event SPRITE_ROCKET, 8, 12, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM5, EVENT_6CE + person_event SPRITE_ROCKET, 5, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerGruntM6, EVENT_6CE + person_event SPRITE_ROCKET_GIRL, 9, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerGruntF2, EVENT_6CE + person_event SPRITE_BLACK_BELT, 5, 4, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d71f, EVENT_6D1 + person_event SPRITE_BLACK_BELT, 5, 5, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d722, EVENT_6D0 + person_event SPRITE_JIGGLYPUFF, 5, 16, UP << 2 | $12, $0, -1, -1, $0, 0, JigglypuffScript_0x5d715, -1 + person_event SPRITE_BUENA, 9, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Buena, -1 + person_event SPRITE_RECEPTIONIST, 11, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x5d8ff, EVENT_6CF diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index f504583e1..8cf57820f 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -401,16 +401,16 @@ RadioTower3F_MapEventHeader: ; signposts db 3 - signpost 0, 3, $0, MapRadioTower3FSignpost0Script - signpost 0, 9, $0, MapRadioTower3FSignpost1Script - signpost 2, 14, $1, MapRadioTower3FSignpost2Script + signpost 0, 3, SIGNPOST_READ, MapRadioTower3FSignpost0Script + signpost 0, 9, SIGNPOST_READ, MapRadioTower3FSignpost1Script + signpost 2, 14, SIGNPOST_UP, MapRadioTower3FSignpost2Script ; people-events db 7 - person_event SPRITE_SUPER_NERD, 8, 11, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x5e553, EVENT_6D0 - person_event SPRITE_GYM_GUY, 8, 7, $a, $0, 255, 255, $80, 0, GymGuyScript_0x5e556, -1 - person_event SPRITE_COOLTRAINER_F, 7, 15, $2, $11, 255, 255, $a0, 0, CooltrainerFScript_0x5e56a, -1 - person_event SPRITE_ROCKET, 5, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM7, EVENT_6CE - person_event SPRITE_ROCKET, 6, 10, $6, $0, 255, 255, $2, 3, TrainerGruntM8, EVENT_6CE - person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, EVENT_6CE - person_event SPRITE_SCIENTIST, 10, 13, $7, $0, 255, 255, $92, 5, TrainerScientistMarc, EVENT_6CE + person_event SPRITE_SUPER_NERD, 8, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x5e553, EVENT_6D0 + person_event SPRITE_GYM_GUY, 8, 7, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GymGuyScript_0x5e556, -1 + person_event SPRITE_COOLTRAINER_F, 7, 15, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5e56a, -1 + person_event SPRITE_ROCKET, 5, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM7, EVENT_6CE + person_event SPRITE_ROCKET, 6, 10, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM8, EVENT_6CE + person_event SPRITE_ROCKET, 10, 20, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM9, EVENT_6CE + person_event SPRITE_SCIENTIST, 10, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerScientistMarc, EVENT_6CE diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 0bcddf8bb..921df243c 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -316,15 +316,15 @@ RadioTower4F_MapEventHeader: ; signposts db 2 - signpost 0, 7, $0, MapRadioTower4FSignpost0Script - signpost 0, 15, $0, MapRadioTower4FSignpost1Script + signpost 0, 7, SIGNPOST_READ, MapRadioTower4FSignpost0Script + signpost 0, 15, SIGNPOST_READ, MapRadioTower4FSignpost1Script ; people-events db 7 - person_event SPRITE_FISHER, 8, 10, $7, $0, 255, 255, $80, 0, FisherScript_0x5eb82, EVENT_6D0 - person_event SPRITE_TEACHER, 10, 18, $3, $0, 255, 255, $a0, 0, TeacherScript_0x5eb85, -1 - person_event SPRITE_GROWLITHE, 11, 16, $16, $0, 255, 255, $80, 0, GrowlitheScript_0x5ebb2, -1 - person_event SPRITE_ROCKET, 10, 9, $1f, $0, 255, 255, $2, 3, TrainerGruntM10, EVENT_6CE - person_event SPRITE_ROCKET, 5, 18, $8, $2, 255, 255, $2, 2, TrainerExecutivem2, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, EVENT_6CE - person_event SPRITE_SCIENTIST, 6, 8, $8, $0, 255, 255, $92, 4, TrainerScientistRich, EVENT_6CE + person_event SPRITE_FISHER, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x5eb82, EVENT_6D0 + person_event SPRITE_TEACHER, 10, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5eb85, -1 + person_event SPRITE_GROWLITHE, 11, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrowlitheScript_0x5ebb2, -1 + person_event SPRITE_ROCKET, 10, 9, RIGHT << 2 | $13, $0, -1, -1, $2, 3, TrainerGruntM10, EVENT_6CE + person_event SPRITE_ROCKET, 5, 18, LEFT << 2 | $0, $2, -1, -1, $2, 2, TrainerExecutivem2, EVENT_6CE + person_event SPRITE_ROCKET_GIRL, 8, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF4, EVENT_6CE + person_event SPRITE_SCIENTIST, 6, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerScientistRich, EVENT_6CE diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index e4a130ef0..2604cc4e4 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -447,16 +447,16 @@ RadioTower5F_MapEventHeader: ; signposts db 5 - signpost 0, 3, $0, MapRadioTower5FSignpost0Script - signpost 0, 11, $0, MapRadioTower5FSignpost2Script - signpost 0, 15, $0, MapRadioTower5FSignpost2Script - signpost 1, 16, $0, RadioTower5FBookshelf - signpost 1, 17, $0, RadioTower5FBookshelf + signpost 0, 3, SIGNPOST_READ, MapRadioTower5FSignpost0Script + signpost 0, 11, SIGNPOST_READ, MapRadioTower5FSignpost2Script + signpost 0, 15, SIGNPOST_READ, MapRadioTower5FSignpost2Script + signpost 1, 16, SIGNPOST_READ, RadioTower5FBookshelf + signpost 1, 17, SIGNPOST_READ, RadioTower5FBookshelf ; people-events db 5 - person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, -1 - person_event SPRITE_ROCKET, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, EVENT_6CE - person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, Ben, EVENT_6D0 - person_event SPRITE_POKE_BALL, 9, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x600fe, EVENT_7CD + person_event SPRITE_GENTLEMAN, 10, 7, DOWN << 2 | $3, $0, -1, -1, $0, 0, Director, -1 + person_event SPRITE_ROCKET, 9, 17, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6CE + person_event SPRITE_ROCKET_GIRL, 6, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerExecutivef1, EVENT_6CE + person_event SPRITE_ROCKER, 9, 17, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Ben, EVENT_6D0 + person_event SPRITE_POKE_BALL, 9, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x600fe, EVENT_7CD diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index 80f5ecf59..29bd4f643 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -88,10 +88,10 @@ RedsHouse1F_MapEventHeader: ; signposts db 3 - signpost 1, 0, $0, RedsHouse1FBookshelf - signpost 1, 1, $0, RedsHouse1FBookshelf - signpost 1, 2, $0, RedsHouse1FTV + signpost 1, 0, SIGNPOST_READ, RedsHouse1FBookshelf + signpost 1, 1, SIGNPOST_READ, RedsHouse1FBookshelf + signpost 1, 2, SIGNPOST_READ, RedsHouse1FTV ; people-events db 1 - person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, -1 + person_event SPRITE_REDS_MOM, 7, 9, LEFT << 2 | $0, $0, -1, -1, $0, 0, RedsMom, -1 diff --git a/maps/RedsHouse2F.asm b/maps/RedsHouse2F.asm index 0a6e90281..9ad02e96a 100644 --- a/maps/RedsHouse2F.asm +++ b/maps/RedsHouse2F.asm @@ -38,8 +38,8 @@ RedsHouse2F_MapEventHeader: ; signposts db 2 - signpost 5, 3, $0, MapRedsHouse2FSignpost0Script - signpost 1, 0, $0, MapRedsHouse2FSignpost1Script + signpost 5, 3, SIGNPOST_READ, MapRedsHouse2FSignpost0Script + signpost 1, 0, SIGNPOST_READ, MapRedsHouse2FSignpost1Script ; people-events db 0 diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 5082a7626..9273dacf2 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -39,10 +39,10 @@ RockTunnel1F_MapEventHeader: ; signposts db 2 - signpost 4, 24, $7, MapRockTunnel1FSignpostItem0 - signpost 15, 21, $7, MapRockTunnel1FSignpostItem1 + signpost 4, 24, SIGNPOST_ITEMIFSET, MapRockTunnel1FSignpostItem0 + signpost 15, 21, SIGNPOST_ITEMIFSET, MapRockTunnel1FSignpostItem1 ; people-events db 2 - person_event SPRITE_POKE_BALL, 22, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b5, EVENT_77E - person_event SPRITE_POKE_BALL, 19, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x743b7, EVENT_77F + person_event SPRITE_POKE_BALL, 22, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b5, EVENT_77E + person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b7, EVENT_77F diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index f59302e7b..275572cf1 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -35,10 +35,10 @@ RockTunnelB1F_MapEventHeader: ; signposts db 1 - signpost 14, 4, $7, MapRockTunnelB1FSignpostItem0 + signpost 14, 4, SIGNPOST_ITEMIFSET, MapRockTunnelB1FSignpostItem0 ; people-events db 3 - person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74409, EVENT_780 - person_event SPRITE_POKE_BALL, 21, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440b, EVENT_781 - person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7440d, EVENT_782 + person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74409, EVENT_780 + person_event SPRITE_POKE_BALL, 21, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440b, EVENT_781 + person_event SPRITE_POKE_BALL, 6, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440d, EVENT_782 diff --git a/maps/Route1.asm b/maps/Route1.asm index 6167b9eef..3dad15826 100644 --- a/maps/Route1.asm +++ b/maps/Route1.asm @@ -119,10 +119,10 @@ Route1_MapEventHeader: ; signposts db 1 - signpost 27, 7, $0, MapRoute1Signpost0Script + signpost 27, 7, SIGNPOST_READ, MapRoute1Signpost0Script ; people-events db 3 - person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, -1 - person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, -1 - person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, -1 + person_event SPRITE_YOUNGSTER, 16, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSchoolboyDanny, -1 + person_event SPRITE_COOLTRAINER_F, 29, 13, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfQuinn, -1 + person_event SPRITE_FRUIT_TREE, 11, 7, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac581, -1 diff --git a/maps/Route10North.asm b/maps/Route10North.asm index bf120445a..19106b3c3 100644 --- a/maps/Route10North.asm +++ b/maps/Route10North.asm @@ -29,8 +29,8 @@ Route10North_MapEventHeader: ; signposts db 2 - signpost 11, 5, $0, PowerPlantSign - signpost 1, 12, $0, Route10PokeCenterSign + signpost 11, 5, SIGNPOST_READ, PowerPlantSign + signpost 1, 12, SIGNPOST_READ, Route10PokeCenterSign ; people-events db 0 diff --git a/maps/Route10PokeCenter1F.asm b/maps/Route10PokeCenter1F.asm index fba6dc384..01ddeb242 100644 --- a/maps/Route10PokeCenter1F.asm +++ b/maps/Route10PokeCenter1F.asm @@ -92,7 +92,7 @@ Route10PokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x188bd4, -1 - person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, -1 - person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, -1 - person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x188bd4, -1 + person_event SPRITE_GENTLEMAN, 10, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x188bd7, -1 + person_event SPRITE_GYM_GUY, 6, 11, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x188bda, -1 + person_event SPRITE_COOLTRAINER_F, 7, 5, UP << 2 | $2, $0, -1, -1, $0, 0, CooltrainerFScript_0x188bee, -1 diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 96c37b4e4..3d850317e 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -116,9 +116,9 @@ Route10South_MapEventHeader: ; signposts db 1 - signpost 3, 5, $0, MapRoute10SouthSignpost0Script + signpost 3, 5, SIGNPOST_READ, MapRoute10SouthSignpost0Script ; people-events db 2 - person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, -1 - person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, -1 + person_event SPRITE_POKEFAN_M, 7, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerJim, -1 + person_event SPRITE_POKEFAN_M, 14, 12, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmRobert, -1 diff --git a/maps/Route11.asm b/maps/Route11.asm index f18707d0b..be306934a 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -216,13 +216,13 @@ Route11_MapEventHeader: ; signposts db 2 - signpost 7, 3, $0, MapRoute11Signpost0Script - signpost 5, 32, $7, MapRoute11SignpostItem1 + signpost 7, 3, SIGNPOST_READ, MapRoute11Signpost0Script + signpost 5, 32, SIGNPOST_ITEMIFSET, MapRoute11SignpostItem1 ; people-events db 5 - person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, -1 - person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, -1 - person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, -1 - person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, -1 - person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, -1 + person_event SPRITE_YOUNGSTER, 18, 26, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterOwen, -1 + person_event SPRITE_YOUNGSTER, 8, 24, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJason, -1 + person_event SPRITE_YOUNGSTER, 11, 32, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerPsychicHerman, -1 + person_event SPRITE_YOUNGSTER, 10, 12, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicFidel, -1 + person_event SPRITE_FRUIT_TREE, 6, 36, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x68055, -1 diff --git a/maps/Route12.asm b/maps/Route12.asm index 7500bad90..304595709 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -237,15 +237,15 @@ Route12_MapEventHeader: ; signposts db 3 - signpost 27, 11, $0, MapRoute12Signpost0Script - signpost 9, 13, $0, MapRoute12Signpost1Script - signpost 13, 14, $7, MapRoute12SignpostItem2 + signpost 27, 11, SIGNPOST_READ, MapRoute12Signpost0Script + signpost 9, 13, SIGNPOST_READ, MapRoute12Signpost1Script + signpost 13, 14, SIGNPOST_ITEMIFSET, MapRoute12SignpostItem2 ; people-events db 6 - person_event SPRITE_FISHER, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, -1 - person_event SPRITE_FISHER, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, -1 - person_event SPRITE_FISHER, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, -1 - person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, -1 - person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, EVENT_788 - person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, EVENT_789 + person_event SPRITE_FISHER, 17, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherMartin, -1 + person_event SPRITE_FISHER, 27, 18, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherStephen, -1 + person_event SPRITE_FISHER, 42, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerFisherBarney, -1 + person_event SPRITE_FISHER, 11, 10, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherKyle, -1 + person_event SPRITE_POKE_BALL, 47, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700b, EVENT_788 + person_event SPRITE_POKE_BALL, 55, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700d, EVENT_789 diff --git a/maps/Route12SuperRodHouse.asm b/maps/Route12SuperRodHouse.asm index 81675c921..d818195a2 100644 --- a/maps/Route12SuperRodHouse.asm +++ b/maps/Route12SuperRodHouse.asm @@ -93,4 +93,4 @@ Route12SuperRodHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, -1 + person_event SPRITE_FISHING_GURU, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x7f484, -1 diff --git a/maps/Route13.asm b/maps/Route13.asm index 842580f78..29fe2a27c 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -278,15 +278,15 @@ Route13_MapEventHeader: ; signposts db 4 - signpost 13, 29, $0, MapRoute13Signpost0Script - signpost 11, 41, $0, MapRoute13Signpost1Script - signpost 13, 17, $0, MapRoute13Signpost2Script - signpost 13, 30, $7, MapRoute13SignpostItem3 + signpost 13, 29, SIGNPOST_READ, MapRoute13Signpost0Script + signpost 11, 41, SIGNPOST_READ, MapRoute13Signpost1Script + signpost 13, 17, SIGNPOST_READ, MapRoute13Signpost2Script + signpost 13, 30, SIGNPOST_ITEMIFSET, MapRoute13SignpostItem3 ; people-events db 5 - person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, -1 - person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, -1 - person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, -1 - person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, -1 - person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, -1 + person_event SPRITE_YOUNGSTER, 10, 46, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBird_keeperPerry, -1 + person_event SPRITE_YOUNGSTER, 10, 47, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerBird_keeperBret, -1 + person_event SPRITE_POKEFAN_M, 12, 36, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJoshua, -1 + person_event SPRITE_POKEFAN_M, 14, 18, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerHikerKenny, -1 + person_event SPRITE_POKEFAN_M, 10, 29, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerPokefanmAlex, -1 diff --git a/maps/Route14.asm b/maps/Route14.asm index 1db2b2738..61dbc2006 100644 --- a/maps/Route14.asm +++ b/maps/Route14.asm @@ -172,7 +172,7 @@ Route14_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, -1 - person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, -1 - person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, -1 - person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, -1 + person_event SPRITE_POKEFAN_M, 19, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmCarter, -1 + person_event SPRITE_YOUNGSTER, 31, 15, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperRoy, -1 + person_event SPRITE_POKEFAN_M, 15, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmTrevor, -1 + person_event SPRITE_TEACHER, 9, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 4, TeacherScript_0x1ad47f, -1 diff --git a/maps/Route15.asm b/maps/Route15.asm index 6626ae41c..b59aa9edc 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -302,14 +302,14 @@ Route15_MapEventHeader: ; signposts db 1 - signpost 9, 19, $0, MapRoute15Signpost0Script + signpost 9, 19, SIGNPOST_READ, MapRoute15Signpost0Script ; people-events db 7 - person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, -1 - person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, -1 - person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, -1 - person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, -1 - person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, -1 - person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, -1 - person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, EVENT_78A + person_event SPRITE_YOUNGSTER, 14, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSchoolboyKipp, -1 + person_event SPRITE_YOUNGSTER, 17, 19, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyTommy, -1 + person_event SPRITE_YOUNGSTER, 14, 37, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyJohnny, -1 + person_event SPRITE_YOUNGSTER, 14, 31, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyBilly, -1 + person_event SPRITE_TEACHER, 16, 34, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerTeacherColette, -1 + person_event SPRITE_TEACHER, 14, 24, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherHillary, -1 + person_event SPRITE_POKE_BALL, 9, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1aa5e4, EVENT_78A diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm index c29e3d558..d53790f7d 100644 --- a/maps/Route15FuchsiaGate.asm +++ b/maps/Route15FuchsiaGate.asm @@ -35,4 +35,4 @@ Route15FuchsiaGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x19679e, -1 diff --git a/maps/Route16.asm b/maps/Route16.asm index 80dd4a4cd..5214e4bb9 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -48,7 +48,7 @@ Route16_MapEventHeader: ; signposts db 1 - signpost 5, 5, $0, MapRoute16Signpost0Script + signpost 5, 5, SIGNPOST_READ, MapRoute16Signpost0Script ; people-events db 0 diff --git a/maps/Route16FuchsiaSpeechHouse.asm b/maps/Route16FuchsiaSpeechHouse.asm index 261c0af0d..51e20b647 100644 --- a/maps/Route16FuchsiaSpeechHouse.asm +++ b/maps/Route16FuchsiaSpeechHouse.asm @@ -33,9 +33,9 @@ Route16FuchsiaSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, Route16FuchsiaSpeechHouseBookshelf - signpost 1, 1, $0, Route16FuchsiaSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, Route16FuchsiaSpeechHouseBookshelf ; people-events db 1 - person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, -1 + person_event SPRITE_SUPER_NERD, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x73373, -1 diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index 2b62fee86..41ccef8b9 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -80,4 +80,4 @@ Route16Gate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x733ea, -1 diff --git a/maps/Route17.asm b/maps/Route17.asm index f3d24c2b3..8b38ec9a1 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -211,12 +211,12 @@ Route17_MapEventHeader: ; signposts db 2 - signpost 54, 9, $7, MapRoute17SignpostItem0 - signpost 77, 8, $7, MapRoute17SignpostItem1 + signpost 54, 9, SIGNPOST_ITEMIFSET, MapRoute17SignpostItem0 + signpost 77, 8, SIGNPOST_ITEMIFSET, MapRoute17SignpostItem1 ; people-events db 4 - person_event SPRITE_BIKER, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, -1 - person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, -1 - person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, -1 - person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, -1 + person_event SPRITE_BIKER, 21, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerBikerRiley, -1 + person_event SPRITE_BIKER, 72, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerBikerJoel, -1 + person_event SPRITE_BIKER, 57, 7, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBikerGlenn, -1 + person_event SPRITE_BIKER, 84, 10, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerBikerCharles, -1 diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index 46daed8b1..a1d9cbf11 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -71,4 +71,4 @@ Route1718Gate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7360e, -1 diff --git a/maps/Route18.asm b/maps/Route18.asm index 5724f0535..54c1b7c03 100644 --- a/maps/Route18.asm +++ b/maps/Route18.asm @@ -119,9 +119,9 @@ Route18_MapEventHeader: ; signposts db 1 - signpost 5, 9, $0, MapRoute18Signpost0Script + signpost 5, 9, SIGNPOST_READ, MapRoute18Signpost0Script ; people-events db 2 - person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, -1 - person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, -1 + person_event SPRITE_YOUNGSTER, 16, 13, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperBoris, -1 + person_event SPRITE_YOUNGSTER, 10, 17, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperBob, -1 diff --git a/maps/Route19.asm b/maps/Route19.asm index 184486610..e9f246767 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -306,14 +306,14 @@ Route19_MapEventHeader: ; signposts db 2 - signpost 13, 11, $0, MapRoute19Signpost0Script - signpost 1, 11, $0, MapRoute19Signpost1Script + signpost 13, 11, SIGNPOST_READ, MapRoute19Signpost0Script + signpost 1, 11, SIGNPOST_READ, MapRoute19Signpost1Script ; people-events db 6 - person_event SPRITE_SWIMMER_GIRL, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, -1 - person_event SPRITE_SWIMMER_GUY, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, -1 - person_event SPRITE_SWIMMER_GUY, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, -1 - person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, -1 - person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, -1 - person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, -1 + person_event SPRITE_SWIMMER_GIRL, 27, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerSwimmerfDawn, -1 + person_event SPRITE_SWIMMER_GUY, 32, 17, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermHarold, -1 + person_event SPRITE_SWIMMER_GUY, 21, 15, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermJerome, -1 + person_event SPRITE_SWIMMER_GUY, 27, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerSwimmermTucker, -1 + person_event SPRITE_FISHER, 9, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 1, FisherScript_0x19ea4d, -1 + person_event SPRITE_FISHER, 9, 15, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 1, FisherScript_0x19ea61, -1 diff --git a/maps/Route19FuchsiaGate.asm b/maps/Route19FuchsiaGate.asm index b6b913376..46ddb6eb0 100644 --- a/maps/Route19FuchsiaGate.asm +++ b/maps/Route19FuchsiaGate.asm @@ -61,4 +61,4 @@ Route19FuchsiaGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, -1 + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x1ab3f6, -1 diff --git a/maps/Route2.asm b/maps/Route2.asm index 4b35a30f2..f9929d677 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -209,20 +209,20 @@ Route2_MapEventHeader: ; signposts db 6 - signpost 51, 7, $0, MapRoute2Signpost0Script - signpost 9, 11, $0, MapRoute2Signpost1Script - signpost 23, 7, $7, MapRoute2SignpostItem2 - signpost 14, 4, $7, MapRoute2SignpostItem3 - signpost 27, 4, $7, MapRoute2SignpostItem4 - signpost 30, 11, $7, MapRoute2SignpostItem5 + signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script + signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script + signpost 23, 7, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem2 + signpost 14, 4, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem3 + signpost 27, 4, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem4 + signpost 30, 11, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem5 ; people-events db 8 - person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, -1 - person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, -1 - person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, -1 - person_event SPRITE_POKE_BALL, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, EVENT_783 - person_event SPRITE_POKE_BALL, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, EVENT_784 - person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, EVENT_785 - person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, EVENT_786 - person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, -1 + person_event SPRITE_BUG_CATCHER, 49, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherRob, -1 + person_event SPRITE_BUG_CATCHER, 8, 10, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherEd, -1 + person_event SPRITE_BUG_CATCHER, 44, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDoug, -1 + person_event SPRITE_POKE_BALL, 33, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac2fe, EVENT_783 + person_event SPRITE_POKE_BALL, 27, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac300, EVENT_784 + person_event SPRITE_POKE_BALL, 6, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac302, EVENT_785 + person_event SPRITE_POKE_BALL, 54, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac304, EVENT_786 + person_event SPRITE_FRUIT_TREE, 18, 14, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route20.asm b/maps/Route20.asm index 8846fb7ce..279baa4d2 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -171,10 +171,10 @@ Route20_MapEventHeader: ; signposts db 1 - signpost 11, 37, $0, MapRoute20Signpost0Script + signpost 11, 37, SIGNPOST_READ, MapRoute20Signpost0Script ; people-events db 3 - person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, -1 - person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, -1 - person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, -1 + person_event SPRITE_SWIMMER_GIRL, 12, 56, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfNicole, -1 + person_event SPRITE_SWIMMER_GIRL, 17, 49, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfLori, -1 + person_event SPRITE_SWIMMER_GUY, 17, 16, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermCameron, -1 diff --git a/maps/Route21.asm b/maps/Route21.asm index fe96e5bce..60fb9a37a 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -147,6 +147,6 @@ Route21_MapEventHeader: ; people-events db 3 - person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, -1 - person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, -1 - person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, -1 + person_event SPRITE_SWIMMER_GIRL, 20, 15, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfNikki, -1 + person_event SPRITE_SWIMMER_GUY, 34, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerSwimmermSeth, -1 + person_event SPRITE_FISHER, 26, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherArnold, -1 diff --git a/maps/Route22.asm b/maps/Route22.asm index 699cbd342..4aae8a738 100644 --- a/maps/Route22.asm +++ b/maps/Route22.asm @@ -28,7 +28,7 @@ Route22_MapEventHeader: ; signposts db 1 - signpost 7, 15, $0, MapRoute22Signpost0Script + signpost 7, 15, SIGNPOST_READ, MapRoute22Signpost0Script ; people-events db 0 diff --git a/maps/Route23.asm b/maps/Route23.asm index 81304151e..3bc0ff78e 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -40,7 +40,7 @@ Route23_MapEventHeader: ; signposts db 1 - signpost 7, 11, $0, IndigoPlateauSign + signpost 7, 11, SIGNPOST_READ, IndigoPlateauSign ; people-events db 0 diff --git a/maps/Route24.asm b/maps/Route24.asm index e02b1cff3..f39d76daf 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -130,4 +130,4 @@ Route24_MapEventHeader: ; people-events db 1 - person_event SPRITE_ROCKET, 11, 12, $3, $0, 255, 255, $0, 0, RocketScript_0x1adbfa, EVENT_76C + person_event SPRITE_ROCKET, 11, 12, DOWN << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x1adbfa, EVENT_76C diff --git a/maps/Route25.asm b/maps/Route25.asm index f5867764c..b1a114541 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -547,19 +547,19 @@ Route25_MapEventHeader: ; signposts db 2 - signpost 5, 45, $0, MapRoute25Signpost0Script - signpost 5, 4, $7, MapRoute25SignpostItem1 + signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script + signpost 5, 4, SIGNPOST_ITEMIFSET, MapRoute25SignpostItem1 ; people-events db 11 - person_event SPRITE_MISTY, 13, 50, $8, $0, 255, 255, $80, 0, ObjectEvent, EVENT_76E - person_event SPRITE_COOLTRAINER_M, 14, 50, $8, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_76E - person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, -1 - person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, -1 - person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, -1 - person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, -1 - person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, -1 - person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, -1 - person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, -1 - person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, -1 - person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, EVENT_78B + person_event SPRITE_MISTY, 13, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_76E + person_event SPRITE_COOLTRAINER_M, 14, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_76E + person_event SPRITE_YOUNGSTER, 12, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyDudley, -1 + person_event SPRITE_LASS, 15, 20, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassEllen, -1 + person_event SPRITE_YOUNGSTER, 12, 25, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyJoe, -1 + person_event SPRITE_LASS, 10, 26, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassLaura, -1 + person_event SPRITE_YOUNGSTER, 8, 29, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperLloyd, -1 + person_event SPRITE_LASS, 15, 32, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassShannon, -1 + person_event SPRITE_SUPER_NERD, 11, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerSupernerdPat, -1 + person_event SPRITE_COOLTRAINER_M, 12, 41, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x19efac, -1 + person_event SPRITE_POKE_BALL, 8, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19efe3, EVENT_78B diff --git a/maps/Route26.asm b/maps/Route26.asm index 9daa11e14..0b498de64 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -513,15 +513,15 @@ Route26_MapEventHeader: ; signposts db 1 - signpost 6, 8, $0, MapRoute26Signpost0Script + signpost 6, 8, SIGNPOST_READ, MapRoute26Signpost0Script ; people-events db 8 - person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, -1 - person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, -1 - person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, -1 - person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, -1 - person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, -1 - person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, -1 - person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, -1 - person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, EVENT_6AA + person_event SPRITE_COOLTRAINER_M, 28, 18, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermJake, -1 + person_event SPRITE_COOLTRAINER_M, 42, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermGaven3, -1 + person_event SPRITE_COOLTRAINER_F, 60, 14, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfJoyce, -1 + person_event SPRITE_COOLTRAINER_F, 12, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainerfBeth1, -1 + person_event SPRITE_YOUNGSTER, 83, 17, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPsychicRichard, -1 + person_event SPRITE_FISHER, 96, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherScott, -1 + person_event SPRITE_FRUIT_TREE, 58, 18, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a4ec2, -1 + person_event SPRITE_POKE_BALL, 19, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a4ec4, EVENT_6AA diff --git a/maps/Route26DayofWeekSiblingsHouse.asm b/maps/Route26DayofWeekSiblingsHouse.asm index fdae9b3a8..a7bb50373 100644 --- a/maps/Route26DayofWeekSiblingsHouse.asm +++ b/maps/Route26DayofWeekSiblingsHouse.asm @@ -84,4 +84,4 @@ Route26DayofWeekSiblingsHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, -1 + person_event SPRITE_POKEDEX, 7, 7, DOWN << 2 | $1, $0, -1, -1, $0, 0, PokedexScript_0x7b1e4, -1 diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealSpeechHouse.asm index 62814fd28..c3c880b8f 100644 --- a/maps/Route26HealSpeechHouse.asm +++ b/maps/Route26HealSpeechHouse.asm @@ -59,9 +59,9 @@ Route26HealSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, Route26HealHouseBookshelf - signpost 1, 1, $0, Route26HealHouseBookshelf + signpost 1, 0, SIGNPOST_READ, Route26HealHouseBookshelf + signpost 1, 1, SIGNPOST_READ, Route26HealHouseBookshelf ; people-events db 1 - person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, -1 + person_event SPRITE_TEACHER, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7b125, -1 diff --git a/maps/Route27.asm b/maps/Route27.asm index a1302d70c..eb3a1121a 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -68,7 +68,7 @@ PsychicGilbertScript: TrainerBird_keeperJose2: ; bit/flag number - dw EVENT_BEAT_BIRD_KEEPER_JOSE + dw EVENT_BEAT_BIRD_KEEPER_JOSE2 ; trainer group && trainer id db BIRD_KEEPER, JOSE2 @@ -571,16 +571,16 @@ Route27_MapEventHeader: ; signposts db 1 - signpost 7, 25, $0, MapRoute27Signpost0Script + signpost 7, 25, SIGNPOST_READ, MapRoute27Signpost0Script ; people-events db 9 - person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, -1 - person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, -1 - person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena, -1 - person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, -1 - person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, -1 - person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, -1 - person_event SPRITE_POKE_BALL, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, EVENT_6AB - person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, EVENT_6AC - person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, -1 + person_event SPRITE_COOLTRAINER_M, 11, 52, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermBlake, -1 + person_event SPRITE_COOLTRAINER_M, 10, 62, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainermBrian, -1 + person_event SPRITE_COOLTRAINER_F, 14, 76, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainerfReena, -1 + person_event SPRITE_COOLTRAINER_F, 10, 41, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfMegan, -1 + person_event SPRITE_YOUNGSTER, 11, 69, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicGilbert, -1 + person_event SPRITE_YOUNGSTER, 17, 62, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperJose2, -1 + person_event SPRITE_POKE_BALL, 16, 64, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a62, EVENT_6AB + person_event SPRITE_POKE_BALL, 16, 57, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a64, EVENT_6AC + person_event SPRITE_FISHER, 14, 25, DOWN << 2 | $3, $0, -1, -1, $0, 3, FisherScript_0x1a089c, -1 diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm index a6994be7a..f67b246b2 100644 --- a/maps/Route27SandstormHouse.asm +++ b/maps/Route27SandstormHouse.asm @@ -104,9 +104,9 @@ Route27SandstormHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, SandstormHouseBookshelf - signpost 1, 1, $0, SandstormHouseBookshelf + signpost 1, 0, SIGNPOST_READ, SandstormHouseBookshelf + signpost 1, 1, SIGNPOST_READ, SandstormHouseBookshelf ; people-events db 1 - person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, -1 + person_event SPRITE_GRANNY, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, SandstormHouseWoman, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index 3671a6f02..68afae6e6 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -31,8 +31,8 @@ Route28_MapEventHeader: ; signposts db 2 - signpost 5, 31, $0, MapRoute28Signpost0Script - signpost 2, 25, $7, MapRoute28SignpostItem1 + signpost 5, 31, SIGNPOST_READ, MapRoute28Signpost0Script + signpost 2, 25, SIGNPOST_ITEMIFSET, MapRoute28SignpostItem1 ; people-events db 0 diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index a95d08063..2c9731dc6 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -82,10 +82,10 @@ Route28FamousSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, CelebrityHouseBookshelf - signpost 1, 1, $0, CelebrityHouseBookshelf + signpost 1, 0, SIGNPOST_READ, CelebrityHouseBookshelf + signpost 1, 1, SIGNPOST_READ, CelebrityHouseBookshelf ; people-events db 2 - person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, -1 - person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, -1 + person_event SPRITE_COOLTRAINER_F, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Celebrity, -1 + person_event SPRITE_MOLTRES, 9, 10, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CelebritysFearow, -1 diff --git a/maps/Route29.asm b/maps/Route29.asm index 984dce1f6..b5a9710fe 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -425,16 +425,16 @@ Route29_MapEventHeader: ; signposts db 2 - signpost 7, 51, $0, MapRoute29Signpost0Script - signpost 5, 3, $0, MapRoute29Signpost1Script + signpost 7, 51, SIGNPOST_READ, MapRoute29Signpost0Script + signpost 5, 3, SIGNPOST_READ, MapRoute29Signpost1Script ; people-events db 8 - person_event SPRITE_COOLTRAINER_M, 16, 54, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a0ff1, -1 - person_event SPRITE_YOUNGSTER, 20, 31, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x1a1028, -1 - person_event SPRITE_TEACHER, 15, 19, $5, $1, 255, 255, $a0, 0, TeacherScript_0x1a102b, -1 - person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, -1 - person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, -1 - person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, -1 - person_event SPRITE_TEACHER, 16, 33, $3, $0, 255, 255, $0, 0, TuscanyScript, EVENT_759 - person_event SPRITE_POKE_BALL, 6, 52, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a108b, EVENT_6AD + person_event SPRITE_COOLTRAINER_M, 16, 54, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x1a0ff1, -1 + person_event SPRITE_YOUNGSTER, 20, 31, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a1028, -1 + person_event SPRITE_TEACHER, 15, 19, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x1a102b, -1 + person_event SPRITE_FRUIT_TREE, 6, 16, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a1089, -1 + person_event SPRITE_FISHER, 7, 29, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x1a102e, -1 + person_event SPRITE_COOLTRAINER_M, 8, 17, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x1a1031, -1 + person_event SPRITE_TEACHER, 16, 33, DOWN << 2 | $3, $0, -1, -1, $0, 0, TuscanyScript, EVENT_759 + person_event SPRITE_POKE_BALL, 6, 52, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a108b, EVENT_6AD diff --git a/maps/Route2946Gate.asm b/maps/Route2946Gate.asm index b0aafb185..1179575d5 100644 --- a/maps/Route2946Gate.asm +++ b/maps/Route2946Gate.asm @@ -51,5 +51,5 @@ Route2946Gate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, -1 - person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, -1 + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x7b5bb, -1 + person_event SPRITE_YOUNGSTER, 8, 10, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x7b5be, -1 diff --git a/maps/Route2Gate.asm b/maps/Route2Gate.asm index a7d74403d..9fb0826eb 100644 --- a/maps/Route2Gate.asm +++ b/maps/Route2Gate.asm @@ -41,4 +41,4 @@ Route2Gate_MapEventHeader: ; people-events db 1 - person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, -1 + person_event SPRITE_SCIENTIST, 8, 10, UP << 2 | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x9b952, -1 diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetSpeechHouse.asm index 9ce3a5330..abc5e6d10 100644 --- a/maps/Route2NuggetSpeechHouse.asm +++ b/maps/Route2NuggetSpeechHouse.asm @@ -66,4 +66,4 @@ Route2NuggetSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, -1 + person_event SPRITE_FISHER, 8, 6, UP << 2 | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x9b847, -1 diff --git a/maps/Route3.asm b/maps/Route3.asm index e9b310003..6b686c4c7 100644 --- a/maps/Route3.asm +++ b/maps/Route3.asm @@ -203,11 +203,11 @@ Route3_MapEventHeader: ; signposts db 1 - signpost 13, 49, $0, MapRoute3Signpost0Script + signpost 13, 49, SIGNPOST_READ, MapRoute3Signpost0Script ; people-events db 4 - person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, -1 - person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, -1 - person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, -1 - person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, -1 + person_event SPRITE_FISHER, 16, 30, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherOtis, -1 + person_event SPRITE_YOUNGSTER, 11, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterWarren, -1 + person_event SPRITE_YOUNGSTER, 7, 20, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerYoungsterJimmy, -1 + person_event SPRITE_FISHER, 9, 53, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerFirebreatherBurt, -1 diff --git a/maps/Route30.asm b/maps/Route30.asm index 7b6e4a770..94efe9c5f 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -457,22 +457,22 @@ Route30_MapEventHeader: ; signposts db 5 - signpost 43, 9, $0, MapRoute30Signpost0Script - signpost 29, 13, $0, MapRoute30Signpost1Script - signpost 5, 15, $0, MapRoute30Signpost2Script - signpost 21, 3, $0, MapRoute30Signpost3Script - signpost 9, 14, $7, MapRoute30SignpostItem4 + signpost 43, 9, SIGNPOST_READ, MapRoute30Signpost0Script + signpost 29, 13, SIGNPOST_READ, MapRoute30Signpost1Script + signpost 5, 15, SIGNPOST_READ, MapRoute30Signpost2Script + signpost 21, 3, SIGNPOST_READ, MapRoute30Signpost3Script + signpost 9, 14, SIGNPOST_ITEMIFSET, MapRoute30SignpostItem4 ; people-events db 11 - person_event SPRITE_YOUNGSTER, 30, 9, $7, $0, 255, 255, $90, 0, YoungsterScript_0x1a1673, EVENT_714 - person_event SPRITE_YOUNGSTER, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey, EVENT_715 - person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, -1 - person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, -1 - person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, -1 - person_event SPRITE_MONSTER, 28, 9, $6, $0, 255, 255, $80, 0, ObjectEvent, EVENT_714 - person_event SPRITE_MONSTER, 29, 9, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_714 - person_event SPRITE_FRUIT_TREE, 43, 9, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f7, -1 - person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, -1 - person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, -1 - person_event SPRITE_POKE_BALL, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, EVENT_7B8 + person_event SPRITE_YOUNGSTER, 30, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a1673, EVENT_714 + person_event SPRITE_YOUNGSTER, 32, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJoey, EVENT_715 + person_event SPRITE_YOUNGSTER, 27, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerYoungsterMikey, -1 + person_event SPRITE_BUG_CATCHER, 11, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDon, -1 + person_event SPRITE_YOUNGSTER, 34, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a17d2, -1 + person_event SPRITE_MONSTER, 28, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_714 + person_event SPRITE_MONSTER, 29, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_714 + person_event SPRITE_FRUIT_TREE, 43, 9, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a17f7, -1 + person_event SPRITE_FRUIT_TREE, 9, 15, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a17f9, -1 + person_event SPRITE_COOLTRAINER_F, 17, 6, UP << 2 | $2, $0, -1, -1, $0, 0, CooltrainerFScript_0x1a17e6, -1 + person_event SPRITE_POKE_BALL, 39, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a17f5, EVENT_7B8 diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerrySpeechHouse.asm index e17bd15e2..c914a7a8f 100644 --- a/maps/Route30BerrySpeechHouse.asm +++ b/maps/Route30BerrySpeechHouse.asm @@ -57,9 +57,9 @@ Route30BerrySpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, Route30BerrySpeechHouseBookshelf - signpost 1, 1, $0, Route30BerrySpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, Route30BerrySpeechHouseBookshelf ; people-events db 1 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, -1 + person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x196d64, -1 diff --git a/maps/Route31.asm b/maps/Route31.asm index 0845048c7..8db796540 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -252,7 +252,7 @@ UnknownScript_0x1a55c7: end ReceivedSpearowMailText: - db "DARK CAVE leads",$4E + db "DARK CAVE leads", $4E db "to another road@" YoungsterScript_0x1a55ed: @@ -441,15 +441,15 @@ Route31_MapEventHeader: ; signposts db 2 - signpost 5, 7, $0, MapRoute31Signpost0Script - signpost 5, 31, $0, MapRoute31Signpost1Script + signpost 5, 7, SIGNPOST_READ, MapRoute31Signpost0Script + signpost 5, 31, SIGNPOST_READ, MapRoute31Signpost1Script ; people-events db 7 - person_event SPRITE_FISHER, 11, 21, $6, $0, 255, 255, $0, 0, FisherScript_0x1a5570, -1 - person_event SPRITE_YOUNGSTER, 9, 13, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1a55ed, -1 - person_event SPRITE_BUG_CATCHER, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, -1 - person_event SPRITE_COOLTRAINER_M, 12, 37, $2, $11, 255, 255, $0, 0, CooltrainerMScript_0x1a55f6, -1 - person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, -1 - person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, EVENT_6AE - person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, EVENT_6AF + person_event SPRITE_FISHER, 11, 21, UP << 2 | $2, $0, -1, -1, $0, 0, FisherScript_0x1a5570, -1 + person_event SPRITE_YOUNGSTER, 9, 13, DOWN << 2 | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1a55ed, -1 + person_event SPRITE_BUG_CATCHER, 17, 25, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherWade1, -1 + person_event SPRITE_COOLTRAINER_M, 12, 37, DOWN << 2 | $2, $11, -1, -1, $0, 0, CooltrainerMScript_0x1a55f6, -1 + person_event SPRITE_FRUIT_TREE, 11, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a55f9, -1 + person_event SPRITE_POKE_BALL, 9, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fb, EVENT_6AE + person_event SPRITE_POKE_BALL, 19, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fd, EVENT_6AF diff --git a/maps/Route31VioletGate.asm b/maps/Route31VioletGate.asm index a2a2974ff..07a66fd14 100644 --- a/maps/Route31VioletGate.asm +++ b/maps/Route31VioletGate.asm @@ -42,5 +42,5 @@ Route31VioletGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, -1 - person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x197634, -1 + person_event SPRITE_COOLTRAINER_F, 6, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerFScript_0x197637, -1 diff --git a/maps/Route32.asm b/maps/Route32.asm index 0ef0f9fab..6aaa55f83 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -1067,26 +1067,26 @@ Route32_MapEventHeader: ; signposts db 6 - signpost 5, 13, $0, Route32Sign - signpost 1, 9, $0, Route32RuinsSign - signpost 84, 10, $0, Route32UnionCaveSign - signpost 73, 12, $0, Route32PokeCenterSign - signpost 67, 12, $7, MapRoute32SignpostItem4 - signpost 40, 11, $7, MapRoute32SignpostItem5 + signpost 5, 13, SIGNPOST_READ, Route32Sign + signpost 1, 9, SIGNPOST_READ, Route32RuinsSign + signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign + signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign + signpost 67, 12, SIGNPOST_ITEMIFSET, MapRoute32SignpostItem4 + signpost 40, 11, SIGNPOST_ITEMIFSET, MapRoute32SignpostItem5 ; people-events db 14 - person_event SPRITE_FISHER, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, -1 - person_event SPRITE_FISHER, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, -1 - person_event SPRITE_FISHER, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, -1 - person_event SPRITE_YOUNGSTER, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, -1 - person_event SPRITE_YOUNGSTER, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, -1 - person_event SPRITE_YOUNGSTER, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, -1 - person_event SPRITE_LASS, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, -1 - person_event SPRITE_COOLTRAINER_M, 12, 23, $8, $0, 255, 255, $0, 0, CooltrainerMScript_0x19046f, -1 - person_event SPRITE_YOUNGSTER, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, -1 - person_event SPRITE_FISHER, 74, 11, $6, $0, 255, 255, $0, 0, FisherScript_0x1904f2, EVENT_6FC - person_event SPRITE_POKE_BALL, 57, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x190773, EVENT_6B0 - person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, -1 - person_event SPRITE_LASS, 71, 16, $8, $0, 255, 255, $0, 0, FriedaScript, EVENT_758 - person_event SPRITE_POKE_BALL, 34, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x190775, EVENT_6B1 + person_event SPRITE_FISHER, 53, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherJustin, -1 + person_event SPRITE_FISHER, 60, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherRalph1, -1 + person_event SPRITE_FISHER, 52, 10, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherHenry, -1 + person_event SPRITE_YOUNGSTER, 26, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterAlbert, -1 + person_event SPRITE_YOUNGSTER, 67, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterGordon, -1 + person_event SPRITE_YOUNGSTER, 49, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperRoland, -1 + person_event SPRITE_LASS, 34, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerLiz1, -1 + person_event SPRITE_COOLTRAINER_M, 12, 23, LEFT << 2 | $0, $0, -1, -1, $0, 0, CooltrainerMScript_0x19046f, -1 + person_event SPRITE_YOUNGSTER, 86, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperPeter, -1 + person_event SPRITE_FISHER, 74, 11, UP << 2 | $2, $0, -1, -1, $0, 0, FisherScript_0x1904f2, EVENT_6FC + person_event SPRITE_POKE_BALL, 57, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190773, EVENT_6B0 + person_event SPRITE_FISHER, 17, 19, LEFT << 2 | $1, $0, -1, -1, $0, 0, FisherScript_0x1904ce, -1 + person_event SPRITE_LASS, 71, 16, LEFT << 2 | $0, $0, -1, -1, $0, 0, FriedaScript, EVENT_758 + person_event SPRITE_POKE_BALL, 34, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190775, EVENT_6B1 diff --git a/maps/Route32PokeCenter1F.asm b/maps/Route32PokeCenter1F.asm index 979f99b3b..5bc736456 100644 --- a/maps/Route32PokeCenter1F.asm +++ b/maps/Route32PokeCenter1F.asm @@ -107,6 +107,6 @@ Route32PokeCenter1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, -1 - person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, -1 - person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x69b52, -1 + person_event SPRITE_FISHING_GURU, 8, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingGuruScript_0x69b55, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x69b80, -1 diff --git a/maps/Route32RuinsofAlphGate.asm b/maps/Route32RuinsofAlphGate.asm index 6b3605435..5eb46b011 100644 --- a/maps/Route32RuinsofAlphGate.asm +++ b/maps/Route32RuinsofAlphGate.asm @@ -60,6 +60,6 @@ Route32RuinsofAlphGate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, -1 - person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, -1 - person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69a2d, -1 + person_event SPRITE_POKEFAN_M, 6, 12, UP << 2 | $0, $10, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x69a30, -1 + person_event SPRITE_YOUNGSTER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x69a33, -1 diff --git a/maps/Route33.asm b/maps/Route33.asm index 3554f4189..b3570d918 100644 --- a/maps/Route33.asm +++ b/maps/Route33.asm @@ -218,10 +218,10 @@ Route33_MapEventHeader: ; signposts db 1 - signpost 11, 11, $0, MapRoute33Signpost0Script + signpost 11, 11, SIGNPOST_READ, MapRoute33Signpost0Script ; people-events db 3 - person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony, -1 - person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, -1 - person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, -1 + person_event SPRITE_POKEFAN_M, 17, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerAnthony, -1 + person_event SPRITE_LASS, 20, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x1ac002, -1 + person_event SPRITE_FRUIT_TREE, 20, 18, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac0ea, -1 diff --git a/maps/Route34.asm b/maps/Route34.asm index 035d16bc4..1d3a1fa4f 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -897,24 +897,24 @@ Route34_MapEventHeader: ; signposts db 5 - signpost 6, 12, $0, MapRoute34Signpost0Script - signpost 33, 13, $0, MapRoute34Signpost1Script - signpost 13, 10, $0, MapRoute34Signpost2Script - signpost 32, 8, $7, MapRoute34SignpostItem3 - signpost 19, 17, $7, MapRoute34SignpostItem4 + signpost 6, 12, SIGNPOST_READ, MapRoute34Signpost0Script + signpost 33, 13, SIGNPOST_READ, MapRoute34Signpost1Script + signpost 13, 10, SIGNPOST_READ, MapRoute34Signpost2Script + signpost 32, 8, SIGNPOST_ITEMIFSET, MapRoute34SignpostItem3 + signpost 19, 17, SIGNPOST_ITEMIFSET, MapRoute34SignpostItem4 ; people-events db 13 - person_event SPRITE_YOUNGSTER, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, -1 - person_event SPRITE_YOUNGSTER, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, -1 - person_event SPRITE_YOUNGSTER, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, -1 - person_event SPRITE_LASS, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, -1 - person_event SPRITE_OFFICER, 15, 13, $6, $0, 255, 255, $90, 0, OfficerScript_0x7824c, -1 - person_event SPRITE_POKEFAN_M, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, -1 - person_event SPRITE_GRAMPS, 20, 19, $6, $0, 255, 255, $0, 0, GrampsScript_0x7803d, EVENT_6E6 - person_event SPRITE_DAYCARE_MON_1, 22, 18, $16, $22, 255, 255, $0, 0, DaycareMon1Script_0x78065, EVENT_6E7 - person_event SPRITE_DAYCARE_MON_2, 23, 21, $16, $22, 255, 255, $0, 0, DaycareMon2Script_0x7806b, EVENT_6E8 - person_event SPRITE_COOLTRAINER_F, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, -1 - person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, -1 - person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, -1 - person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, EVENT_7BC + person_event SPRITE_YOUNGSTER, 11, 17, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerCamperTodd1, -1 + person_event SPRITE_YOUNGSTER, 36, 19, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterSamuel, -1 + person_event SPRITE_YOUNGSTER, 24, 15, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterIan, -1 + person_event SPRITE_LASS, 30, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerGina1, -1 + person_event SPRITE_OFFICER, 15, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7824c, -1 + person_event SPRITE_POKEFAN_M, 32, 22, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmBrandon, -1 + person_event SPRITE_GRAMPS, 20, 19, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x7803d, EVENT_6E6 + person_event SPRITE_DAYCARE_MON_1, 22, 18, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon1Script_0x78065, EVENT_6E7 + person_event SPRITE_DAYCARE_MON_2, 23, 21, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon2Script_0x7806b, EVENT_6E8 + person_event SPRITE_COOLTRAINER_F, 52, 15, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainerfIrene, -1 + person_event SPRITE_COOLTRAINER_F, 52, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfJenn, -1 + person_event SPRITE_COOLTRAINER_F, 55, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfKate, -1 + person_event SPRITE_POKE_BALL, 34, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7832b, EVENT_7BC diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 29fba0540..e1d9ba609 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -152,7 +152,7 @@ Route34IlexForestGate_MapEventHeader: ; people-events db 4 - person_event SPRITE_TEACHER, 7, 13, $8, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EA - person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, -1 - person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, EVENT_6EB - person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EC + person_event SPRITE_TEACHER, 7, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_6EA + person_event SPRITE_BUTTERFREE, 8, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ButterfreeScript_0x62d8a, -1 + person_event SPRITE_LASS, 8, 7, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x62d94, EVENT_6EB + person_event SPRITE_TEACHER, 11, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_6EC diff --git a/maps/Route35.asm b/maps/Route35.asm index d66302c29..ae2bd1a9f 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -592,19 +592,19 @@ Route35_MapEventHeader: ; signposts db 2 - signpost 7, 1, $0, MapRoute35Signpost1Script - signpost 31, 11, $0, MapRoute35Signpost1Script + signpost 7, 1, SIGNPOST_READ, MapRoute35Signpost1Script + signpost 31, 11, SIGNPOST_READ, MapRoute35Signpost1Script ; people-events db 11 - person_event SPRITE_YOUNGSTER, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, -1 - person_event SPRITE_YOUNGSTER, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, -1 - person_event SPRITE_LASS, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, -1 - person_event SPRITE_LASS, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, -1 - person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, -1 - person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, -1 - person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, -1 - person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin, -1 - person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, -1 - person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, -1 - person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, EVENT_6B2 + person_event SPRITE_YOUNGSTER, 23, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperIvan, -1 + person_event SPRITE_YOUNGSTER, 24, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperElliot, -1 + person_event SPRITE_LASS, 24, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerBrooke, -1 + person_event SPRITE_LASS, 30, 14, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerKim, -1 + person_event SPRITE_YOUNGSTER, 32, 18, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerBird_keeperBryan, -1 + person_event SPRITE_FISHER, 14, 6, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherWalt, -1 + person_event SPRITE_BUG_CATCHER, 11, 20, UP << 2 | $2, $2, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherArnie1, -1 + person_event SPRITE_SUPER_NERD, 14, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerJugglerIrwin, -1 + person_event SPRITE_OFFICER, 10, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x19ca49, -1 + person_event SPRITE_FRUIT_TREE, 29, 6, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19ca7e, -1 + person_event SPRITE_POKE_BALL, 20, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19ca7c, EVENT_6B2 diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index c510f82db..322783ade 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -209,6 +209,6 @@ Route35Goldenrodgate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, -1 - person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, -1 - person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, -1 + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x69d37, -1 + person_event SPRITE_POKEFAN_F, 8, 10, UP << 2 | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanFScript_0x69dc6, -1 + person_event SPRITE_FISHER, 6, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x69dda, -1 diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index dc1f0c437..e28e042b9 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -3,58 +3,58 @@ Route35NationalParkgate_MapScriptHeader: db 3 ; triggers - dw UnknownScript_0x6a19d, $0000 - dw UnknownScript_0x6a19e, $0000 - dw UnknownScript_0x6a19f, $0000 + dw Route35NationalParkgate_Trigger1, $0000 + dw Route35NationalParkgate_Trigger2, $0000 + dw Route35NationalParkgate_Trigger3, $0000 ; callback count db 2 ; callbacks - dbw 5, UnknownScript_0x6a1a3 + dbw 5, Route35NationalParkgate_CheckIfStillInContest - dbw 2, UnknownScript_0x6a1af + dbw 2, Route35NationalParkgate_CheckIfContestDay -UnknownScript_0x6a19d: +Route35NationalParkgate_Trigger1: end -UnknownScript_0x6a19e: +Route35NationalParkgate_Trigger2: end -UnknownScript_0x6a19f: - priorityjump UnknownScript_0x6a1d1 +Route35NationalParkgate_Trigger3: + priorityjump Route35NationalParkGate_LeavingContestEarly end -UnknownScript_0x6a1a3: +Route35NationalParkgate_CheckIfStillInContest: checkflag ENGINE_BUG_CONTEST_TIMER - iftrue UnknownScript_0x6a1ac + iftrue Route35NationalParkgate_Yes dotrigger $0 return -UnknownScript_0x6a1ac: +Route35NationalParkgate_Yes: dotrigger $2 return -UnknownScript_0x6a1af: +Route35NationalParkgate_CheckIfContestDay: checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0x6a1ca - if_equal THURSDAY, UnknownScript_0x6a1ca - if_equal SATURDAY, UnknownScript_0x6a1ca + if_equal TUESDAY, Route35NationalParkgate_IsContestDay + if_equal THURSDAY, Route35NationalParkgate_IsContestDay + if_equal SATURDAY, Route35NationalParkgate_IsContestDay checkflag ENGINE_BUG_CONTEST_TIMER - iftrue UnknownScript_0x6a1ac + iftrue Route35NationalParkgate_Yes disappear $2 appear $3 appear $4 return -UnknownScript_0x6a1ca: +Route35NationalParkgate_IsContestDay: appear $2 disappear $3 disappear $4 return -UnknownScript_0x6a1d1: +Route35NationalParkGate_LeavingContestEarly: applymovement $0, MovementData_0x6a2e2 spriteface $2, RIGHT loadfont @@ -63,17 +63,17 @@ UnknownScript_0x6a1d1: RAM2MEM $0 writetext UnknownText_0x6a79a yesorno - iffalse UnknownScript_0x6a1ee + iffalse Route35NationalParkgate_GoBackIn writetext UnknownText_0x6a7db closetext loadmovesprites jumpstd bugcontestresultswarp -UnknownScript_0x6a1ee: +Route35NationalParkgate_GoBackIn: writetext UnknownText_0x6a823 closetext loadmovesprites - scall UnknownScript_0x6a261 + scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR special Function8c084 waitbutton @@ -82,23 +82,23 @@ UnknownScript_0x6a1ee: OfficerScript_0x6a204: checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x6a2c7 - if_equal MONDAY, UnknownScript_0x6a2c7 - if_equal WEDNESDAY, UnknownScript_0x6a2c7 - if_equal FRIDAY, UnknownScript_0x6a2c7 + if_equal SUNDAY, Route35NationalParkgate_NoContestToday + if_equal MONDAY, Route35NationalParkgate_NoContestToday + if_equal WEDNESDAY, Route35NationalParkgate_NoContestToday + if_equal FRIDAY, Route35NationalParkgate_NoContestToday faceplayer loadfont checkflag ENGINE_DAILY_BUG_CONTEST - iftrue UnknownScript_0x6a2c1 - scall UnknownScript_0x6a2de + iftrue Route35NationalParkgate_ContestIsOver + scall Route35NationalParkgate_GetDayOfWeek writetext UnknownText_0x6a2eb yesorno - iffalse UnknownScript_0x6a2a3 + iffalse Route35NationalParkgate_DeclinedToParticipate checkcode VAR_PARTYCOUNT - if_greater_than $1, UnknownScript_0x6a271 - special Function13a12 + if_greater_than $1, Route35NationalParkgate_LeaveTheRestBehind + special CheckFirstMonFainted clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER -UnknownScript_0x6a234: +Route35NationalParkgate_OkayToProceed: setflag ENGINE_BUG_CONTEST_TIMER special PlayMapMusic writetext UnknownText_0x6a39d @@ -109,39 +109,39 @@ UnknownScript_0x6a234: writetext UnknownText_0x6a3e2 closetext loadmovesprites - special Function135db - scall UnknownScript_0x6a261 + special Special_GiveParkBalls + scall Route35NationalParkgate_EnterContest playsound SFX_ENTER_DOOR special Function8c084 waitbutton - special Function139a8 + special Special_SelectRandomBugContestContestants warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f end -UnknownScript_0x6a261: +Route35NationalParkgate_EnterContest: checkcode VAR_FACING - if_equal $2, UnknownScript_0x6a26c + if_equal LEFT, Route35NationalParkgate_FacingLeft applymovement $0, MovementData_0x6a2e5 end -UnknownScript_0x6a26c: +Route35NationalParkgate_FacingLeft: applymovement $0, MovementData_0x6a2e9 end -UnknownScript_0x6a271: +Route35NationalParkgate_LeaveTheRestBehind: checkcode VAR_PARTYCOUNT - if_less_than $6, UnknownScript_0x6a27d + if_less_than 6, Route35NationalParkgate_LessThanFullParty checkcode VAR_BOXSPACE - if_equal $0, UnknownScript_0x6a2b5 + if_equal 0, Route35NationalParkgate_NoRoomInBox -UnknownScript_0x6a27d: ; 6a27d +Route35NationalParkgate_LessThanFullParty: ; 6a27d special Function71ac - if_equal $1, UnknownScript_0x6a2bb + if_equal $1, Route35NationalParkgate_FirstMonIsEgg writetext UnknownText_0x6a4c6 yesorno - iffalse UnknownScript_0x6a2a9 - special Function13a12 - iftrue UnknownScript_0x6a2af + iffalse Route35NationalParkgate_DeclinedToLeaveMonsBehind + special CheckFirstMonFainted + iftrue Route35NationalParkgate_FirstMonIsFainted setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6a537 keeptextopen @@ -149,52 +149,52 @@ UnknownScript_0x6a27d: ; 6a27d playsound SFX_GOT_SAFARI_BALLS waitbutton keeptextopen - jump UnknownScript_0x6a234 + jump Route35NationalParkgate_OkayToProceed -UnknownScript_0x6a2a3: +Route35NationalParkgate_DeclinedToParticipate: writetext UnknownText_0x6a5dc closetext loadmovesprites end -UnknownScript_0x6a2a9: +Route35NationalParkgate_DeclinedToLeaveMonsBehind: writetext UnknownText_0x6a597 closetext loadmovesprites end -UnknownScript_0x6a2af: +Route35NationalParkgate_FirstMonIsFainted: writetext UnknownText_0x6a608 closetext loadmovesprites end -UnknownScript_0x6a2b5: +Route35NationalParkgate_NoRoomInBox: writetext UnknownText_0x6a67c closetext loadmovesprites end -UnknownScript_0x6a2bb: +Route35NationalParkgate_FirstMonIsEgg: writetext UnknownText_0x6a71f closetext loadmovesprites end -UnknownScript_0x6a2c1: +Route35NationalParkgate_ContestIsOver: writetext UnknownText_0x6a84f closetext loadmovesprites end -UnknownScript_0x6a2c7: +Route35NationalParkgate_NoContestToday: jumptextfaceplayer UnknownText_0x6a894 OfficerScript_0x6a2ca: faceplayer loadfont checkflag ENGINE_DAILY_BUG_CONTEST - iftrue UnknownScript_0x6a2c1 + iftrue Route35NationalParkgate_ContestIsOver writetext UnknownText_0x6a894 closetext loadmovesprites @@ -206,7 +206,7 @@ YoungsterScript_0x6a2d8: MapRoute36NationalParkgateSignpost0Script: jumptext UnknownText_0x6a90e -UnknownScript_0x6a2de: +Route35NationalParkgate_GetDayOfWeek: jumpstd daytotext end @@ -454,10 +454,10 @@ Route35NationalParkgate_MapEventHeader: ; signposts db 1 - signpost 0, 5, $0, MapRoute36NationalParkgateSignpost0Script + signpost 0, 5, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script ; people-events db 3 - person_event SPRITE_OFFICER, 5, 6, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6a204, EVENT_745 - person_event SPRITE_YOUNGSTER, 9, 10, $2, $11, 255, 255, $80, 0, YoungsterScript_0x6a2d8, EVENT_734 - person_event SPRITE_OFFICER, 7, 4, $9, $0, 255, 255, $a0, 0, OfficerScript_0x6a2ca, EVENT_746 + person_event SPRITE_OFFICER, 5, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a204, EVENT_745 + person_event SPRITE_YOUNGSTER, 9, 10, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6a2d8, EVENT_734 + person_event SPRITE_OFFICER, 7, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a2ca, EVENT_746 diff --git a/maps/Route36.asm b/maps/Route36.asm index 3a5c1f0d3..e5b25dc4a 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -704,19 +704,19 @@ Route36_MapEventHeader: ; signposts db 4 - signpost 1, 29, $0, MapRoute36Signpost0Script - signpost 11, 45, $0, MapRoute36Signpost1Script - signpost 7, 55, $0, MapRoute36Signpost2Script - signpost 7, 21, $0, MapRoute36Signpost3Script + signpost 1, 29, SIGNPOST_READ, MapRoute36Signpost0Script + signpost 11, 45, SIGNPOST_READ, MapRoute36Signpost1Script + signpost 7, 55, SIGNPOST_READ, MapRoute36Signpost2Script + signpost 7, 21, SIGNPOST_READ, MapRoute36Signpost3Script ; people-events db 9 - person_event SPRITE_YOUNGSTER, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, -1 - person_event SPRITE_YOUNGSTER, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, -1 - person_event SPRITE_WEIRD_TREE, 13, 39, $17, $0, 255, 255, $0, 0, WeirdTreeScript_0x19403c, EVENT_6F8 - person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, -1 - person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, -1 - person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, -1 - person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, ArthurScript, EVENT_75A - person_event SPRITE_LASS, 16, 37, $6, $0, 255, 255, $90, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO - person_event SPRITE_SUICUNE, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 + person_event SPRITE_YOUNGSTER, 17, 24, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicMark, -1 + person_event SPRITE_YOUNGSTER, 18, 35, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSchoolboyAlan1, -1 + person_event SPRITE_WEIRD_TREE, 13, 39, UP << 2 | $13, $0, -1, -1, $0, 0, WeirdTreeScript_0x19403c, EVENT_6F8 + person_event SPRITE_LASS, 12, 55, UP << 2 | $1, $2, -1, -1, $0, 0, LassScript_0x1940e0, -1 + person_event SPRITE_FISHER, 13, 48, LEFT << 2 | $0, $0, -1, -1, $0, 0, FisherScript_0x1940b9, -1 + person_event SPRITE_FRUIT_TREE, 8, 25, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x194247, -1 + person_event SPRITE_YOUNGSTER, 10, 50, DOWN << 2 | $2, $11, -1, -1, $0, 0, ArthurScript, EVENT_75A + person_event SPRITE_LASS, 16, 37, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO + person_event SPRITE_SUICUNE, 10, 25, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index 145f4067f..b80ab2635 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -89,43 +89,43 @@ UnknownScript_0x6ab76: end UnknownScript_0x6ab8c: - checkevent EVENT_716 + checkevent EVENT_BUG_CATCHING_CONTESTANT_1A iftrue UnknownScript_0x6ab94 appear $3 UnknownScript_0x6ab94: - checkevent EVENT_717 + checkevent EVENT_BUG_CATCHING_CONTESTANT_2A iftrue UnknownScript_0x6ab9c appear $4 UnknownScript_0x6ab9c: - checkevent EVENT_718 + checkevent EVENT_BUG_CATCHING_CONTESTANT_3A iftrue UnknownScript_0x6aba4 appear $5 UnknownScript_0x6aba4: - checkevent EVENT_719 + checkevent EVENT_BUG_CATCHING_CONTESTANT_4A iftrue UnknownScript_0x6abac appear $6 UnknownScript_0x6abac: - checkevent EVENT_71A + checkevent EVENT_BUG_CATCHING_CONTESTANT_5A iftrue UnknownScript_0x6abb4 appear $7 UnknownScript_0x6abb4: - checkevent EVENT_71B + checkevent EVENT_BUG_CATCHING_CONTESTANT_6A iftrue UnknownScript_0x6abbc appear $8 UnknownScript_0x6abbc: - checkevent EVENT_71C + checkevent EVENT_BUG_CATCHING_CONTESTANT_7A iftrue UnknownScript_0x6abc4 appear $9 UnknownScript_0x6abc4: - checkevent EVENT_71D + checkevent EVENT_BUG_CATCHING_CONTESTANT_8A iftrue UnknownScript_0x6abcc appear $a UnknownScript_0x6abcc: - checkevent EVENT_71E + checkevent EVENT_BUG_CATCHING_CONTESTANT_9A iftrue UnknownScript_0x6abd4 appear $b UnknownScript_0x6abd4: - checkevent EVENT_71F + checkevent EVENT_BUG_CATCHING_CONTESTANT_10A iftrue UnknownScript_0x6abdc appear $c UnknownScript_0x6abdc: @@ -148,7 +148,7 @@ OfficerScript_0x6abe0: iffalse UnknownScript_0x6ac73 checkcode VAR_PARTYCOUNT if_greater_than $1, UnknownScript_0x6ac41 - special Function13a12 + special CheckFirstMonFainted clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER UnknownScript_0x6ac10: setflag ENGINE_BUG_CONTEST_TIMER @@ -163,12 +163,12 @@ UnknownScript_0x6ac10: closetext loadmovesprites setflag ENGINE_BUG_CONTEST_TIMER - special Function135db + special Special_GiveParkBalls spriteface $0, LEFT playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - special Function139a8 + special Special_SelectRandomBugContestContestants warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12 end @@ -183,7 +183,7 @@ UnknownScript_0x6ac4d: writetext UnknownText_0x6afb0 yesorno iffalse UnknownScript_0x6ac79 - special Function13a12 + special CheckFirstMonFainted iftrue UnknownScript_0x6ac7f setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER writetext UnknownText_0x6b021 @@ -300,7 +300,7 @@ UnknownScript_0x6ad02: YoungsterScript_0x6ad06: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 closetext @@ -316,7 +316,7 @@ UnknownScript_0x6ad14: YoungsterScript_0x6ad1a: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f closetext @@ -332,7 +332,7 @@ UnknownScript_0x6ad28: RockerScript_0x6ad2e: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 closetext @@ -348,7 +348,7 @@ UnknownScript_0x6ad3c: PokefanMScript_0x6ad42: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da closetext @@ -364,7 +364,7 @@ UnknownScript_0x6ad50: YoungsterScript_0x6ad56: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e closetext @@ -380,7 +380,7 @@ UnknownScript_0x6ad64: YoungsterScript_0x6ad6a: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 closetext @@ -396,7 +396,7 @@ UnknownScript_0x6ad78: LassScript_0x6ad7e: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b closetext @@ -412,7 +412,7 @@ UnknownScript_0x6ad8c: YoungsterScript_0x6ad92: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 closetext @@ -428,7 +428,7 @@ UnknownScript_0x6ada0: YoungsterScript_0x6ada6: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b closetext @@ -444,7 +444,7 @@ UnknownScript_0x6adb4: YoungsterScript_0x6adba: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f closetext @@ -858,19 +858,19 @@ Route36NationalParkgate_MapEventHeader: ; signposts db 1 - signpost 0, 6, $0, MapRoute36NationalParkgateSignpost0Script + signpost 0, 6, SIGNPOST_READ, MapRoute36NationalParkgateSignpost0Script ; people-events db 12 - person_event SPRITE_OFFICER, 7, 4, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6abe0, EVENT_747 - person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad06, EVENT_720 - person_event SPRITE_YOUNGSTER, 9, 8, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad1a, EVENT_721 - person_event SPRITE_ROCKER, 10, 6, $7, $0, 255, 255, $90, 0, RockerScript_0x6ad2e, EVENT_722 - person_event SPRITE_POKEFAN_M, 9, 10, $7, $0, 255, 255, $b0, 0, PokefanMScript_0x6ad42, EVENT_723 - person_event SPRITE_YOUNGSTER, 11, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad56, EVENT_724 - person_event SPRITE_YOUNGSTER, 10, 9, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ad6a, EVENT_725 - person_event SPRITE_LASS, 10, 7, $7, $0, 255, 255, $90, 0, LassScript_0x6ad7e, EVENT_726 - person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $80, 0, YoungsterScript_0x6ad92, EVENT_727 - person_event SPRITE_YOUNGSTER, 11, 10, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x6ada6, EVENT_728 - person_event SPRITE_YOUNGSTER, 10, 10, $7, $0, 255, 255, $90, 0, YoungsterScript_0x6adba, EVENT_729 - person_event SPRITE_OFFICER, 6, 7, $6, $0, 255, 255, $a0, 0, OfficerScript_0x6acf4, EVENT_748 + person_event SPRITE_OFFICER, 7, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6abe0, EVENT_747 + person_event SPRITE_YOUNGSTER, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B + person_event SPRITE_YOUNGSTER, 9, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B + person_event SPRITE_ROCKER, 10, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B + person_event SPRITE_POKEFAN_M, 9, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x6ad42, EVENT_BUG_CATCHING_CONTESTANT_4B + person_event SPRITE_YOUNGSTER, 11, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad56, EVENT_BUG_CATCHING_CONTESTANT_5B + person_event SPRITE_YOUNGSTER, 10, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ad6a, EVENT_BUG_CATCHING_CONTESTANT_6B + person_event SPRITE_LASS, 10, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x6ad7e, EVENT_BUG_CATCHING_CONTESTANT_7B + person_event SPRITE_YOUNGSTER, 11, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B + person_event SPRITE_YOUNGSTER, 11, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B + person_event SPRITE_YOUNGSTER, 10, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B + person_event SPRITE_OFFICER, 6, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6acf4, EVENT_748 diff --git a/maps/Route36RuinsofAlphgate.asm b/maps/Route36RuinsofAlphgate.asm index 7afba4134..b1da7927c 100644 --- a/maps/Route36RuinsofAlphgate.asm +++ b/maps/Route36RuinsofAlphgate.asm @@ -49,5 +49,5 @@ Route36RuinsofAlphgate_MapEventHeader: ; people-events db 2 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, -1 - person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, -1 + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x6aa1a, -1 + person_event SPRITE_GRAMPS, 9, 11, DOWN << 2 | $2, $21, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x6aa1d, -1 diff --git a/maps/Route37.asm b/maps/Route37.asm index d1a0369b9..7ef7d624f 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -293,15 +293,15 @@ Route37_MapEventHeader: ; signposts db 2 - signpost 3, 5, $0, MapRoute37Signpost0Script - signpost 2, 4, $7, MapRoute37SignpostItem1 + signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script + signpost 2, 4, SIGNPOST_ITEMIFSET, MapRoute37SignpostItem1 ; people-events db 7 - person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, -1 - person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, -1 - person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, -1 - person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, -1 - person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, SunnyScript, EVENT_75B - person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, -1 - person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, -1 + person_event SPRITE_WEIRD_TREE, 16, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne1, -1 + person_event SPRITE_WEIRD_TREE, 16, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne2, -1 + person_event SPRITE_YOUNGSTER, 10, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerPsychicGreg, -1 + person_event SPRITE_FRUIT_TREE, 9, 17, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e09, -1 + person_event SPRITE_BUG_CATCHER, 12, 20, DOWN << 2 | $2, $11, -1, -1, $0, 0, SunnyScript, EVENT_75B + person_event SPRITE_FRUIT_TREE, 9, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0b, -1 + person_event SPRITE_FRUIT_TREE, 11, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0d, -1 diff --git a/maps/Route38.asm b/maps/Route38.asm index d7f61b22b..a810f8b7c 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -573,15 +573,15 @@ Route38_MapEventHeader: ; signposts db 2 - signpost 7, 33, $0, MapRoute38Signpost0Script - signpost 13, 5, $0, MapRoute38Signpost1Script + signpost 7, 33, SIGNPOST_READ, MapRoute38Signpost0Script + signpost 13, 5, SIGNPOST_READ, MapRoute38Signpost1Script ; people-events db 7 - person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, -1 - person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, -1 - person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, -1 - person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, -1 - person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, -1 - person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, -1 - person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, -1 + person_event SPRITE_STANDING_YOUNGSTER, 5, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyChad1, -1 + person_event SPRITE_LASS, 7, 19, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerLassDana1, -1 + person_event SPRITE_STANDING_YOUNGSTER, 19, 16, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBird_keeperToby, -1 + person_event SPRITE_BUENA, 13, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBeautyValerie, -1 + person_event SPRITE_SAILOR, 9, 28, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerSailorHarry, -1 + person_event SPRITE_FRUIT_TREE, 14, 16, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a1f33, -1 + person_event SPRITE_BUENA, 12, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerBeautyOlivia, -1 diff --git a/maps/Route38EcruteakGate.asm b/maps/Route38EcruteakGate.asm index c0ead38aa..53a193b3d 100644 --- a/maps/Route38EcruteakGate.asm +++ b/maps/Route38EcruteakGate.asm @@ -40,4 +40,4 @@ Route38EcruteakGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x9cbd7, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index dc416a395..e9272be38 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -411,20 +411,20 @@ Route39_MapEventHeader: ; signposts db 4 - signpost 31, 5, $0, MapRoute39Signpost0Script - signpost 5, 9, $0, MapRoute39Signpost1Script - signpost 7, 15, $0, MapRoute39Signpost2Script - signpost 13, 5, $7, MapRoute39SignpostItem3 + signpost 31, 5, SIGNPOST_READ, MapRoute39Signpost0Script + signpost 5, 9, SIGNPOST_READ, MapRoute39Signpost1Script + signpost 7, 15, SIGNPOST_READ, MapRoute39Signpost2Script + signpost 13, 5, SIGNPOST_ITEMIFSET, MapRoute39SignpostItem3 ; people-events db 10 - person_event SPRITE_SAILOR, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, -1 - person_event SPRITE_POKEFAN_M, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, -1 - person_event SPRITE_POKEFAN_F, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, -1 - person_event SPRITE_TAUROS, 16, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 - person_event SPRITE_TAUROS, 15, 10, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 - person_event SPRITE_TAUROS, 19, 8, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 - person_event SPRITE_TAUROS, 17, 12, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1 - person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, -1 - person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, -1 - person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, -1 + person_event SPRITE_SAILOR, 33, 17, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSailorEugene, -1 + person_event SPRITE_POKEFAN_M, 26, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerPokefanmDerek1, -1 + person_event SPRITE_POKEFAN_F, 23, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerPokefanfRuth, -1 + person_event SPRITE_TAUROS, 16, 7, UP << 2 | $12, $0, -1, -1, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_TAUROS, 15, 10, UP << 2 | $12, $0, -1, -1, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_TAUROS, 19, 8, UP << 2 | $12, $0, -1, -1, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_TAUROS, 17, 12, UP << 2 | $12, $0, -1, -1, $0, 0, TaurosScript_0x1a5af5, -1 + person_event SPRITE_STANDING_YOUNGSTER, 11, 17, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerPsychicNorman, -1 + person_event SPRITE_FRUIT_TREE, 7, 13, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a5bf4, -1 + person_event SPRITE_POKEFAN_F, 26, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x1a5bbe, -1 diff --git a/maps/Route39Barn.asm b/maps/Route39Barn.asm index 305b49f47..260d0c518 100644 --- a/maps/Route39Barn.asm +++ b/maps/Route39Barn.asm @@ -200,6 +200,6 @@ Route39Barn_MapEventHeader: ; people-events db 3 - person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, -1 - person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, -1 - person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, -1 + person_event SPRITE_TWIN, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, TwinScript_0x9cc76, -1 + person_event SPRITE_TWIN, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x9cc90, -1 + person_event SPRITE_TAUROS, 7, 7, UP << 2 | $12, $0, -1, -1, $0, 0, TaurosScript_0x9ccaa, -1 diff --git a/maps/Route39Farmhouse.asm b/maps/Route39Farmhouse.asm index c068cb65c..2329148e2 100644 --- a/maps/Route39Farmhouse.asm +++ b/maps/Route39Farmhouse.asm @@ -202,10 +202,10 @@ Route39Farmhouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, FarmhouseBookshelf - signpost 1, 1, $0, FarmhouseBookshelf + signpost 1, 0, SIGNPOST_READ, FarmhouseBookshelf + signpost 1, 1, SIGNPOST_READ, FarmhouseBookshelf ; people-events db 2 - person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, -1 - person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, -1 + person_event SPRITE_POKEFAN_M, 6, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, PokefanMScript_0x9ceb4, -1 + person_event SPRITE_POKEFAN_F, 8, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanFScript_0x9cf0e, -1 diff --git a/maps/Route4.asm b/maps/Route4.asm index cb5069682..8baa6a068 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -177,12 +177,12 @@ Route4_MapEventHeader: ; signposts db 2 - signpost 7, 3, $0, MapRoute4Signpost0Script - signpost 3, 10, $7, MapRoute4SignpostItem1 + signpost 7, 3, SIGNPOST_READ, MapRoute4Signpost0Script + signpost 3, 10, SIGNPOST_ITEMIFSET, MapRoute4SignpostItem1 ; people-events db 4 - person_event SPRITE_YOUNGSTER, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, -1 - person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, -1 - person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, -1 - person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, EVENT_787 + person_event SPRITE_YOUNGSTER, 13, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperHank, -1 + person_event SPRITE_LASS, 12, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerPicnickerHope, -1 + person_event SPRITE_LASS, 10, 25, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerPicnickerSharon, -1 + person_event SPRITE_POKE_BALL, 7, 30, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ae20f, EVENT_787 diff --git a/maps/Route40.asm b/maps/Route40.asm index 9f8d5ea4e..5c00917be 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -404,20 +404,20 @@ Route40_MapEventHeader: ; signposts db 2 - signpost 10, 14, $0, MapRoute40Signpost0Script - signpost 8, 7, $7, MapRoute40SignpostItem1 + signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script + signpost 8, 7, SIGNPOST_ITEMIFSET, MapRoute40SignpostItem1 ; people-events db 12 - person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, -1 - person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, -1 - person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, -1 - person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, -1 - person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, -1 - person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, -1 - person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, -1 - person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, -1 - person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, EVENT_75E - person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, -1 - person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, $0, 255, 255, $90, 0, StandingYoungsterScript_0x1a61d6, EVENT_7CF + person_event SPRITE_OLIVINE_RIVAL, 19, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerSwimmermSimon, -1 + person_event SPRITE_OLIVINE_RIVAL, 34, 22, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerSwimmermRandall, -1 + person_event SPRITE_SWIMMER_GIRL, 23, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerSwimmerfElaine, -1 + person_event SPRITE_SWIMMER_GIRL, 29, 14, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfPaula, -1 + person_event SPRITE_ROCK, 15, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, Route40Rock, -1 + person_event SPRITE_ROCK, 13, 10, LEFT << 2 | $10, $0, -1, -1, $0, 0, Route40Rock, -1 + person_event SPRITE_ROCK, 12, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, Route40Rock, -1 + person_event SPRITE_LASS, 17, 15, UP << 2 | $2, $0, -1, -1, $0, 0, LassScript_0x1a61c4, -1 + person_event SPRITE_BUENA, 14, 12, DOWN << 2 | $3, $0, -1, -1, $0, 0, MonicaScript, EVENT_75E + person_event SPRITE_POKEFAN_M, 10, 11, LEFT << 2 | $1, $0, -1, -1, $0, 0, PokefanMScript_0x1a61c7, -1 + person_event SPRITE_LASS, 8, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a61d3, -1 + person_event SPRITE_STANDING_YOUNGSTER, 13, 20, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, StandingYoungsterScript_0x1a61d6, EVENT_7CF diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 4f0d33d0b..ddc61b758 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -88,5 +88,5 @@ Route40BattleTowerGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, EVENT_7CF - person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, -1 + person_event SPRITE_ROCKER, 7, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, RockerScript_0x9f669, EVENT_7CF + person_event SPRITE_TWIN, 9, 11, UP << 2 | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, TwinScript_0x9f66c, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index 1c626decb..c0b2ea5f3 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -506,17 +506,17 @@ Route41_MapEventHeader: ; signposts db 1 - signpost 35, 9, $7, MapRoute41SignpostItem0 + signpost 35, 9, SIGNPOST_ITEMIFSET, MapRoute41SignpostItem0 ; people-events db 10 - person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, -1 - person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, -1 - person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, -1 - person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, -1 - person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, -1 - person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, -1 - person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, -1 - person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, -1 - person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, -1 - person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, -1 + person_event SPRITE_OLIVINE_RIVAL, 10, 36, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermCharlie, -1 + person_event SPRITE_OLIVINE_RIVAL, 12, 50, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermGeorge, -1 + person_event SPRITE_OLIVINE_RIVAL, 30, 24, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermBerke, -1 + person_event SPRITE_OLIVINE_RIVAL, 34, 36, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermKirk, -1 + person_event SPRITE_OLIVINE_RIVAL, 50, 23, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerSwimmermMathew, -1 + person_event SPRITE_SWIMMER_GIRL, 8, 21, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfKaylee, -1 + person_event SPRITE_SWIMMER_GIRL, 23, 27, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfSusie, -1 + person_event SPRITE_SWIMMER_GIRL, 38, 31, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfDenise, -1 + person_event SPRITE_SWIMMER_GIRL, 32, 48, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerSwimmerfKara, -1 + person_event SPRITE_SWIMMER_GIRL, 54, 13, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerSwimmerfWendy, -1 diff --git a/maps/Route42.asm b/maps/Route42.asm index 3c6cf7528..054f026b1 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -377,20 +377,20 @@ Route42_MapEventHeader: ; signposts db 5 - signpost 10, 4, $0, MapRoute42Signpost0Script - signpost 5, 7, $0, MapRoute42Signpost1Script - signpost 9, 45, $0, MapRoute42Signpost2Script - signpost 8, 54, $0, MapRoute42Signpost3Script - signpost 11, 16, $7, MapRoute42SignpostItem4 + signpost 10, 4, SIGNPOST_READ, MapRoute42Signpost0Script + signpost 5, 7, SIGNPOST_READ, MapRoute42Signpost1Script + signpost 9, 45, SIGNPOST_READ, MapRoute42Signpost2Script + signpost 8, 54, SIGNPOST_READ, MapRoute42Signpost3Script + signpost 11, 16, SIGNPOST_ITEMIFSET, MapRoute42SignpostItem4 ; people-events db 9 - person_event SPRITE_FISHER, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, -1 - person_event SPRITE_POKEFAN_M, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, -1 - person_event SPRITE_SUPER_NERD, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, -1 - person_event SPRITE_FRUIT_TREE, 20, 31, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934d, -1 - person_event SPRITE_FRUIT_TREE, 20, 32, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934f, -1 - person_event SPRITE_FRUIT_TREE, 20, 33, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9351, -1 - person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a9349, EVENT_6B3 - person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, EVENT_6B4 - person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 + person_event SPRITE_FISHER, 14, 44, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherTully1, -1 + person_event SPRITE_POKEFAN_M, 13, 55, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerBenjamin, -1 + person_event SPRITE_SUPER_NERD, 12, 51, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacShane, -1 + person_event SPRITE_FRUIT_TREE, 20, 31, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a934d, -1 + person_event SPRITE_FRUIT_TREE, 20, 32, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a934f, -1 + person_event SPRITE_FRUIT_TREE, 20, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a9351, -1 + person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a9349, EVENT_6B3 + person_event SPRITE_POKE_BALL, 12, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a934b, EVENT_6B4 + person_event SPRITE_SUICUNE, 20, 30, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route42EcruteakGate.asm b/maps/Route42EcruteakGate.asm index 49223e042..056c50fdd 100644 --- a/maps/Route42EcruteakGate.asm +++ b/maps/Route42EcruteakGate.asm @@ -35,4 +35,4 @@ Route42EcruteakGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19a4b5, -1 diff --git a/maps/Route43.asm b/maps/Route43.asm index f0f69247a..3b69877e7 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -606,17 +606,17 @@ Route43_MapEventHeader: ; signposts db 3 - signpost 3, 13, $0, MapRoute43Signpost0Script - signpost 49, 11, $0, MapRoute43Signpost1Script - signpost 38, 16, $0, MapRoute43Signpost2Script + signpost 3, 13, SIGNPOST_READ, MapRoute43Signpost0Script + signpost 49, 11, SIGNPOST_READ, MapRoute43Signpost1Script + signpost 38, 16, SIGNPOST_READ, MapRoute43Signpost2Script ; people-events db 8 - person_event SPRITE_SUPER_NERD, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, -1 - person_event SPRITE_SUPER_NERD, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, -1 - person_event SPRITE_SUPER_NERD, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, -1 - person_event SPRITE_FISHER, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, -1 - person_event SPRITE_LASS, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, -1 - person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, -1 - person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, -1 - person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, EVENT_6B5 + person_event SPRITE_SUPER_NERD, 9, 17, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPokemaniacBen, -1 + person_event SPRITE_SUPER_NERD, 24, 17, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacBrent1, -1 + person_event SPRITE_SUPER_NERD, 11, 18, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPokemaniacRon, -1 + person_event SPRITE_FISHER, 20, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerFisherMarvin, -1 + person_event SPRITE_LASS, 29, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerTiffany3, -1 + person_event SPRITE_YOUNGSTER, 44, 17, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperSpencer, -1 + person_event SPRITE_FRUIT_TREE, 30, 5, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19d266, -1 + person_event SPRITE_POKE_BALL, 36, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19d268, EVENT_6B5 diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 61eda0bad..4281405b1 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -264,6 +264,6 @@ Route43Gate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ac85, EVENT_735 - person_event SPRITE_ROCKET, 8, 6, $6, $0, 255, 255, $0, 0, RocketScript_0x19ac82, EVENT_6DC - person_event SPRITE_ROCKET, 8, 11, $7, $0, 255, 255, $0, 0, RocketScript_0x19ac82, EVENT_6DC + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ac85, EVENT_735 + person_event SPRITE_ROCKET, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_6DC + person_event SPRITE_ROCKET, 8, 11, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_6DC diff --git a/maps/Route43MahoganyGate.asm b/maps/Route43MahoganyGate.asm index 183f7a461..754c4a283 100644 --- a/maps/Route43MahoganyGate.asm +++ b/maps/Route43MahoganyGate.asm @@ -54,4 +54,4 @@ Route43MahoganyGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, -1 + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ab0b, -1 diff --git a/maps/Route44.asm b/maps/Route44.asm index b8209fc07..b8a78ffa4 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -620,20 +620,20 @@ Route44_MapEventHeader: ; signposts db 3 - signpost 7, 53, $0, MapRoute44Signpost0Script - signpost 10, 6, $0, MapRoute44Signpost1Script - signpost 9, 32, $7, MapRoute44SignpostItem2 + signpost 7, 53, SIGNPOST_READ, MapRoute44Signpost0Script + signpost 10, 6, SIGNPOST_READ, MapRoute44Signpost1Script + signpost 9, 32, SIGNPOST_ITEMIFSET, MapRoute44SignpostItem2 ; people-events db 11 - person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, -1 - person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, -1 - person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, -1 - person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, -1 - person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, -1 - person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, -1 - person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, -1 - person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, -1 - person_event SPRITE_POKE_BALL, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, EVENT_6B6 - person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, EVENT_6B7 - person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, EVENT_7BD + person_event SPRITE_FISHER, 7, 39, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherWilton1, -1 + person_event SPRITE_FISHER, 17, 23, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherEdgar, -1 + person_event SPRITE_YOUNGSTER, 13, 14, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicPhil, -1 + person_event SPRITE_SUPER_NERD, 6, 47, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPokemaniacZach, -1 + person_event SPRITE_YOUNGSTER, 9, 55, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBird_keeperVance1, -1 + person_event SPRITE_COOLTRAINER_M, 19, 45, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainermAllen, -1 + person_event SPRITE_COOLTRAINER_F, 18, 35, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainerfCybil, -1 + person_event SPRITE_FRUIT_TREE, 9, 13, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19da40, -1 + person_event SPRITE_POKE_BALL, 12, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da42, EVENT_6B6 + person_event SPRITE_POKE_BALL, 8, 49, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da44, EVENT_6B7 + person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da46, EVENT_7BD diff --git a/maps/Route45.asm b/maps/Route45.asm index 71a9ed5e2..af2489383 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -643,21 +643,21 @@ Route45_MapEventHeader: ; signposts db 2 - signpost 4, 10, $0, MapRoute45Signpost0Script - signpost 80, 13, $7, MapRoute45SignpostItem1 + signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script + signpost 80, 13, SIGNPOST_ITEMIFSET, MapRoute45SignpostItem1 ; people-events db 13 - person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, -1 - person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, -1 - person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, -1 - person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, -1 - person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, -1 - person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, -1 - person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, -1 - person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, -1 - person_event SPRITE_POKE_BALL, 55, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e296, EVENT_6B8 - person_event SPRITE_POKE_BALL, 70, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e298, EVENT_6B9 - person_event SPRITE_POKE_BALL, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, EVENT_6BA - person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, EVENT_6BB - person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, -1 + person_event SPRITE_POKEFAN_M, 20, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerErik, -1 + person_event SPRITE_POKEFAN_M, 69, 19, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerMichael, -1 + person_event SPRITE_POKEFAN_M, 32, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerParry, -1 + person_event SPRITE_POKEFAN_M, 69, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerTimothy, -1 + person_event SPRITE_BLACK_BELT, 54, 15, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBlackbeltKenji, -1 + person_event SPRITE_COOLTRAINER_M, 22, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermRyan, -1 + person_event SPRITE_COOLTRAINER_F, 40, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfKelly, -1 + person_event SPRITE_FRUIT_TREE, 86, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19e294, -1 + person_event SPRITE_POKE_BALL, 55, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e296, EVENT_6B8 + person_event SPRITE_POKE_BALL, 70, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e298, EVENT_6B9 + person_event SPRITE_POKE_BALL, 24, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29a, EVENT_6BA + person_event SPRITE_POKE_BALL, 37, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29c, EVENT_6BB + person_event SPRITE_YOUNGSTER, 74, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x19e269, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 28e7fc957..0b7c8d016 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -305,13 +305,13 @@ Route46_MapEventHeader: ; signposts db 1 - signpost 27, 9, $0, MapRoute46Signpost0Script + signpost 27, 9, SIGNPOST_READ, MapRoute46Signpost0Script ; people-events db 6 - person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, -1 - person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, -1 - person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, -1 - person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, -1 - person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, -1 - person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, EVENT_6BC + person_event SPRITE_POKEFAN_M, 23, 16, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerBailey, -1 + person_event SPRITE_YOUNGSTER, 18, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerCamperTed, -1 + person_event SPRITE_LASS, 17, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerErin1, -1 + person_event SPRITE_FRUIT_TREE, 9, 11, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a978f, -1 + person_event SPRITE_FRUIT_TREE, 10, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a9791, -1 + person_event SPRITE_POKE_BALL, 19, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a978d, EVENT_6BC diff --git a/maps/Route5.asm b/maps/Route5.asm index c8b429505..74353b71b 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -52,9 +52,9 @@ Route5_MapEventHeader: ; signposts db 2 - signpost 17, 17, $0, MapRoute5Signpost0Script - signpost 11, 10, $0, MapRoute5Signpost1Script + signpost 17, 17, SIGNPOST_READ, MapRoute5Signpost0Script + signpost 11, 10, SIGNPOST_READ, MapRoute5Signpost1Script ; people-events db 1 - person_event SPRITE_POKEFAN_M, 20, 21, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1adb19, EVENT_771 + person_event SPRITE_POKEFAN_M, 20, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1adb19, EVENT_771 diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagSpeechHouse.asm index c32ab7162..967eb9299 100644 --- a/maps/Route5CleanseTagSpeechHouse.asm +++ b/maps/Route5CleanseTagSpeechHouse.asm @@ -70,10 +70,10 @@ Route5CleanseTagSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, HouseForSaleBookshelf - signpost 1, 1, $0, HouseForSaleBookshelf + signpost 1, 0, SIGNPOST_READ, HouseForSaleBookshelf + signpost 1, 1, SIGNPOST_READ, HouseForSaleBookshelf ; people-events db 2 - person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, -1 - person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, -1 + person_event SPRITE_GRANNY, 9, 6, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x18b634, -1 + person_event SPRITE_TEACHER, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x18b64f, -1 diff --git a/maps/Route5SaffronCityGate.asm b/maps/Route5SaffronCityGate.asm index 005250c65..f56ab37c7 100644 --- a/maps/Route5SaffronCityGate.asm +++ b/maps/Route5SaffronCityGate.asm @@ -36,4 +36,4 @@ Route5SaffronCityGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, -1 + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x18b5b9, -1 diff --git a/maps/Route5UndergroundEntrance.asm b/maps/Route5UndergroundEntrance.asm index fce246121..e51dd4174 100644 --- a/maps/Route5UndergroundEntrance.asm +++ b/maps/Route5UndergroundEntrance.asm @@ -34,4 +34,4 @@ Route5UndergroundEntrance_MapEventHeader: ; people-events db 1 - person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, -1 + person_event SPRITE_TEACHER, 6, 6, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x18b555, -1 diff --git a/maps/Route6.asm b/maps/Route6.asm index 0b6787dd5..86be6b7d9 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -132,10 +132,10 @@ Route6_MapEventHeader: ; signposts db 1 - signpost 5, 19, $0, MapRoute6Signpost0Script + signpost 5, 19, SIGNPOST_READ, MapRoute6Signpost0Script ; people-events db 3 - person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, EVENT_771 - person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, -1 - person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, -1 + person_event SPRITE_POKEFAN_M, 8, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 2, PokefanMScript_0x1ad951, EVENT_771 + person_event SPRITE_POKEFAN_M, 16, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmRex, -1 + person_event SPRITE_POKEFAN_M, 16, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 9a0fb3bee..0ef4133bc 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -75,4 +75,4 @@ Route6SaffronGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, -1 + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x1926ea, -1 diff --git a/maps/Route7.asm b/maps/Route7.asm index ea86ffb32..8345a7a2a 100644 --- a/maps/Route7.asm +++ b/maps/Route7.asm @@ -48,8 +48,8 @@ Route7_MapEventHeader: ; signposts db 2 - signpost 11, 5, $0, MapRoute7Signpost0Script - signpost 9, 6, $0, MapRoute7Signpost1Script + signpost 11, 5, SIGNPOST_READ, MapRoute7Signpost0Script + signpost 9, 6, SIGNPOST_READ, MapRoute7Signpost1Script ; people-events db 0 diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm index 51166b707..1d177e871 100644 --- a/maps/Route7SaffronGate.asm +++ b/maps/Route7SaffronGate.asm @@ -61,4 +61,4 @@ Route7SaffronGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x73518, -1 diff --git a/maps/Route8.asm b/maps/Route8.asm index c0bf7e8a2..377aa8f58 100644 --- a/maps/Route8.asm +++ b/maps/Route8.asm @@ -258,14 +258,14 @@ Route8_MapEventHeader: ; signposts db 2 - signpost 7, 11, $0, MapRoute8Signpost0Script - signpost 5, 10, $0, MapRoute8Signpost1Script + signpost 7, 11, SIGNPOST_READ, MapRoute8Signpost0Script + signpost 5, 10, SIGNPOST_READ, MapRoute8Signpost1Script ; people-events db 6 - person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, -1 - person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, -1 - person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, -1 - person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, -1 - person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, -1 - person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, -1 + person_event SPRITE_BIKER, 12, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerBikerDwayne, -1 + person_event SPRITE_BIKER, 13, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerBikerHarris, -1 + person_event SPRITE_BIKER, 14, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerBikerZeke, -1 + person_event SPRITE_SUPER_NERD, 6, 27, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdSam, -1 + person_event SPRITE_SUPER_NERD, 16, 35, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerSupernerdTom, -1 + person_event SPRITE_FRUIT_TREE, 9, 37, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x6c06c, -1 diff --git a/maps/Route8SaffronGate.asm b/maps/Route8SaffronGate.asm index a19d8ad5e..37ac7ab05 100644 --- a/maps/Route8SaffronGate.asm +++ b/maps/Route8SaffronGate.asm @@ -35,4 +35,4 @@ Route8SaffronGate_MapEventHeader: ; people-events db 1 - person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, -1 + person_event SPRITE_OFFICER, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7f416, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index 47738a798..d4c7dff56 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -308,14 +308,14 @@ Route9_MapEventHeader: ; signposts db 2 - signpost 7, 15, $0, MapRoute9Signpost0Script - signpost 15, 41, $7, MapRoute9SignpostItem1 + signpost 7, 15, SIGNPOST_READ, MapRoute9Signpost0Script + signpost 15, 41, SIGNPOST_ITEMIFSET, MapRoute9SignpostItem1 ; people-events db 6 - person_event SPRITE_YOUNGSTER, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, -1 - person_event SPRITE_LASS, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, -1 - person_event SPRITE_YOUNGSTER, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, -1 - person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, -1 - person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, -1 - person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, -1 + person_event SPRITE_YOUNGSTER, 15, 27, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperDean, -1 + person_event SPRITE_LASS, 12, 43, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerHeidi, -1 + person_event SPRITE_YOUNGSTER, 8, 15, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerCamperSid, -1 + person_event SPRITE_LASS, 19, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerEdna, -1 + person_event SPRITE_POKEFAN_M, 7, 32, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerTim, -1 + person_event SPRITE_POKEFAN_M, 19, 40, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 4, TrainerHikerSidney, -1 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index 102f9540d..e8b8113c8 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -165,12 +165,12 @@ RuinsofAlphAerodactylChamber_MapEventHeader: ; signposts db 6 - signpost 3, 2, $0, MapRuinsofAlphAerodactylChamberSignpost1Script - signpost 3, 5, $0, MapRuinsofAlphAerodactylChamberSignpost1Script - signpost 2, 3, $1, MapRuinsofAlphAerodactylChamberSignpost2Script - signpost 2, 4, $1, MapRuinsofAlphAerodactylChamberSignpost3Script - signpost 0, 3, $1, MapRuinsofAlphAerodactylChamberSignpost4Script - signpost 0, 4, $1, MapRuinsofAlphAerodactylChamberSignpost5Script + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphAerodactylChamberSignpost5Script ; people-events db 0 diff --git a/maps/RuinsofAlphAerodactylItemRoom.asm b/maps/RuinsofAlphAerodactylItemRoom.asm index e93f8a438..0e0770eba 100644 --- a/maps/RuinsofAlphAerodactylItemRoom.asm +++ b/maps/RuinsofAlphAerodactylItemRoom.asm @@ -42,12 +42,12 @@ RuinsofAlphAerodactylItemRoom_MapEventHeader: ; signposts db 2 - signpost 1, 2, $0, MapRuinsofAlphAerodactylItemRoomSignpost1Script - signpost 1, 5, $0, MapRuinsofAlphAerodactylItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphAerodactylItemRoomSignpost1Script ; people-events db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59aba, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59abc, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59ab6, EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59ab8, EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59aba, EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59abc, EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index 9ab9517be..fcd484b2c 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -166,12 +166,12 @@ RuinsofAlphHoOhChamber_MapEventHeader: ; signposts db 6 - signpost 3, 2, $0, MapRuinsofAlphHoOhChamberSignpost1Script - signpost 3, 5, $0, MapRuinsofAlphHoOhChamberSignpost1Script - signpost 2, 3, $1, MapRuinsofAlphHoOhChamberSignpost2Script - signpost 2, 4, $1, MapRuinsofAlphHoOhChamberSignpost3Script - signpost 0, 3, $1, MapRuinsofAlphHoOhChamberSignpost4Script - signpost 0, 4, $1, MapRuinsofAlphHoOhChamberSignpost5Script + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphHoOhChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphHoOhChamberSignpost5Script ; people-events db 0 diff --git a/maps/RuinsofAlphHoOhItemRoom.asm b/maps/RuinsofAlphHoOhItemRoom.asm index c3e2e1657..94525ff7c 100644 --- a/maps/RuinsofAlphHoOhItemRoom.asm +++ b/maps/RuinsofAlphHoOhItemRoom.asm @@ -42,12 +42,12 @@ RuinsofAlphHoOhItemRoom_MapEventHeader: ; signposts db 2 - signpost 1, 2, $0, MapRuinsofAlphHoOhItemRoomSignpost1Script - signpost 1, 5, $0, MapRuinsofAlphHoOhItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphHoOhItemRoomSignpost1Script ; people-events db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991c, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x5991e, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59918, EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5991a, EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5991c, EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5991e, EVENT_PICKED_UP_CHARCOAL_FROM_HO_OH_ITEM_ROOM diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 1ce89c0ec..0b79dc97b 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -96,35 +96,35 @@ RuinsofAlphInnerChamber_MapEventHeader: ; signposts db 26 - signpost 3, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 5, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 8, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 11, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 14, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 3, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 5, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 8, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 11, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 14, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 8, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 13, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 13, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 5, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 8, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 11, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 14, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 18, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 2, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 5, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 8, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 11, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 14, $0, MapRuinsofAlphInnerChamberSignpost25Script - signpost 24, 17, $0, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 3, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 8, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 13, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 13, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 18, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 2, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 5, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 8, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 11, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 14, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script + signpost 24, 17, SIGNPOST_READ, MapRuinsofAlphInnerChamberSignpost25Script ; people-events db 3 - person_event SPRITE_FISHER, 11, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x58f7d, EVENT_705 - person_event SPRITE_TEACHER, 17, 18, $2, $11, 255, 255, $0, 0, TeacherScript_0x58f80, EVENT_705 - person_event SPRITE_GRAMPS, 23, 15, $7, $0, 255, 255, $b0, 0, GrampsScript_0x58f83, EVENT_705 + person_event SPRITE_FISHER, 11, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58f7d, EVENT_705 + person_event SPRITE_TEACHER, 17, 18, DOWN << 2 | $2, $11, -1, -1, $0, 0, TeacherScript_0x58f80, EVENT_705 + person_event SPRITE_GRAMPS, 23, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x58f83, EVENT_705 diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 808ba0a4a..013bd4a43 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -275,14 +275,14 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; signposts db 6 - signpost 3, 2, $0, MapRuinsofAlphKabutoChamberSignpost1Script - signpost 3, 5, $0, MapRuinsofAlphKabutoChamberSignpost1Script - signpost 2, 3, $1, MapRuinsofAlphKabutoChamberSignpost2Script - signpost 2, 4, $1, MapRuinsofAlphKabutoChamberSignpost3Script - signpost 0, 3, $1, MapRuinsofAlphKabutoChamberSignpost4Script - signpost 0, 4, $1, MapRuinsofAlphKabutoChamberSignpost5Script + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphKabutoChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphKabutoChamberSignpost5Script ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, EVENT_74E - person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, -1 + person_event SPRITE_RECEPTIONIST, 9, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x58769, EVENT_74E + person_event SPRITE_SCIENTIST, 5, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsofAlphKabutoItemRoom.asm b/maps/RuinsofAlphKabutoItemRoom.asm index cbbb8503d..77c2405b7 100644 --- a/maps/RuinsofAlphKabutoItemRoom.asm +++ b/maps/RuinsofAlphKabutoItemRoom.asm @@ -42,12 +42,12 @@ RuinsofAlphKabutoItemRoom_MapEventHeader: ; signposts db 2 - signpost 1, 2, $0, MapRuinsofAlphKabutoItemRoomSignpost1Script - signpost 1, 5, $0, MapRuinsofAlphKabutoItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphKabutoItemRoomSignpost1Script ; people-events db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a6, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x599a8, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a2, EVENT_PICKED_UP_BERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a4, EVENT_PICKED_UP_PSNCUREBERRY_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a6, EVENT_PICKED_UP_HEAL_POWDER_FROM_KABUTO_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x599a8, EVENT_PICKED_UP_ENERGYPOWDER_FROM_KABUTO_ITEM_ROOM diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 917c8e2eb..86ba93086 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -166,12 +166,12 @@ RuinsofAlphOmanyteChamber_MapEventHeader: ; signposts db 6 - signpost 3, 2, $0, MapRuinsofAlphOmanyteChamberSignpost1Script - signpost 3, 5, $0, MapRuinsofAlphOmanyteChamberSignpost1Script - signpost 2, 3, $1, MapRuinsofAlphOmanyteChamberSignpost2Script - signpost 2, 4, $1, MapRuinsofAlphOmanyteChamberSignpost3Script - signpost 0, 3, $1, MapRuinsofAlphOmanyteChamberSignpost4Script - signpost 0, 4, $1, MapRuinsofAlphOmanyteChamberSignpost5Script + signpost 3, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script + signpost 3, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteChamberSignpost1Script + signpost 2, 3, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost2Script + signpost 2, 4, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost3Script + signpost 0, 3, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost4Script + signpost 0, 4, SIGNPOST_UP, MapRuinsofAlphOmanyteChamberSignpost5Script ; people-events db 0 diff --git a/maps/RuinsofAlphOmanyteItemRoom.asm b/maps/RuinsofAlphOmanyteItemRoom.asm index 2d920e170..9a2c6ad24 100644 --- a/maps/RuinsofAlphOmanyteItemRoom.asm +++ b/maps/RuinsofAlphOmanyteItemRoom.asm @@ -42,12 +42,12 @@ RuinsofAlphOmanyteItemRoom_MapEventHeader: ; signposts db 2 - signpost 1, 2, $0, MapRuinsofAlphOmanyteItemRoomSignpost1Script - signpost 1, 5, $0, MapRuinsofAlphOmanyteItemRoomSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script + signpost 1, 5, SIGNPOST_READ, MapRuinsofAlphOmanyteItemRoomSignpost1Script ; people-events db 4 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 10, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a30, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM - person_event SPRITE_POKE_BALL, 8, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x59a32, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a2c, EVENT_PICKED_UP_MYSTERYBERRY_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 10, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a2e, EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a30, EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM + person_event SPRITE_POKE_BALL, 8, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59a32, EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index 5ce6838e4..eabecdf7e 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -337,14 +337,14 @@ RuinsofAlphOutside_MapEventHeader: ; signposts db 3 - signpost 8, 16, $0, MapRuinsofAlphOutsideSignpost0Script - signpost 16, 12, $0, MapRuinsofAlphOutsideSignpost1Script - signpost 12, 18, $0, MapRuinsofAlphOutsideSignpost2Script + signpost 8, 16, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost0Script + signpost 16, 12, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost1Script + signpost 12, 18, SIGNPOST_READ, MapRuinsofAlphOutsideSignpost2Script ; people-events db 5 - person_event SPRITE_YOUNGSTER, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, -1 - person_event SPRITE_SCIENTIST, 19, 15, $7, $0, 255, 255, $0, 0, ScientistScript_0x58043, EVENT_703 - person_event SPRITE_FISHER, 21, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x58061, EVENT_78E - person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, EVENT_78F - person_event SPRITE_YOUNGSTER, 12, 16, $7, $0, 255, 255, $80, 0, YoungsterScript_0x5807e, EVENT_78F + person_event SPRITE_YOUNGSTER, 24, 8, UP << 2 | $2, $0, -1, -1, $2, 1, TrainerPsychicNathan, -1 + person_event SPRITE_SCIENTIST, 19, 15, UP << 2 | $3, $0, -1, -1, $0, 0, ScientistScript_0x58043, EVENT_703 + person_event SPRITE_FISHER, 21, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58061, EVENT_78E + person_event SPRITE_YOUNGSTER, 15, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x58076, EVENT_78F + person_event SPRITE_YOUNGSTER, 12, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5807e, EVENT_78F diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index 2f663809f..c2f6e5744 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -406,12 +406,12 @@ RuinsofAlphResearchCenter_MapEventHeader: ; signposts db 3 - signpost 5, 6, $0, MapRuinsofAlphResearchCenterSignpost0Script - signpost 4, 3, $0, MapRuinsofAlphResearchCenterSignpost1Script - signpost 1, 7, $0, MapRuinsofAlphResearchCenterSignpost2Script + signpost 5, 6, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost0Script + signpost 4, 3, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost1Script + signpost 1, 7, SIGNPOST_READ, MapRuinsofAlphResearchCenterSignpost2Script ; people-events db 3 - person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, -1 - person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, -1 - person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, EVENT_704 + person_event SPRITE_SCIENTIST, 9, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591e5, -1 + person_event SPRITE_SCIENTIST, 6, 9, DOWN << 2 | $2, $12, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x59214, -1 + person_event SPRITE_SCIENTIST, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591d1, EVENT_704 diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index 0ad49c827..d83c0bfde 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -87,11 +87,11 @@ SafariZoneWardensHome_MapEventHeader: ; signposts db 4 - signpost 1, 0, $0, WardensHomeBookshelf - signpost 1, 1, $0, WardensHomeBookshelf - signpost 0, 7, $0, WardenPhoto - signpost 0, 9, $0, SafariZonePhoto + signpost 1, 0, SIGNPOST_READ, WardensHomeBookshelf + signpost 1, 1, SIGNPOST_READ, WardensHomeBookshelf + signpost 0, 7, SIGNPOST_READ, WardenPhoto + signpost 0, 9, SIGNPOST_READ, SafariZonePhoto ; people-events db 1 - person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, -1 + person_event SPRITE_LASS, 8, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, WardensGranddaughter, -1 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index d155c9abe..b1b6f3cdb 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -284,22 +284,22 @@ SaffronCity_MapEventHeader: ; signposts db 8 - signpost 5, 21, $0, SaffronCitySign - signpost 5, 33, $0, SaffronGymSign - signpost 5, 25, $0, FightingDojoSign - signpost 21, 15, $0, SilphCoSign - signpost 29, 25, $0, MrPsychicsHouseSign - signpost 5, 11, $0, SaffronCityMagnetTrainStationSign - signpost 29, 10, $0, SaffronCityPokeCenterSign - signpost 11, 26, $0, SaffronCityMartSign + signpost 5, 21, SIGNPOST_READ, SaffronCitySign + signpost 5, 33, SIGNPOST_READ, SaffronGymSign + signpost 5, 25, SIGNPOST_READ, FightingDojoSign + signpost 21, 15, SIGNPOST_READ, SilphCoSign + signpost 29, 25, SIGNPOST_READ, MrPsychicsHouseSign + signpost 5, 11, SIGNPOST_READ, SaffronCityMagnetTrainStationSign + signpost 29, 10, SIGNPOST_READ, SaffronCityPokeCenterSign + signpost 11, 26, SIGNPOST_READ, SaffronCityMartSign ; people-events db 8 - person_event SPRITE_LASS, 18, 11, $5, $2, 255, 255, $80, 0, LassScript_0x19932a, -1 - person_event SPRITE_POKEFAN_M, 34, 23, $5, $2, 255, 255, $b0, 0, PokefanMScript_0x19933e, -1 - person_event SPRITE_COOLTRAINER_M, 11, 36, $5, $1, 255, 255, $a0, 0, CooltrainerMScript_0x199352, -1 - person_event SPRITE_COOLTRAINER_F, 28, 24, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x199355, -1 - person_event SPRITE_FISHER, 16, 31, $6, $0, 255, 255, $a0, 0, FisherScript_0x199358, -1 - person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, -1 - person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, -1 - person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, -1 + person_event SPRITE_LASS, 18, 11, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x19932a, -1 + person_event SPRITE_POKEFAN_M, 34, 23, UP << 2 | $1, $2, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x19933e, -1 + person_event SPRITE_COOLTRAINER_M, 11, 36, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerMScript_0x199352, -1 + person_event SPRITE_COOLTRAINER_F, 28, 24, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x199355, -1 + person_event SPRITE_FISHER, 16, 31, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x199358, -1 + person_event SPRITE_YOUNGSTER, 23, 19, UP << 2 | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x19936c, -1 + person_event SPRITE_YOUNGSTER, 26, 39, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x19936f, -1 + person_event SPRITE_LASS, 12, 23, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x199372, -1 diff --git a/maps/SaffronGym.asm b/maps/SaffronGym.asm index 8cc8e535d..bb7aa1569 100644 --- a/maps/SaffronGym.asm +++ b/maps/SaffronGym.asm @@ -390,13 +390,13 @@ SaffronGym_MapEventHeader: ; signposts db 1 - signpost 15, 8, $0, SaffronGymStatue + signpost 15, 8, SIGNPOST_READ, SaffronGymStatue ; people-events db 6 - person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, -1 - person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, -1 - person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, -1 - person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, -1 - person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, -1 - person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, -1 + person_event SPRITE_SABRINA, 12, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SabrinaScript_0x189c2e, -1 + person_event SPRITE_GRANNY, 20, 21, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerMediumRebecca, -1 + person_event SPRITE_YOUNGSTER, 20, 7, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicFranklin, -1 + person_event SPRITE_GRANNY, 8, 7, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerMediumDoris, -1 + person_event SPRITE_YOUNGSTER, 8, 21, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPsychicJared, -1 + person_event SPRITE_GYM_GUY, 18, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SaffronGymGuyScript, -1 diff --git a/maps/SaffronMart.asm b/maps/SaffronMart.asm index 41ddde494..4ca2ddb76 100644 --- a/maps/SaffronMart.asm +++ b/maps/SaffronMart.asm @@ -49,6 +49,6 @@ SaffronMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, -1 - person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, -1 - person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x18a3bf, -1 + person_event SPRITE_COOLTRAINER_M, 6, 11, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CooltrainerMScript_0x18a3c6, -1 + person_event SPRITE_COOLTRAINER_F, 10, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x18a3c9, -1 diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index ec70aed5f..c112e1cc8 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -123,7 +123,7 @@ SaffronPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18a47d, -1 - person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, -1 - person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, -1 - person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x18a47d, -1 + person_event SPRITE_TEACHER, 6, 11, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x18a480, -1 + person_event SPRITE_FISHER, 10, 12, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x18a48c, -1 + person_event SPRITE_YOUNGSTER, 8, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x18a4a0, -1 diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index eaf819d1a..cf02c89d9 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -231,7 +231,7 @@ SaffronTrainStation_MapEventHeader: ; people-events db 4 - person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, -1 - person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, -1 - person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, EVENT_772 - person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, EVENT_772 + person_event SPRITE_OFFICER, 13, 13, UP << 2 | $2, $0, -1, -1, $0, 0, OfficerScript_0x18a81e, -1 + person_event SPRITE_GYM_GUY, 18, 14, DOWN << 2 | $2, $11, -1, -1, $0, 0, GymGuyScript_0x18a875, -1 + person_event SPRITE_TEACHER, 15, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, TeacherScript_0x18a889, EVENT_772 + person_event SPRITE_LASS, 14, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x18a88c, EVENT_772 diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index ba2721371..69316d34f 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -171,5 +171,5 @@ SeafoamGym_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, -1 - person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, EVENT_777 + person_event SPRITE_BLAINE, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlaineScript_0x1ab4fb, -1 + person_event SPRITE_GYM_GUY, 9, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SeafoamGymGuyScript, EVENT_777 diff --git a/maps/SilphCo1F.asm b/maps/SilphCo1F.asm index c83298920..799393a3f 100644 --- a/maps/SilphCo1F.asm +++ b/maps/SilphCo1F.asm @@ -68,5 +68,5 @@ SilphCo1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, -1 - person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, -1 + person_event SPRITE_RECEPTIONIST, 6, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ReceptionistScript_0x18abe5, -1 + person_event SPRITE_OFFICER, 5, 17, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x18abe8, -1 diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index b00daa197..827553030 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -28,5 +28,5 @@ SilverCaveItemRooms_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c65e, EVENT_69C - person_event SPRITE_POKE_BALL, 15, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c660, EVENT_69D + person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c65e, EVENT_69C + person_event SPRITE_POKE_BALL, 15, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c660, EVENT_69D diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 290c17977..ab2b3f4be 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -40,9 +40,9 @@ SilverCaveOutside_MapEventHeader: ; signposts db 3 - signpost 19, 24, $0, MtSilverPokeCenterSign - signpost 13, 17, $0, MtSilverSign - signpost 25, 9, $7, MapSilverCaveOutsideSignpostItem2 + signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign + signpost 13, 17, SIGNPOST_READ, MtSilverSign + signpost 25, 9, SIGNPOST_ITEMIFSET, MapSilverCaveOutsideSignpostItem2 ; people-events db 0 diff --git a/maps/SilverCavePokeCenter1F.asm b/maps/SilverCavePokeCenter1F.asm index a9ad58a70..59df1f55b 100644 --- a/maps/SilverCavePokeCenter1F.asm +++ b/maps/SilverCavePokeCenter1F.asm @@ -43,5 +43,5 @@ SilverCavePokeCenter1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, -1 - person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x1ae59a, -1 + person_event SPRITE_GRANNY, 9, 5, LEFT << 2 | $0, $12, -1, -1, $0, 0, GrannyScript_0x1ae59d, -1 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index 5bd516f5b..a47c3ecff 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -41,12 +41,12 @@ SilverCaveRoom1_MapEventHeader: ; signposts db 2 - signpost 23, 16, $7, MapSilverCaveRoom1SignpostItem0 - signpost 12, 17, $7, MapSilverCaveRoom1SignpostItem1 + signpost 23, 16, SIGNPOST_ITEMIFSET, MapSilverCaveRoom1SignpostItem0 + signpost 12, 17, SIGNPOST_ITEMIFSET, MapSilverCaveRoom1SignpostItem1 ; people-events db 4 - person_event SPRITE_POKE_BALL, 13, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c554, EVENT_699 - person_event SPRITE_POKE_BALL, 33, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c556, EVENT_69A - person_event SPRITE_POKE_BALL, 34, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c558, EVENT_69B - person_event SPRITE_POKE_BALL, 22, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c55a, EVENT_7C1 + person_event SPRITE_POKE_BALL, 13, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_699 + person_event SPRITE_POKE_BALL, 33, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_69A + person_event SPRITE_POKE_BALL, 34, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c558, EVENT_69B + person_event SPRITE_POKE_BALL, 22, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c55a, EVENT_7C1 diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 5a7b870a2..4d7280ebb 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -35,10 +35,10 @@ SilverCaveRoom2_MapEventHeader: ; signposts db 1 - signpost 31, 14, $7, MapSilverCaveRoom2SignpostItem0 + signpost 31, 14, SIGNPOST_ITEMIFSET, MapSilverCaveRoom2SignpostItem0 ; people-events db 3 - person_event SPRITE_POKE_BALL, 14, 28, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b2, EVENT_7C2 - person_event SPRITE_POKE_BALL, 28, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b4, EVENT_7C3 - person_event SPRITE_POKE_BALL, 24, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c5b6, EVENT_7C4 + person_event SPRITE_POKE_BALL, 14, 28, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b2, EVENT_7C2 + person_event SPRITE_POKE_BALL, 28, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b4, EVENT_7C3 + person_event SPRITE_POKE_BALL, 24, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b6, EVENT_7C4 diff --git a/maps/SilverCaveRoom3.asm b/maps/SilverCaveRoom3.asm index 27816033c..a867742f8 100644 --- a/maps/SilverCaveRoom3.asm +++ b/maps/SilverCaveRoom3.asm @@ -63,4 +63,4 @@ SilverCaveRoom3_MapEventHeader: ; people-events db 1 - person_event SPRITE_RED, 14, 13, $7, $0, 255, 255, $80, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER + person_event SPRITE_RED, 14, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, RedScript_0x18c603, EVENT_RED_IN_MT_SILVER diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index 1f2e0fcb6..b8965e462 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -10,7 +10,7 @@ KurtScript_0x5a5d5: TrainerGruntM29: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_22 + dw EVENT_BEAT_ROCKET_GRUNTM_29 ; trainer group && trainer id db GRUNTM, 29 @@ -390,12 +390,12 @@ SlowpokeWellB1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_ROCKET, 11, 19, $6, $0, 255, 255, $2, 3, TrainerGruntM29, EVENT_6FC - person_event SPRITE_ROCKET, 6, 9, $6, $0, 255, 255, $2, 1, TrainerGruntM1, EVENT_6FC - person_event SPRITE_ROCKET, 10, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM2, EVENT_6FC - person_event SPRITE_ROCKET_GIRL, 8, 14, $9, $0, 255, 255, $82, 4, TrainerGruntF1, EVENT_6FC - person_event SPRITE_SLOWPOKE, 8, 11, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a681, EVENT_6FB - person_event SPRITE_SLOWPOKE, 6, 10, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a695, EVENT_6FB - person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, EVENT_740 - person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, EVENT_662 + person_event SPRITE_ROCKET, 11, 19, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM29, EVENT_6FC + person_event SPRITE_ROCKET, 6, 9, UP << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM1, EVENT_6FC + person_event SPRITE_ROCKET, 10, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM2, EVENT_6FC + person_event SPRITE_ROCKET_GIRL, 8, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerGruntF1, EVENT_6FC + person_event SPRITE_SLOWPOKE, 8, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a681, EVENT_6FB + person_event SPRITE_SLOWPOKE, 6, 10, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a695, EVENT_6FB + person_event SPRITE_KURT, 18, 20, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x5a5d5, EVENT_740 + person_event SPRITE_BOULDER, 6, 7, LEFT << 2 | $11, $0, -1, -1, $0, 0, SlowpokeWellB1FBoulder, -1 + person_event SPRITE_POKE_BALL, 7, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a6a3, EVENT_662 diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 7f2b4d8a4..811d5b0f6 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -73,5 +73,5 @@ SlowpokeWellB2F_MapEventHeader: ; people-events db 2 - person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, -1 - person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, EVENT_663 + person_event SPRITE_GYM_GUY, 8, 9, DOWN << 2 | $2, $21, -1, -1, $0, 1, GymGuyScript_0x5ad0b, -1 + person_event SPRITE_POKE_BALL, 9, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5ad28, EVENT_663 diff --git a/maps/SoulHouse.asm b/maps/SoulHouse.asm index 36aea0ce7..3d2021bbc 100644 --- a/maps/SoulHouse.asm +++ b/maps/SoulHouse.asm @@ -83,7 +83,7 @@ SoulHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, -1 - person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, -1 - person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, -1 - person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, -1 + person_event SPRITE_GRAMPS, 6, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x7ec47, -1 + person_event SPRITE_TEACHER, 7, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x7ec4a, -1 + person_event SPRITE_LASS, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x7ec4d, -1 + person_event SPRITE_GRANNY, 7, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrannyScript_0x7ec50, -1 diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 8a6c625db..2e5a5bfa8 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -127,14 +127,14 @@ SproutTower1F_MapEventHeader: ; signposts db 2 - signpost 15, 7, $0, MapSproutTower1FSignpost1Script - signpost 15, 12, $0, MapSproutTower1FSignpost1Script + signpost 15, 7, SIGNPOST_READ, MapSproutTower1FSignpost1Script + signpost 15, 12, SIGNPOST_READ, MapSproutTower1FSignpost1Script ; people-events db 6 - person_event SPRITE_SAGE, 8, 11, $6, $0, 255, 255, $90, 0, SageScript_0x1844fe, -1 - person_event SPRITE_SAGE, 11, 10, $2, $11, 255, 255, $90, 0, SageScript_0x184501, -1 - person_event SPRITE_GRANNY, 16, 15, $8, $0, 255, 255, $0, 0, GrannyScript_0x184504, -1 - person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, -1 - person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, -1 - person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, EVENT_647 + person_event SPRITE_SAGE, 8, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageScript_0x1844fe, -1 + person_event SPRITE_SAGE, 11, 10, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageScript_0x184501, -1 + person_event SPRITE_GRANNY, 16, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrannyScript_0x184504, -1 + person_event SPRITE_TEACHER, 13, 13, UP << 2 | $3, $0, -1, -1, $0, 0, TeacherScript_0x184507, -1 + person_event SPRITE_SAGE, 9, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSageChow, -1 + person_event SPRITE_POKE_BALL, 11, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18451e, EVENT_647 diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index 9d4230ffb..c138cc272 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -127,10 +127,10 @@ SproutTower2F_MapEventHeader: ; signposts db 1 - signpost 15, 12, $0, MapSproutTower2FSignpost0Script + signpost 15, 12, SIGNPOST_READ, MapSproutTower2FSignpost0Script ; people-events db 3 - person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, -1 - person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, -1 - person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, EVENT_648 + person_event SPRITE_SAGE, 7, 16, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSageNico, -1 + person_event SPRITE_SAGE, 18, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSageEdmond, -1 + person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1847a7, EVENT_648 diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 05c6ec486..5f6aaccb4 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -384,19 +384,19 @@ SproutTower3F_MapEventHeader: ; signposts db 6 - signpost 1, 8, $0, MapSproutTower3FSignpost5Script - signpost 1, 11, $0, MapSproutTower3FSignpost5Script - signpost 0, 9, $0, MapSproutTower3FSignpost3Script - signpost 0, 10, $0, MapSproutTower3FSignpost3Script - signpost 15, 5, $0, MapSproutTower3FSignpost5Script - signpost 15, 14, $0, MapSproutTower3FSignpost5Script + signpost 1, 8, SIGNPOST_READ, MapSproutTower3FSignpost5Script + signpost 1, 11, SIGNPOST_READ, MapSproutTower3FSignpost5Script + signpost 0, 9, SIGNPOST_READ, MapSproutTower3FSignpost3Script + signpost 0, 10, SIGNPOST_READ, MapSproutTower3FSignpost3Script + signpost 15, 5, SIGNPOST_READ, MapSproutTower3FSignpost5Script + signpost 15, 14, SIGNPOST_READ, MapSproutTower3FSignpost5Script ; people-events db 7 - person_event SPRITE_SAGE, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, -1 - person_event SPRITE_SAGE, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, -1 - person_event SPRITE_SAGE, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, -1 - person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, -1 - person_event SPRITE_POKE_BALL, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, EVENT_649 - person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, EVENT_64A - person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER + person_event SPRITE_SAGE, 17, 12, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSageJin, -1 + person_event SPRITE_SAGE, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerSageTroy, -1 + person_event SPRITE_SAGE, 6, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageLiScript, -1 + person_event SPRITE_SAGE, 15, 15, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSageNeal, -1 + person_event SPRITE_POKE_BALL, 18, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a19, EVENT_649 + person_event SPRITE_POKE_BALL, 5, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a1b, EVENT_64A + person_event SPRITE_SILVER, 8, 14, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index e658be5d3..ac32a8b96 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -506,7 +506,7 @@ ScientistJedScript: TrainerGruntM16: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_15 + dw EVENT_BEAT_ROCKET_GRUNTM_16 ; trainer group && trainer id db GRUNTM, 16 @@ -807,21 +807,21 @@ TeamRocketBaseB1F_MapEventHeader: ; signposts db 9 - signpost 11, 19, $0, MapTeamRocketBaseB1FSignpost0Script - signpost 1, 24, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 1, 6, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 8, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 15, 22, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 5, 24, $1, MapTeamRocketBaseB1FSignpost5Script - signpost 11, 20, $0, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 21, $0, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 3, $7, MapTeamRocketBaseB1FSignpostItem8 + signpost 11, 19, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost0Script + signpost 1, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 1, 6, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 15, 8, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 15, 22, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 5, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script + signpost 11, 20, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script + signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script + signpost 11, 3, SIGNPOST_ITEMIFSET, MapTeamRocketBaseB1FSignpostItem8 ; people-events db 6 - person_event SPRITE_ROCKET, 4, 4, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D9 - person_event SPRITE_ROCKET, 8, 6, $9, $0, 255, 255, $2, 3, TrainerGruntM16, EVENT_6DA - person_event SPRITE_SCIENTIST, 16, 22, $8, $0, 255, 255, $92, 3, TrainerScientistJed, EVENT_6DA - person_event SPRITE_POKE_BALL, 10, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac4, EVENT_669 - person_event SPRITE_POKE_BALL, 19, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac6, EVENT_66A - person_event SPRITE_POKE_BALL, 16, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x6cac8, EVENT_66B + person_event SPRITE_ROCKET, 4, 4, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D9 + person_event SPRITE_ROCKET, 8, 6, LEFT << 2 | $1, $0, -1, -1, $2, 3, TrainerGruntM16, EVENT_6DA + person_event SPRITE_SCIENTIST, 16, 22, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistJed, EVENT_6DA + person_event SPRITE_POKE_BALL, 10, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac4, EVENT_669 + person_event SPRITE_POKE_BALL, 19, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac6, EVENT_66A + person_event SPRITE_POKE_BALL, 16, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac8, EVENT_66B diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 7b503ecaf..97a8dba8f 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -179,7 +179,7 @@ UnknownScript_0x6d0be: TrainerGruntM17: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_16 + dw EVENT_BEAT_ROCKET_GRUNTM_17 ; trainer group && trainer id db GRUNTM, 17 @@ -206,7 +206,7 @@ GruntM17Script: TrainerGruntM18: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_17 + dw EVENT_BEAT_ROCKET_GRUNTM_18 ; trainer group && trainer id db GRUNTM, 18 @@ -233,7 +233,7 @@ GruntM18Script: TrainerGruntM19: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_18 + dw EVENT_BEAT_ROCKET_GRUNTM_19 ; trainer group && trainer id db GRUNTM, 19 @@ -975,43 +975,43 @@ TeamRocketBaseB2F_MapEventHeader: ; signposts db 23 - signpost 12, 14, $6, MapTeamRocketBaseB2FSignpostPtr1 - signpost 12, 15, $6, MapTeamRocketBaseB2FSignpostPtr1 - signpost 9, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 16, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 15, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 14, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 13, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 9, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 8, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 6, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 5, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 12, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 13, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 14, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 15, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 16, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 4, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 5, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 6, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 8, 17, $0, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 26, $7, MapTeamRocketBaseB2FSignpostItem22 + signpost 12, 14, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 + signpost 12, 15, SIGNPOST_IFNOTSET, MapTeamRocketBaseB2FSignpostPtr1 + signpost 9, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 16, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 15, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 14, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 13, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 9, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 8, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 7, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 6, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 5, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 12, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 13, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 14, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 15, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 16, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 4, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 5, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 6, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 7, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 8, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script + signpost 7, 26, SIGNPOST_ITEMIFSET, MapTeamRocketBaseB2FSignpostItem22 ; people-events db 14 - person_event SPRITE_ROCKET, 20, 24, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6DE - person_event SPRITE_ROCKET_GIRL, 20, 24, $7, $0, 255, 255, $80, 0, ObjectEvent, EVENT_6DD - person_event SPRITE_LANCE, 17, 9, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6D6 - person_event SPRITE_DRAGON, 17, 13, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6DF - person_event SPRITE_VOLTORB, 9, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d101, EVENT_6E0 - person_event SPRITE_VOLTORB, 11, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d12c, EVENT_6E1 - person_event SPRITE_VOLTORB, 13, 11, $16, $0, 255, 255, $0, 0, VoltorbScript_0x6d157, EVENT_6E2 - person_event SPRITE_VOLTORB, 9, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6E0 - person_event SPRITE_VOLTORB, 11, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6E1 - person_event SPRITE_VOLTORB, 13, 26, $16, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6E2 - person_event SPRITE_ROCKET, 17, 29, $6, $0, 255, 255, $2, 3, TrainerGruntM17, EVENT_6DA - person_event SPRITE_ROCKET, 5, 8, $a, $0, 255, 255, $2, 1, TrainerGruntM18, EVENT_6DA - person_event SPRITE_ROCKET, 18, 25, $8, $0, 255, 255, $2, 4, TrainerGruntM19, EVENT_6DA - person_event SPRITE_POKE_BALL, 14, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6d20d, EVENT_66C + person_event SPRITE_ROCKET, 20, 24, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6DE + person_event SPRITE_ROCKET_GIRL, 20, 24, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_6DD + person_event SPRITE_LANCE, 17, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D6 + person_event SPRITE_DRAGON, 17, 13, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6DF + person_event SPRITE_VOLTORB, 9, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d101, EVENT_6E0 + person_event SPRITE_VOLTORB, 11, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d12c, EVENT_6E1 + person_event SPRITE_VOLTORB, 13, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d157, EVENT_6E2 + person_event SPRITE_VOLTORB, 9, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6E0 + person_event SPRITE_VOLTORB, 11, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6E1 + person_event SPRITE_VOLTORB, 13, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6E2 + person_event SPRITE_ROCKET, 17, 29, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM17, EVENT_6DA + person_event SPRITE_ROCKET, 5, 8, LEFT << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM18, EVENT_6DA + person_event SPRITE_ROCKET, 18, 25, LEFT << 2 | $0, $0, -1, -1, $2, 4, TrainerGruntM19, EVENT_6DA + person_event SPRITE_POKE_BALL, 14, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6d20d, EVENT_66C diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 4725368c0..2c431a702 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -146,7 +146,7 @@ GruntF5Script: TrainerGruntM28: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_21 + dw EVENT_BEAT_ROCKET_GRUNTM_28 ; trainer group && trainer id db GRUNTM, 28 @@ -638,30 +638,30 @@ TeamRocketBaseB3F_MapEventHeader: ; signposts db 10 - signpost 9, 10, $6, BossDoor - signpost 9, 11, $6, BossDoor - signpost 1, 10, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 11, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 12, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 1, 13, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 4, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 5, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 6, $0, MapTeamRocketBaseB3FSignpost9Script - signpost 13, 7, $0, MapTeamRocketBaseB3FSignpost9Script + signpost 9, 10, SIGNPOST_IFNOTSET, BossDoor + signpost 9, 11, SIGNPOST_IFNOTSET, BossDoor + signpost 1, 10, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 1, 11, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 1, 12, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 1, 13, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 13, 4, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 13, 5, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 13, 6, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script + signpost 13, 7, SIGNPOST_READ, MapTeamRocketBaseB3FSignpost9Script ; people-events db 14 - person_event SPRITE_LANCE, 18, 29, $6, $0, 255, 255, $0, 0, LanceScript_0x6dffc, EVENT_6D7 - person_event SPRITE_ROCKET, 7, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6DB - person_event SPRITE_MOLTRES, 6, 11, $16, $0, 255, 255, $90, 0, MoltresScript_0x6e091, EVENT_6DA - person_event SPRITE_ROCKET_GIRL, 11, 25, $7, $0, 255, 255, $82, 0, TrainerGruntF5, EVENT_6DA - person_event SPRITE_ROCKET, 18, 9, $a, $0, 255, 255, $2, 3, TrainerGruntM28, EVENT_6DA - person_event SPRITE_SCIENTIST, 15, 27, $7, $0, 255, 255, $92, 0, TrainerScientistRoss, EVENT_6DA - person_event SPRITE_SCIENTIST, 19, 15, $9, $0, 255, 255, $92, 3, TrainerScientistMitch, EVENT_6DA - person_event SPRITE_ROCKET, 18, 28, $6, $0, 255, 255, $0, 0, RocketScript_0x6e048, EVENT_6DA - person_event SPRITE_SILVER, 9, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C0 - person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e120, EVENT_66D - person_event SPRITE_POKE_BALL, 16, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e122, EVENT_66E - person_event SPRITE_POKE_BALL, 13, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e124, EVENT_66F - person_event SPRITE_POKE_BALL, 6, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e126, EVENT_670 - person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x6e128, EVENT_654 + person_event SPRITE_LANCE, 18, 29, UP << 2 | $2, $0, -1, -1, $0, 0, LanceScript_0x6dffc, EVENT_6D7 + person_event SPRITE_ROCKET, 7, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6DB + person_event SPRITE_MOLTRES, 6, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MoltresScript_0x6e091, EVENT_6DA + person_event SPRITE_ROCKET_GIRL, 11, 25, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerGruntF5, EVENT_6DA + person_event SPRITE_ROCKET, 18, 9, LEFT << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM28, EVENT_6DA + person_event SPRITE_SCIENTIST, 15, 27, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerScientistRoss, EVENT_6DA + person_event SPRITE_SCIENTIST, 19, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistMitch, EVENT_6DA + person_event SPRITE_ROCKET, 18, 28, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x6e048, EVENT_6DA + person_event SPRITE_SILVER, 9, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C0 + person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e120, EVENT_66D + person_event SPRITE_POKE_BALL, 16, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e122, EVENT_66E + person_event SPRITE_POKE_BALL, 13, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e124, EVENT_66F + person_event SPRITE_POKE_BALL, 6, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e126, EVENT_670 + person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e128, EVENT_654 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index a3eb749e2..5386ab633 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -3,42 +3,42 @@ TimeCapsule_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1934f8, $0000 - dw UnknownScript_0x1934fc, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks - dbw 2, UnknownScript_0x1934fd + dbw 2, TimeCapsule_SetWhichChris -UnknownScript_0x1934f8: - priorityjump UnknownScript_0x19350d +.Trigger1: + priorityjump TimeCapsule_Initialize end -UnknownScript_0x1934fc: +.Trigger2: end -UnknownScript_0x1934fd: - special Function29f47 - iffalse UnknownScript_0x193508 +TimeCapsule_SetWhichChris: + special Special_CableClubCheckWhichChris + iffalse .Chris2 disappear $3 appear $2 return -UnknownScript_0x193508: +.Chris2: disappear $2 appear $3 return -UnknownScript_0x19350d: +TimeCapsule_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $3 end MapTimeCapsuleSignpost1Script: - special Function29eaf + special Special_TimeCapsule newloadmap $f8 end @@ -68,10 +68,10 @@ TimeCapsule_MapEventHeader: ; signposts db 2 - signpost 4, 4, $3, MapTimeCapsuleSignpost1Script - signpost 4, 5, $4, MapTimeCapsuleSignpost1Script + signpost 4, 4, SIGNPOST_RIGHT, MapTimeCapsuleSignpost1Script + signpost 4, 5, SIGNPOST_LEFT, MapTimeCapsuleSignpost1Script ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x19351a, EVENT_000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x19351a, EVENT_001 + person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_CHRIS2_IN_CABLE_CLUB diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index 8daae5af4..a0ffa54a7 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -534,13 +534,13 @@ TinTower1F_MapEventHeader: ; people-events db 10 - person_event SPRITE_SUICUNE, 13, 13, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_7B2 - person_event SPRITE_RAIKOU, 13, 11, $1, $0, 255, 255, $b0, 0, ObjectEvent, EVENT_7B4 - person_event SPRITE_ENTEI, 13, 16, $1, $0, 255, 255, $80, 0, ObjectEvent, EVENT_7B3 - person_event SPRITE_SUPER_NERD, 7, 12, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x1851c8, EVENT_7B5 - person_event SPRITE_SAGE, 13, 9, $3, $0, 255, 255, $0, 0, SageScript_0x185173, EVENT_7B6 - person_event SPRITE_SAGE, 15, 15, $3, $0, 255, 255, $0, 0, SageScript_0x185176, EVENT_7B6 - person_event SPRITE_SAGE, 10, 18, $3, $0, 255, 255, $0, 0, SageScript_0x185179, EVENT_7B6 - person_event SPRITE_SAGE, 6, 8, $4, $10, 255, 255, $0, 0, SageScript_0x18517c, EVENT_7C5 - person_event SPRITE_SAGE, 5, 13, $6, $0, 255, 255, $0, 0, SageScript_0x185188, EVENT_7C5 - person_event SPRITE_SAGE, 6, 18, $5, $1, 255, 255, $0, 0, SageScript_0x1851bc, EVENT_7C5 + person_event SPRITE_SUICUNE, 13, 13, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_7B2 + person_event SPRITE_RAIKOU, 13, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_7B4 + person_event SPRITE_ENTEI, 13, 16, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_7B3 + person_event SPRITE_SUPER_NERD, 7, 12, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x1851c8, EVENT_7B5 + person_event SPRITE_SAGE, 13, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185173, EVENT_7B6 + person_event SPRITE_SAGE, 15, 15, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185176, EVENT_7B6 + person_event SPRITE_SAGE, 10, 18, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185179, EVENT_7B6 + person_event SPRITE_SAGE, 6, 8, UP << 2 | $0, $10, -1, -1, $0, 0, SageScript_0x18517c, EVENT_7C5 + person_event SPRITE_SAGE, 5, 13, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x185188, EVENT_7C5 + person_event SPRITE_SAGE, 6, 18, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x1851bc, EVENT_7C5 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 2bb75172c..02b0765ba 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -25,4 +25,4 @@ TinTower3F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 18, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a37, EVENT_64B + person_event SPRITE_POKE_BALL, 18, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a37, EVENT_64B diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index 873ba660f..e5109007f 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -35,10 +35,10 @@ TinTower4F_MapEventHeader: ; signposts db 1 - signpost 6, 11, $7, MapTinTower4FSignpostItem0 + signpost 6, 11, SIGNPOST_ITEMIFSET, MapTinTower4FSignpostItem0 ; people-events db 3 - person_event SPRITE_POKE_BALL, 14, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a58, EVENT_64C - person_event SPRITE_POKE_BALL, 18, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5a, EVENT_64D - person_event SPRITE_POKE_BALL, 16, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x185a5c, EVENT_64E + person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a58, EVENT_64C + person_event SPRITE_POKE_BALL, 18, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5a, EVENT_64D + person_event SPRITE_POKE_BALL, 16, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5c, EVENT_64E diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index e92d5859d..7478ac69f 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -34,9 +34,9 @@ TinTower5F_MapEventHeader: ; signposts db 2 - signpost 14, 16, $7, MapTinTower5FSignpostItem0 - signpost 15, 3, $7, MapTinTower5FSignpostItem1 + signpost 14, 16, SIGNPOST_ITEMIFSET, MapTinTower5FSignpostItem0 + signpost 15, 3, SIGNPOST_ITEMIFSET, MapTinTower5FSignpostItem1 ; people-events db 1 - person_event SPRITE_POKE_BALL, 13, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185aa9, EVENT_64F + person_event SPRITE_POKE_BALL, 13, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185aa9, EVENT_64F diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 3bddb4071..2e9c3ab09 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -25,4 +25,4 @@ TinTower6F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 12, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x185ae4, EVENT_7C6 + person_event SPRITE_POKE_BALL, 12, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ae4, EVENT_7C6 diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index 79e7f6477..e84c42e6d 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -28,4 +28,4 @@ TinTower7F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 5, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b05, EVENT_650 + person_event SPRITE_POKE_BALL, 5, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b05, EVENT_650 diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 10b3d6cd4..647de8435 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -35,6 +35,6 @@ TinTower8F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b35, EVENT_651 - person_event SPRITE_POKE_BALL, 10, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b37, EVENT_652 - person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b39, EVENT_653 + person_event SPRITE_POKE_BALL, 17, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b35, EVENT_651 + person_event SPRITE_POKE_BALL, 10, 15, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b37, EVENT_652 + person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b39, EVENT_653 diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 75673d3b0..17c73e459 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -38,4 +38,4 @@ TinTower9F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 5, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x185b88, EVENT_7C7 + person_event SPRITE_POKE_BALL, 5, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b88, EVENT_7C7 diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index 38d01485a..d2d2772e1 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -60,4 +60,4 @@ TinTowerRoof_MapEventHeader: ; people-events db 1 - person_event SPRITE_HO_OH, 9, 13, $16, $0, 255, 255, $80, 0, HoOhScript_0x77244, EVENT_73C + person_event SPRITE_HO_OH, 9, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, HoOhScript_0x77244, EVENT_73C diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index 0855535a6..e06881187 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -25,4 +25,4 @@ TohjoFalls_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 10, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18db02, EVENT_6A9 + person_event SPRITE_POKE_BALL, 10, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18db02, EVENT_6A9 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index b454d7d2a..98263f7af 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -3,53 +3,53 @@ TradeCenter_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x1933e9, $0000 - dw UnknownScript_0x1933ed, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks - dbw 2, UnknownScript_0x1933ee + dbw 2, TradeCenter_SetWhichChris -UnknownScript_0x1933e9: - priorityjump UnknownScript_0x1933fe +.Trigger1: + priorityjump TradeCenter_Initialize end -UnknownScript_0x1933ed: +.Trigger2: end -UnknownScript_0x1933ee: - special Function29f47 - iffalse UnknownScript_0x1933f9 +TradeCenter_SetWhichChris: + special Special_CableClubCheckWhichChris + iffalse .Chris2 disappear $3 appear $2 return -UnknownScript_0x1933f9: +.Chris2: disappear $2 appear $3 return -UnknownScript_0x1933fe: +TradeCenter_Initialize: dotrigger $1 domaptrigger GROUP_POKECENTER_2F, MAP_POKECENTER_2F, $1 end MapTradeCenterSignpost1Script: - special Function29ec4 + special Special_TradeCenter newloadmap $f8 end -UnknownScript_0x19340b: +ChrisScript_0x19340b: loadfont - writetext UnknownText_0x193412 + writetext .FriendReadyText closetext loadmovesprites end -UnknownText_0x193412: +.FriendReadyText: text "Your friend is" line "ready." done @@ -68,10 +68,10 @@ TradeCenter_MapEventHeader: ; signposts db 2 - signpost 4, 4, $3, MapTradeCenterSignpost1Script - signpost 4, 5, $4, MapTradeCenterSignpost1Script + signpost 4, 4, SIGNPOST_RIGHT, MapTradeCenterSignpost1Script + signpost 4, 5, SIGNPOST_LEFT, MapTradeCenterSignpost1Script ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, $9, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_000 - person_event SPRITE_CHRIS, 8, 10, $8, $0, 255, 255, $0, 0, ChrisScript_0x193499, EVENT_001 + person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS2_IN_CABLE_CLUB diff --git a/maps/TrainerHouse1F.asm b/maps/TrainerHouse1F.asm index 99c36018b..8ce3cc1ac 100644 --- a/maps/TrainerHouse1F.asm +++ b/maps/TrainerHouse1F.asm @@ -145,14 +145,14 @@ TrainerHouse1F_MapEventHeader: ; signposts db 3 - signpost 0, 5, $0, MapTrainerHouse1FSignpost0Script - signpost 0, 7, $0, MapTrainerHouse1FSignpost1Script - signpost 10, 7, $0, MapTrainerHouse1FSignpost2Script + signpost 0, 5, SIGNPOST_READ, MapTrainerHouse1FSignpost0Script + signpost 0, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost1Script + signpost 10, 7, SIGNPOST_READ, MapTrainerHouse1FSignpost2Script ; people-events db 5 - person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, -1 - person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, -1 - person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, -1 - person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, -1 - person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, -1 + person_event SPRITE_RECEPTIONIST, 15, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x9af67, -1 + person_event SPRITE_COOLTRAINER_M, 15, 11, UP << 2 | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x9af6a, -1 + person_event SPRITE_COOLTRAINER_F, 6, 10, UP << 2 | $2, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x9af6d, -1 + person_event SPRITE_YOUNGSTER, 12, 8, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x9af70, -1 + person_event SPRITE_GENTLEMAN, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, GentlemanScript_0x9af73, -1 diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index 9d947359a..5e56c35b7 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -184,5 +184,5 @@ TrainerHouseB1F_MapEventHeader: ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, -1 - person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, -1 + person_event SPRITE_RECEPTIONIST, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1 + person_event SPRITE_CHRIS, 15, 10, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, -1 diff --git a/maps/Underground.asm b/maps/Underground.asm index 63116edcb..6e4c455e9 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -29,8 +29,8 @@ Underground_MapEventHeader: ; signposts db 2 - signpost 9, 3, $7, MapUndergroundSignpostItem0 - signpost 19, 1, $7, MapUndergroundSignpostItem1 + signpost 9, 3, SIGNPOST_ITEMIFSET, MapUndergroundSignpostItem0 + signpost 19, 1, SIGNPOST_ITEMIFSET, MapUndergroundSignpostItem1 ; people-events db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 24d9c01e4..1962e4364 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -194,7 +194,7 @@ GruntM11Script: TrainerGruntM25: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_20 + dw EVENT_BEAT_ROCKET_GRUNTM_25 ; trainer group && trainer id db GRUNTM, 25 @@ -275,7 +275,7 @@ BurglarEddieScript: TrainerGruntM13: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_12 + dw EVENT_BEAT_ROCKET_GRUNTM_13 ; trainer group && trainer id db GRUNTM, 13 @@ -1012,23 +1012,23 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: ; signposts db 6 - signpost 1, 16, $0, MapUndergroundPathSwitchRoomEntrancesSignpost0Script - signpost 1, 10, $0, MapUndergroundPathSwitchRoomEntrancesSignpost1Script - signpost 1, 2, $0, MapUndergroundPathSwitchRoomEntrancesSignpost2Script - signpost 11, 20, $0, MapUndergroundPathSwitchRoomEntrancesSignpost3Script - signpost 9, 8, $7, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 - signpost 8, 1, $7, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 + signpost 1, 16, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost0Script + signpost 1, 10, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost1Script + signpost 1, 2, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost2Script + signpost 11, 20, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost3Script + signpost 9, 8, SIGNPOST_ITEMIFSET, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 + signpost 8, 1, SIGNPOST_ITEMIFSET, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 ; people-events db 11 - person_event SPRITE_PHARMACIST, 16, 13, $9, $0, 255, 255, $a2, 2, TrainerBurglarDuncan, EVENT_6CE - person_event SPRITE_PHARMACIST, 12, 8, $8, $0, 255, 255, $a2, 2, TrainerBurglarEddie, EVENT_6CE - person_event SPRITE_ROCKET, 6, 21, $6, $0, 255, 255, $2, 3, TrainerGruntM13, EVENT_6CE - person_event SPRITE_ROCKET, 6, 15, $6, $0, 255, 255, $2, 3, TrainerGruntM11, EVENT_6CE - person_event SPRITE_ROCKET, 6, 7, $6, $0, 255, 255, $2, 3, TrainerGruntM25, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 16, 23, $6, $0, 255, 255, $82, 1, TrainerGruntF3, EVENT_6CE - person_event SPRITE_TEACHER, 31, 7, $6, $0, 255, 255, $0, 0, TeacherScript_0x7ca7d, -1 - person_event SPRITE_SUPER_NERD, 31, 23, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7ca7a, -1 - person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7d, EVENT_673 - person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, EVENT_674 - person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C1 + person_event SPRITE_PHARMACIST, 16, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarDuncan, EVENT_6CE + person_event SPRITE_PHARMACIST, 12, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarEddie, EVENT_6CE + person_event SPRITE_ROCKET, 6, 21, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM13, EVENT_6CE + person_event SPRITE_ROCKET, 6, 15, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM11, EVENT_6CE + person_event SPRITE_ROCKET, 6, 7, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM25, EVENT_6CE + person_event SPRITE_ROCKET_GIRL, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF3, EVENT_6CE + person_event SPRITE_TEACHER, 31, 7, UP << 2 | $2, $0, -1, -1, $0, 0, TeacherScript_0x7ca7d, -1 + person_event SPRITE_SUPER_NERD, 31, 23, UP << 2 | $2, $0, -1, -1, $0, 0, SuperNerdScript_0x7ca7a, -1 + person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7d, EVENT_673 + person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7f, EVENT_674 + person_event SPRITE_SILVER, 7, 27, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C1 diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index ab0b3e355..051f14d9b 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -31,7 +31,7 @@ UnknownScript_0x7d950: TrainerGruntM24: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_19 + dw EVENT_BEAT_ROCKET_GRUNTM_24 ; trainer group && trainer id db GRUNTM, 24 @@ -58,7 +58,7 @@ GruntM24Script: TrainerGruntM14: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_13 + dw EVENT_BEAT_ROCKET_GRUNTM_14 ; trainer group && trainer id db GRUNTM, 14 @@ -85,7 +85,7 @@ GruntM14Script: TrainerGruntM15: ; bit/flag number - dw EVENT_BEAT_ROCKET_GRUNTM_14 + dw EVENT_BEAT_ROCKET_GRUNTM_15 ; trainer group && trainer id db GRUNTM, 15 @@ -270,10 +270,10 @@ UndergroundWarehouse_MapEventHeader: ; people-events db 7 - person_event SPRITE_ROCKET, 12, 13, $7, $0, 255, 255, $2, 3, TrainerGruntM24, EVENT_6CE - person_event SPRITE_ROCKET, 19, 12, $7, $0, 255, 255, $2, 3, TrainerGruntM14, EVENT_6CE - person_event SPRITE_ROCKET, 7, 18, $9, $0, 255, 255, $2, 4, TrainerGruntM15, EVENT_6CE - person_event SPRITE_GENTLEMAN, 12, 16, $3, $0, 255, 255, $0, 0, GentlemanScript_0x7d9bf, EVENT_6CE - person_event SPRITE_POKE_BALL, 19, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e4, EVENT_679 - person_event SPRITE_POKE_BALL, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, EVENT_67A - person_event SPRITE_POKE_BALL, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, EVENT_655 + person_event SPRITE_ROCKET, 12, 13, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM24, EVENT_6CE + person_event SPRITE_ROCKET, 19, 12, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM14, EVENT_6CE + person_event SPRITE_ROCKET, 7, 18, LEFT << 2 | $1, $0, -1, -1, $2, 4, TrainerGruntM15, EVENT_6CE + person_event SPRITE_GENTLEMAN, 12, 16, DOWN << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x7d9bf, EVENT_6CE + person_event SPRITE_POKE_BALL, 19, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e4, EVENT_679 + person_event SPRITE_POKE_BALL, 13, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e6, EVENT_67A + person_event SPRITE_POKE_BALL, 5, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e8, EVENT_655 diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index f11bf3d76..518e5511e 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -287,12 +287,12 @@ UnionCave1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_POKEFAN_M, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, -1 - person_event SPRITE_SUPER_NERD, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, -1 - person_event SPRITE_POKEFAN_M, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, -1 - person_event SPRITE_FISHER, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, -1 - person_event SPRITE_FISHER, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, -1 - person_event SPRITE_POKE_BALL, 25, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c00, EVENT_65A - person_event SPRITE_POKE_BALL, 6, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c02, EVENT_65B - person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, EVENT_65C - person_event SPRITE_POKE_BALL, 37, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c06, EVENT_65D + person_event SPRITE_POKEFAN_M, 10, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerHikerDaniel, -1 + person_event SPRITE_SUPER_NERD, 25, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacLarry, -1 + person_event SPRITE_POKEFAN_M, 12, 15, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerRussell, -1 + person_event SPRITE_FISHER, 31, 19, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerFirebreatherRay, -1 + person_event SPRITE_FISHER, 23, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerFirebreatherBill, -1 + person_event SPRITE_POKE_BALL, 25, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c00, EVENT_65A + person_event SPRITE_POKE_BALL, 6, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c02, EVENT_65B + person_event SPRITE_POKE_BALL, 21, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c04, EVENT_65C + person_event SPRITE_POKE_BALL, 37, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c06, EVENT_65D diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index c3796bf3b..b19b3570e 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -227,10 +227,10 @@ UnionCaveB1F_MapEventHeader: ; people-events db 7 - person_event SPRITE_POKEFAN_M, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, -1 - person_event SPRITE_POKEFAN_M, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, -1 - person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, -1 - person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, -1 - person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, EVENT_65E - person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, EVENT_65F + person_event SPRITE_POKEFAN_M, 8, 13, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerPhillip, -1 + person_event SPRITE_POKEFAN_M, 11, 20, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerLeonard, -1 + person_event SPRITE_SUPER_NERD, 36, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacAndrew, -1 + person_event SPRITE_SUPER_NERD, 34, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacCalvin, -1 + person_event SPRITE_POKE_BALL, 20, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a016, EVENT_65E + person_event SPRITE_BOULDER, 14, 11, LEFT << 2 | $11, $0, -1, -1, $0, 0, UnionCaveB1FBoulder, -1 + person_event SPRITE_POKE_BALL, 27, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a018, EVENT_65F diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index fca0b24db..7a967bf44 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -200,9 +200,9 @@ UnionCaveB2F_MapEventHeader: ; people-events db 6 - person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, -1 - person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, -1 - person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, -1 - person_event SPRITE_POKE_BALL, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, EVENT_660 - person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, EVENT_661 - person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, EVENT_760 + person_event SPRITE_ROCKER, 23, 19, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermNick, -1 + person_event SPRITE_COOLTRAINER_F, 17, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfGwen, -1 + person_event SPRITE_COOLTRAINER_F, 34, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfEmma, -1 + person_event SPRITE_POKE_BALL, 6, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36a, EVENT_660 + person_event SPRITE_POKE_BALL, 23, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36c, EVENT_661 + person_event SPRITE_SURF, 35, 15, UP << 2 | $20, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SurfScript_0x5a31f, EVENT_760 diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index e5eda8fee..5764f0a2e 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -284,20 +284,20 @@ VermilionCity_MapEventHeader: ; signposts db 8 - signpost 3, 25, $0, VermilionCitySign - signpost 19, 5, $0, VermilionGymSign - signpost 13, 5, $0, PokemonFanClubSign - signpost 9, 33, $0, VermilionCityDiglettsCaveSign - signpost 15, 27, $0, VermilionCityPortSign - signpost 5, 10, $0, VermilionCityPokeCenterSign - signpost 13, 22, $0, VermilionCityMartSign - signpost 19, 12, $7, MapVermilionCitySignpostItem7 + signpost 3, 25, SIGNPOST_READ, VermilionCitySign + signpost 19, 5, SIGNPOST_READ, VermilionGymSign + signpost 13, 5, SIGNPOST_READ, PokemonFanClubSign + signpost 9, 33, SIGNPOST_READ, VermilionCityDiglettsCaveSign + signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign + signpost 5, 10, SIGNPOST_READ, VermilionCityPokeCenterSign + signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign + signpost 19, 12, SIGNPOST_ITEMIFSET, MapVermilionCitySignpostItem7 ; people-events db 6 - person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, -1 - person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, -1 - person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, -1 - person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, -1 - person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, VermilionSnorlax, EVENT_770 - person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, -1 + person_event SPRITE_TEACHER, 13, 22, DOWN << 2 | $2, $11, -1, -1, $0, 0, TeacherScript_0x1aa983, -1 + person_event SPRITE_GRAMPS, 10, 27, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrampsScript_0x1aa986, -1 + person_event SPRITE_MACHOP, 11, 30, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, VermilionMachop, -1 + person_event SPRITE_SUPER_NERD, 20, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x1aa99b, -1 + person_event SPRITE_BIG_SNORLAX, 12, 38, UP << 2 | $11, $0, -1, -1, $0, 0, VermilionSnorlax, EVENT_770 + person_event SPRITE_POKEFAN_M, 16, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionGym.asm b/maps/VermilionGym.asm index ef9246b3d..a29e196c8 100644 --- a/maps/VermilionGym.asm +++ b/maps/VermilionGym.asm @@ -315,28 +315,28 @@ VermilionGym_MapEventHeader: ; signposts db 17 - signpost 7, 1, $0, MapVermilionGymSignpost14Script - signpost 7, 3, $0, MapVermilionGymSignpost14Script - signpost 7, 5, $0, MapVermilionGymSignpost14Script - signpost 7, 7, $0, MapVermilionGymSignpost14Script - signpost 7, 9, $0, MapVermilionGymSignpost14Script - signpost 9, 1, $0, MapVermilionGymSignpost14Script - signpost 9, 3, $0, MapVermilionGymSignpost14Script - signpost 9, 5, $0, MapVermilionGymSignpost14Script - signpost 9, 7, $0, MapVermilionGymSignpost14Script - signpost 9, 9, $0, MapVermilionGymSignpost14Script - signpost 11, 1, $0, MapVermilionGymSignpost14Script - signpost 11, 3, $0, MapVermilionGymSignpost14Script - signpost 11, 5, $0, MapVermilionGymSignpost14Script - signpost 11, 7, $0, MapVermilionGymSignpost14Script - signpost 11, 9, $0, MapVermilionGymSignpost14Script - signpost 15, 3, $0, VermilionGymStatue - signpost 15, 6, $0, VermilionGymStatue + signpost 7, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 7, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 7, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 7, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 7, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 9, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 1, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 3, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 5, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 7, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 11, 9, SIGNPOST_READ, MapVermilionGymSignpost14Script + signpost 15, 3, SIGNPOST_READ, VermilionGymStatue + signpost 15, 6, SIGNPOST_READ, VermilionGymStatue ; people-events db 5 - person_event SPRITE_SURGE, 6, 9, $6, $0, 255, 255, $b0, 0, SurgeScript_0x1920a5, -1 - person_event SPRITE_GENTLEMAN, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, -1 - person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, -1 - person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, -1 - person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, -1 + person_event SPRITE_SURGE, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, SurgeScript_0x1920a5, -1 + person_event SPRITE_GENTLEMAN, 12, 12, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerGentlemanGregory, -1 + person_event SPRITE_ROCKER, 11, 8, UP << 2 | $2, $3, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerGuitaristVincent, -1 + person_event SPRITE_SUPER_NERD, 14, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerJugglerHorton, -1 + person_event SPRITE_GYM_GUY, 19, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 1, VermilionGymGuyScript, -1 diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm index ff19655dd..228e34ed5 100644 --- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm +++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm @@ -34,4 +34,4 @@ VermilionHouseDiglettsCaveSpeechHouse_MapEventHeader: ; people-events db 1 - person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, -1 + person_event SPRITE_GENTLEMAN, 7, 5, UP << 2 | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, GentlemanScript_0x192031, -1 diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionHouseFishingSpeechHouse.asm index 6f0a824c8..a490c59e1 100644 --- a/maps/VermilionHouseFishingSpeechHouse.asm +++ b/maps/VermilionHouseFishingSpeechHouse.asm @@ -61,8 +61,8 @@ VermilionHouseFishingSpeechHouse_MapEventHeader: ; signposts db 1 - signpost 0, 3, $0, FishingDudesHousePhoto + signpost 0, 3, SIGNPOST_READ, FishingDudesHousePhoto ; people-events db 1 - person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, -1 + person_event SPRITE_FISHING_GURU, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FishingDude, -1 diff --git a/maps/VermilionMagnetTrainSpeechHouse.asm b/maps/VermilionMagnetTrainSpeechHouse.asm index 745a6c9ed..959b232ba 100644 --- a/maps/VermilionMagnetTrainSpeechHouse.asm +++ b/maps/VermilionMagnetTrainSpeechHouse.asm @@ -43,10 +43,10 @@ VermilionMagnetTrainSpeechHouse_MapEventHeader: ; signposts db 2 - signpost 1, 0, $0, VermilionMagnetTrainSpeechHouseBookshelf - signpost 1, 1, $0, VermilionMagnetTrainSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, VermilionMagnetTrainSpeechHouseBookshelf ; people-events db 2 - person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, -1 - person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, -1 + person_event SPRITE_POKEFAN_F, 7, 6, LEFT << 2 | $0, $0, -1, -1, $0, 0, PokefanFScript_0x191eb7, -1 + person_event SPRITE_YOUNGSTER, 7, 4, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x191eba, -1 diff --git a/maps/VermilionMart.asm b/maps/VermilionMart.asm index 08549a33b..359abbb6b 100644 --- a/maps/VermilionMart.asm +++ b/maps/VermilionMart.asm @@ -48,6 +48,6 @@ VermilionMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, -1 - person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, -1 - person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x191f7e, -1 + person_event SPRITE_SUPER_NERD, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x191f85, -1 + person_event SPRITE_BUENA, 10, 12, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x191f88, -1 diff --git a/maps/VermilionPokeCenter1F.asm b/maps/VermilionPokeCenter1F.asm index da87c15b0..74dd53731 100644 --- a/maps/VermilionPokeCenter1F.asm +++ b/maps/VermilionPokeCenter1F.asm @@ -88,7 +88,7 @@ VermilionPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x191603, -1 - person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, -1 - person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, -1 - person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x191603, -1 + person_event SPRITE_FISHING_GURU, 6, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FishingGuruScript_0x191606, -1 + person_event SPRITE_SAILOR, 9, 10, UP << 2 | $0, $10, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x19161a, -1 + person_event SPRITE_BUG_CATCHER, 9, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugCatcherScript_0x19161d, -1 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index bcd154e8d..a4cf151c2 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -32,14 +32,14 @@ UnknownScript_0x74da6: setevent EVENT_739 clearevent EVENT_733 setevent EVENT_030 - setevent EVENT_000 + setevent EVENT_CHRIS1_IN_CABLE_CLUB blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY end SailorScript_0x74dc4: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 closetext @@ -79,9 +79,9 @@ UnknownScript_0x74e1a: UnknownScript_0x74e20: spriteface $3, RIGHT - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x74e86 - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x74e86 spriteface $0, LEFT loadfont @@ -101,7 +101,7 @@ UnknownScript_0x74e20: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_CHRIS2_IN_CABLE_CLUB applymovement $0, MovementData_0x74ef8 jump SailorScript_0x74dc4 @@ -145,7 +145,7 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer loadfont - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74eda @@ -163,7 +163,7 @@ SailorScript_0x74e97: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent EVENT_001 + setevent EVENT_CHRIS2_IN_CABLE_CLUB applymovement $0, MovementData_0x74efe jump SailorScript_0x74dc4 @@ -314,10 +314,10 @@ VermilionPort_MapEventHeader: ; signposts db 1 - signpost 13, 16, $7, MapVermilionPortSignpostItem0 + signpost 13, 16, SIGNPOST_ITEMIFSET, MapVermilionPortSignpostItem0 ; people-events db 3 - person_event SPRITE_SAILOR, 21, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x74dc4, EVENT_72B - person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, -1 - person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, -1 + person_event SPRITE_SAILOR, 21, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x74dc4, EVENT_72B + person_event SPRITE_SAILOR, 15, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x74e97, -1 + person_event SPRITE_SUPER_NERD, 15, 15, UP << 2 | $1, $2, -1, -1, $0, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VermilionPortPassage.asm b/maps/VermilionPortPassage.asm index 586127cd1..9765d6e70 100644 --- a/maps/VermilionPortPassage.asm +++ b/maps/VermilionPortPassage.asm @@ -35,4 +35,4 @@ VermilionPortPassage_MapEventHeader: ; people-events db 1 - person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, -1 + person_event SPRITE_TEACHER, 5, 21, LEFT << 2 | $0, $0, -1, -1, $0, 0, TeacherScript_0x7701a, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 103e511dc..de102f60b 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -260,14 +260,14 @@ VictoryRoad_MapEventHeader: ; signposts db 2 - signpost 29, 3, $7, MapVictoryRoadSignpostItem0 - signpost 65, 3, $7, MapVictoryRoadSignpostItem1 + signpost 29, 3, SIGNPOST_ITEMIFSET, MapVictoryRoadSignpostItem0 + signpost 65, 3, SIGNPOST_ITEMIFSET, MapVictoryRoadSignpostItem1 ; people-events db 6 - person_event SPRITE_SILVER, 17, 22, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C2 - person_event SPRITE_POKE_BALL, 32, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x74529, EVENT_6A3 - person_event SPRITE_POKE_BALL, 52, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452b, EVENT_6A4 - person_event SPRITE_POKE_BALL, 33, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452d, EVENT_6A5 - person_event SPRITE_POKE_BALL, 52, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7452f, EVENT_6A6 - person_event SPRITE_POKE_BALL, 42, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x74531, EVENT_6A7 + person_event SPRITE_SILVER, 17, 22, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C2 + person_event SPRITE_POKE_BALL, 32, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74529, EVENT_6A3 + person_event SPRITE_POKE_BALL, 52, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452b, EVENT_6A4 + person_event SPRITE_POKE_BALL, 33, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452d, EVENT_6A5 + person_event SPRITE_POKE_BALL, 52, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452f, EVENT_6A6 + person_event SPRITE_POKE_BALL, 42, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74531, EVENT_6A7 diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index ac00e6926..b0a536e1f 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -118,6 +118,6 @@ VictoryRoadGate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, -1 - person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX + person_event SPRITE_OFFICER, 15, 12, LEFT << 2 | $1, $0, -1, -1, $0, 0, OfficerScript_0x9ba03, -1 + person_event SPRITE_BLACK_BELT, 9, 11, LEFT << 2 | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER + person_event SPRITE_BLACK_BELT, 9, 16, LEFT << 2 | $0, $0, -1, -1, $0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 2b238af6b..38c13a4df 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -292,21 +292,21 @@ VioletCity_MapEventHeader: ; signposts db 7 - signpost 20, 24, $0, VioletCitySign - signpost 17, 15, $0, VioletGymSign - signpost 8, 24, $0, SproutTowerSign - signpost 17, 27, $0, EarlsPokemonAcademySign - signpost 25, 32, $0, VioletCityPokeCenterSign - signpost 17, 10, $0, VioletCityMartSign - signpost 14, 37, $7, MapVioletCitySignpostItem6 + signpost 20, 24, SIGNPOST_READ, VioletCitySign + signpost 17, 15, SIGNPOST_READ, VioletGymSign + signpost 8, 24, SIGNPOST_READ, SproutTowerSign + signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign + signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign + signpost 17, 10, SIGNPOST_READ, VioletCityMartSign + signpost 14, 37, SIGNPOST_ITEMIFSET, MapVioletCitySignpostItem6 ; people-events db 8 - person_event SPRITE_FISHER, 20, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x1a83bb, EVENT_6CA - person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, -1 - person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, -1 - person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, -1 - person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, -1 - person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, -1 - person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, EVENT_643 - person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, EVENT_644 + person_event SPRITE_FISHER, 20, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a83bb, EVENT_6CA + person_event SPRITE_LASS, 32, 32, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a8403, -1 + person_event SPRITE_SUPER_NERD, 18, 28, DOWN << 2 | $2, $21, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a8406, -1 + person_event SPRITE_GRAMPS, 24, 21, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x1a8409, -1 + person_event SPRITE_YOUNGSTER, 22, 9, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a840c, -1 + person_event SPRITE_FRUIT_TREE, 33, 18, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8425, -1 + person_event SPRITE_POKE_BALL, 5, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8421, EVENT_643 + person_event SPRITE_POKE_BALL, 9, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8423, EVENT_644 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index 79dddae6c..aaab66e41 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -321,12 +321,12 @@ VioletGym_MapEventHeader: ; signposts db 2 - signpost 13, 3, $0, VioletGymStatue - signpost 13, 6, $0, VioletGymStatue + signpost 13, 3, SIGNPOST_READ, VioletGymStatue + signpost 13, 6, SIGNPOST_READ, VioletGymStatue ; people-events db 4 - person_event SPRITE_FALKNER, 5, 9, $6, $0, 255, 255, $90, 0, FalknerScript_0x683c2, -1 - person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, -1 - person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, -1 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, -1 + person_event SPRITE_FALKNER, 5, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FalknerScript_0x683c2, -1 + person_event SPRITE_YOUNGSTER, 10, 11, LEFT << 2 | $0, $2, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperRod, -1 + person_event SPRITE_YOUNGSTER, 14, 6, LEFT << 2 | $1, $2, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperAbe, -1 + person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, VioletGymGuyScript, -1 diff --git a/maps/VioletMart.asm b/maps/VioletMart.asm index 7463c18de..6b2108434 100644 --- a/maps/VioletMart.asm +++ b/maps/VioletMart.asm @@ -60,6 +60,6 @@ VioletMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, -1 - person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, -1 - person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x68295, -1 + person_event SPRITE_GRANNY, 10, 11, UP << 2 | $1, $1, -1, -1, $0, 0, GrannyScript_0x6829c, -1 + person_event SPRITE_COOLTRAINER_M, 6, 9, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x6829f, -1 diff --git a/maps/VioletNicknameSpeechHouse.asm b/maps/VioletNicknameSpeechHouse.asm index 1aa7c7b83..fbe0343c0 100644 --- a/maps/VioletNicknameSpeechHouse.asm +++ b/maps/VioletNicknameSpeechHouse.asm @@ -56,6 +56,6 @@ VioletNicknameSpeechHouse_MapEventHeader: ; people-events db 3 - person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, -1 - person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, -1 - person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, -1 + person_event SPRITE_TEACHER, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, TeacherScript_0x693e9, -1 + person_event SPRITE_LASS, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x693ec, -1 + person_event SPRITE_BIRD, 6, 9, UP << 2 | $1, $1, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x693ef, -1 diff --git a/maps/VioletOnixTradeHouse.asm b/maps/VioletOnixTradeHouse.asm index 7d237a77a..d659392d9 100644 --- a/maps/VioletOnixTradeHouse.asm +++ b/maps/VioletOnixTradeHouse.asm @@ -45,5 +45,5 @@ VioletOnixTradeHouse_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, -1 - person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, -1 + person_event SPRITE_POKEFAN_M, 7, 6, DOWN << 2 | $3, $0, -1, -1, $0, 0, PokefanMScript_0x6998d, -1 + person_event SPRITE_YOUNGSTER, 9, 10, UP << 2 | $0, $20, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x69990, -1 diff --git a/maps/VioletPokeCenter1F.asm b/maps/VioletPokeCenter1F.asm index b76c747b1..773ef92f5 100644 --- a/maps/VioletPokeCenter1F.asm +++ b/maps/VioletPokeCenter1F.asm @@ -226,8 +226,8 @@ VioletPokeCenter1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x694c9, -1 - person_event SPRITE_GAMEBOY_KID, 10, 11, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x69540, -1 - person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, -1 - person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, -1 - person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x694c9, -1 + person_event SPRITE_GAMEBOY_KID, 10, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GameboyKidScript_0x69540, -1 + person_event SPRITE_GENTLEMAN, 8, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x69543, -1 + person_event SPRITE_YOUNGSTER, 5, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x69546, -1 + person_event SPRITE_SCIENTIST, 7, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index 0fb20ff3f..a69f517fe 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -228,16 +228,16 @@ ViridianCity_MapEventHeader: ; signposts db 6 - signpost 17, 17, $0, ViridianCitySign - signpost 7, 27, $0, ViridianGymSign - signpost 1, 19, $0, ViridianCityWelcomeSign - signpost 15, 21, $0, TrainerHouseSign - signpost 25, 24, $0, ViridianCityPokeCenterSign - signpost 19, 30, $0, ViridianCityMartSign + signpost 17, 17, SIGNPOST_READ, ViridianCitySign + signpost 7, 27, SIGNPOST_READ, ViridianGymSign + signpost 1, 19, SIGNPOST_READ, ViridianCityWelcomeSign + signpost 15, 21, SIGNPOST_READ, TrainerHouseSign + signpost 25, 24, SIGNPOST_READ, ViridianCityPokeCenterSign + signpost 19, 30, SIGNPOST_READ, ViridianCityMartSign ; people-events db 4 - person_event SPRITE_GRAMPS, 9, 22, $2, $22, 255, 255, $0, 0, GrampsScript_0x1a9a4c, -1 - person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, -1 - person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, -1 - person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, -1 + person_event SPRITE_GRAMPS, 9, 22, DOWN << 2 | $2, $22, -1, -1, $0, 0, GrampsScript_0x1a9a4c, -1 + person_event SPRITE_GRAMPS, 12, 34, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrampsScript_0x1a9a61, -1 + person_event SPRITE_FISHER, 27, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x1a9a75, -1 + person_event SPRITE_YOUNGSTER, 25, 21, DOWN << 2 | $2, $33, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a9a90, -1 diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index b6d2c985e..6a2b0d744 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -178,10 +178,10 @@ ViridianGym_MapEventHeader: ; signposts db 2 - signpost 13, 3, $0, ViridianGymStatue - signpost 13, 6, $0, ViridianGymStatue + signpost 13, 3, SIGNPOST_READ, ViridianGymStatue + signpost 13, 6, SIGNPOST_READ, ViridianGymStatue ; people-events db 2 - person_event SPRITE_BLUE, 7, 9, $6, $0, 255, 255, $0, 0, BlueScript_0x9aa26, EVENT_776 - person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $90, 0, ViridianGymGuyScript, EVENT_776 + person_event SPRITE_BLUE, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, BlueScript_0x9aa26, EVENT_776 + person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ViridianGymGuyScript, EVENT_776 diff --git a/maps/ViridianMart.asm b/maps/ViridianMart.asm index 4e85c98e5..0c2d8d3cd 100644 --- a/maps/ViridianMart.asm +++ b/maps/ViridianMart.asm @@ -48,6 +48,6 @@ ViridianMart_MapEventHeader: ; people-events db 3 - person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, -1 - person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, -1 - person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, -1 + person_event SPRITE_CLERK, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x9b5e7, -1 + person_event SPRITE_LASS, 6, 11, UP << 2 | $1, $2, -1, -1, $0, 0, LassScript_0x9b5ee, -1 + person_event SPRITE_COOLTRAINER_M, 10, 5, UP << 2 | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x9b5f1, -1 diff --git a/maps/ViridianNicknameSpeechHouse.asm b/maps/ViridianNicknameSpeechHouse.asm index d5888fedd..61852845c 100644 --- a/maps/ViridianNicknameSpeechHouse.asm +++ b/maps/ViridianNicknameSpeechHouse.asm @@ -72,7 +72,7 @@ ViridianNicknameSpeechHouse_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, -1 - person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, -1 - person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, -1 - person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, -1 + person_event SPRITE_POKEFAN_M, 8, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x9ae3a, -1 + person_event SPRITE_LASS, 8, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x9ae3d, -1 + person_event SPRITE_MOLTRES, 6, 9, UP << 2 | $12, $2, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MoltresScript_0x9ae40, -1 + person_event SPRITE_GROWLITHE, 7, 10, UP << 2 | $12, $2, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GrowlitheScript_0x9ae4a, -1 diff --git a/maps/ViridianPokeCenter1F.asm b/maps/ViridianPokeCenter1F.asm index 0baaaa342..6bd421984 100644 --- a/maps/ViridianPokeCenter1F.asm +++ b/maps/ViridianPokeCenter1F.asm @@ -83,7 +83,7 @@ ViridianPokeCenter1F_MapEventHeader: ; people-events db 4 - person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9b690, -1 - person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x9b693, -1 - person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, -1 - person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, -1 + person_event SPRITE_NURSE, 5, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x9b690, -1 + person_event SPRITE_COOLTRAINER_M, 8, 12, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x9b693, -1 + person_event SPRITE_COOLTRAINER_F, 7, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CooltrainerFScript_0x9b6a7, -1 + person_event SPRITE_BUG_CATCHER, 10, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BugCatcherScript_0x9b6aa, -1 diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 383cb172b..0d50aa8e3 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -265,20 +265,20 @@ UnknownScript_0x7c173: jump UnknownScript_0x7c1c1 UnknownScript_0x7c1a9: - setevent EVENT_000 - clearevent EVENT_001 + setevent EVENT_CHRIS1_IN_CABLE_CLUB + clearevent EVENT_CHRIS2_IN_CABLE_CLUB clearevent EVENT_002 jump UnknownScript_0x7c1cd UnknownScript_0x7c1b5: - clearevent EVENT_000 - setevent EVENT_001 + clearevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_CHRIS2_IN_CABLE_CLUB clearevent EVENT_002 jump UnknownScript_0x7c1cd UnknownScript_0x7c1c1: - clearevent EVENT_000 - clearevent EVENT_001 + clearevent EVENT_CHRIS1_IN_CABLE_CLUB + clearevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_002 jump UnknownScript_0x7c1cd @@ -296,9 +296,9 @@ UnknownScript_0x7c1cd: loadfont writetext UnknownText_0x7c6d8 closetext - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x7c2bb - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -348,20 +348,20 @@ UnknownScript_0x7c220: jump UnknownScript_0x7c26e UnknownScript_0x7c256: - setevent EVENT_000 - clearevent EVENT_001 + setevent EVENT_CHRIS1_IN_CABLE_CLUB + clearevent EVENT_CHRIS2_IN_CABLE_CLUB clearevent EVENT_002 jump UnknownScript_0x7c27a UnknownScript_0x7c262: - clearevent EVENT_000 - setevent EVENT_001 + clearevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_CHRIS2_IN_CABLE_CLUB clearevent EVENT_002 jump UnknownScript_0x7c27a UnknownScript_0x7c26e: - clearevent EVENT_000 - clearevent EVENT_001 + clearevent EVENT_CHRIS1_IN_CABLE_CLUB + clearevent EVENT_CHRIS2_IN_CABLE_CLUB setevent EVENT_002 jump UnknownScript_0x7c27a @@ -379,9 +379,9 @@ UnknownScript_0x7c27a: loadfont writetext UnknownText_0x7c82a closetext - checkevent EVENT_000 + checkevent EVENT_CHRIS1_IN_CABLE_CLUB iftrue UnknownScript_0x7c2bb - checkevent EVENT_001 + checkevent EVENT_CHRIS2_IN_CABLE_CLUB iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -726,20 +726,20 @@ WarehouseEntrance_MapEventHeader: ; signposts db 5 - signpost 6, 18, $0, MapWarehouseEntranceSignpost0Script - signpost 6, 19, $0, MapWarehouseEntranceSignpost1Script - signpost 13, 6, $7, MapWarehouseEntranceSignpostItem2 - signpost 18, 4, $7, MapWarehouseEntranceSignpostItem3 - signpost 8, 17, $7, MapWarehouseEntranceSignpostItem4 + signpost 6, 18, SIGNPOST_READ, MapWarehouseEntranceSignpost0Script + signpost 6, 19, SIGNPOST_READ, MapWarehouseEntranceSignpost1Script + signpost 13, 6, SIGNPOST_ITEMIFSET, MapWarehouseEntranceSignpostItem2 + signpost 18, 4, SIGNPOST_ITEMIFSET, MapWarehouseEntranceSignpostItem3 + signpost 8, 17, SIGNPOST_ITEMIFSET, MapWarehouseEntranceSignpostItem4 ; people-events db 9 - person_event SPRITE_SUPER_NERD, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, -1 - person_event SPRITE_SUPER_NERD, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, -1 - person_event SPRITE_SUPER_NERD, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, -1 - person_event SPRITE_SUPER_NERD, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, -1 - person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7c306, EVENT_672 - person_event SPRITE_GRAMPS, 15, 11, $8, $0, 255, 255, $b0, 0, GrampsScript_0x7c146, EVENT_753 - person_event SPRITE_SUPER_NERD, 18, 11, $8, $0, 255, 255, $90, 0, SuperNerdScript_0x7c161, EVENT_754 - person_event SPRITE_SUPER_NERD, 19, 11, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x7c20e, EVENT_755 - person_event SPRITE_GRANNY, 25, 11, $8, $0, 255, 255, $b0, 0, GrannyScript_0x7c132, EVENT_752 + person_event SPRITE_SUPER_NERD, 35, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdEric, -1 + person_event SPRITE_SUPER_NERD, 13, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdTeru, -1 + person_event SPRITE_SUPER_NERD, 31, 7, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPokemaniacIssac, -1 + person_event SPRITE_SUPER_NERD, 10, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacDonald, -1 + person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7c306, EVENT_672 + person_event SPRITE_GRAMPS, 15, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x7c146, EVENT_753 + person_event SPRITE_SUPER_NERD, 18, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x7c161, EVENT_754 + person_event SPRITE_SUPER_NERD, 19, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x7c20e, EVENT_755 + person_event SPRITE_GRANNY, 25, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x7c132, EVENT_752 diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 342b7e716..5962de827 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -59,15 +59,15 @@ WhirlIslandB1F_MapEventHeader: ; signposts db 3 - signpost 4, 30, $7, MapWhirlIslandB1FSignpostItem0 - signpost 18, 36, $7, MapWhirlIslandB1FSignpostItem1 - signpost 23, 2, $7, MapWhirlIslandB1FSignpostItem2 + signpost 4, 30, SIGNPOST_ITEMIFSET, MapWhirlIslandB1FSignpostItem0 + signpost 18, 36, SIGNPOST_ITEMIFSET, MapWhirlIslandB1FSignpostItem1 + signpost 23, 2, SIGNPOST_ITEMIFSET, MapWhirlIslandB1FSignpostItem2 ; people-events db 6 - person_event SPRITE_POKE_BALL, 17, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c410, EVENT_691 - person_event SPRITE_POKE_BALL, 22, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c412, EVENT_692 - person_event SPRITE_POKE_BALL, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, EVENT_693 - person_event SPRITE_POKE_BALL, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, EVENT_694 - person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, EVENT_695 - person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, -1 + person_event SPRITE_POKE_BALL, 17, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c410, EVENT_691 + person_event SPRITE_POKE_BALL, 22, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c412, EVENT_692 + person_event SPRITE_POKE_BALL, 27, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c414, EVENT_693 + person_event SPRITE_POKE_BALL, 12, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c416, EVENT_694 + person_event SPRITE_POKE_BALL, 30, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c418, EVENT_695 + person_event SPRITE_BOULDER, 30, 27, LEFT << 2 | $11, $0, -1, -1, $0, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index e8cbe7b26..dcb4dde53 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -33,6 +33,6 @@ WhirlIslandB2F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 15, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4b8, EVENT_696 - person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4ba, EVENT_697 - person_event SPRITE_POKE_BALL, 16, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c4bc, EVENT_698 + person_event SPRITE_POKE_BALL, 15, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4b8, EVENT_696 + person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4ba, EVENT_697 + person_event SPRITE_POKE_BALL, 16, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4bc, EVENT_698 diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index ae55569e2..139f89a1e 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -59,4 +59,4 @@ WhirlIslandLugiaChamber_MapEventHeader: ; people-events db 1 - person_event SPRITE_LUGIA, 9, 13, $16, $0, 255, 255, $90, 0, LugiaScript_0x18c518, EVENT_73D + person_event SPRITE_LUGIA, 9, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LugiaScript_0x18c518, EVENT_73D diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 18b838024..657aebe43 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -26,4 +26,4 @@ WhirlIslandNE_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 15, 15, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c396, EVENT_68F + person_event SPRITE_POKE_BALL, 15, 15, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c396, EVENT_68F diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index c270ff8f9..60e5ce412 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -28,4 +28,4 @@ WhirlIslandSW_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 6, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c3bc, EVENT_690 + person_event SPRITE_POKE_BALL, 6, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c3bc, EVENT_690 diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index 646ee8545..077e185e8 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -21,7 +21,7 @@ UnknownScript_0x1804ca: end UnknownScript_0x1804cb: - checkevent EVENT_309 + checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED iffalse UnknownScript_0x1804d5 changeblock $4, $e, $2a UnknownScript_0x1804d5: @@ -40,7 +40,7 @@ UnknownScript_0x1804e0: reloadmappart loadmovesprites dotrigger $1 - setevent EVENT_309 + setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED waitbutton end @@ -148,4 +148,4 @@ WillsRoom_MapEventHeader: ; people-events db 1 - person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, -1 + person_event SPRITE_WILL, 11, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, WillScript_0x1804f8, -1 diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index d23619947..b85e8e18f 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -408,9 +408,9 @@ WiseTriosRoom_MapEventHeader: ; people-events db 6 - person_event SPRITE_SAGE, 6, 10, $3, $0, 255, 255, $0, 0, SageScript_0x9859a, EVENT_7AB - person_event SPRITE_SAGE, 11, 10, $5, $1, 255, 255, $0, 0, SageScript_0x9859d, EVENT_7AB - person_event SPRITE_SAGE, 9, 11, $8, $0, 255, 255, $0, 0, SageScript_0x985a0, EVENT_7AB - person_event SPRITE_SAGE, 6, 8, $6, $0, 255, 255, $2, 2, TrainerSageGaku, EVENT_7AC - person_event SPRITE_SAGE, 10, 8, $7, $0, 255, 255, $2, 2, TrainerSageMasa, EVENT_7AC - person_event SPRITE_SAGE, 8, 10, $8, $0, 255, 255, $2, 2, TrainerSageKoji, EVENT_7AC + person_event SPRITE_SAGE, 6, 10, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x9859a, EVENT_7AB + person_event SPRITE_SAGE, 11, 10, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x9859d, EVENT_7AB + person_event SPRITE_SAGE, 9, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, SageScript_0x985a0, EVENT_7AB + person_event SPRITE_SAGE, 6, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerSageGaku, EVENT_7AC + person_event SPRITE_SAGE, 10, 8, UP << 2 | $3, $0, -1, -1, $2, 2, TrainerSageMasa, EVENT_7AC + person_event SPRITE_SAGE, 8, 10, LEFT << 2 | $0, $0, -1, -1, $2, 2, TrainerSageKoji, EVENT_7AC diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index c2548e867..5eb9e811d 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -7733,7 +7733,7 @@ Function103654: ; 103654 ret ; 10366e -Function10366e: ; 10366e +Mobile_SelectThreeMons: ; 10366e callba Function10632f bit 7, c jr z, .asm_10369b diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 1b83268d1..3d4a60b25 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -427,7 +427,7 @@ Function1143b7: ; 1143b7 pop hl push af ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld a, [hli] @@ -673,7 +673,7 @@ Function1144d1: ; 1144d1 .asm_11451c pop hl ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld e, [hl] @@ -690,7 +690,7 @@ Function1144d1: ; 1144d1 .asm_114537 ld hl, wdc06 ld a, [hl] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld hl, wdc09 @@ -1255,7 +1255,7 @@ Function114843: ; 114843 Function114867: ; 114867 ld hl, wdc06 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld e, [hl] @@ -1283,7 +1283,7 @@ Function114867: ; 114867 inc e call z, Function1148b9 ld hl, wdc06 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld [hl], e inc hl @@ -1313,7 +1313,7 @@ Function114867: ; 114867 Function1148b9: ; 1148b9 push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret @@ -1322,7 +1322,7 @@ Function1148b9: ; 1148b9 Function1148c2: ; 1148c2 ld hl, wdc06 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld e, [hl] @@ -1375,7 +1375,7 @@ Function1148c2: ; 1148c2 inc e call z, Function114944 ld hl, wdc06 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld [hl], e inc hl @@ -1413,7 +1413,7 @@ Function1148c2: ; 1148c2 Function114944: ; 114944 push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret @@ -1422,7 +1422,7 @@ Function114944: ; 114944 Function11494d: ; 11494d ld hl, wdc06 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld e, [hl] @@ -1467,7 +1467,7 @@ Function11494d: ; 11494d inc e call z, Function1149c3 ld hl, wdc06 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld [hl], e inc hl @@ -1505,7 +1505,7 @@ Function11494d: ; 11494d Function1149c3: ; 1149c3 push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret @@ -1514,7 +1514,7 @@ Function1149c3: ; 1149c3 Function1149cc: ; 1149cc ld hl, wdc06 ld a, [hl] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a push de @@ -1546,7 +1546,7 @@ Function1149cc: ; 1149cc inc e call z, Function114a0f ld hl, wdc06 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld [hl], e inc hl @@ -1563,7 +1563,7 @@ Function1149cc: ; 1149cc Function114a0f: ; 114a0f push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret @@ -1872,7 +1872,7 @@ Function114b55: ; 114b55 .asm_114b96 ld hl, wdc06 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld e, [hl] @@ -1922,7 +1922,7 @@ Function114bbc: ; 114bbc jr z, .asm_114bff pop hl ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld a, [hli] @@ -2152,7 +2152,7 @@ Function114cd9: ; 114cd9 .asm_114d11 pop hl ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld a, [hli] @@ -2456,7 +2456,7 @@ Function114e62: ; 114e62 Function114ea0: ; 114ea0 ld hl, wdc06 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld a, [hli] @@ -2481,7 +2481,7 @@ Function114ea0: ; 114ea0 inc e call z, Function114ee0 ld hl, wdc06 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e ld [hli], a @@ -2502,7 +2502,7 @@ Function114ea0: ; 114ea0 Function114ee0: ; 114ee0 push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret @@ -2740,7 +2740,7 @@ Function115020: ; 115020 push hl ld hl, wdc06 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld a, [hli] @@ -2767,7 +2767,7 @@ Function115020: ; 115020 .asm_115046 ld hl, wdc06 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e ld [hli], a @@ -2786,7 +2786,7 @@ Function115020: ; 115020 Function115059: ; 115059 push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret @@ -2952,7 +2952,7 @@ Function1150b3: ; 1150b3 Function115136: ; 115136 ld hl, wdc06 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld a, [hli] @@ -2979,7 +2979,7 @@ Function115136: ; 115136 .asm_11515d ld hl, wdc06 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e ld [hli], a @@ -2998,7 +2998,7 @@ Function115136: ; 115136 Function115170: ; 115170 push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret @@ -3007,7 +3007,7 @@ Function115170: ; 115170 Function115179: ; 115179 ld hl, wdc06 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld a, [hli] @@ -3102,7 +3102,7 @@ Function115179: ; 115179 inc e call z, Function11520e ld hl, wdc06 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e ld [hli], a @@ -3117,7 +3117,7 @@ Function115179: ; 115179 Function11520e: ; 11520e push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret @@ -3127,7 +3127,7 @@ Function115217: ; 115217 push hl ld hl, wdc06 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld a, [hli] @@ -3166,7 +3166,7 @@ Function115217: ; 115217 .asm_115252 ld hl, wdc06 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e ld [hli], a @@ -3211,7 +3211,7 @@ Function115217: ; 115217 Function115286: ; 115286 push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret @@ -3610,7 +3610,7 @@ Function1153d2: ; 1153d2 ld [de], a ld hl, RightOrnament ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld e, [hl] @@ -3619,7 +3619,7 @@ Function1153d2: ; 1153d2 ld hl, $ddc8 call Function115d6a ld hl, RightOrnament - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld [hl], e inc hl @@ -3845,7 +3845,7 @@ Function1155d1: ; 1155d1 Function11560a: ; 11560a ld a, [wdc06] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld a, [wdc17] ld [wdc00], a ld [$ff8c], a @@ -3920,7 +3920,7 @@ Function11560a: ; 11560a inc hl ld [hl], d pop bc - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [$ff8c], a ld [$4000], a ld hl, wdc07 @@ -3942,7 +3942,7 @@ Function11560a: ; 11560a jr nz, .asm_11564d .asm_1156a9 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [wdc06], a xor a ret @@ -4285,7 +4285,7 @@ Function11581e: ; 11581e pop hl ld hl, wdc07 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld e, [hl] @@ -4294,7 +4294,7 @@ Function11581e: ; 11581e ld hl, PartyMon5Speed call Function115d6a ld hl, wdc07 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e ld [hli], a @@ -4847,7 +4847,7 @@ Function115b00: ; 115b00 pop hl ld hl, wdc07 ld a, [hli] - ld [wdc01], a + ld [wCurrentMapSignpostCount], a ld [$ff8c], a ld [$4000], a ld e, [hl] @@ -4856,7 +4856,7 @@ Function115b00: ; 115b00 ld hl, wdc26 call Function115d6a ld hl, wdc07 - ld a, [wdc01] + ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e ld [hli], a @@ -5230,7 +5230,7 @@ Function115d6a: ; 115d6a Function115d77: ; 115d77 push bc - ld bc, wdc01 + ld bc, wCurrentMapSignpostCount call Function115d80 pop bc ret diff --git a/wram.asm b/wram.asm index 188233bc8..b4349d638 100644 --- a/wram.asm +++ b/wram.asm @@ -2280,16 +2280,18 @@ BikeFlags:: ; dbf5 ; bit 2: downhill ds 1 - ds 3 + ds 1 +wCurrentMapTriggerPointer:: ; dbf7 + ds 2 wdbf9:: ds 2 wdbfb:: ds 1 wdbfc:: ds 1 wdbfd:: ds 1 -wdbfe:: ds 1 +wCurrentMapXYTriggerCount:: ds 1 wdbff:: ds 1 wdc00:: ds 1 -wdc01:: ds 1 +wCurrentMapSignpostCount:: ds 1 wdc02:: ds 1 wdc03:: ds 1 wdc04:: ds 1 -- cgit v1.2.3 From 0fcef5fc087dc30817410d7692d53e2c382828d5 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 17 Jul 2015 17:17:10 -0400 Subject: More annotations and interpretations of functions and scripts --- constants/event_flags.asm | 11 +- constants/map_constants.asm | 104 +-- constants/misc_constants.asm | 68 ++ engine/events_2.asm | 34 +- engine/more_phone_scripts.asm | 2 +- engine/phone_scripts.asm | 16 +- engine/scripting.asm | 100 +-- engine/std_scripts.asm | 8 +- hram.asm | 2 + items/item_effects.asm | 2 +- main.asm | 1641 ++++++++++++++++++-------------------- maps/BillsHouse.asm | 10 +- maps/Colosseum.asm | 4 +- maps/DragonShrine.asm | 116 +-- maps/DragonsDenB1F.asm | 4 +- maps/EcruteakHouse.asm | 4 +- maps/GoldenrodDeptStoreRoof.asm | 36 +- maps/HallOfFame.asm | 6 +- maps/KrissHouse1F.asm | 10 +- maps/KurtsHouse.asm | 14 +- maps/MrPokemonsHouse.asm | 2 +- maps/OlivinePort.asm | 14 +- maps/PokeCenter2F.asm | 4 +- maps/Route31.asm | 2 +- maps/Route36NationalParkgate.asm | 20 +- maps/TimeCapsule.asm | 4 +- maps/TradeCenter.asm | 4 +- maps/VermilionPort.asm | 14 +- maps/VioletGym.asm | 10 +- maps/WarehouseEntrance.asm | 32 +- text/common_4.asm | 12 +- wram.asm | 4 +- 32 files changed, 1157 insertions(+), 1157 deletions(-) diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 3df321a82..873769ef4 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -1,8 +1,8 @@ const_def - const EVENT_CHRIS1_IN_CABLE_CLUB - const EVENT_CHRIS2_IN_CABLE_CLUB + const EVENT_000 + const EVENT_001 const EVENT_002 const EVENT_003 const EVENT_004 @@ -1648,6 +1648,9 @@ const EVENT_63D const EVENT_63E const EVENT_63F +; Sprite visibility: When these events are cleared, the sprite becomes visible; when set, the sprite is hidden. +; The map script command macros `disappear` and `appear` set/clear these flags and immediately apply the effect on visibility. +; The map script command macros `setevent` and `clearevent` set/clear these flags, and their effects will be seen when the map is reloaded. const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB @@ -1824,8 +1827,8 @@ const EVENT_6ED const EVENT_6EE const EVENT_6EF - const EVENT_6F0 - const EVENT_6F1 + const EVENT_GOLDENROD_SALE_OFF + const EVENT_GOLDENROD_SALE_ON const EVENT_6F2 const EVENT_6F3 const EVENT_6F4 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 6e793ef6a..ed4a781f5 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -580,61 +580,61 @@ MAP_N_A EQU -1 const_value SET $80 SPRITE_POKEMON EQU const_value - const SPRITE_UNOWN - const SPRITE_GEODUDE - const SPRITE_GROWLITHE - const SPRITE_WEEDLE - const SPRITE_SHELLDER - const SPRITE_ODDISH - const SPRITE_GENGAR - const SPRITE_ZUBAT - const SPRITE_MAGIKARP - const SPRITE_SQUIRTLE - const SPRITE_TOGEPI - const SPRITE_BUTTERFREE - const SPRITE_DIGLETT - const SPRITE_POLIWAG - const SPRITE_PIKACHU - const SPRITE_CLEFAIRY - const SPRITE_CHARMANDER - const SPRITE_JYNX - const SPRITE_STARMIE - const SPRITE_BULBASAUR - const SPRITE_JIGGLYPUFF - const SPRITE_GRIMER - const SPRITE_EKANS - const SPRITE_PARAS - const SPRITE_TENTACOOL - const SPRITE_TAUROS - const SPRITE_MACHOP - const SPRITE_VOLTORB - const SPRITE_LAPRAS - const SPRITE_RHYDON - const SPRITE_MOLTRES - const SPRITE_SNORLAX - const SPRITE_GYARADOS - const SPRITE_LUGIA - const SPRITE_HO_OH + const SPRITE_UNOWN ; 80 + const SPRITE_GEODUDE ; 81 + const SPRITE_GROWLITHE ; 82 + const SPRITE_WEEDLE ; 83 + const SPRITE_SHELLDER ; 84 + const SPRITE_ODDISH ; 85 + const SPRITE_GENGAR ; 86 + const SPRITE_ZUBAT ; 87 + const SPRITE_MAGIKARP ; 88 + const SPRITE_SQUIRTLE ; 89 + const SPRITE_TOGEPI ; 8a + const SPRITE_BUTTERFREE ; 8b + const SPRITE_DIGLETT ; 8c + const SPRITE_POLIWAG ; 8d + const SPRITE_PIKACHU ; 8e + const SPRITE_CLEFAIRY ; 8f + const SPRITE_CHARMANDER ; 90 + const SPRITE_JYNX ; 91 + const SPRITE_STARMIE ; 92 + const SPRITE_BULBASAUR ; 93 + const SPRITE_JIGGLYPUFF ; 94 + const SPRITE_GRIMER ; 95 + const SPRITE_EKANS ; 96 + const SPRITE_PARAS ; 97 + const SPRITE_TENTACOOL ; 98 + const SPRITE_TAUROS ; 99 + const SPRITE_MACHOP ; 9a + const SPRITE_VOLTORB ; 9b + const SPRITE_LAPRAS ; 9c + const SPRITE_RHYDON ; 9d + const SPRITE_MOLTRES ; 9e + const SPRITE_SNORLAX ; 9f + const SPRITE_GYARADOS ; a0 + const SPRITE_LUGIA ; a1 + const SPRITE_HO_OH ; a2 const_value SET $e0 - const SPRITE_DAYCARE_MON_1 - const SPRITE_DAYCARE_MON_2 + const SPRITE_DAYCARE_MON_1 ; e0 + const SPRITE_DAYCARE_MON_2 ; e1 const_value SET $f0 SPRITE_VARS EQU const_value - const SPRITE_CONSOLE - const SPRITE_DOLL_1 - const SPRITE_DOLL_2 - const SPRITE_BIG_DOLL - const SPRITE_WEIRD_TREE - const SPRITE_OLIVINE_RIVAL - const SPRITE_AZALEA_ROCKET - const SPRITE_FUCHSIA_GYM_1 - const SPRITE_FUCHSIA_GYM_2 - const SPRITE_FUCHSIA_GYM_3 - const SPRITE_FUCHSIA_GYM_4 - const SPRITE_COPYCAT - const SPRITE_JANINE_IMPERSONATOR + const SPRITE_CONSOLE ; f0 + const SPRITE_DOLL_1 ; f1 + const SPRITE_DOLL_2 ; f2 + const SPRITE_BIG_DOLL ; f3 + const SPRITE_WEIRD_TREE ; f4 + const SPRITE_OLIVINE_RIVAL ; f5 + const SPRITE_AZALEA_ROCKET ; f6 + const SPRITE_FUCHSIA_GYM_1 ; f7 + const SPRITE_FUCHSIA_GYM_2 ; f8 + const SPRITE_FUCHSIA_GYM_3 ; f9 + const SPRITE_FUCHSIA_GYM_4 ; fa + const SPRITE_COPYCAT ; fb + const SPRITE_JANINE_IMPERSONATOR ; fc ; sprite types const_value SET 1 @@ -716,8 +716,8 @@ const_value SET 1 const MAPOBJECT_POINTER_HI ; b const MAPOBJECT_FLAG_LO ; c const MAPOBJECT_FLAG_HI ; d - const MAPOBJECT_E - const MAPOBJECT_F + const MAPOBJECT_E ; unused + const MAPOBJECT_F ; unused MAPOBJECT_NOT_VISIBLE EQU -1 MAPOBJECT_SCREEN_HEIGHT EQU 11 diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 9346ae0e6..32447e579 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -98,3 +98,71 @@ SWITCH_SOMETIMES EQU 1 << SWITCH_SOMETIMES_F SWITCH_RARELY EQU 1 << SWITCH_RARELY_F SWITCH_OFTEN EQU 1 << SWITCH_OFTEN_F SPRITE_GFX_LIST_CAPACITY EQU $20 + +const_value = 1 + const MOM_ITEM + const MOM_DOLL + + const_def + const DECO_BED + const DECO_CARPET + const DECO_PLANT + const DECO_POSTER + const DECO_CONSOLE + const DECO_ORNAMENT + const DECO_BIGDOLL + + const_def + const CARPET_00 + const CARPET_01 + const PLANT_02 + const PLANT_03 + const PLANT_04 + const PLANT_05 + const CARPET_06 + const POSTER_07 + const POSTER_08 + const POSTER_09 + const POSTER_0A + const CARPET_0B + const CARPET_0C + const CARPET_0D + const CARPET_0E + const CARPET_0F + const CARPET_10 + const CONSOLE_11 + const CONSOLE_12 + const CONSOLE_13 + const CARPET_14 + const CARPET_FAMICOM + const CONSTENT_SNES + const CARPET_N64 + const CARPET_VIRTUAL_BOY + const CARPET_19 + const BIGDOLL_SNORLAX + const BIGDOLL_ONIX + const BIGDOLL_LAPRAS + const CARPET_1D + const DOLL_PIKACHU + const DOLL_SURFING_PIKACHU + const DOLL_CLEFAIRY + const DOLL_JIGGLYPUFF + const DOLL_BULBASAUR + const DOLL_CHARMANDER + const DOLL_SQUIRTLE + const DOLL_POLIWAG + const DOLL_DIGLETT + const DOLL_STARMIE + const DOLL_MAGIKARP + const DOLL_ODDISH + const DOLL_GENGAR + const DOLL_SHELLDER + const DOLL_GRIMER + const DOLL_VOLTORM + const DOLL_WEEDLE + const DOLL_UNOWN + const DOLL_GEODUDE + const DOLL_MACHOP + const DOLL_TENTACOOL + const CARPET_GOLD_TROPHY + const CARPET_SILVER_TROPHY diff --git a/engine/events_2.asm b/engine/events_2.asm index bbc883b56..a73b24d20 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -271,21 +271,21 @@ Function97db3:: ; 97db3 Function97db5: ; 97db5 ld hl, StatusFlags2 bit 4, [hl] - jr z, .asm_97df7 + jr z, .NoCall ld a, [PlayerState] - cp $1 - jr nz, .asm_97df7 + cp 1 + jr nz, .NoCall call Function2d05 and a - jr nz, .asm_97df7 + jr nz, .NoCall ld hl, wdca1 + 1 ld a, [hli] ld d, a ld e, [hl] - cp $ff + cp -1 jr nz, .asm_97dd8 ld a, e - cp $ff + cp -1 jr z, .asm_97ddc .asm_97dd8 @@ -297,34 +297,34 @@ Function97db5: ; 97db5 .asm_97ddc ld a, d cp $4 - jr c, .asm_97df7 - ld a, [wdc31] + jr c, .NoCall + ld a, [wSpecialPhoneCallID] and a - jr nz, .asm_97df7 - ld a, $6 - ld [wdc31], a + jr nz, .NoCall + ld a, 6 + ld [wSpecialPhoneCallID], a xor a - ld [wdc31 + 1], a + ld [wSpecialPhoneCallID + 1], a ld hl, StatusFlags2 res 4, [hl] scf ret -.asm_97df7 +.NoCall xor a ret ; 97df9 Function97df9:: ; 97df9 ld hl, wd6de - ld de, $0006 - ld c, $4 + ld de, 6 + ld c, 4 xor a -.asm_97e02 +.loop ld [hl], a add hl, de dec c - jr nz, .asm_97e02 + jr nz, .loop ret ; 97e08 diff --git a/engine/more_phone_scripts.asm b/engine/more_phone_scripts.asm index 9c742df00..605e1a9cf 100644 --- a/engine/more_phone_scripts.asm +++ b/engine/more_phone_scripts.asm @@ -1656,5 +1656,5 @@ UnknownScript_0xa0b04: UnknownScript_0xa0b09: farwritetext UnknownText_0x174000 clearflag ENGINE_BIKE_SHOP_CALL_ENABLED - specialphonecall $0000 + specialphonecall ELMCALL_NONE end diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index f68e1166e..ae6eefe9b 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -139,7 +139,7 @@ MomPhoneNoGymQuestScript: ; 0xbcfac MomPhoneLectureScript: ; 0xbcfb1 setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST setflag ENGINE_DST - specialphonecall $0000 + specialphonecall ELMCALL_NONE farwritetext MomPhoneLectureText yesorno iftrue MomPhoneSaveMoneyScript @@ -247,7 +247,7 @@ ElmPhoneScript1: ; 0xbd00d .pokerus ; 0xbd079 farwritetext ElmPhonePokerusText - specialphonecall $0000 + specialphonecall ELMCALL_NONE end ElmPhoneScript2: ; 0xbd081 @@ -258,35 +258,35 @@ ElmPhoneScript2: ; 0xbd081 if_equal $5, .gift if_equal $8, .gift farwritetext ElmPhonePokerusText - specialphonecall $0000 + specialphonecall ELMCALL_NONE end .disaster ; 0xbd09f farwritetext ElmPhoneDisasterText - specialphonecall $0000 + specialphonecall ELMCALL_NONE setevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON end .assistant ; 0xbd0aa farwritetext ElmPhoneEggAssistantText - specialphonecall $0000 + specialphonecall ELMCALL_NONE clearevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER setevent EVENT_ELMS_AIDE_IN_LAB end .rocket ; 0xbd0b8 farwritetext ElmPhoneRocketText - specialphonecall $0000 + specialphonecall ELMCALL_NONE end .gift ; 0xbd0c0 farwritetext ElmPhoneGiftText - specialphonecall $0000 + specialphonecall ELMCALL_NONE end .unused ; 0xbd0c8 farwritetext ElmPhoneUnusedText - specialphonecall $0000 + specialphonecall ELMCALL_NONE end ; bd0d0 diff --git a/engine/scripting.asm b/engine/scripting.asm index 6fd683fb7..ea620e6f8 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2450,7 +2450,7 @@ GetMoneyAccount: ; 0x97861 ; 0x9786d LoadMoneyAmountToMem: ; 0x9786d - ld bc, $ffc3 + ld bc, hMoneyTemp push bc call GetScriptByte ld [bc], a @@ -2498,8 +2498,8 @@ LoadCoinAmountToMem: ; 978a0 call GetScriptByte ld [$ffc4], a call GetScriptByte - ld [$ffc3], a - ld bc, $ffc3 + ld [hMoneyTemp], a + ld bc, hMoneyTemp ret ; 0x978ae @@ -2572,6 +2572,7 @@ Script_checkcellnum: ; 0x97904 ; script command 0x2a ; parameters: ; person (SingleByteParam) +; returns false if the cell number is not in your phone xor a ld [ScriptVar], a @@ -2590,16 +2591,17 @@ Script_specialphonecall: ; 0x97919 ; call_id (MultiByteParam) call GetScriptByte - ld [wdc31], a + ld [wSpecialPhoneCallID], a call GetScriptByte - ld [wdc31 + 1], a + ld [wSpecialPhoneCallID + 1], a ret ; 0x97926 Script_checkphonecall: ; 0x97926 ; script command 0x9d +; returns false if no special phone call is stored - ld a, [wdc31] + ld a, [wSpecialPhoneCallID] and a jr z, .ok ld a, 1 @@ -2648,6 +2650,7 @@ Script_giveegg: ; 0x97968 ; parameters: ; pkmn (PokemonParam) ; level (DecimalParam) +; if no room in the party, return 0 in ScriptVar; else, return 2 xor a ld [ScriptVar], a @@ -2658,7 +2661,7 @@ Script_giveegg: ; 0x97968 ld [CurPartyLevel], a callba GiveEgg ret nc - ld a, $2 + ld a, 2 ld [ScriptVar], a ret ; 0x97988 @@ -2672,7 +2675,7 @@ Script_setevent: ; 0x97988 ld e, a call GetScriptByte ld d, a - ld b, $1 + ld b, 1 ; set call EventFlagAction ret ; 0x97996 @@ -2686,7 +2689,7 @@ Script_clearevent: ; 0x97996 ld e, a call GetScriptByte ld d, a - ld b, $0 + ld b, 0 ; clear call EventFlagAction ret ; 0x979a4 @@ -2700,13 +2703,13 @@ Script_checkevent: ; 0x979a4 ld e, a call GetScriptByte ld d, a - ld b, $2 + ld b, 2 ; check call EventFlagAction ld a, c and a - jr z, .asm_979b7 ; 0x979b3 $2 - ld a, $1 -.asm_979b7 + jr z, .false ; 0x979b3 $2 + ld a, 1 +.false ld [ScriptVar], a ret ; 0x979bb @@ -2720,7 +2723,7 @@ Script_setflag: ; 0x979bb ld e, a call GetScriptByte ld d, a - ld b, $1 + ld b, 1 ; set call _EngineFlagAction ret ; 0x979c9 @@ -2734,7 +2737,7 @@ Script_clearflag: ; 0x979c9 ld e, a call GetScriptByte ld d, a - ld b, $0 + ld b, 0 ; clear call _EngineFlagAction ret ; 0x979d7 @@ -2748,13 +2751,13 @@ Script_checkflag: ; 0x979d7 ld e, a call GetScriptByte ld d, a - ld b, $2 + ld b, 2 ; check call _EngineFlagAction ld a, c and a - jr z, .asm_979ea ; 0x979e6 $2 - ld a, $1 -.asm_979ea + jr z, .false ; 0x979e6 $2 + ld a, 1 +.false ld [ScriptVar], a ret ; 0x979ee @@ -2808,7 +2811,7 @@ Script_warpfacing: ; 0x97a0e set 5, a or c ld [wd45b], a -; 0x97a1d +; fall through Script_warp: ; 0x97a1d ; script command 0x3c @@ -2818,6 +2821,7 @@ Script_warp: ; 0x97a1d ; x (SingleByteParam) ; y (SingleByteParam) +; This seems to be some sort of error handling case. call GetScriptByte and a jr z, .not_ok ; 0x97a21 $27 @@ -2828,11 +2832,11 @@ Script_warp: ; 0x97a1d ld [XCoord], a call GetScriptByte ld [YCoord], a - ld a, $ff + ld a, -1 ld [wd001], a - ld a, $f1 + ld a, -15 ld [$ff9f], a - ld a, $1 + ld a, 1 call LoadMapStatus call StopScript ret @@ -2840,11 +2844,11 @@ Script_warp: ; 0x97a1d call GetScriptByte call GetScriptByte call GetScriptByte - ld a, $ff + ld a, -1 ld [wd001], a - ld a, $fb + ld a, -5 ld [$ff9f], a - ld a, $1 + ld a, 1 call LoadMapStatus call StopScript ret @@ -2882,7 +2886,7 @@ Script_blackoutmod: ; 0x97a78 Script_reloadmapmusic: ; 0x97a85 ; script command 0x83 - ld a, $1 + ld a, 1 ld [wc2c1], a ret ; 0x97a8b @@ -2913,7 +2917,7 @@ Script_delcmdqueue: ; 0x97a9e ld b, a callba Function97e5c ret c - ld a, $1 + ld a, 1 ld [ScriptVar], a ret ; 0x97ab3 @@ -2942,10 +2946,10 @@ Script_changeblock: ; 0x97acc ; block (SingleByteParam) call GetScriptByte - add $4 + add 4 ld d, a call GetScriptByte - add $4 + add 4 ld e, a call GetBlockLocation call GetScriptByte @@ -2987,7 +2991,7 @@ Script_newloadmap: ; 0x97b08 call GetScriptByte ld [$ff9f], a - ld a, $1 + ld a, 1 call LoadMapStatus call StopScript ret @@ -3064,14 +3068,14 @@ Script_pause: ; 0x97b47 call GetScriptByte and a - jr z, .asm_97b50 ; 0x97b4b $3 + jr z, .loop ; 0x97b4b $3 ld [ScriptDelay], a -.asm_97b50 +.loop ld c, 2 call DelayFrames ld hl, ScriptDelay dec [hl] - jr nz, .asm_97b50 ; 0x97b59 $f5 + jr nz, .loop ; 0x97b59 $f5 ret ; 0x97b5c @@ -3082,9 +3086,9 @@ Script_deactivatefacing: ; 0x97b5c call GetScriptByte and a - jr z, .asm_97b65 ; 0x97b60 $3 + jr z, .no_time ; 0x97b60 $3 ld [ScriptDelay], a -.asm_97b65 +.no_time ld a, SCRIPT_WAIT ld [ScriptMode], a call StopScript @@ -3104,9 +3108,9 @@ Script_end: ; 0x97b74 ; script command 0x91 call ExitScriptSubroutine - jr c, .asm_97b7a + jr c, .resume ret -.asm_97b7a +.resume xor a ld [ScriptRunning], a ld a, SCRIPT_OFF @@ -3121,8 +3125,8 @@ Script_return: ; 0x97b8c ; script command 0x90 call ExitScriptSubroutine - jr c, .asm_97b91 -.asm_97b91 + jr c, .dummy +.dummy ld hl, ScriptFlags res 0, [hl] call StopScript @@ -3135,17 +3139,15 @@ ExitScriptSubroutine: ; 0x97b9a ld hl, wd43c ld a, [hl] and a - jr z, .asm_97bbe ; 0x97b9f $1d + jr z, .done ; 0x97b9f $1d dec [hl] ld e, [hl] ld d, $0 ld hl, wd43d - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ld a, [hli] ld b, a - and $7f + and " " ld [ScriptBank], a ld a, [hli] ld e, a @@ -3155,7 +3157,7 @@ ExitScriptSubroutine: ; 0x97b9a ld [ScriptPos + 1], a and a ret -.asm_97bbe +.done scf ret ; 0x97bc0 @@ -3208,13 +3210,13 @@ Script_wait: ; 0x97c05 push bc call GetScriptByte -.asm_97c09 +.loop push af ld c, 6 call DelayFrames pop af dec a - jr nz, .asm_97c09 ; 0x97c11 $f6 + jr nz, .loop ; 0x97c11 $f6 pop bc ret ; 0x97c15 @@ -3229,7 +3231,7 @@ Script_unknown0xa9: ; 0x97c15 ; 0x97c20 -Function97c20: ; 97c20 +Function97c20: ; 97c20 unreferenced ld a, [.byte] ld [ScriptVar], a ret diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 108579fa1..d367ab956 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -159,7 +159,7 @@ PokeCenterNurseScript: .pokerus_done setflag ENGINE_POKERUS - specialphonecall 1 ; elm calls about pokerus + specialphonecall ELMCALL_POKERUS end DifficultBookshelfScript: @@ -297,7 +297,7 @@ RadioTowerRocketsScript: clearevent EVENT_6CE clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER setevent EVENT_756 - specialphonecall $0004 + specialphonecall ELMCALL_WEIRDBROADCAST domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1 end @@ -383,7 +383,7 @@ BugContestResults_CleanUp ; 0xbc31e BugContestResults_FirstPlace ; 0xbc31e - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 itemtotext SUN_STONE, $1 farwritetext ContestResults_PlayerWonAPrizeText closetext @@ -581,7 +581,7 @@ InitializeEventsScript: setevent EVENT_7A5 setevent EVENT_6EC setevent EVENT_6ED - setevent EVENT_6F0 + setevent EVENT_GOLDENROD_SALE_OFF setevent EVENT_7A9 setevent EVENT_EUSINE_IN_BURNED_TOWER setevent EVENT_6C8 diff --git a/hram.asm b/hram.asm index 9ab83d737..eb9cc06f9 100644 --- a/hram.asm +++ b/hram.asm @@ -41,6 +41,8 @@ hProduct EQU $ffb3 hMathBuffer EQU $ffb8 +hMoneyTemp EQU $ffc3 + hLCDStatCustom EQU $ffc6 hSerialSend EQU $ffcd diff --git a/items/item_effects.asm b/items/item_effects.asm index 377bd46da..3dde48169 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -2810,7 +2810,7 @@ GorgeousBox: ; f767 ; f769 Function_0xf769: ; f769 - callba Function26f02 + callba SetSpecificDecorationFlag ld hl, UnknownText_0xf778 call PrintText diff --git a/main.asm b/main.asm index 08f453fc3..ec7f623b2 100644 --- a/main.asm +++ b/main.asm @@ -11,15 +11,15 @@ Function4000:: ; 4000 ld a, [IsInBattle] and a - jr z, .asm_4012 + jr z, .notinbattle call TextBox - jr .asm_4017 + jr .continue -.asm_4012 +.notinbattle predef Function28eef -.asm_4017 +.continue hlcoord 4, 11 ld de, .Waiting call PlaceString @@ -130,12 +130,12 @@ OptionsMenu: ; 5b64 NewGame: ; 5b6b xor a ld [wc2cc], a - call Function5ba7 + call ResetWRAM call Function5b44 call Function5b8f call OakSpeech call InitializeWorld - ld a, $1 + ld a, 1 ld [wc2d8], a ld a, 0 ; SPAWN_HOME @@ -148,24 +148,24 @@ NewGame: ; 5b6b Function5b8f: ; 5b8f callba Function10632f - jr c, .asm_5b9e + jr c, .ok callba Function48dcb ret -.asm_5b9e - ld c, $0 +.ok + ld c, 0 callba Function4802f ret ; 5ba7 -Function5ba7: ; 5ba7 +ResetWRAM: ; 5ba7 xor a ld [hBGMapMode], a - call Function5bae + call _ResetWRAM ret ; 5bae -Function5bae: ; 5bae +_ResetWRAM: ; 5bae ld hl, Sprites ld bc, Options - Sprites @@ -986,14 +986,14 @@ Function6182: ; 6182 call DelayFrame ld a, $e4 call DmgToCgbBGPals -.asm_618e +.loop call DelayFrame ld a, [hWX] sub $8 cp $ff ret z ld [hWX], a - jr .asm_618e + jr .loop ; 619c Function619c: ; 619c @@ -1002,7 +1002,7 @@ Function619c: ; 619c xor a ld [$ffad], a hlcoord 6, 4 - ld bc, $0707 + lb bc, 7, 7 predef FillBox ret ; 61b4 @@ -1014,7 +1014,7 @@ Function61b4: ; 61b4 xor a ld [$ffad], a hlcoord 6, 4 - ld bc, $0707 + lb bc, 7, 7 predef FillBox ret ; 61cd @@ -1032,7 +1032,7 @@ Function61cd: ; 61cd inc de ld c, a -.asm_61e4 +.loop ld a, [de] inc de ld [hli], a @@ -1046,14 +1046,14 @@ Function61cd: ; 61cd ld b, 0 ld a, [PlayerGender] bit 0, a - jr z, .asm_61f8 + jr z, .male ld b, 1 -.asm_61f8 +.male ld a, b ld [hli], a dec c - jr nz, .asm_61e4 + jr nz, .loop ret ; 61fe @@ -1078,9 +1078,9 @@ Function6219: ; 6219 ld [rSVBK], a call TitleScreen call DelayFrame -.asm_6226 +.loop call Function627b - jr nc, .asm_6226 + jr nc, .loop call ClearSprites call WhiteBGMap pop af @@ -1102,21 +1102,20 @@ Function6219: ; 6219 call UpdateTimePals ld a, [wcf64] cp $5 - jr c, .asm_625e + jr c, .ok xor a -.asm_625e +.ok ld e, a ld d, 0 - ld hl, .data_626a - add hl, de - add hl, de + ld hl, .jumptable_626a + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a jp [hl] ; 626a -.data_626a +.jumptable_626a dw Function5ae8 dw Function6389 dw Function620b @@ -1133,14 +1132,14 @@ TitleScreen: ; 6274 Function627b: ; 627b ld a, [wcf63] bit 7, a - jr nz, .asm_6290 + jr nz, .true call TitleScreenScene callba Function10eea7 call DelayFrame and a ret -.asm_6290 +.true scf ret ; 6292 @@ -1161,8 +1160,7 @@ TitleScreenScene: ; 62a3 ld e, a ld d, 0 ld hl, .scenes - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -1202,7 +1200,7 @@ TitleScreenEntrance: ; 62bc ; Reversed signage for every other line's position. ; This is responsible for the interlaced effect. ld a, e - xor $ff + xor -1 inc a ld b, 8 * 10 / 2 ; logo height / 2 @@ -1389,8 +1387,7 @@ Function639b: ; 639b add hl, bc ld l, [hl] ld h, 0 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ld de, Data63ca add hl, de ld a, [wcf65] @@ -1399,8 +1396,7 @@ Function639b: ; 639b srl a ld e, a ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] and a ret z @@ -3163,11 +3159,11 @@ Function8000: ; 8000 ld [hBGMapMode], a call WhiteBGMap call ClearSprites - ld hl, TileMap + hlcoord 0, 0 ld bc, TileMapEnd - TileMap ld a, " " call ByteFill - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, AttrMapEnd - AttrMap ld a, $7 call ByteFill @@ -4022,8 +4018,7 @@ Function84ef: ; 84ef ld a, d ld d, 0 ld hl, SineWave - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -4063,9 +4058,7 @@ GetPredefPointer:: ; 854b ld e, a ld d, 0 ld hl, PredefPointers - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 pop de ld a, [hli] @@ -4498,7 +4491,7 @@ HealParty: ; c658 ld hl, PartySpecies .loop ld a, [hli] - cp $ff + cp -1 jr z, .done cp EGG jr z, .next @@ -10005,8 +9998,8 @@ ClearPCItemScreen: ; e58b ld [hBGMapMode], a call WhiteBGMap call ClearSprites - ld hl, TileMap - ld bc, 18 * 20 + hlcoord 0, 0 + ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld a, " " call ByteFill hlcoord 0,0 @@ -11001,8 +10994,7 @@ Function1171d: ; 1171d ld e, a ld d, 0 ld hl, Jumptable_1172e - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -11210,8 +11202,8 @@ Function1189c: ; 1189c Function118a8: ; 118a8 call WaitTop - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $60 call ByteFill hlcoord 1, 1 @@ -11322,8 +11314,7 @@ Function11968: ; 11968 ld e, a ld d, $0 ld hl, Jumptable_11977 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -11783,7 +11774,7 @@ Function11c11: ; 11c11 (4:5c11) srl a srl a ld d, a - ld hl, TileMap + hlcoord 0, 0 ld bc, $14 .asm_11c43 ld a, d @@ -11975,7 +11966,7 @@ String_11f7a: ; 11f7a Function11f84: ; 11f84 (4:5f84) call WaitTop - ld hl, TileMap + hlcoord 0, 0 ld bc, $78 ld a, $60 call ByteFill @@ -12474,8 +12465,7 @@ Function1233e: ; 1233e ld e, a ld d, 0 ld hl, Unknown_12365 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -12978,8 +12968,7 @@ StartMenu:: ; 125cd ld hl, .MenuReturns ld e, a ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -14926,8 +14915,7 @@ CheckRegisteredItem: ; 13345 inc hl ld e, a ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 call .IsSameItem jr c, .NoRegisteredItem and a @@ -14951,8 +14939,7 @@ CheckRegisteredItem: ; 13345 inc hl ld e, a ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 call .IsSameItem jr c, .NoRegisteredItem ret @@ -15228,7 +15215,7 @@ Elevator_GetCurrentFloorText: ; 13512 ld a, [hl] push af set 4, [hl] - ld hl, TileMap + hlcoord 0, 0 ld b, $4 ld c, $8 call TextBox @@ -15295,8 +15282,7 @@ FloorToString: ; 13575 ld e, a ld d, 0 ld hl, .floors - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -17240,10 +17226,7 @@ Function143c8: ; 143c8 pop bc ld l, c ld h, $0 - add hl, hl - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 4 pop de add hl, de ld d, h @@ -17270,10 +17253,7 @@ Function14406: ; 14406 and $7f ld l, a ld h, $0 - add hl, hl - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 4 ld a, l add $0 ld l, a @@ -19128,11 +19108,7 @@ Function150d8: ; 150d8 ld e, a ld d, 0 ld hl, Unknown_1522d - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 5 ld a, [hli] push af ld a, [hli] @@ -20099,7 +20075,7 @@ OpenMartDialog:: ; 15a45 call GetMart ld a, c ld [EngineBuffer1], a - call Function15b10 + call LoadMartPointer ld a, [EngineBuffer1] ld hl, .dialogs rst JumpTable @@ -20111,7 +20087,7 @@ OpenMartDialog:: ; 15a45 dw HerbShop dw BargainShop dw Pharmacist - dw VendingMachine + dw RooftopSale ; 15a61 MartDialog: ; 15a61 @@ -20135,9 +20111,9 @@ HerbShop: ; 15a6e ; 15a84 BargainShop: ; 15a84 - ld b, BANK(Unknown_15c51) - ld de, Unknown_15c51 - call Function15b10 + ld b, BANK(BargainShopData) + ld de, BargainShopData + call LoadMartPointer call Function15c25 call Function1d6e ld hl, UnknownText_0x15e6d @@ -20167,17 +20143,17 @@ Pharmacist: ; 15aae ret ; 15ac4 -VendingMachine: ; 15ac4 - ld b, BANK(Unknown_15aee) - ld de, Unknown_15aee +RooftopSale: ; 15ac4 + ld b, BANK(RooftopSaleData1) + ld de, RooftopSaleData1 ld hl, StatusFlags - bit 6, [hl] - jr z, .asm_15ad5 - ld b, BANK(Unknown_15aff) - ld de, Unknown_15aff + bit 6, [hl] ; hall of fame + jr z, .ok + ld b, BANK(RooftopSaleData2) + ld de, RooftopSaleData2 -.asm_15ad5 - call Function15b10 +.ok + call LoadMartPointer call Function15c25 call Function1d6e ld hl, UnknownText_0x15f83 @@ -20188,15 +20164,27 @@ VendingMachine: ; 15ac4 ret ; 15aee -Unknown_15aee: ; 15aee - db $05, $05, $96, $00, $04, $f4, $01, $11, $f4, $01, $26, $f4, $01, $27, $b0, $04, $ff -Unknown_15aff: ; 15aff - db $05, $10, $e8, $03, $0e, $d0, $07, $26, $f4, $01, $02, $e8, $03, $1b, $78, $1e, $ff +RooftopSaleData1: ; 15aee + db 5 + dbw POKE_BALL, 150 + dbw GREAT_BALL, 500 + dbw SUPER_POTION, 500 + dbw FULL_HEAL, 500 + dbw REVIVE, 1200 + db -1 +RooftopSaleData2: ; 15aff + db 5 + dbw HYPER_POTION, 1000 + dbw FULL_RESTORE, 2000 + dbw FULL_HEAL, 500 + dbw ULTRA_BALL, 1000 + dbw PROTEIN, 7800 + db -1 ; 15b10 -Function15b10: ; 15b10 +LoadMartPointer: ; 15b10 ld a, b - ld [wd03f], a + ld [MartPointerBank], a ld a, e ld [MartPointer], a ld a, d @@ -20222,8 +20210,7 @@ GetMart: ; 15b31 .IsAMart ld hl, Marts - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -20323,7 +20310,7 @@ ReadMart: ; 15bbb ld [de], a inc hl inc de - cp $ff + cp -1 jr nz, .CopyMart ld hl, DefaultFlypoint ld de, CurMart + 1 @@ -20357,13 +20344,13 @@ GetMartPrice: ; 15bf0 ld [StringBuffer2 + 1], a ld hl, StringBuffer1 ld de, StringBuffer2 - ld bc, $82 << 8 + 6 ; 6 digits + lb bc, $82, 6 ; 6 digits call PrintNum pop hl ld de, StringBuffer1 ld c, 6 / 2 ; 6 digits -.asm_15c0b +.loop call .TileToNum swap a ld b, a @@ -20371,7 +20358,7 @@ GetMartPrice: ; 15bf0 or b ld [hli], a dec c - jr nz, .asm_15c0b + jr nz, .loop ret ; 15c1a @@ -20396,12 +20383,12 @@ Function15c25: ; 15c25 inc hl ld bc, wd002 ld de, CurMart + 1 -.asm_15c33 +.loop ld a, [hli] ld [de], a inc de - cp $ff - jr z, .asm_15c4b + cp -1 + jr z, .done push de ld a, [hli] @@ -20416,17 +20403,23 @@ Function15c25: ; 15c25 ld c, l pop hl pop de - jr .asm_15c33 + jr .loop -.asm_15c4b +.done pop hl ld a, [hl] ld [CurMart], a ret ; 15c51 -Unknown_15c51: ; 15c51 - db $05, $24, $94, $11, $6e, $8a, $02, $6f, $ac, $0d, $83, $84, $03, $84, $f8, $11, $ff +BargainShopData: ; 15c51 + db 5 + dbw NUGGET, 4500 + dbw PEARL, 650 + dbw BIG_PEARL, 3500 + dbw STARDUST, 900 + dbw STAR_PIECE, 4600 + db -1 ; 15c62 @@ -20453,8 +20446,7 @@ Function15c7d: ; 15c7d pop af ld e, a ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -20479,9 +20471,7 @@ Function15ca3: ; 15ca3 ld e, a ld d, 0 ld hl, .data_15cb0 - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ret ; 15cb0 @@ -20554,7 +20544,7 @@ Function15cef: ; 15cef call Function15d97 jr c, .asm_15d68 ld de, Money - ld bc, $ffc3 + ld bc, hMoneyTemp ld a, $3 call CheckMoney jr c, .asm_15d79 @@ -20569,7 +20559,7 @@ Function15cef: ; 15cef call FlagAction call Function15fc3 ld de, Money - ld bc, $ffc3 + ld bc, hMoneyTemp call TakeMoney ld a, $4 call Function15c7d @@ -20637,16 +20627,14 @@ Function15da5: ; 15da5 ld h, [hl] ld l, a inc hl - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 inc hl ld a, [hli] ld [$ffc5], a ld a, [hl] ld [$ffc4], a xor a - ld [$ffc3], a + ld [hMoneyTemp], a and a ret @@ -20678,9 +20666,7 @@ Function15df9: ; 15df9 ld h, [hl] ld l, a inc hl - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 inc hl ld e, [hl] inc hl @@ -20945,7 +20931,7 @@ Function15efd: ; 15efd call YesNoBox jr c, .asm_15f6e ld de, Money - ld bc, $ffc3 + ld bc, hMoneyTemp call GiveMoney ld a, [wd107] ld hl, NumItems @@ -21296,8 +21282,7 @@ Function16233: ; 16233 ld e, a ld d, 0 ld hl, Jumptable_16242 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -21724,7 +21709,7 @@ Function1651a: ; 1651a push de xor a ld [hBGMapMode], a - ld hl, TileMap + hlcoord 0, 0 ld bc, $0612 call TextBox hlcoord 1, 2 @@ -21860,9 +21845,7 @@ Function16607: ; 16607 push de ld e, a ld d, 0 - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 pop de ret ; 16613 @@ -22273,8 +22256,7 @@ Function1689b: ; 1689b ld e, a ld d, 0 ld hl, TextTable_168aa - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -22812,12 +22794,12 @@ Function16be4: ; 16be4 lb bc, BANK(UnownDexBTile), 1 call Request1bpp - ld hl, TileMap + hlcoord 0, 0 ld bc, $0312 call TextBox hlcoord 0, 5 - ld bc, $0707 + lb bc, 7, 7 call TextBox hlcoord 0, 14 @@ -22935,7 +22917,7 @@ Function16cc8: ; 16cc8 hlcoord 1, 6 xor a ld [$ffad], a - ld bc, $0707 + lb bc, 7, 7 predef FillBox ld de, $9310 callba Functione0000 @@ -22963,7 +22945,7 @@ Function16cff: ; 16cff Function16d20: ; 16d20 hlcoord 1, 6 - ld bc, $0707 + lb bc, 7, 7 call ClearBox hlcoord 1, 9 ld de, UnownDexVacantString @@ -23009,14 +22991,14 @@ INCBIN "gfx/unknown/016da4.1bpp" ; 16dac Function16dac: ; 16dac - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $7f call ByteFill hlcoord 7, 11 ld a, $31 ld [$ffad], a - ld bc, $0707 + lb bc, 7, 7 predef FillBox ret ; 16dc7 @@ -23740,7 +23722,7 @@ Function17254: ; 17254 (5:7254) call WaitTop push hl push bc - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 ld a, $7f call ByteFill @@ -24083,10 +24065,7 @@ Function20000: ; 20000 (8:4000) ld e, a ld d, 0 ld hl, Unknown_20015 - add hl, de - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 4 ld e, [hl] inc hl ld d, [hl] @@ -25002,7 +24981,7 @@ Function243cd: ; 243cd dec c jr nz, .asm_243d7 pop hl - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc pop bc dec b @@ -25059,17 +25038,17 @@ Function24423: ; 24423 ret z xor a call GetSRAMBank - ld hl, TileMap + hlcoord 0, 0 ld de, $a000 - ld bc, $0168 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyBytes call CloseSRAM call Function2173 xor a call GetSRAMBank ld hl, $a000 - ld de, TileMap - ld bc, $0168 + decoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT .asm_2444c ld a, [hl] cp $61 @@ -25206,7 +25185,7 @@ Pokepic:: ; 244e3 call GetTileCoord ld a, $80 ld [$ffad], a - ld bc, $0707 + lb bc, 7, 7 predef FillBox call WaitBGMap ret @@ -26245,7 +26224,7 @@ Function24b8f: ; 24b8f ld a, [hl] push af set 4, [hl] - ld hl, TileMap + hlcoord 0, 0 ld b, $3 ld c, $7 call TextBox @@ -26275,7 +26254,7 @@ String24bd4: ; 24bd4 ; 24bdc Function24bdc: ; 24bdc - ld hl, TileMap + hlcoord 0, 0 ld b, $5 ld c, $11 call TextBox @@ -27069,7 +27048,7 @@ Function250c1: ; 250c1 Function250d1: ; 250d1 push hl - ld hl, $ffc3 + ld hl, hMoneyTemp ld a, [hMultiplicand] ld [hli], a ld a, [$ffb5] @@ -27078,7 +27057,7 @@ Function250d1: ; 250d1 ld [hl], a pop hl inc hl - ld de, $ffc3 + ld de, hMoneyTemp ld bc, $2306 call PrintNum call WaitBGMap @@ -27177,8 +27156,7 @@ Function2518e: ; 2518e (9:518e) ld e, a ld d, $0 ld hl, Jumptable_2519d - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -27328,7 +27306,7 @@ Function25279: ; 25279 (9:5279) ret Function25299: ; 25299 (9:5299) - ld hl, TileMap + hlcoord 0, 0 ld d, $5 call Function253b0 hlcoord 2, 2 @@ -27389,7 +27367,7 @@ Function2530a: ; 2530a (9:530a) hlcoord 2, 8 ld de, Tilemap_25366 call Function253a8 - ld a, [StatusFlags] + ld a, [StatusFlags] ; pokedex bit 0, a ret nz hlcoord 1, 9 @@ -28103,25 +28081,25 @@ Function26830: ; 26830 (9:6830) Function2683a: ; 2683a (9:683a) ld hl, Jumptable_26855 -.asm_2683d +.loop ld a, [hli] ld e, a ld a, [hli] ld d, a or e - jr z, .asm_26854 + jr z, .done push hl call _de_ pop hl - jr nc, .asm_26851 + jr nc, .next ld a, [hl] push hl call Function26830 pop hl -.asm_26851 +.next inc hl - jr .asm_2683d -.asm_26854 + jr .loop +.done ret ; 26855 (9:6855) @@ -28140,30 +28118,30 @@ Function2686c: ; 2686c xor a ld hl, DefaultFlypoint ld [hli], a - ld a, $ff + ld a, -1 ld bc, $0010 call ByteFill ret ; 2687a -Function2687a: ; 2687a -.asm_2687a +CheckAllDecorationFlags: ; 2687a +.loop ld a, [hli] - cp $ff - jr z, .asm_26890 + cp -1 + jr z, .done push hl push af - ld b, $2 - call Function26a3b + ld b, 2 ; check + call DecorationFlagAction ld a, c and a pop bc ld a, b call nz, Function26891 pop hl - jr .asm_2687a + jr .loop -.asm_26890 +.done ret ; 26891 @@ -28182,7 +28160,7 @@ Function2689b: ; 2689b push hl call Function2686c pop hl - call Function2687a + call CheckAllDecorationFlags pop bc ld a, [DefaultFlypoint] and a @@ -28296,7 +28274,7 @@ Function26925: ; 26925 Unknown_2692d: ; 2692d db 30, 31, 32, 33, 34, 35, 36, 37, 38, 39 db 40, 41, 42, 43, 44, 45, 46, 47, 48, 49 - db 50, 51, 52, $ff + db 50, 51, 52, -1 ; 26945 Function26945: ; 26945 @@ -28313,7 +28291,7 @@ Function2694d: ; 2694d ; 26955 Unknown_26955: ; 26955 - db 26, 27, 28, $ff + db 26, 27, 28, -1 ; 26959 Function26959: ; 26959 @@ -28324,28 +28302,28 @@ Function26959: ; 26959 Function2695b: ; 2695b ld a, [DefaultFlypoint] and a - jr z, .asm_269a9 - cp $8 - jr nc, .asm_2697b + jr z, .empty + cp 8 + jr nc, .beyond_eight xor a ld [wcf76], a ld hl, MenuDataHeader_0x269b5 call LoadMenuDataHeader call Function1e5d - jr c, .asm_26977 - call Function26a02 + jr c, .no_action_1 + call DoDecorationAction2 -.asm_26977 +.no_action_1 call Function1c07 ret -.asm_2697b +.beyond_eight ld hl, DefaultFlypoint ld e, [hl] dec [hl] - ld d, $0 + ld d, 0 add hl, de - ld [hl], $ff + ld [hl], -1 call Function1d6e ld hl, MenuDataHeader_0x269c5 call CopyMenuDataHeader @@ -28356,15 +28334,15 @@ Function2695b: ; 2695b ld [wd0e4], a call Function350c ld a, [wcf73] - cp $2 - jr z, .asm_269a5 - call Function26a02 + cp 2 + jr z, .no_action_2 + call DoDecorationAction2 -.asm_269a5 +.no_action_2 call Function1c07 ret -.asm_269a9 +.empty ld hl, UnknownText_0x269b0 call Function1d67 ret @@ -28411,17 +28389,17 @@ MenuData2_0x269cd: ; 0x269cd ; 269dd -Function269dd: ; 269dd +GetDecorationData: ; 269dd ld hl, DecorationAttributes - ld bc, $0006 + ld bc, 6 call AddNTimes ret ; 269e7 Function269e7: ; 269e7 push hl - call Function269dd - call Function26c72 + call GetDecorationData + call GetDecorationType pop hl call CopyName2 ret @@ -28430,17 +28408,17 @@ Function269e7: ; 269e7 Function269f3: ; 269f3 ld a, [MenuSelection] push de - call Function269dd - call Function26c72 + call GetDecorationData + call GetDecorationType pop hl call PlaceString ret ; 26a02 -Function26a02: ; 26a02 +DoDecorationAction2: ; 26a02 ld a, [MenuSelection] - call Function269dd - ld de, $0002 + call GetDecorationData + ld de, 2 add hl, de ld a, [hl] ld hl, Jumptable_26a12 @@ -28467,9 +28445,9 @@ Jumptable_26a12: ; 26a12 ; 26a30 -Function26a30: ; 26a30 - call Function269dd - ld de, $0003 +GetDecorationFlag: ; 26a30 + call GetDecorationData + ld de, 3 add hl, de ld a, [hli] ld d, [hl] @@ -28477,9 +28455,9 @@ Function26a30: ; 26a30 ret ; 26a3b -Function26a3b: ; 26a3b +DecorationFlagAction: ; 26a3b push bc - call Function26a30 + call GetDecorationFlag pop bc call EventFlagAction ret @@ -28487,68 +28465,75 @@ Function26a3b: ; 26a3b Function26a44: ; 26a44 ld a, c - call Function269dd - ld de, $0005 + call GetDecorationData + ld de, 5 add hl, de ld a, [hl] ld c, a ret ; 26a4f +decoration: MACRO + ; type, ??, event flag, sprite + db \1, \2, \3 + dw \4 + db \5 +ENDM + DecorationAttributes: ; 26a4f - db $01, $00, $00, $00, $00, $00 - db $01, $01, $02, $00, $00, $00 - db $02, $12, $01, $a4, $02, $1b - db $02, $14, $01, $a5, $02, $1c - db $02, $15, $01, $a6, $02, $1d - db $02, $13, $01, $a7, $02, $1e - db $01, $01, $04, $00, $00, $00 - db $03, $16, $03, $a8, $02, $08 - db $03, $17, $03, $a9, $02, $0b - db $03, $18, $03, $aa, $02, $0e - db $03, $19, $03, $ab, $02, $11 - db $01, $01, $06, $00, $00, $00 - db $01, $02, $05, $ac, $02, $20 - db $01, $03, $05, $ad, $02, $21 - db $01, $04, $05, $ae, $02, $22 - db $01, $01, $08, $00, $00, $00 - db $01, $05, $07, $af, $02, $1f - db $04, $19, $07, $b0, $02, $23 - db $04, $23, $07, $b1, $02, $24 - db $04, $27, $07, $b2, $02, $25 - db $01, $01, $0a, $00, $00, $00 - db $01, $06, $09, $b3, $02, $5c - db $01, $07, $09, $b4, $02, $5b - db $01, $08, $09, $b5, $02, $51 - db $01, $09, $09, $b6, $02, $57 - db $01, $01, $0c, $00, $00, $00 - db $06, $8f, $0b, $cf, $02, $33 - db $06, $5f, $0b, $d0, $02, $50 - db $06, $83, $0b, $d1, $02, $47 - db $01, $01, $0e, $00, $00, $00 - db $05, $19, $0d, $b7, $02, $8e - db $01, $0c, $0d, $b8, $02, $34 - db $05, $23, $0d, $b9, $02, $8f - db $05, $27, $0d, $ba, $02, $94 - db $05, $01, $0d, $bb, $02, $93 - db $05, $04, $0d, $bc, $02, $90 - db $05, $07, $0d, $bd, $02, $89 - db $05, $3c, $0d, $be, $02, $8d - db $05, $32, $0d, $bf, $02, $8c - db $05, $78, $0d, $c0, $02, $92 - db $05, $81, $0d, $c1, $02, $88 - db $05, $2b, $0d, $c2, $02, $85 - db $05, $5e, $0d, $c3, $02, $86 - db $05, $5a, $0d, $c4, $02, $84 - db $05, $58, $0d, $c5, $02, $95 - db $05, $64, $0d, $c6, $02, $9b - db $05, $0d, $0d, $c7, $02, $83 - db $05, $c9, $0d, $c8, $02, $80 - db $05, $4a, $0d, $c9, $02, $81 - db $05, $42, $0d, $ca, $02, $9a - db $05, $48, $0d, $cb, $02, $98 - db $01, $0a, $0d, $cd, $02, $5e - db $01, $0b, $0d, $ce, $02, $5f + decoration DECO_CARPET, $00, 0, EVENT_000, SPRITE_NONE ; 00 + decoration DECO_CARPET, $01, 2, EVENT_000, SPRITE_NONE ; 01 + decoration DECO_PLANT, $12, 1, EVENT_2A4, $1b ; 02 + decoration DECO_PLANT, $14, 1, EVENT_2A5, $1c ; 03 + decoration DECO_PLANT, $15, 1, EVENT_2A6, $1d ; 04 + decoration DECO_PLANT, $13, 1, EVENT_2A7, $1e ; 05 + decoration DECO_CARPET, $01, 4, EVENT_000, SPRITE_NONE ; 06 + decoration DECO_POSTER, $16, 3, EVENT_2A8, $08 ; 07 + decoration DECO_POSTER, $17, 3, EVENT_2A9, $0b ; 08 + decoration DECO_POSTER, $18, 3, EVENT_2AA, $0e ; 09 + decoration DECO_POSTER, $19, 3, EVENT_2AB, $11 ; 0a + decoration DECO_CARPET, $01, 6, EVENT_000, SPRITE_NONE ; 0b + decoration DECO_CARPET, $02, 5, EVENT_2AC, SPRITE_ERIKA ; 0c + decoration DECO_CARPET, $03, 5, EVENT_2AD, SPRITE_KOGA ; 0d + decoration DECO_CARPET, $04, 5, EVENT_2AE, SPRITE_SABRINA ; 0e + decoration DECO_CARPET, $01, 8, EVENT_000, SPRITE_NONE ; 0f + decoration DECO_CARPET, $05, 7, EVENT_2AF, SPRITE_SURGE ; 10 + decoration DECO_CONSOLE, $19, 7, EVENT_2B0, SPRITE_COOLTRAINER_M ; 11 + decoration DECO_CONSOLE, $23, 7, EVENT_2B1, SPRITE_COOLTRAINER_F ; 12 + decoration DECO_CONSOLE, $27, 7, EVENT_2B2, SPRITE_BUG_CATCHER ; 13 + decoration DECO_CARPET, $01, 10, EVENT_000, SPRITE_NONE ; 14 + decoration DECO_CARPET, $06, 9, EVENT_2B3, SPRITE_FAMICOM ; 15 + decoration DECO_CARPET, $07, 9, EVENT_2B4, SPRITE_SNES ; 16 + decoration DECO_CARPET, $08, 9, EVENT_2B5, SPRITE_N64 ; 17 + decoration DECO_CARPET, $09, 9, EVENT_2B6, SPRITE_VIRTUAL_BOY ; 18 + decoration DECO_CARPET, $01, 12, EVENT_000, SPRITE_NONE ; 19 + decoration DECO_BIGDOLL, $8f, 11, EVENT_2CF, SPRITE_BIG_SNORLAX ; 1a + decoration DECO_BIGDOLL, $5f, 11, EVENT_2D0, SPRITE_BIG_ONIX ; 1b + decoration DECO_BIGDOLL, $83, 11, EVENT_2D1, SPRITE_BIG_LAPRAS ; 1c + decoration DECO_CARPET, $01, 14, EVENT_000, SPRITE_NONE ; 1d + decoration DECO_ORNAMENT, $19, 13, EVENT_2B7, SPRITE_PIKACHU ; 1e + decoration DECO_CARPET, $0c, 13, EVENT_2B8, SPRITE_SURFING_PIKACHU ; 1f + decoration DECO_ORNAMENT, $23, 13, EVENT_2B9, SPRITE_CLEFAIRY ; 20 + decoration DECO_ORNAMENT, $27, 13, EVENT_2BA, SPRITE_JIGGLYPUFF ; 21 + decoration DECO_ORNAMENT, $01, 13, EVENT_2BB, SPRITE_BULBASAUR ; 22 + decoration DECO_ORNAMENT, $04, 13, EVENT_2BC, SPRITE_CHARMANDER ; 23 + decoration DECO_ORNAMENT, $07, 13, EVENT_2BD, SPRITE_SQUIRTLE ; 24 + decoration DECO_ORNAMENT, $3c, 13, EVENT_2BE, SPRITE_POLIWAG ; 25 + decoration DECO_ORNAMENT, $32, 13, EVENT_2BF, SPRITE_DIGLETT ; 26 + decoration DECO_ORNAMENT, $78, 13, EVENT_2C0, SPRITE_STARMIE ; 27 + decoration DECO_ORNAMENT, $81, 13, EVENT_2C1, SPRITE_MAGIKARP ; 28 + decoration DECO_ORNAMENT, $2b, 13, EVENT_2C2, SPRITE_ODDISH ; 29 + decoration DECO_ORNAMENT, $5e, 13, EVENT_2C3, SPRITE_GENGAR ; 2a + decoration DECO_ORNAMENT, $5a, 13, EVENT_2C4, SPRITE_SHELLDER ; 2b + decoration DECO_ORNAMENT, $58, 13, EVENT_2C5, SPRITE_GRIMER ; 2c + decoration DECO_ORNAMENT, $64, 13, EVENT_2C6, SPRITE_VOLTORB ; 2d + decoration DECO_ORNAMENT, $0d, 13, EVENT_2C7, SPRITE_WEEDLE ; 2e + decoration DECO_ORNAMENT, $c9, 13, EVENT_2C8, SPRITE_UNOWN ; 2f + decoration DECO_ORNAMENT, $4a, 13, EVENT_2C9, SPRITE_GEODUDE ; 30 + decoration DECO_ORNAMENT, $42, 13, EVENT_2CA, SPRITE_MACHOP; 31 + decoration DECO_ORNAMENT, $48, 13, EVENT_2CB, SPRITE_TENTACOOL; 32 + decoration DECO_CARPET, $0a, 13, EVENT_2CD, SPRITE_GOLD_TROPHY; 33 + decoration DECO_CARPET, $0b, 13, EVENT_2CE, SPRITE_SILVER_TROPHY; 34 ; 26b8d @@ -28581,7 +28566,7 @@ DecorationNames: ; 26b8d db "GREEN@" ; 26c72 -Function26c72: ; 26c72 +GetDecorationType: ; 26c72 ld a, [hli] ld e, [hl] ld bc, StringBuffer2 @@ -28656,10 +28641,10 @@ Function26cc0: ; 26cc0 jr Function26cda Function26cca: ; 26cca - call Function26ccf + call GetDecorationName jr Function26cda -Function26ccf: ; 26ccf +GetDecorationName: ; 26ccf push bc ld hl, DecorationNames call GetNthString @@ -29037,13 +29022,13 @@ Function26eea: ; 26eea Function26ef1: ; 26ef1 ld a, c - jp Function26a3b + jp DecorationFlagAction ; 26ef5 Function26ef5: ; 26ef5 (9:6ef5) ld a, c - call Function26f0c + call GetDecorationID ld hl, StringBuffer1 push hl call Function269e7 @@ -29051,20 +29036,20 @@ Function26ef5: ; 26ef5 (9:6ef5) ret -Function26f02: ; 26f02 +SetSpecificDecorationFlag: ; 26f02 ld a, c - call Function26f0c - ld b, $1 - call Function26a3b + call GetDecorationID + ld b, 1 ; set + call DecorationFlagAction ret ; 26f0c -Function26f0c: ; 26f0c +GetDecorationID: ; 26f0c push hl push de ld e, a ld d, 0 - ld hl, Unknown_26f2b + ld hl, DecorationIDs add hl, de ld a, [hl] pop de @@ -29072,33 +29057,69 @@ Function26f0c: ; 26f0c ret ; 26f19 -Function26f19: ; 26f19 - ld hl, Unknown_26f2b -.asm_26f1c +SetAllDecorationFlags: ; 26f19 + ld hl, DecorationIDs +.loop ld a, [hli] - cp $ff - jr z, .asm_26f2a + cp -1 + jr z, .done push hl - ld b, $1 - call Function26a3b + ld b, 1 ; set + call DecorationFlagAction pop hl - jr .asm_26f1c + jr .loop -.asm_26f2a +.done ret ; 26f2b -Unknown_26f2b: ; 26f2b - db $02, $03, $04, $05, $07 - db $08, $09, $0a, $0c, $0d - db $0e, $10, $11, $12, $13 - db $15, $16, $17, $18, $1e - db $1f, $20, $21, $22, $23 - db $24, $25, $26, $27, $28 - db $29, $2a, $2b, $2c, $2d - db $2e, $2f, $30, $31, $32 - db $1a, $1b, $1c, $33, $34 - db $ff +DecorationIDs: ; 26f2b + db $02 + db $03 + db $04 + db $05 + db $07 + db $08 + db $09 + db $0a + db $0c + db $0d + db $0e + db $10 + db $11 + db $12 + db $13 + db $15 + db $16 + db $17 + db $18 + db $1e + db $1f + db $20 + db $21 + db $22 + db $23 + db $24 + db $25 + db $26 + db $27 + db $28 + db $29 + db $2a + db $2b + db $2c + db $2d + db $2e + db $2f + db $30 + db $31 + db $32 + db $1a + db $1b + db $1c + db $33 + db $34 + db -1 ; 26f59 DescribeDecoration:: ; 26f59 @@ -31100,7 +31121,7 @@ Function28b42: ; 28b42 call ByteFill hlcoord 1, 16 ld a, $7f - ld bc, $0012 + ld bc, SCREEN_HEIGHT call ByteFill hlcoord 2, 16 ld de, String_28b61 @@ -31114,7 +31135,7 @@ String_28b61: ; 28b61 Function28b68: ; 28b68 ld a, [wcf51] hlcoord 6, 9 - ld bc, $0014 + ld bc, SCREEN_WIDTH call AddNTimes ld [hl], $ec ret @@ -31129,7 +31150,7 @@ Function28b77: ; 28b77 dec c jr nz, .asm_28b79 pop hl - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc pop bc dec b @@ -31752,8 +31773,7 @@ Function290a0: ; 290a0 ld e, a ld d, 0 ld hl, JumpTable290af - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -32041,8 +32061,7 @@ Function29281: ; 29281 ld e, a ld d, 0 ld hl, Jumptable_2928f - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -32072,7 +32091,7 @@ Function29297: ; 29297 Function292af: ; 292af call Function297cf hlcoord 0, 3 - ld bc, $0014 + ld bc, SCREEN_WIDTH ld a, $60 call ByteFill ret @@ -32088,7 +32107,7 @@ Function292be: ; 292be ld a, $5d ld [hl], a ld a, $61 - ld de, $0014 + ld de, SCREEN_WIDTH ld c, $3 .asm_292d9 add hl, de @@ -32119,8 +32138,8 @@ Function292f6: ; 292f6 ld a, $9c ld [$ffd7], a call ClearTileMap - ld hl, TileMap - ld bc, $0014 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH ld a, $7a call ByteFill hlcoord 0, 1 @@ -32385,7 +32404,7 @@ Function294c3: ; 294c3 hlcoord 7, 2 xor a ld [$ffad], a - ld bc, $0707 + lb bc, 7, 7 predef FillBox call WaitBGMap ret @@ -32626,8 +32645,7 @@ Function29676: ; 29676 (a:5676) ld e, [hl] ld d, 0 ld hl, Jumptable_29686 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -32866,8 +32884,8 @@ Function297c9: ; 297c9 ; 297cf Function297cf: ; 297cf - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $7f call ByteFill ret @@ -32884,7 +32902,7 @@ Function297db: ; 297db dec c jr nz, .asm_297dd pop hl - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc pop bc dec b @@ -33645,14 +33663,14 @@ Function29ff8: ; 29ff8 ret Function2a01f: ; 2a01f - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill ld a, e and a jr nz, .asm_2a043 - ld de, TileMap + decoord 0, 0 ld hl, WildMons1 call Function2a052 ld hl, WildMons2 @@ -33662,7 +33680,7 @@ Function2a01f: ; 2a01f ret .asm_2a043 - ld de, TileMap + decoord 0, 0 ld hl, WildMons3 call Function2a052 ld hl, WildMons4 @@ -33743,8 +33761,8 @@ Function2a09c: ; 2a09c push de call GetWorldMapLocation ld c, a - ld hl, TileMap - ld de, $0168 + hlcoord 0, 0 + ld de, SCREEN_WIDTH * SCREEN_HEIGHT .asm_2a0a7 ld a, [hli] cp c @@ -34999,7 +35017,7 @@ Function2c0c5: ; 2c0c5 Function2c0f1: ; 2c0f1 ld a, [wd004] ld [hl], a - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld a, [StartFlypoint] ld [hl], a @@ -37353,7 +37371,7 @@ Function421f5: ; 421f5 xor a ld [hBGMapMode], a - ld hl, TileMap + hlcoord 0, 0 lb bc, 12, 20 call ClearBox @@ -38261,8 +38279,7 @@ Function44333: ; 44333 dec a ld d, 0 ld e, a - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -38986,7 +39003,7 @@ Function4802f: ; 4802f (12:402f) ld b, $1 call Function4930f call WhiteBGMap - ld hl, TileMap + hlcoord 0, 0 ld b, $2 ld c, $14 call ClearBox @@ -39604,7 +39621,7 @@ Function48689: ; 48689 (12:4689) ld b, $1 call Function4930f call WhiteBGMap - ld hl, TileMap + hlcoord 0, 0 ld b, $4 ld c, $14 call ClearBox @@ -40817,11 +40834,11 @@ Function48e14: ; 48e14 (12:4e14) call WhiteBGMap call Function48000 call Functione5f - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 ld a, $0 call ByteFill - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $168 xor a call ByteFill @@ -40858,8 +40875,7 @@ INCBIN "gfx/unknown/048e71.2bpp" Function48e81: ; 48e81 ld hl, PackFGFXPointers - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld e, a ld d, [hl] @@ -41029,7 +41045,7 @@ Function49336: ; 49336 dec c jr nz, .asm_49338 pop hl - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc pop bc dec b @@ -41039,7 +41055,7 @@ Function49336: ; 49336 Function49346: ; 49346 (12:5346) - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $168 xor a call ByteFill @@ -41067,7 +41083,7 @@ Function4936e: ; 4936e (12:536e) ret Function49384: ; 49384 (12:5384) - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $401 ld a, $1 call Function49336 @@ -41165,8 +41181,8 @@ Function4942f: ; 4942f ld a, $5 ; BANK(Unkn1Pals) call FarCopyWRAM call Function49346 - ld hl, AttrMap - ld bc, $0168 + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill hlcoord 0, 14, AttrMap @@ -41198,7 +41214,7 @@ Palette_49478: ; 49478 ; 49480 Function49480: ; 49480 - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $0414 ld a, $7 call Function49336 @@ -41211,7 +41227,7 @@ Function49480: ; 49480 ; 49496 Function49496: ; 49496 - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $0214 ld a, $7 call Function49336 @@ -41508,13 +41524,13 @@ Palette_49757: ; 49757 ; 49797 Function49797: ; 49797 - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $1002 ld a, $4 call Function49336 ld a, $3 - ld [AttrMap + 0 + 1 * SCREEN_WIDTH], a - ld [AttrMap + 0 + 14 * SCREEN_WIDTH], a + ld [AttrMap + 0 + 1 * SCREEN_WIDTH], a ; (0, 1) + ld [AttrMap + 0 + 14 * SCREEN_WIDTH], a ; (0, 14) hlcoord 2, 0, AttrMap ld bc, $0812 ld a, $5 @@ -41639,10 +41655,10 @@ Function4989a: ; 4989a ld a, $a0 ld [wcf64], a ld d, $0 -.asm_498ca +.loop ld a, [wcf63] bit 7, a - jr nz, .asm_498ee + jr nz, .done push bc call Function49bae inc d @@ -41655,9 +41671,9 @@ Function4989a: ; 4989a call DelayFrames pop de pop bc - jr .asm_498ca + jr .loop -.asm_498ee +.done pop af ld [VramState], a call Function498f9 @@ -41669,14 +41685,14 @@ Function498f9: ; 498f9 ld hl, Sprites + 2 xor a ld c, $4 -.asm_498ff +.loop ld [hli], a inc hl inc hl inc hl inc a dec c - jr nz, .asm_498ff + jr nz, .loop ld hl, Sprites + $10 ld bc, $0090 xor a @@ -41862,8 +41878,7 @@ Function49b52: ; 49b52 (12:5b52) ld a, d ld d, $0 ld hl, Unknown_49b6e - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -42124,11 +42139,11 @@ Function49da4: ; 49da4 nop ld a, [wcfcd] and a - jr nz, .asm_49db0 + jr nz, .next ld a, $0 ret -.asm_49db0 +.next ld a, [hCGB] cp $1 ld a, $1 @@ -42138,30 +42153,30 @@ Function49da4: ; 49da4 ld a, [$abe5] cp $ff call CloseSRAM - jr nz, .asm_49dd6 + jr nz, .done ld a, [StatusFlags] bit 7, a ld a, $1 - jr z, .asm_49dd1 - jr .asm_49dd1 + jr z, .ok + jr .ok -.asm_49dd1 - jr .asm_49dd3 +.ok + jr .ok2 -.asm_49dd3 +.ok2 ld a, $1 ret -.asm_49dd6 +.done ld a, [StatusFlags] bit 7, a - jr z, .asm_49ddf - jr .asm_49ddf + jr z, .ok3 + jr .ok3 -.asm_49ddf - jr .asm_49de1 +.ok3 + jr .ok4 -.asm_49de1 +.ok4 ld a, $6 ret ; 49de4 @@ -42870,7 +42885,7 @@ Function4a39a: ; 4a39a Function4a3a7: ; 4a3a7 (12:63a7) call Function4a485 Function4a3aa: ; 4a3aa - ld hl, TileMap + hlcoord 0, 0 ld bc, $301 xor a call Function4a6d8 @@ -42936,7 +42951,7 @@ Function4a3aa: ; 4a3aa Function4a449: ; 4a449 ld bc, $003c ld a, $0 - ld hl, TileMap + hlcoord 0, 0 call ByteFill ld bc, $0028 ld a, $1 @@ -42947,13 +42962,13 @@ Function4a449: ; 4a449 ld bc, $0028 ld a, $1 call ByteFill - ld bc, $0014 + ld bc, SCREEN_WIDTH ld a, $2 call ByteFill - ld bc, $0014 + ld bc, SCREEN_WIDTH ld a, $3 call ByteFill - ld bc, $0014 + ld bc, SCREEN_WIDTH ld a, $7f call ByteFill ret @@ -44496,8 +44511,8 @@ Function4ae5e: ; 4ae5e SECTION "bank13", ROMX, BANK[$13] Function4c000:: ; 4c000 - ld hl, TileMap - ld de, AttrMap + hlcoord 0, 0 + decoord 0, 0, AttrMap ld b, $12 .asm_4c008 push bc @@ -44672,11 +44687,11 @@ Function4cf45: ; 4cf45 (13:4f45) di ld a, $1 ld [rVBK], a ; $ff00+$4f - ld hl, AttrMap + hlcoord 0, 0, AttrMap call Function4cf80 ld a, $0 ld [rVBK], a ; $ff00+$4f - ld hl, TileMap + hlcoord 0, 0 call Function4cf80 .asm_4cf72 ld a, [rLY] ; $ff00+$44 @@ -44846,7 +44861,7 @@ Function4d15b:: ; 4d15b inc hl .asm_4d170 - ld de, TileMap + decoord 0, 0 ld b, SCREEN_HEIGHT .asm_4d175 ld c, SCREEN_WIDTH @@ -44890,11 +44905,11 @@ Function4d188: ; 4d188 di ld a, $1 ld [rVBK], a - ld hl, AttrMap + hlcoord 0, 0, AttrMap call Function4d1cb ld a, $0 ld [rVBK], a - ld hl, TileMap + hlcoord 0, 0 call Function4d1cb .asm_4d1bd ld a, [rLY] @@ -45080,7 +45095,7 @@ Function4d35b: ; 4d35b dec c jr nz, .asm_4d370 pop hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de pop bc dec b @@ -45097,7 +45112,7 @@ Function4d37e: ; 4d37e inc a ld [hl], a pop hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de .asm_4d38d push hl @@ -45107,7 +45122,7 @@ Function4d37e: ; 4d37e call Function4d3ab ld [hl], $7a pop hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de dec b jr nz, .asm_4d38d @@ -47036,13 +47051,13 @@ Function4e253: ; 4e253 (13:6253) ld a, [CurPartySpecies] cp UNOWN jr z, .asm_4e266 - ld hl, TileMap + hlcoord 0, 0 call Function3786 ret .asm_4e266 xor a ld [wc2c6], a - ld hl, TileMap + hlcoord 0, 0 call Function378b ret @@ -47067,7 +47082,7 @@ Function4e289: ; 4e289 (13:6289) call Function4e307 ld de, $9000 predef Function5108b - ld hl, TileMap + hlcoord 0, 0 ld d, $0 ld e, $2 predef Functiond00a3 @@ -47210,7 +47225,7 @@ EggStatsScreen: ; 4e33a set 5, [hl] call Function32f9 ; pals call DelayFrame - ld hl, TileMap + hlcoord 0, 0 call Function3786 callba Function10402d call Function4e497 @@ -47271,7 +47286,7 @@ Function4e497: ; 4e497 (13:6497) ld de, $9000 predef Function5108b pop de - ld hl, TileMap + hlcoord 0, 0 ld d, $0 predef Functiond00a3 ld hl, wcf64 @@ -47672,7 +47687,7 @@ Function4e755: ; 4e755 xor a ld [hBGMapMode], a hlcoord 7, 2 - ld bc, $0707 + lb bc, 7, 7 ld de, $000d .asm_4e762 push bc @@ -47836,8 +47851,8 @@ Function4e881: ; 4e881 ld bc, $400 ld a, $7f call ByteFill - ld hl, AttrMap - ld bc, $0168 + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill xor a @@ -47869,8 +47884,8 @@ Function4e8c2: ; 4e8c2 ld bc, $400 ld a, $7f call ByteFill - ld hl, AttrMap - ld bc, $0168 + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill ld hl, wd000 @@ -48250,8 +48265,8 @@ WritePartyMenuTilemap: ; 0x5005f set 4, [hl] ; Disable text delay xor a ld [hBGMapMode], a - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " call ByteFill ; blank the tilemap call Function50396 ; This reads from a pointer table??? @@ -48584,8 +48599,7 @@ Function5022f: ; 5022f ld e, a ld d, 0 ld hl, EvosAttacksPointers - add hl, de - add hl, de + add_n_times hl, de, 2 call Function50268 pop hl call PlaceString @@ -48803,8 +48817,7 @@ Function50396: ; 50396 ld e, a ld d, 0 ld hl, Unknown_503b2 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -48977,8 +48990,7 @@ PrintPartyMenuText: ; 5049a ld hl, PartyMenuStrings ld e, a ld d, $0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld d, [hl] ld e, a @@ -49114,8 +49126,7 @@ UnknownText_0x505bc: ; 0x505bc Function505c1: ; 505c1 ld e, a ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -51837,8 +51848,7 @@ DoStep: ; 8025f ld e, a ld d, 0 ld hl, .Steps - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -52257,8 +52267,7 @@ EngineFlagAction:: ; 80430 .read ld hl, EngineFlags ; location - add hl, de - add hl, de + add_n_times hl, de, 2 ; bit add hl, de @@ -52368,7 +52377,7 @@ VarActionTable: ; 80671 dwb wd46c, $00 dwb XCoord, $00 dwb YCoord, $00 - dwb wdc31, $00 + dwb wSpecialPhoneCallID, $00 dwb wcf64, $00 dwb wdca4, $00 dwb wdbf9, $40 @@ -52580,12 +52589,12 @@ Function81948: ; 81948 ld bc, $2000 xor a call ByteFill - ld hl, AttrMap - ld bc, $0168 + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT xor a call ByteFill call ClearSprites @@ -52766,8 +52775,7 @@ Function81a74: ; 81a74 ld e, a ld d, 0 ld hl, Jumptable_81acf - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -52825,8 +52833,8 @@ Jumptable_81acf: ; 81acf Function81adb: ; 81adb xor a ld [hBGMapMode], a - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $6f call ByteFill hlcoord 1, 3 @@ -52900,7 +52908,7 @@ Function81adb: ; 81adb ld [TempEnemyMonSpecies], a ld [$ffad], a hlcoord 2, 3 - ld bc, $0707 + lb bc, 7, 7 predef FillBox .asm_81ba9 @@ -52947,8 +52955,7 @@ Function81bf4: ; 81bf4 inc a ld l, a ld h, $0 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ld de, OverworldMap add hl, de ld de, wc608 @@ -53072,8 +53079,7 @@ Function81cc2: ; 81cc2 ld e, a ld d, 0 ld hl, Jumptable_81d02 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -53399,8 +53405,7 @@ Function81eca: ; 81eca inc a ld l, a ld h, $0 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ld de, OverworldMap add hl, de ld e, l @@ -53446,7 +53451,7 @@ Function81efc: ; 81efc dec c jr nz, .asm_81efe pop hl - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc pop bc dec b @@ -53619,12 +53624,12 @@ TilesetColorTest: call Request2bpp ld a, $9c ld [$ffd7], a - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $6f call ByteFill - ld hl, AttrMap - ld bc, $0168 + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $7 call ByteFill ld de, $0015 @@ -53649,12 +53654,12 @@ TilesetColorTest: ; 821d2 Function821d2: ; 821d2 - ld hl, TileMap + hlcoord 0, 0 call Function821de Function821d8: ; 821d8 ld a, [wcf64] - ld hl, AttrMap + hlcoord 0, 0, AttrMap Function821de: ; 821de add hl, de @@ -53701,9 +53706,7 @@ Function8220f: ; 8220f ld a, [wcf64] ld l, a ld h, $0 - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 3 ld de, Unkn1Pals add hl, de ld de, wc608 @@ -53816,8 +53819,7 @@ Function822f0: ; 822f0 ld e, a ld d, 0 ld hl, Jumptable_82301 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -53859,8 +53861,7 @@ Function82309: ; 82309 ld e, a ld d, $0 ld hl, wc608 - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, l ld d, h call Function81ea5 @@ -53999,8 +54000,7 @@ Function84022: ; 84022 ld e, a ld d, 0 ld hl, Jumptable_84031 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -55021,17 +55021,17 @@ Function846f6: ; 846f6 ; 84728 Function84728: ; 84728 - ld hl, TileMap + hlcoord 0, 0 ld de, wca90 - ld bc, $0168 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyBytes ret ; 84735 Function84735: ; 84735 ld hl, wca90 - ld de, TileMap - ld bc, $0168 + decoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call CopyBytes ret ; 84742 @@ -55105,8 +55105,7 @@ Function84785: ; 84785 ld e, a ld d, 0 ld hl, Unknown_84807 - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -55137,8 +55136,7 @@ Function847bd: ; 847bd ld e, a ld d, 0 ld hl, Unknown_84807 - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -55173,12 +55171,12 @@ Unknown_84807: ; 84807 Function84817: ; 84817 (21:4817) xor a ld [wd002], a - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 ld a, $7f call ByteFill call Function84a0e - ld hl, TileMap + hlcoord 0, 0 ld bc, $b4 ld a, $7f call ByteFill @@ -55208,7 +55206,7 @@ String_84865: ; 8486f Function8486f: ; 8486f (21:486f) - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 ld a, $7f call ByteFill @@ -55225,7 +55223,7 @@ Function8486f: ; 8486f (21:486f) ret Function84893: ; 84893 (21:4893) - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 ld a, $7f call ByteFill @@ -55242,7 +55240,7 @@ Function84893: ; 84893 (21:4893) ret Function848b7: ; 848b7 (21:48b7) - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 ld a, $7f call ByteFill @@ -55402,7 +55400,7 @@ Function849c6: ; 849c6 (21:49c6) ret Function849d7: ; 849d7 (21:49d7) - ld hl, TileMap + hlcoord 0, 0 ld a, $79 ld [hli], a ld a, $7a @@ -55416,7 +55414,7 @@ Function849d7: ; 849d7 (21:49d7) ret Function849e9: ; 849e9 (21:49e9) - ld hl, TileMap + hlcoord 0, 0 ld de, $13 ld c, $12 .asm_849f1 @@ -55472,23 +55470,23 @@ HallOfFame:: ; 0x8640e call Function8648e ld a, [StatusFlags] push af - ld a, $1 + ld a, 1 ld [wc2cd], a call Function2ed3 - ld a, $1 + ld a, 1 ld [wd4b5], a ; Enable the Pokégear map to cycle through all of Kanto ld hl, StatusFlags - set 6, [hl] + set 6, [hl] ; hall of fame callba Function14da0 ld hl, wd95e ld a, [hl] - cp $c8 - jr nc, .asm_86436 ; 0x86433 $1 + cp 200 + jr nc, .ok ; 0x86433 $1 inc [hl] -.asm_86436 +.ok callba Function14b85 call Function8653f callba Function14b5f @@ -55529,14 +55527,14 @@ Function8648e: ; 8648e ld [MusicFadeIDLo], a ld a, MUSIC_NONE / $100 ld [MusicFadeIDHi], a - ld a, $a + ld a, 10 ld [MusicFade], a callba Function8c084 xor a ld [VramState], a ld [$ffde], a callba Function4e881 - ld c, $64 + ld c, 100 jp DelayFrames ; 864b4 @@ -55554,31 +55552,31 @@ Function864c3: ; 864c3 xor a ld [wcf63], a call Function8671c - jr c, .asm_864fb - ld de, $0014 + jr c, .done + ld de, SCREEN_WIDTH call Function864b4 xor a ld [wcf64], a -.asm_864d6 +.loop ld a, [wcf64] - cp $6 - jr nc, .asm_864fb + cp 6 + jr nc, .done ld hl, wc608 + 1 ld bc, $0010 call AddNTimes ld a, [hl] - cp $ff - jr z, .asm_864fb + cp -1 + jr z, .done push hl call Function865b5 pop hl call Function8650c - jr c, .asm_864fb + jr c, .done ld hl, wcf64 inc [hl] - jr .asm_864d6 + jr .loop -.asm_864fb +.done call Function86810 ld a, $4 ld [MusicFade], a @@ -55704,8 +55702,8 @@ Function865b5: ; 865b5 ld [TempMonDVs + 1], a ld hl, TempMonDVs predef GetUnownLetter - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $7f call ByteFill ld de, $9310 @@ -55728,8 +55726,8 @@ Function865b5: ; 865b5 call Function86635 xor a ld [wc2c6], a - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $7f call ByteFill hlcoord 6, 5 @@ -55929,11 +55927,11 @@ Function86748: ; 86748 call CopyBytes ld a, $50 ld [StringBuffer2 + 10], a - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $7f call ByteFill - ld hl, TileMap + hlcoord 0, 0 ld bc, $0312 call TextBox hlcoord 0, 12 @@ -56002,8 +56000,8 @@ Function86810: ; 86810 ld de, FontExtra + $d0 lb bc, BANK(FontExtra), 1 call Request2bpp - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $7f call ByteFill callba GetPlayerBackpic @@ -56026,15 +56024,15 @@ Function86810: ; 86810 call Function86635 xor a ld [wc2c6], a - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $7f call ByteFill callba Function88840 xor a ld [$ffad], a hlcoord 12, 5 - ld bc, $0707 + lb bc, 7, 7 predef FillBox ld a, $c0 ld [hSCX], a @@ -56521,7 +56519,7 @@ MovePlayerPic: ; 88266 push de xor a ld [hBGMapMode], a - ld bc, $0707 + lb bc, 7, 7 predef FillBox xor a ld [hBGMapThird], a @@ -56541,7 +56539,7 @@ MovePlayerPic: ; 88266 ld a, h sbc d ld h, a - ld bc, $0707 + lb bc, 7, 7 call ClearBox pop bc pop hl @@ -56749,7 +56747,7 @@ DrawIntroPlayerPic: ; 88874 xor a ld [$ffad], a hlcoord 6, 4 - ld bc, $0707 + lb bc, 7, 7 predef FillBox ret ; 888a9 @@ -56883,9 +56881,9 @@ Function891ab: ; 891ab Function891b8: ; 891b8 call Function8923c - ld hl, TileMap + hlcoord 0, 0 ld a, $7f - ld bc, $0168 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill call DelayFrame ret @@ -56910,13 +56908,13 @@ Function891d3: ; 891d3 (22:51d3) Function891de: ; 891de call Function8923c call ClearPalettes - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld a, $7 - ld bc, $0168 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill - ld hl, TileMap + hlcoord 0, 0 ld a, $7f - ld bc, $0168 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill call Function891ab ret @@ -57617,8 +57615,8 @@ Palette_895de: ; 895de Function895e6: ; 895e6 ld a, 7 - ld hl, AttrMap - ld bc, $0168 + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill ret ; 895f2 @@ -57626,8 +57624,8 @@ Function895e6: ; 895e6 Function895f2: ; 895f2 push bc xor a - ld hl, AttrMap - ld bc, $0168 + hlcoord 0, 0, AttrMap + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT call ByteFill call Function89605 call Function89655 @@ -57677,7 +57675,7 @@ Function8963d: ; 8963d hlcoord 12, 3, AttrMap ld a, 6 ld de, SCREEN_WIDTH - ld bc, $0707 + lb bc, 7, 7 .loop push hl ld c, 7 @@ -57732,7 +57730,7 @@ Function8967a: ; 8967a (22:567a) ret Function89688: ; 89688 - ld hl, TileMap + hlcoord 0, 0 ld a, 1 ld e, SCREEN_WIDTH call Function896e1 @@ -57867,7 +57865,7 @@ Function8971f: ; 8971f ld a, $2d ld [hld], a push hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de ld a, $31 ld [hli], a @@ -57891,7 +57889,7 @@ Function89736: ; 89736 ld [hli], a ld a, $30 ld [hld], a - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de ld a, $33 ld [hli], a @@ -57967,7 +57965,7 @@ Function89797: ; 89797 push bc ld a, $e ld [hl], a - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld a, $11 ld [hli], a @@ -58010,8 +58008,8 @@ Function897d5: ; 897d5 jr nc, .asm_897f3 hlcoord 12, 3, AttrMap xor a - ld de, $0014 - ld bc, $0707 + ld de, SCREEN_WIDTH + lb bc, 7, 7 .asm_897e5 push hl ld c, $7 @@ -58030,7 +58028,7 @@ Function897d5: ; 897d5 ld a, $37 ld [$ffad], a hlcoord 12, 3 - ld bc, $0707 + lb bc, 7, 7 predef FillBox call Function8963d pop bc @@ -58244,7 +58242,7 @@ Unknown_8994a: ; 8994a Function8994e: ; 8994e push hl push de - ld de, $0014 + ld de, SCREEN_WIDTH ld a, l sub e ld l, a @@ -59482,7 +59480,7 @@ Function8a0c1: ; 8a0c1 (22:60c1) Function8a0c9: ; 8a0c9 (22:60c9) push bc - ld hl, TileMap + hlcoord 0, 0 ld de, $14 ld a, b and a @@ -61338,8 +61336,7 @@ Function8ae68: ; 8ae68 inc hl ld d, $0 ld e, $14 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [ScriptVar] ld c, a ld de, Unknown_8aebc @@ -62821,7 +62818,7 @@ Palette_8b6d5: ; 8b6d5 ; 8b6ed Function8b6ed: ; 8b6ed - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $012c xor a call ByteFill @@ -62844,7 +62841,7 @@ Function8b703: ; 8b703 pop hl push hl push bc - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de .asm_8b717 push hl @@ -62855,7 +62852,7 @@ Function8b703: ; 8b703 ld a, $11 ld [hl], a pop hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de dec b jr nz, .asm_8b717 @@ -62900,7 +62897,7 @@ Function8b744: ; 8b744 dec c jr nz, .asm_8b74f pop hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de pop bc dec b @@ -62910,9 +62907,9 @@ Function8b744: ; 8b744 Function8b75d: ; 8b75d call Function8923c - ld hl, TileMap + hlcoord 0, 0 ld a, $1 - ld bc, $0014 + ld bc, SCREEN_WIDTH call ByteFill hlcoord 0, 1 ld a, $2 @@ -63588,8 +63585,7 @@ GetTimePalette: ; 8c117 ld e, a ld d, 0 ld hl, .TimePalettes - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -63898,8 +63894,7 @@ Function8c314: ; 8c314 ld e, a ld d, 0 ld hl, Jumptable_8c323 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -64108,13 +64103,9 @@ Function8c44f: ; 8c44f (23:444f) ld e, a ld d, 0 ld hl, Unknown_8c490 - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 5 ld a, [hli] - cp $ff + cp -1 jr z, .asm_8c47a ld [wcf65], a call Function8c4f5 @@ -64296,7 +64287,7 @@ Function8c5dc: ; 8c5dc (23:45dc) jp z, Function8c673 xor a ld [hBGMapMode], a ; $ff00+$d4 - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $168 inc b inc c @@ -64486,8 +64477,7 @@ Function8c70c: ; 8c70c (23:470c) ld a, d ld d, 0 ld hl, Unknown_8c728 - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -64677,7 +64667,7 @@ Function8c913: ; 8c913 ld a, $5 ld [hli], a ld [hld], a - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hli], a ld [hld], a @@ -64743,8 +64733,7 @@ Function8ca0c: ; 8ca0c ld e, a ld d, 0 ld hl, Jumptable_8ca1b - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -64842,8 +64831,7 @@ Function8ca8e: ; 8ca8e (23:4a8e) add e ld e, a ld hl, Unknown_8cab3 - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -65247,8 +65235,7 @@ GetMagnetTrainBGTiles: ; 8cd74 ld e, a ld d, 0 ld hl, MagnetTrainBGTiles - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -65331,8 +65318,7 @@ Function8cdf7: ; 8cdf7 ld e, a ld d, 0 ld hl, Jumptable_8ce06 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -65645,9 +65631,7 @@ Function8cfd6:: ; 8cfd6 ld e, a ld d, 0 ld hl, Unknown_8d1c4 - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ld e, l ld d, h ld hl, $0000 @@ -65963,8 +65947,7 @@ Function8d189: ; 8d189 ld e, [hl] ld d, 0 ld hl, Unknown_8d6e6 - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -65981,9 +65964,7 @@ Function8d1a2: ; 8d1a2 ld e, a ld d, 0 ld hl, Unknown_8d94d - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ret ; 8d1ac @@ -65991,8 +65972,7 @@ Function8d1ac: ; 8d1ac push hl ld l, a ld h, 0 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ld de, Unknown_8e706 add hl, de ld c, [hl] @@ -66064,8 +66044,7 @@ Function8d24b: ; 8d24b ld e, [hl] ld d, 0 ld hl, Jumptable_8d25b - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -68259,8 +68238,7 @@ Function8e741: ; 8e741 ld a, d ld d, 0 ld hl, Unknown_8e75d - add hl, de - add hl, de + add_n_times hl, de, 2 ld e, [hl] inc hl ld d, [hl] @@ -68399,8 +68377,7 @@ Function8e83f: ; 8e83f Function8e849: ; 8e849 ld d, 0 ld hl, Jumptable_8e854 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -68690,10 +68667,7 @@ GetIcon: ; 8ea1e ; Load icon graphics into VRAM starting from tile hl. ; One tile is 16 bytes long. - add hl, hl - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 4 ld de, VTiles0 add hl, de @@ -69061,7 +69035,7 @@ Function900de: ; 900de (24:40de) ret Function90136:: ; 90136 (24:4136) - ld a, [wdc31] + ld a, [wSpecialPhoneCallID] and a jr z, .asm_90171 dec a @@ -69108,7 +69082,7 @@ UnknownScript_0x90173: ; 0x90173 ; 0x90178 Function90178: ; 90178 (24:4178) - ld a, [wdc31] + ld a, [wSpecialPhoneCallID] dec a ld c, a ld b, 0 @@ -69434,7 +69408,7 @@ Function90363: ; 90363 (24:4363) Phone_CallerTextbox: ; 90375 - ld hl, TileMap + hlcoord 0, 0 ld b, $2 ld c, $12 call TextBox @@ -69794,7 +69768,7 @@ Function90672: ; 90672 (24:4672) Function90783: ; 90783 (24:4783) xor a ld [hBGMapMode], a ; $ff00+$d4 - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 xor a call ByteFill @@ -70193,8 +70167,7 @@ Function909de: ; 909de ld e, a ld d, 0 ld hl, Unknown_909f2 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld d, [hl] ld e, a @@ -70671,7 +70644,7 @@ Function90d9e: ; 90d9e (24:4d9e) Function90da8: ; 90da8 (24:4da8) xor a ld [hBGMapMode], a - ld hl, TileMap + hlcoord 0, 0 ld bc, TileMapEnd - TileMap ld a, $4f call ByteFill @@ -70821,7 +70794,7 @@ Function90e98: ; 90e98 (24:4e98) ret Function90eb0: ; 90eb0 (24:4eb0) - ld hl, TileMap + hlcoord 0, 0 ld bc, $8 ld a, $4f call ByteFill @@ -70839,7 +70812,7 @@ Function90eb0: ; 90eb0 (24:4eb0) ld a, [de] bit 1, a call nz, Function90ef2 - ld hl, TileMap + hlcoord 0, 0 ld a, $46 call Function90ef7 ret @@ -70875,8 +70848,7 @@ Function90f04: ; 90f04 (24:4f04) ld e, a ld d, 0 ld hl, Jumptable_90f13 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -71662,8 +71634,7 @@ Function91342: ; 91342 (24:5342) ld a, [wc6d4] ld e, a ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -71809,7 +71780,7 @@ Function914ab: ; 914ab (24:54ab) ret Function914bb: ; 914bb (24:54bb) - ld hl, TileMap + hlcoord 0, 0 .asm_914be ld a, [de] cp $ff @@ -72421,7 +72392,7 @@ Function91a04: ; 91a04 ld bc, $0006 hlcoord 1, 0 call ByteFill - ld hl, TileMap + hlcoord 0, 0 ld [hl], $6 hlcoord 7, 0 ld [hl], $17 @@ -72479,8 +72450,7 @@ Function91a87: ; 91a87 ld [EnemyTurnsTaken], a ld hl, Jumptable_91ab9 ld d, $0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -72666,7 +72636,7 @@ TownMapBubble: ; 91bb5 ; Draw the bubble containing the location text in the town map HUD ; Top-left corner - ld hl, TileMap + 1 ; (1,0) + hlcoord 1, 0 ld a, $30 ld [hli], a @@ -72678,7 +72648,7 @@ TownMapBubble: ; 91bb5 ; Top-right corner ld a, $31 ld [hl], a - ld hl, TileMap + 1 + 20 ; (1,1) + hlcoord 1, 1 ; Middle row @@ -72688,7 +72658,7 @@ TownMapBubble: ; 91bb5 ; Bottom-left corner - ld hl, TileMap + 1 + 40 ; (1,2) + hlcoord 1, 2 ld a, $32 ld [hli], a @@ -72703,7 +72673,7 @@ TownMapBubble: ; 91bb5 ; Print "Where?" - ld hl, TileMap + 2 ; (2,0) + hlcoord 2, 0 ld de, .Where call PlaceString @@ -72711,7 +72681,7 @@ TownMapBubble: ; 91bb5 call .Name ; Up/down arrows - ld hl, TileMap + 18 + 20 ; (18,1) + hlcoord 18, 1 ld [hl], $34 ret @@ -72730,7 +72700,7 @@ TownMapBubble: ; 91bb5 callba GetLandmarkName - ld hl, TileMap + 2 + 20 ; (2,1) + hlcoord 2, 1 ld de, StringBuffer1 call PlaceString ret @@ -73066,7 +73036,7 @@ Function91dcd: ; 91dcd ret .asm_91ddc - ld hl, TileMap + hlcoord 0, 0 ld de, Sprites ld bc, $00a0 call CopyBytes @@ -73074,14 +73044,14 @@ Function91dcd: ; 91dcd ; 91de9 Function91de9: ; 91de9 - ld hl, TileMap - ld bc, $0014 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH ld a, $7f call ByteFill hlcoord 0, 1 ld a, $6 ld [hli], a - ld bc, $0012 + ld bc, SCREEN_HEIGHT ld a, $7 call ByteFill ld [hl], $17 @@ -73103,7 +73073,7 @@ Function91e1e: ; 91e1e ld [wd003], a ld e, a callba Function2a01f - ld de, TileMap + decoord 0, 0 ld hl, Sprites .asm_91e2e ld a, [de] @@ -73130,7 +73100,7 @@ Function91e1e: ; 91e1e .asm_91e4d ld hl, Sprites - ld de, TileMap + decoord 0, 0 ld bc, $00a0 call CopyBytes ret @@ -73280,7 +73250,7 @@ FillKantoMap: ; 91f04 ld de, KantoMap FillTownMap: ; 91f07 - ld hl, TileMap + hlcoord 0, 0 .loop ld a, [de] cp $ff @@ -73294,8 +73264,8 @@ FillTownMap: ; 91f07 TownMapPals: ; 91f13 ; Assign palettes based on tile ids - ld hl, TileMap - ld de, AttrMap + hlcoord 0, 0 + decoord 0, 0, AttrMap ld bc, 360 .loop ; Current tile @@ -73651,7 +73621,7 @@ Function926f7: ; 926f7 (24:66f7) ld de, $9250 call Decompress ld hl, SlotsTilemap - ld de, TileMap + decoord 0, 0 ld bc, 20 * 12 call CopyBytes ld hl, rLCDC ; $ff40 @@ -73795,8 +73765,7 @@ Function92844: ; 92844 (24:6844) ld e, a ld d, 0 ld hl, Jumptable_92853 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -74373,8 +74342,7 @@ Function92bd4: ; 92bd4 (24:6bd4) ld e, [hl] ld d, 0 ld hl, Jumptable_92be4 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -74873,8 +74841,7 @@ Function92e94: ; 92e94 ld e, a ld d, 0 ld hl, Jumptable_92ebd - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -74975,8 +74942,7 @@ Function92f1d: ; 92f1d ld e, a ld d, 0 ld hl, Jumptable_92f48 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -75383,9 +75349,7 @@ Function93158: ; 93158 (24:7158) ld e, a ld d, 0 ld hl, Unknown_93195 - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ld de, StringBuffer2 ld bc, $4 call CopyBytes @@ -75496,8 +75460,7 @@ Function9321d: ; 9321d (24:721d) ld e, [hl] ld d, 0 ld hl, Jumptable_9322d - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -75593,8 +75556,7 @@ Function932ac: ; 932ac (24:72ac) ld e, [hl] ld d, 0 ld hl, Jumptable_932bc - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -75876,7 +75838,7 @@ Functionb80c6: ; b80c6 ; b80d3 Functionb80d3: ; b80d3 - ld hl, TileMap + hlcoord 0, 0 ld b, $2 ld c, $12 call Functionb8115 @@ -75934,7 +75896,7 @@ Functionb8115: ; b8115 dec c jr nz, .asm_b8121 pop hl - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de pop bc dec b @@ -75943,7 +75905,7 @@ Functionb8115: ; b8115 ; b812f Functionb812f: ; b812f - ld hl, TileMap + hlcoord 0, 0 ld a, $61 ld [hli], a ld a, $62 @@ -76230,8 +76192,7 @@ GetTreeMons: ; b82d2 ld e, a ld d, 0 ld hl, TreeMons - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] @@ -76588,8 +76549,7 @@ PlayRadioShow: ; b8612 ld e, a ld d, 0 ld hl, Jumptable_b863a - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -76818,8 +76778,7 @@ Functionb8762: ; b8762 (2e:4762) jr nc, .loop2 ld e, a ld d, 0 - add hl, de - add hl, de + add_n_times hl, de, 2 inc hl ld a, BANK(WildMons1) call GetFarByte @@ -76932,8 +76891,7 @@ Functionb8854: ; b8854 (2e:4854) ld e, a ld d, 0 ld hl, Unknown_b8869 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -77062,8 +77020,7 @@ Functionb88d9: ; b88d9 (2e:48d9) ld e, a ld d, 0 ld hl, Unknown_b88fe - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -77826,13 +77783,13 @@ Functionb8cf2: ; b8cf2 (2e:4cf2) ld hl, Unknown_b8d3e ld a, [StatusFlags] bit 6, a - jr z, .asm_b8d14 + jr z, .NotMet ld hl, Unknown_b8d43 ld a, [KantoBadges] cp %11111111 - jr nz, .asm_b8d14 + jr nz, .NotMet ld hl, Unknown_b8d4b -.asm_b8d14 +.NotMet pop af ld c, a ld de, $1 @@ -77870,8 +77827,7 @@ Functionb8d56: ; b8d56 (2e:4d56) ld e, a ld d, 0 ld hl, Unknown_b8d7d - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -78047,8 +78003,7 @@ Functionb8e28: ; b8e28 (2e:4e28) ld e, a ld d, 0 ld hl, Unknown_b8e52 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -78287,8 +78242,7 @@ Functionb8f8f: ; b8f8f ld hl, Unknown_b8ff9 ld d, 0 ld e, a - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -78302,8 +78256,7 @@ Functionb8f8f: ; b8f8f push hl ld hl, Jumptable_b8fb8 ld e, b - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -78919,7 +78872,7 @@ Functionb93d2: ; b93d2 ld c, $8 call Functionb9915 ld a, $31 - ld hl, TileMap + hlcoord 0, 0 call Functionb98a8 hlcoord 1, 17 call Functionb98a8 @@ -79108,7 +79061,7 @@ Functionb9582: ; b9582 ld c, $8 call Functionb990c ld a, $31 - ld hl, TileMap + hlcoord 0, 0 call Functionb98dc hlcoord 0, 1 call Functionb98e3 @@ -79270,7 +79223,7 @@ Functionb9710: ; b9710 ld c, $8 call Functionb990c ld a, $31 - ld hl, TileMap + hlcoord 0, 0 call Functionb98a8 hlcoord 1, 17 call Functionb98a8 @@ -79410,7 +79363,7 @@ Functionb984e: ; b984e ; b9858 Functionb9858: ; b9858 - ld hl, TileMap + hlcoord 0, 0 ld a, $31 ld [hli], a inc a @@ -79432,7 +79385,7 @@ Functionb9858: ; b9858 ; b987b Functionb987b: ; b987b - ld hl, TileMap + hlcoord 0, 0 ld a, $31 ld [hli], a inc a @@ -79489,7 +79442,7 @@ Functionb98ba: ; b98ba Functionb98bd: ; b98bd ld [hl], a - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de inc a ld [hl], a @@ -79530,7 +79483,7 @@ Functionb98de: ; b98de Functionb98e3: ; b98e3 ld b, $10 - ld de, $0014 + ld de, SCREEN_WIDTH .asm_b98e8 ld [hl], a add hl, de @@ -79560,7 +79513,7 @@ Functionb98fc: ; b98fc ld [hli], a inc a ld [hl], a - ld bc, $0012 + ld bc, SCREEN_HEIGHT add hl, bc inc a ld [hli], a @@ -80213,8 +80166,7 @@ Functione0191: ; e0191 (38:4191) ld e, a ld d, 0 ld hl, Jumptable_e01a0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -80304,11 +80256,11 @@ UnknownText_0xe0212: ; 0xe0212 Functione0217: ; e0217 xor a ld [hBGMapMode], a - ld hl, TileMap + hlcoord 0, 0 ld bc, $0c09 call Functione04e5 hlcoord 9, 0 - ld bc, $0014 + ld bc, SCREEN_WIDTH ld a, [wc6e8] call AddNTimes ld [hl], $f5 @@ -80416,8 +80368,7 @@ Functione02da: ; e02da ld e, a ld d, $0 ld hl, wc6d0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [wcf66] ld e, a add hl, de @@ -80578,8 +80529,7 @@ Functione03ec: ; e03ec ld e, a ld d, 0 ld hl, Unknown_e0459 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld e, a ld d, [hl] @@ -80587,10 +80537,10 @@ Functione03ec: ; e03ec ld bc, $0017 add hl, bc ld [hl], e - ld bc, $0012 + ld bc, SCREEN_HEIGHT add hl, bc ld a, d - ld de, $0014 + ld de, SCREEN_WIDTH ld b, $3 .asm_e0418 push hl @@ -80670,7 +80620,7 @@ String_e04bc: Functione04c1: ; e04c1 (38:44c1) xor a ld [hBGMapMode], a ; $ff00+$d4 - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 ld a, $29 call ByteFill @@ -80799,7 +80749,7 @@ Functione055f: ; e055f add hl, bc add hl, bc ld [hl], $36 - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $37 ret @@ -80809,7 +80759,7 @@ Functione055f: ; e055f add hl, bc add hl, bc ld [hl], $36 - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $3d ret @@ -80825,7 +80775,7 @@ Functione0583: ; e0583 add hl, bc add hl, bc ld [hl], $3b - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $3a ret @@ -80835,7 +80785,7 @@ Functione0583: ; e0583 add hl, bc add hl, bc ld [hl], $3d - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $3a ret @@ -80851,7 +80801,7 @@ Functione05a7: ; e05a7 add hl, bc add hl, bc ld [hl], $36 - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $38 ret @@ -80861,7 +80811,7 @@ Functione05a7: ; e05a7 add hl, bc add hl, bc ld [hl], $36 - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $3d ret @@ -80877,7 +80827,7 @@ Functione05cb: ; e05cb add hl, bc add hl, bc ld [hl], $3c - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $3a ret @@ -80887,7 +80837,7 @@ Functione05cb: ; e05cb add hl, bc add hl, bc ld [hl], $3d - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $3a ret @@ -80903,7 +80853,7 @@ Functione05ef: ; e05ef add hl, bc add hl, bc ld [hl], $36 - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $39 ret @@ -80913,7 +80863,7 @@ Functione05ef: ; e05ef add hl, bc add hl, bc ld [hl], $36 - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $3d ret @@ -80929,7 +80879,7 @@ Functione0613: ; e0613 add hl, bc add hl, bc ld [hl], $3c - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $3a ret @@ -80939,7 +80889,7 @@ Functione0613: ; e0613 add hl, bc add hl, bc ld [hl], $3d - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hl], $3a ret @@ -81500,8 +81450,7 @@ Functione0960: ; e0960 .asm_e096d call Functione0398 - add hl, hl - add hl, hl + add_n_times hl, hl, 2 ld de, Unknown_e0981 add hl, de ld a, [hli] @@ -81720,7 +81669,7 @@ Functione0c37: ; e0c37 (38:4c37) ld a, [hCGB] ; $ff00+$e6 and a ret z - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $168 xor a call ByteFill @@ -81857,8 +81806,8 @@ Functione1190: ; e1190 ld de, $8ed0 call Decompress call Functione17a3 - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $ee call ByteFill hlcoord 4, 3 @@ -82002,8 +81951,7 @@ Functione12ca: ; e12ca ld e, a ld d, 0 ld hl, Jumptable_e12d9 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -82183,7 +82131,7 @@ Functione13e4: ; e13e4 ; e13ee Functione13ee: ; e13ee - ld de, $0014 + ld de, SCREEN_WIDTH .asm_e13f1 push bc push hl @@ -82233,7 +82181,7 @@ Functione141f: ; e141f push hl call Functione1481 pop hl - ld de, $0014 + ld de, SCREEN_WIDTH ld b, $3 .asm_e1431 ld c, $3 @@ -82262,7 +82210,7 @@ Functione1441: ; e1441 call Functione1463 ld a, [hl] pop hl - ld de, $0014 + ld de, SCREEN_WIDTH ld b, $3 .asm_e1456 ld c, $3 @@ -82285,12 +82233,8 @@ Functione1463: ; e1463 add hl, de ld a, [wcf65] ld e, a - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 4 + add_n_times hl, de, 2 ret ; e1475 @@ -82650,8 +82594,7 @@ Functione17a3: ; e17a3 ld e, a ld d, 0 ld hl, Unknown_e17bd - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -82711,7 +82654,7 @@ Functione1e67: ; e1e67 (38:5e67) ld hl, wc300 ld [hli], a ld [hl], $0 - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 xor a call ByteFill @@ -82748,8 +82691,7 @@ Functione1ed2: ; e1ed2 (38:5ed2) ld e, a ld d, 0 ld hl, Jumptable_e1ee1 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -83107,9 +83049,7 @@ Functione2101: ; e2101 dec a ld l, a ld h, 0 - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 3 ld de, Unknown_e2110 add hl, de ret @@ -83130,7 +83070,7 @@ Functione2128: ; e2128 inc a ld [hld], a inc a - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hli], a inc a @@ -83144,7 +83084,7 @@ Functione2142: ; e2142 ld a, $1 ld [hli], a ld [hld], a - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc ld [hli], a ld [hl], a @@ -83154,11 +83094,11 @@ Functione2142: ; e2142 ; e2152 Functione2152: ; e2152 - ld hl, TileMap - ld bc, $0168 + hlcoord 0, 0 + ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, $1 call ByteFill - ld hl, TileMap + hlcoord 0, 0 ld de, String_e2177 call PlaceString hlcoord 15, 0 @@ -83437,8 +83377,7 @@ Functione247d: ; e247d (38:647d) ld e, a ld d, 0 ld hl, BillsPCDepositJumptable - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -83541,7 +83480,7 @@ BillsPCDepositMenuData: ; 0xe2545 (38:6545) ; 0xe2564 (38:6564) Functione2564: ; e2564 - ld hl, TileMap + hlcoord 0, 0 ld b, $4 ld c, $8 call ClearBox @@ -83701,8 +83640,7 @@ Functione2675: ; e2675 (38:6675) ld e, a ld d, 0 ld hl, BillsPCWithdrawJumptable - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -83962,8 +83900,7 @@ Functione285d: ; e285d ld e, a ld d, 0 ld hl, Jumptable_e2881 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -84450,9 +84387,7 @@ Functione2b6d: ; e2b6d (38:6b6d) ld e, a ld d, $0 ld hl, wc801 - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ld a, [hl] and a jr z, .asm_e2bc6 @@ -84559,9 +84494,7 @@ Functione2c2c: ; e2c2c (38:6c2c) ld e, a ld d, 0 ld hl, OverworldMap - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ld e, l ld d, h hlcoord 9, 4 @@ -84816,9 +84749,7 @@ Functione2def: ; e2def (38:6def) ld e, a ld d, $0 ld hl, OverworldMap - add hl, de - add hl, de - add hl, de + add_n_times hl, de, 3 ld a, [hl] ret @@ -84931,7 +84862,7 @@ Functione2ed5: ; e2ed5 dec c jr nz, .asm_e2ed7 pop hl - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc pop bc dec b @@ -85157,7 +85088,7 @@ Functione307c: ; e307c (38:707c) callba Functione039 ld a, [CurPartySpecies] call PlayCry - ld hl, TileMap + hlcoord 0, 0 ld bc, $f08 call ClearBox hlcoord 8, 14 @@ -85211,7 +85142,7 @@ Functione30fa: ; e30fa (38:70fa) callba Functione039 ld a, [CurPartySpecies] call PlayCry - ld hl, TileMap + hlcoord 0, 0 ld bc, $f08 call ClearBox hlcoord 8, 14 @@ -85246,7 +85177,7 @@ Functione30fa: ; e30fa (38:70fa) ret Functione3180: ; e3180 (38:7180) - ld hl, TileMap + hlcoord 0, 0 ld bc, $f08 call ClearBox hlcoord 8, 14 @@ -85569,8 +85500,7 @@ Functione33d0: ; e33d0 (38:73d0) Functione33df: ; e33df (38:73df) ld e, a ld d, $0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -85648,7 +85578,7 @@ Functione35aa: ; e35aa (38:75aa) Functione35e2: ; e35e2 (38:75e2) xor a ld [hBGMapMode], a ; $ff00+$d4 - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 ld a, $7f call ByteFill @@ -85789,7 +85719,7 @@ Unknown_e36a5: ; e36a5 ; e36cf Functione36cf: ; e36cf (38:76cf) - ld hl, TileMap + hlcoord 0, 0 ld b, $2 ld c, $12 call TextBox @@ -85953,7 +85883,7 @@ _OptionsMenu: ; e41d0 push af ld [hl], $1 call WhiteBGMap - ld hl, TileMap + hlcoord 0, 0 ld b, $10 ld c, $12 call TextBox @@ -86031,8 +85961,7 @@ GetOptionPointer: ; e42d6 ld e, a ;copy it to de ld d, 0 ld hl, .Pointers - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -86512,7 +86441,7 @@ OptionsControl: ; e452a Functione455c: ; e455c hlcoord 1, 1 - ld de, $0014 + ld de, SCREEN_WIDTH ld c, $10 .asm_e4564 ld [hl], $7f @@ -86644,8 +86573,7 @@ Functione4670: ; e4670 ld e, a ld d, 0 ld hl, Jumptable_e467f - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -86742,8 +86670,7 @@ Functione46ed: ; e46ed (39:46ed) ld e, [hl] ld d, 0 ld hl, Jumptable_e46fd - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -86839,8 +86766,7 @@ Functione4776: ; e4776 (39:4776) ld e, a ld d, $0 ld hl, Unknown_e47ac - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [rSVBK] ; $ff00+$70 push af ld a, $5 @@ -86954,8 +86880,7 @@ Functione490f: ; e490f ld e, a ld d, 0 ld hl, IntroScenes - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld h, [hl] ld l, a @@ -87324,7 +87249,7 @@ IntroScene9: ; e4c04 (39:4c04) xor a ld [hLCDStatCustom], a ; $ff00+$c6 call ClearSprites - ld hl, AttrMap + hlcoord 0, 0, AttrMap ld bc, $f0 ld a, $1 call ByteFill @@ -88386,7 +88311,7 @@ Functione541b: ; e541b (39:541b) ld a, $6 ld [rSVBK], a ; $ff00+$70 ld hl, Unkn1Pals - ld de, TileMap + decoord 0, 0 ld b, $12 .asm_e542a ld c, $14 @@ -88421,7 +88346,7 @@ Functione5441: ; e5441 (39:5441) ret Functione5451: ; e5451 (39:5451) - ld hl, TileMap + hlcoord 0, 0 ld bc, $168 .asm_e5457 ld a, [hl] @@ -89405,7 +89330,7 @@ Functionfb634: ; fb634 pop de inc de pop hl - ld bc, $0014 + ld bc, SCREEN_WIDTH add hl, bc pop bc inc c @@ -89986,8 +89911,7 @@ Functionfba2e: ; fba2e (3e:7a2e) ld e, a ld d, 0 ld hl, UnownWords - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [hli] ld e, a ld d, [hl] @@ -90759,8 +90683,7 @@ GetTradeAttribute: ; 0xfcdc2 ld e, a ld d, 0 ld hl, NPCTrades - add hl, de - add hl, de + add_n_times hl, de, 2 pop de add hl, de ret @@ -91079,7 +91002,7 @@ Functionfcfec:: ; fcfec ret nz xor a ld [wdc18], a - call Functionfd044 + call CheckBalance_MomItem2 ret nc call Functionfd0c3 ret nc @@ -91096,23 +91019,23 @@ UnknownScript_0xfd00f: ; 0xfd00f ; 0xfd017 Functionfd017: ; fd017 - call Functionfd0a6 + call MomBuysItem_DeductFunds call Functionfd0eb ld a, [wdc18] and a - jr nz, .asm_fd027 + jr nz, .ok ld hl, wdc17 inc [hl] -.asm_fd027 - ld a, $1 +.ok + ld a, 1 ld [wdbf9], a ld bc, wd03f - ld hl, $0 + ld hl, 0 add hl, bc - ld [hl], $0 + ld [hl], 0 inc hl - ld [hl], $1 - ld hl, $9 + ld [hl], 1 + ld hl, 9 add hl, bc ld a, $3f ld [hli], a @@ -91123,50 +91046,50 @@ Functionfd017: ; fd017 ret ; fd044 -Functionfd044: ; fd044 +CheckBalance_MomItem2: ; fd044 ld a, [wdc17] - cp $a - jr nc, .asm_fd065 - call Functionfd117 + cp 10 + jr nc, .nope + call GetItemFromMom ld a, [hli] - ld [$ffc3], a + ld [hMoneyTemp], a ld a, [hli] ld [$ffc4], a ld a, [hli] ld [$ffc5], a ld de, wd851 - ld bc, $ffc3 + ld bc, hMoneyTemp callba CheckMoney - jr nc, .asm_fd067 + jr nc, .have_enough_money -.asm_fd065 - jr .asm_fd069 +.nope + jr .check_have_2300 -.asm_fd067 +.have_enough_money scf ret -.asm_fd069 - ld hl, $ffc3 - ld [hl], $0 +.check_have_2300 + ld hl, hMoneyTemp + ld [hl], (2300 / $10000) ; $00 inc hl - ld [hl], $8 + ld [hl], ((2300 % $10000) / $100) ; $08 inc hl - ld [hl], $fc -.asm_fd074 + ld [hl], (2300 % $100) ; $fc +.loop ld de, wdc19 ld bc, wd851 callba CheckMoney - jr z, .asm_fd08b - jr nc, .asm_fd089 + jr z, .exact + jr nc, .less_than call Functionfd099 - jr .asm_fd074 + jr .loop -.asm_fd089 +.less_than xor a ret -.asm_fd08b +.exact call Functionfd099 ld a, 5 call RandomRange @@ -91178,43 +91101,43 @@ Functionfd044: ; fd044 Functionfd099: ; fd099 ld de, wdc19 - ld bc, $ffc3 + ld bc, hMoneyTemp callba Function16053 ret ; fd0a6 -Functionfd0a6: ; fd0a6 (3f:50a6) - call Functionfd117 - ld de, $3 +MomBuysItem_DeductFunds: ; fd0a6 (3f:50a6) + call GetItemFromMom + ld de, 3 add hl, de ld a, [hli] - ld [$ffc3], a + ld [hMoneyTemp], a ld a, [hli] ld [$ffc4], a ld a, [hli] ld [$ffc5], a ld de, wd851 - ld bc, $ffc3 + ld bc, hMoneyTemp callba TakeMoney ret Functionfd0c3: ; fd0c3 - call Functionfd117 - ld de, $0006 + call GetItemFromMom + ld de, 6 add hl, de ld a, [hli] - cp $1 - jr z, .asm_fd0db + cp 1 + jr z, .not_doll ld a, [hl] ld c, a - ld b, $1 + ld b, 1 callba Function26ef1 scf ret -.asm_fd0db +.not_doll ld a, [hl] ld [CurItem], a ld a, $1 @@ -91226,115 +91149,121 @@ Functionfd0c3: ; fd0c3 Functionfd0eb: ; fd0eb (3f:50eb) - call Functionfd117 - ld de, $6 + call GetItemFromMom + ld de, 6 ; field add hl, de ld a, [hli] - ld de, UnknownScript_0xfd0fd - cp $1 + ld de, Script_MomBoughtItem + cp 1 ret z - ld de, UnknownScript_0xfd10a + ld de, Script_MomBoughtDoll ret ; fd0fd (3f:50fd) -UnknownScript_0xfd0fd: ; 0xfd0fd - writetext UnknownText_0xfd1b1 - writetext UnknownText_0xfd1b6 - writetext UnknownText_0xfd1bb - writetext UnknownText_0xfd1c0 +Script_MomBoughtItem: ; 0xfd0fd + writetext _MomText_HiHowAreYou + writetext _MomText_FoundAnItem + writetext _MomText_BoughtWithYourMoney + writetext _MomText_ItsInPC end ; 0xfd10a -UnknownScript_0xfd10a: ; 0xfd10a - writetext UnknownText_0xfd1b1 - writetext UnknownText_0xfd1c5 - writetext UnknownText_0xfd1bb - writetext UnknownText_0xfd1ca +Script_MomBoughtDoll: ; 0xfd10a + writetext _MomText_HiHowAreYou + writetext _MomText_FoundADoll + writetext _MomText_BoughtWithYourMoney + writetext _MomText_ItsInRoom end ; 0xfd117 -Functionfd117: ; fd117 +GetItemFromMom: ; fd117 ld a, [wdc18] and a - jr z, .asm_fd123 + jr z, .zero dec a - ld de, Unknown_fd136 - jr .asm_fd12e + ld de, MomItems_1 + jr .continue -.asm_fd123 +.zero ld a, [wdc17] - cp $a - jr c, .asm_fd12b + cp 10 ; length of MomItems_2 + jr c, .ok xor a -.asm_fd12b - ld de, Unknown_fd15e +.ok + ld de, MomItems_2 -.asm_fd12e +.continue ld l, a ld h, 0 - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 3 ; multiply hl by 8 add hl, de ret ; fd136 -Unknown_fd136: ; fd136 - db $00, $00, $00, $00, $02, $58, $01, SUPER_POTION - db $00, $00, $00, $00, $00, $5a, $01, ANTIDOTE - db $00, $00, $00, $00, $00, $b4, $01, POKE_BALL - db $00, $00, $00, $00, $01, $c2, $01, ESCAPE_ROPE - db $00, $00, $00, $00, $01, $f4, $01, GREAT_BALL +momitem: macro +; money to trigger, cost, kind, item + dt \1 + dt \2 + db \3, \4 +ENDM + + +MomItems_1: ; fd136 + momitem 0, 600, MOM_ITEM, SUPER_POTION + momitem 0, 90, MOM_ITEM, ANTIDOTE + momitem 0, 180, MOM_ITEM, POKE_BALL + momitem 0, 450, MOM_ITEM, ESCAPE_ROPE + momitem 0, 500, MOM_ITEM, GREAT_BALL ; fd15e -Unknown_fd15e: ; fd15e - db $00, $03, $84, $00, $02, $58, $01, SUPER_POTION - db $00, $0f, $a0, $00, $01, $0e, $01, REPEL - db $00, $1b, $58, $00, $02, $58, $01, SUPER_POTION - db $00, $27, $10, $00, $07, $08, $02, $23 ; CHARMANDER_DOLL - db $00, $3a, $98, $00, $0b, $b8, $01, MOON_STONE - db $00, $4a, $38, $00, $02, $58, $01, SUPER_POTION - db $00, $75, $30, $00, $12, $c0, $02, $20 ; CLEFAIRY_DOLL - db $00, $9c, $40, $00, $03, $84, $01, HYPER_POTION - db $00, $c3, $50, $00, $1f, $40, $02, $1e ; PIKACHU_DOLL - db $01, $86, $a0, $00, $59, $10, $02, $1a ; SNORLAX_DOLL +MomItems_2: ; fd15e + momitem 900, 600, MOM_ITEM, SUPER_POTION + momitem 4000, 270, MOM_ITEM, REPEL + momitem 7000, 600, MOM_ITEM, SUPER_POTION + momitem 10000, 1800, MOM_DOLL, DOLL_CHARMANDER + momitem 15000, 3000, MOM_ITEM, MOON_STONE + momitem 19000, 600, MOM_ITEM, SUPER_POTION + momitem 30000, 4800, MOM_DOLL, DOLL_CLEFAIRY + momitem 40000, 900, MOM_ITEM, HYPER_POTION + momitem 50000, 8000, MOM_DOLL, DOLL_PIKACHU + momitem 100000, 22800, MOM_DOLL, BIGDOLL_SNORLAX ; fd1ae db 0, 0, 0 ; XXX -UnknownText_0xfd1b1: ; 0xfd1b1 +_MomText_HiHowAreYou: ; 0xfd1b1 ; Hi, ! How are you? text_jump UnknownText_0x1bc615 db "@" ; 0xfd1b6 -UnknownText_0xfd1b6: ; 0xfd1b6 +_MomText_FoundAnItem: ; 0xfd1b6 ; I found a useful item shopping, so text_jump UnknownText_0x1bc62a db "@" ; 0xfd1bb -UnknownText_0xfd1bb: ; 0xfd1bb +_MomText_BoughtWithYourMoney: ; 0xfd1bb ; I bought it with your money. Sorry! text_jump UnknownText_0x1bc64e db "@" ; 0xfd1c0 -UnknownText_0xfd1c0: ; 0xfd1c0 +_MomText_ItsInPC: ; 0xfd1c0 ; It's in your PC. You'll like it! text_jump UnknownText_0x1bc673 db "@" ; 0xfd1c5 -UnknownText_0xfd1c5: ; 0xfd1c5 +_MomText_FoundADoll: ; 0xfd1c5 ; While shopping today, I saw this adorable doll, so text_jump UnknownText_0x1bc693 db "@" ; 0xfd1ca -UnknownText_0xfd1ca: ; 0xfd1ca +_MomText_ItsInRoom: ; 0xfd1ca ; It's in your room. You'll love it! text_jump UnknownText_0x1bc6c7 db "@" @@ -91360,10 +91289,10 @@ Function104000:: ; 104000 ; 104006 Function104006: ; 104006 - ld de, AttrMap + decoord 0, 0, AttrMap ld hl, w6_d000 + $400 call Function104263 - ld de, TileMap + decoord 0, 0 ld hl, w6_d000 call Function10425f ld a, $0 @@ -91383,7 +91312,7 @@ Function10402d:: ; 10402d ; 104033 Function104033: ; 104033 - ld de, TileMap + decoord 0, 0 ld hl, w6_d000 call Function10425f ld a, $0 @@ -91399,7 +91328,7 @@ Function104047: ; 104047 ; 10404d Function10404d: ; 10404d - ld de, AttrMap + decoord 0, 0, AttrMap ld hl, $d400 call Function104263 ld a, $1 @@ -91415,10 +91344,10 @@ Function104061:: ; 104061 ; 104067 Function104067: ; 104067 - ld de, AttrMap + decoord 0, 0, AttrMap ld hl, $d400 call Function104263 - ld de, TileMap + decoord 0, 0 ld hl, w6_d000 call Function10425f call DelayFrame @@ -91445,10 +91374,10 @@ Function104099: ; 104099 ; 1040a2 Function1040a2: ; 1040a2 - ld de, AttrMap + decoord 0, 0, AttrMap ld hl, $d400 call Function104263 - ld de, TileMap + decoord 0, 0 ld hl, w6_d000 call Function10425f call DelayFrame @@ -91515,10 +91444,10 @@ Function104110:: ; 104110 ; 104116 Function104116: ; 104116 - ld de, AttrMap + decoord 0, 0, AttrMap ld hl, $d400 call Function104263 - ld de, TileMap + decoord 0, 0 ld hl, w6_d000 call Function10425f call DelayFrame @@ -91545,11 +91474,11 @@ Function104148: ; 104148 (41:4148) ; 10414e (41:414e) Function10414e: ; 10414e - ld de, AttrMap + decoord 0, 0, AttrMap ld hl, $d400 call Function104263 ld c, $ff - ld de, TileMap + decoord 0, 0 ld hl, w6_d000 call Function104265 ld a, $1 @@ -91785,10 +91714,7 @@ Function104284:: ; 104284 ld a, b ld l, c ld h, $0 - add hl, hl - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 4 ld b, h ld c, l ld h, d @@ -91845,9 +91771,7 @@ Function1042d6: ; 1042d6 ld a, b ld l, c ld h, $0 - add hl, hl - add hl, hl - add hl, hl + add_n_times hl, hl, 3 ld c, l ld b, h ld h, d @@ -91875,10 +91799,10 @@ Function104303: ; 104303 Function104309: ld hl, w6_d000 - ld de, TileMap + decoord 0, 0 call Function10433a ld hl, w6_d000 + $80 - ld de, AttrMap + decoord 0, 0, AttrMap call Function10433a ld a, $1 ld [rVBK], a ; $ff00+$4f @@ -92196,12 +92120,12 @@ Function104770: ; 104770 (41:4770) ret Function1047a3: ; 1047a3 (41:47a3) - ld de, TileMap + decoord 0, 0 call Function1047b4 ld a, [hCGB] ; $ff00+$e6 and a ret z - ld de, AttrMap + decoord 0, 0, AttrMap ld a, $1 ld [rVBK], a ; $ff00+$4f @@ -92572,8 +92496,7 @@ Function104a56: ; 104a56 (41:4a56) ld hl, $abe6 ld e, a ld d, $0 - add hl, de - add hl, de + add_n_times hl, de, 2 ld a, [wc901] ld [hli], a ld a, [wc902] @@ -93439,12 +93362,12 @@ Function105038: ; 105038 (41:5038) and $f or b ld c, a - ld a, [$ffc3] + ld a, [hMoneyTemp] xor c and c ld [$ffc4], a ld a, c - ld [$ffc3], a + ld [hMoneyTemp], a ld a, $30 ld [rJOYP], a ; $ff00+$0 ret @@ -93485,7 +93408,7 @@ Function105091: ; 105091 (41:5091) pop bc jr z, .asm_1050b0 push bc - callab Function26f02 + callab SetSpecificDecorationFlag pop bc .asm_1050b0 inc c @@ -93614,14 +93537,14 @@ Function105153: ; 105153 (41:5153) ld a, BANK(MysteryGiftGFX) ld bc, $430 call FarCopyBytes - ld hl, TileMap + hlcoord 0, 0 ld a, $42 ld bc, $168 call ByteFill hlcoord 3, 7 ld bc, $90f call ClearBox - ld hl, TileMap + hlcoord 0, 0 ld a, $0 ld [hli], a inc a @@ -93919,14 +93842,14 @@ Function1057d7: ; 1057d7 (41:57d7) ld a, BANK(MysteryGiftJP_GFX) ld bc, $80 call FarCopyBytes - ld hl, TileMap + hlcoord 0, 0 ld a, $3f ld bc, $168 call ByteFill hlcoord 3, 7 ld bc, $90f call ClearBox - ld hl, TileMap + hlcoord 0, 0 ld a, $0 ld [hli], a inc a @@ -95613,7 +95536,7 @@ INCBIN "gfx/misc/unown_font.2bpp" ; 1dc1b0 Function1dc1b0: ; 1dc1b0 - ld hl, TileMap + hlcoord 0, 0 ld de, wca90 ld bc, $0154 call CopyBytes @@ -95652,7 +95575,7 @@ Function1dc1b0: ; 1dc1b0 call nz, FarString ld hl, wcaa3 ld [hl], $35 - ld de, $0014 + ld de, SCREEN_WIDTH add hl, de ld b, $f .asm_1dc20a @@ -95681,11 +95604,11 @@ Function1dc213: ; 1dc213 ld [hl], $38 inc hl ld a, $39 - ld bc, $0012 + ld bc, SCREEN_HEIGHT call ByteFill ld [hl], $3a ld hl, wcb1c - ld bc, $0014 + ld bc, SCREEN_WIDTH ld a, $32 call ByteFill ld a, [wd265] @@ -95705,7 +95628,7 @@ Function1dc213: ; 1dc213 Function1dc26a: ; 1dc26a push de - ld de, $0014 + ld de, SCREEN_WIDTH .asm_1dc26e ld [hl], a add hl, de @@ -95837,7 +95760,7 @@ Function1dc381: ; 1dc381 inc [hl] .asm_1dc469 - ld hl, TileMap + hlcoord 0, 0 call Function378b call WaitBGMap ld b, $3 @@ -95856,12 +95779,12 @@ Function1dc47b: ; 1dc47b xor a ld [MonType], a callba Function5084a - ld hl, TileMap + hlcoord 0, 0 ld b, 15 ld c, 18 call TextBox ld bc, SCREEN_WIDTH - ld de, TileMap + decoord 0, 0 hlcoord 0, 1 call CopyBytes hlcoord 7, 0 @@ -96093,7 +96016,7 @@ Function1de171: ; 1de171 (77:6171) ld bc, $f0b call ClearBox ld a, $34 - ld hl, TileMap + hlcoord 0, 0 ld bc, $b call ByteFill ld a, $39 @@ -96128,7 +96051,7 @@ Function1de171: ; 1de171 (77:6171) Function1de1d1: ; 1de1d1 (77:61d1) ld a, $34 - ld hl, TileMap + hlcoord 0, 0 ld bc, $b call ByteFill ld a, $39 @@ -96213,7 +96136,7 @@ Function1de247: ; 1de247 Function1de27f: ; 1de27f push de - ld de, $0014 + ld de, SCREEN_WIDTH .asm_1de283 ld [hl], a add hl, de diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm index 6445a439a..b4f7abf7d 100644 --- a/maps/BillsHouse.asm +++ b/maps/BillsHouse.asm @@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader: GrampsScript_0x189538: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x1896ba checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA iftrue UnknownScript_0x1896c0 @@ -120,7 +120,7 @@ UnknownScript_0x18963b: verbosegiveitem EVERSTONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 loadmovesprites end @@ -131,7 +131,7 @@ UnknownScript_0x189652: verbosegiveitem LEAF_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 loadmovesprites end @@ -142,7 +142,7 @@ UnknownScript_0x189669: verbosegiveitem WATER_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 loadmovesprites end @@ -153,7 +153,7 @@ UnknownScript_0x189680: verbosegiveitem FIRE_STONE, 1 iffalse UnknownScript_0x1896cc setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 loadmovesprites end diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 070bde484..b530d91c5 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -83,5 +83,5 @@ Colosseum_MapEventHeader: ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS1_IN_CABLE_CLUB - person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS2_IN_CABLE_CLUB + person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000 + person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index 6c6ac51c3..e8fdc5016 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -3,91 +3,91 @@ DragonShrine_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x18d01e, $0000 - dw UnknownScript_0x18d022, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 0 -UnknownScript_0x18d01e: - priorityjump UnknownScript_0x18d023 +.Trigger1: + priorityjump DragonShrineTestScript end -UnknownScript_0x18d022: +.Trigger2: end -UnknownScript_0x18d023: +DragonShrineTestScript: applymovement $0, MovementData_0x18d2bf applymovement $2, MovementData_0x18d2c7 loadfont writetext UnknownText_0x18d2ea keeptextopen -UnknownScript_0x18d030: - setevent EVENT_CHRIS2_IN_CABLE_CLUB +.Question1: + setevent EVENT_001 writetext UnknownText_0x18d3bc keeptextopen loadmenudata MenuDataHeader_0x18d215 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0a9 - if_equal $2, UnknownScript_0x18d0cb - if_equal $3, UnknownScript_0x18d0a9 + if_equal $1, .RightAnswer + if_equal $2, .WrongAnswer + if_equal $3, .RightAnswer end -UnknownScript_0x18d049: +.Question2: setevent EVENT_002 writetext UnknownText_0x18d3d3 keeptextopen loadmenudata MenuDataHeader_0x18d234 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0a9 - if_equal $2, UnknownScript_0x18d0a9 - if_equal $3, UnknownScript_0x18d0cb -UnknownScript_0x18d061: + if_equal $1, .RightAnswer + if_equal $2, .RightAnswer + if_equal $3, .WrongAnswer +.Question3: setevent EVENT_003 writetext UnknownText_0x18d3f3 keeptextopen loadmenudata MenuDataHeader_0x18d258 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0cb - if_equal $2, UnknownScript_0x18d0a9 - if_equal $3, UnknownScript_0x18d0a9 -UnknownScript_0x18d079: + if_equal $1, .WrongAnswer + if_equal $2, .RightAnswer + if_equal $3, .RightAnswer +.Question4: setevent EVENT_004 writetext UnknownText_0x18d420 keeptextopen loadmenudata MenuDataHeader_0x18d283 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0a9 - if_equal $2, UnknownScript_0x18d0cb - if_equal $3, UnknownScript_0x18d0a9 -UnknownScript_0x18d091: + if_equal $1, .RightAnswer + if_equal $2, .WrongAnswer + if_equal $3, .RightAnswer +.Question5: setevent EVENT_005 writetext UnknownText_0x18d44a keeptextopen loadmenudata MenuDataHeader_0x18d2a5 interpretmenu2 writebackup - if_equal $1, UnknownScript_0x18d0cb - if_equal $2, UnknownScript_0x18d0a9 - if_equal $3, UnknownScript_0x18d0cb -UnknownScript_0x18d0a9: + if_equal $1, .WrongAnswer + if_equal $2, .RightAnswer + if_equal $3, .WrongAnswer +.RightAnswer: checkevent EVENT_005 - iftrue UnknownScript_0x18d100 + iftrue .PassedTheTest writetext UnknownText_0x18d82d keeptextopen checkevent EVENT_004 - iftrue UnknownScript_0x18d091 + iftrue .Question5 checkevent EVENT_003 - iftrue UnknownScript_0x18d079 + iftrue .Question4 checkevent EVENT_002 - iftrue UnknownScript_0x18d061 - checkevent EVENT_CHRIS2_IN_CABLE_CLUB - iftrue UnknownScript_0x18d049 -UnknownScript_0x18d0cb: + iftrue .Question3 + checkevent EVENT_001 + iftrue .Question2 +.WrongAnswer: loadmovesprites spriteface $2, LEFT loadfont @@ -102,16 +102,16 @@ UnknownScript_0x18d0cb: setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG loadfont checkevent EVENT_005 - iftrue UnknownScript_0x18d091 + iftrue .Question5 checkevent EVENT_004 - iftrue UnknownScript_0x18d079 + iftrue .Question4 checkevent EVENT_003 - iftrue UnknownScript_0x18d061 + iftrue .Question3 checkevent EVENT_002 - iftrue UnknownScript_0x18d049 - checkevent EVENT_CHRIS2_IN_CABLE_CLUB - iftrue UnknownScript_0x18d030 -UnknownScript_0x18d100: + iftrue .Question2 + checkevent EVENT_001 + iftrue .Question1 +.PassedTheTest: writetext UnknownText_0x18d47c closetext loadmovesprites @@ -160,7 +160,7 @@ UnknownScript_0x18d100: playsound SFX_GET_BADGE waitbutton special RestartMapMusic - specialphonecall $8 + specialphonecall ELMCALL_MASTERBALL dotrigger $1 domaptrigger GROUP_DRAGONS_DEN_B1F, MAP_DRAGONS_DEN_B1F, $1 writetext UnknownText_0x18d9f2 @@ -184,30 +184,30 @@ UnknownScript_0x18d100: playsound SFX_ENTER_DOOR disappear $5 waitbutton - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 end ElderScript_0x18d1a5: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB - iftrue UnknownScript_0x18d1f9 + checkevent EVENT_000 + iftrue .DontGiveDratiniYet checkevent EVENT_006 - iftrue UnknownScript_0x18d1ff + iftrue .ReceivedDratini checkevent EVENT_GOT_DRATINI - iffalse UnknownScript_0x18d1c5 + iffalse .GiveDratini checkevent EVENT_BEAT_RIVAL_IN_MT_MOON - iftrue UnknownScript_0x18d1f3 + iftrue .BeatRivalInMtMoon writetext UnknownText_0x18d724 closetext loadmovesprites end -UnknownScript_0x18d1c5: +.GiveDratini: writetext UnknownText_0x18d604 closetext checkcode VAR_PARTYCOUNT - if_equal $6, UnknownScript_0x18d1ed + if_equal 6, .PartyFull writetext UnknownText_0x18d697 playsound SFX_CAUGHT_MON waitbutton @@ -221,25 +221,25 @@ UnknownScript_0x18d1c5: loadmovesprites end -UnknownScript_0x18d1ed: +.PartyFull: writetext UnknownText_0x18d6ac closetext loadmovesprites end -UnknownScript_0x18d1f3: +.BeatRivalInMtMoon: writetext UnknownText_0x18d782 closetext loadmovesprites end -UnknownScript_0x18d1f9: +.DontGiveDratiniYet: writetext UnknownText_0x18d5e5 closetext loadmovesprites end -UnknownScript_0x18d1ff: +.ReceivedDratini: writetext UnknownText_0x18d6ca closetext loadmovesprites @@ -681,7 +681,7 @@ DragonShrine_MapEventHeader: ; people-events db 4 - person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_CHRIS1_IN_CABLE_CLUB - person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_CHRIS1_IN_CABLE_CLUB - person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_CHRIS1_IN_CABLE_CLUB + person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000 + person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000 + person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000 person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790 diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 21bb85fe3..4481d3597 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -212,12 +212,12 @@ SilverScript_0x18c97e: playmusic MUSIC_RIVAL_ENCOUNTER faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x18c995 writetext UnknownText_0x18cc83 closetext loadmovesprites - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 special RestartMapMusic end diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 183a44a08..066b9125b 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -86,7 +86,7 @@ UnknownScript_0x98076: UnknownScript_0x9807c: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER iftrue UnknownScript_0x980a4 - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x980aa checkitem CLEAR_BELL iftrue UnknownScript_0x98093 @@ -102,7 +102,7 @@ UnknownScript_0x98093: dotrigger $1 setevent EVENT_RANG_CLEAR_BELL clearevent EVENT_766 - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 end UnknownScript_0x980a4: diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index c04ded152..5aaf3b8e4 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -7,30 +7,30 @@ GoldenrodDeptStoreRoof_MapScriptHeader: ; callbacks - dbw 1, UnknownScript_0x5671b + dbw 1, .CheckSaleChangeBlock - dbw 2, UnknownScript_0x5672b + dbw 2, .CheckSaleChangeClerk -UnknownScript_0x5671b: +.CheckSaleChangeBlock: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - iftrue UnknownScript_0x56722 + iftrue .ChangeBlock return -UnknownScript_0x56722: +.ChangeBlock: changeblock $0, $2, $3f changeblock $0, $4, $f return -UnknownScript_0x5672b: +.CheckSaleChangeClerk: checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON - iftrue UnknownScript_0x56738 - setevent EVENT_6F0 - clearevent EVENT_6F1 + iftrue .ChangeClerk + setevent EVENT_GOLDENROD_SALE_OFF + clearevent EVENT_GOLDENROD_SALE_ON return -UnknownScript_0x56738: - clearevent EVENT_6F0 - setevent EVENT_6F1 +.ChangeClerk: + clearevent EVENT_GOLDENROD_SALE_OFF + setevent EVENT_GOLDENROD_SALE_ON return ClerkScript_0x5673f: @@ -225,11 +225,11 @@ GoldenrodDeptStoreRoof_MapEventHeader: ; people-events db 8 - person_event SPRITE_CLERK, 8, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x5673f, EVENT_6F0 + person_event SPRITE_CLERK, 8, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF person_event SPRITE_POKEFAN_F, 7, 14, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanFScript_0x56746, -1 person_event SPRITE_FISHER, 5, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x56749, -1 - person_event SPRITE_TWIN, 8, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56754, EVENT_6F1 - person_event SPRITE_SUPER_NERD, 10, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x56757, EVENT_6F1 - person_event SPRITE_POKEFAN_M, 4, 11, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanMScript_0x5676a, EVENT_6F0 - person_event SPRITE_TEACHER, 7, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5676d, EVENT_6F0 - person_event SPRITE_BUG_CATCHER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x56770, EVENT_6F0 + person_event SPRITE_TWIN, 8, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON + person_event SPRITE_SUPER_NERD, 10, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON + person_event SPRITE_POKEFAN_M, 4, 11, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_TEACHER, 7, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF + person_event SPRITE_BUG_CATCHER, 10, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index a50361a17..ca4f1c948 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -40,9 +40,9 @@ HallOfFameScript: domaptrigger GROUP_SPROUT_TOWER_3F, MAP_SPROUT_TOWER_3F, $1 special HealParty checkevent EVENT_GOT_SS_TICKET_FROM_ELM - iftrue HallOfFame_SkipPhoneCall - specialphonecall $5 -HallOfFame_SkipPhoneCall: + iftrue .SkipPhoneCall + specialphonecall ELMCALL_SSTICKET +.SkipPhoneCall: halloffame end diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 680ccfef5..5ad19236f 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -16,13 +16,13 @@ UnknownScript_0x7a4d7: end UnknownScript_0x7a4d8: - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 UnknownScript_0x7a4db: playmusic MUSIC_MOM showemote EMOTE_SHOCK, $2, 15 spriteface $0, LEFT - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x7a4f2 applymovement $2, MovementData_0x7a5fc jump UnknownScript_0x7a4f6 @@ -77,9 +77,9 @@ UnknownScript_0x7a549: writetext UnknownText_0x7a850 closetext loadmovesprites - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x7a55d - checkevent EVENT_CHRIS2_IN_CABLE_CLUB + checkevent EVENT_001 iffalse UnknownScript_0x7a564 jump UnknownScript_0x7a56b @@ -109,7 +109,7 @@ UnknownScript_0x7a57e: MomScript_0x7a582: faceplayer - setevent EVENT_CHRIS2_IN_CABLE_CLUB + setevent EVENT_001 checktriggers iffalse UnknownScript_0x7a572 loadfont diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index df36a7877..ae065d727 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -70,7 +70,7 @@ UnknownScript_0x18e1bf: iffalse UnknownScript_0x18e2b2 setevent EVENT_035 UnknownScript_0x18e1cc: - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x18e29f checkevent EVENT_258 iftrue UnknownScript_0x18e2b4 @@ -89,7 +89,7 @@ UnknownScript_0x18e1cc: checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT iftrue UnknownScript_0x18e34e UnknownScript_0x18e202: - checkevent EVENT_CHRIS2_IN_CABLE_CLUB + checkevent EVENT_001 iftrue UnknownScript_0x18e212 checkevent EVENT_002 iftrue UnknownScript_0x18e212 @@ -110,7 +110,7 @@ UnknownScript_0x18e212: iftrue UnknownScript_0x18e249 checkitem PNK_APRICORN iftrue UnknownScript_0x18e249 - checkevent EVENT_CHRIS2_IN_CABLE_CLUB + checkevent EVENT_001 iftrue UnknownScript_0x18e2ae checkevent EVENT_002 iftrue UnknownScript_0x18e243 @@ -163,7 +163,7 @@ UnknownScript_0x18e293: jump UnknownScript_0x18e299 UnknownScript_0x18e299: - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 setflag ENGINE_KURT_MAKING_BALLS UnknownScript_0x18e29f: writetext UnknownText_0x18e779 @@ -178,7 +178,7 @@ UnknownScript_0x18e2a5: end UnknownScript_0x18e2ab: - setevent EVENT_CHRIS2_IN_CABLE_CLUB + setevent EVENT_001 UnknownScript_0x18e2ae: writetext UnknownText_0x18e82a closetext @@ -349,9 +349,9 @@ UnknownScript_0x18e3e0: KurtsGranddaughter1: faceplayer - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue KurtsGranddaughter2Subscript - checkevent EVENT_CHRIS2_IN_CABLE_CLUB + checkevent EVENT_001 iftrue KurtsGranddaughterFunScript checkevent EVENT_FOREST_IS_RESTLESS iftrue .Lonely diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index fa9ac1206..44a8d3a70 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -126,7 +126,7 @@ UnknownScript_0x196ec9: dotrigger $1 domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 - specialphonecall $2 + specialphonecall ELMCALL_ROBBED clearevent EVENT_COP_IN_ELMS_LAB checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x196f49 diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 3d559e7ba..1c71aad5b 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -20,14 +20,14 @@ UnknownScript_0x748b1: applymovement $0, MovementData_0x74a32 appear $2 dotrigger $0 - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY end SailorScript_0x748c0: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x74919 writetext UnknownText_0x74a55 closetext @@ -69,9 +69,9 @@ UnknownScript_0x74919: UnknownScript_0x7491f: spriteface $4, RIGHT - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x7498b - checkevent EVENT_CHRIS2_IN_CABLE_CLUB + checkevent EVENT_001 iftrue UnknownScript_0x7498b spriteface $0, LEFT loadfont @@ -94,7 +94,7 @@ UnknownScript_0x7494e: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent EVENT_CHRIS2_IN_CABLE_CLUB + setevent EVENT_001 applymovement $0, MovementData_0x74a37 jump SailorScript_0x748c0 @@ -138,7 +138,7 @@ UnknownScript_0x74992: SailorScript_0x7499c: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x74919 checkevent EVENT_030 iffalse UnknownScript_0x749c0 @@ -159,7 +159,7 @@ UnknownScript_0x749c0: writetext UnknownText_0x74b11 closetext loadmovesprites - setevent EVENT_CHRIS2_IN_CABLE_CLUB + setevent EVENT_001 checkcode VAR_FACING if_equal $3, UnknownScript_0x749e5 applymovement $0, MovementData_0x74a3f diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 97fcc6c0e..09b16d6d5 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -17,7 +17,7 @@ PokeCenter2F_MapScriptHeader: special Special_CheckMysteryGift if_equal $0, .Trigger1Done clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY - checkevent EVENT_CHRIS2_IN_CABLE_CLUB + checkevent EVENT_001 iftrue .Trigger1Done priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy @@ -46,7 +46,7 @@ PokeCenter2F_MapScriptHeader: PokeCenter2F_AppearMysteryGiftDeliveryGuy: appear $5 - setevent EVENT_CHRIS2_IN_CABLE_CLUB + setevent EVENT_001 end Script_TradeCenterClosed: diff --git a/maps/Route31.asm b/maps/Route31.asm index 8db796540..ddbc7cd8b 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -15,7 +15,7 @@ UnknownScript_0x1a543c: return UnknownScript_0x1a5443: - specialphonecall $7 + specialphonecall MOMCALL_WORRIED return TrainerBug_catcherWade1: diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index b80ab2635..d938228c3 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -300,7 +300,7 @@ UnknownScript_0x6ad02: YoungsterScript_0x6ad06: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6ad14 writetext UnknownText_0x6b399 closetext @@ -316,7 +316,7 @@ UnknownScript_0x6ad14: YoungsterScript_0x6ad1a: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6ad28 writetext UnknownText_0x6b40f closetext @@ -332,7 +332,7 @@ UnknownScript_0x6ad28: RockerScript_0x6ad2e: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6ad3c writetext UnknownText_0x6b462 closetext @@ -348,7 +348,7 @@ UnknownScript_0x6ad3c: PokefanMScript_0x6ad42: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6ad50 writetext UnknownText_0x6b4da closetext @@ -364,7 +364,7 @@ UnknownScript_0x6ad50: YoungsterScript_0x6ad56: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6ad64 writetext UnknownText_0x6b54e closetext @@ -380,7 +380,7 @@ UnknownScript_0x6ad64: YoungsterScript_0x6ad6a: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6ad78 writetext UnknownText_0x6b5b0 closetext @@ -396,7 +396,7 @@ UnknownScript_0x6ad78: LassScript_0x6ad7e: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6ad8c writetext UnknownText_0x6b64b closetext @@ -412,7 +412,7 @@ UnknownScript_0x6ad8c: YoungsterScript_0x6ad92: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6ada0 writetext UnknownText_0x6b6b8 closetext @@ -428,7 +428,7 @@ UnknownScript_0x6ada0: YoungsterScript_0x6ada6: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6adb4 writetext UnknownText_0x6b71b closetext @@ -444,7 +444,7 @@ UnknownScript_0x6adb4: YoungsterScript_0x6adba: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iffalse UnknownScript_0x6adc8 writetext UnknownText_0x6b76f closetext diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 5386ab633..2f85ad340 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -73,5 +73,5 @@ TimeCapsule_MapEventHeader: ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_CHRIS1_IN_CABLE_CLUB - person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_CHRIS2_IN_CABLE_CLUB + person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_000 + person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_001 diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 98263f7af..e23068c7f 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -73,5 +73,5 @@ TradeCenter_MapEventHeader: ; people-events db 2 - person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS1_IN_CABLE_CLUB - person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_CHRIS2_IN_CABLE_CLUB + person_event SPRITE_CHRIS, 8, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000 + person_event SPRITE_CHRIS, 8, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index a4cf151c2..8b031fc91 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -32,14 +32,14 @@ UnknownScript_0x74da6: setevent EVENT_739 clearevent EVENT_733 setevent EVENT_030 - setevent EVENT_CHRIS1_IN_CABLE_CLUB + setevent EVENT_000 blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY end SailorScript_0x74dc4: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x74e1a writetext UnknownText_0x74f06 closetext @@ -79,9 +79,9 @@ UnknownScript_0x74e1a: UnknownScript_0x74e20: spriteface $3, RIGHT - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x74e86 - checkevent EVENT_CHRIS2_IN_CABLE_CLUB + checkevent EVENT_001 iftrue UnknownScript_0x74e86 spriteface $0, LEFT loadfont @@ -101,7 +101,7 @@ UnknownScript_0x74e20: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent EVENT_CHRIS2_IN_CABLE_CLUB + setevent EVENT_001 applymovement $0, MovementData_0x74ef8 jump SailorScript_0x74dc4 @@ -145,7 +145,7 @@ UnknownScript_0x74e8d: SailorScript_0x74e97: faceplayer loadfont - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x74e1a checkcode VAR_WEEKDAY if_equal MONDAY, UnknownScript_0x74eda @@ -163,7 +163,7 @@ SailorScript_0x74e97: writetext UnknownText_0x74fc2 closetext loadmovesprites - setevent EVENT_CHRIS2_IN_CABLE_CLUB + setevent EVENT_001 applymovement $0, MovementData_0x74efe jump SailorScript_0x74dc4 diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm index aaab66e41..932c3b5c8 100644 --- a/maps/VioletGym.asm +++ b/maps/VioletGym.asm @@ -27,25 +27,25 @@ FalknerScript_0x683c2: scall VioletGymTriggerRockets .FightDone checkevent EVENT_GOT_TM31_MUD_SLAP - iftrue UnknownScript_0x68412 + iftrue .SpeechAfterTM setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ABE domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $2 - specialphonecall $3 + specialphonecall ELMCALL_ASSISTANT writetext UnknownText_0x685c8 keeptextopen verbosegiveitem TM_MUD_SLAP, 1 - iffalse UnknownScript_0x68416 + iffalse .NoRoomForMudSlap setevent EVENT_GOT_TM31_MUD_SLAP writetext UnknownText_0x68648 closetext loadmovesprites end -UnknownScript_0x68412: +.SpeechAfterTM: writetext UnknownText_0x68735 closetext -UnknownScript_0x68416: +.NoRoomForMudSlap: loadmovesprites end diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 0d50aa8e3..4ee49c1a7 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -265,20 +265,20 @@ UnknownScript_0x7c173: jump UnknownScript_0x7c1c1 UnknownScript_0x7c1a9: - setevent EVENT_CHRIS1_IN_CABLE_CLUB - clearevent EVENT_CHRIS2_IN_CABLE_CLUB + setevent EVENT_000 + clearevent EVENT_001 clearevent EVENT_002 jump UnknownScript_0x7c1cd UnknownScript_0x7c1b5: - clearevent EVENT_CHRIS1_IN_CABLE_CLUB - setevent EVENT_CHRIS2_IN_CABLE_CLUB + clearevent EVENT_000 + setevent EVENT_001 clearevent EVENT_002 jump UnknownScript_0x7c1cd UnknownScript_0x7c1c1: - clearevent EVENT_CHRIS1_IN_CABLE_CLUB - clearevent EVENT_CHRIS2_IN_CABLE_CLUB + clearevent EVENT_000 + clearevent EVENT_001 setevent EVENT_002 jump UnknownScript_0x7c1cd @@ -296,9 +296,9 @@ UnknownScript_0x7c1cd: loadfont writetext UnknownText_0x7c6d8 closetext - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x7c2bb - checkevent EVENT_CHRIS2_IN_CABLE_CLUB + checkevent EVENT_001 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd @@ -348,20 +348,20 @@ UnknownScript_0x7c220: jump UnknownScript_0x7c26e UnknownScript_0x7c256: - setevent EVENT_CHRIS1_IN_CABLE_CLUB - clearevent EVENT_CHRIS2_IN_CABLE_CLUB + setevent EVENT_000 + clearevent EVENT_001 clearevent EVENT_002 jump UnknownScript_0x7c27a UnknownScript_0x7c262: - clearevent EVENT_CHRIS1_IN_CABLE_CLUB - setevent EVENT_CHRIS2_IN_CABLE_CLUB + clearevent EVENT_000 + setevent EVENT_001 clearevent EVENT_002 jump UnknownScript_0x7c27a UnknownScript_0x7c26e: - clearevent EVENT_CHRIS1_IN_CABLE_CLUB - clearevent EVENT_CHRIS2_IN_CABLE_CLUB + clearevent EVENT_000 + clearevent EVENT_001 setevent EVENT_002 jump UnknownScript_0x7c27a @@ -379,9 +379,9 @@ UnknownScript_0x7c27a: loadfont writetext UnknownText_0x7c82a closetext - checkevent EVENT_CHRIS1_IN_CABLE_CLUB + checkevent EVENT_000 iftrue UnknownScript_0x7c2bb - checkevent EVENT_CHRIS2_IN_CABLE_CLUB + checkevent EVENT_001 iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd diff --git a/text/common_4.asm b/text/common_4.asm index 0278a20b9..09bfff312 100644 --- a/text/common_4.asm +++ b/text/common_4.asm @@ -542,7 +542,7 @@ UnknownText_0x1c4c08: ; 0x1c4c08 text_from_ram StringBuffer2 text "(S)" line "will be ¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text "." done ; 0x1c4c28 @@ -574,7 +574,7 @@ UnknownText_0x1c4cae: ; 0x1c4cae text_from_ram StringBuffer2 text "(S)" line "will be ¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text "." done ; 0x1c4cce @@ -619,7 +619,7 @@ UnknownText_0x1c4db0: ; 0x1c4db0 text_from_ram StringBuffer2 text " costs" line "¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text ". Want it?" done ; 0x1c4dcd @@ -671,7 +671,7 @@ UnknownText_0x1c4e89: ; 0x1c4e89 text_from_ram StringBuffer2 text "(S)" line "will cost ¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text "." done ; 0x1c4eab @@ -713,7 +713,7 @@ UnknownText_0x1c4f33: ; 0x1c4f33 UnknownText_0x1c4f3e: ; 0x1c4f3e text "I can pay you" line "¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text "." para "Is that OK?" @@ -763,7 +763,7 @@ UnknownText_0x1c500d: ; 0x1c500d UnknownText_0x1c502e: ; 0x1c502e text "Got ¥@" - deciram $ffc3, $36 + deciram hMoneyTemp, $36 text " for" line "@" text_from_ram StringBuffer2 diff --git a/wram.asm b/wram.asm index b4349d638..e768df504 100644 --- a/wram.asm +++ b/wram.asm @@ -1381,6 +1381,7 @@ EngineBuffer1:: ; d03e ds 1 wd03f:: CurFruit:: ; d03f +MartPointerBank:: ds 1 wd040:: @@ -2346,7 +2347,8 @@ FruitTreeFlags:: ; dc27 ds 5 wdc2d:: ds 4 -wdc31:: ds 4 +wSpecialPhoneCallID:: ds 2 +wdc33:: ds 2 wdc35:: ds 4 wdc39:: ds 1 wdc3a:: ds 1 -- cgit v1.2.3 From e674869018ffe8f9be2351b2b569eb7300910e6a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 18 Jul 2015 15:46:38 -0400 Subject: Updated signpost items and person_event flags --- constants/engine_flags.asm | 2 +- constants/event_flags.asm | 819 ++++++++++++++------------- constants/map_constants.asm | 16 +- constants/phone_constants.asm | 43 ++ engine/events.asm | 6 +- engine/map_objects.asm | 8 +- engine/scripting.asm | 32 +- engine/std_scripts.asm | 184 +++--- home.asm | 18 +- home/map_objects.asm | 18 +- macros/trainer.asm | 4 + main.asm | 108 ++-- maps/AzaleaTown.asm | 27 +- maps/BattleTowerBattleRoom.asm | 2 +- maps/BattleTowerOutside.asm | 4 +- maps/BlackthornCity.asm | 10 +- maps/BlackthornGym1F.asm | 6 +- maps/BurnedTower1F.asm | 20 +- maps/BurnedTowerB1F.asm | 22 +- maps/CeladonCity.asm | 5 +- maps/CeruleanCity.asm | 5 +- maps/CeruleanGym.asm | 11 +- maps/CherrygroveCity.asm | 4 +- maps/CianwoodCity.asm | 12 +- maps/CinnabarIsland.asm | 7 +- maps/CopycatsHouse2F.asm | 8 +- maps/DarkCaveBlackthornEntrance.asm | 4 +- maps/DarkCaveVioletEntrance.asm | 13 +- maps/DayCare.asm | 10 +- maps/DiglettsCave.asm | 5 +- maps/DragonShrine.asm | 2 +- maps/DragonsDenB1F.asm | 25 +- maps/EarlsPokemonAcademy.asm | 2 +- maps/EcruteakCity.asm | 7 +- maps/EcruteakGym.asm | 6 +- maps/EcruteakHouse.asm | 88 +-- maps/EcruteakPokeCenter1F.asm | 2 +- maps/ElmsLab.asm | 6 +- maps/FastShip1F.asm | 6 +- maps/FastShipB1F.asm | 30 +- maps/FastShipCabins_NNW_NNE_NE.asm | 14 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 24 +- maps/FastShipCabins_SW_SSW_NW.asm | 8 +- maps/GoldenrodCity.asm | 102 ++-- maps/GoldenrodDeptStore5F.asm | 2 +- maps/GoldenrodDeptStoreB1F.asm | 8 +- maps/GoldenrodFlowerShop.asm | 6 +- maps/GoldenrodGameCorner.asm | 4 +- maps/GoldenrodMagnetTrainStation.asm | 2 +- maps/IcePath1F.asm | 6 +- maps/IcePathB1F.asm | 23 +- maps/IcePathB2FBlackthornSide.asm | 7 +- maps/IcePathB2FMahoganySide.asm | 17 +- maps/IcePathB3F.asm | 2 +- maps/IlexForest.asm | 43 +- maps/IndigoPlateauPokeCenter1F.asm | 6 +- maps/KrissHouse1F.asm | 14 +- maps/KrissHouse2F.asm | 8 +- maps/KrissNeighborsHouse.asm | 2 +- maps/KurtsHouse.asm | 16 +- maps/LakeofRage.asm | 35 +- maps/LancesRoom.asm | 4 +- maps/MahoganyMart1F.asm | 10 +- maps/MahoganyTown.asm | 6 +- maps/MountMoon.asm | 2 +- maps/MountMoonSquare.asm | 23 +- maps/MountMortar1FInside.asm | 19 +- maps/MountMortar1FOutside.asm | 9 +- maps/MountMortar2FInside.asm | 17 +- maps/MountMortarB1F.asm | 15 +- maps/MrPokemonsHouse.asm | 8 +- maps/NationalPark.asm | 9 +- maps/NationalParkBugContest.asm | 9 +- maps/NewBarkTown.asm | 2 +- maps/OlivineCity.asm | 2 +- maps/OlivineGym.asm | 2 +- maps/OlivineLighthouse3F.asm | 2 +- maps/OlivineLighthouse5F.asm | 11 +- maps/OlivineLighthouse6F.asm | 6 +- maps/OlivinePort.asm | 11 +- maps/OlivinePortPassage.asm | 2 +- maps/PokemonFanClub.asm | 2 +- maps/PowerPlant.asm | 10 +- maps/RadioTower1F.asm | 10 +- maps/RadioTower2F.asm | 16 +- maps/RadioTower3F.asm | 10 +- maps/RadioTower4F.asm | 10 +- maps/RadioTower5F.asm | 24 +- maps/RockTunnel1F.asm | 14 +- maps/RockTunnelB1F.asm | 11 +- maps/Route11.asm | 5 +- maps/Route12.asm | 9 +- maps/Route13.asm | 5 +- maps/Route15.asm | 2 +- maps/Route17.asm | 10 +- maps/Route2.asm | 32 +- maps/Route24.asm | 2 +- maps/Route25.asm | 11 +- maps/Route26.asm | 2 +- maps/Route27.asm | 4 +- maps/Route28.asm | 5 +- maps/Route29.asm | 4 +- maps/Route30.asm | 15 +- maps/Route31.asm | 4 +- maps/Route32.asm | 18 +- maps/Route34.asm | 40 +- maps/Route34IlexForestGate.asm | 6 +- maps/Route35.asm | 2 +- maps/Route35NationalParkgate.asm | 6 +- maps/Route36.asm | 6 +- maps/Route36NationalParkgate.asm | 4 +- maps/Route37.asm | 7 +- maps/Route39.asm | 5 +- maps/Route4.asm | 7 +- maps/Route40.asm | 11 +- maps/Route40BattleTowerGate.asm | 4 +- maps/Route41.asm | 5 +- maps/Route42.asm | 9 +- maps/Route43.asm | 2 +- maps/Route43Gate.asm | 6 +- maps/Route44.asm | 11 +- maps/Route45.asm | 13 +- maps/Route46.asm | 2 +- maps/Route5.asm | 2 +- maps/Route6.asm | 2 +- maps/Route9.asm | 5 +- maps/RuinsofAlphAerodactylChamber.asm | 2 +- maps/RuinsofAlphHoOhChamber.asm | 2 +- maps/RuinsofAlphInnerChamber.asm | 8 +- maps/RuinsofAlphKabutoChamber.asm | 6 +- maps/RuinsofAlphOmanyteChamber.asm | 2 +- maps/RuinsofAlphOutside.asm | 8 +- maps/RuinsofAlphResearchCenter.asm | 8 +- maps/SaffronTrainStation.asm | 4 +- maps/SeafoamGym.asm | 2 +- maps/SilverCaveItemRooms.asm | 4 +- maps/SilverCaveOutside.asm | 5 +- maps/SilverCaveRoom1.asm | 18 +- maps/SilverCaveRoom2.asm | 11 +- maps/SlowpokeWellB1F.asm | 30 +- maps/SlowpokeWellB2F.asm | 2 +- maps/SproutTower1F.asm | 2 +- maps/SproutTower2F.asm | 2 +- maps/SproutTower3F.asm | 4 +- maps/TeamRocketBaseB1F.asm | 33 +- maps/TeamRocketBaseB2F.asm | 65 ++- maps/TeamRocketBaseB3F.asm | 28 +- maps/TinTower1F.asm | 28 +- maps/TinTower3F.asm | 2 +- maps/TinTower4F.asm | 11 +- maps/TinTower5F.asm | 12 +- maps/TinTower6F.asm | 2 +- maps/TinTower7F.asm | 2 +- maps/TinTower8F.asm | 6 +- maps/TinTower9F.asm | 2 +- maps/TinTowerRoof.asm | 2 +- maps/TohjoFalls.asm | 2 +- maps/Underground.asm | 10 +- maps/UndergroundPathSwitchRoomEntrances.asm | 34 +- maps/UndergroundWarehouse.asm | 14 +- maps/UnionCave1F.asm | 8 +- maps/UnionCaveB1F.asm | 4 +- maps/UnionCaveB2F.asm | 6 +- maps/VermilionCity.asm | 7 +- maps/VermilionPort.asm | 19 +- maps/VictoryRoad.asm | 24 +- maps/VioletCity.asm | 13 +- maps/ViridianGym.asm | 4 +- maps/WarehouseEntrance.asm | 199 ++++--- maps/WhirlIslandB1F.asm | 25 +- maps/WhirlIslandB2F.asm | 6 +- maps/WhirlIslandLugiaChamber.asm | 2 +- maps/WhirlIslandNE.asm | 2 +- maps/WhirlIslandSW.asm | 2 +- maps/WiseTriosRoom.asm | 24 +- maps/second_map_headers.asm | 2 +- 176 files changed, 1602 insertions(+), 1633 deletions(-) create mode 100644 constants/phone_constants.asm create mode 100644 macros/trainer.asm diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index a2291e3c6..2ff70a57d 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -94,7 +94,7 @@ const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT const ENGINE_TEA_IN_BLUES_HOUSE const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT - const ENGINE_5E + const ENGINE_DAILY_MOVE_TUTOR const ENGINE_5F const ENGINE_60 const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 873769ef4..f7a2c7f52 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -126,66 +126,67 @@ const EVENT_GOT_TM12_SWEET_SCENT const EVENT_RELEASED_THE_BEASTS const EVENT_GOT_MASTER_BALL_FROM_ELM - const EVENT_07D - const EVENT_07E - const EVENT_07F - const EVENT_080 + const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION + const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE + const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS +; Signpost items + const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER const EVENT_081 const EVENT_082 const EVENT_083 - const EVENT_084 - const EVENT_085 - const EVENT_FOUND_REVIVE_IN_ROCKET_BASE_B1F - const EVENT_087 - const EVENT_088 - const EVENT_089 - const EVENT_08A - const EVENT_08B - const EVENT_08C - const EVENT_08D - const EVENT_08E - const EVENT_08F - const EVENT_090 - const EVENT_091 - const EVENT_092 - const EVENT_093 - const EVENT_094 - const EVENT_095 - const EVENT_096 - const EVENT_097 - const EVENT_098 - const EVENT_099 - const EVENT_09A - const EVENT_09B - const EVENT_09C - const EVENT_09D - const EVENT_09E - const EVENT_09F - const EVENT_0A0 - const EVENT_0A1 - const EVENT_0A2 - const EVENT_0A3 - const EVENT_0A4 - const EVENT_0A5 - const EVENT_0A6 - const EVENT_0A7 - const EVENT_0A8 - const EVENT_0A9 - const EVENT_0AA - const EVENT_0AB - const EVENT_0AC - const EVENT_0AD - const EVENT_0AE - const EVENT_0AF - const EVENT_0B0 - const EVENT_0B1 - const EVENT_0B2 - const EVENT_0B3 - const EVENT_0B4 - const EVENT_0B5 - const EVENT_0B6 - const EVENT_0B7 - const EVENT_0B8 + const EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL + const EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION + const EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE + const EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL + const EVENT_ILEX_FOREST_HIDDEN_ETHER + const EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION + const EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL + const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL + const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION + const EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE + const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION + const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE + const EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION + const EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL + const EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE + const EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE + const EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION + const EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS + const EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL + const EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY + const EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL + const EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE + const EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT + const EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL + const EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER + const EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION + const EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL + const EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE + const EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION + const EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER + const EVENT_ROUTE_28_HIDDEN_RARE_CANDY + const EVENT_ROUTE_30_HIDDEN_POTION + const EVENT_ROUTE_32_HIDDEN_GREAT_BALL + const EVENT_ROUTE_32_HIDDEN_SUPER_POTION + const EVENT_ROUTE_34_HIDDEN_RARE_CANDY + const EVENT_ROUTE_34_HIDDEN_SUPER_POTION + const EVENT_ROUTE_37_HIDDEN_ETHER + const EVENT_ROUTE_39_HIDDEN_NUGGET + const EVENT_ROUTE_40_HIDDEN_HYPER_POTION + const EVENT_ROUTE_41_HIDDEN_MAX_ETHER + const EVENT_ROUTE_42_HIDDEN_MAX_POTION + const EVENT_ROUTE_44_HIDDEN_ELIXER + const EVENT_ROUTE_45_HIDDEN_PP_UP + const EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION + const EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL + const EVENT_CIANWOOD_CITY_HIDDEN_REVIVE + const EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER + const EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION + const EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE + const EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY + const EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION + const EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE const EVENT_MET_FLORIA const EVENT_0BA const EVENT_BUGGING_KURT_TOO_MUCH @@ -229,34 +230,34 @@ const EVENT_TALKED_TO_OAK_IN_KANTO const EVENT_GOT_HP_UP_FROM_VERMILION_GUY const EVENT_GOT_TM29_PSYCHIC - const EVENT_0E4 - const EVENT_0E5 - const EVENT_0E6 - const EVENT_0E7 - const EVENT_0E8 - const EVENT_0E9 - const EVENT_0EA - const EVENT_0EB - const EVENT_0EC - const EVENT_0ED - const EVENT_0EE - const EVENT_0EF - const EVENT_0F0 - const EVENT_0F1 - const EVENT_0F2 - const EVENT_0F3 - const EVENT_0F4 - const EVENT_0F5 - const EVENT_0F6 - const EVENT_0F7 - const EVENT_0F8 + const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE + const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE + const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL + const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY + const EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND + const EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION + const EVENT_OLIVINE_PORT_HIDDEN_PROTEIN + const EVENT_VERMILION_PORT_HIDDEN_IRON + const EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE + const EVENT_ROUTE_2_HIDDEN_MAX_ETHER + const EVENT_ROUTE_2_HIDDEN_FULL_HEAL + const EVENT_ROUTE_2_HIDDEN_FULL_RESTORE + const EVENT_ROUTE_2_HIDDEN_REVIVE + const EVENT_ROUTE_4_HIDDEN_ULTRA_BALL + const EVENT_ROUTE_9_HIDDEN_ETHER + const EVENT_ROUTE_12_HIDDEN_ELIXER + const EVENT_ROUTE_13_HIDDEN_CALCIUM + const EVENT_ROUTE_11_HIDDEN_REVIVE + const EVENT_ROUTE_17_HIDDEN_MAX_ETHER + const EVENT_ROUTE_17_HIDDEN_MAX_ELIXER + const EVENT_ROUTE_25_HIDDEN_POTION const EVENT_FOUND_LEFTOVERS_IN_CELADON_CAFE const EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY const EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - const EVENT_0FC - const EVENT_0FD - const EVENT_0FE - const EVENT_0FF + const EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL + const EVENT_CELADON_CITY_HIDDEN_PP_UP + const EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY + const EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL const EVENT_100 const EVENT_101 const EVENT_102 @@ -1651,220 +1652,222 @@ ; Sprite visibility: When these events are cleared, the sprite becomes visible; when set, the sprite is hidden. ; The map script command macros `disappear` and `appear` set/clear these flags and immediately apply the effect on visibility. ; The map script command macros `setevent` and `clearevent` set/clear these flags, and their effects will be seen when the map is reloaded. +; Johto items: 0x640 const EVENT_CYNDAQUIL_POKEBALL_IN_ELMS_LAB const EVENT_TOTODILE_POKEBALL_IN_ELMS_LAB const EVENT_CHIKORITA_POKEBALL_IN_ELMS_LAB - const EVENT_643 - const EVENT_644 - const EVENT_645 - const EVENT_646 - const EVENT_647 - const EVENT_648 - const EVENT_649 - const EVENT_64A - const EVENT_64B - const EVENT_64C - const EVENT_64D - const EVENT_64E - const EVENT_64F - const EVENT_650 - const EVENT_651 - const EVENT_652 - const EVENT_653 - const EVENT_654 - const EVENT_655 - const EVENT_656 - const EVENT_657 - const EVENT_658 - const EVENT_659 - const EVENT_65A - const EVENT_65B - const EVENT_65C - const EVENT_65D - const EVENT_65E - const EVENT_65F - const EVENT_660 - const EVENT_661 - const EVENT_662 - const EVENT_663 - const EVENT_664 - const EVENT_665 - const EVENT_666 - const EVENT_667 - const EVENT_668 - const EVENT_669 - const EVENT_66A - const EVENT_66B - const EVENT_66C - const EVENT_66D - const EVENT_66E - const EVENT_66F - const EVENT_670 - const EVENT_671 - const EVENT_672 - const EVENT_673 - const EVENT_674 - const EVENT_675 - const EVENT_676 - const EVENT_677 - const EVENT_678 - const EVENT_679 - const EVENT_67A - const EVENT_67B - const EVENT_67C - const EVENT_67D - const EVENT_67E - const EVENT_67F - const EVENT_680 - const EVENT_681 - const EVENT_682 - const EVENT_683 - const EVENT_684 - const EVENT_685 - const EVENT_686 - const EVENT_687 - const EVENT_688 - const EVENT_689 - const EVENT_68A - const EVENT_68B - const EVENT_68C - const EVENT_68D - const EVENT_68E - const EVENT_68F - const EVENT_690 - const EVENT_691 - const EVENT_692 - const EVENT_693 - const EVENT_694 - const EVENT_695 - const EVENT_696 - const EVENT_697 - const EVENT_698 - const EVENT_699 - const EVENT_69A - const EVENT_69B - const EVENT_69C - const EVENT_69D - const EVENT_69E - const EVENT_69F - const EVENT_6A0 - const EVENT_6A1 - const EVENT_6A2 - const EVENT_6A3 - const EVENT_6A4 - const EVENT_6A5 - const EVENT_6A6 - const EVENT_6A7 - const EVENT_6A8 - const EVENT_6A9 - const EVENT_6AA - const EVENT_6AB - const EVENT_6AC - const EVENT_6AD - const EVENT_6AE - const EVENT_6AF - const EVENT_6B0 - const EVENT_6B1 - const EVENT_6B2 - const EVENT_6B3 - const EVENT_6B4 - const EVENT_6B5 - const EVENT_6B6 - const EVENT_6B7 - const EVENT_6B8 - const EVENT_6B9 - const EVENT_6BA - const EVENT_6BB - const EVENT_6BC - const EVENT_6BD - const EVENT_6BE - const EVENT_6BF - const EVENT_6C0 - const EVENT_6C1 - const EVENT_6C2 - const EVENT_6C3 + const EVENT_VIOLET_CITY_PP_UP + const EVENT_VIOLET_CITY_RARE_CANDY + const EVENT_LAKE_OF_RAGE_ELIXER + const EVENT_LAKE_OF_RAGE_TM_DETECT + const EVENT_SPROUT_TOWER1F_PARLYZ_HEAL + const EVENT_SPROUT_TOWER2F_X_ACCURACY + const EVENT_SPROUT_TOWER_3F_POTION + const EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE + const EVENT_TIN_TOWER_3F_FULL_HEAL + const EVENT_TIN_TOWER_4F_ULTRA_BALL + const EVENT_TIN_TOWER_4F_PP_UP + const EVENT_TIN_TOWER_4F_ESCAPE_ROPE + const EVENT_TIN_TOWER_5F_RARE_CANDY + const EVENT_TIN_TOWER_7F_MAX_REVIVE + const EVENT_TIN_TOWER_8F_NUGGET + const EVENT_TIN_TOWER_8F_MAX_ELIXER + const EVENT_TIN_TOWER_8F_FULL_RESTORE + const EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL + const EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL + const EVENT_BURNED_TOWER_1F_HP_UP + const EVENT_BURNED_TOWER_B1F_TM_ENDURE + const EVENT_NATIONAL_PARK_PARLYZ_HEAL + const EVENT_NATIONAL_PARK_TM_DIG + const EVENT_UNION_CAVE_1F_GREAT_BALL + const EVENT_UNION_CAVE_1F_X_ATTACK + const EVENT_UNION_CAVE_1F_POTION + const EVENT_UNION_CAVE_1F_AWAKENING + const EVENT_UNION_CAVE_B1F_TM_SWIFT + const EVENT_UNION_CAVE_B1F_X_DEFEND + const EVENT_UNION_CAVE_B2F_ELIXER + const EVENT_UNION_CAVE_B2F_HYPER_POTION + const EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION + const EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE + const EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER + const EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + const EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + const EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER + const EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION + const EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + const EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + const EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC + const EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF + const EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + const EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + const EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + const EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + const EVENT_ILEX_FOREST_REVIVE + const EVENT_WAREHOUSE_ENTRANCE_COIN_CASE + const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + const EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL + const EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER + const EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + const EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + const EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL + const EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER + const EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + const EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + const EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE + const EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + const EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + const EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + const EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + const EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + const EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL + const EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + const EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + const EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE + const EVENT_MOUNT_MORTAR_B1F_HYPER_POTION + const EVENT_MOUNT_MORTAR_B1F_CARBOS + const EVENT_ICE_PATH_1F_HM_WATERFALL + const EVENT_ICE_PATH_1F_PP_UP + const EVENT_ICE_PATH_B1F_IRON + const EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + const EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION + const EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST + const EVENT_ICE_PATH_B3F_NEVERMELTICE + const EVENT_WHIRL_ISLAND_NE_ULTRA_BALL + const EVENT_WHIRL_ISLAND_SW_ULTRA_BALL + const EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + const EVENT_WHIRL_ISLAND_B1F_CARBOS + const EVENT_WHIRL_ISLAND_B1F_CALCIUM + const EVENT_WHIRL_ISLAND_B1F_NUGGET + const EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE + const EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + const EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + const EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER + const EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + const EVENT_SILVER_CAVE_ROOM_1_PROTEIN + const EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + const EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + const EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + const EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE + const EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE + const EVENT_VICTORY_ROAD_TM_EARTHQUAKE + const EVENT_VICTORY_ROAD_MAX_REVIVE + const EVENT_VICTORY_ROAD_FULL_RESTORE + const EVENT_VICTORY_ROAD_FULL_HEAL + const EVENT_VICTORY_ROAD_HP_UP + const EVENT_DRAGONS_DEN_B1F_DRAGON_FANG + const EVENT_TOHJO_FALLS_MOON_STONE + const EVENT_ROUTE_26_MAX_ELIXER + const EVENT_ROUTE_27_TM_SOLARBEAM + const EVENT_ROUTE_27_RARE_CANDY + const EVENT_ROUTE_29_POTION + const EVENT_ROUTE_31_POTION + const EVENT_ROUTE_31_POKE_BALL + const EVENT_ROUTE_32_GREAT_BALL + const EVENT_ROUTE_32_REPEL + const EVENT_ROUTE_35_TM_ROLLOUT + const EVENT_ROUTE_42_ULTRA_BALL + const EVENT_ROUTE_42_SUPER_POTION + const EVENT_ROUTE_43_MAX_ETHER + const EVENT_ROUTE_44_MAX_REVIVE + const EVENT_ROUTE_44_ULTRA_BALL + const EVENT_ROUTE_45_NUGGET + const EVENT_ROUTE_45_REVIVE + const EVENT_ROUTE_45_ELIXER + const EVENT_ROUTE_45_MAX_POTION + const EVENT_ROUTE_46_X_SPEED +; Johto people + const EVENT_RIVAL_NEW_BARK_TOWN + const EVENT_RIVAL_CHERRYGROVE_CITY + const EVENT_RIVAL_AZALEA_TOWN + const EVENT_RIVAL_TEAM_ROCKET_BASE + const EVENT_RIVAL_UNDERGROUND_PATH + const EVENT_RIVAL_VICTORY_ROAD + const EVENT_RIVAL_OLIVINE_CITY const EVENT_RIVAL_SPROUT_TOWER - const EVENT_6C5 - const EVENT_6C6 - const EVENT_6C7 - const EVENT_6C8 - const EVENT_6C9 - const EVENT_6CA - const EVENT_6CB - const EVENT_6CC - const EVENT_6CD - const EVENT_6CE - const EVENT_6CF - const EVENT_6D0 - const EVENT_6D1 - const EVENT_6D2 - const EVENT_6D3 - const EVENT_6D4 - const EVENT_6D5 - const EVENT_6D6 - const EVENT_6D7 - const EVENT_6D8 - const EVENT_6D9 - const EVENT_6DA - const EVENT_6DB - const EVENT_6DC - const EVENT_6DD - const EVENT_6DE - const EVENT_6DF - const EVENT_6E0 - const EVENT_6E1 - const EVENT_6E2 - const EVENT_6E3 - const EVENT_6E4 - const EVENT_6E5 - const EVENT_6E6 - const EVENT_6E7 - const EVENT_6E8 - const EVENT_6E9 - const EVENT_6EA - const EVENT_6EB - const EVENT_6EC - const EVENT_6ED - const EVENT_6EE - const EVENT_6EF + const EVENT_RIVAL_BURNED_TOWER + const EVENT_RIVAL_DRAGONS_DEN + const EVENT_KRISS_HOUSE_MOM_1 + const EVENT_KRISS_HOUSE_MOM_2 + const EVENT_MR_POKEMONS_HOUSE_OAK + const EVENT_VIOLET_CITY_EARL + const EVENT_EARLS_ACADEMY_EARL + const EVENT_GOLDENROD_CITY_ROCKET_SCOUT + const EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + const EVENT_RADIO_TOWER_ROCKET_TAKEOVER + const EVENT_GOLDENROD_CITY_CIVILIANS + const EVENT_RADIO_TOWER_CIVILIANS_AFTER + const EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + const EVENT_OLIVINE_LIGHTHOUSE_JASMINE + const EVENT_OLIVINE_GYM_JASMINE + const EVENT_LAKE_OF_RAGE_LANCE + const EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + const EVENT_TEAM_ROCKET_BASE_B2F_LANCE + const EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS + const EVENT_DRAGONS_DEN_CLAIR + const EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + const EVENT_TEAM_ROCKET_BASE_POPULATION + const EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE + const EVENT_ROUTE_43_GATE_ROCKETS + const EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + const EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + const EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + const EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + const EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + const EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM + const EVENT_DAYCARE_MAN_IN_DAYCARE + const EVENT_DAYCARE_MAN_ON_ROUTE_34 + const EVENT_DAYCARE_MON_1 + const EVENT_DAYCARE_MON_2 + const EVENT_ILEX_FOREST_FARFETCHD + const EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER + const EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + const EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + const EVENT_ILEX_FOREST_LASS + const EVENT_COPYCAT_1 + const EVENT_COPYCAT_2 const EVENT_GOLDENROD_SALE_OFF const EVENT_GOLDENROD_SALE_ON const EVENT_6F2 - const EVENT_6F3 - const EVENT_6F4 + const EVENT_ILEX_FOREST_APPRENTICE + const EVENT_ILEX_FOREST_CHARCOAL_MASTER const EVENT_6F5 const EVENT_6F6 const EVENT_6F7 - const EVENT_6F8 - const EVENT_6F9 - const EVENT_6FA - const EVENT_6FB - const EVENT_6FC - const EVENT_6FD - const EVENT_6FE + const EVENT_ROUTE_36_SUDOWOODO + const EVENT_AZALEA_TOWN_SLOWPOKES + const EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET + const EVENT_SLOWPOKE_WELL_SLOWPOKES + const EVENT_SLOWPOKE_WELL_ROCKETS + const EVENT_KURTS_HOUSE_SLOWPOKE + const EVENT_GUIDE_GENT_IN_HIS_HOUSE const EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE const EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER const EVENT_ELMS_AIDE_IN_LAB const EVENT_COP_IN_ELMS_LAB - const EVENT_703 - const EVENT_704 - const EVENT_705 + const EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + const EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + const EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS const EVENT_BOULDER_IN_BLACKTHORN_GYM_1 const EVENT_BOULDER_IN_BLACKTHORN_GYM_2 const EVENT_BOULDER_IN_BLACKTHORN_GYM_3 - const EVENT_709 - const EVENT_70A - const EVENT_70B - const EVENT_70C const EVENT_BOULDER_IN_ICE_PATH_1 const EVENT_BOULDER_IN_ICE_PATH_2 const EVENT_BOULDER_IN_ICE_PATH_3 const EVENT_BOULDER_IN_ICE_PATH_4 + const EVENT_BOULDER_IN_ICE_PATH_1A + const EVENT_BOULDER_IN_ICE_PATH_2A + const EVENT_BOULDER_IN_ICE_PATH_3A + const EVENT_BOULDER_IN_ICE_PATH_4A const EVENT_MYSTERY_GIFT_DELIVERY_GUY const EVENT_MET_BILL - const EVENT_713 - const EVENT_714 - const EVENT_715 + const EVENT_ECRUTEAK_POKE_CENTER_BILL + const EVENT_ROUTE_30_BATTLE + const EVENT_ROUTE_30_YOUNGSTER_JOEY const EVENT_BUG_CATCHING_CONTESTANT_1A const EVENT_BUG_CATCHING_CONTESTANT_2A const EVENT_BUG_CATCHING_CONTESTANT_3A @@ -1885,112 +1888,114 @@ const EVENT_BUG_CATCHING_CONTESTANT_8B const EVENT_BUG_CATCHING_CONTESTANT_9B const EVENT_BUG_CATCHING_CONTESTANT_10B - const EVENT_72A - const EVENT_72B - const EVENT_72C - const EVENT_72D - const EVENT_72E - const EVENT_72F - const EVENT_730 - const EVENT_731 - const EVENT_732 - const EVENT_733 - const EVENT_734 - const EVENT_735 - const EVENT_736 + const EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY + const EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY + const EVENT_FAST_SHIP_1F_GENTLEMAN + const EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + const EVENT_FAST_SHIP_B1F_SAILOR_LEFT + const EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + const EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + const EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + const EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 + const EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + const EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + const EVENT_LAKE_OF_RAGE_CIVILIANS + const EVENT_MAHOGANY_MART_OWNERS const EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME const EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - const EVENT_739 - const EVENT_73A - const EVENT_73B - const EVENT_73C - const EVENT_73D - const EVENT_73E - const EVENT_73F - const EVENT_740 - const EVENT_741 - const EVENT_742 - const EVENT_743 - const EVENT_744 - const EVENT_745 - const EVENT_746 - const EVENT_747 - const EVENT_748 - const EVENT_749 - const EVENT_74A - const EVENT_74B - const EVENT_74C - const EVENT_74D - const EVENT_74E + const EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + const EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + const EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + const EVENT_TIN_TOWER_ROOF_HO_OH + const EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + const EVENT_KURTS_HOUSE_KURT_1 + const EVENT_KURTS_HOUSE_KURT_2 + const EVENT_SLOWPOKE_WELL_KURT + const EVENT_KRISS_HOUSE_2F_CONSOLE + const EVENT_KRISS_HOUSE_2F_DOLL_1 + const EVENT_KRISS_HOUSE_2F_DOLL_2 + const EVENT_KRISS_HOUSE_2F_BIG_DOLL + const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + const EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + const EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY + const EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN + const EVENT_BURNED_TOWER_B1F_BEASTS_1 + const EVENT_BURNED_TOWER_B1F_BEASTS_2 + const EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + const EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN + const EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST const EVENT_OPENED_MT_SILVER const EVENT_FOUGHT_SNORLAX - const EVENT_751 - const EVENT_752 - const EVENT_753 - const EVENT_754 - const EVENT_755 - const EVENT_756 - const EVENT_757 - const EVENT_758 - const EVENT_759 - const EVENT_75A - const EVENT_75B - const EVENT_75C - const EVENT_75D - const EVENT_75E - const EVENT_75F - const EVENT_760 + const EVENT_LAKE_OF_RAGE_RED_GYARADOS + const EVENT_WAREHOUSE_ENTRANCE_GRANNY + const EVENT_WAREHOUSE_ENTRANCE_GRAMPS + const EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER + const EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER + const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST + const EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + const EVENT_ROUTE_32_FRIEDA_OF_FRIDAY + const EVENT_ROUTE_29_TUSCANY_OF_TUESDAY + const EVENT_ROUTE_36_ARTHUR_OF_THURSDAY + const EVENT_ROUTE_37_SUNNY_OF_SUNDAY + const EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY + const EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY + const EVENT_ROUTE_40_MONICA_OF_MONDAY + const EVENT_LANCES_ROOM_OAK_AND_MARY + const EVENT_UNION_CAVE_B2F_LAPRAS const EVENT_761 const EVENT_RED_IN_MT_SILVER - const EVENT_763 - const EVENT_764 - const EVENT_765 - const EVENT_766 - const EVENT_RANG_CLEAR_BELL - const EVENT_768 + const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY + const EVENT_BURNED_TOWER_MORTY + const EVENT_BURNED_TOWER_1F_EUSINE + const EVENT_RANG_CLEAR_BELL_1 + const EVENT_RANG_CLEAR_BELL_2 + const EVENT_FLORIA_AT_FLOWER_SHOP const EVENT_FLORIA_AT_SUDOWOODO - const EVENT_76A - const EVENT_76B - const EVENT_76C - const EVENT_76D - const EVENT_76E + const EVENT_GOLDENROD_CITY_MOVE_TUTOR + const EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR +; Kanto people + const EVENT_ROUTE_24_ROCKET + const EVENT_CERULEAN_GYM_ROCKET + const EVENT_ROUTE_25_MISTY_BOYFRIEND const EVENT_TRAINERS_IN_CERULEAN_GYM - const EVENT_770 - const EVENT_771 - const EVENT_772 - const EVENT_773 - const EVENT_774 + const EVENT_VERMILION_CITY_SNORLAX + const EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + const EVENT_SAFFRON_TRAIN_STATION_POPULATION + const EVENT_COPYCATS_HOUSE_2F_DOLL + const EVENT_VERMILION_FAN_CLUB_DOLL const EVENT_BLUE_IN_CINNABAR - const EVENT_776 - const EVENT_777 - const EVENT_778 - const EVENT_779 - const EVENT_77A - const EVENT_77B + const EVENT_VIRIDIAN_GYM_BLUE + const EVENT_SEAFOAM_GYM_GYM_GUY + const EVENT_MT_MOON_SQUARE_ROCK + const EVENT_MT_MOON_SQUARE_CLEFAIRY + const EVENT_MT_MOON_RIVAL + const EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL const EVENT_TELEPORT_GUY const EVENT_PICKED_UP_FOCUS_BAND - const EVENT_77E - const EVENT_77F - const EVENT_780 - const EVENT_781 - const EVENT_782 - const EVENT_783 - const EVENT_784 - const EVENT_785 - const EVENT_786 - const EVENT_787 - const EVENT_788 - const EVENT_789 - const EVENT_78A - const EVENT_78B - const EVENT_78C - const EVENT_78D - const EVENT_78E - const EVENT_78F - const EVENT_790 - const EVENT_791 - const EVENT_792 - const EVENT_793 + const EVENT_ROCK_TUNNEL_1F_ELIXER + const EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING + const EVENT_ROCK_TUNNEL_B1F_IRON + const EVENT_ROCK_TUNNEL_B1F_PP_UP + const EVENT_ROCK_TUNNEL_B1F_REVIVE + const EVENT_ROUTE_2_DIRE_HIT + const EVENT_ROUTE_2_MAX_POTION + const EVENT_ROUTE_2_CARBOS + const EVENT_ROUTE_2_ELIXER + const EVENT_ROUTE_4_HP_UP + const EVENT_ROUTE_12_CALCIUM + const EVENT_ROUTE_12_NUGGET + const EVENT_ROUTE_15_PP_UP + const EVENT_ROUTE_25_PROTEIN +; New to Crystal + const EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 + const EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 + const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + const EVENT_DRAGON_SHRINE_CLAIR + const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + const EVENT_KRISS_HOUSE_1F_NEIGHBOR + const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR const EVENT_PICKED_UP_GOLD_BERRY_FROM_HO_OH_ITEM_ROOM const EVENT_PICKED_UP_MYSTERYBERRY_FROM_HO_OH_ITEM_ROOM const EVENT_PICKED_UP_REVIVAL_HERB_FROM_HO_OH_ITEM_ROOM @@ -2007,49 +2012,49 @@ const EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM const EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM const EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM - const EVENT_7A4 - const EVENT_7A5 - const EVENT_7A6 - const EVENT_7A7 - const EVENT_7A8 - const EVENT_7A9 + const EVENT_AZALEA_TOWN_KURT + const EVENT_ILEX_FOREST_KURT + const EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + const EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET + const EVENT_ECRUTEAK_GYM_GRAMPS + const EVENT_ECRUTEAK_CITY_GRAMPS const EVENT_EUSINE_IN_BURNED_TOWER - const EVENT_7AB - const EVENT_7AC - const EVENT_7AD + const EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + const EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + const EVENT_CIANWOOD_CITY_EUSINE const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY const EVENT_SAW_SUICUNE_ON_ROUTE_42 const EVENT_SAW_SUICUNE_ON_ROUTE_36 - const EVENT_7B1 - const EVENT_7B2 - const EVENT_7B3 - const EVENT_7B4 - const EVENT_7B5 - const EVENT_7B6 + const EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + const EVENT_TIN_TOWER_1F_SUICUNE + const EVENT_TIN_TOWER_1F_ENTEI + const EVENT_TIN_TOWER_1F_RAIKOU + const EVENT_TIN_TOWER_1F_EUSINE + const EVENT_TIN_TOWER_1F_WISE_TRIO_1 const EVENT_SET_WHEN_FOUGHT_HO_OH - const EVENT_7B8 - const EVENT_7B9 - const EVENT_7BA - const EVENT_7BB - const EVENT_7BC - const EVENT_7BD - const EVENT_7BE - const EVENT_7BF - const EVENT_7C0 - const EVENT_7C1 - const EVENT_7C2 - const EVENT_7C3 - const EVENT_7C4 - const EVENT_7C5 - const EVENT_7C6 - const EVENT_7C7 - const EVENT_7C8 - const EVENT_7C9 - const EVENT_7CA - const EVENT_7CB - const EVENT_7CC - const EVENT_7CD - const EVENT_7CE - const EVENT_7CF + const EVENT_ROUTE_30_ANTIDOTE + const EVENT_ILEX_FOREST_X_ATTACK + const EVENT_ILEX_FOREST_ANTIDOTE + const EVENT_ILEX_FOREST_ETHER + const EVENT_ROUTE_34_NUGGET + const EVENT_ROUTE_44_MAX_REPEL + const EVENT_ICE_PATH_1F_PROTEIN + const EVENT_DRAGONS_DEN_B1F_CALCIUM + const EVENT_DRAGONS_DEN_B1F_MAX_ELIXER + const EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL + const EVENT_SILVER_CAVE_ROOM_2_CALCIUM + const EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + const EVENT_SILVER_CAVE_ROOM_2_PP_UP + const EVENT_TIN_TOWER_1F_WISE_TRIO_2 + const EVENT_TIN_TOWER_6F_MAX_POTION + const EVENT_TIN_TOWER_9F_HP_UP + const EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + const EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL + const EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE + const EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + const EVENT_MOUNT_MORTAR_B1F_PP_UP + const EVENT_RADIO_TOWER_5F_ULTRA_BALL + const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT + const EVENT_BATTLE_TOWER_OUTSIDE_SAILOR NUM_EVENTS EQU const_value diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ed4a781f5..6f5b71310 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -233,7 +233,7 @@ MAP_N_A EQU -1 mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16 mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5 mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5 - mapgroup DAY_CARE, 4, 5 + mapgroup DAYCARE, 4, 5 newgroup mapgroup ROUTE_6, 9, 10 @@ -700,9 +700,9 @@ const_value SET 1 const OBJECT_32 ; 33-39 are not used - +; map object struct const_def - const MAPOBJECT_VRAM_ID ; 0 + const MAPOBJECT_OBJECT_STRUCT_ID ; 0 const MAPOBJECT_SPRITE ; 1 const MAPOBJECT_Y_COORD ; 2 const MAPOBJECT_X_COORD ; 3 @@ -712,9 +712,9 @@ const_value SET 1 const MAPOBJECT_TIMEOFDAY ; 7 const MAPOBJECT_COLOR ; 8 const MAPOBJECT_RANGE ; 9 - const MAPOBJECT_POINTER_LO ; a + const MAPOBJECT_SCRIPT_POINTER ; a const MAPOBJECT_POINTER_HI ; b - const MAPOBJECT_FLAG_LO ; c + const MAPOBJECT_EVENT_FLAG ; c const MAPOBJECT_FLAG_HI ; d const MAPOBJECT_E ; unused const MAPOBJECT_F ; unused @@ -725,6 +725,10 @@ MAPOBJECT_SCREEN_WIDTH EQU 12 OBJECT_STRUCT_3_DATA_WIDTH EQU 6 OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 +OW_DOWN EQU $0 +OW_RIGHT EQU $4 +OW_UP EQU $8 +OW_LEFT EQU $c const_def const EMOTE_SHOCK ; 0 @@ -748,5 +752,5 @@ OBJECT_STRUCT_3_DATA_HEIGHT EQU 37 const SIGNPOST_LEFT const SIGNPOST_IFSET const SIGNPOST_IFNOTSET - const SIGNPOST_ITEMIFSET + const SIGNPOST_ITEM const SIGNPOST_COPY diff --git a/constants/phone_constants.asm b/constants/phone_constants.asm new file mode 100644 index 000000000..eadfa7d78 --- /dev/null +++ b/constants/phone_constants.asm @@ -0,0 +1,43 @@ + +PHONE_SCHOOLBOY_JACK EQU $05 +PHONE_POKEFAN_BEVERLY EQU $06 +PHONE_SAILOR_HUEY EQU $07 + +PHONE_COOLTRAINERM_GAVEN EQU $0b +PHONE_COOLTRAINERF_BETH EQU $0c +PHONE_BIRDKEEPER_JOSE EQU $0d +PHONE_COOLTRAINERF_REENA EQU $0e +PHONE_YOUNGSTER_JOEY EQU $0f +PHONE_BUG_CATCHER_WADE EQU $10 +PHONE_FISHER_RALPH EQU $11 +PHONE_PICNICKER_LIZ EQU $12 +PHONE_HIKER_ANTHONY EQU $13 +PHONE_CAMPER_TODD EQU $14 +PHONE_PICNICKER_GINA EQU $15 +PHONE_JUGGLER_IRWIN EQU $16 +PHONE_BUG_CATCHER_ARNIE EQU $17 +PHONE_SCHOOLBOY_ALAN EQU $18 + +PHONE_LASS_DANA EQU $1a +PHONE_SCHOOLBOY_CHAD EQU $1b +PHONE_POKEFANM_DEREK EQU $1c +PHONE_FISHER_TULLY EQU $1d +PHONE_POKEMANIAC_BRENT EQU $1e +PHONE_PICNICKER_TIFFANY EQU $1f +PHONE_BIRDKEEPER_VANCE EQU $20 +PHONE_FISHER_WILTON EQU $21 +PHONE_BLACKBELT_KENJI EQU $22 +PHONE_HIKER_PARRY EQU $23 +PHONE_PICNICKER_ERIN EQU $24 + + const_def + const ELMCALL_NONE + const ELMCALL_POKERUS + const ELMCALL_ROBBED + const ELMCALL_ASSISTANT + const ELMCALL_WEIRDBROADCAST + const ELMCALL_SSTICKET + const ELMCALL_UNKNOWN + const MOMCALL_WORRIED + const ELMCALL_MASTERBALL + diff --git a/engine/events.asm b/engine/events.asm index 9435b4c49..1b85c7f7c 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -245,7 +245,7 @@ Function967d1: ; 967d1 ; 967e1 Function967e1: ; 967e1 - callba Function5920 + callba RefreshMapAppearDisappear callba Functiond4d2 callba Functionb8098 ret @@ -648,7 +648,7 @@ TryObjectEvent: ; 969b5 ; 96a04 .zero ; 96a04 - ld hl, MAPOBJECT_POINTER_LO + ld hl, MAPOBJECT_SCRIPT_POINTER add hl, bc ld a, [hli] ld h, [hl] @@ -660,7 +660,7 @@ TryObjectEvent: ; 969b5 ; 96a12 .one ; 96a12 - ld hl, MAPOBJECT_POINTER_LO + ld hl, MAPOBJECT_SCRIPT_POINTER add hl, bc ld a, [hli] ld h, [hl] diff --git a/engine/map_objects.asm b/engine/map_objects.asm index c44d40df7..dab1e2d38 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -2761,7 +2761,7 @@ Function5602: ; 5602 call Function5629 .ok - call Function5920 + call RefreshMapAppearDisappear ret ; 561d @@ -2769,7 +2769,7 @@ Function561d: ; 561d call Function5645 ld a, 0 call Function5629 - call Function5920 + call RefreshMapAppearDisappear ret ; 5629 @@ -2777,7 +2777,7 @@ Function5629: ; 5629 cp $10 ret nc call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -3320,7 +3320,7 @@ Function5903: ; 5903 db 6, 7, 8, 9 ; 5920 -Function5920:: ; 5920 +RefreshMapAppearDisappear:: ; 5920 ld a, [VramState] bit 0, a ret z diff --git a/engine/scripting.asm b/engine/scripting.asm index ea620e6f8..4e99d5927 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1253,10 +1253,10 @@ Script_appear: ; 0x972dd call GetScriptByte call GetScriptPerson - call Function1956 + call _CopyObjectStruct ld a, [$ffaf] - ld b, $0 - call Function9730b + ld b, 0 ; clear + call ApplyEventActionAppearDisappear ret ; 0x972ee @@ -1267,35 +1267,35 @@ Script_disappear: ; 0x972ee call GetScriptByte call GetScriptPerson - cp $fe - jr nz, .asm_972fa ; 0x972f6 $2 + cp -2 + jr nz, .skip ; 0x972f6 $2 ld a, [$ffe0] -.asm_972fa - call Function199f +.skip + call DeleteObjectStruct ld a, [$ffaf] - ld b, $1 - call Function9730b - callba Function5920 + ld b, 1 ; set + call ApplyEventActionAppearDisappear + callba RefreshMapAppearDisappear ret ; 0x9730b -Function9730b: ; 0x9730b +ApplyEventActionAppearDisappear: ; 0x9730b push bc call GetMapObject - ld hl, $000c + ld hl, MAPOBJECT_EVENT_FLAG add hl, bc pop bc ld e, [hl] inc hl ld d, [hl] - ld a, $ff + ld a, -1 cp e - jr nz, .asm_97321 ; 0x9731a $5 + jr nz, .okay ; 0x9731a $5 cp d - jr nz, .asm_97321 ; 0x9731d $2 + jr nz, .okay ; 0x9731d $2 xor a ret -.asm_97321 +.okay call EventFlagAction ret ; 0x97325 diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index d367ab956..db2843e44 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -287,25 +287,25 @@ DayToTextScript: db "SATURDAY@" GoldenrodRocketsScript: - clearevent EVENT_6CD + clearevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER end RadioTowerRocketsScript: setflag ENGINE_ROCKETS_IN_RADIO_TOWER - setevent EVENT_6CF - setevent EVENT_6D1 - clearevent EVENT_6CE + setevent EVENT_GOLDENROD_CITY_CIVILIANS + setevent EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + clearevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER - setevent EVENT_756 + setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST specialphonecall ELMCALL_WEIRDBROADCAST domaptrigger GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN, $1 end BugContestResultsWarpScript: special WhiteBGMap - scall BugContestResults_EnsureNoDuplicateSprites - setevent EVENT_747 - clearevent EVENT_748 + scall BugContestResults_CopyContestantsToResults + setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY setevent EVENT_2D2 warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4 applymovement $0, Movement_ContestResults_WalkAfterWarp @@ -438,7 +438,7 @@ BugContestResults_NoRoomForBerry ; 0xbc375 jump BugContestResults_DidNotWin ; 0xbc380 -BugContestResults_EnsureNoDuplicateSprites ; 0xbc380 +BugContestResults_CopyContestantsToResults ; 0xbc380 checkevent EVENT_BUG_CATCHING_CONTESTANT_1A iftrue .skip1 clearevent EVENT_BUG_CATCHING_CONTESTANT_1B @@ -482,35 +482,35 @@ BugContestResults_EnsureNoDuplicateSprites ; 0xbc380 end InitializeEventsScript: - setevent EVENT_6CB - setevent EVENT_6CE - setevent EVENT_6CD - setevent EVENT_6D0 - setevent EVENT_6F3 - setevent EVENT_6E9 - setevent EVENT_6F4 - setevent EVENT_6D5 - setevent EVENT_6DE - setevent EVENT_6DD - setevent EVENT_6DF - setevent EVENT_6C0 - setevent EVENT_6E4 + setevent EVENT_EARLS_ACADEMY_EARL + setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER + setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + setevent EVENT_RADIO_TOWER_CIVILIANS_AFTER + setevent EVENT_ILEX_FOREST_APPRENTICE + setevent EVENT_ILEX_FOREST_FARFETCHD + setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER + setevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + setevent EVENT_RIVAL_TEAM_ROCKET_BASE + setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM setevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER - setevent EVENT_6BE - setevent EVENT_6BF - setevent EVENT_6C1 - setevent EVENT_6F9 - setevent EVENT_6FD + setevent EVENT_RIVAL_CHERRYGROVE_CITY + setevent EVENT_RIVAL_AZALEA_TOWN + setevent EVENT_RIVAL_UNDERGROUND_PATH + setevent EVENT_AZALEA_TOWN_SLOWPOKES + setevent EVENT_KURTS_HOUSE_SLOWPOKE setevent EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE setevent EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER setevent EVENT_COP_IN_ELMS_LAB - setevent EVENT_703 - setevent EVENT_704 - setevent EVENT_BOULDER_IN_ICE_PATH_1 - setevent EVENT_BOULDER_IN_ICE_PATH_2 - setevent EVENT_BOULDER_IN_ICE_PATH_3 - setevent EVENT_BOULDER_IN_ICE_PATH_4 - setevent EVENT_715 + setevent EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + setevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST + setevent EVENT_BOULDER_IN_ICE_PATH_1A + setevent EVENT_BOULDER_IN_ICE_PATH_2A + setevent EVENT_BOULDER_IN_ICE_PATH_3A + setevent EVENT_BOULDER_IN_ICE_PATH_4A + setevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_3A @@ -531,70 +531,70 @@ InitializeEventsScript: setevent EVENT_BUG_CATCHING_CONTESTANT_8B setevent EVENT_BUG_CATCHING_CONTESTANT_9B setevent EVENT_BUG_CATCHING_CONTESTANT_10B - setevent EVENT_72C - setevent EVENT_72F - setevent EVENT_72D - setevent EVENT_735 - setevent EVENT_736 - setevent EVENT_73C - setevent EVENT_73D - setevent EVENT_741 - setevent EVENT_742 - setevent EVENT_743 - setevent EVENT_744 + setevent EVENT_FAST_SHIP_1F_GENTLEMAN + setevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + setevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + setevent EVENT_LAKE_OF_RAGE_CIVILIANS + setevent EVENT_MAHOGANY_MART_OWNERS + setevent EVENT_TIN_TOWER_ROOF_HO_OH + setevent EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA + setevent EVENT_KRISS_HOUSE_2F_CONSOLE + setevent EVENT_KRISS_HOUSE_2F_DOLL_1 + setevent EVENT_KRISS_HOUSE_2F_DOLL_2 + setevent EVENT_KRISS_HOUSE_2F_BIG_DOLL setevent EVENT_2A4 setevent EVENT_2AF - setevent EVENT_749 - setevent EVENT_6D3 - setevent EVENT_74D + setevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN + setevent EVENT_OLIVINE_GYM_JASMINE + setevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN setevent EVENT_MET_BILL - setevent EVENT_713 + setevent EVENT_ECRUTEAK_POKE_CENTER_BILL setevent EVENT_MYSTERY_GIFT_DELIVERY_GUY - setevent EVENT_6D4 + setevent EVENT_LAKE_OF_RAGE_LANCE setevent EVENT_WAREHOUSE_LAYOUT_1 setevent EVENT_WAREHOUSE_BLOCKED_OFF - setevent EVENT_6D8 - setevent EVENT_6C3 - setevent EVENT_6C2 - setevent EVENT_6C6 - setevent EVENT_75F - setevent EVENT_731 - setevent EVENT_74A + setevent EVENT_DRAGONS_DEN_CLAIR + setevent EVENT_RIVAL_OLIVINE_CITY + setevent EVENT_RIVAL_VICTORY_ROAD + setevent EVENT_RIVAL_DRAGONS_DEN + setevent EVENT_LANCES_ROOM_OAK_AND_MARY + setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + setevent EVENT_BURNED_TOWER_B1F_BEASTS_1 setevent EVENT_RED_IN_MT_SILVER setevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME - setevent EVENT_73A - setevent EVENT_73B - setevent EVENT_733 - setevent EVENT_73F - setevent EVENT_78D - setevent EVENT_766 - setevent EVENT_768 + setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + setevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M + setevent EVENT_KURTS_HOUSE_KURT_2 + setevent EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 + setevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_FLORIA_AT_FLOWER_SHOP setevent EVENT_FLORIA_AT_SUDOWOODO - setevent EVENT_76A - setevent EVENT_78E - setevent EVENT_78F - setevent EVENT_790 - setevent EVENT_791 - setevent EVENT_793 - setevent EVENT_7A4 - setevent EVENT_7A4 - setevent EVENT_7A5 - setevent EVENT_6EC - setevent EVENT_6ED + setevent EVENT_GOLDENROD_CITY_MOVE_TUTOR + setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + setevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + setevent EVENT_DRAGON_SHRINE_CLAIR + setevent EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER + setevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR + setevent EVENT_AZALEA_TOWN_KURT + setevent EVENT_AZALEA_TOWN_KURT + setevent EVENT_ILEX_FOREST_KURT + setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY + setevent EVENT_ILEX_FOREST_LASS setevent EVENT_GOLDENROD_SALE_OFF - setevent EVENT_7A9 + setevent EVENT_ECRUTEAK_CITY_GRAMPS setevent EVENT_EUSINE_IN_BURNED_TOWER - setevent EVENT_6C8 - setevent EVENT_7AC - setevent EVENT_7AD - setevent EVENT_7B5 - setevent EVENT_7B6 - setevent EVENT_7C5 + setevent EVENT_KRISS_HOUSE_MOM_2 + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + setevent EVENT_CIANWOOD_CITY_EUSINE + setevent EVENT_TIN_TOWER_1F_EUSINE + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_SET_WHEN_FOUGHT_HO_OH setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setevent EVENT_7CF + setevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR setflag ENGINE_ROCKET_SIGNAL_ON_CH20 setflag ENGINE_ROCKETS_IN_MAHOGANY variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO @@ -607,16 +607,16 @@ InitializeEventsScript: variablesprite SPRITE_COPYCAT, SPRITE_LASS variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS setevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM - setevent EVENT_76D - setevent EVENT_76C - setevent EVENT_76E + setevent EVENT_CERULEAN_GYM_ROCKET + setevent EVENT_ROUTE_24_ROCKET + setevent EVENT_ROUTE_25_MISTY_BOYFRIEND setevent EVENT_TRAINERS_IN_CERULEAN_GYM - setevent EVENT_773 - setevent EVENT_776 - setevent EVENT_777 - setevent EVENT_779 - setevent EVENT_772 - setevent EVENT_77B + setevent EVENT_COPYCATS_HOUSE_2F_DOLL + setevent EVENT_VIRIDIAN_GYM_BLUE + setevent EVENT_SEAFOAM_GYM_GYM_GUY + setevent EVENT_MT_MOON_SQUARE_CLEFAIRY + setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION + setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL setevent EVENT_036 return diff --git a/home.asm b/home.asm index cd6267436..8e1eb264f 100644 --- a/home.asm +++ b/home.asm @@ -1497,11 +1497,11 @@ FacingPlayerDistance:: ; 36ad ; Return carry if the sprite at bc is facing the player, ; and its distance in d. - ld hl, $0010 ; x + ld hl, OBJECT_MAP_X ; x add hl, bc ld d, [hl] - ld hl, $0011 ; y + ld hl, OBJECT_MAP_Y ; y add hl, bc ld e, [hl] @@ -1570,7 +1570,7 @@ Function36f5:: ; 36f5 add hl, bc ld a, [hl] call GetMapObject - ld hl, $000a + ld hl, OBJECT_STEP_DURATION add hl, bc ld a, [hli] ld h, [hl] @@ -1580,7 +1580,7 @@ Function36f5:: ; 36f5 ld d, h ld e, l push de - ld b, $2 + ld b, $2 ; check call EventFlagAction pop de ld a, c @@ -1593,19 +1593,19 @@ Function36f5:: ; 36f5 Function3718:: ; 3718 ld a, [BattleType] cp BATTLETYPE_CANLOSE - jr .asm_3724 + jr .canlose ld hl, WalkingTile - jr .asm_3731 + jr .ok -.asm_3724 +.canlose ld a, [wd0ee] ld hl, WalkingTile and $f - jr z, .asm_3731 + jr z, .ok ld hl, wd048 + 1 -.asm_3731 +.ok ld a, [hli] ld h, [hl] ld l, a diff --git a/home/map_objects.asm b/home/map_objects.asm index 509492033..2874cbdf3 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -22,7 +22,7 @@ Function180e:: ; 180e ld c, SPRITE_GFX_LIST_CAPACITY - 1 ld b, a ld a, [hConnectionStripLength] - cp $0 + cp 0 jr z, .nope ld a, b .loop @@ -235,7 +235,7 @@ Function18de:: ; 18de ; Sets carry if the object is not visible on the screen. ld [hConnectionStripLength], a call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -327,25 +327,25 @@ Function18f5:: ; 18f5 Function194d:: ; 194d ld [hConnectionStripLength], a call GetMapObject - call Function80e7 + call CopyObjectStruct ret ; 1956 -Function1956:: ; 1956 +_CopyObjectStruct:: ; 1956 ld [hConnectionStripLength], a call Function271e ld a, [hConnectionStripLength] call GetMapObject - callba Function80e7 + callba CopyObjectStruct ret ; 1967 Function1967:: ; 1967 ld [hConnectionStripLength], a call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -375,7 +375,7 @@ Function1985:: ; 1985 ret ; 199f -Function199f:: ; 199f +DeleteObjectStruct:: ; 199f call Function1967 call Function2712 ret @@ -397,7 +397,7 @@ Function19a6:: ; 19a6 Function19b8:: ; 19b8 call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] push af @@ -620,7 +620,7 @@ DrawOnMap:: ; 1ad2 bit 0, a ret z callba Function55e0 - callba Function5920 + callba RefreshMapAppearDisappear ret ; 1ae5 diff --git a/macros/trainer.asm b/macros/trainer.asm new file mode 100644 index 000000000..610de1c13 --- /dev/null +++ b/macros/trainer.asm @@ -0,0 +1,4 @@ +trainerclass: MACRO + enum \1 +const_value = 1 +ENDM diff --git a/main.asm b/main.asm index ec7f623b2..40902a181 100644 --- a/main.asm +++ b/main.asm @@ -207,7 +207,7 @@ _ResetWRAM: ; 5bae ld [wCurBox], a ld [wd4b4], a - call Function5ca6 + call SetDefaultBoxNames ld a, 1 call GetSRAMBank @@ -301,10 +301,10 @@ Function5ca1: ; 5ca1 ret ; 5ca6 -Function5ca6: ; 5ca6 +SetDefaultBoxNames: ; 5ca6 ld hl, wBoxNames ld c, 0 -.asm_5cab +.loop push hl ld de, .Box call CopyName2 @@ -312,12 +312,12 @@ Function5ca6: ; 5ca6 ld a, c inc a cp 10 - jr c, .asm_5cbe + jr c, .less sub 10 ld [hl], "1" inc hl -.asm_5cbe +.less add "0" ld [hli], a ld [hl], "@" @@ -327,7 +327,7 @@ Function5ca6: ; 5ca6 inc c ld a, c cp NUM_BOXES - jr c, .asm_5cab + jr c, .loop ret .Box @@ -3291,7 +3291,7 @@ Function80b8: ; 80b8 ; 80e7 -Function80e7:: ; 80e7 +CopyObjectStruct:: ; 80e7 call Function2707 and a ret nz @@ -3332,7 +3332,7 @@ Function8116: ; 8116 Function811d: ; 811d ld a, [$ffb0] - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld [hl], a ld a, [$ffaf] @@ -3350,12 +3350,12 @@ Function811d: ; 811d add hl, bc ld a, [hl] and $f0 - jr z, .asm_814e + jr z, .no_color swap a and $7 ld [wc2f3], a -.asm_814e +.no_color ld hl, MAPOBJECT_FACING add hl, bc ld a, [hl] @@ -3389,7 +3389,7 @@ Function8177: ; 8177 ld a, [hl] and a jr z, .next - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -3415,7 +3415,7 @@ Function8177: ; 8177 cp MAPOBJECT_SCREEN_HEIGHT jr nc, .next push bc - call Function80e7 + call CopyObjectStruct pop bc jp c, Function81c9 @@ -3479,7 +3479,7 @@ Function81ea: ; 81ea ld a, d cp [hl] jr nz, .next - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -3494,7 +3494,7 @@ Function81ea: ; 81ea jr nc, .next push de push bc - call Function80e7 + call CopyObjectStruct pop bc pop de @@ -3537,7 +3537,7 @@ Function823e: ; 823e ld a, e cp [hl] jr nz, .next - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] cp MAPOBJECT_NOT_VISIBLE @@ -3552,7 +3552,7 @@ Function823e: ; 823e jr nc, .next push de push bc - call Function80e7 + call CopyObjectStruct pop bc pop de @@ -3688,7 +3688,7 @@ Function8341: ; 8341 push bc ld a, c call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] call GetObjectStruct @@ -3697,7 +3697,7 @@ Function8341: ; 8341 pop bc ld a, b call GetMapObject - ld hl, MAPOBJECT_VRAM_ID + ld hl, MAPOBJECT_OBJECT_STRUCT_ID add hl, bc ld a, [hl] call GetObjectStruct @@ -23302,7 +23302,7 @@ Function16f7a: ; 16f7a (5:6f7a) jr nz, .nottogepi ; set the event flag for hatching togepi ld de, EVENT_TOGEPI_HATCHED - ld b, $1 + ld b, $1 ; set call EventFlagAction .nottogepi @@ -25223,14 +25223,14 @@ Function2454f: ; 2454f ld bc, MapObjects ld de, wd81e xor a -.asm_24561 +.loop push af push bc push de call Function245a7 - jr c, .asm_2456c + jr c, .next call Function2457d -.asm_2456c +.next pop de ld [de], a inc de @@ -25242,44 +25242,44 @@ Function2454f: ; 2454f pop af inc a cp $10 - jr nz, .asm_24561 + jr nz, .loop ret Function2457d: ; 2457d (9:457d) - ld hl, $1 + ld hl, MAPOBJECT_SPRITE add hl, bc ld a, [hl] and a - jr z, .asm_245a3 - ld hl, $c + jr z, .minus_one + ld hl, MAPOBJECT_EVENT_FLAG add hl, bc ld a, [hli] ld e, a ld a, [hl] ld d, a - cp $ff - jr nz, .asm_24598 + cp -1 + jr nz, .clear ld a, e - cp $ff - jr z, .asm_245a1 - jr .asm_245a3 -.asm_24598 - ld b, $2 + cp -1 + jr z, .zero + jr .minus_one +.clear + ld b, $2 ; clear call EventFlagAction ld a, c and a - jr nz, .asm_245a3 -.asm_245a1 + jr nz, .minus_one +.zero xor a ret -.asm_245a3 - ld a, $ff +.minus_one + ld a, -1 scf ret Function245a7: ; 245a7 (9:45a7) call Function18f5 - ld a, $ff + ld a, -1 ret c xor a ret @@ -25302,26 +25302,26 @@ Function245af:: ; 245af ; 245cb Function245cb:: ; 245cb -.asm_245cb +.loop call Function24609 jp c, Function245d6 call z, Function245e1 - jr .asm_245cb + jr .loop ; 245d6 Function245d6: ; 245d6 call Function1ff8 ld [wcf73], a - ld a, $0 + ld a, 0 ld [$ffaa], a ret ; 245e1 Function245e1: ; 245e1 call Function245f1 - ld a, $1 + ld a, 1 ld [hBGMapMode], a - ld c, $3 + ld c, 3 call DelayFrames xor a ld [hBGMapMode], a @@ -49467,35 +49467,35 @@ UnknownScript_0x507af: ; 0x507af _BasementKey: ; 507b4 ld a, [MapGroup] cp GROUP_WAREHOUSE_ENTRANCE - jr nz, .asm_507db + jr nz, .nope ld a, [MapNumber] cp MAP_WAREHOUSE_ENTRANCE - jr nz, .asm_507db + jr nz, .nope call GetFacingTileCoord ld a, d cp 22 - jr nz, .asm_507db + jr nz, .nope ld a, e cp 10 - jr nz, .asm_507db + jr nz, .nope - ld hl, UnknownScript_0x507e1 + ld hl, UnlockBasementDoorScript call Function31cd - ld a, $1 + ld a, 1 ld [wd0ec], a ret -.asm_507db +.nope ld a, $0 ld [wd0ec], a ret ; 507e1 -UnknownScript_0x507e1: ; 0x507e1 +UnlockBasementDoorScript: ; 0x507e1 loadmovesprites - farjump MapWarehouseEntranceSignpost0Script + farjump BasementDoorScript ; 0x507e6 @@ -49505,7 +49505,7 @@ _SacredAsh: ; 507e6 call CheckAnyFaintedMon ret nc - ld hl, UnknownScript_0x50821 + ld hl, SacredAshScript call Function31cd ld a, $1 ld [wd0ec], a @@ -49548,7 +49548,7 @@ CheckAnyFaintedMon: ; 507fb ret ; 50821 -UnknownScript_0x50821: ; 0x50821 +SacredAshScript: ; 0x50821 special HealParty reloadmappart playsound SFX_WARP_TO diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index bd1e506ba..cba5ebbfe 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -51,7 +51,7 @@ UnknownScript_0x198049: writetext UnknownText_0x19814d closetext loadmovesprites - setevent EVENT_6BF + setevent EVENT_RIVAL_AZALEA_TOWN checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x198071 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -158,8 +158,8 @@ UnknownScript_0x1980e5: verbosegiveitem GS_BALL, 1 spriteface $d, LEFT setflag ENGINE_HAVE_EXAMINED_GS_BALL - clearevent EVENT_6ED - setevent EVENT_6EB + clearevent EVENT_ILEX_FOREST_LASS + setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS dotrigger $0 loadmovesprites end @@ -201,8 +201,7 @@ WhiteApricornTree: fruittree $14 MapAzaleaTownSignpostItem8: - dw $00b1 - db FULL_HEAL + dwb EVENT_AZALEA_TOWN_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x198134: @@ -478,19 +477,19 @@ AzaleaTown_MapEventHeader: signpost 9, 16, SIGNPOST_READ, AzaleaTownPokeCenterSign signpost 5, 22, SIGNPOST_READ, AzaleaTownMartSign signpost 9, 3, SIGNPOST_READ, AzaleaTownIlextForestSign - signpost 6, 31, SIGNPOST_ITEMIFSET, MapAzaleaTownSignpostItem8 + signpost 6, 31, SIGNPOST_ITEM, MapAzaleaTownSignpostItem8 ; people-events db 12 - person_event SPRITE_AZALEA_ROCKET, 13, 35, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA + person_event SPRITE_AZALEA_ROCKET, 13, 35, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET person_event SPRITE_GRAMPS, 13, 25, DOWN << 2 | $2, $21, -1, -1, $0, 0, GrampsScript_0x1980b1, -1 person_event SPRITE_TEACHER, 17, 19, UP << 2 | $0, $20, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x1980c5, -1 person_event SPRITE_YOUNGSTER, 13, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1980c8, -1 - person_event SPRITE_SLOWPOKE, 21, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 13, 22, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 13, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 - person_event SPRITE_SLOWPOKE, 19, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9 + person_event SPRITE_SLOWPOKE, 21, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 13, 22, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 13, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES + person_event SPRITE_SLOWPOKE, 19, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, SlowpokeScript_0x1980cb, EVENT_AZALEA_TOWN_SLOWPOKES person_event SPRITE_FRUIT_TREE, 6, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, WhiteApricornTree, -1 - person_event SPRITE_AZALEA_ROCKET, 14, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6BF - person_event SPRITE_AZALEA_ROCKET, 20, 14, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC - person_event SPRITE_KURT_OUTSIDE, 9, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4 + person_event SPRITE_AZALEA_ROCKET, 14, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_AZALEA_TOWN + person_event SPRITE_AZALEA_ROCKET, 20, 14, UP << 2 | $2, $0, -1, -1, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_KURT_OUTSIDE, 9, 10, LEFT << 2 | $0, $0, -1, -1, $0, 0, KurtOutsideScript_0x19810c, EVENT_AZALEA_TOWN_KURT diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index f2c19cc93..709504693 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -155,5 +155,5 @@ BattleTowerBattleRoom_MapEventHeader: ; people-events db 2 - person_event SPRITE_YOUNGSTER, 4, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_791 + person_event SPRITE_YOUNGSTER, 4, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER person_event SPRITE_RECEPTIONIST, 10, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, -1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index 7542f2131..3d10ef549 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -13,7 +13,7 @@ BattleTowerOutside_MapScriptHeader: return .Callback2 - clearevent EVENT_7CF + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return StandingYoungsterScript_0x9f85f: @@ -144,5 +144,5 @@ BattleTowerOutside_MapEventHeader: db 4 person_event SPRITE_STANDING_YOUNGSTER, 16, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x9f85f, -1 person_event SPRITE_BUENA, 15, 17, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BuenaScript_0x9f862, -1 - person_event SPRITE_SAILOR, 22, 16, UP << 2 | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_7CF + person_event SPRITE_SAILOR, 22, 16, UP << 2 | $1, $1, -1, -1, $0, 0, SailorScript_0x9f865, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR person_event SPRITE_LASS, 28, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, -1 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index 49f850a4e..59e7456f8 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -333,12 +333,12 @@ BlackthornCity_MapEventHeader: ; people-events db 9 - person_event SPRITE_SUPER_NERD, 16, 22, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E3 - person_event SPRITE_SUPER_NERD, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4 - person_event SPRITE_GRAMPS, 6, 24, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_74C - person_event SPRITE_GRAMPS, 6, 25, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_74D + person_event SPRITE_SUPER_NERD, 16, 22, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + person_event SPRITE_SUPER_NERD, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a46e8, EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM + person_event SPRITE_GRAMPS, 6, 24, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x1a4708, EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + person_event SPRITE_GRAMPS, 6, 25, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrampsScript_0x1a470b, EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN person_event SPRITE_BLACK_BELT, 35, 28, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x1a470e, -1 person_event SPRITE_COOLTRAINER_F, 29, 13, UP << 2 | $1, $2, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerFScript_0x1a4722, -1 person_event SPRITE_YOUNGSTER, 19, 17, UP << 2 | $1, $1, -1, -1, $0, 0, YoungsterScript_0x1a4725, -1 - person_event SPRITE_YOUNGSTER, 24, 26, UP << 2 | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_75D + person_event SPRITE_YOUNGSTER, 24, 26, UP << 2 | $2, $0, -1, -1, $0, 0, SantosScript, EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY person_event SPRITE_COOLTRAINER_F, 23, 39, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1a4728, -1 diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index 5c9d7acf3..9ab5cb56e 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -47,9 +47,9 @@ ClairScript_0x194e24: setevent EVENT_BEAT_COOLTRAINERM_MIKE setevent EVENT_BEAT_COOLTRAINERF_FRAN setevent EVENT_BEAT_COOLTRAINERF_LOLA - clearevent EVENT_736 - setevent EVENT_74C - clearevent EVENT_74D + clearevent EVENT_MAHOGANY_MART_OWNERS + setevent EVENT_BLACKTHORN_CITY_GRAMPS_BLOCKS_DRAGONS_DEN + clearevent EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN end .FightDone writetext UnknownText_0x195162 diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index 4843820ff..b87acda50 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -97,7 +97,7 @@ UnknownScript_0x185c80: closetext loadmovesprites dotrigger $2 - setevent EVENT_6C5 + setevent EVENT_RIVAL_BURNED_TOWER special Functionc48f pause 15 earthquake 50 @@ -129,13 +129,11 @@ BurnedTower1FRock: jumpstd smashrock MapBurnedTower1FSignpostItem0: - dw $0080 - db ETHER + dwb EVENT_BURNED_TOWER_1F_HIDDEN_ETHER, ETHER MapBurnedTower1FSignpostItem1: - dw $00ff - db ULTRA_BALL + dwb EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL, ULTRA_BALL ItemFragment_0x185ccb: @@ -306,13 +304,13 @@ BurnedTower1F_MapEventHeader: ; signposts db 2 - signpost 7, 8, SIGNPOST_ITEMIFSET, MapBurnedTower1FSignpostItem0 - signpost 11, 13, SIGNPOST_ITEMIFSET, MapBurnedTower1FSignpostItem1 + signpost 7, 8, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem0 + signpost 11, 13, SIGNPOST_ITEM, MapBurnedTower1FSignpostItem1 ; people-events db 5 person_event SPRITE_ROCK, 8, 19, LEFT << 2 | $10, $0, -1, -1, $0, 0, BurnedTower1FRock, -1 - person_event SPRITE_SUPER_NERD, 16, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_765 - person_event SPRITE_SILVER, 13, 12, LEFT << 2 | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_6C5 - person_event SPRITE_MORTY, 18, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_764 - person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_656 + person_event SPRITE_SUPER_NERD, 16, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x185cbc, EVENT_BURNED_TOWER_1F_EUSINE + person_event SPRITE_SILVER, 13, 12, LEFT << 2 | $0, $0, -1, -1, $2, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER + person_event SPRITE_MORTY, 18, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MortyScript_0x185cbf, EVENT_BURNED_TOWER_MORTY + person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ccb, EVENT_BURNED_TOWER_1F_HP_UP diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index 7bb1bdb02..0be2b4395 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -81,10 +81,10 @@ UnknownScript_0x18616b: domaptrigger GROUP_ECRUTEAK_GYM, MAP_ECRUTEAK_GYM, $1 domaptrigger GROUP_CIANWOOD_CITY, MAP_CIANWOOD_CITY, $1 clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY - setevent EVENT_7A8 - clearevent EVENT_7A9 - setevent EVENT_764 - setevent EVENT_765 + setevent EVENT_ECRUTEAK_GYM_GRAMPS + clearevent EVENT_ECRUTEAK_CITY_GRAMPS + setevent EVENT_BURNED_TOWER_MORTY + setevent EVENT_BURNED_TOWER_1F_EUSINE appear $a refreshscreen $0 changeblock $6, $e, $1b @@ -252,11 +252,11 @@ BurnedTowerB1F_MapEventHeader: ; people-events db 9 person_event SPRITE_BOULDER, 12, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, BurnedTowerB1FBoulder, -1 - person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_74A - person_event SPRITE_ENTEI, 7, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_74A - person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_74A - person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B - person_event SPRITE_ENTEI, 7, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B - person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_74B - person_event SPRITE_POKE_BALL, 8, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_657 + person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_ENTEI, 7, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_1 + person_event SPRITE_RAIKOU, 7, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_ENTEI, 7, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_SUICUNE, 8, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_SILVER << 4) | $80, 0, ObjectEvent, EVENT_BURNED_TOWER_B1F_BEASTS_2 + person_event SPRITE_POKE_BALL, 8, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x186231, EVENT_BURNED_TOWER_B1F_TM_ENDURE person_event SPRITE_SUPER_NERD, 16, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x186212, EVENT_EUSINE_IN_BURNED_TOWER diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 988e54ede..f14579644 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -66,8 +66,7 @@ CeladonCityPokeCenterSign: jumpstd pokecentersign MapCeladonCitySignpostItem7: - dw $00fd - db PP_UP + dwb EVENT_CELADON_CITY_HIDDEN_PP_UP, PP_UP UnknownText_0x1a9f7d: text "This POLIWRATH is" @@ -254,7 +253,7 @@ CeladonCity_MapEventHeader: signpost 21, 19, SIGNPOST_READ, CeladonCityGameCornerSign signpost 21, 29, SIGNPOST_READ, CeladonCityTrainerTips signpost 9, 30, SIGNPOST_READ, CeladonCityPokeCenterSign - signpost 21, 37, SIGNPOST_ITEMIFSET, MapCeladonCitySignpostItem7 + signpost 21, 37, SIGNPOST_ITEM, MapCeladonCitySignpostItem7 ; people-events db 9 diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 3a60b2230..b1214d2c2 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -141,8 +141,7 @@ CeruleanCityMartSign: jumpstd martsign MapCeruleanCitySignpostItem8: - dw EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY - db BERSERK_GENE + dwb EVENT_FOUND_BERSERK_GENE_IN_CERULEAN_CITY, BERSERK_GENE UnknownText_0x1840bc: text "KANTO's POWER" @@ -296,7 +295,7 @@ CeruleanCity_MapEventHeader: signpost 29, 14, SIGNPOST_READ, CeruleanLockedDoor signpost 21, 20, SIGNPOST_READ, CeruleanCityPokeCenterSign signpost 29, 26, SIGNPOST_READ, CeruleanCityMartSign - signpost 12, 2, SIGNPOST_ITEMIFSET, MapCeruleanCitySignpostItem8 + signpost 12, 2, SIGNPOST_ITEM, MapCeruleanCitySignpostItem8 ; people-events db 6 diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 952e3251e..3e7e94728 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -40,8 +40,8 @@ UnknownScript_0x1883de: playsound SFX_EXIT_BUILDING disappear $2 setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM - clearevent EVENT_76C - clearevent EVENT_76E + clearevent EVENT_ROUTE_24_ROCKET + clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND dotrigger $0 domaptrigger GROUP_ROUTE_25, MAP_ROUTE_25, $1 domaptrigger GROUP_POWER_PLANT, MAP_POWER_PLANT, $0 @@ -177,8 +177,7 @@ CeruleanGymGuyScript: end MapCeruleanGymSignpostItem0: - dw $00fb - db MACHINE_PART + dwb EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM, MACHINE_PART CeruleanGymStatue1: @@ -420,13 +419,13 @@ CeruleanGym_MapEventHeader: ; signposts db 3 - signpost 8, 3, SIGNPOST_ITEMIFSET, MapCeruleanGymSignpostItem0 + signpost 8, 3, SIGNPOST_ITEM, MapCeruleanGymSignpostItem0 signpost 13, 2, SIGNPOST_READ, CeruleanGymStatue1 signpost 13, 6, SIGNPOST_READ, CeruleanGymStatue2 ; people-events db 6 - person_event SPRITE_ROCKET, 14, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_76D + person_event SPRITE_ROCKET, 14, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_CERULEAN_GYM_ROCKET person_event SPRITE_MISTY, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MistyScript_0x188432, EVENT_TRAINERS_IN_CERULEAN_GYM person_event SPRITE_SWIMMER_GIRL, 10, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerSwimmerfDiana, EVENT_TRAINERS_IN_CERULEAN_GYM person_event SPRITE_SWIMMER_GIRL, 13, 5, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerSwimmerfBriana, EVENT_TRAINERS_IN_CERULEAN_GYM diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 0429f25a8..975b9180c 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -570,8 +570,8 @@ CherrygroveCity_MapEventHeader: ; people-events db 5 - person_event SPRITE_GRAMPS, 10, 36, UP << 2 | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_6FE - person_event SPRITE_SILVER, 10, 43, DOWN << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6BE + person_event SPRITE_GRAMPS, 10, 36, UP << 2 | $2, $0, -1, -1, $0, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE + person_event SPRITE_SILVER, 10, 43, DOWN << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY person_event SPRITE_TEACHER, 16, 31, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x19c146, -1 person_event SPRITE_YOUNGSTER, 11, 27, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x19c15a, -1 person_event SPRITE_FISHER, 16, 11, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, MysticWaterGuy, -1 diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index 80886aa07..47b8e5a97 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -135,12 +135,10 @@ CianwoodCityRock: jumpstd smashrock MapCianwoodCitySignpostItem6: - dw $00b2 - db REVIVE + dwb EVENT_CIANWOOD_CITY_HIDDEN_REVIVE, REVIVE MapCianwoodCitySignpostItem7: - dw $00b3 - db MAX_ETHER + dwb EVENT_CIANWOOD_CITY_HIDDEN_MAX_ETHER, MAX_ETHER MovementData_0x1a00da: db $39 ; movement @@ -398,8 +396,8 @@ CianwoodCity_MapEventHeader: signpost 47, 19, SIGNPOST_READ, CianwoodPharmacySign signpost 32, 8, SIGNPOST_READ, CianwoodPhotoStudioSign signpost 24, 8, SIGNPOST_READ, CianwoodPokeSeerSign - signpost 19, 4, SIGNPOST_ITEMIFSET, MapCianwoodCitySignpostItem6 - signpost 29, 5, SIGNPOST_ITEMIFSET, MapCianwoodCitySignpostItem7 + signpost 19, 4, SIGNPOST_ITEM, MapCianwoodCitySignpostItem6 + signpost 29, 5, SIGNPOST_ITEM, MapCianwoodCitySignpostItem7 ; people-events db 12 @@ -413,5 +411,5 @@ CianwoodCity_MapEventHeader: person_event SPRITE_ROCK, 31, 14, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 person_event SPRITE_ROCK, 23, 8, LEFT << 2 | $10, $0, -1, -1, $0, 0, CianwoodCityRock, -1 person_event SPRITE_POKEFAN_F, 50, 14, UP << 2 | $1, $1, -1, -1, $0, 0, PokefanFScript_0x1a0084, -1 - person_event SPRITE_SUPER_NERD, 25, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_7AD + person_event SPRITE_SUPER_NERD, 25, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_CIANWOOD_CITY_EUSINE person_event SPRITE_SUICUNE, 18, 14, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index fd154f439..16dd7a066 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -21,7 +21,7 @@ CinnabarIslandBlue: playsound SFX_WARP_TO applymovement $2, CinnabarIslandBlueTeleport disappear $2 - clearevent EVENT_776 + clearevent EVENT_VIRIDIAN_GYM_BLUE end CinnabarIslandGymSign: @@ -34,8 +34,7 @@ CinnabarIslandPokeCenterSign: jumpstd pokecentersign MapCinnabarIslandSignpostItem3: - dw $00fe - db RARE_CANDY + dwb EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY, RARE_CANDY CinnabarIslandBlueTeleport: teleport_from @@ -143,7 +142,7 @@ CinnabarIsland_MapEventHeader: signpost 11, 12, SIGNPOST_READ, CinnabarIslandPokeCenterSign signpost 11, 9, SIGNPOST_READ, CinnabarIslandGymSign signpost 7, 7, SIGNPOST_READ, CinnabarIslandSign - signpost 1, 9, SIGNPOST_ITEMIFSET, MapCinnabarIslandSignpostItem3 + signpost 1, 9, SIGNPOST_ITEM, MapCinnabarIslandSignpostItem3 ; people-events db 1 diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index d38321a88..67fb3a093 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -108,7 +108,7 @@ Copycat: keeptextopen takeitem LOST_ITEM, 1 setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT - clearevent EVENT_773 + clearevent EVENT_COPYCATS_HOUSE_2F_DOLL jump .Part14 .Part13 @@ -373,9 +373,9 @@ CopycatsHouse2F_MapEventHeader: ; people-events db 6 - person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Copycat, EVENT_6EE + person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Copycat, EVENT_COPYCAT_1 person_event SPRITE_MOLTRES, 8, 10, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CopycatsDodrio, -1 - person_event SPRITE_FAIRY, 5, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CopycatsHouse2FDoll, EVENT_773 + person_event SPRITE_FAIRY, 5, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CopycatsHouse2FDoll, EVENT_COPYCATS_HOUSE_2F_DOLL person_event SPRITE_MONSTER, 5, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CopycatsHouse2FDoll, -1 person_event SPRITE_BIRD, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CopycatsHouse2FDoll, -1 - person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, Copycat, EVENT_6EF + person_event SPRITE_COPYCAT, 7, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, Copycat, EVENT_COPYCAT_2 diff --git a/maps/DarkCaveBlackthornEntrance.asm b/maps/DarkCaveBlackthornEntrance.asm index aed85322e..6e1216fd1 100644 --- a/maps/DarkCaveBlackthornEntrance.asm +++ b/maps/DarkCaveBlackthornEntrance.asm @@ -74,5 +74,5 @@ DarkCaveBlackthornEntrance_MapEventHeader: ; people-events db 3 person_event SPRITE_PHARMACIST, 7, 11, DOWN << 2 | $3, $0, -1, -1, $0, 0, PharmacistScript_0x18c720, -1 - person_event SPRITE_POKE_BALL, 28, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73b, EVENT_6A1 - person_event SPRITE_POKE_BALL, 26, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73d, EVENT_6A2 + person_event SPRITE_POKE_BALL, 28, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73b, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_REVIVE + person_event SPRITE_POKE_BALL, 26, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c73d, EVENT_DARK_CAVE_BLACKTHORN_ENTRANCE_TM_SNORE diff --git a/maps/DarkCaveVioletEntrance.asm b/maps/DarkCaveVioletEntrance.asm index 6bc09411b..2215775f1 100644 --- a/maps/DarkCaveVioletEntrance.asm +++ b/maps/DarkCaveVioletEntrance.asm @@ -21,8 +21,7 @@ DarkCaveVioletEntranceRock: jumpstd smashrock MapDarkCaveVioletEntranceSignpostItem0: - dw $009d - db ELIXER + dwb EVENT_DARK_CAVE_VIOLET_ENTRANCE_HIDDEN_ELIXER, ELIXER DarkCaveVioletEntrance_MapEventHeader: @@ -40,15 +39,15 @@ DarkCaveVioletEntrance_MapEventHeader: ; signposts db 1 - signpost 3, 26, SIGNPOST_ITEMIFSET, MapDarkCaveVioletEntranceSignpostItem0 + signpost 3, 26, SIGNPOST_ITEM, MapDarkCaveVioletEntranceSignpostItem0 ; people-events db 8 - person_event SPRITE_POKE_BALL, 12, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c68e, EVENT_69E + person_event SPRITE_POKE_BALL, 12, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c68e, EVENT_DARK_CAVE_VIOLET_ENTRANCE_POTION person_event SPRITE_ROCK, 18, 20, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 10, 31, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 18, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 person_event SPRITE_ROCK, 35, 40, LEFT << 2 | $10, $0, -1, -1, $0, 0, DarkCaveVioletEntranceRock, -1 - person_event SPRITE_POKE_BALL, 26, 40, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c690, EVENT_69F - person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c692, EVENT_6A0 - person_event SPRITE_POKE_BALL, 32, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c694, EVENT_7CE + person_event SPRITE_POKE_BALL, 26, 40, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c690, EVENT_DARK_CAVE_VIOLET_ENTRANCE_FULL_HEAL + person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c692, EVENT_DARK_CAVE_VIOLET_ENTRANCE_HYPER_POTION + person_event SPRITE_POKE_BALL, 32, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c694, EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT diff --git a/maps/DayCare.asm b/maps/DayCare.asm index f6d03dada..22f7b4258 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -12,13 +12,13 @@ DayCare_MapScriptHeader: UnknownScript_0x62f7b: checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x62f88 - clearevent EVENT_6E5 - setevent EVENT_6E6 + clearevent EVENT_DAYCARE_MAN_IN_DAYCARE + setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 return UnknownScript_0x62f88: - setevent EVENT_6E5 - clearevent EVENT_6E6 + setevent EVENT_DAYCARE_MAN_IN_DAYCARE + clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 return GrampsScript_0x62f8f: @@ -175,5 +175,5 @@ DayCare_MapEventHeader: ; people-events db 2 - person_event SPRITE_GRAMPS, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrampsScript_0x62f8f, EVENT_6E5 + person_event SPRITE_GRAMPS, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrampsScript_0x62f8f, EVENT_DAYCARE_MAN_IN_DAYCARE person_event SPRITE_GRANNY, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrannyScript_0x62fc3, -1 diff --git a/maps/DiglettsCave.asm b/maps/DiglettsCave.asm index 62c2cd46e..ca65ef0bb 100644 --- a/maps/DiglettsCave.asm +++ b/maps/DiglettsCave.asm @@ -9,8 +9,7 @@ PokefanMScript_0x74002: jumptextfaceplayer UnknownText_0x74008 MapDiglettsCaveSignpostItem0: - dw $00e4 - db MAX_REVIVE + dwb EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE, MAX_REVIVE UnknownText_0x74008: @@ -39,7 +38,7 @@ DiglettsCave_MapEventHeader: ; signposts db 1 - signpost 11, 6, SIGNPOST_ITEMIFSET, MapDiglettsCaveSignpostItem0 + signpost 11, 6, SIGNPOST_ITEM, MapDiglettsCaveSignpostItem0 ; people-events db 1 diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index e8fdc5016..798b8d4a6 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -684,4 +684,4 @@ DragonShrine_MapEventHeader: person_event SPRITE_ELDER, 5, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000 person_event SPRITE_ELDER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000 person_event SPRITE_ELDER, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000 - person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_790 + person_event SPRITE_CLAIR, 12, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index 4481d3597..a1eece6bf 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -238,16 +238,13 @@ ItemFragment_0x18c9a3: db MAX_ELIXER, 1 MapDragonsDenB1FSignpostItem1: - dw $00a0 - db REVIVE + dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_REVIVE, REVIVE MapDragonsDenB1FSignpostItem2: - dw $00a1 - db MAX_POTION + dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_POTION, MAX_POTION MapDragonsDenB1FSignpostItem3: - dw $00a2 - db MAX_ELIXER + dwb EVENT_DRAGONS_DEN_B1F_HIDDEN_MAX_ELIXER, MAX_ELIXER MovementData_0x18c9ae: slow_step_right @@ -480,18 +477,18 @@ DragonsDenB1F_MapEventHeader: ; signposts db 4 signpost 24, 18, SIGNPOST_READ, MapDragonsDenB1FSignpost0Script - signpost 29, 33, SIGNPOST_ITEMIFSET, MapDragonsDenB1FSignpostItem1 - signpost 17, 21, SIGNPOST_ITEMIFSET, MapDragonsDenB1FSignpostItem2 - signpost 15, 31, SIGNPOST_ITEMIFSET, MapDragonsDenB1FSignpostItem3 + signpost 29, 33, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem1 + signpost 17, 21, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem2 + signpost 15, 31, SIGNPOST_ITEM, MapDragonsDenB1FSignpostItem3 ; people-events db 9 - person_event SPRITE_POKE_BALL, 20, 39, DOWN << 2 | $1, $0, -1, -1, $0, 0, PokeBallScript_0x18c95a, EVENT_6A8 - person_event SPRITE_CLAIR, 34, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_6D8 - person_event SPRITE_SILVER, 27, 24, DOWN << 2 | $2, $22, -1, -1, $0, 0, SilverScript_0x18c97e, EVENT_6C6 + person_event SPRITE_POKE_BALL, 20, 39, DOWN << 2 | $1, $0, -1, -1, $0, 0, PokeBallScript_0x18c95a, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG + person_event SPRITE_CLAIR, 34, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR + person_event SPRITE_SILVER, 27, 24, DOWN << 2 | $2, $22, -1, -1, $0, 0, SilverScript_0x18c97e, EVENT_RIVAL_DRAGONS_DEN person_event SPRITE_COOLTRAINER_M, 12, 24, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerCooltrainermDarin, -1 person_event SPRITE_COOLTRAINER_F, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCara, -1 person_event SPRITE_TWIN, 21, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia1, -1 person_event SPRITE_TWIN, 22, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsLeaandpia2, -1 - person_event SPRITE_POKE_BALL, 8, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a1, EVENT_7BF - person_event SPRITE_POKE_BALL, 24, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a3, EVENT_7C0 + person_event SPRITE_POKE_BALL, 8, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a1, EVENT_DRAGONS_DEN_B1F_CALCIUM + person_event SPRITE_POKE_BALL, 24, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c9a3, EVENT_DRAGONS_DEN_B1F_MAX_ELIXER diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index 841804c4d..1f8bd3329 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -425,7 +425,7 @@ EarlsPokemonAcademy_MapEventHeader: ; people-events db 6 - person_event SPRITE_FISHER, 6, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, AcademyEarl, EVENT_6CB + person_event SPRITE_FISHER, 6, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, AcademyEarl, EVENT_EARLS_ACADEMY_EARL person_event SPRITE_YOUNGSTER, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x68a83, -1 person_event SPRITE_GAMEBOY_KID, 15, 7, UP << 2 | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x68a86, -1 person_event SPRITE_GAMEBOY_KID, 15, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GameboyKidScript_0x68a91, -1 diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index ce7d15d97..ef49d7e13 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -81,8 +81,7 @@ EcruteakCityMartSign: jumpstd martsign MapEcruteakCitySignpostItem7: - dw $00b4 - db HYPER_POTION + dwb EVENT_ECRUTEAK_CITY_HIDDEN_HYPER_POTION, HYPER_POTION UnusedMissingDaughterText: ; This text is neither used nor referenced in the final game. @@ -287,7 +286,7 @@ EcruteakCity_MapEventHeader: signpost 10, 2, SIGNPOST_READ, BurnedTowerSign signpost 27, 24, SIGNPOST_READ, EcruteakCityPokeCenterSign signpost 21, 30, SIGNPOST_READ, EcruteakCityMartSign - signpost 14, 23, SIGNPOST_ITEMIFSET, MapEcruteakCitySignpostItem7 + signpost 14, 23, SIGNPOST_ITEM, MapEcruteakCitySignpostItem7 ; people-events db 7 @@ -297,4 +296,4 @@ EcruteakCity_MapEventHeader: person_event SPRITE_LASS, 13, 7, UP << 2 | $3, $0, -1, -1, $0, 0, LassScript_0x1a4015, -1 person_event SPRITE_FISHER, 26, 13, UP << 2 | $1, $1, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a4029, -1 person_event SPRITE_YOUNGSTER, 18, 14, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a403d, -1 - person_event SPRITE_GRAMPS, 11, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x1a400f, EVENT_7A9 + person_event SPRITE_GRAMPS, 11, 7, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GrampsScript_0x1a400f, EVENT_ECRUTEAK_CITY_GRAMPS diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index a30fbe9a4..c816119e6 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -37,8 +37,8 @@ MortyScript_0x99d58: checkcode VAR_BADGES scall EcruteakGymTriggerRockets domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $1 - setevent EVENT_766 - setevent EVENT_RANG_CLEAR_BELL + setevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_RANG_CLEAR_BELL_2 .FightDone checkevent EVENT_GOT_TM30_SHADOW_BALL iftrue UnknownScript_0x99db1 @@ -499,4 +499,4 @@ EcruteakGym_MapEventHeader: person_event SPRITE_GRANNY, 9, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumMartha, -1 person_event SPRITE_GRANNY, 13, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerMediumGrace, -1 person_event SPRITE_GYM_GUY, 19, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, EcruteakGymGuyScript, -1 - person_event SPRITE_GRAMPS, 18, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_7A8 + person_event SPRITE_GRAMPS, 18, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ECRUTEAK_GYM_GRAMPS diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 066b9125b..ff33be5cf 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -3,48 +3,48 @@ EcruteakHouse_MapScriptHeader: db 2 ; triggers - dw UnknownScript_0x9800d, $0000 - dw UnknownScript_0x9800e, $0000 + dw .Trigger1, $0000 + dw .Trigger2, $0000 ; callback count db 1 ; callbacks - dbw 2, UnknownScript_0x9800f + dbw 2, .InitializeSages -UnknownScript_0x9800d: +.Trigger1: end -UnknownScript_0x9800e: +.Trigger2: end -UnknownScript_0x9800f: +.InitializeSages: checkevent EVENT_FOUGHT_SUICUNE - iftrue UnknownScript_0x98033 + iftrue .DontBlockTower checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x98033 + iftrue .DontBlockTower checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x98022 + iftrue .BlockTower return -UnknownScript_0x98022: - clearevent EVENT_766 - setevent EVENT_RANG_CLEAR_BELL - setevent EVENT_7B1 +.BlockTower: + clearevent EVENT_RANG_CLEAR_BELL_1 + setevent EVENT_RANG_CLEAR_BELL_2 + setevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE checkitem CLEAR_BELL - iftrue UnknownScript_0x98032 + iftrue .NoClearBell dotrigger $0 -UnknownScript_0x98032: +.NoClearBell: return -UnknownScript_0x98033: - clearevent EVENT_7B1 +.DontBlockTower: + clearevent EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE return -UnknownScript_0x98037: - checkevent EVENT_RANG_CLEAR_BELL - iftrue UnknownScript_0x98061 +EcruteakHouse_XYTrigger1: + checkevent EVENT_RANG_CLEAR_BELL_2 + iftrue EcruteakHouse_XYTrigger_DontMove applymovement $3, MovementData_0x980c7 moveperson $2, $4, $6 appear $2 @@ -52,9 +52,9 @@ UnknownScript_0x98037: disappear $3 end -UnknownScript_0x9804c: - checkevent EVENT_766 - iftrue UnknownScript_0x98061 +EcruteakHouse_XYTrigger2: + checkevent EVENT_RANG_CLEAR_BELL_1 + iftrue EcruteakHouse_XYTrigger_DontMove applymovement $2, MovementData_0x980cc moveperson $3, $5, $6 appear $3 @@ -62,56 +62,56 @@ UnknownScript_0x9804c: disappear $2 end -UnknownScript_0x98061: +EcruteakHouse_XYTrigger_DontMove: end SageScript_0x98062: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x9807c + iftrue .CheckForClearBell checkflag ENGINE_FOGBADGE - iftrue UnknownScript_0x98076 + iftrue .BlockPassage_GotFogBadge writetext UnknownText_0x980d1 closetext loadmovesprites end -UnknownScript_0x98076: +.BlockPassage_GotFogBadge: writetext UnknownText_0x98131 closetext loadmovesprites end -UnknownScript_0x9807c: +.CheckForClearBell: checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x980a4 + iftrue .AllowedThrough checkevent EVENT_000 - iftrue UnknownScript_0x980aa + iftrue .Event000 checkitem CLEAR_BELL - iftrue UnknownScript_0x98093 + iftrue .RingClearBell writetext UnknownText_0x981a4 closetext loadmovesprites end -UnknownScript_0x98093: +.RingClearBell: writetext UnknownText_0x98250 closetext loadmovesprites dotrigger $1 - setevent EVENT_RANG_CLEAR_BELL - clearevent EVENT_766 + setevent EVENT_RANG_CLEAR_BELL_2 + clearevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_000 end -UnknownScript_0x980a4: +.AllowedThrough: writetext UnknownText_0x9837e closetext loadmovesprites end -UnknownScript_0x980aa: +.Event000: writetext UnknownText_0x98391 closetext loadmovesprites @@ -121,13 +121,13 @@ SageScript_0x980b0: faceplayer loadfont checkevent EVENT_GOT_CLEAR_BELL - iftrue UnknownScript_0x980be + iftrue .GotClearBell writetext UnknownText_0x9840b closetext loadmovesprites end -UnknownScript_0x980be: +.GotClearBell: writetext UnknownText_0x9846f closetext loadmovesprites @@ -290,15 +290,15 @@ EcruteakHouse_MapEventHeader: ; xy triggers db 2 - xy_trigger 0, $7, $4, $0, UnknownScript_0x98037, $0, $0 - xy_trigger 0, $7, $5, $0, UnknownScript_0x9804c, $0, $0 + xy_trigger 0, $7, $4, $0, EcruteakHouse_XYTrigger1, $0, $0 + xy_trigger 0, $7, $5, $0, EcruteakHouse_XYTrigger2, $0, $0 ; signposts db 0 ; people-events db 4 - person_event SPRITE_SAGE, 10, 8, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_766 - person_event SPRITE_SAGE, 10, 9, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL - person_event SPRITE_SAGE, 13, 10, DOWN << 2 | $2, $11, -1, -1, $0, 0, SageScript_0x980b0, EVENT_7B1 - person_event SPRITE_GRAMPS, 15, 7, DOWN << 2 | $2, $11, -1, -1, $0, 0, GrampsScript_0x980c4, EVENT_7B1 + person_event SPRITE_SAGE, 10, 8, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_1 + person_event SPRITE_SAGE, 10, 9, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x98062, EVENT_RANG_CLEAR_BELL_2 + person_event SPRITE_SAGE, 13, 10, DOWN << 2 | $2, $11, -1, -1, $0, 0, SageScript_0x980b0, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE + person_event SPRITE_GRAMPS, 15, 7, DOWN << 2 | $2, $11, -1, -1, $0, 0, GrampsScript_0x980c4, EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index c6981b7f2..7903eabbd 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -223,4 +223,4 @@ EcruteakPokeCenter1F_MapEventHeader: person_event SPRITE_POKEFAN_M, 10, 11, LEFT << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x98eb3, -1 person_event SPRITE_COOLTRAINER_F, 8, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, CooltrainerFScript_0x98ebf, -1 person_event SPRITE_GYM_GUY, 5, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, GymGuyScript_0x98ec2, -1 - person_event SPRITE_BILL, 11, 4, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_713 + person_event SPRITE_BILL, 11, 4, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_ECRUTEAK_POKE_CENTER_BILL diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 663b08ff3..8efa83678 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -270,7 +270,7 @@ ElmDirectionsScript: closetext loadmovesprites setevent EVENT_GOT_A_POKEMON_FROM_ELM - setevent EVENT_6BE + setevent EVENT_RIVAL_CHERRYGROVE_CITY dotrigger $5 domaptrigger GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $1 end @@ -339,8 +339,8 @@ ElmAfterTheftScript: setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM setflag ENGINE_BUG_CONTEST_ON domaptrigger GROUP_ROUTE_29, MAP_ROUTE_29, $1 - clearevent EVENT_715 - setevent EVENT_714 + clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY + setevent EVENT_ROUTE_30_BATTLE writetext ElmAfterTheftText6 closetext loadmovesprites diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index a1aaa629a..8ee6218aa 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -66,7 +66,7 @@ UnknownScript_0x7517a: playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - setevent EVENT_72B + setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1 warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11 end @@ -79,7 +79,7 @@ UnknownScript_0x7517a: playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - setevent EVENT_72A + setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1 warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17 end @@ -313,4 +313,4 @@ FastShip1F_MapEventHeader: person_event SPRITE_SAILOR, 6, 29, UP << 2 | $2, $0, -1, -1, $0, 0, SailorScript_0x75160, -1 person_event SPRITE_SAILOR, 11, 18, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x751d0, -1 person_event SPRITE_SAILOR, 21, 26, UP << 2 | $1, $2, -1, -1, $0, 0, SailorScript_0x751e4, -1 - person_event SPRITE_GENTLEMAN, 10, 23, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_72C + person_event SPRITE_GENTLEMAN, 10, 23, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_FAST_SHIP_1F_GENTLEMAN diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index e0942c54f..9f469d5c3 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -16,7 +16,7 @@ UnknownScript_0x7673b: end UnknownScript_0x7673c: - checkevent EVENT_72F + checkevent EVENT_FAST_SHIP_B1F_SAILOR_RIGHT iftrue UnknownScript_0x76766 applymovement $3, MovementData_0x76876 moveperson $2, $1e, $6 @@ -26,7 +26,7 @@ UnknownScript_0x7673c: end UnknownScript_0x76751: - checkevent EVENT_72E + checkevent EVENT_FAST_SHIP_B1F_SAILOR_LEFT iftrue UnknownScript_0x76766 applymovement $2, MovementData_0x76871 moveperson $3, $1f, $6 @@ -51,7 +51,7 @@ SailorScript_0x76767: closetext loadmovesprites setevent EVENT_034 - clearevent EVENT_72D + clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR end UnknownScript_0x76787: @@ -616,15 +616,15 @@ FastShipB1F_MapEventHeader: ; people-events db 12 - person_event SPRITE_SAILOR, 10, 34, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_72E - person_event SPRITE_SAILOR, 10, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_72F - person_event SPRITE_SAILOR, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorJeff, EVENT_739 - person_event SPRITE_LASS, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerDebra, EVENT_739 - person_event SPRITE_SUPER_NERD, 13, 30, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerJugglerFritz, EVENT_739 - person_event SPRITE_SAILOR, 8, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorGarrett, EVENT_73A - person_event SPRITE_FISHER, 12, 29, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherJonah, EVENT_73A - person_event SPRITE_BLACK_BELT, 15, 19, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltWai, EVENT_73A - person_event SPRITE_SAILOR, 8, 27, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorKenneth, EVENT_73B - person_event SPRITE_TEACHER, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherShirley, EVENT_73B - person_event SPRITE_YOUNGSTER, 13, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyNate, EVENT_73B - person_event SPRITE_YOUNGSTER, 15, 18, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyRicky, EVENT_73B + person_event SPRITE_SAILOR, 10, 34, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_LEFT + person_event SPRITE_SAILOR, 10, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x76767, EVENT_FAST_SHIP_B1F_SAILOR_RIGHT + person_event SPRITE_SAILOR, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorJeff, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_LASS, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerDebra, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SUPER_NERD, 13, 30, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerJugglerFritz, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SAILOR, 8, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorGarrett, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_FISHER, 12, 29, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherJonah, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_BLACK_BELT, 15, 19, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBlackbeltWai, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_SAILOR, 8, 27, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSailorKenneth, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_TEACHER, 15, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherShirley, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_YOUNGSTER, 13, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyNate, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_YOUNGSTER, 15, 18, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyRicky, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_NNW_NNE_NE.asm b/maps/FastShipCabins_NNW_NNE_NE.asm index 1cfce4c95..78110d9d7 100644 --- a/maps/FastShipCabins_NNW_NNE_NE.asm +++ b/maps/FastShipCabins_NNW_NNE_NE.asm @@ -374,10 +374,10 @@ FastShipCabins_NNW_NNE_NE_MapEventHeader: ; people-events db 7 - person_event SPRITE_COOLTRAINER_M, 7, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermSean, EVENT_73A - person_event SPRITE_COOLTRAINER_F, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCarol, EVENT_73A - person_event SPRITE_SUPER_NERD, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacEthan, EVENT_73B - person_event SPRITE_POKEFAN_M, 21, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerNoland, EVENT_739 - person_event SPRITE_SAILOR, 30, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x755f1, EVENT_72D - person_event SPRITE_GENTLEMAN, 34, 11, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerGentlemanEdward, EVENT_73A - person_event SPRITE_PHARMACIST, 34, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerBurglarCorey, EVENT_73B + person_event SPRITE_COOLTRAINER_M, 7, 8, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainermSean, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_COOLTRAINER_F, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfCarol, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_SUPER_NERD, 9, 5, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacEthan, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_POKEFAN_M, 21, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerNoland, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SAILOR, 30, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SailorScript_0x755f1, EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR + person_event SPRITE_GENTLEMAN, 34, 11, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerGentlemanEdward, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_PHARMACIST, 34, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerBurglarCorey, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm index a3c9ed360..a46c3dc0d 100644 --- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm +++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm @@ -67,7 +67,7 @@ UnknownScript_0x75f09: loadfont writetext UnknownText_0x76143 keeptextopen - setevent EVENT_72B + setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY domaptrigger GROUP_FAST_SHIP_1F, MAP_FAST_SHIP_1F, $0 jump UnknownScript_0x75f37 @@ -76,7 +76,7 @@ GentlemanScript_0x75f1f: loadfont checkevent EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA iftrue UnknownScript_0x75f67 - checkevent EVENT_732 + checkevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 iftrue UnknownScript_0x75f58 writetext UnknownText_0x760ae closetext @@ -584,13 +584,13 @@ FastShipCabins_SE_SSE_CaptainsCabin_MapEventHeader: ; people-events db 11 person_event SPRITE_CAPTAIN, 29, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, CaptainScript_0x75ea7, -1 - person_event SPRITE_GENTLEMAN, 21, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x75f1f, EVENT_730 - person_event SPRITE_TWIN, 21, 7, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75f6d, EVENT_731 - person_event SPRITE_TWIN, 29, 6, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75ebb, EVENT_732 - person_event SPRITE_POKEFAN_M, 10, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerPokefanmColin, EVENT_739 - person_event SPRITE_TWIN, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg1, EVENT_739 - person_event SPRITE_TWIN, 8, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg2, EVENT_739 - person_event SPRITE_SUPER_NERD, 9, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerPsychicRodney, EVENT_73A - person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJeremy, EVENT_73B - person_event SPRITE_POKEFAN_F, 9, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerPokefanfGeorgia, EVENT_73B - person_event SPRITE_SUPER_NERD, 19, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdShawn, EVENT_73A + person_event SPRITE_GENTLEMAN, 21, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x75f1f, EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + person_event SPRITE_TWIN, 21, 7, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75f6d, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + person_event SPRITE_TWIN, 29, 6, LEFT << 2 | $2, $0, -1, -1, $0, 0, TwinScript_0x75ebb, EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_2 + person_event SPRITE_POKEFAN_M, 10, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerPokefanmColin, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_TWIN, 8, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg1, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_TWIN, 8, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsMegandpeg2, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_SUPER_NERD, 9, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerPsychicRodney, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_POKEFAN_M, 7, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmJeremy, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_POKEFAN_F, 9, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerPokefanfGeorgia, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_SUPER_NERD, 19, 5, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdShawn, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index cc199c381..2b888eeca 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -303,7 +303,7 @@ FastShipCabins_SW_SSW_NW_MapEventHeader: ; people-events db 4 - person_event SPRITE_FISHER, 19, 5, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherLyle, EVENT_739 - person_event SPRITE_BUG_CATCHER, 19, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherKen, EVENT_73B - person_event SPRITE_BUENA, 30, 5, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyCassie, EVENT_73A - person_event SPRITE_ROCKER, 32, 7, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerGuitaristClyde, EVENT_73B + person_event SPRITE_FISHER, 19, 5, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerFirebreatherLyle, EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + person_event SPRITE_BUG_CATCHER, 19, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerBug_catcherKen, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND + person_event SPRITE_BUENA, 30, 5, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBeautyCassie, EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + person_event SPRITE_ROCKER, 32, 7, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerGuitaristClyde, EVENT_FAST_SHIP_PASSENGERS_WESTBOUND diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index e1c6d62d8..ba32d2c0e 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -31,7 +31,7 @@ GoldenrodCity_MapScriptHeader: return .MoveTutorAppear - checkflag ENGINE_5E + checkflag ENGINE_DAILY_MOVE_TUTOR iftrue .MoveTutorDone appear $10 .MoveTutorDone @@ -42,52 +42,52 @@ MoveTutor: loadfont writetext UnknownText_0x199042 yesorno - iffalse UnknownScript_0x19899a + iffalse .Refused special Function24b25 writetext UnknownText_0x199090 yesorno - iffalse UnknownScript_0x1989a0 + iffalse .Refused2 checkcoins 4000 - if_equal $2, UnknownScript_0x1989dd + if_equal $2, .NotEnoughMoney writetext UnknownText_0x1990ce - loadmenudata MenuDataHeader_0x198967 + loadmenudata .MoveMenuDataHeader interpretmenu2 writebackup - if_equal $1, UnknownScript_0x19893a - if_equal $2, UnknownScript_0x198949 - if_equal $3, UnknownScript_0x198958 - jump UnknownScript_0x1989d7 + if_equal $1, .Flamethrower + if_equal $2, .Thunderbolt + if_equal $3, .IceBeam + jump .Incompatible -UnknownScript_0x19893a: +.Flamethrower: writebyte $1 writetext UnknownText_0x1991cf special Function4925b - if_equal $0, UnknownScript_0x1989a6 - jump UnknownScript_0x1989d7 + if_equal $0, .TeachMove + jump .Incompatible -UnknownScript_0x198949: +.Thunderbolt: writebyte $2 writetext UnknownText_0x1991cf special Function4925b - if_equal $0, UnknownScript_0x1989a6 - jump UnknownScript_0x1989d7 + if_equal $0, .TeachMove + jump .Incompatible -UnknownScript_0x198958: +.IceBeam: writebyte $3 writetext UnknownText_0x1991cf special Function4925b - if_equal $0, UnknownScript_0x1989a6 - jump UnknownScript_0x1989d7 + if_equal $0, .TeachMove + jump .Incompatible -MenuDataHeader_0x198967: +.MoveMenuDataHeader: db $40 ; flags db 02, 00 ; start coords db 11, 15 ; end coords - dw MenuData2_0x19896f + dw .MenuData2 db 1 ; default option -MenuData2_0x19896f: +.MenuData2: db $80 ; flags db 4 ; items db "FLAMETHROWER@" @@ -96,19 +96,19 @@ MenuData2_0x19896f: db "CANCEL@" -UnknownScript_0x19899a: +.Refused: writetext UnknownText_0x1990b4 closetext loadmovesprites end -UnknownScript_0x1989a0: +.Refused2: writetext UnknownText_0x199107 closetext loadmovesprites end -UnknownScript_0x1989a6: +.TeachMove: writetext UnknownText_0x19913a keeptextopen takecoins 4000 @@ -119,27 +119,27 @@ UnknownScript_0x1989a6: closetext loadmovesprites checkcode VAR_FACING - if_equal $2, UnknownScript_0x1989c6 + if_equal $2, .WalkAroundPlayer applymovement $10, MovementData_0x198a5f - jump UnknownScript_0x1989ca + jump .GoInside -UnknownScript_0x1989c6: +.WalkAroundPlayer: applymovement $10, MovementData_0x198a63 -UnknownScript_0x1989ca: +.GoInside: playsound SFX_ENTER_DOOR disappear $10 - clearevent EVENT_76B - setflag ENGINE_5E + clearevent EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR + setflag ENGINE_DAILY_MOVE_TUTOR waitbutton end -UnknownScript_0x1989d7: +.Incompatible: writetext UnknownText_0x1991a4 closetext loadmovesprites end -UnknownScript_0x1989dd: +.NotEnoughMoney: writetext UnknownText_0x1991ac closetext loadmovesprites @@ -155,13 +155,13 @@ CooltrainerFScript_0x1989e9: faceplayer loadfont checkevent EVENT_CLEARED_RADIO_TOWER - iftrue UnknownScript_0x1989f7 + iftrue .ClearedRadioTower writetext UnknownText_0x198ae6 closetext loadmovesprites end -UnknownScript_0x1989f7: +.ClearedRadioTower: writetext UnknownText_0x198b2d closetext loadmovesprites @@ -171,13 +171,13 @@ CooltrainerFScript_0x1989fd: faceplayer loadfont checkflag ENGINE_RADIO_CARD - iftrue UnknownScript_0x198a0b + iftrue .GotRadioCard writetext UnknownText_0x198b73 closetext loadmovesprites end -UnknownScript_0x198a0b: +.GotRadioCard: writetext UnknownText_0x198c14 closetext loadmovesprites @@ -581,18 +581,18 @@ GoldenrodCity_MapEventHeader: ; people-events db 15 - person_event SPRITE_POKEFAN_M, 22, 11, UP << 2 | $3, $0, -1, -1, $0, 0, PokefanMScript_0x1989e3, EVENT_6CF - person_event SPRITE_YOUNGSTER, 21, 34, DOWN << 2 | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1989e6, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 20, 16, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1989e9, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 30, 24, DOWN << 2 | $2, $21, -1, -1, $0, 0, CooltrainerFScript_0x1989fd, EVENT_6CF - person_event SPRITE_YOUNGSTER, 21, 23, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x198a11, EVENT_6CF - person_event SPRITE_LASS, 14, 21, UP << 2 | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x198a14, EVENT_6CF - person_event SPRITE_GRAMPS, 31, 15, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x198a17, EVENT_6CF - person_event SPRITE_ROCKET, 20, 8, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a1a, EVENT_6CC - person_event SPRITE_ROCKET, 24, 32, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a29, EVENT_6CD - person_event SPRITE_ROCKET, 19, 12, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a2c, EVENT_6CD - person_event SPRITE_ROCKET, 27, 20, LEFT << 2 | $1, $0, -1, -1, $0, 0, RocketScript_0x198a2f, EVENT_6CE - person_event SPRITE_ROCKET, 24, 33, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a32, EVENT_6CE - person_event SPRITE_ROCKET, 11, 33, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a35, EVENT_6CE - person_event SPRITE_ROCKET, 14, 35, LEFT << 2 | $0, $0, -1, -1, $0, 0, RocketScript_0x198a38, EVENT_6CE - person_event SPRITE_POKEFAN_M, 26, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MoveTutor, EVENT_76A + person_event SPRITE_POKEFAN_M, 22, 11, UP << 2 | $3, $0, -1, -1, $0, 0, PokefanMScript_0x1989e3, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 21, 34, DOWN << 2 | $2, $11, -1, -1, $0, 0, YoungsterScript_0x1989e6, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 20, 16, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x1989e9, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 30, 24, DOWN << 2 | $2, $21, -1, -1, $0, 0, CooltrainerFScript_0x1989fd, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 21, 23, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x198a11, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_LASS, 14, 21, UP << 2 | $1, $2, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x198a14, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_GRAMPS, 31, 15, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x198a17, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_ROCKET, 20, 8, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a1a, EVENT_GOLDENROD_CITY_ROCKET_SCOUT + person_event SPRITE_ROCKET, 24, 32, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a29, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 19, 12, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a2c, EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 27, 20, LEFT << 2 | $1, $0, -1, -1, $0, 0, RocketScript_0x198a2f, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 24, 33, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x198a32, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 11, 33, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x198a35, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 14, 35, LEFT << 2 | $0, $0, -1, -1, $0, 0, RocketScript_0x198a38, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_POKEFAN_M, 26, 16, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, MoveTutor, EVENT_GOLDENROD_CITY_MOVE_TUTOR diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index f134c10d8..7612897a4 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -237,4 +237,4 @@ GoldenrodDeptStore5F_MapEventHeader: person_event SPRITE_COOLTRAINER_M, 7, 10, DOWN << 2 | $3, $0, -1, -1, $0, 0, CooltrainerMScript_0x56133, -1 person_event SPRITE_POKEFAN_M, 9, 17, DOWN << 2 | $2, $22, -1, -1, $0, 0, PokefanMScript_0x5613a, -1 person_event SPRITE_TWIN, 5, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TwinScript_0x56118, -1 - person_event SPRITE_RECEPTIONIST, 9, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x560ce, EVENT_763 + person_event SPRITE_RECEPTIONIST, 9, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x560ce, EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 7a5ce8806..2f878907e 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -121,10 +121,10 @@ GoldenrodDeptStoreB1F_MapEventHeader: ; people-events db 8 - person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c3, EVENT_675 - person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c5, EVENT_676 - person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c7, EVENT_677 - person_event SPRITE_POKE_BALL, 19, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c9, EVENT_678 + person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER + person_event SPRITE_POKE_BALL, 6, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN + person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c7, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL + person_event SPRITE_POKE_BALL, 19, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d7c9, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL person_event SPRITE_BLACK_BELT, 14, 13, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, BlackBeltScript_0x7d7b0, -1 person_event SPRITE_BLACK_BELT, 12, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, BlackBeltScript_0x7d7b3, -1 person_event SPRITE_BLACK_BELT, 17, 10, UP << 2 | $1, $1, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, BlackBeltScript_0x7d7b6, -1 diff --git a/maps/GoldenrodFlowerShop.asm b/maps/GoldenrodFlowerShop.asm index 335668ae0..72965848a 100644 --- a/maps/GoldenrodFlowerShop.asm +++ b/maps/GoldenrodFlowerShop.asm @@ -24,7 +24,7 @@ TeacherScript_0x5535d: setevent EVENT_GOT_SQUIRTBOTTLE loadmovesprites setevent EVENT_FLORIA_AT_SUDOWOODO - clearevent EVENT_768 + clearevent EVENT_FLORIA_AT_FLOWER_SHOP end UnknownScript_0x5538f: @@ -55,7 +55,7 @@ LassScript_0x553a2: closetext loadmovesprites setevent EVENT_0BA - setevent EVENT_768 + setevent EVENT_FLORIA_AT_FLOWER_SHOP clearevent EVENT_FLORIA_AT_SUDOWOODO end @@ -173,4 +173,4 @@ GoldenrodFlowerShop_MapEventHeader: ; people-events db 2 person_event SPRITE_TEACHER, 8, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, TeacherScript_0x5535d, -1 - person_event SPRITE_LASS, 10, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_768 + person_event SPRITE_LASS, 10, 9, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_FLORIA_AT_FLOWER_SHOP diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 81a96e61a..963d0655d 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -22,7 +22,7 @@ UnknownScript_0x56c0e: return UnknownScript_0x56c11: - checkflag ENGINE_5E + checkflag ENGINE_DAILY_MOVE_TUTOR iftrue UnknownScript_0x56c19 disappear $d UnknownScript_0x56c19: ;0x56c19 @@ -490,4 +490,4 @@ GoldenrodGameCorner_MapEventHeader: person_event SPRITE_COOLTRAINER_F, 7, 14, DOWN << 2 | $2, $12, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x56e1d, -1 person_event SPRITE_GENTLEMAN, 14, 9, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x56e20, -1 person_event SPRITE_POKEFAN_M, 13, 6, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, PokefanMScript_0x56e2b, -1 - person_event SPRITE_POKEFAN_M, 14, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x56c1a, EVENT_76B + person_event SPRITE_POKEFAN_M, 14, 21, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x56c1a, EVENT_GOLDENROD_GAME_CORNER_MOVE_TUTOR diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index 8a020c2e7..833602886 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -183,4 +183,4 @@ GoldenrodMagnetTrainStation_MapEventHeader: ; people-events db 2 person_event SPRITE_OFFICER, 13, 13, UP << 2 | $2, $0, -1, -1, $0, 0, OfficerScript_0x550ec, -1 - person_event SPRITE_GENTLEMAN, 18, 15, DOWN << 2 | $2, $22, -1, -1, $0, 0, GentlemanScript_0x55143, EVENT_749 + person_event SPRITE_GENTLEMAN, 18, 15, DOWN << 2 | $2, $22, -1, -1, $0, 0, GentlemanScript_0x55143, EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN diff --git a/maps/IcePath1F.asm b/maps/IcePath1F.asm index c3ffce2f8..29dee8019 100644 --- a/maps/IcePath1F.asm +++ b/maps/IcePath1F.asm @@ -33,6 +33,6 @@ IcePath1F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 11, 35, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_688 - person_event SPRITE_POKE_BALL, 27, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_689 - person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e476, EVENT_7BE + person_event SPRITE_POKE_BALL, 11, 35, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_ICE_PATH_1F_HM_WATERFALL + person_event SPRITE_POKE_BALL, 27, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP + person_event SPRITE_POKE_BALL, 13, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 34d9bef47..4294ceda3 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -34,22 +34,22 @@ StoneTable_0x7e4c7: UnknownScript_0x7e4d8: disappear 2 - clearevent EVENT_BOULDER_IN_ICE_PATH_1 + clearevent EVENT_BOULDER_IN_ICE_PATH_1A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4e0: disappear 3 - clearevent EVENT_BOULDER_IN_ICE_PATH_2 + clearevent EVENT_BOULDER_IN_ICE_PATH_2A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4e8: disappear 4 - clearevent EVENT_BOULDER_IN_ICE_PATH_3 + clearevent EVENT_BOULDER_IN_ICE_PATH_3A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4f0: disappear 5 - clearevent EVENT_BOULDER_IN_ICE_PATH_4 + clearevent EVENT_BOULDER_IN_ICE_PATH_4A jump UnknownScript_0x7e4f8 UnknownScript_0x7e4f8: @@ -74,8 +74,7 @@ ItemFragment_0x7e50d: db IRON, 1 MapIcePathB1FSignpostItem0: - dw $0094 - db MAX_POTION + dwb EVENT_ICE_PATH_B1F_HIDDEN_MAX_POTION, MAX_POTION UnknownText_0x7e512: @@ -104,12 +103,12 @@ IcePathB1F_MapEventHeader: ; signposts db 1 - signpost 30, 17, SIGNPOST_ITEMIFSET, MapIcePathB1FSignpostItem0 + signpost 30, 17, SIGNPOST_ITEM, MapIcePathB1FSignpostItem0 ; people-events db 5 - person_event SPRITE_BOULDER, 11, 15, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_709 - person_event SPRITE_BOULDER, 12, 11, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_70A - person_event SPRITE_BOULDER, 13, 12, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_70B - person_event SPRITE_BOULDER, 11, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_70C - person_event SPRITE_POKE_BALL, 39, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e50d, EVENT_68A + person_event SPRITE_BOULDER, 11, 15, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_1 + person_event SPRITE_BOULDER, 12, 11, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_2 + person_event SPRITE_BOULDER, 13, 12, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_3 + person_event SPRITE_BOULDER, 11, 21, LEFT << 2 | $11, $0, -1, -1, $0, 0, IcePathB1FBoulder, EVENT_BOULDER_IN_ICE_PATH_4 + person_event SPRITE_POKE_BALL, 39, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e50d, EVENT_ICE_PATH_B1F_IRON diff --git a/maps/IcePathB2FBlackthornSide.asm b/maps/IcePathB2FBlackthornSide.asm index 623a50ad8..903063c4e 100644 --- a/maps/IcePathB2FBlackthornSide.asm +++ b/maps/IcePathB2FBlackthornSide.asm @@ -9,8 +9,7 @@ ItemFragment_0x7e646: db TM_REST, 1 MapIcePathB2FBlackthornSideSignpostItem0: - dw $0096 - db ICE_HEAL + dwb EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_HIDDEN_ICE_HEAL, ICE_HEAL IcePathB2FBlackthornSide_MapEventHeader: @@ -27,8 +26,8 @@ IcePathB2FBlackthornSide_MapEventHeader: ; signposts db 1 - signpost 10, 2, SIGNPOST_ITEMIFSET, MapIcePathB2FBlackthornSideSignpostItem0 + signpost 10, 2, SIGNPOST_ITEM, MapIcePathB2FBlackthornSideSignpostItem0 ; people-events db 1 - person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e646, EVENT_68D + person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e646, EVENT_ICE_PATH_B2F_BLACKTHORN_SIDE_TM_REST diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index 00dab155b..6a039d1e9 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -15,8 +15,7 @@ ItemFragment_0x7e5a8: db MAX_POTION, 1 MapIcePathB2FMahoganySideSignpostItem0: - dw $0095 - db CARBOS + dwb EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS UnknownText_0x7e5ad: @@ -42,13 +41,13 @@ IcePathB2FMahoganySide_MapEventHeader: ; signposts db 1 - signpost 17, 0, SIGNPOST_ITEMIFSET, MapIcePathB2FMahoganySideSignpostItem0 + signpost 17, 0, SIGNPOST_ITEM, MapIcePathB2FMahoganySideSignpostItem0 ; people-events db 6 - person_event SPRITE_BOULDER, 7, 15, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1 - person_event SPRITE_BOULDER, 11, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2 - person_event SPRITE_BOULDER, 16, 7, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3 - person_event SPRITE_BOULDER, 17, 16, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4 - person_event SPRITE_POKE_BALL, 13, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a6, EVENT_68B - person_event SPRITE_POKE_BALL, 6, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a8, EVENT_68C + person_event SPRITE_BOULDER, 7, 15, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A + person_event SPRITE_BOULDER, 11, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A + person_event SPRITE_BOULDER, 16, 7, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A + person_event SPRITE_BOULDER, 17, 16, DOWN << 2 | $1, $0, -1, -1, $0, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A + person_event SPRITE_POKE_BALL, 13, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a6, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL + person_event SPRITE_POKE_BALL, 6, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e5a8, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/IcePathB3F.asm b/maps/IcePathB3F.asm index a8fca6f09..bc9c8085b 100644 --- a/maps/IcePathB3F.asm +++ b/maps/IcePathB3F.asm @@ -28,5 +28,5 @@ IcePathB3F_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKE_BALL, 11, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e66f, EVENT_68E + person_event SPRITE_POKE_BALL, 11, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e66f, EVENT_ICE_PATH_B3F_NEVERMELTICE person_event SPRITE_ROCK, 10, 10, LEFT << 2 | $10, $0, -1, -1, $0, 0, IcePathB3FRock, -1 diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index a0e40c51f..6a7757db9 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -344,9 +344,9 @@ BlackBeltScript_0x6edae: writetext UnknownText_0x6f141 closetext loadmovesprites - setevent EVENT_6E9 - setevent EVENT_6F3 - setevent EVENT_6F4 + setevent EVENT_ILEX_FOREST_FARFETCHD + setevent EVENT_ILEX_FOREST_APPRENTICE + setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER clearevent EVENT_6F5 clearevent EVENT_6F6 clearevent EVENT_6F7 @@ -418,18 +418,15 @@ ItemFragment_0x6ee16: db ETHER, 1 MapIlexForestSignpostItem1: - dw $0088 - db ETHER + dwb EVENT_ILEX_FOREST_HIDDEN_ETHER, ETHER MapIlexForestSignpostItem2: - dw $0089 - db SUPER_POTION + dwb EVENT_ILEX_FOREST_HIDDEN_SUPER_POTION, SUPER_POTION MapIlexForestSignpostItem3: - dw $008a - db FULL_HEAL + dwb EVENT_ILEX_FOREST_HIDDEN_FULL_HEAL, FULL_HEAL IlexForestBoulder: ; unused @@ -460,9 +457,9 @@ UnknownScript_0x6ee38: UnknownScript_0x6ee42: takeitem GS_BALL, 1 clearevent EVENT_FOREST_IS_RESTLESS - setevent EVENT_7A4 + setevent EVENT_AZALEA_TOWN_KURT disappear $8 - clearevent EVENT_6EB + clearevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS writetext UnknownText_0x6f43b closetext loadmovesprites @@ -962,21 +959,21 @@ IlexForest_MapEventHeader: ; signposts db 5 signpost 17, 3, SIGNPOST_READ, MapIlexForestSignpost0Script - signpost 7, 11, SIGNPOST_ITEMIFSET, MapIlexForestSignpostItem1 - signpost 14, 22, SIGNPOST_ITEMIFSET, MapIlexForestSignpostItem2 - signpost 17, 1, SIGNPOST_ITEMIFSET, MapIlexForestSignpostItem3 + signpost 7, 11, SIGNPOST_ITEM, MapIlexForestSignpostItem1 + signpost 14, 22, SIGNPOST_ITEM, MapIlexForestSignpostItem2 + signpost 17, 1, SIGNPOST_ITEM, MapIlexForestSignpostItem3 signpost 22, 8, SIGNPOST_UP, MapIlexForestSignpost4Script ; people-events db 11 - person_event SPRITE_BIRD, 35, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x6eb8f, EVENT_6E9 - person_event SPRITE_YOUNGSTER, 32, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6eb7b, EVENT_6F3 - person_event SPRITE_BLACK_BELT, 32, 9, LEFT << 2 | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x6edae, EVENT_6F4 + person_event SPRITE_BIRD, 35, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BirdScript_0x6eb8f, EVENT_ILEX_FOREST_FARFETCHD + person_event SPRITE_YOUNGSTER, 32, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6eb7b, EVENT_ILEX_FOREST_APPRENTICE + person_event SPRITE_BLACK_BELT, 32, 9, LEFT << 2 | $1, $0, -1, -1, $0, 0, BlackBeltScript_0x6edae, EVENT_ILEX_FOREST_CHARCOAL_MASTER person_event SPRITE_ROCKER, 18, 19, LEFT << 2 | $1, $0, -1, -1, $0, 0, RockerScript_0x6edde, -1 - person_event SPRITE_POKE_BALL, 36, 24, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee10, EVENT_671 - person_event SPRITE_KURT, 33, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_7A5 - person_event SPRITE_LASS, 28, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x6ee0d, EVENT_6ED + person_event SPRITE_POKE_BALL, 36, 24, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee10, EVENT_ILEX_FOREST_REVIVE + person_event SPRITE_KURT, 33, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_ILEX_FOREST_KURT + person_event SPRITE_LASS, 28, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x6ee0d, EVENT_ILEX_FOREST_LASS person_event SPRITE_YOUNGSTER, 5, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 0, TrainerBug_catcherWayne, -1 - person_event SPRITE_POKE_BALL, 21, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee12, EVENT_7B9 - person_event SPRITE_POKE_BALL, 11, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee14, EVENT_7BA - person_event SPRITE_POKE_BALL, 5, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee16, EVENT_7BB + person_event SPRITE_POKE_BALL, 21, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee12, EVENT_ILEX_FOREST_X_ATTACK + person_event SPRITE_POKE_BALL, 11, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee14, EVENT_ILEX_FOREST_ANTIDOTE + person_event SPRITE_POKE_BALL, 5, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6ee16, EVENT_ILEX_FOREST_ETHER diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index be28f2155..d5025f029 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -37,7 +37,7 @@ UnknownScript_0x18000a: clearevent EVENT_BEAT_ELITE_4_BRUNO clearevent EVENT_BEAT_ELITE_4_KAREN clearevent EVENT_BEAT_CHAMPION_LANCE - setevent EVENT_75F + setevent EVENT_LANCES_ROOM_OAK_AND_MARY return UnknownScript_0x180053: @@ -86,7 +86,7 @@ UnknownScript_0x1800ce: writetext UnknownText_0x1801f5 closetext loadmovesprites - setevent EVENT_77B + setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x1800f3 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -322,6 +322,6 @@ IndigoPlateauPokeCenter1F_MapEventHeader: person_event SPRITE_NURSE, 11, 7, UP << 2 | $2, $0, -1, -1, $0, 0, NurseScript_0x18012c, -1 person_event SPRITE_CLERK, 11, 15, UP << 2 | $2, $0, -1, -1, $0, 0, ClerkScript_0x18012f, -1 person_event SPRITE_COOLTRAINER_M, 15, 15, DOWN << 2 | $2, $22, -1, -1, $0, 0, CooltrainerMScript_0x180136, -1 - person_event SPRITE_SILVER, 13, 20, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_77B + person_event SPRITE_SILVER, 13, 20, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL person_event SPRITE_GRAMPS, 13, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeleportGuyScript, EVENT_TELEPORT_GUY person_event SPRITE_JYNX, 13, 4, UP << 2 | $12, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, AbraScript, EVENT_TELEPORT_GUY diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 5ad19236f..f12214fdb 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -39,8 +39,8 @@ UnknownScript_0x7a4f6: setflag ENGINE_PHONE_CARD addcellnum $1 dotrigger $1 - setevent EVENT_6C7 - clearevent EVENT_6C8 + setevent EVENT_KRISS_HOUSE_MOM_1 + clearevent EVENT_KRISS_HOUSE_MOM_2 writetext UnknownText_0x7a6bd keeptextopen special Function90913 @@ -404,8 +404,8 @@ KrissHouse1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, MomScript_0x7a582, EVENT_6C7 - person_event SPRITE_MOM, 6, 6, UP << 2 | $3, $0, -1, 1, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, 2, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_MOM, 6, 4, UP << 2 | $3, $0, -1, 4, $0, 0, MomScript_0x7a582, EVENT_6C8 - person_event SPRITE_POKEFAN_F, 8, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, NeighborScript, EVENT_792 + person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_1 + person_event SPRITE_MOM, 6, 6, UP << 2 | $3, $0, -1, 1, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 8, 11, LEFT << 2 | $0, $0, -1, 2, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_MOM, 6, 4, UP << 2 | $3, $0, -1, 4, $0, 0, MomScript_0x7a582, EVENT_KRISS_HOUSE_MOM_2 + person_event SPRITE_POKEFAN_F, 8, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, NeighborScript, EVENT_KRISS_HOUSE_1F_NEIGHBOR diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index 17a55ba6d..f53281589 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -132,7 +132,7 @@ KrissHouse2F_MapEventHeader: ; people-events db 4 - person_event SPRITE_CONSOLE, 6, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, GameConsole, EVENT_741 - person_event SPRITE_DOLL_1, 8, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll1, EVENT_742 - person_event SPRITE_DOLL_2, 8, 9, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll2, EVENT_743 - person_event SPRITE_BIG_DOLL, 5, 4, DOWN << 2 | $21, $0, -1, -1, $0, 0, BigDoll, EVENT_744 + person_event SPRITE_CONSOLE, 6, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, GameConsole, EVENT_KRISS_HOUSE_2F_CONSOLE + person_event SPRITE_DOLL_1, 8, 8, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll1, EVENT_KRISS_HOUSE_2F_DOLL_1 + person_event SPRITE_DOLL_2, 8, 9, DOWN << 2 | $1, $0, -1, -1, $0, 0, Doll2, EVENT_KRISS_HOUSE_2F_DOLL_2 + person_event SPRITE_BIG_DOLL, 5, 4, DOWN << 2 | $21, $0, -1, -1, $0, 0, BigDoll, EVENT_KRISS_HOUSE_2F_BIG_DOLL diff --git a/maps/KrissNeighborsHouse.asm b/maps/KrissNeighborsHouse.asm index cda93dd3d..783110cb9 100644 --- a/maps/KrissNeighborsHouse.asm +++ b/maps/KrissNeighborsHouse.asm @@ -115,4 +115,4 @@ KrissNeighborsHouse_MapEventHeader: ; people-events db 2 person_event SPRITE_COOLTRAINER_F, 7, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighborsDaughter, -1 - person_event SPRITE_POKEFAN_F, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighbor, EVENT_793 + person_event SPRITE_POKEFAN_F, 7, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, KrissNeighbor, EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index ae065d727..a5d83fe61 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -41,7 +41,7 @@ KurtScript_0x18e178: closetext loadmovesprites special Functionc48f - setevent EVENT_6FA + setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET checkcode VAR_FACING if_equal $1, UnknownScript_0x18e1ab spriteface $0, DOWN @@ -310,7 +310,7 @@ UnknownScript_0x18e3a2: UnknownScript_0x18e3ac: playsound SFX_EXIT_BUILDING disappear $2 - clearevent EVENT_7A4 + clearevent EVENT_AZALEA_TOWN_KURT waitbutton special RestartMapMusic domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $2 @@ -359,7 +359,7 @@ KurtsGranddaughter1: iftrue .Dad checkevent EVENT_CLEARED_SLOWPOKE_WELL iftrue .SlowpokeBack - checkevent EVENT_6FA + checkevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET iftrue .Lonely loadfont writetext KurtsGranddaughterSlowpokeGoneText @@ -702,8 +702,8 @@ KurtsHouse_MapEventHeader: ; people-events db 5 - person_event SPRITE_KURT, 6, 7, UP << 2 | $2, $0, -1, -1, $0, 0, KurtScript_0x18e178, EVENT_73E - person_event SPRITE_TWIN, 7, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, KurtsGranddaughter1, EVENT_78C - person_event SPRITE_SLOWPOKE, 7, 10, DOWN << 2 | $1, $0, -1, -1, $0, 0, KurtsHouseSlowpoke, EVENT_6FD - person_event SPRITE_KURT, 7, 18, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x18e3bd, EVENT_73F - person_event SPRITE_TWIN, 8, 15, LEFT << 2 | $1, $0, -1, -1, $0, 0, KurtsGranddaughter2, EVENT_78D + person_event SPRITE_KURT, 6, 7, UP << 2 | $2, $0, -1, -1, $0, 0, KurtScript_0x18e178, EVENT_KURTS_HOUSE_KURT_1 + person_event SPRITE_TWIN, 7, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, KurtsGranddaughter1, EVENT_KURTS_HOUSE_GRANDDAUGHTER_1 + person_event SPRITE_SLOWPOKE, 7, 10, DOWN << 2 | $1, $0, -1, -1, $0, 0, KurtsHouseSlowpoke, EVENT_KURTS_HOUSE_SLOWPOKE + person_event SPRITE_KURT, 7, 18, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x18e3bd, EVENT_KURTS_HOUSE_KURT_2 + person_event SPRITE_TWIN, 8, 15, LEFT << 2 | $1, $0, -1, -1, $0, 0, KurtsGranddaughter2, EVENT_KURTS_HOUSE_GRANDDAUGHTER_2 diff --git a/maps/LakeofRage.asm b/maps/LakeofRage.asm index b4514695d..b593b4857 100644 --- a/maps/LakeofRage.asm +++ b/maps/LakeofRage.asm @@ -51,7 +51,7 @@ UnknownScript_0x70035: playsound SFX_WARP_TO applymovement $2, MovementData_0x70155 disappear $2 - clearevent EVENT_6D5 + clearevent EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE setevent EVENT_DECIDED_TO_HELP_LANCE domaptrigger GROUP_MAHOGANY_MART_1F, MAP_MAHOGANY_MART_1F, $1 end @@ -287,18 +287,15 @@ ItemFragment_0x7014a: db TM_DETECT, 1 MapLakeofRageSignpostItem2: - dw $00b5 - db FULL_RESTORE + dwb EVENT_LAKE_OF_RAGE_HIDDEN_FULL_RESTORE, FULL_RESTORE MapLakeofRageSignpostItem3: - dw $00b6 - db RARE_CANDY + dwb EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY, RARE_CANDY MapLakeofRageSignpostItem4: - dw $00b7 - db MAX_POTION + dwb EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x70155: @@ -570,21 +567,21 @@ LakeofRage_MapEventHeader: db 5 signpost 27, 21, SIGNPOST_READ, MapLakeofRageSignpost0Script signpost 31, 25, SIGNPOST_READ, MapLakeofRageSignpost1Script - signpost 28, 11, SIGNPOST_ITEMIFSET, MapLakeofRageSignpostItem2 - signpost 4, 4, SIGNPOST_ITEMIFSET, MapLakeofRageSignpostItem3 - signpost 5, 35, SIGNPOST_ITEMIFSET, MapLakeofRageSignpostItem4 + signpost 28, 11, SIGNPOST_ITEM, MapLakeofRageSignpostItem2 + signpost 4, 4, SIGNPOST_ITEM, MapLakeofRageSignpostItem3 + signpost 5, 35, SIGNPOST_ITEM, MapLakeofRageSignpostItem4 ; people-events db 12 - person_event SPRITE_LANCE, 32, 25, UP << 2 | $3, $0, -1, -1, $0, 0, LanceScript_0x70022, EVENT_6D4 + person_event SPRITE_LANCE, 32, 25, UP << 2 | $3, $0, -1, -1, $0, 0, LanceScript_0x70022, EVENT_LAKE_OF_RAGE_LANCE person_event SPRITE_GRAMPS, 30, 24, UP << 2 | $3, $0, -1, -1, $0, 0, GrampsScript_0x7008e, -1 person_event SPRITE_SUPER_NERD, 17, 40, LEFT << 2 | $0, $0, -1, -1, $0, 0, SuperNerdScript_0x700a2, -1 person_event SPRITE_COOLTRAINER_F, 33, 29, UP << 2 | $1, $1, -1, -1, $0, 0, CooltrainerFScript_0x700a5, -1 - person_event SPRITE_FISHER, 27, 34, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherAndre, EVENT_735 - person_event SPRITE_FISHER, 30, 28, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherRaymond, EVENT_735 - person_event SPRITE_COOLTRAINER_M, 19, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermAaron, EVENT_735 - person_event SPRITE_COOLTRAINER_F, 11, 40, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerCooltrainerfLois, EVENT_735 - person_event SPRITE_GYARADOS, 26, 22, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GyaradosScript_0x70063, EVENT_751 - person_event SPRITE_SUPER_NERD, 8, 8, UP << 2 | $2, $0, -1, -1, $0, 0, WesleyScript, EVENT_75C - person_event SPRITE_POKE_BALL, 14, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x70148, EVENT_645 - person_event SPRITE_POKE_BALL, 6, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7014a, EVENT_646 + person_event SPRITE_FISHER, 27, 34, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_FISHER, 30, 28, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_COOLTRAINER_M, 19, 8, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 11, 40, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_GYARADOS, 26, 22, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GyaradosScript_0x70063, EVENT_LAKE_OF_RAGE_RED_GYARADOS + person_event SPRITE_SUPER_NERD, 8, 8, UP << 2 | $2, $0, -1, -1, $0, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY + person_event SPRITE_POKE_BALL, 14, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x70148, EVENT_LAKE_OF_RAGE_ELIXER + person_event SPRITE_POKE_BALL, 6, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7014a, EVENT_LAKE_OF_RAGE_TM_DETECT diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index 29cb5bc70..cb016f434 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -359,5 +359,5 @@ LancesRoom_MapEventHeader: ; people-events db 3 person_event SPRITE_LANCE, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, LanceScript_0x180e7b, -1 - person_event SPRITE_TEACHER, 11, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_75F - person_event SPRITE_OAK, 11, 8, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_75F + person_event SPRITE_TEACHER, 11, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY + person_event SPRITE_OAK, 11, 8, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_LANCES_ROOM_OAK_AND_MARY diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index ae938c099..03e02a75f 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -236,8 +236,8 @@ MahoganyMart1F_MapEventHeader: ; people-events db 5 - person_event SPRITE_PHARMACIST, 7, 8, UP << 2 | $2, $0, -1, -1, $0, 0, PharmacistScript_0x6c367, EVENT_6DA - person_event SPRITE_BLACK_BELT, 10, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, BlackBeltScript_0x6c37b, EVENT_6DA - person_event SPRITE_LANCE, 10, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D5 - person_event SPRITE_DRAGON, 10, 7, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D5 - person_event SPRITE_GRANNY, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrannyScript_0x6c3ee, EVENT_736 + person_event SPRITE_PHARMACIST, 7, 8, UP << 2 | $2, $0, -1, -1, $0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_BLACK_BELT, 10, 5, DOWN << 2 | $3, $0, -1, -1, $0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_LANCE, 10, 8, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_DRAGON, 10, 7, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_GRANNY, 7, 5, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index afa02f1c9..249002182 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -268,7 +268,7 @@ MahoganyTown_MapEventHeader: ; people-events db 4 - person_event SPRITE_POKEFAN_M, 12, 23, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x19002e, EVENT_756 + person_event SPRITE_POKEFAN_M, 12, 23, UP << 2 | $2, $0, -1, -1, $0, 0, PokefanMScript_0x19002e, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST person_event SPRITE_GRAMPS, 13, 10, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x19007e, -1 - person_event SPRITE_FISHER, 18, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x190092, EVENT_757 - person_event SPRITE_LASS, 12, 16, UP << 2 | $2, $0, -1, -1, $0, 0, LassScript_0x190095, EVENT_736 + person_event SPRITE_FISHER, 18, 10, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x190092, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM + person_event SPRITE_LASS, 12, 16, UP << 2 | $2, $0, -1, -1, $0, 0, LassScript_0x190095, EVENT_MAHOGANY_MART_OWNERS diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index ebd064561..1a6b7b12b 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -182,4 +182,4 @@ MountMoon_MapEventHeader: ; people-events db 1 - person_event SPRITE_SILVER, 7, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_77A + person_event SPRITE_SILVER, 7, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_RIVAL diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index a6359c118..af142f728 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -18,7 +18,7 @@ UnknownScript_0x77092: end UnknownScript_0x77093: - setevent EVENT_0EC + setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE return UnknownScript_0x77097: @@ -27,11 +27,11 @@ UnknownScript_0x77097: UnknownScript_0x7709a: checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY - iftrue UnknownScript_0x77117 + iftrue .NoDancing checkcode VAR_WEEKDAY - if_not_equal MONDAY, UnknownScript_0x77117 + if_not_equal MONDAY, .NoDancing checknite - iffalse UnknownScript_0x77117 + iffalse .NoDancing appear $2 appear $3 applymovement $0, MovementData_0x77121 @@ -68,16 +68,15 @@ UnknownScript_0x7709a: disappear $2 disappear $3 stopfollow - clearevent EVENT_0EC + clearevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE setflag ENGINE_MT_MOON_SQUARE_CLEFAIRY end -UnknownScript_0x77117: +.NoDancing: end MapMountMoonSquareSignpostItem0: - dw $00ec - db MOON_STONE + dwb EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE, MOON_STONE MapMountMoonSquareSignpost1Script: @@ -151,11 +150,11 @@ MountMoonSquare_MapEventHeader: ; signposts db 2 - signpost 7, 7, SIGNPOST_ITEMIFSET, MapMountMoonSquareSignpostItem0 + signpost 7, 7, SIGNPOST_ITEM, MapMountMoonSquareSignpostItem0 signpost 7, 17, SIGNPOST_READ, MapMountMoonSquareSignpost1Script ; people-events db 3 - person_event SPRITE_FAIRY, 10, 10, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_779 - person_event SPRITE_FAIRY, 10, 11, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_779 - person_event SPRITE_ROCK, 11, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, MtMoonSquareRock, EVENT_778 + person_event SPRITE_FAIRY, 10, 10, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + person_event SPRITE_FAIRY, 10, 11, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MT_MOON_SQUARE_CLEFAIRY + person_event SPRITE_ROCK, 11, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, MtMoonSquareRock, EVENT_MT_MOON_SQUARE_ROCK diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index 6501b70ef..5f9fd0df7 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -84,8 +84,7 @@ ItemFragment_0x7de88: db ULTRA_BALL, 1 MapMountMortar1FInsideSignpostItem0: - dw $0091 - db MAX_REPEL + dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL PokemaniacMillerSeenText: @@ -156,17 +155,17 @@ MountMortar1FInside_MapEventHeader: ; signposts db 1 - signpost 11, 30, SIGNPOST_ITEMIFSET, MapMountMortar1FInsideSignpostItem0 + signpost 11, 30, SIGNPOST_ITEM, MapMountMortar1FInsideSignpostItem0 ; people-events db 10 person_event SPRITE_BOULDER, 47, 25, LEFT << 2 | $11, $0, -1, -1, $0, 0, MountMortar1FBoulder, -1 - person_event SPRITE_POKE_BALL, 42, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7c, EVENT_67D - person_event SPRITE_POKE_BALL, 14, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7e, EVENT_67E - person_event SPRITE_POKE_BALL, 31, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de80, EVENT_67F - person_event SPRITE_POKE_BALL, 24, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de82, EVENT_7A6 - person_event SPRITE_POKE_BALL, 23, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de84, EVENT_7A7 + person_event SPRITE_POKE_BALL, 42, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 14, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7e, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + person_event SPRITE_POKE_BALL, 31, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de80, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + person_event SPRITE_POKE_BALL, 24, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de82, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 23, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET person_event SPRITE_SUPER_NERD, 47, 37, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacMiller, -1 person_event SPRITE_SUPER_NERD, 32, 28, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdMarkus, -1 - person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de86, EVENT_7C8 - person_event SPRITE_POKE_BALL, 21, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de88, EVENT_7C9 + person_event SPRITE_POKE_BALL, 20, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + person_event SPRITE_POKE_BALL, 21, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de88, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL diff --git a/maps/MountMortar1FOutside.asm b/maps/MountMortar1FOutside.asm index 4d5ba3a2d..fc312fcc4 100644 --- a/maps/MountMortar1FOutside.asm +++ b/maps/MountMortar1FOutside.asm @@ -12,8 +12,7 @@ ItemFragment_0x7ddf8: db REVIVE, 1 MapMountMortar1FOutsideSignpostItem0: - dw $0090 - db HYPER_POTION + dwb EVENT_MOUNT_MORTAR_1F_OUTSIDE_HIDDEN_HYPER_POTION, HYPER_POTION MountMortar1FOutside_MapEventHeader: @@ -37,9 +36,9 @@ MountMortar1FOutside_MapEventHeader: ; signposts db 1 - signpost 22, 25, SIGNPOST_ITEMIFSET, MapMountMortar1FOutsideSignpostItem0 + signpost 22, 25, SIGNPOST_ITEM, MapMountMortar1FOutsideSignpostItem0 ; people-events db 2 - person_event SPRITE_POKE_BALL, 19, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf6, EVENT_67B - person_event SPRITE_POKE_BALL, 22, 35, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf8, EVENT_67C + person_event SPRITE_POKE_BALL, 19, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf6, EVENT_MOUNT_MORTAR_1F_OUTSIDE_ETHER + person_event SPRITE_POKE_BALL, 22, 35, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ddf8, EVENT_MOUNT_MORTAR_1F_OUTSIDE_REVIVE diff --git a/maps/MountMortar2FInside.asm b/maps/MountMortar2FInside.asm index 560da0b01..5ed548be5 100644 --- a/maps/MountMortar2FInside.asm +++ b/maps/MountMortar2FInside.asm @@ -51,8 +51,7 @@ ItemFragment_0x7e0e8: db ESCAPE_ROPE, 1 MapMountMortar2FInsideSignpostItem0: - dw $0092 - db FULL_RESTORE + dwb EVENT_MOUNT_MORTAR_2F_INSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE SupernerdHughSeenText: @@ -89,14 +88,14 @@ MountMortar2FInside_MapEventHeader: ; signposts db 1 - signpost 8, 24, SIGNPOST_ITEMIFSET, MapMountMortar2FInsideSignpostItem0 + signpost 8, 24, SIGNPOST_ITEM, MapMountMortar2FInsideSignpostItem0 ; people-events db 7 - person_event SPRITE_POKE_BALL, 26, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0de, EVENT_680 - person_event SPRITE_POKE_BALL, 37, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e0, EVENT_681 - person_event SPRITE_POKE_BALL, 21, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e2, EVENT_682 - person_event SPRITE_POKE_BALL, 9, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e4, EVENT_683 - person_event SPRITE_POKE_BALL, 15, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e6, EVENT_684 - person_event SPRITE_POKE_BALL, 9, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e8, EVENT_685 + person_event SPRITE_POKE_BALL, 26, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0de, EVENT_MOUNT_MORTAR_2F_INSIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 37, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e0, EVENT_MOUNT_MORTAR_2F_INSIDE_RARE_CANDY + person_event SPRITE_POKE_BALL, 21, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e2, EVENT_MOUNT_MORTAR_2F_INSIDE_TM_DEFENSE_CURL + person_event SPRITE_POKE_BALL, 9, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e4, EVENT_MOUNT_MORTAR_2F_INSIDE_DRAGON_SCALE + person_event SPRITE_POKE_BALL, 15, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e6, EVENT_MOUNT_MORTAR_2F_INSIDE_ELIXER + person_event SPRITE_POKE_BALL, 9, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e0e8, EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE person_event SPRITE_SUPER_NERD, 30, 17, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdHugh, -1 diff --git a/maps/MountMortarB1F.asm b/maps/MountMortarB1F.asm index d8d42a630..e1bfd11a7 100644 --- a/maps/MountMortarB1F.asm +++ b/maps/MountMortarB1F.asm @@ -63,8 +63,7 @@ ItemFragment_0x7e248: db PP_UP, 1 MapMountMortarB1FSignpostItem0: - dw $0093 - db MAX_REVIVE + dwb EVENT_MOUNT_MORTAR_B1F_HIDDEN_MAX_REVIVE, MAX_REVIVE UnknownText_0x7e24d: @@ -141,14 +140,14 @@ MountMortarB1F_MapEventHeader: ; signposts db 1 - signpost 6, 4, SIGNPOST_ITEMIFSET, MapMountMortarB1FSignpostItem0 + signpost 6, 4, SIGNPOST_ITEM, MapMountMortarB1FSignpostItem0 ; people-events db 7 - person_event SPRITE_POKE_BALL, 16, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e240, EVENT_686 - person_event SPRITE_POKE_BALL, 20, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e242, EVENT_687 + person_event SPRITE_POKE_BALL, 16, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e240, EVENT_MOUNT_MORTAR_B1F_HYPER_POTION + person_event SPRITE_POKE_BALL, 20, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e242, EVENT_MOUNT_MORTAR_B1F_CARBOS person_event SPRITE_BOULDER, 14, 13, LEFT << 2 | $11, $0, -1, -1, $0, 0, MountMortarB1FBoulder, -1 person_event SPRITE_BLACK_BELT, 8, 20, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlackBeltScript_0x7e1f6, -1 - person_event SPRITE_POKE_BALL, 28, 38, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e244, EVENT_7CA - person_event SPRITE_POKE_BALL, 7, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e246, EVENT_7CB - person_event SPRITE_POKE_BALL, 30, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e248, EVENT_7CC + person_event SPRITE_POKE_BALL, 28, 38, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e244, EVENT_MOUNT_MORTAR_B1F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 7, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e246, EVENT_MOUNT_MORTAR_B1F_MAX_ETHER + person_event SPRITE_POKE_BALL, 30, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e248, EVENT_MOUNT_MORTAR_B1F_PP_UP diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 44a8d3a70..6716aea56 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -120,9 +120,9 @@ UnknownScript_0x196ec9: writetext UnknownText_0x197134 closetext loadmovesprites - setevent EVENT_6BD - setevent EVENT_792 - clearevent EVENT_793 + setevent EVENT_RIVAL_NEW_BARK_TOWN + setevent EVENT_KRISS_HOUSE_1F_NEIGHBOR + clearevent EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR dotrigger $1 domaptrigger GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY, $1 domaptrigger GROUP_ELMS_LAB, MAP_ELMS_LAB, $3 @@ -393,4 +393,4 @@ MrPokemonsHouse_MapEventHeader: ; people-events db 2 person_event SPRITE_GENTLEMAN, 9, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, GentlemanScript_0x196e97, -1 - person_event SPRITE_OAK, 9, 10, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C9 + person_event SPRITE_OAK, 9, 10, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MR_POKEMONS_HOUSE_OAK diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm index 43ea38f40..e9c596df7 100644 --- a/maps/NationalPark.asm +++ b/maps/NationalPark.asm @@ -353,8 +353,7 @@ ItemFragment_0x5c1ce: db TM_DIG, 1 MapNationalParkSignpostItem2: - dw $0084 - db FULL_HEAL + dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x5c1d3: @@ -581,7 +580,7 @@ NationalPark_MapEventHeader: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkSignpost1Script - signpost 47, 6, SIGNPOST_ITEMIFSET, MapNationalParkSignpostItem2 + signpost 47, 6, SIGNPOST_ITEM, MapNationalParkSignpostItem2 signpost 4, 12, SIGNPOST_READ, MapNationalParkSignpost3Script ; people-events @@ -597,6 +596,6 @@ NationalPark_MapEventHeader: person_event SPRITE_POKEFAN_F, 33, 22, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerPokefanfBeverly1, -1 person_event SPRITE_POKEFAN_M, 13, 20, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerPokefanmWilliam, -1 person_event SPRITE_LASS, 18, 12, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassKrise, -1 - person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1cc, EVENT_658 + person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1cc, EVENT_NATIONAL_PARK_PARLYZ_HEAL person_event SPRITE_GAMEBOY_KID, 10, 30, UP << 2 | $2, $0, -1, -1, $0, 0, GameboyKidScript_0x5c037, -1 - person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1ce, EVENT_659 + person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c1ce, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NationalParkBugContest.asm b/maps/NationalParkBugContest.asm index a965a436b..f91e7be51 100644 --- a/maps/NationalParkBugContest.asm +++ b/maps/NationalParkBugContest.asm @@ -101,8 +101,7 @@ ItemFragment_0x5c947: db TM_DIG, 1 MapNationalParkBugContestSignpostItem2: - dw $0084 - db FULL_HEAL + dwb EVENT_NATIONAL_PARK_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x5c94c: @@ -226,7 +225,7 @@ NationalParkBugContest_MapEventHeader: db 4 signpost 44, 14, SIGNPOST_READ, MapNationalParkBugContestSignpost0Script signpost 31, 27, SIGNPOST_READ, MapNationalParkBugContestSignpost1Script - signpost 47, 6, SIGNPOST_ITEMIFSET, MapNationalParkBugContestSignpostItem2 + signpost 47, 6, SIGNPOST_ITEM, MapNationalParkBugContestSignpostItem2 signpost 4, 12, SIGNPOST_READ, MapNationalParkBugContestSignpost3Script ; people-events @@ -241,5 +240,5 @@ NationalParkBugContest_MapEventHeader: person_event SPRITE_YOUNGSTER, 31, 15, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5c924, EVENT_BUG_CATCHING_CONTESTANT_8A person_event SPRITE_YOUNGSTER, 12, 20, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x5c92c, EVENT_BUG_CATCHING_CONTESTANT_9A person_event SPRITE_YOUNGSTER, 38, 21, DOWN << 2 | $2, $33, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5c934, EVENT_BUG_CATCHING_CONTESTANT_10A - person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c945, EVENT_658 - person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c947, EVENT_659 + person_event SPRITE_POKE_BALL, 16, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c945, EVENT_NATIONAL_PARK_PARLYZ_HEAL + person_event SPRITE_POKE_BALL, 47, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5c947, EVENT_NATIONAL_PARK_TM_DIG diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index 4b459cbbd..fa794e9e6 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -307,4 +307,4 @@ NewBarkTown_MapEventHeader: db 3 person_event SPRITE_TEACHER, 12, 10, DOWN << 2 | $3, $1, -1, -1, $0, 0, TeacherScript_0x1a806f, -1 person_event SPRITE_FISHER, 13, 16, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a809b, -1 - person_event SPRITE_SILVER, 6, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, SilverScript_0x1a809e, EVENT_6BD + person_event SPRITE_SILVER, 6, 7, LEFT << 2 | $1, $0, -1, -1, $0, 0, SilverScript_0x1a809e, EVENT_RIVAL_NEW_BARK_TOWN diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index c98c79fd5..3d0c4a1e9 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -323,4 +323,4 @@ OlivineCity_MapEventHeader: person_event SPRITE_SAILOR, 31, 30, UP << 2 | $0, $10, -1, -1, $0, 0, SailorScript_0x1a88a3, -1 person_event SPRITE_STANDING_YOUNGSTER, 17, 24, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, StandingYoungsterScript_0x1a88a6, -1 person_event SPRITE_SAILOR, 25, 21, DOWN << 2 | $2, $11, -1, -1, $0, 0, SailorScript_0x1a88ba, -1 - person_event SPRITE_OLIVINE_RIVAL, 15, 14, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C3 + person_event SPRITE_OLIVINE_RIVAL, 15, 14, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_OLIVINE_CITY diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm index c97e22ffe..5900c1d18 100644 --- a/maps/OlivineGym.asm +++ b/maps/OlivineGym.asm @@ -212,5 +212,5 @@ OlivineGym_MapEventHeader: ; people-events db 2 - person_event SPRITE_JASMINE, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x9c12f, EVENT_6D3 + person_event SPRITE_JASMINE, 7, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x9c12f, EVENT_OLIVINE_GYM_JASMINE person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OlivineGymGuyScript, -1 diff --git a/maps/OlivineLighthouse3F.asm b/maps/OlivineLighthouse3F.asm index f7fac288c..ef5439cfb 100644 --- a/maps/OlivineLighthouse3F.asm +++ b/maps/OlivineLighthouse3F.asm @@ -181,4 +181,4 @@ OlivineLighthouse3F_MapEventHeader: person_event SPRITE_SAILOR, 6, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSailorTerrell, -1 person_event SPRITE_GENTLEMAN, 9, 17, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerGentlemanPreston, -1 person_event SPRITE_YOUNGSTER, 13, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperTheo, -1 - person_event SPRITE_POKE_BALL, 6, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5b279, EVENT_664 + person_event SPRITE_POKE_BALL, 6, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5b279, EVENT_OLIVINE_LIGHTHOUSE_3F_ETHER diff --git a/maps/OlivineLighthouse5F.asm b/maps/OlivineLighthouse5F.asm index 9210bd164..ec7b83ca9 100644 --- a/maps/OlivineLighthouse5F.asm +++ b/maps/OlivineLighthouse5F.asm @@ -69,8 +69,7 @@ ItemFragment_0x609ae: db TM_SWAGGER, 1 MapOlivineLighthouse5FSignpostItem0: - dw $0085 - db HYPER_POTION + dwb EVENT_OLIVINE_LIGHTHOUSE_5F_HIDDEN_HYPER_POTION, HYPER_POTION SailorErnestSeenText: @@ -136,12 +135,12 @@ OlivineLighthouse5F_MapEventHeader: ; signposts db 1 - signpost 13, 3, SIGNPOST_ITEMIFSET, MapOlivineLighthouse5FSignpostItem0 + signpost 13, 3, SIGNPOST_ITEM, MapOlivineLighthouse5FSignpostItem0 ; people-events db 5 person_event SPRITE_SAILOR, 15, 12, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSailorErnest, -1 person_event SPRITE_YOUNGSTER, 7, 12, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerBird_keeperDenis, -1 - person_event SPRITE_POKE_BALL, 16, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609aa, EVENT_665 - person_event SPRITE_POKE_BALL, 19, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ac, EVENT_666 - person_event SPRITE_POKE_BALL, 17, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ae, EVENT_667 + person_event SPRITE_POKE_BALL, 16, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609aa, EVENT_OLIVINE_LIGHTHOUSE_5F_RARE_CANDY + person_event SPRITE_POKE_BALL, 19, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ac, EVENT_OLIVINE_LIGHTHOUSE_5F_SUPER_REPEL + person_event SPRITE_POKE_BALL, 17, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x609ae, EVENT_OLIVINE_LIGHTHOUSE_5F_TM_SWAGGER diff --git a/maps/OlivineLighthouse6F.asm b/maps/OlivineLighthouse6F.asm index 2cd2d3f41..eab641ba6 100644 --- a/maps/OlivineLighthouse6F.asm +++ b/maps/OlivineLighthouse6F.asm @@ -63,7 +63,7 @@ UnknownScript_0x60bab: closetext loadmovesprites setevent EVENT_JASMINE_RETURNED_TO_GYM - clearevent EVENT_6D3 + clearevent EVENT_OLIVINE_GYM_JASMINE checkcode VAR_FACING if_equal $0, UnknownScript_0x60c17 if_equal $3, UnknownScript_0x60c1e @@ -270,6 +270,6 @@ OlivineLighthouse6F_MapEventHeader: ; people-events db 3 - person_event SPRITE_JASMINE, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x60b91, EVENT_6D2 + person_event SPRITE_JASMINE, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, JasmineScript_0x60b91, EVENT_OLIVINE_LIGHTHOUSE_JASMINE person_event SPRITE_MONSTER, 12, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, MonsterScript_0x60c3a, -1 - person_event SPRITE_POKE_BALL, 8, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x60c66, EVENT_668 + person_event SPRITE_POKE_BALL, 8, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x60c66, EVENT_OLIVINE_LIGHTHOUSE_6F_SUPER_POTION diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index 1c71aad5b..94595e1f8 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -43,8 +43,8 @@ SailorScript_0x748c0: waitbutton checkevent EVENT_030 iffalse UnknownScript_0x7490a - clearevent EVENT_73A - setevent EVENT_73B + clearevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_BEAT_COOLTRAINERM_SEAN clearevent EVENT_BEAT_COOLTRAINERF_CAROL clearevent EVENT_BEAT_GENTLEMAN_EDWARD @@ -227,8 +227,7 @@ CooltrainerFScript_0x74a22: end MapOlivinePortSignpostItem0: - dw $00ea - db PROTEIN + dwb EVENT_OLIVINE_PORT_HIDDEN_PROTEIN, PROTEIN MovementData_0x74a30: @@ -394,11 +393,11 @@ OlivinePort_MapEventHeader: ; signposts db 1 - signpost 22, 1, SIGNPOST_ITEMIFSET, MapOlivinePortSignpostItem0 + signpost 22, 1, SIGNPOST_ITEM, MapOlivinePortSignpostItem0 ; people-events db 7 - person_event SPRITE_SAILOR, 27, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x748c0, EVENT_72A + person_event SPRITE_SAILOR, 27, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x748c0, EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY person_event SPRITE_SAILOR, 19, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x749fe, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME person_event SPRITE_SAILOR, 19, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x7499c, EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME person_event SPRITE_FISHING_GURU, 18, 8, UP << 2 | $3, $0, -1, -1, $0, 0, FishingGuruScript_0x74a01, EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME diff --git a/maps/OlivinePortPassage.asm b/maps/OlivinePortPassage.asm index 0d28c1df3..b4ee06672 100644 --- a/maps/OlivinePortPassage.asm +++ b/maps/OlivinePortPassage.asm @@ -36,4 +36,4 @@ OlivinePortPassage_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 5, 21, LEFT << 2 | $0, $0, -1, -1, $0, 0, PokefanMScript_0x76fac, EVENT_733 + person_event SPRITE_POKEFAN_M, 5, 21, LEFT << 2 | $0, $0, -1, -1, $0, 0, PokefanMScript_0x76fac, EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M diff --git a/maps/PokemonFanClub.asm b/maps/PokemonFanClub.asm index 5b8df0ede..1e785dc29 100644 --- a/maps/PokemonFanClub.asm +++ b/maps/PokemonFanClub.asm @@ -311,5 +311,5 @@ PokemonFanClub_MapEventHeader: person_event SPRITE_RECEPTIONIST, 5, 8, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x191821, -1 person_event SPRITE_FISHER, 7, 6, LEFT << 2 | $1, $0, -1, -1, $0, 0, FisherScript_0x191824, -1 person_event SPRITE_TEACHER, 6, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, TeacherScript_0x19186b, -1 - person_event SPRITE_FAIRY, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, FairyScript_0x19186e, EVENT_774 + person_event SPRITE_FAIRY, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, FairyScript_0x19186e, EVENT_VERMILION_FAN_CLUB_DOLL person_event SPRITE_ODDISH, 7, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OddishScript_0x191871, -1 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 409a51395..1a0bc3d60 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -139,7 +139,7 @@ PowerPlantManager: closetext loadmovesprites setevent EVENT_MET_MANAGER_AT_POWER_PLANT - clearevent EVENT_76D + clearevent EVENT_CERULEAN_GYM_ROCKET clearevent EVENT_FOUND_MACHINE_PART_IN_CERULEAN_GYM domaptrigger GROUP_CERULEAN_GYM, MAP_CERULEAN_GYM, $1 dotrigger $1 @@ -156,11 +156,11 @@ UnknownScript_0x188e93: keeptextopen takeitem MACHINE_PART, 1 setevent EVENT_RETURNED_MACHINE_PART - clearevent EVENT_772 - setevent EVENT_771 - setevent EVENT_76C + clearevent EVENT_SAFFRON_TRAIN_STATION_POPULATION + setevent EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH + setevent EVENT_ROUTE_24_ROCKET setevent EVENT_RESTORED_POWER_TO_KANTO - clearevent EVENT_749 + clearevent EVENT_GOLDENROD_TRAIN_STATION_GENTLEMAN UnknownScript_0x188eac: checkevent EVENT_GOT_TM07_ZAP_CANNON iftrue UnknownScript_0x188ec5 diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index 35eaa8e94..4244eb31e 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -501,8 +501,8 @@ RadioTower1F_MapEventHeader: ; people-events db 6 person_event SPRITE_RECEPTIONIST, 10, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ReceptionistScript_0x5cd29, -1 - person_event SPRITE_LASS, 8, 20, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x5ce51, EVENT_6CF - person_event SPRITE_YOUNGSTER, 8, 19, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5ce54, EVENT_6CF - person_event SPRITE_ROCKET, 5, 18, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM3, EVENT_6CE - person_event SPRITE_GENTLEMAN, 10, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x5cd3d, EVENT_6CF - person_event SPRITE_COOLTRAINER_F, 10, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5cdd5, EVENT_6CF + person_event SPRITE_LASS, 8, 20, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, LassScript_0x5ce51, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_YOUNGSTER, 8, 19, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x5ce54, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_ROCKET, 5, 18, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_GENTLEMAN, 10, 12, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, GentlemanScript_0x5cd3d, EVENT_GOLDENROD_CITY_CIVILIANS + person_event SPRITE_COOLTRAINER_F, 10, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5cdd5, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm index 0363e1afe..afd3e39bb 100644 --- a/maps/RadioTower2F.asm +++ b/maps/RadioTower2F.asm @@ -784,14 +784,14 @@ RadioTower2F_MapEventHeader: ; people-events db 11 - person_event SPRITE_SUPER_NERD, 10, 10, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x5d6fe, EVENT_6CF + person_event SPRITE_SUPER_NERD, 10, 10, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x5d6fe, EVENT_GOLDENROD_CITY_CIVILIANS person_event SPRITE_TEACHER, 6, 21, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, TeacherScript_0x5d701, -1 - person_event SPRITE_ROCKET, 8, 5, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM4, EVENT_6CE - person_event SPRITE_ROCKET, 8, 12, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM5, EVENT_6CE - person_event SPRITE_ROCKET, 5, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerGruntM6, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 9, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerGruntF2, EVENT_6CE - person_event SPRITE_BLACK_BELT, 5, 4, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d71f, EVENT_6D1 - person_event SPRITE_BLACK_BELT, 5, 5, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d722, EVENT_6D0 + person_event SPRITE_ROCKET, 8, 5, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 8, 12, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM5, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 5, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerGruntM6, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 9, 14, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerGruntF2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_BLACK_BELT, 5, 4, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d71f, EVENT_RADIO_TOWER_BLACKBELT_BLOCKS_STAIRS + person_event SPRITE_BLACK_BELT, 5, 5, UP << 2 | $2, $0, -1, -1, $0, 0, BlackBeltScript_0x5d722, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_JIGGLYPUFF, 5, 16, UP << 2 | $12, $0, -1, -1, $0, 0, JigglypuffScript_0x5d715, -1 person_event SPRITE_BUENA, 9, 18, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Buena, -1 - person_event SPRITE_RECEPTIONIST, 11, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x5d8ff, EVENT_6CF + person_event SPRITE_RECEPTIONIST, 11, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ReceptionistScript_0x5d8ff, EVENT_GOLDENROD_CITY_CIVILIANS diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index 8cf57820f..4572bf872 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -407,10 +407,10 @@ RadioTower3F_MapEventHeader: ; people-events db 7 - person_event SPRITE_SUPER_NERD, 8, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x5e553, EVENT_6D0 + person_event SPRITE_SUPER_NERD, 8, 11, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x5e553, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_GYM_GUY, 8, 7, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GymGuyScript_0x5e556, -1 person_event SPRITE_COOLTRAINER_F, 7, 15, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, CooltrainerFScript_0x5e56a, -1 - person_event SPRITE_ROCKET, 5, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM7, EVENT_6CE - person_event SPRITE_ROCKET, 6, 10, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM8, EVENT_6CE - person_event SPRITE_ROCKET, 10, 20, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM9, EVENT_6CE - person_event SPRITE_SCIENTIST, 10, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerScientistMarc, EVENT_6CE + person_event SPRITE_ROCKET, 5, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM7, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 10, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM8, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 10, 20, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM9, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_SCIENTIST, 10, 13, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerScientistMarc, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower4F.asm b/maps/RadioTower4F.asm index 921df243c..c5c459d2a 100644 --- a/maps/RadioTower4F.asm +++ b/maps/RadioTower4F.asm @@ -321,10 +321,10 @@ RadioTower4F_MapEventHeader: ; people-events db 7 - person_event SPRITE_FISHER, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x5eb82, EVENT_6D0 + person_event SPRITE_FISHER, 8, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, FisherScript_0x5eb82, EVENT_RADIO_TOWER_CIVILIANS_AFTER person_event SPRITE_TEACHER, 10, 18, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, TeacherScript_0x5eb85, -1 person_event SPRITE_GROWLITHE, 11, 16, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, GrowlitheScript_0x5ebb2, -1 - person_event SPRITE_ROCKET, 10, 9, RIGHT << 2 | $13, $0, -1, -1, $2, 3, TrainerGruntM10, EVENT_6CE - person_event SPRITE_ROCKET, 5, 18, LEFT << 2 | $0, $2, -1, -1, $2, 2, TrainerExecutivem2, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 8, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF4, EVENT_6CE - person_event SPRITE_SCIENTIST, 6, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerScientistRich, EVENT_6CE + person_event SPRITE_ROCKET, 10, 9, RIGHT << 2 | $13, $0, -1, -1, $2, 3, TrainerGruntM10, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 5, 18, LEFT << 2 | $0, $2, -1, -1, $2, 2, TrainerExecutivem2, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 8, 16, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF4, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_SCIENTIST, 6, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerScientistRich, EVENT_RADIO_TOWER_ROCKET_TAKEOVER diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 2604cc4e4..27ca29c88 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -115,15 +115,15 @@ UnknownScript_0x6006e: setevent EVENT_BEAT_ROCKET_EXECUTIVEM_1 setevent EVENT_CLEARED_RADIO_TOWER clearflag ENGINE_ROCKETS_IN_RADIO_TOWER - setevent EVENT_6CC - setevent EVENT_6CD - setevent EVENT_6CE - clearevent EVENT_736 + setevent EVENT_GOLDENROD_CITY_ROCKET_SCOUT + setevent EVENT_GOLDENROD_CITY_ROCKET_TAKEOVER + setevent EVENT_RADIO_TOWER_ROCKET_TAKEOVER + clearevent EVENT_MAHOGANY_MART_OWNERS clearflag ENGINE_ROCKETS_IN_MAHOGANY - clearevent EVENT_6CF - clearevent EVENT_6D0 - setevent EVENT_6E3 - clearevent EVENT_6E4 + clearevent EVENT_GOLDENROD_CITY_CIVILIANS + clearevent EVENT_RADIO_TOWER_CIVILIANS_AFTER + setevent EVENT_BLACKTHORN_CITY_SUPER_NERD_BLOCKS_GYM + clearevent EVENT_BLACKTHORN_CITY_SUPER_NERD_DOES_NOT_BLOCK_GYM special PlayMapMusic disappear $2 moveperson $2, $c, $0 @@ -456,7 +456,7 @@ RadioTower5F_MapEventHeader: ; people-events db 5 person_event SPRITE_GENTLEMAN, 10, 7, DOWN << 2 | $3, $0, -1, -1, $0, 0, Director, -1 - person_event SPRITE_ROCKET, 9, 17, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 6, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerExecutivef1, EVENT_6CE - person_event SPRITE_ROCKER, 9, 17, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Ben, EVENT_6D0 - person_event SPRITE_POKE_BALL, 9, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x600fe, EVENT_7CD + person_event SPRITE_ROCKET, 9, 17, LEFT << 2 | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 6, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerExecutivef1, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKER, 9, 17, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, Ben, EVENT_RADIO_TOWER_CIVILIANS_AFTER + person_event SPRITE_POKE_BALL, 9, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x600fe, EVENT_RADIO_TOWER_5F_ULTRA_BALL diff --git a/maps/RockTunnel1F.asm b/maps/RockTunnel1F.asm index 9273dacf2..41fffb482 100644 --- a/maps/RockTunnel1F.asm +++ b/maps/RockTunnel1F.asm @@ -12,13 +12,11 @@ ItemFragment_0x743b7: db TM_STEEL_WING, 1 MapRockTunnel1FSignpostItem0: - dw $00e7 - db X_ACCURACY + dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_ACCURACY, X_ACCURACY MapRockTunnel1FSignpostItem1: - dw $00e8 - db X_DEFEND + dwb EVENT_ROCK_TUNNEL_1F_HIDDEN_X_DEFEND, X_DEFEND RockTunnel1F_MapEventHeader: @@ -39,10 +37,10 @@ RockTunnel1F_MapEventHeader: ; signposts db 2 - signpost 4, 24, SIGNPOST_ITEMIFSET, MapRockTunnel1FSignpostItem0 - signpost 15, 21, SIGNPOST_ITEMIFSET, MapRockTunnel1FSignpostItem1 + signpost 4, 24, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem0 + signpost 15, 21, SIGNPOST_ITEM, MapRockTunnel1FSignpostItem1 ; people-events db 2 - person_event SPRITE_POKE_BALL, 22, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b5, EVENT_77E - person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b7, EVENT_77F + person_event SPRITE_POKE_BALL, 22, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b5, EVENT_ROCK_TUNNEL_1F_ELIXER + person_event SPRITE_POKE_BALL, 19, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x743b7, EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING diff --git a/maps/RockTunnelB1F.asm b/maps/RockTunnelB1F.asm index 275572cf1..cc82ff680 100644 --- a/maps/RockTunnelB1F.asm +++ b/maps/RockTunnelB1F.asm @@ -15,8 +15,7 @@ ItemFragment_0x7440d: db REVIVE, 1 MapRockTunnelB1FSignpostItem0: - dw $00e9 - db MAX_POTION + dwb EVENT_ROCK_TUNNEL_B1F_HIDDEN_MAX_POTION, MAX_POTION RockTunnelB1F_MapEventHeader: @@ -35,10 +34,10 @@ RockTunnelB1F_MapEventHeader: ; signposts db 1 - signpost 14, 4, SIGNPOST_ITEMIFSET, MapRockTunnelB1FSignpostItem0 + signpost 14, 4, SIGNPOST_ITEM, MapRockTunnelB1FSignpostItem0 ; people-events db 3 - person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74409, EVENT_780 - person_event SPRITE_POKE_BALL, 21, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440b, EVENT_781 - person_event SPRITE_POKE_BALL, 6, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440d, EVENT_782 + person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74409, EVENT_ROCK_TUNNEL_B1F_IRON + person_event SPRITE_POKE_BALL, 21, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440b, EVENT_ROCK_TUNNEL_B1F_PP_UP + person_event SPRITE_POKE_BALL, 6, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7440d, EVENT_ROCK_TUNNEL_B1F_REVIVE diff --git a/maps/Route11.asm b/maps/Route11.asm index be306934a..4f809febc 100644 --- a/maps/Route11.asm +++ b/maps/Route11.asm @@ -120,8 +120,7 @@ FruitTreeScript_0x68055: fruittree $18 MapRoute11SignpostItem1: - dw $00f5 - db REVIVE + dwb EVENT_ROUTE_11_HIDDEN_REVIVE, REVIVE YoungsterOwenSeenText: @@ -217,7 +216,7 @@ Route11_MapEventHeader: ; signposts db 2 signpost 7, 3, SIGNPOST_READ, MapRoute11Signpost0Script - signpost 5, 32, SIGNPOST_ITEMIFSET, MapRoute11SignpostItem1 + signpost 5, 32, SIGNPOST_ITEM, MapRoute11SignpostItem1 ; people-events db 5 diff --git a/maps/Route12.asm b/maps/Route12.asm index 304595709..a13cec780 100644 --- a/maps/Route12.asm +++ b/maps/Route12.asm @@ -126,8 +126,7 @@ ItemFragment_0x1a700d: db NUGGET, 1 MapRoute12SignpostItem2: - dw $00f3 - db ELIXER + dwb EVENT_ROUTE_12_HIDDEN_ELIXER, ELIXER FisherMartinSeenText: @@ -239,7 +238,7 @@ Route12_MapEventHeader: db 3 signpost 27, 11, SIGNPOST_READ, MapRoute12Signpost0Script signpost 9, 13, SIGNPOST_READ, MapRoute12Signpost1Script - signpost 13, 14, SIGNPOST_ITEMIFSET, MapRoute12SignpostItem2 + signpost 13, 14, SIGNPOST_ITEM, MapRoute12SignpostItem2 ; people-events db 6 @@ -247,5 +246,5 @@ Route12_MapEventHeader: person_event SPRITE_FISHER, 27, 18, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerFisherStephen, -1 person_event SPRITE_FISHER, 42, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 5, TrainerFisherBarney, -1 person_event SPRITE_FISHER, 11, 10, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherKyle, -1 - person_event SPRITE_POKE_BALL, 47, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700b, EVENT_788 - person_event SPRITE_POKE_BALL, 55, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700d, EVENT_789 + person_event SPRITE_POKE_BALL, 47, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700b, EVENT_ROUTE_12_CALCIUM + person_event SPRITE_POKE_BALL, 55, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a700d, EVENT_ROUTE_12_NUGGET diff --git a/maps/Route13.asm b/maps/Route13.asm index 29fe2a27c..c8627721d 100644 --- a/maps/Route13.asm +++ b/maps/Route13.asm @@ -150,8 +150,7 @@ MapRoute13Signpost2Script: jumptext UnknownText_0x1a277d MapRoute13SignpostItem3: - dw $00f4 - db CALCIUM + dwb EVENT_ROUTE_13_HIDDEN_CALCIUM, CALCIUM PokefanmAlexSeenText: @@ -281,7 +280,7 @@ Route13_MapEventHeader: signpost 13, 29, SIGNPOST_READ, MapRoute13Signpost0Script signpost 11, 41, SIGNPOST_READ, MapRoute13Signpost1Script signpost 13, 17, SIGNPOST_READ, MapRoute13Signpost2Script - signpost 13, 30, SIGNPOST_ITEMIFSET, MapRoute13SignpostItem3 + signpost 13, 30, SIGNPOST_ITEM, MapRoute13SignpostItem3 ; people-events db 5 diff --git a/maps/Route15.asm b/maps/Route15.asm index b59aa9edc..bcb5129f2 100644 --- a/maps/Route15.asm +++ b/maps/Route15.asm @@ -312,4 +312,4 @@ Route15_MapEventHeader: person_event SPRITE_YOUNGSTER, 14, 31, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyBilly, -1 person_event SPRITE_TEACHER, 16, 34, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerTeacherColette, -1 person_event SPRITE_TEACHER, 14, 24, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerTeacherHillary, -1 - person_event SPRITE_POKE_BALL, 9, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1aa5e4, EVENT_78A + person_event SPRITE_POKE_BALL, 9, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1aa5e4, EVENT_ROUTE_15_PP_UP diff --git a/maps/Route17.asm b/maps/Route17.asm index 8b38ec9a1..2c7e2a605 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -123,13 +123,11 @@ BikerGlennScript: end MapRoute17SignpostItem0: - dw $00f6 - db MAX_ETHER + dwb EVENT_ROUTE_17_HIDDEN_MAX_ETHER, MAX_ETHER MapRoute17SignpostItem1: - dw $00f7 - db MAX_ELIXER + dwb EVENT_ROUTE_17_HIDDEN_MAX_ELIXER, MAX_ELIXER BikerRileySeenText: @@ -211,8 +209,8 @@ Route17_MapEventHeader: ; signposts db 2 - signpost 54, 9, SIGNPOST_ITEMIFSET, MapRoute17SignpostItem0 - signpost 77, 8, SIGNPOST_ITEMIFSET, MapRoute17SignpostItem1 + signpost 54, 9, SIGNPOST_ITEM, MapRoute17SignpostItem0 + signpost 77, 8, SIGNPOST_ITEM, MapRoute17SignpostItem1 ; people-events db 4 diff --git a/maps/Route2.asm b/maps/Route2.asm index f9929d677..6268a1f8a 100644 --- a/maps/Route2.asm +++ b/maps/Route2.asm @@ -108,24 +108,16 @@ FruitTreeScript_0x1ac306: fruittree $19 MapRoute2SignpostItem2: - dw $00ed - db MAX_ETHER - + dwb EVENT_ROUTE_2_HIDDEN_MAX_ETHER, MAX_ETHER MapRoute2SignpostItem3: - dw $00ee - db FULL_HEAL - + dwb EVENT_ROUTE_2_HIDDEN_FULL_HEAL, FULL_HEAL MapRoute2SignpostItem4: - dw $00ef - db FULL_RESTORE - + dwb EVENT_ROUTE_2_HIDDEN_FULL_RESTORE, FULL_RESTORE MapRoute2SignpostItem5: - dw $00f0 - db REVIVE - + dwb EVENT_ROUTE_2_HIDDEN_REVIVE, REVIVE Bug_catcherRobSeenText: text "My bug #MON are" @@ -211,18 +203,18 @@ Route2_MapEventHeader: db 6 signpost 51, 7, SIGNPOST_READ, MapRoute2Signpost0Script signpost 9, 11, SIGNPOST_READ, MapRoute2Signpost1Script - signpost 23, 7, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem2 - signpost 14, 4, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem3 - signpost 27, 4, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem4 - signpost 30, 11, SIGNPOST_ITEMIFSET, MapRoute2SignpostItem5 + signpost 23, 7, SIGNPOST_ITEM, MapRoute2SignpostItem2 + signpost 14, 4, SIGNPOST_ITEM, MapRoute2SignpostItem3 + signpost 27, 4, SIGNPOST_ITEM, MapRoute2SignpostItem4 + signpost 30, 11, SIGNPOST_ITEM, MapRoute2SignpostItem5 ; people-events db 8 person_event SPRITE_BUG_CATCHER, 49, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherRob, -1 person_event SPRITE_BUG_CATCHER, 8, 10, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherEd, -1 person_event SPRITE_BUG_CATCHER, 44, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDoug, -1 - person_event SPRITE_POKE_BALL, 33, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac2fe, EVENT_783 - person_event SPRITE_POKE_BALL, 27, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac300, EVENT_784 - person_event SPRITE_POKE_BALL, 6, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac302, EVENT_785 - person_event SPRITE_POKE_BALL, 54, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac304, EVENT_786 + person_event SPRITE_POKE_BALL, 33, 4, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac2fe, EVENT_ROUTE_2_DIRE_HIT + person_event SPRITE_POKE_BALL, 27, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac300, EVENT_ROUTE_2_MAX_POTION + person_event SPRITE_POKE_BALL, 6, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac302, EVENT_ROUTE_2_CARBOS + person_event SPRITE_POKE_BALL, 54, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ac304, EVENT_ROUTE_2_ELIXER person_event SPRITE_FRUIT_TREE, 18, 14, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1ac306, -1 diff --git a/maps/Route24.asm b/maps/Route24.asm index f39d76daf..113796839 100644 --- a/maps/Route24.asm +++ b/maps/Route24.asm @@ -130,4 +130,4 @@ Route24_MapEventHeader: ; people-events db 1 - person_event SPRITE_ROCKET, 11, 12, DOWN << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x1adbfa, EVENT_76C + person_event SPRITE_ROCKET, 11, 12, DOWN << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x1adbfa, EVENT_ROUTE_24_ROCKET diff --git a/maps/Route25.asm b/maps/Route25.asm index b1a114541..7c21304f6 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -292,8 +292,7 @@ ItemFragment_0x19efe3: db PROTEIN, 1 MapRoute25SignpostItem1: - dw $00f8 - db POTION + dwb EVENT_ROUTE_25_HIDDEN_POTION, POTION MovementData_0x19efe8: @@ -548,12 +547,12 @@ Route25_MapEventHeader: ; signposts db 2 signpost 5, 45, SIGNPOST_READ, MapRoute25Signpost0Script - signpost 5, 4, SIGNPOST_ITEMIFSET, MapRoute25SignpostItem1 + signpost 5, 4, SIGNPOST_ITEM, MapRoute25SignpostItem1 ; people-events db 11 - person_event SPRITE_MISTY, 13, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_76E - person_event SPRITE_COOLTRAINER_M, 14, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_76E + person_event SPRITE_MISTY, 13, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND + person_event SPRITE_COOLTRAINER_M, 14, 50, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_25_MISTY_BOYFRIEND person_event SPRITE_YOUNGSTER, 12, 16, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSchoolboyDudley, -1 person_event SPRITE_LASS, 15, 20, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerLassEllen, -1 person_event SPRITE_YOUNGSTER, 12, 25, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerSchoolboyJoe, -1 @@ -562,4 +561,4 @@ Route25_MapEventHeader: person_event SPRITE_LASS, 15, 32, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerLassShannon, -1 person_event SPRITE_SUPER_NERD, 11, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerSupernerdPat, -1 person_event SPRITE_COOLTRAINER_M, 12, 41, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x19efac, -1 - person_event SPRITE_POKE_BALL, 8, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19efe3, EVENT_78B + person_event SPRITE_POKE_BALL, 8, 36, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19efe3, EVENT_ROUTE_25_PROTEIN diff --git a/maps/Route26.asm b/maps/Route26.asm index 0b498de64..a059989e1 100644 --- a/maps/Route26.asm +++ b/maps/Route26.asm @@ -524,4 +524,4 @@ Route26_MapEventHeader: person_event SPRITE_YOUNGSTER, 83, 17, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPsychicRichard, -1 person_event SPRITE_FISHER, 96, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerFisherScott, -1 person_event SPRITE_FRUIT_TREE, 58, 18, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a4ec2, -1 - person_event SPRITE_POKE_BALL, 19, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a4ec4, EVENT_6AA + person_event SPRITE_POKE_BALL, 19, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a4ec4, EVENT_ROUTE_26_MAX_ELIXER diff --git a/maps/Route27.asm b/maps/Route27.asm index eb3a1121a..c17ad1e8f 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -581,6 +581,6 @@ Route27_MapEventHeader: person_event SPRITE_COOLTRAINER_F, 10, 41, RIGHT << 2 | $13, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfMegan, -1 person_event SPRITE_YOUNGSTER, 11, 69, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicGilbert, -1 person_event SPRITE_YOUNGSTER, 17, 62, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperJose2, -1 - person_event SPRITE_POKE_BALL, 16, 64, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a62, EVENT_6AB - person_event SPRITE_POKE_BALL, 16, 57, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a64, EVENT_6AC + person_event SPRITE_POKE_BALL, 16, 64, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a62, EVENT_ROUTE_27_TM_SOLARBEAM + person_event SPRITE_POKE_BALL, 16, 57, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a0a64, EVENT_ROUTE_27_RARE_CANDY person_event SPRITE_FISHER, 14, 25, DOWN << 2 | $3, $0, -1, -1, $0, 3, FisherScript_0x1a089c, -1 diff --git a/maps/Route28.asm b/maps/Route28.asm index 68afae6e6..192a0c65d 100644 --- a/maps/Route28.asm +++ b/maps/Route28.asm @@ -9,8 +9,7 @@ MapRoute28Signpost0Script: jumptext UnknownText_0x1a5413 MapRoute28SignpostItem1: - dw $00a3 - db RARE_CANDY + dwb EVENT_ROUTE_28_HIDDEN_RARE_CANDY, RARE_CANDY UnknownText_0x1a5413: @@ -32,7 +31,7 @@ Route28_MapEventHeader: ; signposts db 2 signpost 5, 31, SIGNPOST_READ, MapRoute28Signpost0Script - signpost 2, 25, SIGNPOST_ITEMIFSET, MapRoute28SignpostItem1 + signpost 2, 25, SIGNPOST_ITEM, MapRoute28SignpostItem1 ; people-events db 0 diff --git a/maps/Route29.asm b/maps/Route29.asm index b5a9710fe..5cfbaaa73 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -436,5 +436,5 @@ Route29_MapEventHeader: person_event SPRITE_FRUIT_TREE, 6, 16, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a1089, -1 person_event SPRITE_FISHER, 7, 29, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FisherScript_0x1a102e, -1 person_event SPRITE_COOLTRAINER_M, 8, 17, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, CooltrainerMScript_0x1a1031, -1 - person_event SPRITE_TEACHER, 16, 33, DOWN << 2 | $3, $0, -1, -1, $0, 0, TuscanyScript, EVENT_759 - person_event SPRITE_POKE_BALL, 6, 52, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a108b, EVENT_6AD + person_event SPRITE_TEACHER, 16, 33, DOWN << 2 | $3, $0, -1, -1, $0, 0, TuscanyScript, EVENT_ROUTE_29_TUSCANY_OF_TUESDAY + person_event SPRITE_POKE_BALL, 6, 52, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a108b, EVENT_ROUTE_29_POTION diff --git a/maps/Route30.asm b/maps/Route30.asm index 94efe9c5f..bd7e67a9f 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -283,8 +283,7 @@ FruitTreeScript_0x1a17f9: fruittree $5 MapRoute30SignpostItem4: - dw $00a4 - db POTION + dwb EVENT_ROUTE_30_HIDDEN_POTION, POTION MovementData_0x1a17fe: @@ -461,18 +460,18 @@ Route30_MapEventHeader: signpost 29, 13, SIGNPOST_READ, MapRoute30Signpost1Script signpost 5, 15, SIGNPOST_READ, MapRoute30Signpost2Script signpost 21, 3, SIGNPOST_READ, MapRoute30Signpost3Script - signpost 9, 14, SIGNPOST_ITEMIFSET, MapRoute30SignpostItem4 + signpost 9, 14, SIGNPOST_ITEM, MapRoute30SignpostItem4 ; people-events db 11 - person_event SPRITE_YOUNGSTER, 30, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a1673, EVENT_714 - person_event SPRITE_YOUNGSTER, 32, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJoey, EVENT_715 + person_event SPRITE_YOUNGSTER, 30, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x1a1673, EVENT_ROUTE_30_BATTLE + person_event SPRITE_YOUNGSTER, 32, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerYoungsterJoey, EVENT_ROUTE_30_YOUNGSTER_JOEY person_event SPRITE_YOUNGSTER, 27, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerYoungsterMikey, -1 person_event SPRITE_BUG_CATCHER, 11, 5, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerBug_catcherDon, -1 person_event SPRITE_YOUNGSTER, 34, 11, UP << 2 | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x1a17d2, -1 - person_event SPRITE_MONSTER, 28, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_714 - person_event SPRITE_MONSTER, 29, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_714 + person_event SPRITE_MONSTER, 28, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE + person_event SPRITE_MONSTER, 29, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_ROUTE_30_BATTLE person_event SPRITE_FRUIT_TREE, 43, 9, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a17f7, -1 person_event SPRITE_FRUIT_TREE, 9, 15, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a17f9, -1 person_event SPRITE_COOLTRAINER_F, 17, 6, UP << 2 | $2, $0, -1, -1, $0, 0, CooltrainerFScript_0x1a17e6, -1 - person_event SPRITE_POKE_BALL, 39, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a17f5, EVENT_7B8 + person_event SPRITE_POKE_BALL, 39, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a17f5, EVENT_ROUTE_30_ANTIDOTE diff --git a/maps/Route31.asm b/maps/Route31.asm index ddbc7cd8b..3deaca873 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -451,5 +451,5 @@ Route31_MapEventHeader: person_event SPRITE_BUG_CATCHER, 17, 25, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 5, TrainerBug_catcherWade1, -1 person_event SPRITE_COOLTRAINER_M, 12, 37, DOWN << 2 | $2, $11, -1, -1, $0, 0, CooltrainerMScript_0x1a55f6, -1 person_event SPRITE_FRUIT_TREE, 11, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a55f9, -1 - person_event SPRITE_POKE_BALL, 9, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fb, EVENT_6AE - person_event SPRITE_POKE_BALL, 19, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fd, EVENT_6AF + person_event SPRITE_POKE_BALL, 9, 33, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fb, EVENT_ROUTE_31_POTION + person_event SPRITE_POKE_BALL, 19, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a55fd, EVENT_ROUTE_31_POKE_BALL diff --git a/maps/Route32.asm b/maps/Route32.asm index 6aaa55f83..fbfa8ecee 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -623,13 +623,11 @@ Route32PokeCenterSign: jumpstd pokecentersign MapRoute32SignpostItem4: - dw $00a5 - db GREAT_BALL + dwb EVENT_ROUTE_32_HIDDEN_GREAT_BALL, GREAT_BALL MapRoute32SignpostItem5: - dw $00a6 - db SUPER_POTION + dwb EVENT_ROUTE_32_HIDDEN_SUPER_POTION, SUPER_POTION MovementData_0x190789: @@ -1071,8 +1069,8 @@ Route32_MapEventHeader: signpost 1, 9, SIGNPOST_READ, Route32RuinsSign signpost 84, 10, SIGNPOST_READ, Route32UnionCaveSign signpost 73, 12, SIGNPOST_READ, Route32PokeCenterSign - signpost 67, 12, SIGNPOST_ITEMIFSET, MapRoute32SignpostItem4 - signpost 40, 11, SIGNPOST_ITEMIFSET, MapRoute32SignpostItem5 + signpost 67, 12, SIGNPOST_ITEM, MapRoute32SignpostItem4 + signpost 40, 11, SIGNPOST_ITEM, MapRoute32SignpostItem5 ; people-events db 14 @@ -1085,8 +1083,8 @@ Route32_MapEventHeader: person_event SPRITE_LASS, 34, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 1, TrainerPicnickerLiz1, -1 person_event SPRITE_COOLTRAINER_M, 12, 23, LEFT << 2 | $0, $0, -1, -1, $0, 0, CooltrainerMScript_0x19046f, -1 person_event SPRITE_YOUNGSTER, 86, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperPeter, -1 - person_event SPRITE_FISHER, 74, 11, UP << 2 | $2, $0, -1, -1, $0, 0, FisherScript_0x1904f2, EVENT_6FC - person_event SPRITE_POKE_BALL, 57, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190773, EVENT_6B0 + person_event SPRITE_FISHER, 74, 11, UP << 2 | $2, $0, -1, -1, $0, 0, FisherScript_0x1904f2, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_POKE_BALL, 57, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190773, EVENT_ROUTE_32_GREAT_BALL person_event SPRITE_FISHER, 17, 19, LEFT << 2 | $1, $0, -1, -1, $0, 0, FisherScript_0x1904ce, -1 - person_event SPRITE_LASS, 71, 16, LEFT << 2 | $0, $0, -1, -1, $0, 0, FriedaScript, EVENT_758 - person_event SPRITE_POKE_BALL, 34, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190775, EVENT_6B1 + person_event SPRITE_LASS, 71, 16, LEFT << 2 | $0, $0, -1, -1, $0, 0, FriedaScript, EVENT_ROUTE_32_FRIEDA_OF_FRIDAY + person_event SPRITE_POKE_BALL, 34, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x190775, EVENT_ROUTE_32_REPEL diff --git a/maps/Route34.asm b/maps/Route34.asm index 1d3a1fa4f..d8d12e745 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -12,33 +12,33 @@ Route34_MapScriptHeader: UnknownScript_0x78005: checkflag ENGINE_DAYCARE_MONS_ARE_COMPATIBLE iftrue UnknownScript_0x78014 - clearevent EVENT_6E5 - setevent EVENT_6E6 + clearevent EVENT_DAYCARE_MAN_IN_DAYCARE + setevent EVENT_DAYCARE_MAN_ON_ROUTE_34 jump UnknownScript_0x7801d UnknownScript_0x78014: - setevent EVENT_6E5 - clearevent EVENT_6E6 + setevent EVENT_DAYCARE_MAN_IN_DAYCARE + clearevent EVENT_DAYCARE_MAN_ON_ROUTE_34 jump UnknownScript_0x7801d UnknownScript_0x7801d: checkflag ENGINE_DAYCARE_MAN_HAS_MON iffalse UnknownScript_0x78029 - clearevent EVENT_6E7 + clearevent EVENT_DAYCARE_MON_1 jump UnknownScript_0x7802f UnknownScript_0x78029: - setevent EVENT_6E7 + setevent EVENT_DAYCARE_MON_1 jump UnknownScript_0x7802f UnknownScript_0x7802f: checkflag ENGINE_DAYCARE_LADY_HAS_MON iffalse UnknownScript_0x78039 - clearevent EVENT_6E8 + clearevent EVENT_DAYCARE_MON_2 return UnknownScript_0x78039: - setevent EVENT_6E8 + setevent EVENT_DAYCARE_MON_2 return GrampsScript_0x7803d: @@ -604,13 +604,11 @@ ItemFragment_0x7832b: db NUGGET, 1 MapRoute34SignpostItem3: - dw $00a7 - db RARE_CANDY + dwb EVENT_ROUTE_34_HIDDEN_RARE_CANDY, RARE_CANDY MapRoute34SignpostItem4: - dw $00a8 - db SUPER_POTION + dwb EVENT_ROUTE_34_HIDDEN_SUPER_POTION, SUPER_POTION MovementData_0x78333: @@ -888,9 +886,9 @@ Route34_MapEventHeader: db 5 warp_def $25, $d, 1, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE warp_def $25, $e, 2, GROUP_ROUTE_34_ILEX_FOREST_GATE, MAP_ROUTE_34_ILEX_FOREST_GATE - warp_def $e, $b, 1, GROUP_DAY_CARE, MAP_DAY_CARE - warp_def $f, $b, 2, GROUP_DAY_CARE, MAP_DAY_CARE - warp_def $f, $d, 3, GROUP_DAY_CARE, MAP_DAY_CARE + warp_def $e, $b, 1, GROUP_DAYCARE, MAP_DAYCARE + warp_def $f, $b, 2, GROUP_DAYCARE, MAP_DAYCARE + warp_def $f, $d, 3, GROUP_DAYCARE, MAP_DAYCARE ; xy triggers db 0 @@ -900,8 +898,8 @@ Route34_MapEventHeader: signpost 6, 12, SIGNPOST_READ, MapRoute34Signpost0Script signpost 33, 13, SIGNPOST_READ, MapRoute34Signpost1Script signpost 13, 10, SIGNPOST_READ, MapRoute34Signpost2Script - signpost 32, 8, SIGNPOST_ITEMIFSET, MapRoute34SignpostItem3 - signpost 19, 17, SIGNPOST_ITEMIFSET, MapRoute34SignpostItem4 + signpost 32, 8, SIGNPOST_ITEM, MapRoute34SignpostItem3 + signpost 19, 17, SIGNPOST_ITEM, MapRoute34SignpostItem4 ; people-events db 13 @@ -911,10 +909,10 @@ Route34_MapEventHeader: person_event SPRITE_LASS, 30, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerPicnickerGina1, -1 person_event SPRITE_OFFICER, 15, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x7824c, -1 person_event SPRITE_POKEFAN_M, 32, 22, RIGHT << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmBrandon, -1 - person_event SPRITE_GRAMPS, 20, 19, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x7803d, EVENT_6E6 - person_event SPRITE_DAYCARE_MON_1, 22, 18, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon1Script_0x78065, EVENT_6E7 - person_event SPRITE_DAYCARE_MON_2, 23, 21, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon2Script_0x7806b, EVENT_6E8 + person_event SPRITE_GRAMPS, 20, 19, UP << 2 | $2, $0, -1, -1, $0, 0, GrampsScript_0x7803d, EVENT_DAYCARE_MAN_ON_ROUTE_34 + person_event SPRITE_DAYCARE_MON_1, 22, 18, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon1Script_0x78065, EVENT_DAYCARE_MON_1 + person_event SPRITE_DAYCARE_MON_2, 23, 21, UP << 2 | $12, $22, -1, -1, $0, 0, DaycareMon2Script_0x7806b, EVENT_DAYCARE_MON_2 person_event SPRITE_COOLTRAINER_F, 52, 15, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainerfIrene, -1 person_event SPRITE_COOLTRAINER_F, 52, 7, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfJenn, -1 person_event SPRITE_COOLTRAINER_F, 55, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 2, TrainerCooltrainerfKate, -1 - person_event SPRITE_POKE_BALL, 34, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7832b, EVENT_7BC + person_event SPRITE_POKE_BALL, 34, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7832b, EVENT_ROUTE_34_NUGGET diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index e1d9ba609..b7d9548d5 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -152,7 +152,7 @@ Route34IlexForestGate_MapEventHeader: ; people-events db 4 - person_event SPRITE_TEACHER, 7, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_6EA + person_event SPRITE_TEACHER, 7, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_BEHIND_COUNTER person_event SPRITE_BUTTERFREE, 8, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ButterfreeScript_0x62d8a, -1 - person_event SPRITE_LASS, 8, 7, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x62d94, EVENT_6EB - person_event SPRITE_TEACHER, 11, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_6EC + person_event SPRITE_LASS, 8, 7, UP << 2 | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x62d94, EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS + person_event SPRITE_TEACHER, 11, 9, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, TeacherScript_0x62d63, EVENT_ROUTE_34_ILEX_FOREST_GATE_TEACHER_IN_WALKWAY diff --git a/maps/Route35.asm b/maps/Route35.asm index ae2bd1a9f..06cebe3ee 100644 --- a/maps/Route35.asm +++ b/maps/Route35.asm @@ -607,4 +607,4 @@ Route35_MapEventHeader: person_event SPRITE_SUPER_NERD, 14, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerJugglerIrwin, -1 person_event SPRITE_OFFICER, 10, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OfficerScript_0x19ca49, -1 person_event SPRITE_FRUIT_TREE, 29, 6, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19ca7e, -1 - person_event SPRITE_POKE_BALL, 20, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19ca7c, EVENT_6B2 + person_event SPRITE_POKE_BALL, 20, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19ca7c, EVENT_ROUTE_35_TM_ROLLOUT diff --git a/maps/Route35NationalParkgate.asm b/maps/Route35NationalParkgate.asm index e28e042b9..ca966c324 100644 --- a/maps/Route35NationalParkgate.asm +++ b/maps/Route35NationalParkgate.asm @@ -458,6 +458,6 @@ Route35NationalParkgate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 5, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a204, EVENT_745 - person_event SPRITE_YOUNGSTER, 9, 10, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6a2d8, EVENT_734 - person_event SPRITE_OFFICER, 7, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a2ca, EVENT_746 + person_event SPRITE_OFFICER, 5, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a204, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY + person_event SPRITE_YOUNGSTER, 9, 10, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6a2d8, EVENT_ROUTE_35_NATIONAL_PARK_GATE_YOUNGSTER + person_event SPRITE_OFFICER, 7, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6a2ca, EVENT_ROUTE_35_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route36.asm b/maps/Route36.asm index e5b25dc4a..62de1e170 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -102,7 +102,7 @@ LassScript_0x19408c: writetext UnknownText_0x1942f1 closetext loadmovesprites - clearevent EVENT_768 + clearevent EVENT_FLORIA_AT_FLOWER_SHOP checkcode VAR_FACING if_equal $1, UnknownScript_0x1940ac applymovement $9, MovementData_0x19424e @@ -713,10 +713,10 @@ Route36_MapEventHeader: db 9 person_event SPRITE_YOUNGSTER, 17, 24, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPsychicMark, -1 person_event SPRITE_YOUNGSTER, 18, 35, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSchoolboyAlan1, -1 - person_event SPRITE_WEIRD_TREE, 13, 39, UP << 2 | $13, $0, -1, -1, $0, 0, WeirdTreeScript_0x19403c, EVENT_6F8 + person_event SPRITE_WEIRD_TREE, 13, 39, UP << 2 | $13, $0, -1, -1, $0, 0, WeirdTreeScript_0x19403c, EVENT_ROUTE_36_SUDOWOODO person_event SPRITE_LASS, 12, 55, UP << 2 | $1, $2, -1, -1, $0, 0, LassScript_0x1940e0, -1 person_event SPRITE_FISHER, 13, 48, LEFT << 2 | $0, $0, -1, -1, $0, 0, FisherScript_0x1940b9, -1 person_event SPRITE_FRUIT_TREE, 8, 25, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x194247, -1 - person_event SPRITE_YOUNGSTER, 10, 50, DOWN << 2 | $2, $11, -1, -1, $0, 0, ArthurScript, EVENT_75A + person_event SPRITE_YOUNGSTER, 10, 50, DOWN << 2 | $2, $11, -1, -1, $0, 0, ArthurScript, EVENT_ROUTE_36_ARTHUR_OF_THURSDAY person_event SPRITE_LASS, 16, 37, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO person_event SPRITE_SUICUNE, 10, 25, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36 diff --git a/maps/Route36NationalParkgate.asm b/maps/Route36NationalParkgate.asm index d938228c3..c9f751aa8 100644 --- a/maps/Route36NationalParkgate.asm +++ b/maps/Route36NationalParkgate.asm @@ -862,7 +862,7 @@ Route36NationalParkgate_MapEventHeader: ; people-events db 12 - person_event SPRITE_OFFICER, 7, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6abe0, EVENT_747 + person_event SPRITE_OFFICER, 7, 4, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6abe0, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY person_event SPRITE_YOUNGSTER, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B person_event SPRITE_YOUNGSTER, 9, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B person_event SPRITE_ROCKER, 10, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B @@ -873,4 +873,4 @@ Route36NationalParkgate_MapEventHeader: person_event SPRITE_YOUNGSTER, 11, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad92, EVENT_BUG_CATCHING_CONTESTANT_8B person_event SPRITE_YOUNGSTER, 11, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ada6, EVENT_BUG_CATCHING_CONTESTANT_9B person_event SPRITE_YOUNGSTER, 10, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, YoungsterScript_0x6adba, EVENT_BUG_CATCHING_CONTESTANT_10B - person_event SPRITE_OFFICER, 6, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6acf4, EVENT_748 + person_event SPRITE_OFFICER, 6, 7, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6acf4, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY diff --git a/maps/Route37.asm b/maps/Route37.asm index 7ef7d624f..f82c23ccd 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -156,8 +156,7 @@ FruitTreeScript_0x1a8e0d: fruittree $13 MapRoute37SignpostItem1: - dw $00a9 - db ETHER + dwb EVENT_ROUTE_37_HIDDEN_ETHER, ETHER TwinsAnnandanne1SeenText: @@ -294,7 +293,7 @@ Route37_MapEventHeader: ; signposts db 2 signpost 3, 5, SIGNPOST_READ, MapRoute37Signpost0Script - signpost 2, 4, SIGNPOST_ITEMIFSET, MapRoute37SignpostItem1 + signpost 2, 4, SIGNPOST_ITEM, MapRoute37SignpostItem1 ; people-events db 7 @@ -302,6 +301,6 @@ Route37_MapEventHeader: person_event SPRITE_WEIRD_TREE, 16, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerTwinsAnnandanne2, -1 person_event SPRITE_YOUNGSTER, 10, 10, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 1, TrainerPsychicGreg, -1 person_event SPRITE_FRUIT_TREE, 9, 17, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e09, -1 - person_event SPRITE_BUG_CATCHER, 12, 20, DOWN << 2 | $2, $11, -1, -1, $0, 0, SunnyScript, EVENT_75B + person_event SPRITE_BUG_CATCHER, 12, 20, DOWN << 2 | $2, $11, -1, -1, $0, 0, SunnyScript, EVENT_ROUTE_37_SUNNY_OF_SUNDAY person_event SPRITE_FRUIT_TREE, 9, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0b, -1 person_event SPRITE_FRUIT_TREE, 11, 19, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8e0d, -1 diff --git a/maps/Route39.asm b/maps/Route39.asm index e9272be38..34f56bb3e 100644 --- a/maps/Route39.asm +++ b/maps/Route39.asm @@ -232,8 +232,7 @@ FruitTreeScript_0x1a5bf4: fruittree $f MapRoute39SignpostItem3: - dw $00aa - db NUGGET + dwb EVENT_ROUTE_39_HIDDEN_NUGGET, NUGGET UnknownText_0x1a5bf9: @@ -414,7 +413,7 @@ Route39_MapEventHeader: signpost 31, 5, SIGNPOST_READ, MapRoute39Signpost0Script signpost 5, 9, SIGNPOST_READ, MapRoute39Signpost1Script signpost 7, 15, SIGNPOST_READ, MapRoute39Signpost2Script - signpost 13, 5, SIGNPOST_ITEMIFSET, MapRoute39SignpostItem3 + signpost 13, 5, SIGNPOST_ITEM, MapRoute39SignpostItem3 ; people-events db 10 diff --git a/maps/Route4.asm b/maps/Route4.asm index 8baa6a068..66265bba5 100644 --- a/maps/Route4.asm +++ b/maps/Route4.asm @@ -93,8 +93,7 @@ ItemFragment_0x1ae20f: db HP_UP, 1 MapRoute4SignpostItem1: - dw $00f1 - db ULTRA_BALL + dwb EVENT_ROUTE_4_HIDDEN_ULTRA_BALL, ULTRA_BALL Bird_keeperHankSeenText: @@ -178,11 +177,11 @@ Route4_MapEventHeader: ; signposts db 2 signpost 7, 3, SIGNPOST_READ, MapRoute4Signpost0Script - signpost 3, 10, SIGNPOST_ITEMIFSET, MapRoute4SignpostItem1 + signpost 3, 10, SIGNPOST_ITEM, MapRoute4SignpostItem1 ; people-events db 4 person_event SPRITE_YOUNGSTER, 13, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerBird_keeperHank, -1 person_event SPRITE_LASS, 12, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerPicnickerHope, -1 person_event SPRITE_LASS, 10, 25, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 4, TrainerPicnickerSharon, -1 - person_event SPRITE_POKE_BALL, 7, 30, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ae20f, EVENT_787 + person_event SPRITE_POKE_BALL, 7, 30, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1ae20f, EVENT_ROUTE_4_HP_UP diff --git a/maps/Route40.asm b/maps/Route40.asm index 5c00917be..b326ca0ef 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -10,7 +10,7 @@ Route40_MapScriptHeader: dbw 2, MonicaCallback MonicaCallback: - clearevent EVENT_7CF + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears disappear $a @@ -188,8 +188,7 @@ Route40Rock: jumpstd smashrock MapRoute40SignpostItem1: - dw $00ab - db HYPER_POTION + dwb EVENT_ROUTE_40_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a621c: step_right @@ -405,7 +404,7 @@ Route40_MapEventHeader: ; signposts db 2 signpost 10, 14, SIGNPOST_READ, MapRoute40Signpost0Script - signpost 8, 7, SIGNPOST_ITEMIFSET, MapRoute40SignpostItem1 + signpost 8, 7, SIGNPOST_ITEM, MapRoute40SignpostItem1 ; people-events db 12 @@ -417,7 +416,7 @@ Route40_MapEventHeader: person_event SPRITE_ROCK, 13, 10, LEFT << 2 | $10, $0, -1, -1, $0, 0, Route40Rock, -1 person_event SPRITE_ROCK, 12, 11, LEFT << 2 | $10, $0, -1, -1, $0, 0, Route40Rock, -1 person_event SPRITE_LASS, 17, 15, UP << 2 | $2, $0, -1, -1, $0, 0, LassScript_0x1a61c4, -1 - person_event SPRITE_BUENA, 14, 12, DOWN << 2 | $3, $0, -1, -1, $0, 0, MonicaScript, EVENT_75E + person_event SPRITE_BUENA, 14, 12, DOWN << 2 | $3, $0, -1, -1, $0, 0, MonicaScript, EVENT_ROUTE_40_MONICA_OF_MONDAY person_event SPRITE_POKEFAN_M, 10, 11, LEFT << 2 | $1, $0, -1, -1, $0, 0, PokefanMScript_0x1a61c7, -1 person_event SPRITE_LASS, 8, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a61d3, -1 - person_event SPRITE_STANDING_YOUNGSTER, 13, 20, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, StandingYoungsterScript_0x1a61d6, EVENT_7CF + person_event SPRITE_STANDING_YOUNGSTER, 13, 20, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, StandingYoungsterScript_0x1a61d6, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index ddc61b758..ca64f94a3 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -10,7 +10,7 @@ Route40BattleTowerGate_MapScriptHeader: dbw 2, UnknownScript_0x9f665 UnknownScript_0x9f665: - clearevent EVENT_7CF + clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return RockerScript_0x9f669: @@ -88,5 +88,5 @@ Route40BattleTowerGate_MapEventHeader: ; people-events db 2 - person_event SPRITE_ROCKER, 7, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, RockerScript_0x9f669, EVENT_7CF + person_event SPRITE_ROCKER, 7, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, RockerScript_0x9f669, EVENT_BATTLE_TOWER_OUTSIDE_SAILOR person_event SPRITE_TWIN, 9, 11, UP << 2 | $0, $10, -1, -1, (PAL_OW_RED << 4) | $80, 0, TwinScript_0x9f66c, -1 diff --git a/maps/Route41.asm b/maps/Route41.asm index c0b2ea5f3..aff5462ef 100644 --- a/maps/Route41.asm +++ b/maps/Route41.asm @@ -280,8 +280,7 @@ Route41Rock: jumpstd smashrock MapRoute41SignpostItem0: - dw $00ac - db MAX_ETHER + dwb EVENT_ROUTE_41_HIDDEN_MAX_ETHER, MAX_ETHER SwimmermCharlieSeenText: text "The water's warm" @@ -506,7 +505,7 @@ Route41_MapEventHeader: ; signposts db 1 - signpost 35, 9, SIGNPOST_ITEMIFSET, MapRoute41SignpostItem0 + signpost 35, 9, SIGNPOST_ITEM, MapRoute41SignpostItem0 ; people-events db 10 diff --git a/maps/Route42.asm b/maps/Route42.asm index 054f026b1..c241a5a1e 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -251,8 +251,7 @@ FruitTreeScript_0x1a9351: fruittree $17 MapRoute42SignpostItem4: - dw $00ad - db MAX_POTION + dwb EVENT_ROUTE_42_HIDDEN_MAX_POTION, MAX_POTION MovementData_0x1a9356: @@ -381,7 +380,7 @@ Route42_MapEventHeader: signpost 5, 7, SIGNPOST_READ, MapRoute42Signpost1Script signpost 9, 45, SIGNPOST_READ, MapRoute42Signpost2Script signpost 8, 54, SIGNPOST_READ, MapRoute42Signpost3Script - signpost 11, 16, SIGNPOST_ITEMIFSET, MapRoute42SignpostItem4 + signpost 11, 16, SIGNPOST_ITEM, MapRoute42SignpostItem4 ; people-events db 9 @@ -391,6 +390,6 @@ Route42_MapEventHeader: person_event SPRITE_FRUIT_TREE, 20, 31, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a934d, -1 person_event SPRITE_FRUIT_TREE, 20, 32, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a934f, -1 person_event SPRITE_FRUIT_TREE, 20, 33, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a9351, -1 - person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a9349, EVENT_6B3 - person_event SPRITE_POKE_BALL, 12, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a934b, EVENT_6B4 + person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a9349, EVENT_ROUTE_42_ULTRA_BALL + person_event SPRITE_POKE_BALL, 12, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a934b, EVENT_ROUTE_42_SUPER_POTION person_event SPRITE_SUICUNE, 20, 30, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42 diff --git a/maps/Route43.asm b/maps/Route43.asm index 3b69877e7..d2d30fe3d 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -619,4 +619,4 @@ Route43_MapEventHeader: person_event SPRITE_LASS, 29, 13, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerTiffany3, -1 person_event SPRITE_YOUNGSTER, 44, 17, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 3, TrainerCamperSpencer, -1 person_event SPRITE_FRUIT_TREE, 30, 5, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19d266, -1 - person_event SPRITE_POKE_BALL, 36, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19d268, EVENT_6B5 + person_event SPRITE_POKE_BALL, 36, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19d268, EVENT_ROUTE_43_MAX_ETHER diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index 4281405b1..e338b7861 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -264,6 +264,6 @@ Route43Gate_MapEventHeader: ; people-events db 3 - person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ac85, EVENT_735 - person_event SPRITE_ROCKET, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_6DC - person_event SPRITE_ROCKET, 8, 11, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_6DC + person_event SPRITE_OFFICER, 8, 4, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, OfficerScript_0x19ac85, EVENT_LAKE_OF_RAGE_CIVILIANS + person_event SPRITE_ROCKET, 8, 6, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS + person_event SPRITE_ROCKET, 8, 11, UP << 2 | $3, $0, -1, -1, $0, 0, RocketScript_0x19ac82, EVENT_ROUTE_43_GATE_ROCKETS diff --git a/maps/Route44.asm b/maps/Route44.asm index b8a78ffa4..74e491192 100644 --- a/maps/Route44.asm +++ b/maps/Route44.asm @@ -417,8 +417,7 @@ ItemFragment_0x19da46: db MAX_REPEL, 1 MapRoute44SignpostItem2: - dw $00ae - db ELIXER + dwb EVENT_ROUTE_44_HIDDEN_ELIXER, ELIXER FisherWilton1SeenText: @@ -622,7 +621,7 @@ Route44_MapEventHeader: db 3 signpost 7, 53, SIGNPOST_READ, MapRoute44Signpost0Script signpost 10, 6, SIGNPOST_READ, MapRoute44Signpost1Script - signpost 9, 32, SIGNPOST_ITEMIFSET, MapRoute44SignpostItem2 + signpost 9, 32, SIGNPOST_ITEM, MapRoute44SignpostItem2 ; people-events db 11 @@ -634,6 +633,6 @@ Route44_MapEventHeader: person_event SPRITE_COOLTRAINER_M, 19, 45, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainermAllen, -1 person_event SPRITE_COOLTRAINER_F, 18, 35, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 5, TrainerCooltrainerfCybil, -1 person_event SPRITE_FRUIT_TREE, 9, 13, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19da40, -1 - person_event SPRITE_POKE_BALL, 12, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da42, EVENT_6B6 - person_event SPRITE_POKE_BALL, 8, 49, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da44, EVENT_6B7 - person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da46, EVENT_7BD + person_event SPRITE_POKE_BALL, 12, 34, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da42, EVENT_ROUTE_44_MAX_REVIVE + person_event SPRITE_POKE_BALL, 8, 49, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da44, EVENT_ROUTE_44_ULTRA_BALL + person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19da46, EVENT_ROUTE_44_MAX_REPEL diff --git a/maps/Route45.asm b/maps/Route45.asm index af2489383..7057ccbf9 100644 --- a/maps/Route45.asm +++ b/maps/Route45.asm @@ -409,8 +409,7 @@ ItemFragment_0x19e29c: db MAX_POTION, 1 MapRoute45SignpostItem1: - dw $00af - db PP_UP + dwb EVENT_ROUTE_45_HIDDEN_PP_UP, PP_UP HikerErikSeenText: @@ -644,7 +643,7 @@ Route45_MapEventHeader: ; signposts db 2 signpost 4, 10, SIGNPOST_READ, MapRoute45Signpost0Script - signpost 80, 13, SIGNPOST_ITEMIFSET, MapRoute45SignpostItem1 + signpost 80, 13, SIGNPOST_ITEM, MapRoute45SignpostItem1 ; people-events db 13 @@ -656,8 +655,8 @@ Route45_MapEventHeader: person_event SPRITE_COOLTRAINER_M, 22, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainermRyan, -1 person_event SPRITE_COOLTRAINER_F, 40, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfKelly, -1 person_event SPRITE_FRUIT_TREE, 86, 20, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x19e294, -1 - person_event SPRITE_POKE_BALL, 55, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e296, EVENT_6B8 - person_event SPRITE_POKE_BALL, 70, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e298, EVENT_6B9 - person_event SPRITE_POKE_BALL, 24, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29a, EVENT_6BA - person_event SPRITE_POKE_BALL, 37, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29c, EVENT_6BB + person_event SPRITE_POKE_BALL, 55, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e296, EVENT_ROUTE_45_NUGGET + person_event SPRITE_POKE_BALL, 70, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e298, EVENT_ROUTE_45_REVIVE + person_event SPRITE_POKE_BALL, 24, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29a, EVENT_ROUTE_45_ELIXER + person_event SPRITE_POKE_BALL, 37, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x19e29c, EVENT_ROUTE_45_MAX_POTION person_event SPRITE_YOUNGSTER, 74, 8, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x19e269, -1 diff --git a/maps/Route46.asm b/maps/Route46.asm index 0b7c8d016..105bfbd96 100644 --- a/maps/Route46.asm +++ b/maps/Route46.asm @@ -314,4 +314,4 @@ Route46_MapEventHeader: person_event SPRITE_LASS, 17, 6, UP << 2 | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerPicnickerErin1, -1 person_event SPRITE_FRUIT_TREE, 9, 11, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a978f, -1 person_event SPRITE_FRUIT_TREE, 10, 12, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a9791, -1 - person_event SPRITE_POKE_BALL, 19, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a978d, EVENT_6BC + person_event SPRITE_POKE_BALL, 19, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a978d, EVENT_ROUTE_46_X_SPEED diff --git a/maps/Route5.asm b/maps/Route5.asm index 74353b71b..bddc02d2e 100644 --- a/maps/Route5.asm +++ b/maps/Route5.asm @@ -57,4 +57,4 @@ Route5_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKEFAN_M, 20, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1adb19, EVENT_771 + person_event SPRITE_POKEFAN_M, 20, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, PokefanMScript_0x1adb19, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH diff --git a/maps/Route6.asm b/maps/Route6.asm index 86be6b7d9..e3522e22a 100644 --- a/maps/Route6.asm +++ b/maps/Route6.asm @@ -136,6 +136,6 @@ Route6_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKEFAN_M, 8, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 2, PokefanMScript_0x1ad951, EVENT_771 + person_event SPRITE_POKEFAN_M, 8, 21, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 2, PokefanMScript_0x1ad951, EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH person_event SPRITE_POKEFAN_M, 16, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmRex, -1 person_event SPRITE_POKEFAN_M, 16, 14, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerPokefanmAllan, -1 diff --git a/maps/Route9.asm b/maps/Route9.asm index d4c7dff56..032f33cc7 100644 --- a/maps/Route9.asm +++ b/maps/Route9.asm @@ -171,8 +171,7 @@ MapRoute9Signpost0Script: jumptext UnknownText_0x1ab2a2 MapRoute9SignpostItem1: - dw $00f2 - db ETHER + dwb EVENT_ROUTE_9_HIDDEN_ETHER, ETHER CamperDeanSeenText: @@ -309,7 +308,7 @@ Route9_MapEventHeader: ; signposts db 2 signpost 7, 15, SIGNPOST_READ, MapRoute9Signpost0Script - signpost 15, 41, SIGNPOST_ITEMIFSET, MapRoute9SignpostItem1 + signpost 15, 41, SIGNPOST_ITEM, MapRoute9SignpostItem1 ; people-events db 6 diff --git a/maps/RuinsofAlphAerodactylChamber.asm b/maps/RuinsofAlphAerodactylChamber.asm index e8b8113c8..06f0f40f4 100644 --- a/maps/RuinsofAlphAerodactylChamber.asm +++ b/maps/RuinsofAlphAerodactylChamber.asm @@ -61,7 +61,7 @@ MapRuinsofAlphAerodactylChamberSignpost2Script: end UnknownScript_0x58df7: - setevent EVENT_705 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_2A3 setflag ENGINE_UNLOCKED_UNOWNS_3 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 diff --git a/maps/RuinsofAlphHoOhChamber.asm b/maps/RuinsofAlphHoOhChamber.asm index fcd484b2c..6f6d5a3a0 100644 --- a/maps/RuinsofAlphHoOhChamber.asm +++ b/maps/RuinsofAlphHoOhChamber.asm @@ -62,7 +62,7 @@ MapRuinsofAlphHoOhChamberSignpost2Script: end UnknownScript_0x585ba: - setevent EVENT_705 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_2A0 setflag ENGINE_UNLOCKED_UNOWNS_4 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 diff --git a/maps/RuinsofAlphInnerChamber.asm b/maps/RuinsofAlphInnerChamber.asm index 0b79dc97b..5d33b72d7 100644 --- a/maps/RuinsofAlphInnerChamber.asm +++ b/maps/RuinsofAlphInnerChamber.asm @@ -25,7 +25,7 @@ UnknownScript_0x58f6e: loadmovesprites dotrigger $0 setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS - clearevent EVENT_78E + clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end FisherScript_0x58f7d: @@ -125,6 +125,6 @@ RuinsofAlphInnerChamber_MapEventHeader: ; people-events db 3 - person_event SPRITE_FISHER, 11, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58f7d, EVENT_705 - person_event SPRITE_TEACHER, 17, 18, DOWN << 2 | $2, $11, -1, -1, $0, 0, TeacherScript_0x58f80, EVENT_705 - person_event SPRITE_GRAMPS, 23, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x58f83, EVENT_705 + person_event SPRITE_FISHER, 11, 7, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_TEACHER, 17, 18, DOWN << 2 | $2, $11, -1, -1, $0, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_GRAMPS, 23, 15, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsofAlphKabutoChamber.asm b/maps/RuinsofAlphKabutoChamber.asm index 013bd4a43..c7c478862 100644 --- a/maps/RuinsofAlphKabutoChamber.asm +++ b/maps/RuinsofAlphKabutoChamber.asm @@ -66,10 +66,10 @@ MapRuinsofAlphKabutoChamberSignpost2Script: end UnknownScript_0x58778: - setevent EVENT_705 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_2A1 setflag ENGINE_UNLOCKED_UNOWNS_1 - setevent EVENT_74E + setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 earthquake 30 showemote EMOTE_SHOCK, $0, 15 @@ -284,5 +284,5 @@ RuinsofAlphKabutoChamber_MapEventHeader: ; people-events db 2 - person_event SPRITE_RECEPTIONIST, 9, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x58769, EVENT_74E + person_event SPRITE_RECEPTIONIST, 9, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ReceptionistScript_0x58769, EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST person_event SPRITE_SCIENTIST, 5, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x587a8, -1 diff --git a/maps/RuinsofAlphOmanyteChamber.asm b/maps/RuinsofAlphOmanyteChamber.asm index 86ba93086..b6be9055d 100644 --- a/maps/RuinsofAlphOmanyteChamber.asm +++ b/maps/RuinsofAlphOmanyteChamber.asm @@ -62,7 +62,7 @@ MapRuinsofAlphOmanyteChamberSignpost2Script: end UnknownScript_0x58c36: - setevent EVENT_705 + setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS setevent EVENT_2A2 setflag ENGINE_UNLOCKED_UNOWNS_2 domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1 diff --git a/maps/RuinsofAlphOutside.asm b/maps/RuinsofAlphOutside.asm index eabecdf7e..7c8bfc4f0 100644 --- a/maps/RuinsofAlphOutside.asm +++ b/maps/RuinsofAlphOutside.asm @@ -344,7 +344,7 @@ RuinsofAlphOutside_MapEventHeader: ; people-events db 5 person_event SPRITE_YOUNGSTER, 24, 8, UP << 2 | $2, $0, -1, -1, $2, 1, TrainerPsychicNathan, -1 - person_event SPRITE_SCIENTIST, 19, 15, UP << 2 | $3, $0, -1, -1, $0, 0, ScientistScript_0x58043, EVENT_703 - person_event SPRITE_FISHER, 21, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58061, EVENT_78E - person_event SPRITE_YOUNGSTER, 15, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x58076, EVENT_78F - person_event SPRITE_YOUNGSTER, 12, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5807e, EVENT_78F + person_event SPRITE_SCIENTIST, 19, 15, UP << 2 | $3, $0, -1, -1, $0, 0, ScientistScript_0x58043, EVENT_RUINS_OF_ALPH_OUTSIDE_SCIENTIST + person_event SPRITE_FISHER, 21, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x58061, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER + person_event SPRITE_YOUNGSTER, 15, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, YoungsterScript_0x58076, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS + person_event SPRITE_YOUNGSTER, 12, 16, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x5807e, EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS diff --git a/maps/RuinsofAlphResearchCenter.asm b/maps/RuinsofAlphResearchCenter.asm index c2f6e5744..8bdc688fb 100644 --- a/maps/RuinsofAlphResearchCenter.asm +++ b/maps/RuinsofAlphResearchCenter.asm @@ -105,7 +105,7 @@ UnknownScript_0x5920b: writetext UnknownText_0x594cb closetext loadmovesprites - clearevent EVENT_78F + clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS end ScientistScript_0x59214: @@ -134,7 +134,7 @@ UnknownScript_0x5922e: MapRuinsofAlphResearchCenterSignpost1Script: loadfont - checkevent EVENT_704 + checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x59241 checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59247 @@ -152,7 +152,7 @@ UnknownScript_0x59247: MapRuinsofAlphResearchCenterSignpost2Script: loadfont - checkevent EVENT_704 + checkevent EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST iftrue UnknownScript_0x5925a checkcode VAR_UNOWNCOUNT if_equal 26, UnknownScript_0x59260 @@ -414,4 +414,4 @@ RuinsofAlphResearchCenter_MapEventHeader: db 3 person_event SPRITE_SCIENTIST, 9, 8, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591e5, -1 person_event SPRITE_SCIENTIST, 6, 9, DOWN << 2 | $2, $12, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x59214, -1 - person_event SPRITE_SCIENTIST, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591d1, EVENT_704 + person_event SPRITE_SCIENTIST, 9, 6, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ScientistScript_0x591d1, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index cf02c89d9..c4638612c 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -233,5 +233,5 @@ SaffronTrainStation_MapEventHeader: db 4 person_event SPRITE_OFFICER, 13, 13, UP << 2 | $2, $0, -1, -1, $0, 0, OfficerScript_0x18a81e, -1 person_event SPRITE_GYM_GUY, 18, 14, DOWN << 2 | $2, $11, -1, -1, $0, 0, GymGuyScript_0x18a875, -1 - person_event SPRITE_TEACHER, 15, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, TeacherScript_0x18a889, EVENT_772 - person_event SPRITE_LASS, 14, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x18a88c, EVENT_772 + person_event SPRITE_TEACHER, 15, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, TeacherScript_0x18a889, EVENT_SAFFRON_TRAIN_STATION_POPULATION + person_event SPRITE_LASS, 14, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x18a88c, EVENT_SAFFRON_TRAIN_STATION_POPULATION diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index 69316d34f..aa061a712 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -172,4 +172,4 @@ SeafoamGym_MapEventHeader: ; people-events db 2 person_event SPRITE_BLAINE, 6, 9, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, BlaineScript_0x1ab4fb, -1 - person_event SPRITE_GYM_GUY, 9, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SeafoamGymGuyScript, EVENT_777 + person_event SPRITE_GYM_GUY, 9, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SeafoamGymGuyScript, EVENT_SEAFOAM_GYM_GYM_GUY diff --git a/maps/SilverCaveItemRooms.asm b/maps/SilverCaveItemRooms.asm index 827553030..02deaf08d 100644 --- a/maps/SilverCaveItemRooms.asm +++ b/maps/SilverCaveItemRooms.asm @@ -28,5 +28,5 @@ SilverCaveItemRooms_MapEventHeader: ; people-events db 2 - person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c65e, EVENT_69C - person_event SPRITE_POKE_BALL, 15, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c660, EVENT_69D + person_event SPRITE_POKE_BALL, 7, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c65e, EVENT_SILVER_CAVE_ITEM_ROOMS_MAX_REVIVE + person_event SPRITE_POKE_BALL, 15, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c660, EVENT_SILVER_CAVE_ITEM_ROOMS_FULL_RESTORE diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index ab2b3f4be..9120d097b 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -19,8 +19,7 @@ MtSilverSign: jumptext MtSilverSignText MapSilverCaveOutsideSignpostItem2: - dw $00b8 - db FULL_RESTORE + dwb EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE, FULL_RESTORE MtSilverSignText: text "MT.SILVER" @@ -42,7 +41,7 @@ SilverCaveOutside_MapEventHeader: db 3 signpost 19, 24, SIGNPOST_READ, MtSilverPokeCenterSign signpost 13, 17, SIGNPOST_READ, MtSilverSign - signpost 25, 9, SIGNPOST_ITEMIFSET, MapSilverCaveOutsideSignpostItem2 + signpost 25, 9, SIGNPOST_ITEM, MapSilverCaveOutsideSignpostItem2 ; people-events db 0 diff --git a/maps/SilverCaveRoom1.asm b/maps/SilverCaveRoom1.asm index a47c3ecff..b63ae780e 100644 --- a/maps/SilverCaveRoom1.asm +++ b/maps/SilverCaveRoom1.asm @@ -18,13 +18,11 @@ ItemFragment_0x18c55a: db ULTRA_BALL, 1 MapSilverCaveRoom1SignpostItem0: - dw $009a - db DIRE_HIT + dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_DIRE_HIT, DIRE_HIT MapSilverCaveRoom1SignpostItem1: - dw $009b - db ULTRA_BALL + dwb EVENT_SILVER_CAVE_ROOM_1_HIDDEN_ULTRA_BALL, ULTRA_BALL SilverCaveRoom1_MapEventHeader: @@ -41,12 +39,12 @@ SilverCaveRoom1_MapEventHeader: ; signposts db 2 - signpost 23, 16, SIGNPOST_ITEMIFSET, MapSilverCaveRoom1SignpostItem0 - signpost 12, 17, SIGNPOST_ITEMIFSET, MapSilverCaveRoom1SignpostItem1 + signpost 23, 16, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem0 + signpost 12, 17, SIGNPOST_ITEM, MapSilverCaveRoom1SignpostItem1 ; people-events db 4 - person_event SPRITE_POKE_BALL, 13, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_699 - person_event SPRITE_POKE_BALL, 33, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_69A - person_event SPRITE_POKE_BALL, 34, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c558, EVENT_69B - person_event SPRITE_POKE_BALL, 22, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c55a, EVENT_7C1 + person_event SPRITE_POKE_BALL, 13, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c554, EVENT_SILVER_CAVE_ROOM_1_MAX_ELIXER + person_event SPRITE_POKE_BALL, 33, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c556, EVENT_SILVER_CAVE_ROOM_1_PROTEIN + person_event SPRITE_POKE_BALL, 34, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c558, EVENT_SILVER_CAVE_ROOM_1_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 22, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c55a, EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL diff --git a/maps/SilverCaveRoom2.asm b/maps/SilverCaveRoom2.asm index 4d7280ebb..47e4caf0d 100644 --- a/maps/SilverCaveRoom2.asm +++ b/maps/SilverCaveRoom2.asm @@ -15,8 +15,7 @@ ItemFragment_0x18c5b6: db PP_UP, 1 MapSilverCaveRoom2SignpostItem0: - dw $009c - db MAX_POTION + dwb EVENT_SILVER_CAVE_ROOM_2_HIDDEN_MAX_POTION, MAX_POTION SilverCaveRoom2_MapEventHeader: @@ -35,10 +34,10 @@ SilverCaveRoom2_MapEventHeader: ; signposts db 1 - signpost 31, 14, SIGNPOST_ITEMIFSET, MapSilverCaveRoom2SignpostItem0 + signpost 31, 14, SIGNPOST_ITEM, MapSilverCaveRoom2SignpostItem0 ; people-events db 3 - person_event SPRITE_POKE_BALL, 14, 28, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b2, EVENT_7C2 - person_event SPRITE_POKE_BALL, 28, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b4, EVENT_7C3 - person_event SPRITE_POKE_BALL, 24, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b6, EVENT_7C4 + person_event SPRITE_POKE_BALL, 14, 28, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b2, EVENT_SILVER_CAVE_ROOM_2_CALCIUM + person_event SPRITE_POKE_BALL, 28, 26, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b4, EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL + person_event SPRITE_POKE_BALL, 24, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c5b6, EVENT_SILVER_CAVE_ROOM_2_PP_UP diff --git a/maps/SlowpokeWellB1F.asm b/maps/SlowpokeWellB1F.asm index b8965e462..f7889562f 100644 --- a/maps/SlowpokeWellB1F.asm +++ b/maps/SlowpokeWellB1F.asm @@ -79,15 +79,15 @@ GruntM1Script: setevent EVENT_CLEARED_SLOWPOKE_WELL variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1 - clearevent EVENT_6F3 - clearevent EVENT_6E9 + clearevent EVENT_ILEX_FOREST_APPRENTICE + clearevent EVENT_ILEX_FOREST_FARFETCHD setevent EVENT_6F5 setevent EVENT_6F6 - setevent EVENT_6FB - setevent EVENT_740 - clearevent EVENT_6F9 - clearevent EVENT_6FD - clearevent EVENT_73E + setevent EVENT_SLOWPOKE_WELL_SLOWPOKES + setevent EVENT_SLOWPOKE_WELL_KURT + clearevent EVENT_AZALEA_TOWN_SLOWPOKES + clearevent EVENT_KURTS_HOUSE_SLOWPOKE + clearevent EVENT_KURTS_HOUSE_KURT_1 special Function8c084 special HealParty pause 15 @@ -390,12 +390,12 @@ SlowpokeWellB1F_MapEventHeader: ; people-events db 9 - person_event SPRITE_ROCKET, 11, 19, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM29, EVENT_6FC - person_event SPRITE_ROCKET, 6, 9, UP << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM1, EVENT_6FC - person_event SPRITE_ROCKET, 10, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM2, EVENT_6FC - person_event SPRITE_ROCKET_GIRL, 8, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerGruntF1, EVENT_6FC - person_event SPRITE_SLOWPOKE, 8, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a681, EVENT_6FB - person_event SPRITE_SLOWPOKE, 6, 10, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a695, EVENT_6FB - person_event SPRITE_KURT, 18, 20, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x5a5d5, EVENT_740 + person_event SPRITE_ROCKET, 11, 19, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM29, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_ROCKET, 6, 9, UP << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM1, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_ROCKET, 10, 9, LEFT << 2 | $1, $0, -1, -1, $2, 2, TrainerGruntM2, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_ROCKET_GIRL, 8, 14, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerGruntF1, EVENT_SLOWPOKE_WELL_ROCKETS + person_event SPRITE_SLOWPOKE, 8, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a681, EVENT_SLOWPOKE_WELL_SLOWPOKES + person_event SPRITE_SLOWPOKE, 6, 10, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, SlowpokeScript_0x5a695, EVENT_SLOWPOKE_WELL_SLOWPOKES + person_event SPRITE_KURT, 18, 20, UP << 2 | $3, $0, -1, -1, $0, 0, KurtScript_0x5a5d5, EVENT_SLOWPOKE_WELL_KURT person_event SPRITE_BOULDER, 6, 7, LEFT << 2 | $11, $0, -1, -1, $0, 0, SlowpokeWellB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 7, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a6a3, EVENT_662 + person_event SPRITE_POKE_BALL, 7, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a6a3, EVENT_SLOWPOKE_WELL_B1F_SUPER_POTION diff --git a/maps/SlowpokeWellB2F.asm b/maps/SlowpokeWellB2F.asm index 811d5b0f6..fd8a9d4f8 100644 --- a/maps/SlowpokeWellB2F.asm +++ b/maps/SlowpokeWellB2F.asm @@ -74,4 +74,4 @@ SlowpokeWellB2F_MapEventHeader: ; people-events db 2 person_event SPRITE_GYM_GUY, 8, 9, DOWN << 2 | $2, $21, -1, -1, $0, 1, GymGuyScript_0x5ad0b, -1 - person_event SPRITE_POKE_BALL, 9, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5ad28, EVENT_663 + person_event SPRITE_POKE_BALL, 9, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5ad28, EVENT_SLOWPOKE_WELL_B2F_TM_RAIN_DANCE diff --git a/maps/SproutTower1F.asm b/maps/SproutTower1F.asm index 2e5a5bfa8..30c0a5ec2 100644 --- a/maps/SproutTower1F.asm +++ b/maps/SproutTower1F.asm @@ -137,4 +137,4 @@ SproutTower1F_MapEventHeader: person_event SPRITE_GRANNY, 16, 15, LEFT << 2 | $0, $0, -1, -1, $0, 0, GrannyScript_0x184504, -1 person_event SPRITE_TEACHER, 13, 13, UP << 2 | $3, $0, -1, -1, $0, 0, TeacherScript_0x184507, -1 person_event SPRITE_SAGE, 9, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSageChow, -1 - person_event SPRITE_POKE_BALL, 11, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18451e, EVENT_647 + person_event SPRITE_POKE_BALL, 11, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18451e, EVENT_SPROUT_TOWER1F_PARLYZ_HEAL diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm index c138cc272..1d74f3b1a 100644 --- a/maps/SproutTower2F.asm +++ b/maps/SproutTower2F.asm @@ -133,4 +133,4 @@ SproutTower2F_MapEventHeader: db 3 person_event SPRITE_SAGE, 7, 16, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 4, TrainerSageNico, -1 person_event SPRITE_SAGE, 18, 13, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 5, TrainerSageEdmond, -1 - person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1847a7, EVENT_648 + person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index 5f6aaccb4..dbbde2c39 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -397,6 +397,6 @@ SproutTower3F_MapEventHeader: person_event SPRITE_SAGE, 12, 12, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerSageTroy, -1 person_event SPRITE_SAGE, 6, 14, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SageLiScript, -1 person_event SPRITE_SAGE, 15, 15, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerSageNeal, -1 - person_event SPRITE_POKE_BALL, 18, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a19, EVENT_649 - person_event SPRITE_POKE_BALL, 5, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a1b, EVENT_64A + person_event SPRITE_POKE_BALL, 18, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a19, EVENT_SPROUT_TOWER_3F_POTION + person_event SPRITE_POKE_BALL, 5, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x184a1b, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE person_event SPRITE_SILVER, 8, 14, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index ac32a8b96..1ee9fa25f 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -23,7 +23,7 @@ SecurityCamera1a: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -48,7 +48,7 @@ SecurityCamera1b: checkevent EVENT_SECURITY_CAMERA_1 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -73,7 +73,7 @@ SecurityCamera2a: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -99,7 +99,7 @@ SecurityCamera2b: checkevent EVENT_SECURITY_CAMERA_2 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -125,7 +125,7 @@ SecurityCamera3a: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -151,7 +151,7 @@ SecurityCamera3b: checkevent EVENT_SECURITY_CAMERA_3 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -177,7 +177,7 @@ SecurityCamera4: checkevent EVENT_SECURITY_CAMERA_4 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -203,7 +203,7 @@ SecurityCamera5: checkevent EVENT_SECURITY_CAMERA_5 iftrue NoSecurityCamera scall PlaySecurityCameraSounds - checkevent EVENT_6DA + checkevent EVENT_TEAM_ROCKET_BASE_POPULATION iftrue NoSecurityCamera showemote EMOTE_SHOCK, $0, 15 playmusic MUSIC_ROCKET_ENCOUNTER @@ -569,8 +569,7 @@ ItemFragment_0x6cac8: db GUARD_SPEC, 1 MapTeamRocketBaseB1FSignpostItem8: - dw $0086 - db REVIVE + dwb EVENT_TEAM_ROCKET_BASE_B1F_HIDDEN_REVIVE, REVIVE SecurityCameraMovement1: @@ -815,13 +814,13 @@ TeamRocketBaseB1F_MapEventHeader: signpost 5, 24, SIGNPOST_UP, MapTeamRocketBaseB1FSignpost5Script signpost 11, 20, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script signpost 11, 21, SIGNPOST_READ, MapTeamRocketBaseB1FSignpost7Script - signpost 11, 3, SIGNPOST_ITEMIFSET, MapTeamRocketBaseB1FSignpostItem8 + signpost 11, 3, SIGNPOST_ITEM, MapTeamRocketBaseB1FSignpostItem8 ; people-events db 6 - person_event SPRITE_ROCKET, 4, 4, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D9 - person_event SPRITE_ROCKET, 8, 6, LEFT << 2 | $1, $0, -1, -1, $2, 3, TrainerGruntM16, EVENT_6DA - person_event SPRITE_SCIENTIST, 16, 22, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistJed, EVENT_6DA - person_event SPRITE_POKE_BALL, 10, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac4, EVENT_669 - person_event SPRITE_POKE_BALL, 19, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac6, EVENT_66A - person_event SPRITE_POKE_BALL, 16, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac8, EVENT_66B + person_event SPRITE_ROCKET, 4, 4, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_SECURITY_GRUNTS + person_event SPRITE_ROCKET, 8, 6, LEFT << 2 | $1, $0, -1, -1, $2, 3, TrainerGruntM16, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 16, 22, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistJed, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_POKE_BALL, 10, 31, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac4, EVENT_TEAM_ROCKET_BASE_B1F_HYPER_POTION + person_event SPRITE_POKE_BALL, 19, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac6, EVENT_TEAM_ROCKET_BASE_B1F_NUGGET + person_event SPRITE_POKE_BALL, 16, 25, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6cac8, EVENT_TEAM_ROCKET_BASE_B1F_GUARD_SPEC diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 97a8dba8f..8da4ee230 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -89,9 +89,9 @@ UnknownScript_0x6cfac: loadtrainer EXECUTIVEF, 2 startbattle disappear $5 - setevent EVENT_6DD - setevent EVENT_6DE - setevent EVENT_6D6 + setevent EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + setevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE returnafterbattle setevent EVENT_BEAT_ROCKET_EXECUTIVEF_2 loadfont @@ -108,7 +108,7 @@ UnknownScript_0x6cfac: pause 15 special Function8c0ab dotrigger $2 - clearevent EVENT_6D6 + clearevent EVENT_TEAM_ROCKET_BASE_B2F_LANCE spriteface $4, DOWN loadfont writetext UnknownText_0x6d5d8 @@ -265,11 +265,11 @@ VoltorbScript_0x6d101: iftrue UnknownScript_0x6d182 disappear $6 disappear $9 - checkevent EVENT_6E0 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E1 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E2 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -283,11 +283,11 @@ VoltorbScript_0x6d12c: iftrue UnknownScript_0x6d182 disappear $7 disappear $a - checkevent EVENT_6E0 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E1 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E2 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -301,11 +301,11 @@ VoltorbScript_0x6d157: iftrue UnknownScript_0x6d182 disappear $8 disappear $b - checkevent EVENT_6E0 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E1 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 iffalse UnknownScript_0x6d182 - checkevent EVENT_6E2 + checkevent EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 iffalse UnknownScript_0x6d182 returnafterbattle special PlayMapMusic @@ -339,10 +339,10 @@ UnknownScript_0x6d184: disappear $4 setevent EVENT_CLEARED_ROCKET_HIDEOUT clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 - setevent EVENT_6DC - setevent EVENT_757 + setevent EVENT_ROUTE_43_GATE_ROCKETS + setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM dotrigger $3 - clearevent EVENT_735 + clearevent EVENT_LAKE_OF_RAGE_CIVILIANS setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_SECURITY_CAMERA_1 setevent EVENT_SECURITY_CAMERA_2 @@ -395,8 +395,7 @@ ItemFragment_0x6d20d: db TM_THIEF, 1 MapTeamRocketBaseB2FSignpostItem22: - dw $0087 - db FULL_HEAL + dwb EVENT_TEAM_ROCKET_BASE_B2F_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x6d212: @@ -997,21 +996,21 @@ TeamRocketBaseB2F_MapEventHeader: signpost 6, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script signpost 7, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script signpost 8, 17, SIGNPOST_READ, MapTeamRocketBaseB2FSignpost21Script - signpost 7, 26, SIGNPOST_ITEMIFSET, MapTeamRocketBaseB2FSignpostItem22 + signpost 7, 26, SIGNPOST_ITEM, MapTeamRocketBaseB2FSignpostItem22 ; people-events db 14 - person_event SPRITE_ROCKET, 20, 24, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6DE - person_event SPRITE_ROCKET_GIRL, 20, 24, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_6DD - person_event SPRITE_LANCE, 17, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6D6 - person_event SPRITE_DRAGON, 17, 13, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6DF - person_event SPRITE_VOLTORB, 9, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d101, EVENT_6E0 - person_event SPRITE_VOLTORB, 11, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d12c, EVENT_6E1 - person_event SPRITE_VOLTORB, 13, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d157, EVENT_6E2 - person_event SPRITE_VOLTORB, 9, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6E0 - person_event SPRITE_VOLTORB, 11, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6E1 - person_event SPRITE_VOLTORB, 13, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6E2 - person_event SPRITE_ROCKET, 17, 29, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM17, EVENT_6DA - person_event SPRITE_ROCKET, 5, 8, LEFT << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM18, EVENT_6DA - person_event SPRITE_ROCKET, 18, 25, LEFT << 2 | $0, $0, -1, -1, $2, 4, TrainerGruntM19, EVENT_6DA - person_event SPRITE_POKE_BALL, 14, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6d20d, EVENT_66C + person_event SPRITE_ROCKET, 20, 24, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_GRUNT_WITH_EXECUTIVE + person_event SPRITE_ROCKET_GIRL, 20, 24, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_EXECUTIVE + person_event SPRITE_LANCE, 17, 9, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_LANCE + person_event SPRITE_DRAGON, 17, 13, LEFT << 2 | $1, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_DRAGONITE + person_event SPRITE_VOLTORB, 9, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d101, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + person_event SPRITE_VOLTORB, 11, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d12c, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + person_event SPRITE_VOLTORB, 13, 11, UP << 2 | $12, $0, -1, -1, $0, 0, VoltorbScript_0x6d157, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + person_event SPRITE_VOLTORB, 9, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_1 + person_event SPRITE_VOLTORB, 11, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_2 + person_event SPRITE_VOLTORB, 13, 26, UP << 2 | $12, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B2F_ELECTRODE_3 + person_event SPRITE_ROCKET, 17, 29, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM17, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 5, 8, LEFT << 2 | $2, $0, -1, -1, $2, 1, TrainerGruntM18, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 18, 25, LEFT << 2 | $0, $0, -1, -1, $2, 4, TrainerGruntM19, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_POKE_BALL, 14, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6d20d, EVENT_TEAM_ROCKET_BASE_B2F_TM_THIEF diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 2c431a702..b0acfa21c 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -651,17 +651,17 @@ TeamRocketBaseB3F_MapEventHeader: ; people-events db 14 - person_event SPRITE_LANCE, 18, 29, UP << 2 | $2, $0, -1, -1, $0, 0, LanceScript_0x6dffc, EVENT_6D7 - person_event SPRITE_ROCKET, 7, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6DB - person_event SPRITE_MOLTRES, 6, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MoltresScript_0x6e091, EVENT_6DA - person_event SPRITE_ROCKET_GIRL, 11, 25, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerGruntF5, EVENT_6DA - person_event SPRITE_ROCKET, 18, 9, LEFT << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM28, EVENT_6DA - person_event SPRITE_SCIENTIST, 15, 27, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerScientistRoss, EVENT_6DA - person_event SPRITE_SCIENTIST, 19, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistMitch, EVENT_6DA - person_event SPRITE_ROCKET, 18, 28, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x6e048, EVENT_6DA - person_event SPRITE_SILVER, 9, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C0 - person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e120, EVENT_66D - person_event SPRITE_POKE_BALL, 16, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e122, EVENT_66E - person_event SPRITE_POKE_BALL, 13, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e124, EVENT_66F - person_event SPRITE_POKE_BALL, 6, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e126, EVENT_670 - person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e128, EVENT_654 + person_event SPRITE_LANCE, 18, 29, UP << 2 | $2, $0, -1, -1, $0, 0, LanceScript_0x6dffc, EVENT_TEAM_ROCKET_BASE_B3F_LANCE_PASSWORDS + person_event SPRITE_ROCKET, 7, 12, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_TEAM_ROCKET_BASE_B3F_EXECUTIVE + person_event SPRITE_MOLTRES, 6, 11, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, MoltresScript_0x6e091, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET_GIRL, 11, 25, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 0, TrainerGruntF5, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 18, 9, LEFT << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM28, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 15, 27, UP << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SCIENTIST, 19, 15, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_ROCKET, 18, 28, UP << 2 | $2, $0, -1, -1, $0, 0, RocketScript_0x6e048, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_SILVER, 9, 8, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE + person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e120, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN + person_event SPRITE_POKE_BALL, 16, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e122, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL + person_event SPRITE_POKE_BALL, 13, 32, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e124, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL + person_event SPRITE_POKE_BALL, 6, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e126, EVENT_TEAM_ROCKET_BASE_B3F_ICE_HEAL + person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x6e128, EVENT_TEAM_ROCKET_BASE_B3F_ULTRA_BALL diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index a0ffa54a7..262fae8c3 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -29,8 +29,8 @@ UnknownScript_0x18502f: iffalse UnknownScript_0x185050 special SpecialBeastsCheck iffalse UnknownScript_0x185050 - clearevent EVENT_7C5 - setevent EVENT_7B6 + clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 UnknownScript_0x185047: checkevent EVENT_FOUGHT_HO_OH iffalse UnknownScript_0x18504f @@ -66,8 +66,8 @@ UnknownScript_0x185077: disappear $2 disappear $3 disappear $4 - clearevent EVENT_7B6 - setevent EVENT_7C5 + clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 + setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 return UnknownScript_0x185084: @@ -534,13 +534,13 @@ TinTower1F_MapEventHeader: ; people-events db 10 - person_event SPRITE_SUICUNE, 13, 13, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_7B2 - person_event SPRITE_RAIKOU, 13, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_7B4 - person_event SPRITE_ENTEI, 13, 16, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_7B3 - person_event SPRITE_SUPER_NERD, 7, 12, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x1851c8, EVENT_7B5 - person_event SPRITE_SAGE, 13, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185173, EVENT_7B6 - person_event SPRITE_SAGE, 15, 15, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185176, EVENT_7B6 - person_event SPRITE_SAGE, 10, 18, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185179, EVENT_7B6 - person_event SPRITE_SAGE, 6, 8, UP << 2 | $0, $10, -1, -1, $0, 0, SageScript_0x18517c, EVENT_7C5 - person_event SPRITE_SAGE, 5, 13, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x185188, EVENT_7C5 - person_event SPRITE_SAGE, 6, 18, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x1851bc, EVENT_7C5 + person_event SPRITE_SUICUNE, 13, 13, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_SUICUNE + person_event SPRITE_RAIKOU, 13, 11, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_RAIKOU + person_event SPRITE_ENTEI, 13, 16, DOWN << 2 | $1, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, ObjectEvent, EVENT_TIN_TOWER_1F_ENTEI + person_event SPRITE_SUPER_NERD, 7, 12, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x1851c8, EVENT_TIN_TOWER_1F_EUSINE + person_event SPRITE_SAGE, 13, 9, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185173, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 15, 15, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185176, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 10, 18, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x185179, EVENT_TIN_TOWER_1F_WISE_TRIO_1 + person_event SPRITE_SAGE, 6, 8, UP << 2 | $0, $10, -1, -1, $0, 0, SageScript_0x18517c, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 5, 13, UP << 2 | $2, $0, -1, -1, $0, 0, SageScript_0x185188, EVENT_TIN_TOWER_1F_WISE_TRIO_2 + person_event SPRITE_SAGE, 6, 18, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x1851bc, EVENT_TIN_TOWER_1F_WISE_TRIO_2 diff --git a/maps/TinTower3F.asm b/maps/TinTower3F.asm index 02b0765ba..a9ad927e5 100644 --- a/maps/TinTower3F.asm +++ b/maps/TinTower3F.asm @@ -25,4 +25,4 @@ TinTower3F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 18, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a37, EVENT_64B + person_event SPRITE_POKE_BALL, 18, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a37, EVENT_TIN_TOWER_3F_FULL_HEAL diff --git a/maps/TinTower4F.asm b/maps/TinTower4F.asm index e5109007f..3225347fc 100644 --- a/maps/TinTower4F.asm +++ b/maps/TinTower4F.asm @@ -15,8 +15,7 @@ ItemFragment_0x185a5c: db ESCAPE_ROPE, 1 MapTinTower4FSignpostItem0: - dw $007d - db MAX_POTION + dwb EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION, MAX_POTION TinTower4F_MapEventHeader: @@ -35,10 +34,10 @@ TinTower4F_MapEventHeader: ; signposts db 1 - signpost 6, 11, SIGNPOST_ITEMIFSET, MapTinTower4FSignpostItem0 + signpost 6, 11, SIGNPOST_ITEM, MapTinTower4FSignpostItem0 ; people-events db 3 - person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a58, EVENT_64C - person_event SPRITE_POKE_BALL, 18, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5a, EVENT_64D - person_event SPRITE_POKE_BALL, 16, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5c, EVENT_64E + person_event SPRITE_POKE_BALL, 14, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a58, EVENT_TIN_TOWER_4F_ULTRA_BALL + person_event SPRITE_POKE_BALL, 18, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5a, EVENT_TIN_TOWER_4F_PP_UP + person_event SPRITE_POKE_BALL, 16, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185a5c, EVENT_TIN_TOWER_4F_ESCAPE_ROPE diff --git a/maps/TinTower5F.asm b/maps/TinTower5F.asm index 7478ac69f..4611567c4 100644 --- a/maps/TinTower5F.asm +++ b/maps/TinTower5F.asm @@ -9,13 +9,11 @@ ItemFragment_0x185aa9: db RARE_CANDY, 1 MapTinTower5FSignpostItem0: - dw $007e - db FULL_RESTORE + dwb EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE, FULL_RESTORE MapTinTower5FSignpostItem1: - dw $007f - db CARBOS + dwb EVENT_TIN_TOWER_5F_HIDDEN_CARBOS, CARBOS TinTower5F_MapEventHeader: @@ -34,9 +32,9 @@ TinTower5F_MapEventHeader: ; signposts db 2 - signpost 14, 16, SIGNPOST_ITEMIFSET, MapTinTower5FSignpostItem0 - signpost 15, 3, SIGNPOST_ITEMIFSET, MapTinTower5FSignpostItem1 + signpost 14, 16, SIGNPOST_ITEM, MapTinTower5FSignpostItem0 + signpost 15, 3, SIGNPOST_ITEM, MapTinTower5FSignpostItem1 ; people-events db 1 - person_event SPRITE_POKE_BALL, 13, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185aa9, EVENT_64F + person_event SPRITE_POKE_BALL, 13, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185aa9, EVENT_TIN_TOWER_5F_RARE_CANDY diff --git a/maps/TinTower6F.asm b/maps/TinTower6F.asm index 2e9c3ab09..11a532b55 100644 --- a/maps/TinTower6F.asm +++ b/maps/TinTower6F.asm @@ -25,4 +25,4 @@ TinTower6F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 12, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ae4, EVENT_7C6 + person_event SPRITE_POKE_BALL, 12, 12, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185ae4, EVENT_TIN_TOWER_6F_MAX_POTION diff --git a/maps/TinTower7F.asm b/maps/TinTower7F.asm index e84c42e6d..5d8d3969d 100644 --- a/maps/TinTower7F.asm +++ b/maps/TinTower7F.asm @@ -28,4 +28,4 @@ TinTower7F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 5, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b05, EVENT_650 + person_event SPRITE_POKE_BALL, 5, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b05, EVENT_TIN_TOWER_7F_MAX_REVIVE diff --git a/maps/TinTower8F.asm b/maps/TinTower8F.asm index 647de8435..78944021c 100644 --- a/maps/TinTower8F.asm +++ b/maps/TinTower8F.asm @@ -35,6 +35,6 @@ TinTower8F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 17, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b35, EVENT_651 - person_event SPRITE_POKE_BALL, 10, 15, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b37, EVENT_652 - person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b39, EVENT_653 + person_event SPRITE_POKE_BALL, 17, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b35, EVENT_TIN_TOWER_8F_NUGGET + person_event SPRITE_POKE_BALL, 10, 15, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b37, EVENT_TIN_TOWER_8F_MAX_ELIXER + person_event SPRITE_POKE_BALL, 5, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b39, EVENT_TIN_TOWER_8F_FULL_RESTORE diff --git a/maps/TinTower9F.asm b/maps/TinTower9F.asm index 17c73e459..9ac6e5b08 100644 --- a/maps/TinTower9F.asm +++ b/maps/TinTower9F.asm @@ -38,4 +38,4 @@ TinTower9F_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 5, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b88, EVENT_7C7 + person_event SPRITE_POKE_BALL, 5, 13, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x185b88, EVENT_TIN_TOWER_9F_HP_UP diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index d2d2772e1..54c0dcc47 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -60,4 +60,4 @@ TinTowerRoof_MapEventHeader: ; people-events db 1 - person_event SPRITE_HO_OH, 9, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, HoOhScript_0x77244, EVENT_73C + person_event SPRITE_HO_OH, 9, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, HoOhScript_0x77244, EVENT_TIN_TOWER_ROOF_HO_OH diff --git a/maps/TohjoFalls.asm b/maps/TohjoFalls.asm index e06881187..78f29fc42 100644 --- a/maps/TohjoFalls.asm +++ b/maps/TohjoFalls.asm @@ -25,4 +25,4 @@ TohjoFalls_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 10, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18db02, EVENT_6A9 + person_event SPRITE_POKE_BALL, 10, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18db02, EVENT_TOHJO_FALLS_MOON_STONE diff --git a/maps/Underground.asm b/maps/Underground.asm index 6e4c455e9..620a5cf1f 100644 --- a/maps/Underground.asm +++ b/maps/Underground.asm @@ -6,13 +6,11 @@ Underground_MapScriptHeader: db 0 MapUndergroundSignpostItem0: - dw $00e5 - db FULL_RESTORE + dwb EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE, FULL_RESTORE MapUndergroundSignpostItem1: - dw $00e6 - db X_SPECIAL + dwb EVENT_UNDERGROUND_HIDDEN_X_SPECIAL, X_SPECIAL Underground_MapEventHeader: @@ -29,8 +27,8 @@ Underground_MapEventHeader: ; signposts db 2 - signpost 9, 3, SIGNPOST_ITEMIFSET, MapUndergroundSignpostItem0 - signpost 19, 1, SIGNPOST_ITEMIFSET, MapUndergroundSignpostItem1 + signpost 9, 3, SIGNPOST_ITEM, MapUndergroundSignpostItem0 + signpost 19, 1, SIGNPOST_ITEM, MapUndergroundSignpostItem1 ; people-events db 0 diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 1962e4364..fc8b7befa 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -116,9 +116,9 @@ UnknownScript_0x7caaa: end UnknownScript_0x7cad4: - checkevent EVENT_6C5 + checkevent EVENT_RIVAL_BURNED_TOWER iftrue UnknownScript_0x7cae1 - setevent EVENT_6C5 + setevent EVENT_RIVAL_BURNED_TOWER domaptrigger GROUP_BURNED_TOWER_1F, MAP_BURNED_TOWER_1F, $1 UnknownScript_0x7cae1: playmusic MUSIC_RIVAL_ENCOUNTER @@ -126,7 +126,7 @@ UnknownScript_0x7cae1: writetext UnknownText_0x7ce9d closetext loadmovesprites - setevent EVENT_6C1 + setevent EVENT_RIVAL_UNDERGROUND_PATH checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x7cb09 checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -686,13 +686,11 @@ ItemFragment_0x7ce7f: db FULL_HEAL, 1 MapUndergroundPathSwitchRoomEntrancesSignpostItem4: - dw $008e - db MAX_POTION + dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_MAX_POTION, MAX_POTION MapUndergroundPathSwitchRoomEntrancesSignpostItem5: - dw $008f - db REVIVE + dwb EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE, REVIVE MovementData_0x7ce87: @@ -1016,19 +1014,19 @@ UndergroundPathSwitchRoomEntrances_MapEventHeader: signpost 1, 10, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost1Script signpost 1, 2, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost2Script signpost 11, 20, SIGNPOST_READ, MapUndergroundPathSwitchRoomEntrancesSignpost3Script - signpost 9, 8, SIGNPOST_ITEMIFSET, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 - signpost 8, 1, SIGNPOST_ITEMIFSET, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 + signpost 9, 8, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem4 + signpost 8, 1, SIGNPOST_ITEM, MapUndergroundPathSwitchRoomEntrancesSignpostItem5 ; people-events db 11 - person_event SPRITE_PHARMACIST, 16, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarDuncan, EVENT_6CE - person_event SPRITE_PHARMACIST, 12, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarEddie, EVENT_6CE - person_event SPRITE_ROCKET, 6, 21, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM13, EVENT_6CE - person_event SPRITE_ROCKET, 6, 15, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM11, EVENT_6CE - person_event SPRITE_ROCKET, 6, 7, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM25, EVENT_6CE - person_event SPRITE_ROCKET_GIRL, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF3, EVENT_6CE + person_event SPRITE_PHARMACIST, 16, 13, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarDuncan, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_PHARMACIST, 12, 8, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $82, 2, TrainerBurglarEddie, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 21, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM13, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 15, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM11, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 6, 7, UP << 2 | $2, $0, -1, -1, $2, 3, TrainerGruntM25, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET_GIRL, 16, 23, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerGruntF3, EVENT_RADIO_TOWER_ROCKET_TAKEOVER person_event SPRITE_TEACHER, 31, 7, UP << 2 | $2, $0, -1, -1, $0, 0, TeacherScript_0x7ca7d, -1 person_event SPRITE_SUPER_NERD, 31, 23, UP << 2 | $2, $0, -1, -1, $0, 0, SuperNerdScript_0x7ca7a, -1 - person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7d, EVENT_673 - person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7f, EVENT_674 - person_event SPRITE_SILVER, 7, 27, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C1 + person_event SPRITE_POKE_BALL, 16, 5, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7d, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_SMOKE_BALL + person_event SPRITE_POKE_BALL, 13, 18, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7ce7f, EVENT_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_FULL_HEAL + person_event SPRITE_SILVER, 7, 27, UP << 2 | $2, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_UNDERGROUND_PATH diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 051f14d9b..5a6b56941 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -270,10 +270,10 @@ UndergroundWarehouse_MapEventHeader: ; people-events db 7 - person_event SPRITE_ROCKET, 12, 13, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM24, EVENT_6CE - person_event SPRITE_ROCKET, 19, 12, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM14, EVENT_6CE - person_event SPRITE_ROCKET, 7, 18, LEFT << 2 | $1, $0, -1, -1, $2, 4, TrainerGruntM15, EVENT_6CE - person_event SPRITE_GENTLEMAN, 12, 16, DOWN << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x7d9bf, EVENT_6CE - person_event SPRITE_POKE_BALL, 19, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e4, EVENT_679 - person_event SPRITE_POKE_BALL, 13, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e6, EVENT_67A - person_event SPRITE_POKE_BALL, 5, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e8, EVENT_655 + person_event SPRITE_ROCKET, 12, 13, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 19, 12, UP << 2 | $3, $0, -1, -1, $2, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_ROCKET, 7, 18, LEFT << 2 | $1, $0, -1, -1, $2, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_GENTLEMAN, 12, 16, DOWN << 2 | $3, $0, -1, -1, $0, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER + person_event SPRITE_POKE_BALL, 19, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER + person_event SPRITE_POKE_BALL, 13, 17, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK + person_event SPRITE_POKE_BALL, 5, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL diff --git a/maps/UnionCave1F.asm b/maps/UnionCave1F.asm index 518e5511e..68445bb22 100644 --- a/maps/UnionCave1F.asm +++ b/maps/UnionCave1F.asm @@ -292,7 +292,7 @@ UnionCave1F_MapEventHeader: person_event SPRITE_POKEFAN_M, 12, 15, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 1, TrainerHikerRussell, -1 person_event SPRITE_FISHER, 31, 19, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerFirebreatherRay, -1 person_event SPRITE_FISHER, 23, 18, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 4, TrainerFirebreatherBill, -1 - person_event SPRITE_POKE_BALL, 25, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c00, EVENT_65A - person_event SPRITE_POKE_BALL, 6, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c02, EVENT_65B - person_event SPRITE_POKE_BALL, 21, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c04, EVENT_65C - person_event SPRITE_POKE_BALL, 37, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c06, EVENT_65D + person_event SPRITE_POKE_BALL, 25, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c00, EVENT_UNION_CAVE_1F_GREAT_BALL + person_event SPRITE_POKE_BALL, 6, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c02, EVENT_UNION_CAVE_1F_X_ATTACK + person_event SPRITE_POKE_BALL, 21, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c04, EVENT_UNION_CAVE_1F_POTION + person_event SPRITE_POKE_BALL, 37, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x59c06, EVENT_UNION_CAVE_1F_AWAKENING diff --git a/maps/UnionCaveB1F.asm b/maps/UnionCaveB1F.asm index b19b3570e..8ff1dce72 100644 --- a/maps/UnionCaveB1F.asm +++ b/maps/UnionCaveB1F.asm @@ -231,6 +231,6 @@ UnionCaveB1F_MapEventHeader: person_event SPRITE_POKEFAN_M, 11, 20, UP << 2 | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerLeonard, -1 person_event SPRITE_SUPER_NERD, 36, 9, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacAndrew, -1 person_event SPRITE_SUPER_NERD, 34, 21, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacCalvin, -1 - person_event SPRITE_POKE_BALL, 20, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a016, EVENT_65E + person_event SPRITE_POKE_BALL, 20, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a016, EVENT_UNION_CAVE_B1F_TM_SWIFT person_event SPRITE_BOULDER, 14, 11, LEFT << 2 | $11, $0, -1, -1, $0, 0, UnionCaveB1FBoulder, -1 - person_event SPRITE_POKE_BALL, 27, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a018, EVENT_65F + person_event SPRITE_POKE_BALL, 27, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a018, EVENT_UNION_CAVE_B1F_X_DEFEND diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index 7a967bf44..863629925 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -203,6 +203,6 @@ UnionCaveB2F_MapEventHeader: person_event SPRITE_ROCKER, 23, 19, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainermNick, -1 person_event SPRITE_COOLTRAINER_F, 17, 9, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 1, TrainerCooltrainerfGwen, -1 person_event SPRITE_COOLTRAINER_F, 34, 7, UP << 2 | $3, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerCooltrainerfEmma, -1 - person_event SPRITE_POKE_BALL, 6, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36a, EVENT_660 - person_event SPRITE_POKE_BALL, 23, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36c, EVENT_661 - person_event SPRITE_SURF, 35, 15, UP << 2 | $20, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SurfScript_0x5a31f, EVENT_760 + person_event SPRITE_POKE_BALL, 6, 20, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36a, EVENT_UNION_CAVE_B2F_ELIXER + person_event SPRITE_POKE_BALL, 23, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x5a36c, EVENT_UNION_CAVE_B2F_HYPER_POTION + person_event SPRITE_SURF, 35, 15, UP << 2 | $20, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SurfScript_0x5a31f, EVENT_UNION_CAVE_B2F_LAPRAS diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 5764f0a2e..9805c5fb9 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -117,8 +117,7 @@ VermilionCityMartSign: jumpstd martsign MapVermilionCitySignpostItem7: - dw $00fc - db FULL_HEAL + dwb EVENT_VERMILION_CITY_HIDDEN_FULL_HEAL, FULL_HEAL UnknownText_0x1aaa15: text "VERMILION PORT is" @@ -291,7 +290,7 @@ VermilionCity_MapEventHeader: signpost 15, 27, SIGNPOST_READ, VermilionCityPortSign signpost 5, 10, SIGNPOST_READ, VermilionCityPokeCenterSign signpost 13, 22, SIGNPOST_READ, VermilionCityMartSign - signpost 19, 12, SIGNPOST_ITEMIFSET, MapVermilionCitySignpostItem7 + signpost 19, 12, SIGNPOST_ITEM, MapVermilionCitySignpostItem7 ; people-events db 6 @@ -299,5 +298,5 @@ VermilionCity_MapEventHeader: person_event SPRITE_GRAMPS, 10, 27, LEFT << 2 | $1, $0, -1, -1, $0, 0, GrampsScript_0x1aa986, -1 person_event SPRITE_MACHOP, 11, 30, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, VermilionMachop, -1 person_event SPRITE_SUPER_NERD, 20, 18, DOWN << 2 | $2, $11, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x1aa99b, -1 - person_event SPRITE_BIG_SNORLAX, 12, 38, UP << 2 | $11, $0, -1, -1, $0, 0, VermilionSnorlax, EVENT_770 + person_event SPRITE_BIG_SNORLAX, 12, 38, UP << 2 | $11, $0, -1, -1, $0, 0, VermilionSnorlax, EVENT_VERMILION_CITY_SNORLAX person_event SPRITE_POKEFAN_M, 16, 35, UP << 2 | $2, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, VermilionGymBadgeGuy, -1 diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 8b031fc91..94d273189 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -27,10 +27,10 @@ UnknownScript_0x74da6: applymovement $0, MovementData_0x74ef3 appear $2 dotrigger $0 - setevent EVENT_731 - setevent EVENT_730 - setevent EVENT_739 - clearevent EVENT_733 + setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 + setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN + setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP + clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M setevent EVENT_030 setevent EVENT_000 blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY @@ -53,8 +53,8 @@ SailorScript_0x74dc4: playsound SFX_EXIT_BUILDING special Function8c084 waitbutton - setevent EVENT_73A - clearevent EVENT_73B + setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND + clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND clearevent EVENT_BEAT_POKEMANIAC_ETHAN clearevent EVENT_BEAT_BURGLAR_COREY clearevent EVENT_BEAT_BUG_CATCHER_KEN @@ -194,8 +194,7 @@ SuperNerdScript_0x74ee6: end MapVermilionPortSignpostItem0: - dw $00eb - db IRON + dwb EVENT_VERMILION_PORT_HIDDEN_IRON, IRON MovementData_0x74ef1: @@ -314,10 +313,10 @@ VermilionPort_MapEventHeader: ; signposts db 1 - signpost 13, 16, SIGNPOST_ITEMIFSET, MapVermilionPortSignpostItem0 + signpost 13, 16, SIGNPOST_ITEM, MapVermilionPortSignpostItem0 ; people-events db 3 - person_event SPRITE_SAILOR, 21, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x74dc4, EVENT_72B + person_event SPRITE_SAILOR, 21, 11, UP << 2 | $3, $0, -1, -1, $0, 0, SailorScript_0x74dc4, EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY person_event SPRITE_SAILOR, 15, 10, LEFT << 2 | $1, $0, -1, -1, $0, 0, SailorScript_0x74e97, -1 person_event SPRITE_SUPER_NERD, 15, 15, UP << 2 | $1, $2, -1, -1, $0, 0, SuperNerdScript_0x74ee6, -1 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index de102f60b..cfc00a877 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -51,7 +51,7 @@ UnknownScript_0x744d4: writetext UnknownText_0x7455f closetext loadmovesprites - setevent EVENT_6C2 + setevent EVENT_RIVAL_VICTORY_ROAD checkevent EVENT_GOT_TOTODILE_FROM_ELM iftrue UnknownScript_0x744ff checkevent EVENT_GOT_CHIKORITA_FROM_ELM @@ -106,13 +106,11 @@ ItemFragment_0x74531: db HP_UP, 1 MapVictoryRoadSignpostItem0: - dw $009e - db MAX_POTION + dwb EVENT_VICTORY_ROAD_HIDDEN_MAX_POTION, MAX_POTION MapVictoryRoadSignpostItem1: - dw $009f - db FULL_HEAL + dwb EVENT_VICTORY_ROAD_HIDDEN_FULL_HEAL, FULL_HEAL MovementData_0x74539: @@ -260,14 +258,14 @@ VictoryRoad_MapEventHeader: ; signposts db 2 - signpost 29, 3, SIGNPOST_ITEMIFSET, MapVictoryRoadSignpostItem0 - signpost 65, 3, SIGNPOST_ITEMIFSET, MapVictoryRoadSignpostItem1 + signpost 29, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem0 + signpost 65, 3, SIGNPOST_ITEM, MapVictoryRoadSignpostItem1 ; people-events db 6 - person_event SPRITE_SILVER, 17, 22, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_6C2 - person_event SPRITE_POKE_BALL, 32, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74529, EVENT_6A3 - person_event SPRITE_POKE_BALL, 52, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452b, EVENT_6A4 - person_event SPRITE_POKE_BALL, 33, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452d, EVENT_6A5 - person_event SPRITE_POKE_BALL, 52, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452f, EVENT_6A6 - person_event SPRITE_POKE_BALL, 42, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74531, EVENT_6A7 + person_event SPRITE_SILVER, 17, 22, UP << 2 | $3, $0, -1, -1, $0, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD + person_event SPRITE_POKE_BALL, 32, 7, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74529, EVENT_VICTORY_ROAD_TM_EARTHQUAKE + person_event SPRITE_POKE_BALL, 52, 16, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452b, EVENT_VICTORY_ROAD_MAX_REVIVE + person_event SPRITE_POKE_BALL, 33, 22, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452d, EVENT_VICTORY_ROAD_FULL_RESTORE + person_event SPRITE_POKE_BALL, 52, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7452f, EVENT_VICTORY_ROAD_FULL_HEAL + person_event SPRITE_POKE_BALL, 42, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x74531, EVENT_VICTORY_ROAD_HP_UP diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 38c13a4df..e2285be1f 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -46,7 +46,7 @@ UnknownScript_0x1a83d1: applymovement $2, MovementData_0x1a8463 playsound SFX_ENTER_DOOR disappear $2 - clearevent EVENT_6CB + clearevent EVENT_EARLS_ACADEMY_EARL waitbutton end @@ -90,8 +90,7 @@ FruitTreeScript_0x1a8425: fruittree $9 MapVioletCitySignpostItem6: - dw $00b0 - db HYPER_POTION + dwb EVENT_VIOLET_CITY_HIDDEN_HYPER_POTION, HYPER_POTION MovementData_0x1a842a: big_step_down @@ -298,15 +297,15 @@ VioletCity_MapEventHeader: signpost 17, 27, SIGNPOST_READ, EarlsPokemonAcademySign signpost 25, 32, SIGNPOST_READ, VioletCityPokeCenterSign signpost 17, 10, SIGNPOST_READ, VioletCityMartSign - signpost 14, 37, SIGNPOST_ITEMIFSET, MapVioletCitySignpostItem6 + signpost 14, 37, SIGNPOST_ITEM, MapVioletCitySignpostItem6 ; people-events db 8 - person_event SPRITE_FISHER, 20, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a83bb, EVENT_6CA + person_event SPRITE_FISHER, 20, 17, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x1a83bb, EVENT_VIOLET_CITY_EARL person_event SPRITE_LASS, 32, 32, DOWN << 2 | $2, $22, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, LassScript_0x1a8403, -1 person_event SPRITE_SUPER_NERD, 18, 28, DOWN << 2 | $2, $21, -1, -1, (PAL_OW_RED << 4) | $80, 0, SuperNerdScript_0x1a8406, -1 person_event SPRITE_GRAMPS, 24, 21, UP << 2 | $1, $1, -1, -1, $0, 0, GrampsScript_0x1a8409, -1 person_event SPRITE_YOUNGSTER, 22, 9, DOWN << 2 | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x1a840c, -1 person_event SPRITE_FRUIT_TREE, 33, 18, DOWN << 2 | $1, $0, -1, -1, $0, 0, FruitTreeScript_0x1a8425, -1 - person_event SPRITE_POKE_BALL, 5, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8421, EVENT_643 - person_event SPRITE_POKE_BALL, 9, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8423, EVENT_644 + person_event SPRITE_POKE_BALL, 5, 8, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8421, EVENT_VIOLET_CITY_PP_UP + person_event SPRITE_POKE_BALL, 9, 39, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x1a8423, EVENT_VIOLET_CITY_RARE_CANDY diff --git a/maps/ViridianGym.asm b/maps/ViridianGym.asm index 6a2b0d744..7af74d807 100644 --- a/maps/ViridianGym.asm +++ b/maps/ViridianGym.asm @@ -183,5 +183,5 @@ ViridianGym_MapEventHeader: ; people-events db 2 - person_event SPRITE_BLUE, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, BlueScript_0x9aa26, EVENT_776 - person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ViridianGymGuyScript, EVENT_776 + person_event SPRITE_BLUE, 7, 9, UP << 2 | $2, $0, -1, -1, $0, 0, BlueScript_0x9aa26, EVENT_VIRIDIAN_GYM_BLUE + person_event SPRITE_GYM_GUY, 17, 11, UP << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ViridianGymGuyScript, EVENT_VIRIDIAN_GYM_BLUE diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 4ee49c1a7..3fcc7eb36 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -7,13 +7,13 @@ WarehouseEntrance_MapScriptHeader: ; callbacks - dbw 5, UnknownScript_0x7c043 + dbw 5, .ResetSwitches - dbw 1, UnknownScript_0x7c076 + dbw 1, .CheckBasementKey - dbw 2, UnknownScript_0x7c082 + dbw 2, .CheckDayOfWeek -UnknownScript_0x7c043: +.ResetSwitches: clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 @@ -33,69 +33,71 @@ UnknownScript_0x7c043: copyvartobyte UndergroundSwitchPositions return -UnknownScript_0x7c076: +.CheckBasementKey: checkevent EVENT_USED_BASEMENT_KEY - iffalse UnknownScript_0x7c07d + iffalse .LockBasementDoor return -UnknownScript_0x7c07d: +.LockBasementDoor: changeblock $12, $6, $3d return -UnknownScript_0x7c082: +.CheckDayOfWeek: checkcode VAR_WEEKDAY - if_equal MONDAY, UnknownScript_0x7c0a5 - if_equal TUESDAY, UnknownScript_0x7c0b5 - if_equal WEDNESDAY, UnknownScript_0x7c0be - if_equal THURSDAY, UnknownScript_0x7c0c7 - if_equal FRIDAY, UnknownScript_0x7c0d0 - if_equal SATURDAY, UnknownScript_0x7c0d9 + if_equal MONDAY, .Monday + if_equal TUESDAY, .Tuesday + if_equal WEDNESDAY, .Wednesday + if_equal THURSDAY, .Thursday + if_equal FRIDAY, .Friday + if_equal SATURDAY, .Saturday + +.Sunday: disappear $7 disappear $8 appear $9 appear $a return -UnknownScript_0x7c0a5: +.Monday: disappear $7 checkmorn - iffalse UnknownScript_0x7c0ae + iffalse .NotMondayMorning appear $7 -UnknownScript_0x7c0ae: +.NotMondayMorning: disappear $8 disappear $9 disappear $a return -UnknownScript_0x7c0b5: +.Tuesday: disappear $7 appear $8 disappear $9 disappear $a return -UnknownScript_0x7c0be: +.Wednesday: disappear $7 disappear $8 appear $9 disappear $a return -UnknownScript_0x7c0c7: +.Thursday: disappear $7 appear $8 disappear $9 disappear $a return -UnknownScript_0x7c0d0: +.Friday: disappear $7 disappear $8 appear $9 disappear $a return -UnknownScript_0x7c0d9: +.Saturday: disappear $7 appear $8 disappear $9 @@ -213,11 +215,11 @@ PokemaniacDonaldScript: GrannyScript_0x7c132: loadfont checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x7c140 - if_equal SATURDAY, UnknownScript_0x7c140 - jump UnknownScript_0x7c300 + if_equal SUNDAY, .Open + if_equal SATURDAY, .Open + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c140: +.Open: pokemart $1, $0021 loadmovesprites end @@ -225,64 +227,64 @@ UnknownScript_0x7c140: GrampsScript_0x7c146: loadfont checkflag ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED - iftrue UnknownScript_0x7c300 + iftrue WarehouseEntranceScript_ShopClosed checkcode VAR_WEEKDAY - if_equal MONDAY, UnknownScript_0x7c156 - jump UnknownScript_0x7c300 + if_equal MONDAY, .CheckMorn + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c156: +.CheckMorn: checkmorn - iffalse UnknownScript_0x7c300 + iffalse WarehouseEntranceScript_ShopClosed pokemart $2, $0000 loadmovesprites end -SuperNerdScript_0x7c161: +OlderHaircutBrotherScript: loadfont checkcode VAR_WEEKDAY - if_equal TUESDAY, UnknownScript_0x7c173 - if_equal THURSDAY, UnknownScript_0x7c173 - if_equal SATURDAY, UnknownScript_0x7c173 - jump UnknownScript_0x7c300 + if_equal TUESDAY, .DoHaircut + if_equal THURSDAY, .DoHaircut + if_equal SATURDAY, .DoHaircut + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c173: +.DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - iftrue UnknownScript_0x7c208 + iftrue .AlreadyGotHaircut special Function24ae8 writetext UnknownText_0x7c5f9 yesorno - iffalse UnknownScript_0x7c1fc + iffalse .Refused checkmoney $0, 500 - if_equal $2, UnknownScript_0x7c202 + if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c69a keeptextopen special Function7413 - if_equal $0, UnknownScript_0x7c1fc - if_equal $1, UnknownScript_0x7c1fc + if_equal $0, .Refused + if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - if_equal $2, UnknownScript_0x7c1a9 - if_equal $3, UnknownScript_0x7c1b5 - jump UnknownScript_0x7c1c1 + if_equal $2, .two + if_equal $3, .three + jump .else -UnknownScript_0x7c1a9: +.two: setevent EVENT_000 clearevent EVENT_001 clearevent EVENT_002 - jump UnknownScript_0x7c1cd + jump .then -UnknownScript_0x7c1b5: +.three: clearevent EVENT_000 setevent EVENT_001 clearevent EVENT_002 - jump UnknownScript_0x7c1cd + jump .then -UnknownScript_0x7c1c1: +.else: clearevent EVENT_000 clearevent EVENT_001 setevent EVENT_002 - jump UnknownScript_0x7c1cd + jump .then -UnknownScript_0x7c1cd: +.then: takemoney $0, 500 special Function24ae8 writetext UnknownText_0x7c6b8 @@ -302,70 +304,70 @@ UnknownScript_0x7c1cd: iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd -UnknownScript_0x7c1fc: +.Refused: writetext UnknownText_0x7c6ea closetext loadmovesprites end -UnknownScript_0x7c202: +.NotEnoughMoney: writetext UnknownText_0x7c709 closetext loadmovesprites end -UnknownScript_0x7c208: +.AlreadyGotHaircut: writetext UnknownText_0x7c72b closetext loadmovesprites end -SuperNerdScript_0x7c20e: +YoungerHaircutBrotherScript: loadfont checkcode VAR_WEEKDAY - if_equal SUNDAY, UnknownScript_0x7c220 - if_equal WEDNESDAY, UnknownScript_0x7c220 - if_equal FRIDAY, UnknownScript_0x7c220 - jump UnknownScript_0x7c300 + if_equal SUNDAY, .DoHaircut + if_equal WEDNESDAY, .DoHaircut + if_equal FRIDAY, .DoHaircut + jump WarehouseEntranceScript_ShopClosed -UnknownScript_0x7c220: +.DoHaircut: checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - iftrue UnknownScript_0x7c2b5 + iftrue .AlreadyGotHaircut special Function24ae8 writetext UnknownText_0x7c75c yesorno - iffalse UnknownScript_0x7c2a9 + iffalse .Refused checkmoney $0, 300 - if_equal $2, UnknownScript_0x7c2af + if_equal $2, .NotEnoughMoney writetext UnknownText_0x7c7f1 keeptextopen special Function7418 - if_equal $0, UnknownScript_0x7c2a9 - if_equal $1, UnknownScript_0x7c2a9 + if_equal $0, .Refused + if_equal $1, .Refused setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT - if_equal $2, UnknownScript_0x7c256 - if_equal $3, UnknownScript_0x7c262 - jump UnknownScript_0x7c26e + if_equal $2, .two + if_equal $3, .three + jump .else -UnknownScript_0x7c256: +.two: setevent EVENT_000 clearevent EVENT_001 clearevent EVENT_002 - jump UnknownScript_0x7c27a + jump .then -UnknownScript_0x7c262: +.three: clearevent EVENT_000 setevent EVENT_001 clearevent EVENT_002 - jump UnknownScript_0x7c27a + jump .then -UnknownScript_0x7c26e: +.else: clearevent EVENT_000 clearevent EVENT_001 setevent EVENT_002 - jump UnknownScript_0x7c27a + jump .then -UnknownScript_0x7c27a: +.then: takemoney $0, 300 special Function24ae8 writetext UnknownText_0x7c80e @@ -385,19 +387,19 @@ UnknownScript_0x7c27a: iftrue UnknownScript_0x7c2c4 jump UnknownScript_0x7c2cd -UnknownScript_0x7c2a9: +.Refused: writetext UnknownText_0x7c842 closetext loadmovesprites end -UnknownScript_0x7c2af: +.NotEnoughMoney: writetext UnknownText_0x7c85b closetext loadmovesprites end -UnknownScript_0x7c2b5: +.AlreadyGotHaircut: writetext UnknownText_0x7c87b closetext loadmovesprites @@ -424,18 +426,18 @@ UnknownScript_0x7c2cd: loadmovesprites end -MapWarehouseEntranceSignpost0Script:: +BasementDoorScript:: loadfont checkevent EVENT_USED_BASEMENT_KEY - iftrue UnknownScript_0x7c2fa + iftrue .Open checkitem BASEMENT_KEY - iftrue UnknownScript_0x7c2e8 + iftrue .Unlock writetext UnknownText_0x7c5b0 closetext loadmovesprites end -UnknownScript_0x7c2e8: +.Unlock: playsound SFX_TRANSACTION writetext UnknownText_0x7c5d6 closetext @@ -446,13 +448,13 @@ UnknownScript_0x7c2e8: setevent EVENT_USED_BASEMENT_KEY end -UnknownScript_0x7c2fa: +.Open: writetext UnknownText_0x7c5c3 closetext loadmovesprites end -UnknownScript_0x7c300: +WarehouseEntranceScript_ShopClosed: writetext UnknownText_0x7c904 closetext loadmovesprites @@ -465,18 +467,15 @@ MapWarehouseEntranceSignpost1Script: jumptext UnknownText_0x7c91a MapWarehouseEntranceSignpostItem2: - dw $008b - db PARLYZ_HEAL + dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_PARLYZ_HEAL, PARLYZ_HEAL MapWarehouseEntranceSignpostItem3: - dw $008c - db SUPER_POTION + dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_SUPER_POTION, SUPER_POTION MapWarehouseEntranceSignpostItem4: - dw $008d - db ANTIDOTE + dwb EVENT_WAREHOUSE_ENTRANCE_HIDDEN_ANTIDOTE, ANTIDOTE SupernerdEricSeenText: @@ -726,11 +725,11 @@ WarehouseEntrance_MapEventHeader: ; signposts db 5 - signpost 6, 18, SIGNPOST_READ, MapWarehouseEntranceSignpost0Script + signpost 6, 18, SIGNPOST_READ, BasementDoorScript signpost 6, 19, SIGNPOST_READ, MapWarehouseEntranceSignpost1Script - signpost 13, 6, SIGNPOST_ITEMIFSET, MapWarehouseEntranceSignpostItem2 - signpost 18, 4, SIGNPOST_ITEMIFSET, MapWarehouseEntranceSignpostItem3 - signpost 8, 17, SIGNPOST_ITEMIFSET, MapWarehouseEntranceSignpostItem4 + signpost 13, 6, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem2 + signpost 18, 4, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem3 + signpost 8, 17, SIGNPOST_ITEM, MapWarehouseEntranceSignpostItem4 ; people-events db 9 @@ -738,8 +737,8 @@ WarehouseEntrance_MapEventHeader: person_event SPRITE_SUPER_NERD, 13, 10, UP << 2 | $3, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 2, TrainerSupernerdTeru, -1 person_event SPRITE_SUPER_NERD, 31, 7, LEFT << 2 | $2, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 2, TrainerPokemaniacIssac, -1 person_event SPRITE_SUPER_NERD, 10, 6, LEFT << 2 | $1, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacDonald, -1 - person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7c306, EVENT_672 - person_event SPRITE_GRAMPS, 15, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x7c146, EVENT_753 - person_event SPRITE_SUPER_NERD, 18, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, SuperNerdScript_0x7c161, EVENT_754 - person_event SPRITE_SUPER_NERD, 19, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, SuperNerdScript_0x7c20e, EVENT_755 - person_event SPRITE_GRANNY, 25, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x7c132, EVENT_752 + person_event SPRITE_POKE_BALL, 29, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x7c306, EVENT_WAREHOUSE_ENTRANCE_COIN_CASE + person_event SPRITE_GRAMPS, 15, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrampsScript_0x7c146, EVENT_WAREHOUSE_ENTRANCE_GRAMPS + person_event SPRITE_SUPER_NERD, 18, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, OlderHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_OLDER_HAIRCUT_BROTHER + person_event SPRITE_SUPER_NERD, 19, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungerHaircutBrotherScript, EVENT_WAREHOUSE_ENTRANCE_YOUNGER_HAIRCUT_BROTHER + person_event SPRITE_GRANNY, 25, 11, LEFT << 2 | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, GrannyScript_0x7c132, EVENT_WAREHOUSE_ENTRANCE_GRANNY diff --git a/maps/WhirlIslandB1F.asm b/maps/WhirlIslandB1F.asm index 5962de827..c58d3a513 100644 --- a/maps/WhirlIslandB1F.asm +++ b/maps/WhirlIslandB1F.asm @@ -24,18 +24,15 @@ WhirlIslandB1FBoulder: jumpstd strengthboulder MapWhirlIslandB1FSignpostItem0: - dw $0097 - db RARE_CANDY + dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_RARE_CANDY, RARE_CANDY MapWhirlIslandB1FSignpostItem1: - dw $0098 - db ULTRA_BALL + dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_ULTRA_BALL, ULTRA_BALL MapWhirlIslandB1FSignpostItem2: - dw $0099 - db FULL_RESTORE + dwb EVENT_WHIRL_ISLAND_B1F_HIDDEN_FULL_RESTORE, FULL_RESTORE WhirlIslandB1F_MapEventHeader: @@ -59,15 +56,15 @@ WhirlIslandB1F_MapEventHeader: ; signposts db 3 - signpost 4, 30, SIGNPOST_ITEMIFSET, MapWhirlIslandB1FSignpostItem0 - signpost 18, 36, SIGNPOST_ITEMIFSET, MapWhirlIslandB1FSignpostItem1 - signpost 23, 2, SIGNPOST_ITEMIFSET, MapWhirlIslandB1FSignpostItem2 + signpost 4, 30, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem0 + signpost 18, 36, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem1 + signpost 23, 2, SIGNPOST_ITEM, MapWhirlIslandB1FSignpostItem2 ; people-events db 6 - person_event SPRITE_POKE_BALL, 17, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c410, EVENT_691 - person_event SPRITE_POKE_BALL, 22, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c412, EVENT_692 - person_event SPRITE_POKE_BALL, 27, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c414, EVENT_693 - person_event SPRITE_POKE_BALL, 12, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c416, EVENT_694 - person_event SPRITE_POKE_BALL, 30, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c418, EVENT_695 + person_event SPRITE_POKE_BALL, 17, 11, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c410, EVENT_WHIRL_ISLAND_B1F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 22, 6, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c412, EVENT_WHIRL_ISLAND_B1F_CARBOS + person_event SPRITE_POKE_BALL, 27, 37, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c414, EVENT_WHIRL_ISLAND_B1F_CALCIUM + person_event SPRITE_POKE_BALL, 12, 21, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c416, EVENT_WHIRL_ISLAND_B1F_NUGGET + person_event SPRITE_POKE_BALL, 30, 23, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c418, EVENT_WHIRL_ISLAND_B1F_ESCAPE_ROPE person_event SPRITE_BOULDER, 30, 27, LEFT << 2 | $11, $0, -1, -1, $0, 0, WhirlIslandB1FBoulder, -1 diff --git a/maps/WhirlIslandB2F.asm b/maps/WhirlIslandB2F.asm index dcb4dde53..98f5ec703 100644 --- a/maps/WhirlIslandB2F.asm +++ b/maps/WhirlIslandB2F.asm @@ -33,6 +33,6 @@ WhirlIslandB2F_MapEventHeader: ; people-events db 3 - person_event SPRITE_POKE_BALL, 15, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4b8, EVENT_696 - person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4ba, EVENT_697 - person_event SPRITE_POKE_BALL, 16, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4bc, EVENT_698 + person_event SPRITE_POKE_BALL, 15, 14, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4b8, EVENT_WHIRL_ISLAND_B2F_FULL_RESTORE + person_event SPRITE_POKE_BALL, 8, 10, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4ba, EVENT_WHIRL_ISLAND_B2F_MAX_REVIVE + person_event SPRITE_POKE_BALL, 16, 9, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c4bc, EVENT_WHIRL_ISLAND_B2F_MAX_ELIXER diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 139f89a1e..37bdbd0cb 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -59,4 +59,4 @@ WhirlIslandLugiaChamber_MapEventHeader: ; people-events db 1 - person_event SPRITE_LUGIA, 9, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LugiaScript_0x18c518, EVENT_73D + person_event SPRITE_LUGIA, 9, 13, UP << 2 | $12, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LugiaScript_0x18c518, EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA diff --git a/maps/WhirlIslandNE.asm b/maps/WhirlIslandNE.asm index 657aebe43..317d45b48 100644 --- a/maps/WhirlIslandNE.asm +++ b/maps/WhirlIslandNE.asm @@ -26,4 +26,4 @@ WhirlIslandNE_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 15, 15, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c396, EVENT_68F + person_event SPRITE_POKE_BALL, 15, 15, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c396, EVENT_WHIRL_ISLAND_NE_ULTRA_BALL diff --git a/maps/WhirlIslandSW.asm b/maps/WhirlIslandSW.asm index 60e5ce412..759a60693 100644 --- a/maps/WhirlIslandSW.asm +++ b/maps/WhirlIslandSW.asm @@ -28,4 +28,4 @@ WhirlIslandSW_MapEventHeader: ; people-events db 1 - person_event SPRITE_POKE_BALL, 6, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c3bc, EVENT_690 + person_event SPRITE_POKE_BALL, 6, 19, DOWN << 2 | $1, $0, -1, -1, $1, 0, ItemFragment_0x18c3bc, EVENT_WHIRL_ISLAND_SW_ULTRA_BALL diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index b85e8e18f..84316f758 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -26,18 +26,18 @@ UnknownScript_0x98574: iftrue UnknownScript_0x9858c checkitem CLEAR_BELL iftrue UnknownScript_0x9858c - clearevent EVENT_7AB - setevent EVENT_7AC + clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return UnknownScript_0x9858c: - setevent EVENT_7AB - clearevent EVENT_7AC + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return UnknownScript_0x98593: - setevent EVENT_7AB - setevent EVENT_7AC + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return SageScript_0x9859a: @@ -408,9 +408,9 @@ WiseTriosRoom_MapEventHeader: ; people-events db 6 - person_event SPRITE_SAGE, 6, 10, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x9859a, EVENT_7AB - person_event SPRITE_SAGE, 11, 10, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x9859d, EVENT_7AB - person_event SPRITE_SAGE, 9, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, SageScript_0x985a0, EVENT_7AB - person_event SPRITE_SAGE, 6, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerSageGaku, EVENT_7AC - person_event SPRITE_SAGE, 10, 8, UP << 2 | $3, $0, -1, -1, $2, 2, TrainerSageMasa, EVENT_7AC - person_event SPRITE_SAGE, 8, 10, LEFT << 2 | $0, $0, -1, -1, $2, 2, TrainerSageKoji, EVENT_7AC + person_event SPRITE_SAGE, 6, 10, DOWN << 2 | $3, $0, -1, -1, $0, 0, SageScript_0x9859a, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 11, 10, UP << 2 | $1, $1, -1, -1, $0, 0, SageScript_0x9859d, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 9, 11, LEFT << 2 | $0, $0, -1, -1, $0, 0, SageScript_0x985a0, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 + person_event SPRITE_SAGE, 6, 8, UP << 2 | $2, $0, -1, -1, $2, 2, TrainerSageGaku, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + person_event SPRITE_SAGE, 10, 8, UP << 2 | $3, $0, -1, -1, $2, 2, TrainerSageMasa, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 + person_event SPRITE_SAGE, 8, 10, LEFT << 2 | $0, $0, -1, -1, $2, 2, TrainerSageKoji, EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 26a3f02ca..1ba749409 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -456,7 +456,7 @@ map_header_2 GoldenrodPokeComCenter2FMobile, GOLDENROD_POKECOM_CENTER_2F_MOBILE, $0, NONE map_header_2 IlexForestAzaleaGate, ILEX_FOREST_AZALEA_GATE, $0, NONE map_header_2 Route34IlexForestGate, ROUTE_34_ILEX_FOREST_GATE, $0, NONE - map_header_2 DayCare, DAY_CARE, $0, NONE + map_header_2 DayCare, DAYCARE, $0, NONE map_header_2 VermilionHouseFishingSpeechHouse, VERMILION_HOUSE_FISHING_SPEECH_HOUSE, $0, NONE map_header_2 VermilionPokeCenter1F, VERMILION_POKECENTER_1F, $0, NONE map_header_2 VermilionPokeCenter2FBeta, VERMILION_POKECENTER_2F_BETA, $0, NONE -- cgit v1.2.3 From 60cd04b02300c288a01a2f78a44cb39cbe6861d1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 18 Jul 2015 23:45:39 -0400 Subject: Trainer data structure and field move functions Trainer data in map scripts is now a macro-defined structure. Field move functions in main.asm are now nearly completely annotated, with local references. Trailing white space deleted. --- battle/ai/scoring.asm | 12 +- constants/battle_constants.asm | 380 +++--- constants/event_flags.asm | 35 +- constants/item_constants.asm | 10 + constants/phone_constants.asm | 69 +- constants/sfx_constants.asm | 412 +++--- engine/events_2.asm | 2 +- engine/map_objects.asm | 12 +- engine/movement.asm | 12 +- engine/pack.asm | 4 +- engine/scripting.asm | 10 +- engine/spawn_points.asm | 2 +- engine/specials.asm | 12 +- engine/std_scripts.asm | 4 +- gbhw.asm | 2 +- home.asm | 32 +- home/map.asm | 6 +- home/menu.asm | 16 +- home/vblank.asm | 2 +- items/item_attributes.asm | 1798 ++++---------------------- items/item_effects.asm | 8 +- macros/movement.asm | 18 +- macros/trainer.asm | 7 + main.asm | 1786 ++++++++++++------------- maps/AzaleaGym.asm | 90 +- maps/BlackthornGym1F.asm | 54 +- maps/BlackthornGym2F.asm | 36 +- maps/CeladonGym.asm | 90 +- maps/CeruleanGym.asm | 54 +- maps/CianwoodGym.asm | 72 +- maps/DanceTheatre.asm | 90 +- maps/DragonsDenB1F.asm | 72 +- maps/EcruteakGym.asm | 72 +- maps/ElmsLab.asm | 2 +- maps/FastShipB1F.asm | 180 +-- maps/FastShipCabins_NNW_NNE_NE.asm | 108 +- maps/FastShipCabins_SE_SSE_CaptainsCabin.asm | 126 +- maps/FastShipCabins_SW_SSW_NW.asm | 72 +- maps/GoldenrodBillsHouse.asm | 6 +- maps/GoldenrodGym.asm | 72 +- maps/IlexForest.asm | 18 +- maps/KrissHouse2F.asm | 2 +- maps/LakeofRage.asm | 72 +- maps/MahoganyGym.asm | 90 +- maps/MountMortar1FInside.asm | 36 +- maps/MountMortar2FInside.asm | 18 +- maps/NationalPark.asm | 84 +- maps/OlivineLighthouse2F.asm | 42 +- maps/OlivineLighthouse3F.asm | 54 +- maps/OlivineLighthouse4F.asm | 36 +- maps/OlivineLighthouse5F.asm | 36 +- maps/PewterGym.asm | 18 +- maps/RadioTower1F.asm | 18 +- maps/RadioTower2F.asm | 88 +- maps/RadioTower3F.asm | 72 +- maps/RadioTower4F.asm | 72 +- maps/RadioTower5F.asm | 18 +- maps/Route1.asm | 36 +- maps/Route10South.asm | 36 +- maps/Route11.asm | 72 +- maps/Route12.asm | 72 +- maps/Route13.asm | 90 +- maps/Route14.asm | 54 +- maps/Route15.asm | 108 +- maps/Route17.asm | 72 +- maps/Route18.asm | 36 +- maps/Route19.asm | 72 +- maps/Route2.asm | 54 +- maps/Route20.asm | 54 +- maps/Route21.asm | 54 +- maps/Route25.asm | 126 +- maps/Route26.asm | 120 +- maps/Route27.asm | 120 +- maps/Route3.asm | 72 +- maps/Route30.asm | 60 +- maps/Route31.asm | 24 +- maps/Route32.asm | 156 +-- maps/Route33.asm | 24 +- maps/Route34.asm | 156 +-- maps/Route35.asm | 156 +-- maps/Route36.asm | 42 +- maps/Route37.asm | 54 +- maps/Route38.asm | 120 +- maps/Route39.asm | 78 +- maps/Route4.asm | 54 +- maps/Route40.asm | 72 +- maps/Route41.asm | 180 +-- maps/Route42.asm | 60 +- maps/Route43.asm | 120 +- maps/Route44.asm | 138 +- maps/Route45.asm | 138 +- maps/Route46.asm | 60 +- maps/Route6.asm | 36 +- maps/Route8.asm | 90 +- maps/Route9.asm | 108 +- maps/RuinsofAlphOmanyteChamber.asm | 2 +- maps/RuinsofAlphOutside.asm | 36 +- maps/SaffronGym.asm | 72 +- maps/SlowpokeWellB1F.asm | 72 +- maps/SproutTower1F.asm | 18 +- maps/SproutTower2F.asm | 36 +- maps/SproutTower3F.asm | 54 +- maps/TeamRocketBaseB1F.asm | 36 +- maps/TeamRocketBaseB2F.asm | 54 +- maps/TeamRocketBaseB3F.asm | 72 +- maps/UndergroundPathSwitchRoomEntrances.asm | 108 +- maps/UndergroundWarehouse.asm | 54 +- maps/UnionCave1F.asm | 90 +- maps/UnionCaveB1F.asm | 72 +- maps/UnionCaveB2F.asm | 54 +- maps/VermilionGym.asm | 54 +- maps/VioletGym.asm | 36 +- maps/WarehouseEntrance.asm | 72 +- maps/WiseTriosRoom.asm | 54 +- misc/mobile_40.asm | 6 +- wram.asm | 6 +- 116 files changed, 2148 insertions(+), 8705 deletions(-) diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm index 425d6911b..d382011a6 100644 --- a/battle/ai/scoring.asm +++ b/battle/ai/scoring.asm @@ -151,7 +151,7 @@ AI_Setup: ; 385e0 AI_Types: ; 38635 ; Dismiss any move that the player is immune to. ; Encourage super-effective moves. -; Discourage not very effective moves unless +; Discourage not very effective moves unless ; all damaging moves are of the same type. ld hl, Buffer1 - 1 @@ -963,9 +963,9 @@ AI_Smart_Bide: ; 38a1e AI_Smart_Whirlwind: ; 38a2a ; Whirlwind, Roar. -; Discourage this move if the player has not shown +; Discourage this move if the player has not shown ; a super-effective move against the enemy. -; Consider player's type(s) if its moves are unknown. +; Consider player's type(s) if its moves are unknown. push hl callab Function3484e @@ -1231,7 +1231,7 @@ AI_Smart_Paralyze: ; 38b26 call AICheckPlayerQuarterHP jr nc, .asm_38b3a -; 80% chance to greatly encourage this move +; 80% chance to greatly encourage this move ; if enemy is slower than player and its HP is above 25%. call AICompareSpeed ret c @@ -1879,7 +1879,7 @@ AI_Smart_MeanLook: ; 38dfb bit SUBSTATUS_TOXIC, a jr nz, .asm_38e26 -; 80% chance to greatly encourage this move if the player is either +; 80% chance to greatly encourage this move if the player is either ; in love, identified, stuck in Rollout, or has a Nightmare. ld a, [PlayerSubStatus1] and 1<