diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-10 23:26:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-10 23:26:41 -0400 |
| commit | 72bb2bd1604e4f62504901d20c3c930f7d288473 (patch) | |
| tree | ed3cdbbf30cce0d20235587b2afc8357fde863b2 /data/maps/Route111 | |
| parent | 4419337aeb8c8eb3d0145960600f28a74a3c3720 (diff) | |
| parent | 0f538102d9f1327cb699261bde969c89e02b3503 (diff) | |
Merge pull request #1474 from GriffinRichards/clean-miragetower
Clean up Mirage Tower
Diffstat (limited to 'data/maps/Route111')
| -rw-r--r-- | data/maps/Route111/scripts.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 322c9a2b7..428011645 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -2,9 +2,10 @@ .set LOCALID_VICTORIA, 2 .set LOCALID_VIVI, 3 .set LOCALID_VICKY, 4 -.set LOCALID_PLAYER_FALLING, 45 .set LOCALID_ROCK_SMASH_MAN, 46 +@ Note: LOCALID_ROUTE111_PLAYER_FALLING is a local id for this map used elsewhere. It's defined in event_objects.h + Route111_MapScripts:: @ 81F0CA7 map_script MAP_SCRIPT_ON_LOAD, Route111_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition @@ -127,11 +128,11 @@ Route111_EventScript_MirageTowerDisappear:: @ 81F0E60 waitstate delay 24 playse SE_FALL - addobject LOCALID_PLAYER_FALLING + addobject LOCALID_ROUTE111_PLAYER_FALLING special StartPlayerDescendMirageTower waitstate showobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN - removeobject LOCALID_PLAYER_FALLING + removeobject LOCALID_ROUTE111_PLAYER_FALLING delay 16 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH delay 16 |