atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix elevator metatile typo

Browse source
This commit is contained in:
GriffinR 2020-07-06 16:02:49 -04:00
parent 1ce929157f
commit c0bc7e8f7b
2 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
include/constants/metatile_labels.h
View file

@ -289,31 +289,31 @@
#define METATILE_EverGrande_Door_PokemonLeague 0x21D #define METATILE_EverGrande_Door_PokemonLeague 0x21D
// gTileset_PokemonCenter // gTileset_PokemonCenter
#define METATILE_PokemonCenter_Elevator1F_Tile0_Frame0 0x280 #define METATILE_PokemonCenter_Escalator1F_Tile0_Frame0 0x280
#define METATILE_PokemonCenter_Elevator1F_Tile0_Frame1 0x282 #define METATILE_PokemonCenter_Escalator1F_Tile0_Frame1 0x282
#define METATILE_PokemonCenter_Elevator1F_Tile0_Frame2 0x284 #define METATILE_PokemonCenter_Escalator1F_Tile0_Frame2 0x284
#define METATILE_PokemonCenter_Elevator1F_Tile1_Frame0 0x281 #define METATILE_PokemonCenter_Escalator1F_Tile1_Frame0 0x281
#define METATILE_PokemonCenter_Elevator1F_Tile1_Frame1 0x283 #define METATILE_PokemonCenter_Escalator1F_Tile1_Frame1 0x283
#define METATILE_PokemonCenter_Elevator1F_Tile1_Frame2 0x285 #define METATILE_PokemonCenter_Escalator1F_Tile1_Frame2 0x285
#define METATILE_PokemonCenter_Elevator1F_Tile2_Frame0 0x288 #define METATILE_PokemonCenter_Escalator1F_Tile2_Frame0 0x288
#define METATILE_PokemonCenter_Elevator1F_Tile2_Frame1 0x28A #define METATILE_PokemonCenter_Escalator1F_Tile2_Frame1 0x28A
#define METATILE_PokemonCenter_Elevator1F_Tile2_Frame2 0x28C #define METATILE_PokemonCenter_Escalator1F_Tile2_Frame2 0x28C
#define METATILE_PokemonCenter_Elevator1F_Tile3_Frame0 0x289 #define METATILE_PokemonCenter_Escalator1F_Tile3_Frame0 0x289
#define METATILE_PokemonCenter_Elevator1F_Tile3_Frame1 0x28B #define METATILE_PokemonCenter_Escalator1F_Tile3_Frame1 0x28B
#define METATILE_PokemonCenter_Elevator1F_Tile3_Frame2 0x28D #define METATILE_PokemonCenter_Escalator1F_Tile3_Frame2 0x28D
#define METATILE_PokemonCenter_Elevator2F_Tile0_Frame0 0x2A0 #define METATILE_PokemonCenter_Escalator2F_Tile0_Frame0 0x2A0
#define METATILE_PokemonCenter_Elevator2F_Tile0_Frame1 0x2A2 #define METATILE_PokemonCenter_Escalator2F_Tile0_Frame1 0x2A2
#define METATILE_PokemonCenter_Elevator2F_Tile0_Frame2 0x2A4 #define METATILE_PokemonCenter_Escalator2F_Tile0_Frame2 0x2A4
#define METATILE_PokemonCenter_Elevator2F_Tile1_Frame0 0x2A1 #define METATILE_PokemonCenter_Escalator2F_Tile1_Frame0 0x2A1
#define METATILE_PokemonCenter_Elevator2F_Tile1_Frame1 0x2A3 #define METATILE_PokemonCenter_Escalator2F_Tile1_Frame1 0x2A3
#define METATILE_PokemonCenter_Elevator2F_Tile1_Frame2 0x2A5 #define METATILE_PokemonCenter_Escalator2F_Tile1_Frame2 0x2A5
#define METATILE_PokemonCenter_Elevator2F_Tile2_Frame0 0x2A8 #define METATILE_PokemonCenter_Escalator2F_Tile2_Frame0 0x2A8
#define METATILE_PokemonCenter_Elevator2F_Tile2_Frame1 0x2AA #define METATILE_PokemonCenter_Escalator2F_Tile2_Frame1 0x2AA
#define METATILE_PokemonCenter_Elevator2F_Tile2_Frame2 0x2AC #define METATILE_PokemonCenter_Escalator2F_Tile2_Frame2 0x2AC
#define METATILE_PokemonCenter_Floor_ShadowTop_Alt 0x2DC #define METATILE_PokemonCenter_Floor_ShadowTop_Alt 0x2DC
#define METATILE_PokemonCenter_Floor_Plain_Alt 0x2E4 #define METATILE_PokemonCenter_Floor_Plain_Alt 0x2E4
#define METATILE_PokemonCenter_Floor_ShadowTop 0x21E #define METATILE_PokemonCenter_Floor_ShadowTop 0x21E
#define METATILE_PokemonCenter_CounterBarrier 0x25D #define METATILE_PokemonCenter_CounterBarrier 0x25D
// gTileset_InsideOfTruck // gTileset_InsideOfTruck
#define METATILE_InsideOfTruck_ExitLight_Top 0x208 #define METATILE_InsideOfTruck_ExitLight_Top 0x208

