diff --git a/asm/include/main_02013884.inc b/asm/include/main_02013884.inc index 6fb85d9b..17e25973 100644 --- a/asm/include/main_02013884.inc +++ b/asm/include/main_02013884.inc @@ -1,3 +1,3 @@ #pragma once -.public DUNGEON_MOVE_TABLES .public _02098D64 +.public DUNGEON_MOVE_TABLES diff --git a/asm/include/main_02013C30.inc b/asm/include/main_02013C30.inc index eb21f1a8..05de82cc 100644 --- a/asm/include/main_02013C30.inc +++ b/asm/include/main_02013C30.inc @@ -1,10 +1,10 @@ #pragma once +.public _s32_div_f .public CopyBitsFrom .public CopyBitsTo .public DUNGEON_MOVE_TABLES .public GetInfoMoveGround -.public RECOIL_MOVE_LIST -.public Rand16Bit -.public StringFromId -.public _s32_div_f .public memset +.public Rand16Bit +.public RECOIL_MOVE_LIST +.public StringFromId diff --git a/asm/include/main_02014D18.inc b/asm/include/main_02014D18.inc index 509c29e8..7766d7af 100644 --- a/asm/include/main_02014D18.inc +++ b/asm/include/main_02014D18.inc @@ -1,129 +1,4 @@ #pragma once -.public AUDIO_COMMANDS_BUFFER -.public ArrayCopy32 -.public ArrayFill32 -.public BagHasExclusiveItemTypeForMonster -.public CopyAndInterleave -.public CopyAndInterleave0 -.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 GetIqSkillStringId -.public GetItemMoveId16 -.public GetItemNameFormatted -.public GetMainTeamName -.public GetMonsterGender -.public GetMonsterGenderVeneer -.public GetMoveActualAccuracy -.public GetMoveBasePowerFromId -.public GetMoveName -.public GetNameString -.public GetNbFloors -.public GetNbFloorsPlusOne -.public GetPerformanceFlagWithChecks -.public GetStringFromFileVeneer -.public GetTeamMember -.public GetTypeStringId -.public IqSkillFlagTest -.public Is2TurnsMove -.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 RENDER_3D -.public RENDER_3D_FUNCTIONS_64 -.public Rand16Bit -.public Render3dProcessQueue -.public ResumeBgm -.public Rgb8ToRgb5 -.public StringFromId -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public UnloadFile -.public WAN_TABLE -.public ZInit8 .public _02098EA8 .public _02098EE0 .public _02098F60 @@ -387,14 +262,135 @@ .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 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 GetIqSkillStringId +.public GetItemMoveId16 +.public GetItemNameFormatted +.public GetMainTeamName +.public GetMonsterGender +.public GetMonsterGenderVeneer +.public GetMoveActualAccuracy +.public GetMoveBasePowerFromId +.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 Is2TurnsMove +.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 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 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 StrncpySimpleNoPadSafe .public strstr .public sub_01FF8F04 .public sub_02002778 @@ -472,4 +468,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_0204B018.inc b/asm/include/main_0204B018.inc index 997a4daa..309ca8ef 100644 --- a/asm/include/main_0204B018.inc +++ b/asm/include/main_0204B018.inc @@ -1,44 +1,4 @@ #pragma once -.public ARM9_UNKNOWN_TABLE__NA_209E164 -.public AddMoneyCarried -.public CopyBitsFrom -.public CopyBitsTo -.public DEBUG_SPECIAL_EPISODE_NUMBER -.public Debug_FatalError -.public Debug_Print -.public Debug_Print0 -.public FemaleToMaleForm -.public FileClose -.public FileRom_HandleOpen -.public FileRom_HandleRead -.public FileRom_HandleSeek -.public FileRom_InitDataTransfer -.public FileRom_StopDataTransfer -.public FileRom_Veneer_FileInit -.public GAME_MODE -.public GLOBAL_PROGRESS_PTR -.public GetDexNumber -.public GetGameMode -.public GetLanguageType -.public GetMoneyCarried -.public GetMoneyStored -.public GetNotifyNote -.public GetPartyMembers -.public KAOMADO_FILEPATH -.public KAOMADO_STREAM -.public MemAlloc -.public MemZero -.public MemcpySimple -.public PORTRAIT_LAYOUTS -.public RandInt -.public SCRIPT_VARS -.public SCRIPT_VARS_LOCALS -.public SCRIPT_VARS_VALUES -.public SetAdventureLogCompleted -.public SetMoneyCarried -.public SetMoneyStored -.public SetNotifyNote -.public VERSION_EXCLUSIVE_MONSTERS .public _0209CEAC .public _0209CF0C .public _0209CF28 @@ -53,6 +13,46 @@ .public _0209E010 .public _0209E011 .public _s32_div_f +.public AddMoneyCarried +.public ARM9_UNKNOWN_TABLE__NA_209E164 +.public CopyBitsFrom +.public CopyBitsTo +.public Debug_FatalError +.public Debug_Print +.public Debug_Print0 +.public DEBUG_SPECIAL_EPISODE_NUMBER +.public FemaleToMaleForm +.public FileClose +.public FileRom_HandleOpen +.public FileRom_HandleRead +.public FileRom_HandleSeek +.public FileRom_InitDataTransfer +.public FileRom_StopDataTransfer +.public FileRom_Veneer_FileInit +.public GAME_MODE +.public GetDexNumber +.public GetGameMode +.public GetLanguageType +.public GetMoneyCarried +.public GetMoneyStored +.public GetNotifyNote +.public GetPartyMembers +.public GLOBAL_PROGRESS_PTR +.public KAOMADO_FILEPATH +.public KAOMADO_STREAM +.public MemAlloc +.public MemcpySimple +.public MemZero +.public PORTRAIT_LAYOUTS +.public RandInt +.public SCRIPT_VARS +.public SCRIPT_VARS_LOCALS +.public SCRIPT_VARS_VALUES +.public SetAdventureLogCompleted +.public SetMoneyCarried +.public SetMoneyStored +.public SetNotifyNote .public sub_02050974 .public sub_02050990 .public sub_020509BC +.public VERSION_EXCLUSIVE_MONSTERS diff --git a/asm/include/main_0204DB08.inc b/asm/include/main_0204DB08.inc index fb0b128a..59785417 100644 --- a/asm/include/main_0204DB08.inc +++ b/asm/include/main_0204DB08.inc @@ -2,7 +2,6 @@ .public ARM9_UNKNOWN_TABLE__NA_209E12C .public CopyBitsFrom .public MemcpySimple -.public WONDER_MAIL_BITS_MAP .public sub_0204DA2C .public sub_0204E02C .public sub_0204E0A0 @@ -11,3 +10,4 @@ .public sub_020509BC .public sub_0205C2A4 .public sub_0205C548 +.public WONDER_MAIL_BITS_MAP diff --git a/asm/include/main_0204DE7C.inc b/asm/include/main_0204DE7C.inc index 78868e9b..a63c3261 100644 --- a/asm/include/main_0204DE7C.inc +++ b/asm/include/main_0204DE7C.inc @@ -1,60 +1,4 @@ #pragma once -.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS -.public ADVENTURE_LOG_PTR -.public ARM9_UNKNOWN_DATA__NA_209E6BC -.public ARM9_UNKNOWN_TABLE__NA_209E280 -.public ApplyLevelUpBoostsToGroundMonster -.public CLIENT_LEVEL_TABLE -.public Copy16BitsFrom -.public CopyNStringFromId -.public DUNGEON_DATA_LIST -.public Debug_Print0 -.public DungeonSwapIdToIdx -.public DungeonSwapIdxToId -.public GUEST_MONSTER_DATA -.public GetBaseFormCastformCherrimDeoxys -.public GetBodySize -.public GetDexNumberVeneer -.public GetDungeonMode -.public GetDungeonModeSpecial -.public GetGameMode -.public GetMaxItemsAllowed -.public GetMaxMembersAllowed -.public GetMaxReachedFloor -.public GetMoneyCarried -.public GetNameString -.public GetNbItemsInBag -.public GetPartyMembers -.public GetPerformanceFlagWithChecks -.public GetRankUpEntry -.public GetSosMailCount -.public GetStringFromFileVeneer -.public GuestMonsterToGroundMonster -.public IsItemValidVeneer -.public IsLevelResetDungeon -.public IsMoneyAllowed -.public IsRealMove -.public IsRecruitingAllowed -.public LoadScriptVariableValue -.public LoadScriptVariableValueAtIndex -.public MISSION_FLOOR_RANKS_PTRS -.public MemZero -.public MemcpySimple -.public NormalizeTreasureBox -.public OUTLAW_LEVEL_TABLE -.public OUTLAW_MINION_LEVEL_TABLE -.public PENDING_DUNGEON_ID -.public PLAY_TIME_SECONDS -.public SECONDARY_TERRAIN_TYPES -.public SaveScriptVariableValue -.public StringFromId -.public StrncpyName -.public StrncpySimpleNoPad -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public TEAM_NAME -.public WONDER_MAIL_BITS_SWAP -.public WONDER_MAIL_ENCRYPTION_TABLE .public _0209E264 .public _0209E3A1 .public _0209E3A2 @@ -86,6 +30,58 @@ .public _022AB69C .public _022AB924 .public _s32_div_f +.public ADVENTURE_LOG_ENCOUNTERS_MONSTER_IDS +.public ADVENTURE_LOG_PTR +.public ApplyLevelUpBoostsToGroundMonster +.public ARM9_UNKNOWN_DATA__NA_209E6BC +.public ARM9_UNKNOWN_TABLE__NA_209E280 +.public CLIENT_LEVEL_TABLE +.public Copy16BitsFrom +.public CopyNStringFromId +.public Debug_Print0 +.public DUNGEON_DATA_LIST +.public DungeonSwapIdToIdx +.public DungeonSwapIdxToId +.public GetBaseFormCastformCherrimDeoxys +.public GetBodySize +.public GetDexNumberVeneer +.public GetDungeonMode +.public GetDungeonModeSpecial +.public GetGameMode +.public GetMaxItemsAllowed +.public GetMaxMembersAllowed +.public GetMaxReachedFloor +.public GetMoneyCarried +.public GetNameString +.public GetNbItemsInBag +.public GetPartyMembers +.public GetPerformanceFlagWithChecks +.public GetRankUpEntry +.public GetSosMailCount +.public GetStringFromFileVeneer +.public GUEST_MONSTER_DATA +.public GuestMonsterToGroundMonster +.public IsItemValidVeneer +.public IsLevelResetDungeon +.public IsMoneyAllowed +.public IsRealMove +.public IsRecruitingAllowed +.public LoadScriptVariableValue +.public LoadScriptVariableValueAtIndex +.public MemcpySimple +.public MemZero +.public MISSION_FLOOR_RANKS_PTRS +.public NormalizeTreasureBox +.public OUTLAW_LEVEL_TABLE +.public OUTLAW_MINION_LEVEL_TABLE +.public PENDING_DUNGEON_ID +.public PLAY_TIME_SECONDS +.public SaveScriptVariableValue +.public SECONDARY_TERRAIN_TYPES +.public StringFromId +.public StrncpyName +.public StrncpySimpleNoPad +.public StrncpySimpleNoPadSafe .public sub_02004F80 .public sub_0200C4CC .public sub_02048BFC @@ -104,3 +100,7 @@ .public sub_0205EE40 .public sub_0205F00C .public sub_0205FE80 +.public TEAM_MEMBER_TABLE_PTR +.public TEAM_NAME +.public WONDER_MAIL_BITS_SWAP +.public WONDER_MAIL_ENCRYPTION_TABLE diff --git a/asm/include/main_0207BC3C.inc b/asm/include/main_0207BC3C.inc index b36998cf..318792d6 100644 --- a/asm/include/main_0207BC3C.inc +++ b/asm/include/main_0207BC3C.inc @@ -1,10 +1,4 @@ #pragma once -.public ARM9_UNKNOWN_TABLE__NA_20AE924 -.public EnableIrqFlag -.public FileInit -.public InitDmaTransfer_Standard -.public SetIrqFlag -.public WaitForever2 .public _020AEBF8 .public _020B2BB0 .public _022B99EC @@ -19,6 +13,11 @@ .public _022BB560 .public _022BB564 .public _022BB568 +.public ARM9_UNKNOWN_TABLE__NA_20AE924 +.public EnableIrqFlag +.public FileInit +.public InitDmaTransfer_Standard +.public SetIrqFlag .public sub_01FF9AA8 .public sub_01FF9B18 .public sub_01FF9B3C @@ -36,3 +35,4 @@ .public sub_0207A2C0 .public sub_0207A2DC .public sub_0207B854 +.public WaitForever2 diff --git a/asm/include/main_0207E84C.inc b/asm/include/main_0207E84C.inc index b8eef5dd..d11deb85 100644 --- a/asm/include/main_0207E84C.inc +++ b/asm/include/main_0207E84C.inc @@ -1,11 +1,11 @@ #pragma once +.public _022BB5E8 +.public _022BB5F8 .public EnableIrqFlag .public FileInit .public MemcpyFast .public MemsetFast .public SetIrqFlag -.public _022BB5E8 -.public _022BB5F8 .public sub_02079888 .public sub_020798D8 .public sub_0207DCC0 diff --git a/asm/include/overlay_10_rodata_022C464C.inc b/asm/include/overlay_10_rodata_022C464C.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_10_rodata_022C464C.inc +++ b/asm/include/overlay_10_rodata_022C464C.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_10_rodata_022C48E4.inc b/asm/include/overlay_10_rodata_022C48E4.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_10_rodata_022C48E4.inc +++ b/asm/include/overlay_10_rodata_022C48E4.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_10_rodata_022C490C.inc b/asm/include/overlay_10_rodata_022C490C.inc index 67c6bce8..bbade22a 100644 --- a/asm/include/overlay_10_rodata_022C490C.inc +++ b/asm/include/overlay_10_rodata_022C490C.inc @@ -1,10 +1,10 @@ #pragma once .public DoMoveCrunch +.public DoMoveDamage__02325DC0 .public DoMoveDamageCringe30 .public DoMoveDamageFreeze15 .public DoMoveDamageInlined .public DoMoveDamageLowerAccuracy40 .public DoMoveDamageLowerSpeed20 -.public DoMoveDamage__02325DC0 .public DoMoveEarthquake .public DoMoveParalyze__02328230 diff --git a/asm/include/overlay_10_rodata_022C593C.inc b/asm/include/overlay_10_rodata_022C593C.inc index cbe2d761..a00a386c 100644 --- a/asm/include/overlay_10_rodata_022C593C.inc +++ b/asm/include/overlay_10_rodata_022C593C.inc @@ -17,6 +17,10 @@ .public DoMoveCrunch .public DoMoveCrushClaw .public DoMoveCurse +.public DoMoveDamage__02325DC0 +.public DoMoveDamage__0232A500 +.public DoMoveDamage__0232B8B0 +.public DoMoveDamage__0232DD88 .public DoMoveDamageBoostAllStats .public DoMoveDamageBurn10FlameWheel .public DoMoveDamageConfuse10 @@ -40,10 +44,6 @@ .public DoMoveDamageStealItem .public DoMoveDamageWeightDependent .public DoMoveDamageWithRecoil -.public DoMoveDamage__02325DC0 -.public DoMoveDamage__0232A500 -.public DoMoveDamage__0232B8B0 -.public DoMoveDamage__0232DD88 .public DoMoveDefog .public DoMoveDestinyBond .public DoMoveDoubleEdge @@ -69,8 +69,8 @@ .public DoMoveGust .public DoMoveGyroBall .public DoMoveHammerArm -.public DoMoveHeadSmash .public DoMoveHeadbutt +.public DoMoveHeadSmash .public DoMoveHeartSwap .public DoMoveHiddenPower .public DoMoveHornDrill @@ -119,8 +119,8 @@ .public DoMoveSwapItems .public DoMoveTaunt .public DoMoveThunderFang -.public DoMoveThunderWave .public DoMoveThundershock +.public DoMoveThunderWave .public DoMoveTickle .public DoMoveTorment .public DoMoveToxic diff --git a/asm/include/overlay_29_022EE36C.inc b/asm/include/overlay_29_022EE36C.inc index 04c3a518..c6a8544d 100644 --- a/asm/include/overlay_29_022EE36C.inc +++ b/asm/include/overlay_29_022EE36C.inc @@ -40,7 +40,6 @@ .public MultiplyByFixedPoint .public ov10_022C4418 .public ov10_022C4434 -.public ov10_022C44E4 .public ov10_022C45C8 .public ov10_022C45CC .public ov10_022C4770 @@ -58,6 +57,7 @@ .public ov29_022FBD80 .public ov29_02304A48 .public ov29_02346344 +.public PITFALL_TRAP_DAMAGE .public PrepareItemForPrinting__02345728 .public RemoveEmptyItemsInBagWrapper .public RemoveGroundItem diff --git a/asm/include/overlay_29_02301FBC.inc b/asm/include/overlay_29_02301FBC.inc index ead8495a..21a65f0e 100644 --- a/asm/include/overlay_29_02301FBC.inc +++ b/asm/include/overlay_29_02301FBC.inc @@ -1,8 +1,8 @@ #pragma once .public CanLearnIqSkill .public CanSeeTarget -.public DUNGEON_PTR .public DisableIqSkill +.public DUNGEON_PTR .public EnableIqSkill .public EntityIsValid__023000E4 .public GetPerformanceFlagWithChecks diff --git a/asm/include/overlay_29_0231A460.inc b/asm/include/overlay_29_0231A460.inc index 6971562e..1d8fde1a 100644 --- a/asm/include/overlay_29_0231A460.inc +++ b/asm/include/overlay_29_0231A460.inc @@ -6,5 +6,5 @@ .public GetTreatmentBetweenMonsters .public IqSkillIsEnabled .public IsBlinded -.public WeightMoveWithIqSkills .public ov29_0230F8D0 +.public WeightMoveWithIqSkills diff --git a/asm/include/overlay_29_0231AF24.inc b/asm/include/overlay_29_0231AF24.inc index f05ba5fc..e2eea2d4 100644 --- a/asm/include/overlay_29_0231AF24.inc +++ b/asm/include/overlay_29_0231AF24.inc @@ -6,10 +6,10 @@ .public IsMonster__0231A9D4 .public LogMessageByIdWithPopupCheckParticipants .public LogMessageByIdWithPopupCheckUserTarget -.public PrepareItemForPrinting__02345728 -.public SetActionUseMoveAi -.public SubstitutePlaceholderStringTags .public ov29_022E4110 .public ov29_022FB9E0 .public ov29_0232145C .public ov29_0232E80C +.public PrepareItemForPrinting__02345728 +.public SetActionUseMoveAi +.public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_02332A0C.inc b/asm/include/overlay_29_02332A0C.inc index 9e8471b8..654cf08b 100644 --- a/asm/include/overlay_29_02332A0C.inc +++ b/asm/include/overlay_29_02332A0C.inc @@ -27,12 +27,12 @@ .public MirrorMoveIsActive .public MistIsActive .public MonsterHasNegativeStatus +.public MonsterHasQuarterHp .public MonsterIsType .public MoveHitCheck .public ov10_022C6322 .public ov29_022E576C .public ov29_0230040C -.public MonsterHasQuarterHp .public ov29_02304A48 .public ov29_0230D088 .public ov29_0234B034 diff --git a/asm/overlay_10_022C4394.s b/asm/overlay_10_022C4394.s index d90aa555..a355780a 100644 --- a/asm/overlay_10_022C4394.s +++ b/asm/overlay_10_022C4394.s @@ -200,8 +200,8 @@ SPAWN_COOLDOWN: .global MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE MIST_BALL_LOWER_SPECIAL_ATTACK_CHANCE: .byte 0x32, 0x00, 0x00, 0x00 - .global ov10_022C44E4 -ov10_022C44E4: + .global PITFALL_TRAP_DAMAGE +PITFALL_TRAP_DAMAGE: .byte 0x05, 0x00, 0x00, 0x00 .global ov10_022C44E8 ov10_022C44E8: diff --git a/asm/overlay_29_022EE36C.s b/asm/overlay_29_022EE36C.s index 637eccc2..c7e806e5 100644 --- a/asm/overlay_29_022EE36C.s +++ b/asm/overlay_29_022EE36C.s @@ -477,7 +477,7 @@ _022EE8AC: mov r1, #0x4b strb r2, [r8, #0x170] bl ov29_022EA370 - ldr r1, _022EE988 ; =ov10_022C44E4 + ldr r1, _022EE988 ; =PITFALL_TRAP_DAMAGE mov r0, r6 #else strb r2, [r5, #0x172] @@ -485,7 +485,7 @@ _022EE8AC: mov r1, #0x4b strb r2, [r5, #0x174] bl ov29_022EA370 - ldr r1, _022EE988 ; =ov10_022C44E4 + ldr r1, _022EE988 ; =PITFALL_TRAP_DAMAGE mov r0, r7 #endif ldrsh r1, [r1] @@ -568,7 +568,7 @@ _022EE968: #endif _022EE980: .word DUNGEON_PTR _022EE984: .word 0x00000E64 + APPLY_PITFALL_TRAP_EFFECT_OFFSET -_022EE988: .word ov10_022C44E4 +_022EE988: .word PITFALL_TRAP_DAMAGE _022EE98C: .word 0x00000E66 + APPLY_PITFALL_TRAP_EFFECT_OFFSET _022EE990: .word 0x00000E65 + APPLY_PITFALL_TRAP_EFFECT_OFFSET arm_func_end ApplyPitfallTrapEffect