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/field_effect_scripts.s | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'data/field_effect_scripts.s')
| -rw-r--r-- | data/field_effect_scripts.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index aabb1252d..900cc7009 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -67,7 +67,7 @@ gFieldEffectScriptPointers:: @ 81D9B34 .4byte gFieldEffectScript_CutGrass .4byte gFieldEffectScript_FieldMoveShowMonInit .4byte gFieldEffectScript_UseFlyAncientTomb - .4byte gFieldEffectScript_PCTurnOn + .4byte gFieldEffectScript_SecretBasePCTurnOn .4byte gFieldEffectScript_HallOfFameRecord .4byte gFieldEffectScript_UseTeleport @@ -317,8 +317,8 @@ gFieldEffectScript_UseFlyAncientTomb: @ 81D9E26 callnative FldEff_UseFlyAncientTomb end -gFieldEffectScript_PCTurnOn: @ 81D9E2C - callnative FldEff_PCTurnOn +gFieldEffectScript_SecretBasePCTurnOn: @ 81D9E2C + callnative FldEff_SecretBasePCTurnOn end gFieldEffectScript_HallOfFameRecord: @ 81D9E32 |