Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All map triggers use the maptrigger macro, not dw

Browse Source 
.MapTriggers and .MapCallbacks lists are formatted consistently with .Warps, .XYTriggers, .Signposts, and .PersonEvents
This commit is contained in:
Remy Oukaour
2017-12-10 17:53:21 -05:00
parent 66527d861f
commit 62f5913943
133 changed files with 659 additions and 1082 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maps/AzaleaGym.asm
View File

@@ -14,7 +14,7 @@ AzaleaGym_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 0 db 0
BugsyScript: AzaleaGymBugsyScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_BEAT_BUGSY checkevent EVENT_BEAT_BUGSY
@@ -380,7 +380,7 @@ AzaleaGym_MapEventHeader:
.PersonEvents: .PersonEvents:
db 7 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, 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, 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 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

6
maps/AzaleaPokeCenter1F.asm
View File

@@ -7,14 +7,12 @@ const_value set 2
AzaleaPokeCenter1F_MapScriptHeader: AzaleaPokeCenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
maptrigger .Trigger0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .DummyTrigger:
end end
AzaleaPokeCenter1FNurseScript: AzaleaPokeCenter1FNurseScript:

16
maps/AzaleaTown.asm
View File

@@ -15,25 +15,21 @@ const_value set 2
AzaleaTown_MapScriptHeader: AzaleaTown_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 3 db 3
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0 maptrigger .DummyTrigger2
maptrigger .Trigger1
maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .Flypoint dbw MAPCALLBACK_NEWMAP, .Flypoint
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.Trigger2: .DummyTrigger2:
end end
.Flypoint: .Flypoint:

2
maps/BattleTower1F.asm
View File

@@ -8,8 +8,6 @@ const_value set 2
BattleTower1F_MapScriptHeader: BattleTower1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
; triggers
maptrigger .Trigger0 maptrigger .Trigger0
maptrigger .Trigger1 maptrigger .Trigger1

6
maps/BattleTowerBattleRoom.asm
View File

@@ -5,10 +5,8 @@ const_value set 2
BattleTowerBattleRoom_MapScriptHeader: BattleTowerBattleRoom_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .EnterBattleRoom
; triggers maptrigger .DummyTrigger
dw .EnterBattleRoom, 0
dw .DummyTrigger, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0

2
maps/BattleTowerElevator.asm
View File

@@ -4,8 +4,6 @@ const_value set 2
BattleTowerElevator_MapScriptHeader: BattleTowerElevator_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
; triggers
maptrigger .Trigger0 maptrigger .Trigger0
maptrigger .Trigger1 maptrigger .Trigger1

2
maps/BattleTowerHallway.asm
View File

@@ -4,8 +4,6 @@ const_value set 2
BattleTowerHallway_MapScriptHeader: BattleTowerHallway_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
; triggers
maptrigger .Trigger0 maptrigger .Trigger0
maptrigger .Trigger1 maptrigger .Trigger1

2
maps/BattleTowerOutside.asm
View File

@@ -10,8 +10,6 @@ BattleTowerOutside_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 2 db 2
; callbacks
dbw MAPCALLBACK_TILES, .Callback1 dbw MAPCALLBACK_TILES, .Callback1
dbw MAPCALLBACK_OBJECTS, .Callback2 dbw MAPCALLBACK_OBJECTS, .Callback2

2
maps/BlackthornCity.asm
View File

@@ -15,8 +15,6 @@ BlackthornCity_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 2 db 2
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
dbw MAPCALLBACK_OBJECTS, .Santos dbw MAPCALLBACK_OBJECTS, .Santos

2
maps/BlackthornGym1F.asm
View File

@@ -11,8 +11,6 @@ BlackthornGym1F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_TILES, .Boulders dbw MAPCALLBACK_TILES, .Boulders
.Boulders: .Boulders:

2
maps/BlackthornGym2F.asm
View File

@@ -14,8 +14,6 @@ BlackthornGym2F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_CMDQUEUE, .Boulders dbw MAPCALLBACK_CMDQUEUE, .Boulders
.Boulders: .Boulders:

13
maps/BrunosRoom.asm
View File

@@ -4,23 +4,18 @@ const_value set 2
BrunosRoom_MapScriptHeader: BrunosRoom_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .LockDoor
; triggers maptrigger .DummyTrigger
dw .Trigger0, 0
dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_TILES, .BrunosRoomDoors dbw MAPCALLBACK_TILES, .BrunosRoomDoors
.Trigger0: .LockDoor:
priorityjump .BrunosDoorLocksBehindYou priorityjump .BrunosDoorLocksBehindYou
end end
.Trigger1: .DummyTrigger:
end end
.BrunosRoomDoors: .BrunosRoomDoors:

21
maps/BurnedTower1F.asm
View File

@@ -8,27 +8,22 @@ const_value set 2
BurnedTower1F_MapScriptHeader: BurnedTower1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 3 db 3
maptrigger .EusineTrigger
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0 maptrigger .DummyTrigger2
maptrigger .Trigger1
maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_TILES, .HoleAndLadder dbw MAPCALLBACK_TILES, .HoleAndLadder
.Trigger0: .EusineTrigger:
priorityjump .EusineTrigger priorityjump .MeetEusine
end end
.Trigger1: .DummyTrigger1:
end end
.Trigger2: .DummyTrigger2:
end end
.HoleAndLadder: .HoleAndLadder:
@@ -42,7 +37,7 @@ BurnedTower1F_MapScriptHeader:
.Done: .Done:
return return
.EusineTrigger: .MeetEusine:
spriteface BURNEDTOWER1F_EUSINE, DOWN spriteface BURNEDTOWER1F_EUSINE, DOWN
showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15 showemote EMOTE_SHOCK, BURNEDTOWER1F_EUSINE, 15
applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement applymovement BURNEDTOWER1F_EUSINE, BurnedTower1FEusineMovement

17
maps/BurnedTowerB1F.asm
View File

@@ -12,25 +12,20 @@ const_value set 2
BurnedTowerB1F_MapScriptHeader: BurnedTowerB1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw .Trigger0, 0
dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_TILES, .LadderCallback
; callbacks .DummyTrigger0:
dbw MAPCALLBACK_TILES, BurnedTowerB1FLadderCallback
.Trigger0:
end end
.Trigger1: .DummyTrigger1:
end end
BurnedTowerB1FLadderCallback: .LadderCallback:
checkevent EVENT_RELEASED_THE_BEASTS checkevent EVENT_RELEASED_THE_BEASTS
iftrue .NoChange iftrue .NoChange
changeblock $6, $e, $2 changeblock $6, $e, $2

2
maps/CeladonCity.asm
View File

@@ -15,8 +15,6 @@ CeladonCity_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint: .FlyPoint:

3
maps/CeladonDeptStore6F.asm
View File

@@ -8,9 +8,6 @@ CeladonDeptStore6F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_TILES, .Callback dbw MAPCALLBACK_TILES, .Callback
.Callback: .Callback:

2
maps/CeruleanCity.asm
View File

@@ -12,8 +12,6 @@ CeruleanCity_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint: .FlyPoint:

14
maps/CeruleanGym.asm
View File

