diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-28 00:06:27 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-28 00:06:27 -0500 |
| commit | 373d73eb3b8d28aa217bc6043a29cc44fcf0e45b (patch) | |
| tree | ebf87b07f0741286a7436e23606df876b409f4b7 /data | |
| parent | bf45b83c65026a84425e3bc1f99e269653ed8c8b (diff) | |
Fix last special var
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/PetalburgCity/map.json | 8 | ||||
| -rw-r--r-- | data/maps/PetalburgCity/scripts.inc | 2 | ||||
| -rw-r--r-- | data/maps/PetalburgCity_Gym/scripts.inc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json index 3d09ae706..6a9a6b33d 100644 --- a/data/maps/PetalburgCity/map.json +++ b/data/maps/PetalburgCity/map.json @@ -229,7 +229,7 @@ "x": 4, "y": 10, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC691" }, @@ -238,7 +238,7 @@ "x": 4, "y": 11, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC6A7" }, @@ -247,7 +247,7 @@ "x": 4, "y": 12, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC6BD" }, @@ -256,7 +256,7 @@ "x": 4, "y": 13, "elevation": 3, - "var": "VAR_0x40C9", + "var": "VAR_SCOTT_PETALBURG_ENCOUNTER", "var_value": "0", "script": "PetalburgCity_EventScript_1DC6D3" } diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc index 0520fe044..5a652ab15 100644 --- a/data/maps/PetalburgCity/scripts.inc +++ b/data/maps/PetalburgCity/scripts.inc @@ -572,7 +572,7 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9 call_if_eq PetalburgCity_EventScript_1DC7B2 compare VAR_0x8008, 3 call_if_eq PetalburgCity_EventScript_1DC7C4 - setvar VAR_0x40C9, 1 + setvar VAR_SCOTT_PETALBURG_ENCOUNTER, 1 removeobject 9 releaseall end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index fef5c4048..a256a6547 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -60,7 +60,7 @@ PetalburgCity_Gym_EventScript_204955:: @ 8204955 return PetalburgCity_Gym_EventScript_20495D:: @ 820495D - setorcopyvar VAR_NEVER_READ_0x8015, 269 + setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, 269 specialvar VAR_RESULT, IsTrainerReadyForRematch compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_204985 |