Skip to content

Commit

Permalink
Stats viewer layout update
Browse files Browse the repository at this point in the history
  • Loading branch information
Pseurae committed Oct 15, 2024
1 parent 0a6491c commit 974cd8d
Show file tree
Hide file tree
Showing 4 changed files with 150 additions and 107 deletions.
2 changes: 2 additions & 0 deletions include/pokemon.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ void LONG_CALL DecryptBoxMon(struct BoxPokemon *boxMon);
void LONG_CALL SetBoxMonData(struct BoxPokemon *boxMon, s32 field, u32 dataArg);
void LONG_CALL CalculateMonStats(struct Pokemon *mon);
u8 LONG_CALL GetAbilityBySpecies(u16 species, bool8 altAbility);
u8 LONG_CALL GetMonGender(struct Pokemon *mon);

enum
{
Expand All @@ -182,6 +183,7 @@ enum
extern const s8 gNatureStatTable[25][5];
extern const u8 *const gNatureNames[25];
extern const struct BaseStats gBaseStats[];
extern const u8 gSpeciesNames[][11];
extern const u8 gAbilityNames[][13];

extern const u8 gMoveNames[][13];
Expand Down
3 changes: 3 additions & 0 deletions linker/rodata.ld
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,13 @@ gStatStageRatios = 0x8208244;
gNatureNames = 0x83c1004;
gBaseStats = 0x81fec18;
gAbilityNames = 0x81fa248;
gSpeciesNames = 0x81f716c;

BattleStatText_HP = 0x84007d2;
BattleStatText_Attack = 0x84007d5;
BattleStatText_Defense = 0x84007dc;
BattleStatText_Speed = 0x84007e4;
BattleStatText_SpAtk = 0x84007ea;
BattleStatText_SpDef = 0x84007f2;
OtherText_MaleSymbol = 0x8410458;
OtherText_FemaleSymbol = 0x841045a;
1 change: 1 addition & 0 deletions linker/text.ld
Original file line number Diff line number Diff line change
Expand Up @@ -261,3 +261,4 @@ ProcessSpriteCopyRequests = 0x8001214 | 1;
LoadOam = 0x8000f70 | 1;
CB2_ReturnToField = 0x80545e4 | 1;
Menu_EraseScreen = 0x8071ef4 | 1;
GetMonGender = 0x803c4b8 | 1;
Loading

0 comments on commit 974cd8d

Please sign in to comment.