diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-07 19:46:44 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-07 20:54:44 -0500 |
| commit | 0a2c709535bd79d8b62f3e8aafda9171670c1ecf (patch) | |
| tree | f5a49a53a3813152e41ee8db4f250a3d61b0d660 /data | |
| parent | f73ea3d931cad4d4e99bbeb664aca6a0344ea1c7 (diff) | |
Label all metatile behaviors and functions
Diffstat (limited to 'data')
| -rw-r--r-- | data/scripts/maps/PetalburgCity_Gym.inc | 4 | ||||
| -rw-r--r-- | data/scripts/maps/SootopolisCity.inc | 4 | ||||
| -rw-r--r-- | data/specials.inc | 4 | ||||
| -rw-r--r-- | data/text/maps/SootopolisCity.inc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 59828c28d..259d59390 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -983,12 +983,12 @@ PetalburgCity_Gym_EventScript_15516F:: @ 815516F return PetalburgCity_Gym_EventScript_155182:: @ 8155182 - special PetalburgGymSpecial1 + special PetalburgGymSlideOpenDoors waitstate return PetalburgCity_Gym_EventScript_155187:: @ 8155187 - special PetalburgGymSpecial2 + special PetalburgGymOpenDoorsInstantly return PetalburgCity_Gym_EventScript_15518B:: @ 815518B diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index f5452a7bb..e18eca17c 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -196,8 +196,8 @@ SootopolisCity_EventScript_14D2F6:: @ 814D2F6 msgbox SootopolisCity_Text_16A711, 3 end -ClosedSootopolisGymDoorScript:: @ 814D2FF - msgbox ClosedSootopolisGymDoorText, 3 +ClosedSootopolisDoorScript:: @ 814D2FF + msgbox ClosedSootopolisDoorText, 3 end SootopolisCity_EventScript_14D308:: @ 814D308 diff --git a/data/specials.inc b/data/specials.inc index 2728d98fc..bdf4258c3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -153,8 +153,8 @@ gSpecials:: def_special DrawWholeMapView def_special StorePlayerCoordsInVars def_special MauvilleGymSpecial3 - def_special PetalburgGymSpecial1 - def_special PetalburgGymSpecial2 + def_special PetalburgGymSlideOpenDoors + def_special PetalburgGymOpenDoorsInstantly def_special GetPlayerTrainerIdOnesDigit def_special GetPlayerBigGuyGirlString def_special GetRivalSonDaughterString diff --git a/data/text/maps/SootopolisCity.inc b/data/text/maps/SootopolisCity.inc index cc89d86bd..cfe3fd2e2 100644 --- a/data/text/maps/SootopolisCity.inc +++ b/data/text/maps/SootopolisCity.inc @@ -1,4 +1,4 @@ -ClosedSootopolisGymDoorText: @ 8169690 +ClosedSootopolisDoorText: @ 8169690 .string "The door is closed.$" SootopolisCity_Text_1696A4:: @ 81696A4 |