ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 02:10:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

label remaining metatiles in field_specials.c

Browse Source
This commit is contained in:
garak 2019-06-11 19:12:47 -04:00 committed by huderlem
parent a9560d9c62
commit 7e35b8a710
2 changed files with 76 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/constants/metatile_labels.h
View File

@ -47,6 +47,34 @@
#define METATILE_BrendansMaysHouse_MayPC_Off 0x259 #define METATILE_BrendansMaysHouse_MayPC_Off 0x259
#define METATILE_BrendansMaysHouse_MayPC_On 0x27E #define METATILE_BrendansMaysHouse_MayPC_On 0x27E
// gTileset_Shop
#define METATILE_Shop_Laptop1_Normal 0x29D
#define METATILE_Shop_Laptop2_Normal 0x2A5
#define METATILE_Shop_Laptop1_Flash 0x258
#define METATILE_Shop_Laptop2_Flash 0x260
// gTileset_BattleFrontier
#define METATILE_BattleFrontier_Elevator_Top0 0x329
#define METATILE_BattleFrontier_Elevator_Top1 0x32A
#define METATILE_BattleFrontier_Elevator_Top2 0x32B
#define METATILE_BattleFrontier_Elevator_Mid0 0x331
#define METATILE_BattleFrontier_Elevator_Mid1 0x332
#define METATILE_BattleFrontier_Elevator_Mid2 0x333
#define METATILE_BattleFrontier_Elevator_Bottom0 0x339
#define METATILE_BattleFrontier_Elevator_Bottom1 0x33A
#define METATILE_BattleFrontier_Elevator_Bottom2 0x33B

71
src/field_specials.c
View File

