pret · AsparagusEduardo · Dec 20, 2025 · Dec 20, 2025 · Dec 20, 2025 · Dec 20, 2025
diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc
@@ -4738,9 +4738,9 @@
     .short \width
     .endm
 
-    .macro SetPartyGiratinaForm form
+    .macro UpdatePartyGiratinaForm forceOrigin
     .short 808
-    .short \form
+    .short \forceOrigin
     .endm
 
     .macro ScrCmd_329 arg0, arg1, arg2, arg3

diff --git a/generated/evolution_methods.txt b/generated/evolution_methods.txt
@@ -1,10 +1,10 @@
 EVO_NONE
-EVO_LEVEL_HAPPINESS
-EVO_LEVEL_HAPPINESS_DAY
-EVO_LEVEL_HAPPINESS_NIGHT
+EVO_LEVEL_FRIENDSHIP
+EVO_LEVEL_FRIENDSHIP_DAY
+EVO_LEVEL_FRIENDSHIP_NIGHT
 EVO_LEVEL
 EVO_TRADE
-EVO_TRADE_WITH_HELD_ITEM
+EVO_TRADE_HELD_ITEM
 EVO_USE_ITEM
 EVO_LEVEL_ATK_GT_DEF
 EVO_LEVEL_ATK_EQ_DEF
@@ -16,8 +16,8 @@ EVO_LEVEL_SHEDINJA
 EVO_LEVEL_BEAUTY
 EVO_USE_ITEM_MALE
 EVO_USE_ITEM_FEMALE
-EVO_LEVEL_WITH_HELD_ITEM_DAY
-EVO_LEVEL_WITH_HELD_ITEM_NIGHT
+EVO_LEVEL_HELD_ITEM_DAY
+EVO_LEVEL_HELD_ITEM_NIGHT
 EVO_LEVEL_KNOW_MOVE
 EVO_LEVEL_SPECIES_IN_PARTY
 EVO_LEVEL_MALE

diff --git a/generated/gender_ratios.txt b/generated/gender_ratios.txt
@@ -5,4 +5,4 @@ GENDER_RATIO_FEMALE_50 = 127
 GENDER_RATIO_FEMALE_75 = 191
 GENDER_RATIO_FEMALE_87_5 = 223
 GENDER_RATIO_FEMALE_ONLY = 254
-GENDER_RATIO_NO_GENDER = 255
+GENDER_RATIO_UNKNOWN = 255
diff --git a/generated/species_data_params.txt b/generated/species_data_params.txt
@@ -7,7 +7,7 @@ SPECIES_DATA_BASE_SP_DEF
 SPECIES_DATA_TYPE_1
 SPECIES_DATA_TYPE_2
 SPECIES_DATA_CATCH_RATE
-SPECIES_DATA_BASE_EXP_REWARD
+SPECIES_DATA_EXP_YIELD
 SPECIES_DATA_EV_HP_YIELD
 SPECIES_DATA_EV_ATK_YIELD
 SPECIES_DATA_EV_DEF_YIELD
@@ -17,7 +17,7 @@ SPECIES_DATA_EV_SP_DEF_YIELD
 SPECIES_DATA_HELD_ITEM_COMMON
 SPECIES_DATA_HELD_ITEM_RARE
 SPECIES_DATA_GENDER_RATIO
-SPECIES_DATA_HATCH_CYCLES
+SPECIES_DATA_EGG_CYCLES
 SPECIES_DATA_BASE_FRIENDSHIP
 SPECIES_DATA_EXP_RATE
 SPECIES_DATA_EGG_GROUP_1

diff --git a/include/applications/poffin_case/manager.h b/include/applications/poffin_case/manager.h
@@ -34,8 +34,8 @@ typedef struct PoffinManagerMessages {
     String *discardStr;
     String *thrownOutStr;
     String *headerStr;
-    String *flavorStrs[FLAVOR_MAX + 1];
-    String *flavorDescs[FLAVOR_MAX];
+    String *flavorStrs[FLAVOR_COUNT + 1];
+    String *flavorDescs[FLAVOR_COUNT];
     u8 textDelay;
     u8 unused[3];
 } PoffinManagerMessages;
