pret · AsparagusEduardo · Dec 20, 2025 · Dec 20, 2025 · Dec 20, 2025 · Dec 20, 2025
diff --git a/asm/include/overlay_01_021E6880.inc b/asm/include/overlay_01_021E6880.inc
@@ -149,7 +149,7 @@
 .public FieldSystem_UnkSub108_MoveMoodTowardsNeutral
 .public HandleDaycareStep
 .public FieldSystem_BugContest_Get
-.public MonApplyFriendshipMod
+.public Pokemon_UpdateFriendship
 .public Party_GetCount
 .public Party_GetMonByIndex
 .public SaveArray_Party_Get

diff --git a/asm/include/overlay_01_021F1AFC.inc b/asm/include/overlay_01_021F1AFC.inc
@@ -91,7 +91,7 @@
 .public sub_02069DC8
 .public FollowMon_IsActive
 .public FieldSystem_UnkSub108_AddMonMood
-.public GetMonData
+.public Pokemon_GetData
 .public Party_GetMonByIndex
 .public SaveArray_Party_Get
 .public memset

diff --git a/asm/include/overlay_01_021F72DC.inc b/asm/include/overlay_01_021F72DC.inc
@@ -42,9 +42,9 @@
 .public FollowMon_SetObjectParams
 .public FieldSystem_SetFollowerPokeParam
 .public FieldSystem_UnkSub108_Set
-.public GetMonData
-.public GetMonGender
-.public MonIsShiny
+.public Pokemon_GetData
+.public Pokemon_GetGender
+.public Pokemon_IsShiny
 .public SaveArray_Party_Get
 .public _s32_div_f
 .public ov01_021F1640

diff --git a/asm/include/overlay_01_021FC66C.inc b/asm/include/overlay_01_021FC66C.inc
@@ -43,7 +43,7 @@
 .public FollowMon_GetMapObject
 .public FollowMon_IsActive
 .public FieldSystem_UnkSub108_GetMonMood
-.public GetMonData
+.public Pokemon_GetData
 .public SaveArray_Party_Get
 .public FieldSystem_GetGearPhoneRingManager
 .public GearPhoneRingManager_ResetIfActive

diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc
@@ -314,22 +314,22 @@
 .public FieldSystem_UnkSub108_GetMonMood
 .public FieldSystem_BugContest_Get
 .public BugContest_GetSportBallsAddr
-.public ZeroMonData
-.public AllocMonZeroed
-.public CreateMon
-.public CreateMonWithNature
-.public CreateMonWithGenderNatureLetter
-.public CreateMonWithFixedIVs
-.public GetMonData
-.public SetMonData
-.public GetMonBaseStat
-.public GetMonNature
-.public GetNatureFromPersonality
-.public GetGenderBySpeciesAndPersonality
-.public GenerateShinyPersonality
-.public GetPokemonSpriteCharAndPlttNarcIds
-.public Mon_GetBoxMon
-.public WildMonSetRandomHeldItem
+.public Pokemon_Init
+.public Pokemon_New
+.public Pokemon_InitWithParams
+.public Pokemon_InitWithNature
+.public Pokemon_InitWithGenderNatureLetter
+.public Pokemon_InitAndCalcStats
+.public Pokemon_GetData
+.public Pokemon_SetData
+.public Species_GetValue
+.public Pokemon_GetNature
+.public Personality_GetNature
+.public Species_GetGenderFromPersonality
+.public Personality_GenerateShiny
+.public Pokemon_BuildSpriteTemplate
+.public Pokemon_GetBoxMon
+.public Pokemon_GiveWildHeldItem
 .public CalcMonPokeathlonStars
 .public EnemyTrainerSet_Init
 .public Party_AddMon

diff --git a/asm/include/overlay_03.inc b/asm/include/overlay_03.inc
@@ -195,7 +195,7 @@
 .public sub_020669B4
 .public CheckFlag09A
 .public sub_02066D80
-.public GetMonData
+.public Pokemon_GetData
 .public Party_GetCount
 .public Party_GetMonByIndex
 .public SaveArray_Party_Get

diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc
@@ -140,9 +140,9 @@
 .public sub_02037AC0
 .public sub_02037B38
 .public sub_0203A880
