diff --git a/asm/include/itcm.inc b/asm/include/itcm.inc index 8d3b1fb4..5985ca78 100644 --- a/asm/include/itcm.inc +++ b/asm/include/itcm.inc @@ -6,7 +6,6 @@ .public _02099784 .public _02099E44 .public _020A2CF8 -.public MONSTER_DATA_TABLE_PTR .public _0229AFC0 .public _0229AFCC .public _0229AFE4 @@ -130,6 +129,7 @@ .public IsTacticSet .public MemcpyFast .public MemsetFast +.public MONSTER_DATA_TABLE_PTR .public OS_IRQTable .public ov10_022C4580 .public ov10_022C4900 diff --git a/asm/include/main_0200E864.inc b/asm/include/main_0200E864.inc index 353804d2..33cb2bc2 100644 --- a/asm/include/main_0200E864.inc +++ b/asm/include/main_0200E864.inc @@ -1,12 +1,12 @@ #pragma once -.public EnsureValidItem -.public GET_ITEM_NAME_FORMATTED_SPRINTF -.public ITEM_DATA_TABLE_PTRS -.public SprintfStatic__0200E808_EU -.public StringFromId .public _0209808C .public _0209809C .public _020980AC .public _020980B0 +.public EnsureValidItem +.public GET_ITEM_NAME_FORMATTED_SPRINTF +.public ITEM_DATA_TABLE_PTRS +.public SprintfStatic__0200E808_EU .public strcpy +.public StringFromId .public vsprintf diff --git a/asm/include/main_0200EB30.inc b/asm/include/main_0200EB30.inc index 8f464d30..b23d63ea 100644 --- a/asm/include/main_0200EB30.inc +++ b/asm/include/main_0200EB30.inc @@ -1,6 +1,6 @@ #pragma once .public ARM9_UNKNOWN_TABLE__NA_2097FF8 .public BAG_ITEMS_PTR_MIRROR -.public ITEM_DATA_TABLE_PTRS .public IsItemValid +.public ITEM_DATA_TABLE_PTRS .public ItemZInit diff --git a/asm/include/main_0200ED1C.inc b/asm/include/main_0200ED1C.inc index d2e8efaf..6b70190d 100644 --- a/asm/include/main_0200ED1C.inc +++ b/asm/include/main_0200ED1C.inc @@ -1,85 +1,4 @@ #pragma once -.public AreItemsEquivalent -.public BAG_ITEMS_PTR_MIRROR -.public BulkItemToItem -.public CALCIUM_STAT_BOOST -.public CopyBitsFrom -.public CopyBitsTo -.public DUNGEON_MOVE_TABLES -.public Debug_Print0 -.public EXCLUSIVE_ITEM_ATTACK_BOOSTS -.public EXCLUSIVE_ITEM_DEFENSE_BOOSTS -.public EXCLUSIVE_ITEM_EFFECT_DATA -.public EXCLUSIVE_ITEM_SPECIAL_ATTACK_BOOSTS -.public EXCLUSIVE_ITEM_SPECIAL_DEFENSE_BOOSTS -.public EXCLUSIVE_ITEM_STAT_BOOST_DATA_INDEXES -.public FemaleToMaleForm -.public GINSENG_CHANCE_3 -.public GUMMI_STAT_BOOST -.public GetBagCapacity -.public GetBagCapacitySpecialEpisode -.public GetBaseFormCastformDeoxysCherrim -.public GetDungeonResultString -.public GetExclusiveItem -.public GetExclusiveItemParameter -.public GetExclusiveItemType -.public GetExecuteSpecialEpisodeType -.public GetFamilyIndex -.public GetItemCategory -.public GetItemCategoryVeneer -.public GetItemIdFromList -.public GetMaxPp -.public GetMoveMaxGinsengBoostGround -.public GetPartyMembers -.public GetPerformanceFlagWithChecks -.public GetRank -.public GetRankStorageSize -.public GetScenarioBalance -.public GetTeamMember -.public GetType -.public HasMonsterBeenAttackedInDungeons -.public IQ_GUMMI_GAIN_TABLE -.public IRON_STAT_BOOST -.public InitBulkItem -.public Is2TurnsMove -.public IsGummi -.public IsItemInTimeDarkness -.public IsItemValidVeneer -.public IsMonsterValid -.public IsStorableItem -.public IsThrownItem -.public IsTicketItem -.public IsTreasureBox -.public ItemZInit -.public KECLEON_SHOP_ITEM_TABLE_LISTS_1 -.public KECLEON_SHOP_ITEM_TABLE_LISTS_2 -.public LIFE_SEED_HP_BOOST -.public LoadFileFromRom -.public LoadScriptVariableValue -.public MemAlloc -.public MemFree -.public MemZero -.public OpenWaza -.public PROTEIN_STAT_BOOST -.public RECYCLE_SHOP_ITEM_LIST -.public Rand16Bit -.public RandInt -.public RandIntSafe -.public RandRange -.public RemoveEmptyItems -.public SITRUS_BERRY_FULL_HP_BOOST -.public SaveScriptVariableValue -.public SelectWaza -.public SetItemAcquired -.public SetNbRecycled -.public SortItemList -.public StringFromId -.public TYPE_SPECIFIC_EXCLUSIVE_ITEMS -.public UnloadFile -.public WONDER_GUMMI_IQ_GAIN -.public WONDER_GUMMI_STAT_BOOST -.public ZINC_STAT_BOOST -.public ZInit8 .public _0209889C .public _020988A4 .public _020988A8 @@ -105,6 +24,81 @@ .public _020AF700 .public _022A4BD8 .public _s32_div_f +.public AreItemsEquivalent +.public BAG_ITEMS_PTR_MIRROR +.public BulkItemToItem +.public CALCIUM_STAT_BOOST +.public CopyBitsFrom +.public CopyBitsTo +.public Debug_Print0 +.public DUNGEON_MOVE_TABLES +.public EXCLUSIVE_ITEM_ATTACK_BOOSTS +.public EXCLUSIVE_ITEM_DEFENSE_BOOSTS +.public EXCLUSIVE_ITEM_EFFECT_DATA +.public EXCLUSIVE_ITEM_SPECIAL_ATTACK_BOOSTS +.public EXCLUSIVE_ITEM_SPECIAL_DEFENSE_BOOSTS +.public EXCLUSIVE_ITEM_STAT_BOOST_DATA_INDEXES +.public FemaleToMaleForm +.public GetBagCapacity +.public GetBagCapacitySpecialEpisode +.public GetBaseFormCastformDeoxysCherrim +.public GetDungeonResultString +.public GetExclusiveItem +.public GetExclusiveItemParameter +.public GetExclusiveItemType +.public GetExecuteSpecialEpisodeType +.public GetFamilyIndex +.public GetItemCategory +.public GetItemCategoryVeneer +.public GetItemIdFromList +.public GetMaxPp +.public GetMoveMaxGinsengBoostGround +.public GetPartyMembers +.public GetPerformanceFlagWithChecks +.public GetRank +.public GetRankStorageSize +.public GetScenarioBalance +.public GetTeamMember +.public GetType +.public GINSENG_CHANCE_3 +.public GUMMI_STAT_BOOST +.public HasMonsterBeenAttackedInDungeons +.public InitBulkItem +.public IQ_GUMMI_GAIN_TABLE +.public IRON_STAT_BOOST +.public Is2TurnsMove +.public IsGummi +.public IsItemInTimeDarkness +.public IsItemValidVeneer +.public IsMonsterValid +.public IsStorableItem +.public IsThrownItem +.public IsTicketItem +.public IsTreasureBox +.public ItemZInit +.public KECLEON_SHOP_ITEM_TABLE_LISTS_1 +.public KECLEON_SHOP_ITEM_TABLE_LISTS_2 +.public LIFE_SEED_HP_BOOST +.public LoadFileFromRom +.public LoadScriptVariableValue +.public MemAlloc +.public MemFree +.public MemZero +.public OpenWaza +.public PROTEIN_STAT_BOOST +.public Rand16Bit +.public RandInt +.public RandIntSafe +.public RandRange +.public RECYCLE_SHOP_ITEM_LIST +.public RemoveEmptyItems +.public SaveScriptVariableValue +.public SelectWaza +.public SetItemAcquired +.public SetNbRecycled +.public SITRUS_BERRY_FULL_HP_BOOST +.public SortItemList +.public StringFromId .public sub_0200D1F0 .public sub_0200D8AC .public sub_0200EB90 @@ -116,4 +110,10 @@ .public sub_02055020 .public sub_02055054 .public sub_020582E0 +.public TYPE_SPECIFIC_EXCLUSIVE_ITEMS +.public UnloadFile .public vsprintf +.public WONDER_GUMMI_IQ_GAIN +.public WONDER_GUMMI_STAT_BOOST +.public ZINC_STAT_BOOST +.public ZInit8 diff --git a/asm/include/main_02013AD0.inc b/asm/include/main_02013AD0.inc index d196abe7..e5aa25a6 100644 --- a/asm/include/main_02013AD0.inc +++ b/asm/include/main_02013AD0.inc @@ -1,129 +1,4 @@ #pragma once -.public AUDIO_COMMANDS_BUFFER -.public ArrayCopy32 -.public ArrayFill32 -.public BagHasExclusiveItemTypeForMonster -.public CopyAndInterleave -.public CopyAndInterleave0 -.public CopyBitsFrom -.public CopyBitsTo -.public CopyStringFromId -.public DUNGEON_MOVE_TABLES -.public Debug_FatalError -.public Debug_GetDebugFlag -.public Debug_Print -.public Debug_Print0 -.public DirectoryFileMngr_GetDirectoryFileSize -.public DirectoryFileMngr_LoadDirectoryFile -.public DirectoryFileMngr_OpenDirectoryFile -.public DseBgm_IsPlaying -.public DseBgm_Load -.public DseBgm_SetFades -.public DseBgm_SetSignalCallback -.public DseBgm_Stop -.public DseBgm_Unload -.public DseDriver_ConfigureHeap -.public DseDriver_Init -.public DseDriver_LoadDefaultSettings -.public DseSe_GetUsedBankIDs -.public DseSe_HasPlayingInstances -.public DseSe_Load -.public DseSe_Play -.public DseSe_Stop -.public DseSe_StopAll -.public DseSe_Unload -.public DseSequence_GetParameter -.public DseSwd_IsBankLoading -.public DseSwd_LoadBank -.public DseSwd_LoadMainBank -.public DseSwd_LoadWaves -.public DseSwd_Unload -.public DungeonGoesUp -.public DungeonSwapIdxToId -.public ENTITIES -.public EnqueueRender3dTexture -.public FileClose -.public FileGetSize -.public FileRom_HandleOpen -.public FileRom_HandleRead -.public FileRom_InitDataTransfer -.public FileRom_StopDataTransfer -.public FileRom_Veneer_FileInit -.public G3i_LookAt_ -.public G3i_OrthoW_ -.public GXS_BeginLoadBGExtPltt -.public GXS_BeginLoadOBJExtPltt -.public GXS_EndLoadBGExtPltt -.public GXS_EndLoadOBJExtPltt -.public GX_BeginLoadBGExtPltt -.public GX_BeginLoadOBJExtPltt -.public GX_BeginLoadTex -.public GX_BeginLoadTexPltt -.public GX_EndLoadBGExtPltt -.public GX_EndLoadOBJExtPltt -.public GX_EndLoadTex -.public GX_EndLoadTexPltt -.public GX_LoadTex -.public GX_LoadTexPltt -.public GetAbility -.public GetAbilityString -.public GetActiveRosterIndex -.public GetActiveTeamMember -.public GetActorMatchingStorageId -.public GetCurrentBagCapacity -.public GetDsFirmwareUserSettingsVeneer -.public GetExecuteSpecialEpisodeType -.public GetGameMode -.public GetInfoMoveGround -.public GetIqSkillStringId -.public GetItemMoveId16 -.public GetItemNameFormatted -.public GetMainTeamName -.public GetMonsterGender -.public GetMonsterGenderVeneer -.public GetMoveName -.public GetNameString -.public GetNbFloors -.public GetNbFloorsPlusOne -.public GetPerformanceFlagWithChecks -.public GetStringFromFileVeneer -.public GetTeamMember -.public GetTypeStringId -.public IqSkillFlagTest -.public LANGUAGE_INFO_DATA -.public LoadFileFromRom -.public LoadScriptVariableValue -.public LoadScriptVariableValueAtIndex -.public LoadStringFile -.public MOVE_ACCURACY_STARS_TABLE -.public MOVE_POWER_STARS_TABLE -.public MemAlloc -.public MemArenaAlloc -.public MemFree -.public MemLocateSet -.public MemLocateUnset -.public MemZero -.public MemZero32 -.public Memcpy32 -.public MultiplyByFixedPoint -.public NewRender3dQuadrilateral -.public NewRender3dRectangle -.public NewRender3dTexture -.public NewRender3dTiling -.public PUNCH_MOVE_LIST -.public PointsToZero -.public RECOIL_MOVE_LIST -.public RENDER_3D -.public RENDER_3D_FUNCTIONS_64 -.public Rand16Bit -.public Render3dProcessQueue -.public ResumeBgm -.public Rgb8ToRgb5 -.public StringFromId -.public TEAM_MEMBER_TABLE_PTR -.public UnloadFile -.public WAN_TABLE -.public ZInit8 .public _02098EA8 .public _02098EE0 .public _02098F60 @@ -392,13 +267,134 @@ .public _022A5970 .public _s32_div_f .public _u32_div_f +.public ArrayCopy32 +.public ArrayFill32 +.public AUDIO_COMMANDS_BUFFER +.public BagHasExclusiveItemTypeForMonster +.public CopyAndInterleave +.public CopyAndInterleave0 +.public CopyBitsFrom +.public CopyBitsTo +.public CopyStringFromId +.public Debug_FatalError +.public Debug_GetDebugFlag +.public Debug_Print +.public Debug_Print0 +.public DirectoryFileMngr_GetDirectoryFileSize +.public DirectoryFileMngr_LoadDirectoryFile +.public DirectoryFileMngr_OpenDirectoryFile +.public DseBgm_IsPlaying +.public DseBgm_Load +.public DseBgm_SetFades +.public DseBgm_SetSignalCallback +.public DseBgm_Stop +.public DseBgm_Unload +.public DseDriver_ConfigureHeap +.public DseDriver_Init +.public DseDriver_LoadDefaultSettings +.public DseSe_GetUsedBankIDs +.public DseSe_HasPlayingInstances +.public DseSe_Load +.public DseSe_Play +.public DseSe_Stop +.public DseSe_StopAll +.public DseSe_Unload +.public DseSequence_GetParameter +.public DseSwd_IsBankLoading +.public DseSwd_LoadBank +.public DseSwd_LoadMainBank +.public DseSwd_LoadWaves +.public DseSwd_Unload +.public DUNGEON_MOVE_TABLES +.public DungeonGoesUp +.public DungeonSwapIdxToId +.public EnqueueRender3dTexture +.public ENTITIES +.public FileClose +.public FileGetSize +.public FileRom_HandleOpen +.public FileRom_HandleRead +.public FileRom_InitDataTransfer +.public FileRom_StopDataTransfer +.public FileRom_Veneer_FileInit +.public G3i_LookAt_ +.public G3i_OrthoW_ +.public GetAbility +.public GetAbilityString +.public GetActiveRosterIndex +.public GetActiveTeamMember +.public GetActorMatchingStorageId +.public GetCurrentBagCapacity +.public GetDsFirmwareUserSettingsVeneer +.public GetExecuteSpecialEpisodeType +.public GetGameMode +.public GetInfoMoveGround +.public GetIqSkillStringId +.public GetItemMoveId16 +.public GetItemNameFormatted +.public GetMainTeamName +.public GetMonsterGender +.public GetMonsterGenderVeneer +.public GetMoveName +.public GetNameString +.public GetNbFloors +.public GetNbFloorsPlusOne +.public GetPerformanceFlagWithChecks +.public GetStringFromFileVeneer +.public GetTeamMember +.public GetTypeStringId +.public GX_BeginLoadBGExtPltt +.public GX_BeginLoadOBJExtPltt +.public GX_BeginLoadTex +.public GX_BeginLoadTexPltt +.public GX_EndLoadBGExtPltt +.public GX_EndLoadOBJExtPltt +.public GX_EndLoadTex +.public GX_EndLoadTexPltt +.public GX_LoadTex +.public GX_LoadTexPltt +.public GXS_BeginLoadBGExtPltt +.public GXS_BeginLoadOBJExtPltt +.public GXS_EndLoadBGExtPltt +.public GXS_EndLoadOBJExtPltt +.public IqSkillFlagTest +.public LANGUAGE_INFO_DATA +.public LoadFileFromRom +.public LoadScriptVariableValue +.public LoadScriptVariableValueAtIndex +.public LoadStringFile +.public MemAlloc +.public MemArenaAlloc +.public Memcpy32 +.public MemFree +.public MemLocateSet +.public MemLocateUnset .public memset +.public MemZero +.public MemZero32 +.public MOVE_ACCURACY_STARS_TABLE +.public MOVE_POWER_STARS_TABLE +.public MultiplyByFixedPoint +.public NewRender3dQuadrilateral +.public NewRender3dRectangle +.public NewRender3dTexture +.public NewRender3dTiling .public ov10_022BDADC .public ov10_022C2528 +.public PointsToZero +.public PUNCH_MOVE_LIST +.public Rand16Bit +.public RECOIL_MOVE_LIST +.public Render3dProcessQueue +.public RENDER_3D +.public RENDER_3D_FUNCTIONS_64 +.public ResumeBgm +.public Rgb8ToRgb5 .public sprintf .public strcat .public strcmp .public strcpy +.public StringFromId .public strlen .public strncmp .public strstr @@ -478,4 +474,8 @@ .public sub_0207C9C4 .public sub_0207C9E4 .public sub_0207CC10 +.public TEAM_MEMBER_TABLE_PTR +.public UnloadFile .public vsprintf +.public WAN_TABLE +.public ZInit8 diff --git a/asm/include/main_02034974.inc b/asm/include/main_02034974.inc index ed960a43..46a3957f 100644 --- a/asm/include/main_02034974.inc +++ b/asm/include/main_02034974.inc @@ -443,6 +443,7 @@ .public IsLevelResetDungeon .public IsMainCharacter .public IsMoneyAllowed +.public IsMonsterIllegalForMissions .public IsMovesetValidInTimeDarkness .public IsNot2TurnsMoveOrSketch .public IsOptionsMenuActive @@ -718,7 +719,6 @@ .public sub_0205FC20 .public sub_0205FD88 .public sub_0205FE80 -.public sub_02062B64 .public sub_0206637C .public sub_02079094 .public sub_0207B9EC diff --git a/asm/include/main_02051098.inc b/asm/include/main_02051098.inc index 9a0fd48f..2a909eb0 100644 --- a/asm/include/main_02051098.inc +++ b/asm/include/main_02051098.inc @@ -1,32 +1,4 @@ #pragma once -.public ARM9_UNKNOWN_PTR__NA_20A2C84 -.public ARM9_UNKNOWN_TABLE__NA_20A20B0 -.public AllocateTemp1024ByteBufferFromPool -.public ArrayCopy32 -.public ArrayFill32 -.public BAG_CAPACITY_TABLE -.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES -.public CopyBitsFrom -.public CopyBitsTo -.public DUNGEON_RESTRICTIONS -.public DecompressAtNormalVeneer -.public DungeonFloorToGroupFloor -.public GetAtSize -.public GetBaseForm -.public GetItemIdFromList -.public GetNbFloorsPlusOne -.public LoadFileFromRom -.public LoadM2nAndN2m -.public MISSION_FLOORS_FORBIDDEN -.public MONSTER_SPRITE_DATA -.public MemAlloc -.public MemFree -.public MemZero -.public RANK_UP_TABLE -.public RandIntSafe -.public StringFromId -.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE -.public UnloadFile .public _020A0C68 .public _020A0C69 .public _020A0C6A @@ -46,9 +18,35 @@ .public _020AFF80 .public _020AFF88 .public _020B09B0 -.public MONSTER_DATA_TABLE_PTR .public _020B09C0 .public _s32_div_f +.public AllocateTemp1024ByteBufferFromPool +.public ARM9_UNKNOWN_PTR__NA_20A2C84 +.public ARM9_UNKNOWN_TABLE__NA_20A20B0 +.public ArrayCopy32 +.public ArrayFill32 +.public BAG_CAPACITY_TABLE +.public BAG_CAPACITY_TABLE_SPECIAL_EPISODES +.public CopyBitsFrom +.public CopyBitsTo +.public DecompressAtNormalVeneer +.public DUNGEON_RESTRICTIONS +.public DungeonFloorToGroupFloor +.public GetAtSize +.public GetBaseForm +.public GetItemIdFromList +.public GetNbFloorsPlusOne +.public LoadFileFromRom +.public LoadM2nAndN2m +.public MemAlloc +.public MemFree +.public MemZero +.public MISSION_FLOORS_FORBIDDEN +.public MONSTER_DATA_TABLE_PTR +.public MONSTER_SPRITE_DATA +.public RandIntSafe +.public RANK_UP_TABLE +.public StringFromId .public strncpy .public sub_0200302C .public sub_020030FC @@ -67,4 +65,6 @@ .public sub_0200B3C0 .public sub_0200B3D4 .public sub_0200B3FC +.public UnloadFile +.public UNOWN_SPECIES_ADDITIONAL_CHAR_PTR_TABLE .public vsprintf diff --git a/asm/include/main_02052890.inc b/asm/include/main_02052890.inc index ac6d9703..e57f2332 100644 --- a/asm/include/main_02052890.inc +++ b/asm/include/main_02052890.inc @@ -1,12 +1,30 @@ #pragma once +.public _020A1880 +.public _020A1884 +.public _020A189C +.public _020A18C0 +.public _020A3210 +.public _020A322C +.public _020A3248 +.public _020A3258 +.public _020A327C +.public _020A328C +.public _020A32D4 +.public _020A32F8 +.public _020A3330 +.public _020B09C8 +.public _020B09D0 +.public _020B12F4_EU +.public _020B1308_EU +.public _s32_div_f .public Debug_Print0 .public DecompressAtNormalVeneer .public DexNumbersEqual .public DirectoryFileMngr_OpenDirectoryFile .public DungeonToGroundMoveset .public EnableAllLearnableIqSkills -.public FORBIDDEN_FORGOT_MOVE_LIST .public FemaleToMaleForm +.public FORBIDDEN_FORGOT_MOVE_LIST .public GetDexNumber .public GetInfoGroundMoveset .public GetInfoMoveGround @@ -23,8 +41,8 @@ .public GetNbMoves .public GetSpriteSize .public GroundToDungeonMoveset -.public HIDDEN_POWER_BASE_POWER_TABLE .public HandleSir0Translation +.public HIDDEN_POWER_BASE_POWER_TABLE .public IsValidTeamMember .public ItemZInit .public LEVEL_UP_DATA_DECOMPRESS_BUFFER @@ -33,6 +51,7 @@ .public LoadMonsterMd .public MemAlloc .public MemFree +.public MONSTER_DATA_TABLE_PTR .public PointsToZero .public Rand16Bit .public RandIntSafe @@ -44,29 +63,6 @@ .public StrncmpSimple .public StrncpyName .public StrncpySimple -.public TEAM_MEMBER_TABLE -.public TEAM_MEMBER_TABLE_PTR -.public UnloadFile -.public ZInit8 -.public _020A1880 -.public _020A1884 -.public _020A189C -.public _020A18C0 -.public _020A3210 -.public _020A322C -.public _020A3248 -.public _020A3258 -.public _020A327C -.public _020A328C -.public _020A32D4 -.public _020A32F8 -.public _020A3330 -.public MONSTER_DATA_TABLE_PTR -.public _020B09C8 -.public _020B09D0 -.public _020B12F4_EU -.public _020B1308_EU -.public _s32_div_f .public sub_01FF8F28 .public sub_02015090 .public sub_02025304_JP @@ -80,4 +76,8 @@ .public sub_020560B8 .public sub_020564B0 .public sub_02056504 +.public TEAM_MEMBER_TABLE +.public TEAM_MEMBER_TABLE_PTR +.public UnloadFile .public vsprintf +.public ZInit8 diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 9673c807..ad4be75e 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -84,6 +84,7 @@ .public IsControlsChartActive .public IsDialogueBoxActive .public IsItemInTimeDarkness +.public IsMonsterIllegalForMissions .public IsMovesetValid .public IsParentMenuActive .public IsSimpleMenuActive @@ -370,7 +371,6 @@ .public sub_0205B77C .public sub_0205B80C .public sub_0205BBA4 -.public sub_02062B64 .public sub_0207A2A4 .public sub_020851AC .public UpdateWindow diff --git a/asm/include/overlay_03_0233CA98.inc b/asm/include/overlay_03_0233CA98.inc index 5db7a45a..3ee3607b 100644 --- a/asm/include/overlay_03_0233CA98.inc +++ b/asm/include/overlay_03_0233CA98.inc @@ -38,6 +38,7 @@ .public IsAdvancedTextBoxActive .public IsItemInTimeDarkness .public IsItemValidVeneer +.public IsMonsterIllegalForMissions .public IsRecruitingAllowed .public IsScrollBoxActive .public ItemZInit @@ -277,7 +278,6 @@ .public sub_0205BD78 .public sub_0205BD90 .public sub_0205C700 -.public sub_02062B64 .public sub_02062E34 .public sub_020630A4 .public sub_0206351C diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc index 6d8f8fbd..e7745242 100644 --- a/asm/include/overlay_05.inc +++ b/asm/include/overlay_05.inc @@ -17,6 +17,7 @@ .public GetTeamMember .public InitPreprocessorArgs .public IsAdvancedMenuActive2 +.public IsMonsterIllegalForMissions .public IsMovesetValid .public MemAlloc .public MemFree @@ -106,5 +107,4 @@ .public sub_020590C0 .public sub_020590DC .public sub_0205BD78 -.public sub_02062B64 .public UpdateWindow diff --git a/asm/include/overlay_29_022E37DC.inc b/asm/include/overlay_29_022E37DC.inc index 98dac40e..566b6541 100644 --- a/asm/include/overlay_29_022E37DC.inc +++ b/asm/include/overlay_29_022E37DC.inc @@ -120,7 +120,7 @@ .public ov29_023515CC .public ov29_023515E8 .public ov29_023515F4 -.public ov29_02351604 +.public POSITION_DISPLACEMENT_TO_DIRECTION .public ov29_0235352C .public ov29_0235354C .public ov29_02353558 diff --git a/asm/include/overlay_29_022EAB50.inc b/asm/include/overlay_29_022EAB50.inc index bfc53255..bd42ff8a 100644 --- a/asm/include/overlay_29_022EAB50.inc +++ b/asm/include/overlay_29_022EAB50.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public AbilityIsActiveVeneer .public AdvanceFrame .public DUNGEON_PRNG_STATE @@ -11,16 +12,8 @@ .public IqSkillIsEnabled .public IsCurrentFixedRoomBossFight .public LogMessageByIdWithPopupCheckUserTarget -.public MUSIC_ID_TABLE .public MoveMonsterToPos -.public PlayBgmByIdVeneer -.public PlayBgmByIdVolumeVeneer -.public RANDOM_MUSIC_ID_TABLE -.public RoundUpDiv256 -.public StringFromId -.public SubstitutePlaceholderStringTags -.public UpdateEntityPixelPos -.public _s32_div_f +.public MUSIC_ID_TABLE .public ov29_022E555C .public ov29_02321260 .public ov29_023516E8 @@ -29,7 +22,12 @@ .public ov29_02352070 .public ov29_0237C91C .public ov29_0237C91E +.public PlayBgmByIdVeneer +.public PlayBgmByIdVolumeVeneer +.public RANDOM_MUSIC_ID_TABLE +.public RoundUpDiv256 .public strcmp +.public StringFromId .public sub_0200D208 .public sub_02017ACC .public sub_02017B18 @@ -39,3 +37,5 @@ .public sub_02017C68 .public sub_02017C74 .public sub_02017D80 +.public SubstitutePlaceholderStringTags +.public UpdateEntityPixelPos diff --git a/asm/include/overlay_29_022EB41C.inc b/asm/include/overlay_29_022EB41C.inc index cd0ef5a9..cea369db 100644 --- a/asm/include/overlay_29_022EB41C.inc +++ b/asm/include/overlay_29_022EB41C.inc @@ -1,10 +1,11 @@ #pragma once +.public abs .public AdvanceFrame .public CalcSpeedStageWrapper .public ChangeLeader -.public DUNGEON_PTR .public DecrementWindCounter .public DisplayActions +.public DUNGEON_PTR .public EnemyEvolution .public EntityIsValid__022EC608 .public ExecuteMonsterAction @@ -16,27 +17,10 @@ .public GetItemInfo .public GetLeader .public GetTile -.public ITEM_CATEGORY_ACTIONS .public IsFloorOver .public IsHM +.public ITEM_CATEGORY_ACTIONS .public ItemZInit -.public RemoveEmptyItemsInBagWrapper -.public RemoveEquivItemNoHole -.public RemoveGroundItem -.public RemoveItem -.public RunMonsterAi -.public SetItemAcquired -.public SetLeaderAction -.public SetMonsterActionFields -.public ShouldDisplayEntityWrapper -.public SpawnItem -.public TickStatusAndHealthRegen -.public TryActivateArtificialWeatherAbilities -.public TryActivateWeather -.public TryForcedLoss -.public TryRestoreRoostTyping -.public TrySpawnMonsterAndActivatePlusMinus -.public abs .public ov29_022E81F8 .public ov29_022EF9C8 .public ov29_0230FC24 @@ -50,4 +34,20 @@ .public ov29_0237C920 .public ov29_0237C922 .public ov29_0237C96C +.public RemoveEmptyItemsInBagWrapper +.public RemoveEquivItemNoHole +.public RemoveGroundItem +.public RemoveItem +.public RunMonsterAi +.public SetItemAcquired +.public SetLeaderAction +.public SetMonsterActionFields +.public ShouldDisplayEntityWrapper +.public SpawnItem .public sub_01FFBDF4 +.public TickStatusAndHealthRegen +.public TryActivateArtificialWeatherAbilities +.public TryActivateWeather +.public TryForcedLoss +.public TryRestoreRoostTyping +.public TrySpawnMonsterAndActivatePlusMinus diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc index a2a0f1ad..0ea5e688 100644 --- a/asm/include/overlay_29_022F05B4.inc +++ b/asm/include/overlay_29_022F05B4.inc @@ -80,8 +80,6 @@ .public ov29_022E0DF0 .public ov29_022E28D4 .public ov29_022E2CA0 -.public ov29_022E3DD8 -.public ov29_022E3E24 .public ov29_022E8104 .public ov29_022E81F8 .public ov29_022EA370 @@ -163,6 +161,8 @@ .public ov29_0237C6A4 .public ov29_0237C9A4 .public ov29_0237CFBB +.public PlayExclamationPointEffect__022E47D4 +.public PlayQuestionMarkEffect .public PlaySeVolumeWrapper .public PointCameraToMonster .public PositionHasMonster diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc index e863e2c3..71a9164d 100644 --- a/asm/include/overlay_29_022F7388.inc +++ b/asm/include/overlay_29_022F7388.inc @@ -93,6 +93,7 @@ .public PopulateActiveMonsterPtrs .public RemoveHolderForItemInBag .public ReplaceWanFromBinFile +.public RevertGiratinaAndShaymin .public SetForcedLossReason .public SetMissionTargetEnemyDefeated .public ShouldMonsterRunAway @@ -102,7 +103,6 @@ .public sub_02056228 .public sub_020566C4 .public sub_020585B4 -.public sub_02058674 .public SubstitutePlaceholderStringTags .public TEAM_MEMBER_TABLE_PTR .public TryEndStatusWithAbility diff --git a/asm/include/overlay_29_02300108.inc b/asm/include/overlay_29_02300108.inc index 388c2858..7cbd4f92 100644 --- a/asm/include/overlay_29_02300108.inc +++ b/asm/include/overlay_29_02300108.inc @@ -6,11 +6,11 @@ .public GetName .public GetNameRaw .public GetNameWithGender -.public StringFromId .public ov29_0234B0B4 .public ov29_023527C0 .public ov29_023527D0 .public strcpy +.public StringFromId .public sub_02024FB8 .public sub_02056084 .public sub_02058534 diff --git a/asm/include/overlay_29_023007A8.inc b/asm/include/overlay_29_023007A8.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_29_023007A8.inc +++ b/asm/include/overlay_29_023007A8.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_29_0230F9A4.inc b/asm/include/overlay_29_0230F9A4.inc index 015fdd98..dc2d56bc 100644 --- a/asm/include/overlay_29_0230F9A4.inc +++ b/asm/include/overlay_29_0230F9A4.inc @@ -57,7 +57,6 @@ .public ov10_022C4BE4 .public ov10_022C4FC4 .public ov29_022E34A8_EU -.public ov29_022E42E8 .public ov29_022E53F0 .public ov29_022E543C .public ov29_022EA370 @@ -77,6 +76,7 @@ .public ov29_0234B084 .public ov29_0234B294 .public ov29_023529A8 +.public PlayEffectAnimationEntityStandard .public POISON_DAMAGE .public POISON_DAMAGE_COOLDOWN .public SpawnDroppedItemWrapper diff --git a/asm/include/overlay_29_02311C28.inc b/asm/include/overlay_29_02311C28.inc index 89c17633..ed1796be 100644 --- a/asm/include/overlay_29_02311C28.inc +++ b/asm/include/overlay_29_02311C28.inc @@ -71,7 +71,6 @@ .public ov29_022E51B0 .public ov29_022E5258 .public ov29_022E52F8 -.public ov29_022E539C .public ov29_022E53EC .public ov29_022E543C .public ov29_022E60E4 @@ -84,6 +83,7 @@ .public ov29_0234B084 .public ov29_0234B0B4 .public ov29_02353318 +.public PlayExclamationPointEffect__022E5D4C .public SafeguardIsActive .public SECONDARY_TERRAIN_TYPES .public SPEED_BOOST_TURN_RANGE diff --git a/asm/include/overlay_29_0231A7A0.inc b/asm/include/overlay_29_0231A7A0.inc index 94c5a220..3e74e41f 100644 --- a/asm/include/overlay_29_0231A7A0.inc +++ b/asm/include/overlay_29_0231A7A0.inc @@ -10,9 +10,9 @@ .public IsMonster__0231A9D4 .public LogMessageByIdWithPopupCheckUser .public ov10_022C459C -.public ov29_022E3ED0 .public ov29_022FA574 .public ov29_0232145C +.public PlayExclamationPointEffect__022E4880 .public SubstitutePlaceholderStringTags .public TryActivateTruant .public UpdateMovePp diff --git a/asm/include/overlay_29_0231EA04.inc b/asm/include/overlay_29_0231EA04.inc index 4b20431b..70aa698f 100644 --- a/asm/include/overlay_29_0231EA04.inc +++ b/asm/include/overlay_29_0231EA04.inc @@ -1,7 +1,7 @@ #pragma once -.public DUNGEON_PTR .public DetermineAllMonsterShadow .public DetermineTileWalkableNeighbors +.public DUNGEON_PTR .public EnsureCanStandCurrentTile .public EntityIsValid__0231EDD8 .public GetMoveCategory @@ -10,9 +10,6 @@ .public InitMove .public IsFullFloorFixedRoom .public LogMessageByIdWithPopupCheckUser -.public StairsAlwaysReachable -.public UpdateMinimap -.public UpdateTrapsVisibility .public ov29_022E0378 .public ov29_022EA370 .public ov29_022F9C74 @@ -20,3 +17,6 @@ .public ov29_0233665C .public ov29_0233785C .public ov29_0233FB1C +.public StairsAlwaysReachable +.public UpdateMinimap +.public UpdateTrapsVisibility diff --git a/asm/main_02034974.s b/asm/main_02034974.s index f5d4267c..7ab3ea0d 100644 --- a/asm/main_02034974.s +++ b/asm/main_02034974.s @@ -11367,7 +11367,7 @@ _0203D6E4: ldr r0, _0203E4B0 ; =_020AFE74 ldr r0, [r0] ldrsh r0, [r0, #0x38] - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 beq _0203D73C _0203D718: diff --git a/asm/main_02054C24.s b/asm/main_02054C24.s index 38460224..ee393848 100644 --- a/asm/main_02054C24.s +++ b/asm/main_02054C24.s @@ -4630,7 +4630,7 @@ sub_02058644: ; 0x02058644 _02058650: mov r0, r4 mov r1, r5 - bl sub_02058674 + bl RevertGiratinaAndShaymin add r0, r4, #1 mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 @@ -4639,8 +4639,8 @@ _02058650: ldmia sp!, {r3, r4, r5, pc} arm_func_end sub_02058644 - arm_func_start sub_02058674 -sub_02058674: ; 0x02058674 + arm_func_start RevertGiratinaAndShaymin +RevertGiratinaAndShaymin: ; 0x02058674 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -4674,7 +4674,7 @@ _020586C8: .align 2, 0 _020586E8: .word 0x00000211 _020586EC: .word 0x00000217 - arm_func_end sub_02058674 + arm_func_end RevertGiratinaAndShaymin arm_func_start sub_020586F0 sub_020586F0: ; 0x020586F0 diff --git a/asm/main_02058F24.s b/asm/main_02058F24.s index 31b1ef5f..008ec01c 100644 --- a/asm/main_02058F24.s +++ b/asm/main_02058F24.s @@ -4665,7 +4665,7 @@ _0205CDB8: ldmia sp!, {r3, r4, r5, pc} _0205CDD4: ldrsh r0, [r4, #0x18] - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 beq _0205CDF8 ldrsh r1, [r4, #0x18] @@ -4717,7 +4717,7 @@ _0205CE68: mov r0, #0 ldmia sp!, {r3, r4, r5, pc} _0205CE90: - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 beq _0205CEB0 ldrsh r1, [r4, #0x1c] @@ -4858,7 +4858,7 @@ _0205D050: ldmia sp!, {r4, r5, r6, pc} _0205D074: mov r0, r5 - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 beq _0205D098 ldr r0, _0205D114 ; =_020A3A6C @@ -11849,8 +11849,8 @@ _02062B58: _02062B60: .word MISSION_BANNED_STORY_MONSTERS arm_func_end IsMonsterMissionAllowedStory - arm_func_start sub_02062B64 -sub_02062B64: ; 0x02062B64 + arm_func_start IsMonsterIllegalForMissions +IsMonsterIllegalForMissions: ; 0x02062B64 stmdb sp!, {r4, lr} mov r4, r0 bl IsMonsterValid @@ -11876,7 +11876,7 @@ _02062BA8: .align 2, 0 _02062BB0: .word 0x00000217 _02062BB4: .word 0x00000117 - arm_func_end sub_02062B64 + arm_func_end IsMonsterIllegalForMissions arm_func_start CanDungeonBeUsedForMission CanDungeonBeUsedForMission: ; 0x02062BB8 diff --git a/asm/overlay_00.s b/asm/overlay_00.s index 16b87c84..50b5c78c 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -2334,7 +2334,7 @@ _022BE1E8: beq _022BE304 cmp r0, #2 bne _022BE234 - bl ov00_022BE918 + bl SelectRandomBackground cmp sl, #1 bne _022BE224 mov r0, #0 @@ -2920,8 +2920,8 @@ _022BE910: .word ov00_023187F0 _022BE914: .word ov00_023187F4 arm_func_end ov00_022BE8D0 - arm_func_start ov00_022BE918 -ov00_022BE918: ; 0x022BE918 + arm_func_start SelectRandomBackground +SelectRandomBackground: ; 0x022BE918 stmdb sp!, {r3, lr} sub sp, sp, #8 mov r0, #7 @@ -2942,7 +2942,7 @@ ov00_022BE918: ; 0x022BE918 .align 2, 0 _022BE95C: .word ov00_023187F0 _022BE960: .word ov00_023187F4 - arm_func_end ov00_022BE918 + arm_func_end SelectRandomBackground arm_func_start ov00_022BE964 ov00_022BE964: ; 0x022BE964 diff --git a/asm/overlay_01.s b/asm/overlay_01.s index 0eb1edec..9e31d8c1 100644 --- a/asm/overlay_01.s +++ b/asm/overlay_01.s @@ -5553,7 +5553,7 @@ _0232DAFC: mov r2, r5 bl ov01_0232E334 ldrsh r0, [r8, #4] - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 bne _0232DB68 add r0, r8, #0x22 diff --git a/asm/overlay_03_0233CA98.s b/asm/overlay_03_0233CA98.s index 1c148f9b..6fd51cca 100644 --- a/asm/overlay_03_0233CA98.s +++ b/asm/overlay_03_0233CA98.s @@ -4585,7 +4585,7 @@ _0234087C: cmp r0, #0 beq _023408D8 ldrsh r0, [r4, #0xd0] - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 bne _023408D0 ldrb r0, [r4, #0xc6] @@ -6149,7 +6149,7 @@ _02341DC4: beq _02341EA0 add r0, r2, #0x1600 ldrsh r0, [r0, #0x1c] - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 bne _02341E80 mov r0, r4 @@ -6483,7 +6483,7 @@ _02342284: beq _02342378 add r0, r1, #0x1600 ldrsh r0, [r0, #0x1c] - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 bne _02342364 ldr r1, _02341D00 ; =ov03_02346BC8 @@ -7092,7 +7092,7 @@ _02342B68: beq _02342C44 add r0, r1, #0x1600 ldrsh r0, [r0, #0x1c] - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 bne _02342C30 ldr r0, _02341D00 ; =ov03_02346BC8 diff --git a/asm/overlay_05.s b/asm/overlay_05.s index ffb5af88..d9acb46c 100644 --- a/asm/overlay_05.s +++ b/asm/overlay_05.s @@ -1260,7 +1260,7 @@ _0233DA9C: mul sl, r6, sb add r7, r5, sl ldrsh r0, [r7, #0x20] - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 bne _0233DAF4 ldrsh r0, [r7, #0x20] @@ -2490,7 +2490,7 @@ _0233EC14: beq _0233EC8C ldrsh r0, [sl, #0x20] add r8, r8, #1 - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 bne _0233EC88 ldrsh r0, [sl, #0x20] @@ -2765,7 +2765,7 @@ _0233F01C: beq _0233F094 ldrsh r0, [sl, #0x20] add r7, r7, #1 - bl sub_02062B64 + bl IsMonsterIllegalForMissions cmp r0, #0 bne _0233F090 ldrsh r0, [sl, #0x20] diff --git a/asm/overlay_29_022E37DC.s b/asm/overlay_29_022E37DC.s index ae99687d..e3a56fb1 100644 --- a/asm/overlay_29_022E37DC.s +++ b/asm/overlay_29_022E37DC.s @@ -459,8 +459,8 @@ _022E3DD0: .word 0x000003E7 _022E3DD4: .word DUNGEON_PTR arm_func_end UpdateStatusIconFlags - arm_func_start ov29_022E3DD8 -ov29_022E3DD8: ; 0x022E3DD8 + arm_func_start PlayQuestionMarkEffect +PlayQuestionMarkEffect: ; 0x022E3DD8 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -480,10 +480,10 @@ ov29_022E3DD8: ; 0x022E3DD8 bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r4, pc} - arm_func_end ov29_022E3DD8 + arm_func_end PlayQuestionMarkEffect - arm_func_start ov29_022E3E24 -ov29_022E3E24: ; 0x022E3E24 + arm_func_start PlayExclamationPointEffect__022E47D4 +PlayExclamationPointEffect__022E47D4: ; 0x022E3E24 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -505,7 +505,7 @@ ov29_022E3E24: ; 0x022E3E24 ldmia sp!, {r4, pc} .align 2, 0 _022E3E70: .word 0x00000143 - arm_func_end ov29_022E3E24 + arm_func_end PlayExclamationPointEffect__022E47D4 arm_func_start ov29_022E3E74 ov29_022E3E74: ; 0x022E3E74 @@ -535,8 +535,8 @@ ov29_022E3E74: ; 0x022E3E74 _022E3ECC: .word 0x0000030E arm_func_end ov29_022E3E74 - arm_func_start ov29_022E3ED0 -ov29_022E3ED0: ; 0x022E3ED0 + arm_func_start PlayExclamationPointEffect__022E4880 +PlayExclamationPointEffect__022E4880: ; 0x022E3ED0 stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -558,7 +558,7 @@ ov29_022E3ED0: ; 0x022E3ED0 ldmia sp!, {r4, pc} .align 2, 0 _022E3F1C: .word 0x00000143 - arm_func_end ov29_022E3ED0 + arm_func_end PlayExclamationPointEffect__022E4880 arm_func_start ov29_022E3F20 ov29_022E3F20: ; 0x022E3F20 @@ -926,8 +926,8 @@ ov29_022E42E4: ; 0x022E42E4 bx lr arm_func_end ov29_022E42E4 - arm_func_start ov29_022E42E8 -ov29_022E42E8: ; 0x022E42E8 + arm_func_start PlayEffectAnimationEntityStandard +PlayEffectAnimationEntityStandard: ; 0x022E42E8 stmdb sp!, {r3, r4, r5, lr} sub sp, sp, #0x10 mov r4, r1 @@ -948,7 +948,7 @@ ov29_022E42E8: ; 0x022E42E8 bl PlayEffectAnimationEntity add sp, sp, #0x10 ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_022E42E8 + arm_func_end PlayEffectAnimationEntityStandard arm_func_start ov29_022E4338 ov29_022E4338: ; 0x022E4338 @@ -2307,8 +2307,8 @@ _022E5388: _022E5398: .word 0x0000018D arm_func_end ov29_022E52F8 - arm_func_start ov29_022E539C -ov29_022E539C: ; 0x022E539C + arm_func_start PlayExclamationPointEffect__022E5D4C +PlayExclamationPointEffect__022E5D4C: ; 0x022E539C stmdb sp!, {r4, lr} sub sp, sp, #0x10 mov r4, r0 @@ -2330,7 +2330,7 @@ ov29_022E539C: ; 0x022E539C ldmia sp!, {r4, pc} .align 2, 0 _022E53E8: .word 0x00000143 - arm_func_end ov29_022E539C + arm_func_end PlayExclamationPointEffect__022E5D4C arm_func_start ov29_022E53EC ov29_022E53EC: ; 0x022E53EC @@ -7271,7 +7271,7 @@ GetDirectionTowardsPosition: ; 0x022E9020 mvn r0, #0 cmp r2, r0 movle r2, r0 - ldr r1, _022E9088 ; =ov29_02351604 + ldr r1, _022E9088 ; =POSITION_DISPLACEMENT_TO_DIRECTION add r2, r2, #1 mov r0, #0xc mla r0, r2, r0, r1 @@ -7279,7 +7279,7 @@ GetDirectionTowardsPosition: ; 0x022E9020 ldr r0, [r0, r1, lsl #2] bx lr .align 2, 0 -_022E9088: .word ov29_02351604 +_022E9088: .word POSITION_DISPLACEMENT_TO_DIRECTION arm_func_end GetDirectionTowardsPosition arm_func_start GetChebyshevDistance diff --git a/asm/overlay_29_022F05B4.s b/asm/overlay_29_022F05B4.s index a71a3918..1dbae5c9 100644 --- a/asm/overlay_29_022F05B4.s +++ b/asm/overlay_29_022F05B4.s @@ -3811,9 +3811,9 @@ _022F3A6C: bl ov29_022E8104 bl ov29_022E81F8 mov r0, fp - bl ov29_022E3DD8 + bl PlayQuestionMarkEffect bl GetLeader - bl ov29_022E3E24 + bl PlayExclamationPointEffect__022E47D4 mov r0, #0 mov r1, r6 mov r2, r0 diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s index e44b3e5b..e9953daf 100644 --- a/asm/overlay_29_022F7388.s +++ b/asm/overlay_29_022F7388.s @@ -1434,7 +1434,7 @@ _022F8330: ldrsh r0, [r5, #0xc] #endif mvn r1, #0 - bl sub_02058674 + bl RevertGiratinaAndShaymin ldrsh r0, [r4, #8] mov r1, r4 bl sub_0205349C @@ -1536,7 +1536,7 @@ _022F84AC: beq _022F8528 ldrsh r0, [r7, #0xc] mvn r1, #0 - bl sub_02058674 + bl RevertGiratinaAndShaymin ldrsh r0, [r4, #8] mov r1, r4 bl sub_0205349C diff --git a/asm/overlay_29_0230F9A4.s b/asm/overlay_29_0230F9A4.s index 2e81daf9..00ff9483 100644 --- a/asm/overlay_29_0230F9A4.s +++ b/asm/overlay_29_0230F9A4.s @@ -1110,7 +1110,7 @@ _0231092C: bl ov29_02307BDC ldr r1, [r4, #0xc8] mov r0, r5 - bl ov29_022E42E8 + bl PlayEffectAnimationEntityStandard ldr r1, _02310AD4 ; =ov10_022C446C mov r0, r5 ldrsh r1, [r1] diff --git a/asm/overlay_29_02311C28.s b/asm/overlay_29_02311C28.s index 5e218948..a121d4cf 100644 --- a/asm/overlay_29_02311C28.s +++ b/asm/overlay_29_02311C28.s @@ -3103,7 +3103,7 @@ _02314498: add r1, r0, #1 mov r0, r6 strb r1, [r4, #0xd1] - bl ov29_022E539C + bl PlayExclamationPointEffect__022E5D4C ldr r2, _0231453C ; =0x00000D02 mov r0, r7 mov r1, r6 diff --git a/asm/overlay_29_0231A7A0.s b/asm/overlay_29_0231A7A0.s index bf0eb1c9..83887bd4 100644 --- a/asm/overlay_29_0231A7A0.s +++ b/asm/overlay_29_0231A7A0.s @@ -27,7 +27,7 @@ ShouldUsePp: ; 0x0231A7A0 cmp r0, #0 beq _0231A81C mov r0, r7 - bl ov29_022E3ED0 + bl PlayExclamationPointEffect__022E4880 mov r0, #0 mov r1, r7 mov r2, r0 @@ -47,7 +47,7 @@ _0231A81C: cmp r0, #0 beq _0231A868 mov r0, r7 - bl ov29_022E3ED0 + bl PlayExclamationPointEffect__022E4880 mov r0, #0 mov r1, r7 mov r2, r0 diff --git a/asm/overlay_29_rodata_0234FD04.s b/asm/overlay_29_rodata_0234FD04.s index 3dcabada..516c066e 100644 --- a/asm/overlay_29_rodata_0234FD04.s +++ b/asm/overlay_29_rodata_0234FD04.s @@ -1695,8 +1695,8 @@ ov29_023515E8: ov29_023515F4: .byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x1C, 0x14 .byte 0x01, 0xFD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .global ov29_02351604 -ov29_02351604: + .global POSITION_DISPLACEMENT_TO_DIRECTION +POSITION_DISPLACEMENT_TO_DIRECTION: .byte 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 .byte 0x03, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00 .byte 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00