Merge pull request #178 from red031000/master

forme -> form
pret · Jun 30, 2023 · 6df5e87 · 6df5e87
2 parents dcbf1d6 + 83245b1
commit 6df5e87
Show file tree

Hide file tree

Showing 114 changed files with 957 additions and 957 deletions.
diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc
@@ -155,8 +155,8 @@
 .public PlayerProfile_GetTrainerID
 .public PlayerProfile_GetTrainerID_VisibleHalf
 .public PlayerProfile_GetTrainerGender
-.public Pokedex_GetSeenFormeByIdx_Unown
-.public Pokedex_GetSeenFormeNum_Unown
+.public Pokedex_GetSeenFormByIdx_Unown
+.public Pokedex_GetSeenFormNum_Unown
 .public Save_Pokedex_Get
 .public Save_Misc_Get
 .public sub_0202AA44

diff --git a/asm/include/overlay_106.inc b/asm/include/overlay_106.inc
@@ -80,8 +80,8 @@
 .public Thunk_G3X_Reset
 .public sub_02026E50
 .public SpeciesToOverworldModelIndexOffset
-.public OverworldModelLookupFormeCount
-.public OverworldModelLookupHasFemaleForme
+.public OverworldModelLookupFormCount
+.public OverworldModelLookupHasFemaleForm
 .public GetMonData
 .public MonIsShiny
 .public GetPartyCount

diff --git a/asm/include/overlay_112.inc b/asm/include/overlay_112.inc
@@ -248,8 +248,8 @@
 .public SetFlagInArray
 .public ClearFlagInArray
 .public SpeciesToOverworldModelIndexOffset
-.public OverworldModelLookupFormeCount
-.public OverworldModelLookupHasFemaleForme
+.public OverworldModelLookupFormCount
+.public OverworldModelLookupHasFemaleForm
 .public ZeroMonData
 .public AllocMonZeroed
 .public AcquireBoxMonLock
@@ -260,7 +260,7 @@
 .public GetBoxMonData
 .public SetMonData
 .public SetBoxMonData
-.public AllocAndLoadMonPersonal_HandleAlternateForme
+.public AllocAndLoadMonPersonal_HandleAlternateForm
 .public AllocAndLoadMonPersonal
 .public GetPersonalAttr
 .public FreeMonPersonal
@@ -274,7 +274,7 @@
 .public sub_02070438
 .public Mon_GetBoxMon
 .public CopyBoxPokemonToPokemon
-.public Mon_UpdateShayminForme
+.public Mon_UpdateShayminForm
 .public ChangePersonalityToNatureGenderAndAbility
 .public PCStorage_PlaceMonInBoxByIndexPair
 .public PCStorage_DeleteBoxMonByIndexPair

diff --git a/asm/include/overlay_113.inc b/asm/include/overlay_113.inc
@@ -101,8 +101,8 @@
 .public Save_PlayerData_GetProfileAddr
 .public Save_PlayerData_GetOptionsAddr
 .public PlayerProfile_GetPlayerName_NewString
-.public Pokedex_GetSeenFormeByIdx_Unown
-.public Pokedex_GetSeenFormeNum_Unown
+.public Pokedex_GetSeenFormByIdx_Unown
+.public Pokedex_GetSeenFormNum_Unown
 .public Save_Pokedex_Get
 .public Options_GetTextFrameDelay
 .public Options_GetFrame

diff --git a/asm/include/overlay_12_0224E4FC.inc b/asm/include/overlay_12_0224E4FC.inc
@@ -18,7 +18,7 @@
 .public CopyPokemonToPokemon
 .public GetFlavorPreferenceFromPID
 .public GetArceusTypeByHeldItemEffect
-.public Mon_UpdateGiratinaForme
+.public Mon_UpdateGiratinaForm
 .public sub_020720FC
 .public MaskOfFlagNo
 .public GetMoveMaxPP
@@ -38,7 +38,7 @@
 .public PokedexData_LoadAll
 .public PokedexData_UnloadAll
 .public PokedexData_GetWeight
-.public SetDexBanksByGiratinaForme
+.public SetDexBanksByGiratinaForm
 .public MIi_CpuClearFast
 .public _s32_div_f
 .public _u32_div_f

diff --git a/asm/include/overlay_12_battle_command.inc b/asm/include/overlay_12_battle_command.inc
@@ -70,7 +70,7 @@
 .public CalcMonStats
 .public GetMonData
 .public SetMonData
