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

Sync dbp - rename files

Browse Source
This commit is contained in:
GriffinR
2022-08-07 13:55:50 -04:00
parent 77e6f75509
commit 0e8b639fae
18 changed files with 36 additions and 1892 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/link_games/dodrioberry_berrysprites.png → graphics/dodrio_berry_picking/berries.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 395 B

graphics/link_games/dodrioberry_bg1.bin → graphics/dodrio_berry_picking/bg.bin
View File
graphics/link_games/dodrioberry_bg1.pal → graphics/dodrio_berry_picking/bg.pal
View File
graphics/link_games/dodrioberry_bg1.png → graphics/dodrio_berry_picking/bg.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

graphics/link_games/dodrioberry_platform.png → graphics/dodrio_berry_picking/cloud.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 310 B

graphics/link_games/dodrioberry_pkmn.png → graphics/dodrio_berry_picking/dodrio.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

graphics/link_games/dodrioberry_shiny.pal → graphics/dodrio_berry_picking/shiny.pal
View File
graphics/link_games/dodrioberry_status.png → graphics/dodrio_berry_picking/status.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

graphics/link_games/dodrioberry_bg2.pal → graphics/dodrio_berry_picking/tree_border.pal
View File
graphics/link_games/dodrioberry_bg2.png → graphics/dodrio_berry_picking/tree_border.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

