diff options
Diffstat (limited to 'data/maps')
579 files changed, 4238 insertions, 4238 deletions
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.json b/data/maps/AbandonedShip_CaptainsOffice/map.json index 9ba54183a..b1c4086c0 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/map.json +++ b/data/maps/AbandonedShip_CaptainsOffice/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 6, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index 22c76847a..c7be02801 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -6,7 +6,7 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 faceplayer goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, AbandonedShip_CaptainsOffice_EventScript_15EB2D msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 diff --git a/data/maps/AbandonedShip_Corridors_1F/map.json b/data/maps/AbandonedShip_Corridors_1F/map.json index 96d49a702..c65a79fdc 100644 --- a/data/maps/AbandonedShip_Corridors_1F/map.json +++ b/data/maps/AbandonedShip_Corridors_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 17, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 5, "y": 10, "elevation": 3, @@ -126,4 +126,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.json b/data/maps/AbandonedShip_Corridors_B1F/map.json index 2461f4f46..7c100a73e 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/map.json +++ b/data/maps/AbandonedShip_Corridors_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 2, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 9, "y": 6, "elevation": 3, @@ -107,4 +107,4 @@ "script": "AbandonedShip_Corridors_B1F_EventScript_15E9D3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index 7b3923a86..cdf430e27 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -28,7 +28,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 lockall goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse SE_PIN diff --git a/data/maps/AbandonedShip_Deck/map.json b/data/maps/AbandonedShip_Deck/map.json index f6cd97821..73c3a0e96 100644 --- a/data/maps/AbandonedShip_Deck/map.json +++ b/data/maps/AbandonedShip_Deck/map.json @@ -50,4 +50,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json index 1f91ea0e6..78abf1e20 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.json +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/map.json @@ -90,4 +90,4 @@ "script": "AbandonedShip_HiddenFloorCorridors_EventScript_15EC98" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index 6a71ee049..6639e6b6e 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 lockall goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse SE_PIN @@ -69,7 +69,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A lockall goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse SE_PIN @@ -84,7 +84,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 lockall goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse SE_PIN @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 lockall goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse SE_PIN diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.json b/data/maps/AbandonedShip_HiddenFloorRooms/map.json index 1e7250a37..243d83bdf 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/map.json +++ b/data/maps/AbandonedShip_HiddenFloorRooms/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 41, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 11, "elevation": 3, @@ -212,4 +212,4 @@ "script": "AbandonedShip_HiddenFloorRooms_EventScript_15EEAB" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc index 5a5ab3005..0c2e900c3 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc @@ -43,8 +43,8 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 dofieldeffect FLDEFF_SPARKLE - specialvar RESULT, FoundAbandonedShipRoom4Key - compare RESULT, 0 + specialvar VAR_RESULT, FoundAbandonedShipRoom4Key + compare VAR_RESULT, 0 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B waitfieldeffect FLDEFF_SPARKLE delay 10 @@ -54,11 +54,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 - specialvar RESULT, FoundAbandonedShipRoom1Key - compare RESULT, 1 + specialvar VAR_RESULT, FoundAbandonedShipRoom1Key + compare VAR_RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B waitfieldeffect FLDEFF_SPARKLE delay 10 @@ -77,8 +77,8 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setfieldeffectargument 1, 3 setfieldeffectargument 2, 0 dofieldeffect FLDEFF_SPARKLE - specialvar RESULT, FoundAbandonedShipRoom6Key - compare RESULT, 0 + specialvar VAR_RESULT, FoundAbandonedShipRoom6Key + compare VAR_RESULT, 0 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B waitfieldeffect FLDEFF_SPARKLE delay 10 @@ -98,8 +98,8 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setfieldeffectargument 1, 6 setfieldeffectargument 2, 0 dofieldeffect FLDEFF_SPARKLE - specialvar RESULT, FoundAbandonedShipRoom2Key - compare RESULT, 0 + specialvar VAR_RESULT, FoundAbandonedShipRoom2Key + compare VAR_RESULT, 0 call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B waitfieldeffect FLDEFF_SPARKLE delay 10 diff --git a/data/maps/AbandonedShip_Room_B1F/map.json b/data/maps/AbandonedShip_Room_B1F/map.json index 179130662..abbe32342 100644 --- a/data/maps/AbandonedShip_Room_B1F/map.json +++ b/data/maps/AbandonedShip_Room_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.json b/data/maps/AbandonedShip_Rooms2_1F/map.json index 792287b70..1d9d75c42 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 13, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index cd7c8fd9f..089893aa2 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -3,8 +3,8 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 end @@ -16,8 +16,8 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 end diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.json b/data/maps/AbandonedShip_Rooms2_B1F/map.json index d41973d6c..ce39a1b79 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms2_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 3, "elevation": 3, @@ -70,4 +70,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_1F/map.json b/data/maps/AbandonedShip_Rooms_1F/map.json index dbff0fb56..e78ef41b1 100644 --- a/data/maps/AbandonedShip_Rooms_1F/map.json +++ b/data/maps/AbandonedShip_Rooms_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 5, "elevation": 3, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.json b/data/maps/AbandonedShip_Rooms_B1F/map.json index 276c9af99..5ae694e61 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/map.json +++ b/data/maps/AbandonedShip_Rooms_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 25, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 7, "elevation": 3, @@ -63,4 +63,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater1/map.json b/data/maps/AbandonedShip_Underwater1/map.json index a3e1bafb6..8e891b65d 100644 --- a/data/maps/AbandonedShip_Underwater1/map.json +++ b/data/maps/AbandonedShip_Underwater1/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AbandonedShip_Underwater2/map.json b/data/maps/AbandonedShip_Underwater2/map.json index ddffa3ccd..72b161120 100644 --- a/data/maps/AbandonedShip_Underwater2/map.json +++ b/data/maps/AbandonedShip_Underwater2/map.json @@ -22,4 +22,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AncientTomb/map.json b/data/maps/AncientTomb/map.json index b9f8d49df..c9286da84 100644 --- a/data/maps/AncientTomb/map.json +++ b/data/maps/AncientTomb/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGISTEEL", + "graphics_id": "OBJ_EVENT_GFX_REGISTEEL", "x": 8, "y": 7, "elevation": 3, @@ -75,4 +75,4 @@ "script": "AncientTomb_EventScript_15F042" } ] -}
\ No newline at end of file +} diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index c8d5e13b2..01b04bf27 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -9,7 +9,7 @@ AncientTomb_MapScript1_15EFCE:: @ 815EFCE end AncientTomb_EventScript_15EFD8:: @ 815EFD8 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED return AncientTomb_MapScript1_15EFDC:: @ 815EFDC diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 711a88409..d9fac11ab 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 20, "y": 4, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index 1bf19ee24..a5a26ae9b 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 27, "y": 18, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 20, "y": 18, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 10, "elevation": 3, @@ -295,4 +295,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 3b4c04273..a5268d031 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -8,7 +8,7 @@ AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C end AquaHideout_B1F_EventScript_15D846:: @ 815D846 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED return AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index c15429c2a..11dcc1a40 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 13, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 19, "y": 20, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 6, "elevation": 3, @@ -170,4 +170,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 103de2313..519c799fc 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -9,14 +9,14 @@ AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 playse SE_PIN - applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE - applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839 .else - applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0841 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 setvar VAR_TEMP_1, 1 @@ -31,37 +31,37 @@ MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 end AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 .ifdef SAPPHIRE - setvar VAR_SPECIAL_9, 4 + setvar VAR_0x8009, 4 .else - setvar VAR_SPECIAL_9, 3 + setvar VAR_0x8009, 3 .endif .ifdef SAPPHIRE - applymovement VAR_SPECIAL_8, Movement_1A083F + applymovement VAR_0x8008, Movement_1A083F .else - applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0843 .endif waitmovement 0 delay 20 - applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closemessage .ifdef SAPPHIRE - applymovement VAR_SPECIAL_8, Movement_1A083F + applymovement VAR_0x8008, Movement_1A083F .else - applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D958 + applymovement VAR_0x8009, AquaHideout_B2F_Movement_15D958 .else - applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D95D + applymovement VAR_0x8009, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - removeobject VAR_SPECIAL_9 + removeobject VAR_0x8009 delay 20 - applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE diff --git a/data/maps/BattleTower_BattleRoom/map.json b/data/maps/BattleTower_BattleRoom/map.json index e01643833..848b03946 100644 --- a/data/maps/BattleTower_BattleRoom/map.json +++ b/data/maps/BattleTower_BattleRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 5, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BATTLE_TOWER_OPPONENT" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 7, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index ea80ae58b..589438fa3 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -21,27 +21,27 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA waitmessage closemessage special ScrSpecial_HealPlayerParty - setvar VAR_SPECIAL_4, 0 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 0 special StartSpecialBattle waitstate - switch RESULT + switch VAR_RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty - setvar VAR_SPECIAL_4, 0 - setvar VAR_SPECIAL_5, 5 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 5 special SetBattleTowerProperty - setvar VAR_SPECIAL_4, 14 + setvar VAR_0x8004, 14 special SetBattleTowerProperty - setvar VAR_SPECIAL_4, 3 + setvar VAR_0x8004, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 - setvar VAR_SPECIAL_4, 6 + setvar VAR_0x8004, 6 special SetBattleTowerProperty - switch RESULT + switch VAR_RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 applymovement 1, BattleTower_BattleRoom_Movement_160AC6 waitmovement 0 @@ -60,21 +60,21 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2 msgbox BattleTower_BattleRoom_Text_19AD09, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case NO, BattleTower_BattleRoom_EventScript_1609E0 case YES, BattleTower_BattleRoom_EventScript_160A3C case 127, BattleTower_BattleRoom_EventScript_1609E0 BattleTower_BattleRoom_EventScript_1609E0:: @ 81609E0 msgbox BattleTower_BattleRoom_Text_19AD3C, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case NO, BattleTower_BattleRoom_EventScript_160A0E case YES, BattleTower_BattleRoom_EventScript_160A94 case 127, BattleTower_BattleRoom_EventScript_160A0E BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E msgbox BattleTower_BattleRoom_Text_19AD66, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case NO, BattleTower_BattleRoom_EventScript_1609B2 case YES, BattleTower_BattleRoom_EventScript_160AB1 case 127, BattleTower_BattleRoom_EventScript_1609B2 @@ -89,23 +89,23 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty - setvar VAR_SPECIAL_4, 0 - setvar VAR_SPECIAL_5, 4 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 4 special SetBattleTowerProperty - setvar VAR_SPECIAL_4, 2 - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 1 special SetBattleTowerProperty - setvar VAR_SPECIAL_4, 7 + setvar VAR_0x8004, 7 special SetBattleTowerProperty - setvar VAR_SPECIAL_4, 14 + setvar VAR_0x8004, 14 special SetBattleTowerProperty - setvar VAR_SPECIAL_4, 3 + setvar VAR_0x8004, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 special SaveBattleTowerProgress message BattleTower_BattleRoom_Text_1C6CE1 delay 60 diff --git a/data/maps/BattleTower_Corridor/map.json b/data/maps/BattleTower_Corridor/map.json index bc61ba6e5..eec8217c8 100644 --- a/data/maps/BattleTower_Corridor/map.json +++ b/data/maps/BattleTower_Corridor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 9, "y": 2, "elevation": 3, @@ -28,4 +28,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Corridor/scripts.inc b/data/maps/BattleTower_Corridor/scripts.inc index 6511d0333..8981a2a14 100644 --- a/data/maps/BattleTower_Corridor/scripts.inc +++ b/data/maps/BattleTower_Corridor/scripts.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare VAR_SPECIAL_6, 1 + compare VAR_0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmetatile 12, 0, METATILE_BattleTower_CorridorOpenDoor_Top, 0 setmetatile 12, 1, METATILE_BattleTower_CorridorOpenDoor_Bottom, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar VAR_TEMP_0, 1 - compare VAR_SPECIAL_6, 1 + compare VAR_0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 applymovement 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/maps/BattleTower_Elevator/map.json b/data/maps/BattleTower_Elevator/map.json index fa1eed087..43e78ec05 100644 --- a/data/maps/BattleTower_Elevator/map.json +++ b/data/maps/BattleTower_Elevator/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 1, "y": 5, "elevation": 3, @@ -28,4 +28,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Lobby/map.json b/data/maps/BattleTower_Lobby/map.json index 8a155bb78..8b630bfdd 100644 --- a/data/maps/BattleTower_Lobby/map.json +++ b/data/maps/BattleTower_Lobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 12, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 1, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 4, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_REPORTER_BATTLE_TOWER" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 6, "elevation": 3, @@ -124,4 +124,4 @@ "script": "BattleTower_Lobby_EventScript_160727" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc index 28f828bc6..bac2dff05 100644 --- a/data/maps/BattleTower_Lobby/scripts.inc +++ b/data/maps/BattleTower_Lobby/scripts.inc @@ -11,23 +11,23 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 end BattleTower_Lobby_EventScript_16029C:: @ 816029C - setvar VAR_SPECIAL_4, 10 + setvar VAR_0x8004, 10 special SetBattleTowerProperty goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4 goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD - specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak - compare VAR_SPECIAL_7, 50 + specialvar VAR_0x8007, GetBestBattleTowerStreak + compare VAR_0x8007, 50 goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER - special TryInitBattleTowerAwardManEventObject + special TryInitBattleTowerAwardManObjectEvent return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak - compare VAR_SPECIAL_7, 100 + specialvar VAR_0x8007, GetBestBattleTowerStreak + compare VAR_0x8007, 100 goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER - special TryInitBattleTowerAwardManEventObject + special TryInitBattleTowerAwardManObjectEvent return BattleTower_Lobby_EventScript_1602E4:: @ 81602E4 @@ -73,12 +73,12 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 faceplayer message BattleTower_Lobby_Text_19A487 waitmessage - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 special BattleTowerUtil - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special AwardBattleTowerRibbons - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waitmessage @@ -87,36 +87,36 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 msgbox BattleTower_Lobby_Text_19A719, 4 BattleTower_Lobby_EventScript_16037D:: @ 816037D - setvar VAR_SPECIAL_4, 8 + setvar VAR_0x8004, 8 special BattleTowerUtil - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage - setvar VAR_SPECIAL_4, 13 + setvar VAR_0x8004, 13 special SetBattleTowerProperty special DetermineBattleTowerPrize - setvar VAR_SPECIAL_4, 3 + setvar VAR_0x8004, 3 special SaveBattleTowerProgress playse SE_SAVE waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD - setvar VAR_SPECIAL_4, 0 - setvar VAR_SPECIAL_5, 3 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 3 special SetBattleTowerProperty message BattleTower_Lobby_Text_19A4BB waitmessage special GiveBattleTowerPrize - switch RESULT + switch VAR_RESULT case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waitmessage playfanfare MUS_FANFA4 waitfanfare - setvar VAR_SPECIAL_4, 9 + setvar VAR_0x8004, 9 special BattleTowerUtil - compare RESULT, 49 + compare VAR_RESULT, 49 goto_if_ne BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -142,9 +142,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitmessage message BattleTower_Lobby_Text_19A589 waitmessage - setvar VAR_SPECIAL_4, 13 + setvar VAR_0x8004, 13 special SetBattleTowerProperty - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 special SaveBattleTowerProgress playse SE_SAVE waitse @@ -162,12 +162,12 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waitmessage message BattleTower_Lobby_Text_19A5CE waitmessage - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 special SaveBattleTowerProgress playse SE_SAVE waitse - setvar VAR_SPECIAL_4, 8 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 0 special SetBattleTowerProperty setvar VAR_TEMP_0, 5 special SavePlayerParty @@ -182,9 +182,9 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 special BattleTowerUtil - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty msgbox BattleTower_Lobby_Text_199F2C, 4 @@ -193,7 +193,7 @@ BattleTower_Lobby_EventScript_1604BE:: @ 81604BE message BattleTower_Lobby_Text_199F79 waitmessage multichoice 15, 6, 23, 0 - switch RESULT + switch VAR_RESULT case 0, BattleTower_Lobby_EventScript_1604FA case 1, BattleTower_Lobby_EventScript_160600 case 2, BattleTower_Lobby_EventScript_160652 @@ -203,39 +203,39 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA message BattleTower_Lobby_Text_19A024 waitmessage multichoice 18, 6, 24, 0 - switch RESULT + switch VAR_RESULT case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D - setvar VAR_SPECIAL_4, 1 - copyvar VAR_SPECIAL_5, RESULT - copyvar VAR_SPECIAL_6, RESULT + setvar VAR_0x8004, 1 + copyvar VAR_0x8005, VAR_RESULT + copyvar VAR_0x8006, VAR_RESULT special SetBattleTowerProperty msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 special ChooseBattleTowerPlayerParty waitstate - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16064F msgbox BattleTower_Lobby_Text_199FDA, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case NO, BattleTower_Lobby_EventScript_16064F case YES, BattleTower_Lobby_EventScript_160587 case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 - setvar VAR_SPECIAL_4, 5 + setvar VAR_0x8004, 5 special SetBattleTowerProperty setvar VAR_TEMP_0, 0 - setvar VAR_SPECIAL_4, 11 + setvar VAR_0x8004, 11 special SetBattleTowerProperty - setvar VAR_SPECIAL_4, 0 - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 1 special SetBattleTowerProperty - setvar VAR_SPECIAL_4, 8 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 8 + setvar VAR_0x8005, 0 special SetBattleTowerProperty special LoadPlayerParty closemessage @@ -243,7 +243,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 call S_DoSaveDialog setvar VAR_TEMP_0, 5 erasebox 0, 0, 15, 10 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty @@ -261,7 +261,7 @@ BattleTower_Lobby_EventScript_160600:: @ 8160600 goto BattleTower_Lobby_EventScript_1604BE BattleTower_Lobby_EventScript_16060D:: @ 816060D - switch RESULT + switch VAR_RESULT case 0, BattleTower_Lobby_EventScript_160628 case 1, BattleTower_Lobby_EventScript_160635 @@ -274,7 +274,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160642:: @ 8160642 - setvar VAR_SPECIAL_4, 12 + setvar VAR_0x8004, 12 special SetBattleTowerProperty goto BattleTower_Lobby_EventScript_160652 @@ -283,7 +283,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 - setvar VAR_SPECIAL_4, 11 + setvar VAR_0x8004, 11 special SetBattleTowerProperty BattleTower_Lobby_EventScript_160662:: @ 8160662 @@ -333,7 +333,7 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 lock faceplayer msgbox BattleTower_Lobby_Text_19A747, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case YES, BattleTower_Lobby_EventScript_1606CC case NO, BattleTower_Lobby_EventScript_1606F7 release @@ -341,13 +341,13 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 BattleTower_Lobby_EventScript_1606CC:: @ 81606CC msgbox BattleTower_Lobby_Text_19A7C3, 4 - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160701 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_16070B end @@ -388,9 +388,9 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5 goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 - setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD + setvar VAR_0x8008, DECOR_SILVER_SHIELD givedecoration_std DECOR_SILVER_SHIELD - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_SILVER_SHIELD msgbox BattleTower_Lobby_Text_19ABAA, 4 @@ -398,13 +398,13 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 end BattleTower_Lobby_EventScript_160773:: @ 8160773 - specialvar RESULT, GetBestBattleTowerStreak - compare RESULT, 100 + specialvar VAR_RESULT, GetBestBattleTowerStreak + compare VAR_RESULT, 100 goto_if_lt BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD + setvar VAR_0x8008, DECOR_GOLD_SHIELD givedecoration_std DECOR_GOLD_SHIELD - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_GOLD_SHIELD msgbox BattleTower_Lobby_Text_19ABAA, 4 @@ -412,7 +412,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - bufferdecorationname 1, VAR_SPECIAL_8 + bufferdecorationname 1, VAR_0x8008 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/maps/BattleTower_Outside/map.json b/data/maps/BattleTower_Outside/map.json index 8fe21534b..761dc2a10 100644 --- a/data/maps/BattleTower_Outside/map.json +++ b/data/maps/BattleTower_Outside/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 18, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 11, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 10, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 19, "y": 26, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 19, "y": 24, "elevation": 3, @@ -97,4 +97,4 @@ "script": "BattleTower_Outside_EventScript_16025A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/BattleTower_Outside/scripts.inc b/data/maps/BattleTower_Outside/scripts.inc index 8f6cb4305..680738272 100644 --- a/data/maps/BattleTower_Outside/scripts.inc +++ b/data/maps/BattleTower_Outside/scripts.inc @@ -13,7 +13,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 faceplayer msgbox BattleTower_Outside_Text_199D06, 4 checkitem ITEM_SS_TICKET, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waitmessage @@ -22,7 +22,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 BattleTower_Outside_EventScript_16018E:: @ 816018E multichoicedefault 21, 6, 53, 2, 0 - switch RESULT + switch VAR_RESULT case 0, BattleTower_Outside_EventScript_1601D0 case 1, BattleTower_Outside_EventScript_1601FB case 2, BattleTower_Outside_EventScript_160250 @@ -36,7 +36,7 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 BattleTower_Outside_EventScript_1601D0:: @ 81601D0 msgbox BattleTower_Outside_Text_199DF2, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -47,7 +47,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 BattleTower_Outside_EventScript_1601FB:: @ 81601FB msgbox BattleTower_Outside_Text_199E0E, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -64,11 +64,11 @@ BattleTower_Outside_EventScript_160226:: @ 8160226 BattleTower_Outside_EventScript_160232:: @ 8160232 closemessage - applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 + applymovement VAR_LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE - setvar VAR_SPECIAL_4, 4 + setvar VAR_0x8004, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json index 1c5957605..0a12aa36e 100644 --- a/data/maps/CaveOfOrigin_1F/map.json +++ b/data/maps/CaveOfOrigin_1F/map.json @@ -57,4 +57,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json index d0c378768..ed873116c 100644 --- a/data/maps/CaveOfOrigin_B1F/map.json +++ b/data/maps/CaveOfOrigin_B1F/map.json @@ -57,4 +57,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B2F/map.json b/data/maps/CaveOfOrigin_B2F/map.json index 793424743..9c35a6ad3 100644 --- a/data/maps/CaveOfOrigin_B2F/map.json +++ b/data/maps/CaveOfOrigin_B2F/map.json @@ -57,4 +57,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B3F/map.json b/data/maps/CaveOfOrigin_B3F/map.json index d6989c689..8dce96798 100644 --- a/data/maps/CaveOfOrigin_B3F/map.json +++ b/data/maps/CaveOfOrigin_B3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 5, "elevation": 3, @@ -71,4 +71,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B4F/map.json b/data/maps/CaveOfOrigin_B4F/map.json index 31376fa77..8ab4aa087 100644 --- a/data/maps/CaveOfOrigin_B4F/map.json +++ b/data/maps/CaveOfOrigin_B4F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 9, "y": 10, "elevation": 3, @@ -64,4 +64,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc index aeec7023f..b689d5158 100644 --- a/data/maps/CaveOfOrigin_B4F/scripts.inc +++ b/data/maps/CaveOfOrigin_B4F/scripts.inc @@ -42,9 +42,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 dofieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE .ifdef SAPPHIRE - setvar RESULT, 3 + setvar VAR_RESULT, 3 .else - setvar RESULT, 2 + setvar VAR_RESULT, 2 .endif playse SE_TAMA special sub_80818A4 @@ -63,8 +63,8 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar RESULT, GetBattleOutcome - compare RESULT, 1 + specialvar VAR_RESULT, GetBattleOutcome + compare VAR_RESULT, 1 call_if_eq CaveOfOrigin_B4F_EventScript_15DE73 setflag FLAG_HIDE_WALLACE_SOOTOPOLIS setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 diff --git a/data/maps/CaveOfOrigin_Entrance/map.json b/data/maps/CaveOfOrigin_Entrance/map.json index 160d8f11f..12df1094b 100644 --- a/data/maps/CaveOfOrigin_Entrance/map.json +++ b/data/maps/CaveOfOrigin_Entrance/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DesertRuins/map.json b/data/maps/DesertRuins/map.json index 6f9f801eb..6e8529525 100644 --- a/data/maps/DesertRuins/map.json +++ b/data/maps/DesertRuins/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGIROCK", + "graphics_id": "OBJ_EVENT_GFX_REGIROCK", "x": 8, "y": 7, "elevation": 3, @@ -75,4 +75,4 @@ "script": "DesertRuins_EventScript_15CB77" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index cf1ae8e72..fefb24228 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -9,7 +9,7 @@ DesertRuins_MapScript1_15CB03:: @ 815CB03 end DesertRuins_EventScript_15CB0D:: @ 815CB0D - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED return DesertRuins_MapScript1_15CB11:: @ 815CB11 diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json index 12baca163..9fe0e921d 100644 --- a/data/maps/DewfordTown/map.json +++ b/data/maps/DewfordTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 12, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 9, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 12, "y": 14, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 8, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 1, "y": 6, "elevation": 3, @@ -168,4 +168,4 @@ "script": "DewfordTown_EventScript_14E0BD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index 63f8c45b9..dec181f27 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -13,7 +13,7 @@ DewfordTown_EventScript_14E002:: @ 814E002 message DewfordTown_Text_16B522 waitmessage multichoicedefault 21, 6, 0, 2, 0 - switch RESULT + switch VAR_RESULT case 0, DewfordTown_EventScript_14E04B case 1, DewfordTown_EventScript_14E05B case 2, DewfordTown_EventScript_14E06B @@ -42,7 +42,7 @@ DewfordTown_EventScript_14E06B:: @ 814E06B DewfordTown_EventScript_14E076:: @ 814E076 msgbox DewfordTown_Text_16B3BC, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release @@ -75,9 +75,9 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 faceplayer goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq DewfordTown_EventScript_14E0F0 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq DewfordTown_EventScript_14E111 end @@ -98,9 +98,9 @@ DewfordTown_EventScript_14E11B:: @ 814E11B message DewfordTown_Text_16B84E waitmessage multichoice 20, 8, 50, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq DewfordTown_EventScript_14E13D - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq DewfordTown_EventScript_14E147 end @@ -141,7 +141,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 waitstate release end @@ -177,7 +177,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E281 call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A closemessage - copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 @@ -595,9 +595,9 @@ DewfordTown_EventScript_14E413:: @ 814E413 faceplayer call DewfordTown_EventScript_1A0102 msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq DewfordTown_EventScript_14E439 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq DewfordTown_EventScript_14E443 end @@ -608,19 +608,19 @@ DewfordTown_EventScript_14E439:: @ 814E439 DewfordTown_EventScript_14E443:: @ 814E443 msgbox DewfordTown_Text_16BADC, 4 - setvar VAR_SPECIAL_4, 9 + setvar VAR_0x8004, 9 call DewfordTown_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq DewfordTown_EventScript_14E46E - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq DewfordTown_EventScript_14E485 end DewfordTown_EventScript_14E46E:: @ 814E46E incrementgamestat GAME_STAT_STARTED_TRENDS - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/maps/DewfordTown_Gym/map.json b/data/maps/DewfordTown_Gym/map.json index 8d466ac25..eec89848c 100644 --- a/data/maps/DewfordTown_Gym/map.json +++ b/data/maps/DewfordTown_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BRAWLY", + "graphics_id": "OBJ_EVENT_GFX_BRAWLY", "x": 14, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 17, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 1, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 12, "y": 24, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 5, "y": 24, "elevation": 3, @@ -128,4 +128,4 @@ "script": "DewfordTown_Gym_EventScript_15326E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 3e57e0fec..476880f68 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -9,12 +9,12 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B DewfordTown_Gym_EventScript_153071:: @ 8153071 goto_if_trainer_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 - copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 - compare VAR_SPECIAL_0, 0 + copyvar VAR_0x8001, VAR_0x8000 + compare VAR_0x8000, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare VAR_SPECIAL_0, 1 + compare VAR_0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare VAR_SPECIAL_0, 2 + compare VAR_0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -41,14 +41,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - compare VAR_SPECIAL_0, VAR_SPECIAL_1 + compare VAR_0x8000, VAR_0x8001 goto_if_eq DewfordTown_Gym_EventScript_1530F5 - copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 - compare VAR_SPECIAL_0, 1 + copyvar VAR_0x8001, VAR_0x8000 + compare VAR_0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare VAR_SPECIAL_0, 2 + compare VAR_0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare VAR_SPECIAL_0, 3 + compare VAR_0x8000, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -79,17 +79,17 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 return DewfordTown_Gym_EventScript_153122:: @ 8153122 - setvar VAR_SPECIAL_0, 0 + setvar VAR_0x8000, 0 goto_if_trainer_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 - addvar VAR_SPECIAL_0, 1 + addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 goto_if_trainer_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 - addvar VAR_SPECIAL_0, 1 + addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 goto_if_trainer_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 - addvar VAR_SPECIAL_0, 1 + addvar VAR_0x8000, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return @@ -112,14 +112,14 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq DewfordTown_Gym_EventScript_1A00FB - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 giveitem_std ITEM_TM08_BULK_UP - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 setflag FLAG_RECEIVED_TM08 diff --git a/data/maps/DewfordTown_Hall/map.json b/data/maps/DewfordTown_Hall/map.json index 0f82fb6d0..ff4fa0065 100644 --- a/data/maps/DewfordTown_Hall/map.json +++ b/data/maps/DewfordTown_Hall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 4, "y": 6, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 1, "y": 5, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 4, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 3, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 5, "y": 2, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 14, "y": 7, "elevation": 0, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 12, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 15, "y": 3, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 6, "elevation": 3, @@ -164,4 +164,4 @@ "script": "DewfordTown_Hall_EventScript_153363" } ] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 602c4776e..65e16a78a 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -6,7 +6,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 faceplayer call DewfordTown_Hall_EventScript_1A0102 special TrendyPhraseIsOld - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 release @@ -31,9 +31,9 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD call DewfordTown_Hall_EventScript_1A0102 special BufferRandomHobbyOrLifestyleString msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq DewfordTown_Hall_EventScript_1532F6 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq DewfordTown_Hall_EventScript_153300 end @@ -88,7 +88,7 @@ DewfordTown_Hall_EventScript_153363:: @ 8153363 lockall call DewfordTown_Hall_EventScript_1A0102 special GetDewfordHallPaintingNameIndex - switch RESULT + switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_1533CA case 4, DewfordTown_Hall_EventScript_1533CA case 1, DewfordTown_Hall_EventScript_1533D4 @@ -121,20 +121,20 @@ DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 lockall - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_15340A:: @ 815340A call DewfordTown_Hall_EventScript_1A0102 special GetDewfordHallPaintingNameIndex - switch RESULT + switch VAR_RESULT case 0, DewfordTown_Hall_EventScript_153470 case 1, DewfordTown_Hall_EventScript_153470 case 2, DewfordTown_Hall_EventScript_15348C @@ -191,14 +191,14 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end DewfordTown_Hall_EventScript_15351E:: @ 815351E - compare FACING, 4 + compare VAR_FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC applymovement 255, DewfordTown_Hall_Movement_1A0843 waitmovement 0 @@ -210,16 +210,16 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 applymovement 7, DewfordTown_Hall_Movement_15359B waitmovement 0 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end DewfordTown_Hall_EventScript_153556:: @ 8153556 - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq DewfordTown_Hall_EventScript_15356D - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq DewfordTown_Hall_EventScript_153578 return @@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_153578:: @ 8153578 return DewfordTown_Hall_EventScript_153583:: @ 8153583 - compare FACING, 3 + compare VAR_FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC applymovement 255, DewfordTown_Hall_Movement_1A083F waitmovement 0 @@ -255,7 +255,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem_std ITEM_TM36_SLUDGE_BOMB - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag FLAG_RECEIVED_TM36 release diff --git a/data/maps/DewfordTown_House1/map.json b/data/maps/DewfordTown_House1/map.json index ea60b5b2a..d4774d408 100644 --- a/data/maps/DewfordTown_House1/map.json +++ b/data/maps/DewfordTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 3, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 4, "y": 2, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_House2/map.json b/data/maps/DewfordTown_House2/map.json index 502361cc0..87ab4a86b 100644 --- a/data/maps/DewfordTown_House2/map.json +++ b/data/maps/DewfordTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index a2341bc76..307e33033 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -7,7 +7,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem_std ITEM_SILK_SCARF - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag FLAG_RECEIVED_SILK_SCARF release diff --git a/data/maps/DewfordTown_PokemonCenter_1F/map.json b/data/maps/DewfordTown_PokemonCenter_1F/map.json index 6d45f5e01..bf90976b0 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 10, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 5, "elevation": 0, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index 38f242eab..5408bef63 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A end DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/DewfordTown_PokemonCenter_2F/map.json b/data/maps/DewfordTown_PokemonCenter_2F/map.json index 68322ae20..67ce247cc 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/map.json +++ b/data/maps/DewfordTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json index b7c3bad8f..3ce7e8570 100644 --- a/data/maps/DoubleBattleColosseum/map.json +++ b/data/maps/DoubleBattleColosseum/map.json @@ -80,4 +80,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json index 5b45d25af..643d4db3d 100644 --- a/data/maps/EverGrandeCity/map.json +++ b/data/maps/EverGrandeCity/map.json @@ -190,4 +190,4 @@ "script": "EverGrandeCity_EventScript_1A00EA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.json b/data/maps/EverGrandeCity_ChampionsRoom/map.json index 4b581716c..67025f33f 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/map.json +++ b/data/maps/EverGrandeCity_ChampionsRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_RIVAL_CHAMPIONS_ROOM" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 12, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 55597b1f8..abb8e4121 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 closemessage playse SE_DOOR checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB end @@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF diff --git a/data/maps/EverGrandeCity_Corridor1/map.json b/data/maps/EverGrandeCity_Corridor1/map.json index d22b9db11..86723c0f2 100644 --- a/data/maps/EverGrandeCity_Corridor1/map.json +++ b/data/maps/EverGrandeCity_Corridor1/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor2/map.json b/data/maps/EverGrandeCity_Corridor2/map.json index 6d87a7667..692e6daa7 100644 --- a/data/maps/EverGrandeCity_Corridor2/map.json +++ b/data/maps/EverGrandeCity_Corridor2/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor3/map.json b/data/maps/EverGrandeCity_Corridor3/map.json index f83993e77..aa5544f4d 100644 --- a/data/maps/EverGrandeCity_Corridor3/map.json +++ b/data/maps/EverGrandeCity_Corridor3/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor4/map.json b/data/maps/EverGrandeCity_Corridor4/map.json index c74147e67..9c0daf82f 100644 --- a/data/maps/EverGrandeCity_Corridor4/map.json +++ b/data/maps/EverGrandeCity_Corridor4/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_Corridor5/map.json b/data/maps/EverGrandeCity_Corridor5/map.json index c1968cd1e..c310da938 100644 --- a/data/maps/EverGrandeCity_Corridor5/map.json +++ b/data/maps/EverGrandeCity_Corridor5/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.json b/data/maps/EverGrandeCity_DrakesRoom/map.json index e26096649..c027a16f6 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/map.json +++ b/data/maps/EverGrandeCity_DrakesRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_DRAKE", + "graphics_id": "OBJ_EVENT_GFX_DRAKE", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index f00a809bd..a90523822 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -53,7 +53,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B end EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 special sub_810FF60 setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_1A0693 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.json b/data/maps/EverGrandeCity_GlaciasRoom/map.json index 364c524e2..286bfdd39 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/map.json +++ b/data/maps/EverGrandeCity_GlaciasRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GLACIA", + "graphics_id": "OBJ_EVENT_GFX_GLACIA", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_HallOfFame/map.json b/data/maps/EverGrandeCity_HallOfFame/map.json index f4b7c36c8..297d66426 100644 --- a/data/maps/EverGrandeCity_HallOfFame/map.json +++ b/data/maps/EverGrandeCity_HallOfFame/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 6, "y": 16, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 4b54204d3..22cd64497 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 setvar VAR_TEMP_1, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D end diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.json b/data/maps/EverGrandeCity_PhoebesRoom/map.json index 71b7eba91..36a42757d 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/map.json +++ b/data/maps/EverGrandeCity_PhoebesRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PHOEBE", + "graphics_id": "OBJ_EVENT_GFX_PHOEBE", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json index 719252e66..2de6531f9 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 7, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 3c0ad3732..75793b737 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json index c52dcb52c..dca22233b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/map.json +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.json b/data/maps/EverGrandeCity_PokemonLeague/map.json index c5cfa4062..0a74924fc 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/map.json +++ b/data/maps/EverGrandeCity_PokemonLeague/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 3, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 16, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 11, "y": 2, "elevation": 3, @@ -96,4 +96,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index 6da717d06..7191b6e3e 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -14,7 +14,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B return EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage waitbuttonpress @@ -89,11 +89,11 @@ EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A end EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 - applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 + applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 waitmovement 0 msgbox EverGrandeCity_PokemonLeague_Text_191804, 4 closemessage - applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D + applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D waitmovement 0 releaseall end diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.json b/data/maps/EverGrandeCity_SidneysRoom/map.json index a3e51d8de..72ff929f6 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/map.json +++ b/data/maps/EverGrandeCity_SidneysRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SIDNEY", + "graphics_id": "OBJ_EVENT_GFX_SIDNEY", "x": 6, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json index 2241e06b3..0d37b1514 100644 --- a/data/maps/FallarborTown/map.json +++ b/data/maps/FallarborTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 11, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 9, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 15, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 12, "elevation": 3, @@ -179,4 +179,4 @@ "flag": "FLAG_HIDDEN_ITEM_1C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_ContestHall/map.json b/data/maps/FallarborTown_ContestHall/map.json index 0c40a8767..40294eafb 100644 --- a/data/maps/FallarborTown_ContestHall/map.json +++ b/data/maps/FallarborTown_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 19, "y": 8, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 7, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 0, "y": 15, "elevation": 0, @@ -86,4 +86,4 @@ "script": "FallarborTown_ContestHall_EventScript_153AEA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_ContestLobby/map.json b/data/maps/FallarborTown_ContestLobby/map.json index cc0849449..d814c1b3c 100644 --- a/data/maps/FallarborTown_ContestLobby/map.json +++ b/data/maps/FallarborTown_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 2, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 0, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_FALLARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 12, "y": 2, "elevation": 3, @@ -148,4 +148,4 @@ "script": "FallarborTown_ContestLobby_EventScript_153AC2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc index 9a82f89e2..f594d397d 100644 --- a/data/maps/FallarborTown_ContestLobby/scripts.inc +++ b/data/maps/FallarborTown_ContestLobby/scripts.inc @@ -7,8 +7,8 @@ FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 end FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD - setvar VAR_SPECIAL_B, 6 - setvar CONTEST_RANK, 1 + setvar VAR_0x800B, 6 + setvar VAR_CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 special SetContestTrainerGfxIds diff --git a/data/maps/FallarborTown_House1/map.json b/data/maps/FallarborTown_House1/map.json index d2a9e287d..94a3ea653 100644 --- a/data/maps/FallarborTown_House1/map.json +++ b/data/maps/FallarborTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_PROF_COSMO_FALLARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 6, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index f16b6e828..23e47d780 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -10,7 +10,7 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 faceplayer goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_153BDA msgbox FallarborTown_House1_Text_177755, 4 release @@ -19,13 +19,13 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 FallarborTown_House1_EventScript_153BDA:: @ 8153BDA call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_153C2D call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_153C3E - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem_std ITEM_TM27_RETURN - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B - setvar VAR_SPECIAL_4, 280 + setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_1A067F setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_177910, 4 diff --git a/data/maps/FallarborTown_House2/map.json b/data/maps/FallarborTown_House2/map.json index fa3cee306..b113df4ea 100644 --- a/data/maps/FallarborTown_House2/map.json +++ b/data/maps/FallarborTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc index 41ebd039c..67eb4fac1 100644 --- a/data/maps/FallarborTown_House2/scripts.inc +++ b/data/maps/FallarborTown_House2/scripts.inc @@ -13,10 +13,10 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_House2_EventScript_153D60 msgbox FallarborTown_House2_Text_177BDB, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case NO, FallarborTown_House2_EventScript_153D60 goto FallarborTown_House2_EventScript_153CE4 end @@ -25,12 +25,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special SelectMoveTutorMon waitstate - compare VAR_SPECIAL_4, 255 + compare VAR_0x8004, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special IsSelectedMonEgg - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare VAR_SPECIAL_5, 0 + compare VAR_0x8005, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -39,7 +39,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special DisplayMoveTutorMenu waitstate - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 takeitem ITEM_HEART_SCALE, 1 diff --git a/data/maps/FallarborTown_Mart/map.json b/data/maps/FallarborTown_Mart/map.json index bb9f173d5..a2ef49c03 100644 --- a/data/maps/FallarborTown_Mart/map.json +++ b/data/maps/FallarborTown_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 5, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_1F/map.json b/data/maps/FallarborTown_PokemonCenter_1F/map.json index d5c94de23..7642da9bb 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 2, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 10, "y": 2, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 801f704e3..9e4fa7579 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 end FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress @@ -28,7 +28,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 faceplayer msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4 closemessage - switch FACING + switch VAR_FACING case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49 case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59 end diff --git a/data/maps/FallarborTown_PokemonCenter_2F/map.json b/data/maps/FallarborTown_PokemonCenter_2F/map.json index 9fab7e284..0279f1562 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/map.json +++ b/data/maps/FallarborTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FieryPath/map.json b/data/maps/FieryPath/map.json index 7db7c586a..1af09e409 100644 --- a/data/maps/FieryPath/map.json +++ b/data/maps/FieryPath/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_FIERY_PATH_1" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 10, "y": 15, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 17, "y": 15, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 12, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 23, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 24, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 32, "elevation": 3, @@ -134,4 +134,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json index 8e51423b3..79177c4c6 100644 --- a/data/maps/FortreeCity/map.json +++ b/data/maps/FortreeCity/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 31, "y": 3, "elevation": 4, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 32, "y": 16, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 32, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 14, "elevation": 4, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 8, "y": 10, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 9, "y": 16, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 25, "y": 8, "elevation": 3, @@ -230,4 +230,4 @@ "script": "FortreeCity_EventScript_1A00E1" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index 342e2fdc3..5fe0b96a3 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -56,7 +56,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9CF msgbox FortreeCity_Text_167868, 4 release @@ -64,7 +64,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 FortreeCity_EventScript_14C9CF:: @ 814C9CF msgbox FortreeCity_Text_16788B, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq FortreeCity_EventScript_14C9E4 release end @@ -72,15 +72,15 @@ FortreeCity_EventScript_14C9CF:: @ 814C9CF FortreeCity_EventScript_14C9E4:: @ 814C9E4 msgbox FortreeCity_Text_1678CB, 4 closemessage - applymovement LAST_TALKED, FortreeCity_Movement_1A0662 + applymovement VAR_LAST_TALKED, FortreeCity_Movement_1A0662 waitmovement 0 waitse playmoncry SPECIES_KECLEON, 2 delay 40 waitmoncry - applymovement LAST_TALKED, FortreeCity_Movement_14CA13 + applymovement VAR_LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED setflag FLAG_KECLEON_FLED_FORTREE release end diff --git a/data/maps/FortreeCity_DecorationShop/map.json b/data/maps/FortreeCity_DecorationShop/map.json index 6d3ea3a85..9dcd666c3 100644 --- a/data/maps/FortreeCity_DecorationShop/map.json +++ b/data/maps/FortreeCity_DecorationShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 2, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_Gym/map.json b/data/maps/FortreeCity_Gym/map.json index d2b78027e..d2a9b517e 100644 --- a/data/maps/FortreeCity_Gym/map.json +++ b/data/maps/FortreeCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WINONA", + "graphics_id": "OBJ_EVENT_GFX_WINONA", "x": 4, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 12, "y": 22, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 9, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 18, "y": 19, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 18, "y": 1, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 2, "y": 19, "elevation": 3, @@ -125,4 +125,4 @@ "script": "FortreeCity_Gym_EventScript_157FED" } ] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index 3a814a4b7..3902fc815 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -29,14 +29,14 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET - setvar VAR_SPECIAL_8, 6 + setvar VAR_0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem_std ITEM_TM40_AERIAL_ACE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 setflag FLAG_RECEIVED_TM40 diff --git a/data/maps/FortreeCity_House1/map.json b/data/maps/FortreeCity_House1/map.json index 47f18883c..b1dfbf2d7 100644 --- a/data/maps/FortreeCity_House1/map.json +++ b/data/maps/FortreeCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 7, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 443cc3a5c..475905070 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -5,29 +5,29 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_157EAD - setvar VAR_SPECIAL_8, 1 - copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, GetInGameTradeSpeciesInfo - copyvar VAR_SPECIAL_9, RESULT + setvar VAR_0x8008, 1 + copyvar VAR_0x8004, VAR_0x8008 + specialvar VAR_RESULT, GetInGameTradeSpeciesInfo + copyvar VAR_0x8009, VAR_RESULT msgbox FortreeCity_House1_Text_18568C, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq FortreeCity_House1_EventScript_157E95 special SelectMonForNPCTrade waitstate - copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 - compare VAR_SPECIAL_4, 255 + copyvar VAR_0x800A, VAR_0x8004 + compare VAR_0x8004, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 - copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, GetTradeSpecies - copyvar VAR_SPECIAL_B, RESULT - compare RESULT, VAR_SPECIAL_9 + copyvar VAR_0x8005, VAR_0x800A + specialvar VAR_RESULT, GetTradeSpecies + copyvar VAR_0x800B, VAR_RESULT + compare VAR_RESULT, VAR_0x8009 goto_if_ne FortreeCity_House1_EventScript_157E9F - copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + copyvar VAR_0x8004, VAR_0x8008 + copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate - bufferspeciesname 0, VAR_SPECIAL_9 + bufferspeciesname 0, VAR_0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release @@ -39,7 +39,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - bufferspeciesname 0, VAR_SPECIAL_9 + bufferspeciesname 0, VAR_0x8009 msgbox FortreeCity_House1_Text_185737, 4 release end diff --git a/data/maps/FortreeCity_House2/map.json b/data/maps/FortreeCity_House2/map.json index 6285e9693..5f14237e1 100644 --- a/data/maps/FortreeCity_House2/map.json +++ b/data/maps/FortreeCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 2, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index 365646d81..5535a8d49 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -8,19 +8,19 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 - switch RESULT + switch VAR_RESULT case 1, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1863F6, 4 multichoice 21, 8, 54, 1 - switch RESULT + switch VAR_RESULT case 1, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_186455, 4 multichoice 21, 8, 54, 1 - switch RESULT + switch VAR_RESULT case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 giveitem_std ITEM_TM10_HIDDEN_POWER - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_18652F, 4 diff --git a/data/maps/FortreeCity_House3/map.json b/data/maps/FortreeCity_House3/map.json index 7859f5942..3f23b0ada 100644 --- a/data/maps/FortreeCity_House3/map.json +++ b/data/maps/FortreeCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 0, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 5, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House4/map.json b/data/maps/FortreeCity_House4/map.json index 544c5e153..a217711ba 100644 --- a/data/maps/FortreeCity_House4/map.json +++ b/data/maps/FortreeCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 1, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 3, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 77e43be34..36e339fa8 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -21,25 +21,25 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 end FortreeCity_House4_EventScript_1581C2:: @ 81581C2 - applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839 waitmovement 0 msgbox FortreeCity_House4_Text_18684E, 4 releaseall end FortreeCity_House4_EventScript_1581D6:: @ 81581D6 - applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839 waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 giveitem_std ITEM_MENTAL_HERB - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag FLAG_RECEIVED_MENTAL_HERB releaseall end FortreeCity_House4_EventScript_158204:: @ 8158204 - applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839 waitmovement 0 msgbox FortreeCity_House4_Text_186924, 4 releaseall diff --git a/data/maps/FortreeCity_House5/map.json b/data/maps/FortreeCity_House5/map.json index 5f8ecdcde..1b3535ddf 100644 --- a/data/maps/FortreeCity_House5/map.json +++ b/data/maps/FortreeCity_House5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 6, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_Mart/map.json b/data/maps/FortreeCity_Mart/map.json index b12606304..366dd8d69 100644 --- a/data/maps/FortreeCity_Mart/map.json +++ b/data/maps/FortreeCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 8, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 6, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_1F/map.json b/data/maps/FortreeCity_PokemonCenter_1F/map.json index 11d44415e..c18237db4 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 2, "y": 3, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 999541b31..53f47a324 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/FortreeCity_PokemonCenter_2F/map.json b/data/maps/FortreeCity_PokemonCenter_2F/map.json index 56d6484bb..7a19eb100 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/map.json +++ b/data/maps/FortreeCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_1F/map.json b/data/maps/GraniteCave_1F/map.json index 6d83020d3..be6ec6372 100644 --- a/data/maps/GraniteCave_1F/map.json +++ b/data/maps/GraniteCave_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 7, "elevation": 3, @@ -70,4 +70,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_B1F/map.json b/data/maps/GraniteCave_B1F/map.json index 92c124cff..65c55e08d 100644 --- a/data/maps/GraniteCave_B1F/map.json +++ b/data/maps/GraniteCave_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 15, "y": 21, "elevation": 3, @@ -78,4 +78,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_B2F/map.json b/data/maps/GraniteCave_B2F/map.json index 4c76d1534..5060b2f3b 100644 --- a/data/maps/GraniteCave_B2F/map.json +++ b/data/maps/GraniteCave_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_GRANITE_CAVE_B2F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 5, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 14, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 2, "y": 16, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 7, "y": 12, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 4, "y": 22, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 6, "y": 22, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 21, "elevation": 3, @@ -185,4 +185,4 @@ "flag": "FLAG_HIDDEN_ITEM_31" } ] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_StevensRoom/map.json b/data/maps/GraniteCave_StevensRoom/map.json index 2a9c53104..28d6e9e8c 100644 --- a/data/maps/GraniteCave_StevensRoom/map.json +++ b/data/maps/GraniteCave_StevensRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 7, "y": 8, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index 013703e92..46ec0f8d1 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -5,22 +5,22 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar VAR_SPECIAL_4, ITEM_LETTER + setvar VAR_0x8004, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem_std ITEM_TM47_STEEL_WING - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closemessage - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq GraniteCave_StevensRoom_EventScript_15CC78 - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D playse SE_KAIDAN removeobject 1 diff --git a/data/maps/InsideOfTruck/map.json b/data/maps/InsideOfTruck/map.json index 04065d10b..23d0d9acc 100644 --- a/data/maps/InsideOfTruck/map.json +++ b/data/maps/InsideOfTruck/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 0, "y": 0, "elevation": 8, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 0, "y": 3, "elevation": 8, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOVING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX", "x": 2, "y": 3, "elevation": 8, @@ -145,4 +145,4 @@ "script": "InsideOfTruck_EventScript_15FC8B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 629db8bf5..59a4e79ee 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -17,9 +17,9 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall setflag FLAG_SPECIAL_FLAG_0 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq InsideOfTruck_EventScript_15FC68 end diff --git a/data/maps/IslandCave/map.json b/data/maps/IslandCave/map.json index f519a7003..93fbe62c9 100644 --- a/data/maps/IslandCave/map.json +++ b/data/maps/IslandCave/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_REGICE", + "graphics_id": "OBJ_EVENT_GFX_REGICE", "x": 8, "y": 7, "elevation": 3, @@ -75,4 +75,4 @@ "script": "IslandCave_EventScript_15EF7C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 41496fcc8..77392a4e7 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -9,7 +9,7 @@ IslandCave_MapScript1_15EEC6:: @ 815EEC6 end IslandCave_EventScript_15EED0:: @ 815EED0 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED return IslandCave_MapScript1_15EED4:: @ 815EED4 diff --git a/data/maps/JaggedPass/map.json b/data/maps/JaggedPass/map.json index 63de6d018..562ba58ed 100644 --- a/data/maps/JaggedPass/map.json +++ b/data/maps/JaggedPass/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 8, "y": 18, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 16, "y": 22, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 24, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_JAGGED_PASS_1" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 13, "y": 35, "elevation": 3, @@ -149,4 +149,4 @@ "flag": "FLAG_HIDDEN_ITEM_4C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 96ad4a0aa..151da14d1 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -24,8 +24,8 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, TRAINER_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 end @@ -37,8 +37,8 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, TRAINER_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 end diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json index ef3ec701f..5f3efd98d 100644 --- a/data/maps/LavaridgeTown/map.json +++ b/data/maps/LavaridgeTown/map.json @@ -18,7 +18,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 8, "y": 7, "elevation": 3, @@ -31,7 +31,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 1, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 8, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 10, "y": 13, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN", "x": 4, "y": 4, "elevation": 3, @@ -83,7 +83,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_HOT_SPRINGS_OLD_WOMAN", "x": 5, "y": 4, "elevation": 3, @@ -96,7 +96,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 6, "y": 16, "elevation": 3, @@ -109,7 +109,7 @@ "flag": "FLAG_HIDE_RIVAL_LAVARIDGE_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 12, "y": 15, "elevation": 0, @@ -122,7 +122,7 @@ "flag": "FLAG_HIDE_RIVAL_LAVARIDGE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 4, "y": 7, "elevation": 3, @@ -256,4 +256,4 @@ "flag": "FLAG_HIDDEN_ITEM_0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index c2bf9bb68..6c4b66e4b 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -27,7 +27,7 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 opendoor 12, 15 waitdooranim addobject 8 @@ -43,16 +43,16 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED applymovement 8, LavaridgeTown_Movement_1A0835 waitmovement 0 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LavaridgeTown_EventScript_14E56B - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LavaridgeTown_EventScript_14E570 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LavaridgeTown_EventScript_14E68F checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -67,16 +67,16 @@ LavaridgeTown_EventScript_14E570:: @ 814E570 LavaridgeTown_EventScript_14E575:: @ 814E575 lock faceplayer - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LavaridgeTown_EventScript_14E56B - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LavaridgeTown_EventScript_14E570 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -98,22 +98,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closemessage - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LavaridgeTown_EventScript_14E646 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LavaridgeTown_EventScript_14E69A - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end @@ -127,13 +127,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 return LavaridgeTown_EventScript_14E64E:: @ 814E64E - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq LavaridgeTown_EventScript_14E67B - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq LavaridgeTown_EventScript_14E680 - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq LavaridgeTown_EventScript_14E685 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq LavaridgeTown_EventScript_14E68A return @@ -164,13 +164,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A return LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq LavaridgeTown_EventScript_14E6D2 - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq LavaridgeTown_EventScript_14E6D2 - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq LavaridgeTown_EventScript_14E6DD - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq LavaridgeTown_EventScript_14E6D2 return @@ -235,8 +235,8 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E end_movement LavaridgeTown_EventScript_14E710:: @ 814E710 - specialvar RESULT, GetPlayerFacingDirection - compare RESULT, 1 + specialvar VAR_RESULT, GetPlayerFacingDirection + compare VAR_RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E721 end @@ -273,10 +273,10 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A faceplayer goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LavaridgeTown_EventScript_14E7B2 getpartysize - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag FLAG_RECEIVED_LAVARIDGE_EGG diff --git a/data/maps/LavaridgeTown_Gym_1F/map.json b/data/maps/LavaridgeTown_Gym_1F/map.json index 8abb700fe..8abc65dc9 100644 --- a/data/maps/LavaridgeTown_Gym_1F/map.json +++ b/data/maps/LavaridgeTown_Gym_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FLANNERY", + "graphics_id": "OBJ_EVENT_GFX_FLANNERY", "x": 8, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 10, "y": 19, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 4, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 0, "y": 2, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 6, "y": 23, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 6, "y": 2, "elevation": 3, @@ -278,4 +278,4 @@ "script": "LavaridgeTown_Gym_1F_EventScript_153888" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 3f5f9a285..16c4e2031 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -75,7 +75,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq LavaridgeTown_Gym_1F_EventScript_1A00FB - setvar VAR_SPECIAL_8, 4 + setvar VAR_0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar VAR_LAVARIDGE_RIVAL_STATE, 1 @@ -84,7 +84,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 giveitem_std ITEM_TM50_OVERHEAT - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 setflag FLAG_RECEIVED_TM50 diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.json b/data/maps/LavaridgeTown_Gym_B1F/map.json index 5b43c5bcb..4f11e429f 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/map.json +++ b/data/maps/LavaridgeTown_Gym_B1F/map.json @@ -155,4 +155,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_HerbShop/map.json b/data/maps/LavaridgeTown_HerbShop/map.json index 041a08509..651ec648b 100644 --- a/data/maps/LavaridgeTown_HerbShop/map.json +++ b/data/maps/LavaridgeTown_HerbShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 3, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index 71fc2cbfe..5da9d19ad 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -31,7 +31,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem_std ITEM_CHARCOAL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag FLAG_RECEIVED_CHARCOAL release diff --git a/data/maps/LavaridgeTown_House/map.json b/data/maps/LavaridgeTown_House/map.json index 30a9e1505..4035f889a 100644 --- a/data/maps/LavaridgeTown_House/map.json +++ b/data/maps/LavaridgeTown_House/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 2, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 6, "y": 6, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_Mart/map.json b/data/maps/LavaridgeTown_Mart/map.json index cd194d233..060d69e0c 100644 --- a/data/maps/LavaridgeTown_Mart/map.json +++ b/data/maps/LavaridgeTown_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 9, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json index c6257850c..b823fcabe 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 10, "y": 6, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 1, "y": 3, "elevation": 3, @@ -96,4 +96,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 611ced28f..22382ad54 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 end LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json index 6e32a6da9..ec48712c6 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/map.json +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json index 8e40cf42a..678e72a1f 100644 --- a/data/maps/LilycoveCity/map.json +++ b/data/maps/LilycoveCity/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 32, "y": 20, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 15, "y": 18, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 28, "y": 28, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 21, "y": 15, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 16, "y": 9, "elevation": 5, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 35, "y": 27, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 35, "y": 37, "elevation": 5, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 34, "y": 37, "elevation": 5, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 57, "y": 17, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 73, "y": 15, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 61, "y": 36, "elevation": 5, @@ -166,7 +166,7 @@ "flag": "FLAG_ITEM_LILYCOVE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 43, "y": 18, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 46, "y": 12, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 45, "y": 12, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 38, "y": 9, "elevation": 5, @@ -218,7 +218,7 @@ "flag": "FLAG_HIDE_GRUNTS_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 50, "y": 7, "elevation": 5, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 27, "y": 7, "elevation": 5, @@ -458,4 +458,4 @@ "flag": "FLAG_HIDDEN_ITEM_4B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 53b05fad9..8951fe606 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -64,9 +64,9 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 - addvar RESULT, ITEM_CHERI_BERRY - giveitem_std RESULT - compare RESULT, 0 + addvar VAR_RESULT, ITEM_CHERI_BERRY + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE msgbox LilycoveCity_Text_1C5B1D, 4 @@ -164,8 +164,8 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialvar VAR_SPECIAL_4, sub_80C4D50 - switch VAR_SPECIAL_4 + specialvar VAR_0x8004, sub_80C4D50 + switch VAR_0x8004 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 releaseall @@ -204,10 +204,10 @@ LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 - applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 + applymovement VAR_LAST_TALKED, LilycoveCity_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_Text_168675, 4 - applymovement LAST_TALKED, LilycoveCity_Movement_1A083D + applymovement VAR_LAST_TALKED, LilycoveCity_Movement_1A083D waitmovement 0 setflag FLAG_MET_WAILMER_TRAINER releaseall @@ -238,9 +238,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 lock faceplayer checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CD60 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_EventScript_14CDD3 end @@ -248,7 +248,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 playbgm MUS_GIRL_SUP, TRUE call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0 call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch VAR_STARTER_MON @@ -277,7 +277,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 playbgm MUS_BOY_SUP, TRUE call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23 call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch VAR_STARTER_MON @@ -334,11 +334,11 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 - setvar RESULT, 0 + setvar VAR_RESULT, 0 call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LilycoveCity_EventScript_14CEEE - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LilycoveCity_EventScript_14CEF7 clearflag FLAG_HIDE_MAY_UPSTAIRS clearflag FLAG_HIDE_MAY_PICHU_DOLL @@ -350,7 +350,7 @@ LilycoveCity_EventScript_14CEDE:: @ 814CEDE return LilycoveCity_EventScript_14CEE8:: @ 814CEE8 - setvar RESULT, 1 + setvar VAR_RESULT, 1 return LilycoveCity_EventScript_14CEEE:: @ 814CEEE @@ -368,11 +368,11 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 - setvar RESULT, 0 + setvar VAR_RESULT, 0 call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LilycoveCity_EventScript_14CF47 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LilycoveCity_EventScript_14CF50 clearflag FLAG_HIDE_BRENDAN_UPSTAIRS goto LilycoveCity_EventScript_14CF6B @@ -393,13 +393,13 @@ LilycoveCity_EventScript_14CF62:: @ 814CF62 LilycoveCity_EventScript_14CF6B:: @ 814CF6B closemessage - applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 + applymovement VAR_LAST_TALKED, LilycoveCity_Movement_1A0845 waitmovement 0 delay 50 setfieldeffectargument 0, 1 dofieldeffect FLDEFF_NPCFLY_OUT delay 15 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED waitfieldeffect FLDEFF_NPCFLY_OUT savebgm 0 fadedefaultbgm diff --git a/data/maps/LilycoveCity_ContestHall/map.json b/data/maps/LilycoveCity_ContestHall/map.json index 31d149109..b77a43092 100644 --- a/data/maps/LilycoveCity_ContestHall/map.json +++ b/data/maps/LilycoveCity_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 30, "y": 30, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 11, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 40, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 12, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 15, "y": 22, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 10, "y": 25, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 25, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 25, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 16, "y": 25, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 8, "y": 24, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 18, "y": 24, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 24, "y": 10, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 27, "y": 10, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 22, "y": 13, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 24, "y": 13, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 26, "y": 13, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 28, "y": 13, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 20, "y": 10, "elevation": 3, @@ -259,7 +259,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 30, "y": 11, "elevation": 3, @@ -272,7 +272,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 8, "elevation": 3, @@ -285,7 +285,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 13, "y": 20, "elevation": 3, @@ -298,7 +298,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 36, "y": 22, "elevation": 3, @@ -311,7 +311,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 39, "y": 22, "elevation": 3, @@ -324,7 +324,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 34, "y": 25, "elevation": 3, @@ -337,7 +337,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 36, "y": 25, "elevation": 3, @@ -350,7 +350,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 38, "y": 25, "elevation": 3, @@ -363,7 +363,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 40, "y": 25, "elevation": 3, @@ -376,7 +376,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 32, "y": 23, "elevation": 3, @@ -389,7 +389,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 37, "y": 20, "elevation": 3, @@ -402,7 +402,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 42, "y": 24, "elevation": 3, @@ -415,7 +415,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 23, "y": 26, "elevation": 3, @@ -509,4 +509,4 @@ "script": "LilycoveCity_ContestHall_EventScript_159315" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestLobby/map.json b/data/maps/LilycoveCity_ContestLobby/map.json index 6d87bca77..ec02f26f1 100644 --- a/data/maps/LilycoveCity_ContestLobby/map.json +++ b/data/maps/LilycoveCity_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 6, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 17, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 1, "y": 1, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 14, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 3, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 20, "y": 2, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 8, "y": 10, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 18, "y": 8, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 19, "y": 9, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 13, "y": 1, "elevation": 0, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_ARTIST_LILCOVE_CONTEST" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 13, "y": 10, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 6, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 7, "y": 7, "elevation": 3, @@ -275,4 +275,4 @@ "script": "LilycoveCity_ContestLobby_EventScript_15908D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index 27c19ec39..e96a356ce 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -30,9 +30,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 drawcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -42,8 +42,8 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE closemessage special sub_80C4CEC setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 - specialvar RESULT, GiveMonArtistRibbon - compare RESULT, 1 + specialvar VAR_RESULT, GiveMonArtistRibbon + compare VAR_RESULT, 1 call_if_eq LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 @@ -55,7 +55,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closemessage @@ -86,8 +86,8 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialvar VAR_SPECIAL_4, sub_80C4D50 - switch VAR_SPECIAL_4 + specialvar VAR_0x8004, sub_80C4D50 + switch VAR_0x8004 case 1, LilycoveCity_ContestLobby_EventScript_1589D6 case 2, LilycoveCity_ContestLobby_EventScript_1589DA case 3, LilycoveCity_ContestLobby_EventScript_1589DE @@ -116,7 +116,7 @@ LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6 return LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA - switch CONTEST_CATEGORY + switch VAR_CONTEST_CATEGORY case 0, LilycoveCity_ContestLobby_EventScript_158A27 case 1, LilycoveCity_ContestLobby_EventScript_158A2B case 2, LilycoveCity_ContestLobby_EventScript_158A2F @@ -203,9 +203,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A fadescreen 1 drawcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end @@ -214,8 +214,8 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE closemessage special sub_80C4CEC setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 - specialvar RESULT, GiveMonArtistRibbon - compare RESULT, 1 + specialvar VAR_RESULT, GiveMonArtistRibbon + compare VAR_RESULT, 1 call_if_eq LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 @@ -227,7 +227,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closemessage @@ -303,7 +303,7 @@ LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C @@ -325,18 +325,18 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog erasebox 0, 0, 15, 9 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag FLAG_TEMP_3 return LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0 multichoice 0, 0, 2, 0 - switch RESULT + switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_158CEA case 1, LilycoveCity_ContestLobby_EventScript_158C27 case 2, LilycoveCity_ContestLobby_EventScript_158C35 @@ -356,20 +356,20 @@ LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 - setvar CONTEST_RANK, 0 + setvar VAR_CONTEST_RANK, 0 choosecontestmon - compare VAR_SPECIAL_4, 255 + compare VAR_0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special ScrSpecial_CheckSelectedMonAndInitContest - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4 - compare RESULT, 4 + compare VAR_RESULT, 4 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2 end @@ -389,11 +389,11 @@ LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 end LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 - copyvar VAR_SPECIAL_8, VAR_SPECIAL_4 + copyvar VAR_0x8008, VAR_0x8004 message LilycoveCity_ContestLobby_Text_1A67A3 waitmessage yesnobox 20, 8 - switch RESULT + switch VAR_RESULT case 0, LilycoveCity_ContestLobby_EventScript_158C42 case 1, LilycoveCity_ContestLobby_EventScript_158D24 end @@ -403,29 +403,29 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA message LilycoveCity_ContestLobby_Text_1886DC waitmessage multichoice 0, 0, 4, 0 - switch RESULT + switch VAR_RESULT case 5, LilycoveCity_ContestLobby_EventScript_158C35 case 127, LilycoveCity_ContestLobby_EventScript_158C35 - copyvar CONTEST_CATEGORY, RESULT + copyvar VAR_CONTEST_CATEGORY, VAR_RESULT goto LilycoveCity_ContestLobby_EventScript_158C42 end LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 message LilycoveCity_ContestLobby_Text_1887C7 waitmessage - copyvar VAR_SPECIAL_4, RESULT + copyvar VAR_0x8004, VAR_RESULT special sub_808363C waitstate - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90 - compare RESULT, 5 + compare VAR_RESULT, 5 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 messageautoscroll LilycoveCity_ContestLobby_Text_18872A waitmessage contestlinktransfer - switch VAR_SPECIAL_4 + switch VAR_0x8004 case 0, LilycoveCity_ContestLobby_EventScript_158DD1 case 1, LilycoveCity_ContestLobby_EventScript_158D82 case 2, LilycoveCity_ContestLobby_EventScript_158DC3 @@ -467,11 +467,11 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special ScrSpecial_GetContestPlayerMonIdx - addvar VAR_SPECIAL_4, 1 + addvar VAR_0x8004, 1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar VAR_SPECIAL_4, -1 + addvar VAR_0x8004, -1 goto LilycoveCity_ContestLobby_EventScript_158DEE end @@ -480,7 +480,7 @@ LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE setvar VAR_LINK_CONTEST_ROOM_STATE, 1 special ScrSpecial_SetLinkContestTrainerGfxIdx setvar VAR_CONTEST_LOCATION, 5 - setvar CONTEST_RANK, 3 + setvar VAR_CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_158F08 end @@ -564,11 +564,11 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE end_movement LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 - specialvar RESULT, sub_80C5044 - compare RESULT, 1 + specialvar VAR_RESULT, sub_80C5044 + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 - setvar VAR_SPECIAL_B, 8 - setvar CONTEST_RANK, 3 + setvar VAR_0x800B, 8 + setvar VAR_CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 special SetContestTrainerGfxIds @@ -582,14 +582,14 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 - setvar VAR_SPECIAL_B, 8 - setvar CONTEST_RANK, 3 + setvar VAR_0x800B, 8 + setvar VAR_CONTEST_RANK, 3 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET end LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 - switch CONTEST_CATEGORY + switch VAR_CONTEST_CATEGORY case 0, LilycoveCity_ContestLobby_EventScript_158F45 case 1, LilycoveCity_ContestLobby_EventScript_158F52 case 2, LilycoveCity_ContestLobby_EventScript_158F5F diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json index 92c382057..c7ef3cb00 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 10, "y": 3, "elevation": 3, @@ -60,4 +60,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json index a24cad6ad..6d5093142 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 7, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 10, "y": 3, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 7, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 4, "elevation": 3, @@ -101,4 +101,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 5bfc6a5e7..40d757c4a 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -6,8 +6,8 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 faceplayer call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD - specialvar RESULT, CompletedHoennPokedex - compare RESULT, 1 + specialvar VAR_RESULT, CompletedHoennPokedex + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release end diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json index 146a13d89..9ea7fd933 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 0, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc index f895ea99d..5a157eadd 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc @@ -5,12 +5,12 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C lock faceplayer call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR + copyvar VAR_0x8005, VAR_DEPT_STORE_FLOOR special DisplayCurrentElevatorFloor message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage multichoice 0, 0, 57, 0 - switch RESULT + switch VAR_RESULT case 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A402 case 1, LilycoveCity_DepartmentStoreElevator_EventScript_15A425 case 2, LilycoveCity_DepartmentStoreElevator_EventScript_15A448 @@ -71,7 +71,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 erasebox 0, 0, 29, 19 - applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 + applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 waitmovement 0 special ShakeScreenInElevator waitstate diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json index cb8b47317..0ec2ad64b 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN", + "graphics_id": "OBJ_EVENT_GFX_ROOFTOP_SALE_WOMAN", "x": 6, "y": 1, "elevation": 3, @@ -79,4 +79,4 @@ "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index e2274110c..9ed0262ea 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -4,9 +4,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 getpricereduction 3 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 lock faceplayer getpricereduction 3 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release @@ -78,7 +78,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE multichoice 16, 0, 42, 0 - copyvar VAR_TEMP_1, RESULT + copyvar VAR_TEMP_1, VAR_RESULT switch VAR_TEMP_1 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227 @@ -133,10 +133,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 compare VAR_TEMP_1, 2 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace VAR_TEMP_0, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 compare VAR_TEMP_1, 0 call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 @@ -154,10 +154,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace VAR_TEMP_0, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 @@ -166,10 +166,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace VAR_TEMP_0, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.json b/data/maps/LilycoveCity_DepartmentStore_1F/map.json index 7dea79e10..1d88cb7ae 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 14, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 4, "y": 4, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 6, "elevation": 3, @@ -131,4 +131,4 @@ "script": "LilycoveCity_DepartmentStore_1F_EventScript_159F05" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index f6b23bc05..ad2c6aad1 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -13,13 +13,13 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_159EB1 goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag FLAG_DAILY_PICKED_LOTTO_TICKET message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber - copyvar VAR_SPECIAL_8, RESULT + copyvar VAR_0x8008, VAR_RESULT special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 @@ -32,24 +32,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY - compare VAR_SPECIAL_6, 0 + compare VAR_0x8006, 0 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare VAR_SPECIAL_6, 1 + compare VAR_0x8006, 1 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitemname 0, VAR_SPECIAL_5 - compare VAR_SPECIAL_4, 1 + bufferitemname 0, VAR_0x8005 + compare VAR_0x8004, 1 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare VAR_SPECIAL_4, 2 + compare VAR_0x8004, 2 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare VAR_SPECIAL_4, 3 + compare VAR_0x8004, 3 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare VAR_SPECIAL_4, 4 + compare VAR_0x8004, 4 call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem_std VAR_SPECIAL_5 - compare RESULT, 0 + giveitem_std VAR_0x8005 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end @@ -99,7 +99,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 return LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C - copyvar VAR_LOTTERY_PRIZE, VAR_SPECIAL_5 + copyvar VAR_LOTTERY_PRIZE, VAR_0x8005 goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end @@ -111,7 +111,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 giveitem_std VAR_LOTTERY_PRIZE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar VAR_LOTTERY_PRIZE, 0 release diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.json b/data/maps/LilycoveCity_DepartmentStore_2F/map.json index 77c1c429d..fa87aaa80 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 0, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 10, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 6, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.json b/data/maps/LilycoveCity_DepartmentStore_3F/map.json index 5734db8d1..a8b94d162 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 0, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 13, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 8, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 10, "y": 2, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.json b/data/maps/LilycoveCity_DepartmentStore_4F/map.json index 62b267e00..17aa1c20c 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_4F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 0, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 6, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 9, "y": 6, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.json b/data/maps/LilycoveCity_DepartmentStore_5F/map.json index 32233acd4..23da6139d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/map.json +++ b/data/maps/LilycoveCity_DepartmentStore_5F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 1, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 7, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 9, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 15, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 17, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 5, "elevation": 3, @@ -128,4 +128,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_EmptyMap/map.json b/data/maps/LilycoveCity_EmptyMap/map.json index c762be1ef..555c36be7 100644 --- a/data/maps/LilycoveCity_EmptyMap/map.json +++ b/data/maps/LilycoveCity_EmptyMap/map.json @@ -22,4 +22,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_Harbor/map.json b/data/maps/LilycoveCity_Harbor/map.json index a39d10445..1c58a59a7 100644 --- a/data/maps/LilycoveCity_Harbor/map.json +++ b/data/maps/LilycoveCity_Harbor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 3, "y": 13, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 8, "y": 10, "elevation": 3, @@ -96,4 +96,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 57ad4b85b..3bb6d47c8 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -10,7 +10,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 lock faceplayer checkitem ITEM_EON_TICKET, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_Harbor_EventScript_1599EE goto LilycoveCity_Harbor_EventScript_1598BA end @@ -24,7 +24,7 @@ LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD msgbox LilycoveCity_Harbor_Text_18B36F, 4 checkitem ITEM_SS_TICKET, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waitmessage @@ -33,7 +33,7 @@ LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1 multichoicedefault 18, 6, 56, 2, 0 - switch RESULT + switch VAR_RESULT case 0, LilycoveCity_Harbor_EventScript_159933 case 1, LilycoveCity_Harbor_EventScript_15995B case 2, LilycoveCity_Harbor_EventScript_1599E4 @@ -47,7 +47,7 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_15998A @@ -58,7 +58,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 LilycoveCity_Harbor_EventScript_15995B:: @ 815995B msgbox LilycoveCity_Harbor_Text_18B499, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 @@ -75,17 +75,17 @@ LilycoveCity_Harbor_EventScript_15997E:: @ 815997E LilycoveCity_Harbor_EventScript_15998A:: @ 815998A msgbox LilycoveCity_Harbor_Text_18B4B3, 4 closemessage - applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR - compare FACING, 2 + hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR + compare VAR_FACING, 2 call_if_eq LilycoveCity_Harbor_EventScript_1599D9 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -110,10 +110,10 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage - applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR + hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 @@ -125,14 +125,14 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE waitmovement 0 delay 30 removeobject 4 - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq LilycoveCity_Harbor_EventScript_1599D9 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json index 436108db1..efc66e267 100644 --- a/data/maps/LilycoveCity_House1/map.json +++ b/data/maps/LilycoveCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House2/map.json b/data/maps/LilycoveCity_House2/map.json index 5bbf047eb..47d919218 100644 --- a/data/maps/LilycoveCity_House2/map.json +++ b/data/maps/LilycoveCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 0, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index 797c8f203..123e3a79d 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem_std ITEM_TM44_REST - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_18B883, 4 diff --git a/data/maps/LilycoveCity_House3/map.json b/data/maps/LilycoveCity_House3/map.json index b9a6565ba..ee0bd57b5 100644 --- a/data/maps/LilycoveCity_House3/map.json +++ b/data/maps/LilycoveCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 1, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 2, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 2, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 5, "elevation": 3, @@ -108,4 +108,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc index 1a569bf5b..f771ab1d4 100644 --- a/data/maps/LilycoveCity_House3/scripts.inc +++ b/data/maps/LilycoveCity_House3/scripts.inc @@ -4,18 +4,18 @@ LilycoveCity_House3_MapScripts:: @ 8159BE4 LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA random 4 - copyvar VAR_TEMP_1, RESULT + copyvar VAR_TEMP_1, VAR_RESULT end LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 lock faceplayer msgbox LilycoveCity_House3_Text_18B8CC, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closemessage - applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_1A083D waitmovement 0 release end @@ -23,7 +23,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D msgbox LilycoveCity_House3_Text_18B9DC, 4 closemessage - applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_1A083D waitmovement 0 release end @@ -33,7 +33,7 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 faceplayer msgbox LilycoveCity_House3_Text_18BD64, 4 closemessage - applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_1A083D waitmovement 0 release end diff --git a/data/maps/LilycoveCity_House4/map.json b/data/maps/LilycoveCity_House4/map.json index 7b0393b39..7645f5564 100644 --- a/data/maps/LilycoveCity_House4/map.json +++ b/data/maps/LilycoveCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json index d24a66165..07ef68f64 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 5, "y": 12, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 13, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 13, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 2, "y": 8, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 3, "y": 8, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 11, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 19, "y": 3, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 6, "y": 2, "elevation": 3, @@ -296,4 +296,4 @@ "script": "LilycoveCity_LilycoveMuseum_1F_EventScript_15854F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc index b45261aca..0d115eff8 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 waitmessage multichoice 20, 8, 16, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F end @@ -23,9 +23,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end @@ -39,7 +39,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC waitmovement 0 removeobject 2 - switch FACING + switch VAR_FACING case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2 case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7 diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json index e463c2b09..64b70f3d1 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 10, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 19, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 14, "y": 6, "elevation": 3, @@ -172,4 +172,4 @@ "script": "LilycoveCity_LilycoveMuseum_2F_EventScript_15853D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 2ef07a1e9..c6090a5a9 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -92,8 +92,8 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialvar VAR_SPECIAL_4, sub_80C4D50 - switch VAR_SPECIAL_4 + specialvar VAR_0x8004, sub_80C4D50 + switch VAR_0x8004 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C @@ -119,7 +119,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration_std DECOR_GLASS_ORNAMENT - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag FLAG_RECEIVED_GLASS_ORNAMENT closemessage diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/map.json b/data/maps/LilycoveCity_MoveDeletersHouse/map.json index d84c669f7..97b012072 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/map.json +++ b/data/maps/LilycoveCity_MoveDeletersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc index 4e67762bb..8adf8b559 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc @@ -6,7 +6,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B releaseall @@ -16,23 +16,23 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special SelectMonForNPCTrade waitstate - compare VAR_SPECIAL_4, 255 + compare VAR_0x8004, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special IsSelectedMonEgg - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 special SelectMove fadescreen 0 - compare VAR_SPECIAL_5, 4 + compare VAR_0x8005, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO - switch RESULT + switch VAR_RESULT case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53 case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B releaseall diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/map.json b/data/maps/LilycoveCity_PokemonCenter_1F/map.json index f9c5e37ec..cca7088ee 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 11, "y": 8, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index 508f5fab8..61c6db9aa 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/map.json b/data/maps/LilycoveCity_PokemonCenter_2F/map.json index bbc4ebb00..549fe96df 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/map.json +++ b/data/maps/LilycoveCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json index 1e0fe952d..7310a5ed5 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 8, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 5, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 7, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_FANCLUB_LITTLE_BOY" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 1, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_FANCLUB_BOY" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 3, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_FANCLUB_LADY" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 10, "y": 10, "elevation": 3, @@ -134,4 +134,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index bab091a0e..eeb5669ae 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -69,37 +69,37 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special UpdateMovedLilycoveFanClubMembers - setvar VAR_SPECIAL_4, 8 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 0 + setvar VAR_0x8004, 8 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 - setvar VAR_SPECIAL_4, 9 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 0 + setvar VAR_0x8004, 9 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD - setvar VAR_SPECIAL_4, 10 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 0 + setvar VAR_0x8004, 10 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 - setvar VAR_SPECIAL_4, 11 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 0 + setvar VAR_0x8004, 11 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED - setvar VAR_SPECIAL_4, 12 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 0 + setvar VAR_0x8004, 12 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 - setvar VAR_SPECIAL_4, 13 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 0 + setvar VAR_0x8004, 13 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD - setvar VAR_SPECIAL_4, 14 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 0 + setvar VAR_0x8004, 14 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159505 - setvar VAR_SPECIAL_4, 15 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 0 + setvar VAR_0x8004, 15 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 0 call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -146,23 +146,23 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer - setvar VAR_SPECIAL_4, 13 + setvar VAR_0x8004, 13 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 1 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 7 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 release end LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 1 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 release @@ -186,23 +186,23 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer - setvar VAR_SPECIAL_4, 8 + setvar VAR_0x8004, 8 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 1 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 7 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 release end LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 1 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 release @@ -226,23 +226,23 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613 LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer - setvar VAR_SPECIAL_4, 9 + setvar VAR_0x8004, 9 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 1 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 7 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 release end LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 1 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 release @@ -266,23 +266,23 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer - setvar VAR_SPECIAL_4, 10 + setvar VAR_0x8004, 10 special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 1 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 7 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 release end LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 1 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 release @@ -306,21 +306,21 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701 LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer - setvar VAR_SPECIAL_4, 11 + setvar VAR_0x8004, 11 special BufferStreakTrainerText - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 1 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 7 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 release end LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 1 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 release @@ -339,21 +339,21 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763 LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer - setvar VAR_SPECIAL_4, 12 + setvar VAR_0x8004, 12 special BufferStreakTrainerText - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 1 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 7 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 release end LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 1 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 release @@ -372,21 +372,21 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5 LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer - setvar VAR_SPECIAL_4, 14 + setvar VAR_0x8004, 14 special BufferStreakTrainerText - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 1 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 7 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 release end LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 1 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 release @@ -405,21 +405,21 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827 LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer - setvar VAR_SPECIAL_4, 15 + setvar VAR_0x8004, 15 special BufferStreakTrainerText - specialvar RESULT, ShouldMoveLilycoveFanClubMember - compare RESULT, 1 + specialvar VAR_RESULT, ShouldMoveLilycoveFanClubMember + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 7 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 release end LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 - specialvar RESULT, GetNumMovedLilycoveFanClubMembers - compare RESULT, 1 + specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers + compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 release diff --git a/data/maps/LilycoveCity_UnusedMart/map.json b/data/maps/LilycoveCity_UnusedMart/map.json index 9eb06baa0..f66009546 100644 --- a/data/maps/LilycoveCity_UnusedMart/map.json +++ b/data/maps/LilycoveCity_UnusedMart/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom1/map.json b/data/maps/LinkContestRoom1/map.json index 4527b75c2..ba40fea8f 100644 --- a/data/maps/LinkContestRoom1/map.json +++ b/data/maps/LinkContestRoom1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 7, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 4, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 8, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 2, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 4, "y": 2, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 5, "y": 2, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 9, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 10, "y": 2, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 12, "y": 5, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 2, "y": 5, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_LINK_CONTEST_ROOM_POKEBALL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 10, "y": 7, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ARTIST", + "graphics_id": "OBJ_EVENT_GFX_ARTIST", "x": 12, "y": 6, "elevation": 3, @@ -210,4 +210,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc index 8983389c2..870eeb331 100644 --- a/data/maps/LinkContestRoom1/scripts.inc +++ b/data/maps/LinkContestRoom1/scripts.inc @@ -13,15 +13,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LinkContestRoom1_EventScript_15F5E0 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LinkContestRoom1_EventScript_15F5E4 - compare RESULT, 2 + compare VAR_RESULT, 2 call_if_eq LinkContestRoom1_EventScript_15F5E8 - compare RESULT, 3 + compare VAR_RESULT, 3 call_if_eq LinkContestRoom1_EventScript_15F5EC - compare RESULT, 4 + compare VAR_RESULT, 4 call_if_eq LinkContestRoom1_EventScript_15F5F0 return @@ -126,10 +126,10 @@ LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB return LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 - setvar RESULT, 32 + setvar VAR_RESULT, 32 special ScriptRandom - addvar RESULT, 1 - switch RESULT + addvar VAR_RESULT, 1 + switch VAR_RESULT case 1, LinkContestRoom1_EventScript_15F859 case 2, LinkContestRoom1_EventScript_15F85F case 3, LinkContestRoom1_EventScript_15F865 @@ -414,16 +414,16 @@ LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9 return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 - setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return diff --git a/data/maps/LinkContestRoom2/map.json b/data/maps/LinkContestRoom2/map.json index bc020148a..c018394a4 100644 --- a/data/maps/LinkContestRoom2/map.json +++ b/data/maps/LinkContestRoom2/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom3/map.json b/data/maps/LinkContestRoom3/map.json index 9a7446dad..2cd4ac89e 100644 --- a/data/maps/LinkContestRoom3/map.json +++ b/data/maps/LinkContestRoom3/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom4/map.json b/data/maps/LinkContestRoom4/map.json index efd3fbedb..0c1bd764f 100644 --- a/data/maps/LinkContestRoom4/map.json +++ b/data/maps/LinkContestRoom4/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom5/map.json b/data/maps/LinkContestRoom5/map.json index 042f5286e..c2360ee23 100644 --- a/data/maps/LinkContestRoom5/map.json +++ b/data/maps/LinkContestRoom5/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LinkContestRoom6/map.json b/data/maps/LinkContestRoom6/map.json index e73501882..cc556b5ca 100644 --- a/data/maps/LinkContestRoom6/map.json +++ b/data/maps/LinkContestRoom6/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown/map.json b/data/maps/LittlerootTown/map.json index f012ff56f..2a432f363 100644 --- a/data/maps/LittlerootTown/map.json +++ b/data/maps/LittlerootTown/map.json @@ -18,7 +18,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_3", "x": 16, "y": 10, "elevation": 3, @@ -31,7 +31,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 12, "y": 13, "elevation": 3, @@ -44,7 +44,7 @@ "flag": "FLAG_HIDE_FAT_MAN_LITTLEROOT" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 14, "y": 17, "elevation": 3, @@ -57,7 +57,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 5, "y": 8, "elevation": 3, @@ -70,7 +70,7 @@ "flag": "FLAG_HIDE_MOM_LITTLEROOT" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 2, "y": 10, "elevation": 4, @@ -83,7 +83,7 @@ "flag": "FLAG_HIDE_MOVING_TRUCK_BRENDAN" }, { - "graphics_id": "EVENT_OBJ_GFX_TRUCK", + "graphics_id": "OBJ_EVENT_GFX_TRUCK", "x": 11, "y": 10, "elevation": 4, @@ -236,4 +236,4 @@ "script": "LittlerootTown_EventScript_14D834" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index e98f73393..d0b82f8ef 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -54,9 +54,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag FLAG_HIDE_MOM_LITTLEROOT setobjectmovementtype 4, 8 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_EventScript_14D5C5 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_EventScript_14D5CD return @@ -76,8 +76,8 @@ LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 LittlerootTown_EventScript_14D5EF:: @ 814D5EF lockall - setvar VAR_SPECIAL_4, 5 - setvar VAR_SPECIAL_5, 8 + setvar VAR_0x8004, 5 + setvar VAR_0x8005, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 @@ -87,8 +87,8 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF LittlerootTown_EventScript_14D60D:: @ 814D60D lockall - setvar VAR_SPECIAL_4, 14 - setvar VAR_SPECIAL_5, 8 + setvar VAR_0x8004, 14 + setvar VAR_0x8005, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 @@ -101,12 +101,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B playse SE_DANSA applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 - opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 + opendoor VAR_0x8004, VAR_0x8005 waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 + closedoor VAR_0x8004, VAR_0x8005 waitdooranim delay 10 applymovement 4, LittlerootTown_Movement_14D6AE @@ -116,7 +116,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 - opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 + opendoor VAR_0x8004, VAR_0x8005 waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD @@ -124,7 +124,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B setflag FLAG_HIDE_MOM_LITTLEROOT setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat 255, MAP_PETALBURG_CITY - closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 + closedoor VAR_0x8004, VAR_0x8005 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag FLAG_SPECIAL_FLAG_0 @@ -331,9 +331,9 @@ LittlerootTown_EventScript_14D7FF:: @ 814D7FF LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_EventScript_14D822 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_EventScript_14D82B releaseall end @@ -349,9 +349,9 @@ LittlerootTown_EventScript_14D82B:: @ 814D82B LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_EventScript_14D84E - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_EventScript_14D857 releaseall end @@ -366,77 +366,77 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall - setvar VAR_SPECIAL_8, 3 + setvar VAR_0x8008, 3 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall - setvar VAR_SPECIAL_8, 4 + setvar VAR_0x8008, 4 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall - setvar VAR_SPECIAL_8, 5 + setvar VAR_0x8008, 5 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_EventScript_14D93C - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_EventScript_14D947 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_EventScript_14D926 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closemessage checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_EventScript_14D952 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_EventScript_14DAAA - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end LittlerootTown_EventScript_14D926:: @ 814D926 - setvar VAR_SPECIAL_9, 5 - setvar VAR_SPECIAL_A, 8 + setvar VAR_0x8009, 5 + setvar VAR_0x800A, 8 return LittlerootTown_EventScript_14D931:: @ 814D931 - setvar VAR_SPECIAL_9, 14 - setvar VAR_SPECIAL_A, 8 + setvar VAR_0x8009, 14 + setvar VAR_0x800A, 8 return LittlerootTown_EventScript_14D93C:: @ 814D93C @@ -450,32 +450,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LittlerootTown_EventScript_14D9D8 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LittlerootTown_EventScript_14D9ED - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq LittlerootTown_EventScript_14DA02 - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq LittlerootTown_EventScript_14DA17 - compare VAR_SPECIAL_8, 4 + compare VAR_0x8008, 4 call_if_eq LittlerootTown_EventScript_14DA2C - compare VAR_SPECIAL_8, 5 + compare VAR_0x8008, 5 call_if_eq LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LittlerootTown_EventScript_14D9D8 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LittlerootTown_EventScript_14D9ED - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq LittlerootTown_EventScript_14DA56 - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq LittlerootTown_EventScript_14DA6B - compare VAR_SPECIAL_8, 4 + compare VAR_0x8008, 4 call_if_eq LittlerootTown_EventScript_14DA80 - compare VAR_SPECIAL_8, 5 + compare VAR_0x8008, 5 call_if_eq LittlerootTown_EventScript_14DA95 return @@ -550,32 +550,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LittlerootTown_EventScript_14DB30 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LittlerootTown_EventScript_14DB3B - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq LittlerootTown_EventScript_14DB46 - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq LittlerootTown_EventScript_14DB6C - compare VAR_SPECIAL_8, 4 + compare VAR_0x8008, 4 call_if_eq LittlerootTown_EventScript_14DB92 - compare VAR_SPECIAL_8, 5 + compare VAR_0x8008, 5 call_if_eq LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq LittlerootTown_EventScript_14DB30 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq LittlerootTown_EventScript_14DB3B - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq LittlerootTown_EventScript_14DBDE - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq LittlerootTown_EventScript_14DC04 - compare VAR_SPECIAL_8, 4 + compare VAR_0x8008, 4 call_if_eq LittlerootTown_EventScript_14DC2A - compare VAR_SPECIAL_8, 5 + compare VAR_0x8008, 5 call_if_eq LittlerootTown_EventScript_14DC50 return @@ -592,96 +592,96 @@ LittlerootTown_EventScript_14DB3B:: @ 814DB3B LittlerootTown_EventScript_14DB46:: @ 814DB46 applymovement 4, LittlerootTown_Movement_14DCB4 waitmovement 0 - opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + opendoor VAR_0x8009, VAR_0x800A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + opendoor VAR_0x8009, VAR_0x800A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + opendoor VAR_0x8009, VAR_0x800A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + opendoor VAR_0x8009, VAR_0x800A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + opendoor VAR_0x8009, VAR_0x800A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + opendoor VAR_0x8009, VAR_0x800A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + opendoor VAR_0x8009, VAR_0x800A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + closedoor VAR_0x8009, VAR_0x800A waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + opendoor VAR_0x8009, VAR_0x800A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + closedoor VAR_0x8009, VAR_0x800A waitdooranim return @@ -839,19 +839,19 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock faceplayer checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_EventScript_14D926 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 - opendoor VAR_SPECIAL_9, VAR_SPECIAL_A + opendoor VAR_0x8009, VAR_0x800A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor VAR_SPECIAL_9, VAR_SPECIAL_A + closedoor VAR_0x8009, VAR_0x800A waitdooranim goto LittlerootTown_EventScript_14DD2B end diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.json b/data/maps/LittlerootTown_BrendansHouse_1F/map.json index fa1ac38ad..166451028 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 2, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_CARRYING_BOX", "x": 1, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_FACING_AWAY", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_FACING_AWAY", "x": 4, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_BRENDAN_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 5, "y": 6, "elevation": 3, @@ -112,4 +112,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index deaeb6f59..b712826f3 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -17,7 +17,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return @@ -75,15 +75,15 @@ LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall - setvar VAR_SPECIAL_4, 1 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 end LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 lockall - setvar VAR_SPECIAL_4, 0 - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8004, 0 + setvar VAR_0x8005, 1 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF end @@ -115,9 +115,9 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall - setvar VAR_SPECIAL_4, 1 - setvar VAR_SPECIAL_5, 0 - applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 0 + applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json index 40ef52b9a..bb38b7c46 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json +++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 0, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BRENDAN_UPSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 0, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 4, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 1, "y": 0, "elevation": 0, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 1, "elevation": 0, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 2, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 3, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 4, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 5, "elevation": 0, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 7, "y": 1, "elevation": 3, @@ -238,4 +238,4 @@ "script": "LittlerootTown_BrendansHouse_2F_EventScript_152870" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index ed6818fa0..932334f02 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -22,16 +22,16 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152814 end @@ -50,14 +50,14 @@ gUnknown_0815281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D end LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 @@ -67,7 +67,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 end gBrendanHouse_TurnPCOff:: @ 8152850 - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.json b/data/maps/LittlerootTown_MaysHouse_1F/map.json index f2416f54c..15b502ef3 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 8, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_MAY_MOM_DOWNSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_FACING_AWAY", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_FACING_AWAY", "x": 6, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX", + "graphics_id": "OBJ_EVENT_GFX_MACHOKE_CARRYING_BOX", "x": 9, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_MACHOKE_MOVER_2" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 7, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_MAY_MOM" }, { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 5, "y": 6, "elevation": 3, @@ -112,4 +112,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index fa018ca54..587695bcc 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -17,7 +17,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 checkplayergender - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return @@ -75,15 +75,15 @@ LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall - setvar VAR_SPECIAL_4, 1 - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 end LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 lockall - setvar VAR_SPECIAL_4, 1 - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end @@ -116,9 +116,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 @ 81529C7 lockall checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E1 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -160,9 +160,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall - setvar VAR_SPECIAL_4, 1 - setvar VAR_SPECIAL_5, 1 - applymovement VAR_SPECIAL_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 + applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json index db982aaf5..8c1861439 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/map.json +++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_MAY_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_MAY_NORMAL", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_MAY_UPSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 6, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 1, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 2, "y": 6, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 3, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 4, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 5, "y": 6, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 7, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 7, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 2, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 3, "y": 7, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 4, "y": 7, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 5, "y": 7, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_MOM", + "graphics_id": "OBJ_EVENT_GFX_MOM", "x": 1, "y": 1, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_HIDE_MOM_UPSTAIRS" }, { - "graphics_id": "EVENT_OBJ_GFX_PICHU_DOLL", + "graphics_id": "OBJ_EVENT_GFX_PICHU_DOLL", "x": 3, "y": 4, "elevation": 4, @@ -251,4 +251,4 @@ "script": "LittlerootTown_MaysHouse_2F_EventScript_152C39" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index bcc4ba46b..628f3b18e 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -22,7 +22,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkplayergender - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end @@ -31,12 +31,12 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse SE_KAIDAN - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_STATE, 1 savebgm 0 @@ -47,73 +47,73 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 playbgm MUS_GIRL_SUP, TRUE - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 waitmovement 0 - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closemessage - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29 - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34 - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F return LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29 - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11 waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152B34:: @ 8152B34 - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 playbgm MUS_BOY_SUP, TRUE - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 waitmovement 0 - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closemessage - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA return LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30 waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25 waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 - applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall @@ -190,9 +190,9 @@ gUnknown_08152C39:: @ 8152C39 LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C end @@ -202,7 +202,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 end LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 @@ -212,7 +212,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C end gMayHouse_TurnPCOff:: @ 8152C75 - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json index 11681f61e..cef892407 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.json +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 9, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 6, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_BIRCH_IN_LAB" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 7, "y": 4, "elevation": 3, @@ -190,4 +190,4 @@ "script": "LittlerootTown_ProfessorBirchsLab_EventScript_152ED0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 74d5f9193..620cddd0b 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -30,23 +30,23 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE playfanfare MUS_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -59,9 +59,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -122,9 +122,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 waitmovement 0 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED @@ -137,19 +137,19 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem_std ITEM_POKE_BALL, 5 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 - setvar RESULT, 0 + setvar VAR_RESULT, 0 return LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem_std ITEM_POKE_BALL, 5 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 - setvar RESULT, 1 + setvar VAR_RESULT, 1 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D @@ -186,9 +186,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 lock faceplayer checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 37996e6e8..b4df38381 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 19, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 20, "y": 3, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_B1F/map.json b/data/maps/MagmaHideout_B1F/map.json index 4a63a0bd8..e2b9bf84b 100644 --- a/data/maps/MagmaHideout_B1F/map.json +++ b/data/maps/MagmaHideout_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 33, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 41, "y": 17, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 33, "y": 19, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 18, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_ITEM_MAGMA_HIDEOUT_B1F_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 11, "elevation": 3, @@ -323,4 +323,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MagmaHideout_B1F/scripts.inc b/data/maps/MagmaHideout_B1F/scripts.inc index a55d260ab..89eb5ab98 100644 --- a/data/maps/MagmaHideout_B1F/scripts.inc +++ b/data/maps/MagmaHideout_B1F/scripts.inc @@ -7,5 +7,5 @@ MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE end MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED return diff --git a/data/maps/MagmaHideout_B2F/map.json b/data/maps/MagmaHideout_B2F/map.json index 121b86c48..e1a03b59c 100644 --- a/data/maps/MagmaHideout_B2F/map.json +++ b/data/maps/MagmaHideout_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 31, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 12, "y": 20, "elevation": 1, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 13, "y": 3, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNTS_HIDEOUTS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 20, "elevation": 3, @@ -174,4 +174,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json index fb3887037..deef6ac38 100644 --- a/data/maps/MauvilleCity/map.json +++ b/data/maps/MauvilleCity/map.json @@ -33,7 +33,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 29, "y": 16, "elevation": 3, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 24, "y": 10, "elevation": 3, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 14, "y": 11, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 18, "y": 6, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 17, "y": 14, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 8, "y": 6, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "FLAG_HIDE_WALLY_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 9, "y": 6, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "FLAG_HIDE_WALLY_FATHER_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 29, "y": 9, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "FLAG_HIDE_WATTSON_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 19, "elevation": 3, @@ -268,4 +268,4 @@ "script": "MauvilleCity_EventScript_14C099" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index f5eb064e5..c3c6834e4 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -101,12 +101,12 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 end MauvilleCity_EventScript_14C154:: @ 814C154 - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq MauvilleCity_EventScript_14C23C - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MauvilleCity_EventScript_14C285 closemessage - switch FACING + switch VAR_FACING case 2, MauvilleCity_EventScript_14C187 case 4, MauvilleCity_EventScript_14C1D9 end @@ -299,7 +299,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 giveitem_std ITEM_TM24_THUNDERBOLT - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag FLAG_RECEIVED_TM24 msgbox MauvilleCity_Text_166488, 4 diff --git a/data/maps/MauvilleCity_BikeShop/map.json b/data/maps/MauvilleCity_BikeShop/map.json index 2d33f59b1..05872fbc9 100644 --- a/data/maps/MauvilleCity_BikeShop/map.json +++ b/data/maps/MauvilleCity_BikeShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 2, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 7, "y": 6, "elevation": 3, @@ -73,4 +73,4 @@ "script": "MauvilleCity_BikeShop_EventScript_156988" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index 08f11d641..c0dd433a3 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -8,17 +8,17 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end @@ -26,7 +26,7 @@ MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 message MauvilleCity_BikeShop_Text_1810B1 waitmessage multichoice 21, 8, 12, 1 - switch RESULT + switch VAR_RESULT case 0, MauvilleCity_BikeShop_EventScript_15682D case 1, MauvilleCity_BikeShop_EventScript_156847 end @@ -62,19 +62,19 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E msgbox MauvilleCity_BikeShop_Text_1813A0, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_15688D - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D msgbox MauvilleCity_BikeShop_Text_1813D4, 4 checkitem ITEM_ACRO_BIKE, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 checkitem ITEM_MACH_BIKE, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA msgbox MauvilleCity_BikeShop_Text_181498, 4 release @@ -113,7 +113,7 @@ MauvilleCity_BikeShop_EventScript_156914:: @ 8156914 MauvilleCity_BikeShop_EventScript_156920:: @ 8156920 multichoice 0, 0, 43, 0 - switch RESULT + switch VAR_RESULT case 0, MauvilleCity_BikeShop_EventScript_156962 case 1, MauvilleCity_BikeShop_EventScript_15696E case 2, MauvilleCity_BikeShop_EventScript_15697A @@ -151,7 +151,7 @@ MauvilleCity_BikeShop_EventScript_156988:: @ 8156988 MauvilleCity_BikeShop_EventScript_156994:: @ 8156994 multichoice 0, 0, 44, 0 - switch RESULT + switch VAR_RESULT case 0, MauvilleCity_BikeShop_EventScript_1569D6 case 1, MauvilleCity_BikeShop_EventScript_1569E2 case 2, MauvilleCity_BikeShop_EventScript_1569EE diff --git a/data/maps/MauvilleCity_GameCorner/map.json b/data/maps/MauvilleCity_GameCorner/map.json index 710a912a2..f28ad929e 100644 --- a/data/maps/MauvilleCity_GameCorner/map.json +++ b/data/maps/MauvilleCity_GameCorner/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 12, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 16, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 11, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 7, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 19, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 20, "y": 8, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 6, "y": 8, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 13, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 1, "y": 7, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 9, "y": 8, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 6, "elevation": 3, @@ -379,4 +379,4 @@ "script": "MauvilleCity_GameCorner_EventScript_1C40AC" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index b9f8e5ad1..8026e3b08 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -6,7 +6,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 faceplayer msgbox MauvilleCity_GameCorner_Text_181C35, 4 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waitmessage @@ -17,7 +17,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 multichoicedefault 15, 0, 49, 0, 0 - switch RESULT + switch VAR_RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 goto MauvilleCity_GameCorner_EventScript_156B4C @@ -25,7 +25,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 @ 8156A87 multichoicedefault 15, 0, 49, 1, 0 - switch RESULT + switch VAR_RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 goto MauvilleCity_GameCorner_EventScript_156B4C @@ -36,7 +36,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE compare VAR_TEMP_1, 9950 goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 takemoney 0x3e8, 0 @@ -55,7 +55,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 compare VAR_TEMP_1, 9500 goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 takemoney 0x2710, 0 @@ -100,7 +100,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 release end @@ -119,7 +119,7 @@ MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 multichoice 12, 0, 48, 0 - switch RESULT + switch VAR_RESULT case 0, MauvilleCity_GameCorner_EventScript_156BE2 case 1, MauvilleCity_GameCorner_EventScript_156BF0 case 2, MauvilleCity_GameCorner_EventScript_156BFE @@ -144,7 +144,7 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156C46 @@ -158,7 +158,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 givedecoration DECOR_TREECKO_DOLL @@ -174,7 +174,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 givedecoration DECOR_TORCHIC_DOLL @@ -190,7 +190,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 givedecoration DECOR_MUDKIP_DOLL @@ -221,7 +221,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 release end @@ -240,7 +240,7 @@ MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 multichoice 12, 0, 55, 0 - switch RESULT + switch VAR_RESULT case 0, MauvilleCity_GameCorner_EventScript_156DA6 case 1, MauvilleCity_GameCorner_EventScript_156DB4 case 2, MauvilleCity_GameCorner_EventScript_156DC2 @@ -277,7 +277,7 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156E3C @@ -292,7 +292,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C compare VAR_TEMP_2, 1500 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32_DOUBLE_TEAM, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 1500 giveitem ITEM_TM32_DOUBLE_TEAM, 1 @@ -307,7 +307,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 compare VAR_TEMP_2, 3500 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29_PSYCHIC, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 3500 giveitem ITEM_TM29_PSYCHIC, 1 @@ -322,7 +322,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 compare VAR_TEMP_2, 4000 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35_FLAMETHROWER, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 giveitem ITEM_TM35_FLAMETHROWER, 1 @@ -337,7 +337,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA compare VAR_TEMP_2, 4000 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24_THUNDERBOLT, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 giveitem ITEM_TM24_THUNDERBOLT, 1 @@ -352,7 +352,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 compare VAR_TEMP_2, 4000 goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13_ICE_BEAM, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 giveitem ITEM_TM13_ICE_BEAM, 1 @@ -391,7 +391,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 faceplayer goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_156FDB @@ -402,7 +402,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration_std DECOR_TREECKO_DOLL @@ -413,7 +413,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration_std DECOR_TORCHIC_DOLL @@ -424,7 +424,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration_std DECOR_MUDKIP_DOLL @@ -452,7 +452,7 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 goto MauvilleCity_GameCorner_EventScript_157108 @@ -498,7 +498,7 @@ MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 closemessage - applymovement LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D + applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D waitmovement 0 release end @@ -520,132 +520,132 @@ MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 0 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 0 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 1 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 1 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 2 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 2 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 3 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 3 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 4 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 4 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 5 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 5 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 6 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 6 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 7 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 7 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 8 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 8 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 9 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 9 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 10 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 10 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar VAR_SPECIAL_4, 11 - specialvar RESULT, GetSlotMachineId - playslotmachine RESULT + setvar VAR_0x8004, 11 + specialvar VAR_RESULT, GetSlotMachineId + playslotmachine VAR_RESULT releaseall end diff --git a/data/maps/MauvilleCity_Gym/map.json b/data/maps/MauvilleCity_Gym/map.json index d68b4ac5b..e63936ff8 100644 --- a/data/maps/MauvilleCity_Gym/map.json +++ b/data/maps/MauvilleCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WATTSON", + "graphics_id": "OBJ_EVENT_GFX_WATTSON", "x": 4, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WATTSON_MAUVILLE_GYM" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 6, "y": 9, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 1, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 2, "y": 15, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 20, "elevation": 3, @@ -153,4 +153,4 @@ "script": "MauvilleCity_Gym_EventScript_156771" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 9fb3042f7..62f5303ec 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -44,19 +44,19 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B end MauvilleCity_Gym_EventScript_15657D:: @ 815657D - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end @@ -84,7 +84,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq MauvilleCity_Gym_EventScript_1A00FB - setvar VAR_SPECIAL_8, 3 + setvar VAR_0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView @@ -94,7 +94,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB MauvilleCity_Gym_EventScript_15661D:: @ 815661D giveitem_std ITEM_TM34_SHOCK_WAVE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 setflag FLAG_RECEIVED_TM34 @@ -112,7 +112,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 1 - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -122,7 +122,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 2 - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -132,7 +132,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 3 - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 goto MauvilleCity_Gym_EventScript_1566BA end diff --git a/data/maps/MauvilleCity_House1/map.json b/data/maps/MauvilleCity_House1/map.json index ad7d843c0..ebf7c9319 100644 --- a/data/maps/MauvilleCity_House1/map.json +++ b/data/maps/MauvilleCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House2/map.json b/data/maps/MauvilleCity_House2/map.json index 58d88282f..2385d61b3 100644 --- a/data/maps/MauvilleCity_House2/map.json +++ b/data/maps/MauvilleCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 4, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index f18d278b5..321905148 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -7,21 +7,21 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_1572E5 release end MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 playse SE_PIN - applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0833 + applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_1A0833 waitmovement 0 - applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 + applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_1A0835 waitmovement 0 msgbox MauvilleCity_House2_Text_1824D8, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq MauvilleCity_House2_EventScript_15731B - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MauvilleCity_House2_EventScript_157347 end diff --git a/data/maps/MauvilleCity_Mart/map.json b/data/maps/MauvilleCity_Mart/map.json index 14e637a85..e4179a323 100644 --- a/data/maps/MauvilleCity_Mart/map.json +++ b/data/maps/MauvilleCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/map.json b/data/maps/MauvilleCity_PokemonCenter_1F/map.json index cf578fc29..551ad0e4d 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 8, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 11, "y": 4, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 2, "y": 8, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 817679cec..29fcc1278 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -13,7 +13,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 end MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/map.json b/data/maps/MauvilleCity_PokemonCenter_2F/map.json index e8fca6505..d4a8e42ab 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/map.json +++ b/data/maps/MauvilleCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 6, "y": 7, "elevation": 3, @@ -103,4 +103,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_1R/map.json b/data/maps/MeteorFalls_1F_1R/map.json index d27e4ba7d..ab56a3c4f 100644 --- a/data/maps/MeteorFalls_1F_1R/map.json +++ b/data/maps/MeteorFalls_1F_1R/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 32, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 12, "y": 20, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_GRUNTS_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 21, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_GRUNTS_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 6, "y": 20, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 6, "y": 20, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 6, "y": 21, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 23, "elevation": 3, @@ -208,4 +208,4 @@ "script": "0x0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_2R/map.json b/data/maps/MeteorFalls_1F_2R/map.json index 24c133810..4580e9b23 100644 --- a/data/maps/MeteorFalls_1F_2R/map.json +++ b/data/maps/MeteorFalls_1F_2R/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 13, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 6, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 7, "y": 12, "elevation": 3, @@ -100,4 +100,4 @@ "script": "0x0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 92b9f4661..971b9c285 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -3,8 +3,8 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 end @@ -16,8 +16,8 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 end @@ -29,8 +29,8 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 end diff --git a/data/maps/MeteorFalls_B1F_1R/map.json b/data/maps/MeteorFalls_B1F_1R/map.json index 2e7a33686..293d0da4f 100644 --- a/data/maps/MeteorFalls_B1F_1R/map.json +++ b/data/maps/MeteorFalls_B1F_1R/map.json @@ -57,4 +57,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MeteorFalls_B1F_2R/map.json b/data/maps/MeteorFalls_B1F_2R/map.json index 7fb77ab10..d1c02e53a 100644 --- a/data/maps/MeteorFalls_B1F_2R/map.json +++ b/data/maps/MeteorFalls_B1F_2R/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json index 3a62d9ace..392e7ebd4 100644 --- a/data/maps/MossdeepCity/map.json +++ b/data/maps/MossdeepCity/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 42, "y": 24, "elevation": 5, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 50, "y": 34, "elevation": 5, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 32, "y": 12, "elevation": 5, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 26, "y": 21, "elevation": 5, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 45, "y": 18, "elevation": 7, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 62, "y": 35, "elevation": 5, @@ -106,7 +106,7 @@ "flag": "FLAG_ITEM_MOSSDEEP_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 53, "y": 5, "elevation": 7, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 56, "y": 21, "elevation": 7, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 23, "y": 13, "elevation": 5, @@ -321,4 +321,4 @@ "script": "MossdeepCity_EventScript_14CFE4" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 7ec338927..d34944bb6 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -59,7 +59,7 @@ MossdeepCity_EventScript_14D011:: @ 814D011 lock faceplayer msgbox MossdeepCity_Text_16944E, 4 - applymovement LAST_TALKED, MossdeepCity_Movement_1A083D + applymovement VAR_LAST_TALKED, MossdeepCity_Movement_1A083D waitmovement 0 release end @@ -69,11 +69,11 @@ MossdeepCity_EventScript_14D027:: @ 814D027 faceplayer goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem_std ITEM_KINGS_ROCK - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag FLAG_RECEIVED_KINGS_ROCK release diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.json b/data/maps/MossdeepCity_GameCorner_1F/map.json index a06d123a8..1c79748c3 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -59,4 +59,4 @@ "script": "MossdeepCity_GameCorner_1F_EventScript_15AE4C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc index 7e147c48f..38366ac43 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc @@ -6,7 +6,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special ValidateEReaderTrainer - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC71 end @@ -17,7 +17,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special ValidateEReaderTrainer - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC9E compare VAR_GAME_CORNER_STATE, 0 call_if_ne MossdeepCity_GameCorner_1F_EventScript_15ACAF @@ -94,28 +94,28 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special BufferEReaderTrainerName msgbox MossdeepCity_GameCorner_1F_Text_18E650, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 erasebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closemessage - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE16 - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1 waitstate @@ -136,19 +136,19 @@ MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5 return MossdeepCity_GameCorner_1F_EventScript_15AE04:: @ 815AE04 - applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 + applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3A waitmovement 0 return MossdeepCity_GameCorner_1F_EventScript_15AE16:: @ 815AE16 - applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49 + applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49 applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3E waitmovement 0 return MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28 - applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 + applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE42 waitmovement 0 return diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.json b/data/maps/MossdeepCity_GameCorner_B1F/map.json index b67e47009..8eda40f65 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/map.json +++ b/data/maps/MossdeepCity_GameCorner_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 6, "y": 5, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc index 0af775590..aa604b493 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc @@ -18,15 +18,15 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special PrintEReaderTrainerGreeting msgbox gStringVar4, 4 closemessage - setvar VAR_SPECIAL_4, 2 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 0 special StartSpecialBattle waitstate - compare RESULT, 3 + compare VAR_RESULT, 3 call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AED5 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEE3 - compare RESULT, 2 + compare VAR_RESULT, 2 call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE closemessage special ScrSpecial_HealPlayerParty diff --git a/data/maps/MossdeepCity_Gym/map.json b/data/maps/MossdeepCity_Gym/map.json index 390abe349..72b0499c4 100644 --- a/data/maps/MossdeepCity_Gym/map.json +++ b/data/maps/MossdeepCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TATE", + "graphics_id": "OBJ_EVENT_GFX_TATE", "x": 8, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 2, "y": 24, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 17, "y": 18, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 17, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 11, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 0, "y": 7, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 4, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 8, "y": 29, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LIZA", + "graphics_id": "OBJ_EVENT_GFX_LIZA", "x": 9, "y": 3, "elevation": 3, @@ -206,4 +206,4 @@ "script": "MossdeepCity_Gym_EventScript_15A80A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index aabfd73ec..695953c38 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -22,26 +22,26 @@ MossdeepCity_Gym_EventScript_15A506:: @ 815A506 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 - setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 + setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Right, 0 + setmetatile 2, 7, METATILE_MossdeepGym_Switch_Down, 1 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A528:: @ 815A528 - setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 + setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Right, 0 + setmetatile 8, 10, METATILE_MossdeepGym_Switch_Down, 1 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A540:: @ 815A540 - setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 - setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 + setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Left, 0 + setmetatile 17, 15, METATILE_MossdeepGym_Switch_Down, 1 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A558:: @ 815A558 - setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 - setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 + setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Up, 0 + setmetatile 5, 24, METATILE_MossdeepGym_Switch_Down, 1 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B @@ -60,7 +60,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 - setvar VAR_SPECIAL_8, 7 + setvar VAR_0x8008, 7 call MossdeepCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR goto MossdeepCity_Gym_EventScript_15A5C6 @@ -68,7 +68,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 giveitem_std ITEM_TM04_CALM_MIND - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 setflag FLAG_RECEIVED_TM04 @@ -81,8 +81,8 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 2, 7, METATILE_MossdeepGym_Empty1, 1 + setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Right, 0 + setmetatile 2, 7, METATILE_MossdeepGym_Switch_Down, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -96,8 +96,8 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 5, 5, METATILE_MossdeepGym_Obelisk_Base, 0 - setmetatile 2, 7, METATILE_MossdeepGym_Empty0, 1 + setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Left, 0 + setmetatile 2, 7, METATILE_MossdeepGym_Switch_Up, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -107,8 +107,8 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 8, 14, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 8, 10, METATILE_MossdeepGym_Empty1, 1 + setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Right, 0 + setmetatile 8, 10, METATILE_MossdeepGym_Switch_Down, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -116,8 +116,8 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 8, 14, METATILE_MossdeepGym_OuterWall_RightCorner, 0 - setmetatile 8, 10, METATILE_MossdeepGym_Empty0, 1 + setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Down, 0 + setmetatile 8, 10, METATILE_MossdeepGym_Switch_Up, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -127,8 +127,8 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Base, 0 - setmetatile 17, 15, METATILE_MossdeepGym_Empty1, 1 + setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Left, 0 + setmetatile 17, 15, METATILE_MossdeepGym_Switch_Down, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -136,8 +136,8 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 15, 17, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 17, 15, METATILE_MossdeepGym_Empty0, 1 + setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Right, 0 + setmetatile 17, 15, METATILE_MossdeepGym_Switch_Up, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -147,8 +147,8 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 1, 23, METATILE_MossdeepGym_Wall_LeftCorner, 0 - setmetatile 5, 24, METATILE_MossdeepGym_Empty1, 1 + setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Up, 0 + setmetatile 5, 24, METATILE_MossdeepGym_Switch_Down, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -156,8 +156,8 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmetatile 1, 23, METATILE_MossdeepGym_Obelisk_Top, 0 - setmetatile 5, 24, METATILE_MossdeepGym_Empty0, 1 + setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Right, 0 + setmetatile 5, 24, METATILE_MossdeepGym_Switch_Up, 1 goto MossdeepCity_Gym_EventScript_15A619 end diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json index 5935872d6..fcb0a5455 100644 --- a/data/maps/MossdeepCity_House1/map.json +++ b/data/maps/MossdeepCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 3, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc index 97a5fc452..12b2bc2a5 100644 --- a/data/maps/MossdeepCity_House1/scripts.inc +++ b/data/maps/MossdeepCity_House1/scripts.inc @@ -6,8 +6,8 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F faceplayer bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_18D465, 4 - specialvar RESULT, GetPokeblockNameByMonNature - compare RESULT, 0 + specialvar VAR_RESULT, GetPokeblockNameByMonNature + compare VAR_RESULT, 0 goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 release diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json index 85d4a3770..5a43747ff 100644 --- a/data/maps/MossdeepCity_House2/map.json +++ b/data/maps/MossdeepCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 4, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 4, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index c8bccdd52..53cb4511b 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B closemessage setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq MossdeepCity_House2_EventScript_15A8AE - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq MossdeepCity_House2_EventScript_15A8B9 removeobject 3 release diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json index 897ce3fa0..b5f4dd201 100644 --- a/data/maps/MossdeepCity_House3/map.json +++ b/data/maps/MossdeepCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 4, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index 4c4d6cbdd..ead159df5 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -6,7 +6,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 faceplayer goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem_std ITEM_SUPER_ROD diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json index 27c0640f0..f7bafeb6a 100644 --- a/data/maps/MossdeepCity_House4/map.json +++ b/data/maps/MossdeepCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 6, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 2, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc index 15ed22c5e..dc5063c15 100644 --- a/data/maps/MossdeepCity_House4/scripts.inc +++ b/data/maps/MossdeepCity_House4/scripts.inc @@ -18,7 +18,7 @@ MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 lock faceplayer special CheckPlayerHasSecretBase - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MossdeepCity_House4_EventScript_15AB6D special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_18E17E, 4 diff --git a/data/maps/MossdeepCity_Mart/map.json b/data/maps/MossdeepCity_Mart/map.json index d42689305..0cc9d7f28 100644 --- a/data/maps/MossdeepCity_Mart/map.json +++ b/data/maps/MossdeepCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 1, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 8, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 5, "y": 3, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/map.json b/data/maps/MossdeepCity_PokemonCenter_1F/map.json index 467a5150b..4b8a9b59c 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 8, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 3, "y": 5, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index 906cf8e83..5fe72062f 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/map.json b/data/maps/MossdeepCity_PokemonCenter_2F/map.json index 89a6bfddc..bb0bd4786 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/map.json +++ b/data/maps/MossdeepCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 6, "elevation": 3, @@ -103,4 +103,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.json b/data/maps/MossdeepCity_SpaceCenter_1F/map.json index 1f2d73745..f73363201 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 6, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 14, "y": 7, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 83b859c26..7ac7d5f4d 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -5,14 +5,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B lock faceplayer dodailyevents - specialvar RESULT, GetWeekCount - buffernumberstring 0, RESULT - compare RESULT, 0 + specialvar VAR_RESULT, GetWeekCount + buffernumberstring 0, VAR_RESULT + compare VAR_RESULT, 0 call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15ABBA - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closemessage - applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmovement 0 release end @@ -35,7 +35,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem_std ITEM_SUN_STONE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 @@ -56,7 +56,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, 4 closemessage - applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmovement 0 release end diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.json b/data/maps/MossdeepCity_SpaceCenter_2F/map.json index eed6b9e62..b2ddc566f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/map.json +++ b/data/maps/MossdeepCity_SpaceCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 6, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 11, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 5, "y": 6, "elevation": 3, @@ -62,4 +62,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json index f2659f369..1f3be9321 100644 --- a/data/maps/MossdeepCity_StevensHouse/map.json +++ b/data/maps/MossdeepCity_StevensHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 9, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_STEVEN_STEVENS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 6, "y": 4, "elevation": 3, @@ -115,4 +115,4 @@ "script": "MossdeepCity_StevensHouse_EventScript_15AAF0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 073416b5a..6025a6b6b 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -71,12 +71,12 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 getpartysize - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC - copyvar VAR_SPECIAL_4, RESULT + copyvar VAR_0x8004, VAR_RESULT removeobject 2 playfanfare MUS_FANFA4 message MossdeepCity_StevensHouse_Text_18DD61 @@ -85,7 +85,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678 setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag FLAG_RECEIVED_BELDUM diff --git a/data/maps/MtChimney/map.json b/data/maps/MtChimney/map.json index 61497ff7d..f432ddc41 100644 --- a/data/maps/MtChimney/map.json +++ b/data/maps/MtChimney/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 24, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 13, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 12, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 32, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 28, "y": 12, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 19, "y": 39, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 29, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 31, "y": 12, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 16, "y": 37, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 22, "y": 39, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 19, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 18, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 17, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 23, "y": 20, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 22, "y": 19, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 21, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 19, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 12, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 29, "y": 12, "elevation": 3, @@ -259,7 +259,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 30, "y": 5, "elevation": 3, @@ -272,7 +272,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 31, "y": 5, "elevation": 3, @@ -285,7 +285,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 9, "y": 15, "elevation": 3, @@ -298,7 +298,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 20, "y": 39, "elevation": 3, @@ -311,7 +311,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 21, "y": 39, "elevation": 3, @@ -324,7 +324,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 16, "y": 18, "elevation": 3, @@ -337,7 +337,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 7, "elevation": 3, @@ -350,7 +350,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 29, "y": 7, "elevation": 3, @@ -363,7 +363,7 @@ "flag": "FLAG_HIDE_MT_CHIMNEY_PEOPLE" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 27, "y": 17, "elevation": 3, @@ -425,4 +425,4 @@ "script": "MtChimney_EventScript_15D1DA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index a3906af8c..e06433dfa 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -18,17 +18,17 @@ MtChimney_EventScript_15CF95:: @ 815CF95 showmoneybox 0, 0 nop msgbox MtChimney_Text_195760, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MtChimney_EventScript_15D018 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq MtChimney_EventScript_15D000 giveitem_std ITEM_LAVA_COOKIE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoneybox 0, 0 release @@ -409,7 +409,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_15D1D0 goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem_std ITEM_METEORITE @@ -438,8 +438,8 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, TRAINER_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 end diff --git a/data/maps/MtChimney_CableCarStation/map.json b/data/maps/MtChimney_CableCarStation/map.json index e0bdbc99c..0fd291caa 100644 --- a/data/maps/MtChimney_CableCarStation/map.json +++ b/data/maps/MtChimney_CableCarStation/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 7161e8800..cf80ed39c 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -32,9 +32,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B lock faceplayer msgbox MtChimney_CableCarStation_Text_19256A, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq MtChimney_CableCarStation_EventScript_15C16C - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end @@ -44,7 +44,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/maps/MtPyre_1F/map.json b/data/maps/MtPyre_1F/map.json index 5e96cc77f..5747b70d1 100644 --- a/data/maps/MtPyre_1F/map.json +++ b/data/maps/MtPyre_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 21, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 17, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 13, "y": 10, "elevation": 3, @@ -97,4 +97,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index f34c31da0..3629c375f 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -7,7 +7,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem_std ITEM_CLEANSE_TAG - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag FLAG_RECEIVED_CLEANSE_TAG release diff --git a/data/maps/MtPyre_2F/map.json b/data/maps/MtPyre_2F/map.json index fe048207c..dba85a8fa 100644 --- a/data/maps/MtPyre_2F/map.json +++ b/data/maps/MtPyre_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_MT_PYRE_2F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 5, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 8, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 3, "y": 8, "elevation": 3, @@ -129,4 +129,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_3F/map.json b/data/maps/MtPyre_3F/map.json index aa22262f3..594e6bf08 100644 --- a/data/maps/MtPyre_3F/map.json +++ b/data/maps/MtPyre_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 1, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 12, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 7, "elevation": 3, @@ -97,4 +97,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_4F/map.json b/data/maps/MtPyre_4F/map.json index ce16ca88d..a47ced86c 100644 --- a/data/maps/MtPyre_4F/map.json +++ b/data/maps/MtPyre_4F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 11, "elevation": 3, @@ -84,4 +84,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_5F/map.json b/data/maps/MtPyre_5F/map.json index 98ac6cfc2..465ed07f7 100644 --- a/data/maps/MtPyre_5F/map.json +++ b/data/maps/MtPyre_5F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 3, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, @@ -77,4 +77,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_6F/map.json b/data/maps/MtPyre_6F/map.json index aa7dcbb8b..f95bc310d 100644 --- a/data/maps/MtPyre_6F/map.json +++ b/data/maps/MtPyre_6F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 6, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 9, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index 92086949f..5bf36092b 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -3,8 +3,8 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 end diff --git a/data/maps/MtPyre_Exterior/map.json b/data/maps/MtPyre_Exterior/map.json index a7bebab0b..e58591664 100644 --- a/data/maps/MtPyre_Exterior/map.json +++ b/data/maps/MtPyre_Exterior/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 15, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 40, "elevation": 3, @@ -126,4 +126,4 @@ "flag": "FLAG_HIDDEN_ITEM_4E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_Summit/map.json b/data/maps/MtPyre_Summit/map.json index 1b6007fc3..c57858d45 100644 --- a/data/maps/MtPyre_Summit/map.json +++ b/data/maps/MtPyre_Summit/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 22, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 23, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_LEADER_MT_PYRE_SUMMIT" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 23, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 18, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 25, "y": 15, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 11, "elevation": 3, @@ -187,4 +187,4 @@ "flag": "FLAG_HIDDEN_ITEM_50" } ] -}
\ No newline at end of file +} diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 36b72ad12..90e41c233 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -8,19 +8,19 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD lockall - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto MtPyre_Summit_EventScript_15D4E1 end @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_15D593 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq MtPyre_Summit_EventScript_15D59E - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_15D5AA - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq MtPyre_Summit_EventScript_15D5BF - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -143,9 +143,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF .else msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO .endif - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq MtPyre_Summit_EventScript_15D611 - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq MtPyre_Summit_EventScript_15D61A release end @@ -186,20 +186,20 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A .else msgbox MtPyre_Summit_Text_1B6283, MSGBOX_YESNO .endif - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end MtPyre_Summit_EventScript_15D669:: @ 815D669 - setvar VAR_SPECIAL_4, ITEM_RED_OR_BLUE_ORB + setvar VAR_0x8004, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closemessage - applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 + applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0841 waitmovement 0 delay 40 - applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0839 + applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0839 waitmovement 0 delay 10 .ifdef SAPPHIRE @@ -217,9 +217,9 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B .else msgbox MtPyre_Summit_Text_1B62E7, MSGBOX_YESNO .endif - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -243,19 +243,19 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE lockall - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto MtPyre_Summit_EventScript_15D6F2 end @@ -265,11 +265,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_15D75E - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq MtPyre_Summit_EventScript_15D769 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -277,11 +277,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closemessage - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq MtPyre_Summit_EventScript_15D77F - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq MtPyre_Summit_EventScript_15D78A - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 diff --git a/data/maps/NewMauville_Entrance/map.json b/data/maps/NewMauville_Entrance/map.json index 0d519bcd0..4162f2bfb 100644 --- a/data/maps/NewMauville_Entrance/map.json +++ b/data/maps/NewMauville_Entrance/map.json @@ -39,4 +39,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc index da46a8053..b954c69c8 100644 --- a/data/maps/NewMauville_Entrance/scripts.inc +++ b/data/maps/NewMauville_Entrance/scripts.inc @@ -27,10 +27,10 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC waitmovement 0 msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982D4, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0 diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json index 787a05e2d..53f6cd305 100644 --- a/data/maps/NewMauville_Inside/map.json +++ b/data/maps/NewMauville_Inside/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 25, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 22, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 17, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_NEW_MAUVILLE_INSIDE_5" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 18, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 6, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 10, "elevation": 3, @@ -283,4 +283,4 @@ "script": "NewMauville_Inside_EventScript_15E8E0" } ] -}
\ No newline at end of file +} diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index 02d17a3ef..d995b1f69 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -13,7 +13,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F end NewMauville_Inside_EventScript_15E58F:: @ 815E58F - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED return NewMauville_Inside_MapScript1_15E593:: @ 815E593 diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json index 5653cd4ad..55c96ca33 100644 --- a/data/maps/OldaleTown/map.json +++ b/data/maps/OldaleTown/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 16, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 13, "y": 7, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 9, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 11, "y": 19, "elevation": 3, @@ -190,4 +190,4 @@ "script": "OldaleTown_EventScript_1A00E1" } ] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index dcac39584..ad30b2014 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -41,7 +41,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC playbgm MUS_TSURETEK, FALSE msgbox OldaleTown_Text_16AEF2, 4 closemessage - switch FACING + switch VAR_FACING case 1, OldaleTown_EventScript_14DE07 case 2, OldaleTown_EventScript_14DE1E case 4, OldaleTown_EventScript_14DE35 @@ -71,7 +71,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 giveitem_std ITEM_POTION - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag FLAG_RECEIVED_POTION_OLDALE @@ -251,9 +251,9 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 OldaleTown_EventScript_14DF92:: @ 814DF92 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq OldaleTown_EventScript_14DFAA - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq OldaleTown_EventScript_14DFB8 end diff --git a/data/maps/OldaleTown_House1/map.json b/data/maps/OldaleTown_House1/map.json index cfae29190..51c124e99 100644 --- a/data/maps/OldaleTown_House1/map.json +++ b/data/maps/OldaleTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 6, "y": 4, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_House2/map.json b/data/maps/OldaleTown_House2/map.json index 792d74c52..e9e477ca1 100644 --- a/data/maps/OldaleTown_House2/map.json +++ b/data/maps/OldaleTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_Mart/map.json b/data/maps/OldaleTown_Mart/map.json index d8d8d9154..5ef397b20 100644 --- a/data/maps/OldaleTown_Mart/map.json +++ b/data/maps/OldaleTown_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 9, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.json b/data/maps/OldaleTown_PokemonCenter_1F/map.json index f33bfda02..5f27f1af7 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 10, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 3, "y": 7, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index 16e11d6a2..a3f05e593 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E end OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.json b/data/maps/OldaleTown_PokemonCenter_2F/map.json index 2797b36de..2da8b5347 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/map.json +++ b/data/maps/OldaleTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json index a8cff836a..e2d2c51e0 100644 --- a/data/maps/PacifidlogTown/map.json +++ b/data/maps/PacifidlogTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 10, "y": 23, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 11, "y": 14, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 9, "y": 16, "elevation": 3, @@ -133,4 +133,4 @@ "script": "PacifidlogTown_EventScript_1A00EA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House1/map.json b/data/maps/PacifidlogTown_House1/map.json index 8593de30f..8d8f7872f 100644 --- a/data/maps/PacifidlogTown_House1/map.json +++ b/data/maps/PacifidlogTown_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 3, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House2/map.json b/data/maps/PacifidlogTown_House2/map.json index d63c501c4..c0ec16e14 100644 --- a/data/maps/PacifidlogTown_House2/map.json +++ b/data/maps/PacifidlogTown_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 8, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZURILL", + "graphics_id": "OBJ_EVENT_GFX_AZURILL", "x": 1, "y": 7, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index 110bdcbe6..5798680bd 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -10,19 +10,19 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541CE call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541D7 setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER - specialvar RESULT, GetLeadMonFriendshipScore - compare RESULT, 4 + specialvar VAR_RESULT, GetLeadMonFriendshipScore + compare VAR_RESULT, 4 goto_if_ge PacifidlogTown_House2_EventScript_1541EC - specialvar RESULT, GetLeadMonFriendshipScore - compare RESULT, 2 + specialvar VAR_RESULT, GetLeadMonFriendshipScore + compare VAR_RESULT, 2 goto_if_ge PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_1A14DC - specialvar RESULT, GetDaysUntilPacifidlogTMAvailable - compare RESULT, 0 + specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable + compare VAR_RESULT, 0 call_if_eq PacifidlogTown_House2_EventScript_1541E8 return @@ -42,7 +42,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 giveitem_std ITEM_TM27_RETURN - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay @@ -58,7 +58,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 giveitem_std ITEM_TM21_FRUSTRATION - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay @@ -67,8 +67,8 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 end PacifidlogTown_House2_EventScript_154254:: @ 8154254 - specialvar RESULT, GetDaysUntilPacifidlogTMAvailable - buffernumberstring 0, RESULT + specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable + buffernumberstring 0, VAR_RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end diff --git a/data/maps/PacifidlogTown_House3/map.json b/data/maps/PacifidlogTown_House3/map.json index 1585a2133..b42480887 100644 --- a/data/maps/PacifidlogTown_House3/map.json +++ b/data/maps/PacifidlogTown_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 3, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 4, "y": 2, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index 3b21ac996..055287bfb 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -5,29 +5,29 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_154338 - setvar VAR_SPECIAL_8, 2 - copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, GetInGameTradeSpeciesInfo - copyvar VAR_SPECIAL_9, RESULT + setvar VAR_0x8008, 2 + copyvar VAR_0x8004, VAR_0x8008 + specialvar VAR_RESULT, GetInGameTradeSpeciesInfo + copyvar VAR_0x8009, VAR_RESULT msgbox PacifidlogTown_House3_Text_17940E, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PacifidlogTown_House3_EventScript_154320 special SelectMonForNPCTrade waitstate - copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 - compare VAR_SPECIAL_4, 255 + copyvar VAR_0x800A, VAR_0x8004 + compare VAR_0x8004, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 - copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, GetTradeSpecies - copyvar VAR_SPECIAL_B, RESULT - compare RESULT, VAR_SPECIAL_9 + copyvar VAR_0x8005, VAR_0x800A + specialvar VAR_RESULT, GetTradeSpecies + copyvar VAR_0x800B, VAR_RESULT + compare VAR_RESULT, VAR_0x8009 goto_if_ne PacifidlogTown_House3_EventScript_15432A - copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + copyvar VAR_0x8004, VAR_0x8008 + copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate - bufferspeciesname 0, VAR_SPECIAL_9 + bufferspeciesname 0, VAR_0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release @@ -39,7 +39,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - bufferspeciesname 0, VAR_SPECIAL_9 + bufferspeciesname 0, VAR_0x8009 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/maps/PacifidlogTown_House4/map.json b/data/maps/PacifidlogTown_House4/map.json index 1d61f1cb8..20fdcc9f7 100644 --- a/data/maps/PacifidlogTown_House4/map.json +++ b/data/maps/PacifidlogTown_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 7, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc index 584366c88..84a477156 100644 --- a/data/maps/PacifidlogTown_House4/scripts.inc +++ b/data/maps/PacifidlogTown_House4/scripts.inc @@ -13,9 +13,9 @@ PacifidlogTown_House4_EventScript_15435E:: @ 815435E lock faceplayer msgbox PacifidlogTown_House4_Text_17963D, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PacifidlogTown_House4_EventScript_15437F - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PacifidlogTown_House4_EventScript_154389 end diff --git a/data/maps/PacifidlogTown_House5/map.json b/data/maps/PacifidlogTown_House5/map.json index ea88241c2..541cac276 100644 --- a/data/maps/PacifidlogTown_House5/map.json +++ b/data/maps/PacifidlogTown_House5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 3, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc index 46b1990df..8c24cddcb 100644 --- a/data/maps/PacifidlogTown_House5/scripts.inc +++ b/data/maps/PacifidlogTown_House5/scripts.inc @@ -4,8 +4,8 @@ PacifidlogTown_House5_MapScripts:: @ 8154393 PacifidlogTown_House5_EventScript_154394:: @ 8154394 lock faceplayer - specialvar RESULT, IsMirageIslandPresent - compare RESULT, 1 + specialvar VAR_RESULT, IsMirageIslandPresent + compare VAR_RESULT, 1 goto_if_eq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 release diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json index 807c25cc7..629093f52 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 10, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 2, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 4, "y": 5, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index ea7a8e056..e5756cd71 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 end @ 8154109 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json index 312f2debf..aaa4c37c9 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/map.json +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 700132ab2..f9e9029a1 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 16, "y": 18, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "FLAG_HIDE_WALLY_MOM_PETALBURG_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 15, "y": 10, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_WALLY_PETALBURG" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 8, "y": 22, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 20, "y": 10, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 15, "y": 11, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_WALLY_FATHER_PETALBURG" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 14, "y": 11, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_HIDE_WALLY_MOTHER_PETALBURG" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 2, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_ITEM_PETALBURG_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 28, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_ITEM_PETALBURG_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 15, "elevation": 3, @@ -288,4 +288,4 @@ "flag": "FLAG_HIDDEN_ITEM_5F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 77b12b556..fee198977 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -156,25 +156,25 @@ PetalburgCity_EventScript_14B82D:: @ 814B82D PetalburgCity_EventScript_14B836:: @ 814B836 lockall - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall - setvar VAR_SPECIAL_8, 3 + setvar VAR_0x8008, 3 goto PetalburgCity_EventScript_14B866 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq PetalburgCity_EventScript_14B91B - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq PetalburgCity_EventScript_14B930 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq PetalburgCity_EventScript_14B93B - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq PetalburgCity_EventScript_14B965 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq PetalburgCity_EventScript_14B977 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq PetalburgCity_EventScript_14B989 - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 diff --git a/data/maps/PetalburgCity_Gym/map.json b/data/maps/PetalburgCity_Gym/map.json index 92ee7ca46..f18ca8549 100644 --- a/data/maps/PetalburgCity_Gym/map.json +++ b/data/maps/PetalburgCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NORMAN", + "graphics_id": "OBJ_EVENT_GFX_NORMAN", "x": 4, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_NORMAN_PETALBURG_GYM" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 94, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 81, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 42, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 55, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 68, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 4, "y": 29, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 109, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_PETALBURG_GYM_GUIDE" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 4, "y": 111, "elevation": 3, @@ -525,4 +525,4 @@ "script": "PetalburgCity_Gym_EventScript_1551BA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index c7efb49ae..09d969ec8 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -13,7 +13,7 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8005, 1 call PetalburgCity_Gym_EventScript_154F9A call_if_trainer_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB call_if_trainer_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC @@ -25,7 +25,7 @@ PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8005, 1 call PetalburgCity_Gym_EventScript_154F9A call PetalburgCity_Gym_EventScript_154FBB call PetalburgCity_Gym_EventScript_154FDC @@ -106,7 +106,7 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 case 7, PetalburgCity_Gym_EventScript_15493D msgbox PetalburgCity_Gym_Text_179DF6, 4 closemessage - switch FACING + switch VAR_FACING case 1, PetalburgCity_Gym_EventScript_15463D case 2, PetalburgCity_Gym_EventScript_154648 case 3, PetalburgCity_Gym_EventScript_154653 @@ -114,87 +114,87 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 end PetalburgCity_Gym_EventScript_15463D:: @ 815463D - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E - setvar VAR_SPECIAL_8, 3 + setvar VAR_0x8008, 3 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse SE_DOOR - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_1547EE - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq PetalburgCity_Gym_EventScript_154800 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq PetalburgCity_Gym_EventScript_15481C - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_154884 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq PetalburgCity_Gym_EventScript_15488F - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq PetalburgCity_Gym_EventScript_1548A1 - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_1548C5 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq PetalburgCity_Gym_EventScript_1548D0 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq PetalburgCity_Gym_EventScript_1548DB - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_15492F - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq PetalburgCity_Gym_EventScript_154930 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq PetalburgCity_Gym_EventScript_15493B - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_15493C - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_1548F1 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq PetalburgCity_Gym_EventScript_1548FC - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq PetalburgCity_Gym_EventScript_1548F1 - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 playbgm MUS_TSURETEK, FALSE - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq PetalburgCity_Gym_EventScript_154835 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq PetalburgCity_Gym_EventScript_15484E - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq PetalburgCity_Gym_EventScript_154860 - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 @@ -344,7 +344,7 @@ PetalburgCity_Gym_EventScript_15493C:: @ 815493C PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69 @@ -353,28 +353,28 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D end PetalburgCity_Gym_EventScript_154969:: @ 8154969 - specialvar RESULT, IsEnigmaBerryValid - compare RESULT, 0 + specialvar VAR_RESULT, IsEnigmaBerryValid + compare VAR_RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkpcitem ITEM_ENIGMA_BERRY, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 compare VAR_ENIGMA_BERRY_AVAILABLE, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 - setvar RESULT, 1 + setvar VAR_RESULT, 1 return PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 - setvar RESULT, 0 + setvar VAR_RESULT, 0 return PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem_std ITEM_ENIGMA_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release @@ -393,7 +393,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE - setvar VAR_SPECIAL_8, 5 + setvar VAR_0x8008, 5 call PetalburgCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED @@ -403,28 +403,28 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem_std ITEM_TM42_FACADE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closemessage - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq PetalburgCity_Gym_EventScript_154ABC - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq PetalburgCity_Gym_EventScript_154AC7 - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq PetalburgCity_Gym_EventScript_154AD2 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq PetalburgCity_Gym_EventScript_154ADD delay 70 - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq PetalburgCity_Gym_EventScript_154AE8 - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq PetalburgCity_Gym_EventScript_154AF3 - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq PetalburgCity_Gym_EventScript_154AFE - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release @@ -584,12 +584,12 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if_lt PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 7 - setvar VAR_SPECIAL_9, 85 + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 85 msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -614,132 +614,132 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if_lt PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 1 - setvar VAR_SPECIAL_9, 98 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 98 msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 7 - setvar VAR_SPECIAL_9, 46 + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 1 - setvar VAR_SPECIAL_9, 59 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 7 - setvar VAR_SPECIAL_9, 59 + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 1 - setvar VAR_SPECIAL_9, 72 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall goto_if_trainer_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 1 - setvar VAR_SPECIAL_9, 20 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 7 - setvar VAR_SPECIAL_9, 20 + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 1 - setvar VAR_SPECIAL_9, 33 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall goto_if_trainer_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 7 - setvar VAR_SPECIAL_9, 33 + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall goto_if_trainer_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 1 - setvar VAR_SPECIAL_9, 7 + setvar VAR_0x8008, 1 + setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall goto_if_trainer_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9 - setvar VAR_SPECIAL_8, 7 - setvar VAR_SPECIAL_9, 7 + setvar VAR_0x8008, 7 + setvar VAR_0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -750,7 +750,7 @@ PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 end PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 call PetalburgCity_Gym_EventScript_154FBB special DrawWholeMapView release @@ -767,7 +767,7 @@ PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 end PetalburgCity_Gym_EventScript_154E56:: @ 8154E56 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 call PetalburgCity_Gym_EventScript_154FFD special DrawWholeMapView release @@ -784,7 +784,7 @@ PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E end PetalburgCity_Gym_EventScript_154E92:: @ 8154E92 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 call PetalburgCity_Gym_EventScript_15503F special DrawWholeMapView release @@ -801,7 +801,7 @@ PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA end PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 call PetalburgCity_Gym_EventScript_155081 special DrawWholeMapView release @@ -818,7 +818,7 @@ PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 end PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 call PetalburgCity_Gym_EventScript_154FDC special DrawWholeMapView release @@ -835,7 +835,7 @@ PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 end PetalburgCity_Gym_EventScript_154F46:: @ 8154F46 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 call PetalburgCity_Gym_EventScript_15501E special DrawWholeMapView release @@ -852,7 +852,7 @@ PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E end PetalburgCity_Gym_EventScript_154F82:: @ 8154F82 - setvar VAR_SPECIAL_5, 0 + setvar VAR_0x8005, 0 call PetalburgCity_Gym_EventScript_155060 special DrawWholeMapView release @@ -863,73 +863,73 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 end PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A - setvar VAR_SPECIAL_4, 1 - compare VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 1 + compare VAR_0x8005, 0 call_if_eq PetalburgCity_Gym_EventScript_155182 - compare VAR_SPECIAL_5, 1 + compare VAR_0x8005, 1 call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB - setvar VAR_SPECIAL_4, 2 - compare VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 2 + compare VAR_0x8005, 0 call_if_eq PetalburgCity_Gym_EventScript_155182 - compare VAR_SPECIAL_5, 1 + compare VAR_0x8005, 1 call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC - setvar VAR_SPECIAL_4, 3 - compare VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 3 + compare VAR_0x8005, 0 call_if_eq PetalburgCity_Gym_EventScript_155182 - compare VAR_SPECIAL_5, 1 + compare VAR_0x8005, 1 call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD - setvar VAR_SPECIAL_4, 4 - compare VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 4 + compare VAR_0x8005, 0 call_if_eq PetalburgCity_Gym_EventScript_155182 - compare VAR_SPECIAL_5, 1 + compare VAR_0x8005, 1 call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E - setvar VAR_SPECIAL_4, 5 - compare VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 5 + compare VAR_0x8005, 0 call_if_eq PetalburgCity_Gym_EventScript_155182 - compare VAR_SPECIAL_5, 1 + compare VAR_0x8005, 1 call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F - setvar VAR_SPECIAL_4, 6 - compare VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 6 + compare VAR_0x8005, 0 call_if_eq PetalburgCity_Gym_EventScript_155182 - compare VAR_SPECIAL_5, 1 + compare VAR_0x8005, 1 call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 - setvar VAR_SPECIAL_4, 7 - compare VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 7 + compare VAR_0x8005, 0 call_if_eq PetalburgCity_Gym_EventScript_155182 - compare VAR_SPECIAL_5, 1 + compare VAR_0x8005, 1 call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 - setvar VAR_SPECIAL_4, 8 - compare VAR_SPECIAL_5, 0 + setvar VAR_0x8004, 8 + compare VAR_0x8005, 0 call_if_eq PetalburgCity_Gym_EventScript_155182 - compare VAR_SPECIAL_5, 1 + compare VAR_0x8005, 1 call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/maps/PetalburgCity_House1/map.json b/data/maps/PetalburgCity_House1/map.json index 975013262..306e3b6aa 100644 --- a/data/maps/PetalburgCity_House1/map.json +++ b/data/maps/PetalburgCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 7, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_House2/map.json b/data/maps/PetalburgCity_House2/map.json index 54c64bd0f..795a86244 100644 --- a/data/maps/PetalburgCity_House2/map.json +++ b/data/maps/PetalburgCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 7, "y": 5, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_Mart/map.json b/data/maps/PetalburgCity_Mart/map.json index 1c687123a..1cc632844 100644 --- a/data/maps/PetalburgCity_Mart/map.json +++ b/data/maps/PetalburgCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 9, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 6, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/map.json b/data/maps/PetalburgCity_PokemonCenter_1F/map.json index bc88e34fd..ac27f67a3 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 11, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 9, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 4, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 6753865e0..eff4c8650 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A end PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress @@ -27,8 +27,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 lock faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 - specialvar RESULT, IsStarterInParty - compare RESULT, 1 + specialvar VAR_RESULT, IsStarterInParty + compare VAR_RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release end diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/map.json b/data/maps/PetalburgCity_PokemonCenter_2F/map.json index 92c27f737..9f32c5995 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/map.json +++ b/data/maps/PetalburgCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgCity_WallysHouse/map.json b/data/maps/PetalburgCity_WallysHouse/map.json index 924f08084..2eb5e8ce3 100644 --- a/data/maps/PetalburgCity_WallysHouse/map.json +++ b/data/maps/PetalburgCity_WallysHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 7, "y": 5, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgWoods/map.json b/data/maps/PetalburgWoods/map.json index d93e6e2f7..619808a48 100644 --- a/data/maps/PetalburgWoods/map.json +++ b/data/maps/PetalburgWoods/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 19, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 19, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 26, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 26, "y": 20, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_DEVON_PETALBURG_WOODS" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 45, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 35, "y": 20, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 8, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_3" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 15, "y": 19, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 7, "y": 32, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 4, "y": 14, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 30, "y": 34, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 26, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_ITEM_PETALBURG_WOODS_4" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 33, "y": 5, "elevation": 3, @@ -295,4 +295,4 @@ "script": "PetalburgWoods_EventScript_15CF1E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 8d1651d3a..57e4d1478 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -91,7 +91,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 giveitem_std ITEM_GREAT_BALL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D end @@ -244,7 +244,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem_std ITEM_MIRACLE_SEED - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag FLAG_RECEIVED_MIRACLE_SEED release @@ -270,8 +270,8 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, TRAINER_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 end diff --git a/data/maps/RecordCorner/map.json b/data/maps/RecordCorner/map.json index 9170a1bbe..513fe058c 100644 --- a/data/maps/RecordCorner/map.json +++ b/data/maps/RecordCorner/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 10, "y": 5, "elevation": 3, @@ -94,4 +94,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json index cd5cf9c6c..58f046257 100644 --- a/data/maps/Route101/map.json +++ b/data/maps/Route101/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 16, "y": 8, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 9, "y": 13, "elevation": 0, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_BIRCH_BATTLE_POOCHYENA" }, { - "graphics_id": "EVENT_OBJ_GFX_BIRCHS_BAG", + "graphics_id": "OBJ_EVENT_GFX_BIRCHS_BAG", "x": 7, "y": 14, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_HIDE_BIRCH_STARTERS_BAG" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 10, "y": 13, "elevation": 0, @@ -75,7 +75,7 @@ "flag": "FLAG_HIDE_POOCHYENA_ROUTE101" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 5, "y": 11, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_HIDE_BIRCH_ROUTE101" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 2, "y": 13, "elevation": 3, @@ -195,4 +195,4 @@ "script": "Route101_EventScript_14EA76" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route102/map.json b/data/maps/Route102/map.json index 8a270897c..a08922258 100644 --- a/data/maps/Route102/map.json +++ b/data/maps/Route102/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 18, "y": 11, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 14, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 25, "y": 15, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 7, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 37, "y": 4, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 15, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_ITEM_ROUTE102_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 2, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 2, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 19, "y": 4, "elevation": 3, @@ -160,4 +160,4 @@ "script": "Route102_EventScript_14EAE3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index 758d05d45..bdc1803c2 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -19,8 +19,8 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, TRAINER_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 end diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json index 6b2419465..02f9b30c3 100644 --- a/data/maps/Route103/map.json +++ b/data/maps/Route103/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 49, "y": 12, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 10, "y": 2, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE103" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 71, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 65, "y": 11, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 64, "y": 11, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 50, "y": 8, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 58, "y": 5, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 59, "y": 5, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 60, "y": 5, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 20, "y": 10, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PROF_BIRCH", + "graphics_id": "OBJ_EVENT_GFX_PROF_BIRCH", "x": 7, "y": 3, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_HIDE_BIRCH_ROUTE103" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 56, "y": 12, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 63, "y": 8, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "FLAG_ITEM_ROUTE103_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 67, "y": 7, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 69, "y": 7, "elevation": 3, @@ -230,4 +230,4 @@ "script": "Route103_EventScript_14ED8B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 625fc5271..ec9ae2420 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -10,9 +10,9 @@ Route103_MapScript1_14EB87:: @ 814EB87 Route103_EventScript_14EB92:: @ 814EB92 lockall checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route103_EventScript_14EBAB - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route103_EventScript_14EC04 end @@ -90,7 +90,7 @@ Route103_EventScript_14ECCB:: @ 814ECCB Route103_EventScript_14ECD9:: @ 814ECD9 closemessage - switch FACING + switch VAR_FACING case 1, Route103_EventScript_14ED29 case 2, Route103_EventScript_14ED0C case 3, Route103_EventScript_14ED29 @@ -173,8 +173,8 @@ Route103_EventScript_14ED94:: @ 814ED94 Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 end @@ -186,8 +186,8 @@ Route103_EventScript_14EDD6:: @ 814EDD6 Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 end @@ -204,8 +204,8 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, TRAINER_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 end diff --git a/data/maps/Route104/map.json b/data/maps/Route104/map.json index 3be9b9c9d..402186fe0 100644 --- a/data/maps/Route104/map.json +++ b/data/maps/Route104/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 15, "y": 60, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 25, "y": 49, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 31, "y": 24, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 27, "y": 63, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 30, "y": 50, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 28, "y": 74, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 12, "y": 54, "elevation": 1, @@ -119,7 +119,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 51, "elevation": 4, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_ROUTE104" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 29, "y": 8, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 6, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 6, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 41, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 41, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 41, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 37, "y": 8, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 22, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 23, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 24, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 3, "y": 25, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 39, "y": 15, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_ITEM_ROUTE104_1" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 8, "y": 19, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 27, "y": 15, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 28, "y": 15, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 11, "y": 44, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 22, "y": 25, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_ITEM_ROUTE104_2" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 18, "y": 67, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 22, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "FLAG_ITEM_ROUTE104_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 22, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 8, "elevation": 3, @@ -431,7 +431,7 @@ "flag": "FLAG_ITEM_ROUTE104_4" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 26, "elevation": 3, @@ -585,4 +585,4 @@ "flag": "FLAG_HIDDEN_ITEM_58" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 9b055f134..9e475791f 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -32,7 +32,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem_std ITEM_CHESTO_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 msgbox Route104_Text_1C5665, 4 @@ -50,7 +50,7 @@ Route104_EventScript_14EF09:: @ 814EF09 goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem_std ITEM_WHITE_HERB - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_WHITE_HERB release @@ -103,7 +103,7 @@ Route104_EventScript_14EF93:: @ 814EF93 goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem_std ITEM_TM09_BULLET_SEED - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_TM09 release @@ -148,7 +148,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 @@ -402,8 +402,8 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, TRAINER_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -415,8 +415,8 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, TRAINER_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -428,8 +428,8 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, TRAINER_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end diff --git a/data/maps/Route104_MrBrineysHouse/map.json b/data/maps/Route104_MrBrineysHouse/map.json index 55e841a63..c63adc21d 100644 --- a/data/maps/Route104_MrBrineysHouse/map.json +++ b/data/maps/Route104_MrBrineysHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 514b1b9cc..708cc249c 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -33,7 +33,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -42,7 +42,7 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 message Route104_MrBrineysHouse_Text_191E80 waitmessage multichoicedefault 21, 8, 14, 1, 0 - switch RESULT + switch VAR_RESULT case 0, Route104_MrBrineysHouse_EventScript_15BDAB case 1, Route104_MrBrineysHouse_EventScript_15BDA1 case 127, Route104_MrBrineysHouse_EventScript_15BDA1 @@ -50,14 +50,14 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.json b/data/maps/Route104_PrettyPetalFlowerShop/map.json index 6dbcdeb34..43be93d0c 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrettyPetalFlowerShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 0, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 11, "y": 6, "elevation": 4, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 5e70a8ec2..fa9d98c16 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -21,18 +21,18 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -88,9 +88,9 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA goto_if_set FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP, Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 - addvar RESULT, ITEM_CHERI_BERRY - giveitem_std RESULT - compare RESULT, 0 + addvar VAR_RESULT, ITEM_CHERI_BERRY + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 diff --git a/data/maps/Route104_Prototype/map.json b/data/maps/Route104_Prototype/map.json index ba74f5320..5d3ecfb4a 100644 --- a/data/maps/Route104_Prototype/map.json +++ b/data/maps/Route104_Prototype/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 27, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 13, "y": 9, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 13, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 25, "y": 21, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 16, "y": 30, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 34, "y": 2, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 15, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 14, "y": 4, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 27, "y": 29, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 26, "y": 29, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 17, "y": 37, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 11, "y": 28, "elevation": 3, @@ -196,4 +196,4 @@ "script": "Route104_Prototype_EventScript_160D25" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json index 3b43b7439..98e93f16a 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 2, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json index 9b23945b3..9a4119af2 100644 --- a/data/maps/Route105/map.json +++ b/data/maps/Route105/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 60, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 10, "y": 44, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 26, "y": 36, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 19, "y": 9, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 73, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_ITEM_ROUTE105_1" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 12, "y": 51, "elevation": 3, @@ -121,4 +121,4 @@ "flag": "FLAG_HIDDEN_ITEM_59" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route106/map.json b/data/maps/Route106/map.json index 72ecc9cd7..db91a4888 100644 --- a/data/maps/Route106/map.json +++ b/data/maps/Route106/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 29, "y": 11, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 5, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 51, "y": 14, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 65, "y": 14, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 14, "elevation": 3, @@ -132,4 +132,4 @@ "script": "Route106_EventScript_14F32F" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index 16132e530..1fe49235b 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -17,8 +17,8 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, TRAINER_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 end diff --git a/data/maps/Route107/map.json b/data/maps/Route107/map.json index 9d92a48c6..38aeaa80a 100644 --- a/data/maps/Route107/map.json +++ b/data/maps/Route107/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 27, "y": 10, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 38, "y": 11, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 50, "y": 6, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 16, "y": 11, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 33, "y": 4, "elevation": 1, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 32, "y": 4, "elevation": 1, @@ -104,4 +104,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 3f8d2dc0f..5ad30f9f4 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -8,8 +8,8 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, TRAINER_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 end diff --git a/data/maps/Route108/map.json b/data/maps/Route108/map.json index 505462bb1..c4589064e 100644 --- a/data/maps/Route108/map.json +++ b/data/maps/Route108/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 17, "y": 13, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 8, "y": 6, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 50, "y": 10, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 36, "y": 12, "elevation": 1, @@ -95,4 +95,4 @@ "flag": "FLAG_HIDDEN_ITEM_56" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route109/map.json b/data/maps/Route109/map.json index f6ba28567..520b0590a 100644 --- a/data/maps/Route109/map.json +++ b/data/maps/Route109/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MR_BRINEYS_BOAT", + "graphics_id": "OBJ_EVENT_GFX_MR_BRINEYS_BOAT", "x": 21, "y": 26, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 21, "y": 24, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "FLAG_HIDE_MR_BRINEY_ROUTE109" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 12, "y": 36, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 25, "y": 42, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 19, "y": 19, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 14, "y": 11, "elevation": 4, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 21, "y": 11, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 28, "y": 8, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 11, "y": 6, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 27, "y": 48, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_ROUTE109_1" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 29, "y": 32, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 28, "y": 31, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 15, "y": 52, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 24, "y": 17, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_F", + "graphics_id": "OBJ_EVENT_GFX_TUBER_F", "x": 25, "y": 17, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 30, "y": 32, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 8, "y": 41, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 9, "y": 41, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 33, "y": 6, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 32, "y": 6, "elevation": 3, @@ -359,4 +359,4 @@ "flag": "FLAG_HIDDEN_ITEM_5B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 899952d1a..eeb21cacf 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -8,7 +8,7 @@ Route109_EventScript_14F4D3:: @ 814F4D3 applymovement 2, Route109_Movement_14F67B waitmovement 0 removeobject 2 - switch FACING + switch VAR_FACING case 1, Route109_EventScript_14F518 case 3, Route109_EventScript_14F538 case 4, Route109_EventScript_14F528 @@ -54,7 +54,7 @@ Route109_EventScript_14F548:: @ 814F548 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage - copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 + copyvar VAR_BRINEY_LOCATION, VAR_0x8008 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 @@ -278,7 +278,7 @@ Route109_EventScript_14F680:: @ 814F680 Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 msgbox Route109_Text_16E0F9, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end @@ -287,7 +287,7 @@ Route109_EventScript_14F6AF:: @ 814F6AF message Route109_Text_16E26A waitmessage multichoicedefault 21, 8, 14, 1, 0 - switch RESULT + switch VAR_RESULT case 0, Route109_EventScript_14F6E2 case 1, Route109_EventScript_14F6FB case 127, Route109_EventScript_14F6FB @@ -318,7 +318,7 @@ Route109_EventScript_14F70E:: @ 814F70E faceplayer msgbox Route109_Text_16E405, 4 closemessage - applymovement LAST_TALKED, Route109_Movement_1A083D + applymovement VAR_LAST_TALKED, Route109_Movement_1A083D waitmovement 0 release end @@ -330,10 +330,10 @@ Route109_EventScript_14F725:: @ 814F725 goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem_std ITEM_SOFT_SAND - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route109_EventScript_1A029B closemessage - applymovement LAST_TALKED, Route109_Movement_1A083D + applymovement VAR_LAST_TALKED, Route109_Movement_1A083D waitmovement 0 setflag FLAG_RECEIVED_SOFT_SAND release @@ -341,7 +341,7 @@ Route109_EventScript_14F725:: @ 814F725 Route109_EventScript_14F762:: @ 814F762 msgbox Route109_Text_16E446, 4 - applymovement LAST_TALKED, Route109_Movement_1A083D + applymovement VAR_LAST_TALKED, Route109_Movement_1A083D waitmovement 0 release end @@ -394,8 +394,8 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, TRAINER_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 end @@ -407,8 +407,8 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, TRAINER_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 end diff --git a/data/maps/Route109_SeashoreHouse/map.json b/data/maps/Route109_SeashoreHouse/map.json index f13c989a7..f5ab2fc3b 100644 --- a/data/maps/Route109_SeashoreHouse/map.json +++ b/data/maps/Route109_SeashoreHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M", "x": 14, "y": 9, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 10, "y": 5, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 1506e18f9..b4a731471 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -25,7 +25,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 giveitem_std ITEM_SODA_POP, 6 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag FLAG_RECEIVED_6_SODA_POP release @@ -40,7 +40,7 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoneybox 0, 0 nop msgbox Route109_SeashoreHouse_Text_19B702, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoneybox 0, 0 @@ -49,10 +49,10 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A checkmoney 0x12c, 0 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E9E checkitemspace ITEM_SODA_POP, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 takemoney 0x12c, 0 diff --git a/data/maps/Route110/map.json b/data/maps/Route110/map.json index 39771ce64..900b7b0e9 100644 --- a/data/maps/Route110/map.json +++ b/data/maps/Route110/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 17, "y": 90, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 29, "y": 79, "elevation": 4, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 14, "y": 69, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 9, "y": 57, "elevation": 4, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 10, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 27, "y": 24, "elevation": 4, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 15, "y": 7, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 16, "y": 73, "elevation": 4, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 19, "y": 31, "elevation": 4, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_F", "x": 30, "y": 31, "elevation": 4, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 16, "y": 55, "elevation": 4, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 5, "y": 39, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 33, "y": 15, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 23, "y": 40, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 10, "y": 19, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 11, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 11, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 11, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 69, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_ITEM_ROUTE110_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 47, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "FLAG_ITEM_ROUTE110_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 27, "y": 92, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 7, "y": 83, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 83, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 9, "y": 83, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 10, "y": 83, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 82, "elevation": 0, @@ -366,7 +366,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 21, "y": 78, "elevation": 4, @@ -379,7 +379,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 34, "y": 54, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 34, "y": 54, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 33, "y": 69, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 73, "elevation": 3, @@ -658,4 +658,4 @@ "script": "Route110_EventScript_14F9E6" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 93333ce56..077770cd2 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -33,7 +33,7 @@ Route110_EventScript_14F946:: @ 814F946 lock faceplayer msgbox Route110_Text_16E6C0, 4 - applymovement LAST_TALKED, Route110_Movement_1A083D + applymovement VAR_LAST_TALKED, Route110_Movement_1A083D waitmovement 0 release end @@ -42,7 +42,7 @@ Route110_EventScript_14F95C:: @ 814F95C lock faceplayer msgbox Route110_Text_16E6F2, 4 - applymovement LAST_TALKED, Route110_Movement_1A083D + applymovement VAR_LAST_TALKED, Route110_Movement_1A083D waitmovement 0 release end @@ -51,7 +51,7 @@ Route110_EventScript_14F972:: @ 814F972 lock faceplayer msgbox Route110_Text_16E729, 4 - applymovement LAST_TALKED, Route110_Movement_1A083D + applymovement VAR_LAST_TALKED, Route110_Movement_1A083D waitmovement 0 release end @@ -60,7 +60,7 @@ Route110_EventScript_14F988:: @ 814F988 lock faceplayer msgbox Route110_Text_16E76A, 4 - applymovement LAST_TALKED, Route110_Movement_1A083D + applymovement VAR_LAST_TALKED, Route110_Movement_1A083D waitmovement 0 release end @@ -131,8 +131,8 @@ Route110_EventScript_14FA25:: @ 814FA25 Route110_EventScript_14FA2E:: @ 814FA2E lockall - specialvar RESULT, GetRecordedCyclingRoadResults - compare RESULT, 0 + specialvar VAR_RESULT, GetRecordedCyclingRoadResults + compare VAR_RESULT, 0 goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 releaseall @@ -146,8 +146,8 @@ Route110_EventScript_14FA49:: @ 814FA49 Route110_EventScript_14FA53:: @ 814FA53 lock faceplayer - specialvar RESULT, GetPlayerAvatarBike - compare RESULT, 1 + specialvar VAR_RESULT, GetPlayerAvatarBike + compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FA84 compare VAR_CYCLING_CHALLENGE_STATE, 0 goto_if_eq Route110_EventScript_14FA7A @@ -177,8 +177,8 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, TRAINER_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 end @@ -205,8 +205,8 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 end @@ -223,8 +223,8 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 end @@ -236,8 +236,8 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, TRAINER_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 end @@ -263,7 +263,7 @@ Route110_EventScript_14FC27:: @ 814FC27 Route110_EventScript_14FC39:: @ 814FC39 special FinishCyclingRoadChallenge msgbox Route110_Text_16EF65, 4 - switch RESULT + switch VAR_RESULT case 10, Route110_EventScript_14FCC3 case 9, Route110_EventScript_14FCD1 case 8, Route110_EventScript_14FCD1 @@ -309,26 +309,26 @@ Route110_EventScript_14FD09:: @ 814FD09 return Route110_EventScript_14FD13:: @ 814FD13 - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 - setvar VAR_SPECIAL_8, 3 + setvar VAR_0x8008, 3 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD34:: @ 814FD34 lockall checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_EventScript_14FDA7 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq Route110_EventScript_14FDAC applymovement 28, Route110_Movement_1A0845 waitmovement 0 @@ -337,16 +337,16 @@ Route110_EventScript_14FD34:: @ 814FD34 applymovement 28, Route110_Movement_1A0835 waitmovement 0 delay 30 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq Route110_EventScript_14FF14 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq Route110_EventScript_14FF1F - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq Route110_EventScript_14FF2A checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route110_EventScript_14FE2B releaseall end @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq Route110_EventScript_14FF56 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq Route110_EventScript_14FF5E - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq Route110_EventScript_14FF35 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq Route110_EventScript_14FF40 - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq Route110_EventScript_14FF4B removeobject 29 setvar VAR_ROUTE110_STATE, 1 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json index 9cbe4c81e..f5aa399d1 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 7, "y": 2, "elevation": 3, @@ -76,4 +76,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc index 8d6465c89..35809885d 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc @@ -23,10 +23,10 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 @ Coord event directly in front of the gatesman heading left to right lockall - specialvar RESULT, GetPlayerAvatarBike @ player state? - compare RESULT, 2 + specialvar VAR_RESULT, GetPlayerAvatarBike @ player state? + compare VAR_RESULT, 2 call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json index ab14ffdb0..1c101fb14 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 7, "y": 2, "elevation": 3, @@ -76,4 +76,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc index edae49291..67ef10af6 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc @@ -10,8 +10,8 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall - specialvar RESULT, GetPlayerAvatarBike - compare RESULT, 0 + specialvar VAR_RESULT, GetPlayerAvatarBike + compare VAR_RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 1 diff --git a/data/maps/Route110_TrickHouseCorridor/map.json b/data/maps/Route110_TrickHouseCorridor/map.json index 027edb4dc..116e0994d 100644 --- a/data/maps/Route110_TrickHouseCorridor/map.json +++ b/data/maps/Route110_TrickHouseCorridor/map.json @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json index 588dd24c6..fb2b69f8d 100644 --- a/data/maps/Route110_TrickHouseEnd/map.json +++ b/data/maps/Route110_TrickHouseEnd/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -62,4 +62,4 @@ "flag": "FLAG_HIDDEN_ITEM_1" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc index 4817f3f2e..f294ea2b2 100644 --- a/data/maps/Route110_TrickHouseEnd/scripts.inc +++ b/data/maps/Route110_TrickHouseEnd/scripts.inc @@ -61,7 +61,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage @@ -74,7 +74,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage @@ -87,7 +87,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage @@ -100,7 +100,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage @@ -113,7 +113,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12_TAUNT - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage @@ -126,7 +126,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage @@ -139,7 +139,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage @@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closemessage - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq Route110_TrickHouseEnd_EventScript_161C74 - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq Route110_TrickHouseEnd_EventScript_161C7F - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq Route110_TrickHouseEnd_EventScript_161C8A - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq Route110_TrickHouseEnd_EventScript_161C95 delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF .else givedecoration_std DECOR_RED_TENT .endc - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json index 115382d52..91fe0ca4d 100644 --- a/data/maps/Route110_TrickHouseEntrance/map.json +++ b/data/maps/Route110_TrickHouseEntrance/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 6, "y": 2, "elevation": 3, @@ -96,4 +96,4 @@ "script": "Route110_TrickHouseEntrance_EventScript_16158A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc index 19d5a606d..ae36aa84a 100644 --- a/data/maps/Route110_TrickHouseEntrance/scripts.inc +++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc @@ -362,9 +362,9 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE giveitem_std ITEM_RARE_CANDY - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -372,9 +372,9 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA giveitem_std ITEM_TIMER_BALL - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -382,9 +382,9 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 giveitem_std ITEM_HARD_STONE - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -392,9 +392,9 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 giveitem_std ITEM_SMOKE_BALL - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -402,9 +402,9 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E giveitem_std ITEM_TM12_TAUNT - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -412,9 +412,9 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA giveitem_std ITEM_MAGNET - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -422,9 +422,9 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 giveitem_std ITEM_PP_MAX - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -447,9 +447,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 .else givedecoration_std DECOR_RED_TENT .endif - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall @@ -488,7 +488,7 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO closemessage - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end @@ -729,23 +729,23 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 end Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 - setvar VAR_SPECIAL_4, 6 - setvar VAR_SPECIAL_5, 3 - setvar VAR_SPECIAL_6, 0 + setvar VAR_0x8004, 6 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6 - setvar VAR_SPECIAL_4, 11 - setvar VAR_SPECIAL_5, 5 - setvar VAR_SPECIAL_6, 0 + setvar VAR_0x8004, 11 + setvar VAR_0x8005, 5 + setvar VAR_0x8006, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B - setvar VAR_SPECIAL_4, 9 - setvar VAR_SPECIAL_5, 2 - setvar VAR_SPECIAL_6, 0 + setvar VAR_0x8004, 9 + setvar VAR_0x8005, 2 + setvar VAR_0x8006, 0 call Route110_TrickHouseEntrance_EventScript_161920 return diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json index 328d1130c..7e751f290 100644 --- a/data/maps/Route110_TrickHousePuzzle1/map.json +++ b/data/maps/Route110_TrickHousePuzzle1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 13, "y": 21, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 13, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 3, "y": 18, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 7, "y": 21, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 12, "y": 18, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 10, "y": 16, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 12, "y": 12, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 3, "y": 12, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 0, "y": 14, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 6, "y": 10, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 10, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 9, "y": 8, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 2, "y": 4, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 0, "y": 6, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 6, "y": 4, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 11, "y": 4, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 12, "elevation": 3, @@ -246,7 +246,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 14, "y": 14, "elevation": 3, @@ -293,4 +293,4 @@ "script": "Route110_TrickHousePuzzle1_EventScript_161D14" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json index a06a5713a..f7cbe12c5 100644 --- a/data/maps/Route110_TrickHousePuzzle2/map.json +++ b/data/maps/Route110_TrickHousePuzzle2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 13, "y": 16, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 0, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 9, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 5, "y": 19, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 2, "elevation": 3, @@ -148,4 +148,4 @@ "script": "Route110_TrickHousePuzzle2_EventScript_161DC3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json index e938dbea0..09e65aab2 100644 --- a/data/maps/Route110_TrickHousePuzzle3/map.json +++ b/data/maps/Route110_TrickHousePuzzle3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 16, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 1, "y": 13, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 11, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 4, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 1, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 13, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 1, "y": 20, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 2, "y": 21, "elevation": 3, @@ -253,4 +253,4 @@ "script": "Route110_TrickHousePuzzle3_EventScript_1626EB" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json index 383bd64da..43e1e81f6 100644 --- a/data/maps/Route110_TrickHousePuzzle4/map.json +++ b/data/maps/Route110_TrickHousePuzzle4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 12, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 7, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 4, "elevation": 0, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 13, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 2, "y": 12, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 8, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 7, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 13, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 14, "y": 2, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 14, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 14, "y": 9, "elevation": 3, @@ -241,4 +241,4 @@ "script": "Route110_TrickHousePuzzle4_EventScript_16274E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json index feb75a963..9ce88d3b6 100644 --- a/data/maps/Route110_TrickHousePuzzle5/map.json +++ b/data/maps/Route110_TrickHousePuzzle5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 9, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 12, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 12, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 1, "y": 6, "elevation": 3, @@ -238,4 +238,4 @@ "script": "Route110_TrickHousePuzzle5_EventScript_1627D5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc index a7f283b2d..51fdc9afb 100644 --- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc @@ -173,7 +173,7 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162B83 case 1, Route110_TrickHousePuzzle5_EventScript_162BA6 case 2, Route110_TrickHousePuzzle5_EventScript_162BC9 @@ -195,7 +195,7 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162BEC case 1, Route110_TrickHousePuzzle5_EventScript_162C0F case 2, Route110_TrickHousePuzzle5_EventScript_162C32 @@ -217,7 +217,7 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162C55 case 1, Route110_TrickHousePuzzle5_EventScript_162C78 case 2, Route110_TrickHousePuzzle5_EventScript_162C9B @@ -239,7 +239,7 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162CBE case 1, Route110_TrickHousePuzzle5_EventScript_162CE1 case 2, Route110_TrickHousePuzzle5_EventScript_162D04 @@ -261,7 +261,7 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162D27 case 1, Route110_TrickHousePuzzle5_EventScript_162D4A case 2, Route110_TrickHousePuzzle5_EventScript_162D6D @@ -270,7 +270,7 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83 msgbox Route110_TrickHousePuzzle5_Text_19D4AE, 4 multichoice 0, 0, 25, 1 - switch RESULT + switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -278,7 +278,7 @@ Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83 Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6 msgbox Route110_TrickHousePuzzle5_Text_19D501, 4 multichoice 0, 0, 26, 1 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -286,7 +286,7 @@ Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6 Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9 msgbox Route110_TrickHousePuzzle5_Text_19D553, 4 multichoice 0, 0, 27, 1 - switch RESULT + switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -294,7 +294,7 @@ Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9 Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC msgbox Route110_TrickHousePuzzle5_Text_19D68E, 4 multichoice 0, 0, 28, 1 - switch RESULT + switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -302,7 +302,7 @@ Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F msgbox Route110_TrickHousePuzzle5_Text_19D6EC, 4 multichoice 0, 0, 29, 1 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -310,7 +310,7 @@ Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32 msgbox Route110_TrickHousePuzzle5_Text_19D745, 4 multichoice 0, 0, 30, 1 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -318,7 +318,7 @@ Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32 Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55 msgbox Route110_TrickHousePuzzle5_Text_19D81B, 4 multichoice 0, 0, 31, 1 - switch RESULT + switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -326,7 +326,7 @@ Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55 Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78 msgbox Route110_TrickHousePuzzle5_Text_19D865, 4 multichoice 0, 0, 32, 1 - switch RESULT + switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -334,7 +334,7 @@ Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78 Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B msgbox Route110_TrickHousePuzzle5_Text_19D8BA, 4 multichoice 0, 0, 33, 1 - switch RESULT + switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -342,7 +342,7 @@ Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE msgbox Route110_TrickHousePuzzle5_Text_19D987, 4 multichoice 0, 0, 34, 1 - switch RESULT + switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -350,7 +350,7 @@ Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1 msgbox Route110_TrickHousePuzzle5_Text_19D9DC, 4 multichoice 0, 0, 35, 1 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -358,7 +358,7 @@ Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1 Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04 msgbox Route110_TrickHousePuzzle5_Text_19DA1D, 4 multichoice 0, 0, 36, 1 - switch RESULT + switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -366,7 +366,7 @@ Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04 Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27 msgbox Route110_TrickHousePuzzle5_Text_19DAEF, 4 multichoice 0, 0, 37, 1 - switch RESULT + switch VAR_RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -374,7 +374,7 @@ Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27 Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A msgbox Route110_TrickHousePuzzle5_Text_19DB43, 4 multichoice 0, 0, 38, 1 - switch RESULT + switch VAR_RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end @@ -382,7 +382,7 @@ Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D msgbox Route110_TrickHousePuzzle5_Text_19DB97, 4 multichoice 0, 0, 39, 1 - switch RESULT + switch VAR_RESULT case 2, Route110_TrickHousePuzzle5_EventScript_162DDF goto Route110_TrickHousePuzzle5_EventScript_162D90 end diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json index 289c15127..a6394d018 100644 --- a/data/maps/Route110_TrickHousePuzzle6/map.json +++ b/data/maps/Route110_TrickHousePuzzle6/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 14, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 0, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 2, "elevation": 3, @@ -98,4 +98,4 @@ "script": "Route110_TrickHousePuzzle6_EventScript_1630EA" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json index c599fd181..373b30748 100644 --- a/data/maps/Route110_TrickHousePuzzle7/map.json +++ b/data/maps/Route110_TrickHousePuzzle7/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 0, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 14, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 9, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 10, "elevation": 3, @@ -148,4 +148,4 @@ "script": "Route110_TrickHousePuzzle7_EventScript_163375" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json index 58fd42a74..936925f86 100644 --- a/data/maps/Route110_TrickHousePuzzle8/map.json +++ b/data/maps/Route110_TrickHousePuzzle8/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 12, "y": 21, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 12, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 2, "y": 11, "elevation": 3, @@ -98,4 +98,4 @@ "script": "Route110_TrickHousePuzzle8_EventScript_16341C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route111/map.json b/data/maps/Route111/map.json index a759b157c..5a5c23e2e 100644 --- a/data/maps/Route111/map.json +++ b/data/maps/Route111/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 13, "y": 114, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_VICTOR_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 13, "y": 113, "elevation": 0, @@ -54,7 +54,7 @@ "flag": "FLAG_HIDE_VICTORIA_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 13, "y": 113, "elevation": 0, @@ -67,7 +67,7 @@ "flag": "FLAG_HIDE_VIVI_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 13, "y": 113, "elevation": 0, @@ -80,7 +80,7 @@ "flag": "FLAG_HIDE_VICKI_WINSTRATE" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 28, "y": 51, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 22, "y": 5, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 23, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 8, "y": 91, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 24, "y": 60, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 27, "y": 69, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 21, "y": 47, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 32, "y": 72, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 18, "y": 101, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 19, "y": 100, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 23, "y": 8, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 105, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "FLAG_ITEM_ROUTE111_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 5, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 5, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_2" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 13, "y": 86, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 14, "y": 86, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE111_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 54, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_ITEM_ROUTE111_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 114, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "FLAG_ITEM_ROUTE111_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 22, "y": 21, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 10, "y": 82, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 11, "y": 71, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 32, "y": 29, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 11, "y": 12, "elevation": 3, @@ -431,7 +431,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 9, "y": 27, "elevation": 3, @@ -444,7 +444,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 13, "y": 20, "elevation": 3, @@ -457,7 +457,7 @@ "flag": "FLAG_HIDE_SECRET_POWER_MAN" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 32, "y": 38, "elevation": 3, @@ -470,7 +470,7 @@ "flag": "FLAG_HIDE_ROOT_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_FOSSIL", + "graphics_id": "OBJ_EVENT_GFX_FOSSIL", "x": 33, "y": 38, "elevation": 3, @@ -483,7 +483,7 @@ "flag": "FLAG_HIDE_CLAW_FOSSIL" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 20, "y": 114, "elevation": 3, @@ -957,4 +957,4 @@ "flag": "FLAG_HIDDEN_ITEM_39" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 4f223e37e..0092d793d 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -50,7 +50,7 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall msgbox Route111_Text_16FA54, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route111_EventScript_15005F giveitem_std ITEM_ROOT_FOSSIL closemessage @@ -72,7 +72,7 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall msgbox Route111_Text_16FAED, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route111_EventScript_1500A5 giveitem_std ITEM_CLAW_FOSSIL closemessage @@ -122,7 +122,7 @@ Route111_EventScript_1500C5:: @ 81500C5 goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem_std ITEM_RAZZ_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 special GetPlayerBigGuyGirlString @@ -137,31 +137,31 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 goto Route111_EventScript_15013A end @ 815012E lockall - setvar VAR_SPECIAL_4, 3 + setvar VAR_0x8004, 3 goto Route111_EventScript_15013A end Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_150151 setvar VAR_TEMP_3, 1 releaseall @@ -170,13 +170,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 call_if_eq Route111_EventScript_150188 - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 call_if_eq Route111_EventScript_150193 - compare VAR_SPECIAL_4, 2 + compare VAR_0x8004, 2 call_if_eq Route111_EventScript_15019E - compare VAR_SPECIAL_4, 3 + compare VAR_0x8004, 3 call_if_eq Route111_EventScript_1501A9 releaseall end @@ -235,7 +235,7 @@ Route111_EventScript_1501D1:: @ 81501D1 faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY msgbox Route111_Text_16F705, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release @@ -389,8 +389,8 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, TRAINER_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 end @@ -417,8 +417,8 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, TRAINER_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 end @@ -430,8 +430,8 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, TRAINER_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 end diff --git a/data/maps/Route111_OldLadysRestStop/map.json b/data/maps/Route111_OldLadysRestStop/map.json index 1359d68cc..8269b34f6 100644 --- a/data/maps/Route111_OldLadysRestStop/map.json +++ b/data/maps/Route111_OldLadysRestStop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 6, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc index 1263c4b83..277b0402c 100644 --- a/data/maps/Route111_OldLadysRestStop/scripts.inc +++ b/data/maps/Route111_OldLadysRestStop/scripts.inc @@ -10,9 +10,9 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB lock faceplayer msgbox Route111_OldLadysRestStop_Text_1923AF, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end @@ -21,9 +21,9 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC closemessage call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end diff --git a/data/maps/Route111_WinstrateFamilysHouse/map.json b/data/maps/Route111_WinstrateFamilysHouse/map.json index a66ac4543..3241998c5 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/map.json +++ b/data/maps/Route111_WinstrateFamilysHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 4, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 4, "y": 4, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index 020b51791..e971a8b9f 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -4,7 +4,7 @@ Route111_WinstrateFamilysHouse_MapScripts:: @ 815BF24 Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 lock faceplayer - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -12,11 +12,11 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer - setvar VAR_SPECIAL_8, 3 + setvar VAR_0x8008, 3 goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem_std ITEM_MACHO_BRACE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 @@ -30,7 +30,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72 Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 lock faceplayer - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 msgbox Route111_WinstrateFamilysHouse_Text_192190, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -38,7 +38,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer - setvar VAR_SPECIAL_8, 4 + setvar VAR_0x8008, 4 goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 setflag FLAG_TEMP_4 @@ -52,7 +52,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 closemessage - applymovement VAR_SPECIAL_8, Route111_WinstrateFamilysHouse_Movement_1A083D + applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D waitmovement 0 release end diff --git a/data/maps/Route112/map.json b/data/maps/Route112/map.json index b2eef42bc..e6876a2d9 100644 --- a/data/maps/Route112/map.json +++ b/data/maps/Route112/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 26, "y": 30, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 24, "y": 34, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 29, "y": 49, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 22, "y": 46, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 17, "y": 40, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 27, "y": 30, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 27, "y": 6, "elevation": 0, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 28, "y": 6, "elevation": 0, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 6, "elevation": 0, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 8, "y": 50, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 43, "elevation": 3, @@ -255,4 +255,4 @@ "script": "Route112_EventScript_150537" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 8e3f73fc0..ae03b2248 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -38,8 +38,8 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, TRAINER_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 end diff --git a/data/maps/Route112_CableCarStation/map.json b/data/maps/Route112_CableCarStation/map.json index c6ed9d9a8..3f9a7377e 100644 --- a/data/maps/Route112_CableCarStation/map.json +++ b/data/maps/Route112_CableCarStation/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CABLE_CAR", + "graphics_id": "OBJ_EVENT_GFX_CABLE_CAR", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index a593ccccc..2460aada9 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -33,9 +33,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C lock faceplayer msgbox Route112_CableCarStation_Text_1924F5, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route112_CableCarStation_EventScript_15C0AD - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route112_CableCarStation_EventScript_15C0DC end @@ -45,7 +45,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 1, Route112_CableCarStation_Movement_15C0E6 applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/maps/Route113/map.json b/data/maps/Route113/map.json index 3a03a4f74..8a49c686c 100644 --- a/data/maps/Route113/map.json +++ b/data/maps/Route113/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 66, "y": 12, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 36, "y": 10, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 62, "y": 8, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 21, "y": 11, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 51, "y": 11, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 53, "y": 7, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_ITEM_ROUTE113_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 78, "y": 5, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "FLAG_ITEM_ROUTE113_2" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 66, "y": 3, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 29, "y": 6, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 45, "y": 6, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 46, "y": 6, "elevation": 3, @@ -372,4 +372,4 @@ "flag": "FLAG_HIDDEN_ITEM_1E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 5b44f2442..58c769273 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -60,8 +60,8 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, TRAINER_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 end @@ -73,8 +73,8 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, TRAINER_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 end diff --git a/data/maps/Route113_GlassWorkshop/map.json b/data/maps/Route113_GlassWorkshop/map.json index 25b73fcff..5e8e6d5a9 100644 --- a/data/maps/Route113_GlassWorkshop/map.json +++ b/data/maps/Route113_GlassWorkshop/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 5, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc index e42a6f89a..7940b9cd7 100644 --- a/data/maps/Route113_GlassWorkshop/scripts.inc +++ b/data/maps/Route113_GlassWorkshop/scripts.inc @@ -35,7 +35,7 @@ Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 checkitem ITEM_SOOT_SACK, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 compare VAR_ASH_GATHER_COUNT, 250 @@ -51,10 +51,10 @@ Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 end Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE - setvar VAR_SPECIAL_9, 0 + setvar VAR_0x8009, 0 special ShowGlassWorkshopMenu waitstate - switch RESULT + switch VAR_RESULT case 0, Route113_GlassWorkshop_EventScript_163660 case 1, Route113_GlassWorkshop_EventScript_16369C case 2, Route113_GlassWorkshop_EventScript_1636D8 @@ -67,13 +67,13 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE - bufferitemname 0, VAR_SPECIAL_8 - setvar VAR_SPECIAL_A, 250 + setvar VAR_0x8008, ITEM_BLUE_FLUTE + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 10 subvar VAR_ASH_GATHER_COUNT, 250 @@ -81,13 +81,13 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE - bufferitemname 0, VAR_SPECIAL_8 - setvar VAR_SPECIAL_A, 500 + setvar VAR_0x8008, ITEM_YELLOW_FLUTE + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 11 subvar VAR_ASH_GATHER_COUNT, 500 @@ -95,13 +95,13 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar VAR_SPECIAL_8, ITEM_RED_FLUTE - bufferitemname 0, VAR_SPECIAL_8 - setvar VAR_SPECIAL_A, 500 + setvar VAR_0x8008, ITEM_RED_FLUTE + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 12 subvar VAR_ASH_GATHER_COUNT, 500 @@ -109,13 +109,13 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE - bufferitemname 0, VAR_SPECIAL_8 - setvar VAR_SPECIAL_A, 1000 + setvar VAR_0x8008, ITEM_WHITE_FLUTE + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -123,13 +123,13 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE - bufferitemname 0, VAR_SPECIAL_8 - setvar VAR_SPECIAL_A, 1000 + setvar VAR_0x8008, ITEM_BLACK_FLUTE + bufferitemname 0, VAR_0x8008 + setvar VAR_0x800A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -137,14 +137,14 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 end Route113_GlassWorkshop_EventScript_16378C:: @ 816378C - setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR - bufferdecorationname 0, VAR_SPECIAL_8 - setvar VAR_SPECIAL_A, 6000 + setvar VAR_0x8009, 1 + setvar VAR_0x8008, DECOR_PRETTY_CHAIR + bufferdecorationname 0, VAR_0x8008 + setvar VAR_0x800A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 @@ -152,14 +152,14 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C end Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD - setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK - bufferdecorationname 0, VAR_SPECIAL_8 - setvar VAR_SPECIAL_A, 8000 + setvar VAR_0x8009, 1 + setvar VAR_0x8008, DECOR_PRETTY_DESK + bufferdecorationname 0, VAR_0x8008 + setvar VAR_0x800A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 @@ -172,15 +172,15 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E end Route113_GlassWorkshop_EventScript_163818:: @ 8163818 - setvar VAR_SPECIAL_A, 250 - subvar VAR_SPECIAL_A, 16456 + setvar VAR_0x800A, 250 + subvar VAR_0x800A, 16456 buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 - subvar VAR_SPECIAL_A, 16456 + subvar VAR_0x800A, 16456 buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage @@ -201,23 +201,23 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare VAR_SPECIAL_9, 0 + compare VAR_0x8009, 0 call_if_eq Route113_GlassWorkshop_EventScript_163889 - compare VAR_SPECIAL_9, 1 + compare VAR_0x8009, 1 call_if_eq Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem_std VAR_SPECIAL_8 - compare RESULT, 0 + giveitem_std VAR_0x8008 + compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration_std VAR_SPECIAL_8 - compare RESULT, 0 + givedecoration_std VAR_0x8008 + compare VAR_RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -245,59 +245,59 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 end Route113_GlassWorkshop_EventScript_163925:: @ 8163925 - setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE - bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_0x8009, 0 + setvar VAR_0x8008, ITEM_BLUE_FLUTE + bufferitemname 0, VAR_0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 - setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE - bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_0x8009, 0 + setvar VAR_0x8008, ITEM_YELLOW_FLUTE + bufferitemname 0, VAR_0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D - setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, ITEM_RED_FLUTE - bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_0x8009, 0 + setvar VAR_0x8008, ITEM_RED_FLUTE + bufferitemname 0, VAR_0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 - setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE - bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_0x8009, 0 + setvar VAR_0x8008, ITEM_WHITE_FLUTE + bufferitemname 0, VAR_0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 - setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE - bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_0x8009, 0 + setvar VAR_0x8008, ITEM_BLACK_FLUTE + bufferitemname 0, VAR_0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 - setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR + setvar VAR_0x8009, 1 + setvar VAR_0x8008, DECOR_PRETTY_CHAIR bufferdecorationname 0, DECOR_PRETTY_CHAIR goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D - setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK + setvar VAR_0x8009, 1 + setvar VAR_0x8008, DECOR_PRETTY_DESK bufferdecorationname 0, DECOR_PRETTY_DESK goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare VAR_SPECIAL_9, 0 + compare VAR_0x8009, 0 call_if_eq Route113_GlassWorkshop_EventScript_163889 - compare VAR_SPECIAL_9, 1 + compare VAR_0x8009, 1 call_if_eq Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release diff --git a/data/maps/Route114/map.json b/data/maps/Route114/map.json index c72be9b6f..9980ae967 100644 --- a/data/maps/Route114/map.json +++ b/data/maps/Route114/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 43, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 44, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 15, "y": 65, "elevation": 7, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 30, "y": 72, "elevation": 5, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 22, "y": 50, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 19, "y": 35, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 20, "y": 56, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 45, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "FLAG_ITEM_ROUTE114_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 11, "y": 37, "elevation": 4, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_ROUTE114_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 12, "y": 43, "elevation": 4, @@ -166,7 +166,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 19, "y": 11, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_POOCHYENA", + "graphics_id": "OBJ_EVENT_GFX_POOCHYENA", "x": 19, "y": 12, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 27, "y": 42, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 23, "y": 20, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 19, "y": 26, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 30, "y": 58, "elevation": 5, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 53, "elevation": 5, @@ -257,7 +257,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 30, "y": 54, "elevation": 5, @@ -270,7 +270,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 22, "y": 69, "elevation": 7, @@ -283,7 +283,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 64, "elevation": 5, @@ -296,7 +296,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 24, "y": 44, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 23, "y": 44, "elevation": 3, @@ -437,4 +437,4 @@ "flag": "FLAG_HIDDEN_ITEM_2A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index dd5ec1695..7af6aaec0 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -8,10 +8,10 @@ Route114_EventScript_150733:: @ 8150733 goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 - addvar RESULT, 15 - addvar RESULT, 133 - giveitem_std RESULT - compare RESULT, 0 + addvar VAR_RESULT, 15 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 msgbox Route114_Text_1C5861, 4 @@ -29,7 +29,7 @@ Route114_EventScript_150782:: @ 8150782 goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem_std ITEM_TM05_ROAR - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1701C5, 4 @@ -85,8 +85,8 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, TRAINER_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -98,8 +98,8 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, TRAINER_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end diff --git a/data/maps/Route114_FossilManiacsHouse/map.json b/data/maps/Route114_FossilManiacsHouse/map.json index 58d91f253..fc6608a89 100644 --- a/data/maps/Route114_FossilManiacsHouse/map.json +++ b/data/maps/Route114_FossilManiacsHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 3, "y": 2, "elevation": 3, @@ -83,4 +83,4 @@ "script": "Route114_FossilManiacsHouse_EventScript_15C205" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index c93584561..8313eacb1 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -12,7 +12,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem_std ITEM_TM28_DIG - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag FLAG_RECEIVED_TM28 release diff --git a/data/maps/Route114_FossilManiacsTunnel/map.json b/data/maps/Route114_FossilManiacsTunnel/map.json index bbd151d1d..7a7f76711 100644 --- a/data/maps/Route114_FossilManiacsTunnel/map.json +++ b/data/maps/Route114_FossilManiacsTunnel/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 740a48314..23440b191 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -6,10 +6,10 @@ Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F faceplayer goto_if_set FLAG_RECEIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 checkitem ITEM_CLAW_FOSSIL, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 msgbox Route114_FossilManiacsTunnel_Text_192795, 4 release diff --git a/data/maps/Route114_LanettesHouse/map.json b/data/maps/Route114_LanettesHouse/map.json index f959007e4..abde113c6 100644 --- a/data/maps/Route114_LanettesHouse/map.json +++ b/data/maps/Route114_LanettesHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 4, "elevation": 3, @@ -68,4 +68,4 @@ "script": "Route114_LanettesHouse_EventScript_15C2D5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 30eb844ac..2fe385c18 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -17,7 +17,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 .else givedecoration_std DECOR_SEEDOT_DOLL .endif - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE setflag FLAG_RECEIVED_DOLL_LANETTE release @@ -31,7 +31,7 @@ Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall msgbox Route114_LanettesHouse_Text_192B4A, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall @@ -39,7 +39,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/maps/Route115/map.json b/data/maps/Route115/map.json index 98588d46f..cc2f976d9 100644 --- a/data/maps/Route115/map.json +++ b/data/maps/Route115/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 18, "y": 68, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 15, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 27, "y": 53, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 5, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 12, "y": 5, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 13, "y": 5, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 15, "y": 50, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 17, "y": 17, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 25, "y": 61, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 60, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "FLAG_ITEM_ROUTE115_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 5, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_ITEM_ROUTE115_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 29, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_ITEM_ROUTE115_3" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 64, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 31, "y": 65, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 29, "y": 50, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 56, "elevation": 3, @@ -344,4 +344,4 @@ "flag": "FLAG_HIDDEN_ITEM_61" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 9cb3652f1..6fd262de4 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -15,8 +15,8 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, TRAINER_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 end @@ -33,8 +33,8 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, TRAINER_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 end @@ -46,8 +46,8 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, TRAINER_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 end diff --git a/data/maps/Route116/map.json b/data/maps/Route116/map.json index 615b94d98..8e466e012 100644 --- a/data/maps/Route116/map.json +++ b/data/maps/Route116/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 18, "y": 2, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 19, "y": 2, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 12, "y": 7, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 21, "y": 6, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 33, "y": 8, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 13, "y": 17, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 19, "y": 6, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_ITEM_ROUTE116_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 17, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_ITEM_ROUTE116_3" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 20, "y": 2, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 21, "y": 2, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 46, "y": 9, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "FLAG_HIDE_BRINEY_ROUTE116" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 30, "y": 6, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 36, "y": 15, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 24, "y": 9, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 80, "y": 8, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "FLAG_ITEM_ROUTE116_4" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 22, "y": 16, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 25, "y": 4, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 31, "y": 9, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 46, "y": 11, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 56, "y": 12, "elevation": 4, @@ -283,7 +283,7 @@ "flag": "FLAG_ITEM_ROUTE116_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 38, "y": 9, "elevation": 3, @@ -296,7 +296,7 @@ "flag": "FLAG_HIDE_TUNNER_DIGGER_ROUTE116" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 74, "y": 13, "elevation": 3, @@ -429,4 +429,4 @@ "flag": "FLAG_HIDDEN_ITEM_BLACK_GLASSES" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 284ce3363..29ddd8ae2 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -40,31 +40,31 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag FLAG_MET_DEVON_EMPLOYEE giveitem_std ITEM_REPEAT_BALL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 closemessage - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq Route116_EventScript_150AEE - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq Route116_EventScript_150AEE - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq Route116_EventScript_150AEE - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq Route116_EventScript_150AF9 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F setflag FLAG_RECEIVED_REPEAT_BALL release end Route116_EventScript_150AEE:: @ 8150AEE - applymovement LAST_TALKED, Route116_Movement_150B1C + applymovement VAR_LAST_TALKED, Route116_Movement_150B1C waitmovement 0 return Route116_EventScript_150AF9:: @ 8150AF9 - applymovement LAST_TALKED, Route116_Movement_150B25 + applymovement VAR_LAST_TALKED, Route116_Movement_150B25 waitmovement 0 return @@ -144,10 +144,10 @@ Route116_EventScript_150B8F:: @ 8150B8F lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150BCA - specialvar RESULT, FoundBlackGlasses - compare RESULT, 1 + specialvar VAR_RESULT, FoundBlackGlasses + compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 release @@ -162,8 +162,8 @@ Route116_EventScript_150BBB:: @ 8150BBB Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 - specialvar RESULT, FoundBlackGlasses - compare RESULT, 1 + specialvar VAR_RESULT, FoundBlackGlasses + compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 release @@ -177,25 +177,25 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 delay 20 - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq Route116_EventScript_150C37 - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq Route116_EventScript_150C37 - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq Route116_EventScript_150C37 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq Route116_EventScript_150C42 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED release end Route116_EventScript_150C37:: @ 8150C37 - applymovement LAST_TALKED, Route116_Movement_150C4D + applymovement VAR_LAST_TALKED, Route116_Movement_150C4D waitmovement 0 return Route116_EventScript_150C42:: @ 8150C42 - applymovement LAST_TALKED, Route116_Movement_150C57 + applymovement VAR_LAST_TALKED, Route116_Movement_150C57 waitmovement 0 return @@ -236,8 +236,8 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, TRAINER_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 end @@ -259,8 +259,8 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, TRAINER_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 end diff --git a/data/maps/Route116_TunnelersRestHouse/map.json b/data/maps/Route116_TunnelersRestHouse/map.json index d298eedd1..f5927d4b0 100644 --- a/data/maps/Route116_TunnelersRestHouse/map.json +++ b/data/maps/Route116_TunnelersRestHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 3, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 2, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json index 09336cb04..58f8875a2 100644 --- a/data/maps/Route117/map.json +++ b/data/maps/Route117/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 13, "y": 13, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 26, "y": 13, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 47, "y": 4, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 33, "y": 3, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 39, "y": 4, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 42, "y": 2, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 49, "y": 2, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_M", "x": 35, "y": 7, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 31, "y": 11, "elevation": 3, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 10, "y": 9, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 41, "y": 13, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 42, "y": 13, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 43, "y": 13, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 16, "y": 18, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "FLAG_ITEM_ROUTE117_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 15, "y": 2, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 9, "y": 1, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "FLAG_ITEM_ROUTE117_2" }, { - "graphics_id": "EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F", + "graphics_id": "OBJ_EVENT_GFX_RUNNING_TRIATHLETE_F", "x": 21, "y": 1, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 17, "y": 12, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 46, "y": 15, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 45, "y": 15, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 48, "y": 10, "elevation": 3, @@ -340,4 +340,4 @@ "flag": "FLAG_HIDDEN_ITEM_48" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 3c5bc8a66..363b19280 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -39,8 +39,8 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, TRAINER_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 end @@ -52,8 +52,8 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, TRAINER_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 end @@ -65,8 +65,8 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, TRAINER_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 end @@ -78,8 +78,8 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, TRAINER_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 end @@ -96,8 +96,8 @@ Route117_EventScript_150E85:: @ 8150E85 Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 end @@ -109,8 +109,8 @@ Route117_EventScript_150EC7:: @ 8150EC7 Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 end diff --git a/data/maps/Route117_PokemonDayCare/map.json b/data/maps/Route117_PokemonDayCare/map.json index 02b70db9c..abf33dae3 100644 --- a/data/maps/Route117_PokemonDayCare/map.json +++ b/data/maps/Route117_PokemonDayCare/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 2, "y": 2, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route118/map.json b/data/maps/Route118/map.json index 2ec9a3578..e5c9690e3 100644 --- a/data/maps/Route118/map.json +++ b/data/maps/Route118/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 5, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 5, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 37, "y": 5, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 64, "y": 10, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_1" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 12, "y": 8, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_2" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 33, "y": 8, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 34, "y": 8, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE118_3" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 38, "y": 8, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 28, "y": 8, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 7, "y": 10, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 14, "y": 14, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 56, "y": 7, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 39, "y": 15, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 17, "y": 11, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 44, "y": 7, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_HIDE_STEVEN_ROUTE118" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 69, "y": 7, "elevation": 3, @@ -387,4 +387,4 @@ "flag": "FLAG_HIDDEN_ITEM_42" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 850d9138d..0bb082903 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -11,9 +11,9 @@ Route118_EventScript_150F34:: @ 8150F34 faceplayer goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_150F89 msgbox Route118_Text_170F12, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route118_EventScript_150F5E - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route118_EventScript_150F7F end @@ -49,7 +49,7 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_151069 @@ -59,7 +59,7 @@ Route118_EventScript_150FAE:: @ 8150FAE Route118_EventScript_150FCE:: @ 8150FCE lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 applymovement 255, Route118_Movement_1A0841 waitmovement 0 goto Route118_EventScript_151004 @@ -67,7 +67,7 @@ Route118_EventScript_150FCE:: @ 8150FCE Route118_EventScript_150FE4:: @ 8150FE4 lockall - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_15106B @@ -82,11 +82,11 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closemessage - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq Route118_EventScript_151048 - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq Route118_EventScript_151053 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq Route118_EventScript_15105E setvar VAR_ROUTE118_STATE, 1 removeobject 19 @@ -160,8 +160,8 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, TRAINER_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 end @@ -183,8 +183,8 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, TRAINER_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 end diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json index 74b0263ae..65f784333 100644 --- a/data/maps/Route119/map.json +++ b/data/maps/Route119/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 24, "y": 5, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 25, "y": 5, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 26, "y": 5, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 12, "y": 123, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 26, "y": 123, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 5, "y": 125, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 7, "y": 74, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 116, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 35, "y": 83, "elevation": 4, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 34, "y": 122, "elevation": 3, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 17, "y": 128, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 28, "y": 16, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 19, "y": 49, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 10, "y": 50, "elevation": 4, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 8, "y": 62, "elevation": 3, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 25, "y": 32, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE119" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 121, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "FLAG_ITEM_ROUTE119_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 4, "y": 96, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "FLAG_ITEM_ROUTE119_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 29, "y": 53, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_ITEM_ROUTE119_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 25, "y": 76, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "FLAG_ITEM_ROUTE119_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 18, "elevation": 3, @@ -296,7 +296,7 @@ "flag": "FLAG_ITEM_ROUTE119_5" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 117, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "FLAG_ITEM_ROUTE119_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 33, "elevation": 4, @@ -322,7 +322,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 34, "elevation": 4, @@ -335,7 +335,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 17, "y": 33, "elevation": 4, @@ -348,7 +348,7 @@ "flag": "FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 31, "y": 109, "elevation": 3, @@ -361,7 +361,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 8, "y": 23, "elevation": 3, @@ -374,7 +374,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 23, "elevation": 3, @@ -387,7 +387,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 29, "y": 90, "elevation": 3, @@ -400,7 +400,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 30, "y": 90, "elevation": 3, @@ -413,7 +413,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M", + "graphics_id": "OBJ_EVENT_GFX_CYCLING_TRIATHLETE_M", "x": 19, "y": 133, "elevation": 3, @@ -426,7 +426,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 56, "elevation": 3, @@ -439,7 +439,7 @@ "flag": "FLAG_ITEM_ROUTE119_7" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 35, "y": 93, "elevation": 4, @@ -452,7 +452,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 29, "y": 6, "elevation": 3, @@ -465,7 +465,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 31, "y": 6, "elevation": 3, @@ -478,7 +478,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE119_1" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 20, "y": 13, "elevation": 4, @@ -491,7 +491,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE119_2" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 13, "y": 104, "elevation": 3, @@ -850,4 +850,4 @@ "script": "Route119_EventScript_151605" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 9874d3098..c94ce00e2 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -8,9 +8,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare VAR_SPECIAL_4, 6 + compare VAR_0x8004, 6 call_if_eq Route119_EventScript_151193 - compare VAR_SPECIAL_4, 7 + compare VAR_0x8004, 7 call_if_eq Route119_EventScript_151197 return @@ -51,9 +51,9 @@ Route119_EventScript_1511DB:: @ 81511DB lockall addobject 25 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq Route119_EventScript_151254 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq Route119_EventScript_151259 delay 65 compare VAR_TEMP_1, 1 @@ -71,9 +71,9 @@ Route119_EventScript_1511DB:: @ 81511DB addobject 16 delay 30 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route119_EventScript_15125E - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route119_EventScript_1512D8 releaseall end @@ -295,8 +295,8 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, TRAINER_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 end @@ -308,8 +308,8 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, TRAINER_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 end @@ -354,7 +354,7 @@ Route119_EventScript_1515C5:: @ 81515C5 faceplayer msgbox Route119_Text_171520, 4 closemessage - applymovement LAST_TALKED, Route119_Movement_1A083D + applymovement VAR_LAST_TALKED, Route119_Movement_1A083D waitmovement 0 release end @@ -364,7 +364,7 @@ Route119_EventScript_1515DC:: @ 81515DC faceplayer msgbox Route119_Text_17157C, 4 closemessage - applymovement LAST_TALKED, Route119_Movement_1A083D + applymovement VAR_LAST_TALKED, Route119_Movement_1A083D waitmovement 0 release end diff --git a/data/maps/Route119_House/map.json b/data/maps/Route119_House/map.json index 471d9c40f..7c5395d29 100644 --- a/data/maps/Route119_House/map.json +++ b/data/maps/Route119_House/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 1, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 0, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 2, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 8, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 6, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 5, "y": 3, "elevation": 3, @@ -121,4 +121,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_1F/map.json b/data/maps/Route119_WeatherInstitute_1F/map.json index 048366667..ef0477682 100644 --- a/data/maps/Route119_WeatherInstitute_1F/map.json +++ b/data/maps/Route119_WeatherInstitute_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 5, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 2, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 14, "y": 11, "elevation": 3, @@ -135,4 +135,4 @@ "script": "Route119_WeatherInstitute_1F_EventScript_163C83" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_2F/map.json b/data/maps/Route119_WeatherInstitute_2F/map.json index 9d59bb48d..2893c39e8 100644 --- a/data/maps/Route119_WeatherInstitute_2F/map.json +++ b/data/maps/Route119_WeatherInstitute_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 10, "y": 8, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 4, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 0, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 1, "y": 7, "elevation": 3, @@ -101,4 +101,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 8a8737dad..a2317a791 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -56,7 +56,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 getpartysize - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 playfanfare MUS_FANFA4 message Route119_WeatherInstitute_2F_Text_19F267 diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json index f8d8e334d..c9a163922 100644 --- a/data/maps/Route120/map.json +++ b/data/maps/Route120/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 4, "y": 79, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 5, "y": 79, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 6, "y": 79, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 7, "y": 79, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 34, "y": 24, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 35, "y": 24, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 36, "y": 24, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 9, "y": 92, "elevation": 5, @@ -127,7 +127,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 10, "y": 92, "elevation": 5, @@ -140,7 +140,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 11, "y": 92, "elevation": 5, @@ -153,7 +153,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 5, "y": 22, "elevation": 3, @@ -166,7 +166,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 32, "y": 14, "elevation": 3, @@ -179,7 +179,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 27, "y": 51, "elevation": 3, @@ -192,7 +192,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 36, "y": 45, "elevation": 3, @@ -205,7 +205,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 19, "y": 80, "elevation": 5, @@ -218,7 +218,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 20, "y": 55, "elevation": 3, @@ -231,7 +231,7 @@ "flag": "FLAG_ITEM_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -244,7 +244,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -257,7 +257,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 36, "y": 5, "elevation": 3, @@ -270,7 +270,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 37, "y": 5, "elevation": 3, @@ -283,7 +283,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 35, "y": 32, "elevation": 3, @@ -296,7 +296,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 89, "elevation": 3, @@ -309,7 +309,7 @@ "flag": "FLAG_ITEM_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 14, "y": 92, "elevation": 5, @@ -322,7 +322,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 28, "y": 35, "elevation": 3, @@ -335,7 +335,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 60, "elevation": 3, @@ -348,7 +348,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 16, "y": 6, "elevation": 3, @@ -361,7 +361,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 18, "y": 34, "elevation": 3, @@ -374,7 +374,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 22, "y": 13, "elevation": 3, @@ -387,7 +387,7 @@ "flag": "FLAG_ITEM_ROUTE120_4" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 23, "y": 82, "elevation": 5, @@ -400,7 +400,7 @@ "flag": "FLAG_ITEM_ROUTE120_3" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 12, "y": 16, "elevation": 4, @@ -413,7 +413,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_1" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 13, "y": 15, "elevation": 4, @@ -426,7 +426,7 @@ "flag": "FLAG_HIDE_STEVEN_ROUTE120" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 20, "y": 1, "elevation": 3, @@ -439,7 +439,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 15, "y": 1, "elevation": 3, @@ -452,7 +452,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 10, "y": 72, "elevation": 3, @@ -465,7 +465,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 19, "y": 28, "elevation": 3, @@ -478,7 +478,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_2", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_2", "x": 12, "y": 16, "elevation": 3, @@ -491,7 +491,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_2" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 20, "y": 11, "elevation": 3, @@ -504,7 +504,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_3" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 27, "y": 2, "elevation": 3, @@ -517,7 +517,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_4" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 4, "y": 77, "elevation": 3, @@ -530,7 +530,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_5" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 7, "y": 51, "elevation": 3, @@ -543,7 +543,7 @@ "flag": "FLAG_HIDE_KECLEON_ROUTE120_7" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 19, "y": 48, "elevation": 3, @@ -813,4 +813,4 @@ "secret_base_id": "SECRET_BASE_SHRUB1_4" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 4d2eca797..4c7aefdea 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -9,17 +9,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 call_if_eq Route120_EventScript_15166B - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 call_if_eq Route120_EventScript_151672 - compare VAR_SPECIAL_4, 2 + compare VAR_0x8004, 2 call_if_eq Route120_EventScript_151676 - compare VAR_SPECIAL_4, 3 + compare VAR_0x8004, 3 call_if_eq Route120_EventScript_15167A - compare VAR_SPECIAL_4, 4 + compare VAR_0x8004, 4 call_if_eq Route120_EventScript_15167E - compare VAR_SPECIAL_4, 5 + compare VAR_0x8004, 5 call_if_eq Route120_EventScript_151682 return @@ -111,12 +111,12 @@ Route120_EventScript_151739:: @ 8151739 dodailyevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837 msgbox Route120_Text_1C58F1, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq Route120_EventScript_151841 - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq Route120_EventScript_15184A - specialvar RESULT, GetPlayerTrainerIdOnesDigit - switch RESULT + specialvar VAR_RESULT, GetPlayerTrainerIdOnesDigit + switch VAR_RESULT case 0, Route120_EventScript_1517DC case 5, Route120_EventScript_1517DC case 1, Route120_EventScript_1517E7 @@ -130,33 +130,33 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY + setvar VAR_0x8004, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY + setvar VAR_0x8004, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY + setvar VAR_0x8004, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY + setvar VAR_0x8004, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY + setvar VAR_0x8004, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std VAR_SPECIAL_4 - compare RESULT, 0 + giveitem_std VAR_0x8004 + compare VAR_RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 msgbox Route120_Text_1C5A0B, 4 @@ -181,7 +181,7 @@ Route120_EventScript_151853:: @ 8151853 faceplayer goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE120, Route120_EventScript_151884 msgbox Route120_Text_171827, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -194,7 +194,7 @@ Route120_EventScript_151877:: @ 8151877 Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -202,9 +202,9 @@ Route120_EventScript_151884:: @ 8151884 Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closemessage - compare FACING, 2 + compare VAR_FACING, 2 call_if_eq Route120_EventScript_15197F - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq Route120_EventScript_15198A applymovement 31, Route120_Movement_1A083F waitmovement 0 @@ -220,7 +220,7 @@ Route120_EventScript_15189D:: @ 815189D delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE @@ -286,8 +286,8 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, TRAINER_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 end @@ -309,8 +309,8 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, TRAINER_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 end diff --git a/data/maps/Route121/map.json b/data/maps/Route121/map.json index 8fb438a87..de0def82e 100644 --- a/data/maps/Route121/map.json +++ b/data/maps/Route121/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 29, "y": 14, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 14, "y": 2, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 15, "y": 2, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 16, "y": 2, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 17, "y": 2, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 64, "y": 14, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 65, "y": 14, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 66, "y": 14, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 67, "y": 14, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 39, "y": 9, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 40, "y": 9, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 30, "y": 8, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_HIDE_GRUNTS_ROUTE121" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 30, "y": 7, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "FLAG_HIDE_GRUNTS_ROUTE121" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 31, "y": 7, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "FLAG_HIDE_GRUNTS_ROUTE121" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 32, "y": 5, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 65, "y": 4, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 63, "y": 5, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 55, "y": 8, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HEX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_HEX_MANIAC", "x": 11, "y": 10, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 22, "y": 5, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 55, "y": 10, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "FLAG_ITEM_ROUTE121_1" }, { - "graphics_id": "EVENT_OBJ_GFX_CUTTABLE_TREE", + "graphics_id": "OBJ_EVENT_GFX_CUTTABLE_TREE", "x": 26, "y": 12, "elevation": 3, @@ -431,4 +431,4 @@ "flag": "FLAG_HIDDEN_ITEM_49" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index d154d3f6b..b6a0abe09 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -73,8 +73,8 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, TRAINER_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 end @@ -101,8 +101,8 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, TRAINER_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 end diff --git a/data/maps/Route121_SafariZoneEntrance/map.json b/data/maps/Route121_SafariZoneEntrance/map.json index 9664da26a..1bde0de82 100644 --- a/data/maps/Route121_SafariZoneEntrance/map.json +++ b/data/maps/Route121_SafariZoneEntrance/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PICNICKER", + "graphics_id": "OBJ_EVENT_GFX_PICNICKER", "x": 17, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 10, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 8, "y": 2, "elevation": 3, @@ -102,4 +102,4 @@ "script": "Route121_SafariZoneEntrance_EventScript_15C487" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 30cba964b..75f134e7e 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -34,7 +34,7 @@ Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A lock faceplayer msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release @@ -52,7 +52,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 showmoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C @@ -60,11 +60,11 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 checkitem ITEM_POKEBLOCK_CASE, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 call Route121_SafariZoneEntrance_EventScript_15C425 checkmoney 0x1f4, 0 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 takemoney 0x1f4, 0 @@ -88,10 +88,10 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 getpartysize - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F - specialvar RESULT, CheckFreePokemonStorageSpace - compare RESULT, 1 + specialvar VAR_RESULT, CheckFreePokemonStorageSpace + compare VAR_RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C diff --git a/data/maps/Route122/map.json b/data/maps/Route122/map.json index 5f98fcab7..1037df207 100644 --- a/data/maps/Route122/map.json +++ b/data/maps/Route122/map.json @@ -33,4 +33,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} 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 diff --git a/data/maps/Route123_BerryMastersHouse/map.json b/data/maps/Route123_BerryMastersHouse/map.json index 60abf6aec..2de87d68a 100644 --- a/data/maps/Route123_BerryMastersHouse/map.json +++ b/data/maps/Route123_BerryMastersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index 3356df83b..d81cf9aee 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -13,18 +13,18 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER, Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 - addvar RESULT, 20 - addvar RESULT, 133 - giveitem_std RESULT - compare RESULT, 0 + addvar VAR_RESULT, 20 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 random 10 - addvar RESULT, 20 - addvar RESULT, 133 - giveitem_std RESULT - compare RESULT, 0 + addvar VAR_RESULT, 20 + addvar VAR_RESULT, 133 + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 release @@ -41,13 +41,13 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 dodailyevents goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 - setvar VAR_SPECIAL_4, 13 + setvar VAR_0x8004, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AAD - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163A9B end @@ -58,26 +58,26 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare VAR_SPECIAL_4, 0 + compare VAR_0x8004, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare VAR_SPECIAL_4, 1 + compare VAR_0x8004, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare VAR_SPECIAL_4, 2 + compare VAR_0x8004, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare VAR_SPECIAL_4, 3 + compare VAR_0x8004, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare VAR_SPECIAL_4, 4 + compare VAR_0x8004, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare VAR_SPECIAL_4, 5 + compare VAR_0x8004, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 random 10 - addvar RESULT, ITEM_CHERI_BERRY - giveitem_std RESULT - compare RESULT, 0 + addvar VAR_RESULT, ITEM_CHERI_BERRY + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D release @@ -87,7 +87,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_SPELON_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D @@ -97,7 +97,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_PAMTRE_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D @@ -107,7 +107,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_WATMEL_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D @@ -117,7 +117,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_DURIN_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D @@ -127,7 +127,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_BELUE_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json index 0c2746806..07c6c35ac 100644 --- a/data/maps/Route124/map.json +++ b/data/maps/Route124/map.json @@ -38,7 +38,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 58, "y": 59, "elevation": 1, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 33, "y": 25, "elevation": 1, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 14, "y": 27, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 49, "y": 45, "elevation": 1, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 60, "y": 74, "elevation": 1, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 28, "y": 12, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_ITEM_ROUTE124_2" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 31, "y": 53, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_ITEM_ROUTE124_3" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 58, "y": 11, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_ITEM_ROUTE124_1" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 18, "y": 44, "elevation": 1, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 17, "y": 44, "elevation": 1, @@ -188,4 +188,4 @@ "script": "Route124_EventScript_151DEF" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index cb42e1944..8232dee34 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -22,8 +22,8 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, TRAINER_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 end @@ -45,8 +45,8 @@ Route124_EventScript_151E7B:: @ 8151E7B Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 end @@ -58,8 +58,8 @@ Route124_EventScript_151EBD:: @ 8151EBD Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 end diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.json b/data/maps/Route124_DivingTreasureHuntersHouse/map.json index 90f82b109..365faa9d2 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/map.json +++ b/data/maps/Route124_DivingTreasureHuntersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 5, "y": 4, "elevation": 0, @@ -52,4 +52,4 @@ "script": "Route124_DivingTreasureHuntersHouse_EventScript_164335" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 7bcddfe19..128b48a25 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -30,16 +30,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E9C return @@ -87,7 +87,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 Route124_DivingTreasureHuntersHouse_EventScript_163F61:: @ 8163F61 multichoice 0, 0, 58, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F goto Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -95,7 +95,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163F61:: @ 8163F61 Route124_DivingTreasureHuntersHouse_EventScript_163F87:: @ 8163F87 multichoice 0, 0, 59, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F goto Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -103,7 +103,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163F87:: @ 8163F87 Route124_DivingTreasureHuntersHouse_EventScript_163FAD:: @ 8163FAD multichoice 0, 0, 60, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -112,7 +112,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163FAD:: @ 8163FAD Route124_DivingTreasureHuntersHouse_EventScript_163FDE:: @ 8163FDE multichoice 0, 0, 61, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F goto Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -120,7 +120,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163FDE:: @ 8163FDE Route124_DivingTreasureHuntersHouse_EventScript_164004:: @ 8164004 multichoice 0, 0, 62, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -129,7 +129,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164004:: @ 8164004 Route124_DivingTreasureHuntersHouse_EventScript_164035:: @ 8164035 multichoice 0, 0, 63, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -138,7 +138,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164035:: @ 8164035 Route124_DivingTreasureHuntersHouse_EventScript_164066:: @ 8164066 multichoice 0, 0, 64, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164274 @@ -148,7 +148,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164066:: @ 8164066 Route124_DivingTreasureHuntersHouse_EventScript_1640A2:: @ 81640A2 multichoice 0, 0, 65, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F goto Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -156,7 +156,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1640A2:: @ 81640A2 Route124_DivingTreasureHuntersHouse_EventScript_1640C8:: @ 81640C8 multichoice 0, 0, 66, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -165,7 +165,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1640C8:: @ 81640C8 Route124_DivingTreasureHuntersHouse_EventScript_1640F9:: @ 81640F9 multichoice 0, 0, 67, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -174,7 +174,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1640F9:: @ 81640F9 Route124_DivingTreasureHuntersHouse_EventScript_16412A:: @ 816412A multichoice 0, 0, 68, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 @@ -184,7 +184,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_16412A:: @ 816412A Route124_DivingTreasureHuntersHouse_EventScript_164166:: @ 8164166 multichoice 0, 0, 69, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -193,7 +193,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164166:: @ 8164166 Route124_DivingTreasureHuntersHouse_EventScript_164197:: @ 8164197 multichoice 0, 0, 70, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 @@ -203,7 +203,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164197:: @ 8164197 Route124_DivingTreasureHuntersHouse_EventScript_1641D3:: @ 81641D3 multichoice 0, 0, 71, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 @@ -213,7 +213,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1641D3:: @ 81641D3 Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F multichoice 0, 0, 72, 0 - switch RESULT + switch VAR_RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164274 @@ -223,49 +223,49 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar VAR_SPECIAL_8, ITEM_RED_SHARD - setvar VAR_SPECIAL_9, ITEM_FIRE_STONE + setvar VAR_0x8008, ITEM_RED_SHARD + setvar VAR_0x8009, ITEM_FIRE_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar VAR_SPECIAL_8, ITEM_YELLOW_SHARD - setvar VAR_SPECIAL_9, ITEM_THUNDER_STONE + setvar VAR_0x8008, ITEM_YELLOW_SHARD + setvar VAR_0x8009, ITEM_THUNDER_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar VAR_SPECIAL_8, ITEM_BLUE_SHARD - setvar VAR_SPECIAL_9, ITEM_WATER_STONE + setvar VAR_0x8008, ITEM_BLUE_SHARD + setvar VAR_0x8009, ITEM_WATER_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar VAR_SPECIAL_8, ITEM_GREEN_SHARD - setvar VAR_SPECIAL_9, ITEM_LEAF_STONE + setvar VAR_0x8008, ITEM_GREEN_SHARD + setvar VAR_0x8009, ITEM_LEAF_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitemname 0, VAR_SPECIAL_8 - bufferitemname 1, VAR_SPECIAL_9 + bufferitemname 0, VAR_0x8008 + bufferitemname 1, VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F - checkitemspace VAR_SPECIAL_9, 1 - compare RESULT, 1 + checkitemspace VAR_0x8009, 1 + compare VAR_RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - checkitem VAR_SPECIAL_8, 2 - compare RESULT, 0 + checkitem VAR_0x8008, 2 + compare VAR_RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - takeitem VAR_SPECIAL_8, 1 - giveitem_std VAR_SPECIAL_9 + takeitem VAR_0x8008, 1 + giveitem_std VAR_0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json index daa715f90..1257bc3f3 100644 --- a/data/maps/Route125/map.json +++ b/data/maps/Route125/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 46, "y": 9, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 9, "y": 32, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 31, "y": 33, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 39, "y": 20, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 23, "y": 28, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 20, "y": 21, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 21, "y": 21, "elevation": 3, @@ -154,4 +154,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE4_2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 4ff30f363..3e1febd5d 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -28,8 +28,8 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, TRAINER_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json index 568a30c4d..0b1f067d0 100644 --- a/data/maps/Route126/map.json +++ b/data/maps/Route126/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 55, "y": 22, "elevation": 1, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 33, "y": 63, "elevation": 1, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 49, "elevation": 1, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 64, "y": 44, "elevation": 1, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 1, "elevation": 3, @@ -96,4 +96,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json index d7aeede26..cf1d10919 100644 --- a/data/maps/Route127/map.json +++ b/data/maps/Route127/map.json @@ -33,7 +33,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 18, "y": 68, "elevation": 1, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 45, "y": 44, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 7, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "FLAG_ITEM_ROUTE127_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 64, "y": 39, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "FLAG_ITEM_ROUTE127_2" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 53, "y": 13, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 52, "y": 25, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 64, "y": 19, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 12, "y": 18, "elevation": 3, @@ -137,7 +137,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 63, "y": 63, "elevation": 3, @@ -189,4 +189,4 @@ "secret_base_id": "SECRET_BASE_YELLOW_CAVE1_3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json index f660ca061..ffeeea577 100644 --- a/data/maps/Route128/map.json +++ b/data/maps/Route128/map.json @@ -33,7 +33,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 77, "y": 24, "elevation": 1, @@ -46,7 +46,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 35, "y": 34, "elevation": 1, @@ -59,7 +59,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 40, "y": 22, "elevation": 3, @@ -72,7 +72,7 @@ "flag": "FLAG_HIDE_STEVEN_ROUTE128" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 37, "y": 22, "elevation": 3, @@ -85,7 +85,7 @@ "flag": "FLAG_HIDE_EVIL_LEADER_ROUTE128" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 38, "y": 21, "elevation": 3, @@ -98,7 +98,7 @@ "flag": "FLAG_HIDE_OTHER_LEADER_ROUTE128" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 63, "y": 28, "elevation": 3, @@ -111,7 +111,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 24, "y": 8, "elevation": 3, @@ -124,7 +124,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 47, "y": 9, "elevation": 3, @@ -165,4 +165,4 @@ "flag": "FLAG_HIDDEN_ITEM_5E" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index 12d9bace5..3b3522a6f 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -181,8 +181,8 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, TRAINER_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 end @@ -194,8 +194,8 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, TRAINER_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 end diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json index 2e82703ce..49c90b05f 100644 --- a/data/maps/Route129/map.json +++ b/data/maps/Route129/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 15, "y": 23, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 35, "y": 9, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 14, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 28, "y": 16, "elevation": 1, @@ -78,4 +78,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route130/map.json b/data/maps/Route130/map.json index 9dee253e1..050f1dd3b 100644 --- a/data/maps/Route130/map.json +++ b/data/maps/Route130/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 26, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 68, "y": 22, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BERRY_TREE", + "graphics_id": "OBJ_EVENT_GFX_BERRY_TREE", "x": 52, "y": 9, "elevation": 3, @@ -65,4 +65,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 70eace112..a1e7b27d4 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -3,8 +3,8 @@ Route130_MapScripts:: @ 81523C2 .byte 0 Route130_MapScript1_1523C8:: @ 81523C8 - specialvar RESULT, IsMirageIslandPresent - compare RESULT, 1 + specialvar VAR_RESULT, IsMirageIslandPresent + compare VAR_RESULT, 1 goto_if_eq Route130_EventScript_15240C setflag FLAG_TEMP_11 setflag FLAG_TEMP_12 diff --git a/data/maps/Route131/map.json b/data/maps/Route131/map.json index cedfcb2a5..b8475d8e7 100644 --- a/data/maps/Route131/map.json +++ b/data/maps/Route131/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 17, "y": 25, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 36, "y": 26, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 33, "y": 28, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 45, "y": 23, "elevation": 1, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 9, "y": 16, "elevation": 1, @@ -88,7 +88,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TUBER_M_SWIMMING", + "graphics_id": "OBJ_EVENT_GFX_TUBER_M_SWIMMING", "x": 8, "y": 16, "elevation": 1, @@ -112,4 +112,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route132/map.json b/data/maps/Route132/map.json index 0bbc25537..126e33093 100644 --- a/data/maps/Route132/map.json +++ b/data/maps/Route132/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 7, "y": 3, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 41, "y": 16, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 10, "y": 11, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_ITEM_ROUTE132_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 46, "y": 28, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 9, "y": 16, "elevation": 3, @@ -91,4 +91,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route133/map.json b/data/maps/Route133/map.json index d0f5c04a1..a62b50133 100644 --- a/data/maps/Route133/map.json +++ b/data/maps/Route133/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 6, "y": 4, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 68, "y": 24, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 69, "y": 24, "elevation": 1, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 58, "y": 15, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_ITEM_ROUTE133_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 8, "y": 10, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_ITEM_ROUTE133_2" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 37, "y": 16, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 7, "y": 14, "elevation": 3, @@ -117,4 +117,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Route134/map.json b/data/maps/Route134/map.json index 1db9b4559..13cef0f1b 100644 --- a/data/maps/Route134/map.json +++ b/data/maps/Route134/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_M", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_M", "x": 52, "y": 9, "elevation": 1, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SWIMMER_F", + "graphics_id": "OBJ_EVENT_GFX_SWIMMER_F", "x": 45, "y": 5, "elevation": 1, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 41, "y": 23, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 65, "y": 14, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 56, "y": 16, "elevation": 3, @@ -91,4 +91,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index eed60f018..f08944375 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 22, "y": 34, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 13, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 25, "y": 37, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 21, "y": 46, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 12, "y": 45, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 26, "y": 23, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_2", "x": 24, "y": 51, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 25, "y": 51, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 30, "y": 10, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_DEVON_RUSTBORO" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 21, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_GRUNT_RUSTBORO" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 13, "y": 34, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 36, "y": 51, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "FLAG_ITEM_RUSTBORO_1" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 19, "y": 27, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 16, "y": 50, "elevation": 3, @@ -497,4 +497,4 @@ "script": "RustboroCity_EventScript_14C440" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 72699ab79..710b8c700 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -123,7 +123,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar VAR_SPECIAL_4, 0 + setvar VAR_0x8004, 0 goto RustboroCity_EventScript_14C4F4 end @@ -131,7 +131,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar VAR_SPECIAL_4, 1 + setvar VAR_0x8004, 1 goto RustboroCity_EventScript_14C4F4 end @@ -139,7 +139,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 goto RustboroCity_EventScript_14C4F4 end @@ -147,7 +147,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar VAR_SPECIAL_4, 3 + setvar VAR_0x8004, 3 goto RustboroCity_EventScript_14C4F4 end @@ -155,7 +155,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar VAR_SPECIAL_4, 4 + setvar VAR_0x8004, 4 goto RustboroCity_EventScript_14C4F4 end @@ -465,7 +465,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D call_if_eq RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage @@ -547,9 +547,9 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA faceplayer goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq RustboroCity_EventScript_14C90A end @@ -567,9 +567,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq RustboroCity_EventScript_14C939 end diff --git a/data/maps/RustboroCity_CuttersHouse/map.json b/data/maps/RustboroCity_CuttersHouse/map.json index d3de8eede..275bbdf3f 100644 --- a/data/maps/RustboroCity_CuttersHouse/map.json +++ b/data/maps/RustboroCity_CuttersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 9, "y": 2, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.json b/data/maps/RustboroCity_DevonCorp_1F/map.json index 8958b1f0d..79c98cb82 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/map.json +++ b/data/maps/RustboroCity_DevonCorp_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 2, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 15, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 5, "y": 3, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.json b/data/maps/RustboroCity_DevonCorp_2F/map.json index fa0083821..366aa436f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/map.json +++ b/data/maps/RustboroCity_DevonCorp_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 1, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 2, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 5, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 14, "y": 8, "elevation": 3, @@ -95,4 +95,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index e0b0e30f8..92c16e002 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -68,10 +68,10 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 checkitem ITEM_CLAW_FOSSIL, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE release end @@ -84,7 +84,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -102,7 +102,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -133,9 +133,9 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 bufferspeciesname 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 getpartysize - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar VAR_SPECIAL_4, RESULT + copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare MUS_FANFA4 @@ -144,7 +144,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 waitmessage givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -153,9 +153,9 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 bufferspeciesname 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 getpartysize - compare RESULT, 6 + compare VAR_RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar VAR_SPECIAL_4, RESULT + copyvar VAR_0x8004, VAR_RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare MUS_FANFA4 @@ -164,7 +164,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 waitmessage givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.json b/data/maps/RustboroCity_DevonCorp_3F/map.json index f0ee24e39..cf7d992ee 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/map.json +++ b/data/maps/RustboroCity_DevonCorp_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 17, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 15, "y": 5, "elevation": 3, @@ -79,4 +79,4 @@ "script": "RustboroCity_DevonCorp_3F_EventScript_1578CF" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index cead5e5a2..e8d2f4d68 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -150,7 +150,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closemessage - applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D waitmovement 0 release end @@ -158,12 +158,12 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 giveitem_std ITEM_EXP_SHARE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 closemessage - applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D waitmovement 0 release end @@ -171,7 +171,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4 closemessage - applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D waitmovement 0 release end diff --git a/data/maps/RustboroCity_Flat1_1F/map.json b/data/maps/RustboroCity_Flat1_1F/map.json index c31c09f47..d8e7ffa22 100644 --- a/data/maps/RustboroCity_Flat1_1F/map.json +++ b/data/maps/RustboroCity_Flat1_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 9, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 12, "y": 4, "elevation": 3, @@ -63,4 +63,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat1_2F/map.json b/data/maps/RustboroCity_Flat1_2F/map.json index 357559246..b262445ea 100644 --- a/data/maps/RustboroCity_Flat1_2F/map.json +++ b/data/maps/RustboroCity_Flat1_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 6, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_1F/map.json b/data/maps/RustboroCity_Flat2_1F/map.json index e458782d3..1477e2433 100644 --- a/data/maps/RustboroCity_Flat2_1F/map.json +++ b/data/maps/RustboroCity_Flat2_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 11, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 8, "y": 4, "elevation": 3, @@ -63,4 +63,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_2F/map.json b/data/maps/RustboroCity_Flat2_2F/map.json index 08c2f98b6..c99e411c5 100644 --- a/data/maps/RustboroCity_Flat2_2F/map.json +++ b/data/maps/RustboroCity_Flat2_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 11, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 7, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index 5ed9ac0ef..c100687a2 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -11,7 +11,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem_std ITEM_PREMIER_BALL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release diff --git a/data/maps/RustboroCity_Flat2_3F/map.json b/data/maps/RustboroCity_Flat2_3F/map.json index 1bc864ba9..5a5be9a55 100644 --- a/data/maps/RustboroCity_Flat2_3F/map.json +++ b/data/maps/RustboroCity_Flat2_3F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_7", + "graphics_id": "OBJ_EVENT_GFX_MAN_7", "x": 7, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_1", "x": 12, "y": 2, "elevation": 3, @@ -49,4 +49,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Gym/map.json b/data/maps/RustboroCity_Gym/map.json index 2593b63a1..e20a3125b 100644 --- a/data/maps/RustboroCity_Gym/map.json +++ b/data/maps/RustboroCity_Gym/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ROXANNE", + "graphics_id": "OBJ_EVENT_GFX_ROXANNE", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 3, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 3, "y": 17, "elevation": 3, @@ -99,4 +99,4 @@ "script": "RustboroCity_Gym_EventScript_1579BD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 9c379107f..f1eb9d171 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -17,7 +17,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setflag FLAG_BADGE01_GET setvar VAR_RUSTBORO_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1 - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq RustboroCity_Gym_EventScript_1A00FB @@ -26,7 +26,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem_std ITEM_TM39_ROCK_TOMB - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_184170, 4 diff --git a/data/maps/RustboroCity_House1/map.json b/data/maps/RustboroCity_House1/map.json index d0a4a6952..5886df257 100644 --- a/data/maps/RustboroCity_House1/map.json +++ b/data/maps/RustboroCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 6, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 9, "y": 2, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index abbac505b..f49581ef9 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -5,25 +5,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_157D13 - setvar VAR_SPECIAL_8, 0 - copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, GetInGameTradeSpeciesInfo - copyvar VAR_SPECIAL_9, RESULT + setvar VAR_0x8008, 0 + copyvar VAR_0x8004, VAR_0x8008 + specialvar VAR_RESULT, GetInGameTradeSpeciesInfo + copyvar VAR_0x8009, VAR_RESULT msgbox RustboroCity_House1_Text_184EBA, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq RustboroCity_House1_EventScript_157CFB special SelectMonForNPCTrade waitstate - copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 - compare VAR_SPECIAL_4, 255 + copyvar VAR_0x800A, VAR_0x8004 + compare VAR_0x8004, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB - copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, GetTradeSpecies - copyvar VAR_SPECIAL_B, RESULT - compare RESULT, VAR_SPECIAL_9 + copyvar VAR_0x8005, VAR_0x800A + specialvar VAR_RESULT, GetTradeSpecies + copyvar VAR_0x800B, VAR_RESULT + compare VAR_RESULT, VAR_0x8009 goto_if_ne RustboroCity_House1_EventScript_157D05 - copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - copyvar VAR_SPECIAL_5, VAR_SPECIAL_A + copyvar VAR_0x8004, VAR_0x8008 + copyvar VAR_0x8005, VAR_0x800A special CreateInGameTradePokemon special DoInGameTradeScene waitstate @@ -38,7 +38,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferspeciesname 0, VAR_SPECIAL_9 + bufferspeciesname 0, VAR_0x8009 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/maps/RustboroCity_House2/map.json b/data/maps/RustboroCity_House2/map.json index bb13d157c..32e0585bc 100644 --- a/data/maps/RustboroCity_House2/map.json +++ b/data/maps/RustboroCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 4, "y": 5, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_House3/map.json b/data/maps/RustboroCity_House3/map.json index 4c85ea665..5aa5ad3cb 100644 --- a/data/maps/RustboroCity_House3/map.json +++ b/data/maps/RustboroCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 4, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 7, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_Mart/map.json b/data/maps/RustboroCity_Mart/map.json index b8ec482f2..ddd770acc 100644 --- a/data/maps/RustboroCity_Mart/map.json +++ b/data/maps/RustboroCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 2, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 8, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BUG_CATCHER", + "graphics_id": "OBJ_EVENT_GFX_BUG_CATCHER", "x": 8, "y": 2, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_1F/map.json b/data/maps/RustboroCity_PokemonCenter_1F/map.json index 84658ac3d..0db82f965 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 11, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 3, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 10, "y": 6, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index c0bb5c2dd..6da36aef8 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/RustboroCity_PokemonCenter_2F/map.json b/data/maps/RustboroCity_PokemonCenter_2F/map.json index b15b76dee..d4c0a47f8 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/map.json +++ b/data/maps/RustboroCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonSchool/map.json b/data/maps/RustboroCity_PokemonSchool/map.json index c313a32a8..c83fe43e1 100644 --- a/data/maps/RustboroCity_PokemonSchool/map.json +++ b/data/maps/RustboroCity_PokemonSchool/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 8, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_5", + "graphics_id": "OBJ_EVENT_GFX_BOY_5", "x": 9, "y": 6, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 3, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 10, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 3, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 5, "y": 3, "elevation": 3, @@ -149,4 +149,4 @@ "script": "RustboroCity_PokemonSchool_EventScript_157AC5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index f8193cbb8..467a62b04 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -11,7 +11,7 @@ RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 message RustboroCity_PokemonSchool_Text_184368 waitmessage multichoicegrid 8, 1, 13, 3, 0 - switch RESULT + switch VAR_RESULT case 0, RustboroCity_PokemonSchool_EventScript_157A50 case 1, RustboroCity_PokemonSchool_EventScript_157A5E case 2, RustboroCity_PokemonSchool_EventScript_157A6C @@ -78,35 +78,35 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE lock faceplayer goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem_std ITEM_QUICK_CLAW - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closemessage - applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmovement 0 setflag FLAG_RECEIVED_QUICK_CLAW release end RustboroCity_PokemonSchool_EventScript_157B1E:: @ 8157B1E - applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60 waitmovement 0 return RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 - applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49 waitmovement 0 return RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 msgbox RustboroCity_PokemonSchool_Text_184737, 4 closemessage - applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmovement 0 release end diff --git a/data/maps/RusturfTunnel/map.json b/data/maps/RusturfTunnel/map.json index 735f458e9..517180038 100644 --- a/data/maps/RusturfTunnel/map.json +++ b/data/maps/RusturfTunnel/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 23, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 3, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_ITEM_RUSTURF_TUNNEL_2" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 5, "y": 4, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_BRINEY_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_GRUNT_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 14, "y": 4, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_PEEKO_RUSTURF_TUNNEL" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 24, "y": 4, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 32, "y": 13, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 25, "y": 4, "elevation": 3, @@ -213,4 +213,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 6c3f759cc..0e3c71b22 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -24,7 +24,7 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 faceplayer msgbox RusturfTunnel_Text_194766, 4 closemessage - applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D waitmovement 0 release end @@ -36,7 +36,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_1944C5, 4 closemessage - applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D waitmovement 0 release end @@ -44,7 +44,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 RusturfTunnel_EventScript_15C7BC:: @ 815C7BC msgbox RusturfTunnel_Text_1945B2, 4 closemessage - applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D waitmovement 0 release end diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json index 96a71a548..a9dc2e319 100644 --- a/data/maps/SSTidalCorridor/map.json +++ b/data/maps/SSTidalCorridor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 1, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 16, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 9, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL" }, { - "graphics_id": "EVENT_OBJ_GFX_WINGULL", + "graphics_id": "OBJ_EVENT_GFX_WINGULL", "x": 7, "y": 2, "elevation": 3, @@ -228,4 +228,4 @@ "script": "SSTidalCorridor_EventScript_15FDCD" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json index 32427e217..2d39a4738 100644 --- a/data/maps/SSTidalLowerDeck/map.json +++ b/data/maps/SSTidalLowerDeck/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 10, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 7, "y": 4, "elevation": 3, @@ -58,4 +58,4 @@ "flag": "FLAG_HIDDEN_ITEM_23" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json index dae890edb..26b8ea700 100644 --- a/data/maps/SSTidalRooms/map.json +++ b/data/maps/SSTidalRooms/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 34, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 21, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 7, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 13, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 22, "y": 11, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 15, "y": 6, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 28, "y": 5, "elevation": 3, @@ -221,4 +221,4 @@ "script": "SSTidalRooms_EventScript_15FF47" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 52927d54e..fd7854875 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -7,7 +7,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem_std ITEM_TM49_SNATCH - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_199C1A, 4 diff --git a/data/maps/SafariZone_Northeast/map.json b/data/maps/SafariZone_Northeast/map.json index b55b4b17d..162bab045 100644 --- a/data/maps/SafariZone_Northeast/map.json +++ b/data/maps/SafariZone_Northeast/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 22, "y": 9, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 6, "y": 29, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 25, "y": 10, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 25, "y": 13, "elevation": 3, @@ -75,7 +75,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 28, "y": 14, "elevation": 3, @@ -88,7 +88,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 23, "y": 6, "elevation": 3, @@ -101,7 +101,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 7, "elevation": 3, @@ -114,7 +114,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 27, "y": 7, "elevation": 3, @@ -127,7 +127,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 6, "elevation": 3, @@ -143,4 +143,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Northwest/map.json b/data/maps/SafariZone_Northwest/map.json index 7ce5e066a..a978577ff 100644 --- a/data/maps/SafariZone_Northwest/map.json +++ b/data/maps/SafariZone_Northwest/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 8, "y": 8, "elevation": 5, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 33, "y": 7, "elevation": 3, @@ -52,4 +52,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_RestHouse/map.json b/data/maps/SafariZone_RestHouse/map.json index 75441b275..e1e4f1376 100644 --- a/data/maps/SafariZone_RestHouse/map.json +++ b/data/maps/SafariZone_RestHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 7, "y": 4, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PSYCHIC_M", + "graphics_id": "OBJ_EVENT_GFX_PSYCHIC_M", "x": 8, "y": 4, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 2, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Southeast/map.json b/data/maps/SafariZone_Southeast/map.json index 4a221659e..c21f3a5ee 100644 --- a/data/maps/SafariZone_Southeast/map.json +++ b/data/maps/SafariZone_Southeast/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 32, "y": 34, "elevation": 4, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 26, "y": 28, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_5", + "graphics_id": "OBJ_EVENT_GFX_MAN_5", "x": 16, "y": 6, "elevation": 5, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_YOUNGSTER", + "graphics_id": "OBJ_EVENT_GFX_YOUNGSTER", "x": 15, "y": 31, "elevation": 3, @@ -86,4 +86,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc index d7d581891..e989748b1 100644 --- a/data/maps/SafariZone_Southeast/scripts.inc +++ b/data/maps/SafariZone_Southeast/scripts.inc @@ -55,7 +55,7 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 compare VAR_TEMP_1, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release @@ -70,7 +70,7 @@ SafariZone_Southeast_EventScript_1600D1:: @ 81600D1 SafariZone_Southeast_EventScript_1600E0:: @ 81600E0 msgbox SafariZone_Southeast_Text_1C3ACA, 4 closemessage - switch FACING + switch VAR_FACING case 2, SafariZone_Southeast_EventScript_160105 case 4, SafariZone_Southeast_EventScript_16011F end diff --git a/data/maps/SafariZone_Southwest/map.json b/data/maps/SafariZone_Southwest/map.json index aa8783ee7..149fb1d6d 100644 --- a/data/maps/SafariZone_Southwest/map.json +++ b/data/maps/SafariZone_Southwest/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 22, "y": 9, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 0, "y": 37, "elevation": 3, @@ -69,4 +69,4 @@ "script": "SafariZone_Southwest_EventScript_16002D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ScorchedSlab/map.json b/data/maps/ScorchedSlab/map.json index 21620a3ff..d77f55591 100644 --- a/data/maps/ScorchedSlab/map.json +++ b/data/maps/ScorchedSlab/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 7, "y": 5, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json index 0aadf9e82..36b4b7c67 100644 --- a/data/maps/SeafloorCavern_Entrance/map.json +++ b/data/maps/SeafloorCavern_Entrance/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index a112c7687..1ff3e10d6 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 5, "y": 10, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 15, "y": 10, "elevation": 3, @@ -102,4 +102,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room2/map.json b/data/maps/SeafloorCavern_Room2/map.json index bfaaa3348..6f118a1b6 100644 --- a/data/maps/SeafloorCavern_Room2/map.json +++ b/data/maps/SeafloorCavern_Room2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 14, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 6, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 14, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 11, "y": 9, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 7, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 15, "y": 11, "elevation": 3, @@ -161,4 +161,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index c2e2e3ecf..f31764448 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 13, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 11, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 11, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 10, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 8, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 9, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 9, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 9, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 10, "y": 5, "elevation": 3, @@ -167,4 +167,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 98bd188b9..28f00360b 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 4, "y": 8, "elevation": 3, @@ -57,4 +57,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room5/map.json b/data/maps/SeafloorCavern_Room5/map.json index 111cbb4cd..85ba5add7 100644 --- a/data/maps/SeafloorCavern_Room5/map.json +++ b/data/maps/SeafloorCavern_Room5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 11, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 11, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 11, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 3, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 13, "y": 8, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 12, "y": 8, "elevation": 3, @@ -115,4 +115,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room6/map.json b/data/maps/SeafloorCavern_Room6/map.json index b94b49f3f..a554c7531 100644 --- a/data/maps/SeafloorCavern_Room6/map.json +++ b/data/maps/SeafloorCavern_Room6/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room7/map.json b/data/maps/SeafloorCavern_Room7/map.json index 2ec32dfe6..700c3107f 100644 --- a/data/maps/SeafloorCavern_Room7/map.json +++ b/data/maps/SeafloorCavern_Room7/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room8/map.json b/data/maps/SeafloorCavern_Room8/map.json index 0025aa4ff..4c143b175 100644 --- a/data/maps/SeafloorCavern_Room8/map.json +++ b/data/maps/SeafloorCavern_Room8/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 6, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_15" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 5, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 5, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_18" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 3, "y": 4, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 4, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 6, "y": 4, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 7, "y": 4, "elevation": 3, @@ -186,4 +186,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 922ca110b..e308633ec 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 17, "y": 38, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 9, "y": 42, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 9, "y": 42, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 8, "y": 41, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 8, "y": 42, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 14, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 17, "y": 38, "elevation": 3, @@ -124,4 +124,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index d50a591f7..6d6b58be8 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -14,10 +14,10 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA lockall - setvar VAR_SPECIAL_4, 2 - setvar VAR_SPECIAL_5, 3 - setvar VAR_SPECIAL_6, 4 - setvar VAR_SPECIAL_7, 5 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 5 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 applymovement 255, SeafloorCavern_Room9_Movement_15DD68 @@ -28,24 +28,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif closemessage - addobject VAR_SPECIAL_4 + addobject VAR_0x8004 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD36 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_15DD36 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41D5, 4 .else msgbox SeafloorCavern_Room9_Text_1B486C, 4 .endif - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, 4 .else msgbox SeafloorCavern_Room9_Text_1B4897, 4 .endif - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0839 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0839 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4289, 4 @@ -74,9 +74,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA special WaitWeather waitstate .ifdef SAPPHIRE - setvar RESULT, 1 + setvar VAR_RESULT, 1 .else - setvar RESULT, 0 + setvar VAR_RESULT, 0 .endif playse SE_W197 setfieldeffectargument 0, 16 @@ -85,14 +85,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA dofieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE .ifdef SAPPHIRE - setvar RESULT, 0 + setvar VAR_RESULT, 0 .else - setvar RESULT, 1 + setvar VAR_RESULT, 1 .endif playfanfare MUS_ME_TAMA playse SE_TAMA special sub_80818A4 - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0841 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 delay 150 @@ -104,23 +104,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA waitmovement 0 special sub_80818FC waitstate - setvar VAR_SPECIAL_4, 1 - setvar VAR_SPECIAL_5, 1 + setvar VAR_0x8004, 1 + setvar VAR_0x8005, 1 special sub_810F758 waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 removeobject 1 delay 4 - setvar VAR_SPECIAL_4, 2 - setvar VAR_SPECIAL_5, 2 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 2 special sub_810F758 waitstate delay 30 - setvar VAR_SPECIAL_4, 2 - setvar VAR_SPECIAL_5, 3 - setvar VAR_SPECIAL_6, 4 - setvar VAR_SPECIAL_7, 5 + setvar VAR_0x8004, 2 + setvar VAR_0x8005, 3 + setvar VAR_0x8006, 4 + setvar VAR_0x8007, 5 .ifdef SAPPHIRE msgbox UnknownString_81B43F2, 4 .else @@ -135,7 +135,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif closemessage - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD41 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_15DD41 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B447A, 4 @@ -145,7 +145,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA closemessage playse SE_PC_OFF delay 20 - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0845 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B45C6, 4 @@ -153,14 +153,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif closemessage - addobject VAR_SPECIAL_5 - addobject VAR_SPECIAL_6 - addobject VAR_SPECIAL_7 - applymovement VAR_SPECIAL_7, SeafloorCavern_Room9_Movement_15DD63 - applymovement VAR_SPECIAL_6, SeafloorCavern_Room9_Movement_15DD63 - applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD5A + addobject VAR_0x8005 + addobject VAR_0x8006 + addobject VAR_0x8007 + applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_15DD5A waitmovement 0 - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A083F + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B464D, 4 @@ -168,9 +168,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif playse SE_PIN - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0835 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, 4 @@ -183,8 +183,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif closemessage - applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60 - applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD46 + applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_15DD60 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_15DD46 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4818, 4 diff --git a/data/maps/SealedChamber_InnerRoom/map.json b/data/maps/SealedChamber_InnerRoom/map.json index f7665694e..585bb90d0 100644 --- a/data/maps/SealedChamber_InnerRoom/map.json +++ b/data/maps/SealedChamber_InnerRoom/map.json @@ -95,4 +95,4 @@ "script": "SealedChamber_InnerRoom_EventScript_15F1E8" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 11aba3ac8..c8d4929b9 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -7,8 +7,8 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 waitbuttonpress erasebox 0, 0, 29, 19 goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_15F247 - specialvar RESULT, CheckRelicanthWailord - compare RESULT, 0 + specialvar VAR_RESULT, CheckRelicanthWailord + compare VAR_RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 playse SE_TRACK_MOVE diff --git a/data/maps/SealedChamber_OuterRoom/map.json b/data/maps/SealedChamber_OuterRoom/map.json index f689c055d..c2c74b930 100644 --- a/data/maps/SealedChamber_OuterRoom/map.json +++ b/data/maps/SealedChamber_OuterRoom/map.json @@ -255,4 +255,4 @@ "script": "SealedChamber_OuterRoom_EventScript_15F1D9" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json index b537b704e..1100ada56 100644 --- a/data/maps/SecretBase_BlueCave1/map.json +++ b/data/maps/SecretBase_BlueCave1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json index 52c57c24b..8b3b35721 100644 --- a/data/maps/SecretBase_BlueCave2/map.json +++ b/data/maps/SecretBase_BlueCave2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 2, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json index 09728d252..11ab94ef5 100644 --- a/data/maps/SecretBase_BlueCave3/map.json +++ b/data/maps/SecretBase_BlueCave3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json index 50ee51d18..ce0338ac4 100644 --- a/data/maps/SecretBase_BlueCave4/map.json +++ b/data/maps/SecretBase_BlueCave4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 13, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json index cb5e4a4ad..4df7c9b36 100644 --- a/data/maps/SecretBase_BrownCave1/map.json +++ b/data/maps/SecretBase_BrownCave1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json index 14970984c..f96c7ac37 100644 --- a/data/maps/SecretBase_BrownCave2/map.json +++ b/data/maps/SecretBase_BrownCave2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 11, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json index 2bf0b85f3..b1c136f37 100644 --- a/data/maps/SecretBase_BrownCave3/map.json +++ b/data/maps/SecretBase_BrownCave3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json index 3430a9beb..348b19024 100644 --- a/data/maps/SecretBase_BrownCave4/map.json +++ b/data/maps/SecretBase_BrownCave4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 2, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json index 5d07a9a75..8ef1182dc 100644 --- a/data/maps/SecretBase_RedCave1/map.json +++ b/data/maps/SecretBase_RedCave1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 7, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json index a9aede8fe..9746434b2 100644 --- a/data/maps/SecretBase_RedCave2/map.json +++ b/data/maps/SecretBase_RedCave2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json index b7540e17e..4ea1ae21f 100644 --- a/data/maps/SecretBase_RedCave3/map.json +++ b/data/maps/SecretBase_RedCave3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 12, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json index 8e2720d9e..458d8e469 100644 --- a/data/maps/SecretBase_RedCave4/map.json +++ b/data/maps/SecretBase_RedCave4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json index e026ff3c4..4b314b856 100644 --- a/data/maps/SecretBase_Shrub1/map.json +++ b/data/maps/SecretBase_Shrub1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json index c74be4345..10463cf97 100644 --- a/data/maps/SecretBase_Shrub2/map.json +++ b/data/maps/SecretBase_Shrub2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 13, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json index b31391a90..cbbf64305 100644 --- a/data/maps/SecretBase_Shrub3/map.json +++ b/data/maps/SecretBase_Shrub3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json index adab91085..487c0f09f 100644 --- a/data/maps/SecretBase_Shrub4/map.json +++ b/data/maps/SecretBase_Shrub4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 9, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json index 643829a91..9fcb78bc3 100644 --- a/data/maps/SecretBase_Tree1/map.json +++ b/data/maps/SecretBase_Tree1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 5, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json index 943cca9d4..b7c0da914 100644 --- a/data/maps/SecretBase_Tree2/map.json +++ b/data/maps/SecretBase_Tree2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json index 6120fc2a5..349e340eb 100644 --- a/data/maps/SecretBase_Tree3/map.json +++ b/data/maps/SecretBase_Tree3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json index 40cffa28f..c6c0856cf 100644 --- a/data/maps/SecretBase_Tree4/map.json +++ b/data/maps/SecretBase_Tree4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 10, "y": 9, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json index 3c9a7af7c..ab18d10de 100644 --- a/data/maps/SecretBase_YellowCave1/map.json +++ b/data/maps/SecretBase_YellowCave1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 3, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json index e88ca5209..07481867c 100644 --- a/data/maps/SecretBase_YellowCave2/map.json +++ b/data/maps/SecretBase_YellowCave2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 1, "y": 1, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json index ab9b876b7..d1060d26d 100644 --- a/data/maps/SecretBase_YellowCave3/map.json +++ b/data/maps/SecretBase_YellowCave3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 7, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json index 0fbff9fb6..f717b2c88 100644 --- a/data/maps/SecretBase_YellowCave4/map.json +++ b/data/maps/SecretBase_YellowCave4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_F", + "graphics_id": "OBJ_EVENT_GFX_VAR_F", "x": 9, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_DECORATION_1" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 0, "y": 0, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_DECORATION_2" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 0, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_DECORATION_3" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_2", + "graphics_id": "OBJ_EVENT_GFX_VAR_2", "x": 0, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_DECORATION_4" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_3", + "graphics_id": "OBJ_EVENT_GFX_VAR_3", "x": 0, "y": 3, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_DECORATION_5" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_4", + "graphics_id": "OBJ_EVENT_GFX_VAR_4", "x": 0, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_DECORATION_6" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_5", + "graphics_id": "OBJ_EVENT_GFX_VAR_5", "x": 0, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_DECORATION_7" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 0, "y": 6, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_DECORATION_8" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_7", + "graphics_id": "OBJ_EVENT_GFX_VAR_7", "x": 1, "y": 0, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_DECORATION_9" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_8", + "graphics_id": "OBJ_EVENT_GFX_VAR_8", "x": 1, "y": 1, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_DECORATION_10" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_9", + "graphics_id": "OBJ_EVENT_GFX_VAR_9", "x": 1, "y": 2, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_DECORATION_11" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_A", + "graphics_id": "OBJ_EVENT_GFX_VAR_A", "x": 1, "y": 3, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_DECORATION_12" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_B", + "graphics_id": "OBJ_EVENT_GFX_VAR_B", "x": 1, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_DECORATION_13" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_C", + "graphics_id": "OBJ_EVENT_GFX_VAR_C", "x": 1, "y": 5, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "FLAG_DECORATION_14" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_D", + "graphics_id": "OBJ_EVENT_GFX_VAR_D", "x": 1, "y": 6, "elevation": 3, @@ -218,4 +218,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.json b/data/maps/ShoalCave_HighTideEntranceRoom/map.json index c6d66b6c3..3ae268fa1 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_HighTideEntranceRoom/map.json @@ -14,4 +14,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.json b/data/maps/ShoalCave_HighTideInnerRoom/map.json index 7226401ef..ef1f1487c 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/map.json +++ b/data/maps/ShoalCave_HighTideInnerRoom/map.json @@ -14,4 +14,4 @@ "warp_events": [], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.json b/data/maps/ShoalCave_LowTideEntranceRoom/map.json index 51848cfb4..cb85bc9d3 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/map.json +++ b/data/maps/ShoalCave_LowTideEntranceRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 30, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 18, "y": 15, "elevation": 3, @@ -70,4 +70,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 2005cb67b..76de79e6f 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -21,24 +21,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 dodailyevents call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 checkitem ITEM_SHOAL_SHELL, 4 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E106 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 takeitem ITEM_SHOAL_SALT, 4 takeitem ITEM_SHOAL_SHELL, 4 giveitem_std ITEM_SHELL_BELL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 setflag FLAG_TEMP_2 @@ -47,18 +47,18 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 ShoalCave_LowTideEntranceRoom_EventScript_15E106:: @ 815E106 checkitem ITEM_SHOAL_SALT, 5 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E117 return ShoalCave_LowTideEntranceRoom_EventScript_15E117:: @ 815E117 checkitem ITEM_SHOAL_SHELL, 5 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E128 return ShoalCave_LowTideEntranceRoom_EventScript_15E128:: @ 815E128 - setvar RESULT, 2 + setvar VAR_RESULT, 2 return ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E @@ -68,10 +68,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 checkitem ITEM_SHOAL_SALT, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 checkitem ITEM_SHOAL_SHELL, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 release diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.json b/data/maps/ShoalCave_LowTideIceRoom/map.json index e0f2701b5..614b0bd45 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/map.json +++ b/data/maps/ShoalCave_LowTideIceRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 8, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 12, "y": 21, "elevation": 4, @@ -49,4 +49,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.json b/data/maps/ShoalCave_LowTideInnerRoom/map.json index 8b9fbc81e..cb71337b8 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/map.json +++ b/data/maps/ShoalCave_LowTideInnerRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 26, "y": 14, "elevation": 5, @@ -134,4 +134,4 @@ "script": "ShoalCave_LowTideInnerRoom_EventScript_15E2F7" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 546481765..512de471c 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -63,7 +63,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -80,7 +80,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -92,7 +92,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -104,7 +104,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0 special DrawWholeMapView @@ -116,7 +116,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem_std ITEM_SHOAL_SALT - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView @@ -133,7 +133,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem_std ITEM_SHOAL_SALT - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.json b/data/maps/ShoalCave_LowTideLowerRoom/map.json index 4488b4dfa..4caad9c19 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/map.json +++ b/data/maps/ShoalCave_LowTideLowerRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 25, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 11, "y": 4, "elevation": 3, @@ -79,4 +79,4 @@ "script": "ShoalCave_LowTideLowerRoom_EventScript_15E413" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 19223a499..aa271034d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -18,7 +18,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem_std ITEM_SHOAL_SALT - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmetatile 18, 2, 858, 0 special DrawWholeMapView @@ -37,7 +37,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem_std ITEM_FOCUS_BAND - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag FLAG_RECEIVED_FOCUS_BAND release diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.json b/data/maps/ShoalCave_LowTideStairsRoom/map.json index 315d7b271..945c23cf5 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/map.json +++ b/data/maps/ShoalCave_LowTideStairsRoom/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 12, "elevation": 3, @@ -52,4 +52,4 @@ "script": "ShoalCave_LowTideStairsRoom_EventScript_15E3B7" } ] -}
\ No newline at end of file +} diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index f3a629582..3a935af56 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -18,7 +18,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem_std ITEM_SHOAL_SALT - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0 special DrawWholeMapView diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json index e961fcfc2..8d401f04f 100644 --- a/data/maps/SingleBattleColosseum/map.json +++ b/data/maps/SingleBattleColosseum/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 9, "y": 3, "elevation": 3, @@ -62,4 +62,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_1F/map.json b/data/maps/SkyPillar_1F/map.json index dee61d817..dc120c3b6 100644 --- a/data/maps/SkyPillar_1F/map.json +++ b/data/maps/SkyPillar_1F/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_2F/map.json b/data/maps/SkyPillar_2F/map.json index a46aea2de..9dc7b05de 100644 --- a/data/maps/SkyPillar_2F/map.json +++ b/data/maps/SkyPillar_2F/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_3F/map.json b/data/maps/SkyPillar_3F/map.json index 02ade47fd..712c1c490 100644 --- a/data/maps/SkyPillar_3F/map.json +++ b/data/maps/SkyPillar_3F/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_4F/map.json b/data/maps/SkyPillar_4F/map.json index 2c6b535ea..7d25f8c81 100644 --- a/data/maps/SkyPillar_4F/map.json +++ b/data/maps/SkyPillar_4F/map.json @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_5F/map.json b/data/maps/SkyPillar_5F/map.json index 3aff1cb3a..007456bfc 100644 --- a/data/maps/SkyPillar_5F/map.json +++ b/data/maps/SkyPillar_5F/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Entrance/map.json b/data/maps/SkyPillar_Entrance/map.json index 8a2810482..d0d984329 100644 --- a/data/maps/SkyPillar_Entrance/map.json +++ b/data/maps/SkyPillar_Entrance/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Outside/map.json b/data/maps/SkyPillar_Outside/map.json index 1985cc5e2..1d5b0d633 100644 --- a/data/maps/SkyPillar_Outside/map.json +++ b/data/maps/SkyPillar_Outside/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Top/map.json b/data/maps/SkyPillar_Top/map.json index f64a9bf89..edb7cb344 100644 --- a/data/maps/SkyPillar_Top/map.json +++ b/data/maps/SkyPillar_Top/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RAYQUAZA", + "graphics_id": "OBJ_EVENT_GFX_RAYQUAZA", "x": 14, "y": 6, "elevation": 3, @@ -36,4 +36,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 82149a4bc..d7d68c06a 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -7,7 +7,7 @@ SkyPillar_Top_MapScript1_15F308:: @ 815F308 end SkyPillar_Top_EventScript_15F312:: @ 815F312 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED return SkyPillar_Top_EventScript_15F316:: @ 815F316 diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json index 1207a96fd..537b4fbd3 100644 --- a/data/maps/SlateportCity/map.json +++ b/data/maps/SlateportCity/map.json @@ -28,7 +28,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 21, "y": 11, "elevation": 3, @@ -41,7 +41,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 35, "y": 27, "elevation": 3, @@ -54,7 +54,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 15, "y": 13, "elevation": 3, @@ -67,7 +67,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 26, "y": 29, "elevation": 3, @@ -80,7 +80,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 31, "y": 27, "elevation": 3, @@ -93,7 +93,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_COOK", + "graphics_id": "OBJ_EVENT_GFX_COOK", "x": 5, "y": 43, "elevation": 3, @@ -106,7 +106,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_2", "x": 20, "y": 37, "elevation": 3, @@ -119,7 +119,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 8, "y": 42, "elevation": 3, @@ -132,7 +132,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMERAMAN", + "graphics_id": "OBJ_EVENT_GFX_CAMERAMAN", "x": 29, "y": 13, "elevation": 3, @@ -145,7 +145,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 28, "y": 14, "elevation": 3, @@ -158,7 +158,7 @@ "flag": "FLAG_HIDE_GABBY_AND_TY_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 28, "y": 13, "elevation": 3, @@ -171,7 +171,7 @@ "flag": "FLAG_HIDE_STERN_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 35, "y": 36, "elevation": 3, @@ -184,7 +184,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 28, "y": 46, "elevation": 3, @@ -197,7 +197,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 50, "elevation": 3, @@ -210,7 +210,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 16, "y": 46, "elevation": 3, @@ -223,7 +223,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCHOOL_KID_M", + "graphics_id": "OBJ_EVENT_GFX_SCHOOL_KID_M", "x": 12, "y": 18, "elevation": 3, @@ -236,7 +236,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 24, "elevation": 3, @@ -249,7 +249,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 15, "y": 31, "elevation": 3, @@ -262,7 +262,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 30, "y": 27, "elevation": 3, @@ -275,7 +275,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 29, "y": 27, "elevation": 3, @@ -288,7 +288,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 6, "y": 38, "elevation": 3, @@ -301,7 +301,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 5, "y": 51, "elevation": 3, @@ -314,7 +314,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_6", + "graphics_id": "OBJ_EVENT_GFX_MAN_6", "x": 34, "y": 51, "elevation": 3, @@ -327,7 +327,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 47, "elevation": 3, @@ -340,7 +340,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 11, "y": 47, "elevation": 3, @@ -353,7 +353,7 @@ "flag": "FLAG_HIDE_TM_SALESMAN_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 5, "y": 47, "elevation": 3, @@ -366,7 +366,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 22, "y": 27, "elevation": 3, @@ -379,7 +379,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 23, "y": 27, "elevation": 3, @@ -392,7 +392,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 24, "y": 27, "elevation": 3, @@ -405,7 +405,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 21, "y": 26, "elevation": 3, @@ -418,7 +418,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 20, "y": 26, "elevation": 3, @@ -609,4 +609,4 @@ "script": "SlateportCity_EventScript_14BC3C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 5583762d3..1b5592f22 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M .else - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M .endif setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C @@ -66,11 +66,11 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 faceplayer bufferleadmonspeciesname 0 msgbox SlateportCity_Text_164682, 4 - specialvar RESULT, LeadMonHasEffortRibbon - compare RESULT, 1 + specialvar VAR_RESULT, LeadMonHasEffortRibbon + compare VAR_RESULT, 1 call_if_eq SlateportCity_EventScript_14BB35 - specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut - compare RESULT, 0 + specialvar VAR_RESULT, ScrSpecial_AreLeadMonEVsMaxedOut + compare VAR_RESULT, 0 call_if_eq SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 playfanfare MUS_FANFA4 @@ -283,9 +283,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 lock faceplayer msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq SlateportCity_EventScript_14BD28 - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq SlateportCity_EventScript_14BD31 release end diff --git a/data/maps/SlateportCity_ContestHall/map.json b/data/maps/SlateportCity_ContestHall/map.json index e9d393dc4..6084fcd54 100644 --- a/data/maps/SlateportCity_ContestHall/map.json +++ b/data/maps/SlateportCity_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 19, "y": 15, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 1, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_4", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_4", "x": 9, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CONTEST_JUDGE", + "graphics_id": "OBJ_EVENT_GFX_CONTEST_JUDGE", "x": 12, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 7, "y": 11, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 9, "y": 11, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 11, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 13, "y": 11, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 8, "y": 6, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 12, "y": 6, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 5, "y": 10, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 15, "y": 10, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 0, "y": 17, "elevation": 3, @@ -216,4 +216,4 @@ "script": "SlateportCity_ContestHall_EventScript_155671" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_ContestHall/scripts.inc b/data/maps/SlateportCity_ContestHall/scripts.inc index 5f6a3c15d..d4b43ee56 100644 --- a/data/maps/SlateportCity_ContestHall/scripts.inc +++ b/data/maps/SlateportCity_ContestHall/scripts.inc @@ -15,7 +15,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem_std ITEM_TM41_TORMENT - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_ContestHall_Text_17CE28, 4 diff --git a/data/maps/SlateportCity_ContestLobby/map.json b/data/maps/SlateportCity_ContestLobby/map.json index 9daed7053..bcb51b116 100644 --- a/data/maps/SlateportCity_ContestLobby/map.json +++ b/data/maps/SlateportCity_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 0, "y": 3, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 9, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_SLATEPORT" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 13, "y": 5, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 1, "y": 5, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 12, "y": 2, "elevation": 3, @@ -174,4 +174,4 @@ "script": "SlateportCity_ContestLobby_EventScript_15908D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc index 356b64518..3bf5a3d06 100644 --- a/data/maps/SlateportCity_ContestLobby/scripts.inc +++ b/data/maps/SlateportCity_ContestLobby/scripts.inc @@ -7,8 +7,8 @@ SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 end SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D - setvar VAR_SPECIAL_B, 7 - setvar CONTEST_RANK, 2 + setvar VAR_0x800B, 7 + setvar VAR_CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 special SetContestTrainerGfxIds diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json index 9dce77426..43aa2334c 100644 --- a/data/maps/SlateportCity_Harbor/map.json +++ b/data/maps/SlateportCity_Harbor/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 8, "y": 10, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 4, "y": 12, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 1, "y": 12, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_WORKERS_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 6, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_STERN_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 8, "y": 9, "elevation": 1, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 7, "y": 10, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 8, "y": 10, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR" }, { - "graphics_id": "EVENT_OBJ_GFX_SUBMARINE_SHADOW", + "graphics_id": "OBJ_EVENT_GFX_SUBMARINE_SHADOW", "x": 7, "y": 9, "elevation": 1, @@ -185,4 +185,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 872c70352..76f9379b1 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -23,25 +23,25 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B lockall - setvar VAR_SPECIAL_8, 0 + setvar VAR_0x8008, 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall - setvar VAR_SPECIAL_8, 1 + setvar VAR_0x8008, 1 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall - setvar VAR_SPECIAL_8, 2 + setvar VAR_0x8008, 2 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall - setvar VAR_SPECIAL_8, 3 + setvar VAR_0x8008, 3 applymovement 255, SlateportCity_Harbor_Movement_1560C2 waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 @@ -62,13 +62,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 7 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 - compare VAR_SPECIAL_8, 0 + compare VAR_0x8008, 0 call_if_eq SlateportCity_Harbor_EventScript_15605C - compare VAR_SPECIAL_8, 1 + compare VAR_0x8008, 1 call_if_eq SlateportCity_Harbor_EventScript_156071 - compare VAR_SPECIAL_8, 2 + compare VAR_0x8008, 2 call_if_eq SlateportCity_Harbor_EventScript_156086 - compare VAR_SPECIAL_8, 3 + compare VAR_0x8008, 3 call_if_eq SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage @@ -166,7 +166,7 @@ SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 msgbox SlateportCity_Harbor_Text_17FA73, 4 checkitem ITEM_SS_TICKET, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waitmessage @@ -175,7 +175,7 @@ SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD multichoicedefault 18, 6, 52, 2, 0 - switch RESULT + switch VAR_RESULT case 0, SlateportCity_Harbor_EventScript_15613F case 1, SlateportCity_Harbor_EventScript_156167 case 2, SlateportCity_Harbor_EventScript_1561DA @@ -189,7 +189,7 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_156196 @@ -200,7 +200,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F SlateportCity_Harbor_EventScript_156167:: @ 8156167 msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 @@ -217,17 +217,17 @@ SlateportCity_Harbor_EventScript_15618A:: @ 815618A SlateportCity_Harbor_EventScript_156196:: @ 8156196 msgbox SlateportCity_Harbor_Text_17FBB6, 4 closemessage - applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 + applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR - compare FACING, 2 + hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR + compare VAR_FACING, 2 call_if_eq SlateportCity_Harbor_EventScript_1561EF - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar VAR_SPECIAL_4, 5 + setvar VAR_0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E return @@ -273,7 +273,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closemessage - applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D + applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_1A083D waitmovement 0 release end @@ -298,7 +298,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F compare VAR_TEMP_1, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 @@ -318,7 +318,7 @@ SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7 SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 multichoice 0, 0, 46, 0 - switch RESULT + switch VAR_RESULT case 0, SlateportCity_Harbor_EventScript_1562EA case 1, SlateportCity_Harbor_EventScript_15632A case 2, SlateportCity_Harbor_EventScript_15636A @@ -327,10 +327,10 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem_std ITEM_DEEP_SEA_TOOTH - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 @@ -340,10 +340,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem_std ITEM_DEEP_SEA_SCALE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_House1/map.json index 795ccbcbe..596a3c7ad 100644 --- a/data/maps/SlateportCity_House1/map.json +++ b/data/maps/SlateportCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 7, "y": 5, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc index be2955937..589800008 100644 --- a/data/maps/SlateportCity_House1/scripts.inc +++ b/data/maps/SlateportCity_House1/scripts.inc @@ -5,9 +5,9 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B lock faceplayer msgbox SlateportCity_House1_Text_17D46A, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq SlateportCity_House1_EventScript_15569C - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special SelectMonForNPCTrade waitstate - compare VAR_SPECIAL_4, 255 + compare VAR_0x8004, 255 goto_if_ne SlateportCity_House1_EventScript_1556C9 - compare VAR_SPECIAL_4, 255 + compare VAR_0x8004, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -27,21 +27,21 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF end SlateportCity_House1_EventScript_1556C9:: @ 81556C9 - specialvar RESULT, ScriptGetPartyMonSpecies - compare RESULT, SPECIES_EGG + specialvar VAR_RESULT, ScriptGetPartyMonSpecies + compare VAR_RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C special TV_CopyNicknameToStringVar1AndEnsureTerminated special TV_CheckMonOTIDEqualsPlayerID - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - specialvar RESULT, MonOTNameMatchesPlayer + specialvar VAR_RESULT, MonOTNameMatchesPlayer special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq SlateportCity_House1_EventScript_155730 - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -58,9 +58,9 @@ SlateportCity_House1_EventScript_155726:: @ 8155726 SlateportCity_House1_EventScript_155730:: @ 8155730 msgbox SlateportCity_House1_Text_17D580, 4 call SlateportCity_House1_EventScript_1A0678 - specialvar RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged special TV_CopyNicknameToStringVar1AndEnsureTerminated - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 release diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House2/map.json index 0cbf020dc..93ff24a83 100644 --- a/data/maps/SlateportCity_House2/map.json +++ b/data/maps/SlateportCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 4, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 7, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc index 934fae153..986b27124 100644 --- a/data/maps/SlateportCity_House2/scripts.inc +++ b/data/maps/SlateportCity_House2/scripts.inc @@ -9,7 +9,7 @@ SlateportCity_House2_EventScript_156399:: @ 8156399 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq SlateportCity_House2_EventScript_1563B5 msgbox SlateportCity_House2_Text_180567, 4 release diff --git a/data/maps/SlateportCity_Mart/map.json b/data/maps/SlateportCity_Mart/map.json index e9d3cf528..cf4541605 100644 --- a/data/maps/SlateportCity_Mart/map.json +++ b/data/maps/SlateportCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 4, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 5, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.json b/data/maps/SlateportCity_OceanicMuseum_1F/map.json index d2cbbf046..7e88562c9 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 7, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 18, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 12, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 2, "y": 8, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 3, "y": 4, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 14, "y": 4, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 12, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 8, "y": 3, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 2, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 10, "y": 2, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 17, "y": 7, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 18, "y": 8, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 9, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 4, "elevation": 3, @@ -343,4 +343,4 @@ "script": "SlateportCity_OceanicMuseum_1F_EventScript_155C0D" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index cb65f1be5..0495e2b3c 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M .else - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M .endif end @@ -34,7 +34,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closemessage hidemoneybox 0, 0 @@ -45,7 +45,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A takemoney 0x32, 0 updatemoneybox 0, 0 @@ -164,14 +164,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem_std ITEM_TM46_THIEF - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag FLAG_RECEIVED_TM46 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closemessage - compare FACING, 2 + compare VAR_FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 - compare FACING, 2 + compare VAR_FACING, 2 goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_155CAD end diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.json b/data/maps/SlateportCity_OceanicMuseum_2F/map.json index 02de2a32f..578249d64 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/map.json +++ b/data/maps/SlateportCity_OceanicMuseum_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 13, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_6", + "graphics_id": "OBJ_EVENT_GFX_VAR_6", "x": 6, "y": 1, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 1, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 6, "y": 1, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 12, "y": 7, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 9, "y": 6, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_OCEANIC_MUSEUM_VISITORS" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 1, "y": 3, "elevation": 3, @@ -283,4 +283,4 @@ "script": "SlateportCity_OceanicMuseum_2F_EventScript_155F10" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 58e4ba240..569da9944 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -21,21 +21,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmovement 0 - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 - compare FACING, 4 + compare VAR_FACING, 4 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 - compare FACING, 4 + compare VAR_FACING, 4 call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmovement 0 - compare FACING, 1 + compare VAR_FACING, 1 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 - compare FACING, 3 + compare VAR_FACING, 3 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 @@ -78,7 +78,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 - setvar VAR_SPECIAL_4, 269 + setvar VAR_0x8004, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 closemessage @@ -266,7 +266,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4 closemessage - applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D + applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D waitmovement 0 release end diff --git a/data/maps/SlateportCity_PokemonCenter_1F/map.json b/data/maps/SlateportCity_PokemonCenter_1F/map.json index 1c4799881..67c8eb1e3 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 2, "y": 3, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 10, "y": 7, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index 1164e96d6..fef6401e7 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 end SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/SlateportCity_PokemonCenter_2F/map.json b/data/maps/SlateportCity_PokemonCenter_2F/map.json index 8b6acc885..0b97403b1 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/map.json +++ b/data/maps/SlateportCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json index ea2e9c2dd..0226b2688 100644 --- a/data/maps/SlateportCity_PokemonFanClub/map.json +++ b/data/maps/SlateportCity_PokemonFanClub/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 11, "y": 4, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 1, "y": 5, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_F", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_F", "x": 11, "y": 5, "elevation": 0, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 6, "y": 2, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 6, "y": 5, "elevation": 4, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ZIGZAGOON", + "graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON", "x": 3, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SKITTY", + "graphics_id": "OBJ_EVENT_GFX_SKITTY", "x": 8, "y": 3, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 10, "y": 8, "elevation": 3, @@ -134,4 +134,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 6a8c88e1e..b47b7b317 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -75,7 +75,7 @@ SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 checkitemspace ITEM_RED_SCARF, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_RED_SCARF @@ -86,7 +86,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 checkitemspace ITEM_BLUE_SCARF, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_BLUE_SCARF @@ -97,7 +97,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 checkitemspace ITEM_PINK_SCARF, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_PINK_SCARF @@ -108,7 +108,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 checkitemspace ITEM_GREEN_SCARF, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_GREEN_SCARF @@ -119,7 +119,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 checkitemspace ITEM_YELLOW_SCARF, 1 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_YELLOW_SCARF @@ -134,8 +134,8 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 end SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 - specialvar RESULT, CheckLeadMonCool - compare RESULT, 1 + specialvar VAR_RESULT, CheckLeadMonCool + compare VAR_RESULT, 1 call_if_eq SlateportCity_PokemonFanClub_EventScript_1559B3 return @@ -144,8 +144,8 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 return SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 - specialvar RESULT, CheckLeadMonBeauty - compare RESULT, 1 + specialvar VAR_RESULT, CheckLeadMonBeauty + compare VAR_RESULT, 1 call_if_eq SlateportCity_PokemonFanClub_EventScript_1559CA return @@ -154,8 +154,8 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA return SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 - specialvar RESULT, CheckLeadMonCute - compare RESULT, 1 + specialvar VAR_RESULT, CheckLeadMonCute + compare VAR_RESULT, 1 call_if_eq SlateportCity_PokemonFanClub_EventScript_1559E1 return @@ -164,8 +164,8 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 return SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 - specialvar RESULT, CheckLeadMonSmart - compare RESULT, 1 + specialvar VAR_RESULT, CheckLeadMonSmart + compare VAR_RESULT, 1 call_if_eq SlateportCity_PokemonFanClub_EventScript_1559F8 return @@ -174,8 +174,8 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 return SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE - specialvar RESULT, CheckLeadMonTough - compare RESULT, 1 + specialvar VAR_RESULT, CheckLeadMonTough + compare VAR_RESULT, 1 call_if_eq SlateportCity_PokemonFanClub_EventScript_155A0F return @@ -188,21 +188,21 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 faceplayer goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 - specialvar RESULT, GetLeadMonFriendshipScore - compare RESULT, 4 + specialvar VAR_RESULT, GetLeadMonFriendshipScore + compare VAR_RESULT, 4 goto_if_ge SlateportCity_PokemonFanClub_EventScript_155A3A release end SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A playse SE_PIN - applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 + applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 waitmovement 0 - applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 + applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem_std ITEM_SOOTHE_BELL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag FLAG_RECEIVED_SOOTHE_BELL release diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json index fc07ddcc4..d506e68aa 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 5, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 7, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 18, "y": 8, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 11, "elevation": 3, @@ -89,4 +89,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json index c7e9f2f69..75caaada4 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/map.json +++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 10, "y": 7, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 8, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SCIENTIST_1", + "graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1", "x": 0, "y": 9, "elevation": 3, @@ -62,4 +62,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json index 74f275db9..6a7d8bda2 100644 --- a/data/maps/SootopolisCity/map.json +++ b/data/maps/SootopolisCity/map.json @@ -12,7 +12,7 @@ "connections": [], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 29, "y": 20, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 33, "y": 20, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 36, "y": 21, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 47, "y": 42, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 32, "y": 21, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 9, "y": 43, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1", "x": 51, "y": 14, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 43, "y": 26, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 26, "y": 4, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_HIDE_SOOTOPOLIS_RESIDENTS" }, { - "graphics_id": "EVENT_OBJ_GFX_STEVEN", + "graphics_id": "OBJ_EVENT_GFX_STEVEN", "x": 30, "y": 21, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_HIDE_STEVEN_SOOTOPOLIS" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 49, "y": 34, "elevation": 3, @@ -302,4 +302,4 @@ "script": "SootopolisCity_EventScript_14D2F6" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index af4934b2f..8806d6e76 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -89,23 +89,23 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 - addvar RESULT, 20 - addvar RESULT, ITEM_CHERI_BERRY - giveitem_std RESULT - compare RESULT, 0 + addvar VAR_RESULT, 20 + addvar VAR_RESULT, ITEM_CHERI_BERRY + giveitem_std VAR_RESULT + compare VAR_RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS msgbox SootopolisCity_Text_1C64D0, 4 random 2 - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SootopolisCity_EventScript_14D1FF - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D220 end SootopolisCity_EventScript_14D1FF:: @ 814D1FF giveitem_std ITEM_FIGY_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -113,7 +113,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF SootopolisCity_EventScript_14D220:: @ 814D220 giveitem_std ITEM_IAPAPA_BERRY - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -121,7 +121,7 @@ SootopolisCity_EventScript_14D220:: @ 814D220 SootopolisCity_EventScript_14D241:: @ 814D241 msgbox SootopolisCity_Text_1C6540, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release @@ -446,13 +446,13 @@ SootopolisCity_EventScript_14D498:: @ 814D498 SootopolisCity_EventScript_14D4AD:: @ 814D4AD msgbox SootopolisCity_Text_16A33E, 4 closemessage - applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 + applymovement VAR_LAST_TALKED, SootopolisCity_Movement_1A0845 waitmovement 0 delay 50 setfieldeffectargument 0, 1 dofieldeffect FLDEFF_NPCFLY_OUT delay 15 - removeobject LAST_TALKED + removeobject VAR_LAST_TALKED waitfieldeffect FLDEFF_NPCFLY_OUT release end diff --git a/data/maps/SootopolisCity_Gym_1F/map.json b/data/maps/SootopolisCity_Gym_1F/map.json index 90afefed7..541c548a1 100644 --- a/data/maps/SootopolisCity_Gym_1F/map.json +++ b/data/maps/SootopolisCity_Gym_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLACE", + "graphics_id": "OBJ_EVENT_GFX_WALLACE", "x": 8, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 7, "y": 24, "elevation": 3, @@ -80,4 +80,4 @@ "script": "SootopolisCity_Gym_1F_EventScript_15B0B3" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index c54dec972..211620b00 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -100,14 +100,14 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET - setvar VAR_SPECIAL_8, 8 + setvar VAR_0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 giveitem_std ITEM_TM03_WATER_PULSE - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 setflag FLAG_RECEIVED_TM03 diff --git a/data/maps/SootopolisCity_Gym_B1F/map.json b/data/maps/SootopolisCity_Gym_B1F/map.json index 37b40f491..1c1f356e7 100644 --- a/data/maps/SootopolisCity_Gym_B1F/map.json +++ b/data/maps/SootopolisCity_Gym_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 7, "y": 19, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 9, "y": 17, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 9, "y": 14, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 6, "y": 13, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 3, "y": 9, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 11, "y": 9, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 8, "y": 7, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BEAUTY", + "graphics_id": "OBJ_EVENT_GFX_BEAUTY", "x": 12, "y": 7, "elevation": 3, @@ -127,4 +127,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json index b66dd5768..2bf4bd5ef 100644 --- a/data/maps/SootopolisCity_House1/map.json +++ b/data/maps/SootopolisCity_House1/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_KECLEON_1", + "graphics_id": "OBJ_EVENT_GFX_KECLEON_1", "x": 2, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json index 0b4ffb2d6..608a9a9bb 100644 --- a/data/maps/SootopolisCity_House2/map.json +++ b/data/maps/SootopolisCity_House2/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 3, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc index d714993d4..4fe8050a5 100644 --- a/data/maps/SootopolisCity_House2/scripts.inc +++ b/data/maps/SootopolisCity_House2/scripts.inc @@ -5,9 +5,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 lock faceplayer msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES call_if_eq SootopolisCity_House2_EventScript_15B307 - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json index d2a01f18e..915a3b63a 100644 --- a/data/maps/SootopolisCity_House3/map.json +++ b/data/maps/SootopolisCity_House3/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_GIRL_2", "x": 6, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc index 6ffa30d3d..20eeeb933 100644 --- a/data/maps/SootopolisCity_House3/scripts.inc +++ b/data/maps/SootopolisCity_House3/scripts.inc @@ -5,7 +5,7 @@ SootopolisCity_House3_EventScript_15B31A:: @ 815B31A lock faceplayer msgbox SootopolisCity_House3_Text_18FB36, MSGBOX_YESNO - compare RESULT, YES + compare VAR_RESULT, YES goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json index f68c71213..33dd96c46 100644 --- a/data/maps/SootopolisCity_House4/map.json +++ b/data/maps/SootopolisCity_House4/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_MAN_1", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_5", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_5", "x": 5, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_AZUMARILL", + "graphics_id": "OBJ_EVENT_GFX_AZUMARILL", "x": 2, "y": 3, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json index 32bf9dc1f..dd424dcf1 100644 --- a/data/maps/SootopolisCity_House5/map.json +++ b/data/maps/SootopolisCity_House5/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MANIAC", + "graphics_id": "OBJ_EVENT_GFX_MANIAC", "x": 3, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_3", + "graphics_id": "OBJ_EVENT_GFX_GIRL_3", "x": 6, "y": 3, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json index 586979fcf..b7c3a0874 100644 --- a/data/maps/SootopolisCity_House6/map.json +++ b/data/maps/SootopolisCity_House6/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 4, "y": 3, "elevation": 3, @@ -43,4 +43,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 24c59500a..897531b5b 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -6,11 +6,11 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 faceplayer goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO call_if_eq SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration_std DECOR_WAILMER_DOLL - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag FLAG_RECEIVED_WAILMER_DOLL release diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json index 796901032..9d98555d9 100644 --- a/data/maps/SootopolisCity_House7/map.json +++ b/data/maps/SootopolisCity_House7/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_2", "x": 5, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 1, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House8/map.json b/data/maps/SootopolisCity_House8/map.json index e645c2dd5..d4bc31546 100644 --- a/data/maps/SootopolisCity_House8/map.json +++ b/data/maps/SootopolisCity_House8/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_FISHERMAN", + "graphics_id": "OBJ_EVENT_GFX_FISHERMAN", "x": 2, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_HIKER", + "graphics_id": "OBJ_EVENT_GFX_HIKER", "x": 5, "y": 4, "elevation": 3, @@ -73,4 +73,4 @@ "script": "SootopolisCity_House8_EventScript_15B531" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_House8/scripts.inc b/data/maps/SootopolisCity_House8/scripts.inc index 91dd3490b..f7971a225 100644 --- a/data/maps/SootopolisCity_House8/scripts.inc +++ b/data/maps/SootopolisCity_House8/scripts.inc @@ -8,15 +8,15 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 msgbox SootopolisCity_House8_Text_1900F7, 4 special SelectMonForNPCTrade waitstate - copyvar RESULT, VAR_SPECIAL_4 - compare RESULT, 255 + copyvar VAR_RESULT, VAR_0x8004 + compare VAR_RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B452 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B45C - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B466 release end @@ -39,7 +39,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 giveitem_std ITEM_ELIXIR - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closemessage release @@ -57,15 +57,15 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 msgbox SootopolisCity_House8_Text_190431, 4 special SelectMonForNPCTrade waitstate - copyvar RESULT, VAR_SPECIAL_4 - compare RESULT, 255 + copyvar VAR_RESULT, VAR_0x8004 + compare VAR_RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B4E3 - compare RESULT, 2 + compare VAR_RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B4ED - compare RESULT, 3 + compare VAR_RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B4F7 release end @@ -88,7 +88,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 giveitem_std ITEM_ELIXIR - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closemessage release diff --git a/data/maps/SootopolisCity_Mart/map.json b/data/maps/SootopolisCity_Mart/map.json index bb2231ba1..36435f04c 100644 --- a/data/maps/SootopolisCity_Mart/map.json +++ b/data/maps/SootopolisCity_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_FAT_MAN", + "graphics_id": "OBJ_EVENT_GFX_FAT_MAN", "x": 5, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 9, "y": 5, "elevation": 3, @@ -69,4 +69,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/map.json b/data/maps/SootopolisCity_PokemonCenter_1F/map.json index bed5ed911..944e7afda 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 12, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 7, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index ebfaf4e23..96fbb9c5b 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 end @ 815B19A - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/map.json b/data/maps/SootopolisCity_PokemonCenter_2F/map.json index 134e3d67b..83f4627fc 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/map.json +++ b/data/maps/SootopolisCity_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Exterior/map.json b/data/maps/SouthernIsland_Exterior/map.json index 9863ed343..abac82272 100644 --- a/data/maps/SouthernIsland_Exterior/map.json +++ b/data/maps/SouthernIsland_Exterior/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_SAILOR", + "graphics_id": "OBJ_EVENT_GFX_SAILOR", "x": 13, "y": 23, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_SS_TIDAL", + "graphics_id": "OBJ_EVENT_GFX_SS_TIDAL", "x": 13, "y": 25, "elevation": 1, @@ -65,4 +65,4 @@ "script": "SouthernIsland_Exterior_EventScript_160B4A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc index 13e4774e2..abb25bda0 100644 --- a/data/maps/SouthernIsland_Exterior/scripts.inc +++ b/data/maps/SouthernIsland_Exterior/scripts.inc @@ -10,15 +10,15 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 lock faceplayer msgbox SouthernIsland_Exterior_Text_1C5215, MSGBOX_YESNO - compare RESULT, NO + compare VAR_RESULT, NO goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closemessage - applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 + applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR - setvar VAR_SPECIAL_4, 2 + setvar VAR_0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate diff --git a/data/maps/SouthernIsland_Interior/map.json b/data/maps/SouthernIsland_Interior/map.json index 0c925de3f..80c109755 100644 --- a/data/maps/SouthernIsland_Interior/map.json +++ b/data/maps/SouthernIsland_Interior/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_VAR_0", + "graphics_id": "OBJ_EVENT_GFX_VAR_0", "x": 13, "y": 12, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_LATIOS_OR_LATIAS_FLYING" }, { - "graphics_id": "EVENT_OBJ_GFX_VAR_1", + "graphics_id": "OBJ_EVENT_GFX_VAR_1", "x": 13, "y": 2, "elevation": 0, @@ -65,4 +65,4 @@ "script": "SouthernIsland_Interior_EventScript_160B9B" } ] -}
\ No newline at end of file +} diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 7094ebed8..1cd1d6f13 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -13,32 +13,32 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIOS .else - setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS + setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIAS .endif call SouthernIsland_Interior_EventScript_160B77 end SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 checkplayergender - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq SouthernIsland_Interior_EventScript_160B8F - compare RESULT, 1 + compare VAR_RESULT, 1 goto_if_eq SouthernIsland_Interior_EventScript_160B95 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 - setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B lockall - setvar VAR_SPECIAL_8, 12 + setvar VAR_0x8008, 12 goto SouthernIsland_Interior_EventScript_160BA7 end diff --git a/data/maps/TradeCenter/map.json b/data/maps/TradeCenter/map.json index a3351b84f..f80e362be 100644 --- a/data/maps/TradeCenter/map.json +++ b/data/maps/TradeCenter/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_6", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_6", "x": 9, "y": 6, "elevation": 3, @@ -62,4 +62,4 @@ } ], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater1/map.json index 4315d5adf..b5da6e8f3 100644 --- a/data/maps/Underwater1/map.json +++ b/data/maps/Underwater1/map.json @@ -82,4 +82,4 @@ "flag": "FLAG_HIDDEN_ITEM_26" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater2/map.json index 317a9aaa0..19bb67c63 100644 --- a/data/maps/Underwater2/map.json +++ b/data/maps/Underwater2/map.json @@ -103,4 +103,4 @@ "flag": "FLAG_HIDDEN_ITEM_C" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater3/map.json index 20b8acfe9..5166a403c 100644 --- a/data/maps/Underwater3/map.json +++ b/data/maps/Underwater3/map.json @@ -63,4 +63,4 @@ "flag": "FLAG_HIDDEN_ITEM_18" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater4/map.json index ce04b09ea..a963da647 100644 --- a/data/maps/Underwater4/map.json +++ b/data/maps/Underwater4/map.json @@ -50,4 +50,4 @@ "flag": "FLAG_HIDDEN_ITEM_1A" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_Route134/map.json b/data/maps/Underwater_Route134/map.json index 53d5ee607..d435556ee 100644 --- a/data/maps/Underwater_Route134/map.json +++ b/data/maps/Underwater_Route134/map.json @@ -22,4 +22,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json index cd02aeebd..030de2c7e 100644 --- a/data/maps/Underwater_SeafloorCavern/map.json +++ b/data/maps/Underwater_SeafloorCavern/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 5, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 6, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 7, "y": 4, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION" }, { - "graphics_id": "EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL", + "graphics_id": "OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL", "x": 8, "y": 4, "elevation": 3, @@ -75,4 +75,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SealedChamber/map.json b/data/maps/Underwater_SealedChamber/map.json index 109e01432..4a31edb43 100644 --- a/data/maps/Underwater_SealedChamber/map.json +++ b/data/maps/Underwater_SealedChamber/map.json @@ -31,4 +31,4 @@ "script": "Underwater_SealedChamber_EventScript_15F0B8" } ] -}
\ No newline at end of file +} diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc index 3151c4575..5d2236507 100644 --- a/data/maps/Underwater_SealedChamber/scripts.inc +++ b/data/maps/Underwater_SealedChamber/scripts.inc @@ -3,10 +3,10 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 .byte 0 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 - getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5 - compare VAR_SPECIAL_4, 12 + getplayerxy VAR_0x8004, VAR_0x8005 + compare VAR_0x8004, 12 goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 - compare VAR_SPECIAL_5, 44 + compare VAR_0x8005, 44 goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json index a0cadda64..8250b2a32 100644 --- a/data/maps/Underwater_SootopolisCity/map.json +++ b/data/maps/Underwater_SootopolisCity/map.json @@ -29,4 +29,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json index 83ca5ce0c..eba4d0b48 100644 --- a/data/maps/UnknownMap_25_29/map.json +++ b/data/maps/UnknownMap_25_29/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json index c43f27759..4a8343163 100644 --- a/data/maps/UnknownMap_25_30/map.json +++ b/data/maps/UnknownMap_25_30/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json index a4dc2582a..932a48899 100644 --- a/data/maps/UnknownMap_25_31/map.json +++ b/data/maps/UnknownMap_25_31/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json index 2f1000c45..32d15dbdc 100644 --- a/data/maps/UnknownMap_25_32/map.json +++ b/data/maps/UnknownMap_25_32/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json index e0a3cd273..14d6589b6 100644 --- a/data/maps/UnknownMap_25_33/map.json +++ b/data/maps/UnknownMap_25_33/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json index 7db383760..b4d5c7bab 100644 --- a/data/maps/UnknownMap_25_34/map.json +++ b/data/maps/UnknownMap_25_34/map.json @@ -12,4 +12,4 @@ "connections": null, "shared_events_map": "LinkContestRoom1", "shared_scripts_map": "LinkContestRoom1" -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json index 56da57485..c79294e3a 100644 --- a/data/maps/VerdanturfTown/map.json +++ b/data/maps/VerdanturfTown/map.json @@ -23,7 +23,7 @@ ], "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_2", + "graphics_id": "OBJ_EVENT_GFX_MAN_2", "x": 4, "y": 17, "elevation": 3, @@ -36,7 +36,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_1", "x": 9, "y": 2, "elevation": 3, @@ -49,7 +49,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_1", + "graphics_id": "OBJ_EVENT_GFX_BOY_1", "x": 11, "y": 9, "elevation": 3, @@ -62,7 +62,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_CAMPER", + "graphics_id": "OBJ_EVENT_GFX_CAMPER", "x": 6, "y": 10, "elevation": 3, @@ -193,4 +193,4 @@ "script": "VerdanturfTown_EventScript_14E8E5" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_ContestHall/map.json b/data/maps/VerdanturfTown_ContestHall/map.json index 9a8c4abe3..80225a30d 100644 --- a/data/maps/VerdanturfTown_ContestHall/map.json +++ b/data/maps/VerdanturfTown_ContestHall/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_BOY_4", + "graphics_id": "OBJ_EVENT_GFX_BOY_4", "x": 0, "y": 7, "elevation": 0, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 20, "y": 15, "elevation": 0, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LITTLE_GIRL_2", + "graphics_id": "OBJ_EVENT_GFX_LITTLE_GIRL_2", "x": 9, "y": 8, "elevation": 3, @@ -86,4 +86,4 @@ "script": "VerdanturfTown_ContestHall_EventScript_153EB2" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_ContestLobby/map.json b/data/maps/VerdanturfTown_ContestLobby/map.json index a6a1b79fe..feb2dfbed 100644 --- a/data/maps/VerdanturfTown_ContestLobby/map.json +++ b/data/maps/VerdanturfTown_ContestLobby/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 5, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 11, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GIRL_1", + "graphics_id": "OBJ_EVENT_GFX_GIRL_1", "x": 14, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 1, "y": 6, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_REPORTER_M", + "graphics_id": "OBJ_EVENT_GFX_REPORTER_M", "x": 7, "y": 5, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_HIDE_CONTEST_REPORTER_VERDANTURF" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_3", + "graphics_id": "OBJ_EVENT_GFX_BOY_3", "x": 0, "y": 3, "elevation": 3, @@ -148,4 +148,4 @@ "script": "VerdanturfTown_ContestLobby_EventScript_153E89" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc index 1ee3708ac..ff95f3c64 100644 --- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc +++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc @@ -7,8 +7,8 @@ VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70 end VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 - setvar VAR_SPECIAL_B, 5 - setvar CONTEST_RANK, 0 + setvar VAR_0x800B, 5 + setvar VAR_CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 special SetContestTrainerGfxIds @@ -104,7 +104,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem_std ITEM_TM45_ATTRACT - compare RESULT, 0 + compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag FLAG_RECEIVED_TM45 release diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json index 52ef96351..21d102b64 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 3, "y": 4, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_PIKACHU", + "graphics_id": "OBJ_EVENT_GFX_PIKACHU", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc index ed60ec1c7..4ec0af464 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc @@ -5,8 +5,8 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_154030:: @ 8154030 lock faceplayer msgbox VerdanturfTown_FriendshipRatersHouse_Text_178A9C, 4 - specialvar RESULT, GetLeadMonFriendshipScore - switch RESULT + specialvar VAR_RESULT, GetLeadMonFriendshipScore + switch VAR_RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154093 case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_15409D case 2, VerdanturfTown_FriendshipRatersHouse_EventScript_1540A7 diff --git a/data/maps/VerdanturfTown_House/map.json b/data/maps/VerdanturfTown_House/map.json index 1a345f0e7..dacece217 100644 --- a/data/maps/VerdanturfTown_House/map.json +++ b/data/maps/VerdanturfTown_House/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 4, "y": 4, "elevation": 3, @@ -56,4 +56,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_Mart/map.json b/data/maps/VerdanturfTown_Mart/map.json index ff9a09f9d..367f8e510 100644 --- a/data/maps/VerdanturfTown_Mart/map.json +++ b/data/maps/VerdanturfTown_Mart/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MART_EMPLOYEE", + "graphics_id": "OBJ_EVENT_GFX_MART_EMPLOYEE", "x": 1, "y": 3, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BOY_2", + "graphics_id": "OBJ_EVENT_GFX_BOY_2", "x": 5, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_WOMAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_WOMAN_1", "x": 8, "y": 5, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_LASS", + "graphics_id": "OBJ_EVENT_GFX_LASS", "x": 3, "y": 2, "elevation": 3, @@ -82,4 +82,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json index 5bf660e2d..41945575a 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_NURSE", + "graphics_id": "OBJ_EVENT_GFX_NURSE", "x": 7, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_GENTLEMAN", + "graphics_id": "OBJ_EVENT_GFX_GENTLEMAN", "x": 4, "y": 5, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_OLD_MAN_1", + "graphics_id": "OBJ_EVENT_GFX_OLD_MAN_1", "x": 12, "y": 2, "elevation": 3, @@ -76,4 +76,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index de2f770d6..6aa3c746f 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -9,7 +9,7 @@ VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 - setvar VAR_SPECIAL_B, 1 + setvar VAR_0x800B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json index 8850238f5..c5dddc69c 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/map.json +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 4, "y": 2, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 7, "y": 2, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_TEALA", + "graphics_id": "OBJ_EVENT_GFX_TEALA", "x": 10, "y": 2, "elevation": 3, @@ -90,4 +90,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VerdanturfTown_WandasHouse/map.json b/data/maps/VerdanturfTown_WandasHouse/map.json index 57b32a20c..599bfe697 100644 --- a/data/maps/VerdanturfTown_WandasHouse/map.json +++ b/data/maps/VerdanturfTown_WandasHouse/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 14, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_HIDE_WALLY_WANDAS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_BLACK_BELT", + "graphics_id": "OBJ_EVENT_GFX_BLACK_BELT", "x": 5, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_3", + "graphics_id": "OBJ_EVENT_GFX_MAN_3", "x": 7, "y": 2, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_2", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_2", "x": 2, "y": 4, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_3", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_3", "x": 5, "y": 5, "elevation": 3, @@ -95,4 +95,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_1F/map.json b/data/maps/VictoryRoad_1F/map.json index d7e721397..c26c4fc51 100644 --- a/data/maps/VictoryRoad_1F/map.json +++ b/data/maps/VictoryRoad_1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 33, "y": 22, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 6, "y": 15, "elevation": 4, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 27, "y": 34, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 31, "y": 12, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 40, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 37, "y": 39, "elevation": 4, @@ -90,7 +90,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_1F_2" }, { - "graphics_id": "EVENT_OBJ_GFX_WALLY", + "graphics_id": "OBJ_EVENT_GFX_WALLY", "x": 31, "y": 9, "elevation": 3, @@ -179,4 +179,4 @@ "flag": "FLAG_HIDDEN_ITEM_51" } ] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index b4931325a..7247ce1d7 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -92,8 +92,8 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 - specialvar RESULT, ShouldTryRematchBattle - compare RESULT, 1 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 end diff --git a/data/maps/VictoryRoad_B1F/map.json b/data/maps/VictoryRoad_B1F/map.json index a833aaea5..a33cf522a 100644 --- a/data/maps/VictoryRoad_B1F/map.json +++ b/data/maps/VictoryRoad_B1F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 20, "y": 5, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "FLAG_TEMP_13" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 21, "y": 4, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "FLAG_TEMP_14" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 4, "y": 7, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "FLAG_TEMP_11" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 9, "y": 10, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "FLAG_TEMP_12" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 20, "y": 26, "elevation": 3, @@ -77,7 +77,7 @@ "flag": "FLAG_TEMP_17" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 21, "y": 25, "elevation": 3, @@ -90,7 +90,7 @@ "flag": "FLAG_TEMP_16" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 35, "y": 6, "elevation": 3, @@ -103,7 +103,7 @@ "flag": "FLAG_TEMP_1E" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 19, "y": 5, "elevation": 3, @@ -116,7 +116,7 @@ "flag": "FLAG_TEMP_19" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 4, "elevation": 3, @@ -129,7 +129,7 @@ "flag": "FLAG_TEMP_1A" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 18, "y": 12, "elevation": 3, @@ -142,7 +142,7 @@ "flag": "FLAG_TEMP_1B" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 20, "y": 25, "elevation": 3, @@ -155,7 +155,7 @@ "flag": "FLAG_TEMP_1C" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 21, "y": 26, "elevation": 3, @@ -168,7 +168,7 @@ "flag": "FLAG_TEMP_1D" }, { - "graphics_id": "EVENT_OBJ_GFX_PUSHABLE_BOULDER", + "graphics_id": "OBJ_EVENT_GFX_PUSHABLE_BOULDER", "x": 34, "y": 4, "elevation": 3, @@ -181,7 +181,7 @@ "flag": "FLAG_TEMP_1F" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 37, "y": 12, "elevation": 3, @@ -194,7 +194,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 26, "y": 16, "elevation": 3, @@ -207,7 +207,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 5, "y": 21, "elevation": 3, @@ -220,7 +220,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_BREAKABLE_ROCK", + "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK", "x": 34, "y": 3, "elevation": 3, @@ -233,7 +233,7 @@ "flag": "FLAG_VICTORY_ROAD_ROCK" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 42, "y": 8, "elevation": 4, @@ -246,7 +246,7 @@ "flag": "FLAG_ITEM_VICTORY_ROAD_B1F_1" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 32, "y": 3, "elevation": 3, @@ -312,4 +312,4 @@ ], "coord_events": [], "bg_events": [] -}
\ No newline at end of file +} diff --git a/data/maps/VictoryRoad_B2F/map.json b/data/maps/VictoryRoad_B2F/map.json index a8d0480ca..58f5d73fc 100644 --- a/data/maps/VictoryRoad_B2F/map.json +++ b/data/maps/VictoryRoad_B2F/map.json @@ -12,7 +12,7 @@ "connections": null, "object_events": [ { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 15, "y": 6, "elevation": 3, @@ -25,7 +25,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_MAN_4", + "graphics_id": "OBJ_EVENT_GFX_MAN_4", "x": 43, "y": 14, "elevation": 3, @@ -38,7 +38,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 2, "y": 17, "elevation": 3, @@ -51,7 +51,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_WOMAN_7", + "graphics_id": "OBJ_EVENT_GFX_WOMAN_7", "x": 35, "y": 22, "elevation": 3, @@ -64,7 +64,7 @@ "flag": "0" }, { - "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL", + "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "x": 13, "y": 8, "elevation": 3, @@ -126,4 +126,4 @@ "flag": "FLAG_HIDDEN_ITEM_53" } ] -}
\ No newline at end of file +} diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index e804c8968..8b455060d 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -557,4 +557,4 @@ "SafariZone_Southwest", "SafariZone_Southeast" ] -}
\ No newline at end of file +} |