-.public AllocAndLoadMonPersonal_HandleAlternateForme
+.public AllocAndLoadMonPersonal_HandleAlternateForm
 .public GetPersonalAttr
 .public FreeMonPersonal
 .public GetMonBaseStat
@@ -83,7 +83,7 @@
 .public MonTryLearnMoveOnLevelUp
 .public CopyPokemonToPokemon
 .public Party_MaskMonsWithPokerus
-.public Mon_UpdateGiratinaForme
+.public Mon_UpdateGiratinaForm
 .public MaskOfFlagNo
 .public PCStorage_PlaceMonInBoxFirstEmptySlot
 .public PCStorage_GetActiveBox
@@ -341,7 +341,7 @@
 .public BtlCmd_CheckChatterActivation
 .public BtlCmd_GetMoveParam
 .public BtlCmd_Mosaic
-.public BtlCmd_ChangeForme
+.public BtlCmd_ChangeForm
 .public BtlCmd_SetBattleBackground
 .public BtlCmd_RecoverStatus
 .public BtlCmd_TryRun

diff --git a/asm/include/overlay_12_battle_controller.inc b/asm/include/overlay_12_battle_controller.inc
@@ -107,7 +107,7 @@
 .public BattleControl_EmitPartyStatusHeal
 .public ov12_02263D14
 .public BattleController_EmitPlayMosaicAnimation
-.public BattleController_EmitChangeForme
+.public BattleController_EmitChangeForm
 .public BattleController_EmitSetBattleBackground
 .public ov12_02263E18
 .public BattleController_EmitInitStartBallGauge

diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc
@@ -214,17 +214,17 @@
 .public GetBoxMonData
 .public SetMonData
 .public SetBoxMonData
-.public GetMonBaseStatEx_HandleAlternateForme
+.public GetMonBaseStatEx_HandleAlternateForm
 .public GetBoxMonNature
 .public GetBoxMonGender
 .public GetBoxmonSpriteCharAndPlttNarcIds
 .public Mon_GetBoxMon
 .public CopyBoxPokemonToPokemon
 .public CopyPokemonToPokemon
-.public BoxMon_UpdateArceusForme
-.public BoxMon_UpdateGiratinaForme
-.public Mon_UpdateShayminForme
-.public BoxMon_UpdateShayminForme
+.public BoxMon_UpdateArceusForm
+.public BoxMon_UpdateGiratinaForm
+.public Mon_UpdateShayminForm
+.public BoxMon_UpdateShayminForm
 .public PCStorage_PlaceMonInBoxFirstEmptySlot
 .public PCStorage_PlaceMonInBoxByIndexPair
 .public PCStorage_SwapMonsInBoxByIndexPair

diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc
@@ -229,13 +229,13 @@
 .public Pokedex_GetNatDexFlag
 .public Pokedex_HasCaughtMonWithLanguage
 .public Pokedex_GetInternationalViewFlag
-.public Pokedex_GetSeenFormeByIdx
-.public Pokedex_GetSeenFormeNum
+.public Pokedex_GetSeenFormByIdx
+.public Pokedex_GetSeenFormNum
 .public MapHeader_GetMapSec
 .public AcquireMonLock
 .public ReleaseMonLock
 .public GetMonData
-.public GetMonBaseStat_HandleAlternateForme
+.public GetMonBaseStat_HandleAlternateForm
 .public GetPokemonSpriteCharAndPlttNarcIds
 .public GetMonSpriteCharAndPlttNarcIdsEx
 .public sub_020708D8
@@ -250,7 +250,7 @@
 .public sub_02091294
 .public sub_020912AC
 .public sub_020912D0
-.public SetDexBanksByGiratinaForme
+.public SetDexBanksByGiratinaForm
 .public GetPokedexDataNarcID
 .public GetDexWeightMsgBank
 .public GetDexHeightMsgBank

diff --git a/asm/include/overlay_59.inc b/asm/include/overlay_59.inc
@@ -178,7 +178,7 @@
 .public sub_02032004
 .public sub_02032024
 .public GetMonData
-.public GetMonBaseStat_HandleAlternateForme
+.public GetMonBaseStat_HandleAlternateForm
 .public GetPokemonSpriteCharAndPlttNarcIds
 .public CalcMonPokeathlonPerformance
 .public CalcMonPokeathlonStars

diff --git a/asm/include/overlay_63.inc b/asm/include/overlay_63.inc
@@ -126,8 +126,8 @@
 .public GetIGTHours
 .public GetIGTMinutes
 .public SpeciesToOverworldModelIndexOffset
