diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-22 19:52:11 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-02-24 10:10:18 -0600 |
| commit | 4582fd15456e2c84588026cdfbe70d6b6e558a35 (patch) | |
| tree | 62688976fd1204f4dae1fb4e82f999d7cb2171d4 /data/maps/RustboroCity | |
| parent | bb508ade64bd152fa146b71e6734a4ea704b31f3 (diff) | |
Name a ton of commonly used event scripts
Diffstat (limited to 'data/maps/RustboroCity')
| -rw-r--r-- | data/maps/RustboroCity/map.json | 8 | ||||
| -rw-r--r-- | data/maps/RustboroCity/scripts.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json index d43f7c33b..8b8f8fd04 100644 --- a/data/maps/RustboroCity/map.json +++ b/data/maps/RustboroCity/map.json @@ -539,7 +539,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -547,7 +547,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", @@ -563,7 +563,7 @@ "y": 45, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E6A" + "script": "Common_EventScript_ShowPokemartSign" }, { "type": "sign", @@ -571,7 +571,7 @@ "y": 38, "elevation": 0, "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", - "script": "RustboroCity_EventScript_271E73" + "script": "Common_EventScript_ShowPokemonCenterSign" }, { "type": "sign", diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 8ffbf8373..e5f034f1d 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -5,7 +5,7 @@ RustboroCity_MapScripts:: @ 81E06BD RustboroCity_MapScript1_1E06C8: @ 81E06C8 setflag FLAG_VISITED_RUSTBORO_CITY - call RustboroCity_EventScript_271ED7 + call Common_EventScript_SetupRivalGender compare VAR_0x405A, 6 call_if_eq RustboroCity_EventScript_1E0707 getplayerxy VAR_TEMP_0, VAR_TEMP_1 |