pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Define scene constants alongside scene_scripts (#979)

Browse Source 
Generic SCENE_DEFAULT and SCENE_FINISHED are legacy values
This commit is contained in:
Rangi 2022-07-29 17:43:10 -04:00 committed by GitHub
parent 51bfd31ea8
commit 8826d97ee4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
94 changed files with 380 additions and 518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants.asm
View File

@ -38,7 +38,6 @@ INCLUDE "constants/pokemon_data_constants.asm"
INCLUDE "constants/printer_constants.asm" INCLUDE "constants/printer_constants.asm"
INCLUDE "constants/radio_constants.asm" INCLUDE "constants/radio_constants.asm"
INCLUDE "constants/scgb_constants.asm" INCLUDE "constants/scgb_constants.asm"
INCLUDE "constants/scene_constants.asm"
INCLUDE "constants/script_constants.asm" INCLUDE "constants/script_constants.asm"
INCLUDE "constants/serial_constants.asm" INCLUDE "constants/serial_constants.asm"
INCLUDE "constants/sfx_constants.asm" INCLUDE "constants/sfx_constants.asm"

160
constants/scene_constants.asm
View File

@ -1,160 +0,0 @@
; See data/maps/scenes.asm for which maps have scene variables.
; Each scene_script and coord_event is associated with a current scene ID.
; Scene variables default to 0.
DEF SCENE_DEFAULT EQU 0
; Often a map will have a one-time default event for scene 0, and switch to a
; do-nothing scene 1 when the event finishes.
DEF SCENE_FINISHED EQU 1
; A coord_event for scene -1 will always activate, regardless of the map's
; scene variable value.
DEF SCENE_ALWAYS EQU -1
; wPokecenter2FSceneID
const_def 1
const SCENE_POKECENTER2F_LEAVE_TRADE_CENTER ; 1
const SCENE_POKECENTER2F_LEAVE_COLOSSEUM ; 2
const SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE ; 3
const SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM ; 4
const SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM ; 5
; wPowerPlantSceneID
const_def
const SCENE_POWERPLANT_NOTHING ; 0
const SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL ; 1
; wCeruleanGymSceneID
const_def
const SCENE_CERULEANGYM_NOTHING ; 0
const SCENE_CERULEANGYM_GRUNT_RUNS_OUT ; 1
; wRoute25SceneID
const_def
const SCENE_ROUTE25_NOTHING ; 0
const SCENE_ROUTE25_MISTYS_DATE ; 1
; wLancesRoomSceneID
const_def 1
const SCENE_LANCESROOM_APPROACH_LANCE ; 1
; wElmsLabSceneID
const_def 1
const SCENE_ELMSLAB_CANT_LEAVE ; 1
const SCENE_ELMSLAB_NOTHING ; 2
const SCENE_ELMSLAB_MEET_OFFICER ; 3
const SCENE_ELMSLAB_UNUSED ; 4
const SCENE_ELMSLAB_AIDE_GIVES_POTION ; 5
const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS ; 6
; wRoute29SceneID
const_def
const SCENE_ROUTE29_NOTHING ; 0
const SCENE_ROUTE29_CATCH_TUTORIAL ; 1
; wCherrygroveCitySceneID
const_def
const SCENE_CHERRYGROVECITY_NOTHING ; 0
const SCENE_CHERRYGROVECITY_MEET_RIVAL ; 1
; wRoute32SceneID
const_def 1
const SCENE_ROUTE32_OFFER_SLOWPOKETAIL ; 1
const SCENE_ROUTE32_NOTHING ; 2
; wRoute35NationalParkGateSceneID
const_def
const SCENE_ROUTE35NATIONALPARKGATE_NOTHING ; 0
const SCENE_ROUTE35NATIONALPARKGATE_UNUSED ; 1
const SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2
; wRoute36SceneID
const_def
const SCENE_ROUTE36_NOTHING ; 0
const SCENE_ROUTE36_SUICUNE ; 1
; wRoute36NationalParkGateSceneID
const_def
const SCENE_ROUTE36NATIONALPARKGATE_NOTHING ; 0
const SCENE_ROUTE36NATIONALPARKGATE_UNUSED ; 1
const SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY ; 2
; wAzaleaTownSceneID
const_def
const SCENE_AZALEATOWN_NOTHING ; 0
const SCENE_AZALEATOWN_RIVAL_BATTLE ; 1
const SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL ; 2
; wGoldenrodGymSceneID
const_def
const SCENE_GOLDENRODGYM_NOTHING ; 0
const SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING ; 1
; wRoute42SceneID
const_def
const SCENE_ROUTE42_NOTHING ; 0
const SCENE_ROUTE42_SUICUNE ; 1
; wCianwoodCitySceneID
const_def
const SCENE_CIANWOODCITY_NOTHING ; 0
const SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE ; 1
; wBurnedTower1FSceneID
const_def 1
const SCENE_BURNEDTOWER1F_RIVAL_BATTLE ; 1
const SCENE_BURNEDTOWER1F_NOTHING ; 2
; wRadioTower5FSceneID
const_def 1
const SCENE_RADIOTOWER5F_ROCKET_BOSS ; 1
const SCENE_RADIOTOWER5F_NOTHING ; 2
; wRuinsOfAlphOutsideSceneID
const_def
const SCENE_RUINSOFALPHOUTSIDE_NOTHING ; 0
const SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX ; 1
; wRuinsOfAlphResearchCenterSceneID
const_def
const SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING ; 0
const SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX ; 1
; wRuinsOfAlphInnerChamberSceneID
const_def
const SCENE_RUINSOFALPHINNERCHAMBER_NOTHING ; 0
const SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE ; 1
; wMahoganyMart1FSceneID
const_def
const SCENE_MAHOGANYMART1F_NOTHING ; 0
const SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS ; 1
; wTeamRocketBaseB2FSceneID
const_def 1
const SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS ; 1
const SCENE_TEAMROCKETBASEB2F_ELECTRODES ; 2
const SCENE_TEAMROCKETBASEB2F_NOTHING ; 3
; wTeamRocketBaseB3FSceneID
const_def 1
const SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER ; 1
const SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS ; 2
const SCENE_TEAMROCKETBASEB3F_NOTHING ; 3
; wDragonsDenB1FSceneID
const_def
const SCENE_DRAGONSDENB1F_NOTHING ; 0
const SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM ; 1
; wOlivinePortSceneID
const_def 1
const SCENE_OLIVINEPORT_LEAVE_SHIP ; 1
; wVermilionPortSceneID
const_def 1
const SCENE_VERMILIONPORT_LEAVE_SHIP ; 1
; wFastShip1FSceneID
const_def 1
const SCENE_FASTSHIP1F_ENTER_SHIP ; 1
const SCENE_FASTSHIP1F_MEET_GRANDPA ; 2

4
constants/script_constants.asm
View File

@ -114,6 +114,10 @@ DEF COORD_EVENT_SIZE EQU 8 ; coord_event
DEF BG_EVENT_SIZE EQU 5 ; bg_event DEF BG_EVENT_SIZE EQU 5 ; bg_event
DEF OBJECT_EVENT_SIZE EQU 13 ; object_event DEF OBJECT_EVENT_SIZE EQU 13 ; object_event
; A coord_event for scene -1 will always activate,
; regardless of the map's scene variable value.
DEF SCENE_ALWAYS EQU -1
; bg_event types ; bg_event types
; BGEventJumptable indexes (see engine/overworld/events.asm) ; BGEventJumptable indexes (see engine/overworld/events.asm)
const_def const_def

2
docs/bugs_and_glitches.md
View File

@ -2193,7 +2193,7 @@ Edit `DragonsDen1F_MapScripts` in [maps/DragonsDen1F.asm](https://github.com/pre
+ callback MAPCALLBACK_NEWMAP, .UnsetClairScene + callback MAPCALLBACK_NEWMAP, .UnsetClairScene
+ +
+.UnsetClairScene: +.UnsetClairScene:
+ setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_NOTHING + setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_NOOP
+ endcallback + endcallback
``` ```

6
engine/events/std_scripts.asm
View File

@ -302,7 +302,7 @@ RadioTowerRocketsScript:
clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER clearevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST
specialphonecall SPECIALCALL_WEIRDBROADCAST specialphonecall SPECIALCALL_WEIRDBROADCAST
setmapscene MAHOGANY_TOWN, SCENE_FINISHED setmapscene MAHOGANY_TOWN, SCENE_MAHOGANYTOWN_NOOP
end end
BugContestResultsWarpScript: BugContestResultsWarpScript:
@ -359,8 +359,8 @@ BugContestResults_DidNotLeaveMons:
waitbutton waitbutton
BugContestResults_CleanUp: BugContestResults_CleanUp:
closetext closetext
setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING setscene SCENE_ROUTE36NATIONALPARKGATE_NOOP
setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOTHING setmapscene ROUTE_35_NATIONAL_PARK_GATE, SCENE_ROUTE35NATIONALPARKGATE_NOOP
setevent EVENT_BUG_CATCHING_CONTESTANT_1A setevent EVENT_BUG_CATCHING_CONTESTANT_1A
setevent EVENT_BUG_CATCHING_CONTESTANT_2A setevent EVENT_BUG_CATCHING_CONTESTANT_2A
setevent EVENT_BUG_CATCHING_CONTESTANT_3A setevent EVENT_BUG_CATCHING_CONTESTANT_3A

3
macros/legacy.asm
View File

@ -249,6 +249,9 @@ DEF PERSONTYPE_SCRIPT EQUS "OBJECTTYPE_SCRIPT"
DEF PERSONTYPE_ITEMBALL EQUS "OBJECTTYPE_ITEMBALL" DEF PERSONTYPE_ITEMBALL EQUS "OBJECTTYPE_ITEMBALL"
DEF PERSONTYPE_TRAINER EQUS "OBJECTTYPE_TRAINER" DEF PERSONTYPE_TRAINER EQUS "OBJECTTYPE_TRAINER"
DEF SCENE_DEFAULT EQU 0
DEF SCENE_FINISHED EQU 1
; macros/scripts/movement.asm ; macros/scripts/movement.asm
DEF show_person EQUS "show_object" DEF show_person EQUS "show_object"

13
macros/scripts/maps.asm
View File

@ -10,13 +10,26 @@ DEF object_const_def EQUS "const_def 2"
MACRO def_scene_scripts MACRO def_scene_scripts
REDEF _NUM_SCENE_SCRIPTS EQUS "_NUM_SCENE_SCRIPTS_\@" REDEF _NUM_SCENE_SCRIPTS EQUS "_NUM_SCENE_SCRIPTS_\@"
db {_NUM_SCENE_SCRIPTS} db {_NUM_SCENE_SCRIPTS}
const_def
DEF {_NUM_SCENE_SCRIPTS} = 0 DEF {_NUM_SCENE_SCRIPTS} = 0
ENDM ENDM
MACRO scene_const
;\1: scene id constant
const \1
EXPORT \1
ENDM
MACRO scene_script MACRO scene_script
;\1: script pointer ;\1: script pointer
;\2: scene id constant
dw \1 dw \1
dw 0 ; filler dw 0 ; filler
if _NARG == 2
scene_const \2
else
const_skip
endc
DEF {_NUM_SCENE_SCRIPTS} += 1 DEF {_NUM_SCENE_SCRIPTS} += 1
ENDM ENDM

2
maps/AzaleaPokecenter1F.asm
View File

@ -6,7 +6,7 @@
AzaleaPokecenter1F_MapScripts: AzaleaPokecenter1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene scene_script .DummyScene ; unusable
def_callbacks def_callbacks

10
maps/AzaleaTown.asm
View File

@ -14,9 +14,9 @@
AzaleaTown_MapScripts: AzaleaTown_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING scene_script .DummyScene0, SCENE_AZALEATOWN_NOOP
scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE scene_script .DummyScene1, SCENE_AZALEATOWN_RIVAL_BATTLE
scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL scene_script .DummyScene2, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint callback MAPCALLBACK_NEWMAP, .Flypoint
@ -100,7 +100,7 @@ AzaleaTownRivalBattleScript:
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER disappear AZALEATOWN_SILVER
setscene SCENE_AZALEATOWN_NOTHING setscene SCENE_AZALEATOWN_NOOP
waitsfx waitsfx
playmapmusic playmapmusic
end end
@ -167,7 +167,7 @@ AzaleaTownCelebiScene:
setflag ENGINE_FOREST_IS_RESTLESS setflag ENGINE_FOREST_IS_RESTLESS
clearevent EVENT_ILEX_FOREST_LASS clearevent EVENT_ILEX_FOREST_LASS
setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS setevent EVENT_ROUTE_34_ILEX_FOREST_GATE_LASS
setscene SCENE_AZALEATOWN_NOTHING setscene SCENE_AZALEATOWN_NOOP
closetext closetext
end end

20
maps/BattleTower1F.asm
View File

@ -7,8 +7,8 @@
BattleTower1F_MapScripts: BattleTower1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene0, SCENE_BATTLETOWER1F_CHECKSTATE
scene_script .Scene1 ; SCENE_FINISHED scene_script .Scene1, SCENE_BATTLETOWER1F_NOOP
def_callbacks def_callbacks
@ -36,7 +36,7 @@ BattleTower1F_MapScripts:
setval BATTLETOWERACTION_06 setval BATTLETOWERACTION_06
special BattleTowerAction special BattleTowerAction
.SkipEverything: .SkipEverything:
setscene SCENE_FINISHED setscene SCENE_BATTLETOWER1F_NOOP
.Scene1: .Scene1:
end end
@ -79,10 +79,10 @@ Script_ChooseChallenge:
writetext Text_SaveBeforeEnteringBattleRoom writetext Text_SaveBeforeEnteringBattleRoom
yesorno yesorno
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_DEFAULT setscene SCENE_BATTLETOWER1F_CHECKSTATE
special TryQuickSave special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_FINISHED setscene SCENE_BATTLETOWER1F_NOOP
setval BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags] setval BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [sBattleTowerSaveFileFlags]
special BattleTowerAction special BattleTowerAction
special BattleTowerRoomMenu special BattleTowerRoomMenu
@ -103,9 +103,9 @@ Script_ResumeBattleTowerChallenge:
special BattleTowerAction special BattleTowerAction
Script_WalkToBattleTowerElevator: Script_WalkToBattleTowerElevator:
musicfadeout MUSIC_NONE, 8 musicfadeout MUSIC_NONE, 8
setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_DEFAULT setmapscene BATTLE_TOWER_BATTLE_ROOM, SCENE_BATTLETOWERBATTLEROOM_ENTER
setmapscene BATTLE_TOWER_ELEVATOR, SCENE_DEFAULT setmapscene BATTLE_TOWER_ELEVATOR, SCENE_BATTLETOWERELEVATOR_ENTER
setmapscene BATTLE_TOWER_HALLWAY, SCENE_DEFAULT setmapscene BATTLE_TOWER_HALLWAY, SCENE_BATTLETOWERHALLWAY_ENTER
follow BATTLETOWER1F_RECEPTIONIST, PLAYER follow BATTLETOWER1F_RECEPTIONIST, PLAYER
applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator applymovement BATTLETOWER1F_RECEPTIONIST, MovementData_BattleTower1FWalkToElevator
setval BATTLETOWERACTION_0A setval BATTLETOWERACTION_0A
@ -206,10 +206,10 @@ Script_StartChallenge: ; unreferenced
writetext Text_SaveBeforeReentry writetext Text_SaveBeforeReentry
yesorno yesorno
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_DEFAULT setscene SCENE_BATTLETOWER1F_CHECKSTATE
special TryQuickSave special TryQuickSave
iffalse Script_Menu_ChallengeExplanationCancel iffalse Script_Menu_ChallengeExplanationCancel
setscene SCENE_FINISHED setscene SCENE_BATTLETOWER1F_NOOP
setval BATTLETOWERACTION_06 setval BATTLETOWERACTION_06
special BattleTowerAction special BattleTowerAction
setval BATTLETOWERACTION_12 setval BATTLETOWERACTION_12

6
maps/BattleTowerBattleRoom.asm
View File

@ -4,15 +4,15 @@
BattleTowerBattleRoom_MapScripts: BattleTowerBattleRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .EnterBattleRoom ; SCENE_DEFAULT scene_script .EnterBattleRoom, SCENE_BATTLETOWERBATTLEROOM_ENTER
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_BATTLETOWERBATTLEROOM_NOOP
def_callbacks def_callbacks
.EnterBattleRoom: .EnterBattleRoom:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER disappear BATTLETOWERBATTLEROOM_YOUNGSTER
sdefer Script_BattleRoom sdefer Script_BattleRoom
setscene SCENE_FINISHED setscene SCENE_BATTLETOWERBATTLEROOM_NOOP
.DummyScene: .DummyScene:
end end

6
maps/BattleTowerElevator.asm
View File

@ -3,14 +3,14 @@
BattleTowerElevator_MapScripts: BattleTowerElevator_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene0, SCENE_BATTLETOWERELEVATOR_ENTER
scene_script .Scene1 ; SCENE_FINISHED scene_script .Scene1, SCENE_BATTLETOWERELEVATOR_NOOP
def_callbacks def_callbacks
.Scene0: .Scene0:
sdefer .RideElevator sdefer .RideElevator
setscene SCENE_FINISHED setscene SCENE_BATTLETOWERELEVATOR_NOOP
.Scene1: .Scene1:
end end

6
maps/BattleTowerHallway.asm
View File

@ -3,14 +3,14 @@
BattleTowerHallway_MapScripts: BattleTowerHallway_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene0, SCENE_BATTLETOWERHALLWAY_ENTER
scene_script .Scene1 ; SCENE_FINISHED scene_script .Scene1, SCENE_BATTLETOWERHALLWAY_NOOP
def_callbacks def_callbacks
.Scene0: .Scene0:
sdefer .ChooseBattleRoom sdefer .ChooseBattleRoom
setscene SCENE_FINISHED setscene SCENE_BATTLETOWERHALLWAY_NOOP
.Scene1: .Scene1:
end end

6
maps/BrunosRoom.asm
View File

@ -3,8 +3,8 @@
BrunosRoom_MapScripts: BrunosRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LockDoor ; SCENE_DEFAULT scene_script .LockDoor, SCENE_BRUNOSROOM_LOCK_DOOR
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_BRUNOSROOM_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .BrunosRoomDoors callback MAPCALLBACK_TILES, .BrunosRoomDoors
@ -35,7 +35,7 @@ BrunosRoom_MapScripts:
changeblock 4, 14, $2a ; wall changeblock 4, 14, $2a ; wall
reloadmappart reloadmappart
closetext closetext
setscene SCENE_FINISHED setscene SCENE_BRUNOSROOM_NOOP
setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED setevent EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
waitsfx waitsfx
end end

8
maps/BurnedTower1F.asm
View File

@ -7,9 +7,9 @@
BurnedTower1F_MapScripts: BurnedTower1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .EusineScene ; SCENE_DEFAULT scene_script .EusineScene, SCENE_BURNEDTOWER1F_MEET_EUSINE
scene_script .DummyScene1 ; SCENE_BURNEDTOWER1F_RIVAL_BATTLE scene_script .DummyScene1, SCENE_BURNEDTOWER1F_RIVAL_BATTLE
scene_script .DummyScene2 ; SCENE_BURNEDTOWER1F_NOTHING scene_script .DummyScene2, SCENE_BURNEDTOWER1F_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .HoleAndLadder callback MAPCALLBACK_TILES, .HoleAndLadder
@ -96,7 +96,7 @@ BurnedTowerRivalBattleScript:
writetext BurnedTowerSilver_AfterText1 writetext BurnedTowerSilver_AfterText1
waitbutton waitbutton
closetext closetext
setscene SCENE_BURNEDTOWER1F_NOTHING setscene SCENE_BURNEDTOWER1F_NOOP
setevent EVENT_RIVAL_BURNED_TOWER setevent EVENT_RIVAL_BURNED_TOWER
special FadeOutMusic special FadeOutMusic
pause 15 pause 15

12
maps/BurnedTowerB1F.asm
View File

@ -11,8 +11,8 @@
BurnedTowerB1F_MapScripts: BurnedTowerB1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_BURNEDTOWERB1F_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .LadderCallback callback MAPCALLBACK_TILES, .LadderCallback
@ -79,10 +79,10 @@ ReleaseTheBeasts:
disappear BURNEDTOWERB1F_SUICUNE1 disappear BURNEDTOWERB1F_SUICUNE1
waitsfx waitsfx
special RestartMapMusic special RestartMapMusic
setscene SCENE_FINISHED setscene SCENE_BURNEDTOWERB1F_NOOP
setevent EVENT_RELEASED_THE_BEASTS setevent EVENT_RELEASED_THE_BEASTS
special InitRoamMons special InitRoamMons
setmapscene ECRUTEAK_GYM, SCENE_FINISHED setmapscene ECRUTEAK_GYM, SCENE_ECRUTEAKGYM_NOOP
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setevent EVENT_ECRUTEAK_GYM_GRAMPS setevent EVENT_ECRUTEAK_GYM_GRAMPS
@ -94,7 +94,7 @@ ReleaseTheBeasts:
changeblock 6, 14, $1b ; ladder changeblock 6, 14, $1b ; ladder
reloadmappart reloadmappart
closetext closetext
setscene SCENE_FINISHED setscene SCENE_BURNEDTOWERB1F_NOOP
end end
BurnedTowerB1FEusine: BurnedTowerB1FEusine:
@ -245,7 +245,7 @@ BurnedTowerB1F_MapEvents:
warp_event 7, 15, BURNED_TOWER_1F, 14 warp_event 7, 15, BURNED_TOWER_1F, 14
def_coord_events def_coord_events
coord_event 10, 6, SCENE_DEFAULT, ReleaseTheBeasts coord_event 10, 6, SCENE_BURNEDTOWERB1F_RELEASE_THE_BEASTS, ReleaseTheBeasts
def_bg_events def_bg_events

8
maps/CeruleanGym.asm
View File

@ -8,8 +8,8 @@
CeruleanGym_MapScripts: CeruleanGym_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_CERULEANGYM_NOTHING scene_script .DummyScene0, SCENE_CERULEANGYM_NOOP
scene_script .GruntRunsOut ; SCENE_CERULEANGYM_GRUNT_RUNS_OUT scene_script .GruntRunsOut, SCENE_CERULEANGYM_GRUNT_RUNS_OUT
def_callbacks def_callbacks
@ -46,9 +46,9 @@ CeruleanGym_MapScripts:
setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM setevent EVENT_MET_ROCKET_GRUNT_AT_CERULEAN_GYM
clearevent EVENT_ROUTE_24_ROCKET clearevent EVENT_ROUTE_24_ROCKET
clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND clearevent EVENT_ROUTE_25_MISTY_BOYFRIEND
setscene SCENE_CERULEANGYM_NOTHING setscene SCENE_CERULEANGYM_NOOP
setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE setmapscene ROUTE_25, SCENE_ROUTE25_MISTYS_DATE
setmapscene POWER_PLANT, SCENE_POWERPLANT_NOTHING setmapscene POWER_PLANT, SCENE_POWERPLANT_NOOP
waitsfx waitsfx
special RestartMapMusic special RestartMapMusic
pause 15 pause 15

6
maps/CherrygroveCity.asm
View File

@ -7,8 +7,8 @@
CherrygroveCity_MapScripts: CherrygroveCity_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_CHERRYGROVECITY_NOTHING scene_script .DummyScene0, SCENE_CHERRYGROVECITY_NOOP
scene_script .DummyScene1 ; SCENE_CHERRYGROVECITY_MEET_RIVAL scene_script .DummyScene1, SCENE_CHERRYGROVECITY_MEET_RIVAL
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, .FlyPoint
@ -169,7 +169,7 @@ CherrygroveSilverSceneNorth:
turnobject PLAYER, LEFT turnobject PLAYER, LEFT
applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
disappear CHERRYGROVECITY_SILVER disappear CHERRYGROVECITY_SILVER
setscene SCENE_CHERRYGROVECITY_NOTHING setscene SCENE_CHERRYGROVECITY_NOOP
special HealParty special HealParty
playmapmusic playmapmusic
end end

6
maps/CianwoodCity.asm
View File

@ -14,8 +14,8 @@
CianwoodCity_MapScripts: CianwoodCity_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_CIANWOODCITY_NOTHING scene_script .DummyScene0, SCENE_CIANWOODCITY_NOOP
scene_script .DummyScene1 ; SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE scene_script .DummyScene1, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune callback MAPCALLBACK_NEWMAP, .FlyPointAndSuicune
@ -47,7 +47,7 @@ CianwoodCitySuicuneAndEusine:
applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneDepartMovement applymovement CIANWOODCITY_SUICUNE, CianwoodCitySuicuneDepartMovement
disappear CIANWOODCITY_SUICUNE disappear CIANWOODCITY_SUICUNE
pause 10 pause 10
setscene SCENE_CIANWOODCITY_NOTHING setscene SCENE_CIANWOODCITY_NOOP
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setmapscene ROUTE_42, SCENE_ROUTE42_SUICUNE setmapscene ROUTE_42, SCENE_ROUTE42_SUICUNE
checkevent EVENT_FOUGHT_EUSINE checkevent EVENT_FOUGHT_EUSINE

6
maps/Colosseum.asm
View File

@ -4,8 +4,8 @@
Colosseum_MapScripts: Colosseum_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .InitializeColosseum ; SCENE_DEFAULT scene_script .InitializeColosseum, SCENE_COLOSSEUM_INITIALIZE
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_COLOSSEUM_NOOP
scene_script .DummyScene2 ; unused scene_script .DummyScene2 ; unused
def_callbacks def_callbacks
@ -39,7 +39,7 @@ Colosseum_MapScripts:
endcallback endcallback
.InitializeAndPreparePokecenter2F: .InitializeAndPreparePokecenter2F:
setscene SCENE_FINISHED setscene SCENE_COLOSSEUM_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
end end

6
maps/DragonShrine.asm
View File

@ -6,8 +6,8 @@
DragonShrine_MapScripts: DragonShrine_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DragonShrineTest ; SCENE_DEFAULT scene_script .DragonShrineTest, SCENE_DRAGONSHRINE_TAKE_TEST
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_DRAGONSHRINE_NOOP
def_callbacks def_callbacks
@ -163,7 +163,7 @@ DragonShrine_MapScripts:
waitsfx waitsfx
special RestartMapMusic special RestartMapMusic
specialphonecall SPECIALCALL_MASTERBALL specialphonecall SPECIALCALL_MASTERBALL
setscene SCENE_FINISHED setscene SCENE_DRAGONSHRINE_NOOP
setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM setmapscene DRAGONS_DEN_B1F, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
writetext DragonShrinePlayerReceivedRisingBadgeText writetext DragonShrinePlayerReceivedRisingBadgeText
promptbutton promptbutton

6
maps/DragonsDenB1F.asm
View File

@ -11,8 +11,8 @@
DragonsDenB1F_MapScripts: DragonsDenB1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DRAGONSDENB1F_NOTHING scene_script .DummyScene0, SCENE_DRAGONSDENB1F_NOOP
scene_script .DummyScene1 ; SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM scene_script .DummyScene1, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckSilver callback MAPCALLBACK_NEWMAP, .CheckSilver
@ -79,7 +79,7 @@ DragonsDenB1F_ClairScene:
pause 30 pause 30
special RestartMapMusic special RestartMapMusic
disappear DRAGONSDENB1F_CLAIR disappear DRAGONSDENB1F_CLAIR
setscene SCENE_DRAGONSDENB1F_NOTHING setscene SCENE_DRAGONSDENB1F_NOOP
end end
TrainerCooltrainermDarin: TrainerCooltrainermDarin:

6
maps/EcruteakGym.asm
View File

@ -9,8 +9,8 @@
EcruteakGym_MapScripts: EcruteakGym_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .ForcedToLeave ; SCENE_DEFAULT scene_script .ForcedToLeave, SCENE_ECRUTEAKGYM_FORCED_TO_LEAVE
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_ECRUTEAKGYM_NOOP
def_callbacks def_callbacks
@ -41,7 +41,7 @@ EcruteakGymMortyScript:
setflag ENGINE_FOGBADGE setflag ENGINE_FOGBADGE
readvar VAR_BADGES readvar VAR_BADGES
scall EcruteakGymActivateRockets scall EcruteakGymActivateRockets
setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_FINISHED setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP
setevent EVENT_RANG_CLEAR_BELL_1 setevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_RANG_CLEAR_BELL_2 setevent EVENT_RANG_CLEAR_BELL_2
.FightDone: .FightDone:

6
maps/EcruteakPokecenter1F.asm
View File

@ -7,8 +7,8 @@
EcruteakPokecenter1F_MapScripts: EcruteakPokecenter1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .MeetBill ; SCENE_DEFAULT scene_script .MeetBill, SCENE_ECRUTEAKPOKECENTER1F_MEET_BILL
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_ECRUTEAKPOKECENTER1F_NOOP
def_callbacks def_callbacks
@ -51,7 +51,7 @@ EcruteakPokecenter1F_MapScripts:
disappear ECRUTEAKPOKECENTER1F_BILL disappear ECRUTEAKPOKECENTER1F_BILL
clearevent EVENT_MET_BILL clearevent EVENT_MET_BILL
setflag ENGINE_TIME_CAPSULE setflag ENGINE_TIME_CAPSULE
setscene SCENE_FINISHED setscene SCENE_ECRUTEAKPOKECENTER1F_NOOP
waitsfx waitsfx
end end

12
maps/EcruteakTinTowerEntrance.asm
View File

@ -6,8 +6,8 @@
EcruteakTinTowerEntrance_MapScripts: EcruteakTinTowerEntrance_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .InitializeSages callback MAPCALLBACK_OBJECTS, .InitializeSages
@ -33,7 +33,7 @@ EcruteakTinTowerEntrance_MapScripts:
setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE setevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
checkitem CLEAR_BELL checkitem CLEAR_BELL
iftrue .NoClearBell iftrue .NoClearBell
setscene SCENE_DEFAULT setscene SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS
.NoClearBell: .NoClearBell:
endcallback endcallback
@ -98,7 +98,7 @@ EcruteakTinTowerEntranceSageScript:
writetext EcruteakTinTowerEntranceSageText_HearsClearBell writetext EcruteakTinTowerEntranceSageText_HearsClearBell
waitbutton waitbutton
closetext closetext
setscene SCENE_FINISHED setscene SCENE_ECRUTEAKTINTOWERENTRANCE_NOOP
setevent EVENT_RANG_CLEAR_BELL_2 setevent EVENT_RANG_CLEAR_BELL_2
clearevent EVENT_RANG_CLEAR_BELL_1 clearevent EVENT_RANG_CLEAR_BELL_1
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@ -286,8 +286,8 @@ EcruteakTinTowerEntrance_MapEvents:
warp_event 17, 3, WISE_TRIOS_ROOM, 3 warp_event 17, 3, WISE_TRIOS_ROOM, 3
def_coord_events def_coord_events
coord_event 4, 7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksLeft coord_event 4, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS, EcruteakTinTowerEntranceSageBlocksLeft
coord_event 5, 7, SCENE_DEFAULT, EcruteakTinTowerEntranceSageBlocksRight coord_event 5, 7, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS, EcruteakTinTowerEntranceSageBlocksRight
def_bg_events def_bg_events

23
maps/ElmsLab.asm
View File

@ -8,12 +8,13 @@
ElmsLab_MapScripts: ElmsLab_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .MeetElm ; SCENE_DEFAULT scene_script .MeetElm, SCENE_ELMSLAB_MEET_ELM
scene_script .DummyScene1 ; SCENE_ELMSLAB_CANT_LEAVE scene_script .DummyScene1, SCENE_ELMSLAB_CANT_LEAVE
scene_script .DummyScene2 ; SCENE_ELMSLAB_NOTHING scene_script .DummyScene2, SCENE_ELMSLAB_NOOP
scene_script .DummyScene3 ; SCENE_ELMSLAB_MEET_OFFICER scene_script .DummyScene3, SCENE_ELMSLAB_MEET_OFFICER
scene_script .DummyScene4 ; SCENE_ELMSLAB_UNUSED scene_script .DummyScene4, SCENE_ELMSLAB_UNUSED
scene_script .DummyScene5 ; SCENE_ELMSLAB_AIDE_GIVES_POTION scene_script .DummyScene5, SCENE_ELMSLAB_AIDE_GIVES_POTION
scene_const SCENE_ELMSLAB_AIDE_GIVES_POKE_BALLS
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .MoveElmCallback callback MAPCALLBACK_OBJECTS, .MoveElmCallback
@ -39,7 +40,7 @@ ElmsLab_MapScripts:
.MoveElmCallback: .MoveElmCallback:
checkscene checkscene
iftrue .Skip ; not SCENE_DEFAULT iftrue .Skip ; not SCENE_ELMSLAB_MEET_ELM
moveobject ELMSLAB_ELM, 3, 4 moveobject ELMSLAB_ELM, 3, 4
.Skip: .Skip:
endcallback endcallback
@ -273,7 +274,7 @@ ElmDirectionsScript:
setevent EVENT_GOT_A_POKEMON_FROM_ELM setevent EVENT_GOT_A_POKEMON_FROM_ELM
setevent EVENT_RIVAL_CHERRYGROVE_CITY setevent EVENT_RIVAL_CHERRYGROVE_CITY
setscene SCENE_ELMSLAB_AIDE_GIVES_POTION setscene SCENE_ELMSLAB_AIDE_GIVES_POTION
setmapscene NEW_BARK_TOWN, SCENE_FINISHED setmapscene NEW_BARK_TOWN, SCENE_NEWBARKTOWN_NOOP
end end
ElmDescribesMrPokemonScript: ElmDescribesMrPokemonScript:
@ -477,7 +478,7 @@ AideScript_GivePotion:
writetext AideText_AlwaysBusy writetext AideText_AlwaysBusy
waitbutton waitbutton
closetext closetext
setscene SCENE_ELMSLAB_NOTHING setscene SCENE_ELMSLAB_NOOP
end end
AideScript_WalkBalls1: AideScript_WalkBalls1:
@ -505,7 +506,7 @@ AideScript_GiveYouBalls:
promptbutton promptbutton
itemnotify itemnotify
closetext closetext
setscene SCENE_ELMSLAB_NOTHING setscene SCENE_ELMSLAB_NOOP
end end
AideScript_ReceiveTheBalls: AideScript_ReceiveTheBalls:
@ -560,7 +561,7 @@ CopScript:
closetext closetext
applymovement ELMSLAB_OFFICER, OfficerLeavesMovement applymovement ELMSLAB_OFFICER, OfficerLeavesMovement
disappear ELMSLAB_OFFICER disappear ELMSLAB_OFFICER
setscene SCENE_ELMSLAB_NOTHING setscene SCENE_ELMSLAB_NOOP
end end
ElmsLabWindow: ElmsLabWindow:

10
maps/FastShip1F.asm
View File

@ -6,9 +6,9 @@
FastShip1F_MapScripts: FastShip1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_FASTSHIP1F_NOOP
scene_script .EnterFastShip ; SCENE_FASTSHIP1F_ENTER_SHIP scene_script .EnterFastShip, SCENE_FASTSHIP1F_ENTER_SHIP
scene_script .DummyScene2 ; SCENE_FASTSHIP1F_MEET_GRANDPA scene_script .DummyScene2, SCENE_FASTSHIP1F_MEET_GRANDPA
def_callbacks def_callbacks
@ -37,7 +37,7 @@ FastShip1F_MapScripts:
end end
.SkipGrandpa: .SkipGrandpa:
setscene SCENE_DEFAULT setscene SCENE_FASTSHIP1F_NOOP
end end
FastShip1FSailor1Script: FastShip1FSailor1Script:
@ -133,7 +133,7 @@ WorriedGrandpaSceneLeft:
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
applymovement FASTSHIP1F_GENTLEMAN, FastShip1F_GrandpaRunsOutMovement applymovement FASTSHIP1F_GENTLEMAN, FastShip1F_GrandpaRunsOutMovement
disappear FASTSHIP1F_GENTLEMAN disappear FASTSHIP1F_GENTLEMAN
setscene SCENE_DEFAULT setscene SCENE_FASTSHIP1F_NOOP
end end
FastShip1F_SailorStepAsideMovement: FastShip1F_SailorStepAsideMovement:

8
maps/FastShipB1F.asm
View File

@ -14,8 +14,8 @@
FastShipB1F_MapScripts: FastShipB1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_FASTSHIPB1F_SAILOR_BLOCKS
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_FASTSHIPB1F_NOOP
def_callbacks def_callbacks
@ -454,8 +454,8 @@ FastShipB1F_MapEvents:
warp_event 31, 13, FAST_SHIP_1F, 12 warp_event 31, 13, FAST_SHIP_1F, 12
def_coord_events def_coord_events
coord_event 30, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksLeft coord_event 30, 7, SCENE_FASTSHIPB1F_SAILOR_BLOCKS, FastShipB1FSailorBlocksLeft
coord_event 31, 7, SCENE_DEFAULT, FastShipB1FSailorBlocksRight coord_event 31, 7, SCENE_FASTSHIPB1F_SAILOR_BLOCKS, FastShipB1FSailorBlocksRight
def_bg_events def_bg_events
bg_event 27, 9, BGEVENT_READ, FastShipB1FTrashcan bg_event 27, 9, BGEVENT_READ, FastShipB1FTrashcan

2
maps/FastShipCabins_NNW_NNE_NE.asm
View File

@ -96,7 +96,7 @@ FastShipLazySailorScript:
waitbutton waitbutton
closetext closetext
setevent EVENT_FAST_SHIP_LAZY_SAILOR setevent EVENT_FAST_SHIP_LAZY_SAILOR
setmapscene FAST_SHIP_B1F, SCENE_FINISHED setmapscene FAST_SHIP_B1F, SCENE_FASTSHIPB1F_NOOP
readvar VAR_FACING readvar VAR_FACING
ifequal RIGHT, .Movement2 ifequal RIGHT, .Movement2
applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement1 applymovement FASTSHIPCABINS_NNW_NNE_NE_SAILOR, FastShipLazySailorLeavesMovement1

4
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View File

@ -79,7 +79,7 @@ SSAquaGranddaughterBefore:
writetext SSAquaEntertainedGranddaughterText writetext SSAquaEntertainedGranddaughterText
promptbutton promptbutton
setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
setmapscene FAST_SHIP_1F, SCENE_DEFAULT setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_NOOP
sjump SSAquaMetalCoatAndDocking sjump SSAquaMetalCoatAndDocking
SSAquaGrandpa: SSAquaGrandpa:
@ -92,7 +92,7 @@ SSAquaGrandpa:
writetext SSAquaCantFindGranddaughterText writetext SSAquaCantFindGranddaughterText
waitbutton waitbutton
closetext closetext
setmapscene FAST_SHIP_1F, SCENE_DEFAULT setmapscene FAST_SHIP_1F, SCENE_FASTSHIP1F_NOOP
end end
SSAquaMetalCoatAndDocking: SSAquaMetalCoatAndDocking:

2
maps/FuchsiaPokecenter1F.asm
View File

@ -6,7 +6,7 @@
FuchsiaPokecenter1F_MapScripts: FuchsiaPokecenter1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene scene_script .DummyScene ; unusable
def_callbacks def_callbacks

6
maps/GoldenrodGym.asm
View File

@ -8,8 +8,8 @@
GoldenrodGym_MapScripts: GoldenrodGym_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_GOLDENRODGYM_NOTHING scene_script .DummyScene0, SCENE_GOLDENRODGYM_NOOP
scene_script .DummyScene1 ; SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING scene_script .DummyScene1, SCENE_GOLDENRODGYM_WHITNEY_STOPS_CRYING
def_callbacks def_callbacks
@ -110,7 +110,7 @@ WhitneyCriesScript:
waitbutton waitbutton
closetext closetext
applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement applymovement GOLDENRODGYM_LASS2, BridgetWalksAwayMovement
setscene SCENE_GOLDENRODGYM_NOTHING setscene SCENE_GOLDENRODGYM_NOOP
clearevent EVENT_MADE_WHITNEY_CRY clearevent EVENT_MADE_WHITNEY_CRY
end end

4
maps/GoldenrodMagnetTrainStation.asm
View File

@ -4,7 +4,7 @@
GoldenrodMagnetTrainStation_MapScripts: GoldenrodMagnetTrainStation_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT scene_script .DummyScene, SCENE_GOLDENRODMAGNETTRAINSTATION_ARRIVE_FROM_SAFFRON
def_callbacks def_callbacks
@ -172,7 +172,7 @@ GoldenrodMagnetTrainStation_MapEvents:
warp_event 11, 5, SAFFRON_MAGNET_TRAIN_STATION, 3 warp_event 11, 5, SAFFRON_MAGNET_TRAIN_STATION, 3
def_coord_events def_coord_events
coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromSaffron coord_event 11, 6, SCENE_GOLDENRODMAGNETTRAINSTATION_ARRIVE_FROM_SAFFRON, Script_ArriveFromSaffron
def_bg_events def_bg_events

5
maps/GoldenrodPokecenter1F.asm
View File

@ -7,6 +7,7 @@
GoldenrodPokecenter1F_MapScripts: GoldenrodPokecenter1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_const SCENE_GOLDENRODPOKECENTER1F_GS_BALL
def_callbacks def_callbacks
@ -811,8 +812,8 @@ GoldenrodPokecenter1F_MapEvents:
warp_event 0, 7, POKECENTER_2F, 1 warp_event 0, 7, POKECENTER_2F, 1
def_coord_events def_coord_events
coord_event 3, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneLeft coord_event 3, 7, SCENE_GOLDENRODPOKECENTER1F_GS_BALL, GoldenrodPokecenter1F_GSBallSceneLeft
coord_event 4, 7, SCENE_DEFAULT, GoldenrodPokecenter1F_GSBallSceneRight coord_event 4, 7, SCENE_GOLDENRODPOKECENTER1F_GS_BALL, GoldenrodPokecenter1F_GSBallSceneRight
def_bg_events def_bg_events

12
maps/GoldenrodUndergroundSwitchRoomEntrances.asm
View File

@ -47,8 +47,8 @@ ENDM
GoldenrodUndergroundSwitchRoomEntrances_MapScripts: GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .UpdateDoorPositions callback MAPCALLBACK_TILES, .UpdateDoorPositions
@ -131,7 +131,7 @@ UndergroundSilverScene1:
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1 applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
setscene SCENE_FINISHED setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOOP
waitsfx waitsfx
playmapmusic playmapmusic
end end
@ -150,7 +150,7 @@ UndergroundSilverScene2:
applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2 applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
setscene SCENE_FINISHED setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOOP
waitsfx waitsfx
playmapmusic playmapmusic
end end
@ -944,8 +944,8 @@ GoldenrodUndergroundSwitchRoomEntrances_MapEvents:
warp_event 21, 29, GOLDENROD_CITY, 13 warp_event 21, 29, GOLDENROD_CITY, 13
def_coord_events def_coord_events
coord_event 19, 4, SCENE_DEFAULT, UndergroundSilverScene1 coord_event 19, 4, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE, UndergroundSilverScene1
coord_event 19, 5, SCENE_DEFAULT, UndergroundSilverScene2 coord_event 19, 5, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE, UndergroundSilverScene2
def_bg_events def_bg_events
bg_event 16, 1, BGEVENT_READ, Switch1Script bg_event 16, 1, BGEVENT_READ, Switch1Script

8
maps/HallOfFame.asm
View File

@ -3,8 +3,8 @@
HallOfFame_MapScripts: HallOfFame_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .EnterHallOfFame ; SCENE_DEFAULT scene_script .EnterHallOfFame, SCENE_HALLOFFAME_ENTER
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_HALLOFFAME_NOOP
def_callbacks def_callbacks
@ -26,7 +26,7 @@ HallOfFame_MapScripts:
closetext closetext
turnobject HALLOFFAME_LANCE, UP turnobject HALLOFFAME_LANCE, UP
applymovement PLAYER, HallOfFame_SlowlyApproachMachine applymovement PLAYER, HallOfFame_SlowlyApproachMachine
setscene SCENE_FINISHED setscene SCENE_HALLOFFAME_NOOP
pause 15 pause 15
setval HEALMACHINE_HALL_OF_FAME setval HEALMACHINE_HALL_OF_FAME
special HealMachineAnim special HealMachineAnim
@ -36,7 +36,7 @@ HallOfFame_MapScripts:
clearevent EVENT_RED_IN_MT_SILVER clearevent EVENT_RED_IN_MT_SILVER
setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME setevent EVENT_OLIVINE_PORT_SPRITES_BEFORE_HALL_OF_FAME
clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME clearevent EVENT_OLIVINE_PORT_SPRITES_AFTER_HALL_OF_FAME
setmapscene SPROUT_TOWER_3F, SCENE_FINISHED setmapscene SPROUT_TOWER_3F, SCENE_SPROUTTOWER3F_NOOP
special HealParty special HealParty
checkevent EVENT_GOT_SS_TICKET_FROM_ELM checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue .SkipPhoneCall iftrue .SkipPhoneCall

20
maps/IndigoPlateauPokecenter1F.asm
View File

@ -8,7 +8,7 @@
IndigoPlateauPokecenter1F_MapScripts: IndigoPlateauPokecenter1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT scene_script .DummyScene, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .PrepareElite4 callback MAPCALLBACK_NEWMAP, .PrepareElite4
@ -17,12 +17,12 @@ IndigoPlateauPokecenter1F_MapScripts:
end end
.PrepareElite4: .PrepareElite4:
setmapscene WILLS_ROOM, SCENE_DEFAULT setmapscene WILLS_ROOM, SCENE_WILLSROOM_LOCK_DOOR
setmapscene KOGAS_ROOM, SCENE_DEFAULT setmapscene KOGAS_ROOM, SCENE_KOGASROOM_LOCK_DOOR
setmapscene BRUNOS_ROOM, SCENE_DEFAULT setmapscene BRUNOS_ROOM, SCENE_BRUNOSROOM_LOCK_DOOR
setmapscene KARENS_ROOM, SCENE_DEFAULT setmapscene KARENS_ROOM, SCENE_KARENSROOM_LOCK_DOOR
setmapscene LANCES_ROOM, SCENE_DEFAULT setmapscene LANCES_ROOM, SCENE_LANCESROOM_LOCK_DOOR
setmapscene HALL_OF_FAME, SCENE_DEFAULT setmapscene HALL_OF_FAME, SCENE_HALLOFFAME_ENTER
clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED clearevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
clearevent EVENT_WILLS_ROOM_EXIT_OPEN clearevent EVENT_WILLS_ROOM_EXIT_OPEN
clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED clearevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
@ -128,7 +128,7 @@ PlateauRivalPostBattle:
turnobject PLAYER, DOWN turnobject PLAYER, DOWN
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
disappear INDIGOPLATEAUPOKECENTER1F_SILVER disappear INDIGOPLATEAUPOKECENTER1F_SILVER
setscene SCENE_DEFAULT setscene SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE
playmapmusic playmapmusic
setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
PlateauRivalScriptDone: PlateauRivalScriptDone:
@ -310,8 +310,8 @@ IndigoPlateauPokecenter1F_MapEvents:
warp_event 14, 3, WILLS_ROOM, 1 warp_event 14, 3, WILLS_ROOM, 1
def_coord_events def_coord_events
coord_event 16, 4, SCENE_DEFAULT, PlateauRivalBattle1 coord_event 16, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE, PlateauRivalBattle1
coord_event 17, 4, SCENE_DEFAULT, PlateauRivalBattle2 coord_event 17, 4, SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE, PlateauRivalBattle2
def_bg_events def_bg_events

6
maps/KarensRoom.asm
View File

@ -3,8 +3,8 @@
KarensRoom_MapScripts: KarensRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LockDoor ; SCENE_DEFAULT scene_script .LockDoor, SCENE_KARENSROOM_LOCK_DOOR
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_KARENSROOM_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .KarensRoomDoors callback MAPCALLBACK_TILES, .KarensRoomDoors
@ -35,7 +35,7 @@ KarensRoom_MapScripts:
changeblock 4, 14, $2a ; wall changeblock 4, 14, $2a ; wall
reloadmappart reloadmappart
closetext closetext
setscene SCENE_FINISHED setscene SCENE_KARENSROOM_NOOP
setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED setevent EVENT_KARENS_ROOM_ENTRANCE_CLOSED
waitsfx waitsfx
end end

6
maps/KogasRoom.asm
View File

@ -3,8 +3,8 @@
KogasRoom_MapScripts: KogasRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LockDoor ; SCENE_DEFAULT scene_script .LockDoor, SCENE_KOGASROOM_LOCK_DOOR
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_KOGASROOM_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .KogasRoomDoors callback MAPCALLBACK_TILES, .KogasRoomDoors
@ -35,7 +35,7 @@ KogasRoom_MapScripts:
changeblock 4, 14, $2a ; wall changeblock 4, 14, $2a ; wall
reloadmappart reloadmappart
closetext closetext
setscene SCENE_FINISHED setscene SCENE_KOGASROOM_NOOP
setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED setevent EVENT_KOGAS_ROOM_ENTRANCE_CLOSED
waitsfx waitsfx
end end

4
maps/LancesRoom.asm
View File

@ -5,8 +5,8 @@
LancesRoom_MapScripts: LancesRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LockDoor ; SCENE_DEFAULT scene_script .LockDoor, SCENE_LANCESROOM_LOCK_DOOR
scene_script .DummyScene ; SCENE_LANCESROOM_APPROACH_LANCE scene_script .DummyScene, SCENE_LANCESROOM_APPROACH_LANCE
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .LancesRoomDoors callback MAPCALLBACK_TILES, .LancesRoomDoors

2
maps/LavenderNameRater.asm
View File

@ -3,7 +3,7 @@
LavenderNameRater_MapScripts: LavenderNameRater_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene scene_script .DummyScene ; unusable
def_callbacks def_callbacks

6
maps/MahoganyMart1F.asm
View File

@ -7,8 +7,8 @@
MahoganyMart1F_MapScripts: MahoganyMart1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_MAHOGANYMART1F_NOTHING scene_script .DummyScene0, SCENE_MAHOGANYMART1F_NOOP
scene_script .LanceUncoversStaircase ; SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS scene_script .LanceUncoversStaircase, SCENE_MAHOGANYMART1F_LANCE_UNCOVERS_STAIRS
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase callback MAPCALLBACK_TILES, .MahoganyMart1FStaircase
@ -99,7 +99,7 @@ MahoganyMart1FLanceUncoversStaircaseScript:
applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceGoDownStairsMovement applymovement MAHOGANYMART1F_LANCE, MahoganyMart1FLanceGoDownStairsMovement
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
disappear MAHOGANYMART1F_LANCE disappear MAHOGANYMART1F_LANCE
setscene SCENE_MAHOGANYMART1F_NOTHING setscene SCENE_MAHOGANYMART1F_NOOP
waitsfx waitsfx
end end

8
maps/MahoganyTown.asm
View File

@ -8,8 +8,8 @@ DEF MAHOGANYTOWN_RAGECANDYBAR_PRICE EQU 300
MahoganyTown_MapScripts: MahoganyTown_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_MAHOGANYTOWN_TRY_RAGECANDYBAR
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_MAHOGANYTOWN_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, .FlyPoint
@ -255,8 +255,8 @@ MahoganyTown_MapEvents:
warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3 warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3
def_coord_events def_coord_events
coord_event 19, 8, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript coord_event 19, 8, SCENE_MAHOGANYTOWN_TRY_RAGECANDYBAR, MahoganyTownTryARageCandyBarScript
coord_event 19, 9, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript coord_event 19, 9, SCENE_MAHOGANYTOWN_TRY_RAGECANDYBAR, MahoganyTownTryARageCandyBarScript
def_bg_events def_bg_events
bg_event 1, 5, BGEVENT_READ, MahoganyTownSign bg_event 1, 5, BGEVENT_READ, MahoganyTownSign

6
maps/MobileBattleRoom.asm
View File

@ -1,7 +1,7 @@
MobileBattleRoom_MapScripts: MobileBattleRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .InitializeMobileBattleRoom ; SCENE_DEFAULT scene_script .InitializeMobileBattleRoom, SCENE_MOBILEBATTLEROOM_INITIALIZE
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_MOBILEBATTLEROOM_NOOP
def_callbacks def_callbacks
@ -13,7 +13,7 @@ MobileBattleRoom_MapScripts:
end end
.InitializeAndPreparePokecenter2F: .InitializeAndPreparePokecenter2F:
setscene SCENE_FINISHED setscene SCENE_MOBILEBATTLEROOM_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
end end

6
maps/MobileTradeRoom.asm
View File

@ -1,7 +1,7 @@
MobileTradeRoom_MapScripts: MobileTradeRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .InitializeMobileTradeRoom ; SCENE_DEFAULT scene_script .InitializeMobileTradeRoom, SCENE_MOBILETRADEROOM_INITIALIZE
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_MOBILETRADEROOM_NOOP
def_callbacks def_callbacks
@ -13,7 +13,7 @@ MobileTradeRoom_MapScripts:
end end
.InitializeAndPreparePokecenter2F: .InitializeAndPreparePokecenter2F:
setscene SCENE_FINISHED setscene SCENE_MOBILETRADEROOM_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
end end

6
maps/MountMoon.asm
View File

@ -3,8 +3,8 @@
MountMoon_MapScripts: MountMoon_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .RivalEncounter ; SCENE_DEFAULT scene_script .RivalEncounter, SCENE_MOUNTMOON_RIVAL_BATTLE
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_MOUNTMOON_NOOP
def_callbacks def_callbacks
@ -64,7 +64,7 @@ MountMoon_MapScripts:
closetext closetext
applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter
disappear MOUNTMOON_SILVER disappear MOUNTMOON_SILVER
setscene SCENE_FINISHED setscene SCENE_MOUNTMOON_NOOP
setevent EVENT_BEAT_RIVAL_IN_MT_MOON setevent EVENT_BEAT_RIVAL_IN_MT_MOON
playmapmusic playmapmusic
end end

4
maps/MountMoonSquare.asm
View File

@ -5,7 +5,7 @@
MountMoonSquare_MapScripts: MountMoonSquare_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT scene_script .DummyScene, SCENE_MOUNTMOONSQUARE_CLEFAIRY_DANCE
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .DisappearMoonStone callback MAPCALLBACK_NEWMAP, .DisappearMoonStone
@ -139,7 +139,7 @@ MountMoonSquare_MapEvents:
warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1 warp_event 13, 7, MOUNT_MOON_GIFT_SHOP, 1
def_coord_events def_coord_events
coord_event 7, 11, SCENE_DEFAULT, ClefairyDance coord_event 7, 11, SCENE_MOUNTMOONSQUARE_CLEFAIRY_DANCE, ClefairyDance
def_bg_events def_bg_events
bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone bg_event 7, 7, BGEVENT_ITEM, MountMoonSquareHiddenMoonStone

6
maps/MrPokemonsHouse.asm
View File

@ -4,8 +4,8 @@
MrPokemonsHouse_MapScripts: MrPokemonsHouse_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .MeetMrPokemon ; SCENE_DEFAULT scene_script .MeetMrPokemon, SCENE_MRPOKEMONSHOUSE_MEET_MR_POKEMON
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_MRPOKEMONSHOUSE_NOOP
def_callbacks def_callbacks
@ -123,7 +123,7 @@ MrPokemonsHouse_OakScript:
setevent EVENT_RIVAL_NEW_BARK_TOWN setevent EVENT_RIVAL_NEW_BARK_TOWN
setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR setevent EVENT_PLAYERS_HOUSE_1F_NEIGHBOR
clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR clearevent EVENT_PLAYERS_NEIGHBORS_HOUSE_NEIGHBOR
setscene SCENE_FINISHED setscene SCENE_MRPOKEMONSHOUSE_NOOP
setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_MEET_RIVAL setmapscene CHERRYGROVE_CITY, SCENE_CHERRYGROVECITY_MEET_RIVAL
setmapscene ELMS_LAB, SCENE_ELMSLAB_MEET_OFFICER setmapscene ELMS_LAB, SCENE_ELMSLAB_MEET_OFFICER
specialphonecall SPECIALCALL_ROBBED specialphonecall SPECIALCALL_ROBBED

8
maps/NewBarkTown.asm
View File

@ -5,8 +5,8 @@
NewBarkTown_MapScripts: NewBarkTown_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_NEWBARKTOWN_TEACHER_STOPS_YOU
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_NEWBARKTOWN_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, .FlyPoint
@ -289,8 +289,8 @@ NewBarkTown_MapEvents:
warp_event 11, 13, ELMS_HOUSE, 1 warp_event 11, 13, ELMS_HOUSE, 1
def_coord_events def_coord_events
coord_event 1, 8, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene1 coord_event 1, 8, SCENE_NEWBARKTOWN_TEACHER_STOPS_YOU, NewBarkTown_TeacherStopsYouScene1
coord_event 1, 9, SCENE_DEFAULT, NewBarkTown_TeacherStopsYouScene2 coord_event 1, 9, SCENE_NEWBARKTOWN_TEACHER_STOPS_YOU, NewBarkTown_TeacherStopsYouScene2
def_bg_events def_bg_events
bg_event 8, 8, BGEVENT_READ, NewBarkTownSign bg_event 8, 8, BGEVENT_READ, NewBarkTownSign

12
maps/OlivineCity.asm
View File

@ -6,8 +6,8 @@
OlivineCity_MapScripts: OlivineCity_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_OLIVINECITY_RIVAL_ENCOUNTER
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_OLIVINECITY_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, .FlyPoint
@ -39,7 +39,7 @@ OlivineCityRivalSceneTop:
applymovement PLAYER, OlivineCityPlayerStepsAsideTopMovement applymovement PLAYER, OlivineCityPlayerStepsAsideTopMovement
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
applymovement OLIVINECITY_OLIVINE_RIVAL, OlivineCityRivalLeavesTopMovement applymovement OLIVINECITY_OLIVINE_RIVAL, OlivineCityRivalLeavesTopMovement
setscene SCENE_FINISHED setscene SCENE_OLIVINECITY_NOOP
disappear OLIVINECITY_OLIVINE_RIVAL disappear OLIVINECITY_OLIVINE_RIVAL
special RestartMapMusic special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
@ -64,7 +64,7 @@ OlivineCityRivalSceneBottom:
turnobject PLAYER, RIGHT turnobject PLAYER, RIGHT
applymovement OLIVINECITY_OLIVINE_RIVAL, OlivineCityRivalLeavesBottomMovement applymovement OLIVINECITY_OLIVINE_RIVAL, OlivineCityRivalLeavesBottomMovement
disappear OLIVINECITY_OLIVINE_RIVAL disappear OLIVINECITY_OLIVINE_RIVAL
setscene SCENE_FINISHED setscene SCENE_OLIVINECITY_NOOP
special RestartMapMusic special RestartMapMusic
variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
special LoadUsedSpritesGFX special LoadUsedSpritesGFX
@ -303,8 +303,8 @@ OlivineCity_MapEvents:
warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2 warp_event 20, 27, OLIVINE_PORT_PASSAGE, 2
def_coord_events def_coord_events
coord_event 13, 12, SCENE_DEFAULT, OlivineCityRivalSceneTop coord_event 13, 12, SCENE_OLIVINECITY_RIVAL_ENCOUNTER, OlivineCityRivalSceneTop
coord_event 13, 13, SCENE_DEFAULT, OlivineCityRivalSceneBottom coord_event 13, 13, SCENE_OLIVINECITY_RIVAL_ENCOUNTER, OlivineCityRivalSceneBottom
def_bg_events def_bg_events
bg_event 17, 11, BGEVENT_READ, OlivineCitySign bg_event 17, 11, BGEVENT_READ, OlivineCitySign

8
maps/OlivinePort.asm
View File

@ -9,8 +9,8 @@
OlivinePort_MapScripts: OlivinePort_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_OLIVINEPORT_ASK_ENTER_SHIP
scene_script .LeaveFastShip ; SCENE_OLIVINEPORT_LEAVE_SHIP scene_script .LeaveFastShip, SCENE_OLIVINEPORT_LEAVE_SHIP
def_callbacks def_callbacks
@ -24,7 +24,7 @@ OlivinePort_MapScripts:
.LeaveFastShipScript: .LeaveFastShipScript:
applymovement PLAYER, OlivinePortLeaveFastShipMovement applymovement PLAYER, OlivinePortLeaveFastShipMovement
appear OLIVINEPORT_SAILOR1 appear OLIVINEPORT_SAILOR1
setscene SCENE_DEFAULT setscene SCENE_OLIVINEPORT_ASK_ENTER_SHIP
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
blackoutmod OLIVINE_CITY blackoutmod OLIVINE_CITY
end end
@ -390,7 +390,7 @@ OlivinePort_MapEvents:
warp_event 7, 23, FAST_SHIP_1F, 1 warp_event 7, 23, FAST_SHIP_1F, 1
def_coord_events def_coord_events
coord_event 7, 15, SCENE_DEFAULT, OlivinePortWalkUpToShipScript coord_event 7, 15, SCENE_OLIVINEPORT_ASK_ENTER_SHIP, OlivinePortWalkUpToShipScript
def_bg_events def_bg_events
bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein bg_event 1, 22, BGEVENT_ITEM, OlivinePortHiddenProtein

12
maps/PlayersHouse1F.asm
View File

@ -7,8 +7,8 @@
PlayersHouse1F_MapScripts: PlayersHouse1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_PLAYERSHOUSE1F_MEET_MOM
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_PLAYERSHOUSE1F_NOOP
def_callbacks def_callbacks
@ -41,7 +41,7 @@ MeetMomScript:
setflag ENGINE_POKEGEAR setflag ENGINE_POKEGEAR
setflag ENGINE_PHONE_CARD setflag ENGINE_PHONE_CARD
addcellnum PHONE_MOM addcellnum PHONE_MOM
setscene SCENE_FINISHED setscene SCENE_PLAYERSHOUSE1F_NOOP
setevent EVENT_PLAYERS_HOUSE_MOM_1 setevent EVENT_PLAYERS_HOUSE_MOM_1
clearevent EVENT_PLAYERS_HOUSE_MOM_2 clearevent EVENT_PLAYERS_HOUSE_MOM_2
writetext MomGivesPokegearText writetext MomGivesPokegearText
@ -114,7 +114,7 @@ MomScript:
faceplayer faceplayer
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2 setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
checkscene checkscene
iffalse MeetMomTalkedScript ; SCENE_DEFAULT iffalse MeetMomTalkedScript ; SCENE_PLAYERSHOUSE1F_MEET_MOM
opentext opentext
checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
iftrue .FirstTimeBanking iftrue .FirstTimeBanking
@ -392,8 +392,8 @@ PlayersHouse1F_MapEvents:
warp_event 9, 0, PLAYERS_HOUSE_2F, 1 warp_event 9, 0, PLAYERS_HOUSE_2F, 1
def_coord_events def_coord_events
coord_event 8, 4, SCENE_DEFAULT, MeetMomLeftScript coord_event 8, 4, SCENE_PLAYERSHOUSE1F_MEET_MOM, MeetMomLeftScript
coord_event 9, 4, SCENE_DEFAULT, MeetMomRightScript coord_event 9, 4, SCENE_PLAYERSHOUSE1F_MEET_MOM, MeetMomRightScript
def_bg_events def_bg_events
bg_event 0, 1, BGEVENT_READ, PlayersHouse1FStoveScript bg_event 0, 1, BGEVENT_READ, PlayersHouse1FStoveScript

32
maps/Pokecenter2F.asm
View File

@ -6,12 +6,12 @@
Pokecenter2F_MapScripts: Pokecenter2F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .Scene0 ; SCENE_DEFAULT scene_script .Scene0, SCENE_POKECENTER2F_NOOP
scene_script .Scene1 ; SCENE_POKECENTER2F_LEAVE_TRADE_CENTER scene_script .Scene1, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
scene_script .Scene2 ; SCENE_POKECENTER2F_LEAVE_COLOSSEUM scene_script .Scene2, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
scene_script .Scene3 ; SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE scene_script .Scene3, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
scene_script .Scene4 ; SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM scene_script .Scene4, SCENE_POKECENTER2F_LEAVE_MOBILE_TRADE_ROOM
scene_script .Scene5 ; SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM scene_script .Scene5, SCENE_POKECENTER2F_LEAVE_MOBILE_BATTLE_ROOM
def_callbacks def_callbacks
@ -374,15 +374,15 @@ LinkReceptionistScript_TimeCapsule:
Script_LeftCableTradeCenter: Script_LeftCableTradeCenter:
special WaitForOtherPlayerToExit special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkTradeRoom scall Script_WalkOutOfLinkTradeRoom
setscene SCENE_DEFAULT setscene SCENE_POKECENTER2F_NOOP
setmapscene TRADE_CENTER, SCENE_DEFAULT setmapscene TRADE_CENTER, SCENE_TRADECENTER_INITIALIZE
end end
Script_LeftMobileTradeRoom: Script_LeftMobileTradeRoom:
special Function101220 special Function101220
scall Script_WalkOutOfMobileTradeRoom scall Script_WalkOutOfMobileTradeRoom
setscene SCENE_DEFAULT setscene SCENE_POKECENTER2F_NOOP
setmapscene MOBILE_TRADE_ROOM, SCENE_DEFAULT setmapscene MOBILE_TRADE_ROOM, SCENE_MOBILETRADEROOM_INITIALIZE
end end
Script_WalkOutOfMobileTradeRoom: Script_WalkOutOfMobileTradeRoom:
@ -394,15 +394,15 @@ Script_WalkOutOfMobileTradeRoom:
Script_LeftCableColosseum: Script_LeftCableColosseum:
special WaitForOtherPlayerToExit special WaitForOtherPlayerToExit
scall Script_WalkOutOfLinkBattleRoom scall Script_WalkOutOfLinkBattleRoom
setscene SCENE_DEFAULT setscene SCENE_POKECENTER2F_NOOP
setmapscene COLOSSEUM, SCENE_DEFAULT setmapscene COLOSSEUM, SCENE_COLOSSEUM_INITIALIZE
end end
Script_LeftMobileBattleRoom: Script_LeftMobileBattleRoom:
special Function101220 special Function101220
scall Script_WalkOutOfMobileBattleRoom scall Script_WalkOutOfMobileBattleRoom
setscene SCENE_DEFAULT setscene SCENE_POKECENTER2F_NOOP
setmapscene MOBILE_BATTLE_ROOM, SCENE_DEFAULT setmapscene MOBILE_BATTLE_ROOM, SCENE_MOBILEBATTLEROOM_INITIALIZE
end end
Script_WalkOutOfMobileBattleRoom: Script_WalkOutOfMobileBattleRoom:
@ -577,8 +577,8 @@ Script_LeftTimeCapsule:
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2 applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
.Done: .Done:
setscene SCENE_DEFAULT setscene SCENE_POKECENTER2F_NOOP
setmapscene TIME_CAPSULE, SCENE_DEFAULT setmapscene TIME_CAPSULE, SCENE_TIMECAPSULE_INITIALIZE
end end
Pokecenter2FLinkRecordSign: Pokecenter2FLinkRecordSign:

6
maps/PowerPlant.asm
View File

@ -9,8 +9,8 @@
PowerPlant_MapScripts: PowerPlant_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_POWERPLANT_NOTHING scene_script .DummyScene0, SCENE_POWERPLANT_NOOP
scene_script .DummyScene1 ; SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL scene_script .DummyScene1, SCENE_POWERPLANT_GUARD_GETS_PHONE_CALL
def_callbacks def_callbacks
@ -40,7 +40,7 @@ PowerPlantGuardPhoneScript:
closetext closetext
turnobject PLAYER, DOWN turnobject PLAYER, DOWN
applymovement POWERPLANT_OFFICER1, PowerPlantOfficer1ReturnToPostMovement applymovement POWERPLANT_OFFICER1, PowerPlantOfficer1ReturnToPostMovement
setscene SCENE_POWERPLANT_NOTHING setscene SCENE_POWERPLANT_NOOP
end end
PowerPlantOfficerScript: PowerPlantOfficerScript:

12
maps/RadioTower5F.asm
View File

@ -7,9 +7,9 @@
RadioTower5F_MapScripts: RadioTower5F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_RADIOTOWER5F_FAKE_DIRECTOR
scene_script .DummyScene1 ; SCENE_RADIOTOWER5F_ROCKET_BOSS scene_script .DummyScene1, SCENE_RADIOTOWER5F_ROCKET_BOSS
scene_script .DummyScene2 ; SCENE_RADIOTOWER5F_NOTHING scene_script .DummyScene2, SCENE_RADIOTOWER5F_NOOP
def_callbacks def_callbacks
@ -124,8 +124,8 @@ RadioTower5FRocketBossScene:
writetext RadioTower5FDirectorDescribeClearBellText writetext RadioTower5FDirectorDescribeClearBellText
waitbutton waitbutton
closetext closetext
setscene SCENE_RADIOTOWER5F_NOTHING setscene SCENE_RADIOTOWER5F_NOOP
setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_DEFAULT setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_ECRUTEAKTINTOWERENTRANCE_SAGE_BLOCKS
setevent EVENT_GOT_CLEAR_BELL setevent EVENT_GOT_CLEAR_BELL
setevent EVENT_TEAM_ROCKET_DISBANDED setevent EVENT_TEAM_ROCKET_DISBANDED
sjump .UselessJump sjump .UselessJump
@ -426,7 +426,7 @@ RadioTower5F_MapEvents:
warp_event 12, 0, RADIO_TOWER_4F, 3 warp_event 12, 0, RADIO_TOWER_4F, 3
def_coord_events def_coord_events
coord_event 0, 3, SCENE_DEFAULT, FakeDirectorScript coord_event 0, 3, SCENE_RADIOTOWER5F_FAKE_DIRECTOR, FakeDirectorScript
coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene coord_event 16, 5, SCENE_RADIOTOWER5F_ROCKET_BOSS, RadioTower5FRocketBossScene
def_bg_events def_bg_events

2
maps/RedsHouse1F.asm
View File

@ -3,7 +3,7 @@
RedsHouse1F_MapScripts: RedsHouse1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene scene_script .DummyScene ; unusable
def_callbacks def_callbacks

6
maps/Route16Gate.asm
View File

@ -3,7 +3,7 @@
Route16Gate_MapScripts: Route16Gate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT scene_script .DummyScene, SCENE_ROUTE16GATE_BICYCLE_CHECK
def_callbacks def_callbacks
@ -68,8 +68,8 @@ Route16Gate_MapEvents:
warp_event 9, 5, ROUTE_16, 3 warp_event 9, 5, ROUTE_16, 3
def_coord_events def_coord_events
coord_event 5, 4, SCENE_DEFAULT, Route16GateBicycleCheck coord_event 5, 4, SCENE_ROUTE16GATE_BICYCLE_CHECK, Route16GateBicycleCheck
coord_event 5, 5, SCENE_DEFAULT, Route16GateBicycleCheck coord_event 5, 5, SCENE_ROUTE16GATE_BICYCLE_CHECK, Route16GateBicycleCheck
def_bg_events def_bg_events

6
maps/Route17Route18Gate.asm
View File

@ -3,7 +3,7 @@
Route17Route18Gate_MapScripts: Route17Route18Gate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT scene_script .DummyScene, SCENE_ROUTE17ROUTE18GATE_BICYCLE_CHECK
def_callbacks def_callbacks
@ -59,8 +59,8 @@ Route17Route18Gate_MapEvents:
warp_event 9, 5, ROUTE_18, 2 warp_event 9, 5, ROUTE_18, 2
def_coord_events def_coord_events
coord_event 5, 4, SCENE_DEFAULT, Route17Route18GateBicycleCheck coord_event 5, 4, SCENE_ROUTE17ROUTE18GATE_BICYCLE_CHECK, Route17Route18GateBicycleCheck
coord_event 5, 5, SCENE_DEFAULT, Route17Route18GateBicycleCheck coord_event 5, 5, SCENE_ROUTE17ROUTE18GATE_BICYCLE_CHECK, Route17Route18GateBicycleCheck
def_bg_events def_bg_events

8
maps/Route25.asm
View File

@ -13,8 +13,8 @@
Route25_MapScripts: Route25_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_ROUTE25_NOTHING scene_script .DummyScene0, SCENE_ROUTE25_NOOP
scene_script .DummyScene1 ; SCENE_ROUTE25_MISTYS_DATE scene_script .DummyScene1, SCENE_ROUTE25_MISTYS_DATE
def_callbacks def_callbacks
@ -46,7 +46,7 @@ Route25MistyDate1Script:
applymovement ROUTE25_MISTY, Route25MistyLeavesMovement applymovement ROUTE25_MISTY, Route25MistyLeavesMovement
disappear ROUTE25_MISTY disappear ROUTE25_MISTY
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
setscene SCENE_ROUTE25_NOTHING setscene SCENE_ROUTE25_NOOP
special RestartMapMusic special RestartMapMusic
end end
@ -72,7 +72,7 @@ Route25MistyDate2Script:
applymovement ROUTE25_MISTY, Route25MistyLeavesMovement applymovement ROUTE25_MISTY, Route25MistyLeavesMovement
disappear ROUTE25_MISTY disappear ROUTE25_MISTY
clearevent EVENT_TRAINERS_IN_CERULEAN_GYM clearevent EVENT_TRAINERS_IN_CERULEAN_GYM
setscene SCENE_ROUTE25_NOTHING setscene SCENE_ROUTE25_NOOP
special RestartMapMusic special RestartMapMusic
end end

10
maps/Route27.asm
View File

@ -11,8 +11,8 @@
Route27_MapScripts: Route27_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_ROUTE27_FIRST_STEP_INTO_KANTO
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_ROUTE27_NOOP
def_callbacks def_callbacks
@ -40,7 +40,7 @@ FirstStepIntoKantoScene_Continue:
writetext Route27FisherText writetext Route27FisherText
waitbutton waitbutton
closetext closetext
setscene SCENE_FINISHED setscene SCENE_ROUTE27_NOOP
end end
Route27FisherScript: Route27FisherScript:
@ -474,8 +474,8 @@ Route27_MapEvents:
warp_event 36, 5, TOHJO_FALLS, 2 warp_event 36, 5, TOHJO_FALLS, 2
def_coord_events def_coord_events
coord_event 18, 10, SCENE_DEFAULT, FirstStepIntoKantoLeftScene coord_event 18, 10, SCENE_ROUTE27_FIRST_STEP_INTO_KANTO, FirstStepIntoKantoLeftScene
coord_event 19, 10, SCENE_DEFAULT, FirstStepIntoKantoRightScene coord_event 19, 10, SCENE_ROUTE27_FIRST_STEP_INTO_KANTO, FirstStepIntoKantoRightScene
def_bg_events def_bg_events
bg_event 25, 7, BGEVENT_READ, TohjoFallsSign bg_event 25, 7, BGEVENT_READ, TohjoFallsSign

2
maps/Route28SteelWingHouse.asm
View File

@ -4,7 +4,7 @@
Route28SteelWingHouse_MapScripts: Route28SteelWingHouse_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene scene_script .DummyScene ; unusable
def_callbacks def_callbacks

12
maps/Route29.asm
View File

@ -10,8 +10,8 @@
Route29_MapScripts: Route29_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_ROUTE29_NOTHING scene_script .DummyScene0, SCENE_ROUTE29_NOOP
scene_script .DummyScene1 ; SCENE_ROUTE29_CATCH_TUTORIAL scene_script .DummyScene1, SCENE_ROUTE29_CATCH_TUTORIAL
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .Tuscany callback MAPCALLBACK_OBJECTS, .Tuscany
@ -57,7 +57,7 @@ Route29Tutorial1:
writetext CatchingTutorialDebriefText writetext CatchingTutorialDebriefText
waitbutton waitbutton
closetext closetext
setscene SCENE_ROUTE29_NOTHING setscene SCENE_ROUTE29_NOOP
setevent EVENT_LEARNED_TO_CATCH_POKEMON setevent EVENT_LEARNED_TO_CATCH_POKEMON
end end
@ -82,7 +82,7 @@ Route29Tutorial2:
writetext CatchingTutorialDebriefText writetext CatchingTutorialDebriefText
waitbutton waitbutton
closetext closetext
setscene SCENE_ROUTE29_NOTHING setscene SCENE_ROUTE29_NOOP
setevent EVENT_LEARNED_TO_CATCH_POKEMON setevent EVENT_LEARNED_TO_CATCH_POKEMON
end end
@ -91,7 +91,7 @@ Script_RefusedTutorial1:
waitbutton waitbutton
closetext closetext
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData1b
setscene SCENE_ROUTE29_NOTHING setscene SCENE_ROUTE29_NOOP
end end
Script_RefusedTutorial2: Script_RefusedTutorial2:
@ -99,7 +99,7 @@ Script_RefusedTutorial2:
waitbutton waitbutton
closetext closetext
applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b applymovement ROUTE29_COOLTRAINER_M1, DudeMovementData2b
setscene SCENE_ROUTE29_NOTHING setscene SCENE_ROUTE29_NOOP
end end
CatchingTutorialDudeScript: CatchingTutorialDudeScript:

10
maps/Route32.asm
View File

@ -16,9 +16,9 @@
Route32_MapScripts: Route32_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_ROUTE32_COOLTRAINER_M_BLOCKS
scene_script .DummyScene1 ; SCENE_ROUTE32_OFFER_SLOWPOKETAIL scene_script .DummyScene1, SCENE_ROUTE32_OFFER_SLOWPOKETAIL
scene_script .DummyScene2 ; SCENE_ROUTE32_NOTHING scene_script .DummyScene2, SCENE_ROUTE32_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .Frieda callback MAPCALLBACK_OBJECTS, .Frieda
@ -125,7 +125,7 @@ Route32WannaBuyASlowpokeTailScript:
SlowpokeTailSalesmanScript: SlowpokeTailSalesmanScript:
faceplayer faceplayer
_OfferToSellSlowpokeTail: _OfferToSellSlowpokeTail:
setscene SCENE_ROUTE32_NOTHING setscene SCENE_ROUTE32_NOOP
opentext opentext
writetext Text_MillionDollarSlowpokeTail writetext Text_MillionDollarSlowpokeTail
yesorno yesorno
@ -930,7 +930,7 @@ Route32_MapEvents:
warp_event 6, 79, UNION_CAVE_1F, 4 warp_event 6, 79, UNION_CAVE_1F, 4
def_coord_events def_coord_events
coord_event 18, 8, SCENE_DEFAULT, Route32CooltrainerMStopsYouScene coord_event 18, 8, SCENE_ROUTE32_COOLTRAINER_M_BLOCKS, Route32CooltrainerMStopsYouScene
coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript coord_event 7, 71, SCENE_ROUTE32_OFFER_SLOWPOKETAIL, Route32WannaBuyASlowpokeTailScript
def_bg_events def_bg_events

3
maps/Route34IlexForestGate.asm
View File

@ -6,6 +6,7 @@
Route34IlexForestGate_MapScripts: Route34IlexForestGate_MapScripts:
def_scene_scripts def_scene_scripts
scene_const SCENE_ROUTE34ILEXFORESTGATE_TEACHER_BLOCKS_IF_FOREST_IS_RESTLESS
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .IsForestRestless callback MAPCALLBACK_OBJECTS, .IsForestRestless
@ -143,7 +144,7 @@ Route34IlexForestGate_MapEvents:
warp_event 5, 7, ILEX_FOREST, 1 warp_event 5, 7, ILEX_FOREST, 1
def_coord_events def_coord_events
coord_event 4, 7, SCENE_DEFAULT, Route34IlexForestGateCelebiEvent coord_event 4, 7, SCENE_ROUTE34ILEXFORESTGATE_TEACHER_BLOCKS_IF_FOREST_IS_RESTLESS, Route34IlexForestGateCelebiEvent
def_bg_events def_bg_events

8
maps/Route35NationalParkGate.asm
View File

@ -5,9 +5,9 @@
Route35NationalParkGate_MapScripts: Route35NationalParkGate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_ROUTE35NATIONALPARKGATE_NOTHING scene_script .DummyScene0, SCENE_ROUTE35NATIONALPARKGATE_NOOP
scene_script .DummyScene1 ; SCENE_ROUTE35NATIONALPARKGATE_UNUSED scene_script .DummyScene1, SCENE_ROUTE35NATIONALPARKGATE_UNUSED
scene_script .LeaveContestEarly ; SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY scene_script .LeaveContestEarly, SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
@ -26,7 +26,7 @@ Route35NationalParkGate_MapScripts:
.CheckIfContestRunning: .CheckIfContestRunning:
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning iftrue .BugContestIsRunning
setscene SCENE_ROUTE35NATIONALPARKGATE_NOTHING setscene SCENE_ROUTE35NATIONALPARKGATE_NOOP
endcallback endcallback
.BugContestIsRunning: .BugContestIsRunning:

6
maps/Route36.asm
View File

@ -11,8 +11,8 @@
Route36_MapScripts: Route36_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_ROUTE36_NOTHING scene_script .DummyScene0, SCENE_ROUTE36_NOOP
scene_script .DummyScene1 ; SCENE_ROUTE36_SUICUNE scene_script .DummyScene1, SCENE_ROUTE36_SUICUNE
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .ArthurCallback callback MAPCALLBACK_OBJECTS, .ArthurCallback
@ -42,7 +42,7 @@ Route36SuicuneScript:
disappear ROUTE36_SUICUNE disappear ROUTE36_SUICUNE
turnobject PLAYER, DOWN turnobject PLAYER, DOWN
pause 10 pause 10
setscene SCENE_ROUTE36_NOTHING setscene SCENE_ROUTE36_NOOP
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_SUICUNE_AND_EUSINE
end end

8
maps/Route36NationalParkGate.asm
View File

@ -14,9 +14,9 @@
Route36NationalParkGate_MapScripts: Route36NationalParkGate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_ROUTE36NATIONALPARKGATE_NOTHING scene_script .DummyScene0, SCENE_ROUTE36NATIONALPARKGATE_NOOP
scene_script .DummyScene1 ; SCENE_ROUTE36NATIONALPARKGATE_UNUSED scene_script .DummyScene1, SCENE_ROUTE36NATIONALPARKGATE_UNUSED
scene_script .LeaveContestEarly ; SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY scene_script .LeaveContestEarly, SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning callback MAPCALLBACK_NEWMAP, .CheckIfContestRunning
@ -35,7 +35,7 @@ Route36NationalParkGate_MapScripts:
.CheckIfContestRunning: .CheckIfContestRunning:
checkflag ENGINE_BUG_CONTEST_TIMER checkflag ENGINE_BUG_CONTEST_TIMER
iftrue .BugContestIsRunning iftrue .BugContestIsRunning
setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING setscene SCENE_ROUTE36NATIONALPARKGATE_NOOP
endcallback endcallback
.BugContestIsRunning: .BugContestIsRunning:

6
maps/Route42.asm
View File

@ -11,8 +11,8 @@
Route42_MapScripts: Route42_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_ROUTE42_NOTHING scene_script .DummyScene0, SCENE_ROUTE42_NOOP
scene_script .DummyScene1 ; SCENE_ROUTE42_SUICUNE scene_script .DummyScene1, SCENE_ROUTE42_SUICUNE
def_callbacks def_callbacks
@ -29,7 +29,7 @@ Route42SuicuneScript:
applymovement ROUTE42_SUICUNE, Route42SuicuneMovement applymovement ROUTE42_SUICUNE, Route42SuicuneMovement
disappear ROUTE42_SUICUNE disappear ROUTE42_SUICUNE
pause 10 pause 10
setscene SCENE_ROUTE42_NOTHING setscene SCENE_ROUTE42_NOOP
clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36 clearevent EVENT_SAW_SUICUNE_ON_ROUTE_36
setmapscene ROUTE_36, SCENE_ROUTE36_SUICUNE setmapscene ROUTE_36, SCENE_ROUTE36_SUICUNE
end end

4
maps/Route43.asm
View File

@ -17,11 +17,11 @@ Route43_MapScripts:
.CheckIfRockets: .CheckIfRockets:
checkevent EVENT_CLEARED_ROCKET_HIDEOUT checkevent EVENT_CLEARED_ROCKET_HIDEOUT
iftrue .NoRockets iftrue .NoRockets
setmapscene ROUTE_43_GATE, SCENE_DEFAULT setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_ROCKET_SHAKEDOWN
endcallback endcallback
.NoRockets: .NoRockets:
setmapscene ROUTE_43_GATE, SCENE_FINISHED setmapscene ROUTE_43_GATE, SCENE_ROUTE43GATE_NOOP
endcallback endcallback
TrainerCamperSpencer: TrainerCamperSpencer:

10
maps/Route43Gate.asm
View File

@ -7,8 +7,8 @@ DEF ROUTE43GATE_TOLL EQU 1000
Route43Gate_MapScripts: Route43Gate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .RocketShakedown ; SCENE_DEFAULT scene_script .RocketShakedown, SCENE_ROUTE43GATE_ROCKET_SHAKEDOWN
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_ROUTE43GATE_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .CheckIfRockets callback MAPCALLBACK_NEWMAP, .CheckIfRockets
@ -35,7 +35,7 @@ Route43Gate_MapScripts:
readvar VAR_FACING readvar VAR_FACING
ifequal DOWN, RocketScript_Southbound ifequal DOWN, RocketScript_Southbound
ifequal UP, RocketScript_Northbound ifequal UP, RocketScript_Northbound
setscene SCENE_FINISHED setscene SCENE_ROUTE43GATE_NOOP
end end
RocketScript_Southbound: RocketScript_Southbound:
@ -67,7 +67,7 @@ RocketScript_ShakeDownSouth:
closetext closetext
applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassSouth
applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassSouth
setscene SCENE_FINISHED setscene SCENE_ROUTE43GATE_NOOP
special RestartMapMusic special RestartMapMusic
end end
@ -99,7 +99,7 @@ RocketScript_ShakeDownNorth:
closetext closetext
applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth applymovement ROUTE43GATE_ROCKET2, Rocket2Script_LetsYouPassNorth
applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth applymovement ROUTE43GATE_ROCKET1, Rocket1Script_LetsYouPassNorth
setscene SCENE_FINISHED setscene SCENE_ROUTE43GATE_NOOP
special RestartMapMusic special RestartMapMusic
end end

2
maps/Route6SaffronGate.asm
View File

@ -3,7 +3,7 @@
Route6SaffronGate_MapScripts: Route6SaffronGate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene scene_script .DummyScene ; unusable
def_callbacks def_callbacks

6
maps/RuinsOfAlphAerodactylChamber.asm
View File

@ -1,7 +1,7 @@
RuinsOfAlphAerodactylChamber_MapScripts: RuinsOfAlphAerodactylChamber_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .CheckWall ; SCENE_DEFAULT scene_script .CheckWall, SCENE_RUINSOFALPHAERODACTYLCHAMBER_CHECK_WALL
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .HiddenDoors callback MAPCALLBACK_TILES, .HiddenDoors
@ -41,7 +41,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
changeblock 4, 0, $30 ; open wall changeblock 4, 0, $30 ; open wall
reloadmappart reloadmappart
earthquake 50 earthquake 50
setscene SCENE_FINISHED setscene SCENE_RUINSOFALPHAERODACTYLCHAMBER_NOOP
closetext closetext
end end

6
maps/RuinsOfAlphHoOhChamber.asm
View File

@ -1,7 +1,7 @@
RuinsOfAlphHoOhChamber_MapScripts: RuinsOfAlphHoOhChamber_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .CheckWall ; SCENE_DEFAULT scene_script .CheckWall, SCENE_RUINSOFALPHHOOHCHAMBER_CHECK_WALL
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_RUINSOFALPHHOOHCHAMBER_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .HiddenDoors callback MAPCALLBACK_TILES, .HiddenDoors
@ -42,7 +42,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
changeblock 4, 0, $30 ; open wall changeblock 4, 0, $30 ; open wall
reloadmappart reloadmappart
earthquake 50 earthquake 50
setscene SCENE_FINISHED setscene SCENE_RUINSOFALPHHOOHCHAMBER_NOOP
closetext closetext
end end

6
maps/RuinsOfAlphInnerChamber.asm
View File

@ -5,8 +5,8 @@
RuinsOfAlphInnerChamber_MapScripts: RuinsOfAlphInnerChamber_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_RUINSOFALPHINNERCHAMBER_NOTHING scene_script .DummyScene0, SCENE_RUINSOFALPHINNERCHAMBER_NOOP
scene_script .UnownAppear ; SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE scene_script .UnownAppear, SCENE_RUINSOFALPHINNERCHAMBER_STRANGE_PRESENCE
def_callbacks def_callbacks
@ -22,7 +22,7 @@ RuinsOfAlphInnerChamber_MapScripts:
writetext RuinsOfAlphStrangePresenceText writetext RuinsOfAlphStrangePresenceText
waitbutton waitbutton
closetext closetext
setscene SCENE_RUINSOFALPHINNERCHAMBER_NOTHING setscene SCENE_RUINSOFALPHINNERCHAMBER_NOOP
setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS setevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER clearevent EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
end end

6
maps/RuinsOfAlphKabutoChamber.asm
View File

@ -4,8 +4,8 @@
RuinsOfAlphKabutoChamber_MapScripts: RuinsOfAlphKabutoChamber_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .CheckWall ; SCENE_DEFAULT scene_script .CheckWall, SCENE_RUINSOFALPHKABUTOCHAMBER_CHECK_WALL
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_RUINSOFALPHKABUTOCHAMBER_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .HiddenDoors callback MAPCALLBACK_TILES, .HiddenDoors
@ -45,7 +45,7 @@ RuinsOfAlphKabutoChamber_MapScripts:
changeblock 4, 0, $30 ; open wall changeblock 4, 0, $30 ; open wall
reloadmappart reloadmappart
earthquake 50 earthquake 50
setscene SCENE_FINISHED setscene SCENE_RUINSOFALPHKABUTOCHAMBER_NOOP
closetext closetext
end end

6
maps/RuinsOfAlphOmanyteChamber.asm
View File

@ -1,7 +1,7 @@
RuinsOfAlphOmanyteChamber_MapScripts: RuinsOfAlphOmanyteChamber_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .CheckWall ; SCENE_DEFAULT scene_script .CheckWall, SCENE_RUINSOFALPHOMANYTECHAMBER_CHECK_WALL
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_RUINSOFALPHOMANYTECHAMBER_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .HiddenDoors callback MAPCALLBACK_TILES, .HiddenDoors
@ -42,7 +42,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
changeblock 4, 0, $30 ; open wall changeblock 4, 0, $30 ; open wall
reloadmappart reloadmappart
earthquake 50 earthquake 50
setscene SCENE_FINISHED setscene SCENE_RUINSOFALPHOMANYTECHAMBER_NOOP
closetext closetext
end end

6
maps/RuinsOfAlphOutside.asm
View File

@ -7,8 +7,8 @@
RuinsOfAlphOutside_MapScripts: RuinsOfAlphOutside_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_RUINSOFALPHOUTSIDE_NOTHING scene_script .DummyScene0, SCENE_RUINSOFALPHOUTSIDE_NOOP
scene_script .DummyScene1 ; SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX scene_script .DummyScene1, SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .ScientistCallback callback MAPCALLBACK_OBJECTS, .ScientistCallback
@ -38,7 +38,7 @@ RuinsOfAlphOutside_MapScripts:
.NoScientist: .NoScientist:
disappear RUINSOFALPHOUTSIDE_SCIENTIST disappear RUINSOFALPHOUTSIDE_SCIENTIST
setscene SCENE_RUINSOFALPHOUTSIDE_NOTHING setscene SCENE_RUINSOFALPHOUTSIDE_NOOP
endcallback endcallback
RuinsOfAlphOutsideScientistScene1: RuinsOfAlphOutsideScientistScene1:

6
maps/RuinsOfAlphResearchCenter.asm
View File

@ -5,8 +5,8 @@
RuinsOfAlphResearchCenter_MapScripts: RuinsOfAlphResearchCenter_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING scene_script .DummyScene0, SCENE_RUINSOFALPHRESEARCHCENTER_NOOP
scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX scene_script .GetUnownDex, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .ScientistCallback callback MAPCALLBACK_OBJECTS, .ScientistCallback
@ -53,7 +53,7 @@ RuinsOfAlphResearchCenter_MapScripts:
waitbutton waitbutton
closetext closetext
applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, RuinsOfAlphResearchCenterLeavesPlayerMovement applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, RuinsOfAlphResearchCenterLeavesPlayerMovement
setscene SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING setscene SCENE_RUINSOFALPHRESEARCHCENTER_NOOP
special RestartMapMusic special RestartMapMusic
end end

4
maps/SaffronMagnetTrainStation.asm
View File

@ -6,7 +6,7 @@
SaffronMagnetTrainStation_MapScripts: SaffronMagnetTrainStation_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT scene_script .DummyScene, SCENE_SAFFRONMAGNETTRAINSTATION_ARRIVE_FROM_GOLDENROD
def_callbacks def_callbacks
@ -223,7 +223,7 @@ SaffronMagnetTrainStation_MapEvents:
warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3 warp_event 11, 5, GOLDENROD_MAGNET_TRAIN_STATION, 3
def_coord_events def_coord_events
coord_event 11, 6, SCENE_DEFAULT, Script_ArriveFromGoldenrod coord_event 11, 6, SCENE_SAFFRONMAGNETTRAINSTATION_ARRIVE_FROM_GOLDENROD, Script_ArriveFromGoldenrod
def_bg_events def_bg_events

2
maps/SeafoamGym.asm
View File

@ -4,7 +4,7 @@
SeafoamGym_MapScripts: SeafoamGym_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene scene_script .DummyScene ; unusable
def_callbacks def_callbacks

8
maps/SproutTower3F.asm
View File

@ -9,8 +9,8 @@
SproutTower3F_MapScripts: SproutTower3F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_SPROUTTOWER3F_RIVAL_ENCOUNTER
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_SPROUTTOWER3F_NOOP
def_callbacks def_callbacks
@ -57,7 +57,7 @@ SproutTower3FRivalScene:
disappear SPROUTTOWER3F_SILVER disappear SPROUTTOWER3F_SILVER
waitsfx waitsfx
special FadeInQuickly special FadeInQuickly
setscene SCENE_FINISHED setscene SCENE_SPROUTTOWER3F_NOOP
special RestartMapMusic special RestartMapMusic
end end
@ -334,7 +334,7 @@ SproutTower3F_MapEvents:
warp_event 10, 14, SPROUT_TOWER_2F, 4 warp_event 10, 14, SPROUT_TOWER_2F, 4
def_coord_events def_coord_events
coord_event 11, 9, SCENE_DEFAULT, SproutTower3FRivalScene coord_event 11, 9, SCENE_SPROUTTOWER3F_RIVAL_ENCOUNTER, SproutTower3FRivalScene
def_bg_events def_bg_events
bg_event 8, 1, BGEVENT_READ, SproutTower3FStatue bg_event 8, 1, BGEVENT_READ, SproutTower3FStatue

62
maps/TeamRocketBaseB1F.asm
View File

@ -8,7 +8,7 @@
TeamRocketBaseB1F_MapScripts: TeamRocketBaseB1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT scene_script .DummyScene, SCENE_TEAMROCKETBASEB1F_TRAPS
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt callback MAPCALLBACK_OBJECTS, .HideSecurityGrunt
@ -736,38 +736,38 @@ TeamRocketBaseB1F_MapEvents:
def_coord_events def_coord_events
; There are five security cameras in the base. ; There are five security cameras in the base.
; Walking in front of one triggers two Rocket Grunts. ; Walking in front of one triggers two Rocket Grunts.
coord_event 24, 2, SCENE_DEFAULT, SecurityCamera1a coord_event 24, 2, SCENE_TEAMROCKETBASEB1F_TRAPS, SecurityCamera1a
coord_event 24, 3, SCENE_DEFAULT, SecurityCamera1b coord_event 24, 3, SCENE_TEAMROCKETBASEB1F_TRAPS, SecurityCamera1b
coord_event 6, 2, SCENE_DEFAULT, SecurityCamera2a coord_event 6, 2, SCENE_TEAMROCKETBASEB1F_TRAPS, SecurityCamera2a
coord_event 6, 3, SCENE_DEFAULT, SecurityCamera2b coord_event 6, 3, SCENE_TEAMROCKETBASEB1F_TRAPS, SecurityCamera2b
coord_event 24, 6, SCENE_DEFAULT, SecurityCamera3a coord_event 24, 6, SCENE_TEAMROCKETBASEB1F_TRAPS, SecurityCamera3a
coord_event 24, 7, SCENE_DEFAULT, SecurityCamera3b coord_event 24, 7, SCENE_TEAMROCKETBASEB1F_TRAPS, SecurityCamera3b
coord_event 22, 16, SCENE_DEFAULT, SecurityCamera4 coord_event 22, 16, SCENE_TEAMROCKETBASEB1F_TRAPS, SecurityCamera4
coord_event 8, 16, SCENE_DEFAULT, SecurityCamera5 coord_event 8, 16, SCENE_TEAMROCKETBASEB1F_TRAPS, SecurityCamera5
; There are spots on the floor that trigger a Pokémon battle. ; There are spots on the floor that trigger a Pokémon battle.
; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct. ; Each Pokémon (Voltorb, Koffing, Geodude) knows Selfdestruct.
coord_event 2, 7, SCENE_DEFAULT, ExplodingTrap1 coord_event 2, 7, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap1
coord_event 3, 7, SCENE_DEFAULT, ExplodingTrap2 coord_event 3, 7, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap2
coord_event 4, 7, SCENE_DEFAULT, ExplodingTrap3 coord_event 4, 7, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap3
coord_event 1, 8, SCENE_DEFAULT, ExplodingTrap4 coord_event 1, 8, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap4
coord_event 3, 8, SCENE_DEFAULT, ExplodingTrap5 coord_event 3, 8, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap5
coord_event 5, 8, SCENE_DEFAULT, ExplodingTrap6 coord_event 5, 8, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap6
coord_event 3, 9, SCENE_DEFAULT, ExplodingTrap7 coord_event 3, 9, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap7
coord_event 4, 9, SCENE_DEFAULT, ExplodingTrap8 coord_event 4, 9, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap8
coord_event 1, 10, SCENE_DEFAULT, ExplodingTrap9 coord_event 1, 10, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap9
coord_event 2, 10, SCENE_DEFAULT, ExplodingTrap10 coord_event 2, 10, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap10
coord_event 3, 10, SCENE_DEFAULT, ExplodingTrap11 coord_event 3, 10, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap11
coord_event 5, 10, SCENE_DEFAULT, ExplodingTrap12 coord_event 5, 10, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap12
coord_event 2, 11, SCENE_DEFAULT, ExplodingTrap13 coord_event 2, 11, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap13
coord_event 4, 11, SCENE_DEFAULT, ExplodingTrap14 coord_event 4, 11, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap14
coord_event 1, 12, SCENE_DEFAULT, ExplodingTrap15 coord_event 1, 12, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap15
coord_event 2, 12, SCENE_DEFAULT, ExplodingTrap16 coord_event 2, 12, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap16
coord_event 4, 12, SCENE_DEFAULT, ExplodingTrap17 coord_event 4, 12, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap17
coord_event 5, 12, SCENE_DEFAULT, ExplodingTrap18 coord_event 5, 12, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap18
coord_event 1, 13, SCENE_DEFAULT, ExplodingTrap19 coord_event 1, 13, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap19
coord_event 3, 13, SCENE_DEFAULT, ExplodingTrap20 coord_event 3, 13, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap20
coord_event 4, 13, SCENE_DEFAULT, ExplodingTrap21 coord_event 4, 13, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap21
coord_event 5, 13, SCENE_DEFAULT, ExplodingTrap22 coord_event 5, 13, SCENE_TEAMROCKETBASEB1F_TRAPS, ExplodingTrap22
def_bg_events def_bg_events
bg_event 19, 11, BGEVENT_READ, TeamRocketBaseB1FSecretSwitch bg_event 19, 11, BGEVENT_READ, TeamRocketBaseB1FSecretSwitch

14
maps/TeamRocketBaseB2F.asm
View File

@ -16,10 +16,10 @@
TeamRocketBaseB2F_MapScripts: TeamRocketBaseB2F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_TEAMROCKETBASEB2F_LANCE_HEALS
scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS scene_script .DummyScene1, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS
scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB2F_ELECTRODES scene_script .DummyScene2, SCENE_TEAMROCKETBASEB2F_ELECTRODES
scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB2F_NOTHING scene_script .DummyScene3, SCENE_TEAMROCKETBASEB2F_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .TransmitterDoorCallback callback MAPCALLBACK_TILES, .TransmitterDoorCallback
@ -302,7 +302,7 @@ RocketBaseElectrodeScript:
clearflag ENGINE_ROCKET_SIGNAL_ON_CH20 clearflag ENGINE_ROCKET_SIGNAL_ON_CH20
setevent EVENT_ROUTE_43_GATE_ROCKETS setevent EVENT_ROUTE_43_GATE_ROCKETS
setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM setevent EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM
setscene SCENE_TEAMROCKETBASEB2F_NOTHING setscene SCENE_TEAMROCKETBASEB2F_NOOP
clearevent EVENT_LAKE_OF_RAGE_CIVILIANS clearevent EVENT_LAKE_OF_RAGE_CIVILIANS
setevent EVENT_TURNED_OFF_SECURITY_CAMERAS setevent EVENT_TURNED_OFF_SECURITY_CAMERAS
setevent EVENT_SECURITY_CAMERA_1 setevent EVENT_SECURITY_CAMERA_1
@ -917,8 +917,8 @@ TeamRocketBaseB2F_MapEvents:
warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4 warp_event 27, 14, TEAM_ROCKET_BASE_B3F, 4
def_coord_events def_coord_events
coord_event 5, 14, SCENE_DEFAULT, LanceHealsScript1 coord_event 5, 14, SCENE_TEAMROCKETBASEB2F_LANCE_HEALS, LanceHealsScript1
coord_event 4, 13, SCENE_DEFAULT, LanceHealsScript2 coord_event 4, 13, SCENE_TEAMROCKETBASEB2F_LANCE_HEALS, LanceHealsScript2
coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFLeft coord_event 14, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFLeft
coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFRight coord_event 15, 11, SCENE_TEAMROCKETBASEB2F_ROCKET_BOSS, RocketBaseBossFRight
coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseCantLeaveScript coord_event 14, 12, SCENE_TEAMROCKETBASEB2F_ELECTRODES, RocketBaseCantLeaveScript

10
maps/TeamRocketBaseB3F.asm
View File

@ -16,10 +16,10 @@
TeamRocketBaseB3F_MapScripts: TeamRocketBaseB3F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LanceGetsPassword ; SCENE_DEFAULT scene_script .LanceGetsPassword, SCENE_TEAMROCKETBASEB3F_LANCE_GETS_PASSWORD
scene_script .DummyScene1 ; SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER scene_script .DummyScene1, SCENE_TEAMROCKETBASEB3F_RIVAL_ENCOUNTER
scene_script .DummyScene2 ; SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS scene_script .DummyScene2, SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS
scene_script .DummyScene3 ; SCENE_TEAMROCKETBASEB3F_NOTHING scene_script .DummyScene3, SCENE_TEAMROCKETBASEB3F_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .CheckGiovanniDoor callback MAPCALLBACK_TILES, .CheckGiovanniDoor
@ -114,7 +114,7 @@ RocketBaseBoss:
playsound SFX_TACKLE playsound SFX_TACKLE
applymovement TEAMROCKETBASEB3F_ROCKET1, RocketBaseBossLeavesMovement applymovement TEAMROCKETBASEB3F_ROCKET1, RocketBaseBossLeavesMovement
disappear TEAMROCKETBASEB3F_ROCKET1 disappear TEAMROCKETBASEB3F_ROCKET1
setscene SCENE_TEAMROCKETBASEB3F_NOTHING setscene SCENE_TEAMROCKETBASEB3F_NOOP
end end
RocketBaseMurkrow: RocketBaseMurkrow:

6
maps/TimeCapsule.asm
View File

@ -4,8 +4,8 @@
TimeCapsule_MapScripts: TimeCapsule_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .InitializeTimeCapsule ; SCENE_DEFAULT scene_script .InitializeTimeCapsule, SCENE_TIMECAPSULE_INITIALIZE
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_TIMECAPSULE_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris callback MAPCALLBACK_OBJECTS, .SetWhichChris
@ -30,7 +30,7 @@ TimeCapsule_MapScripts:
endcallback endcallback
.InitializeAndPreparePokecenter2F: .InitializeAndPreparePokecenter2F:
setscene SCENE_FINISHED setscene SCENE_TIMECAPSULE_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TIME_CAPSULE
end end

12
maps/TinTower1F.asm
View File

@ -12,8 +12,8 @@
TinTower1F_MapScripts: TinTower1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .FaceSuicune ; SCENE_DEFAULT scene_script .FaceSuicune, SCENE_TINTOWER1F_SUICUNE_BATTLE
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_TINTOWER1F_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .NPCsCallback callback MAPCALLBACK_OBJECTS, .NPCsCallback
@ -123,12 +123,12 @@ TinTower1F_MapScripts:
disappear TINTOWER1F_SUICUNE disappear TINTOWER1F_SUICUNE
setevent EVENT_FOUGHT_SUICUNE setevent EVENT_FOUGHT_SUICUNE
setevent EVENT_SAW_SUICUNE_ON_ROUTE_42 setevent EVENT_SAW_SUICUNE_ON_ROUTE_42
setmapscene ROUTE_42, SCENE_ROUTE42_NOTHING setmapscene ROUTE_42, SCENE_ROUTE42_NOOP
setevent EVENT_SAW_SUICUNE_ON_ROUTE_36 setevent EVENT_SAW_SUICUNE_ON_ROUTE_36
setmapscene ROUTE_36, SCENE_ROUTE36_NOTHING setmapscene ROUTE_36, SCENE_ROUTE36_NOOP
setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY setevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_NOTHING setmapscene CIANWOOD_CITY, SCENE_CIANWOODCITY_NOOP
setscene SCENE_FINISHED setscene SCENE_TINTOWER1F_NOOP
clearevent EVENT_SET_WHEN_FOUGHT_HO_OH clearevent EVENT_SET_WHEN_FOUGHT_HO_OH
reloadmapafterbattle reloadmapafterbattle
pause 20 pause 20

6
maps/TradeCenter.asm
View File

@ -4,8 +4,8 @@
TradeCenter_MapScripts: TradeCenter_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .InitializeTradeCenter ; SCENE_DEFAULT scene_script .InitializeTradeCenter, SCENE_TRADECENTER_INITIALIZE
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_TRADECENTER_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .SetWhichChris callback MAPCALLBACK_OBJECTS, .SetWhichChris
@ -30,7 +30,7 @@ TradeCenter_MapScripts:
endcallback endcallback
.InitializeAndPreparePokecenter2F: .InitializeAndPreparePokecenter2F:
setscene SCENE_FINISHED setscene SCENE_TRADECENTER_NOOP
setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_TRADE_CENTER
end end

4
maps/TrainerHouseB1F.asm
View File

@ -4,7 +4,7 @@
TrainerHouseB1F_MapScripts: TrainerHouseB1F_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene ; SCENE_DEFAULT scene_script .DummyScene, SCENE_TRAINERHOUSEB1F_ASK_BATTLE
def_callbacks def_callbacks
@ -174,7 +174,7 @@ TrainerHouseB1F_MapEvents:
warp_event 9, 4, TRAINER_HOUSE_1F, 3 warp_event 9, 4, TRAINER_HOUSE_1F, 3
def_coord_events def_coord_events
coord_event 7, 3, SCENE_DEFAULT, TrainerHouseReceptionistScript coord_event 7, 3, SCENE_TRAINERHOUSEB1F_ASK_BATTLE, TrainerHouseReceptionistScript
def_bg_events def_bg_events

8
maps/VermilionPort.asm
View File

@ -5,8 +5,8 @@
VermilionPort_MapScripts: VermilionPort_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_VERMILIONPORT_ASK_ENTER_SHIP
scene_script .LeaveFastShip ; SCENE_VERMILIONPORT_LEAVE_SHIP scene_script .LeaveFastShip, SCENE_VERMILIONPORT_LEAVE_SHIP
def_callbacks def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_NEWMAP, .FlyPoint
@ -25,7 +25,7 @@ VermilionPort_MapScripts:
.LeaveFastShipScript: .LeaveFastShipScript:
applymovement PLAYER, VermilionPortLeaveFastShipMovement applymovement PLAYER, VermilionPortLeaveFastShipMovement
appear VERMILIONPORT_SAILOR1 appear VERMILIONPORT_SAILOR1
setscene SCENE_DEFAULT setscene SCENE_VERMILIONPORT_ASK_ENTER_SHIP
setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1 setevent EVENT_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_TWIN_1
setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
@ -304,7 +304,7 @@ VermilionPort_MapEvents:
warp_event 7, 17, FAST_SHIP_1F, 1 warp_event 7, 17, FAST_SHIP_1F, 1
def_coord_events def_coord_events
coord_event 7, 11, SCENE_DEFAULT, VermilionPortWalkUpToShipScript coord_event 7, 11, SCENE_VERMILIONPORT_ASK_ENTER_SHIP, VermilionPortWalkUpToShipScript
def_bg_events def_bg_events
bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron bg_event 16, 13, BGEVENT_ITEM, VermilionPortHiddenIron

12
maps/VictoryRoad.asm
View File

@ -8,8 +8,8 @@
VictoryRoad_MapScripts: VictoryRoad_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_VICTORYROAD_RIVAL_BATTLE
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_VICTORYROAD_NOOP
def_callbacks def_callbacks
@ -30,7 +30,7 @@ VictoryRoadRivalLeft:
scall VictoryRoadRivalNext scall VictoryRoadRivalNext
applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement1 applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement1
disappear VICTORYROAD_SILVER disappear VICTORYROAD_SILVER
setscene SCENE_FINISHED setscene SCENE_VICTORYROAD_NOOP
playmapmusic playmapmusic
end end
@ -44,7 +44,7 @@ VictoryRoadRivalRight:
scall VictoryRoadRivalNext scall VictoryRoadRivalNext
applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement2 applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement2
disappear VICTORYROAD_SILVER disappear VICTORYROAD_SILVER
setscene SCENE_FINISHED setscene SCENE_VICTORYROAD_NOOP
playmapmusic playmapmusic
end end
@ -252,8 +252,8 @@ VictoryRoad_MapEvents:
warp_event 13, 5, ROUTE_23, 3 warp_event 13, 5, ROUTE_23, 3
def_coord_events def_coord_events
coord_event 12, 8, SCENE_DEFAULT, VictoryRoadRivalLeft coord_event 12, 8, SCENE_VICTORYROAD_RIVAL_BATTLE, VictoryRoadRivalLeft
coord_event 13, 8, SCENE_DEFAULT, VictoryRoadRivalRight coord_event 13, 8, SCENE_VICTORYROAD_RIVAL_BATTLE, VictoryRoadRivalRight
def_bg_events def_bg_events
bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion bg_event 3, 29, BGEVENT_ITEM, VictoryRoadHiddenMaxPotion

8
maps/VictoryRoadGate.asm
View File

@ -5,8 +5,8 @@
VictoryRoadGate_MapScripts: VictoryRoadGate_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_VICTORYROADGATE_BADGE_CHECK
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_VICTORYROADGATE_NOOP
def_callbacks def_callbacks
@ -38,7 +38,7 @@ VictoryRoadGateBadgeCheckScript:
writetext VictoryRoadGateEightBadgesText writetext VictoryRoadGateEightBadgesText
waitbutton waitbutton
closetext closetext
setscene SCENE_FINISHED setscene SCENE_VICTORYROADGATE_NOOP
end end
VictoryRoadGateLeftBlackBeltScript: VictoryRoadGateLeftBlackBeltScript:
@ -109,7 +109,7 @@ VictoryRoadGate_MapEvents:
warp_event 2, 7, ROUTE_28, 2 warp_event 2, 7, ROUTE_28, 2
def_coord_events def_coord_events
coord_event 10, 11, SCENE_DEFAULT, VictoryRoadGateBadgeCheckScene coord_event 10, 11, SCENE_VICTORYROADGATE_BADGE_CHECK, VictoryRoadGateBadgeCheckScene
def_bg_events def_bg_events

2
maps/VioletGym.asm
View File

@ -34,7 +34,7 @@ VioletGymFalknerScript:
iftrue .SpeechAfterTM iftrue .SpeechAfterTM
setevent EVENT_BEAT_BIRD_KEEPER_ROD setevent EVENT_BEAT_BIRD_KEEPER_ROD
setevent EVENT_BEAT_BIRD_KEEPER_ABE setevent EVENT_BEAT_BIRD_KEEPER_ABE
setmapscene ELMS_LAB, SCENE_ELMSLAB_NOTHING setmapscene ELMS_LAB, SCENE_ELMSLAB_NOOP
specialphonecall SPECIALCALL_ASSISTANT specialphonecall SPECIALCALL_ASSISTANT
writetext FalknerZephyrBadgeText writetext FalknerZephyrBadgeText
promptbutton promptbutton

6
maps/WillsRoom.asm
View File

@ -3,8 +3,8 @@
WillsRoom_MapScripts: WillsRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .LockDoor ; SCENE_DEFAULT scene_script .LockDoor, SCENE_WILLSROOM_LOCK_DOOR
scene_script .DummyScene ; SCENE_FINISHED scene_script .DummyScene, SCENE_WILLSROOM_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, .WillsRoomDoors callback MAPCALLBACK_TILES, .WillsRoomDoors
@ -35,7 +35,7 @@ WillsRoom_MapScripts:
changeblock 4, 14, $2a ; wall changeblock 4, 14, $2a ; wall
reloadmappart reloadmappart
closetext closetext
setscene SCENE_FINISHED setscene SCENE_WILLSROOM_NOOP
setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED setevent EVENT_WILLS_ROOM_ENTRANCE_CLOSED
waitsfx waitsfx
end end

8
maps/WiseTriosRoom.asm
View File

@ -8,8 +8,8 @@
WiseTriosRoom_MapScripts: WiseTriosRoom_MapScripts:
def_scene_scripts def_scene_scripts
scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene0, SCENE_WISETRIOSROOM_SAGE_BLOCKS
scene_script .DummyScene1 ; SCENE_FINISHED scene_script .DummyScene1, SCENE_WISETRIOSROOM_NOOP
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, .WiseTrioCallback callback MAPCALLBACK_OBJECTS, .WiseTrioCallback
@ -103,7 +103,7 @@ TrainerSageKoji:
applymovement WISETRIOSROOM_SAGE6, WiseTriosRoomSageAllowsPassageMovement applymovement WISETRIOSROOM_SAGE6, WiseTriosRoomSageAllowsPassageMovement
turnobject WISETRIOSROOM_SAGE6, UP turnobject WISETRIOSROOM_SAGE6, UP
setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER setevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
setscene SCENE_FINISHED setscene SCENE_WISETRIOSROOM_NOOP
end end
.KojiAllowsPassage: .KojiAllowsPassage:
@ -351,7 +351,7 @@ WiseTriosRoom_MapEvents:
warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5 warp_event 1, 4, ECRUTEAK_TIN_TOWER_ENTRANCE, 5
def_coord_events def_coord_events
coord_event 7, 4, SCENE_DEFAULT, WiseTriosRoom_CannotEnterTinTowerScript coord_event 7, 4, SCENE_WISETRIOSROOM_SAGE_BLOCKS, WiseTriosRoom_CannotEnterTinTowerScript
def_bg_events def_bg_events