@@ -9,22 +9,20 @@ const_value set 2
CeruleanGym_MapScriptHeader: CeruleanGym_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .GruntRunsOut
dw UnknownScript_0x1883d9, 0
dw UnknownScript_0x1883da, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x1883d9: .DummyTrigger0:
end end
UnknownScript_0x1883da: .GruntRunsOut:
priorityjump UnknownScript_0x1883de priorityjump .GruntRunsOutScript
end end
UnknownScript_0x1883de: .GruntRunsOutScript:
applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3 applymovement CERULEANGYM_ROCKET, MovementData_0x1884e3
playsound SFX_TACKLE playsound SFX_TACKLE
applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb applymovement CERULEANGYM_ROCKET, MovementData_0x1884eb

12
maps/CherrygroveCity.asm
View File

@@ -8,21 +8,17 @@ const_value set 2
CherrygroveCity_MapScriptHeader: CherrygroveCity_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.FlyPoint: .FlyPoint:

12
maps/CianwoodCity.asm
View File

@@ -15,21 +15,17 @@ const_value set 2
CianwoodCity_MapScriptHeader: CianwoodCity_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune dbw MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.FlyPointAndSuicune: .FlyPointAndSuicune:

6
maps/CianwoodPharmacy.asm
View File

@@ -4,14 +4,12 @@ const_value set 2
CianwoodPharmacy_MapScriptHeader: CianwoodPharmacy_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw CianwoodPharmacyTrigger, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
CianwoodPharmacyTrigger: .DummyTrigger:
end end
CianwoodPharmacist: CianwoodPharmacist:

2
maps/CinnabarIsland.asm
View File

@@ -7,8 +7,6 @@ CinnabarIsland_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint: .FlyPoint:

30
maps/Colosseum.asm
View File

@@ -5,32 +5,26 @@ const_value set 2
Colosseum_MapScriptHeader: Colosseum_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 3 db 3
maptrigger .InitializeColosseum
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0 maptrigger .DummyTrigger2
maptrigger .Trigger1
maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 2 db 2
dbw MAPCALLBACK_OBJECTS, .SetWhichChris
dbw MAPCALLBACK_NEWMAP, .PreparePokeCenter2F
; callbacks .InitializeColosseum:
priorityjump .InitializeAndPreparePokeCenter2F
dbw MAPCALLBACK_OBJECTS, ColosseumScript_SetWhichChris
dbw MAPCALLBACK_NEWMAP, ColosseumScript_InitializeCB
.Trigger0:
priorityjump ColosseumScript_Initialize
end end
.Trigger1: .DummyTrigger1:
end end
.Trigger2: .DummyTrigger2:
end end
ColosseumScript_SetWhichChris: .SetWhichChris:
special Special_CableClubCheckWhichChris special Special_CableClubCheckWhichChris
iffalse .Chris2 iffalse .Chris2
disappear COLOSSEUM_CHRIS2 disappear COLOSSEUM_CHRIS2
@@ -42,11 +36,11 @@ ColosseumScript_SetWhichChris:
appear COLOSSEUM_CHRIS2 appear COLOSSEUM_CHRIS2
return return
ColosseumScript_InitializeCB: .PreparePokeCenter2F:
domaptrigger POKECENTER_2F, $2 domaptrigger POKECENTER_2F, $2
return return
ColosseumScript_Initialize: .InitializeAndPreparePokeCenter2F:
dotrigger $1 dotrigger $1
domaptrigger POKECENTER_2F, $2 domaptrigger POKECENTER_2F, $2
end end

3
maps/CopycatsHouse2F.asm
View File

@@ -12,9 +12,6 @@ CopycatsHouse2F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .Callback dbw MAPCALLBACK_OBJECTS, .Callback
.Callback: .Callback:

3
maps/DayCare.asm
View File

@@ -8,9 +8,6 @@ DayCare_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .EggCheckCallback dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback: .EggCheckCallback:

34
maps/DragonShrine.asm
View File

@@ -7,22 +7,20 @@ const_value set 2
DragonShrine_MapScriptHeader: DragonShrine_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DragonShrineTest
; triggers maptrigger .DummyTrigger
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .DragonShrineTest:
priorityjump DragonShrineTestScript priorityjump .DragonShrineTestScript
end end
.Trigger1: .DummyTrigger:
end end
DragonShrineTestScript: .DragonShrineTestScript:
applymovement PLAYER, MovementData_0x18d2bf applymovement PLAYER, MovementData_0x18d2bf
applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7 applymovement DRAGONSHRINE_ELDER1, MovementData_0x18d2c7
opentext opentext
@@ -272,10 +270,10 @@ MenuDataHeader_0x18d215:
db $40 ; flags db $40 ; flags
db 04, 08 ; start coords db 04, 08 ; start coords
db 11, 19 ; end coords db 11, 19 ; end coords
dw MenuData2_0x18d21d dw .MenuData2
db 1 ; default option db 1 ; default option
MenuData2_0x18d21d: .MenuData2:
db $81 ; flags db $81 ; flags
db 3 ; items db 3 ; items
db "Pal@" db "Pal@"
@@ -287,10 +285,10 @@ MenuDataHeader_0x18d234:
db $40 ; flags db $40 ; flags
db 04, 09 ; start coords db 04, 09 ; start coords
db 11, 19 ; end coords db 11, 19 ; end coords
dw MenuData2_0x18d23c dw .MenuData2
db 1 ; default option db 1 ; default option
MenuData2_0x18d23c: .MenuData2:
db $81 ; flags db $81 ; flags
db 3 ; items db 3 ; items
db "Strategy@" db "Strategy@"
@@ -302,10 +300,10 @@ MenuDataHeader_0x18d258:
db $40 ; flags db $40 ; flags
db 04, 05 ; start coords db 04, 05 ; start coords
db 11, 19 ; end coords db 11, 19 ; end coords
dw MenuData2_0x18d260 dw .MenuData2
db 1 ; default option db 1 ; default option
MenuData2_0x18d260: .MenuData2:
db $81 ; flags db $81 ; flags
db 3 ; items db 3 ; items
db "Weak person@" db "Weak person@"
@@ -317,10 +315,10 @@ MenuDataHeader_0x18d283:
db $40 ; flags db $40 ; flags
db 04, 08 ; start coords db 04, 08 ; start coords
db 11, 19 ; end coords db 11, 19 ; end coords
dw MenuData2_0x18d28b dw .MenuData2
db 1 ; default option db 1 ; default option
MenuData2_0x18d28b: .MenuData2:
db $81 ; flags db $81 ; flags
db 3 ; items db 3 ; items
db "Love@" db "Love@"
@@ -332,10 +330,10 @@ MenuDataHeader_0x18d2a5:
db $40 ; flags db $40 ; flags
db 04, 12 ; start coords db 04, 12 ; start coords
db 11, 19 ; end coords db 11, 19 ; end coords
dw MenuData2_0x18d2ad dw .MenuData2
db 1 ; default option db 1 ; default option
MenuData2_0x18d2ad: .MenuData2:
db $81 ; flags db $81 ; flags
db 3 ; items db 3 ; items
db "Tough@" db "Tough@"