70
src/fldeff_escalator.c
View file

@ -16,46 +16,46 @@ static void Task_DrawTeleporterCable(u8 taskId);
#define ESCALATOR_STAGES 3 #define ESCALATOR_STAGES 3
#define LAST_ESCALATOR_STAGE (ESCALATOR_STAGES - 1) #define LAST_ESCALATOR_STAGE (ESCALATOR_STAGES - 1)
static const u16 sElevatorMetatiles_1F_0[ESCALATOR_STAGES] = { static const u16 sEscalatorMetatiles_1F_0[ESCALATOR_STAGES] = {
METATILE_PokemonCenter_Elevator1F_Tile0_Frame2, METATILE_PokemonCenter_Escalator1F_Tile0_Frame2,
METATILE_PokemonCenter_Elevator1F_Tile0_Frame1, METATILE_PokemonCenter_Escalator1F_Tile0_Frame1,
METATILE_PokemonCenter_Elevator1F_Tile0_Frame0 METATILE_PokemonCenter_Escalator1F_Tile0_Frame0
}; };
static const u16 sElevatorMetatiles_1F_1[ESCALATOR_STAGES] = { static const u16 sEscalatorMetatiles_1F_1[ESCALATOR_STAGES] = {
METATILE_PokemonCenter_Elevator1F_Tile1_Frame2, METATILE_PokemonCenter_Escalator1F_Tile1_Frame2,
METATILE_PokemonCenter_Elevator1F_Tile1_Frame1, METATILE_PokemonCenter_Escalator1F_Tile1_Frame1,
METATILE_PokemonCenter_Elevator1F_Tile1_Frame0 METATILE_PokemonCenter_Escalator1F_Tile1_Frame0
}; };
static const u16 sElevatorMetatiles_1F_2[ESCALATOR_STAGES] = { static const u16 sEscalatorMetatiles_1F_2[ESCALATOR_STAGES] = {
METATILE_PokemonCenter_Elevator1F_Tile2_Frame2, METATILE_PokemonCenter_Escalator1F_Tile2_Frame2,
METATILE_PokemonCenter_Elevator1F_Tile2_Frame1, METATILE_PokemonCenter_Escalator1F_Tile2_Frame1,
METATILE_PokemonCenter_Elevator1F_Tile2_Frame0 METATILE_PokemonCenter_Escalator1F_Tile2_Frame0
}; };
static const u16 sElevatorMetatiles_1F_3[ESCALATOR_STAGES] = { static const u16 sEscalatorMetatiles_1F_3[ESCALATOR_STAGES] = {
METATILE_PokemonCenter_Elevator1F_Tile3_Frame2, METATILE_PokemonCenter_Escalator1F_Tile3_Frame2,
METATILE_PokemonCenter_Elevator1F_Tile3_Frame1, METATILE_PokemonCenter_Escalator1F_Tile3_Frame1,
METATILE_PokemonCenter_Elevator1F_Tile3_Frame0 METATILE_PokemonCenter_Escalator1F_Tile3_Frame0
}; };
static const u16 sElevatorMetatiles_2F_0[ESCALATOR_STAGES] = { static const u16 sEscalatorMetatiles_2F_0[ESCALATOR_STAGES] = {
METATILE_PokemonCenter_Elevator2F_Tile0_Frame0, METATILE_PokemonCenter_Escalator2F_Tile0_Frame0,
METATILE_PokemonCenter_Elevator2F_Tile0_Frame1, METATILE_PokemonCenter_Escalator2F_Tile0_Frame1,
METATILE_PokemonCenter_Elevator2F_Tile0_Frame2 METATILE_PokemonCenter_Escalator2F_Tile0_Frame2
}; };
static const u16 sElevatorMetatiles_2F_1[ESCALATOR_STAGES] = { static const u16 sEscalatorMetatiles_2F_1[ESCALATOR_STAGES] = {
METATILE_PokemonCenter_Elevator2F_Tile1_Frame0, METATILE_PokemonCenter_Escalator2F_Tile1_Frame0,
METATILE_PokemonCenter_Elevator2F_Tile1_Frame1, METATILE_PokemonCenter_Escalator2F_Tile1_Frame1,
METATILE_PokemonCenter_Elevator2F_Tile1_Frame2 METATILE_PokemonCenter_Escalator2F_Tile1_Frame2
}; };
static const u16 sElevatorMetatiles_2F_2[ESCALATOR_STAGES] = { static const u16 sEscalatorMetatiles_2F_2[ESCALATOR_STAGES] = {
METATILE_PokemonCenter_Elevator2F_Tile2_Frame0, METATILE_PokemonCenter_Escalator2F_Tile2_Frame0,
METATILE_PokemonCenter_Elevator2F_Tile2_Frame1, METATILE_PokemonCenter_Escalator2F_Tile2_Frame1,
METATILE_PokemonCenter_Elevator2F_Tile2_Frame2 METATILE_PokemonCenter_Escalator2F_Tile2_Frame2
}; };
#define tState data[0] #define tState data[0]
@ -122,25 +122,25 @@ static void Task_DrawEscalator(u8 taskId)
switch (tState) switch (tState)
{ {
case 0: case 0:
SetEscalatorMetatile(taskId, sElevatorMetatiles_1F_0, 0); SetEscalatorMetatile(taskId, sEscalatorMetatiles_1F_0, 0);
break; break;
case 1: case 1:
SetEscalatorMetatile(taskId, sElevatorMetatiles_1F_1, 0); SetEscalatorMetatile(taskId, sEscalatorMetatiles_1F_1, 0);
break; break;
case 2: case 2:
SetEscalatorMetatile(taskId, sElevatorMetatiles_1F_2, METATILE_COLLISION_MASK); SetEscalatorMetatile(taskId, sEscalatorMetatiles_1F_2, METATILE_COLLISION_MASK);
break; break;
case 3: case 3:
SetEscalatorMetatile(taskId, sElevatorMetatiles_1F_3, 0); SetEscalatorMetatile(taskId, sEscalatorMetatiles_1F_3, 0);
break; break;
case 4: case 4:
SetEscalatorMetatile(taskId, sElevatorMetatiles_2F_0, METATILE_COLLISION_MASK); SetEscalatorMetatile(taskId, sEscalatorMetatiles_2F_0, METATILE_COLLISION_MASK);
break; break;
case 5: case 5:
SetEscalatorMetatile(taskId, sElevatorMetatiles_2F_1, 0); SetEscalatorMetatile(taskId, sEscalatorMetatiles_2F_1, 0);
break; break;
case 6: case 6:
SetEscalatorMetatile(taskId, sElevatorMetatiles_2F_2, 0); SetEscalatorMetatile(taskId, sEscalatorMetatiles_2F_2, 0);
break; break;
} }