ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-20 11:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format more templates

Browse Source
This commit is contained in:
Slawter666 2018-09-02 17:53:52 +01:00
parent 6106154801
commit f74adc80c1
13 changed files with 546 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/battle_records.c
View File

@ -64,11 +64,28 @@ static const struct BgTemplate sTrainerHillRecordsBgTemplates[] =
static const struct WindowTemplate sTrainerHillRecordsWindowTemplates[] =
{
{0x0, 0x2, 0x1, 0x1A, 0x12, 0xF, 0x14},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 1,
.width = 26,
.height = 18,
.paletteNum = 15,
.baseBlock = 20
},
DUMMY_WIN_TEMPLATE
};
static const struct WindowTemplate sLinkBattleRecordsWindow = {0x0, 0x2, 0x1, 0x1A, 0x11, 0xF, 0x1};
static const struct WindowTemplate sLinkBattleRecordsWindow =
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 1,
.width = 26,
.height = 17,
.paletteNum = 15,
.baseBlock = 1
};
static const u8 sText_DashesNoPlayer[] = _("-------");
static const u8 sText_DashesNoScore[] = _("----");

10
src/credits.c
View File

@ -948,7 +948,15 @@ static const struct BgTemplate gUnknown_085E6F68[] =
};
static const struct WindowTemplate gUnknown_085E6F6C[] =
{
{ 0x00, 0x00, 0x09, 0x1E, 0x0C, 0x08, 0x0001 },
{
.priority = 0,
.tilemapLeft = 0,
.tilemapTop = 9,
.width = 30,
.height = 12,
.paletteNum = 8,
.baseBlock = 1
},
DUMMY_WIN_TEMPLATE,
};
static const u8 gUnknown_085E6F7C[][2] =

11
src/daycare.c
View File