13
maps/DragonsDenB1F.asm
View File

@@ -12,22 +12,17 @@ const_value set 2
DragonsDenB1F_MapScriptHeader: DragonsDenB1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .CheckSilver dbw MAPCALLBACK_NEWMAP, .CheckSilver
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.CheckSilver: .CheckSilver:

8
maps/EarlsPokemonAcademy.asm
View File

@@ -66,7 +66,7 @@ AcademyBlackboard:
opentext opentext
writetext AcademyBlackboardText writetext AcademyBlackboardText
.Loop: .Loop:
loadmenudata .MenuHeader loadmenudata .BlackboardMenuData
_2dmenu _2dmenu
closewindow closewindow
if_equal $1, .Poison if_equal $1, .Poison
@@ -102,14 +102,14 @@ AcademyBlackboard:
waitbutton waitbutton
jump .Loop jump .Loop
.MenuHeader: .BlackboardMenuData:
db $40 ; flags db $40 ; flags
db 00, 00 ; start coords db 00, 00 ; start coords
db 08, 11 ; end coords db 08, 11 ; end coords
dw .Data dw .MenuData2
db 1 ; default option db 1 ; default option
.Data: .MenuData2:
db $80 ; flags db $80 ; flags
dn 3, 2 ; rows, columns dn 3, 2 ; rows, columns
db 5 ; spacing db 5 ; spacing

2
maps/EcruteakCity.asm
View File

@@ -13,8 +13,6 @@ EcruteakCity_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint: .FlyPoint:

10
maps/EcruteakGym.asm
View File

@@ -10,19 +10,17 @@ const_value set 2
EcruteakGym_MapScriptHeader: EcruteakGym_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .ForcedToLeave
; triggers maptrigger .DummyTrigger
dw UnknownScript_0x99d53, 0
dw UnknownScript_0x99d57, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x99d53: .ForcedToLeave:
priorityjump EcruteakGymClosed priorityjump EcruteakGymClosed
end end
UnknownScript_0x99d57: .DummyTrigger:
end end
MortyScript_0x99d58: MortyScript_0x99d58:

13
maps/EcruteakHouse.asm
View File

@@ -7,22 +7,17 @@ const_value set 2
EcruteakHouse_MapScriptHeader: EcruteakHouse_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .InitializeSages dbw MAPCALLBACK_OBJECTS, .InitializeSages
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.InitializeSages: .InitializeSages:

10
maps/EcruteakPokeCenter1F.asm
View File

@@ -8,19 +8,17 @@ const_value set 2
EcruteakPokeCenter1F_MapScriptHeader: EcruteakPokeCenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .MeetBill
; triggers maptrigger .DummyTrigger
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .MeetBill:
priorityjump .BillActivatesTimeCapsule priorityjump .BillActivatesTimeCapsule
end end
.Trigger1: .DummyTrigger:
end end
.BillActivatesTimeCapsule: .BillActivatesTimeCapsule:

45
maps/ElmsLab.asm
View File

@@ -9,61 +9,56 @@ const_value set 2
ElmsLab_MapScriptHeader: ElmsLab_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 6 db 6
maptrigger .MeetElm
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0 maptrigger .DummyTrigger2
maptrigger .Trigger1 maptrigger .DummyTrigger3
maptrigger .Trigger2 maptrigger .DummyTrigger4
maptrigger .Trigger3 maptrigger .DummyTrigger5
maptrigger .Trigger4
maptrigger .Trigger5
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_OBJECTS, .MoveElmCallback
; callbacks .MeetElm:
priorityjump .WalkUpToElm
dbw MAPCALLBACK_OBJECTS, .Callback_MoveElm
.Trigger0:
priorityjump ElmsLab_AutowalkUpToElm
end end
.Trigger1: .DummyTrigger1:
end end
.Trigger2: .DummyTrigger2:
end end
.Trigger3: .DummyTrigger3:
end end
.Trigger4: .DummyTrigger4:
end end
.Trigger5: .DummyTrigger5:
end end
.Callback_MoveElm: .MoveElmCallback:
checktriggers checktriggers
iftrue .Skip iftrue .Skip
moveperson ELMSLAB_ELM, $3, $4 moveperson ELMSLAB_ELM, $3, $4
.Skip: .Skip:
return return
ElmsLab_AutowalkUpToElm: .WalkUpToElm:
applymovement PLAYER, ElmsLab_WalkUpToElmMovement applymovement PLAYER, ElmsLab_WalkUpToElmMovement
showemote EMOTE_SHOCK, ELMSLAB_ELM, 15 showemote EMOTE_SHOCK, ELMSLAB_ELM, 15
spriteface ELMSLAB_ELM, RIGHT spriteface ELMSLAB_ELM, RIGHT
opentext opentext
writetext ElmText_Intro writetext ElmText_Intro
ElmsLab_RefuseLoop: .MustSayYes:
yesorno yesorno
iftrue ElmsLab_ElmGetsEmail iftrue .ElmGetsEmail
writetext ElmText_Refused writetext ElmText_Refused
jump ElmsLab_RefuseLoop jump .MustSayYes
ElmsLab_ElmGetsEmail: .ElmGetsEmail:
writetext ElmText_Accepted writetext ElmText_Accepted
buttonsound buttonsound
writetext ElmText_ResearchAmbitions writetext ElmText_ResearchAmbitions

18
maps/FastShip1F.asm
View File

@@ -7,26 +7,24 @@ const_value set 2
FastShip1F_MapScriptHeader: FastShip1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 3 db 3
maptrigger .DummyTrigger0
; triggers maptrigger .EnterFastShip
maptrigger .Trigger0 maptrigger .DummyTrigger2
maptrigger .Trigger1
maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .EnterFastShip:
priorityjump .PriorityJump2 priorityjump .EnterFastShipScript
end end
.Trigger2: .DummyTrigger2:
end end
.PriorityJump2: .EnterFastShipScript:
applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e applymovement FASTSHIP1F_SAILOR1, MovementData_0x7520e
applymovement PLAYER, MovementData_0x75217 applymovement PLAYER, MovementData_0x75217
applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211 applymovement FASTSHIP1F_SAILOR1, MovementData_0x75211

10
maps/FastShipB1F.asm
View File

@@ -15,18 +15,16 @@ const_value set 2
FastShipB1F_MapScriptHeader: FastShipB1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw UnknownScript_0x7673a, 0
dw UnknownScript_0x7673b, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x7673a: .DummyTrigger0:
end end
UnknownScript_0x7673b: .DummyTrigger1:
end end
UnknownScript_0x7673c: UnknownScript_0x7673c:

2
maps/FuchsiaCity.asm
View File

@@ -10,8 +10,6 @@ FuchsiaCity_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint: .FlyPoint:

6
maps/FuchsiaPokeCenter1F.asm
View File

@@ -7,14 +7,12 @@ const_value set 2
FuchsiaPokeCenter1F_MapScriptHeader: FuchsiaPokeCenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw UnknownScript_0x196458, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x196458: .DummyTrigger:
end end
NurseScript_0x196459: NurseScript_0x196459:

2
maps/GoldenrodCity.asm
View File

