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

Moved menu defines to header file

Browse source 
Added FRLG signpost border
Started working on LoadSignPostWindowFrameGfx
This commit is contained in:
pkmnsnfrn 2024-07-15 22:57:29 -07:00
parent 1ae615651d
commit 61eff23d89
5 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
graphics/text_window/signpost.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 219 B

7
include/menu.h
View file

@ -5,6 +5,13 @@
#include "text.h"
#include "window.h"
#define DLG_WINDOW_PALETTE_NUM 15
#define DLG_WINDOW_BASE_TILE_NUM 0x200
#define STD_WINDOW_PALETTE_NUM 14
#define STD_WINDOW_PALETTE_SIZE PLTT_SIZEOF(10)
#define STD_WINDOW_BASE_TILE_NUM 0x214
#define MENU_NOTHING_CHOSEN -2
#define MENU_B_PRESSED -1

6
src/menu.c
View file

@ -23,12 +23,6 @@
#include "config/overworld.h"
#include "constants/songs.h"
#define DLG_WINDOW_PALETTE_NUM 15
#define DLG_WINDOW_BASE_TILE_NUM 0x200
#define STD_WINDOW_PALETTE_NUM 14
#define STD_WINDOW_PALETTE_SIZE PLTT_SIZEOF(10)
#define STD_WINDOW_BASE_TILE_NUM 0x214
struct MenuInfoIcon
{
u8 width;

2
src/script.c
View file

@ -509,7 +509,7 @@ void InitRamScript_NoObjectEvent(u8 *script, u16 scriptSize)
void SetWalkingIntoSignVars(void)
{
gWalkAwayFromSignpostTimer = 6;
gWalkAwayFromSignpostTimer = WALK_AWAY_SIGNPOST_FRAMES;
sMsgBoxIsCancelable = TRUE;
}

8
src/text_window.c
View file

@ -82,6 +82,8 @@ static const struct TilesPal sWindowFrames[WINDOW_FRAMES_COUNT] =
{sTextWindowFrame20_Gfx, sTextWindowFrame20_Pal}
};
const u16 gSignpostWindow_Gfx[] = INCBIN_U16("graphics/text_window/signpost.4bpp");
// code
const struct TilesPal *GetWindowFrameTilesPal(u8 id)
{
@ -199,8 +201,6 @@ void LoadUserWindowBorderGfxOnBg(u8 bg, u16 destOffset, u8 palOffset)
void LoadSignPostWindowFrameGfx(void)
{
// TODO signpost msgbox frames
//LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUnknown_8470B0C, 0x260, destOffset);
//LoadPalette(GetWindowFrameTilesPal(1), palIdx, 32);
LoadMessageBoxAndBorderGfx();
LoadBgTiles(GetWindowAttribute(0, WINDOW_BG), gSignpostWindow_Gfx, 0x260, DLG_WINDOW_BASE_TILE_NUM);
LoadPalette(GetTextWindowPalette(1), BG_PLTT_ID(DLG_WINDOW_PALETTE_NUM), PLTT_SIZE_4BPP);
}