-.public GetMonData
-.public GetMonGender
-.public Mon_GetBoxMon
+.public Pokemon_GetData
+.public Pokemon_GetGender
+.public Pokemon_GetBoxMon
 .public Pokemon_GetIconNaix
 .public GetMonIconNaixEx
 .public GetMonIconPaletteEx

diff --git a/asm/include/overlay_07.inc b/asm/include/overlay_07.inc
@@ -158,9 +158,9 @@
 .public SealOnCapsuleGetID
 .public SealOnCapsuleGetX
 .public SealOnCapsuleGetY
-.public GetMonData
-.public GetMonSpriteCharAndPlttNarcIdsEx
-.public GetMonPicHeightBySpeciesGenderForm
+.public Pokemon_GetData
+.public Species_BuildSpriteTemplate
+.public Species_LoadSpriteYOffset
 .public sub_02071FDC
 .public sub_020729D8
 .public sub_020729FC

diff --git a/asm/include/overlay_08.inc b/asm/include/overlay_08.inc
@@ -102,10 +102,10 @@
 .public System_GetTouchNew
 .public String_New
 .public String_Delete
-.public GetMonData
-.public GetMonExpBySpeciesAndLevel
-.public GetMonGender
-.public Mon_GetBoxMon
+.public Pokemon_GetData
+.public Species_GetExpAtLevel
+.public Pokemon_GetGender
+.public Pokemon_GetBoxMon
 .public GetMoveAttr
 .public GetMoveMaxPP
 .public PCStorage_FindFirstBoxWithEmptySlot

diff --git a/asm/include/overlay_10.inc b/asm/include/overlay_10.inc
@@ -1,8 +1,8 @@
 #include <nitro/fs/overlay.h>
 #pragma once
 .public GF_AssertFail
-.public GetMonData
-.public GetMonBaseStat
+.public Pokemon_GetData
+.public Species_GetValue
 .public MaskOfFlagNo
 .public Party_GetCount
 .public Party_GetMonByIndex

diff --git a/asm/include/overlay_106.inc b/asm/include/overlay_106.inc
@@ -82,8 +82,8 @@
 .public SpeciesToOverworldModelIndexOffset
 .public OverworldModelLookupFormCount
 .public OverworldModelLookupHasFemaleForm
-.public GetMonData
-.public MonIsShiny
+.public Pokemon_GetData
+.public Pokemon_IsShiny
 .public Party_GetCount
 .public Party_GetMonByIndex
 .public SaveArray_Party_Get

diff --git a/asm/include/overlay_111.inc b/asm/include/overlay_111.inc
@@ -101,9 +101,9 @@
 .public String_Delete
 .public Options_GetTextFrameDelay
 .public Options_GetFrame
-.public GetMonData
-.public GetMonGender
-.public Mon_GetBoxMon
+.public Pokemon_GetData
+.public Pokemon_GetGender
+.public Pokemon_GetBoxMon
 .public Pokemon_GetIconNaix
 .public Pokemon_GetIconPalette
 .public sub_02074490

diff --git a/asm/include/overlay_112.inc b/asm/include/overlay_112.inc
@@ -250,32 +250,32 @@
 .public SpeciesToOverworldModelIndexOffset
 .public OverworldModelLookupFormCount
 .public OverworldModelLookupHasFemaleForm