@@ -21,8 +21,6 @@ GoldenrodCity_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 2 db 2
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria dbw MAPCALLBACK_NEWMAP, .FlyPointAndFloria
dbw MAPCALLBACK_OBJECTS, .MoveTutor dbw MAPCALLBACK_OBJECTS, .MoveTutor

3
maps/GoldenrodDeptStore5F.asm
View File

@@ -12,9 +12,6 @@ GoldenrodDeptStore5F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .CheckIfSunday dbw MAPCALLBACK_OBJECTS, .CheckIfSunday
.CheckIfSunday: .CheckIfSunday:

4
maps/GoldenrodDeptStoreB1F.asm
View File

@@ -14,11 +14,7 @@ GoldenrodDeptStoreB1F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 2 db 2
; callbacks
dbw MAPCALLBACK_TILES, UnknownScript_0x7d781 dbw MAPCALLBACK_TILES, UnknownScript_0x7d781
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac dbw MAPCALLBACK_NEWMAP, UnknownScript_0x7d7ac
UnknownScript_0x7d781: UnknownScript_0x7d781:

4
maps/GoldenrodDeptStoreRoof.asm
View File

@@ -14,11 +14,7 @@ GoldenrodDeptStoreRoof_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 2 db 2
; callbacks
dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock
dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk
.CheckSaleChangeBlock: .CheckSaleChangeBlock:

3
maps/GoldenrodGameCorner.asm
View File

@@ -18,9 +18,6 @@ GoldenrodGameCorner_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .Callback dbw MAPCALLBACK_OBJECTS, .Callback
.Callback: .Callback:

10
maps/GoldenrodGym.asm
View File

@@ -9,18 +9,16 @@ const_value set 2
GoldenrodGym_MapScriptHeader: GoldenrodGym_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw UnknownScript_0x5400a, 0
dw UnknownScript_0x5400b, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x5400a: .DummyTrigger0:
end end
UnknownScript_0x5400b: .DummyTrigger1:
end end
WhitneyScript_0x5400c: WhitneyScript_0x5400c:

6
maps/GoldenrodMagnetTrainStation.asm
View File

@@ -5,14 +5,12 @@ const_value set 2
GoldenrodMagnetTrainStation_MapScriptHeader: GoldenrodMagnetTrainStation_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
maptrigger .Trigger0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .DummyTrigger:
end end
OfficerScript_0x550ec: OfficerScript_0x550ec:

8
maps/GoldenrodPokeComCenter2FMobile.asm
View File

@@ -53,10 +53,10 @@ MenuDataHeader_0x62602:
db $40 ; flags db $40 ; flags
db 00, 00 ; start coords db 00, 00 ; start coords
db 08, 15 ; end coords db 08, 15 ; end coords
dw MenuData2_0x6260a dw .MenuData2
db 1 ; default option db 1 ; default option
MenuData2_0x6260a: .MenuData2:
db $80 ; flags db $80 ; flags
db 3 ; items db 3 ; items
db "# つうしん クラブ@" ; # COM CLUB db "# つうしん クラブ@" ; # COM CLUB
@@ -98,10 +98,10 @@ MenuDataHeader_0x6264c:
db $40 ; flags db $40 ; flags
db 00, 00 ; start coords db 00, 00 ; start coords
db 08, 15 ; end coords db 08, 15 ; end coords
dw MenuData2_0x62654 dw .MenuData2
db 1 ; default option db 1 ; default option
MenuData2_0x62654: .MenuData2:
db $80 ; flags db $80 ; flags
db 3 ; items db 3 ; items
db "でんわ", $1f,"つかうとき@" ; Use phone db "でんわ", $1f,"つかうとき@" ; Use phone

14
maps/HallOfFame.asm
View File

@@ -4,22 +4,20 @@ const_value set 2
HallOfFame_MapScriptHeader: HallOfFame_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .EnterHallOfFame
; triggers maptrigger .DummyTrigger
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .EnterHallOfFame:
priorityjump HallOfFameScript priorityjump .EnterHallOfFameScript
end end
.Trigger1: .DummyTrigger:
end end
HallOfFameScript: .EnterHallOfFameScript:
follow HALLOFFAME_LANCE, PLAYER follow HALLOFFAME_LANCE, PLAYER
applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance applymovement HALLOFFAME_LANCE, HallOfFame_WalkUpWithLance
stopfollow stopfollow

3
maps/IcePathB1F.asm
View File

@@ -11,9 +11,6 @@ IcePathB1F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_CMDQUEUE, .SetUpStoneTable dbw MAPCALLBACK_CMDQUEUE, .SetUpStoneTable
.SetUpStoneTable: .SetUpStoneTable:

3
maps/IlexForest.asm
View File

@@ -17,9 +17,6 @@ IlexForest_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback dbw MAPCALLBACK_OBJECTS, .FarfetchdCallback
.FarfetchdCallback: .FarfetchdCallback:

13
maps/IndigoPlateauPokeCenter1F.asm
View File

@@ -9,21 +9,16 @@ const_value set 2
IndigoPlateauPokeCenter1F_MapScriptHeader: IndigoPlateauPokeCenter1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw UnknownScript_0x180009, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_NEWMAP, .PrepareElite4
; callbacks .DummyTrigger:
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x18000a
UnknownScript_0x180009:
end end
UnknownScript_0x18000a: .PrepareElite4:
domaptrigger WILLS_ROOM, $0 domaptrigger WILLS_ROOM, $0
domaptrigger KOGAS_ROOM, $0 domaptrigger KOGAS_ROOM, $0
domaptrigger BRUNOS_ROOM, $0 domaptrigger BRUNOS_ROOM, $0

13
maps/KarensRoom.asm
View File

@@ -4,23 +4,18 @@ const_value set 2
KarensRoom_MapScriptHeader: KarensRoom_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .LockDoor
; triggers maptrigger .DummyTrigger
dw .Trigger0, 0
dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_TILES, .KarensRoomDoors dbw MAPCALLBACK_TILES, .KarensRoomDoors
.Trigger0: .LockDoor:
priorityjump .KarensDoorLocksBehindYou priorityjump .KarensDoorLocksBehindYou
end end
.Trigger1: .DummyTrigger:
end end
.KarensRoomDoors: .KarensRoomDoors:

13
maps/KogasRoom.asm
View File

@@ -4,23 +4,18 @@ const_value set 2
KogasRoom_MapScriptHeader: KogasRoom_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .LockDoor
; triggers maptrigger .DummyTrigger
dw .Trigger0, 0
dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_TILES, .KogasRoomDoors dbw MAPCALLBACK_TILES, .KogasRoomDoors
.Trigger0: .LockDoor:
priorityjump .KogasDoorLocksBehindYou priorityjump .KogasDoorLocksBehindYou
end end
.Trigger1: .DummyTrigger:
end end
.KogasRoomDoors: .KogasRoomDoors:

10
maps/KrissHouse1F.asm
View File

@@ -8,18 +8,16 @@ const_value set 2
KrissHouse1F_MapScriptHeader: KrissHouse1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw UnknownScript_0x7a4d6, 0
dw UnknownScript_0x7a4d7, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x7a4d6: .DummyTrigger0:
end end
UnknownScript_0x7a4d7: .DummyTrigger1:
end end
UnknownScript_0x7a4d8: UnknownScript_0x7a4d8:

