From 120e75d275988c5d723ac827e141d4ea5195e461 Mon Sep 17 00:00:00 2001 From: sphericalice Date: Mon, 25 Oct 2021 18:03:14 +0100 Subject: Document the CloseBattlePikeCurtain special --- include/constants/metatile_labels.h | 1 + include/global.fieldmap.h | 5 +++++ 2 files changed, 6 insertions(+) (limited to 'include') diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index b4ee3eacf..519120082 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -352,6 +352,7 @@ #define METATILE_InsideShip_IntactDoor_Bottom_Interior 0x297 // gTileset_BattlePike +#define METATILE_BattlePike_CurtainFrames_Start 0x201 #define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A #define METATILE_BattlePike_Curtain_Stage0_Tile1 0x251 #define METATILE_BattlePike_Curtain_Stage0_Tile2 0x252 diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 41b8539ff..a1e752415 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -36,6 +36,11 @@ struct Tileset /*0x14*/ TilesetCB callback; }; +// Tilesets do not actually have s strict width. +// This constant is simply used for the offset between rows of metatiles for +// large tiles, such as the Battle Pike's curtain tile. +#define TILESET_WIDTH 8 + struct MapLayout { /*0x00*/ s32 width; -- cgit v1.2.3 From 5bce17cbcee66842b33e1c46c2a71684ee8093fb Mon Sep 17 00:00:00 2001 From: sphericalice Date: Mon, 25 Oct 2021 18:11:06 +0100 Subject: Fix typo in the TILESET_WIDTH comment --- include/global.fieldmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index a1e752415..5c673fc45 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -36,7 +36,7 @@ struct Tileset /*0x14*/ TilesetCB callback; }; -// Tilesets do not actually have s strict width. +// Tilesets do not actually have a strict width. // This constant is simply used for the offset between rows of metatiles for // large tiles, such as the Battle Pike's curtain tile. #define TILESET_WIDTH 8 -- cgit v1.2.3 From 7b5267c799579047ac012928024ce92918c541fe Mon Sep 17 00:00:00 2001 From: sphericalice Date: Mon, 25 Oct 2021 20:51:04 +0100 Subject: Rename TILESET_WIDTH to METATILE_ROW_WIDTH --- include/global.fieldmap.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 5c673fc45..5d788ddf7 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -11,6 +11,11 @@ #define METATILE_ID(tileset, name) (METATILE_##tileset##_##name) +// Rows of metatiles do not actually have a strict width. +// This constant is used for calculations for finding the next row of metatiles +// for constructing large tiles, such as the Battle Pike's curtain tile. +#define METATILE_ROW_WIDTH 8 + enum { CONNECTION_INVALID = -1, @@ -36,11 +41,6 @@ struct Tileset /*0x14*/ TilesetCB callback; }; -// Tilesets do not actually have a strict width. -// This constant is simply used for the offset between rows of metatiles for -// large tiles, such as the Battle Pike's curtain tile. -#define TILESET_WIDTH 8 - struct MapLayout { /*0x00*/ s32 width; -- cgit v1.2.3