summaryrefslogtreecommitdiff
path: root/engine/phone_scripts.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-23 12:59:19 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-23 12:59:19 -0400
commit432df825d4039a44a49fff01ef843395ab5abb3d (patch)
tree5a2dce3edf871a8d420b927411cee6ef1f931781 /engine/phone_scripts.asm
parent185b0a1c86e442d9c3ecd38d7c3fc7cfdb24be21 (diff)
Replaced GROUP_, MAP_ references with the map macro
Updated macros that rely on the GROUP_, MAP_ constants to use the map macro Added GROUP_NONE and MAP_NONE for the sake of compatibility with this new scheme Added new macro elevfloor to simplify the definition of elevators under this new scheme
Diffstat (limited to 'engine/phone_scripts.asm')
-rw-r--r--engine/phone_scripts.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm
index 9aba26450..a7a41a8ce 100644
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -1001,7 +1001,7 @@ UnknownScript_0xbd6a6:
iftrue UnknownScript_0xbd6bd
setflag ENGINE_DUNSPARCE_SWARM
pokenamemem DUNSPARCE, $1
- loadwilddata $0, GROUP_DARK_CAVE_VIOLET_ENTRANCE, MAP_DARK_CAVE_VIOLET_ENTRANCE
+ loadwilddata $0, DARK_CAVE_VIOLET_ENTRANCE
displaylocation DARK_CAVE, $2
farjump UnknownScript_0xa05de
@@ -1224,7 +1224,7 @@ UnknownScript_0xbd887:
iftrue UnknownScript_0xbd8a2
setflag ENGINE_YANMA_SWARM
pokenamemem YANMA, $1
- loadwilddata $1, GROUP_ROUTE_35, MAP_ROUTE_35
+ loadwilddata $1, ROUTE_35
displaylocation ROUTE_35, $2
farjump UnknownScript_0xa05ce