diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-08-04 15:35:35 -0400 |
| commit | cd876292d126c339bfc31c717d5bec6fe1b63f80 (patch) | |
| tree | e7e3666bc80640d9b946f79c07e8d0858600598b /src/fldeff_misc.c | |
| parent | a08cbaee0a5f06f2e6d11ceb958e36430175f220 (diff) | |
| parent | fa5bfc16279fe6c8c38392612796448495da896f (diff) | |
Merge branch 'master' into pokenav_unk_2
Diffstat (limited to 'src/fldeff_misc.c')
| -rw-r--r-- | src/fldeff_misc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 39ed30260..c68a95d41 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -22,6 +22,7 @@ #include "constants/metatile_behaviors.h" #include "constants/songs.h" #include "constants/vars.h" +#include "constants/metatile_labels.h" EWRAM_DATA struct MapPosition gPlayerFacingPosition = {0}; @@ -800,16 +801,16 @@ static void Task_SecretBasePCTurnOn(u8 taskId) { case 4: case 12: - MapGridSetMetatileIdAt(data[0], data[1], 548); + MapGridSetMetatileIdAt(data[0], data[1], 0x224); CurrentMapDrawMetatileAt(data[0], data[1]); break; case 8: case 16: - MapGridSetMetatileIdAt(data[0], data[1], 544); + MapGridSetMetatileIdAt(data[0], data[1], 0x220); CurrentMapDrawMetatileAt(data[0], data[1]); break; case 20: - MapGridSetMetatileIdAt(data[0], data[1], 548); + MapGridSetMetatileIdAt(data[0], data[1], 0x224); CurrentMapDrawMetatileAt(data[0], data[1]); FieldEffectActiveListRemove(FLDEFF_PCTURN_ON); EnableBothScriptContexts(); @@ -828,9 +829,9 @@ void DoSecretBasePCTurnOffEffect(void) PlaySE(SE_PC_OFF); if (!VarGet(VAR_CURRENT_SECRET_BASE)) - MapGridSetMetatileIdAt(x, y, 3616); + MapGridSetMetatileIdAt(x, y, 0x220 | METATILE_COLLISION_MASK); else - MapGridSetMetatileIdAt(x, y, 3617); + MapGridSetMetatileIdAt(x, y, 0x221 | METATILE_COLLISION_MASK); CurrentMapDrawMetatileAt(x, y); } @@ -902,8 +903,8 @@ bool8 FldEff_NopA700(void) static void DoSecretBaseBreakableDoorEffect(s16 x, s16 y) { PlaySE(SE_TOY_KABE); - MapGridSetMetatileIdAt(x, y, 630); - MapGridSetMetatileIdAt(x, y - 1, 622); + MapGridSetMetatileIdAt(x, y, 0x276); + MapGridSetMetatileIdAt(x, y - 1, 0x26E); CurrentMapDrawMetatileAt(x, y); CurrentMapDrawMetatileAt(x, y - 1); } |