diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2019-08-04 20:35:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-04 20:35:38 +0100 |
| commit | 667f0837e2c0fecb03e4198a182cf04624a47fbd (patch) | |
| tree | 4f11ff910478fdb34a4c40c465b30be2ac1a22da /data/scripts | |
| parent | 89da828794d036e33ef313ab95868c8be6bb039f (diff) | |
| parent | ce941e6f56803b389c20a52c0a5b89f5ade12b7a (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index fe3fa9fae..eeecf2d75 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -1390,34 +1390,34 @@ EventScript_277BB4:: @ 8277BB4 end OldaleTown_PokemonCenter_2F_EventScript_277BBE:: @ 8277BBE - setmetatile 5, 2, 732, 0 - setmetatile 5, 3, 740, 0 + setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0 + setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 return OldaleTown_PokemonCenter_2F_EventScript_277BD1:: @ 8277BD1 - setmetatile 5, 2, 542, 1 - setmetatile 5, 3, 605, 1 + setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1 + setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1 return OldaleTown_PokemonCenter_2F_EventScript_277BE4:: @ 8277BE4 - setmetatile 9, 2, 732, 0 - setmetatile 9, 3, 740, 0 + setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0 + setmetatile 9, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0 return OldaleTown_PokemonCenter_2F_EventScript_277BF7:: @ 8277BF7 - setmetatile 9, 2, 542, 1 - setmetatile 9, 3, 605, 1 + setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1 + setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1 return MossdeepCity_GameCorner_1F_EventScript_277C0A:: @ 8277C0A OldaleTown_PokemonCenter_2F_EventScript_277C0A:: @ 8277C0A - setmetatile 5, 2, 556, 0 - setmetatile 5, 3, 564, 0 + setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterOpen_Top, 0 + setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterOpen_Bottom, 0 return OldaleTown_PokemonCenter_2F_EventScript_277C1D:: @ 8277C1D - setmetatile 5, 2, 554, 1 - setmetatile 5, 3, 562, 1 + setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterClosed_Top, 1 + setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1 return BattleFrontier_PokemonCenter_1F_MapScript1_277C30: @ 8277C30 |