diff options
| author | yenatch <yenatch@gmail.com> | 2017-05-21 00:54:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-21 00:54:20 -0400 |
| commit | 1c49064780f87a874c8f516ef20be61b17bafef0 (patch) | |
| tree | 39d88024b6c278f8c4182ee869db6316c71bd8bd /data | |
| parent | 9281b378095596896fce5be481fb40966226d955 (diff) | |
| parent | ea181bea7652e6ea28705302ce7e85998e248986 (diff) | |
Merge pull request #299 from PikalaxALT/master
Secret base and TV decompilation
Diffstat (limited to 'data')
| -rw-r--r-- | data/scripts/maps/SlateportCity.inc | 8 | ||||
| -rw-r--r-- | data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 19f9af2eb..6125c4871 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar 0x4010, 118 - setvar 0x4011, 117 + setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, 120 - setvar 0x4011, 119 + setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 0bfeb4f5a..e84f8ccc6 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar 0x4010, 118 - setvar 0x4011, 117 + setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, 120 - setvar 0x4011, 119 + setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif end |