@ -101,7 +101,7 @@ static void sub_81395BC(u8 taskId);
static void sub_8139620(u8 taskId); static void sub_8139620(u8 taskId);
static void sub_8139AF4(u8 taskId); static void sub_8139AF4(u8 taskId);
static void sub_8139C2C(u16 a1, u8 a2); static void sub_8139C2C(u16 a1, u8 a2);
static void sub_8139C80(u8 taskId); static void MoveElevatorWindowLights(u8 taskId);
static void sub_813A2DC(u8 taskId); static void sub_813A2DC(u8 taskId);
static void sub_813AA60(u16 a0, u16 a1); static void sub_813AA60(u16 a0, u16 a1);
static void sub_813ACE8(u8 a0, u16 a1); static void sub_813ACE8(u8 a0, u16 a1);
@ -1185,13 +1185,13 @@ static void LotteryCornerComputerEffect(struct Task *task)
task->data[3] = 0; task->data[3] = 0;
if (task->data[4] != 0) if (task->data[4] != 0)
{ {
MapGridSetMetatileIdAt(18, 8, 0xe9d); MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Normal) | METATILE_COLLISION_MASK);
MapGridSetMetatileIdAt(18, 9, 0xea5); MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Normal) | METATILE_COLLISION_MASK);
} }
else else
{ {
MapGridSetMetatileIdAt(18, 8, 0xe58); MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Flash) | METATILE_COLLISION_MASK);
MapGridSetMetatileIdAt(18, 9, 0xe60); MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Flash) | METATILE_COLLISION_MASK);
} }
DrawWholeMapView(); DrawWholeMapView();
task->data[4] ^= 1; task->data[4] ^= 1;
@ -1205,8 +1205,8 @@ static void LotteryCornerComputerEffect(struct Task *task)
void EndLotteryCornerComputerEffect(void) void EndLotteryCornerComputerEffect(void)
{ {
MapGridSetMetatileIdAt(18, 8, 0xe9d); MapGridSetMetatileIdAt(18, 8, METATILE_ID(Shop, Laptop1_Normal) | METATILE_COLLISION_MASK);
MapGridSetMetatileIdAt(18, 9, 0xea5); MapGridSetMetatileIdAt(18, 9, METATILE_ID(Shop, Laptop2_Normal) | METATILE_COLLISION_MASK);
DrawWholeMapView(); DrawWholeMapView();
} }
@ -1722,17 +1722,42 @@ const u8 *const gElevatorFloorsTable[] = {
gText_Rooftop gText_Rooftop
}; };
const u16 gUnknown_085B2BF4[][3] = static const u16 sElevatorWindowTiles_Ascending[][3] =
{ {
{0x0329, 0x032a, 0x032b}, {
{0x0331, 0x0332, 0x0333}, METATILE_ID(BattleFrontier, Elevator_Top0),
{0x0339, 0x033a, 0x033b}, METATILE_ID(BattleFrontier, Elevator_Top1),
METATILE_ID(BattleFrontier, Elevator_Top2)
},
{
METATILE_ID(BattleFrontier, Elevator_Mid0),
METATILE_ID(BattleFrontier, Elevator_Mid1),
METATILE_ID(BattleFrontier, Elevator_Mid2)
},
{
METATILE_ID(BattleFrontier, Elevator_Bottom0),
METATILE_ID(BattleFrontier, Elevator_Bottom1),
METATILE_ID(BattleFrontier, Elevator_Bottom2)
},
}; };
const u16 gUnknown_085B2C06[][3] =
static const u16 sElevatorWindowTiles_Descending[][3] =
{ {
{0x0329, 0x032b, 0x032a}, {
{0x0331, 0x0333, 0x0332}, METATILE_ID(BattleFrontier, Elevator_Top0),
{0x0339, 0x033b, 0x033a}, METATILE_ID(BattleFrontier, Elevator_Top2),
METATILE_ID(BattleFrontier, Elevator_Top1)
},
{
METATILE_ID(BattleFrontier, Elevator_Mid0),
METATILE_ID(BattleFrontier, Elevator_Mid2),
METATILE_ID(BattleFrontier, Elevator_Mid1)
},
{
METATILE_ID(BattleFrontier, Elevator_Bottom0),
METATILE_ID(BattleFrontier, Elevator_Bottom2),
METATILE_ID(BattleFrontier, Elevator_Bottom1)
},
}; };
void SetDepartmentStoreFloorVar(void) void SetDepartmentStoreFloorVar(void)
@ -1875,21 +1900,21 @@ void sub_8139C10(void)
RemoveWindow(gUnknown_0203AB5E); RemoveWindow(gUnknown_0203AB5E);
} }
static void sub_8139C2C(u16 a1, u8 a2) static void sub_8139C2C(u16 a1, bool8 descending)
{ {
static const u8 gUnknown_085B2C21[] = { 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b }; static const u8 gUnknown_085B2C21[] = { 0x03, 0x06, 0x09, 0x0c, 0x0f, 0x12, 0x15, 0x18, 0x1b };
if (FuncIsActiveTask(sub_8139C80) != TRUE) if (FuncIsActiveTask(MoveElevatorWindowLights) != TRUE)
{ {
u8 taskId = CreateTask(sub_8139C80, 8); u8 taskId = CreateTask(MoveElevatorWindowLights, 8);
gTasks[taskId].data[0] = 0; gTasks[taskId].data[0] = 0;
gTasks[taskId].data[1] = 0; gTasks[taskId].data[1] = 0;
gTasks[taskId].data[2] = a2; gTasks[taskId].data[2] = descending;
gTasks[taskId].data[3] = gUnknown_085B2C21[a1]; gTasks[taskId].data[3] = gUnknown_085B2C21[a1];
} }
} }
static void sub_8139C80(u8 taskId) static void MoveElevatorWindowLights(u8 taskId)
{ {
u8 x, y; u8 x, y;
s16 *data = gTasks[taskId].data; s16 *data = gTasks[taskId].data;
@ -1897,13 +1922,13 @@ static void sub_8139C80(u8 taskId)
if (data[1] == 6) if (data[1] == 6)
{ {
data[0]++; data[0]++;
if (data[2] == 0) if (data[2] == FALSE)
{ {
for (y = 0; y < 3; y++) for (y = 0; y < 3; y++)
{ {
for (x = 0; x < 3; x++) for (x = 0; x < 3; x++)
{ {
MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2BF4[y][data[0] % 3] | METATILE_COLLISION_MASK); MapGridSetMetatileIdAt(x + 8, y + 7, sElevatorWindowTiles_Ascending[y][data[0] % 3] | METATILE_COLLISION_MASK);
} }
} }
} }
@ -1913,7 +1938,7 @@ static void sub_8139C80(u8 taskId)
{ {
for (x = 0; x < 3; x++) for (x = 0; x < 3; x++)
{ {
MapGridSetMetatileIdAt(x + 8, y + 7, gUnknown_085B2C06[y][data[0] % 3] | METATILE_COLLISION_MASK); MapGridSetMetatileIdAt(x + 8, y + 7, sElevatorWindowTiles_Descending[y][data[0] % 3] | METATILE_COLLISION_MASK);
} }
} }
} }