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

Cleaned up metatile behavior

Browse source
This commit is contained in:
pkmnsnfrn 2024-07-25 21:22:08 -07:00
parent 02cdbb3c7d
commit f362f6e754
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/menu.c
View file

@ -50,6 +50,7 @@ struct Menu
static u16 AddWindowParameterized(u8, u8, u8, u8, u8, u8, u16); static u16 AddWindowParameterized(u8, u8, u8, u8, u8, u8, u16);
static void WindowFunc_DrawStandardFrame(u8, u8, u8, u8, u8, u8); static void WindowFunc_DrawStandardFrame(u8, u8, u8, u8, u8, u8);
static void WindowFunc_DrawSignFrame(u8, u8, u8, u8, u8, u8); static void WindowFunc_DrawSignFrame(u8, u8, u8, u8, u8, u8);
static inline void *GetWindowFunc_DialogueFrame(void);
static void WindowFunc_DrawDialogueFrame(u8, u8, u8, u8, u8, u8); static void WindowFunc_DrawDialogueFrame(u8, u8, u8, u8, u8, u8);
static void WindowFunc_ClearStdWindowAndFrame(u8, u8, u8, u8, u8, u8); static void WindowFunc_ClearStdWindowAndFrame(u8, u8, u8, u8, u8, u8);
static void WindowFunc_ClearDialogWindowAndFrame(u8, u8, u8, u8, u8, u8); static void WindowFunc_ClearDialogWindowAndFrame(u8, u8, u8, u8, u8, u8);
@ -328,7 +329,6 @@ static void WindowFunc_DrawSignFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 wi
static inline void *GetWindowFunc_DialogueFrame(void) static inline void *GetWindowFunc_DialogueFrame(void)
{ {
return (IsMsgSignPost() ? WindowFunc_DrawSignFrame : WindowFunc_DrawDialogueFrame); return (IsMsgSignPost() ? WindowFunc_DrawSignFrame : WindowFunc_DrawDialogueFrame);
} }
void DrawDialogueFrame(u8 windowId, bool8 copyToVram) void DrawDialogueFrame(u8 windowId, bool8 copyToVram)

2
src/metatile_behavior.c
View file

@ -127,6 +127,8 @@ static const u8 sTileBitAttributes[NUM_METATILE_BEHAVIORS] =
[MB_HORIZONTAL_RAIL] = TILE_FLAG_UNUSED, [MB_HORIZONTAL_RAIL] = TILE_FLAG_UNUSED,
#if OW_AUTO_SIGNPOST == TRUE #if OW_AUTO_SIGNPOST == TRUE
[MB_SIGNPOST] = TILE_FLAG_UNUSED, [MB_SIGNPOST] = TILE_FLAG_UNUSED,
[MB_POKEMON_CENTER_SIGN] = TILE_FLAG_UNUSED,
[MB_POKEMART_SIGN] = TILE_FLAG_UNUSED,
#endif #endif
}; };