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

23
maps/ElmsLab.asm
View File

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