@ -61,7 +61,16 @@ EWRAM_DATA static u16 sHatchedEggMotherMoves[4] = {0};
#include "data/pokemon/egg_moves.h"
static const struct WindowTemplate sDaycareLevelMenuWindowTemplate = {0, 0xF, 1, 0xE, 6, 0xF, 8};
static const struct WindowTemplate sDaycareLevelMenuWindowTemplate =
{
.priority = 0,
.tilemapLeft = 15,
.tilemapTop = 1,
.width = 14,
.height = 6,
.paletteNum = 15,
.baseBlock = 8
};
static const struct ListMenuItem sLevelMenuItems[] =
{

69
src/decoration.c
View File

@ -214,22 +214,67 @@ void (*const SecretBasePC_SelectedDecorActions[][2])(u8 taskId) = {
}
};
const struct WindowTemplate gUnknown_085A6B90[4] = {
{ 0, 1, 1, 18, 8, 15, 0x0001 },
{ 0, 1, 1, 13, 18, 13, 0x0091 },
{ 0, 17, 1, 12, 2, 15, 0x017b },
{ 0, 16, 13, 13, 6, 15, 0x0193 }
const struct WindowTemplate gUnknown_085A6B90[4] =
{
{
.priority = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
.width = 18,
.height = 8,
.paletteNum = 15,
.baseBlock = 0x0001
},
{
.priority = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
.width = 13,
.height = 18,
.paletteNum = 13,
.baseBlock = 0x0091
},
{
.priority = 0,
.tilemapLeft = 17,
.tilemapTop = 1,
.width = 12,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x017b
},
{
.priority = 0,
.tilemapLeft = 16,
.tilemapTop = 13,
.width = 13,
.height = 6,
.paletteNum = 15,
.baseBlock = 0x0193
}
};
const u16 gUnknown_085A6BB0[] = INCBIN_U16("graphics/decorations/unk_85a6bb0.gbapal");
const struct ListMenuTemplate gUnknown_085A6BD0 = {
NULL,
sub_8127480,
sub_81274A0,
0, 0,
0, 0, 8, 0,
9, 2, 1, 3, FALSE, 0, FALSE, 7
const struct ListMenuTemplate gUnknown_085A6BD0 =
{
.items = NULL,
.moveCursorFunc = sub_8127480,
.itemPrintFunc = sub_81274A0,
.totalItems = 0,
.maxShowed = 0,
.windowId = 0,
.header_X = 0,
.item_X = 8,
.cursor_X = 0,
.upText_Y = 9,
.cursorPal = 2,
.fillValue = 1,
.cursorShadowPal = 3,
.lettersSpacing = FALSE,
.itemVerticalPadding = 0,
.scrollMultiple = FALSE,
.fontId = 7
};
#include "data/decoration/icon.h"

18
src/egg_hatch.c
View File

@ -253,13 +253,27 @@ static const struct BgTemplate sBgTemplates_EggHatch[2] =
static const struct WindowTemplate sWinTemplates_EggHatch[2] =
{
{0, 2, 0xF, 0x1A, 4, 0, 0x40},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 15,
.width = 26,
.height = 4,
.paletteNum = 0,
.baseBlock = 64
},
DUMMY_WIN_TEMPLATE
};
static const struct WindowTemplate sYesNoWinTemplate =
{
0, 0x15, 9, 5, 4, 0xF, 0x1A8
.priority = 0,
.tilemapLeft = 21,
.tilemapTop = 9,
.width = 5,
.height = 4,
.paletteNum = 15,
.baseBlock = 424
};
static const s16 sEggShardVelocities[][2] =

23
src/field_region_map.c
View File

@ -55,9 +55,26 @@ static const struct BgTemplate gUnknown_085E5068[] = {
}
};
static const struct WindowTemplate gUnknown_085E5070[] = {
{ 0, 17, 17, 12, 2, 15, 0x0001 },
{ 0, 22, 1, 7, 2, 15, 0x0019 },
static const struct WindowTemplate gUnknown_085E5070[] =
{
{
.priority = 0,
.tilemapLeft = 17,
.tilemapTop = 17,
.width = 12,
.height = 2,
.paletteNum = 15,
.baseBlock = 1
},
{
.priority = 0,
.tilemapLeft = 22,
.tilemapTop = 1,
.width = 7,
.height = 2,
.paletteNum = 15,
.baseBlock = 25
},
DUMMY_WIN_TEMPLATE
};

126
src/main_menu.c
View File

@ -131,29 +131,121 @@ const u8 gUnknown_082FEEF0[] = INCBIN_U8("graphics/birch_speech/map.bin.lz");
const u16 gUnknown_082FF018[] = INCBIN_U16("graphics/birch_speech/bg2.gbapal");
const u16 gUnknown_082FF028[] = {0, 0, 0, 0, 0, 0, 0, 0};
const struct WindowTemplate sWindowTemplates_NoSavedGame[] = {
{0, 2, 1, 26, 2, 15, 1},
{0, 2, 5, 26, 2, 15, 0x35}
const struct WindowTemplate sWindowTemplates_NoSavedGame[] =
{
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 1,
.width = 26,
.height = 2,
.paletteNum = 15,
.baseBlock = 1
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 5,
.width = 26,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x35
}
};
const struct WindowTemplate sWindowTemplates_HasSavedGame[] = {
{0, 2, 1, 26, 6, 15, 1},
{0, 2, 9, 26, 2, 15, 0x9D},
{0, 2, 13, 26, 2, 15, 0xD1},
{0, 2, 17, 26, 2, 15, 0x105},
{0, 2, 21, 26, 2, 15, 0x139}
const struct WindowTemplate sWindowTemplates_HasSavedGame[] =
{
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 1,
.width = 26,
.height = 6,
.paletteNum = 15,
.baseBlock = 1
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 9,
.width = 26,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x9D
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 13,
.width = 26,
.height = 2,
.paletteNum = 15,
.baseBlock = 0xD1
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 17,
.width = 26,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x105
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 21,
.width = 26,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x139
}
};
const struct WindowTemplate sWindowTemplate_ErrorWindow[] = {
{0, 2, 15, 26, 4, 15, 0x16D},
{0xFF, 0, 0, 0, 0, 0, 0}
const struct WindowTemplate sWindowTemplate_ErrorWindow[] =
{
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 15,
.width = 26,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x16D
},
DUMMY_WIN_TEMPLATE
};
const struct WindowTemplate gUnknown_082FF080[] = {
{0, 2, 15, 27, 4, 15, 1},
{0, 3, 5, 6, 4, 15, 0x6D},
{0, 3, 2, 9, 10, 15, 0x85},
{0xFF, 0, 0, 0, 0, 0, 0}
const struct WindowTemplate gUnknown_082FF080[] =
{
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 15,
.width = 27,
.height = 4,
.paletteNum = 15,
.baseBlock = 1
},
{
.priority = 0,
.tilemapLeft = 3,
.tilemapTop = 5,
.width = 6,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x6D
},
{
.priority = 0,
.tilemapLeft = 3,
.tilemapTop = 2,
.width = 9,
.height = 10,
.paletteNum = 15,
.baseBlock = 0x85
},
DUMMY_WIN_TEMPLATE
};
const u16 gMainMenuBgPal[] = INCBIN_U16("graphics/misc/main_menu_bg.gbapal");

18
src/menu.c
View File

@ -65,13 +65,27 @@ static const u8 gUnknown_0860F094[] = { 8, 4, 1 };
static const struct WindowTemplate gUnknown_0860F098[] =
{
{ 0x00, 0x02, 0x0F, 0x1B, 0x04, 0x0F, 0x194 },
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 15,
.width = 27,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x194
},
DUMMY_WIN_TEMPLATE
};
static const struct WindowTemplate gUnknown_0860F0A8 =
{
0x00, 0x15, 0x09, 0x05, 0x04, 0x0F, 0x125
.priority = 0,
.tilemapLeft = 21,
.tilemapTop = 9,
.width = 5,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x125
};
const u16 gUnknown_0860F0B0[] = INCBIN_U16("graphics/interface/860F0B0.gbapal");