5
maps/KrissHouse2F.asm
View File

@@ -10,11 +10,7 @@ KrissHouse2F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 2 db 2
; callbacks
dbw MAPCALLBACK_NEWMAP, .InitializeRoom dbw MAPCALLBACK_NEWMAP, .InitializeRoom
dbw MAPCALLBACK_TILES, .SetSpawn dbw MAPCALLBACK_TILES, .SetSpawn
.Null: .Null:
@@ -53,6 +49,7 @@ GameConsole:
KrissHousePoster: KrissHousePoster:
dw EVENT_KRISS_ROOM_POSTER, .Script dw EVENT_KRISS_ROOM_POSTER, .Script
.Script: .Script:
describedecoration 0 describedecoration 0

17
maps/KurtsHouse.asm
View File

@@ -11,30 +11,27 @@ KurtsHouse_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_OBJECTS, .KurtCallback
; callbacks .KurtCallback:
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x18e154
UnknownScript_0x18e154:
checkevent EVENT_CLEARED_SLOWPOKE_WELL checkevent EVENT_CLEARED_SLOWPOKE_WELL
iffalse UnknownScript_0x18e177 iffalse .Done
checkevent EVENT_FOREST_IS_RESTLESS checkevent EVENT_FOREST_IS_RESTLESS
iftrue UnknownScript_0x18e177 iftrue .Done
checkflag ENGINE_KURT_MAKING_BALLS checkflag ENGINE_KURT_MAKING_BALLS
iftrue UnknownScript_0x18e16f iftrue .MakingBalls
disappear KURTSHOUSE_KURT2 disappear KURTSHOUSE_KURT2
appear KURTSHOUSE_KURT1 appear KURTSHOUSE_KURT1
disappear KURTSHOUSE_TWIN2 disappear KURTSHOUSE_TWIN2
appear KURTSHOUSE_TWIN1 appear KURTSHOUSE_TWIN1
return return
UnknownScript_0x18e16f: .MakingBalls:
disappear KURTSHOUSE_KURT1 disappear KURTSHOUSE_KURT1
appear KURTSHOUSE_KURT2 appear KURTSHOUSE_KURT2
disappear KURTSHOUSE_TWIN1 disappear KURTSHOUSE_TWIN1
appear KURTSHOUSE_TWIN2 appear KURTSHOUSE_TWIN2
UnknownScript_0x18e177: .Done:
return return
KurtScript_0x18e178: KurtScript_0x18e178:

13
maps/LakeOfRage.asm
View File

@@ -15,23 +15,18 @@ const_value set 2
LakeOfRage_MapScriptHeader: LakeOfRage_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 2 db 2
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
dbw MAPCALLBACK_OBJECTS, .Wesley dbw MAPCALLBACK_OBJECTS, .Wesley
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.FlyPoint: .FlyPoint:

29
maps/LancesRoom.asm
View File

@@ -6,37 +6,32 @@ const_value set 2
LancesRoom_MapScriptHeader: LancesRoom_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .LockDoor
; triggers maptrigger .DummyTrigger
dw .Trigger0, 0
dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_TILES, .LancesRoomDoors
; callbacks .LockDoor:
priorityjump .LancesDoorLocksBehindYou
dbw MAPCALLBACK_TILES, .CheckDoor
.Trigger0:
priorityjump LancesRoom_PlayerWalksIn_DoorsCloseBehind
end end
.Trigger1: .DummyTrigger:
end end
.CheckDoor: .LancesRoomDoors:
checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED checkevent EVENT_LANCES_ROOM_ENTRANCE_CLOSED
iffalse .LanceEntranceOpen iffalse .KeepDoorsClosed
changeblock $4, $16, $34 changeblock $4, $16, $34
.LanceEntranceOpen: .KeepDoorsClosed:
checkevent EVENT_LANCES_ROOM_EXIT_OPEN checkevent EVENT_LANCES_ROOM_EXIT_OPEN
iffalse .LanceExitClosed iffalse .OpenDoors
changeblock $4, $0, $b changeblock $4, $0, $b
.LanceExitClosed: .OpenDoors:
return return
LancesRoom_PlayerWalksIn_DoorsCloseBehind: .LancesDoorLocksBehindYou:
applymovement PLAYER, LancesRoom_PlayerWalksInMovementData applymovement PLAYER, LancesRoom_PlayerWalksInMovementData
refreshscreen $86 refreshscreen $86
playsound SFX_STRENGTH playsound SFX_STRENGTH

9
maps/LavenderNameRater.asm
View File

@@ -4,14 +4,12 @@ const_value set 2
LavenderNameRater_MapScriptHeader: LavenderNameRater_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw UnknownScript_0x7eaf1, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x7eaf1: .DummyTrigger:
end end
LavenderNameRater: LavenderNameRater:
@@ -22,8 +20,7 @@ LavenderNameRater:
closetext closetext
end end
LavenderNameRaterBookshelf: LavenderNameRaterUnusedBookshelf:
; unused
jumpstd difficultbookshelf jumpstd difficultbookshelf
LavenderNameRater_MapEventHeader: LavenderNameRater_MapEventHeader:

2
maps/LavenderTown.asm
View File

@@ -10,8 +10,6 @@ LavenderTown_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint: .FlyPoint:

21
maps/MahoganyMart1F.asm
View File

@@ -8,31 +8,26 @@ const_value set 2
MahoganyMart1F_MapScriptHeader: MahoganyMart1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .LanceUncoversStaircase
dw UnknownScript_0x6c356, 0
dw UnknownScript_0x6c357, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_TILES, .MahoganyMart1FStaircase
; callbacks .DummyTrigger0:
dbw MAPCALLBACK_TILES, UnknownScript_0x6c35b
UnknownScript_0x6c356:
end end
UnknownScript_0x6c357: .LanceUncoversStaircase:
priorityjump UnknownScript_0x6c38f priorityjump UnknownScript_0x6c38f
end end
UnknownScript_0x6c35b: .MahoganyMart1FStaircase:
checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
iftrue UnknownScript_0x6c362 iftrue .ShowStairs
return return
UnknownScript_0x6c362: .ShowStairs:
changeblock $6, $2, $1e changeblock $6, $2, $1e
return return

12
maps/MahoganyTown.asm
View File

@@ -7,21 +7,17 @@ const_value set 2
MahoganyTown_MapScriptHeader: MahoganyTown_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.FlyPoint: .FlyPoint:

14
maps/MobileBattleRoom.asm
View File

@@ -1,22 +1,20 @@
MobileBattleRoom_MapScriptHeader: MobileBattleRoom_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .InitializeMobileBattleRoom
; triggers maptrigger .DummyTrigger
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .InitializeMobileBattleRoom:
priorityjump MobileBattleRoom_Initialize priorityjump .InitializeAndPreparePokeCenter2F
end end
.Trigger1: .DummyTrigger:
end end
MobileBattleRoom_Initialize: .InitializeAndPreparePokeCenter2F:
dotrigger $1 dotrigger $1
domaptrigger POKECENTER_2F, $5 domaptrigger POKECENTER_2F, $5
end end