-.public ZeroMonData
-.public AllocMonZeroed
-.public AcquireBoxMonLock
-.public ReleaseBoxMonLock
-.public CreateMon
-.public CalcMonLevelAndStats
-.public GetMonData
-.public GetBoxMonData
-.public SetMonData
-.public SetBoxMonData
-.public AllocAndLoadMonPersonal_HandleAlternateForm
-.public AllocAndLoadMonPersonal
-.public GetPersonalAttr
-.public FreeMonPersonal
-.public CalcBoxMonExpToNextLevel
-.public MonApplyFriendshipMod
-.public GetBoxMonGender
-.public MonIsShiny
-.public BoxMonIsShiny
-.public GetBoxmonSpriteCharAndPlttNarcIds
-.public GetMonSpriteCharAndPlttNarcIdsEx
-.public sub_02070438
-.public Mon_GetBoxMon
-.public CopyBoxPokemonToPokemon
-.public Mon_UpdateShayminForm
-.public ChangePersonalityToNatureGenderAndAbility
+.public Pokemon_Init
+.public Pokemon_New
+.public BoxPokemon_DecryptData
+.public BoxPokemon_EncryptData
+.public Pokemon_InitWithParams
+.public Pokemon_CalcLevelAndStats
+.public Pokemon_GetData
+.public BoxPokemon_GetData
+.public Pokemon_SetData
+.public BoxPokemon_SetData
+.public SpeciesData_NewFromForm
+.public SpeciesData_NewFromSpecies
+.public SpeciesData_GetValue
+.public SpeciesData_Free
+.public BoxPokemon_CalcExpToNextLevel
+.public Pokemon_UpdateFriendship
+.public BoxPokemon_GetGender
+.public Pokemon_IsShiny
+.public BoxPokemon_IsShiny
+.public BoxPokemon_BuildSpriteTemplate
+.public Species_BuildSpriteTemplate
+.public Species_SanitizeFormId
+.public Pokemon_GetBoxMon
+.public BoxPokemon_CopyToPokemon
+.public Pokemon_UpdateShayminForm
+.public Personality_ChangeNatureGenderAbility
 .public PCStorage_PlaceMonInBoxByIndexPair
 .public PCStorage_DeleteBoxMonByIndexPair
 .public PCStorage_FindFirstEmptySlot

diff --git a/asm/include/overlay_12_022378C0.inc b/asm/include/overlay_12_022378C0.inc
@@ -141,10 +141,10 @@
 .public sub_0203A880
 .public sub_0203A914
 .public sub_0203A930
-.public GetMonData
-.public SetMonData
-.public MonApplyFriendshipMod
-.public GetMonGender
+.public Pokemon_GetData
+.public Pokemon_SetData
+.public Pokemon_UpdateFriendship
+.public Pokemon_GetGender
 .public MaskOfFlagNo
 .public SaveArray_Party_Alloc
 .public Party_GetCount

diff --git a/asm/include/overlay_12_battle_command.inc b/asm/include/overlay_12_battle_command.inc
@@ -67,23 +67,23 @@
 .public System_GetTouchNew
 .public GF_AssertFail
 .public String_Delete
-.public CalcMonStats
-.public GetMonData
-.public SetMonData
-.public AllocAndLoadMonPersonal_HandleAlternateForm
-.public GetPersonalAttr
-.public FreeMonPersonal
-.public GetMonBaseStat
-.public GetMonBaseExperienceAtCurrentLevel
-.public MonApplyFriendshipMod
-.public GetPokemonSpriteCharAndPlttNarcIds
-.public Mon_GetBoxMon
+.public Pokemon_CalcStats
+.public Pokemon_GetData
+.public Pokemon_SetData
+.public SpeciesData_NewFromForm
+.public SpeciesData_GetValue
+.public SpeciesData_Free
+.public Species_GetValue
+.public Pokemon_GetCurrentLevelBaseExp
+.public Pokemon_UpdateFriendship
+.public Pokemon_BuildSpriteTemplate
+.public Pokemon_GetBoxMon
 .public Pokemon_TryLevelUp
-.public MonSetMoveInSlot
-.public MonTryLearnMoveOnLevelUp
-.public CopyPokemonToPokemon
-.public Party_MaskMonsWithPokerus
-.public Mon_UpdateGiratinaForm
+.public Pokemon_SetMoveInSlot
+.public Pokemon_TryLevelUpMove
+.public Pokemon_Copy
+.public Party_MaskHasPokerus
+.public Pokemon_UpdateGiratinaForm
 .public MaskOfFlagNo
 .public PCStorage_PlaceMonInBoxFirstEmptySlot
 .public PCStorage_GetActiveBox

diff --git a/asm/include/overlay_12_battle_controller.inc b/asm/include/overlay_12_battle_controller.inc
@@ -4,10 +4,10 @@
 .public sub_0202FC48
 .public sub_02037454
 .public sub_0203769C
-.public GetMonData
-.public GetPercentProgressTowardsNextLevel
-.public GetMonExpBySpeciesAndLevel
-.public GetMonPicHeightBySpeciesGenderForm
+.public Pokemon_GetData
+.public Pokemon_CalcPercentToNextLevel
+.public Species_GetExpAtLevel
+.public Species_LoadSpriteYOffset
 .public MaskOfFlagNo
 .public GetMoveMaxPP
 .public Party_GetCount

