ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-06 15:38:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Label data for screen effect tasks

Browse Source
This commit is contained in:
GriffinR 2023-02-01 10:20:18 -05:00
parent 603d870ea0
commit 27a5e05f75
1 changed files with 78 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/field_specials.c
View File

@ -94,8 +94,8 @@ static void LoadLinkPartnerObjectEventSpritePalette(u8, u8, u8);
static void Task_PetalburgGymSlideOpenRoomDoors(u8); static void Task_PetalburgGymSlideOpenRoomDoors(u8);
static void PetalburgGymSetDoorMetatiles(u8, u16); static void PetalburgGymSetDoorMetatiles(u8, u16);
static void Task_PCTurnOnEffect(u8); static void Task_PCTurnOnEffect(u8);
static void PCTurnOnEffect_0(struct Task *); static void PCTurnOnEffect(struct Task *);
static void PCTurnOnEffect_1(s16, s8, s8); static void PCTurnOnEffect_SetMetatile(s16, s8, s8);
static void PCTurnOffEffect(void); static void PCTurnOffEffect(void);
static void Task_LotteryCornerComputerEffect(u8); static void Task_LotteryCornerComputerEffect(u8);
static void LotteryCornerComputerEffect(struct Task *); static void LotteryCornerComputerEffect(struct Task *);
@ -966,34 +966,44 @@ void FieldShowRegionMap(void)
SetMainCallback2(CB2_FieldShowRegionMap); SetMainCallback2(CB2_FieldShowRegionMap);
} }
// Task data for Task_PCTurnOnEffect and Task_LotteryCornerComputerEffect
#define tPaused data[0] // Never set
#define tTaskId data[1]
#define tFlickerCount data[2]
#define tTimer data[3]
#define tIsScreenOn data[4]
// For this special, gSpecialVar_0x8004 is expected to be some PC_LOCATION_* value.
void DoPCTurnOnEffect(void) void DoPCTurnOnEffect(void)
{ {
if (FuncIsActiveTask(Task_PCTurnOnEffect) != TRUE) if (FuncIsActiveTask(Task_PCTurnOnEffect) != TRUE)
{ {
u8 taskId = CreateTask(Task_PCTurnOnEffect, 8); u8 taskId = CreateTask(Task_PCTurnOnEffect, 8);
gTasks[taskId].data[0] = 0; gTasks[taskId].tPaused = FALSE;
gTasks[taskId].data[1] = taskId; gTasks[taskId].tTaskId = taskId;
gTasks[taskId].data[2] = 0; gTasks[taskId].tFlickerCount = 0;
gTasks[taskId].data[3] = 0; gTasks[taskId].tTimer = 0;
gTasks[taskId].data[4] = 0; gTasks[taskId].tIsScreenOn = FALSE;
} }
} }
static void Task_PCTurnOnEffect(u8 taskId) static void Task_PCTurnOnEffect(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
if (task->data[0] == 0) if (!task->tPaused)
PCTurnOnEffect_0(task); PCTurnOnEffect(task);
} }
static void PCTurnOnEffect_0(struct Task *task) static void PCTurnOnEffect(struct Task *task)
{ {
u8 playerDirection; u8 playerDirection;
s8 dx = 0; s8 dx = 0;
s8 dy = 0; s8 dy = 0;
if (task->data[3] == 6) if (task->tTimer == 6)
{ {
task->data[3] = 0; task->tTimer = 0;
// Get where the PC should be, depending on where the player is looking.
playerDirection = GetPlayerFacingDirection(); playerDirection = GetPlayerFacingDirection();
switch (playerDirection) switch (playerDirection)
{ {
@ -1010,39 +1020,47 @@ static void PCTurnOnEffect_0(struct Task *task)
dy = -1; dy = -1;
break; break;
} }
PCTurnOnEffect_1(task->data[4], dx, dy);
// Update map
PCTurnOnEffect_SetMetatile(task->tIsScreenOn, dx, dy);
DrawWholeMapView(); DrawWholeMapView();
task->data[4] ^= 1;
if ((++task->data[2]) == 5) // Screen flickers 5 times. Odd number and starting with the
DestroyTask(task->data[1]); // screen off means the animation ends with the screen on.
task->tIsScreenOn ^= 1;
if (++task->tFlickerCount == 5)
DestroyTask(task->tTaskId);
} }
task->data[3]++; task->tTimer++;
} }
static void PCTurnOnEffect_1(s16 isPcTurnedOn, s8 dx, s8 dy) static void PCTurnOnEffect_SetMetatile(s16 isScreenOn, s8 dx, s8 dy)
{ {
u16 tileId = 0; u16 metatileId = 0;
if (isPcTurnedOn) if (isScreenOn)
{ {
// Screen is off, set it on
if (gSpecialVar_0x8004 == PC_LOCATION_OTHER) if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
tileId = METATILE_Building_PC_Off; metatileId = METATILE_Building_PC_Off;
else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE) else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
tileId = METATILE_BrendansMaysHouse_BrendanPC_Off; metatileId = METATILE_BrendansMaysHouse_BrendanPC_Off;
else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE) else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
tileId = METATILE_BrendansMaysHouse_MayPC_Off; metatileId = METATILE_BrendansMaysHouse_MayPC_Off;
} }
else else
{ {
// Screen is on, set it off
if (gSpecialVar_0x8004 == PC_LOCATION_OTHER) if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
tileId = METATILE_Building_PC_On; metatileId = METATILE_Building_PC_On;
else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE) else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
tileId = METATILE_BrendansMaysHouse_BrendanPC_On; metatileId = METATILE_BrendansMaysHouse_BrendanPC_On;
else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE) else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
tileId = METATILE_BrendansMaysHouse_MayPC_On; metatileId = METATILE_BrendansMaysHouse_MayPC_On;
} }
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + MAP_OFFSET, gSaveBlock1Ptr->pos.y + dy + MAP_OFFSET, tileId | MAPGRID_COLLISION_MASK); MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + MAP_OFFSET, gSaveBlock1Ptr->pos.y + dy + MAP_OFFSET, metatileId | MAPGRID_COLLISION_MASK);
} }
// For this special, gSpecialVar_0x8004 is expected to be some PC_LOCATION_* value.
void DoPCTurnOffEffect(void) void DoPCTurnOffEffect(void)
{ {
PCTurnOffEffect(); PCTurnOffEffect();
@ -1052,7 +1070,9 @@ static void PCTurnOffEffect(void)
{ {
s8 dx = 0; s8 dx = 0;
s8 dy = 0; s8 dy = 0;
u16 tileId = 0; u16 metatileId = 0;
// Get where the PC should be, depending on where the player is looking.
u8 playerDirection = GetPlayerFacingDirection(); u8 playerDirection = GetPlayerFacingDirection();
switch (playerDirection) switch (playerDirection)
{ {
@ -1069,13 +1089,15 @@ static void PCTurnOffEffect(void)
dy = -1; dy = -1;
break; break;
} }
if (gSpecialVar_0x8004 == PC_LOCATION_OTHER) if (gSpecialVar_0x8004 == PC_LOCATION_OTHER)
tileId = METATILE_Building_PC_Off; metatileId = METATILE_Building_PC_Off;
else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE) else if (gSpecialVar_0x8004 == PC_LOCATION_BRENDANS_HOUSE)
tileId = METATILE_BrendansMaysHouse_BrendanPC_Off; metatileId = METATILE_BrendansMaysHouse_BrendanPC_Off;
else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE) else if (gSpecialVar_0x8004 == PC_LOCATION_MAYS_HOUSE)
tileId = METATILE_BrendansMaysHouse_MayPC_Off; metatileId = METATILE_BrendansMaysHouse_MayPC_Off;
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + MAP_OFFSET, gSaveBlock1Ptr->pos.y + dy + MAP_OFFSET, tileId | MAPGRID_COLLISION_MASK);
MapGridSetMetatileIdAt(gSaveBlock1Ptr->pos.x + dx + MAP_OFFSET, gSaveBlock1Ptr->pos.y + dy + MAP_OFFSET, metatileId | MAPGRID_COLLISION_MASK);
DrawWholeMapView(); DrawWholeMapView();
} }
@ -1084,42 +1106,47 @@ void DoLotteryCornerComputerEffect(void)
if (FuncIsActiveTask(Task_LotteryCornerComputerEffect) != TRUE) if (FuncIsActiveTask(Task_LotteryCornerComputerEffect) != TRUE)
{ {
u8 taskId = CreateTask(Task_LotteryCornerComputerEffect, 8); u8 taskId = CreateTask(Task_LotteryCornerComputerEffect, 8);
gTasks[taskId].data[0] = 0; gTasks[taskId].tPaused = FALSE;
gTasks[taskId].data[1] = taskId; gTasks[taskId].tTaskId = taskId;
gTasks[taskId].data[2] = 0; gTasks[taskId].tFlickerCount = 0;
gTasks[taskId].data[3] = 0; gTasks[taskId].tTimer = 0;
gTasks[taskId].data[4] = 0; gTasks[taskId].tIsScreenOn = FALSE;
} }
} }
static void Task_LotteryCornerComputerEffect(u8 taskId) static void Task_LotteryCornerComputerEffect(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
if (task->data[0] == 0) if (!task->tPaused)
LotteryCornerComputerEffect(task); LotteryCornerComputerEffect(task);
} }
static void LotteryCornerComputerEffect(struct Task *task) static void LotteryCornerComputerEffect(struct Task *task)
{ {
if (task->data[3] == 6) if (task->tTimer == 6)
{ {
task->data[3] = 0; task->tTimer = 0;
if (task->data[4] != 0) if (task->tIsScreenOn)
{ {
// Screen is on, set it off
MapGridSetMetatileIdAt(11 + MAP_OFFSET, 1 + MAP_OFFSET, METATILE_Shop_Laptop1_Normal | MAPGRID_COLLISION_MASK); MapGridSetMetatileIdAt(11 + MAP_OFFSET, 1 + MAP_OFFSET, METATILE_Shop_Laptop1_Normal | MAPGRID_COLLISION_MASK);
MapGridSetMetatileIdAt(11 + MAP_OFFSET, 2 + MAP_OFFSET, METATILE_Shop_Laptop2_Normal | MAPGRID_COLLISION_MASK); MapGridSetMetatileIdAt(11 + MAP_OFFSET, 2 + MAP_OFFSET, METATILE_Shop_Laptop2_Normal | MAPGRID_COLLISION_MASK);
} }
else else
{ {
// Screen is off, set it on
MapGridSetMetatileIdAt(11 + MAP_OFFSET, 1 + MAP_OFFSET, METATILE_Shop_Laptop1_Flash | MAPGRID_COLLISION_MASK); MapGridSetMetatileIdAt(11 + MAP_OFFSET, 1 + MAP_OFFSET, METATILE_Shop_Laptop1_Flash | MAPGRID_COLLISION_MASK);
MapGridSetMetatileIdAt(11 + MAP_OFFSET, 2 + MAP_OFFSET, METATILE_Shop_Laptop2_Flash | MAPGRID_COLLISION_MASK); MapGridSetMetatileIdAt(11 + MAP_OFFSET, 2 + MAP_OFFSET, METATILE_Shop_Laptop2_Flash | MAPGRID_COLLISION_MASK);
} }
DrawWholeMapView(); DrawWholeMapView();
task->data[4] ^= 1;
if ((++task->data[2]) == 5) // Screen flickers 5 times. Odd number and starting with the
DestroyTask(task->data[1]); // screen off means the animation ends with the screen on.
task->tIsScreenOn ^= 1;
if (++task->tFlickerCount == 5)
DestroyTask(task->tTaskId);
} }
task->data[3]++; task->tTimer++;
} }
void EndLotteryCornerComputerEffect(void) void EndLotteryCornerComputerEffect(void)
@ -1129,6 +1156,12 @@ void EndLotteryCornerComputerEffect(void)
DrawWholeMapView(); DrawWholeMapView();
} }
#undef tPaused
#undef tTaskId
#undef tFlickerCount
#undef tTimer
#undef tIsScreenOn
void SetTrickHouseNuggetFlag(void) void SetTrickHouseNuggetFlag(void)
{ {
u16 *specVar = &gSpecialVar_0x8004; u16 *specVar = &gSpecialVar_0x8004;