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

Document pokeblock feed scene

Browse Source
This commit is contained in:
GriffinR 2021-04-12 12:33:06 -04:00
parent c786a9b20c
commit 042a2ecc41
6 changed files with 455 additions and 358 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/graphics.h
View File

@ -4076,7 +4076,7 @@ extern const u8 gNamingScreenCursor_Gfx[];
extern const u8 gNamingScreenInputArrow_Gfx[]; extern const u8 gNamingScreenInputArrow_Gfx[];
extern const u8 gNamingScreenUnderscore_Gfx[]; extern const u8 gNamingScreenUnderscore_Gfx[];
extern const u32 gUnknown_08D9BA44[]; extern const u32 gPokeblockFeedBg_Tilemap[];
extern const u32 gConfetti_Gfx[]; extern const u32 gConfetti_Gfx[];
extern const u32 gConfetti_Pal[]; extern const u32 gConfetti_Pal[];

2
include/pokeblock.h
View File

@ -51,7 +51,7 @@ extern s16 gPokeblockGain;
void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void)); void ChooseMonToGivePokeblock(struct Pokeblock *pokeblock, void (*callback)(void));
// pokeblock feed // pokeblock feed
void CB2_PreparePokeblockFeedScene(void); void PreparePokeblockFeedScene(void);
// pokeblock // pokeblock
extern const s8 gPokeblockFlavorCompatibilityTable[NUM_NATURES * FLAVOR_COUNT]; extern const s8 gPokeblockFlavorCompatibilityTable[NUM_NATURES * FLAVOR_COUNT];

2
src/graphics.c
View File

@ -1201,7 +1201,7 @@ const u32 gPokeblockBlack_Pal[] = INCBIN_U32("graphics/pokeblock/black.gbapal.lz
const u32 gPokeblockWhite_Pal[] = INCBIN_U32("graphics/pokeblock/white.gbapal.lz"); const u32 gPokeblockWhite_Pal[] = INCBIN_U32("graphics/pokeblock/white.gbapal.lz");
const u32 gPokeblockGold_Pal[] = INCBIN_U32("graphics/pokeblock/gold.gbapal.lz"); const u32 gPokeblockGold_Pal[] = INCBIN_U32("graphics/pokeblock/gold.gbapal.lz");
const u32 gUnknown_08D9BA44[] = INCBIN_U32("graphics/interface/pokeblock_feeding_bg_map.bin.lz"); const u32 gPokeblockFeedBg_Tilemap[] = INCBIN_U32("graphics/interface/pokeblock_feeding_bg_map.bin.lz");
#include "data/graphics/berries.h" #include "data/graphics/berries.h"
#include "data/graphics/rayquaza_scene.h" #include "data/graphics/rayquaza_scene.h"

803
src/pokeblock_feed.c
View File

File diff suppressed because it is too large Load Diff

2
src/use_pokeblock.c
View File

@ -708,7 +708,7 @@ static void FeedPokeblockToMon(void)
FREE_AND_SET_NULL(sMenu); FREE_AND_SET_NULL(sMenu);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
gMain.savedCallback = CB2_ReturnAndChooseMonToGivePokeblock; gMain.savedCallback = CB2_ReturnAndChooseMonToGivePokeblock;
CB2_PreparePokeblockFeedScene(); PreparePokeblockFeedScene();
} }
break; break;
} }