diff options
133 files changed, 659 insertions, 1082 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm index 982ade9b4..2c3818f0c 100644 --- a/maps/AzaleaGym.asm +++ b/maps/AzaleaGym.asm @@ -14,7 +14,7 @@ AzaleaGym_MapScriptHeader: .MapCallbacks: db 0 -BugsyScript: +AzaleaGymBugsyScript: faceplayer opentext checkevent EVENT_BEAT_BUGSY @@ -380,7 +380,7 @@ AzaleaGym_MapEventHeader: .PersonEvents: db 7 - person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BugsyScript, -1 + person_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1 person_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1 person_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherAl, -1 person_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1 diff --git a/maps/AzaleaPokeCenter1F.asm b/maps/AzaleaPokeCenter1F.asm index 2b3ca2e70..3a8a0310c 100644 --- a/maps/AzaleaPokeCenter1F.asm +++ b/maps/AzaleaPokeCenter1F.asm @@ -7,14 +7,12 @@ const_value set 2 AzaleaPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - maptrigger .Trigger0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger: end AzaleaPokeCenter1FNurseScript: diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index 1714e0432..3ebda5298 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -15,25 +15,21 @@ const_value set 2 AzaleaTown_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .Flypoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end .Flypoint: diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 6cf6bdd50..d83e48e59 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -8,8 +8,6 @@ const_value set 2 BattleTower1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers maptrigger .Trigger0 maptrigger .Trigger1 diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm index 8626a0021..4f389e970 100644 --- a/maps/BattleTowerBattleRoom.asm +++ b/maps/BattleTowerBattleRoom.asm @@ -5,10 +5,8 @@ const_value set 2 BattleTowerBattleRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .EnterBattleRoom, 0 - dw .DummyTrigger, 0 + maptrigger .EnterBattleRoom + maptrigger .DummyTrigger .MapCallbacks: db 0 diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm index 2ae68654c..4bd5b8e6f 100644 --- a/maps/BattleTowerElevator.asm +++ b/maps/BattleTowerElevator.asm @@ -4,8 +4,6 @@ const_value set 2 BattleTowerElevator_MapScriptHeader: .MapTriggers: db 2 - - ; triggers maptrigger .Trigger0 maptrigger .Trigger1 diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 03424a977..cc65fcbfd 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -4,8 +4,6 @@ const_value set 2 BattleTowerHallway_MapScriptHeader: .MapTriggers: db 2 - - ; triggers maptrigger .Trigger0 maptrigger .Trigger1 diff --git a/maps/BattleTowerOutside.asm b/maps/BattleTowerOutside.asm index eeb4bf93b..0ccd463aa 100644 --- a/maps/BattleTowerOutside.asm +++ b/maps/BattleTowerOutside.asm @@ -10,8 +10,6 @@ BattleTowerOutside_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_TILES, .Callback1 dbw MAPCALLBACK_OBJECTS, .Callback2 diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm index cc9abdda9..9a28c8abb 100644 --- a/maps/BlackthornCity.asm +++ b/maps/BlackthornCity.asm @@ -15,8 +15,6 @@ BlackthornCity_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_OBJECTS, .Santos diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm index b291385ca..d507b5c3c 100644 --- a/maps/BlackthornGym1F.asm +++ b/maps/BlackthornGym1F.asm @@ -11,8 +11,6 @@ BlackthornGym1F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_TILES, .Boulders .Boulders: diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index bb6a8e5a1..9aac7c210 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -14,8 +14,6 @@ BlackthornGym2F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_CMDQUEUE, .Boulders .Boulders: diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm index ba1e8c3c8..99412cf33 100644 --- a/maps/BrunosRoom.asm +++ b/maps/BrunosRoom.asm @@ -4,23 +4,18 @@ const_value set 2 BrunosRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .BrunosRoomDoors -.Trigger0: +.LockDoor: priorityjump .BrunosDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end .BrunosRoomDoors: diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index c48bb3bcc..7d50f22d0 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -8,27 +8,22 @@ const_value set 2 BurnedTower1F_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .EusineTrigger + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .HoleAndLadder -.Trigger0: - priorityjump .EusineTrigger +.EusineTrigger: + priorityjump .MeetEusine end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end .HoleAndLadder: @@ -42,7 +37,7 @@ BurnedTower1F_MapScriptHeader: .Done: return -.EusineTrigger: +.MeetEusine: spriteface BURNEDTOWER1F_EUSINE, DOWN showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15 applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm index ece68f7df..fb386a49f 100644 --- a/maps/BurnedTowerB1F.asm +++ b/maps/BurnedTowerB1F.asm @@ -12,25 +12,20 @@ const_value set 2 BurnedTowerB1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .LadderCallback - ; callbacks - - dbw MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback - -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -BurnedTowerB1FLadderCallback: +.LadderCallback: checkevent EVENT_RELEASED_THE_BEASTS iftrue .NoChange changeblock $6, $e, $2 diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm index 461b558ff..f45332ff1 100644 --- a/maps/CeladonCity.asm +++ b/maps/CeladonCity.asm @@ -15,8 +15,6 @@ CeladonCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index a82e45f11..a4e163ed5 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -8,9 +8,6 @@ CeladonDeptStore6F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .Callback .Callback: diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm index 47afa867a..ad3070679 100644 --- a/maps/CeruleanCity.asm +++ b/maps/CeruleanCity.asm @@ -12,8 +12,6 @@ CeruleanCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm index 52e993891..b886d337b 100644 --- a/maps/CeruleanGym.asm +++ b/maps/CeruleanGym.asm @@ -9,22 +9,20 @@ const_value set 2 CeruleanGym_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x1883d9, 0 - dw UnknownScript_0x1883da, 0 + maptrigger .DummyTrigger0 + maptrigger .GruntRunsOut .MapCallbacks: db 0 -UnknownScript_0x1883d9: +.DummyTrigger0: end -UnknownScript_0x1883da: - priorityjump UnknownScript_0x1883de +.GruntRunsOut: + priorityjump .GruntRunsOutScript end -UnknownScript_0x1883de: +.GruntRunsOutScript: applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3 playsound SFX_TACKLE applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm index 12c3f5d9a..a6a1594d1 100644 --- a/maps/CherrygroveCity.asm +++ b/maps/CherrygroveCity.asm @@ -8,21 +8,17 @@ const_value set 2 CherrygroveCity_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm index c6b2d8d28..eb44f3ccb 100644 --- a/maps/CianwoodCity.asm +++ b/maps/CianwoodCity.asm @@ -15,21 +15,17 @@ const_value set 2 CianwoodCity_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPointAndSuicune: diff --git a/maps/CianwoodPharmacy.asm b/maps/CianwoodPharmacy.asm index 2a3f49c9d..b9feae6fd 100644 --- a/maps/CianwoodPharmacy.asm +++ b/maps/CianwoodPharmacy.asm @@ -4,14 +4,12 @@ const_value set 2 CianwoodPharmacy_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw CianwoodPharmacyTrigger, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -CianwoodPharmacyTrigger: +.DummyTrigger: end CianwoodPharmacist: diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm index 62e79ad4f..6dfa77e3a 100644 --- a/maps/CinnabarIsland.asm +++ b/maps/CinnabarIsland.asm @@ -7,8 +7,6 @@ CinnabarIsland_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm index 25794f5c0..14766393c 100644 --- a/maps/Colosseum.asm +++ b/maps/Colosseum.asm @@ -5,32 +5,26 @@ const_value set 2 Colosseum_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .InitializeColosseum + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 2 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris + dbw MAPCALLBACK_NEWMAP, .PreparePokeCenter2F - ; callbacks - - dbw MAPCALLBACK_OBJECTS, ColosseumScript_SetWhichChris - - dbw MAPCALLBACK_NEWMAP, ColosseumScript_InitializeCB - -.Trigger0: - priorityjump ColosseumScript_Initialize +.InitializeColosseum: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end -ColosseumScript_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear COLOSSEUM_CHRIS2 @@ -42,11 +36,11 @@ ColosseumScript_SetWhichChris: appear COLOSSEUM_CHRIS2 return -ColosseumScript_InitializeCB: +.PreparePokeCenter2F: domaptrigger POKECENTER_2F, $2 return -ColosseumScript_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $2 end diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm index 41689241d..069930525 100644 --- a/maps/CopycatsHouse2F.asm +++ b/maps/CopycatsHouse2F.asm @@ -12,9 +12,6 @@ CopycatsHouse2F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Callback .Callback: diff --git a/maps/DayCare.asm b/maps/DayCare.asm index 8f2f6e5ac..ee10f375e 100644 --- a/maps/DayCare.asm +++ b/maps/DayCare.asm @@ -8,9 +8,6 @@ DayCare_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm index ebd833ccd..f031667b9 100644 --- a/maps/DragonShrine.asm +++ b/maps/DragonShrine.asm @@ -7,22 +7,20 @@ const_value set 2 DragonShrine_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DragonShrineTest + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: - priorityjump DragonShrineTestScript +.DragonShrineTest: + priorityjump .DragonShrineTestScript end -.Trigger1: +.DummyTrigger: end -DragonShrineTestScript: +.DragonShrineTestScript: applymovement PLAYER, MovementData_0x18d2bf applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7 opentext @@ -272,10 +270,10 @@ MenuDataHeader_0x18d215: db $40 ; flags db 04, 08 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d21d + dw .MenuData2 db 1 ; default option -MenuData2_0x18d21d: +.MenuData2: db $81 ; flags db 3 ; items db "Pal@" @@ -287,10 +285,10 @@ MenuDataHeader_0x18d234: db $40 ; flags db 04, 09 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d23c + dw .MenuData2 db 1 ; default option -MenuData2_0x18d23c: +.MenuData2: db $81 ; flags db 3 ; items db "Strategy@" @@ -302,10 +300,10 @@ MenuDataHeader_0x18d258: db $40 ; flags db 04, 05 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d260 + dw .MenuData2 db 1 ; default option -MenuData2_0x18d260: +.MenuData2: db $81 ; flags db 3 ; items db "Weak person@" @@ -317,10 +315,10 @@ MenuDataHeader_0x18d283: db $40 ; flags db 04, 08 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d28b + dw .MenuData2 db 1 ; default option -MenuData2_0x18d28b: +.MenuData2: db $81 ; flags db 3 ; items db "Love@" @@ -332,10 +330,10 @@ MenuDataHeader_0x18d2a5: db $40 ; flags db 04, 12 ; start coords db 11, 19 ; end coords - dw MenuData2_0x18d2ad + dw .MenuData2 db 1 ; default option -MenuData2_0x18d2ad: +.MenuData2: db $81 ; flags db 3 ; items db "Tough@" diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm index ef6ec59ed..f8528c9b8 100644 --- a/maps/DragonsDenB1F.asm +++ b/maps/DragonsDenB1F.asm @@ -12,22 +12,17 @@ const_value set 2 DragonsDenB1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .CheckSilver -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .CheckSilver: diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm index a43e652a8..2eb9081e4 100644 --- a/maps/EarlsPokemonAcademy.asm +++ b/maps/EarlsPokemonAcademy.asm @@ -66,7 +66,7 @@ AcademyBlackboard: opentext writetext AcademyBlackboardText .Loop: - loadmenudata .MenuHeader + loadmenudata .BlackboardMenuData _2dmenu closewindow if_equal $1, .Poison @@ -102,14 +102,14 @@ AcademyBlackboard: waitbutton jump .Loop -.MenuHeader: +.BlackboardMenuData: db $40 ; flags db 00, 00 ; start coords db 08, 11 ; end coords - dw .Data + dw .MenuData2 db 1 ; default option -.Data: +.MenuData2: db $80 ; flags dn 3, 2 ; rows, columns db 5 ; spacing diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm index b15850d2e..6ffc502c6 100644 --- a/maps/EcruteakCity.asm +++ b/maps/EcruteakCity.asm @@ -13,8 +13,6 @@ EcruteakCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm index 0af0cf3c9..bf9d55848 100644 --- a/maps/EcruteakGym.asm +++ b/maps/EcruteakGym.asm @@ -10,19 +10,17 @@ const_value set 2 EcruteakGym_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x99d53, 0 - dw UnknownScript_0x99d57, 0 + maptrigger .ForcedToLeave + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x99d53: +.ForcedToLeave: priorityjump EcruteakGymClosed end -UnknownScript_0x99d57: +.DummyTrigger: end MortyScript_0x99d58: diff --git a/maps/EcruteakHouse.asm b/maps/EcruteakHouse.asm index 2b795ebd6..f50b39627 100644 --- a/maps/EcruteakHouse.asm +++ b/maps/EcruteakHouse.asm @@ -7,22 +7,17 @@ const_value set 2 EcruteakHouse_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .InitializeSages -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .InitializeSages: diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index dc578d2e0..0d711128f 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -8,19 +8,17 @@ const_value set 2 EcruteakPokeCenter1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .MeetBill + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.MeetBill: priorityjump .BillActivatesTimeCapsule end -.Trigger1: +.DummyTrigger: end .BillActivatesTimeCapsule: diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index c49c522fc..d8783226b 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -9,61 +9,56 @@ const_value set 2 ElmsLab_MapScriptHeader: .MapTriggers: db 6 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 - maptrigger .Trigger3 - maptrigger .Trigger4 - maptrigger .Trigger5 + maptrigger .MeetElm + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 + maptrigger .DummyTrigger3 + maptrigger .DummyTrigger4 + maptrigger .DummyTrigger5 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .MoveElmCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, .Callback_MoveElm - -.Trigger0: - priorityjump ElmsLab_AutowalkUpToElm +.MeetElm: + priorityjump .WalkUpToElm end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end -.Trigger3: +.DummyTrigger3: end -.Trigger4: +.DummyTrigger4: end -.Trigger5: +.DummyTrigger5: end -.Callback_MoveElm: +.MoveElmCallback: checktriggers iftrue .Skip moveperson ELMSLAB_ELM, $3, $4 .Skip: return -ElmsLab_AutowalkUpToElm: +.WalkUpToElm: applymovement PLAYER, ElmsLab_WalkUpToElmMovement showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 spriteface ELMSLAB_ELM, RIGHT opentext writetext ElmText_Intro -ElmsLab_RefuseLoop: +.MustSayYes: yesorno - iftrue ElmsLab_ElmGetsEmail + iftrue .ElmGetsEmail writetext ElmText_Refused - jump ElmsLab_RefuseLoop + jump .MustSayYes -ElmsLab_ElmGetsEmail: +.ElmGetsEmail: writetext ElmText_Accepted buttonsound writetext ElmText_ResearchAmbitions diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm index 3440cd848..9a6a93f5d 100644 --- a/maps/FastShip1F.asm +++ b/maps/FastShip1F.asm @@ -7,26 +7,24 @@ const_value set 2 FastShip1F_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .EnterFastShip + maptrigger .DummyTrigger2 .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger0: end -.Trigger1: - priorityjump .PriorityJump2 +.EnterFastShip: + priorityjump .EnterFastShipScript end -.Trigger2: +.DummyTrigger2: end -.PriorityJump2: +.EnterFastShipScript: applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement PLAYER, MovementData_0x75217 applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211 diff --git a/maps/FastShipB1F.asm b/maps/FastShipB1F.asm index e3478657b..5744e3b37 100644 --- a/maps/FastShipB1F.asm +++ b/maps/FastShipB1F.asm @@ -15,18 +15,16 @@ const_value set 2 FastShipB1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x7673a, 0 - dw UnknownScript_0x7673b, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x7673a: +.DummyTrigger0: end -UnknownScript_0x7673b: +.DummyTrigger1: end UnknownScript_0x7673c: diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm index 13af9ee23..58d155454 100644 --- a/maps/FuchsiaCity.asm +++ b/maps/FuchsiaCity.asm @@ -10,8 +10,6 @@ FuchsiaCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/FuchsiaPokeCenter1F.asm b/maps/FuchsiaPokeCenter1F.asm index 820d854c5..3759aab35 100644 --- a/maps/FuchsiaPokeCenter1F.asm +++ b/maps/FuchsiaPokeCenter1F.asm @@ -7,14 +7,12 @@ const_value set 2 FuchsiaPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x196458, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x196458: +.DummyTrigger: end NurseScript_0x196459: diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm index 7642bf6b7..ffbfe6e7d 100644 --- a/maps/GoldenrodCity.asm +++ b/maps/GoldenrodCity.asm @@ -21,8 +21,6 @@ GoldenrodCity_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria dbw MAPCALLBACK_OBJECTS, .MoveTutor diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index b10f019ac..8a7549be2 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -12,9 +12,6 @@ GoldenrodDeptStore5F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .CheckIfSunday .CheckIfSunday: diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm index 769c01fb8..cd7e63446 100644 --- a/maps/GoldenrodDeptStoreB1F.asm +++ b/maps/GoldenrodDeptStoreB1F.asm @@ -14,11 +14,7 @@ GoldenrodDeptStoreB1F_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_TILES, UnknownScript_0x7d781 - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac UnknownScript_0x7d781: diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index d3cb7af76..9787e69b8 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -14,11 +14,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock - dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk .CheckSaleChangeBlock: diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index ee0ccecb0..298485663 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -18,9 +18,6 @@ GoldenrodGameCorner_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Callback .Callback: diff --git a/maps/GoldenrodGym.asm b/maps/GoldenrodGym.asm index b014bc126..88156e35e 100644 --- a/maps/GoldenrodGym.asm +++ b/maps/GoldenrodGym.asm @@ -9,18 +9,16 @@ const_value set 2 GoldenrodGym_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x5400a, 0 - dw UnknownScript_0x5400b, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x5400a: +.DummyTrigger0: end -UnknownScript_0x5400b: +.DummyTrigger1: end WhitneyScript_0x5400c: diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm index eea47ac8f..9818cd9ee 100644 --- a/maps/GoldenrodMagnetTrainStation.asm +++ b/maps/GoldenrodMagnetTrainStation.asm @@ -5,14 +5,12 @@ const_value set 2 GoldenrodMagnetTrainStation_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - maptrigger .Trigger0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger: end OfficerScript_0x550ec: diff --git a/maps/GoldenrodPokeComCenter2FMobile.asm b/maps/GoldenrodPokeComCenter2FMobile.asm index 56ae85b30..427dc3236 100644 --- a/maps/GoldenrodPokeComCenter2FMobile.asm +++ b/maps/GoldenrodPokeComCenter2FMobile.asm @@ -53,10 +53,10 @@ MenuDataHeader_0x62602: db $40 ; flags db 00, 00 ; start coords db 08, 15 ; end coords - dw MenuData2_0x6260a + dw .MenuData2 db 1 ; default option -MenuData2_0x6260a: +.MenuData2: db $80 ; flags db 3 ; items db "# つうしん クラブ@" ; # COM CLUB @@ -98,10 +98,10 @@ MenuDataHeader_0x6264c: db $40 ; flags db 00, 00 ; start coords db 08, 15 ; end coords - dw MenuData2_0x62654 + dw .MenuData2 db 1 ; default option -MenuData2_0x62654: +.MenuData2: db $80 ; flags db 3 ; items db "でんわ", $1f,"つかうとき@" ; Use phone diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm index bf5804c42..2f4a3a200 100644 --- a/maps/HallOfFame.asm +++ b/maps/HallOfFame.asm @@ -4,22 +4,20 @@ const_value set 2 HallOfFame_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .EnterHallOfFame + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: - priorityjump HallOfFameScript +.EnterHallOfFame: + priorityjump .EnterHallOfFameScript end -.Trigger1: +.DummyTrigger: end -HallOfFameScript: +.EnterHallOfFameScript: follow HALLOFFAME_LANCE, PLAYER applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance stopfollow diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index afac65352..071133d97 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -11,9 +11,6 @@ IcePathB1F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_CMDQUEUE, .SetUpStoneTable .SetUpStoneTable: diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm index c1817a6cc..d1640aa11 100644 --- a/maps/IlexForest.asm +++ b/maps/IlexForest.asm @@ -17,9 +17,6 @@ IlexForest_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback .FarfetchdCallback: diff --git a/maps/IndigoPlateauPokeCenter1F.asm b/maps/IndigoPlateauPokeCenter1F.asm index 4b906d818..2174552e6 100644 --- a/maps/IndigoPlateauPokeCenter1F.asm +++ b/maps/IndigoPlateauPokeCenter1F.asm @@ -9,21 +9,16 @@ const_value set 2 IndigoPlateauPokeCenter1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x180009, 0 + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .PrepareElite4 - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x18000a - -UnknownScript_0x180009: +.DummyTrigger: end -UnknownScript_0x18000a: +.PrepareElite4: domaptrigger WILLS_ROOM, $0 domaptrigger KOGAS_ROOM, $0 domaptrigger BRUNOS_ROOM, $0 diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm index 6ab50b3fc..c944ba97f 100644 --- a/maps/KarensRoom.asm +++ b/maps/KarensRoom.asm @@ -4,23 +4,18 @@ const_value set 2 KarensRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .KarensRoomDoors -.Trigger0: +.LockDoor: priorityjump .KarensDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end .KarensRoomDoors: diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm index 35fcb68b7..454878bb4 100644 --- a/maps/KogasRoom.asm +++ b/maps/KogasRoom.asm @@ -4,23 +4,18 @@ const_value set 2 KogasRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .KogasRoomDoors -.Trigger0: +.LockDoor: priorityjump .KogasDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end .KogasRoomDoors: diff --git a/maps/KrissHouse1F.asm b/maps/KrissHouse1F.asm index 70aad1590..ed69fe9a4 100644 --- a/maps/KrissHouse1F.asm +++ b/maps/KrissHouse1F.asm @@ -8,18 +8,16 @@ const_value set 2 KrissHouse1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x7a4d6, 0 - dw UnknownScript_0x7a4d7, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x7a4d6: +.DummyTrigger0: end -UnknownScript_0x7a4d7: +.DummyTrigger1: end UnknownScript_0x7a4d8: diff --git a/maps/KrissHouse2F.asm b/maps/KrissHouse2F.asm index f847f6fa0..eec62a6aa 100644 --- a/maps/KrissHouse2F.asm +++ b/maps/KrissHouse2F.asm @@ -10,11 +10,7 @@ KrissHouse2F_MapScriptHeader: .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .InitializeRoom - dbw MAPCALLBACK_TILES, .SetSpawn .Null: @@ -53,6 +49,7 @@ GameConsole: KrissHousePoster: dw EVENT_KRISS_ROOM_POSTER, .Script + .Script: describedecoration 0 diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm index 17a278d65..e5c76fec3 100644 --- a/maps/KurtsHouse.asm +++ b/maps/KurtsHouse.asm @@ -11,30 +11,27 @@ KurtsHouse_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .KurtCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18e154 - -UnknownScript_0x18e154: +.KurtCallback: checkevent EVENT_CLEARED_SLOWPOKE_WELL - iffalse UnknownScript_0x18e177 + iffalse .Done checkevent EVENT_FOREST_IS_RESTLESS - iftrue UnknownScript_0x18e177 + iftrue .Done checkflag ENGINE_KURT_MAKING_BALLS - iftrue UnknownScript_0x18e16f + iftrue .MakingBalls disappear KURTSHOUSE_KURT2 appear KURTSHOUSE_KURT1 disappear KURTSHOUSE_TWIN2 appear KURTSHOUSE_TWIN1 return -UnknownScript_0x18e16f: +.MakingBalls: disappear KURTSHOUSE_KURT1 appear KURTSHOUSE_KURT2 disappear KURTSHOUSE_TWIN1 appear KURTSHOUSE_TWIN2 -UnknownScript_0x18e177: +.Done: return KurtScript_0x18e178: diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index db08e2b5f..ffcc865f7 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -15,23 +15,18 @@ const_value set 2 LakeOfRage_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_OBJECTS, .Wesley -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm index e3572d50d..14dc9852b 100644 --- a/maps/LancesRoom.asm +++ b/maps/LancesRoom.asm @@ -6,37 +6,32 @@ const_value set 2 LancesRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .LancesRoomDoors - ; callbacks - - dbw MAPCALLBACK_TILES, .CheckDoor - -.Trigger0: - priorityjump LancesRoom_PlayerWalksIn_DoorsCloseBehind +.LockDoor: + priorityjump .LancesDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end -.CheckDoor: +.LancesRoomDoors: checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED - iffalse .LanceEntranceOpen + iffalse .KeepDoorsClosed changeblock $4, $16, $34 -.LanceEntranceOpen: +.KeepDoorsClosed: checkevent EVENT_LANCES_ROOM_EXIT_OPEN - iffalse .LanceExitClosed + iffalse .OpenDoors changeblock $4, $0, $b -.LanceExitClosed: +.OpenDoors: return -LancesRoom_PlayerWalksIn_DoorsCloseBehind: +.LancesDoorLocksBehindYou: applymovement PLAYER, LancesRoom_PlayerWalksInMovementData refreshscreen $86 playsound SFX_STRENGTH diff --git a/maps/LavenderNameRater.asm b/maps/LavenderNameRater.asm index 6ac3cfb26..dfab25b6b 100644 --- a/maps/LavenderNameRater.asm +++ b/maps/LavenderNameRater.asm @@ -4,14 +4,12 @@ const_value set 2 LavenderNameRater_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x7eaf1, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x7eaf1: +.DummyTrigger: end LavenderNameRater: @@ -22,8 +20,7 @@ LavenderNameRater: closetext end -LavenderNameRaterBookshelf: -; unused +LavenderNameRaterUnusedBookshelf: jumpstd difficultbookshelf LavenderNameRater_MapEventHeader: diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm index 45f235d76..f0b40ad12 100644 --- a/maps/LavenderTown.asm +++ b/maps/LavenderTown.asm @@ -10,8 +10,6 @@ LavenderTown_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 532574644..81823061c 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -8,31 +8,26 @@ const_value set 2 MahoganyMart1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x6c356, 0 - dw UnknownScript_0x6c357, 0 + maptrigger .DummyTrigger0 + maptrigger .LanceUncoversStaircase .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .MahoganyMart1FStaircase - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x6c35b - -UnknownScript_0x6c356: +.DummyTrigger0: end -UnknownScript_0x6c357: +.LanceUncoversStaircase: priorityjump UnknownScript_0x6c38f end -UnknownScript_0x6c35b: +.MahoganyMart1FStaircase: checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART - iftrue UnknownScript_0x6c362 + iftrue .ShowStairs return -UnknownScript_0x6c362: +.ShowStairs: changeblock $6, $2, $1e return diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index 0612b0811..62b56708e 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -7,21 +7,17 @@ const_value set 2 MahoganyTown_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 7c5628955..7a10a7299 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -1,22 +1,20 @@ MobileBattleRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .InitializeMobileBattleRoom + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: - priorityjump MobileBattleRoom_Initialize +.InitializeMobileBattleRoom: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger: end -MobileBattleRoom_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $5 end diff --git a/maps/MobileTradeRoomMobile.asm b/maps/MobileTradeRoomMobile.asm index 60a0f72fc..3e1753832 100644 --- a/maps/MobileTradeRoomMobile.asm +++ b/maps/MobileTradeRoomMobile.asm @@ -1,22 +1,20 @@ MobileTradeRoomMobile_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .InitializeMobileTradeRoomMobile + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: - priorityjump MobileTradeRoomMobile_Initialize +.InitializeMobileTradeRoomMobile: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger: end -MobileTradeRoomMobile_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $4 end diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm index 3a98e1b90..2d30c2ab5 100644 --- a/maps/MountMoon.asm +++ b/maps/MountMoon.asm @@ -4,19 +4,17 @@ const_value set 2 MountMoon_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .RivalEncounter + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.RivalEncounter: priorityjump .RivalBattle end -.Trigger1: +.DummyTrigger: end .RivalBattle: diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm index 1c84c2e65..5b5c2e113 100644 --- a/maps/MountMoonSquare.asm +++ b/maps/MountMoonSquare.asm @@ -6,19 +6,14 @@ const_value set 2 MountMoonSquare_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw .Trigger0, 0 + maptrigger .DummyTrigger .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone dbw MAPCALLBACK_OBJECTS, .DisappearRock -.Trigger0: +.DummyTrigger: end .DisappearMoonStone: diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm index 6449ad404..8a322339d 100644 --- a/maps/MrPokemonsHouse.asm +++ b/maps/MrPokemonsHouse.asm @@ -5,19 +5,17 @@ const_value set 2 MrPokemonsHouse_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .MeetMrPokemon + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.MeetMrPokemon: priorityjump .MrPokemonEvent end -.Trigger1: +.DummyTrigger: end .MrPokemonEvent: diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm index d382a4cf1..110536631 100644 --- a/maps/NewBarkTown.asm +++ b/maps/NewBarkTown.asm @@ -6,21 +6,17 @@ const_value set 2 NewBarkTown_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm index 87b842a39..508df854d 100644 --- a/maps/OlivineCity.asm +++ b/maps/OlivineCity.asm @@ -7,21 +7,17 @@ const_value set 2 OlivineCity_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .FlyPoint: diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm index b7830eaed..200abc9e9 100644 --- a/maps/OlivinePort.asm +++ b/maps/OlivinePort.asm @@ -10,22 +10,20 @@ const_value set 2 OlivinePort_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x748ac, 0 - dw UnknownScript_0x748ad, 0 + maptrigger .DummyTrigger0 + maptrigger .LeaveFastShip .MapCallbacks: db 0 -UnknownScript_0x748ac: +.DummyTrigger0: end -UnknownScript_0x748ad: - priorityjump UnknownScript_0x748b1 +.LeaveFastShip: + priorityjump .LeaveFastShipScript end -UnknownScript_0x748b1: +.LeaveFastShipScript: applymovement PLAYER, MovementData_0x74a32 appear OLIVINEPORT_SAILOR1 dotrigger $0 diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm index 45ab0c5ca..932484f8c 100644 --- a/maps/PalletTown.asm +++ b/maps/PalletTown.asm @@ -8,8 +8,6 @@ PalletTown_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm index e70012447..36474b7ea 100644 --- a/maps/PewterCity.asm +++ b/maps/PewterCity.asm @@ -11,8 +11,6 @@ PewterCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/PokeCenter2F.asm b/maps/PokeCenter2F.asm index 3730b6708..3cebaf902 100644 --- a/maps/PokeCenter2F.asm +++ b/maps/PokeCenter2F.asm @@ -7,8 +7,6 @@ const_value set 2 PokeCenter2F_MapScriptHeader: .MapTriggers: db 6 - - ; triggers maptrigger .Trigger0 maptrigger .Trigger1 maptrigger .Trigger2 diff --git a/maps/PowerPlant.asm b/maps/PowerPlant.asm index 62a539eb3..317f12764 100644 --- a/maps/PowerPlant.asm +++ b/maps/PowerPlant.asm @@ -10,18 +10,16 @@ const_value set 2 PowerPlant_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x188dc3, 0 - dw UnknownScript_0x188dc4, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x188dc3: +.DummyTrigger0: end -UnknownScript_0x188dc4: +.DummyTrigger1: end PowerPlantGuardPhoneScript: diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm index fef269adf..a9fed600c 100644 --- a/maps/RadioTower3F.asm +++ b/maps/RadioTower3F.asm @@ -13,12 +13,9 @@ RadioTower3F_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .CardKeyShutterCallback - ; callbacks - - dbw MAPCALLBACK_TILES, CardKeyShutterCallback - -CardKeyShutterCallback: +.CardKeyShutterCallback: checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER iftrue .Change return diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm index 3f8b444d4..c2fd1e9ea 100644 --- a/maps/RadioTower5F.asm +++ b/maps/RadioTower5F.asm @@ -8,22 +8,20 @@ const_value set 2 RadioTower5F_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end FakeDirectorScript: diff --git a/maps/RedsHouse1F.asm b/maps/RedsHouse1F.asm index ae909f6da..cf7dd4b3b 100644 --- a/maps/RedsHouse1F.asm +++ b/maps/RedsHouse1F.asm @@ -4,14 +4,12 @@ const_value set 2 RedsHouse1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw .Trigger, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger: +.DummyTrigger: end RedsMom: diff --git a/maps/Route16.asm b/maps/Route16.asm index 4d9c02ece..7c63d184b 100644 --- a/maps/Route16.asm +++ b/maps/Route16.asm @@ -4,20 +4,17 @@ Route16_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad318 - -UnknownScript_0x1ad318: +.AlwaysOnBike: checkcode VAR_YCOORD - if_less_than $5, UnknownScript_0x1ad328 + if_less_than $5, .CanWalk checkcode VAR_XCOORD - if_greater_than $d, UnknownScript_0x1ad328 + if_greater_than $d, .CanWalk setflag ENGINE_ALWAYS_ON_BIKE return -UnknownScript_0x1ad328: +.CanWalk: clearflag ENGINE_ALWAYS_ON_BIKE return diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index e1ed8c714..17572bf14 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -4,14 +4,12 @@ const_value set 2 Route16Gate_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x733e9, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x733e9: +.DummyTrigger: end OfficerScript_0x733ea: diff --git a/maps/Route17.asm b/maps/Route17.asm index 0a20a3e78..1ea495cc3 100644 --- a/maps/Route17.asm +++ b/maps/Route17.asm @@ -10,12 +10,9 @@ Route17_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad0ab - -UnknownScript_0x1ad0ab: +.AlwaysOnBike: setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_DOWNHILL return diff --git a/maps/Route1718Gate.asm b/maps/Route1718Gate.asm index e1650702b..2be96d3f0 100644 --- a/maps/Route1718Gate.asm +++ b/maps/Route1718Gate.asm @@ -4,14 +4,12 @@ const_value set 2 Route1718Gate_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x7360d, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x7360d: +.DummyTrigger: end OfficerScript_0x7360e: diff --git a/maps/Route19.asm b/maps/Route19.asm index 11e21de7f..0de9f2f1f 100644 --- a/maps/Route19.asm +++ b/maps/Route19.asm @@ -12,9 +12,6 @@ Route19_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .ClearRocks .ClearRocks: diff --git a/maps/Route20.asm b/maps/Route20.asm index 5733f3f9f..ce0d45d8a 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -9,9 +9,6 @@ Route20_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .ClearRocks .ClearRocks: diff --git a/maps/Route23.asm b/maps/Route23.asm index a8bd39b5e..83b114ab7 100644 --- a/maps/Route23.asm +++ b/maps/Route23.asm @@ -4,8 +4,6 @@ Route23_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/Route25.asm b/maps/Route25.asm index 911017ef6..197ecd86e 100644 --- a/maps/Route25.asm +++ b/maps/Route25.asm @@ -14,18 +14,16 @@ const_value set 2 Route25_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x19ee9e, 0 - dw UnknownScript_0x19ee9f, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x19ee9e: +.DummyTrigger0: end -UnknownScript_0x19ee9f: +.DummyTrigger1: end UnknownScript_0x19eea0: diff --git a/maps/Route27.asm b/maps/Route27.asm index 7781e5bbf..c944c66ee 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -12,18 +12,16 @@ const_value set 2 Route27_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x1a0871, 0 - dw UnknownScript_0x1a0872, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x1a0871: +.DummyTrigger0: end -UnknownScript_0x1a0872: +.DummyTrigger1: end UnknownScript_0x1a0873: diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28FamousSpeechHouse.asm index 0e0f95f01..d2e121af3 100644 --- a/maps/Route28FamousSpeechHouse.asm +++ b/maps/Route28FamousSpeechHouse.asm @@ -5,14 +5,12 @@ const_value set 2 Route28FamousSpeechHouse_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw .Trigger, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger: +.DummyTrigger: end Celebrity: diff --git a/maps/Route29.asm b/maps/Route29.asm index 629c4dd77..bf4bd169a 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -11,22 +11,17 @@ const_value set 2 Route29_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Tuscany -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .Tuscany: diff --git a/maps/Route31.asm b/maps/Route31.asm index 61b67be11..829fd2830 100644 --- a/maps/Route31.asm +++ b/maps/Route31.asm @@ -13,9 +13,6 @@ Route31_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .CheckMomCall .CheckMomCall: diff --git a/maps/Route32.asm b/maps/Route32.asm index da9eb5c70..f0cebf11e 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -17,26 +17,21 @@ const_value set 2 Route32_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Frieda -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end .Frieda: diff --git a/maps/Route34.asm b/maps/Route34.asm index 7aa242199..d8935c8f3 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -19,9 +19,6 @@ Route34_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .EggCheckCallback .EggCheckCallback: diff --git a/maps/Route34IlexForestGate.asm b/maps/Route34IlexForestGate.asm index 674bca42d..fd7aad411 100644 --- a/maps/Route34IlexForestGate.asm +++ b/maps/Route34IlexForestGate.asm @@ -10,19 +10,16 @@ Route34IlexForestGate_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .IsForestRestless - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x62d2d - -UnknownScript_0x62d2d: +.IsForestRestless: checkevent EVENT_FOREST_IS_RESTLESS - iffalse UnknownScript_0x62d38 + iffalse .Normal disappear ROUTE34ILEXFORESTGATE_TEACHER1 appear ROUTE34ILEXFORESTGATE_TEACHER2 return -UnknownScript_0x62d38: +.Normal: disappear ROUTE34ILEXFORESTGATE_TEACHER2 appear ROUTE34ILEXFORESTGATE_TEACHER1 return diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm index bb88c55d6..f7aa0b22f 100644 --- a/maps/Route35NationalParkGate.asm +++ b/maps/Route35NationalParkGate.asm @@ -6,60 +6,54 @@ const_value set 2 Route35NationalParkGate_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - dw Route35NationalParkGate_Trigger1, 0 - dw Route35NationalParkGate_Trigger2, 0 - dw Route35NationalParkGate_Trigger3, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .LeaveContestEarly .MapCallbacks: db 2 + dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning + dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable - ; callbacks - - dbw MAPCALLBACK_NEWMAP, Route35NationalParkGate_CheckIfStillInContest - - dbw MAPCALLBACK_OBJECTS, Route35NationalParkGate_CheckIfContestDay - -Route35NationalParkGate_Trigger1: +.DummyTrigger0: end -Route35NationalParkGate_Trigger2: +.DummyTrigger1: end -Route35NationalParkGate_Trigger3: - priorityjump Route35NationalParkGate_LeavingContestEarly +.LeaveContestEarly: + priorityjump .LeavingContestEarly end -Route35NationalParkGate_CheckIfStillInContest: +.CheckIfContestRunning: checkflag ENGINE_BUG_CONTEST_TIMER - iftrue Route35NationalParkGate_Yes + iftrue .BugContestIsRunning dotrigger $0 return -Route35NationalParkGate_Yes: +.BugContestIsRunning: dotrigger $2 return -Route35NationalParkGate_CheckIfContestDay: +.CheckIfContestAvailable: checkcode VAR_WEEKDAY - if_equal TUESDAY, Route35NationalParkGate_IsContestDay - if_equal THURSDAY, Route35NationalParkGate_IsContestDay - if_equal SATURDAY, Route35NationalParkGate_IsContestDay + if_equal TUESDAY, .SetContestOfficer + if_equal THURSDAY, .SetContestOfficer + if_equal SATURDAY, .SetContestOfficer checkflag ENGINE_BUG_CONTEST_TIMER - iftrue Route35NationalParkGate_Yes + iftrue .BugContestIsRunning disappear ROUTE35NATIONALPARKGATE_OFFICER1 appear ROUTE35NATIONALPARKGATE_YOUNGSTER appear ROUTE35NATIONALPARKGATE_OFFICER2 return -Route35NationalParkGate_IsContestDay: +.SetContestOfficer: appear ROUTE35NATIONALPARKGATE_OFFICER1 disappear ROUTE35NATIONALPARKGATE_YOUNGSTER disappear ROUTE35NATIONALPARKGATE_OFFICER2 return -Route35NationalParkGate_LeavingContestEarly: +.LeavingContestEarly: applymovement PLAYER, MovementData_0x6a2e2 spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT opentext @@ -68,13 +62,13 @@ Route35NationalParkGate_LeavingContestEarly: RAM2MEM $0 writetext UnknownText_0x6a79a yesorno - iffalse Route35NationalParkGate_GoBackIn + iffalse .GoBackToContest writetext UnknownText_0x6a7db waitbutton closetext jumpstd bugcontestresultswarp -Route35NationalParkGate_GoBackIn: +.GoBackToContest: writetext UnknownText_0x6a823 waitbutton closetext diff --git a/maps/Route36.asm b/maps/Route36.asm index 02ca0e9cd..5b4121cc4 100644 --- a/maps/Route36.asm +++ b/maps/Route36.asm @@ -12,22 +12,17 @@ const_value set 2 Route36_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .ArthurCallback -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .ArthurCallback: diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm index a2cb753a1..02f980735 100644 --- a/maps/Route36NationalParkGate.asm +++ b/maps/Route36NationalParkGate.asm @@ -15,29 +15,23 @@ const_value set 2 Route36NationalParkGate_MapScriptHeader: .MapTriggers: db 3 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .LeaveContestEarly .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning - dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end -.Trigger2: - priorityjump .LeftTheContestEarly +.LeaveContestEarly: + priorityjump .LeavingContestEarly end .CheckIfContestRunning: @@ -69,7 +63,7 @@ Route36NationalParkGate_MapScriptHeader: .Return: return -.LeftTheContestEarly: +.LeavingContestEarly: spriteface PLAYER, UP opentext checkcode VAR_CONTESTMINUTES diff --git a/maps/Route37.asm b/maps/Route37.asm index df3877226..0065917a2 100644 --- a/maps/Route37.asm +++ b/maps/Route37.asm @@ -13,12 +13,9 @@ Route37_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .Sunny - ; callbacks - - dbw MAPCALLBACK_OBJECTS, SunnyCallback - -SunnyCallback: +.Sunny: checkcode VAR_WEEKDAY if_equal SUNDAY, .SunnyAppears disappear ROUTE37_SUNNY diff --git a/maps/Route40.asm b/maps/Route40.asm index 81891c7b9..a5677f0c4 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -18,12 +18,9 @@ Route40_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .MonicaCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, MonicaCallback - -MonicaCallback: +.MonicaCallback: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR checkcode VAR_WEEKDAY if_equal MONDAY, .MonicaAppears diff --git a/maps/Route40BattleTowerGate.asm b/maps/Route40BattleTowerGate.asm index 4e6cfa8cb..796d73eec 100644 --- a/maps/Route40BattleTowerGate.asm +++ b/maps/Route40BattleTowerGate.asm @@ -8,12 +8,9 @@ Route40BattleTowerGate_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .ShowSailor - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x9f665 - -UnknownScript_0x9f665: +.ShowSailor: clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR return diff --git a/maps/Route42.asm b/maps/Route42.asm index cd52b8973..ee29c9d7f 100644 --- a/maps/Route42.asm +++ b/maps/Route42.asm @@ -12,18 +12,16 @@ const_value set 2 Route42_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x1a9216, 0 - dw UnknownScript_0x1a9217, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x1a9216: +.DummyTrigger0: end -UnknownScript_0x1a9217: +.DummyTrigger1: end Route42SuicuneScript: diff --git a/maps/Route43.asm b/maps/Route43.asm index fa04dbe53..126842e64 100644 --- a/maps/Route43.asm +++ b/maps/Route43.asm @@ -14,18 +14,15 @@ Route43_MapScriptHeader: .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .CheckIfRockets - ; callbacks - - dbw MAPCALLBACK_NEWMAP, UnknownScript_0x19d051 - -UnknownScript_0x19d051: +.CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x19d05c + iftrue .NoRockets domaptrigger ROUTE_43_GATE, $0 return -UnknownScript_0x19d05c: +.NoRockets: domaptrigger ROUTE_43_GATE, $1 return diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm index ee54a42c7..99ca71a58 100644 --- a/maps/Route43Gate.asm +++ b/maps/Route43Gate.asm @@ -6,36 +6,31 @@ const_value set 2 Route43Gate_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .RocketShakedown + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_NEWMAP, .CheckIfRockets - ; callbacks - - dbw MAPCALLBACK_NEWMAP, GateScript_CheckIfRockets - -.Trigger0: - priorityjump GateScript_RocketTakeover +.RocketShakedown: + priorityjump .RocketTakeover end -.Trigger1: +.DummyTrigger: end -GateScript_CheckIfRockets: +.CheckIfRockets: checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue GateScript_NoRockets + iftrue .NoRockets domaptrigger ROUTE_43, $0 return -GateScript_NoRockets: +.NoRockets: domaptrigger ROUTE_43, $1 return -GateScript_RocketTakeover: +.RocketTakeover: playmusic MUSIC_ROCKET_ENCOUNTER checkcode VAR_FACING if_equal DOWN, RocketScript_Southbound diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 9e3275d97..b9081eccd 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -4,14 +4,12 @@ const_value set 2 Route6SaffronGate_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x1926e9, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x1926e9: +.DummyTrigger: end OfficerScript_0x1926ea: diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm index f68d0302b..d6e6bc0d8 100644 --- a/maps/RuinsOfAlphAerodactylChamber.asm +++ b/maps/RuinsOfAlphAerodactylChamber.asm @@ -1,45 +1,40 @@ RuinsOfAlphAerodactylChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x58dad, 0 - dw UnknownScript_0x58db8, 0 + maptrigger .CheckWall + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x58db9 - -UnknownScript_0x58dad: +.CheckWall: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER - iftrue UnknownScript_0x58db4 + iftrue .OpenWall end -UnknownScript_0x58db4: - priorityjump UnknownScript_0x58dd3 +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x58db8: +.DummyTrigger: end -UnknownScript_0x58db9: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER - iftrue UnknownScript_0x58dc3 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58dc3: +.WallOpen: checkevent EVENT_SOLVED_AERODACTYL_PUZZLE - iffalse UnknownScript_0x58dca + iffalse .FloorClosed return -UnknownScript_0x58dca: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58dd3: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm index 74e11cf4d..2ff478945 100644 --- a/maps/RuinsOfAlphHoOhChamber.asm +++ b/maps/RuinsOfAlphHoOhChamber.asm @@ -1,46 +1,41 @@ RuinsOfAlphHoOhChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x5856d, 0 - dw UnknownScript_0x5857b, 0 + maptrigger .CheckWall + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x5857c - -UnknownScript_0x5856d: +.CheckWall: special SpecialHoOhChamber checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER - iftrue UnknownScript_0x58577 + iftrue .OpenWall end -UnknownScript_0x58577: - priorityjump UnknownScript_0x58596 +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x5857b: +.DummyTrigger: end -UnknownScript_0x5857c: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_HO_OH_CHAMBER - iftrue UnknownScript_0x58586 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58586: +.WallOpen: checkevent EVENT_SOLVED_HO_OH_PUZZLE - iffalse UnknownScript_0x5858d + iffalse .FloorClosed return -UnknownScript_0x5858d: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58596: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm index 1348995c3..e949611e2 100644 --- a/maps/RuinsOfAlphInnerChamber.asm +++ b/maps/RuinsOfAlphInnerChamber.asm @@ -6,26 +6,22 @@ const_value set 2 RuinsOfAlphInnerChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x58f69, 0 - dw UnknownScript_0x58f6a, 0 + maptrigger .DummyTrigger0 + maptrigger .UnownAppear .MapCallbacks: db 0 -UnknownScript_0x58f69: +.DummyTrigger0: end -UnknownScript_0x58f6a: - priorityjump UnknownScript_0x58f6e - -UnknownScript_0x58f6d: +.UnownAppear: + priorityjump .StrangePresenceScript end -UnknownScript_0x58f6e: +.StrangePresenceScript: opentext - writetext UnknownText_0x58f89 + writetext RuinsOfAlphStrangePresenceText waitbutton closetext dotrigger $0 @@ -33,30 +29,30 @@ UnknownScript_0x58f6e: clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER end -FisherScript_0x58f7d: - jumptextfaceplayer UnknownText_0x58fac +RuinsOfAlphInnerChamberFisherScript: + jumptextfaceplayer RuinsOfAlphInnerChamberFisherText -TeacherScript_0x58f80: - jumptextfaceplayer UnknownText_0x58fda +RuinsOfAlphInnerChamberTeacherScript: + jumptextfaceplayer RuinsOfAlphInnerChamberTeacherText -GrampsScript_0x58f83: - jumptextfaceplayer UnknownText_0x59024 +RuinsOfAlphInnerChamberGrampsScript: + jumptextfaceplayer RuinsOfAlphInnerChamberGrampsText -RuinsOfAlphInnerChamberStatueScript: - jumptext UnknownText_0x59072 +RuinsOfAlphInnerChamberStatue: + jumptext RuinsOfAlphInnerChamberStatueText -UnknownText_0x58f89: +RuinsOfAlphStrangePresenceText: text "There is a strange" line "presence here…" done -UnknownText_0x58fac: +RuinsOfAlphInnerChamberFisherText: text "This is a big" line "room, but there's" cont "nothing here." done -UnknownText_0x58fda: +RuinsOfAlphInnerChamberTeacherText: text "This place has a" line "mystical quality" cont "to it." @@ -65,7 +61,7 @@ UnknownText_0x58fda: line "ethereal even." done -UnknownText_0x59024: +RuinsOfAlphInnerChamberGrampsText: text "Ancient buildings" line "are often tombs of" cont "kings." @@ -74,7 +70,7 @@ UnknownText_0x59024: line "for instance." done -UnknownText_0x59072: +RuinsOfAlphInnerChamberStatueText: text "It's a replica of" line "an ancient #-" cont "MON." @@ -101,35 +97,35 @@ RuinsOfAlphInnerChamber_MapEventHeader: .Signposts: db 26 - signpost 3, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 3, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 8, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 13, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 13, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 18, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript - signpost 24, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatueScript + signpost 3, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 3, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 8, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 13, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 13, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 18, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 2, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 5, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 8, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 11, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 14, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue + signpost 24, 17, SIGNPOST_READ, RuinsOfAlphInnerChamberStatue .PersonEvents: db 3 - person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, FisherScript_0x58f7d, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, TeacherScript_0x58f80, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS - person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, GrampsScript_0x58f83, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_FISHER, 7, 3, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberFisherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_TEACHER, 13, 14, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberTeacherScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS + person_event SPRITE_GRAMPS, 19, 11, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BROWN, PERSONTYPE_SCRIPT, 0, RuinsOfAlphInnerChamberGrampsScript, EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm index fdd7e0b3b..ba03172aa 100644 --- a/maps/RuinsOfAlphKabutoChamber.asm +++ b/maps/RuinsOfAlphKabutoChamber.asm @@ -5,47 +5,40 @@ const_value set 2 RuinsOfAlphKabutoChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x5872b, 0 - dw UnknownScript_0x58736, 0 + maptrigger .CheckWall + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x58737 - -UnknownScript_0x5872b: +.CheckWall: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER - iftrue UnknownScript_0x58732 + iftrue .OpenWall end -UnknownScript_0x58732: - priorityjump UnknownScript_0x58751 - -UnknownScript_0x58735: +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x58736: +.DummyTrigger: end -UnknownScript_0x58737: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER - iftrue UnknownScript_0x58741 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58741: +.WallOpen: checkevent EVENT_SOLVED_KABUTO_PUZZLE - iffalse UnknownScript_0x58748 + iffalse .FloorClosed return -UnknownScript_0x58748: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58751: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm index 09738ed3a..fbf806070 100644 --- a/maps/RuinsOfAlphOmanyteChamber.asm +++ b/maps/RuinsOfAlphOmanyteChamber.asm @@ -1,46 +1,41 @@ RuinsOfAlphOmanyteChamber_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x58be9, 0 - dw UnknownScript_0x58bf7, 0 + maptrigger .CheckWall + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .HiddenDoors - ; callbacks - - dbw MAPCALLBACK_TILES, UnknownScript_0x58bf8 - -UnknownScript_0x58be9: +.CheckWall: special SpecialOmanyteChamber checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER - iftrue UnknownScript_0x58bf3 + iftrue .OpenWall end -UnknownScript_0x58bf3: - priorityjump UnknownScript_0x58c12 +.OpenWall: + priorityjump .WallOpenScript end -UnknownScript_0x58bf7: +.DummyTrigger: end -UnknownScript_0x58bf8: +.HiddenDoors: checkevent EVENT_WALL_OPENED_IN_OMANYTE_CHAMBER - iftrue UnknownScript_0x58c02 + iftrue .WallOpen changeblock $4, $0, $2e -UnknownScript_0x58c02: +.WallOpen: checkevent EVENT_SOLVED_OMANYTE_PUZZLE - iffalse UnknownScript_0x58c09 + iffalse .FloorClosed return -UnknownScript_0x58c09: +.FloorClosed: changeblock $2, $2, $1 changeblock $4, $2, $2 return -UnknownScript_0x58c12: +.WallOpenScript: pause 30 earthquake 30 showemote EMOTE_SHOCK, PLAYER, 20 diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index e291a3d73..402860251 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -8,52 +8,47 @@ const_value set 2 RuinsOfAlphOutside_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x5800d, 0 - dw UnknownScript_0x5800e, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .ScientistCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x5800f - -UnknownScript_0x5800d: +.DummyTrigger0: end -UnknownScript_0x5800e: +.DummyTrigger1: end -UnknownScript_0x5800f: +.ScientistCallback: checkflag ENGINE_UNOWN_DEX - iftrue UnknownScript_0x5802c + iftrue .NoScientist checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS - iftrue UnknownScript_0x5801e - jump UnknownScript_0x5802c + iftrue .MaybeScientist + jump .NoScientist -UnknownScript_0x5801e: +.MaybeScientist: checkcode VAR_UNOWNCOUNT - if_greater_than $2, UnknownScript_0x58027 - jump UnknownScript_0x5802c + if_greater_than $2, .YesScientist + jump .NoScientist -UnknownScript_0x58027: +.YesScientist: appear RUINSOFALPHOUTSIDE_SCIENTIST dotrigger $1 return -UnknownScript_0x5802c: +.NoScientist: disappear RUINSOFALPHOUTSIDE_SCIENTIST dotrigger $0 return -UnknownScript_0x58031: +RuinsOfAlphOutsideScientistTrigger1: spriteface RUINSOFALPHOUTSIDE_SCIENTIST, UP spriteface PLAYER, DOWN jump UnknownScript_0x58044 -UnknownScript_0x5803a: +RuinsOfAlphOutsideScientistTrigger2: spriteface RUINSOFALPHOUTSIDE_SCIENTIST, LEFT spriteface PLAYER, RIGHT jump UnknownScript_0x58044 @@ -130,13 +125,13 @@ UnknownScript_0x580a9: end -MapRuinsOfAlphOutsideSignpost0Script: +RuinsOfAlphOutsideSignpost0Script: jumptext UnknownText_0x58325 -MapRuinsOfAlphOutsideSignpost1Script: +RuinsOfAlphOutsideSignpost1Script: jumptext UnknownText_0x58342 -MapRuinsOfAlphOutsideSignpost2Script: +RuinsOfAlphOutsideSignpost2Script: jumptext UnknownText_0x58362 MovementData_0x580ba: @@ -307,14 +302,14 @@ RuinsOfAlphOutside_MapEventHeader: .XYTriggers: db 2 - xy_trigger 1, $e, $b, $0, UnknownScript_0x58031, $0, $0 - xy_trigger 1, $f, $a, $0, UnknownScript_0x5803a, $0, $0 + xy_trigger 1, $e, $b, $0, RuinsOfAlphOutsideScientistTrigger1, $0, $0 + xy_trigger 1, $f, $a, $0, RuinsOfAlphOutsideScientistTrigger2, $0, $0 .Signposts: db 3 - signpost 8, 16, SIGNPOST_READ, MapRuinsOfAlphOutsideSignpost0Script - signpost 16, 12, SIGNPOST_READ, MapRuinsOfAlphOutsideSignpost1Script - signpost 12, 18, SIGNPOST_READ, MapRuinsOfAlphOutsideSignpost2Script + signpost 8, 16, SIGNPOST_READ, RuinsOfAlphOutsideSignpost0Script + signpost 16, 12, SIGNPOST_READ, RuinsOfAlphOutsideSignpost1Script + signpost 12, 18, SIGNPOST_READ, RuinsOfAlphOutsideSignpost2Script .PersonEvents: db 5 diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index c81f5eef1..4899b44ac 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -6,36 +6,31 @@ const_value set 2 RuinsOfAlphResearchCenter_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x59180, 0 - dw UnknownScript_0x59181, 0 + maptrigger .DummyTrigger0 + maptrigger .GetUnownDex .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .ScientistCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x59185 - -UnknownScript_0x59180: +.DummyTrigger0: end -UnknownScript_0x59181: - priorityjump UnknownScript_0x59192 +.GetUnownDex: + priorityjump .GetUnownDexScript end -UnknownScript_0x59185: +.ScientistCallback: checktriggers - if_equal $1, UnknownScript_0x5918b + if_equal $1, .ShowScientist return -UnknownScript_0x5918b: +.ShowScientist: moveperson RUINSOFALPHRESEARCHCENTER_SCIENTIST3, $3, $7 appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3 return -UnknownScript_0x59192: +.GetUnownDexScript: applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x5926f playsound SFX_BOOT_PC pause 60 diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm index 121273939..758d49b98 100644 --- a/maps/SaffronCity.asm +++ b/maps/SaffronCity.asm @@ -14,8 +14,6 @@ SaffronCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm index 5b14dc196..3101a4af1 100644 --- a/maps/SaffronTrainStation.asm +++ b/maps/SaffronTrainStation.asm @@ -7,14 +7,12 @@ const_value set 2 SaffronTrainStation_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - maptrigger .Trigger0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -.Trigger0: +.DummyTrigger: end OfficerScript_0x18a81e: diff --git a/maps/SeafoamGym.asm b/maps/SeafoamGym.asm index e9193a2fa..e63cd13c8 100644 --- a/maps/SeafoamGym.asm +++ b/maps/SeafoamGym.asm @@ -5,14 +5,12 @@ const_value set 2 SeafoamGym_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw UnknownScript_0x1ab4fa, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -UnknownScript_0x1ab4fa: +.DummyTrigger: end BlaineScript_0x1ab4fb: diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm index 37e24d730..4b4657f1e 100644 --- a/maps/SilverCaveOutside.asm +++ b/maps/SilverCaveOutside.asm @@ -4,8 +4,6 @@ SilverCaveOutside_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index f0129e5ce..74c0004af 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -10,18 +10,16 @@ const_value set 2 SproutTower3F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x184945, 0 - dw UnknownScript_0x184946, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x184945: +.DummyTrigger0: end -UnknownScript_0x184946: +.DummyTrigger1: end UnknownScript_0x184947: diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm index ea699ea1b..ae826ed1f 100644 --- a/maps/TeamRocketBaseB1F.asm +++ b/maps/TeamRocketBaseB1F.asm @@ -9,21 +9,16 @@ const_value set 2 TeamRocketBaseB1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - maptrigger .Trigger0 + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .HideSecurityGrunt - ; callbacks - - dbw MAPCALLBACK_OBJECTS, .Callback1 - -.Trigger0: +.DummyTrigger: end -.Callback1: +.HideSecurityGrunt: disappear TEAMROCKETBASEB1F_ROCKET1 return diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 9c3e00a9b..7930866cd 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -17,33 +17,28 @@ const_value set 2 TeamRocketBaseB2F_MapScriptHeader: .MapTriggers: db 4 - - ; triggers - dw UnknownScript_0x6cf85, 0 - dw UnknownScript_0x6cf86, 0 - dw UnknownScript_0x6cf87, 0 - dw UnknownScript_0x6cf88, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 + maptrigger .DummyTrigger3 .MapCallbacks: db 1 + dbw MAPCALLBACK_TILES, .TransmitterDoorCallback - ; callbacks - - dbw MAPCALLBACK_TILES, TransmitterDoorCallback - -UnknownScript_0x6cf85: +.DummyTrigger0: end -UnknownScript_0x6cf86: +.DummyTrigger1: end -UnknownScript_0x6cf87: +.DummyTrigger2: end -UnknownScript_0x6cf88: +.DummyTrigger3: end -TransmitterDoorCallback: +.TransmitterDoorCallback: checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER iftrue .Change return @@ -319,12 +314,10 @@ UnknownScript_0x6d184: setevent EVENT_SECURITY_CAMERA_5 end -MapTeamRocketBaseB2FSignpostPtr1: - dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER - dw MapTeamRocketBaseB2FSignpost1Script - +TeamRocketBaseB2FLockedDoor: + dw EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER, .Script -MapTeamRocketBaseB2FSignpost1Script: +.Script: opentext checkevent EVENT_LEARNED_HAIL_GIOVANNI iftrue UnknownScript_0x6d1e8 @@ -344,16 +337,16 @@ UnknownScript_0x6d1e8: waitsfx end -MapTeamRocketBaseB2FSignpost21Script: +TeamRocketBaseB2FTransmitterScript: opentext checkevent EVENT_CLEARED_ROCKET_HIDEOUT - iftrue UnknownScript_0x6d207 + iftrue .Deactivated writetext UnknownText_0x6dda7 waitbutton closetext end -UnknownScript_0x6d207: +.Deactivated: writetext UnknownText_0x6de03 waitbutton closetext @@ -942,28 +935,28 @@ TeamRocketBaseB2F_MapEventHeader: .Signposts: db 23 - 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 12, 14, SIGNPOST_IFNOTSET, TeamRocketBaseB2FLockedDoor + signpost 12, 15, SIGNPOST_IFNOTSET, TeamRocketBaseB2FLockedDoor + signpost 9, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 16, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 15, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 14, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 13, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 9, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 8, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 7, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 6, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 5, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 12, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 13, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 14, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 15, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 16, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 4, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 5, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 6, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 7, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript + signpost 8, 17, SIGNPOST_READ, TeamRocketBaseB2FTransmitterScript signpost 7, 26, SIGNPOST_ITEM, TeamRocketBaseB2FHiddenFullHeal .PersonEvents: diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 473e1d281..98d0c543d 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -17,31 +17,26 @@ const_value set 2 TeamRocketBaseB3F_MapScriptHeader: .MapTriggers: db 4 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 - maptrigger .Trigger2 - maptrigger .Trigger3 + maptrigger .LanceGetsPassword + maptrigger .DummyTrigger1 + maptrigger .DummyTrigger2 + maptrigger .DummyTrigger3 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .CheckGiovanniDoor -.Trigger0: +.LanceGetsPassword: priorityjump LanceGetPasswordScript end -.Trigger1: +.DummyTrigger1: end -.Trigger2: +.DummyTrigger2: end -.Trigger3: +.DummyTrigger3: end .CheckGiovanniDoor: @@ -178,9 +173,8 @@ ScientistMitchScript: closetext end -BossDoor: - dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE - dw .Script +TeamRocketBaseB3FLockedDoor: + dw EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE, .Script .Script: opentext @@ -207,7 +201,7 @@ BossDoor: waitsfx end -MapTeamRocketBaseB3FSignpost9Script: +TeamRocketBaseB3FOathScript: jumpstd teamrocketoath TeamRocketBaseB3FProtein: @@ -590,16 +584,16 @@ TeamRocketBaseB3F_MapEventHeader: .Signposts: db 10 - 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 + signpost 9, 10, SIGNPOST_IFNOTSET, TeamRocketBaseB3FLockedDoor + signpost 9, 11, SIGNPOST_IFNOTSET, TeamRocketBaseB3FLockedDoor + signpost 1, 10, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 1, 11, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 1, 12, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 1, 13, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 13, 4, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 13, 5, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 13, 6, SIGNPOST_READ, TeamRocketBaseB3FOathScript + signpost 13, 7, SIGNPOST_READ, TeamRocketBaseB3FOathScript .PersonEvents: db 14 diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm index 014e0d26b..ed34b3f5c 100644 --- a/maps/TimeCapsule.asm +++ b/maps/TimeCapsule.asm @@ -5,26 +5,21 @@ const_value set 2 TimeCapsule_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .InitializeTimeCapsule + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris - ; callbacks - - dbw MAPCALLBACK_OBJECTS, TimeCapsule_SetWhichChris - -.Trigger0: - priorityjump TimeCapsule_Initialize +.InitializeTimeCapsule: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger: end -TimeCapsule_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear TIMECAPSULE_CHRIS2 @@ -36,7 +31,7 @@ TimeCapsule_SetWhichChris: appear TIMECAPSULE_CHRIS2 return -TimeCapsule_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $3 end diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm index c2b88b2a1..b48d41ff7 100644 --- a/maps/TinTower1F.asm +++ b/maps/TinTower1F.asm @@ -13,68 +13,62 @@ const_value set 2 TinTower1F_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x18502a, 0 - dw UnknownScript_0x18502e, 0 + maptrigger .FaceSuicune + maptrigger .DummyTrigger .MapCallbacks: db 2 + dbw MAPCALLBACK_OBJECTS, .NPCsCallback + dbw MAPCALLBACK_TILES, .StairsCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18502f - - dbw MAPCALLBACK_TILES, TinTowerStairsCallback - -UnknownScript_0x18502a: - priorityjump SuicuneBattle +.FaceSuicune: + priorityjump .SuicuneBattle end -UnknownScript_0x18502e: +.DummyTrigger: end -UnknownScript_0x18502f: +.NPCsCallback: checkevent EVENT_GOT_RAINBOW_WING - iftrue UnknownScript_0x185047 + iftrue .GotRainbowWing checkevent EVENT_BEAT_ELITE_FOUR - iffalse UnknownScript_0x185050 + iffalse .FaceBeasts special SpecialBeastsCheck - iffalse UnknownScript_0x185050 + iffalse .FaceBeasts clearevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 setevent EVENT_TIN_TOWER_1F_WISE_TRIO_1 -UnknownScript_0x185047: +.GotRainbowWing: checkevent EVENT_FOUGHT_HO_OH iffalse .Done appear TINTOWER1F_EUSINE .Done: return -UnknownScript_0x185050: +.FaceBeasts: checkevent EVENT_FOUGHT_SUICUNE - iftrue UnknownScript_0x185077 + iftrue .FoughtSuicune appear TINTOWER1F_SUICUNE writebyte RAIKOU special SpecialMonCheck - iftrue UnknownScript_0x185065 + iftrue .NoRaikou appear TINTOWER1F_RAIKOU - jump UnknownScript_0x185067 + jump .CheckEntei -UnknownScript_0x185065: +.NoRaikou: disappear TINTOWER1F_RAIKOU -UnknownScript_0x185067: +.CheckEntei: writebyte ENTEI special SpecialMonCheck - iftrue UnknownScript_0x185074 + iftrue .NoEntei appear TINTOWER1F_ENTEI - jump UnknownScript_0x185076 + jump .BeastsDone -UnknownScript_0x185074: +.NoEntei: disappear TINTOWER1F_ENTEI -UnknownScript_0x185076: +.BeastsDone: return -UnknownScript_0x185077: +.FoughtSuicune: disappear TINTOWER1F_SUICUNE disappear TINTOWER1F_RAIKOU disappear TINTOWER1F_ENTEI @@ -82,14 +76,14 @@ UnknownScript_0x185077: setevent EVENT_TIN_TOWER_1F_WISE_TRIO_2 return -TinTowerStairsCallback: +.StairsCallback: checkevent EVENT_GOT_RAINBOW_WING - iftrue .NoChange + iftrue .DontHideStairs changeblock $a, $2, $9 -.NoChange: +.DontHideStairs: return -SuicuneBattle: +.SuicuneBattle: applymovement PLAYER, TinTowerPlayerMovement1 pause 15 writebyte RAIKOU diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm index f1ab17ccf..befbf1f3b 100644 --- a/maps/TinTowerRoof.asm +++ b/maps/TinTowerRoof.asm @@ -7,9 +7,6 @@ TinTowerRoof_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .HoOh .HoOh: diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm index 36f476de4..07cb18136 100644 --- a/maps/TradeCenter.asm +++ b/maps/TradeCenter.asm @@ -5,26 +5,21 @@ const_value set 2 TradeCenter_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .InitializeTradeCenter + maptrigger .DummyTrigger .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .SetWhichChris - ; callbacks - - dbw MAPCALLBACK_OBJECTS, TradeCenter_SetWhichChris - -.Trigger0: - priorityjump TradeCenter_Initialize +.InitializeTradeCenter: + priorityjump .InitializeAndPreparePokeCenter2F end -.Trigger1: +.DummyTrigger: end -TradeCenter_SetWhichChris: +.SetWhichChris: special Special_CableClubCheckWhichChris iffalse .Chris2 disappear TRADECENTER_CHRIS2 @@ -36,7 +31,7 @@ TradeCenter_SetWhichChris: appear TRADECENTER_CHRIS2 return -TradeCenter_Initialize: +.InitializeAndPreparePokeCenter2F: dotrigger $1 domaptrigger POKECENTER_2F, $1 end diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm index c96f5973b..1f6302623 100644 --- a/maps/TrainerHouseB1F.asm +++ b/maps/TrainerHouseB1F.asm @@ -5,14 +5,12 @@ const_value set 2 TrainerHouseB1F_MapScriptHeader: .MapTriggers: db 1 - - ; triggers - dw Trigger0, 0 + maptrigger .DummyTrigger .MapCallbacks: db 0 -Trigger0: +.DummyTrigger: end TrainerHouseReceptionistScript: diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 1354f2753..d329dade7 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -46,22 +46,17 @@ const_value set 2 UndergroundPathSwitchRoomEntrances_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .UpdateDoorPositions -.Trigger0: +.DummyTrigger0: end -.Trigger1: +.DummyTrigger1: end .UpdateDoorPositions: diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index 60a87339c..67f5632ca 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -13,9 +13,6 @@ UndergroundWarehouse_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .ResetSwitches .ResetSwitches: diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm index f0f49cf27..80ea5a6d6 100644 --- a/maps/UnionCaveB2F.asm +++ b/maps/UnionCaveB2F.asm @@ -12,9 +12,6 @@ UnionCaveB2F_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Lapras .Lapras: diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm index 2840e4ca3..28b189eac 100644 --- a/maps/VermilionCity.asm +++ b/maps/VermilionCity.asm @@ -12,8 +12,6 @@ VermilionCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm index 4cbb78604..3bf754db4 100644 --- a/maps/VermilionPort.asm +++ b/maps/VermilionPort.asm @@ -6,29 +6,25 @@ const_value set 2 VermilionPort_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - maptrigger .Trigger0 - maptrigger .Trigger1 + maptrigger .DummyTrigger0 + maptrigger .LeaveFastShip .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint -.Trigger0: +.DummyTrigger0: end -.Trigger1: - priorityjump UnknownScript_0x74da6 +.LeaveFastShip: + priorityjump .LeaveFastShipScript end .FlyPoint: setflag ENGINE_FLYPOINT_VERMILION return -UnknownScript_0x74da6: +.LeaveFastShipScript: applymovement PLAYER, MovementData_0x74ef3 appear VERMILIONPORT_SAILOR1 dotrigger $0 diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm index 46f59f5c3..4320621f2 100644 --- a/maps/VictoryRoad.asm +++ b/maps/VictoryRoad.asm @@ -9,18 +9,16 @@ const_value set 2 VictoryRoad_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x74490, 0 - dw UnknownScript_0x74491, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x74490: +.DummyTrigger0: end -UnknownScript_0x74491: +.DummyTrigger1: end UnknownScript_0x74492: diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm index 08737c111..36c57fd61 100644 --- a/maps/VictoryRoadGate.asm +++ b/maps/VictoryRoadGate.asm @@ -6,62 +6,60 @@ const_value set 2 VictoryRoadGate_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x9b9fb, 0 - dw UnknownScript_0x9b9fc, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 0 -UnknownScript_0x9b9fb: +.DummyTrigger0: end -UnknownScript_0x9b9fc: +.DummyTrigger1: end -UnknownScript_0x9b9fd: +VictoryRoadGateBadgeCheckTrigger: spriteface PLAYER, LEFT - jump UnknownScript_0x9ba04 + jump VictoryRoadGateBadgeCheckScript -OfficerScript_0x9ba03: +VictoryRoadGateOfficerScript: faceplayer -UnknownScript_0x9ba04: +VictoryRoadGateBadgeCheckScript: opentext - writetext UnknownText_0x9ba29 + writetext VictoryRoadGateOfficerText buttonsound checkcode VAR_BADGES - if_greater_than 7, UnknownScript_0x9ba19 - writetext UnknownText_0x9ba5f + if_greater_than 7, .AllEightBadges + writetext VictoryRoadGateNotEnoughBadgesText waitbutton closetext - applymovement PLAYER, MovementData_0x9ba27 + applymovement PLAYER, VictoryRoadGateStepDownMovement end -UnknownScript_0x9ba19: - writetext UnknownText_0x9bab4 +.AllEightBadges: + writetext VictoryRoadGateEightBadgesText waitbutton closetext dotrigger $1 end -BlackBeltScript_0x9ba21: - jumptextfaceplayer UnknownText_0x9baf1 +VictoryRoadGateLeftBlackBeltScript: + jumptextfaceplayer VictoryRoadGateLeftBlackBeltText -BlackBeltScript_0x9ba24: - jumptextfaceplayer UnknownText_0x9bb37 +VictoryRoadGateRightBlackBeltScript: + jumptextfaceplayer VictoryRoadGateRightBlackBeltText -MovementData_0x9ba27: +VictoryRoadGateStepDownMovement: step DOWN step_end -UnknownText_0x9ba29: +VictoryRoadGateOfficerText: text "Only trainers who" line "have proven them-" cont "selves may pass." done -UnknownText_0x9ba5f: +VictoryRoadGateNotEnoughBadgesText: text "You don't have all" line "the GYM BADGES of" cont "JOHTO." @@ -71,7 +69,7 @@ UnknownText_0x9ba5f: cont "through." done -UnknownText_0x9bab4: +VictoryRoadGateEightBadgesText: text "Oh! The eight" line "BADGES of JOHTO!" @@ -79,7 +77,7 @@ UnknownText_0x9bab4: line "on through!" done -UnknownText_0x9baf1: +VictoryRoadGateLeftBlackBeltText: text "This way leads to" line "MT.SILVER." @@ -88,7 +86,7 @@ UnknownText_0x9baf1: cont "there." done -UnknownText_0x9bb37: +VictoryRoadGateRightBlackBeltText: text "Off to the #MON" line "LEAGUE, are you?" @@ -116,13 +114,13 @@ VictoryRoadGate_MapEventHeader: .XYTriggers: db 1 - xy_trigger 0, $b, $a, $0, UnknownScript_0x9b9fd, $0, $0 + xy_trigger 0, $b, $a, $0, VictoryRoadGateBadgeCheckTrigger, $0, $0 .Signposts: db 0 .PersonEvents: db 3 - person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, OfficerScript_0x9ba03, -1 - person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER - person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX + person_event SPRITE_OFFICER, 11, 8, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateOfficerScript, -1 + person_event SPRITE_BLACK_BELT, 5, 7, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateLeftBlackBeltScript, EVENT_OPENED_MT_SILVER + person_event SPRITE_BLACK_BELT, 5, 12, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, VictoryRoadGateRightBlackBeltScript, EVENT_FOUGHT_SNORLAX diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm index 87ec32077..14f97ae1b 100644 --- a/maps/VioletCity.asm +++ b/maps/VioletCity.asm @@ -14,8 +14,6 @@ VioletCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm index ced89061b..3d86ae488 100644 --- a/maps/ViridianCity.asm +++ b/maps/ViridianCity.asm @@ -10,8 +10,6 @@ ViridianCity_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks dbw MAPCALLBACK_NEWMAP, .FlyPoint .FlyPoint: diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index 39da084b4..fa6213a64 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -15,13 +15,8 @@ WarehouseEntrance_MapScriptHeader: .MapCallbacks: db 3 - - ; callbacks - dbw MAPCALLBACK_NEWMAP, .ResetSwitches - dbw MAPCALLBACK_TILES, .CheckBasementKey - dbw MAPCALLBACK_OBJECTS, .CheckDayOfWeek .ResetSwitches: diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm index 79b9eb2aa..9a4db5f15 100644 --- a/maps/WhirlIslandLugiaChamber.asm +++ b/maps/WhirlIslandLugiaChamber.asm @@ -7,9 +7,6 @@ WhirlIslandLugiaChamber_MapScriptHeader: .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_OBJECTS, .Lugia .Lugia: diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm index bb8b8b974..69493a773 100644 --- a/maps/WillsRoom.asm +++ b/maps/WillsRoom.asm @@ -4,34 +4,29 @@ const_value set 2 WillsRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw .Trigger0, 0 - dw .Trigger1, 0 + maptrigger .LockDoor + maptrigger .DummyTrigger .MapCallbacks: db 1 - - ; callbacks - dbw MAPCALLBACK_TILES, .WillsRoomDoors -.Trigger0: +.LockDoor: priorityjump .WillsDoorLocksBehindYou end -.Trigger1: +.DummyTrigger: end .WillsRoomDoors: checkevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED - iffalse .KeepDoorClosed + iffalse .KeepDoorsClosed changeblock $4, $e, $2a -.KeepDoorClosed: +.KeepDoorsClosed: checkevent EVENT_WILLS_ROOM_EXIT_OPEN - iffalse .OpenDoor + iffalse .OpenDoors changeblock $4, $2, $16 -.OpenDoor: +.OpenDoors: return .WillsDoorLocksBehindYou: diff --git a/maps/WiseTriosRoom.asm b/maps/WiseTriosRoom.asm index 2aab72239..dee082bd8 100644 --- a/maps/WiseTriosRoom.asm +++ b/maps/WiseTriosRoom.asm @@ -9,41 +9,36 @@ const_value set 2 WiseTriosRoom_MapScriptHeader: .MapTriggers: db 2 - - ; triggers - dw UnknownScript_0x98572, 0 - dw UnknownScript_0x98573, 0 + maptrigger .DummyTrigger0 + maptrigger .DummyTrigger1 .MapCallbacks: db 1 + dbw MAPCALLBACK_OBJECTS, .WiseTrioCallback - ; callbacks - - dbw MAPCALLBACK_OBJECTS, UnknownScript_0x98574 - -UnknownScript_0x98572: +.DummyTrigger0: end -UnknownScript_0x98573: +.DummyTrigger1: end -UnknownScript_0x98574: +.WiseTrioCallback: checkevent EVENT_FOUGHT_SUICUNE - iftrue UnknownScript_0x98593 + iftrue .NoWiseTrio checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER - iftrue UnknownScript_0x9858c + iftrue .WiseTrio2 checkitem CLEAR_BELL - iftrue UnknownScript_0x9858c + iftrue .WiseTrio2 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return -UnknownScript_0x9858c: +.WiseTrio2: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 clearevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return -UnknownScript_0x98593: +.NoWiseTrio: setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_1 setevent EVENT_WISE_TRIOS_ROOM_WISE_TRIO_2 return |