summaryrefslogtreecommitdiff
path: root/engine/scripting.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/scripting.asm')
-rw-r--r--engine/scripting.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 84590f3c0..8ffdb9fcd 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -144,7 +144,7 @@ ScriptCommandTable:
dw Script_writetext ; 4c
dw Script_repeattext ; 4d
dw Script_yesorno ; 4e
- dw Script_loadmenudata ; 4f
+ dw Script_loadmenuheader ; 4f
dw Script_closewindow ; 50
dw Script_jumptextfaceplayer ; 51
if _CRYSTAL
@@ -432,15 +432,15 @@ Script_yesorno:
ld [ScriptVar], a
ret
-Script_loadmenudata:
+Script_loadmenuheader:
; script command 0x4f
-; parameters: data
+; parameters: menu_header
call GetScriptByte
ld l, a
call GetScriptByte
ld h, a
- ld de, LoadMenuDataHeader
+ ld de, LoadMenuHeader
ld a, [ScriptBank]
call Call_a_de
call UpdateSprites
@@ -1294,7 +1294,7 @@ Script_earthquake:
ld hl, EarthquakeMovement
ld de, wEarthquakeMovementDataBuffer
- ld bc, EarthquakeMovementEnd - EarthquakeMovement
+ ld bc, EarthquakeMovement.End - EarthquakeMovement
call CopyBytes
call GetScriptByte
ld [wEarthquakeMovementDataBuffer + 1], a
@@ -1312,7 +1312,7 @@ EarthquakeMovement:
step_shake 16 ; the 16 gets overwritten with the script byte
step_sleep 16 ; the 16 gets overwritten with the lower 6 bits of the script byte
step_end
-EarthquakeMovementEnd
+.End
Script_loadpikachudata:
@@ -2449,14 +2449,14 @@ Script_wildoff:
; script command 0x38
ld hl, wStatusFlags
- set 5, [hl]
+ set STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
ret
Script_wildon:
; script command 0x37
ld hl, wStatusFlags
- res 5, [hl]
+ res STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
ret
Script_xycompare:
@@ -2477,7 +2477,7 @@ Script_warpfacing:
maskbits NUM_DIRECTIONS
ld c, a
ld a, [wPlayerSpriteSetupFlags]
- set 5, a
+ set PLAYERSPRITESETUP_CUSTOM_FACING_F, a
or c
ld [wPlayerSpriteSetupFlags], a
; fall through
@@ -2804,12 +2804,12 @@ Script_halloffame:
; script command 0xa1
ld hl, wGameTimerPause
- res 0, [hl]
+ res GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
farcall StubbedTrainerRankings_HallOfFame
farcall StubbedTrainerRankings_HallOfFame2
farcall HallOfFame
ld hl, wGameTimerPause
- set 0, [hl]
+ set GAMETIMERPAUSE_TIMER_PAUSED_F, [hl]
jr ReturnFromCredits
Script_credits: