diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /data/scripts/maps/SecretBase_YellowCave4.inc | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/scripts/maps/SecretBase_YellowCave4.inc')
| -rw-r--r-- | data/scripts/maps/SecretBase_YellowCave4.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc index 302bc3930..bb673b7b6 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ b/data/scripts/maps/SecretBase_YellowCave4.inc @@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 815F337 .byte 0 SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C - tileeffect 6 + setstepcallback 6 end SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F @@ -19,5 +19,5 @@ SecretBase_RedCave1_MapScript2_15F358:: @ 815F358 .2byte 0 SecretBase_RedCave1_MapScript2_15F362:: @ 815F362 - map_script_2 0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE + map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE .2byte 0 |