14
maps/MobileTradeRoomMobile.asm
View File

@@ -1,22 +1,20 @@
MobileTradeRoomMobile_MapScriptHeader: MobileTradeRoomMobile_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .InitializeMobileTradeRoomMobile
; triggers maptrigger .DummyTrigger
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .InitializeMobileTradeRoomMobile:
priorityjump MobileTradeRoomMobile_Initialize priorityjump .InitializeAndPreparePokeCenter2F
end end
.Trigger1: .DummyTrigger:
end end
MobileTradeRoomMobile_Initialize: .InitializeAndPreparePokeCenter2F:
dotrigger $1 dotrigger $1
domaptrigger POKECENTER_2F, $4 domaptrigger POKECENTER_2F, $4
end end

10
maps/MountMoon.asm
View File

@@ -4,19 +4,17 @@ const_value set 2
MountMoon_MapScriptHeader: MountMoon_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .RivalEncounter
; triggers maptrigger .DummyTrigger
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .RivalEncounter:
priorityjump .RivalBattle priorityjump .RivalBattle
end end
.Trigger1: .DummyTrigger:
end end
.RivalBattle: .RivalBattle:

9
maps/MountMoonSquare.asm
View File

@@ -6,19 +6,14 @@ const_value set 2
MountMoonSquare_MapScriptHeader: MountMoonSquare_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw .Trigger0, 0
.MapCallbacks: .MapCallbacks:
db 2 db 2
; callbacks
dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone dbw MAPCALLBACK_NEWMAP, .DisappearMoonStone
dbw MAPCALLBACK_OBJECTS, .DisappearRock dbw MAPCALLBACK_OBJECTS, .DisappearRock
.Trigger0: .DummyTrigger:
end end
.DisappearMoonStone: .DisappearMoonStone:

10
maps/MrPokemonsHouse.asm
View File

@@ -5,19 +5,17 @@ const_value set 2
MrPokemonsHouse_MapScriptHeader: MrPokemonsHouse_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .MeetMrPokemon
; triggers maptrigger .DummyTrigger
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .MeetMrPokemon:
priorityjump .MrPokemonEvent priorityjump .MrPokemonEvent
end end
.Trigger1: .DummyTrigger:
end end
.MrPokemonEvent: .MrPokemonEvent:

12
maps/NewBarkTown.asm
View File

@@ -6,21 +6,17 @@ const_value set 2
NewBarkTown_MapScriptHeader: NewBarkTown_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.FlyPoint: .FlyPoint:

12
maps/OlivineCity.asm
View File

@@ -7,21 +7,17 @@ const_value set 2
OlivineCity_MapScriptHeader: OlivineCity_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.FlyPoint: .FlyPoint:

14
maps/OlivinePort.asm
View File

@@ -10,22 +10,20 @@ const_value set 2
OlivinePort_MapScriptHeader: OlivinePort_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .LeaveFastShip
dw UnknownScript_0x748ac, 0
dw UnknownScript_0x748ad, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x748ac: .DummyTrigger0:
end end
UnknownScript_0x748ad: .LeaveFastShip:
priorityjump UnknownScript_0x748b1 priorityjump .LeaveFastShipScript
end end
UnknownScript_0x748b1: .LeaveFastShipScript:
applymovement PLAYER, MovementData_0x74a32 applymovement PLAYER, MovementData_0x74a32
appear OLIVINEPORT_SAILOR1 appear OLIVINEPORT_SAILOR1
dotrigger $0 dotrigger $0

2
maps/PalletTown.asm
View File

@@ -8,8 +8,6 @@ PalletTown_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint: .FlyPoint:

2
maps/PewterCity.asm
View File

@@ -11,8 +11,6 @@ PewterCity_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint: .FlyPoint:

2
maps/PokeCenter2F.asm
View File

@@ -7,8 +7,6 @@ const_value set 2
PokeCenter2F_MapScriptHeader: PokeCenter2F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 6 db 6
; triggers
maptrigger .Trigger0 maptrigger .Trigger0
maptrigger .Trigger1 maptrigger .Trigger1
maptrigger .Trigger2 maptrigger .Trigger2

10
maps/PowerPlant.asm
View File

@@ -10,18 +10,16 @@ const_value set 2
PowerPlant_MapScriptHeader: PowerPlant_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw UnknownScript_0x188dc3, 0
dw UnknownScript_0x188dc4, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x188dc3: .DummyTrigger0:
end end
UnknownScript_0x188dc4: .DummyTrigger1:
end end
PowerPlantGuardPhoneScript: PowerPlantGuardPhoneScript:

7
maps/RadioTower3F.asm
View File

@@ -13,12 +13,9 @@ RadioTower3F_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_TILES, .CardKeyShutterCallback
; callbacks .CardKeyShutterCallback:
dbw MAPCALLBACK_TILES, CardKeyShutterCallback
CardKeyShutterCallback:
checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
iftrue .Change iftrue .Change
return return

14
maps/RadioTower5F.asm
View File

@@ -8,22 +8,20 @@ const_value set 2
RadioTower5F_MapScriptHeader: RadioTower5F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 3 db 3
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0 maptrigger .DummyTrigger2
maptrigger .Trigger1
maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.Trigger2: .DummyTrigger2:
end end
FakeDirectorScript: FakeDirectorScript:

6
maps/RedsHouse1F.asm
View File

@@ -4,14 +4,12 @@ const_value set 2
RedsHouse1F_MapScriptHeader: RedsHouse1F_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw .Trigger, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger: .DummyTrigger:
end end
RedsMom: RedsMom:

13
maps/Route16.asm
View File

@@ -4,20 +4,17 @@ Route16_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike
; callbacks .AlwaysOnBike:
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad318
UnknownScript_0x1ad318:
checkcode VAR_YCOORD checkcode VAR_YCOORD
if_less_than $5, UnknownScript_0x1ad328 if_less_than $5, .CanWalk
checkcode VAR_XCOORD checkcode VAR_XCOORD
if_greater_than $d, UnknownScript_0x1ad328 if_greater_than $d, .CanWalk
setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_ALWAYS_ON_BIKE
return return
UnknownScript_0x1ad328: .CanWalk:
clearflag ENGINE_ALWAYS_ON_BIKE clearflag ENGINE_ALWAYS_ON_BIKE
return return

6
maps/Route16Gate.asm
View File

@@ -4,14 +4,12 @@ const_value set 2
Route16Gate_MapScriptHeader: Route16Gate_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw UnknownScript_0x733e9, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x733e9: .DummyTrigger:
end end
OfficerScript_0x733ea: OfficerScript_0x733ea:

7
maps/Route17.asm
View File

@@ -10,12 +10,9 @@ Route17_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_NEWMAP, .AlwaysOnBike
; callbacks .AlwaysOnBike:
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x1ad0ab
UnknownScript_0x1ad0ab:
setflag ENGINE_ALWAYS_ON_BIKE setflag ENGINE_ALWAYS_ON_BIKE
setflag ENGINE_DOWNHILL setflag ENGINE_DOWNHILL
return return

