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

add more macros

Browse Source
This commit is contained in:
kiliwily 2020-08-29 01:02:20 +02:00
parent 5e7b6a089c
commit c68c2b66e8
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/constants/daycare.h
View File

@ -22,6 +22,6 @@
// Array buffers // Array buffers
#define EGG_MOVES_ARRAY_COUNT 10 #define EGG_MOVES_ARRAY_COUNT 10
#define EGG_LVL_UP_MOVES_ARRAY_COUNT 50 #define EGG_LVL_UP_MOVES_ARRAY_COUNT (MAX_LEVEL_UP_MOVES > 50 ? MAX_LEVEL_UP_MOVES : 50)
#endif //GUARD_DAYCARE_CONSTANTS_H #endif //GUARD_DAYCARE_CONSTANTS_H

24
src/move_relearner.c
View File

@ -150,20 +150,22 @@
#define JAM_HEART_EMPTY 2 #define JAM_HEART_EMPTY 2
#define JAM_HEART_FULL 3 #define JAM_HEART_FULL 3
#define MAX_RELEARNER_MOVES (MAX_LEVEL_UP_MOVES > 25 ? MAX_LEVEL_UP_MOVES : 25)
static EWRAM_DATA struct static EWRAM_DATA struct
{ {
u8 state; u8 state;
u8 heartSpriteIds[16]; /*0x001*/ u8 heartSpriteIds[16]; /*0x001*/
u16 movesToLearn[25]; /*0x01A*/ u16 movesToLearn[MAX_RELEARNER_MOVES]; /*0x01A*/
u8 partyMon; /*0x044*/ u8 partyMon; /*0x044*/
u8 moveSlot; /*0x045*/ u8 moveSlot; /*0x045*/
struct ListMenuItem menuItems[25]; /*0x0E8*/ struct ListMenuItem menuItems[MAX_RELEARNER_MOVES]; /*0x0E8*/
u8 numMenuChoices; /*0x110*/ u8 numMenuChoices; /*0x110*/
u8 numToShowAtOnce; /*0x111*/ u8 numToShowAtOnce; /*0x111*/
u8 moveListMenuTask; /*0x112*/ u8 moveListMenuTask; /*0x112*/
u8 moveListScrollArrowTask; /*0x113*/ u8 moveListScrollArrowTask; /*0x113*/
u8 moveDisplayArrowTask; /*0x114*/ u8 moveDisplayArrowTask; /*0x114*/
u16 scrollOffset; /*0x116*/ u16 scrollOffset; /*0x116*/
} *sMoveRelearnerStruct = {0}; } *sMoveRelearnerStruct = {0};
static EWRAM_DATA struct { static EWRAM_DATA struct {