Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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
94 changed files with 380 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
maps/BattleTower1F.asm
View File

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