diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-19 09:37:12 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2022-01-19 09:37:12 -0500 |
| commit | f127e64a3ca2899510622f012bc3823da2c5cd23 (patch) | |
| tree | 411794dea8d12d93823df6814aed9f1acc8c0c93 /include | |
| parent | 69759b2d128ea27f3bc9ebdb7e58ea3698d0a491 (diff) | |
Name overworld tilemaps for their bg, add layer type constants
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.fieldmap.h | 6 | ||||
| -rw-r--r-- | include/overworld.h | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 33be942c8..2613682fd 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -9,6 +9,12 @@ #define METATILE_COLLISION_SHIFT 10 #define METATILE_ELEVATION_MASK 0xF000 +enum { + METATILE_LAYER_TYPE_NORMAL, // Metatile uses middle and top bg layers + METATILE_LAYER_TYPE_COVERED, // Metatile uses bottom and middle bg layers + METATILE_LAYER_TYPE_SPLIT, // Metatile uses bottom and top bg layers +}; + #define METATILE_ID(tileset, name) (METATILE_##tileset##_##name) // Rows of metatiles do not actually have a strict width. diff --git a/include/overworld.h b/include/overworld.h index 04b61f7fd..b8794ea70 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -40,20 +40,18 @@ struct LinkPlayerObjectEvent u8 movementMode; }; -// Exported RAM declarations extern struct WarpData gLastUsedWarp; extern struct LinkPlayerObjectEvent gLinkPlayerObjectEvents[4]; -extern u16 *gBGTilemapBuffers1; -extern u16 *gBGTilemapBuffers2; -extern u16 *gBGTilemapBuffers3; +extern u16 *gOverworldTilemapBuffer_Bg2; +extern u16 *gOverworldTilemapBuffer_Bg1; +extern u16 *gOverworldTilemapBuffer_Bg3; extern u16 gHeldKeyCodeToSend; extern void (*gFieldCallback)(void); extern bool8 (*gFieldCallback2)(void); extern u8 gLocalLinkPlayerId; extern u8 gFieldLinkPlayerCount; -// Exported ROM declarations extern const struct UCoords32 gDirectionToVectors[]; void DoWhiteOut(void); |