dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Static methods in union_room.c; remove src/data/union_room.h

Browse Source
This commit is contained in:
PikalaxALT
2020-01-22 10:19:58 -05:00
parent 26716a8733
commit 944f150b5e
3 changed files with 592 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/union_room_player_avatar.h
+2
View File
@@ -9,5 +9,7 @@ void sub_811BECC(struct UnkStruct_URoom *arg0);
void sub_811BEDC(struct UnkStruct_URoom *arg0);
bool32 sub_811BF00(struct UnkStruct_Main0 *arg0, s16 *arg1, s16 *arg2, u8 *arg3);
void sub_811C028(u32 arg0, u32 arg1, struct UnkStruct_Main0 *arg2);
u8 sub_811B754(struct UnkStruct_8019BA8 * ptr);
void sub_811BA78(void);
#endif //GUARD_UNION_ROOM_PLAYER_AVATAR_H
src/data/union_room.h
-428
View File
@@ -1,428 +0,0 @@
#define _8456CD8(a, b) ((a) | ((b) << 8))
static const u8 *const gUnknown_8456C74[] = {
gUnknown_84571AC,
gUnknown_8459394,
gUnknown_84593A4,
gUnknown_84593B4,
gUnknown_84593C4,
gUnknown_84593D4,
gUnknown_84593E4,
gUnknown_84593F4,
gUnknown_84593DC,
gUnknown_8459400,
gUnknown_8459410,
gUnknown_845941C,
gUnknown_845942C,
gUnknown_8459434,
gUnknown_8459440,
gUnknown_84571AC,
gUnknown_84571AC,
gUnknown_84571AC,
gUnknown_84571AC,
gUnknown_84571AC,
gUnknown_84571AC,
gUnknown_84593E4,
gUnknown_84593F4
};
static const struct WindowTemplate gUnknown_8456CD0 = {
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 0,
.width = 30,
.height = 2,
.paletteNum = 0xF,
.baseBlock = 0x008
};
static const u32 gUnknown_8456CD8[] = {
_8456CD8( 1, 2),
_8456CD8( 2, 2),
_8456CD8( 3, 4),
_8456CD8( 4, 2),
_8456CD8( 9, 37),
_8456CD8(10, 37),
_8456CD8(11, 53),
_8456CD8(13, 53),
_8456CD8(14, 53)
};
static const struct WindowTemplate gUnknown_8456CFC = {
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 3,
.width = 13,
.height = 10,
.paletteNum = 15,
.baseBlock = 0x044
};
static const struct WindowTemplate gUnknown_8456D04 = {
.bg = 0,
.tilemapLeft = 16,
.tilemapTop = 3,
.width = 7,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x0C6
};
const struct ListMenuItem gUnknown_8456D0C[] = {
{gUnknown_84571AC, 0},
{gUnknown_84571AC, 1},
{gUnknown_84571AC, 2},
{gUnknown_84571AC, 3},
{gUnknown_84571AC, 4}
};
static const struct ListMenuTemplate gUnknown_8456D34 = {
.items = gUnknown_8456D0C,
.moveCursorFunc = NULL,
.itemPrintFunc = sub_81164C8,
.totalItems = 5,
.maxShowed = 5,
.windowId = 0,
.header_X = 0,
.item_X = 1,
.cursor_X = 0,
.upText_Y = 0,
.cursorPal = 2,
.fillValue = 1,
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 2,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = 2,
.cursorKind = 1
};
static const struct WindowTemplate gUnknown_8456D4C = {
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 3,
.width = 17,
.height = 10,
.paletteNum = 15,
.baseBlock = 0x044
};
static const struct WindowTemplate gUnknown_8456D54 = {
.bg = 0,
.tilemapLeft = 20,
.tilemapTop = 3,
.width = 7,
.height = 4,
.paletteNum = 15,
.baseBlock = 0x0EE
};
static const struct ListMenuItem gUnknown_8456D5C[] = {
{gUnknown_84571AC, 0},
{gUnknown_84571AC, 1},
{gUnknown_84571AC, 2},
{gUnknown_84571AC, 3},
{gUnknown_84571AC, 4},
{gUnknown_84571AC, 5},
{gUnknown_84571AC, 6},
{gUnknown_84571AC, 7},
{gUnknown_84571AC, 8},
{gUnknown_84571AC, 9},
{gUnknown_84571AC, 10},
{gUnknown_84571AC, 11},
{gUnknown_84571AC, 12},
{gUnknown_84571AC, 13},
{gUnknown_84571AC, 14},
{gUnknown_84571AC, 15}
};
static const struct ListMenuTemplate gUnknown_8456DDC = {
.items = gUnknown_8456D5C,
.moveCursorFunc = ListMenuDefaultCursorMoveFunc,
.itemPrintFunc = sub_8116F94,
.totalItems = 16,
.maxShowed = 5,
.windowId = 0,
.header_X = 0,
.item_X = 8,
.cursor_X = 0,
.upText_Y = 0,
.cursorPal = 2,
.fillValue = 1,
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 2,
.scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
.fontId = 2,
.cursorKind = 0
};
static const struct WindowTemplate gUnknown_8456DF4 = {
.bg = 0,
.tilemapLeft = 20,
.tilemapTop = 6,
.width = 8,
.height = 7,
.paletteNum = 15,
.baseBlock = 0x001
};
static const struct ListMenuItem gUnknown_8456DFC[] = {
{gUnknown_8459354, _8456CD8( 8, 2)},
{gUnknown_8459344, _8456CD8(65, 2)},
{gUnknown_845934C, _8456CD8(69, 2)},
{gUnknown_8459360, _8456CD8(64, 0)}
};
static const struct ListMenuTemplate gUnknown_8456E1C = {
.items = gUnknown_8456DFC,
.moveCursorFunc = ListMenuDefaultCursorMoveFunc,
.itemPrintFunc = NULL,
.totalItems = 4,
.maxShowed = 4,
.windowId = 0,
.header_X = 0,
.item_X = 8,
.cursor_X = 0,
.upText_Y = 0,
.cursorPal = 2,
.fillValue = 1,
.cursorShadowPal = 3,
.lettersSpacing = 1,
.itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = 2,
.cursorKind = 0
};
static const struct WindowTemplate gUnknown_8456E34 = {
.bg = 0,
.tilemapLeft = 18,
.tilemapTop = 8,
.width = 11,
.height = 5,
.paletteNum = 15,
.baseBlock = 0x001
};
static const struct ListMenuItem gUnknown_8456E3C[] = {
{gText_Register, 1},
{gUnknown_8459370, 2},
{gUnknown_8459360, 3}
};
static const struct ListMenuTemplate gUnknown_8456E54 = {
.items = gUnknown_8456E3C,
.moveCursorFunc = ListMenuDefaultCursorMoveFunc,
.itemPrintFunc = NULL,
.totalItems = 3,
.maxShowed = 3,
.windowId = 0,
.header_X = 0,
.item_X = 8,
.cursor_X = 0,
.upText_Y = 0,
.cursorPal = 2,
.fillValue = 1,
.cursorShadowPal = 3,
.lettersSpacing = 1,
.itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = 2,
.cursorKind = 0
};
static const struct WindowTemplate gUnknown_8456E6C = {
.bg = 0,
.tilemapLeft = 20,
.tilemapTop = 2,
.width = 9,
.height = 11,
.paletteNum = 15,
.baseBlock = 0x001
};
static const struct ListMenuItem gUnknown_8456E74[] = {
{gTypeNames[TYPE_NORMAL], TYPE_NORMAL},
{gTypeNames[TYPE_FIRE], TYPE_FIRE},
{gTypeNames[TYPE_WATER], TYPE_WATER},
{gTypeNames[TYPE_ELECTRIC], TYPE_ELECTRIC},
{gTypeNames[TYPE_GRASS], TYPE_GRASS},
{gTypeNames[TYPE_ICE], TYPE_ICE},
{gTypeNames[TYPE_GROUND], TYPE_GROUND},
{gTypeNames[TYPE_ROCK], TYPE_ROCK},
{gTypeNames[TYPE_FLYING], TYPE_FLYING},
{gTypeNames[TYPE_PSYCHIC], TYPE_PSYCHIC},
{gTypeNames[TYPE_FIGHTING], TYPE_FIGHTING},
{gTypeNames[TYPE_POISON], TYPE_POISON},
{gTypeNames[TYPE_BUG], TYPE_BUG},
{gTypeNames[TYPE_GHOST], TYPE_GHOST},
{gTypeNames[TYPE_DRAGON], TYPE_DRAGON},
{gTypeNames[TYPE_STEEL], TYPE_STEEL},
{gTypeNames[TYPE_DARK], TYPE_DARK},
{gUnknown_8459360, NUMBER_OF_MON_TYPES}
};
static const struct ListMenuTemplate gUnknown_8456F04 = {
.items = gUnknown_8456E74,
.moveCursorFunc = ListMenuDefaultCursorMoveFunc,
.itemPrintFunc = NULL,
.totalItems = NUMBER_OF_MON_TYPES,
.maxShowed = 6,
.windowId = 0,
.header_X = 0,
.item_X = 8,
.cursor_X = 0,
.upText_Y = 2,
.cursorPal = 2,
.fillValue = 1,
.cursorShadowPal = 3,
.lettersSpacing = 1,
.itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = 2,
.cursorKind = 0
};
static const struct WindowTemplate gUnknown_8456F1C = {
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
.width = 28,
.height = 2,
.paletteNum = 13,
.baseBlock = 0x001
};
static const struct WindowTemplate gUnknown_8456F24 = {
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 5,
.width = 28,
.height = 10,
.paletteNum = 13,
.baseBlock = 0x039
};
static const struct ListMenuItem gUnknown_8456F2C[] = {
{gUnknown_84571AC, -3},
{gUnknown_84571AC, 0},
{gUnknown_84571AC, 1},
{gUnknown_84571AC, 2},
{gUnknown_84571AC, 3},
{gUnknown_84571AC, 4},
{gUnknown_84571AC, 5},
{gUnknown_84571AC, 6},
{gUnknown_84571AC, 7},
{gUnknown_8459368, 8}
};
static const struct ListMenuTemplate gUnknown_8456F7C = {
.items = gUnknown_8456F2C,
.moveCursorFunc = ListMenuDefaultCursorMoveFunc,
.itemPrintFunc = sub_811ACA4,
.totalItems = 10,
.maxShowed = 5,
.windowId = 0,
.header_X = 0,
.item_X = 12,
.cursor_X = 0,
.upText_Y = 2,
.cursorPal = 14,
.fillValue = 15,
.cursorShadowPal = 13,
.lettersSpacing = 1,
.itemVerticalPadding = 1,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = 2,
.cursorKind = 0
};
static const struct WindowTemplate gUnknown_8456F94 = {
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 5,
.width = 28,
.height = 10,
.paletteNum = 13,
.baseBlock = 0x039
};
static const struct ListMenuItem gUnknown_8456F9C[] = {
{gUnknown_84571AC, 0},
{gUnknown_84571AC, 1},
{gUnknown_84571AC, 2},
{gUnknown_84571AC, 3},
{gUnknown_84571AC, 4},
{gUnknown_84571AC, 5},
{gUnknown_84571AC, 6},
{gUnknown_84571AC, 7},
{gUnknown_84571AC, 8},
{gUnknown_84571AC, 9},
{gUnknown_84571AC, 10},
{gUnknown_84571AC, 11},
{gUnknown_84571AC, 12},
{gUnknown_84571AC, 13},
{gUnknown_84571AC, 14},
{gUnknown_84571AC, 15}
};
static const struct ListMenuTemplate gUnknown_845701C = {
.items = gUnknown_8456F9C,
.moveCursorFunc = ListMenuDefaultCursorMoveFunc,
.itemPrintFunc = nullsub_92,
.totalItems = 16,
.maxShowed = 4,
.windowId = 0,
.header_X = 0,
.item_X = 8,
.cursor_X = 1,
.upText_Y = 0,
.cursorPal = 2,
.fillValue = 1,
.cursorShadowPal = 3,
.lettersSpacing = 1,
.itemVerticalPadding = 0,
.scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
.fontId = 2,
.cursorKind = 0
};
static const struct UnkStruct_Shared gUnknown_8457034 = {};
// starts at gUnknown_082F0474 in pokeemerald, union link groups
ALIGNED(4) static const u8 gUnknown_845704C[] = {0x01, 0xFF};
ALIGNED(4) static const u8 gUnknown_8457050[] = {0x02, 0xFF};
ALIGNED(4) static const u8 gUnknown_8457054[] = {0x03, 0xFF};
ALIGNED(4) static const u8 gUnknown_8457058[] = {0x04, 0xFF};
ALIGNED(4) static const u8 gUnknown_845705C[] = {0x09, 0xFF};
ALIGNED(4) static const u8 gUnknown_8457060[] = {0x0A, 0xFF};
ALIGNED(4) static const u8 gUnknown_8457064[] = {0x0B, 0xFF};
ALIGNED(4) static const u8 gUnknown_8457068[] = {0x15, 0xFF};
ALIGNED(4) static const u8 gUnknown_845706C[] = {0x16, 0xFF};
ALIGNED(4) static const u8 gUnknown_8457070[] = {0x40, 0x41, 0x44, 0x45, 0x48, 0x51, 0x52, 0x53, 0x54, 0xFF};
ALIGNED(4) static const u8 gUnknown_845707C[] = {0x0C, 0xFF};
ALIGNED(4) static const u8 gUnknown_8457080[] = {0x01, 0x02, 0x03, 0x04, 0x09, 0x0A, 0x0B, 0x15, 0x16, 0x0D, 0xFF};
ALIGNED(4) static const u8 gUnknown_845708C[] = {0x01, 0x02, 0x03, 0x04, 0x0A, 0xFF};
static const u8 *const gUnknown_8457094[] = {
gUnknown_845704C,
gUnknown_8457050,
gUnknown_8457054,
gUnknown_8457058,
gUnknown_845705C,
gUnknown_8457060,
gUnknown_8457064,
gUnknown_8457068,
gUnknown_845706C,
gUnknown_8457070,
gUnknown_845707C,
gUnknown_8457080,
gUnknown_845708C
};
static const u8 gUnknown_84570C8[] = {0x01, 0x02, 0x03, 0x04, 0x09, 0x0A, 0x0B, 0x15, 0x16, 0xF7, 0x00, 0xAF, 0xF7, 0x01, 0xFF, 0x00};
#undef _8456CD8
src/union_room.c
+590 -166
View File
File diff suppressed because it is too large Load Diff