diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-04-10 17:08:28 +0200 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-04-10 17:08:28 +0200 |
| commit | 217eff6eda39082b1f31a0bf5c28834e032ab43a (patch) | |
| tree | 0371e3e80bcc1d99979f5dfb97e52ce668316b9b /src/engine | |
| parent | 2bbc1a63239201be8f1a7b360e81d19192093a8f (diff) | |
clean up script and event constants
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/bank03.asm | 10 | ||||
| -rw-r--r-- | src/engine/bank04.asm | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index e53fc38..8979d23 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -2642,7 +2642,7 @@ Func_d317: ; d317 (3:5317) INCROM $d32b, $d336 -DeckMachine_d336: ; d336 (3:5336) +OWScript_OpenDeckMachine: ; d336 (3:5336) push bc call Func_c2a3 call PauseSong @@ -3025,7 +3025,7 @@ OWSequence_Sara: ; e177 (3:6177) OWSequence_BeatSara: ; e18c (3:618c) start_script run_script OWScript_SetEventFlags - db FLAG_BEAT_SARA + db EVENT_BEAT_SARA run_script OWScript_PrintTextString tx Text0430 run_script OWScript_GiveBoosterPacks @@ -3063,7 +3063,7 @@ OWSequence_Amanda: ; e19e (03:619e) OWSequence_BeatAmanda: ; e1b3 (03:61b3) start_script run_script OWScript_SetEventFlags - db FLAG_BEAT_AMANDA + db EVENT_BEAT_AMANDA run_script OWScript_PrintTextString tx Text0437 run_script OWScript_GiveBoosterPacks @@ -3085,10 +3085,10 @@ OWSequence_NotReadyToSeeAmy: OWSequence_Joshua: start_script run_script OWScript_JumpIfFlagNotSet - db FLAG_BEAT_AMANDA + db EVENT_BEAT_AMANDA dw .sara_and_amanda_not_beaten run_script OWScript_JumpIfFlagNotSet - db FLAG_BEAT_SARA + db EVENT_BEAT_SARA dw .sara_and_amanda_not_beaten run_script OWScript_ScriptJump dw .beat_sara_and_amanda diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index 5140705..9bf84f3 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -1023,7 +1023,7 @@ OverworldScriptTable: ; 1217b (4:617b) dw OWScript_EndScriptCloseText dw Func_d244 dw Func_d24c - dw DeckMachine_d336 + dw OWScript_OpenDeckMachine dw Func_d271 dw Func_d36d dw Func_ce6f |