@@ -74,8 +74,8 @@ typedef struct PoffinManager {
     SpriteSystem *spriteSys;
     SpriteManager *spriteMan;
     Sprite *listSprites[NUM_LIST_SPRITES];
-    Sprite *flavorSprites[FLAVOR_MAX];
-    Sprite *buttonSprites[FLAVOR_MAX + 1];
+    Sprite *flavorSprites[FLAVOR_COUNT];
+    Sprite *buttonSprites[FLAVOR_COUNT + 1];
     PoffinSpriteManager *poffinSpriteMan;
     PoffinSprite *poffinSprite;
 } PoffinManager;

diff --git a/include/applications/pokemon_summary_screen/main.h b/include/applications/pokemon_summary_screen/main.h
@@ -383,9 +383,9 @@ typedef struct PokemonSummaryMonData {
     u8 ability;
     u8 nature;
 
-    u16 moves[LEARNED_MOVES_MAX];
-    u8 curPP[LEARNED_MOVES_MAX];
-    u8 maxPP[LEARNED_MOVES_MAX];
+    u16 moves[MAX_MON_MOVES];
+    u8 curPP[MAX_MON_MOVES];
+    u8 maxPP[MAX_MON_MOVES];
 
     u8 OTGender;
     u8 cool;

diff --git a/include/battle/ai_context.h b/include/battle/ai_context.h
@@ -22,9 +22,9 @@ typedef struct AIContext {
     u8 padding0013;
     int padding0014; // this does not match with a u32, weird
 
-    u8 moveDamageRolls[LEARNED_MOVES_MAX];
+    u8 moveDamageRolls[MAX_MON_MOVES];
 
-    u16 battlerMoves[MAX_BATTLERS][LEARNED_MOVES_MAX];
+    u16 battlerMoves[MAX_BATTLERS][MAX_MON_MOVES];
     u8 battlerAbilities[MAX_BATTLERS];
     u16 battlerHeldItems[MAX_BATTLERS];
 

diff --git a/include/battle/battle_mon.h b/include/battle/battle_mon.h
@@ -61,7 +61,7 @@ typedef struct BattleMon {
     u16 speed;
     u16 spAttack;
     u16 spDefense;
-    u16 moves[LEARNED_MOVES_MAX];
+    u16 moves[MAX_MON_MOVES];
 
     u32 hpIV : 5;
     u32 attackIV : 5;
@@ -96,8 +96,8 @@ typedef struct BattleMon {
     u32 pressureAnnounced : 1;
     u32 padding0028_0B : 2;
 
-    u8 ppCur[LEARNED_MOVES_MAX];
-    u8 ppUps[LEARNED_MOVES_MAX];
+    u8 ppCur[MAX_MON_MOVES];
+    u8 ppUps[MAX_MON_MOVES];
 
     u8 level;
     u8 friendship;

diff --git a/include/battle/move_display_info.h b/include/battle/move_display_info.h
@@ -4,9 +4,9 @@
 #include "constants/moves.h"
 
 typedef struct MoveDisplayInfo {
-    u16 move[LEARNED_MOVES_MAX];
-    u16 curPP[LEARNED_MOVES_MAX];
-    u16 maxPP[LEARNED_MOVES_MAX];
+    u16 move[MAX_MON_MOVES];
+    u16 curPP[MAX_MON_MOVES];
+    u16 maxPP[MAX_MON_MOVES];
 } MoveDisplayInfo;
 
 #endif // POKEPLATINUM_MOVE_DISPLAY_INFO
diff --git a/include/constants/flavor.h b/include/constants/flavor.h
@@ -8,7 +8,7 @@ enum Flavor {
     FLAVOR_BITTER,
     FLAVOR_SOUR,
 
-    FLAVOR_MAX,
+    FLAVOR_COUNT,
 };
 
 #endif // POKEPLATINUM_CONSTANTS_FLAVOR_H
diff --git a/include/constants/moves.h b/include/constants/moves.h
@@ -5,7 +5,7 @@
 #include "generated/move_classes.h"
 #include "generated/moves.h"
 
-#define LEARNED_MOVES_MAX 4
+#define MAX_MON_MOVES     4
 #define MOVE_NOT_SELECTED 0xFF
 
 #define GBA_NUM_VALID_MOVES MOVE_PSYCHO_BOOST

diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
@@ -17,16 +17,17 @@
 
 #define MAX_POKEMON_SHEEN    255
 #define MAX_POKEMON_MARKINGS 6
-#define MAX_POKEMON_LEVEL    100
+#define MAX_MON_LEVEL        100
 #define EGG_POKEMON_LEVEL    1
 
-#define EVOLVE_FRIENDSHIP_THRESHOLD 220
+#define FRIENDSHIP_EVO_THRESHOLD 220
 
 #define BASE_FRIENDSHIP_VALUE 70
-#define MAX_FRIENDSHIP_VALUE  255
+#define MAX_FRIENDSHIP        255
 #define LOW_FRIENDSHIP_LIMIT  100
 #define MED_FRIENDSHIP_LIMIT  200
-#define HIGH_FRIENDSHIP_LIMIT MAX_FRIENDSHIP_VALUE
+#define FRIENDSHIP_TIER_NUM   3
+#define HIGH_FRIENDSHIP_LIMIT MAX_FRIENDSHIP
 
 #define CATCHING_SHOW_MONS       6
 #define MAX_GBA_TRANSFER_HISTORY 20

diff --git a/include/hall_of_fame_entries.h b/include/hall_of_fame_entries.h
@@ -19,7 +19,7 @@ typedef struct HallOfFamePokemon {
     u32 OTID;
     u16 nickname[MON_NAME_LEN + 1];
     u16 OTName[TRAINER_NAME_LEN + 1];
-    u16 moves[LEARNED_MOVES_MAX];
+    u16 moves[MAX_MON_MOVES];
     u8 padding_3A[2];
 } HallOfFamePokemon;
 
@@ -44,7 +44,7 @@ typedef struct PCHallOfFamePokemon {
     u16 species;
     u8 level;
     u8 form;
-    u16 moves[LEARNED_MOVES_MAX];
+    u16 moves[MAX_MON_MOVES];
 } PCHallOfFamePokemon;
 
 int HallOfFame_SaveSize(void);

diff --git a/include/overlay013/battle_party.h b/include/overlay013/battle_party.h
@@ -167,7 +167,7 @@ typedef struct BattlePartyPokemon {
     u8 tough;
     u8 mail;
     u8 form;
-    BattlePartyPokemonMove moves[LEARNED_MOVES_MAX];
+    BattlePartyPokemonMove moves[MAX_MON_MOVES];
 } BattlePartyPokemon;
 
 typedef struct BattlePartyContext {
@@ -239,7 +239,7 @@ typedef struct BattleParty {
     u8 useItemState;
     u8 unk_2079;
     u16 selectedPokemonCurrentHP;
-    u16 selectedPokemonCurrentMovePPs[LEARNED_MOVES_MAX];
+    u16 selectedPokemonCurrentMovePPs[MAX_MON_MOVES];
     BattleSubMenuCursor *cursor;
     u8 selectPokemonPreviousScreenButton;
     u8 learnMovePreviousScreenButton;
@@ -250,7 +250,7 @@ typedef struct BattleParty {
 #define PARTY_SLOT_SELECTABLE_IN_BATTLE     1
 #define PARTY_SLOT_SELECTABLE_NOT_IN_BATTLE 2
 
-#define MOVE_TO_LEARN_SLOT LEARNED_MOVES_MAX
+#define MOVE_TO_LEARN_SLOT MAX_MON_MOVES
 
 void BattlePartyTask_Start(BattlePartyContext *context);
 u8 BattlePartyTask_CheckCanPartySlotBeSelected(BattleParty *battleParty, s32 partySlot);

diff --git a/include/overlay104/frontier_data_transfer.h b/include/overlay104/frontier_data_transfer.h
@@ -21,7 +21,7 @@ typedef struct FrontierPokemonDataDTO {
         u16 form : 5;
     };
     u16 item;
-    u16 moves[LEARNED_MOVES_MAX];
+    u16 moves[MAX_MON_MOVES];
     u32 otID;
     u32 personality;
     union {