diff --git a/asm/include/overlay_12_battle_controller_opponent.inc b/asm/include/overlay_12_battle_controller_opponent.inc
@@ -66,17 +66,17 @@
 .public TextPrinterCheckActive
 .public GF_AssertFail
 .public PlayerProfile_GetVersion
-.public AllocMonZeroed
-.public CalcMonLevelAndStats
-.public GetMonData
-.public SetMonData
-.public GetMonBaseStat
-.public GetNatureFromPersonality
-.public GetMonSpriteCharAndPlttNarcIdsEx
-.public GetMonPicHeightBySpeciesGenderForm
+.public Pokemon_New
+.public Pokemon_CalcLevelAndStats
+.public Pokemon_GetData
+.public Pokemon_SetData
+.public Species_GetValue
+.public Personality_GetNature
+.public Species_BuildSpriteTemplate
+.public Species_LoadSpriteYOffset
 .public sub_02070C24
 .public sub_02070D84
-.public CopyPokemonToPokemon
+.public Pokemon_Copy
 .public sub_0207204C
 .public MaskOfFlagNo
 .public TrainerClassToBackpicID

diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc
@@ -207,24 +207,24 @@
 .public Save_PlayerData_GetOptionsAddr
 .public Options_GetFrame
 .public Save_SpecialRibbons_Get
-.public AllocMonZeroed
-.public AcquireBoxMonLock
-.public ReleaseBoxMonLock
-.public GetMonData
-.public GetBoxMonData
-.public SetMonData
-.public SetBoxMonData
-.public GetMonBaseStatEx_HandleAlternateForm
-.public GetBoxMonNature
-.public GetBoxMonGender
-.public GetBoxmonSpriteCharAndPlttNarcIds
-.public Mon_GetBoxMon
-.public CopyBoxPokemonToPokemon
-.public CopyPokemonToPokemon
-.public BoxMon_UpdateArceusForm
-.public BoxMon_UpdateGiratinaForm
-.public Mon_UpdateShayminForm
-.public BoxMon_UpdateShayminForm
+.public Pokemon_New
+.public BoxPokemon_DecryptData
+.public BoxPokemon_EncryptData
+.public Pokemon_GetData
+.public BoxPokemon_GetData
+.public Pokemon_SetData
+.public BoxPokemon_SetData
+.public Species_GetFormValueFromNarc
+.public BoxPokemon_GetNature
+.public BoxPokemon_GetGender
+.public BoxPokemon_BuildSpriteTemplate
+.public Pokemon_GetBoxMon
+.public BoxPokemon_CopyToPokemon
+.public Pokemon_Copy
+.public BoxPokemon_UpdateArceusForm
+.public BoxPokemon_UpdateGiratinaForm
+.public Pokemon_UpdateShayminForm
+.public BoxPokemon_UpdateShayminForm
 .public PCStorage_PlaceMonInBoxFirstEmptySlot
 .public PCStorage_PlaceMonInBoxByIndexPair
 .public PCStorage_SwapMonsInBoxByIndexPair

diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc
@@ -232,13 +232,13 @@
 .public Pokedex_GetSeenFormByIdx
 .public Pokedex_GetSeenFormNum
 .public MapHeader_GetMapSec
-.public AcquireMonLock
-.public ReleaseMonLock
-.public GetMonData
-.public GetMonBaseStat_HandleAlternateForm
-.public GetPokemonSpriteCharAndPlttNarcIds
-.public GetMonSpriteCharAndPlttNarcIdsEx
-.public GetMonPicHeightBySpeciesGenderForm
+.public Pokemon_DecryptData
+.public Pokemon_EncryptData
+.public Pokemon_GetData
+.public Species_GetFormValue
+.public Pokemon_BuildSpriteTemplate
+.public Species_BuildSpriteTemplate
+.public Species_LoadSpriteYOffset
 .public GetBattleMonIconNaixEx
 .public GetBattleMonIconPaletteEx
 .public sub_02074490

diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc
@@ -123,7 +123,7 @@
 .public FieldSystem_MapIsBattleTowerMultiPartnerSelectRoom
 .public FieldSystem_BugContest_Get
 .public BugContest_GetSportBallsAddr
-.public GetMonData
+.public Pokemon_GetData
 .public Pokemon_GetIconNaix
 .public Pokemon_GetIconPalette
 .public sub_02074490