Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract rodata for unk_pokedex_area_screen_helper

This commit is contained in:
Diegoisawesome 2018-08-14 22:05:48 -07:00
parent a07d69d7c2
commit 332a8bcb1d
6 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/unk_pokedex_area_screen_helper.s → data/battle_pyramid.s
View File

@ -3,22 +3,6 @@
.section .rodata
.align 2
gUnknown_0861D1A0:: @ 861D1A0
.incbin "graphics/interface/region_map.8bpp.lz"
.align 2
gUnknown_0861DEF4:: @ 861DEF4
.incbin "graphics/interface/region_map.bin.lz"
.align 2
gUnknown_0861E208:: @ 861E208
.incbin "graphics/interface/region_map_affine.8bpp.lz"
.align 2
gUnknown_0861EF64:: @ 861EF64
.incbin "graphics/interface/region_map_affine.bin.lz"
.align 2
gUnknown_0861F2B4:: @ 861F2B4
.4byte 0x000011f0, 0x000001e1, 0x000021de

2
include/pokemon_storage_system.h
View File

@ -83,6 +83,6 @@ void CompactPartySlots(void);
u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
bool8 CheckFreePokemonStorageSpace(void);
u8 StorageGetCurrentBox(void);
u8 sub_80D214C(struct BoxPokemon* a, u8 b, u8 c, u8 d);
u8 sub_80D214C(struct BoxPokemon *a, u8 b, u8 c, u8 d);
#endif // GUARD_POKEMON_STORAGE_SYSTEM_H

2
include/pokemon_summary_screen.h
View File

@ -2,6 +2,6 @@
#define GUARD_POKEMON_SUMMARY_SCREEN_H
void sub_81C4F98(u8, void(*)(void));
void ShowSelectMovePokemonSummaryScreen(struct Pokemon *a, u8 b, u8 c, void *d, u16 e);
void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
#endif // GUARD_POKEMON_SUMMARY_SCREEN_H

2
ld_script.txt
View File

@ -540,7 +540,7 @@ SECTIONS {
src/berry_fix_program.o(.rodata);
src/pokemon_summary_screen.o(.rodata);
src/unk_pokedex_area_screen_helper.o(.rodata);
data/unk_pokedex_area_screen_helper.o(.rodata);
data/battle_pyramid.o(.rodata);
data/pokenav.o(.rodata);
src/match_call.o(.rodata);
data/pokenav.o(.rodata.after.match.call);

17
src/pokemon_summary_screen.c
View File

@ -45,13 +45,12 @@
static EWRAM_DATA struct UnkSummaryStruct
{
/*0x00*/ union
{
/*0x00*/ union {
struct Pokemon *mons;
struct BoxPokemon *boxMons;
} monList;
/*0x04*/ void (*callback)(void);
/*0x08*/ struct Sprite *markingsSpriteId;
/*0x04*/ MainCallback callback;
/*0x08*/ struct Sprite *markingsSprite;
/*0x0C*/ struct Pokemon currentMon;
/*0x70*/ struct PokeSummary
{
@ -3936,20 +3935,20 @@ void sub_81C4984(struct Pokemon *mon)
{
struct Sprite *sprite = sub_811FF94(30003, 30003, gUnknown_0861D120);
gUnknown_0203CF1C->markingsSpriteId = sprite;
gUnknown_0203CF1C->markingsSprite = sprite;
if (sprite != NULL)
{
StartSpriteAnim(sprite, GetMonData(mon, MON_DATA_MARKINGS));
gUnknown_0203CF1C->markingsSpriteId->pos1.x = 60;
gUnknown_0203CF1C->markingsSpriteId->pos1.y = 26;
gUnknown_0203CF1C->markingsSpriteId->oam.priority = 1;
gUnknown_0203CF1C->markingsSprite->pos1.x = 60;
gUnknown_0203CF1C->markingsSprite->pos1.y = 26;
gUnknown_0203CF1C->markingsSprite->oam.priority = 1;
}
}
void sub_81C49E0(struct Pokemon *mon)
{
DestroySprite(gUnknown_0203CF1C->markingsSpriteId);
DestroySprite(gUnknown_0203CF1C->markingsSprite);
FreeSpriteTilesByTag(30003);
sub_81C4984(mon);
}

8
src/unk_pokedex_area_screen_helper.c
View File

@ -8,10 +8,10 @@
EWRAM_DATA u8 *gUnknown_0203CF28 = NULL;
static const u16 gUnknown_0861D140[] = INCBIN_U16("graphics/interface/region_map.gbapal");
extern const u8 gUnknown_0861D1A0[];
extern const u8 gUnknown_0861DEF4[];
extern const u8 gUnknown_0861E208[];
extern const u8 gUnknown_0861EF64[];
static const u8 gUnknown_0861D1A0[] = INCBIN_U8("graphics/interface/region_map.8bpp.lz");
static const u8 gUnknown_0861DEF4[] = INCBIN_U8("graphics/interface/region_map.bin.lz");
static const u8 gUnknown_0861E208[] = INCBIN_U8("graphics/interface/region_map_affine.8bpp.lz");
static const u8 gUnknown_0861EF64[] = INCBIN_U8("graphics/interface/region_map_affine.bin.lz");
struct UnkStruct_1C4D70
{