-.public OverworldModelLookupFormeCount
-.public OverworldModelLookupHasFemaleForme
+.public OverworldModelLookupFormCount
+.public OverworldModelLookupHasFemaleForm
 .public MonIsInGameTradePoke
 .public AcquireMonLock
 .public ReleaseMonLock

diff --git a/asm/include/overlay_64.inc b/asm/include/overlay_64.inc
@@ -100,8 +100,8 @@
 .public Save_HOF_GetMonStatsByIndexPair
 .public Save_HOF_GetClearDate
 .public SpeciesToOverworldModelIndexOffset
-.public OverworldModelLookupFormeCount
-.public OverworldModelLookupHasFemaleForme
+.public OverworldModelLookupFormCount
+.public OverworldModelLookupHasFemaleForm
 .public GetGenderBySpeciesAndPersonality
 .public CalcShininessByOtIdAndPersonality
 .public GetMonSpriteCharAndPlttNarcIdsEx

diff --git a/asm/include/overlay_65.inc b/asm/include/overlay_65.inc
@@ -191,12 +191,12 @@
 .public ReleaseMonLock
 .public GetMonData
 .public SetMonData
-.public GetMonBaseStat_HandleAlternateForme
+.public GetMonBaseStat_HandleAlternateForm
 .public GetPokemonSpriteCharAndPlttNarcIds
 .public sub_0207083C
 .public Mon_GetBoxMon
 .public CopyPokemonToPokemon
-.public Mon_UpdateShayminForme
+.public Mon_UpdateShayminForm
 .public Pokemon_RemoveCapsule
 .public GetMonIconNaixEx
 .public GetMonIconPaletteEx

diff --git a/asm/include/overlay_68.inc b/asm/include/overlay_68.inc
@@ -134,7 +134,7 @@
 .public GetMonData
 .public GetBoxMonData
 .public SetMonData
-.public GetMonBaseStat_HandleAlternateForme
+.public GetMonBaseStat_HandleAlternateForm
 .public GetPokemonSpriteCharAndPlttNarcIds
 .public Mon_GetBoxMon
 .public GetMoveAttr

diff --git a/asm/include/overlay_70.inc b/asm/include/overlay_70.inc
@@ -240,8 +240,8 @@
 .public GetMonEvolution
 .public CopyBoxPokemonToPokemon
 .public CopyPokemonToPokemon
-.public Mon_UpdateShayminForme
-.public BoxMon_UpdateShayminForme
+.public Mon_UpdateShayminForm
+.public BoxMon_UpdateShayminForm
 .public Pokemon_RemoveCapsule
 .public PCStorage_PlaceMonInBoxFirstEmptySlot
 .public PCStorage_DeleteBoxMonByIndexPair

diff --git a/asm/include/overlay_71.inc b/asm/include/overlay_71.inc
@@ -137,7 +137,7 @@
 .public AcquireBoxMonLock
 .public ReleaseBoxMonLock
 .public GetBoxMonData
-.public GetMonBaseStat_HandleAlternateForme
+.public GetMonBaseStat_HandleAlternateForm
 .public GetBoxmonSpriteCharAndPlttNarcIds
 .public sub_02070854
 .public sub_02072914

diff --git a/asm/include/overlay_78.inc b/asm/include/overlay_78.inc
@@ -84,8 +84,8 @@
 .public PlayerProfile_GetTrainerGender
 .public Save_GetPartyLeadAlive
 .public SpeciesToOverworldModelIndexOffset
-.public OverworldModelLookupFormeCount
-.public OverworldModelLookupHasFemaleForme
+.public OverworldModelLookupFormCount
+.public OverworldModelLookupHasFemaleForm
 .public GetMonData
 .public GetMonGender
 .public MonIsShiny

diff --git a/asm/include/overlay_81.inc b/asm/include/overlay_81.inc
@@ -179,7 +179,7 @@
 .public sub_0203A880
 .public sub_0203A914
 .public GetMonData
-.public GetMonBaseStat_HandleAlternateForme
+.public GetMonBaseStat_HandleAlternateForm
 .public GetMonGender
 .public GetPokemonSpriteCharAndPlttNarcIds
 .public Mon_GetBoxMon

diff --git a/asm/include/overlay_96.inc b/asm/include/overlay_96.inc
@@ -328,8 +328,8 @@
 .public CheckFlagInArray
 .public SetFlagInArray
 .public SpeciesToOverworldModelIndexOffset