20
src/mystery_event_menu.c
View File

@ -42,8 +42,24 @@ static const struct BgTemplate sBgTemplates[] =
static const struct WindowTemplate sWindowTemplates[] =
{
{0, 4, 15, 22, 4, 14, 20},
{0, 7, 6, 16, 4, 14, 0x6C},
{
.priority = 0,
.tilemapLeft = 4,
.tilemapTop = 15,
.width = 22,
.height = 4,
.paletteNum = 14,
.baseBlock = 20
},
{
.priority = 0,
.tilemapLeft = 7,
.tilemapTop = 6,
.width = 16,
.height = 4,
.paletteNum = 14,
.baseBlock = 0x6C
},
DUMMY_WIN_TEMPLATE
};

53
src/naming_screen.c
View File

@ -113,12 +113,53 @@ static const struct BgTemplate gUnknown_0858BE00[] =
}
};
static const struct WindowTemplate gUnknown_0858BE10[] = {
{ 0x01, 0x03, 0x0A, 0x13, 0x08, 0x0A, 0x030 },
{ 0x02, 0x03, 0x0A, 0x13, 0x08, 0x0A, 0x0C8 },
{ 0x03, 0x08, 0x06, 0x11, 0x02, 0x0A, 0x030 },
{ 0x03, 0x08, 0x04, 0x11, 0x02, 0x0A, 0x052 },
{ 0x00, 0x00, 0x00, 0x1E, 0x02, 0x0B, 0x074 },
static const struct WindowTemplate gUnknown_0858BE10[] =
{
{
.priority = 1,
.tilemapLeft = 3,
.tilemapTop = 10,
.width = 19,
.height = 8,
.paletteNum = 10,
.baseBlock = 0x030
},
{
.priority = 2,
.tilemapLeft = 3,
.tilemapTop = 10,
.width = 19,
.height = 8,
.paletteNum = 10,
.baseBlock = 0x0C8
},
{
.priority = 3,
.tilemapLeft = 8,
.tilemapTop = 6,
.width = 17,
.height = 2,
.paletteNum = 10,
.baseBlock = 0x030
},
{
.priority = 3,
.tilemapLeft = 8,
.tilemapTop = 4,
.width = 17,
.height = 2,
.paletteNum = 10,
.baseBlock = 0x052
},
{
.priority = 0,
.tilemapLeft = 0,
.tilemapTop = 0,
.width = 30,
.height = 2,
.paletteNum = 11,
.baseBlock = 0x074
},
DUMMY_WIN_TEMPLATE
};

20
src/option_menu.c
View File

@ -91,8 +91,24 @@ static const u8 *const sOptionMenuItemsNames[MENUITEM_COUNT] =
static const struct WindowTemplate sOptionMenuWinTemplates[] =
{
{1, 2, 1, 0x1A, 2, 1, 2},
{0, 2, 5, 0x1A, 0xE, 1, 0x36},
{
.priority = 1,
.tilemapLeft = 2,
.tilemapTop = 1,
.width = 26,
.height = 2,
.paletteNum = 1,
.baseBlock = 2
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 5,
.width = 26,
.height = 14,
.paletteNum = 1,
.baseBlock = 0x36
},
DUMMY_WIN_TEMPLATE
};

114
src/player_pc.c
View File

@ -184,9 +184,33 @@ const struct MenuAction gMailboxMailOptions[] =
static const struct WindowTemplate gUnknown_085DFF24[3] =
{
{0x00, 0x01, 0x01, 0x09, 0x06, 0x0F, 0x0001},
{0x00, 0x01, 0x01, 0x09, 0x08, 0x0F, 0x0001},
{0x00, 0x01, 0x01, 0x0A, 0x08, 0x0F, 0x0001}
{
.priority = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
.width = 9,
.height = 6,
.paletteNum = 15,
.baseBlock = 1
},
{
.priority = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
.width = 9,
.height = 8,
.paletteNum = 15,
.baseBlock = 1
},
{
.priority = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
.width = 10,
.height = 8,
.paletteNum = 15,
.baseBlock = 1
}
};
static const struct YesNoFuncTable ResumeFromWithdrawYesNoFuncList = // ResumeFromWithdrawYesNoFuncList
@ -195,27 +219,85 @@ static const struct YesNoFuncTable ResumeFromWithdrawYesNoFuncList = // ResumeFr
ItemStorage_ResumeInputFromNoToss
};
static const struct ListMenuTemplate gUnknown_085DFF44 = {
NULL,
ItemStorage_MoveCursor,
fish4_goto_x5_or_x6,
0, 0,
0, 0, 8, 0,
9, 2, 1, 3, FALSE, 0, FALSE, 7
static const struct ListMenuTemplate gUnknown_085DFF44 =
{
.items = NULL,
.moveCursorFunc = ItemStorage_MoveCursor,
.itemPrintFunc = fish4_goto_x5_or_x6,
.totalItems = 0,
.maxShowed = 0,
.windowId = 0,
.header_X = 0,
.item_X = 8,
.cursor_X = 0,
.upText_Y = 9,
.cursorPal = 2,
.fillValue = 1,
.cursorShadowPal = 3,
.lettersSpacing = FALSE,
.itemVerticalPadding = 0,
.scrollMultiple = FALSE,
.fontId = 7
};
static const struct WindowTemplate gUnknown_085DFF5C[5] =
{
{0x00, 0x10, 0x01, 0x0D, 0x12, 0x0F, 0x0001},
{0x00, 0x01, 0x0D, 0x0D, 0x06, 0x0F, 0x00EB},
{0x00, 0x01, 0x08, 0x03, 0x03, 0x0F, 0x0153},
{0x00, 0x01, 0x01, 0x0D, 0x02, 0x0F, 0x0139},
{0x00, 0x08, 0x09, 0x06, 0x02, 0x0F, 0x015C}
{
.priority = 0,
.tilemapLeft = 16,
.tilemapTop = 1,
.width = 13,
.height = 18,
.paletteNum = 15,
.baseBlock = 0x0001
},
{
.priority = 0,
.tilemapLeft = 1,
.tilemapTop = 13,
.width = 13,
.height = 6,
.paletteNum = 15,
.baseBlock = 0x00EB
},
{
.priority = 0,
.tilemapLeft = 1,
.tilemapTop = 8,
.width = 3,
.height = 3,
.paletteNum = 15,
.baseBlock = 0x0153
},
{
.priority = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
.width = 13,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x0139
},
{
.priority = 0,
.tilemapLeft = 8,
.tilemapTop = 9,
.width = 6,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x015C
}
};
static const struct WindowTemplate gUnknown_085DFF84 =
{
0x00, 0x09, 0x07, 0x05, 0x04, 0x0F, 0x0168
.priority = 0,
.tilemapLeft = 9,
.tilemapTop = 7,
.width = 5,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x0168
};
static const u8 gUnknown_085DFF8C[] = {0x01, 0x03, 0x02, 0x00};

121
src/pokeblock.c
View File

@ -294,21 +294,118 @@ static const struct Pokeblock sFavoritePokeblocksTable[] =
static const struct WindowTemplate sWindowTemplatesForPokeblockMenu[] =
{
{0, 2, 1, 9, 2, 0xF, 0x1E},
{0, 0xF, 1, 0xE, 0x12, 0xF, 0x30},
{0, 2, 0xD, 5, 2, 0xF, 0x12C},
{0, 2, 0xF, 5, 2, 0xF, 0x136},
{0, 2, 0x11, 5, 2, 0xF, 0x140},
{0, 8, 0xD, 5, 2, 0xF, 0x14A},
{0, 8, 0xF, 5, 2, 0xF, 0x154},
{0, 0xB, 0x11, 2, 2, 0xF, 0x15E},
{1, 7, 5, 6, 6, 0xF, 0x162},
{1, 7, 7, 6, 4, 0xF, 0x186},
{1, 2, 0xF, 0x1B, 4, 0xF, 0x19E},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 1,
.width = 9,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x1E
},
{
.priority = 0,
.tilemapLeft = 15,
.tilemapTop = 1,
.width = 14,
.height = 18,
.paletteNum = 15,
.baseBlock = 0x30
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 13,
.width = 5,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x12C
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 15,
.width = 5,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x136
},
{
.priority = 0,
.tilemapLeft = 2,
.tilemapTop = 17,
.width = 5,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x140
},
{
.priority = 0,
.tilemapLeft = 8,
.tilemapTop = 13,
.width = 5,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x14A
},
{
.priority = 0,
.tilemapLeft = 8,
.tilemapTop = 15,
.width = 5,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x154
},
{
.priority = 0,
.tilemapLeft = 11,
.tilemapTop = 17,
.width = 2,
.height = 2,
.paletteNum = 15,
.baseBlock = 0x15E
},
{
.priority = 1,
.tilemapLeft = 7,
.tilemapTop = 5,
.width = 6,
.height = 6,
.paletteNum = 15,
.baseBlock = 0x162
},
{
.priority = 1,
.tilemapLeft = 7,
.tilemapTop = 7,
.width = 6,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x186
},
{
.priority = 1,
.tilemapLeft = 2,
.tilemapTop = 15,
.width = 27,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x19E
},
DUMMY_WIN_TEMPLATE
};
static const struct WindowTemplate sTossPkblockWindowTemplate = {1, 0x15, 9, 5, 4, 0xF, 0x20A};
static const struct WindowTemplate sTossPkblockWindowTemplate =
{
.priority = 1,
.tilemapLeft = 21,
.tilemapTop = 9,
.width = 5,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x20A
};
static const struct ListMenuTemplate sPokeblockListMenuTemplate =
{