summaryrefslogtreecommitdiff
path: root/data/maps/Route123
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route123')
-rw-r--r--data/maps/Route123/map.json70
-rw-r--r--data/maps/Route123/scripts.inc12
2 files changed, 41 insertions, 41 deletions
diff --git a/data/maps/Route123/map.json b/data/maps/Route123/map.json
index bfbb21685..3d7914161 100644
--- a/data/maps/Route123/map.json
+++ b/data/maps/Route123/map.json
@@ -23,7 +23,7 @@
],
"object_events": [
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 11,
"y": 3,
"elevation": 3,
@@ -36,7 +36,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 12,
"y": 3,
"elevation": 3,
@@ -49,7 +49,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 14,
"y": 3,
"elevation": 3,
@@ -62,7 +62,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 15,
"y": 3,
"elevation": 3,
@@ -75,7 +75,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 81,
"y": 1,
"elevation": 3,
@@ -88,7 +88,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 82,
"y": 1,
"elevation": 3,
@@ -101,7 +101,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 83,
"y": 1,
"elevation": 3,
@@ -114,7 +114,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_WOMAN_7",
+ "graphics_id": "OBJ_EVENT_GFX_WOMAN_7",
"x": 70,
"y": 12,
"elevation": 3,
@@ -127,7 +127,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_MAN_4",
+ "graphics_id": "OBJ_EVENT_GFX_MAN_4",
"x": 58,
"y": 7,
"elevation": 3,
@@ -140,7 +140,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 14,
"y": 5,
"elevation": 3,
@@ -153,7 +153,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 15,
"y": 5,
"elevation": 3,
@@ -166,7 +166,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 17,
"y": 5,
"elevation": 3,
@@ -179,7 +179,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 18,
"y": 5,
"elevation": 3,
@@ -192,7 +192,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 17,
"y": 3,
"elevation": 3,
@@ -205,7 +205,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 18,
"y": 3,
"elevation": 3,
@@ -218,7 +218,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 11,
"y": 5,
"elevation": 3,
@@ -231,7 +231,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 12,
"y": 5,
"elevation": 3,
@@ -244,7 +244,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 101,
"y": 13,
"elevation": 3,
@@ -257,7 +257,7 @@
"flag": "FLAG_TEMP_11"
},
{
- "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 129,
"y": 14,
"elevation": 3,
@@ -270,7 +270,7 @@
"flag": "FLAG_TEMP_12"
},
{
- "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE",
"x": 92,
"y": 9,
"elevation": 3,
@@ -283,7 +283,7 @@
"flag": "FLAG_TEMP_13"
},
{
- "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 31,
"y": 8,
"elevation": 3,
@@ -296,7 +296,7 @@
"flag": "FLAG_ITEM_ROUTE123_1"
},
{
- "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 139,
"y": 18,
"elevation": 3,
@@ -309,7 +309,7 @@
"flag": "FLAG_ITEM_ROUTE123_2"
},
{
- "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
+ "graphics_id": "OBJ_EVENT_GFX_GIRL_3",
"x": 108,
"y": 13,
"elevation": 3,
@@ -322,7 +322,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 109,
"y": 13,
"elevation": 3,
@@ -335,7 +335,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 110,
"y": 13,
"elevation": 3,
@@ -348,7 +348,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE",
+ "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE",
"x": 111,
"y": 13,
"elevation": 3,
@@ -361,7 +361,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_WOMAN_3",
+ "graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
"x": 16,
"y": 9,
"elevation": 3,
@@ -374,7 +374,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1",
+ "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1",
"x": 38,
"y": 13,
"elevation": 3,
@@ -387,7 +387,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1",
+ "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1",
"x": 37,
"y": 13,
"elevation": 3,
@@ -400,7 +400,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M",
+ "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M",
"x": 138,
"y": 12,
"elevation": 3,
@@ -413,7 +413,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_LASS",
+ "graphics_id": "OBJ_EVENT_GFX_LASS",
"x": 50,
"y": 16,
"elevation": 3,
@@ -426,7 +426,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC",
+ "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC",
"x": 87,
"y": 14,
"elevation": 3,
@@ -439,7 +439,7 @@
"flag": "0"
},
{
- "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 27,
"y": 18,
"elevation": 3,
@@ -452,7 +452,7 @@
"flag": "FLAG_ITEM_ROUTE123_3"
},
{
- "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",
+ "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
"x": 75,
"y": 9,
"elevation": 3,
@@ -701,4 +701,4 @@
"flag": "FLAG_HIDDEN_ITEM_4A"
}
]
-} \ No newline at end of file
+}
diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc
index 4dda69997..f3ed72b9b 100644
--- a/data/maps/Route123/scripts.inc
+++ b/data/maps/Route123/scripts.inc
@@ -12,11 +12,11 @@ Route123_EventScript_151C5D:: @ 8151C5D
goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_151CAC
msgbox Route123_Text_171D83, 4
special IsGrassTypeInParty
- compare RESULT, 0
+ compare VAR_RESULT, 0
goto_if_eq Route123_EventScript_151CAA
msgbox Route123_Text_171DC2, 4
giveitem_std ITEM_TM19_GIGA_DRAIN
- compare RESULT, 0
+ compare VAR_RESULT, 0
goto_if_eq Route123_EventScript_1A029B
setflag FLAG_RECEIVED_TM19
msgbox Route123_Text_171E34, 4
@@ -61,8 +61,8 @@ Route123_EventScript_151CFF:: @ 8151CFF
Route123_EventScript_151D16:: @ 8151D16
trainerbattle 0, TRAINER_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3
- specialvar RESULT, ShouldTryRematchBattle
- compare RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_if_eq Route123_EventScript_151D3D
msgbox Route123_Text_1C01B1, 6
end
@@ -74,8 +74,8 @@ Route123_EventScript_151D3D:: @ 8151D3D
Route123_EventScript_151D54:: @ 8151D54
trainerbattle 0, TRAINER_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303
- specialvar RESULT, ShouldTryRematchBattle
- compare RESULT, 1
+ specialvar VAR_RESULT, ShouldTryRematchBattle
+ compare VAR_RESULT, 1
goto_if_eq Route123_EventScript_151D7B
msgbox Route123_Text_1C030F, 6
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 12:47:29 +0000