6
maps/Route1718Gate.asm
View File

@@ -4,14 +4,12 @@ const_value set 2
Route1718Gate_MapScriptHeader: Route1718Gate_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw UnknownScript_0x7360d, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x7360d: .DummyTrigger:
end end
OfficerScript_0x7360e: OfficerScript_0x7360e:

3
maps/Route19.asm
View File

@@ -12,9 +12,6 @@ Route19_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_TILES, .ClearRocks dbw MAPCALLBACK_TILES, .ClearRocks
.ClearRocks: .ClearRocks:

3
maps/Route20.asm
View File

@@ -9,9 +9,6 @@ Route20_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .ClearRocks dbw MAPCALLBACK_NEWMAP, .ClearRocks
.ClearRocks: .ClearRocks:

2
maps/Route23.asm
View File

@@ -4,8 +4,6 @@ Route23_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .FlyPoint dbw MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint: .FlyPoint:

10
maps/Route25.asm
View File

@@ -14,18 +14,16 @@ const_value set 2
Route25_MapScriptHeader: Route25_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw UnknownScript_0x19ee9e, 0
dw UnknownScript_0x19ee9f, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x19ee9e: .DummyTrigger0:
end end
UnknownScript_0x19ee9f: .DummyTrigger1:
end end
UnknownScript_0x19eea0: UnknownScript_0x19eea0:

10
maps/Route27.asm
View File

@@ -12,18 +12,16 @@ const_value set 2
Route27_MapScriptHeader: Route27_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw UnknownScript_0x1a0871, 0
dw UnknownScript_0x1a0872, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x1a0871: .DummyTrigger0:
end end
UnknownScript_0x1a0872: .DummyTrigger1:
end end
UnknownScript_0x1a0873: UnknownScript_0x1a0873:

6
maps/Route28FamousSpeechHouse.asm
View File

@@ -5,14 +5,12 @@ const_value set 2
Route28FamousSpeechHouse_MapScriptHeader: Route28FamousSpeechHouse_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw .Trigger, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
.Trigger: .DummyTrigger:
end end
Celebrity: Celebrity:

13
maps/Route29.asm
View File

@@ -11,22 +11,17 @@ const_value set 2
Route29_MapScriptHeader: Route29_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0
maptrigger .Trigger1
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .Tuscany dbw MAPCALLBACK_OBJECTS, .Tuscany
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.Tuscany: .Tuscany:

3
maps/Route31.asm
View File

@@ -13,9 +13,6 @@ Route31_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_NEWMAP, .CheckMomCall dbw MAPCALLBACK_NEWMAP, .CheckMomCall
.CheckMomCall: .CheckMomCall:

17
maps/Route32.asm
View File

@@ -17,26 +17,21 @@ const_value set 2
Route32_MapScriptHeader: Route32_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 3 db 3
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0 maptrigger .DummyTrigger2
maptrigger .Trigger1
maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .Frieda dbw MAPCALLBACK_OBJECTS, .Frieda
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.Trigger2: .DummyTrigger2:
end end
.Frieda: .Frieda:

3
maps/Route34.asm
View File

@@ -19,9 +19,6 @@ Route34_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .EggCheckCallback dbw MAPCALLBACK_OBJECTS, .EggCheckCallback
.EggCheckCallback: .EggCheckCallback:

11
maps/Route34IlexForestGate.asm
View File

@@ -10,19 +10,16 @@ Route34IlexForestGate_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_OBJECTS, .IsForestRestless
; callbacks .IsForestRestless:
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x62d2d
UnknownScript_0x62d2d:
checkevent EVENT_FOREST_IS_RESTLESS checkevent EVENT_FOREST_IS_RESTLESS
iffalse UnknownScript_0x62d38 iffalse .Normal
disappear ROUTE34ILEXFORESTGATE_TEACHER1 disappear ROUTE34ILEXFORESTGATE_TEACHER1
appear ROUTE34ILEXFORESTGATE_TEACHER2 appear ROUTE34ILEXFORESTGATE_TEACHER2
return return
UnknownScript_0x62d38: .Normal:
disappear ROUTE34ILEXFORESTGATE_TEACHER2 disappear ROUTE34ILEXFORESTGATE_TEACHER2
appear ROUTE34ILEXFORESTGATE_TEACHER1 appear ROUTE34ILEXFORESTGATE_TEACHER1
return return

48
maps/Route35NationalParkGate.asm
View File

@@ -6,60 +6,54 @@ const_value set 2
Route35NationalParkGate_MapScriptHeader: Route35NationalParkGate_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 3 db 3
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw Route35NationalParkGate_Trigger1, 0 maptrigger .LeaveContestEarly
dw Route35NationalParkGate_Trigger2, 0
dw Route35NationalParkGate_Trigger3, 0
.MapCallbacks: .MapCallbacks:
db 2 db 2
dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning
dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
; callbacks .DummyTrigger0:
dbw MAPCALLBACK_NEWMAP, Route35NationalParkGate_CheckIfStillInContest
dbw MAPCALLBACK_OBJECTS, Route35NationalParkGate_CheckIfContestDay
Route35NationalParkGate_Trigger1:
end end
Route35NationalParkGate_Trigger2: .DummyTrigger1:
end end
Route35NationalParkGate_Trigger3: .LeaveContestEarly:
priorityjump Route35NationalParkGate_LeavingContestEarly priorityjump .LeavingContestEarly
end end
Route35NationalParkGate_CheckIfStillInContest: .CheckIfContestRunning:
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER
iftrue Route35NationalParkGate_Yes iftrue .BugContestIsRunning
dotrigger $0 dotrigger $0
return return
Route35NationalParkGate_Yes: .BugContestIsRunning:
dotrigger $2 dotrigger $2
return return
Route35NationalParkGate_CheckIfContestDay: .CheckIfContestAvailable:
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_equal TUESDAY, Route35NationalParkGate_IsContestDay if_equal TUESDAY, .SetContestOfficer
if_equal THURSDAY, Route35NationalParkGate_IsContestDay if_equal THURSDAY, .SetContestOfficer
if_equal SATURDAY, Route35NationalParkGate_IsContestDay if_equal SATURDAY, .SetContestOfficer
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER
iftrue Route35NationalParkGate_Yes iftrue .BugContestIsRunning
disappear ROUTE35NATIONALPARKGATE_OFFICER1 disappear ROUTE35NATIONALPARKGATE_OFFICER1
appear ROUTE35NATIONALPARKGATE_YOUNGSTER appear ROUTE35NATIONALPARKGATE_YOUNGSTER
appear ROUTE35NATIONALPARKGATE_OFFICER2 appear ROUTE35NATIONALPARKGATE_OFFICER2
return return
Route35NationalParkGate_IsContestDay: .SetContestOfficer:
appear ROUTE35NATIONALPARKGATE_OFFICER1 appear ROUTE35NATIONALPARKGATE_OFFICER1
disappear ROUTE35NATIONALPARKGATE_YOUNGSTER disappear ROUTE35NATIONALPARKGATE_YOUNGSTER
disappear ROUTE35NATIONALPARKGATE_OFFICER2 disappear ROUTE35NATIONALPARKGATE_OFFICER2
return return
Route35NationalParkGate_LeavingContestEarly: .LeavingContestEarly:
applymovement PLAYER, MovementData_0x6a2e2 applymovement PLAYER, MovementData_0x6a2e2
spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT spriteface ROUTE35NATIONALPARKGATE_OFFICER1, RIGHT
opentext opentext
@@ -68,13 +62,13 @@ Route35NationalParkGate_LeavingContestEarly:
RAM2MEM $0 RAM2MEM $0
writetext UnknownText_0x6a79a writetext UnknownText_0x6a79a
yesorno yesorno
iffalse Route35NationalParkGate_GoBackIn iffalse .GoBackToContest
writetext UnknownText_0x6a7db writetext UnknownText_0x6a7db
waitbutton waitbutton
closetext closetext
jumpstd bugcontestresultswarp jumpstd bugcontestresultswarp
Route35NationalParkGate_GoBackIn: .GoBackToContest:
writetext UnknownText_0x6a823 writetext UnknownText_0x6a823
waitbutton waitbutton
closetext closetext