graphics/link_games/dodrioberry_bg2left.bin → graphics/dodrio_berry_picking/tree_border_left.bin
View File
graphics/link_games/dodrioberry_bg2right.bin → graphics/dodrio_berry_picking/tree_border_right.bin
View File
include/dodrio_berry_picking.h
+3
View File
@@ -29,9 +29,12 @@ struct DodrioGame_Player
u32 unused; u32 unused;
}; // size = 0x3C }; // size = 0x3C
// dodrio_berry_picking.c
void StartDodrioBerryPicking(u16 partyId, MainCallback exitCallback); void StartDodrioBerryPicking(u16 partyId, MainCallback exitCallback);
void ShowDodrioBerryPickingRecords(void); void ShowDodrioBerryPickingRecords(void);
void IsDodrioInParty(void); void IsDodrioInParty(void);
// dodrio_berry_picking_comm.c
void SendPacket_ReadyToStart(bool32 ready); void SendPacket_ReadyToStart(bool32 ready);
bool8 RecvPacket_ReadyToStart(s32 playerId); bool8 RecvPacket_ReadyToStart(s32 playerId);
void SendPacket_GameState(struct DodrioGame_Player *player, void SendPacket_GameState(struct DodrioGame_Player *player,
ld_script.txt
+1 -1
View File
@@ -294,7 +294,7 @@ SECTIONS {
src/dodrio_berry_picking.o(.text); src/dodrio_berry_picking.o(.text);
src/battle_controller_pokedude.o(.text); src/battle_controller_pokedude.o(.text);
src/quest_log_objects.o(.text); src/quest_log_objects.o(.text);
src/dodrio_berry_picking_3.o(.text); src/dodrio_berry_picking_comm.o(.text);
src/teachy_tv.o(.text); src/teachy_tv.o(.text);
src/ereader_helpers.o(.text); src/ereader_helpers.o(.text);
src/digit_obj_util.o(.text); src/digit_obj_util.o(.text);
src/data/dodrio_berry_picking.h
-242
View File
@@ -1,242 +0,0 @@
static const struct BgTemplate sUnknown_847565C[] =
{
{
.bg = 0,
.charBaseIndex = 0,
.mapBaseIndex = 30,
.screenSize = 0,
.paletteMode = 0,
.priority = 0,
.baseTile = 0
},
{
.bg = 1,
.charBaseIndex = 2,
.mapBaseIndex = 12,
.screenSize = 1,
.paletteMode = 0,
.priority = 1,
.baseTile = 0
},
{
.bg = 2,
.charBaseIndex = 2,
.mapBaseIndex = 14,
.screenSize = 1,
.paletteMode = 0,
.priority = 1,
.baseTile = 0
},
{
.bg = 3,
.charBaseIndex = 3,
.mapBaseIndex = 31,
.screenSize = 0,
.paletteMode = 0,
.priority = 2,
.baseTile = 0
},
};
// Unknown unreferenced data, feel free to remove.
static const u32 sUnused[] = {255, 0};
static const struct WindowTemplate sUnknown_8475674[] =
{
{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 1,
.width = 28,
.height = 3,
.paletteNum = 13,
.baseBlock = 0x13,
},
{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 6,
.width = 28,
.height = 13,
.paletteNum = 13,
.baseBlock = 0x67,
}
};
static const struct WindowTemplate sUnknown_8475684 =
{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 6,
.width = 28,
.height = 7,
.paletteNum = 13,
.baseBlock = 0x67,
};
static const struct WindowTemplate sUnknown_847568C[] =
{
{
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 8,
.width = 19,
.height = 3,
.paletteNum = 13,
.baseBlock = 0x13,
},
{
.bg = 0,
.tilemapLeft = 22,
.tilemapTop = 7,
.width = 6,
.height = 4,
.paletteNum = 13,
.baseBlock = 0x4C,
}
};
static const struct WindowTemplate sUnknown_847569C =
{
.bg = 0,
.tilemapLeft = 4,
.tilemapTop = 6,
.width = 22,
.height = 5,
.paletteNum = 13,
.baseBlock = 0x13,
};
static const struct WindowTemplate sUnknown_84756A4 =
{
.bg = 0,
.tilemapLeft = 5,
.tilemapTop = 8,
.width = 19,
.height = 3,
.paletteNum = 13,
.baseBlock = 0x13,
};
static const u8 sUnknown_8471F50[5][5][11] =
{
{
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0},
},
{
{0, 1, 2, 3, 4, 5, 6, 3, 8, 9, 0},
{0, 1, 2, 5, 6, 3, 4, 5, 8, 9, 0},
},
{
{0, 1, 2, 3, 4, 5, 6, 7, 2, 9, 0},
{0, 1, 4, 5, 6, 7, 2, 3, 4, 9, 0},
{0, 1, 6, 7, 2, 3, 4, 5, 6, 9, 0},
},
{
{0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 0},
{0, 3, 4, 5, 6, 7, 8, 1, 2, 3, 0},
{0, 5, 6, 7, 8, 1, 2, 3, 4, 5, 0},
{0, 7, 8, 1, 2, 3, 4, 5, 6, 7, 0},
},
{
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0},
{2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2},
{4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4},
{6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6},
{8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8},
},
};
static const u8 sUnknown_8472063[5][5][3] =
{
{
{4, 5, 6},
},
{
{3, 4, 5},
{5, 6, 3},
},
{
{4, 5, 6},
{6, 7, 2},
{2, 3, 4},
},
{
{3, 4, 5},
{5, 6, 7},
{7, 8, 1},
{1, 2, 3},
},
{
{4, 5, 6},
{6, 7, 8},
{8, 9, 0},
{0, 1, 2},
{2, 3, 4},
},
};
static const u8 sUnknown_84720AE[5][5][3] =
{
{
{1, 0, 1},
},
{
{1, 0, 1},
{0, 1, 0},
},
{
{2, 0, 1},
{0, 1, 2},
{1, 2, 0},
},
{
{3, 0, 1},
{0, 1, 2},
{1, 2, 3},
{2, 3, 0},
},
{
{4, 0, 1},
{0, 1, 2},
{1, 2, 3},
{2, 3, 4},
{3, 4, 0},
},
};
ALIGNED(4)
static const u8 sUnknown_84720FC[5][11] =
{
{9, 9, 9, 9, 1, 1, 1, 9, 9, 9, 9},
{9, 9, 9, 0, 0, 1, 1, 0, 9, 9, 9},
{9, 9, 2, 2, 0, 0, 1, 1, 1, 9, 9},
{9, 3, 3, 0, 0, 1, 1, 2, 2, 3, 9},
{3, 3, 4, 4, 0, 0, 1, 1, 2, 2, 3},
};
static const u8 sUnknown_8472133[5][5] =
{
{5},
{4, 6},
{3, 5, 7},
{2, 4, 6, 8},
{1, 3, 5, 6, 9},
};
static const u16 sDodrioBerryBgPal1[] = INCBIN_U16("graphics/link_games/dodrioberry_bg1.gbapal",
"graphics/link_games/dodrioberry_bg2.gbapal");
static const u16 sDodrioBerryPkmnPal[] = INCBIN_U16("graphics/link_games/dodrioberry_pkmn.gbapal");
static const u16 sDodrioBerryShinyPal[] = INCBIN_U16("graphics/link_games/dodrioberry_shiny.gbapal");
static const u16 sDodrioBerryStatusPal[] = INCBIN_U16("graphics/link_games/dodrioberry_status.gbapal");
static const u16 sDodrioBerrySpritesPal[] = INCBIN_U16("graphics/link_games/dodrioberry_berrysprites.gbapal");
static const u32 sDodrioBerrySpritesGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_berrysprites.4bpp.lz");
static const u16 sDodrioBerryPlatformPal[] = INCBIN_U16("graphics/link_games/dodrioberry_platform.gbapal");
static const u32 sDodrioBerryBgGfx1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.4bpp.lz");
static const u32 sDodrioBerryBgGfx2[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2.4bpp.lz");
static const u32 sDodrioBerryStatusGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_status.4bpp.lz");
static const u32 sDodrioBerryPlatformGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_platform.4bpp.lz");
static const u32 sDodrioBerryPkmnGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_pkmn.4bpp.lz");
static const u32 sDodrioBerryBgTilemap1[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.bin.lz");
static const u32 sDodrioBerryBgTilemap2Right[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2right.bin.lz");
static const u32 sDodrioBerryBgTilemap2Left[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2left.bin.lz");
src/dodrio_berry_picking.c
+32 -32
View File
@@ -612,22 +612,22 @@ static const u8 sUnsharedColumns[MAX_RFU_PLAYERS][MAX_RFU_PLAYERS] =
}; };
// Duplicate and unused gfx. // Duplicate and unused gfx.
static const u32 sDuplicateGfx[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.gbapal", static const u32 sDuplicateGfx[] = INCBIN_U32("graphics/dodrio_berry_picking/bg.gbapal",
"graphics/link_games/dodrioberry_bg2.gbapal", "graphics/dodrio_berry_picking/tree_border.gbapal",
"graphics/link_games/dodrioberry_pkmn.gbapal", "graphics/dodrio_berry_picking/dodrio.gbapal",
"graphics/link_games/dodrioberry_shiny.gbapal", "graphics/dodrio_berry_picking/shiny.gbapal",
"graphics/link_games/dodrioberry_status.gbapal", "graphics/dodrio_berry_picking/status.gbapal",
"graphics/link_games/dodrioberry_berrysprites.gbapal", "graphics/dodrio_berry_picking/berries.gbapal",
"graphics/link_games/dodrioberry_berrysprites.4bpp.lz", "graphics/dodrio_berry_picking/berries.4bpp.lz",
"graphics/link_games/dodrioberry_platform.gbapal", "graphics/dodrio_berry_picking/cloud.gbapal",
"graphics/link_games/dodrioberry_bg1.4bpp.lz", "graphics/dodrio_berry_picking/bg.4bpp.lz",
"graphics/link_games/dodrioberry_bg2.4bpp.lz", "graphics/dodrio_berry_picking/tree_border.4bpp.lz",
"graphics/link_games/dodrioberry_status.4bpp.lz", "graphics/dodrio_berry_picking/status.4bpp.lz",
"graphics/link_games/dodrioberry_platform.4bpp.lz", "graphics/dodrio_berry_picking/cloud.4bpp.lz",
"graphics/link_games/dodrioberry_pkmn.4bpp.lz", "graphics/dodrio_berry_picking/dodrio.4bpp.lz",
"graphics/link_games/dodrioberry_bg1.bin.lz", "graphics/dodrio_berry_picking/bg.bin.lz",
"graphics/link_games/dodrioberry_bg2right.bin.lz", "graphics/dodrio_berry_picking/tree_border_right.bin.lz",
"graphics/link_games/dodrioberry_bg2left.bin.lz"); "graphics/dodrio_berry_picking/tree_border_left.bin.lz");
static const u8 sBerryFallDelays[][3] = static const u8 sBerryFallDelays[][3] =
{ {
@@ -3320,22 +3320,22 @@ static const u8 sUnsharedColumns_Duplicate[MAX_RFU_PLAYERS][MAX_RFU_PLAYERS] =
{1, 3, 5, 6, 9}, {1, 3, 5, 6, 9},
}; };
static const u16 sBg_Pal[] = INCBIN_U16("graphics/link_games/dodrioberry_bg1.gbapal", static const u16 sBg_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/bg.gbapal",
"graphics/link_games/dodrioberry_bg2.gbapal"); "graphics/dodrio_berry_picking/tree_border.gbapal");
static const u16 sDodrioNormal_Pal[] = INCBIN_U16("graphics/link_games/dodrioberry_pkmn.gbapal"); static const u16 sDodrioNormal_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/dodrio.gbapal");
static const u16 sDodrioShiny_Pal[] = INCBIN_U16("graphics/link_games/dodrioberry_shiny.gbapal"); static const u16 sDodrioShiny_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/shiny.gbapal");
static const u16 sStatus_Pal[] = INCBIN_U16("graphics/link_games/dodrioberry_status.gbapal"); static const u16 sStatus_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/status.gbapal");
static const u16 sBerries_Pal[] = INCBIN_U16("graphics/link_games/dodrioberry_berrysprites.gbapal"); static const u16 sBerries_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/berries.gbapal");
static const u32 sBerries_Gfx[] = INCBIN_U32("graphics/link_games/dodrioberry_berrysprites.4bpp.lz"); static const u32 sBerries_Gfx[] = INCBIN_U32("graphics/dodrio_berry_picking/berries.4bpp.lz");
static const u16 sCloud_Pal[] = INCBIN_U16("graphics/link_games/dodrioberry_platform.gbapal"); static const u16 sCloud_Pal[] = INCBIN_U16("graphics/dodrio_berry_picking/cloud.gbapal");
static const u32 sBg_Gfx[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.4bpp.lz"); static const u32 sBg_Gfx[] = INCBIN_U32("graphics/dodrio_berry_picking/bg.4bpp.lz");
static const u32 sTreeBorder_Gfx[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2.4bpp.lz"); static const u32 sTreeBorder_Gfx[] = INCBIN_U32("graphics/dodrio_berry_picking/tree_border.4bpp.lz");
static const u32 sStatus_Gfx[] = INCBIN_U32("graphics/link_games/dodrioberry_status.4bpp.lz"); static const u32 sStatus_Gfx[] = INCBIN_U32("graphics/dodrio_berry_picking/status.4bpp.lz");
static const u32 sCloud_Gfx[] = INCBIN_U32("graphics/link_games/dodrioberry_platform.4bpp.lz"); static const u32 sCloud_Gfx[] = INCBIN_U32("graphics/dodrio_berry_picking/cloud.4bpp.lz");
static const u32 sDodrio_Gfx[] = INCBIN_U32("graphics/link_games/dodrioberry_pkmn.4bpp.lz"); static const u32 sDodrio_Gfx[] = INCBIN_U32("graphics/dodrio_berry_picking/dodrio.4bpp.lz");
static const u32 sBg_Tilemap[] = INCBIN_U32("graphics/link_games/dodrioberry_bg1.bin.lz"); static const u32 sBg_Tilemap[] = INCBIN_U32("graphics/dodrio_berry_picking/bg.bin.lz");
static const u32 sTreeBorderRight_Tilemap[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2right.bin.lz"); static const u32 sTreeBorderRight_Tilemap[] = INCBIN_U32("graphics/dodrio_berry_picking/tree_border_right.bin.lz");
static const u32 sTreeBorderLeft_Tilemap[] = INCBIN_U32("graphics/link_games/dodrioberry_bg2left.bin.lz"); static const u32 sTreeBorderLeft_Tilemap[] = INCBIN_U32("graphics/dodrio_berry_picking/tree_border_left.bin.lz");
static const struct OamData sOamData_Dodrio = static const struct OamData sOamData_Dodrio =
{ {
src/dodrio_berry_picking_2.c
-1617
View File
File diff suppressed because it is too large Load Diff
src/dodrio_berry_picking_3.c → src/dodrio_berry_picking_comm.c
View File