summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/field_specials.c92
-rw-r--r--src/field_tasks.c25
-rw-r--r--src/scrcmd.c2
3 files changed, 76 insertions, 43 deletions
diff --git a/src/field_specials.c b/src/field_specials.c
index f455ae561..94170b133 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -46,6 +46,7 @@
#include "constants/moves.h"
#include "constants/menu.h"
#include "constants/event_objects.h"
+#include "constants/metatile_labels.h"
static EWRAM_DATA u8 sElevatorCurrentFloorWindowId = 0;
static EWRAM_DATA u16 sElevatorScroll = 0;
@@ -211,6 +212,9 @@ bool8 PlayerHasGrassPokemonInParty(void)
return FALSE;
}
+#define tState data[0]
+#define tTimer data[1]
+
void AnimatePcTurnOn(void)
{
u8 taskId;
@@ -218,27 +222,31 @@ void AnimatePcTurnOn(void)
if (FuncIsActiveTask(Task_AnimatePcTurnOn) != TRUE)
{
taskId = CreateTask(Task_AnimatePcTurnOn, 8);
- gTasks[taskId].data[0] = 0;
- gTasks[taskId].data[1] = 0;
+ gTasks[taskId].tState = 0;
+ gTasks[taskId].tTimer = 0;
}
}
+// PC flickers on and off while turning on
static void Task_AnimatePcTurnOn(u8 taskId)
{
s16 *data = gTasks[taskId].data;
- if (data[1] == 6)
+ if (tTimer == 6)
{
- PcTurnOnUpdateMetatileId(data[0] & 1);
+ PcTurnOnUpdateMetatileId(tState & 1);
DrawWholeMapView();
- data[1] = 0;
- data[0]++;
- if (data[0] == 5)
+ tTimer = 0;
+ tState++;
+ if (tState == 5)
DestroyTask(taskId);
}
- data[1]++;
+ tTimer++;
}
-static void PcTurnOnUpdateMetatileId(bool16 a0)
+#undef tState
+#undef tTimer
+
+static void PcTurnOnUpdateMetatileId(bool16 flickerOff)
{
u16 metatileId = 0;
s8 deltaX = 0;
@@ -260,25 +268,25 @@ static void PcTurnOnUpdateMetatileId(bool16 a0)
deltaY = -1;
break;
}
- if (a0)
+ if (flickerOff)
{
if (gSpecialVar_0x8004 == 0)
- metatileId = 0x62;
+ metatileId = METATILE_Building_PCOff;
else if (gSpecialVar_0x8004 == 1)
- metatileId = 0x28F;
+ metatileId = METATILE_GenericBuilding1_PlayersPCOff;
else if (gSpecialVar_0x8004 == 2)
- metatileId = 0x28F;
+ metatileId = METATILE_GenericBuilding1_PlayersPCOff;
}
else
{
if (gSpecialVar_0x8004 == 0)
- metatileId = 0x63;
+ metatileId = METATILE_Building_PCOn;
else if (gSpecialVar_0x8004 == 1)
- metatileId = 0x28A;
+ metatileId = METATILE_GenericBuilding1_PlayersPCOn;
else if (gSpecialVar_0x8004 == 2)
- metatileId = 0x28A;
+ metatileId = METATILE_GenericBuilding1_PlayersPCOn;
}
- MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | 0xC00);
+ MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | METATILE_COLLISION_MASK);
}
void AnimatePcTurnOff()
@@ -304,12 +312,12 @@ void AnimatePcTurnOff()
break;
}
if (gSpecialVar_0x8004 == 0)
- metatileId = 0x62;
+ metatileId = METATILE_Building_PCOff;
else if (gSpecialVar_0x8004 == 1)
- metatileId = 0x28F;
+ metatileId = METATILE_GenericBuilding1_PlayersPCOff;
else if (gSpecialVar_0x8004 == 2)
- metatileId = 0x28F;
- MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | 0xC00);
+ metatileId = METATILE_GenericBuilding1_PlayersPCOff;
+ MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + deltaX + 7, gSaveBlock1Ptr->pos.y + deltaY + 7, metatileId | METATILE_COLLISION_MASK);
DrawWholeMapView();
}
@@ -770,15 +778,39 @@ static const u8 sUnused_83F5B84[] = {
};
static const u16 sElevatorWindowMetatilesGoingUp[][3] = {
- {0x2e8, 0x2e9, 0x2ea},
- {0x2f0, 0x2f1, 0x2f2},
- {0x2f8, 0x2f9, 0x2fa}
+ {
+ METATILE_SilphCo_ElevatorWindow_Top0,
+ METATILE_SilphCo_ElevatorWindow_Top1,
+ METATILE_SilphCo_ElevatorWindow_Top2
+ },
+ {
+ METATILE_SilphCo_ElevatorWindow_Mid0,
+ METATILE_SilphCo_ElevatorWindow_Mid1,
+ METATILE_SilphCo_ElevatorWindow_Mid2
+ },
+ {
+ METATILE_SilphCo_ElevatorWindow_Bottom0,
+ METATILE_SilphCo_ElevatorWindow_Bottom1,
+ METATILE_SilphCo_ElevatorWindow_Bottom2
+ }
};
static const u16 sElevatorWindowMetatilesGoingDown[][3] = {
- {0x2e8, 0x2ea, 0x2e9},
- {0x2f0, 0x2f2, 0x2f1},
- {0x2f8, 0x2fa, 0x2f9}
+ {
+ METATILE_SilphCo_ElevatorWindow_Top0,
+ METATILE_SilphCo_ElevatorWindow_Top2,
+ METATILE_SilphCo_ElevatorWindow_Top1
+ },
+ {
+ METATILE_SilphCo_ElevatorWindow_Mid0,
+ METATILE_SilphCo_ElevatorWindow_Mid2,
+ METATILE_SilphCo_ElevatorWindow_Mid1
+ },
+ {
+ METATILE_SilphCo_ElevatorWindow_Bottom0,
+ METATILE_SilphCo_ElevatorWindow_Bottom2,
+ METATILE_SilphCo_ElevatorWindow_Bottom1
+ }
};
static const u8 sElevatorAnimationDuration[] = {
@@ -1114,7 +1146,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
{
for (j = 0; j < 3; j++)
{
- MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingUp[i][data[0] % 3] | 0xC00);
+ MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingUp[i][data[0] % 3] | METATILE_COLLISION_MASK);
}
}
}
@@ -1124,7 +1156,7 @@ static void Task_AnimateElevatorWindowView(u8 taskId)
{
for (j = 0; j < 3; j++)
{
- MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingDown[i][data[0] % 3] | 0xC00);
+ MapGridSetMetatileIdAt(j + 8, i + 7, sElevatorWindowMetatilesGoingDown[i][data[0] % 3] | METATILE_COLLISION_MASK);
}
}
}
@@ -2277,7 +2309,7 @@ bool8 CutMoveRuinValleyCheck(void)
void CutMoveOpenDottedHoleDoor(void)
{
- MapGridSetMetatileIdAt(31, 31, 0x358);
+ MapGridSetMetatileIdAt(31, 31, METATILE_SeviiIslands67_DottedHoleDoor_Open);
DrawWholeMapView();
PlaySE(SE_BAN);
FlagSet(FLAG_USED_CUT_ON_RUIN_VALLEY_BRAILLE);
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 1c7288240..6bd4b6f46 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -13,6 +13,7 @@
#include "task.h"
#include "constants/field_tasks.h"
#include "constants/flags.h"
+#include "constants/metatile_labels.h"
#include "constants/songs.h"
#include "constants/vars.h"
@@ -37,15 +38,15 @@ static const TaskFunc sPerStepCallbacks[] =
static const u8 sIcefallCaveIceTileCoords[][2] =
{
- { 0x08, 0x03 },
- { 0x0a, 0x05 },
- { 0x0f, 0x05 },
- { 0x08, 0x09 },
- { 0x09, 0x09 },
- { 0x10, 0x09 },
- { 0x08, 0x0a },
- { 0x09, 0x0a },
- { 0x08, 0x0e }
+ { 8, 3 },
+ { 10, 5 },
+ { 15, 5 },
+ { 8, 9 },
+ { 9, 9 },
+ { 16, 9 },
+ { 8, 10 },
+ { 9, 10 },
+ { 8, 14 }
};
static void Task_RunPerStepCallback(u8 taskId)
@@ -146,7 +147,7 @@ void SetIcefallCaveCrackedIceMetatiles(void)
{
int x = sIcefallCaveIceTileCoords[i][0] + 7;
int y = sIcefallCaveIceTileCoords[i][1] + 7;
- MapGridSetMetatileIdAt(x, y, 0x35a);
+ MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_CrackedIce);
}
}
}
@@ -199,7 +200,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId)
x = data[4];
y = data[5];
PlaySE(SE_RU_BARI);
- MapGridSetMetatileIdAt(x, y, 0x35a);
+ MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_CrackedIce);
CurrentMapDrawMetatileAt(x, y);
data[1] = 1;
}
@@ -214,7 +215,7 @@ static void IcefallCaveIcePerStepCallback(u8 taskId)
x = data[4];
y = data[5];
PlaySE(SE_RU_GASYAN);
- MapGridSetMetatileIdAt(x, y, 0x35b);
+ MapGridSetMetatileIdAt(x, y, METATILE_SeafoamIslands_IceHole);
CurrentMapDrawMetatileAt(x, y);
VarSet(VAR_TEMP_1, 1);
data[1] = 1;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 76b020fbc..3f1927cbf 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -2111,7 +2111,7 @@ bool8 ScrCmd_setmetatile(struct ScriptContext *ctx)
if (!v8)
MapGridSetMetatileIdAt(x, y, tileId);
else
- MapGridSetMetatileIdAt(x, y, tileId | 0xC00);
+ MapGridSetMetatileIdAt(x, y, tileId | METATILE_COLLISION_MASK);
return FALSE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 15:06:25 +0000