summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/macros/event.inc20
-rw-r--r--data/script_cmd_table.inc20
-rw-r--r--data/scripts/cable_club.inc24
-rw-r--r--data/scripts/contest_hall.inc124
-rw-r--r--data/scripts/maps/BattleTower_Lobby.inc8
-rw-r--r--data/scripts/maps/CaveOfOrigin_B4F.inc4
-rw-r--r--data/scripts/maps/DewfordTown.inc16
-rw-r--r--data/scripts/maps/LavaridgeTown.inc8
-rw-r--r--data/scripts/maps/LittlerootTown.inc88
-rw-r--r--data/scripts/maps/Route104.inc10
-rw-r--r--data/scripts/maps/Route109.inc10
-rw-r--r--data/scripts/maps/Route111.inc8
-rw-r--r--data/scripts/maps/Route130.inc4
-rw-r--r--data/scripts/maps/Route131.inc2
-rw-r--r--data/scripts/maps/SeafloorCavern_Room9.inc4
-rw-r--r--data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc4
-rw-r--r--data/scripts/maps/ShoalCave_LowTideInnerRoom.inc4
-rw-r--r--data/scripts/maps/UnknownMap_25_34.inc116
-rw-r--r--src/field/scrcmd.c20
19 files changed, 247 insertions, 247 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index ffd1b9f07..992d4b9f9 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1124,12 +1124,12 @@
.byte \subroutine
.endm
- .macro setmapfooter word
+ .macro setmaplayoutindex word
.byte 0xa7
.2byte \word
.endm
- .macro spritelevelup word, byte1, byte2, byte3
+ .macro setobjectpriority word, byte1, byte2, byte3
.byte 0xa8
.2byte \word
.byte \byte1
@@ -1137,14 +1137,14 @@
.byte \byte3
.endm
- .macro restorespritelevel word, byte1, byte2
+ .macro resetobjectpriority word, byte1, byte2
.byte 0xa9
.2byte \word
.byte \byte1
.byte \byte2
.endm
- .macro createvsprite byte1, byte2, word1, word2, byte3, byte4
+ .macro createvobject byte1, byte2, word1, word2, byte3, byte4
.byte 0xaa
.byte \byte1
.byte \byte2
@@ -1154,40 +1154,40 @@
.byte \byte4
.endm
- .macro vspriteface byte1, byte2
+ .macro turnvobject byte1, byte2
.byte 0xab
.byte \byte1
.byte \byte2
.endm
@ Queues the opening of the door tile at (X, Y) with an animation.
- .macro setdooropened X, Y
+ .macro opendoor X, Y
.byte 0xac
.2byte \X
.2byte \Y
.endm
@ Queues the closing of the door tile at (X, Y) with an animation.
- .macro setdoorclosed X, Y
+ .macro closedoor X, Y
.byte 0xad
.2byte \X
.2byte \Y
.endm
@ Executes the state changes queued with setdooropened, setdoorclosed, setdooropened2, and setdoorclosed2.
- .macro doorchange
+ .macro waitdooranim
.byte 0xae
.endm
@ Queues the opening of the door tile at (X, Y) without an animation.
- .macro setdooropened2 X, Y
+ .macro setdooropen X, Y
.byte 0xaf
.2byte \X
.2byte \Y
.endm
@ Queues the closing of the door tile at (X, Y) without an animation.
- .macro setdoorclosed2 X, Y
+ .macro setdoorclosed X, Y
.byte 0xb0
.2byte \X
.2byte \Y
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index a72341143..463d91201 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -167,16 +167,16 @@ gScriptCmdTable:: @ 814AE30
.4byte ScrCmd_setweather @ 0xA4
.4byte ScrCmd_doweather @ 0xA5
.4byte ScrCmd_tileeffect @ 0xA6
- .4byte ScrCmd_setmapfooter @ 0xA7
- .4byte ScrCmd_spritelevelup @ 0xA8
- .4byte ScrCmd_restorespritelevel @ 0xA9
- .4byte ScrCmd_createvsprite @ 0xAA
- .4byte ScrCmd_vspriteface @ 0xAB
- .4byte ScrCmd_setdooropened @ 0xAC
- .4byte ScrCmd_setdoorclosed @ 0xAD
- .4byte ScrCmd_doorchange @ 0xAE
- .4byte ScrCmd_setdooropened2 @ 0xAF
- .4byte ScrCmd_setdoorclosed2 @ 0xB0
+ .4byte ScrCmd_setmaplayoutindex @ 0xA7
+ .4byte ScrCmd_setobjectpriority @ 0xA8
+ .4byte ScrCmd_resetobjectpriority @ 0xA9
+ .4byte ScrCmd_createvobject @ 0xAA
+ .4byte ScrCmd_turnvobject @ 0xAB
+ .4byte ScrCmd_opendoor @ 0xAC
+ .4byte ScrCmd_closedoor @ 0xAD
+ .4byte ScrCmd_waitdooranim @ 0xAE
+ .4byte ScrCmd_setdooropen @ 0xAF
+ .4byte ScrCmd_setdoorclosed @ 0xB0
.4byte ScrCmd_event_b1 @ 0xB1
.4byte ScrCmd_event_b2 @ 0xB2
.4byte ScrCmd_checkcoins @ 0xB3
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 009dc8dff..9f44e131b 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -229,13 +229,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
closemessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
waitmovement 0
- setdooropened 5, 1
- doorchange
+ opendoor 5, 1
+ waitdooranim
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
waitmovement 0
hideobject 255, 0, 0
- setdoorclosed 5, 1
- doorchange
+ closedoor 5, 1
+ waitdooranim
release
compare 0x8004, 5
goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3FCD
@@ -394,13 +394,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
closemessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
waitmovement 0
- setdooropened 8, 1
- doorchange
+ opendoor 8, 1
+ waitdooranim
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
waitmovement 0
hideobject 255, 0, 0
- setdoorclosed 8, 1
- doorchange
+ closedoor 8, 1
+ waitdooranim
release
goto OldaleTown_PokemonCenter_2F_EventScript_1A4325
@@ -492,13 +492,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
closemessage
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
waitmovement 0
- setdooropened 11, 1
- doorchange
+ opendoor 11, 1
+ waitdooranim
applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
waitmovement 0
hideobject 255, 0, 0
- setdoorclosed 11, 1
- doorchange
+ closedoor 11, 1
+ waitdooranim
release
goto OldaleTown_PokemonCenter_2F_EventScript_1A4325
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 6209a8e6d..bad45e486 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -924,71 +924,71 @@ LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90
return
LinkContestRoom1_EventScript_1A5AE4:: @ 81A5AE4
- vspriteface 0, 1
- vspriteface 2, 1
- vspriteface 4, 4
- vspriteface 6, 1
- vspriteface 8, 1
- vspriteface 10, 1
- vspriteface 12, 1
- vspriteface 14, 1
- vspriteface 16, 1
- vspriteface 18, 1
- vspriteface 20, 4
- vspriteface 22, 4
- vspriteface 25, 4
- vspriteface 27, 3
- vspriteface 28, 4
+ turnvobject 0, 1
+ turnvobject 2, 1
+ turnvobject 4, 4
+ turnvobject 6, 1
+ turnvobject 8, 1
+ turnvobject 10, 1
+ turnvobject 12, 1
+ turnvobject 14, 1
+ turnvobject 16, 1
+ turnvobject 18, 1
+ turnvobject 20, 4
+ turnvobject 22, 4
+ turnvobject 25, 4
+ turnvobject 27, 3
+ turnvobject 28, 4
delay 10
- vspriteface 0, 4
- vspriteface 2, 4
- vspriteface 4, 4
- vspriteface 6, 4
- vspriteface 8, 4
- vspriteface 10, 3
- vspriteface 12, 3
- vspriteface 14, 3
- vspriteface 16, 3
- vspriteface 18, 3
- vspriteface 20, 1
- vspriteface 22, 1
- vspriteface 25, 2
- vspriteface 27, 2
- vspriteface 28, 2
+ turnvobject 0, 4
+ turnvobject 2, 4
+ turnvobject 4, 4
+ turnvobject 6, 4
+ turnvobject 8, 4
+ turnvobject 10, 3
+ turnvobject 12, 3
+ turnvobject 14, 3
+ turnvobject 16, 3
+ turnvobject 18, 3
+ turnvobject 20, 1
+ turnvobject 22, 1
+ turnvobject 25, 2
+ turnvobject 27, 2
+ turnvobject 28, 2
delay 10
- vspriteface 1, 2
- vspriteface 3, 2
- vspriteface 5, 2
- vspriteface 7, 2
- vspriteface 9, 4
- vspriteface 11, 2
- vspriteface 15, 2
- vspriteface 13, 2
- vspriteface 17, 2
- vspriteface 19, 2
- vspriteface 21, 3
- vspriteface 23, 3
- vspriteface 24, 3
- vspriteface 26, 4
- vspriteface 29, 3
- vspriteface 30, 3
+ turnvobject 1, 2
+ turnvobject 3, 2
+ turnvobject 5, 2
+ turnvobject 7, 2
+ turnvobject 9, 4
+ turnvobject 11, 2
+ turnvobject 15, 2
+ turnvobject 13, 2
+ turnvobject 17, 2
+ turnvobject 19, 2
+ turnvobject 21, 3
+ turnvobject 23, 3
+ turnvobject 24, 3
+ turnvobject 26, 4
+ turnvobject 29, 3
+ turnvobject 30, 3
delay 10
- vspriteface 1, 4
- vspriteface 3, 4
- vspriteface 5, 4
- vspriteface 7, 4
- vspriteface 9, 4
- vspriteface 11, 3
- vspriteface 15, 3
- vspriteface 13, 3
- vspriteface 17, 3
- vspriteface 19, 3
- vspriteface 21, 1
- vspriteface 23, 1
- vspriteface 24, 1
- vspriteface 26, 2
- vspriteface 29, 2
- vspriteface 30, 2
+ turnvobject 1, 4
+ turnvobject 3, 4
+ turnvobject 5, 4
+ turnvobject 7, 4
+ turnvobject 9, 4
+ turnvobject 11, 3
+ turnvobject 15, 3
+ turnvobject 13, 3
+ turnvobject 17, 3
+ turnvobject 19, 3
+ turnvobject 21, 1
+ turnvobject 23, 1
+ turnvobject 24, 1
+ turnvobject 26, 2
+ turnvobject 29, 2
+ turnvobject 30, 2
delay 10
return
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 5bb74d35b..b92ec258e 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -296,13 +296,13 @@ BattleTower_Lobby_EventScript_160664:: @ 8160664
applymovement 1, BattleTower_Lobby_Movement_160693
applymovement 255, BattleTower_Lobby_Movement_160693
waitmovement 0
- setdooropened 6, 1
- doorchange
+ opendoor 6, 1
+ waitdooranim
applymovement 1, BattleTower_Lobby_Movement_160697
applymovement 255, BattleTower_Lobby_Movement_16069A
waitmovement 0
- setdoorclosed 6, 1
- doorchange
+ closedoor 6, 1
+ waitdooranim
return
BattleTower_Lobby_Movement_160693:: @ 8160693
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index e8270030b..c6c3cd45e 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -14,9 +14,9 @@ CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1
CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
.ifdef SAPPHIRE
- setmapfooter 163
+ setmaplayoutindex 163
.else
- setmapfooter 313
+ setmaplayoutindex 313
.endif
call CaveOfOrigin_B4F_EventScript_1A01B5
checkflag 113
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
index 480a408e3..bdb7ca51a 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/scripts/maps/DewfordTown.inc
@@ -118,8 +118,8 @@ DewfordTown_EventScript_14E147:: @ 814E147
DewfordTown_EventScript_14E151:: @ 814E151
call DewfordTown_EventScript_1A010C
- spritelevelup 2, 0, 11, 0
- spritelevelup 255, 0, 11, 0
+ setobjectpriority 2, 0, 11, 0
+ setobjectpriority 255, 0, 11, 0
applymovement 2, DewfordTown_Movement_14E40E
waitmovement 0
removeobject 2
@@ -141,7 +141,7 @@ DewfordTown_EventScript_14E151:: @ 814E151
setflag 743
hideobject 4, 0, 11
setvar 0x408e, 2
- restorespritelevel 255, 0, 11
+ resetobjectpriority 255, 0, 11
warp Route104_MrBrineysHouse, 255, 5, 4
copyvar 0x4096, 0x8008
waitstate
@@ -150,8 +150,8 @@ DewfordTown_EventScript_14E151:: @ 814E151
DewfordTown_EventScript_14E1D8:: @ 814E1D8
call DewfordTown_EventScript_1A010C
- spritelevelup 2, 0, 11, 0
- spritelevelup 255, 0, 11, 1
+ setobjectpriority 2, 0, 11, 0
+ setobjectpriority 255, 0, 11, 1
applymovement 2, DewfordTown_Movement_14E40E
waitmovement 0
removeobject 2
@@ -168,7 +168,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8
waitmovement 0
setobjectxyperm 2, 21, 26
addobject 2
- spritelevelup 2, 0, 24, 0
+ setobjectpriority 2, 0, 24, 0
applymovement 2, DewfordTown_Movement_14E410
waitmovement 0
clearflag 741
@@ -182,8 +182,8 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8
call_if 1, DewfordTown_EventScript_14E28A
closemessage
copyvar 0x4096, 0x8008
- restorespritelevel 255, 0, 11
- restorespritelevel 2, 0, 24
+ resetobjectpriority 255, 0, 11
+ resetobjectpriority 2, 0, 24
moveobjectoffscreen 2
release
end
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index 5a4981f09..85f323063 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -29,13 +29,13 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3
LavaridgeTown_EventScript_14E4ED:: @ 814E4ED
lockall
setvar 0x8008, 1
- setdooropened 12, 15
- doorchange
+ opendoor 12, 15
+ waitdooranim
addobject 8
applymovement 8, LavaridgeTown_Movement_14E70E
waitmovement 0
- setdoorclosed 12, 15
- doorchange
+ closedoor 12, 15
+ waitdooranim
applymovement 8, LavaridgeTown_Movement_1A083F
waitmovement 0
applymovement 255, LavaridgeTown_Movement_1A0843
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index af1d0cc1e..220aeead7 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -102,13 +102,13 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B
playse 10
applymovement 255, LittlerootTown_Movement_14D6C0
waitmovement 0
- setdooropened 0x8004, 0x8005
- doorchange
+ opendoor 0x8004, 0x8005
+ waitdooranim
addobject 4
applymovement 4, LittlerootTown_Movement_14D6AC
waitmovement 0
- setdoorclosed 0x8004, 0x8005
- doorchange
+ closedoor 0x8004, 0x8005
+ waitdooranim
delay 10
applymovement 4, LittlerootTown_Movement_14D6AE
waitmovement 0
@@ -117,16 +117,16 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B
applymovement 4, LittlerootTown_Movement_14D6B1
applymovement 255, LittlerootTown_Movement_14D6B8
waitmovement 0
- setdooropened 0x8004, 0x8005
- doorchange
+ opendoor 0x8004, 0x8005
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14D6B5
applymovement 255, LittlerootTown_Movement_14D6BD
waitmovement 0
setflag 752
setvar 0x4092, 3
hideobject 255, 0, 0
- setdoorclosed 0x8004, 0x8005
- doorchange
+ closedoor 0x8004, 0x8005
+ waitdooranim
clearflag 868
clearflag 0x4000
return
@@ -595,97 +595,97 @@ LittlerootTown_EventScript_14DB3B:: @ 814DB3B
LittlerootTown_EventScript_14DB46:: @ 814DB46
applymovement 4, LittlerootTown_Movement_14DCB4
waitmovement 0
- setdooropened 0x8009, 0x800a
- doorchange
+ opendoor 0x8009, 0x800a
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14DCE0
waitmovement 0
hideobject 4, 0, 9
- setdoorclosed 0x8009, 0x800a
- doorchange
+ closedoor 0x8009, 0x800a
+ waitdooranim
return
LittlerootTown_EventScript_14DB6C:: @ 814DB6C
applymovement 4, LittlerootTown_Movement_14DCBA
waitmovement 0
- setdooropened 0x8009, 0x800a
- doorchange
+ opendoor 0x8009, 0x800a
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14DCE0
waitmovement 0
hideobject 4, 0, 9
- setdoorclosed 0x8009, 0x800a
- doorchange
+ closedoor 0x8009, 0x800a
+ waitdooranim
return
LittlerootTown_EventScript_14DB92:: @ 814DB92
applymovement 4, LittlerootTown_Movement_14DCC1
waitmovement 0
- setdooropened 0x8009, 0x800a
- doorchange
+ opendoor 0x8009, 0x800a
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14DCE0
waitmovement 0
hideobject 4, 0, 9
- setdoorclosed 0x8009, 0x800a
- doorchange
+ closedoor 0x8009, 0x800a
+ waitdooranim
return
LittlerootTown_EventScript_14DBB8:: @ 814DBB8
applymovement 4, LittlerootTown_Movement_14DCC5
waitmovement 0
- setdooropened 0x8009, 0x800a
- doorchange
+ opendoor 0x8009, 0x800a
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14DCE0
waitmovement 0
hideobject 4, 0, 9
- setdoorclosed 0x8009, 0x800a
- doorchange
+ closedoor 0x8009, 0x800a
+ waitdooranim
return
LittlerootTown_EventScript_14DBDE:: @ 814DBDE
applymovement 4, LittlerootTown_Movement_14DCCA
waitmovement 0
- setdooropened 0x8009, 0x800a
- doorchange
+ opendoor 0x8009, 0x800a
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14DCE0
waitmovement 0
hideobject 4, 0, 9
- setdoorclosed 0x8009, 0x800a
- doorchange
+ closedoor 0x8009, 0x800a
+ waitdooranim
return
LittlerootTown_EventScript_14DC04:: @ 814DC04
applymovement 4, LittlerootTown_Movement_14DCCF
waitmovement 0
- setdooropened 0x8009, 0x800a
- doorchange
+ opendoor 0x8009, 0x800a
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14DCE0
waitmovement 0
hideobject 4, 0, 9
- setdoorclosed 0x8009, 0x800a
- doorchange
+ closedoor 0x8009, 0x800a
+ waitdooranim
return
LittlerootTown_EventScript_14DC2A:: @ 814DC2A
applymovement 4, LittlerootTown_Movement_14DCD3
waitmovement 0
- setdooropened 0x8009, 0x800a
- doorchange
+ opendoor 0x8009, 0x800a
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14DCE0
waitmovement 0
hideobject 4, 0, 9
- setdoorclosed 0x8009, 0x800a
- doorchange
+ closedoor 0x8009, 0x800a
+ waitdooranim
return
LittlerootTown_EventScript_14DC50:: @ 814DC50
applymovement 4, LittlerootTown_Movement_14DCDA
waitmovement 0
- setdooropened 0x8009, 0x800a
- doorchange
+ opendoor 0x8009, 0x800a
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14DCE0
waitmovement 0
hideobject 4, 0, 9
- setdoorclosed 0x8009, 0x800a
- doorchange
+ closedoor 0x8009, 0x800a
+ waitdooranim
return
LittlerootTown_Movement_14DC76:: @ 814DC76
@@ -849,13 +849,13 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2
call LittlerootTown_EventScript_14DD38
applymovement 4, LittlerootTown_Movement_1A0841
waitmovement 0
- setdooropened 0x8009, 0x800a
- doorchange
+ opendoor 0x8009, 0x800a
+ waitdooranim
applymovement 4, LittlerootTown_Movement_14DCE0
waitmovement 0
hideobject 4, 0, 9
- setdoorclosed 0x8009, 0x800a
- doorchange
+ closedoor 0x8009, 0x800a
+ waitdooranim
goto LittlerootTown_EventScript_14DD2B
end
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index b1e3d94ac..651f2afb4 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -124,8 +124,8 @@ Route104_EventScript_14EFCC:: @ 814EFCC
end
Route104_EventScript_14EFD5:: @ 814EFD5
- spritelevelup 8, 0, 19, 0
- spritelevelup 255, 0, 19, 0
+ setobjectpriority 8, 0, 19, 0
+ setobjectpriority 255, 0, 19, 0
applymovement 8, Route104_Movement_14F16C
waitmovement 0
removeobject 8
@@ -144,7 +144,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5
waitmovement 0
setobjectxyperm 2, 12, 8
addobject 2
- spritelevelup 2, 0, 11, 0
+ setobjectpriority 2, 0, 11, 0
clearflag 740
applymovement 2, Route104_Movement_14F16F
waitmovement 0
@@ -154,8 +154,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5
setflag 742
hideobject 7, 0, 19
copyvar 0x4096, 0x8008
- restorespritelevel 255, 0, 19
- restorespritelevel 2, 0, 11
+ resetobjectpriority 255, 0, 19
+ resetobjectpriority 2, 0, 11
moveobjectoffscreen 2
setvar 0x408e, 0
checkflag 189
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index 501ca5e0e..9f0ef8c8d 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -3,8 +3,8 @@ Route109_MapScripts:: @ 814F4D2
Route109_EventScript_14F4D3:: @ 814F4D3
call Route109_EventScript_1A010C
- spritelevelup 2, 0, 24, 0
- spritelevelup 255, 0, 24, 0
+ setobjectpriority 2, 0, 24, 0
+ setobjectpriority 255, 0, 24, 0
applymovement 2, Route109_Movement_14F67B
waitmovement 0
removeobject 2
@@ -46,7 +46,7 @@ Route109_EventScript_14F548:: @ 814F548
clearflag 743
setobjectxyperm 2, 12, 8
addobject 2
- spritelevelup 2, 0, 11, 0
+ setobjectpriority 2, 0, 11, 0
applymovement 2, Route109_Movement_14F67D
waitmovement 0
clearflag 740
@@ -55,8 +55,8 @@ Route109_EventScript_14F548:: @ 814F548
msgbox Route109_Text_16B4B5, 4
closemessage
copyvar 0x4096, 0x8008
- restorespritelevel 255, 0, 24
- restorespritelevel 2, 0, 11
+ resetobjectpriority 255, 0, 24
+ resetobjectpriority 2, 0, 11
moveobjectoffscreen 2
release
end
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index ec13ca3a3..545e62921 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -314,13 +314,13 @@ Route111_EventScript_1501F3:: @ 81501F3
end
Route111_EventScript_150348:: @ 8150348
- setdooropened 13, 113
- doorchange
+ opendoor 13, 113
+ waitdooranim
return
Route111_EventScript_15034F:: @ 815034F
- setdoorclosed 13, 113
- doorchange
+ closedoor 13, 113
+ waitdooranim
return
Route111_Movement_150356:: @ 8150356
diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc
index 7c3c575dc..69da29471 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/scripts/maps/Route130.inc
@@ -22,11 +22,11 @@ Route130_MapScript1_1523C8:: @ 81523C8
setflag 30
setflag 31
setflag 32
- setmapfooter 264
+ setmaplayoutindex 264
end
Route130_EventScript_15240C:: @ 815240C
- setmapfooter 46
+ setmaplayoutindex 46
end
Route130_EventScript_152410:: @ 8152410
diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc
index 124788a17..50ad4222b 100644
--- a/data/scripts/maps/Route131.inc
+++ b/data/scripts/maps/Route131.inc
@@ -8,7 +8,7 @@ Route131_MapScript1_152444:: @ 8152444
end
Route131_EventScript_15244E:: @ 815244E
- setmapfooter 320
+ setmaplayoutindex 320
return
Route131_EventScript_152452:: @ 8152452
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index 19ac9a036..eb3d108a6 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -6,9 +6,9 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC
call SeafloorCavern_Room9_EventScript_1A0196
call SeafloorCavern_Room9_EventScript_1A01B5
.ifdef SAPPHIRE
- setmapfooter 157
+ setmaplayoutindex 157
.else
- setmapfooter 327
+ setmaplayoutindex 327
.endif
end
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
index 983ab69d9..52d430db5 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
@@ -9,11 +9,11 @@ ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D
goto ShoalCave_LowTideEntranceRoom_EventScript_15E072
ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E
- setmapfooter 169
+ setmaplayoutindex 169
end
ShoalCave_LowTideEntranceRoom_EventScript_15E072:: @ 815E072
- setmapfooter 165
+ setmaplayoutindex 165
end
ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
index 05fc6a315..ada997023 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
@@ -9,11 +9,11 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D
goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF
ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB
- setmapfooter 170
+ setmaplayoutindex 170
end
ShoalCave_LowTideInnerRoom_EventScript_15E1AF:: @ 815E1AF
- setmapfooter 166
+ setmaplayoutindex 166
end
ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
index 6b7854dc9..a3a1f711c 100644
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ b/data/scripts/maps/UnknownMap_25_34.inc
@@ -302,73 +302,73 @@ LinkContestRoom1_EventScript_15F919:: @ 815F919
return
LinkContestRoom1_EventScript_15F956:: @ 815F956
- createvsprite 5, 20, 3, 2, 3, 1
- createvsprite 46, 24, 11, 2, 3, 1
+ createvobject 5, 20, 3, 2, 3, 1
+ createvobject 46, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_15F969:: @ 815F969
- createvsprite 45, 0, 2, 3, 3, 4
- createvsprite 66, 1, 2, 4, 3, 4
- createvsprite 55, 2, 2, 7, 3, 4
- createvsprite 46, 3, 2, 8, 3, 4
- createvsprite 5, 10, 12, 3, 3, 3
- createvsprite 20, 11, 12, 4, 3, 3
- createvsprite 24, 12, 12, 7, 3, 3
- createvsprite 12, 13, 12, 8, 3, 3
- createvsprite 47, 20, 3, 2, 3, 1
- createvsprite 46, 24, 11, 2, 3, 1
+ createvobject 45, 0, 2, 3, 3, 4
+ createvobject 66, 1, 2, 4, 3, 4
+ createvobject 55, 2, 2, 7, 3, 4
+ createvobject 46, 3, 2, 8, 3, 4
+ createvobject 5, 10, 12, 3, 3, 3
+ createvobject 20, 11, 12, 4, 3, 3
+ createvobject 24, 12, 12, 7, 3, 3
+ createvobject 12, 13, 12, 8, 3, 3
+ createvobject 47, 20, 3, 2, 3, 1
+ createvobject 46, 24, 11, 2, 3, 1
return
LinkContestRoom1_EventScript_15F9C4:: @ 815F9C4
- createvsprite 45, 0, 2, 3, 3, 4
- createvsprite 66, 1, 2, 4, 3, 4
- createvsprite 55, 2, 2, 7, 3, 4
- createvsprite 48, 3, 2, 8, 3, 4
- createvsprite 5, 10, 12, 3, 3, 3
- createvsprite 20, 11, 12, 4, 3, 3
- createvsprite 24, 12, 12, 7, 3, 3
- createvsprite 45, 13, 12, 8, 3, 3
- createvsprite 22, 20, 3, 2, 3, 1
- createvsprite 23, 20, 6, 2, 3, 1
- createvsprite 34, 20, 7, 2, 3, 1
- createvsprite 46, 24, 8, 2, 3, 1
- createvsprite 48, 24, 11, 2, 3, 1
- createvsprite 11, 25, 3, 9, 3, 2
- createvsprite 35, 26, 4, 9, 3, 2
- createvsprite 17, 27, 5, 9, 3, 2
- createvsprite 41, 28, 9, 9, 3, 2
- createvsprite 38, 29, 10, 9, 3, 2
- createvsprite 83, 30, 11, 9, 3, 2
+ createvobject 45, 0, 2, 3, 3, 4
+ createvobject 66, 1, 2, 4, 3, 4
+ createvobject 55, 2, 2, 7, 3, 4
+ createvobject 48, 3, 2, 8, 3, 4
+ createvobject 5, 10, 12, 3, 3, 3
+ createvobject 20, 11, 12, 4, 3, 3
+ createvobject 24, 12, 12, 7, 3, 3
+ createvobject 45, 13, 12, 8, 3, 3
+ createvobject 22, 20, 3, 2, 3, 1
+ createvobject 23, 20, 6, 2, 3, 1
+ createvobject 34, 20, 7, 2, 3, 1
+ createvobject 46, 24, 8, 2, 3, 1
+ createvobject 48, 24, 11, 2, 3, 1
+ createvobject 11, 25, 3, 9, 3, 2
+ createvobject 35, 26, 4, 9, 3, 2
+ createvobject 17, 27, 5, 9, 3, 2
+ createvobject 41, 28, 9, 9, 3, 2
+ createvobject 38, 29, 10, 9, 3, 2
+ createvobject 83, 30, 11, 9, 3, 2
return
LinkContestRoom1_EventScript_15FA70:: @ 815FA70
- createvsprite 45, 0, 2, 3, 3, 4
- createvsprite 66, 1, 2, 4, 3, 4
- createvsprite 55, 2, 2, 7, 3, 4
- createvsprite 12, 3, 2, 8, 3, 4
- createvsprite 39, 4, 1, 3, 3, 4
- createvsprite 34, 6, 1, 5, 3, 4
- createvsprite 26, 7, 1, 6, 3, 4
- createvsprite 48, 9, 1, 8, 3, 4
- createvsprite 5, 10, 12, 3, 3, 3
- createvsprite 20, 11, 12, 4, 3, 3
- createvsprite 24, 12, 12, 7, 3, 3
- createvsprite 45, 13, 12, 8, 3, 3
- createvsprite 50, 14, 13, 3, 3, 3
- createvsprite 52, 15, 13, 4, 3, 3
- createvsprite 65, 17, 13, 6, 3, 3
- createvsprite 83, 18, 13, 7, 3, 3
- createvsprite 116, 19, 13, 8, 3, 3
- createvsprite 25, 20, 3, 2, 3, 1
- createvsprite 31, 21, 6, 2, 3, 1
- createvsprite 33, 22, 7, 2, 3, 1
- createvsprite 46, 24, 11, 2, 3, 1
- createvsprite 49, 25, 3, 9, 3, 2
- createvsprite 35, 26, 4, 9, 3, 2
- createvsprite 48, 27, 5, 9, 3, 2
- createvsprite 41, 28, 9, 9, 3, 2
- createvsprite 38, 29, 10, 9, 3, 2
- createvsprite 83, 30, 11, 9, 3, 2
+ createvobject 45, 0, 2, 3, 3, 4
+ createvobject 66, 1, 2, 4, 3, 4
+ createvobject 55, 2, 2, 7, 3, 4
+ createvobject 12, 3, 2, 8, 3, 4
+ createvobject 39, 4, 1, 3, 3, 4
+ createvobject 34, 6, 1, 5, 3, 4
+ createvobject 26, 7, 1, 6, 3, 4
+ createvobject 48, 9, 1, 8, 3, 4
+ createvobject 5, 10, 12, 3, 3, 3
+ createvobject 20, 11, 12, 4, 3, 3
+ createvobject 24, 12, 12, 7, 3, 3
+ createvobject 45, 13, 12, 8, 3, 3
+ createvobject 50, 14, 13, 3, 3, 3
+ createvobject 52, 15, 13, 4, 3, 3
+ createvobject 65, 17, 13, 6, 3, 3
+ createvobject 83, 18, 13, 7, 3, 3
+ createvobject 116, 19, 13, 8, 3, 3
+ createvobject 25, 20, 3, 2, 3, 1
+ createvobject 31, 21, 6, 2, 3, 1
+ createvobject 33, 22, 7, 2, 3, 1
+ createvobject 46, 24, 11, 2, 3, 1
+ createvobject 49, 25, 3, 9, 3, 2
+ createvobject 35, 26, 4, 9, 3, 2
+ createvobject 48, 27, 5, 9, 3, 2
+ createvobject 41, 28, 9, 9, 3, 2
+ createvobject 38, 29, 10, 9, 3, 2
+ createvobject 83, 30, 11, 9, 3, 2
return
LinkContestRoom1_EventScript_15FB64:: @ 815FB64
diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c
index dd80a2f42..90b986a1f 100644
--- a/src/field/scrcmd.c
+++ b/src/field/scrcmd.c
@@ -708,7 +708,7 @@ bool8 ScrCmd_tileeffect(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_setmapfooter(struct ScriptContext *ctx)
+bool8 ScrCmd_setmaplayoutindex(struct ScriptContext *ctx)
{
u16 value = VarGet(ScriptReadHalfword(ctx));
@@ -1093,7 +1093,7 @@ bool8 ScrCmd_hideobject(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_spritelevelup(struct ScriptContext *ctx)
+bool8 ScrCmd_setobjectpriority(struct ScriptContext *ctx)
{
u16 localId = VarGet(ScriptReadHalfword(ctx));
u8 mapGroup = ScriptReadByte(ctx);
@@ -1104,7 +1104,7 @@ bool8 ScrCmd_spritelevelup(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_restorespritelevel(struct ScriptContext *ctx)
+bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx)
{
u16 localId = VarGet(ScriptReadHalfword(ctx));
u8 mapGroup = ScriptReadByte(ctx);
@@ -1142,7 +1142,7 @@ bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_createvsprite(struct ScriptContext *ctx)
+bool8 ScrCmd_createvobject(struct ScriptContext *ctx)
{
u8 graphicsId = ScriptReadByte(ctx);
u8 v2 = ScriptReadByte(ctx);
@@ -1155,7 +1155,7 @@ bool8 ScrCmd_createvsprite(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_vspriteface(struct ScriptContext *ctx)
+bool8 ScrCmd_turnvobject(struct ScriptContext *ctx)
{
u8 v1 = ScriptReadByte(ctx);
u8 direction = ScriptReadByte(ctx);
@@ -1913,7 +1913,7 @@ bool8 ScrCmd_setmaptile(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_setdooropened(struct ScriptContext *ctx)
+bool8 ScrCmd_opendoor(struct ScriptContext *ctx)
{
u16 x = VarGet(ScriptReadHalfword(ctx));
u16 y = VarGet(ScriptReadHalfword(ctx));
@@ -1925,7 +1925,7 @@ bool8 ScrCmd_setdooropened(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_setdoorclosed(struct ScriptContext *ctx)
+bool8 ScrCmd_closedoor(struct ScriptContext *ctx)
{
u16 x = VarGet(ScriptReadHalfword(ctx));
u16 y = VarGet(ScriptReadHalfword(ctx));
@@ -1944,13 +1944,13 @@ static bool8 IsDoorAnimationStopped()
return FALSE;
}
-bool8 ScrCmd_doorchange(struct ScriptContext *ctx)
+bool8 ScrCmd_waitdooranim(struct ScriptContext *ctx)
{
SetupNativeScript(ctx, IsDoorAnimationStopped);
return TRUE;
}
-bool8 ScrCmd_setdooropened2(struct ScriptContext *ctx)
+bool8 ScrCmd_setdooropen(struct ScriptContext *ctx)
{
u16 x = VarGet(ScriptReadHalfword(ctx));
u16 y = VarGet(ScriptReadHalfword(ctx));
@@ -1961,7 +1961,7 @@ bool8 ScrCmd_setdooropened2(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_setdoorclosed2(struct ScriptContext *ctx)
+bool8 ScrCmd_setdoorclosed(struct ScriptContext *ctx)
{
u16 x = VarGet(ScriptReadHalfword(ctx));
u16 y = VarGet(ScriptReadHalfword(ctx));
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 13:37:34 +0000