13
maps/Route36.asm
View File

@@ -12,22 +12,17 @@ const_value set 2
Route36_MapScriptHeader: Route36_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw .Trigger0, 0
dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
; callbacks
dbw MAPCALLBACK_OBJECTS, .ArthurCallback dbw MAPCALLBACK_OBJECTS, .ArthurCallback
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.ArthurCallback: .ArthurCallback:

22
maps/Route36NationalParkGate.asm
View File

@@ -15,29 +15,23 @@ const_value set 2
Route36NationalParkGate_MapScriptHeader: Route36NationalParkGate_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 3 db 3
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
maptrigger .Trigger0 maptrigger .LeaveContestEarly
maptrigger .Trigger1
maptrigger .Trigger2
.MapCallbacks: .MapCallbacks:
db 2 db 2
; callbacks
dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning dbw MAPCALLBACK_NEWMAP, .CheckIfContestRunning
dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable dbw MAPCALLBACK_OBJECTS, .CheckIfContestAvailable
.Trigger0: .DummyTrigger0:
end end
.Trigger1: .DummyTrigger1:
end end
.Trigger2: .LeaveContestEarly:
priorityjump .LeftTheContestEarly priorityjump .LeavingContestEarly
end end
.CheckIfContestRunning: .CheckIfContestRunning:
@@ -69,7 +63,7 @@ Route36NationalParkGate_MapScriptHeader:
.Return: .Return:
return return
.LeftTheContestEarly: .LeavingContestEarly:
spriteface PLAYER, UP spriteface PLAYER, UP
opentext opentext
checkcode VAR_CONTESTMINUTES checkcode VAR_CONTESTMINUTES

7
maps/Route37.asm
View File

@@ -13,12 +13,9 @@ Route37_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_OBJECTS, .Sunny
; callbacks .Sunny:
dbw MAPCALLBACK_OBJECTS, SunnyCallback
SunnyCallback:
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_equal SUNDAY, .SunnyAppears if_equal SUNDAY, .SunnyAppears
disappear ROUTE37_SUNNY disappear ROUTE37_SUNNY

7
maps/Route40.asm
View File

@@ -18,12 +18,9 @@ Route40_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_OBJECTS, .MonicaCallback
; callbacks .MonicaCallback:
dbw MAPCALLBACK_OBJECTS, MonicaCallback
MonicaCallback:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
checkcode VAR_WEEKDAY checkcode VAR_WEEKDAY
if_equal MONDAY, .MonicaAppears if_equal MONDAY, .MonicaAppears

7
maps/Route40BattleTowerGate.asm
View File

@@ -8,12 +8,9 @@ Route40BattleTowerGate_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_OBJECTS, .ShowSailor
; callbacks .ShowSailor:
dbw MAPCALLBACK_OBJECTS, UnknownScript_0x9f665
UnknownScript_0x9f665:
clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
return return

10
maps/Route42.asm
View File

@@ -12,18 +12,16 @@ const_value set 2
Route42_MapScriptHeader: Route42_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .DummyTrigger0
; triggers maptrigger .DummyTrigger1
dw UnknownScript_0x1a9216, 0
dw UnknownScript_0x1a9217, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x1a9216: .DummyTrigger0:
end end
UnknownScript_0x1a9217: .DummyTrigger1:
end end
Route42SuicuneScript: Route42SuicuneScript:

11
maps/Route43.asm
View File

@@ -14,18 +14,15 @@ Route43_MapScriptHeader:
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_NEWMAP, .CheckIfRockets
; callbacks .CheckIfRockets:
dbw MAPCALLBACK_NEWMAP, UnknownScript_0x19d051
UnknownScript_0x19d051:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue UnknownScript_0x19d05c iftrue .NoRockets
domaptrigger ROUTE_43_GATE, $0 domaptrigger ROUTE_43_GATE, $0
return return
UnknownScript_0x19d05c: .NoRockets:
domaptrigger ROUTE_43_GATE, $1 domaptrigger ROUTE_43_GATE, $1
return return

25
maps/Route43Gate.asm
View File

@@ -6,36 +6,31 @@ const_value set 2
Route43Gate_MapScriptHeader: Route43Gate_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 2 db 2
maptrigger .RocketShakedown
; triggers maptrigger .DummyTrigger
dw .Trigger0, 0
dw .Trigger1, 0
.MapCallbacks: .MapCallbacks:
db 1 db 1
dbw MAPCALLBACK_NEWMAP, .CheckIfRockets
; callbacks .RocketShakedown:
priorityjump .RocketTakeover
dbw MAPCALLBACK_NEWMAP, GateScript_CheckIfRockets
.Trigger0:
priorityjump GateScript_RocketTakeover
end end
.Trigger1: .DummyTrigger:
end end
GateScript_CheckIfRockets: .CheckIfRockets:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue GateScript_NoRockets iftrue .NoRockets
domaptrigger ROUTE_43, $0 domaptrigger ROUTE_43, $0
return return
GateScript_NoRockets: .NoRockets:
domaptrigger ROUTE_43, $1 domaptrigger ROUTE_43, $1
return return
GateScript_RocketTakeover: .RocketTakeover:
playmusic MUSIC_ROCKET_ENCOUNTER playmusic MUSIC_ROCKET_ENCOUNTER
checkcode VAR_FACING checkcode VAR_FACING
if_equal DOWN, RocketScript_Southbound if_equal DOWN, RocketScript_Southbound

6
maps/Route6SaffronGate.asm
View File

@@ -4,14 +4,12 @@ const_value set 2
Route6SaffronGate_MapScriptHeader: Route6SaffronGate_MapScriptHeader:
.MapTriggers: .MapTriggers:
db 1 db 1
maptrigger .DummyTrigger
; triggers
dw UnknownScript_0x1926e9, 0
.MapCallbacks: .MapCallbacks:
db 0 db 0
UnknownScript_0x1926e9: .DummyTrigger:
end end
OfficerScript_0x1926ea: OfficerScript_0x1926ea:

Some files were not shown because too many files have changed in this diff Show More