-.public OverworldModelLookupFormeCount
-.public OverworldModelLookupHasFemaleForme
+.public OverworldModelLookupFormCount
+.public OverworldModelLookupHasFemaleForm
 .public GetMonBaseStat
 .public GetMonSpriteCharAndPlttNarcIdsEx
 .public sub_020708D8

diff --git a/asm/include/overlay_99.inc b/asm/include/overlay_99.inc
@@ -76,7 +76,7 @@
 .public PlayerProfile_GetTrainerGender
 .public Pokedex_GetSeenSpindaPersonality
 .public Pokedex_SpeciesGetLastSeenGender
-.public Pokedex_GetSeenFormeByIdx
+.public Pokedex_GetSeenFormByIdx
 .public sub_02031974
 .public sub_02031978
 .public sub_0203197C

diff --git a/asm/include/unk_0205A44C.inc b/asm/include/unk_0205A44C.inc
@@ -14,7 +14,7 @@
 .public MailMsg_GetMsgBank
 .public MailMsg_GetMsgNo
 .public MailMsg_Copy
-.public SaveEasyChat_SetGreetingFlag
+.public Save_EasyChat_SetGreetingFlag
 .public FreeToHeap
 .public LCRandom
 .public GF_AssertFail

diff --git a/asm/include/unk_0205BB1C.inc b/asm/include/unk_0205BB1C.inc
@@ -12,7 +12,7 @@
 .public sub_0205BC78
 .public Save_GetPartyLead
 .public Save_GetPartyLeadAlive
-.public Save_PlayerHasRegiInParty
+.public Save_PlayerHasAllRegisInParty
 .public sub_0205BED8
 .public sub_0205BFB4
 .public MapObject_SetVisible

diff --git a/asm/include/unk_02078E30.inc b/asm/include/unk_02078E30.inc
@@ -105,8 +105,8 @@
 .public GetMonGender
 .public Mon_GetBoxMon
 .public GetMonEvolution
-.public Pokemon_UpdateArceusForme
-.public Mon_UpdateGiratinaForme
+.public Pokemon_UpdateArceusForm
+.public Mon_UpdateGiratinaForm
 .public Mon_CanUseGracidea
 .public IsPokemonBannedFromBattleFrontier
 .public GetPartyCount
@@ -220,5 +220,5 @@
 .public _0210159C
 .public gSystem
 .public OS_IRQTable
-.public PartyMenu_InitIconFormeChangeWork
-.public PartyMenu_AnimateIconFormeChange
+.public PartyMenu_InitIconFormChangeData
+.public PartyMenu_AnimateIconFormChange
diff --git a/asm/include/unk_0207F42C.inc b/asm/include/unk_0207F42C.inc
@@ -27,8 +27,8 @@
 .public GetMonData
 .public SetMonData
 .public Mon_GetBoxMon
-.public Pokemon_UpdateArceusForme
-.public Mon_UpdateGiratinaForme
+.public Pokemon_UpdateArceusForm
+.public Mon_UpdateGiratinaForm
 .public Pokemon_RemoveCapsule
 .public GetPartyMonByIndex
 .public Party_SwapSlots
@@ -72,4 +72,4 @@
 .public _s32_div_f
 .public _020FA484
 .public gNatureStatMods
-.public PartyMenu_AnimateIconFormeChange
+.public PartyMenu_AnimateIconFormChange
diff --git a/asm/include/unk_0208B1AC.inc b/asm/include/unk_0208B1AC.inc
@@ -28,7 +28,7 @@
 .public sub_020249D4
 .public sub_02024ADC
 .public sub_02024B1C
-.public GetMonBaseStat_HandleAlternateForme
+.public GetMonBaseStat_HandleAlternateForm
 .public CalcBoxMonPokeathlonPerformance
 .public CalcBoxmonPokeathlonStars
 .public GetMoveAttr

diff --git a/asm/include/unk_02091880.inc b/asm/include/unk_02091880.inc
@@ -4,8 +4,8 @@
 .public EasyChatManager_Delete
 .public EasyChatManager_ReadWordIntoString
 .public GetECWordIndexByPair
-.public SaveEasyChat_GetTrendySayingFlag
-.public SaveEasyChat_GetGreetingsFlag
+.public Save_EasyChat_GetTrendySayingFlag
+.public Save_EasyChat_GetGreetingsFlag
 .public AllocFromHeap
 .public FreeToHeap
 .public Pokedex_CheckMonSeenFlag