From f59becd3f626bff6cdf9d7da64317fc39e1cad06 Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sat, 22 Aug 2026 20:45:50 -0400 Subject: [PATCH] Synced from pmdsky-debug --- asm/include/main_020024E4.inc | 10 +- asm/include/main_02002910.inc | 12 +- asm/include/main_02003DB8.inc | 8 +- asm/include/main_020040AC.inc | 10 +- asm/include/main_02004FF8.inc | 66 ++++----- asm/include/main_02009648.inc | 2 +- asm/include/main_0200C5B4.inc | 4 +- asm/include/main_02010FC4.inc | 2 +- asm/include/main_02011528.inc | 2 +- asm/include/main_02011850.inc | 8 +- asm/include/main_02011F60.inc | 8 +- asm/include/main_02012294.inc | 46 +++---- asm/include/main_020151E4.inc | 62 ++++----- asm/include/main_02017D20.inc | 126 +++++++++--------- asm/include/main_0201BAC8.inc | 2 +- asm/include/main_0201C000.inc | 16 +-- asm/include/main_0201D738.inc | 32 ++--- asm/include/main_0201E3AC.inc | 110 +++++++-------- asm/include/main_0202598C.inc | 36 ++--- asm/include/main_020261F4.inc | 2 +- asm/include/main_0202676C.inc | 22 +-- asm/include/main_020276C0.inc | 8 +- asm/include/main_020278C4.inc | 2 +- asm/include/main_02027B88.inc | 4 +- asm/include/main_02028354.inc | 26 ++-- asm/include/main_02029EE8.inc | 8 +- asm/include/main_0202A3E4.inc | 8 +- asm/include/main_0202A690.inc | 4 +- asm/include/main_0202AB94.inc | 4 +- asm/include/main_0202B568.inc | 2 +- asm/include/main_0202BA20.inc | 2 +- asm/include/main_0202BD10.inc | 6 +- asm/include/main_0202C7E4.inc | 2 +- asm/include/main_0202D0EC.inc | 16 +-- asm/include/main_0202F190.inc | 8 +- asm/include/main_0202FD50.inc | 6 +- asm/include/main_02030A90.inc | 4 +- asm/include/main_02032960.inc | 2 +- asm/include/main_02033414.inc | 30 ++--- asm/include/main_02034974.inc | 78 +++++------ asm/include/main_02037570.inc | 142 ++++++++++---------- asm/include/main_0203C774.inc | 6 +- asm/include/main_0203CAF0.inc | 132 +++++++++--------- asm/include/main_02042BE0.inc | 8 +- asm/include/main_020432B4.inc | 2 +- asm/include/main_0204357C.inc | 184 +++++++++++++------------- asm/include/main_020484C0.inc | 10 +- asm/include/main_02048764.inc | 14 +- asm/include/main_02048B74.inc | 2 +- asm/include/main_02048C5C.inc | 4 +- asm/include/main_02048CF8.inc | 68 +++++----- asm/include/main_0204D368.inc | 6 +- asm/include/main_0204F0A0.inc | 12 +- asm/include/main_020504BC.inc | 6 +- asm/include/main_02054E4C.inc | 8 +- asm/include/main_02055894.inc | 8 +- asm/include/main_02056960.inc | 4 +- asm/include/main_02056EB8.inc | 28 ++-- asm/include/main_0205EDA4.inc | 54 ++++---- asm/include/main_02062A68.inc | 32 ++--- asm/include/main_02065998.inc | 2 +- asm/include/main_02065C84.inc | 14 +- asm/include/main_020664B8.inc | 90 ++++++------- asm/include/main_0206A878.inc | 38 +++--- asm/include/main_0206C1BC.inc | 16 +-- asm/include/main_0206C9BC.inc | 102 +++++++------- asm/include/overlay_00.inc | 60 ++++----- asm/include/overlay_00_022DB2F8.inc | 152 ++++++++++----------- asm/include/overlay_00_0230D398.inc | 10 +- asm/include/overlay_00_0230E460.inc | 92 ++++++------- asm/include/overlay_01.inc | 162 +++++++++++------------ asm/include/overlay_01_02337634.inc | 8 +- asm/include/overlay_04_0233CAF8.inc | 12 +- asm/include/overlay_06_0233CAB8.inc | 8 +- asm/include/overlay_10_022BCDF4.inc | 22 +-- asm/include/overlay_10_022BFF78.inc | 32 ++--- asm/include/overlay_11.inc | 78 +++++------ asm/include/overlay_11_022E46FC.inc | 46 +++---- asm/include/overlay_11_022E7FB8.inc | 2 +- asm/include/overlay_11_022E8090.inc | 34 ++--- asm/include/overlay_11_022EA024.inc | 14 +- asm/include/overlay_11_022EE5E4.inc | 38 +++--- asm/include/overlay_11_022FAC54.inc | 16 +-- asm/include/overlay_11_022FD308.inc | 8 +- asm/include/overlay_11_022FE4AC.inc | 1 + asm/include/overlay_11_022FE5F8.inc | 122 ++++++++--------- asm/include/overlay_11_0230CE30.inc | 26 ++-- asm/include/overlay_16.inc | 18 +-- asm/include/overlay_16_0238CD08.inc | 1 + asm/include/overlay_17_0238A754.inc | 4 +- asm/include/overlay_17_0238B2B4.inc | 10 +- asm/include/overlay_18.inc | 10 +- asm/include/overlay_18_0238C114.inc | 4 +- asm/include/overlay_18_0238CAB0.inc | 2 +- asm/include/overlay_29_022DC7E4.inc | 6 +- asm/include/overlay_29_022E08F4.inc | 4 +- asm/include/overlay_29_022E0A18.inc | 12 +- asm/include/overlay_29_022E1AD4.inc | 4 +- asm/include/overlay_29_022E335C.inc | 4 +- asm/include/overlay_29_022E37DC.inc | 20 +-- asm/include/overlay_29_022E41F0.inc | 2 +- asm/include/overlay_29_022E45CC.inc | 2 +- asm/include/overlay_29_022E4868.inc | 2 +- asm/include/overlay_29_022E4BB4.inc | 4 +- asm/include/overlay_29_022E5650.inc | 18 +-- asm/include/overlay_29_022E6798.inc | 4 +- asm/include/overlay_29_022E6928.inc | 12 +- asm/include/overlay_29_022E7EC4.inc | 8 +- asm/include/overlay_29_022E86A4.inc | 14 +- asm/include/overlay_29_022E9628.inc | 2 +- asm/include/overlay_29_022E9FE0.inc | 12 +- asm/include/overlay_29_022EAD00.inc | 4 +- asm/include/overlay_29_022EAF48.inc | 10 +- asm/include/overlay_29_022ED030.inc | 6 +- asm/include/overlay_29_022ED888.inc | 2 +- asm/include/overlay_29_022EDCBC.inc | 2 +- asm/include/overlay_29_022F0654.inc | 30 ++--- asm/include/overlay_29_022F2B3C.inc | 48 +++---- asm/include/overlay_29_022F52CC.inc | 18 +-- asm/include/overlay_29_022F9744.inc | 2 +- asm/include/overlay_29_022FB678.inc | 2 +- asm/include/overlay_29_022FE4BC.inc | 2 +- asm/include/overlay_29_022FFF5C.inc | 4 +- asm/include/overlay_29_02302A5C.inc | 2 +- asm/include/overlay_29_02320788.inc | 24 ++-- asm/include/overlay_29_02321288.inc | 4 +- asm/include/overlay_29_0232145C.inc | 2 +- asm/include/overlay_29_02322DDC.inc | 2 +- asm/include/overlay_29_02324BE8.inc | 2 +- asm/include/overlay_29_02325644.inc | 8 +- asm/include/overlay_29_02325FC4.inc | 2 +- asm/include/overlay_29_0232692C.inc | 6 +- asm/include/overlay_29_02326CC8.inc | 2 +- asm/include/overlay_29_02326EB8.inc | 6 +- asm/include/overlay_29_02327C08.inc | 2 +- asm/include/overlay_29_02327DE0.inc | 2 +- asm/include/overlay_29_02328030.inc | 6 +- asm/include/overlay_29_023283A4.inc | 2 +- asm/include/overlay_29_02328538.inc | 2 +- asm/include/overlay_29_02328B00.inc | 12 +- asm/include/overlay_29_02329258.inc | 4 +- asm/include/overlay_29_023293F8.inc | 2 +- asm/include/overlay_29_02329898.inc | 6 +- asm/include/overlay_29_0232A148.inc | 2 +- asm/include/overlay_29_0232A2BC.inc | 2 +- asm/include/overlay_29_0232A524.inc | 22 +-- asm/include/overlay_29_0232AC54.inc | 2 +- asm/include/overlay_29_0232AD18.inc | 4 +- asm/include/overlay_29_0232B024.inc | 6 +- asm/include/overlay_29_0232B518.inc | 2 +- asm/include/overlay_29_0232B6C8.inc | 4 +- asm/include/overlay_29_0232B940.inc | 8 +- asm/include/overlay_29_0232BF88.inc | 8 +- asm/include/overlay_29_0232C310.inc | 2 +- asm/include/overlay_29_0232C578.inc | 4 +- asm/include/overlay_29_0232C84C.inc | 4 +- asm/include/overlay_29_0232CB18.inc | 2 +- asm/include/overlay_29_0232CF84.inc | 8 +- asm/include/overlay_29_0232D418.inc | 4 +- asm/include/overlay_29_0232D90C.inc | 8 +- asm/include/overlay_29_0232E744.inc | 4 +- asm/include/overlay_29_0232E864.inc | 2 +- asm/include/overlay_29_02338684.inc | 4 +- asm/include/overlay_29_023388B0.inc | 8 +- asm/include/overlay_29_02339138.inc | 6 +- asm/include/overlay_29_0233A248.inc | 20 +-- asm/include/overlay_29_0233AE84.inc | 8 +- asm/include/overlay_29_02341E6C.inc | 22 +-- asm/include/overlay_29_02343980.inc | 12 +- asm/include/overlay_29_02344BA8.inc | 2 +- asm/include/overlay_29_02344BF8.inc | 22 +-- asm/include/overlay_29_02348D3C.inc | 8 +- asm/include/overlay_29_0234AEE8.inc | 4 +- asm/include/overlay_29_0234B130.inc | 2 +- asm/include/overlay_29_0234B350.inc | 2 +- asm/include/overlay_29_0234B4CC.inc | 6 +- asm/main_0201C000.s | 12 +- asm/overlay_10_022BCDF4.s | 6 +- asm/overlay_10_022BFF78.s | 4 +- asm/overlay_11_022EE5E4.s | 2 +- asm/overlay_29_022E335C.s | 4 +- asm/overlay_29_022E37DC.s | 8 +- asm/overlay_29_022E41F0.s | 8 +- asm/overlay_29_022E45CC.s | 6 +- asm/overlay_29_022E4868.s | 20 +-- asm/overlay_29_022E4BB4.s | 60 ++++----- asm/overlay_29_022E5650.s | 56 ++++---- asm/overlay_29_022E6798.s | 4 +- asm/overlay_29_022E6928.s | 4 +- asm/overlay_29_022EDCBC.s | 2 +- asm/overlay_29_022F0654.s | 2 +- asm/overlay_29_022F9744.s | 8 +- asm/overlay_29_022FB678.s | 2 +- asm/overlay_29_022FE4BC.s | 4 +- asm/overlay_29_02302A5C.s | 2 +- asm/overlay_29_02305C28.s | 8 +- asm/overlay_29_0232145C.s | 2 +- asm/overlay_29_02322DDC.s | 2 +- asm/overlay_29_02324BE8.s | 4 +- asm/overlay_29_02325644.s | 6 +- asm/overlay_29_0232E864.s | 2 +- lib/DSE/asm/include/main_020721D4.inc | 1 + lib/DSE/asm/include/main_020727FC.inc | 1 + lib/DSE/asm/include/main_020729A4.inc | 24 ++-- src/overlay_29_022E3F20.c | 10 +- src/overlay_29_022E406C.c | 10 +- src/overlay_29_022E4338.c | 18 +-- src/overlay_29_022E4704.c | 10 +- src/overlay_29_022E66C4.c | 6 +- 209 files changed, 1847 insertions(+), 1843 deletions(-) diff --git a/asm/include/main_020024E4.inc b/asm/include/main_020024E4.inc index 0b4c9e9d..4d1a9fa8 100644 --- a/asm/include/main_020024E4.inc +++ b/asm/include/main_020024E4.inc @@ -1,4 +1,9 @@ #pragma once +.public _020AEF30 +.public _0229AFC0 +.public _0229AFCC +.public _0229AFE4 +.public _0229B004 .public OS_CreateThread .public OS_GetThreadPriority .public OS_InitMutex @@ -8,8 +13,3 @@ .public OS_SleepThreadDirect .public OS_UnlockMutex .public OSi_ThreadInfo -.public _020AEF30 -.public _0229AFC0 -.public _0229AFCC -.public _0229AFE4 -.public _0229B004 diff --git a/asm/include/main_02002910.inc b/asm/include/main_02002910.inc index 01802904..3af9bace 100644 --- a/asm/include/main_02002910.inc +++ b/asm/include/main_02002910.inc @@ -1,4 +1,10 @@ #pragma once +.public _020AEF58 +.public _0229B0E8 +.public _0229B0F0 +.public _0229B0F8 +.public _0229B110 +.public _0229B114 .public Card_LockBackup .public Card_LockRom .public Card_UnlockBackup @@ -16,12 +22,6 @@ .public OS_TryLockMutex .public OS_UnlockMutex .public OSi_ThreadInfo -.public _020AEF58 -.public _0229B0E8 -.public _0229B0F0 -.public _0229B0F8 -.public _0229B110 -.public _0229B114 .public sub_02002580 .public sub_02002670 .public sub_020026B8 diff --git a/asm/include/main_02003DB8.inc b/asm/include/main_02003DB8.inc index 4ee70d55..3bbf8c7f 100644 --- a/asm/include/main_02003DB8.inc +++ b/asm/include/main_02003DB8.inc @@ -1,12 +1,12 @@ #pragma once -.public Card_TerminateForPulledOut -.public Debug_Print0 -.public OS_SleepThread -.public OS_WaitIrq .public _02092540 .public _020AEF7C .public _020AF050 .public _020AF078 +.public Card_TerminateForPulledOut +.public Debug_Print0 +.public OS_SleepThread +.public OS_WaitIrq .public sub_02002448 .public sub_02002580 .public sub_020025F8 diff --git a/asm/include/main_020040AC.inc b/asm/include/main_020040AC.inc index 62f83015..d559462a 100644 --- a/asm/include/main_020040AC.inc +++ b/asm/include/main_020040AC.inc @@ -1,13 +1,16 @@ #pragma once +.public _02092558 +.public _020925A0 +.public _020925B4 .public CardPullOutWithStatus .public DC_FlushAll .public Debug_FatalError +.public FileRom_InitDataTransfer +.public FileRom_StopDataTransfer .public FS_LoadOverlayImage .public FS_LoadOverlayInfo .public FS_StartOverlay .public FS_UnloadOverlay -.public FileRom_InitDataTransfer -.public FileRom_StopDataTransfer .public GetDsFirmwareUserSettings .public IC_InvalidateAll .public LOADED_OVERLAY_GROUP_0 @@ -15,6 +18,3 @@ .public MATHi_CRC32InitTable .public MemAlloc .public MemFree -.public _02092558 -.public _020925A0 -.public _020925B4 diff --git a/asm/include/main_02004FF8.inc b/asm/include/main_02004FF8.inc index accf419e..7df5c11a 100644 --- a/asm/include/main_02004FF8.inc +++ b/asm/include/main_02004FF8.inc @@ -1,37 +1,4 @@ #pragma once -.public CardPullOutWithStatus -.public Card_IsPulledOut -.public DC_FlushAll -.public Debug_Print -.public Debug_Print0 -.public FS_CloseFile -.public FS_InitFile -.public FS_OpenFile -.public FS_ReadFile -.public FS_SeekFile -.public FileRom_StopDataTransfer -.public GXS_BeginLoadBGExtPltt -.public GXS_EndLoadBGExtPltt -.public GX_BeginLoadBGExtPltt -.public GX_BeginLoadOBJExtPltt -.public GX_EndLoadBGExtPltt -.public GX_EndLoadOBJExtPltt -.public MI_DmaCopy16Async -.public MI_DmaCopy32Async -.public MI_DmaSend16Async -.public MI_DmaSend32Async -.public MI_IsDmaBusy -.public MemFree -.public MemLocateSet -.public RandInt -.public Rtc_GetDateTime -.public Rtc_Init -.public TOUCHSCREEN_STATUS -.public TP_GetUserInfo -.public TP_Init -.public TP_RequestSamplingAsync -.public TP_SetCalibrateParam -.public TP_WaitCalibratedResult .public _020925C8 .public _020925F8 .public _02092670 @@ -72,6 +39,33 @@ .public _fmul .public _s32_div_f .public abs +.public Card_IsPulledOut +.public CardPullOutWithStatus +.public DC_FlushAll +.public Debug_Print +.public Debug_Print0 +.public FileRom_StopDataTransfer +.public FS_CloseFile +.public FS_InitFile +.public FS_OpenFile +.public FS_ReadFile +.public FS_SeekFile +.public GX_BeginLoadBGExtPltt +.public GX_BeginLoadOBJExtPltt +.public GX_EndLoadBGExtPltt +.public GX_EndLoadOBJExtPltt +.public GXS_BeginLoadBGExtPltt +.public GXS_EndLoadBGExtPltt +.public MemFree +.public MemLocateSet +.public MI_DmaCopy16Async +.public MI_DmaCopy32Async +.public MI_DmaSend16Async +.public MI_DmaSend32Async +.public MI_IsDmaBusy +.public RandInt +.public Rtc_GetDateTime +.public Rtc_Init .public sprintf .public sqrtf .public strcat @@ -96,3 +90,9 @@ .public sub_020031C0 .public sub_0200844C .public sub_0200846C +.public TOUCHSCREEN_STATUS +.public TP_GetUserInfo +.public TP_Init +.public TP_RequestSamplingAsync +.public TP_SetCalibrateParam +.public TP_WaitCalibratedResult diff --git a/asm/include/main_02009648.inc b/asm/include/main_02009648.inc index 360ff530..287ec341 100644 --- a/asm/include/main_02009648.inc +++ b/asm/include/main_02009648.inc @@ -1,7 +1,6 @@ #pragma once .public G2x_SetBlendAlpha_ .public G3X_SetClearColor -.public GXS_SetGraphicsMode .public GX_SetBankForBG .public GX_SetBankForBGExtPltt .public GX_SetBankForOBJ @@ -12,6 +11,7 @@ .public GX_SetBankForTex .public GX_SetBankForTexPltt .public GX_SetGraphicsMode +.public GXS_SetGraphicsMode .public sub_02009120 .public sub_020091CC .public sub_020091F8 diff --git a/asm/include/main_0200C5B4.inc b/asm/include/main_0200C5B4.inc index 3b60fe27..5679cbb7 100644 --- a/asm/include/main_0200C5B4.inc +++ b/asm/include/main_0200C5B4.inc @@ -1,12 +1,12 @@ #pragma once +.public _02094C0C .public AllocateTemp1024ByteBufferFromPool -.public DUNGEON_RETURN_STATUS_TABLE .public DrawTextInWindow +.public DUNGEON_RETURN_STATUS_TABLE .public GetDungeonResultMsg .public GetStringFromFileVeneer .public GetWindow .public MaybeGetColoredFormattedItemName .public PreprocessString .public StringFromId -.public _02094C0C .public sub_020265A8 diff --git a/asm/include/main_02010FC4.inc b/asm/include/main_02010FC4.inc index d5decaf6..f86af6bd 100644 --- a/asm/include/main_02010FC4.inc +++ b/asm/include/main_02010FC4.inc @@ -1,4 +1,5 @@ #pragma once +.public _020A1878 .public ApplyExclusiveItemStatBoosts .public BAG_ITEMS_PTR_MIRROR .public EXCLUSIVE_ITEM_EFFECT_DATA @@ -15,4 +16,3 @@ .public MemFree .public MemZero .public SetExclusiveItemEffect -.public _020A1878 diff --git a/asm/include/main_02011528.inc b/asm/include/main_02011528.inc index 390cce2b..bc33df29 100644 --- a/asm/include/main_02011528.inc +++ b/asm/include/main_02011528.inc @@ -1,9 +1,9 @@ #pragma once .public ApplyGummiBoostsGroundMode .public CALCIUM_STAT_BOOST -.public GINSENG_CHANCE_3 .public GetMoveBasePowerGround .public GetMoveMaxGinsengBoostGround +.public GINSENG_CHANCE_3 .public IRON_STAT_BOOST .public LIFE_SEED_HP_BOOST .public ModifyDefensiveStat diff --git a/asm/include/main_02011850.inc b/asm/include/main_02011850.inc index e0094f17..a02e232a 100644 --- a/asm/include/main_02011850.inc +++ b/asm/include/main_02011850.inc @@ -1,8 +1,9 @@ #pragma once +.public _0209889C .public BAG_ITEMS_PTR_MIRROR .public CountValidRecycleShopItems -.public GUMMI_STAT_BOOST .public GetType +.public GUMMI_STAT_BOOST .public IQ_GUMMI_GAIN_TABLE .public IsGummi .public IsMonsterAffectedByGravelyrockGroundMode @@ -14,8 +15,7 @@ .public ModifyOffensiveStat .public RandIntSafe .public SaveScriptVariableValue -.public WONDER_GUMMI_IQ_GAIN -.public WONDER_GUMMI_STAT_BOOST -.public _0209889C .public sub_0200D1F0 .public sub_0201297C +.public WONDER_GUMMI_IQ_GAIN +.public WONDER_GUMMI_STAT_BOOST diff --git a/asm/include/main_02011F60.inc b/asm/include/main_02011F60.inc index 318ab4f7..a34904e1 100644 --- a/asm/include/main_02011F60.inc +++ b/asm/include/main_02011F60.inc @@ -1,15 +1,15 @@ #pragma once +.public _020988A4 +.public _020988A8 +.public _s32_div_f .public BAG_ITEMS_PTR_MIRROR .public CountValidRecycleShopItems .public FreeRecycleOfferItems .public GetRank .public GetScenarioBalance .public LoadScriptVariableValue -.public RECYCLE_SHOP_ITEM_LIST .public Rand16Bit +.public RECYCLE_SHOP_ITEM_LIST .public SaveScriptVariableValue .public SetNbRecycled -.public _020988A4 -.public _020988A8 -.public _s32_div_f .public sub_02011B3C diff --git a/asm/include/main_02012294.inc b/asm/include/main_02012294.inc index 4e903aa2..2c69552b 100644 --- a/asm/include/main_02012294.inc +++ b/asm/include/main_02012294.inc @@ -1,4 +1,22 @@ #pragma once +.public _020988D0 +.public _020988D4 +.public _020988D8 +.public _02098CB4 +.public _02098CCC +.public _02098D24 +.public _02098D48 +.public _02098D68 +.public _02098DE4 +.public _02098DF4 +.public _02098E04 +.public _02098E0C +.public _02098E14 +.public _02098E58 +.public _02098E9C +.public _020AF6D0 +.public _020AF700 +.public _022A4BD8 .public BAG_ITEMS_PTR_MIRROR .public BitstreamDebug .public ConvertStorageItemAtIdxToBulkItem @@ -7,8 +25,8 @@ .public CountNbItemsOfTypeInBag .public CountNbItemsOfTypeInStorage .public CountNbOfItemsInStorage -.public DUNGEON_MOVE_TABLES .public Debug_Print0 +.public DUNGEON_MOVE_TABLES .public FemaleToMaleForm .public GetBaseFormCastformDeoxysCherrim .public GetDungeonResultString @@ -35,36 +53,18 @@ .public MemAlloc .public MemFree .public OpenWaza -.public RECYCLE_SHOP_ITEM_LIST .public RandInt .public RandRange +.public RECYCLE_SHOP_ITEM_LIST .public RemoveEmptyItemsInBag .public RemoveItem .public RemoveItemAtIdxInStorage .public ReturnEggExclusiveItem -.public SYNTH_BIN_FILE_PTR .public SelectWaza .public StringFromId +.public sub_02010044 +.public SYNTH_BIN_FILE_PTR .public TYPE_SPECIFIC_EXCLUSIVE_ITEMS .public UnloadFile -.public ZInit8 -.public _020988D0 -.public _020988D4 -.public _020988D8 -.public _02098CB4 -.public _02098CCC -.public _02098D24 -.public _02098D48 -.public _02098D68 -.public _02098DE4 -.public _02098DF4 -.public _02098E04 -.public _02098E0C -.public _02098E14 -.public _02098E58 -.public _02098E9C -.public _020AF6D0 -.public _020AF700 -.public _022A4BD8 -.public sub_02010044 .public vsprintf +.public ZInit8 diff --git a/asm/include/main_020151E4.inc b/asm/include/main_020151E4.inc index a26adddd..5443a3f6 100644 --- a/asm/include/main_020151E4.inc +++ b/asm/include/main_020151E4.inc @@ -1,35 +1,4 @@ #pragma once -.public AtoiTagVeneer -.public BagHasExclusiveItemTypeForMonster -.public CopyColorToPaletteDataRgba -.public DUNGEON_MOVE_TABLES -.public DeleteWanTableEntryVeneer -.public DisplayAndSwitchAnimationControlCurrentFrame -.public DungeonGoesUp -.public GetAbility -.public GetNbFloors -.public GetStringFromFileVeneer -.public HandleSir0Translation -.public InitAnimationControlWithSet__0201C0B0 -.public InitPreprocessorArgs -.public IqSkillFlagTest -.public LoadFileFromRom -.public LoadWanTableEntry -.public MarkPaletteDataAsNeedingUpdate -.public MemAlloc -.public MemFree -.public MemZero -.public MemZero32 -.public MultiplyByFixedPoint -.public PreprocessString -.public Rand16Bit -.public SetAnimationForAnimationControl -.public SetSpriteIdForAnimationControl -.public StopBgmCommand -.public StrcmpTagVeneer -.public StringFromId -.public UnloadFile -.public WAN_TABLE .public _02098EA8 .public _02098EE0 .public _02098F60 @@ -66,9 +35,38 @@ .public _022A4BE8 .public _s32_div_f .public _u32_div_f +.public AtoiTagVeneer +.public BagHasExclusiveItemTypeForMonster +.public CopyColorToPaletteDataRgba +.public DeleteWanTableEntryVeneer +.public DisplayAndSwitchAnimationControlCurrentFrame +.public DUNGEON_MOVE_TABLES +.public DungeonGoesUp +.public GetAbility +.public GetNbFloors +.public GetStringFromFileVeneer +.public HandleSir0Translation +.public InitAnimationControlWithSet__0201C0B0 +.public InitPreprocessorArgs +.public IqSkillFlagTest +.public LoadFileFromRom +.public LoadWanTableEntry +.public MarkPaletteDataAsNeedingUpdate +.public MemAlloc +.public MemFree +.public MemZero +.public MemZero32 +.public MultiplyByFixedPoint .public ov10_022BDADC .public ov10_022C2528 +.public PreprocessString +.public Rand16Bit +.public SetAnimationForAnimationControl +.public SetSpriteIdForAnimationControl +.public StopBgmCommand +.public StrcmpTagVeneer .public strcpy +.public StringFromId .public strlen .public strncmp .public sub_0200A174 @@ -107,4 +105,6 @@ .public sub_0206ADA0 .public sub_0206ADB8 .public sub_0206BA5C +.public UnloadFile .public vsprintf +.public WAN_TABLE diff --git a/asm/include/main_02017D20.inc b/asm/include/main_02017D20.inc index 74a5411c..827c7543 100644 --- a/asm/include/main_02017D20.inc +++ b/asm/include/main_02017D20.inc @@ -1,67 +1,4 @@ #pragma once -.public AUDIO_COMMANDS_BUFFER -.public AddObjToUngroupedOamObjs -.public ClearGroupedOamObjsAndGroups -.public CopyAndInterleave -.public CopyAndInterleave0 -.public DC_FlushRange -.public Debug_GetDebugFlag -.public Debug_Print -.public Debug_Print0 -.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 FileClose -.public FileGetSize -.public FileRom_HandleOpen -.public FileRom_HandleRead -.public FileRom_InitDataTransfer -.public FileRom_StopDataTransfer -.public FileRom_Veneer_FileInit -.public FillPaletteDataRgba -.public GXS_BeginLoadBGExtPltt -.public GXS_BeginLoadOBJExtPltt -.public GXS_EndLoadBGExtPltt -.public GXS_EndLoadOBJExtPltt -.public GX_BeginLoadBGExtPltt -.public GX_BeginLoadOBJExtPltt -.public GX_EndLoadBGExtPltt -.public GX_EndLoadOBJExtPltt -.public InitOamInfo -.public MTi_CpuClear32 -.public MTi_CpuCopy32 -.public MarkPaletteDataAsNeedingUpdate -.public MemAlloc -.public MemArenaAlloc -.public MemLocateSet -.public MemLocateUnset -.public MemZero -.public Memcpy32 -.public PointsToZero -.public ResumeBgm -.public SND_Init -.public Snd_LockChannel -.public Snd_UnlockChannel -.public ZInit8 .public _0209916C .public _0209918C .public _020991C8 @@ -139,6 +76,68 @@ .public _022A4EF4 .public _022A4EFC .public _s32_div_f +.public AddObjToUngroupedOamObjs +.public AUDIO_COMMANDS_BUFFER +.public ClearGroupedOamObjsAndGroups +.public CopyAndInterleave +.public CopyAndInterleave0 +.public DC_FlushRange +.public Debug_GetDebugFlag +.public Debug_Print +.public Debug_Print0 +.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 FileClose +.public FileGetSize +.public FileRom_HandleOpen +.public FileRom_HandleRead +.public FileRom_InitDataTransfer +.public FileRom_StopDataTransfer +.public FileRom_Veneer_FileInit +.public FillPaletteDataRgba +.public GX_BeginLoadBGExtPltt +.public GX_BeginLoadOBJExtPltt +.public GX_EndLoadBGExtPltt +.public GX_EndLoadOBJExtPltt +.public GXS_BeginLoadBGExtPltt +.public GXS_BeginLoadOBJExtPltt +.public GXS_EndLoadBGExtPltt +.public GXS_EndLoadOBJExtPltt +.public InitOamInfo +.public MarkPaletteDataAsNeedingUpdate +.public MemAlloc +.public MemArenaAlloc +.public Memcpy32 +.public MemLocateSet +.public MemLocateUnset +.public MemZero +.public MTi_CpuClear32 +.public MTi_CpuCopy32 +.public PointsToZero +.public ResumeBgm +.public SND_Init +.public Snd_LockChannel +.public Snd_UnlockChannel .public sprintf .public sub_02002778 .public sub_020027E8 @@ -165,3 +164,4 @@ .public sub_0206C6BC .public sub_0206C754 .public sub_0206F5C8 +.public ZInit8 diff --git a/asm/include/main_0201BAC8.inc b/asm/include/main_0201BAC8.inc index 2813e8ca..1d21ff5e 100644 --- a/asm/include/main_0201BAC8.inc +++ b/asm/include/main_0201BAC8.inc @@ -1,8 +1,8 @@ #pragma once +.public _020AFC28 .public MemAlloc .public MemZero .public OBJ_GRAPHICS_CONTROLS_PTR -.public _020AFC28 .public sub_0201AB90 .public sub_0201AC10 .public sub_0201AC20 diff --git a/asm/include/main_0201C000.inc b/asm/include/main_0201C000.inc index 0918aa81..3a2dd2a4 100644 --- a/asm/include/main_0201C000.inc +++ b/asm/include/main_0201C000.inc @@ -1,4 +1,10 @@ #pragma once +.public _020996E0 +.public _020AFC30 +.public _020AFC3C +.public _020AFC50 +.public _020AFC70 +.public _s32_div_f .public AddWanFragmentToOam .public Debug_Print0 .public EnqueueRender3dTexture @@ -8,17 +14,11 @@ .public Rand16Bit .public Rgb8ToRgb5 .public SpriteTypeInWanTable -.public WAN_TABLE -.public WanTableSpriteHasAnimationGroup -.public _020996E0 -.public _020AFC30 -.public _020AFC3C -.public _020AFC50 -.public _020AFC70 -.public _s32_div_f .public sub_0201B388 .public sub_0201B53C .public sub_0201D1B0 .public sub_0201DC4C .public sub_0201E050 .public sub_0201E408 +.public WAN_TABLE +.public WanTableSpriteHasAnimationGroup diff --git a/asm/include/main_0201D738.inc b/asm/include/main_0201D738.inc index 9b71daa1..a0cba396 100644 --- a/asm/include/main_0201D738.inc +++ b/asm/include/main_0201D738.inc @@ -1,20 +1,4 @@ #pragma once -.public DirectoryFileMngr_OpenDirectoryFile -.public DisplayAndSwitchAnimationControlCurrentFrame -.public GX_BeginLoadTex -.public GX_BeginLoadTexPltt -.public GX_EndLoadTex -.public GX_EndLoadTexPltt -.public GX_LoadTex -.public GX_LoadTexPltt -.public GeomSwapBuffers -.public HandleSir0Translation -.public LoadFileFromRom -.public LoadObjPalette -.public MemAlloc -.public MemFree -.public MemZero -.public OBJ_GRAPHICS_CONTROLS_PTR .public _02099714 .public _0209971C .public _02099720 @@ -25,6 +9,22 @@ .public _020AFC70 .public _022A4F38 .public _s32_div_f +.public DirectoryFileMngr_OpenDirectoryFile +.public DisplayAndSwitchAnimationControlCurrentFrame +.public GeomSwapBuffers +.public GX_BeginLoadTex +.public GX_BeginLoadTexPltt +.public GX_EndLoadTex +.public GX_EndLoadTexPltt +.public GX_LoadTex +.public GX_LoadTexPltt +.public HandleSir0Translation +.public LoadFileFromRom +.public LoadObjPalette +.public MemAlloc +.public MemFree +.public MemZero +.public OBJ_GRAPHICS_CONTROLS_PTR .public strcat .public strcpy .public strncmp diff --git a/asm/include/main_0201E3AC.inc b/asm/include/main_0201E3AC.inc index 84ff4f66..39aa30ec 100644 --- a/asm/include/main_0201E3AC.inc +++ b/asm/include/main_0201E3AC.inc @@ -1,59 +1,4 @@ #pragma once -.public CopyStringFromId -.public Debug_FatalError -.public Debug_GetDebugFlag -.public Debug_Print0 -.public DungeonGoesUp -.public DungeonSwapIdxToId -.public ENTITIES -.public G3i_LookAt_ -.public G3i_OrthoW_ -.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 GetNbFloorsPlusOne -.public GetResolvedPerformanceProgressFlag -.public GetStringFromFileVeneer -.public GetTeamMember -.public GetTypeStringId -.public LANGUAGE_INFO_DATA -.public LoadScriptVariableValue -.public LoadScriptVariableValueAtIndex -.public LoadScriptVariableValueString -.public LoadStringFile -.public MOVE_ACCURACY_STARS_TABLE -.public MOVE_POWER_STARS_TABLE -.public MaybeGetFormattedItemName -.public MemAlloc -.public MemZero -.public NewRender3dQuadrilateral -.public NewRender3dRectangle -.public NewRender3dTexture -.public NewRender3dTiling -.public PlanCopyTextureToTextureVram -.public PlaySeByIdVolumeWrapper -.public RENDER_3D -.public RENDER_3D_FUNCTIONS_64 -.public Render3dProcessQueue -.public Rgb8ToRgb5 -.public StringFromId -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR .public _020997A4 .public _020997B4 .public _020997E4 @@ -197,9 +142,63 @@ .public _022A5970 .public _s32_div_f .public _u32_div_f +.public CopyStringFromId +.public Debug_FatalError +.public Debug_GetDebugFlag +.public Debug_Print0 +.public DungeonGoesUp +.public DungeonSwapIdxToId +.public ENTITIES +.public G3i_LookAt_ +.public G3i_OrthoW_ +.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 GetNbFloorsPlusOne +.public GetResolvedPerformanceProgressFlag +.public GetStringFromFileVeneer +.public GetTeamMember +.public GetTypeStringId +.public LANGUAGE_INFO_DATA +.public LoadScriptVariableValue +.public LoadScriptVariableValueAtIndex +.public LoadScriptVariableValueString +.public LoadStringFile +.public MaybeGetFormattedItemName +.public MemAlloc +.public MemZero +.public MOVE_ACCURACY_STARS_TABLE +.public MOVE_POWER_STARS_TABLE +.public NewRender3dQuadrilateral +.public NewRender3dRectangle +.public NewRender3dTexture +.public NewRender3dTiling +.public PlanCopyTextureToTextureVram +.public PlaySeByIdVolumeWrapper +.public Render3dProcessQueue +.public RENDER_3D +.public RENDER_3D_FUNCTIONS_64 +.public Rgb8ToRgb5 .public strcat .public strcpy +.public StringFromId .public strlen +.public StrncpySimpleNoPadSafe .public strstr .public sub_01FF8F04 .public sub_02006220 @@ -220,4 +219,5 @@ .public sub_02065BF0 .public sub_02065CD8 .public sub_0206A90C +.public TEAM_MEMBER_TABLE_PTR .public vsprintf diff --git a/asm/include/main_0202598C.inc b/asm/include/main_0202598C.inc index 031cf83b..1c243f47 100644 --- a/asm/include/main_0202598C.inc +++ b/asm/include/main_0202598C.inc @@ -1,22 +1,4 @@ #pragma once -.public DrawChar -.public FileRom_HandleRead -.public FileRom_HandleSeek -.public FileRom_InitDataTransfer -.public FileRom_StopDataTransfer -.public GetColorCodePaletteOffset -.public GetHeldButtons -.public GetPressedButtons -.public GetReleasedStylus -.public GetWindow -.public GetWindowRectangle -.public HandleSir0Translation -.public IsTouchScreenNotOff -.public LoadFileFromRom -.public RandInt -.public TBL_TALK_GROUP_STRING_ID_START -.public UnloadFile -.public UpdateWindow .public _0209AB60 .public _0209AB9C .public _0209ABF0 @@ -37,6 +19,21 @@ .public _022A7A64 .public _022A92B4_JP .public _022A92C4 +.public DrawChar +.public FileRom_HandleRead +.public FileRom_HandleSeek +.public FileRom_InitDataTransfer +.public FileRom_StopDataTransfer +.public GetColorCodePaletteOffset +.public GetHeldButtons +.public GetPressedButtons +.public GetReleasedStylus +.public GetWindow +.public GetWindowRectangle +.public HandleSir0Translation +.public IsTouchScreenNotOff +.public LoadFileFromRom +.public RandInt .public sprintf .public sub_01FF905C .public sub_01FF9130_JP @@ -54,3 +51,6 @@ .public sub_02028324 .public sub_020288DC .public sub_020288FC +.public TBL_TALK_GROUP_STRING_ID_START +.public UnloadFile +.public UpdateWindow diff --git a/asm/include/main_020261F4.inc b/asm/include/main_020261F4.inc index 053173fd..fd58f093 100644 --- a/asm/include/main_020261F4.inc +++ b/asm/include/main_020261F4.inc @@ -1,9 +1,9 @@ #pragma once +.public _020AFD04 .public AnalyzeText .public DrawChar .public GetColorCodePaletteOffset .public PreprocessStringFromId -.public _020AFD04 .public sub_02020B4C .public sub_02020B60 .public sub_02020B74 diff --git a/asm/include/main_0202676C.inc b/asm/include/main_0202676C.inc index 0ab1b0fe..bdbf1107 100644 --- a/asm/include/main_0202676C.inc +++ b/asm/include/main_0202676C.inc @@ -1,15 +1,4 @@ #pragma once -.public DecompressAtHalf -.public DelayWteFree -.public GetWindow -.public LoadAlert -.public LoadCursors -.public LoadFileFromRom -.public LoadWteFromRom -.public MemZero -.public Memcpy32 -.public UnloadFile -.public WINDOW_LIST .public _0209AC4C .public _0209AC50 .public _0209AC54 @@ -38,7 +27,16 @@ .public _022A88E4 .public _022A92B4_JP .public _022A92B8_JP +.public DecompressAtHalf +.public DelayWteFree +.public GetWindow +.public LoadAlert +.public LoadCursors +.public LoadFileFromRom +.public LoadWteFromRom +.public Memcpy32 .public memset +.public MemZero .public sub_0200A124 .public sub_0200A29C .public sub_0200B2C4 @@ -51,3 +49,5 @@ .public sub_0202903C .public sub_02029A50 .public sub_0202A124 +.public UnloadFile +.public WINDOW_LIST diff --git a/asm/include/main_020276C0.inc b/asm/include/main_020276C0.inc index fc03656f..dfc155e7 100644 --- a/asm/include/main_020276C0.inc +++ b/asm/include/main_020276C0.inc @@ -1,12 +1,12 @@ #pragma once +.public _022A7A6C +.public _022A7A74 +.public _022A7B1C .public GetPaletteBaseAddress__020278A8 .public InitRender3dElement64 .public InitWindowTrailer .public MemAlloc -.public WINDOW_LIST -.public _022A7A6C -.public _022A7A74 -.public _022A7B1C .public sub_020278C4 .public sub_02027B1C .public sub_02029A50 +.public WINDOW_LIST diff --git a/asm/include/main_020278C4.inc b/asm/include/main_020278C4.inc index eac6a5d1..87a9aeb5 100644 --- a/asm/include/main_020278C4.inc +++ b/asm/include/main_020278C4.inc @@ -1,5 +1,5 @@ #pragma once -.public WINDOW_LIST .public _022A7A6C .public _022A8990 .public _022A8991 +.public WINDOW_LIST diff --git a/asm/include/main_02027B88.inc b/asm/include/main_02027B88.inc index 1922fcc8..ff711d01 100644 --- a/asm/include/main_02027B88.inc +++ b/asm/include/main_02027B88.inc @@ -1,10 +1,10 @@ #pragma once -.public InitWindowTrailer -.public WINDOW_LIST .public _0209AC64 .public _0209ACAC .public _020AFD4C .public _020AFD98 .public _022A7A6C .public _022A7AE4 +.public InitWindowTrailer .public sub_0200B3FC +.public WINDOW_LIST diff --git a/asm/include/main_02028354.inc b/asm/include/main_02028354.inc index 24825b89..135b00e5 100644 --- a/asm/include/main_02028354.inc +++ b/asm/include/main_02028354.inc @@ -1,17 +1,4 @@ #pragma once -.public CURSOR_16_ANIMATION_CONTROL -.public CURSOR_16_SPRITE_ID -.public CURSOR_ANIMATION_CONTROL -.public GetPageItemYOffset -.public GetPaletteBaseAddress__020278A8 -.public InitAnimationControlWithSet__0201C0B0 -.public LoadWanTableEntry -.public Memcpy32 -.public PREV_MENU_ITEMS -.public SetAnimationForAnimationControl -.public SetSpriteIdForAnimationControl -.public WAN_TABLE -.public WINDOW_LIST .public _0209AC64 .public _0209AC78 .public _0209ACA8 @@ -34,7 +21,18 @@ .public _022A8992 .public _022A9A5C .public _022AA35C +.public CURSOR_16_ANIMATION_CONTROL +.public CURSOR_16_SPRITE_ID +.public CURSOR_ANIMATION_CONTROL +.public GetPageItemYOffset +.public GetPaletteBaseAddress__020278A8 +.public InitAnimationControlWithSet__0201C0B0 +.public LoadWanTableEntry +.public Memcpy32 .public memset +.public PREV_MENU_ITEMS +.public SetAnimationForAnimationControl +.public SetSpriteIdForAnimationControl .public sub_0200302C .public sub_020030FC .public sub_0200A174 @@ -60,3 +58,5 @@ .public sub_02033350 .public sub_02033390 .public sub_020333B4 +.public WAN_TABLE +.public WINDOW_LIST diff --git a/asm/include/main_02029EE8.inc b/asm/include/main_02029EE8.inc index d7ad0871..2763784b 100644 --- a/asm/include/main_02029EE8.inc +++ b/asm/include/main_02029EE8.inc @@ -1,4 +1,7 @@ #pragma once +.public _0209AE20 +.public _020AFDA0 +.public _020AFDA8 .public ALERT_ANIMATION_CONTROL .public ALERT_SPRITE_ID .public DisplayAndSwitchAnimationControlCurrentFrame @@ -8,12 +11,9 @@ .public MemAlloc .public SetAnimationForAnimationControl .public SetSpriteIdForAnimationControl -.public WAN_TABLE -.public _0209AE20 -.public _020AFDA0 -.public _020AFDA8 .public sub_02025D90 .public sub_020334A8 .public sub_020335A8 .public sub_02033BC0 .public sub_02034360 +.public WAN_TABLE diff --git a/asm/include/main_0202A3E4.inc b/asm/include/main_0202A3E4.inc index 5db35703..de4b0892 100644 --- a/asm/include/main_0202A3E4.inc +++ b/asm/include/main_0202A3E4.inc @@ -1,4 +1,7 @@ #pragma once +.public _0209AE34 +.public _0209AE44 +.public _020AFDAC .public CreateParentMenuInternal .public CreateTextBox .public FileClose @@ -11,10 +14,7 @@ .public GetStringFromFileVeneer .public MemAlloc .public MemFree -.public UpdateWindow -.public _0209AE34 -.public _0209AE44 -.public _020AFDAC .public sub_02026E3C .public sub_02027040 .public sub_02027A08 +.public UpdateWindow diff --git a/asm/include/main_0202A690.inc b/asm/include/main_0202A690.inc index 4943549f..e9a1e236 100644 --- a/asm/include/main_0202A690.inc +++ b/asm/include/main_0202A690.inc @@ -9,10 +9,10 @@ .public MemFree .public NewWindowScreenCheck .public PARENT_MENU_DEFAULT_WINDOW_PARAMS -.public UpdateParentMenu -.public UpdateWindow .public strcpy .public sub_020265A8 .public sub_020287C4 .public sub_02031A5C .public sub_02032984 +.public UpdateParentMenu +.public UpdateWindow diff --git a/asm/include/main_0202AB94.inc b/asm/include/main_0202AB94.inc index 05fe6b89..8847c387 100644 --- a/asm/include/main_0202AB94.inc +++ b/asm/include/main_0202AB94.inc @@ -13,8 +13,6 @@ .public PlayWindowInputSound .public PreprocessStringFromId .public SIMPLE_MENU_DEFAULT_WINDOW_PARAMS -.public UpdateSimpleMenu -.public UpdateWindow .public sub_020263C8 .public sub_020265A8 .public sub_02027B1C @@ -34,3 +32,5 @@ .public sub_02032684 .public sub_02032984 .public sub_02033758 +.public UpdateSimpleMenu +.public UpdateWindow diff --git a/asm/include/main_0202B568.inc b/asm/include/main_0202B568.inc index 3efde11c..2abef97c 100644 --- a/asm/include/main_0202B568.inc +++ b/asm/include/main_0202B568.inc @@ -8,7 +8,6 @@ .public GetWindowContents .public IsMenuOptionActive .public PlayWindowInputSound -.public UpdateWindow .public sub_020263C8 .public sub_02027B1C .public sub_0202810C @@ -24,3 +23,4 @@ .public sub_0203250C .public sub_02032684 .public sub_02033758 +.public UpdateWindow diff --git a/asm/include/main_0202BA20.inc b/asm/include/main_0202BA20.inc index c5833b4d..78ab989e 100644 --- a/asm/include/main_0202BA20.inc +++ b/asm/include/main_0202BA20.inc @@ -6,7 +6,7 @@ .public InitWindowInput .public MemAlloc .public NewWindowScreenCheck -.public UpdateAdvancedMenu .public sub_020265A8 .public sub_02031A5C .public sub_02032984 +.public UpdateAdvancedMenu diff --git a/asm/include/main_0202BD10.inc b/asm/include/main_0202BD10.inc index 603b4995..9347ab23 100644 --- a/asm/include/main_0202BD10.inc +++ b/asm/include/main_0202BD10.inc @@ -1,6 +1,6 @@ #pragma once -.public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS .public CalcMenuHeightDiv8__02031AA4 +.public COLLECTION_MENU_DEFAULT_WINDOW_PARAMS .public GetNumItemsOnPage .public GetPageItemYOffset .public GetPageStart @@ -12,8 +12,6 @@ .public MemAlloc .public NewWindowScreenCheck .public PlayWindowInputSound -.public UpdateCollectionMenu -.public UpdateWindow .public sub_02026358 .public sub_02026428 .public sub_020265A8 @@ -32,3 +30,5 @@ .public sub_0203250C .public sub_02032684 .public sub_02033758 +.public UpdateCollectionMenu +.public UpdateWindow diff --git a/asm/include/main_0202C7E4.inc b/asm/include/main_0202C7E4.inc index 615ed95d..8a020528 100644 --- a/asm/include/main_0202C7E4.inc +++ b/asm/include/main_0202C7E4.inc @@ -6,7 +6,6 @@ .public GetWindowContents .public IsMenuOptionActive .public PlayWindowInputSound -.public UpdateWindow .public sub_02025D90 .public sub_02026358 .public sub_02026428 @@ -26,3 +25,4 @@ .public sub_020324C4 .public sub_02032684 .public sub_02033758 +.public UpdateWindow diff --git a/asm/include/main_0202D0EC.inc b/asm/include/main_0202D0EC.inc index d0ecc46f..a9d9c0ad 100644 --- a/asm/include/main_0202D0EC.inc +++ b/asm/include/main_0202D0EC.inc @@ -1,8 +1,13 @@ #pragma once +.public _0209AEE0 +.public _0209AEEC +.public _0209AEF4 +.public _0209AEFC +.public _0209AF04 .public CalcMenuHeightDiv8__02031AA4 .public DEBUG_MENU_DEFAULT_WINDOW_PARAMS -.public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS .public DeleteWindow +.public DIALOGUE_BOX_DEFAULT_WINDOW_PARAMS .public DrawTextInWindow .public GetCurrentPage .public GetNumItemsOnPage @@ -25,13 +30,6 @@ .public PreprocessString .public PreprocessStringFromId .public SCROLL_BOX_DEFAULT_WINDOW_PARAMS -.public UpdateDialogueBox -.public UpdateWindow -.public _0209AEE0 -.public _0209AEEC -.public _0209AEF4 -.public _0209AEFC -.public _0209AF04 .public strcpy .public sub_02006C8C .public sub_02021F44 @@ -66,3 +64,5 @@ .public sub_020323F8 .public sub_02032684 .public sub_02033758 +.public UpdateDialogueBox +.public UpdateWindow diff --git a/asm/include/main_0202F190.inc b/asm/include/main_0202F190.inc index 61916094..6a29746c 100644 --- a/asm/include/main_0202F190.inc +++ b/asm/include/main_0202F190.inc @@ -1,4 +1,5 @@ #pragma once +.public _0209AF6C .public AREA_NAME_BOX_DEFAULT_WINDOW_PARAMS .public DeleteWindow .public GetPressedButtons @@ -7,15 +8,12 @@ .public IsValidPortrait .public LoadPortrait .public MemAlloc -.public MemFree .public MemcpySimple +.public MemFree .public NewWindowScreenCheck .public PORTRAIT_BOX_DEFAULT_WINDOW_PARAMS .public PreprocessString .public PreprocessStringFromId -.public TEXT_BOX_DEFAULT_WINDOW_PARAMS -.public UpdateAreaNameBox -.public _0209AF6C .public sub_0202613C .public sub_02026184 .public sub_02026194 @@ -36,3 +34,5 @@ .public sub_0202836C .public sub_02028770 .public sub_02048240 +.public TEXT_BOX_DEFAULT_WINDOW_PARAMS +.public UpdateAreaNameBox diff --git a/asm/include/main_0202FD50.inc b/asm/include/main_0202FD50.inc index 7d4e300d..dc133637 100644 --- a/asm/include/main_0202FD50.inc +++ b/asm/include/main_0202FD50.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public ADVANCED_TEXT_BOX_DEFAULT_WINDOW_PARAMS .public ALERT_BOX_DEFAULT_WINDOW_PARAMS .public AnalyzeText @@ -14,9 +15,6 @@ .public MemZero .public NewWindowScreenCheck .public PreprocessString -.public UpdateAdvancedTextBox -.public UpdateWindow -.public _s32_div_f .public sub_01FF9128 .public sub_01FF929C .public sub_02020B60 @@ -30,3 +28,5 @@ .public sub_0202810C .public sub_0202812C .public sub_0202836C +.public UpdateAdvancedTextBox +.public UpdateWindow diff --git a/asm/include/main_02030A90.inc b/asm/include/main_02030A90.inc index fc8f63de..8272a953 100644 --- a/asm/include/main_02030A90.inc +++ b/asm/include/main_02030A90.inc @@ -16,8 +16,6 @@ .public NewWindowScreenCheck .public PlaySeVolumeWrapper .public PlayWindowInputSound -.public TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS -.public UpdateWindow .public sub_020063A0 .public sub_020063F4 .public sub_02006BFC @@ -54,3 +52,5 @@ .public sub_020336FC .public sub_02033758 .public sub_0203C984 +.public TEAM_SELECTION_MENU_DEFAULT_WINDOW_PARAMS +.public UpdateWindow diff --git a/asm/include/main_02032960.inc b/asm/include/main_02032960.inc index c4cf4ca3..9b17e623 100644 --- a/asm/include/main_02032960.inc +++ b/asm/include/main_02032960.inc @@ -1,9 +1,9 @@ #pragma once +.public _s32_div_f .public InventoryMenuNext10Pages .public InventoryMenuPrevious10Pages .public InventoryMenuPreviousPage .public PlaySeVolumeWrapper -.public _s32_div_f .public sub_02006BFC .public sub_02006C8C .public sub_02031908 diff --git a/asm/include/main_02033414.inc b/asm/include/main_02033414.inc index f9693fc7..09025a36 100644 --- a/asm/include/main_02033414.inc +++ b/asm/include/main_02033414.inc @@ -1,19 +1,4 @@ #pragma once -.public AppendStandardStringToMission -.public DrawTextInWindow -.public GetCurrentPage -.public GetTotalNumPages -.public InventoryMenuNext10Pages -.public InventoryMenuNextPage -.public InventoryMenuPrevious10Pages -.public InventoryMenuPreviousPage -.public MENU_CONTROL_PTR -.public MemAlloc -.public NULL_OVERLAY_LOAD_ENTRY -.public PlayWindowInputSound -.public PreprocessString -.public PreprocessStringFromId -.public UnloadOverlay .public _0209AFC4 .public _0209AFDC .public _0209AFE4 @@ -37,6 +22,20 @@ .public _0209B074 .public _0209B07C .public _0209B084 +.public AppendStandardStringToMission +.public DrawTextInWindow +.public GetCurrentPage +.public GetTotalNumPages +.public InventoryMenuNext10Pages +.public InventoryMenuNextPage +.public InventoryMenuPrevious10Pages +.public InventoryMenuPreviousPage +.public MemAlloc +.public MENU_CONTROL_PTR +.public NULL_OVERLAY_LOAD_ENTRY +.public PlayWindowInputSound +.public PreprocessString +.public PreprocessStringFromId .public sub_02006C8C .public sub_02025D50 .public sub_02026594 @@ -55,3 +54,4 @@ .public sub_020333B4 .public sub_020333D8 .public sub_020469BC +.public UnloadOverlay diff --git a/asm/include/main_02034974.inc b/asm/include/main_02034974.inc index 3e85fa0e..b75fbbac 100644 --- a/asm/include/main_02034974.inc +++ b/asm/include/main_02034974.inc @@ -1,4 +1,40 @@ #pragma once +.public _0209B09C +.public _0209B0EC +.public _0209B0FC +.public _0209B10C +.public _0209B11C +.public _0209B134 +.public _0209B1B8 +.public _0209B1C8 +.public _0209B1D8 +.public _0209B1F0 +.public _0209B208 +.public _0209B218 +.public _0209B228 +.public _0209B244 +.public _0209B254 +.public _0209B264 +.public _0209B28C +.public _0209B298 +.public _0209B2B8 +.public _0209B2C4 +.public _0209B2D0 +.public _0209B2DC +.public _0209B2EC +.public _0209B2FC +.public _0209B31C +.public _0209B32C +.public _0209B32E +.public _0209B3B4 +.public _0209B3B6 +.public _020AFDBC +.public _020AFDD0 +.public _020AFDD8 +.public _020AFDE0 +.public _020AFDE8 +.public _020AFDF0 +.public _s32_div_f .public CheckDebugMenuField0x1A4 .public CheckOptionsMenuField0x1A4 .public CheckParentMenuField0x1A0 @@ -42,11 +78,11 @@ .public IsSimpleMenuActive .public IsValidPortrait .public LoadOverlay -.public MENU_CONTROL_PTR .public MemAlloc +.public MemcpySimple .public MemFree .public MemZero -.public MemcpySimple +.public MENU_CONTROL_PTR .public NULL_OVERLAY_LOAD_ENTRY .public OverlayIsLoaded .public OverlayLoadEntriesEqual @@ -59,44 +95,8 @@ .public ShowPortraitInPortraitBox .public ShowStringIdInDialogueBox .public ShowStringInDialogueBox -.public StrcpySimple -.public _0209B09C -.public _0209B0EC -.public _0209B0FC -.public _0209B10C -.public _0209B11C -.public _0209B134 -.public _0209B1B8 -.public _0209B1C8 -.public _0209B1D8 -.public _0209B1F0 -.public _0209B208 -.public _0209B218 -.public _0209B228 -.public _0209B244 -.public _0209B254 -.public _0209B264 -.public _0209B28C -.public _0209B298 -.public _0209B2B8 -.public _0209B2C4 -.public _0209B2D0 -.public _0209B2DC -.public _0209B2EC -.public _0209B2FC -.public _0209B31C -.public _0209B32C -.public _0209B32E -.public _0209B3B4 -.public _0209B3B6 -.public _020AFDBC -.public _020AFDD0 -.public _020AFDD8 -.public _020AFDE0 -.public _020AFDE8 -.public _020AFDF0 -.public _s32_div_f .public strcpy +.public StrcpySimple .public sub_020063F4 .public sub_02027180 .public sub_020282F4 diff --git a/asm/include/main_02037570.inc b/asm/include/main_02037570.inc index 38af2902..3cc25705 100644 --- a/asm/include/main_02037570.inc +++ b/asm/include/main_02037570.inc @@ -1,75 +1,4 @@ #pragma once -.public AppendStandardStringToMission -.public CloseAdvancedMenu -.public CloseAdvancedTextBox -.public CloseDialogueBox -.public CloseSimpleMenu -.public CloseTeamSelectionMenu -.public CloseTextBox -.public CreateAdvancedMenu -.public CreateAdvancedTextBox -.public CreateDialogueBox -.public CreateSimpleMenuFromStringIds -.public CreateTeamSelectionMenu -.public CreateTextBox -.public Debug_Print0 -.public DrawTextInWindow -.public FemaleToMaleForm -.public GetActiveRosterIndex -.public GetActiveTeamMember -.public GetAdvancedMenuResult -.public GetAppointedLeaderMemberIdx -.public GetDexNumber -.public GetDigitInputResult -.public GetEvolutionPossibilities -.public GetHero -.public GetHeroMemberIdx -.public GetItemMoveId16 -.public GetKeyM2NSwitch -.public GetKeyboardStatus -.public GetKeyboardStringResult -.public GetMainCharacter1MemberIdx -.public GetMainCharacter2MemberIdx -.public GetMainCharacter3MemberIdx -.public GetNameString -.public GetPartner -.public GetPartnerMemberIdx -.public GetPressedButtons -.public GetSimpleMenuResult__0202B870 -.public GetStringFromFileVeneer -.public GetTeamMember -.public GetType -.public GetWindow -.public IsAdvancedMenuActive2 -.public IsAdvancedTextBoxActive -.public IsDialogueBoxActive -.public IsMainCharacter -.public IsMovesetValidInTimeDarkness -.public IsShaymin -.public IsSimpleMenuActive -.public IsTeamSelectionMenuActive -.public IsTeamSelectionMenuState3 -.public IsTextboxState3 -.public IsValidTeamMember -.public KEYBOARD_STRING_IDS -.public MemAlloc -.public MemFree -.public MemZero -.public MemcpySimple -.public PlaySeVolumeWrapper -.public PreprocessStringFromId -.public ReturnScriptMenuResultZero -.public SaveScriptVariableValueBytes -.public SetAdvancedTextBoxField0x1C2 -.public SetAdvancedTextBoxState5 -.public SetMainTeamName -.public ShowKeyboard -.public ShowStringIdInDialogueBox -.public StrcpySimple -.public StrncpySimple -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public UpdateWindow .public _0209B288 .public _0209B28C .public _0209B2C4 @@ -124,9 +53,78 @@ .public _020B12A0_JP .public _022AADF8 .public _s32_div_f +.public AppendStandardStringToMission +.public CloseAdvancedMenu +.public CloseAdvancedTextBox +.public CloseDialogueBox +.public CloseSimpleMenu +.public CloseTeamSelectionMenu +.public CloseTextBox +.public CreateAdvancedMenu +.public CreateAdvancedTextBox +.public CreateDialogueBox +.public CreateSimpleMenuFromStringIds +.public CreateTeamSelectionMenu +.public CreateTextBox +.public Debug_Print0 +.public DrawTextInWindow +.public FemaleToMaleForm +.public GetActiveRosterIndex +.public GetActiveTeamMember +.public GetAdvancedMenuResult +.public GetAppointedLeaderMemberIdx +.public GetDexNumber +.public GetDigitInputResult +.public GetEvolutionPossibilities +.public GetHero +.public GetHeroMemberIdx +.public GetItemMoveId16 +.public GetKeyboardStatus +.public GetKeyboardStringResult +.public GetKeyM2NSwitch +.public GetMainCharacter1MemberIdx +.public GetMainCharacter2MemberIdx +.public GetMainCharacter3MemberIdx +.public GetNameString +.public GetPartner +.public GetPartnerMemberIdx +.public GetPressedButtons +.public GetSimpleMenuResult__0202B870 +.public GetStringFromFileVeneer +.public GetTeamMember +.public GetType +.public GetWindow +.public IsAdvancedMenuActive2 +.public IsAdvancedTextBoxActive +.public IsDialogueBoxActive +.public IsMainCharacter +.public IsMovesetValidInTimeDarkness +.public IsShaymin +.public IsSimpleMenuActive +.public IsTeamSelectionMenuActive +.public IsTeamSelectionMenuState3 +.public IsTextboxState3 +.public IsValidTeamMember +.public KEYBOARD_STRING_IDS +.public MemAlloc +.public MemcpySimple +.public MemFree +.public MemZero .public ov11_0230D71C +.public PlaySeVolumeWrapper +.public PreprocessStringFromId +.public ReturnScriptMenuResultZero +.public SaveScriptVariableValueBytes +.public SetAdvancedTextBoxField0x1C2 +.public SetAdvancedTextBoxState5 +.public SetMainTeamName +.public ShowKeyboard +.public ShowStringIdInDialogueBox .public sprintf .public strcpy +.public StrcpySimple +.public StrncpySimple +.public StrncpySimpleNoPadSafe .public sub_020063F4 .public sub_0202065C .public sub_0202372C @@ -170,4 +168,6 @@ .public sub_02056F60 .public sub_020584F8 .public sub_02059B08 +.public TEAM_MEMBER_TABLE_PTR +.public UpdateWindow .public vsprintf diff --git a/asm/include/main_0203C774.inc b/asm/include/main_0203C774.inc index 9b573d35..aad7a1a7 100644 --- a/asm/include/main_0203C774.inc +++ b/asm/include/main_0203C774.inc @@ -1,11 +1,11 @@ #pragma once -.public MemAlloc -.public StringFromId -.public UpdateWindow .public _0209C60C .public _020AFE5C .public _020AFE70 +.public MemAlloc +.public StringFromId .public sub_020262E0 .public sub_02027B1C .public sub_0203C984 .public sub_0203C9A0 +.public UpdateWindow diff --git a/asm/include/main_0203CAF0.inc b/asm/include/main_0203CAF0.inc index c314da23..5326ed68 100644 --- a/asm/include/main_0203CAF0.inc +++ b/asm/include/main_0203CAF0.inc @@ -1,4 +1,53 @@ #pragma once +.public _0209C7CC +.public _0209C7D4 +.public _0209C7E4 +.public _0209C820 +.public _0209C82C +.public _0209C83C +.public _0209C844 +.public _0209C846 +.public _0209C850 +.public _0209C85C +.public _0209C86C +.public _0209C884 +.public _0209C89C +.public _0209C8A8 +.public _0209C8B8 +.public _0209C8C8 +.public _0209C928 +.public _0209C92C +.public _0209C93C +.public _0209C94C +.public _0209C95C +.public _0209C96C +.public _0209C97C +.public _0209C98C +.public _0209C99C +.public _0209C9AC +.public _0209C9B0 +.public _0209C9CC +.public _0209C9D4 +.public _0209C9DC +.public _0209C9E4 +.public _0209C9F4 +.public _0209C9FC +.public _0209CA08 +.public _0209CA18 +.public _0209CA2C +.public _0209E912 +.public _020AFE70 +.public _020AFE78 +.public _020AFE7C +.public _020AFE8C +.public _020AFE90 +.public _020AFE98 +.public _022AADFC +.public _022AAE00 +.public _022AAE2A +.public _022AAE2E +.public _022AAE58 +.public _s32_div_f .public AddItemToStorage .public AddMoneyCarried .public AppendStandardStringToMission @@ -96,13 +145,22 @@ .public IsTouchScreenNotOff .public LAST_NEW_MOVE .public LoadScriptVariableValue -.public MISSION_REWARD_STRUCT_MAIN_PTR .public MaybeGetColoredFormattedItemName .public MaybeGetUncoloredFormattedItemName .public MemAlloc +.public memcpy +.public MemcpySimple .public MemFree .public MemZero -.public MemcpySimple +.public MISSION_REWARD_STRUCT_MAIN_PTR +.public ov11_023061CC +.public ov11_023061E4 +.public ov11_02306C64 +.public ov11_02306C9C +.public ov11_0230D000 +.public ov11_0230D220 +.public ov11_0230D92C +.public ov11_02310BDC .public PlayAdvancedTextBoxInputSound .public PlaySeByIdVolumeWrapper .public PlaySeVolumeWrapper @@ -111,7 +169,6 @@ .public RandIntSafe .public RemoveEmptyItemsInBag .public ResumeAdvancedMenu -.public STATUSES_FULL_DESCRIPTION_STRING_IDS .public SetAdvancedTextBoxField0x1C2 .public SetAdvancedTextBoxState5 .public SetCollectionMenuField0x1BC @@ -126,73 +183,13 @@ .public SetUnkAdvancedTextBoxWindowFn .public ShowKeyboard .public ShowPortraitInPortraitBox +.public STATUSES_FULL_DESCRIPTION_STRING_IDS +.public strcat +.public strcpy .public StrcpySimple .public StringFromId .public StrncpySimple .public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public UNK_STORAGE_STRUCT_0XC -.public UpdateWindow -.public _0209C7CC -.public _0209C7D4 -.public _0209C7E4 -.public _0209C820 -.public _0209C82C -.public _0209C83C -.public _0209C844 -.public _0209C846 -.public _0209C850 -.public _0209C85C -.public _0209C86C -.public _0209C884 -.public _0209C89C -.public _0209C8A8 -.public _0209C8B8 -.public _0209C8C8 -.public _0209C928 -.public _0209C92C -.public _0209C93C -.public _0209C94C -.public _0209C95C -.public _0209C96C -.public _0209C97C -.public _0209C98C -.public _0209C99C -.public _0209C9AC -.public _0209C9B0 -.public _0209C9CC -.public _0209C9D4 -.public _0209C9DC -.public _0209C9E4 -.public _0209C9F4 -.public _0209C9FC -.public _0209CA08 -.public _0209CA18 -.public _0209CA2C -.public _0209E912 -.public _020AFE70 -.public _020AFE78 -.public _020AFE7C -.public _020AFE8C -.public _020AFE90 -.public _020AFE98 -.public _022AADFC -.public _022AAE00 -.public _022AAE2A -.public _022AAE2E -.public _022AAE58 -.public _s32_div_f -.public memcpy -.public ov11_023061CC -.public ov11_023061E4 -.public ov11_02306C64 -.public ov11_02306C9C -.public ov11_0230D000 -.public ov11_0230D220 -.public ov11_0230D92C -.public ov11_02310BDC -.public strcat -.public strcpy .public sub_02001808 .public sub_020063F4 .public sub_02006498 @@ -259,4 +256,7 @@ .public sub_0205B028 .public sub_0205B0A0 .public sub_0205B0B8 +.public TEAM_MEMBER_TABLE_PTR +.public UNK_STORAGE_STRUCT_0XC +.public UpdateWindow .public vsprintf diff --git a/asm/include/main_02042BE0.inc b/asm/include/main_02042BE0.inc index be15d93b..7a6acabb 100644 --- a/asm/include/main_02042BE0.inc +++ b/asm/include/main_02042BE0.inc @@ -1,4 +1,6 @@ #pragma once +.public _0209CA48 +.public _0209CA58 .public BAG_ITEMS_PTR_MIRROR .public CountSelectedStorageItems .public CreateCollectionMenu @@ -10,10 +12,6 @@ .public PlaySeVolumeWrapper .public SetCollectionMenuVoidFn .public SortItemsInBag -.public UNK_STORAGE_STRUCT_0X14 -.public UNK_STORAGE_STRUCT_0XC -.public _0209CA48 -.public _0209CA58 .public sub_0202C654 .public sub_0202D068 .public sub_0202D16C @@ -28,3 +26,5 @@ .public sub_0204426C .public sub_02044308 .public sub_0204440C +.public UNK_STORAGE_STRUCT_0X14 +.public UNK_STORAGE_STRUCT_0XC diff --git a/asm/include/main_020432B4.inc b/asm/include/main_020432B4.inc index e5087df7..23b07c85 100644 --- a/asm/include/main_020432B4.inc +++ b/asm/include/main_020432B4.inc @@ -1,8 +1,8 @@ #pragma once +.public _0209CA3C .public ConvertStorageItemAtIdxToItem .public CountNbOfItemsInStorage .public CountNbOfValidItemsInStorage .public CountNbOfValidItemsInTimeDarknessInStorage .public MaybeGetColoredFormattedItemName .public UNK_STORAGE_STRUCT_0X14 -.public _0209CA3C diff --git a/asm/include/main_0204357C.inc b/asm/include/main_0204357C.inc index 7857c766..d130e028 100644 --- a/asm/include/main_0204357C.inc +++ b/asm/include/main_0204357C.inc @@ -1,96 +1,4 @@ #pragma once -.public AppendStandardStringToMission -.public Arm9LoadUnkFieldNa0x2029EC8 -.public BAG_ITEMS_PTR_MIRROR -.public ClearStorageSelectedItemTable -.public CloseAdvancedMenu -.public CloseAdvancedTextBox -.public CloseAdvancedTextBox2 -.public CloseDialogueBox -.public CloseParentMenu -.public CloseScrollBox -.public CloseSimpleMenu -.public CloseTextBox -.public CloseTextBox2 -.public CopyMenuControlWindowExtraInfo -.public CountNbOfItemsInStorage -.public CountSelectedStorageItems -.public CreateAdvancedMenu -.public CreateAdvancedTextBox -.public CreateAdvancedTextBoxWithArg -.public CreateDialogueBox -.public CreateParentMenu -.public CreateParentMenuFromStringIds -.public CreateScrollBoxSingle -.public CreateSimpleMenu -.public CreateSimpleMenuFromStringIds -.public CreateTextBox -.public CreateTextBoxWithArg -.public DUNGEON_PTR -.public DrawTextInWindow -.public DrawTileGrid -.public FreeUnkStorageStruct0x18c0 -.public GetActiveTeamMember -.public GetAdvancedMenuCurrentOption -.public GetAdvancedMenuResult -.public GetAdvancedTextBoxFlags2 -.public GetCurrentBagCapacity -.public GetItemAtIdx -.public GetItemCategoryVeneer -.public GetMoneyCarried -.public GetMonsterOrTrapName -.public GetNameRaw -.public GetNbItemsInBag -.public GetPressedButtons -.public GetRecoloredNameOfTeamMemberAtIdx -.public GetReleasedStylus -.public GetSimpleMenuResult__0202AEA4 -.public GetSimpleMenuResult__0202B870 -.public GetStringFromFileVeneer -.public GetType -.public GetWindowIdSelectedItemOnPage -.public InitMenu -.public InitMenuWithWindowExtraInfo -.public InitPreprocessorArgs -.public InitUnkStorageStruct0x18c0 -.public IsAdvancedMenuActive2 -.public IsAdvancedTextBoxActive -.public IsDialogueBoxActive -.public IsExclusiveItemIdForMonster -.public IsExperienceLocked -.public IsItemInTimeDarkness -.public IsItemValidVeneer -.public IsParentMenuActive -.public IsScrollBoxActive -.public IsSimpleMenuActive -.public IsTextboxState3 -.public IsTouchScreenNotOff -.public IsTreasureBox -.public MaybeGetColoredFormattedItemName -.public MaybeGetFormattedItemName -.public MemAlloc -.public MemFree -.public MemZero -.public PlayBgmByIdVeneer -.public PlaySeVolumeWrapper -.public PreprocessString -.public PreprocessStringFromId -.public ReadStringFromDialogueBox -.public SetAdvancedTextBoxField0x1C2 -.public SetAdvancedTextBoxPartialMenu -.public ShowDialogueBox -.public ShowStringIdInDialogueBox -.public ShowStringInDialogueBox -.public SortItemsInStorage -.public StringFromId -.public TEAM_MEMBER_TABLE_PTR -.public TryPointCameraToMonster -.public UNK_STORAGE_STRUCT_0X14 -.public UNK_STORAGE_STRUCT_0X410_PTR -.public UNK_STORAGE_STRUCT_0X8_PTR_1 -.public UNK_STORAGE_STRUCT_0X8_PTR_2 -.public UNK_STORAGE_WINDOW_STRUCT_0XC_PTR -.public UpdateWindow .public _0209CA68 .public _0209CA78 .public _0209CA88 @@ -135,10 +43,94 @@ .public _022AAE64 .public _022AAE68 .public _s32_div_f +.public AppendStandardStringToMission +.public Arm9LoadUnkFieldNa0x2029EC8 +.public BAG_ITEMS_PTR_MIRROR +.public ClearStorageSelectedItemTable +.public CloseAdvancedMenu +.public CloseAdvancedTextBox +.public CloseAdvancedTextBox2 +.public CloseDialogueBox +.public CloseParentMenu +.public CloseScrollBox +.public CloseSimpleMenu +.public CloseTextBox +.public CloseTextBox2 +.public CopyMenuControlWindowExtraInfo +.public CountNbOfItemsInStorage +.public CountSelectedStorageItems +.public CreateAdvancedMenu +.public CreateAdvancedTextBox +.public CreateAdvancedTextBoxWithArg +.public CreateDialogueBox +.public CreateParentMenu +.public CreateParentMenuFromStringIds +.public CreateScrollBoxSingle +.public CreateSimpleMenu +.public CreateSimpleMenuFromStringIds +.public CreateTextBox +.public CreateTextBoxWithArg +.public DrawTextInWindow +.public DrawTileGrid +.public DUNGEON_PTR +.public FreeUnkStorageStruct0x18c0 +.public GetActiveTeamMember +.public GetAdvancedMenuCurrentOption +.public GetAdvancedMenuResult +.public GetAdvancedTextBoxFlags2 +.public GetCurrentBagCapacity +.public GetItemAtIdx +.public GetItemCategoryVeneer +.public GetMoneyCarried +.public GetMonsterOrTrapName +.public GetNameRaw +.public GetNbItemsInBag +.public GetPressedButtons +.public GetRecoloredNameOfTeamMemberAtIdx +.public GetReleasedStylus +.public GetSimpleMenuResult__0202AEA4 +.public GetSimpleMenuResult__0202B870 +.public GetStringFromFileVeneer +.public GetType +.public GetWindowIdSelectedItemOnPage +.public InitMenu +.public InitMenuWithWindowExtraInfo +.public InitPreprocessorArgs +.public InitUnkStorageStruct0x18c0 +.public IsAdvancedMenuActive2 +.public IsAdvancedTextBoxActive +.public IsDialogueBoxActive +.public IsExclusiveItemIdForMonster +.public IsExperienceLocked +.public IsItemInTimeDarkness +.public IsItemValidVeneer +.public IsParentMenuActive +.public IsScrollBoxActive +.public IsSimpleMenuActive +.public IsTextboxState3 +.public IsTouchScreenNotOff +.public IsTreasureBox +.public MaybeGetColoredFormattedItemName +.public MaybeGetFormattedItemName +.public MemAlloc +.public MemFree +.public MemZero .public ov29_022EA62C .public ov29_023002F0 .public ov29_02347100 +.public PlayBgmByIdVeneer +.public PlaySeVolumeWrapper +.public PreprocessString +.public PreprocessStringFromId +.public ReadStringFromDialogueBox +.public SetAdvancedTextBoxField0x1C2 +.public SetAdvancedTextBoxPartialMenu +.public ShowDialogueBox +.public ShowStringIdInDialogueBox +.public ShowStringInDialogueBox +.public SortItemsInStorage .public strcpy +.public StringFromId .public strlen .public strncmp .public sub_020063F4 @@ -186,3 +178,11 @@ .public sub_02054804 .public sub_02056228 .public sub_02058460 +.public TEAM_MEMBER_TABLE_PTR +.public TryPointCameraToMonster +.public UNK_STORAGE_STRUCT_0X14 +.public UNK_STORAGE_STRUCT_0X410_PTR +.public UNK_STORAGE_STRUCT_0X8_PTR_1 +.public UNK_STORAGE_STRUCT_0X8_PTR_2 +.public UNK_STORAGE_WINDOW_STRUCT_0XC_PTR +.public UpdateWindow diff --git a/asm/include/main_020484C0.inc b/asm/include/main_020484C0.inc index f4c7a173..4a8bf408 100644 --- a/asm/include/main_020484C0.inc +++ b/asm/include/main_020484C0.inc @@ -1,4 +1,9 @@ #pragma once +.public _020A2808 +.public _020A2830 +.public _020A2844 +.public _020A2880 +.public _020A2894 .public AssignSpecialEpisodePc .public EventFlagBackup .public EventFlagResume @@ -15,11 +20,6 @@ .public SetBothScreensWindowsColor .public SetSpecialEpisodeOpenOld .public SetTeamSetupHeroAndPartnerOnly -.public _020A2808 -.public _020A2830 -.public _020A2844 -.public _020A2880 -.public _020A2894 .public sub_0200CAD4 .public sub_0200CAE4 .public sub_02048B48 diff --git a/asm/include/main_02048764.inc b/asm/include/main_02048764.inc index e7c59624..15e88323 100644 --- a/asm/include/main_02048764.inc +++ b/asm/include/main_02048764.inc @@ -1,4 +1,10 @@ #pragma once +.public _020A281C +.public _020A2858 +.public _020A286C +.public _020A28A8 +.public _020AFF00 +.public _020AFF14 .public ApplyLevelUpBoostsToGroundMonster .public DEFAULT_HERO_ID .public EnableAllLearnableIqSkills @@ -17,18 +23,12 @@ .public NOTIFY_NOTE .public PARTNER_TALK_KIND_TABLE .public Rand32Bit -.public SPECIAL_EPISODE_MAIN_CHARACTERS .public SaveScriptVariableValue .public SaveScriptVariableValueBytes .public SetBothScreensWindowsColor .public SetTeamSetupHeroAndPartnerOnly +.public SPECIAL_EPISODE_MAIN_CHARACTERS .public StrncpyName -.public _020A281C -.public _020A2858 -.public _020A286C -.public _020A28A8 -.public _020AFF00 -.public _020AFF14 .public sub_02048C0C .public sub_02048C3C .public sub_02048C4C diff --git a/asm/include/main_02048B74.inc b/asm/include/main_02048B74.inc index 5e43ecb9..68c984d2 100644 --- a/asm/include/main_02048B74.inc +++ b/asm/include/main_02048B74.inc @@ -1,5 +1,5 @@ #pragma once -.public Debug_Print0 .public _0209CD4C .public _020AFF38 .public _022AAE70 +.public Debug_Print0 diff --git a/asm/include/main_02048C5C.inc b/asm/include/main_02048C5C.inc index bbe607bc..a106d8c1 100644 --- a/asm/include/main_02048C5C.inc +++ b/asm/include/main_02048C5C.inc @@ -1,5 +1,5 @@ #pragma once -.public MemsetSimple -.public ReadStringSave .public _022AAE74 .public _022AAE78 +.public MemsetSimple +.public ReadStringSave diff --git a/asm/include/main_02048CF8.inc b/asm/include/main_02048CF8.inc index 23423d05..e0fbc561 100644 --- a/asm/include/main_02048CF8.inc +++ b/asm/include/main_02048CF8.inc @@ -1,14 +1,43 @@ #pragma once +.public _0209CD6C +.public _0209CD84 +.public _0209CD94 +.public _0209CDA4 +.public _0209CDB8 +.public _0209CDD0 +.public _0209CDE0 +.public _0209CDF8 +.public _0209CE10 +.public _0209CE40 +.public _0209CE50 +.public _0209CE54 +.public _0209CE58 +.public _0209CE68 +.public _0209CE78 +.public _020AFF40 +.public _020AFF4C +.public _020AFF54 +.public _020AFF5C +.public _020AFF64 +.public _020AFF68 +.public _020AFF6C +.public _022AAE74 +.public _022AAEA4 +.public _022AAEA8 +.public _022AAEAC +.public _022AB09C +.public _f2d +.public _fsub .public BitstreamDebug -.public CARD_Init -.public CardBackupError -.public CardPullOutWithStatus .public Card_GetBackupTotalSize .public Card_GetCurrentBackupType .public Card_IdentifyBackup +.public CARD_Init .public Card_LockBackup .public Card_UnlockBackup +.public CardBackupError .public Cardi_RequestStreamCommand +.public CardPullOutWithStatus .public CheckStringSave .public CloseDialogueBox .public CopyBitsFrom @@ -46,37 +75,6 @@ .public SetNotifyNote .public SetRngSeed .public ShowStringIdInDialogueBox -.public WriteItemsToSave -.public WriteMonsterInfoToSave -.public _0209CD6C -.public _0209CD84 -.public _0209CD94 -.public _0209CDA4 -.public _0209CDB8 -.public _0209CDD0 -.public _0209CDE0 -.public _0209CDF8 -.public _0209CE10 -.public _0209CE40 -.public _0209CE50 -.public _0209CE54 -.public _0209CE58 -.public _0209CE68 -.public _0209CE78 -.public _020AFF40 -.public _020AFF4C -.public _020AFF54 -.public _020AFF5C -.public _020AFF64 -.public _020AFF68 -.public _020AFF6C -.public _022AAE74 -.public _022AAEA4 -.public _022AAEA8 -.public _022AAEAC -.public _022AB09C -.public _f2d -.public _fsub .public sub_02002580 .public sub_020027F8 .public sub_02003B94 @@ -104,3 +102,5 @@ .public sub_0205BFB0 .public sub_0205FAB0 .public sub_0205FC20 +.public WriteItemsToSave +.public WriteMonsterInfoToSave diff --git a/asm/include/main_0204D368.inc b/asm/include/main_0204D368.inc index d3035635..23160cc0 100644 --- a/asm/include/main_0204D368.inc +++ b/asm/include/main_0204D368.inc @@ -1,4 +1,6 @@ #pragma once +.public _0209E010 +.public _0209E011 .public ARM9_UNKNOWN_TABLE__NA_209E164 .public BitstreamDebug .public CopyBitsFrom @@ -10,10 +12,10 @@ .public FileRom_InitDataTransfer .public FileRom_StopDataTransfer .public FileRom_Veneer_FileInit -.public GLOBAL_PROGRESS_PTR .public GetDexNumber .public GetDungeonTipShown .public GetMonsterFlag1 +.public GLOBAL_PROGRESS_PTR .public HasMonsterBeenAttackedInDungeons .public InitBitstreamForRead .public InitBitstreamForWrite @@ -25,5 +27,3 @@ .public SetMonsterFlag1 .public SetMonsterFlag2 .public VERSION_EXCLUSIVE_MONSTERS -.public _0209E010 -.public _0209E011 diff --git a/asm/include/main_0204F0A0.inc b/asm/include/main_0204F0A0.inc index 15dc01c5..4bf0ef71 100644 --- a/asm/include/main_0204F0A0.inc +++ b/asm/include/main_0204F0A0.inc @@ -1,4 +1,9 @@ #pragma once +.public _0209E3A1 +.public _0209E3A2 +.public _0209E3A3 +.public _022AB4F8 +.public _022AB5AC .public DUNGEON_DATA_LIST .public DungeonSwapIdToIdx .public DungeonSwapIdxToId @@ -24,11 +29,6 @@ .public OUTLAW_MINION_LEVEL_TABLE .public SECONDARY_TERRAIN_TYPES .public StrncpyName -.public TEAM_MEMBER_TABLE_PTR -.public _0209E3A1 -.public _0209E3A2 -.public _0209E3A3 -.public _022AB4F8 -.public _022AB5AC .public sub_0204CEE0 .public sub_0205EE40 +.public TEAM_MEMBER_TABLE_PTR diff --git a/asm/include/main_020504BC.inc b/asm/include/main_020504BC.inc index 2122160b..86cffabb 100644 --- a/asm/include/main_020504BC.inc +++ b/asm/include/main_020504BC.inc @@ -1,8 +1,10 @@ #pragma once +.public _0209E6BD +.public _022AB924 .public ADVENTURE_LOG_PTR .public ARM9_UNKNOWN_DATA__NA_209E6BC -.public CONVERSION2_TYPE_TABLE .public ComputeSpecialCounters +.public CONVERSION2_TYPE_TABLE .public Copy16BitsFrom .public Copy16BitsTo .public CopyNStringFromId @@ -14,5 +16,3 @@ .public StrncpySimpleNoPad .public StrncpySimpleNoPadSafe .public TEAM_NAME -.public _0209E6BD -.public _022AB924 diff --git a/asm/include/main_02054E4C.inc b/asm/include/main_02054E4C.inc index 4dae128d..a8a842d3 100644 --- a/asm/include/main_02054E4C.inc +++ b/asm/include/main_02054E4C.inc @@ -1,10 +1,10 @@ #pragma once +.public _020A333C +.public _020A3340 +.public _020B0A4C +.public _022B5788 .public GetGameMode .public MemZero .public SprintfStatic__02054A60 .public StrncpySimpleNoPadSafe .public TEAM_MEMBER_TABLE_PTR -.public _020A333C -.public _020A3340 -.public _020B0A4C -.public _022B5788 diff --git a/asm/include/main_02055894.inc b/asm/include/main_02055894.inc index 5f1e981e..e63ab481 100644 --- a/asm/include/main_02055894.inc +++ b/asm/include/main_02055894.inc @@ -1,4 +1,6 @@ #pragma once +.public _020A3350 +.public _022B5788 .public Debug_Print0 .public EnableAllLearnableIqSkills .public GetBaseDefensiveStat @@ -15,12 +17,10 @@ .public StrcmpMonsterName .public StrncpyName .public StrncpySimple -.public TEAM_MEMBER_TABLE_PTR -.public TryAddMonsterToActiveTeam -.public _020A3350 -.public _022B5788 .public sub_02052CF4 .public sub_02053D1C .public sub_02053F10 .public sub_020564B0 .public sub_02056554 +.public TEAM_MEMBER_TABLE_PTR +.public TryAddMonsterToActiveTeam diff --git a/asm/include/main_02056960.inc b/asm/include/main_02056960.inc index 9bc1c862..1d875a5d 100644 --- a/asm/include/main_02056960.inc +++ b/asm/include/main_02056960.inc @@ -6,10 +6,10 @@ .public GetMainCharacter3MemberIdx .public GetPartnerMemberIdx .public IsMainCharacter -.public TEAM_MEMBER_TABLE_PTR -.public TryAddMonsterToActiveTeam .public sub_02056410 .public sub_020564B0 .public sub_02056554 .public sub_02057464 .public sub_02058138 +.public TEAM_MEMBER_TABLE_PTR +.public TryAddMonsterToActiveTeam diff --git a/asm/include/main_02056EB8.inc b/asm/include/main_02056EB8.inc index ac19d61a..95f36aed 100644 --- a/asm/include/main_02056EB8.inc +++ b/asm/include/main_02056EB8.inc @@ -1,4 +1,15 @@ #pragma once +.public _020A336C +.public _020A3398 +.public _020A33B8 +.public _020A33D4 +.public _020A340C +.public _020A343C +.public _020A344C +.public _020A3450 +.public _020A3468 +.public _020AFC28 +.public _022B578C .public AddMoneyCarried .public AddSimpleObjToOam .public CheckTeamMemberIdx @@ -37,20 +48,6 @@ .public SetHolderForItemInBag .public ShuffleHiddenPower .public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public TryAddMonsterToActiveTeam -.public UnloadFile -.public _020A336C -.public _020A3398 -.public _020A33B8 -.public _020A33D4 -.public _020A340C -.public _020A343C -.public _020A344C -.public _020A3450 -.public _020A3468 -.public _020AFC28 -.public _022B578C .public sub_0200FA0C .public sub_0204E584 .public sub_02052E2C @@ -72,3 +69,6 @@ .public sub_020565F4 .public sub_020566C4 .public sub_020568DC +.public TEAM_MEMBER_TABLE_PTR +.public TryAddMonsterToActiveTeam +.public UnloadFile diff --git a/asm/include/main_0205EDA4.inc b/asm/include/main_0205EDA4.inc index 6022ae7d..57901f25 100644 --- a/asm/include/main_0205EDA4.inc +++ b/asm/include/main_0205EDA4.inc @@ -1,10 +1,23 @@ #pragma once +.public _020A3CA0 +.public _020A3CBC +.public _020A462C +.public _020A4644 +.public _020A4654 +.public _020A4664 +.public _020A4674 +.public _020A4678 +.public _020A4688 +.public _020A4698 +.public _020A46A8 +.public _020B0AFC +.public _s32_div_f .public AlreadyHasSimilarMission .public AppendStandardStringToMission .public BitstreamDebug -.public CHALLENGE_NORMAL_FIXED_ROOM_IDS .public CanDungeonBeUsedForMission .public CanMonsterBeUsedForMissionWrapper +.public CHALLENGE_NORMAL_FIXED_ROOM_IDS .public CheckDungeonMissionUnlockConditions .public Copy16BitsFrom .public Copy16BitsTo @@ -42,6 +55,11 @@ .public IsMissionTypeSpecialEpisode .public IsSpecialEpisodeBeaten .public LoadFileFromRom +.public MaybeGetFormattedItemName +.public MemAlloc +.public MemcpySimple +.public MemFree +.public MemZero .public MISSION_BANNED_MONSTERS .public MISSION_DELIVER_LIST_PTR .public MISSION_DUNGEON_UNLOCK_TABLE @@ -50,43 +68,22 @@ .public MISSION_RANK_POINTS .public MISSION_STRING_IDS .public MISSION_VALIDATION_FUNCTION_LIST -.public MaybeGetFormattedItemName -.public MemAlloc -.public MemFree -.public MemZero -.public MemcpySimple .public MissionToWonderMailPassword .public OUTLAW_HIDEOUT_FIXED_ROOM_IDS .public PreprocessString .public PreprocessStringFromId -.public RANK_STRING_PTR_TABLE -.public REMOTE_STRING_PTR_TABLE -.public RESCUE_BIN_UNPACK .public Rand16Bit .public RandInt .public RandIntSafe +.public RANK_STRING_PTR_TABLE +.public REMOTE_STRING_PTR_TABLE .public RemoveFirstUnequippedItemOfType -.public StringFromId -.public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public TREASURE_MEMO_FIXED_ROOM_IDS -.public WriteMissionMtState -.public _020A3CA0 -.public _020A3CBC -.public _020A462C -.public _020A4644 -.public _020A4654 -.public _020A4664 -.public _020A4674 -.public _020A4678 -.public _020A4688 -.public _020A4698 -.public _020A46A8 -.public _020B0AFC -.public _s32_div_f +.public RESCUE_BIN_UNPACK .public strcat .public strcpy +.public StringFromId .public strncat +.public StrncpySimpleNoPadSafe .public sub_020022C4 .public sub_020022D0 .public sub_020251F0 @@ -97,4 +94,7 @@ .public sub_0205E3F8 .public sub_0205E48C .public sub_0205E50C +.public TEAM_MEMBER_TABLE_PTR +.public TREASURE_MEMO_FIXED_ROOM_IDS .public vsprintf +.public WriteMissionMtState diff --git a/asm/include/main_02062A68.inc b/asm/include/main_02062A68.inc index a66672a4..691d0d5f 100644 --- a/asm/include/main_02062A68.inc +++ b/asm/include/main_02062A68.inc @@ -1,8 +1,14 @@ #pragma once +.public _020A3CAD +.public _020A46B0 +.public _020A46D0 +.public _020AFC70 +.public _020B0B04 +.public _s32_div_f .public CAFE_MISSION_REWARD_TYPE_WEIGHTS .public CopyColorToPaletteDataRgba -.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS .public Debug_Print0 +.public DEFAULT_MISSION_REWARD_TYPE_WEIGHTS .public DirectoryFileMngr_OpenDirectoryFile .public DungeonSwapIdToIdx .public EnqueueRender3dTiling @@ -21,37 +27,30 @@ .public GetType .public HandleSir0TranslationVeneer .public HasMonsterBeenAttackedInDungeons -.public ITEM_DELIVERY_TABLE .public IsForbiddenFloor .public IsItemAvailableInDungeonGroup .public IsItemInTimeDarkness .public IsMonsterMissionAllowed .public IsMonsterValid .public IsStoryBeforePoint +.public ITEM_DELIVERY_TABLE +.public MarkPaletteDataAsNeedingUpdate +.public MemAlloc +.public MemcpySimple +.public MemFree +.public MemZero .public MISSION_BANNED_STORY_MONSTERS .public MISSION_DUNGEON_UNLOCK_TABLE .public MISSION_RANK_POINTS -.public MarkPaletteDataAsNeedingUpdate -.public MemAlloc -.public MemFree -.public MemZero -.public MemcpySimple .public MultiplyByFixedPoint .public NO_SEND_ITEM_TABLE .public OUTLAW_MISSION_REWARD_TYPE_WEIGHTS -.public RANK_STRING_PTR_TABLE -.public RESCUE_BIN_UNPACK .public RandInt .public RandIntSafe .public RandRangeSafe +.public RANK_STRING_PTR_TABLE +.public RESCUE_BIN_UNPACK .public RetrieveFromItemList2 -.public UnloadFile -.public _020A3CAD -.public _020A46B0 -.public _020A46D0 -.public _020AFC70 -.public _020B0B04 -.public _s32_div_f .public sub_02001AB0 .public sub_020090A0 .public sub_020090C0 @@ -71,3 +70,4 @@ .public sub_0205E090 .public sub_0206220C .public sub_02064FE4 +.public UnloadFile diff --git a/asm/include/main_02065998.inc b/asm/include/main_02065998.inc index cf4f2826..eb504d49 100644 --- a/asm/include/main_02065998.inc +++ b/asm/include/main_02065998.inc @@ -8,6 +8,6 @@ .public GetPartnerMemberIdx .public GetRecruitMentryIdBySpecies .public GetUnitNpcIds -.public OverlayIsLoaded .public ov11_022E96E4 +.public OverlayIsLoaded .public sub_02065050 diff --git a/asm/include/main_02065C84.inc b/asm/include/main_02065C84.inc index b21cef35..0eddc4ee 100644 --- a/asm/include/main_02065C84.inc +++ b/asm/include/main_02065C84.inc @@ -1,4 +1,6 @@ #pragma once +.public _020A9208 +.public _022B7320 .public BulkItemToItem .public CopyFrameTypeOption .public Debug_Print0 @@ -20,6 +22,8 @@ .public LoadWazaP .public MainGame .public NoteLoadBase +.public ov00_022BE0C8 +.public ov11_022E82CC .public OverlayIsLoaded .public ReadSaveHeader .public SetAdventureLogStructLocation @@ -27,13 +31,6 @@ .public SetGameMode .public SetScenarioProgressScriptVar .public SetSpecialEpisodeType -.public UnloadOverlay -.public WAN_TABLE -.public ZeroInitScriptVariable -.public _020A9208 -.public _022B7320 -.public ov00_022BE0C8 -.public ov11_022E82CC .public sub_020024A0 .public sub_0200CA8C .public sub_0201D7A8 @@ -59,3 +56,6 @@ .public sub_02052C3C .public sub_0205B44C .public sub_0205C73C +.public UnloadOverlay +.public WAN_TABLE +.public ZeroInitScriptVariable diff --git a/asm/include/main_020664B8.inc b/asm/include/main_020664B8.inc index 36bf0105..25cb7644 100644 --- a/asm/include/main_020664B8.inc +++ b/asm/include/main_020664B8.inc @@ -1,4 +1,41 @@ #pragma once +.public _020A9268 +.public _020A9278 +.public _020A9288 +.public _020A9298 +.public _020A92A8 +.public _020A92EC +.public _020A9304 +.public _020A931C +.public _020A9334 +.public _020A9364 +.public _020A937C +.public _020A9394 +.public _020A93B4 +.public _020B0A54 +.public _020B0B24 +.public _020B0B2C +.public _020B0B2D +.public _020B0B2E +.public _020B0B2F +.public _020B0B30 +.public _020B0B31 +.public _020B0B32 +.public _020B0B33 +.public _020B0B34 +.public _020B0B35 +.public _020B0B36 +.public _020B0B37 +.public _020B0B38 +.public _020B0B39 +.public _020B0B3A +.public _020B0B3B +.public _020B0B3C +.public _020B0B3D +.public _020B0B3E +.public _020B0B3F +.public _020B0B44 +.public _020B0B48 .public AddMissionToJobList .public AlreadyHaveMission .public CanDungeonBeUsedForMission @@ -53,51 +90,6 @@ .public MemFree .public MemZero .public NoteSaveBase -.public PlaySeVolumeWrapper -.public PreprocessStringFromId -.public SetCollectionMenuField0x1B2 -.public SetQuestionMarks -.public SetSpecialEpisodeOpen -.public ShowPortraitInPortraitBox -.public StrncpySimpleNoPadSafe -.public UpdateWindow -.public _020A9268 -.public _020A9278 -.public _020A9288 -.public _020A9298 -.public _020A92A8 -.public _020A92EC -.public _020A9304 -.public _020A931C -.public _020A9334 -.public _020A9364 -.public _020A937C -.public _020A9394 -.public _020A93B4 -.public _020B0A54 -.public _020B0B24 -.public _020B0B2C -.public _020B0B2D -.public _020B0B2E -.public _020B0B2F -.public _020B0B30 -.public _020B0B31 -.public _020B0B32 -.public _020B0B33 -.public _020B0B34 -.public _020B0B35 -.public _020B0B36 -.public _020B0B37 -.public _020B0B38 -.public _020B0B39 -.public _020B0B3A -.public _020B0B3B -.public _020B0B3C -.public _020B0B3D -.public _020B0B3E -.public _020B0B3F -.public _020B0B44 -.public _020B0B48 .public ov01_02337B3C .public ov01_02337B68 .public ov01_02337BA0 @@ -110,6 +102,13 @@ .public ov03_0233CDC8 .public ov03_0233CDD8 .public ov03_0233CDE4 +.public PlaySeVolumeWrapper +.public PreprocessStringFromId +.public SetCollectionMenuField0x1B2 +.public SetQuestionMarks +.public SetSpecialEpisodeOpen +.public ShowPortraitInPortraitBox +.public StrncpySimpleNoPadSafe .public sub_02003B94 .public sub_02003BC8 .public sub_0202836C @@ -160,3 +159,4 @@ .public sub_0205F710 .public sub_0205FA38 .public sub_0206276C +.public UpdateWindow diff --git a/asm/include/main_0206A878.inc b/asm/include/main_0206A878.inc index ca9ca436..b5dda3a8 100644 --- a/asm/include/main_0206A878.inc +++ b/asm/include/main_0206A878.inc @@ -1,23 +1,4 @@ #pragma once -.public CosAbs4096 -.public Debug_Print0 -.public DelayWteFree -.public DeleteWanTableEntryVeneer -.public DisplayAndSwitchAnimationControlCurrentFrame -.public GetExecuteSpecialEpisodeType -.public InitAnimationControlWithSet__0201C0B0 -.public LoadWanTableEntry -.public LoadWteFromRom -.public MAP_MARKER_PLACEMENTS -.public MemAlloc -.public MemFree -.public MemZero -.public MultiplyByFixedPoint -.public Rand16Bit -.public SetAnimationForAnimationControl -.public SetSpriteIdForAnimationControl -.public SinAbs4096 -.public WAN_TABLE .public _020A94BC .public _020A94C6 .public _020A94D2 @@ -33,11 +14,29 @@ .public _020B0B5C .public _020B0B60 .public _s32_div_f +.public CosAbs4096 +.public Debug_Print0 +.public DelayWteFree +.public DeleteWanTableEntryVeneer +.public DisplayAndSwitchAnimationControlCurrentFrame +.public GetExecuteSpecialEpisodeType +.public InitAnimationControlWithSet__0201C0B0 +.public LoadWanTableEntry +.public LoadWteFromRom +.public MAP_MARKER_PLACEMENTS +.public MemAlloc +.public MemFree +.public MemZero +.public MultiplyByFixedPoint .public ov10_022C2340 .public ov10_022C23B0 .public ov10_022C23EC .public ov10_022C2450 .public ov10_022C24DC +.public Rand16Bit +.public SetAnimationForAnimationControl +.public SetSpriteIdForAnimationControl +.public SinAbs4096 .public sub_0201D12C .public sub_0201D9C8 .public sub_0201DF38 @@ -51,3 +50,4 @@ .public sub_0201F36C .public sub_02024934 .public sub_0206A7CC +.public WAN_TABLE diff --git a/asm/include/main_0206C1BC.inc b/asm/include/main_0206C1BC.inc index 78686642..daa10a8f 100644 --- a/asm/include/main_0206C1BC.inc +++ b/asm/include/main_0206C1BC.inc @@ -1,4 +1,12 @@ #pragma once +.public _020B1290 +.public _022B7331 +.public _022B7334 +.public _022B7340 +.public _022B734C +.public _022B7A30 +.public _022B8330 +.public _022B9130 .public DRIVER_WORK .public DseBgm_StopAll .public DseBgm_SysSetupNoteList @@ -16,14 +24,6 @@ .public OS_InitAlarm .public OS_InitTick .public OS_SetTick -.public _020B1290 -.public _022B7331 -.public _022B7334 -.public _022B7340 -.public _022B734C -.public _022B7A30 -.public _022B8330 -.public _022B9130 .public sub_0206C184 .public sub_0206C19C .public sub_0206DC78 diff --git a/asm/include/main_0206C9BC.inc b/asm/include/main_0206C9BC.inc index 472f6a12..e7521624 100644 --- a/asm/include/main_0206C9BC.inc +++ b/asm/include/main_0206C9BC.inc @@ -1,55 +1,4 @@ #pragma once -.public DC_FlushRange -.public DC_WaitWriteBufferEmpty -.public DRIVER_WORK -.public DseChannel_AllocateNote -.public DseChannel_ChangeNote -.public DseChannel_ReleaseNote -.public DseMem_AllocateUser -.public DseSynth_AllocateNew -.public DseSynth_ClearHeldNotes -.public DseSynth_ResetAllVoiceTimersAndVolumes -.public DseSynth_ResetAndSetBankAndSequence -.public DseSynth_RestoreHeldNotes -.public DseSynth_SetBend -.public DseSynth_SetGlobalVolumeIndex -.public DseSynth_SetPan -.public DseSynth_SetVolume -.public DseSynth_StopChannels -.public DseSynth_Unload -.public DseUtil_ByteSwap32 -.public DseVoice_Cleanup -.public DseVoice_Deallocate -.public DseVoice_PlayNote -.public DseVoice_ReleaseNote -.public DseVoice_UpdateHardware -.public DseVoice_UpdateParameters -.public Dse_SetError -.public Dse_SetError2 -.public FS_CloseFile -.public FS_InitFile -.public FS_OpenFile -.public FS_ReadFileAsync -.public FS_SeekFile -.public FS_WaitAsync -.public MTi_CpuClearFast -.public OS_CreateThread -.public OS_GetTickLo -.public OS_JoinThread -.public OS_Sleep -.public OS_SleepThread -.public OS_WakeupThreadDirect -.public SMD_EVENTS_FUN_TABLE -.public Snd_FlushCommand -.public Snd_RecvCommandReply -.public Snd_SetOutputSelector -.public Snd_SetupAlarm -.public Snd_SetupCapture -.public Snd_StartTimer -.public Snd_StopTimer -.public SoundEnvelope_ForceVolume -.public SoundLfoBank_Reset -.public UpdateChannels .public _020B0B7C .public _022B7380 .public _022B7388 @@ -77,5 +26,56 @@ .public _fmul .public _s32_div_f .public _u32_div_f +.public DC_FlushRange +.public DC_WaitWriteBufferEmpty +.public DRIVER_WORK +.public Dse_SetError +.public Dse_SetError2 +.public DseChannel_AllocateNote +.public DseChannel_ChangeNote +.public DseChannel_ReleaseNote +.public DseMem_AllocateUser +.public DseSynth_AllocateNew +.public DseSynth_ClearHeldNotes +.public DseSynth_ResetAllVoiceTimersAndVolumes +.public DseSynth_ResetAndSetBankAndSequence +.public DseSynth_RestoreHeldNotes +.public DseSynth_SetBend +.public DseSynth_SetGlobalVolumeIndex +.public DseSynth_SetPan +.public DseSynth_SetVolume +.public DseSynth_StopChannels +.public DseSynth_Unload +.public DseUtil_ByteSwap32 +.public DseVoice_Cleanup +.public DseVoice_Deallocate +.public DseVoice_PlayNote +.public DseVoice_ReleaseNote +.public DseVoice_UpdateHardware +.public DseVoice_UpdateParameters +.public FS_CloseFile +.public FS_InitFile +.public FS_OpenFile +.public FS_ReadFileAsync +.public FS_SeekFile +.public FS_WaitAsync +.public MTi_CpuClearFast +.public OS_CreateThread +.public OS_GetTickLo +.public OS_JoinThread +.public OS_Sleep +.public OS_SleepThread +.public OS_WakeupThreadDirect +.public SMD_EVENTS_FUN_TABLE +.public Snd_FlushCommand +.public Snd_RecvCommandReply +.public Snd_SetOutputSelector +.public Snd_SetupAlarm +.public Snd_SetupCapture +.public Snd_StartTimer +.public Snd_StopTimer +.public SoundEnvelope_ForceVolume +.public SoundLfoBank_Reset .public sub_0206C688 .public sub_02072BB8 +.public UpdateChannels diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc index 512d3423..8b0d0cca 100644 --- a/asm/include/overlay_00.inc +++ b/asm/include/overlay_00.inc @@ -1,6 +1,14 @@ #pragma once -.public CRYPTO_RC4Init +.public _02000BDC +.public _02000BF4 +.public _02000C1C +.public _02000C34 +.public _ll_udiv +.public _s32_div_f +.public _start_AutoloadDoneCallback +.public _u32_div_f .public Crypto_RC4Encrypt +.public CRYPTO_RC4Init .public DC_FlushRange .public DC_InvalidateRange .public DC_StoreRange @@ -91,11 +99,18 @@ .public InitWfcSettingsOverlay .public LoadOverlay .public MATH_CalcCRC16 +.public Math_CountPopulation .public MATHi_CRC16InitTable .public MATHi_CRC16Update .public MD5_Digest .public MD5_Init .public MD5_Update +.public MemAlloc +.public memcmp +.public MemcpySimple +.public MemFree +.public memmove +.public MemZero .public MI_CpuCopy8 .public MI_CpuFill8 .public MI_DmaCopy16 @@ -106,11 +121,6 @@ .public MTi_CpuCopy16 .public MTi_CpuCopy32 .public MTi_CpuCopy32Fast -.public Math_CountPopulation -.public MemAlloc -.public MemFree -.public MemZero -.public MemcpySimple .public OS_CancelAlarm .public OS_CreateAlarm .public OS_CreateThread @@ -147,30 +157,6 @@ .public OS_YieldThread .public OSi_ReferSymbol .public OSi_ThreadInfo -.public PXI_Init -.public PXI_IsCallbackReady -.public PXI_SendWordByFifo -.public PXI_SetFifoRecvCallback -.public PlayBgmByIdVeneer -.public RandInt -.public Rtc_ConvertDateTimeToSecond -.public Rtc_GetDate -.public Rtc_GetTime -.public Rtc_Init -.public SetIrqFlag -.public Std_CopyLString -.public UnloadOverlay -.public WaitForever2 -.public _02000BDC -.public _02000BF4 -.public _02000C1C -.public _02000C34 -.public _ll_udiv -.public _s32_div_f -.public _start_AutoloadDoneCallback -.public _u32_div_f -.public memcmp -.public memmove .public ov00_02317F44 .public ov00_02317F54 .public ov00_02317F5C @@ -331,6 +317,18 @@ .public ov01_023310B8 .public ov01_02337914 .public ov01_0233AE64 +.public PlayBgmByIdVeneer +.public PXI_Init +.public PXI_IsCallbackReady +.public PXI_SendWordByFifo +.public PXI_SetFifoRecvCallback +.public RandInt +.public Rtc_ConvertDateTimeToSecond +.public Rtc_GetDate +.public Rtc_GetTime +.public Rtc_Init +.public SetIrqFlag +.public Std_CopyLString .public strcmp .public strlen .public strncmp @@ -388,3 +386,5 @@ .public sub_0205B77C .public sub_0205B80C .public sub_02079990 +.public UnloadOverlay +.public WaitForever2 diff --git a/asm/include/overlay_00_022DB2F8.inc b/asm/include/overlay_00_022DB2F8.inc index 938f2d03..a0d4193f 100644 --- a/asm/include/overlay_00_022DB2F8.inc +++ b/asm/include/overlay_00_022DB2F8.inc @@ -1,5 +1,23 @@ #pragma once +.public _020AECB0 +.public _020AED30 +.public _020AEDB0 +.public _022BCA70 +.public _d2f +.public _dadd +.public _ddiv +.public _dflt +.public _dmul +.public _dsub +.public _ll_udiv +.public _s32_div_f +.public _u32_div_f +.public abs +.public atof +.public atoi +.public bind .public CloseVeneer +.public connect .public Cps_GetSslLowThreadPriority .public Cps_Resolve .public Cps_SetRootCa @@ -51,6 +69,11 @@ .public Dwci_SetBuddyFriendData .public Dwci_SetReverseBuddyFlag .public EnableIrqFlag +.public fclose +.public fcntl +.public fread +.public fseek +.public ftell .public GetDsFirmwareUserSettings .public Gt2Accept .public Gt2AddressToString @@ -78,22 +101,26 @@ .public MATH_CalcCRC16 .public MATH_CalcCRC32 .public MATH_CalcCRC8 +.public Math_CalcSha1 .public MATHi_CRC16InitTable .public MATHi_CRC32InitTable .public MATHi_CRC8InitTable -.public MD5Final_Ghi -.public MD5Init_Ghi -.public MD5Update_Ghi .public MD5_Digest .public MD5_Init .public MD5_Update +.public MD5Final_Ghi +.public MD5Init_Ghi +.public MD5Update_Ghi +.public memcmp +.public memcpy +.public memmove +.public memset .public MI_CpuCopy8 .public MI_CpuFill8 .public MTi_CpuClear16 .public MTi_CpuClear32 .public MTi_CpuCopy16 .public MTi_CpuCopy32 -.public Math_CalcSha1 .public NnBeginNegotiationWithSocket .public NnCancel .public NnFreeNegotiateList @@ -119,78 +146,6 @@ .public OS_VsPrintf .public OS_WakeupThreadDirect .public OSi_ThreadInfo -.public PXI_IsCallbackReady -.public PXI_SendWordByFifo -.public PXI_SetFifoRecvCallback -.public Qr2_Buffer_AddA -.public Rtc_ConvertDateTimeToSecond -.public Rtc_GetDate -.public Rtc_GetDateTime -.public Rtc_GetTime -.public Rtc_Init -.public SVC_WaitByLoop -.public SbServerGetIntValueA -.public SbServerGetPrivateInetAddress -.public SbServerGetPrivateQueryPort -.public SbServerGetPublicInetAddress -.public SbServerGetPublicQueryPort -.public SbServerHasPrivateAddress -.public ServerBrowserClear -.public ServerBrowserFree -.public ServerBrowserGetMyPublicIpAddr -.public ServerBrowserGetServer -.public ServerBrowserLimitUpdateA -.public ServerBrowserSendMessageToServerA -.public ServerBrowserSendNatNegotiateCookieToServerA -.public ServerBrowserState -.public ServerBrowserThink -.public SetIrqFlag -.public Soc_GetHostByName -.public Soc_GetHostID -.public Soc_GetSockName -.public Soc_InetAtoN -.public Soc_Poll -.public Soc_Shutdown -.public Soc_U32to4U8 -.public Socl_EnableSsl -.public Socl_GetHostID -.public Socl_Resolve -.public Std_CompareNString -.public Std_CompareString__020852CC -.public Std_GetStringLength -.public Std_TsScanf -.public WaitForever2 -.public Wcm_GetApEssid -.public Wcm_GetApMacAddress -.public Wcm_GetLinkLevel -.public Wcm_GetPhase -.public _020AECB0 -.public _020AED30 -.public _020AEDB0 -.public _022BCA70 -.public _d2f -.public _dadd -.public _ddiv -.public _dflt -.public _dmul -.public _dsub -.public _ll_udiv -.public _s32_div_f -.public _u32_div_f -.public abs -.public atof -.public atoi -.public bind -.public connect -.public fclose -.public fcntl -.public fread -.public fseek -.public ftell -.public memcmp -.public memcpy -.public memmove -.public memset .public ov00_02318268 .public ov00_0231826C .public ov00_02318274 @@ -945,7 +900,11 @@ .public ov00_02328A18 .public ov00_02328B18 .public ov00_02328C18 +.public PXI_IsCallbackReady +.public PXI_SendWordByFifo +.public PXI_SetFifoRecvCallback .public qr2_buffer_add_int +.public Qr2_Buffer_AddA .public qr2_init_socketa .public qr2_keybuffer_add .public qr2_parse_querya @@ -959,12 +918,47 @@ .public recv .public recvfrom .public rewind +.public Rtc_ConvertDateTimeToSecond +.public Rtc_GetDate +.public Rtc_GetDateTime +.public Rtc_GetTime +.public Rtc_Init +.public SbServerGetIntValueA +.public SbServerGetPrivateInetAddress +.public SbServerGetPrivateQueryPort +.public SbServerGetPublicInetAddress +.public SbServerGetPublicQueryPort +.public SbServerHasPrivateAddress .public send .public sendto +.public ServerBrowserClear +.public ServerBrowserFree +.public ServerBrowserGetMyPublicIpAddr +.public ServerBrowserGetServer +.public ServerBrowserLimitUpdateA +.public ServerBrowserSendMessageToServerA +.public ServerBrowserSendNatNegotiateCookieToServerA +.public ServerBrowserState +.public ServerBrowserThink +.public SetIrqFlag .public snprintf +.public Soc_GetHostByName +.public Soc_GetHostID +.public Soc_GetSockName +.public Soc_InetAtoN +.public Soc_Poll +.public Soc_Shutdown +.public Soc_U32to4U8 .public socket +.public Socl_EnableSsl +.public Socl_GetHostID +.public Socl_Resolve .public sprintf .public srand +.public Std_CompareNString +.public Std_CompareString__020852CC +.public Std_GetStringLength +.public Std_TsScanf .public strcat .public strchr .public strcmp @@ -976,4 +970,10 @@ .public strstr .public strtol .public strtoul +.public SVC_WaitByLoop +.public WaitForever2 +.public Wcm_GetApEssid +.public Wcm_GetApMacAddress +.public Wcm_GetLinkLevel +.public Wcm_GetPhase .public wcslen diff --git a/asm/include/overlay_00_0230D398.inc b/asm/include/overlay_00_0230D398.inc index b86cad4d..f0a644a9 100644 --- a/asm/include/overlay_00_0230D398.inc +++ b/asm/include/overlay_00_0230D398.inc @@ -3,6 +3,9 @@ .public ArrayFree_Gsi .public ArrayLength_Gsi .public ArrayNth_Gsi +.public current_time_gsi +.public gsifree +.public gsimalloc .public Gt2StringToAddress .public Gti2CloseSocket .public Gti2CreateSocket @@ -25,13 +28,10 @@ .public Gti2SendReject .public Gti2SocketConnectionsThink .public Gti2SocketSend -.public TableMap_Gsi -.public TableRemove_Gsi -.public current_time_gsi -.public gsifree -.public gsimalloc .public memcpy .public memmove .public msleep_gsi .public ov00_02328E18 .public strlen +.public TableMap_Gsi +.public TableRemove_Gsi diff --git a/asm/include/overlay_00_0230E460.inc b/asm/include/overlay_00_0230E460.inc index b0b32aa5..a2b4f957 100644 --- a/asm/include/overlay_00_0230E460.inc +++ b/asm/include/overlay_00_0230E460.inc @@ -1,4 +1,10 @@ #pragma once +.public _020AECB0 +.public _020AEDB0 +.public _msl_strnicmp__0208E248 +.public _s32_div_f +.public _u32_div_f +.public abs .public ArrayAppend_Gsi .public ArrayClear_Gsi .public ArrayDeleteAt_Gsi @@ -8,6 +14,7 @@ .public ArrayNew_Gsi .public ArrayNth_Gsi .public ArrayRemoveAt_Gsi +.public atoi .public BucketAdd_Gsi .public BucketAvg_Gsi .public BucketConcat_Gsi @@ -17,8 +24,14 @@ .public BucketSub_Gsi .public CanReceiveOnSocket .public CanSendOnSocket +.public current_time_gsi +.public getlocalhost_gsi +.public getsockname_gsi .public GoaGetLastError +.public goastrdup .public GsDebugAssert +.public gsifree +.public gsimalloc .public Gt2CloseAllConnectionsHard .public Gti2AllocateBuffer .public Gti2BufferShorten @@ -39,61 +52,19 @@ .public Gti2GetResponse .public Gti2NewIncomingConnection .public Gti2PingCallback -.public Gti2ReceiveFilterCallback .public Gti2ReceivedCallback +.public Gti2ReceiveFilterCallback .public Gti2SocketErrorCallback .public Gti2UnrecognizedMessageCallback -.public IsPrivateIP -.public OS_SnPrintf -.public OS_VsPrintf -.public PlayerOpFloat -.public PlayerOpInt -.public PlayerOpString -.public ServerOpFloat -.public ServerOpInt -.public ServerOpString -.public Soc_GetHostByName -.public Soc_InetNtoA -.public SocketBind -.public SocketClose -.public SocketConnect -.public SocketCreate -.public SocketRecv -.public SocketRecvFrom -.public SocketSend -.public SocketSendTo -.public SocketShutDown_Gsi -.public SocketStartUp_Ghi -.public Std_TsScanf -.public TableCount_Gsi -.public TableEnter_Gsi -.public TableFree_Gsi -.public TableLookup_Gsi -.public TableMapSafe2_Gsi -.public TableNew2_Gsi -.public TableRemove_Gsi -.public TeamOpFloat -.public TeamOpInt -.public TeamOpString -.public _020AECB0 -.public _020AEDB0 -.public _msl_strnicmp__0208E248 -.public _s32_div_f -.public _u32_div_f -.public abs -.public atoi -.public current_time_gsi -.public getlocalhost_gsi -.public getsockname_gsi -.public goastrdup -.public gsifree -.public gsimalloc .public inet_addr_gsi +.public IsPrivateIP .public memcmp .public memcpy .public memmove .public memset .public msleep_gsi +.public OS_SnPrintf +.public OS_VsPrintf .public ov00_02317FC0 .public ov00_02317FD4 .public ov00_02317FE8 @@ -291,8 +262,27 @@ .public ov09_0233CA80 .public ov09_0233CBC8 .public ov09_0233CBF8 +.public PlayerOpFloat +.public PlayerOpInt +.public PlayerOpString .public rand +.public ServerOpFloat +.public ServerOpInt +.public ServerOpString +.public Soc_GetHostByName +.public Soc_InetNtoA +.public SocketBind +.public SocketClose +.public SocketConnect +.public SocketCreate +.public SocketRecv +.public SocketRecvFrom +.public SocketSend +.public SocketSendTo +.public SocketShutDown_Gsi +.public SocketStartUp_Ghi .public srand +.public Std_TsScanf .public strcasecmp .public strchr .public strcmp @@ -300,3 +290,13 @@ .public strlen .public strncmp .public strstr +.public TableCount_Gsi +.public TableEnter_Gsi +.public TableFree_Gsi +.public TableLookup_Gsi +.public TableMapSafe2_Gsi +.public TableNew2_Gsi +.public TableRemove_Gsi +.public TeamOpFloat +.public TeamOpInt +.public TeamOpString diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc index 76ad2630..6239cd00 100644 --- a/asm/include/overlay_01.inc +++ b/asm/include/overlay_01.inc @@ -1,12 +1,16 @@ #pragma once +.public _020B0A5C +.public _ll_udiv +.public _s32_div_f +.public _u32_div_f +.public _ull_mod .public AllocateTemp1024ByteBufferFromPool .public AppendStandardStringToMission .public BAG_ITEMS_PTR_MIRROR .public BitstreamDebug -.public CLEAR_MARK_PERFORMANCE_PROGRESS_FLAGS -.public CONTINUE_CHOICE .public CheckParentMenuField0x1A0 .public CheckSimpleMenuField0x1A0 +.public CLEAR_MARK_PERFORMANCE_PROGRESS_FLAGS .public CloseAdvancedMenu .public CloseAdvancedTextBox .public CloseControlsChart @@ -15,6 +19,7 @@ .public CloseSimpleMenu .public CloseTextBox .public ComputeSpecialCounters +.public CONTINUE_CHOICE .public Copy16BitsFrom .public Copy16BitsTo .public CopyBitsFrom @@ -118,89 +123,13 @@ .public MAIN_MENU_WINDOW_PARAMS_7 .public MAIN_MENU_WINDOW_PARAMS_8 .public MAIN_MENU_WINDOW_PARAMS_9 -.public MTi_CpuCopy32 .public MaybeGetFormattedItemName .public MemAlloc -.public MemFree -.public MemZero .public MemcpySimple +.public MemFree .public MemsetSimple -.public PRINTS_STRUCT -.public PlaySeVolumeWrapper -.public PreprocessString -.public PreprocessStringFromId -.public PrintClearMark -.public PrintSpecialEpisodeClearMark -.public RandInt -.public ResumeAdvancedMenu -.public ResumeParentMenu -.public SUBMENU -.public SetAdvancedTextBoxState5 -.public SetAnimationForAnimationControl -.public SetDebugSpecialEpisodeNumber -.public SetIrqFlag -.public SetMainTeamName -.public SetScenarioProgressScriptVar -.public SetSpriteIdForAnimationControl -.public ShowKeyboard -.public ShowStringIdInDialogueBox -.public ShowStringInDialogueBox -.public StrcpyName -.public StrcpySimple -.public StringFromId -.public StrncmpSimple -.public StrncpyName -.public StrncpySimpleNoPadSafe -.public UpdateWindow -.public WAN_TABLE -.public WM_Disable -.public WM_Enable -.public WM_EndDataSharing__022C1278 -.public WM_EndScan -.public WM_Finish -.public WM_GetAllowedChannel -.public WM_GetDispersionBeaconPeriod -.public WM_GetDispersionScanPeriod -.public WM_GetLinkLevel -.public WM_GetNextTgid -.public WM_Init -.public WM_MeasureChannel -.public WM_PowerOff -.public WM_PowerOn -.public WM_ReadStatus -.public WM_Reset -.public WM_SetEntry -.public WM_SetIndCallback -.public WM_SetMpDataToPortEx -.public WM_SetParentParameter -.public WM_SetPortCallback -.public WM_StartConnectEx -.public WM_StartDataSharing -.public WM_StartMP -.public WM_StartParent -.public WM_StartScan -.public Wbt_AidbitmapToAid -.public Wbt_CancelCurrentCommand -.public Wbt_End -.public Wbt_GetBlock -.public Wbt_GetBlockInfo -.public Wbt_InitChild -.public Wbt_InitParent -.public Wbt_MpChildRecvHook -.public Wbt_MpChildSendHook -.public Wbt_MpParentRecvHook -.public Wbt_MpParentSendHook -.public Wbt_PrintBtList -.public Wbt_PutUserData -.public Wbt_RegisterBlock -.public Wbt_RequestSync -.public Wbt_SetOwnAid -.public Wbt_UnregisterBlock -.public _020B0A5C -.public _ll_udiv -.public _s32_div_f -.public _u32_div_f -.public _ull_mod +.public MemZero +.public MTi_CpuCopy32 .public ov00_022BCA80 .public ov00_022BCBAC .public ov00_022BCCC8 @@ -331,9 +260,34 @@ .public ov01_0233CA70 .public ov01_0233CA78 .public ov09_0233D964 +.public PlaySeVolumeWrapper +.public PreprocessString +.public PreprocessStringFromId +.public PrintClearMark +.public PRINTS_STRUCT +.public PrintSpecialEpisodeClearMark +.public RandInt +.public ResumeAdvancedMenu +.public ResumeParentMenu +.public SetAdvancedTextBoxState5 +.public SetAnimationForAnimationControl +.public SetDebugSpecialEpisodeNumber +.public SetIrqFlag +.public SetMainTeamName +.public SetScenarioProgressScriptVar +.public SetSpriteIdForAnimationControl +.public ShowKeyboard +.public ShowStringIdInDialogueBox +.public ShowStringInDialogueBox .public sprintf .public strcmp .public strcpy +.public StrcpyName +.public StrcpySimple +.public StringFromId +.public StrncmpSimple +.public StrncpyName +.public StrncpySimpleNoPadSafe .public sub_02002448 .public sub_020062FC .public sub_020063F4 @@ -407,4 +361,50 @@ .public sub_0205B5A8 .public sub_0205BBA4 .public sub_020851AC +.public SUBMENU +.public UpdateWindow .public vsprintf +.public WAN_TABLE +.public Wbt_AidbitmapToAid +.public Wbt_CancelCurrentCommand +.public Wbt_End +.public Wbt_GetBlock +.public Wbt_GetBlockInfo +.public Wbt_InitChild +.public Wbt_InitParent +.public Wbt_MpChildRecvHook +.public Wbt_MpChildSendHook +.public Wbt_MpParentRecvHook +.public Wbt_MpParentSendHook +.public Wbt_PrintBtList +.public Wbt_PutUserData +.public Wbt_RegisterBlock +.public Wbt_RequestSync +.public Wbt_SetOwnAid +.public Wbt_UnregisterBlock +.public WM_Disable +.public WM_Enable +.public WM_EndDataSharing__022C1278 +.public WM_EndScan +.public WM_Finish +.public WM_GetAllowedChannel +.public WM_GetDispersionBeaconPeriod +.public WM_GetDispersionScanPeriod +.public WM_GetLinkLevel +.public WM_GetNextTgid +.public WM_Init +.public WM_MeasureChannel +.public WM_PowerOff +.public WM_PowerOn +.public WM_ReadStatus +.public WM_Reset +.public WM_SetEntry +.public WM_SetIndCallback +.public WM_SetMpDataToPortEx +.public WM_SetParentParameter +.public WM_SetPortCallback +.public WM_StartConnectEx +.public WM_StartDataSharing +.public WM_StartMP +.public WM_StartParent +.public WM_StartScan diff --git a/asm/include/overlay_01_02337634.inc b/asm/include/overlay_01_02337634.inc index eee235f4..2848f787 100644 --- a/asm/include/overlay_01_02337634.inc +++ b/asm/include/overlay_01_02337634.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public CardBackupError .public CreateMainMenus .public Debug_Print0 @@ -10,13 +11,10 @@ .public InitPreprocessorArgs .public IsTouchScreenNotOff .public MemAlloc +.public MemcpySimple .public MemFree .public MemZero -.public MemcpySimple .public NoteSaveBase -.public PRINTS_STRINGS -.public StrcpyName -.public _s32_div_f .public ov00_022BCA80 .public ov00_022BCBAC .public ov00_022BCC30 @@ -290,6 +288,8 @@ .public ov07_0233F6E0 .public ov07_0233F758 .public ov07_0233FCD8 +.public PRINTS_STRINGS +.public StrcpyName .public sub_02003B5C .public sub_02003B94 .public sub_02003BC8 diff --git a/asm/include/overlay_04_0233CAF8.inc b/asm/include/overlay_04_0233CAF8.inc index 50b8581a..f97e1a06 100644 --- a/asm/include/overlay_04_0233CAF8.inc +++ b/asm/include/overlay_04_0233CAF8.inc @@ -32,12 +32,6 @@ .public MemFree .public MemZero .public NoteSaveBase -.public PlaySeVolumeWrapper -.public RandInt -.public RemoveItemAtIdxInStorage -.public StrncpySimpleNoPadSafe -.public UnloadFile -.public ZeroInitMissionRewardDataStruct .public ov01_0232B540 .public ov01_0232B5D0 .public ov01_0232E94C @@ -80,6 +74,10 @@ .public ov04_0233F640 .public ov04_0233F644 .public ov04_0233F670 +.public PlaySeVolumeWrapper +.public RandInt +.public RemoveItemAtIdxInStorage +.public StrncpySimpleNoPadSafe .public sub_02003B5C .public sub_02003B94 .public sub_02003BC8 @@ -112,3 +110,5 @@ .public sub_02046C78 .public sub_02046D20 .public sub_0204A018 +.public UnloadFile +.public ZeroInitMissionRewardDataStruct diff --git a/asm/include/overlay_06_0233CAB8.inc b/asm/include/overlay_06_0233CAB8.inc index 1c85af08..4db8dd6d 100644 --- a/asm/include/overlay_06_0233CAB8.inc +++ b/asm/include/overlay_06_0233CAB8.inc @@ -20,13 +20,10 @@ .public IsSpecialEpisodeOpen .public IsTouchScreenNotOff .public MemAlloc +.public MemcpySimple .public MemFree .public MemZero -.public MemcpySimple .public NoteSaveBase -.public SetSpecialEpisodeOpen -.public ShowKeyboard -.public WonderMailPasswordToMission .public ov00_022BCA80 .public ov00_022BCBAC .public ov00_022BD264 @@ -80,6 +77,8 @@ .public ov06_0233EEE0 .public ov06_0233EEEC .public ov06_0233EEF0 +.public SetSpecialEpisodeOpen +.public ShowKeyboard .public sub_02003B94 .public sub_02003BC8 .public sub_02003BFC @@ -116,3 +115,4 @@ .public sub_02069D40 .public sub_02069D94 .public sub_02069DC0 +.public WonderMailPasswordToMission diff --git a/asm/include/overlay_10_022BCDF4.inc b/asm/include/overlay_10_022BCDF4.inc index b47df376..cf1e6135 100644 --- a/asm/include/overlay_10_022BCDF4.inc +++ b/asm/include/overlay_10_022BCDF4.inc @@ -1,4 +1,6 @@ #pragma once +.public _s32_div_f +.public abs .public CreateInventoryMenu .public Debug_Print0 .public DeleteWanTableEntryVeneer @@ -23,17 +25,6 @@ .public MemFree .public MemZero .public OBJ_GRAPHICS_CONTROLS_PTR -.public PlaySeByIdVolumeWrapper -.public SetAnimationControlPausedFlag -.public SetAnimationForAnimationControl -.public SetSpriteIdForAnimationControl -.public SwitchAnimationControlToNextFrame -.public TEAM_MEMBER_TABLE_PTR -.public UnkMapRelatedFunc -.public UpdateWindow -.public WAN_TABLE -.public _s32_div_f -.public abs .public ov10_022BCCB0 .public ov10_022BFE3C .public ov10_022BFE54 @@ -79,6 +70,10 @@ .public ov11_023061CC .public ov11_02306C64 .public ov11_02306C9C +.public PlaySeByIdVolumeWrapper +.public SetAnimationControlPausedFlag +.public SetAnimationForAnimationControl +.public SetSpriteIdForAnimationControl .public strcpy .public sub_02001808 .public sub_0201C108 @@ -123,4 +118,9 @@ .public sub_020640DC .public sub_0206423C .public sub_020642A8 +.public SwitchAnimationControlToNextFrame +.public TEAM_MEMBER_TABLE_PTR +.public UnkMapRelatedFunc +.public UpdateWindow .public vsprintf +.public WAN_TABLE diff --git a/asm/include/overlay_10_022BFF78.inc b/asm/include/overlay_10_022BFF78.inc index a61e269c..9896e4df 100644 --- a/asm/include/overlay_10_022BFF78.inc +++ b/asm/include/overlay_10_022BFF78.inc @@ -1,4 +1,5 @@ #pragma once +.public abs .public ClearWindow .public ClosePortraitBox .public CloseTextBox @@ -9,6 +10,7 @@ .public DeleteWanTableEntryVeneer .public DisplayAndSwitchAnimationControlCurrentFrame .public DrawTextInWindow +.public FillPixelOffsetArrayFromSprite .public GendersEqual .public GetBgRegionArea .public GetBodySize @@ -22,24 +24,10 @@ .public LoadWanTableEntryFromPack .public MarkPaletteDataAsNeedingUpdate .public MemAlloc +.public Memcpy32 .public MemFree .public MemZero -.public Memcpy32 .public MultiplyByFixedPoint -.public PreprocessString -.public Rand16Bit -.public SetAndPlayAnimationForAnimationControl -.public SetPortraitEmotion -.public SetPortraitLayout -.public SetPortraitOffset -.public SetSpriteIdForAnimationControl -.public ShowPortraitInPortraitBox -.public StartFadeDungeonWrapper -.public SwitchAnimationControlToNextFrame -.public UnkMapRelatedFunc -.public UpdateWindow -.public WAN_TABLE -.public abs .public ov10_022BD744 .public ov10_022BDCA4 .public ov10_022BFE0C @@ -71,13 +59,21 @@ .public ov29_022DD83C .public ov29_0234C584 .public ov29_0234C5EC +.public PreprocessString +.public Rand16Bit +.public SetAndPlayAnimationForAnimationControl +.public SetPortraitEmotion +.public SetPortraitLayout +.public SetPortraitOffset +.public SetSpriteIdForAnimationControl +.public ShowPortraitInPortraitBox +.public StartFadeDungeonWrapper .public strcmp .public strcpy .public sub_0200B330 .public sub_0200B3FC .public sub_0201C138 .public sub_0201CF80 -.public sub_0201D034 .public sub_0201D12C .public sub_0201D1B0 .public sub_02025010_EU @@ -93,4 +89,8 @@ .public sub_02063FF4 .public sub_02064014 .public sub_0206409C +.public SwitchAnimationControlToNextFrame +.public UnkMapRelatedFunc +.public UpdateWindow .public vsprintf +.public WAN_TABLE diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc index 5510a7eb..9950c1ba 100644 --- a/asm/include/overlay_11.inc +++ b/asm/include/overlay_11.inc @@ -1,4 +1,10 @@ #pragma once +.public _020A1870 +.public _020A548A +.public _020A5490 +.public _fdiv +.public _ffix +.public _fflt .public CalcAndUpdateScriptVarWithOtherScriptVar .public CalcAndUpdateScriptVarWithOtherValue .public CalcScriptVariablesVeneer @@ -42,53 +48,15 @@ .public IsStoryBeforeOrAtPoint .public IsStoryBeforePoint .public ItemAtTableIdx -.public LOCK_NOTIFY_ARRAY .public LoadAndCompareScriptVarAndValue .public LoadAndCompareScriptVars .public LoadFileFromRom .public LoadScriptVariableValue .public LoadScriptVariableValueAtIndex .public LoadScriptVariableValueSum +.public LOCK_NOTIFY_ARRAY .public MemAlloc .public MemFree -.public OVERLAY11_DEBUG_STRINGS -.public PlayBgmByIdVeneer -.public PlayBgmByIdVolumeVeneer -.public PlaySeByIdVolumeWrapper -.public PreprocessString -.public RandInt -.public SCRIPT_COMMAND_PARSING_DATA -.public SCRIPT_OP_CODES -.public SaveScriptVariableValue -.public SaveScriptVariableValueAtIndex -.public ScriptParamToFixedPoint16 -.public ScriptParamToInt -.public ScriptSpecialProcess0x16 -.public ScriptSpecialProcessCall -.public SetAdventureLogCompleted -.public SetEnterDungeon -.public SetPortraitEmotion -.public SetPortraitLayout -.public SetPortraitOffset -.public SetResolvedPerformanceProgressFlag -.public SetScenarioProgressScriptVar -.public SetSpecialEpisodeBeaten -.public SetWorldMapLevel -.public UnloadFile -.public UnlockActorRoutines -.public UnlockMainRoutine -.public UnlockObjectRoutines -.public UnlockPerformerRoutines -.public UpdateTeamStats -.public WorldMapSetCamera -.public WorldMapSetMode -.public ZeroInitScriptVariable -.public _020A1870 -.public _020A548A -.public _020A5490 -.public _fdiv -.public _ffix -.public _fflt .public ov10_022C0814 .public ov10_022C096C .public ov10_022C0998 @@ -305,6 +273,29 @@ .public ov11_02324EA4 .public ov11_02324ECC .public ov11_02324F1C +.public OVERLAY11_DEBUG_STRINGS +.public PlayBgmByIdVeneer +.public PlayBgmByIdVolumeVeneer +.public PlaySeByIdVolumeWrapper +.public PreprocessString +.public RandInt +.public SaveScriptVariableValue +.public SaveScriptVariableValueAtIndex +.public SCRIPT_COMMAND_PARSING_DATA +.public SCRIPT_OP_CODES +.public ScriptParamToFixedPoint16 +.public ScriptParamToInt +.public ScriptSpecialProcess0x16 +.public ScriptSpecialProcessCall +.public SetAdventureLogCompleted +.public SetEnterDungeon +.public SetPortraitEmotion +.public SetPortraitLayout +.public SetPortraitOffset +.public SetResolvedPerformanceProgressFlag +.public SetScenarioProgressScriptVar +.public SetSpecialEpisodeBeaten +.public SetWorldMapLevel .public sprintf .public sub_0200514C .public sub_020051A0 @@ -358,3 +349,12 @@ .public sub_02065CB0 .public sub_02065CB4 .public sub_0206C0EC +.public UnloadFile +.public UnlockActorRoutines +.public UnlockMainRoutine +.public UnlockObjectRoutines +.public UnlockPerformerRoutines +.public UpdateTeamStats +.public WorldMapSetCamera +.public WorldMapSetMode +.public ZeroInitScriptVariable diff --git a/asm/include/overlay_11_022E46FC.inc b/asm/include/overlay_11_022E46FC.inc index 7e8d3981..6184acba 100644 --- a/asm/include/overlay_11_022E46FC.inc +++ b/asm/include/overlay_11_022E46FC.inc @@ -72,8 +72,8 @@ .public LoadRecycleShopOverlayInit .public LoadRecycleShopOverlayResume .public LoadRuleDungeonEffectsOverlay -.public LoadScriptVarValuePair .public LoadScriptVariableValue +.public LoadScriptVarValuePair .public LoadSpecialEpisodeDiscardOverlay1 .public LoadSpecialEpisodeDiscardOverlay2 .public LoadSpindaCafeOverlayInit @@ -83,28 +83,6 @@ .public MemFree .public MemZero .public MissionRewardValidateDungeonId -.public PrepareMenuAcceptTeamMember -.public PreprocessStringFromId -.public RandomizeDemoActors -.public RemoveBulkItemInStorage -.public RemoveItemNoHole -.public ReturnToTitleScreen -.public SaveScriptVariableValue -.public ScriptSpecialProcess0x16 -.public SetActorTalkMain -.public SetActorTalkSub -.public SetNewFriendActor -.public SetRandomRequestNpcs1And2 -.public SetScenarioProgressScriptVar -.public SetTeamSetupHeroAndPartnerOnly -.public SetTeamSetupHeroOnly -.public SetupAndShowKeyboard -.public SpecialProcAddItemToBag -.public StatusUpdate -.public StrcpyName -.public UnloadOverlay -.public WasMissionCompletedToday -.public ZeroInitScriptVariable .public ov11_022DC89C .public ov11_022DCB28 .public ov11_022E45F4 @@ -222,7 +200,26 @@ .public ov11_02324F94 .public ov28_0238A140 .public ov28_0238A468 +.public PrepareMenuAcceptTeamMember +.public PreprocessStringFromId +.public RandomizeDemoActors +.public RemoveBulkItemInStorage +.public RemoveItemNoHole +.public ReturnToTitleScreen +.public SaveScriptVariableValue +.public ScriptSpecialProcess0x16 +.public SetActorTalkMain +.public SetActorTalkSub +.public SetNewFriendActor +.public SetRandomRequestNpcs1And2 +.public SetScenarioProgressScriptVar +.public SetTeamSetupHeroAndPartnerOnly +.public SetTeamSetupHeroOnly +.public SetupAndShowKeyboard +.public SpecialProcAddItemToBag .public sprintf +.public StatusUpdate +.public StrcpyName .public sub_020051A0 .public sub_02005494 .public sub_020057A8 @@ -265,3 +262,6 @@ .public sub_0206C134 .public sub_0206C144 .public sub_0206C164 +.public UnloadOverlay +.public WasMissionCompletedToday +.public ZeroInitScriptVariable diff --git a/asm/include/overlay_11_022E7FB8.inc b/asm/include/overlay_11_022E7FB8.inc index f0972062..a04fddc3 100644 --- a/asm/include/overlay_11_022E7FB8.inc +++ b/asm/include/overlay_11_022E7FB8.inc @@ -1,3 +1,3 @@ #pragma once -.public UNIONALL_RAM_ADDRESS .public ov11_022DC89C +.public UNIONALL_RAM_ADDRESS diff --git a/asm/include/overlay_11_022E8090.inc b/asm/include/overlay_11_022E8090.inc index a8ab8b7d..d5a26eea 100644 --- a/asm/include/overlay_11_022E8090.inc +++ b/asm/include/overlay_11_022E8090.inc @@ -13,7 +13,6 @@ .public DecrementEggHatchTimer .public FreeMissionRewardStructMain .public G3X_Reset -.public GROUND_MEMORY_ARENA_1 .public GenerateCroagunkItems .public GenerateDailyMissions .public GenerateKecleonItems1 @@ -25,6 +24,7 @@ .public GetReleasedStylus .public GetResolvedPerformanceProgressFlag .public GetScenarioBalance +.public GROUND_MEMORY_ARENA_1 .public GroupOamAttributesBothScreens .public HandleMenus .public HandleUnlocks @@ -39,22 +39,6 @@ .public MemArenaAlloc .public MemFree .public MemsetSimple -.public RECRUITMENT_TABLE_LEVELS -.public RECRUITMENT_TABLE_LOCATIONS -.public RECRUITMENT_TABLE_SPECIES -.public RollRandomItemReward -.public SaveScriptVariableValue -.public SetBaseStatsMovesGroundMonster -.public SetDungeonConquest -.public SetMemAllocatorParams -.public SetPortraitLayout -.public SetRandomRequestNpcs1And2 -.public ShowPortraitInPortraitBox -.public ShowStringIdInDialogueBox -.public StrncpyName -.public UpdateRecycleShop -.public WasMissionCompletedToday -.public ZeroInitScriptVariable .public ov10_022BF7D4 .public ov11_022DC6C4 .public ov11_022DC718 @@ -151,6 +135,19 @@ .public ov11_02324F98 .public ov11_02324F9C .public ov11_02324FA0 +.public RECRUITMENT_TABLE_LEVELS +.public RECRUITMENT_TABLE_LOCATIONS +.public RECRUITMENT_TABLE_SPECIES +.public RollRandomItemReward +.public SaveScriptVariableValue +.public SetBaseStatsMovesGroundMonster +.public SetDungeonConquest +.public SetMemAllocatorParams +.public SetPortraitLayout +.public SetRandomRequestNpcs1And2 +.public ShowPortraitInPortraitBox +.public ShowStringIdInDialogueBox +.public StrncpyName .public sub_020012D8 .public sub_020017B4 .public sub_0200383C @@ -210,3 +207,6 @@ .public sub_02062DC4 .public sub_0206309C .public sub_0206C0D8 +.public UpdateRecycleShop +.public WasMissionCompletedToday +.public ZeroInitScriptVariable diff --git a/asm/include/overlay_11_022EA024.inc b/asm/include/overlay_11_022EA024.inc index b626b5cb..0d205f74 100644 --- a/asm/include/overlay_11_022EA024.inc +++ b/asm/include/overlay_11_022EA024.inc @@ -1,25 +1,22 @@ #pragma once +.public _fdiv +.public _ffix +.public _fflt .public C_ROUTINE_NAMES .public ClampComponentAbs .public Debug_GetDebugFlag .public EuclideanNorm__020050B0 -.public GROUND_WAN_FILES_TABLE .public GetFadeStatus .public GetHeldButtons .public GetPressedButtons .public GetReleasedStylus .public GetSpeedOption +.public GROUND_WAN_FILES_TABLE .public HandleFadesVeneer .public IsTouchScreenUseAnywhere .public KeyWaitInit .public MemAlloc .public MemFree -.public RandRange -.public SCRIPT_OP_CODE_NAMES -.public UnlockScriptingLock -.public _fdiv -.public _ffix -.public _fflt .public ov10_022BDB54 .public ov10_022BDB60 .public ov10_022BDBA4 @@ -1484,6 +1481,8 @@ .public ov11_0238916C .public ov11_023891F4 .public ov11_023891F8 +.public RandRange +.public SCRIPT_OP_CODE_NAMES .public sub_0200514C .public sub_02008F3C .public sub_02009120 @@ -1503,3 +1502,4 @@ .public sub_0200BD50 .public sub_0201F2A0 .public sub_0206C0FC +.public UnlockScriptingLock diff --git a/asm/include/overlay_11_022EE5E4.inc b/asm/include/overlay_11_022EE5E4.inc index 4c7aa157..07b238fd 100644 --- a/asm/include/overlay_11_022EE5E4.inc +++ b/asm/include/overlay_11_022EE5E4.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public ACTOR_FUNCTION_TABLE .public AnimationControlGetAllocForMaxFrame .public CopyColorToPaletteDataRgba @@ -15,13 +16,14 @@ .public FillOamAttributeInfo .public FillPaletteDataRgba .public FuncThatCallsRunNextOpcode -.public GROUND_STATE_MAP -.public GROUND_STATE_PTRS -.public GROUND_WEATHER_TABLE .public GetCollidingEventId .public GetCollidingObjectId .public GetCoroutineInfo +.public GetPixelOffsetFromSprite .public GetSpriteIndex__02052724 +.public GROUND_STATE_MAP +.public GROUND_STATE_PTRS +.public GROUND_WEATHER_TABLE .public GroundBg_FreeAll .public GroundBg_Init .public InitAnimationControlWithSet__0201C0B0 @@ -39,24 +41,10 @@ .public LoadWteFromRom .public MarkPaletteDataAsNeedingUpdate .public MemAlloc +.public Memcpy32 .public MemFree .public MemZero -.public Memcpy32 .public OBJECTS -.public PlaySeVolumeWrapper -.public RandInt -.public Render3dElement64 -.public SETANIMATION_TABLE -.public ScriptStationLoadTalk -.public SetActorTalkMain -.public SetActorTalkMainAndActorTalkSub -.public SetActorTalkSub -.public SetAnimationForAnimationControl -.public SetSpriteIdForAnimationControl -.public SwitchAnimationControlToNextFrame -.public UnlockRoutine -.public WAN_TABLE -.public _s32_div_f .public ov10_022BDA84 .public ov10_022BDB80 .public ov10_022BDC0C @@ -254,6 +242,16 @@ .public ov11_0238A068 .public ov16_0238CC94 .public ov16_0238CCA8 +.public PlaySeVolumeWrapper +.public RandInt +.public Render3dElement64 +.public ScriptStationLoadTalk +.public SetActorTalkMain +.public SetActorTalkMainAndActorTalkSub +.public SetActorTalkSub +.public SETANIMATION_TABLE +.public SetAnimationForAnimationControl +.public SetSpriteIdForAnimationControl .public sprintf .public sub_0200302C .public sub_020030FC @@ -276,7 +274,6 @@ .public sub_0200B3C0 .public sub_020163AC .public sub_0201C108 -.public sub_0201CF90 .public sub_0201D100 .public sub_0201D18C .public sub_0201D1B0 @@ -298,3 +295,6 @@ .public sub_0206ADB8 .public sub_0206B9DC .public sub_0206BA5C +.public SwitchAnimationControlToNextFrame +.public UnlockRoutine +.public WAN_TABLE diff --git a/asm/include/overlay_11_022FAC54.inc b/asm/include/overlay_11_022FAC54.inc index c9be52ee..7fe7d4c8 100644 --- a/asm/include/overlay_11_022FAC54.inc +++ b/asm/include/overlay_11_022FAC54.inc @@ -1,4 +1,5 @@ #pragma once +.public abs .public ChangeActorAnimation .public Debug_Print .public DeleteLiveActor @@ -8,15 +9,8 @@ .public LoadObjectAnimData .public MemAlloc .public MemFree -.public OBJECTS .public OBJECT_FUNCTION_TABLE -.public SetActorTalkSub -.public SetAnimDataFields2 -.public SetAnimDataFieldsWrapper -.public SetAttributeBitfieldLiveActor -.public SetPositionLiveActor -.public UnlockRoutine -.public abs +.public OBJECTS .public ov11_022DC934 .public ov11_022DC958 .public ov11_022DC9A0 @@ -62,6 +56,12 @@ .public ov11_02322074 .public ov11_02324CF8 .public ov11_02324D00 +.public SetActorTalkSub +.public SetAnimDataFields2 +.public SetAnimDataFieldsWrapper +.public SetAttributeBitfieldLiveActor +.public SetPositionLiveActor .public sub_02005430 .public sub_020054C0 .public sub_02006DC8 +.public UnlockRoutine diff --git a/asm/include/overlay_11_022FD308.inc b/asm/include/overlay_11_022FD308.inc index 48bf6662..76445159 100644 --- a/asm/include/overlay_11_022FD308.inc +++ b/asm/include/overlay_11_022FD308.inc @@ -6,10 +6,6 @@ .public InitScriptRoutine .public MemAlloc .public MemFree -.public PERFORMER_FUNCTION_TABLE -.public SetAnimDataFields2 -.public SetAnimDataFieldsWrapper -.public UnlockRoutine .public ov11_022DC934 .public ov11_022DC958 .public ov11_022DC9A0 @@ -43,3 +39,7 @@ .public ov11_02322324 .public ov11_02324D00 .public ov11_02324D04 +.public PERFORMER_FUNCTION_TABLE +.public SetAnimDataFields2 +.public SetAnimDataFieldsWrapper +.public UnlockRoutine diff --git a/asm/include/overlay_11_022FE4AC.inc b/asm/include/overlay_11_022FE4AC.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_11_022FE4AC.inc +++ b/asm/include/overlay_11_022FE4AC.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_11_022FE5F8.inc b/asm/include/overlay_11_022FE5F8.inc index a173597c..2fc0ff08 100644 --- a/asm/include/overlay_11_022FE5F8.inc +++ b/asm/include/overlay_11_022FE5F8.inc @@ -49,9 +49,9 @@ .public DrawTextInWindow .public DungeonMoveToGroundMove .public DungeonSwapIdxToId +.public EnableIqSkill .public EVENTS .public EXCLUSIVE_ITEM_REQUIREMENTS_PTR -.public EnableIqSkill .public FreeMissionRewardStructMain .public FuncThatCallsRunNextOpcode .public GetActiveRosterIndex @@ -122,69 +122,11 @@ .public MaybeGetFormattedItemName .public MaybeGetUncoloredFormattedItemName .public MemAlloc +.public memcpy +.public MemcpySimple .public MemFree .public MemZero -.public MemcpySimple .public NewWindowScreenCheck -.public PlaySeVolumeWrapper -.public PopInventoryMenuField0x1A3 -.public PreprocessString -.public PreprocessStringFromId -.public PrintBadgeMark -.public PrintIqSkillsMenu -.public RecolorNameString -.public RemoveItemNoHole -.public RemoveItemNoHoleCheck -.public ResetAttributeBitfieldLivePerformer -.public ResumeAdvancedMenu -.public ResumeParentMenu -.public ReturnScriptMenuResult -.public ReturnScriptMenuResultZero -.public SWAP_SHOP_CLUMSET_ONE_STAR_STR -.public SWAP_SHOP_CLUMSET_THREE_STAR_STR -.public SWAP_SHOP_CLUMSET_TWO_STAR_STR -.public SWAP_SHOP_INVENTORY_PTRS -.public SWAP_SHOP_ONE_STAR_STR -.public SWAP_SHOP_RED_TEXT_TAG_STR -.public SWAP_SHOP_THREE_STAR_STR -.public SWAP_SHOP_TWO_STAR_STR -.public SWAP_SHOP_UNCENTER_TEXT_TAG_STR -.public SaveScriptVariableValue -.public SaveScriptVariableValueBytes -.public SetAnimDataFields2 -.public SetAreaNameBoxState3 -.public SetAttributeBitfieldLivePerformer -.public SetCollectionMenuField0x1A4 -.public SetCollectionMenuField0x1C8 -.public SetInventoryMenuState0 -.public SetInventoryMenuState6 -.public SetItemAcquired -.public SetNewFriendActor -.public SetParentMenuState7 -.public SetWindowTitle -.public ShowDialogueBox -.public ShowKeyboard -.public ShowStringIdInDialogueBox -.public ShowStringInDialogueBox -.public SortItemsInBag -.public StrcmpMonsterName -.public StrcpyName -.public StrcpySimple -.public StringFromId -.public StrncpyName -.public StrncpySimple -.public StrncpySimpleNoPad -.public StrncpySimpleNoPadSafe -.public SwapShopFreeDoublePointer -.public TEAM_INFO_BOX_DEFAULT_WINDOW_PARAMS -.public TEAM_MEMBER_TABLE_PTR -.public UnloadFile -.public UpdateWindow -.public ValidateTeamMembers -.public WorldMapSetCamera -.public WorldMapSetMode -.public ZeroInitMissionRewardDataStruct -.public memcpy .public ov10_022BCC60 .public ov10_022BCC7C .public ov10_022BCCB0 @@ -382,9 +324,49 @@ .public ov11_0238A080 .public ov11_0238A084 .public ov11_0238A088 +.public PlaySeVolumeWrapper +.public PopInventoryMenuField0x1A3 +.public PreprocessString +.public PreprocessStringFromId +.public PrintBadgeMark +.public PrintIqSkillsMenu +.public RecolorNameString +.public RemoveItemNoHole +.public RemoveItemNoHoleCheck +.public ResetAttributeBitfieldLivePerformer +.public ResumeAdvancedMenu +.public ResumeParentMenu +.public ReturnScriptMenuResult +.public ReturnScriptMenuResultZero +.public SaveScriptVariableValue +.public SaveScriptVariableValueBytes +.public SetAnimDataFields2 +.public SetAreaNameBoxState3 +.public SetAttributeBitfieldLivePerformer +.public SetCollectionMenuField0x1A4 +.public SetCollectionMenuField0x1C8 +.public SetInventoryMenuState0 +.public SetInventoryMenuState6 +.public SetItemAcquired +.public SetNewFriendActor +.public SetParentMenuState7 +.public SetWindowTitle +.public ShowDialogueBox +.public ShowKeyboard +.public ShowStringIdInDialogueBox +.public ShowStringInDialogueBox +.public SortItemsInBag .public sprintf .public strcat +.public StrcmpMonsterName .public strcpy +.public StrcpyName +.public StrcpySimple +.public StringFromId +.public StrncpyName +.public StrncpySimple +.public StrncpySimpleNoPad +.public StrncpySimpleNoPadSafe .public sub_020037A4 .public sub_02008BA8 .public sub_0200CF6C @@ -512,4 +494,22 @@ .public sub_02067664 .public sub_0206A84C .public sub_0206C110 +.public SWAP_SHOP_CLUMSET_ONE_STAR_STR +.public SWAP_SHOP_CLUMSET_THREE_STAR_STR +.public SWAP_SHOP_CLUMSET_TWO_STAR_STR +.public SWAP_SHOP_INVENTORY_PTRS +.public SWAP_SHOP_ONE_STAR_STR +.public SWAP_SHOP_RED_TEXT_TAG_STR +.public SWAP_SHOP_THREE_STAR_STR +.public SWAP_SHOP_TWO_STAR_STR +.public SWAP_SHOP_UNCENTER_TEXT_TAG_STR +.public SwapShopFreeDoublePointer +.public TEAM_INFO_BOX_DEFAULT_WINDOW_PARAMS +.public TEAM_MEMBER_TABLE_PTR +.public UnloadFile +.public UpdateWindow +.public ValidateTeamMembers .public vsprintf +.public WorldMapSetCamera +.public WorldMapSetMode +.public ZeroInitMissionRewardDataStruct diff --git a/asm/include/overlay_11_0230CE30.inc b/asm/include/overlay_11_0230CE30.inc index 4920335c..ef07f847 100644 --- a/asm/include/overlay_11_0230CE30.inc +++ b/asm/include/overlay_11_0230CE30.inc @@ -1,4 +1,8 @@ #pragma once +.public _fdiv +.public _ffix +.public _fflt +.public _s32_div_f .public AnimRelatedFunction__022F6F14 .public AppendStandardStringToMission .public ClampComponentAbs @@ -11,10 +15,9 @@ .public Debug_Print .public DelayWteFree .public DrawTextInWindow -.public EVENTS .public EuclideanNorm__020050B0 +.public EVENTS .public FX_Atan2Idx -.public GROUND_WEATHER_TABLE .public GetAcceptedMission .public GetDungeonMode .public GetExecuteSpecialEpisodeType @@ -25,6 +28,7 @@ .public GetMissionRankWithCapAndModifiersAndCap .public GetPartner .public GetTopScreenOption +.public GROUND_WEATHER_TABLE .public GroundBg_FreeAll .public GroundBg_Init .public InitAnimDataFromOtherAnimDataVeneer @@ -39,17 +43,6 @@ .public LoadWteFromRom .public MemAlloc .public MemFree -.public OverlayIsLoaded -.public SentryUpdateDisplay -.public SetAnimDataFields2 -.public TRIG_TABLE -.public UpdateWindow -.public VEC_Distance -.public WORLD_MAP_MODE -.public _fdiv -.public _ffix -.public _fflt -.public _s32_div_f .public ov11_022DC240 .public ov11_022DC368 .public ov11_022DC3A0 @@ -243,6 +236,9 @@ .public ov16_0238CCBC .public ov16_0238CCD8 .public ov16_0238CCF0 +.public OverlayIsLoaded +.public SentryUpdateDisplay +.public SetAnimDataFields2 .public sub_0200514C .public sub_020055C8 .public sub_02008F64 @@ -272,3 +268,7 @@ .public sub_0206A96C .public sub_0206A9DC .public sub_0206AA40 +.public TRIG_TABLE +.public UpdateWindow +.public VEC_Distance +.public WORLD_MAP_MODE diff --git a/asm/include/overlay_16.inc b/asm/include/overlay_16.inc index fee0d212..99ebf5cb 100644 --- a/asm/include/overlay_16.inc +++ b/asm/include/overlay_16.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public CloseAdvancedMenu .public CloseDialogueBox .public ClosePortraitBox @@ -8,15 +9,15 @@ .public CreatePortraitBox .public CreateSimpleMenuFromStringIds .public Debug_Print0 -.public EVOLUTION_HP_BONUS -.public EVOLUTION_PHYSICAL_STAT_BONUSES -.public EVOLUTION_SPECIAL_STAT_BONUSES .public EVO_MAIN_MENU_ITEMS .public EVO_MENU_ITEMS_CONFIRM .public EVO_SUBMENU_ITEMS .public EVO_WINDOW_PARAMS_4 .public EVO_WINDOW_PARAMS_5 .public EVO_WINDOW_PARAMS_6 +.public EVOLUTION_HP_BONUS +.public EVOLUTION_PHYSICAL_STAT_BONUSES +.public EVOLUTION_SPECIAL_STAT_BONUSES .public GetActiveTeamMember .public GetAdvancedMenuResult .public GetEvolutionPossibilities @@ -44,6 +45,10 @@ .public IsValidTeamMember .public MemAlloc .public MemFree +.public ov11_0230D220 +.public ov11_02310BDC +.public ov16_0238CE04 +.public ov16_0238CE28 .public OVERLAY16_UNKNOWN_POINTER__NA_238CE40 .public PreprocessString .public Rand16Bit @@ -63,12 +68,6 @@ .public StrncpyName .public StrncpySimple .public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public _s32_div_f -.public ov11_0230D220 -.public ov11_02310BDC -.public ov16_0238CE04 -.public ov16_0238CE28 .public sub_02017C50 .public sub_02017C74 .public sub_02017CB4 @@ -102,3 +101,4 @@ .public sub_020582E0 .public sub_02059B08 .public sub_0205B008 +.public TEAM_MEMBER_TABLE_PTR diff --git a/asm/include/overlay_16_0238CD08.inc b/asm/include/overlay_16_0238CD08.inc index 6f70f09b..3f59c932 100644 --- a/asm/include/overlay_16_0238CD08.inc +++ b/asm/include/overlay_16_0238CD08.inc @@ -1 +1,2 @@ #pragma once + diff --git a/asm/include/overlay_17_0238A754.inc b/asm/include/overlay_17_0238A754.inc index 25316035..d0217174 100644 --- a/asm/include/overlay_17_0238A754.inc +++ b/asm/include/overlay_17_0238A754.inc @@ -25,6 +25,8 @@ .public InitPortraitParamsWithMonsterId .public IsDialogueBoxActive .public IsMainCharacter +.public ov17_0238A278 +.public ov17_0238A364 .public OVERLAY17_FUNCTION_POINTER_TABLE .public OVERLAY17_UNKNOWN_POINTER__NA_238BE00 .public ReturnScriptMenuResultZero @@ -33,8 +35,6 @@ .public ShowDialogueBox .public ShowPortraitInPortraitBox .public ShowStringIdInDialogueBox -.public ov17_0238A278 -.public ov17_0238A364 .public sub_02039C3C .public sub_0203A998 .public sub_0203C7E4 diff --git a/asm/include/overlay_17_0238B2B4.inc b/asm/include/overlay_17_0238B2B4.inc index ad290da5..6a6500b4 100644 --- a/asm/include/overlay_17_0238B2B4.inc +++ b/asm/include/overlay_17_0238B2B4.inc @@ -4,11 +4,6 @@ .public GetSimpleMenuResult__0202B870 .public IsMePlaying .public IsSimpleMenuActive -.public OVERLAY17_UNKNOWN_POINTER__NA_238BE00 -.public PlaySeVolumeWrapper -.public PrintIqSkillsMenu -.public TEAM_MEMBER_TABLE_PTR -.public TryAddMonsterToActiveTeam .public ov11_022DC504 .public ov17_0238B028 .public ov17_0238B048 @@ -24,6 +19,9 @@ .public ov17_0238B260 .public ov17_0238B278 .public ov17_0238B290 +.public OVERLAY17_UNKNOWN_POINTER__NA_238BE00 +.public PlaySeVolumeWrapper +.public PrintIqSkillsMenu .public sub_02017C50 .public sub_020307EC .public sub_0203A51C @@ -53,3 +51,5 @@ .public sub_020572EC .public sub_02057444 .public sub_02058138 +.public TEAM_MEMBER_TABLE_PTR +.public TryAddMonsterToActiveTeam diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc index bd2521cc..58accbc9 100644 --- a/asm/include/overlay_18.inc +++ b/asm/include/overlay_18.inc @@ -52,6 +52,9 @@ .public LINK_SHOP_WINDOW_PARAMS_9 .public MemAlloc .public MemFree +.public ov11_0238A090 +.public ov18_0238D5F8 +.public ov18_0238D608 .public OVERLAY18_FUNCTION_POINTER_TABLE .public PortraitBoxNeedsUpdate .public PreprocessString @@ -64,11 +67,6 @@ .public ShowPortraitInPortraitBox .public ShowStringIdInDialogueBox .public StrncpySimpleNoPadSafe -.public TEAM_MEMBER_TABLE_PTR -.public UpdateWindow -.public ov11_0238A090 -.public ov18_0238D5F8 -.public ov18_0238D608 .public sub_02027B1C .public sub_0202BC60 .public sub_0202F334 @@ -97,4 +95,6 @@ .public sub_020572EC .public sub_020573A0 .public sub_0205B028 +.public TEAM_MEMBER_TABLE_PTR +.public UpdateWindow .public vsprintf diff --git a/asm/include/overlay_18_0238C114.inc b/asm/include/overlay_18_0238C114.inc index bb089643..a6226d58 100644 --- a/asm/include/overlay_18_0238C114.inc +++ b/asm/include/overlay_18_0238C114.inc @@ -4,11 +4,10 @@ .public GetSimpleMenuResult__0202B870 .public IsSimpleMenuActive .public LINK_SHOP_PTR +.public ov18_0238BE28 .public PlaySeByIdVolumeWrapper .public PlaySeVolumeWrapper .public PrintIqSkillsMenu -.public TEAM_MEMBER_TABLE_PTR -.public ov18_0238BE28 .public sub_02017C74 .public sub_020307EC .public sub_0203A51C @@ -41,3 +40,4 @@ .public sub_02041B7C .public sub_020420F4 .public sub_020572EC +.public TEAM_MEMBER_TABLE_PTR diff --git a/asm/include/overlay_18_0238CAB0.inc b/asm/include/overlay_18_0238CAB0.inc index a0be1d53..f565b1ee 100644 --- a/asm/include/overlay_18_0238CAB0.inc +++ b/asm/include/overlay_18_0238CAB0.inc @@ -6,7 +6,6 @@ .public IsAdvancedMenuActive2 .public IsSimpleMenuActive .public LINK_SHOP_PTR -.public ResumeAdvancedMenu .public memcpy .public ov18_0238ADA8 .public ov18_0238BE28 @@ -65,6 +64,7 @@ .public ov18_0238D22C .public ov18_0238D23C .public ov18_0238D260 +.public ResumeAdvancedMenu .public sub_0202C1E4 .public sub_0203FD14 .public sub_0203FD2C diff --git a/asm/include/overlay_29_022DC7E4.inc b/asm/include/overlay_29_022DC7E4.inc index 4602935f..6d0c8002 100644 --- a/asm/include/overlay_29_022DC7E4.inc +++ b/asm/include/overlay_29_022DC7E4.inc @@ -1,8 +1,9 @@ #pragma once +.public _s32_div_f .public AddSimpleObjToOam .public ChangeSimpleObjTexture -.public DUNGEON_PTR .public DirectoryFileMngr_OpenDirectoryFile +.public DUNGEON_PTR .public FillPaletteInitInfo .public GetDefaultTileTextureId .public HandleSir0Translation @@ -12,8 +13,6 @@ .public MemFree .public MemZero .public OBJ_GRAPHICS_CONTROLS_PTR -.public UnloadFile -.public _s32_div_f .public ov29_022DC78C .public ov29_02350F88 .public ov29_02350F8C @@ -66,3 +65,4 @@ .public sub_02063734 .public sub_02063770 .public sub_02063830 +.public UnloadFile diff --git a/asm/include/overlay_29_022E08F4.inc b/asm/include/overlay_29_022E08F4.inc index 0d5816c5..9174c7c8 100644 --- a/asm/include/overlay_29_022E08F4.inc +++ b/asm/include/overlay_29_022E08F4.inc @@ -1,8 +1,6 @@ #pragma once .public DUNGEON_PTR .public GetScenarioBalance -.public StartFadeDungeonWrapper -.public WaitUntilFadeIsFinished .public ov29_022DE15C .public ov29_022DE854 .public ov29_022E0DFC @@ -11,3 +9,5 @@ .public ov29_022E8778 .public ov29_022EA370 .public ov29_0233A248 +.public StartFadeDungeonWrapper +.public WaitUntilFadeIsFinished diff --git a/asm/include/overlay_29_022E0A18.inc b/asm/include/overlay_29_022E0A18.inc index 52e80510..eab69a57 100644 --- a/asm/include/overlay_29_022E0A18.inc +++ b/asm/include/overlay_29_022E0A18.inc @@ -1,9 +1,11 @@ #pragma once +.public _020AFC28 +.public _020AFC70 .public AnimationDelayOrSomething .public CopyAndInterleaveWrapper +.public DirectoryFileMngr_OpenDirectoryFile .public DUNGEON_BUTTON_INPUT .public DUNGEON_PTR -.public DirectoryFileMngr_OpenDirectoryFile .public DungeonGoesUp .public FadeToBlack .public FillPaletteInitInfo @@ -21,11 +23,6 @@ .public Memcpy32 .public Memset32 .public OBJ_GRAPHICS_CONTROLS_PTR -.public SetMinimapDataE447 -.public UnloadFile -.public UnloadWte -.public _020AFC28 -.public _020AFC70 .public ov10_022C4D54 .public ov29_022E8BFC .public ov29_022E9FD0 @@ -41,6 +38,7 @@ .public ov29_0237C6A4 .public ov29_0237C6B8 .public ov29_0237C6D4 +.public SetMinimapDataE447 .public sub_020063F4 .public sub_02006564 .public sub_02006BFC @@ -52,3 +50,5 @@ .public sub_02009454 .public sub_020094C4 .public sub_0201E380 +.public UnloadFile +.public UnloadWte diff --git a/asm/include/overlay_29_022E1AD4.inc b/asm/include/overlay_29_022E1AD4.inc index f64eab0b..4e6c9b71 100644 --- a/asm/include/overlay_29_022E1AD4.inc +++ b/asm/include/overlay_29_022E1AD4.inc @@ -9,8 +9,6 @@ .public HasDropeyeStatus .public HiddenStairsPresent .public IsPositionActuallyInSight -.public PopulateActiveMonsterPtrs -.public SECONDARY_TERRAIN_TYPES .public ov29_022DE954 .public ov29_022DE9F8 .public ov29_022DEA10 @@ -20,3 +18,5 @@ .public ov29_02304830 .public ov29_0237C754 .public ov29_0237C79C +.public PopulateActiveMonsterPtrs +.public SECONDARY_TERRAIN_TYPES diff --git a/asm/include/overlay_29_022E335C.inc b/asm/include/overlay_29_022E335C.inc index 3b0e0309..d509ecfa 100644 --- a/asm/include/overlay_29_022E335C.inc +++ b/asm/include/overlay_29_022E335C.inc @@ -5,7 +5,8 @@ .public DisplayUi .public DUNGEON_PTR .public EntityIsValid__022E37B8 -.public GetEffectAnimationField0x19 +.public GetEffectAnimationWanOffset +.public GetPixelOffsetFromSprite .public GetTileSafe .public InitOamAdjustmentInfo .public LogMessageByIdWithPopupCheckUser @@ -17,7 +18,6 @@ .public ov29_0235354C .public ScreenEffectActive .public ShouldDisplayEntityAdvanced -.public sub_0201CF90 .public UpdateCamera .public UpdateMinimap .public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_022E37DC.inc b/asm/include/overlay_29_022E37DC.inc index e89d0733..c9c9dd4e 100644 --- a/asm/include/overlay_29_022E37DC.inc +++ b/asm/include/overlay_29_022E37DC.inc @@ -3,8 +3,17 @@ .public AnimationHasMoreFrames .public DUNGEON_PTR .public EntityIsValid__022E37B8 -.public GetEffectAnimationField0x19 +.public GetEffectAnimationWanOffset .public InitOamAdjustmentInfo +.public ov10_022BDC68 +.public ov10_022BF274 +.public ov10_022BF2B4 +.public ov10_022BF9CC +.public ov29_022DE5D8 +.public ov29_022DE5F0 +.public ov29_022E6E40 +.public ov29_022ED0F4 +.public ov29_0235354C .public PlayEffectAnimationEntity .public PlaySeByIdIfShouldDisplayEntity .public STATUS_ICON_ARRAY_BIDE @@ -22,12 +31,3 @@ .public STATUS_ICON_ARRAY_REFLECT .public STATUS_ICON_ARRAY_SLEEP .public STATUS_ICON_ARRAY_SURE_SHOT -.public ov10_022BDC68 -.public ov10_022BF274 -.public ov10_022BF2B4 -.public ov10_022BF9CC -.public ov29_022DE5D8 -.public ov29_022DE5F0 -.public ov29_022E6E40 -.public ov29_022ED0F4 -.public ov29_0235354C diff --git a/asm/include/overlay_29_022E41F0.inc b/asm/include/overlay_29_022E41F0.inc index 264700b1..54aa975e 100644 --- a/asm/include/overlay_29_022E41F0.inc +++ b/asm/include/overlay_29_022E41F0.inc @@ -1,3 +1,3 @@ #pragma once -.public GetEffectAnimationField0x19 +.public GetEffectAnimationWanOffset .public PlayEffectAnimationEntity diff --git a/asm/include/overlay_29_022E45CC.inc b/asm/include/overlay_29_022E45CC.inc index 264700b1..54aa975e 100644 --- a/asm/include/overlay_29_022E45CC.inc +++ b/asm/include/overlay_29_022E45CC.inc @@ -1,3 +1,3 @@ #pragma once -.public GetEffectAnimationField0x19 +.public GetEffectAnimationWanOffset .public PlayEffectAnimationEntity diff --git a/asm/include/overlay_29_022E4868.inc b/asm/include/overlay_29_022E4868.inc index ddb30d5a..1177c9d6 100644 --- a/asm/include/overlay_29_022E4868.inc +++ b/asm/include/overlay_29_022E4868.inc @@ -1,4 +1,4 @@ #pragma once -.public GetEffectAnimationField0x19 +.public GetEffectAnimationWanOffset .public PlayEffectAnimationEntity .public PlaySeByIdIfShouldDisplayEntity diff --git a/asm/include/overlay_29_022E4BB4.inc b/asm/include/overlay_29_022E4BB4.inc index 9c7e98d1..52f51bdd 100644 --- a/asm/include/overlay_29_022E4BB4.inc +++ b/asm/include/overlay_29_022E4BB4.inc @@ -1,5 +1,5 @@ #pragma once .public DUNGEON_PTR -.public GetEffectAnimationField0x19 -.public PlayEffectAnimationEntity +.public GetEffectAnimationWanOffset .public ov29_0230D618 +.public PlayEffectAnimationEntity diff --git a/asm/include/overlay_29_022E5650.inc b/asm/include/overlay_29_022E5650.inc index f8110de5..8258ded7 100644 --- a/asm/include/overlay_29_022E5650.inc +++ b/asm/include/overlay_29_022E5650.inc @@ -7,19 +7,13 @@ .public DUNGEON_PTR .public DungeonGoesUp .public EntityIsValid__022E37B8 -.public GetEffectAnimationField0x19 +.public FillPixelOffsetArrayFromSprite +.public GetEffectAnimationWanOffset .public GetFloorType .public GetLeader .public InitOamAdjustmentInfo .public IsCurrentFixedRoomBossFight .public LogMessageByIdWithPopup -.public PlayEffectAnimationEntity -.public PlayEffectAnimationPixelPos -.public PlayEffectAnimationPos -.public PlayMeByIdIfNot998 -.public PlaySeByIdIfNotSilence -.public ShouldDisplayEntityWrapper -.public SubstitutePlaceholderStringTags .public ov10_022BDC68 .public ov10_022BEC08 .public ov10_022BEC94 @@ -38,4 +32,10 @@ .public ov29_023511DC .public ov29_0235122C .public ov29_0235124C -.public sub_0201D034 +.public PlayEffectAnimationEntity +.public PlayEffectAnimationPixelPos +.public PlayEffectAnimationPos +.public PlayMeByIdIfNot998 +.public PlaySeByIdIfNotSilence +.public ShouldDisplayEntityWrapper +.public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_022E6798.inc b/asm/include/overlay_29_022E6798.inc index 66c3d8bf..9ba970f5 100644 --- a/asm/include/overlay_29_022E6798.inc +++ b/asm/include/overlay_29_022E6798.inc @@ -2,7 +2,7 @@ .public AdvanceFrame .public AnimationDelayOrSomething .public DUNGEON_PTR -.public GetEffectAnimationField0x19 +.public GetEffectAnimationWanOffset +.public ov29_022EA370 .public PlayEffectAnimationEntity .public ShouldDisplayEntityAdvanced -.public ov29_022EA370 diff --git a/asm/include/overlay_29_022E6928.inc b/asm/include/overlay_29_022E6928.inc index 0ee19b86..ffc03744 100644 --- a/asm/include/overlay_29_022E6928.inc +++ b/asm/include/overlay_29_022E6928.inc @@ -11,7 +11,7 @@ .public DungeonRngSetPrimary .public DungeonRngSetSecondary .public FloorNumberIsEven -.public GetEffectAnimationField0x19 +.public GetEffectAnimationWanOffset .public GetLeader .public GetMonsterGenderVeneer .public GetMonsterIdFromSpawnEntry @@ -19,6 +19,7 @@ .public GetNbFloorsPlusOne .public GetNbPrecedingFloors .public GetNbRecruited +.public GetPixelOffsetFromSprite .public GetSecondFormIfValid .public GetSpriteFileSize .public HandleSir0Translation @@ -35,10 +36,6 @@ .public MemAlloc .public MemFree .public NeedsItemToSpawn -.public PlayEffectAnimationEntity -.public RandIntSafe -.public SetMonsterId -.public UnloadFile .public ov10_022BDC68 .public ov10_022BDE50 .public ov10_022BEFD8 @@ -56,4 +53,7 @@ .public ov29_023515B0 .public ov29_023515CC .public ov29_0235354C -.public sub_0201CF90 +.public PlayEffectAnimationEntity +.public RandIntSafe +.public SetMonsterId +.public UnloadFile diff --git a/asm/include/overlay_29_022E7EC4.inc b/asm/include/overlay_29_022E7EC4.inc index 92130689..d3ca2476 100644 --- a/asm/include/overlay_29_022E7EC4.inc +++ b/asm/include/overlay_29_022E7EC4.inc @@ -13,10 +13,6 @@ .public MemAlloc .public MemFree .public MemZero -.public SetMinimapDataE447 -.public SetMinimapDataE448 -.public TOP_SCREEN_STATUS_PTR -.public UpdateMinimap .public ov10_022C1E50 .public ov10_022C1E80 .public ov10_022C21D8 @@ -43,7 +39,11 @@ .public ov29_0233A0E8 .public ov29_0233A1BC .public ov29_0234B4E0 +.public SetMinimapDataE447 +.public SetMinimapDataE448 .public sub_02048384 .public sub_020483B8 .public sub_020483D8 .public sub_02048400 +.public TOP_SCREEN_STATUS_PTR +.public UpdateMinimap diff --git a/asm/include/overlay_29_022E86A4.inc b/asm/include/overlay_29_022E86A4.inc index 63d333f5..4c2fd7b8 100644 --- a/asm/include/overlay_29_022E86A4.inc +++ b/asm/include/overlay_29_022E86A4.inc @@ -1,25 +1,20 @@ #pragma once .public CloseTextBox2 .public CreateTextBox +.public DrawTextInWindow .public DUNGEON_CONTROLS_MENU_PTR .public DUNGEON_CONTROLS_MENU_WINDOW_PARAMS .public DUNGEON_PTR -.public DrawTextInWindow .public FreeDungeonControlsMenuWithBg .public FreeTeamStatsWrapper .public GetIdleAnimationId .public GetTopScreenOption .public InitDungeonControlsMenuWithBg -.public InitPreprocessorArgs .public InitializeTeamStats +.public InitPreprocessorArgs .public MemAlloc .public MemFree .public MemZero -.public StartFadeDungeonWrapper -.public StringFromId -.public TOP_SCREEN_STATUS_PTR -.public UpdateTeamStatsWrapper -.public UpdateWindow .public ov10_022C1DE0 .public ov10_022C2278 .public ov29_022DC684 @@ -47,5 +42,10 @@ .public ov29_0234F2B8 .public ov29_023515E8 .public ov29_0235352C +.public StartFadeDungeonWrapper +.public StringFromId .public sub_0200B330 .public sub_0200B3D4 +.public TOP_SCREEN_STATUS_PTR +.public UpdateTeamStatsWrapper +.public UpdateWindow diff --git a/asm/include/overlay_29_022E9628.inc b/asm/include/overlay_29_022E9628.inc index 5d275cc9..64b78000 100644 --- a/asm/include/overlay_29_022E9628.inc +++ b/asm/include/overlay_29_022E9628.inc @@ -1,8 +1,8 @@ #pragma once +.public abs .public DUNGEON_PTR .public DungeonRandInt .public GetLeader .public GetTile .public MemAlloc .public MemFree -.public abs diff --git a/asm/include/overlay_29_022E9FE0.inc b/asm/include/overlay_29_022E9FE0.inc index 56fb91ea..1863674a 100644 --- a/asm/include/overlay_29_022E9FE0.inc +++ b/asm/include/overlay_29_022E9FE0.inc @@ -1,10 +1,11 @@ #pragma once +.public _s32_div_f .public ChangeSimpleObjTexture +.public DisplayMonstersAndItems +.public DisplayUi .public DUNGEON_BUTTON_INPUT .public DUNGEON_FRAMES_PASSED .public DUNGEON_PTR -.public DisplayMonstersAndItems -.public DisplayUi .public FlashLeaderIcon .public GetAlertBoxLoadingStatus .public GetBottomScreenOption @@ -13,10 +14,6 @@ .public HandleTopScreenFades .public InitWeirdMinimapMatrix .public OBJ_GRAPHICS_CONTROLS_PTR -.public RenderWeather3D -.public UpdateCamera -.public UpdateMinimap -.public _s32_div_f .public ov29_022DD8B4 .public ov29_022DDEF8 .public ov29_022DE11C @@ -33,4 +30,7 @@ .public ov29_0234B854 .public ov29_02353540 .public ov29_02353560 +.public RenderWeather3D .public sub_02051E20 +.public UpdateCamera +.public UpdateMinimap diff --git a/asm/include/overlay_29_022EAD00.inc b/asm/include/overlay_29_022EAD00.inc index d13ed925..f56723e6 100644 --- a/asm/include/overlay_29_022EAD00.inc +++ b/asm/include/overlay_29_022EAD00.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public AdvanceFrame .public ChangeDungeonMusic .public DUNGEON_PTR @@ -6,8 +7,7 @@ .public FIXED_ROOM_PROPERTIES_TABLE .public IsCurrentFixedRoomBossFight .public MUSIC_ID_TABLE -.public RANDOM_MUSIC_ID_TABLE -.public _s32_div_f .public ov29_022EAE40 +.public RANDOM_MUSIC_ID_TABLE .public sub_02017B18 .public sub_02017C68 diff --git a/asm/include/overlay_29_022EAF48.inc b/asm/include/overlay_29_022EAF48.inc index 8d823231..60606394 100644 --- a/asm/include/overlay_29_022EAF48.inc +++ b/asm/include/overlay_29_022EAF48.inc @@ -6,11 +6,6 @@ .public LogMessageByIdWithPopupCheckUserTarget .public MoveMonsterToPos .public MusicTableIdxToMusicId -.public PlayBgmByIdVeneer -.public PlayBgmByIdVolumeVeneer -.public StringFromId -.public SubstitutePlaceholderStringTags -.public UpdateEntityPixelPos .public ov29_022E555C .public ov29_022EAE40 .public ov29_02321260 @@ -20,7 +15,12 @@ .public ov29_02352070 .public ov29_0237C91C .public ov29_0237C91E +.public PlayBgmByIdVeneer +.public PlayBgmByIdVolumeVeneer .public strcmp +.public StringFromId .public sub_0200D208 .public sub_02017B70 .public sub_02017B7C +.public SubstitutePlaceholderStringTags +.public UpdateEntityPixelPos diff --git a/asm/include/overlay_29_022ED030.inc b/asm/include/overlay_29_022ED030.inc index e66d012c..1afc1718 100644 --- a/asm/include/overlay_29_022ED030.inc +++ b/asm/include/overlay_29_022ED030.inc @@ -1,14 +1,14 @@ #pragma once +.public _020AFC70 .public AdvanceFrame .public InitRender3dElement64 .public LoadWteFromFileDirectory -.public ProcessWte -.public StringFromId -.public _020AFC70 .public ov29_02352690 .public ov29_02352698 .public ov29_0235359C .public ov29_0237C99C +.public ProcessWte .public strcpy +.public StringFromId .public sub_0201E080 .public sub_0201F2A0 diff --git a/asm/include/overlay_29_022ED888.inc b/asm/include/overlay_29_022ED888.inc index 314c47af..07bd1633 100644 --- a/asm/include/overlay_29_022ED888.inc +++ b/asm/include/overlay_29_022ED888.inc @@ -6,6 +6,6 @@ .public GetTile .public GetTileSafe .public OBJ_GRAPHICS_CONTROLS_PTR -.public SpawnTrap .public ov29_023526A0 .public ov29_0237C864 +.public SpawnTrap diff --git a/asm/include/overlay_29_022EDCBC.inc b/asm/include/overlay_29_022EDCBC.inc index 50cd2b19..511aa274 100644 --- a/asm/include/overlay_29_022EDCBC.inc +++ b/asm/include/overlay_29_022EDCBC.inc @@ -21,10 +21,10 @@ .public LogMessageByIdWithPopupCheckUserUnknown .public ov29_022E2CA0 .public ov29_022E58B0 -.public ov29_022F9840 .public PlaySeByIdIfShouldDisplayEntity .public SpawnTrap .public SubstitutePlaceholderStringTags .public TRAP_BUSTER_ACTIVATION_CHANCE +.public TryPointCameraToFarOffTeammate .public UpdateShopkeeperModeAfterTrap .public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_022F0654.inc b/asm/include/overlay_29_022F0654.inc index c415fa62..dc717b8f 100644 --- a/asm/include/overlay_29_022F0654.inc +++ b/asm/include/overlay_29_022F0654.inc @@ -6,9 +6,9 @@ .public CheckMonsterTeamMemberIdx .public CloseTextBox .public CreateTextBox +.public DrawTextInWindow .public DUNGEON_BUTTON_INPUT .public DUNGEON_PTR -.public DrawTextInWindow .public EntityIsValid__022F0590 .public ExecuteMoveEffect .public GetBottomScreenOption @@ -17,6 +17,7 @@ .public GetLeaderMonster .public GetMessageLogPreprocessorArgs .public GetMoneyCarried +.public GetPixelOffsetFromSprite .public GetTopScreenOption .public InitMove .public InitPortraitDungeon @@ -25,19 +26,6 @@ .public MakeMonsterIdleInDirection2 .public MemAlloc .public MemFree -.public PlaySeByIdVolumeWrapper -.public PreprocessString -.public SetMessageLogPreprocessorArgsSpeakerId -.public SetMessageLogPreprocessorArgsSpeakerId0x30000 -.public SetMessageLogPreprocessorArgsStringToName -.public SetTopScreenOption -.public SubstitutePlaceholderStringTags -.public TryPointCameraToMonster -.public UnkMapRelatedFunc -.public UpdateAiTargetPos -.public UpdateMinimap -.public UpdateWindow -.public WaitUntilAlertBoxPauseIsOver .public ov29_022DE608 .public ov29_022E0B44 .public ov29_022E0C4C @@ -65,7 +53,19 @@ .public ov29_023535A4 .public ov29_0237C6A4 .public ov29_0237CFBB +.public PlaySeByIdVolumeWrapper +.public PreprocessString +.public SetMessageLogPreprocessorArgsSpeakerId +.public SetMessageLogPreprocessorArgsSpeakerId0x30000 +.public SetMessageLogPreprocessorArgsStringToName +.public SetTopScreenOption .public sub_02001AB0 .public sub_02006B70 -.public sub_0201CF90 .public sub_02027B1C +.public SubstitutePlaceholderStringTags +.public TryPointCameraToMonster +.public UnkMapRelatedFunc +.public UpdateAiTargetPos +.public UpdateMinimap +.public UpdateWindow +.public WaitUntilAlertBoxPauseIsOver diff --git a/asm/include/overlay_29_022F2B3C.inc b/asm/include/overlay_29_022F2B3C.inc index ffc8c1cb..51735f38 100644 --- a/asm/include/overlay_29_022F2B3C.inc +++ b/asm/include/overlay_29_022F2B3C.inc @@ -1,4 +1,6 @@ #pragma once +.public _s32_div_f +.public abs .public AddHeldItemToBag .public AddItemToBag .public AddItemToBagNoHeld @@ -11,9 +13,9 @@ .public ChangeMonsterAnimation .public CheckTeamItemsFlags .public DIRECTIONS_XY +.public DrawTileGrid .public DUNGEON_BUTTON_INPUT .public DUNGEON_PTR -.public DrawTileGrid .public DungeonRandInt .public GetActiveTeamMember .public GetCheckDirectionOption @@ -44,29 +46,6 @@ .public LogMessageByIdWithPopup .public LogMessageByIdWithPopupCheckUser .public OBJ_GRAPHICS_CONTROLS_PTR -.public PlayExclamationPointEffect__022E47D4 -.public PlayQuestionMarkEffect -.public PlaySeByIdIfNotSilence -.public PlaySeVolumeWrapper -.public PointCameraToMonster -.public PrepareItemForPrinting__02345728 -.public RemoveEmptyItemsInBagWrapper -.public RemoveEquivItemNoHole -.public RemoveGroundItem -.public RemoveHolderForItemInBag -.public ResetTriggerFlags -.public SetHolderForItemInBag -.public SetMonsterActionFields -.public ShouldMonsterRunAway -.public SpawnItem -.public SubstitutePlaceholderStringTags -.public TryAddMonsterToActiveTeam -.public TryLeaderItemPickUp -.public TryTriggerMonsterHouse -.public TryTriggerTrap -.public UpdateTrapsVisibility -.public _s32_div_f -.public abs .public ov29_022E0B44 .public ov29_022E0C64 .public ov29_022E0C80 @@ -102,4 +81,25 @@ .public ov29_023526F4 .public ov29_0237C6A4 .public ov29_0237C9A4 +.public PlayExclamationPointEffect__022E47D4 +.public PlayQuestionMarkEffect +.public PlaySeByIdIfNotSilence +.public PlaySeVolumeWrapper +.public PointCameraToMonster +.public PrepareItemForPrinting__02345728 +.public RemoveEmptyItemsInBagWrapper +.public RemoveEquivItemNoHole +.public RemoveGroundItem +.public RemoveHolderForItemInBag +.public ResetTriggerFlags +.public SetHolderForItemInBag +.public SetMonsterActionFields +.public ShouldMonsterRunAway +.public SpawnItem .public sub_02006B70 +.public SubstitutePlaceholderStringTags +.public TryAddMonsterToActiveTeam +.public TryLeaderItemPickUp +.public TryTriggerMonsterHouse +.public TryTriggerTrap +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_022F52CC.inc b/asm/include/overlay_29_022F52CC.inc index b1f1f16a..af3880d4 100644 --- a/asm/include/overlay_29_022F52CC.inc +++ b/asm/include/overlay_29_022F52CC.inc @@ -3,8 +3,8 @@ .public CanMonsterUseItem .public ChangeMonsterAnimation .public ChangeMonsterAnimationToIdle -.public DUNGEON_PTR .public DecrementStackItem +.public DUNGEON_PTR .public DungeonRandInt .public EntityIsValid__022F528C .public ExclusiveItemEffectFlagTest @@ -19,6 +19,14 @@ .public LogItemBlockedByEmbargo .public LogMessageByIdWithPopupCheckUser .public MonsterHasEmbargoStatus +.public ov29_022E5728 +.public ov29_022E9A9C +.public ov29_022EA370 +.public ov29_022EB378 +.public ov29_022F3B8C +.public ov29_0230F9A4 +.public ov29_02346FB8 +.public ov29_02347000 .public PlaySeByIdIfShouldDisplayEntity .public PrepareItemForPrinting__02345728 .public PrepareItemForPrinting__02345754 @@ -31,11 +39,3 @@ .public ShouldMonsterRunAwayAndShowEffect .public SpawnItem .public TryTriggerMonsterHouse -.public ov29_022E5728 -.public ov29_022E9A9C -.public ov29_022EA370 -.public ov29_022EB378 -.public ov29_022F3B8C -.public ov29_0230F9A4 -.public ov29_02346FB8 -.public ov29_02347000 diff --git a/asm/include/overlay_29_022F9744.inc b/asm/include/overlay_29_022F9744.inc index a3b96f47..bb38d682 100644 --- a/asm/include/overlay_29_022F9744.inc +++ b/asm/include/overlay_29_022F9744.inc @@ -43,9 +43,9 @@ .public ov29_022E4160 .public ov29_022E81F8 .public ov29_022EA370 -.public ov29_02307CE0 .public ov29_02307DD0 .public PointCameraToMonster +.public ResetTypeChanges .public SECONDARY_TERRAIN_TYPES .public SetActionPassTurnOrWalk .public SetPreprocessorArgsIdVal diff --git a/asm/include/overlay_29_022FB678.inc b/asm/include/overlay_29_022FB678.inc index b6ab5579..438a1319 100644 --- a/asm/include/overlay_29_022FB678.inc +++ b/asm/include/overlay_29_022FB678.inc @@ -11,9 +11,9 @@ .public IqSkillIsEnabled .public IsMonster__022F9720 .public IsSecretBazaarNpcBehavior -.public ov29_02307CE0 .public ov29_02348100 .public PlayMissSfx__022E611C +.public ResetTypeChanges .public TeamMemberHasEnabledIqSkill .public UpdateMapSurveyorFlag .public UpdateMinimap diff --git a/asm/include/overlay_29_022FE4BC.inc b/asm/include/overlay_29_022FE4BC.inc index 56269fef..ffdbe1d0 100644 --- a/asm/include/overlay_29_022FE4BC.inc +++ b/asm/include/overlay_29_022FE4BC.inc @@ -40,7 +40,6 @@ .public ov29_022F4DAC .public ov29_022F505C .public ov29_022F52B0 -.public ov29_022F9840 .public ov29_022F996C .public ov29_022FBD08 .public ov29_022FEDBC @@ -65,6 +64,7 @@ .public TalkToTeamMemberInFront .public TryActivateFlashFireOnAllMonsters .public TryPlaceItem +.public TryPointCameraToFarOffTeammate .public TrySpawnTrapperTrap .public TryTriggerTrap .public UseRegularAttackOrStruggle diff --git a/asm/include/overlay_29_022FFF5C.inc b/asm/include/overlay_29_022FFF5C.inc index 5f23736a..525e23f3 100644 --- a/asm/include/overlay_29_022FFF5C.inc +++ b/asm/include/overlay_29_022FFF5C.inc @@ -1,12 +1,12 @@ #pragma once .public AbilityIsActive -.public EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOOST .public EntityIsValid__023000E4 +.public EXCL_ITEM_EFFECTS_WEATHER_ATK_SPEED_BOOST .public ExclusiveItemEffectIsActive__022FFF28 .public GetApparentWeather .public GetExclusiveItemWithEffectFromBag .public LogMessageByIdWithPopupCheckUser +.public ov29_022E655C .public PrepareItemForPrinting__02345728 .public SubstitutePlaceholderStringTags .public UpdateStateFlags -.public ov29_022E655C diff --git a/asm/include/overlay_29_02302A5C.inc b/asm/include/overlay_29_02302A5C.inc index 93320f64..fdfce8ed 100644 --- a/asm/include/overlay_29_02302A5C.inc +++ b/asm/include/overlay_29_02302A5C.inc @@ -16,6 +16,7 @@ .public EntityIsValid__02302A38 .public EntityIsValid__023047B8 .public FillOamAttributeInfo +.public FillPixelOffsetArrayFromSprite .public FormatMoveString .public GetEncodedHalfword .public GetIdleAnimationId @@ -87,7 +88,6 @@ .public strcpy .public StringFromId .public sub_020149C0 -.public sub_0201D034 .public sub_0201D1B0 .public sub_0204F610 .public sub_02053904 diff --git a/asm/include/overlay_29_02320788.inc b/asm/include/overlay_29_02320788.inc index d5c0752d..c79b6bc2 100644 --- a/asm/include/overlay_29_02320788.inc +++ b/asm/include/overlay_29_02320788.inc @@ -6,10 +6,10 @@ .public CannotStandOnTile__02300384 .public CannotStandOnTile__023006C8 .public ChangeMonsterAnimationToIdle -.public DUNGEON_FRAMES_PASSED -.public DUNGEON_PTR .public DetermineTileWalkableNeighbors .public DiscoverMinimap +.public DUNGEON_FRAMES_PASSED +.public DUNGEON_PTR .public EntityIsValid__02320764 .public ExclusiveItemEffectIsActiveWithLogging .public FindClosestUnoccupiedTileWithin2 @@ -23,16 +23,6 @@ .public LogMessageByIdWithPopupCheckUserTarget .public MonsterIsType .public MoveMonsterToPos -.public RemoveGroundItem -.public ShouldDisplayEntityWrapper -.public SubstitutePlaceholderStringTags -.public TryEndPetrifiedOrSleepStatus -.public TryInflictPetrifiedStatus -.public TwoTurnMoveForcedMiss -.public UpdateCamera -.public UpdateEntityPixelPos -.public UpdateMinimap -.public UpdateTrapsVisibility .public ov29_022E5560 .public ov29_022E55F0 .public ov29_022E5650 @@ -44,4 +34,14 @@ .public ov29_02336694 .public ov29_023529B8 .public ov29_02353700 +.public RemoveGroundItem +.public ShouldDisplayEntityWrapper .public sub_01FFB62C +.public SubstitutePlaceholderStringTags +.public TryEndPetrifiedOrSleepStatus +.public TryInflictPetrifiedStatus +.public TwoTurnMoveForcedMiss +.public UpdateCamera +.public UpdateEntityPixelPos +.public UpdateMinimap +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_02321288.inc b/asm/include/overlay_29_02321288.inc index 128ed35e..691f79f2 100644 --- a/asm/include/overlay_29_02321288.inc +++ b/asm/include/overlay_29_02321288.inc @@ -3,10 +3,10 @@ .public EntityIsValid__02321438 .public GetMonsterInFront .public LogMessageByIdWithPopupCheckUserTarget -.public SubstitutePlaceholderStringTags -.public UpdateMovePp .public ov29_022E4C84 .public ov29_022E4CD4 .public ov29_022FAA04 .public ov29_02322374 .public ov29_023247B4 +.public SubstitutePlaceholderStringTags +.public UpdateMovePp diff --git a/asm/include/overlay_29_0232145C.inc b/asm/include/overlay_29_0232145C.inc index 56ef478d..fd973416 100644 --- a/asm/include/overlay_29_0232145C.inc +++ b/asm/include/overlay_29_0232145C.inc @@ -49,7 +49,6 @@ .public ov10_022C4714 .public ov29_022E5864 .public ov29_022EA370 -.public ov29_022F9840 .public ov29_022FAA04 .public ov29_02304B14 .public ov29_02321288 @@ -85,6 +84,7 @@ .public TryInflictPoisonedStatus .public TryInflictShadowHoldStatus .public TryInflictSleepStatus +.public TryPointCameraToFarOffTeammate .public TrySealMove .public TryWarp .public UpdateAiTargetPos diff --git a/asm/include/overlay_29_02322DDC.inc b/asm/include/overlay_29_02322DDC.inc index 61c58a5e..68b403e2 100644 --- a/asm/include/overlay_29_02322DDC.inc +++ b/asm/include/overlay_29_02322DDC.inc @@ -17,6 +17,7 @@ .public GetMoveAnimation .public GetMoveAnimationId .public GetMoveAnimationSpeed +.public GetPixelOffsetFromSprite .public GetTile .public IqSkillIsEnabled .public IsChargingTwoTurnMove @@ -44,5 +45,4 @@ .public ShouldDisplayEntityWrapper .public ShouldTreatMonsterAsAlly .public SinAbs4096 -.public sub_0201CF90 .public TwoTurnMoveForcedMiss diff --git a/asm/include/overlay_29_02324BE8.inc b/asm/include/overlay_29_02324BE8.inc index 3dab1503..e5547543 100644 --- a/asm/include/overlay_29_02324BE8.inc +++ b/asm/include/overlay_29_02324BE8.inc @@ -12,6 +12,7 @@ .public GetDamageSource .public GetMoveAnimation .public GetMoveAnimationId +.public GetPixelOffsetFromSprite .public GetSpriteIndex__02052708 .public Is2TurnsMove .public IsUsableWhileTaunted @@ -44,6 +45,5 @@ .public SetMessageLogPreprocessorArgsNumberVal .public ShouldDisplayEntityAdvanced .public ShouldMovePlayAlternativeAnimation -.public sub_0201CF90 .public sub_0201D1D4 .public WanTableSpriteHasAnimationGroup diff --git a/asm/include/overlay_29_02325644.inc b/asm/include/overlay_29_02325644.inc index 7cb95afa..7f4d14e2 100644 --- a/asm/include/overlay_29_02325644.inc +++ b/asm/include/overlay_29_02325644.inc @@ -5,17 +5,17 @@ .public GetApparentWeather .public GetEffectAnimation .public GetMoveAnimation +.public GetPixelOffsetFromSprite .public GetTileAtEntity .public IsChargingTwoTurnMove .public IsMonsterSleeping .public IsTileGround -.public ShouldDisplayEntityAdvanced -.public UnkMapRelatedFunc -.public WaitUntilAlertBoxPauseIsOver .public ov10_022BED90 .public ov10_022BF160 .public ov10_022BFC5C .public ov29_022E2CA0 .public ov29_022E6D68 .public ov29_02352AD8 -.public sub_0201CF90 +.public ShouldDisplayEntityAdvanced +.public UnkMapRelatedFunc +.public WaitUntilAlertBoxPauseIsOver diff --git a/asm/include/overlay_29_02325FC4.inc b/asm/include/overlay_29_02325FC4.inc index 4fd0bcae..f484073d 100644 --- a/asm/include/overlay_29_02325FC4.inc +++ b/asm/include/overlay_29_02325FC4.inc @@ -1,7 +1,7 @@ #pragma once .public BeginChargedMove -.public DIG_DAMAGE_MULTIPLIER .public DealDamage +.public DIG_DAMAGE_MULTIPLIER .public EndTwoTurnMove .public GetTileAtEntity .public IsChargingTwoTurnMove diff --git a/asm/include/overlay_29_0232692C.inc b/asm/include/overlay_29_0232692C.inc index bfe7e3b8..30f15aa9 100644 --- a/asm/include/overlay_29_0232692C.inc +++ b/asm/include/overlay_29_0232692C.inc @@ -1,7 +1,7 @@ #pragma once +.public ApplyOffensiveStatMultiplier .public ATK_STAT_IDX .public AURORA_BEAM_LOWER_ATTACK_CHANCE -.public ApplyOffensiveStatMultiplier .public BoostOffensiveStat .public CalcDamageFixedWrapper .public DealDamage @@ -15,9 +15,9 @@ .public LogMessageByIdWithPopupCheckUserTarget .public LowerHitChanceStat .public OCTAZOOKA_LOWER_ACCURACY_CHANCE +.public ov10_022C4C0C +.public ov10_022C4C0E .public SPATK_STAT_IDX .public SubstitutePlaceholderStringTags .public TryInflictBurnStatus .public TryInflictConfusedStatus -.public ov10_022C4C0C -.public ov10_022C4C0E diff --git a/asm/include/overlay_29_02326CC8.inc b/asm/include/overlay_29_02326CC8.inc index 6e872552..db6ff2c5 100644 --- a/asm/include/overlay_29_02326CC8.inc +++ b/asm/include/overlay_29_02326CC8.inc @@ -2,6 +2,6 @@ .public DealDamage .public DungeonRandOutcomeUserTargetInteraction .public EndFrozenStatus -.public FLAMETHROWER_BURN_CHANCE .public FLAME_WHEEL_BURN_CHANCE +.public FLAMETHROWER_BURN_CHANCE .public TryInflictBurnStatus diff --git a/asm/include/overlay_29_02326EB8.inc b/asm/include/overlay_29_02326EB8.inc index 0e395aaa..0e1034e0 100644 --- a/asm/include/overlay_29_02326EB8.inc +++ b/asm/include/overlay_29_02326EB8.inc @@ -1,12 +1,12 @@ #pragma once -.public ATK_STAT_IDX .public AbilityIsActiveVeneer .public ApplyDamageAndEffectsWrapper -.public BITE_CRINGE_CHANCE +.public ATK_STAT_IDX .public BeginChargedMove +.public BITE_CRINGE_CHANCE +.public CalcDamageFixedWrapper .public CONSTRICT_LOWER_SPEED_CHANCE .public CRUNCH_LOWER_DEFENSE_CHANCE -.public CalcDamageFixedWrapper .public DealDamage .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction diff --git a/asm/include/overlay_29_02327C08.inc b/asm/include/overlay_29_02327C08.inc index 06fe6c90..4473c0b6 100644 --- a/asm/include/overlay_29_02327C08.inc +++ b/asm/include/overlay_29_02327C08.inc @@ -5,7 +5,7 @@ .public DungeonRandRange .public LowerDefensiveStat .public LowerOffensiveStat +.public ov29_02332F18 .public PSYBEAM_CONFUSE_CHANCE .public SPATK_STAT_IDX .public TryInflictConfusedStatus -.public ov29_02332F18 diff --git a/asm/include/overlay_29_02327DE0.inc b/asm/include/overlay_29_02327DE0.inc index 526d5006..3109a72a 100644 --- a/asm/include/overlay_29_02327DE0.inc +++ b/asm/include/overlay_29_02327DE0.inc @@ -5,6 +5,6 @@ .public DungeonRandOutcomeUserAction .public EntityIsValidMoveEffects__0232800C .public LogMessageByIdWithPopupCheckUserTarget +.public ov29_022E5474 .public SubstitutePlaceholderStringTags .public WATER_SPOUT_DAMAGE_MULT_TABLE -.public ov29_022E5474 diff --git a/asm/include/overlay_29_02328030.inc b/asm/include/overlay_29_02328030.inc index 63442b57..35f29ba3 100644 --- a/asm/include/overlay_29_02328030.inc +++ b/asm/include/overlay_29_02328030.inc @@ -1,14 +1,14 @@ #pragma once -.public DUNGEON_PTR .public DealDamage +.public DUNGEON_PTR .public DungeonRandOutcomeUserTargetInteraction .public GetDamageSourceWrapper .public GetMoveType .public InitMove .public LICK_PARALYZE_CHANCE .public NATURE_POWER_TABLE +.public ov10_022C4E44 +.public ov10_022C6324 .public TryExplosion .public TryIncreaseHp .public TryInflictParalysisStatus -.public ov10_022C4E44 -.public ov10_022C6324 diff --git a/asm/include/overlay_29_023283A4.inc b/asm/include/overlay_29_023283A4.inc index b0f9e25a..0c004c62 100644 --- a/asm/include/overlay_29_023283A4.inc +++ b/asm/include/overlay_29_023283A4.inc @@ -9,5 +9,5 @@ .public GetMoveType .public LevitateIsActive .public LogMessageByIdWithPopupCheckUserTarget -.public TryInflictCringeStatus .public ov29_0230D4A4 +.public TryInflictCringeStatus diff --git a/asm/include/overlay_29_02328538.inc b/asm/include/overlay_29_02328538.inc index b576ad1a..6966970c 100644 --- a/asm/include/overlay_29_02328538.inc +++ b/asm/include/overlay_29_02328538.inc @@ -2,8 +2,8 @@ .public AbilityIsActiveVeneer .public ApplyDamageAndEffectsWrapper .public CalcRecoilDamageFixed -.public DUNGEON_PTR .public DealDamage +.public DUNGEON_PTR .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction .public EntityIsValidMoveEffects__0232800C diff --git a/asm/include/overlay_29_02328B00.inc b/asm/include/overlay_29_02328B00.inc index 31a60a73..da6360bb 100644 --- a/asm/include/overlay_29_02328B00.inc +++ b/asm/include/overlay_29_02328B00.inc @@ -1,11 +1,11 @@ #pragma once -.public ATK_STAT_IDX .public AbilityIsActiveVeneer +.public ATK_STAT_IDX .public BeginChargedMove .public BoostDefensiveStat .public CalcDamageFixedWrapper -.public DIVE_DAMAGE_MULTIPLIER .public DealDamage +.public DIVE_DAMAGE_MULTIPLIER .public DungeonRandOutcomeUserTargetInteraction .public EndFrozenStatus .public EndTwoTurnMove @@ -21,19 +21,19 @@ .public LowerHitChanceStat .public MUDDY_WATER_LOWER_ACCURACY_CHANCE .public MULTIHIT_MOVE_SUCCESSIVE_HITS +.public ov29_0230D4A4 .public SACRED_FIRE_BURN_CHANCE .public SOLARBEAM_DAMAGE_MULTIPLIER .public SONICBOOM_FIXED_DAMAGE .public SPATK_STAT_IDX .public StringFromId -.public TWINEEDLE_HIT_TRACKER -.public TWINEEDLE_POISON_CHANCE -.public TWISTER_CRINGE_CHANCE .public TryExplosion .public TryIncreaseHp .public TryInflictBurnStatus .public TryInflictCringeStatus .public TryInflictPoisonedStatus .public TryInflictStockpileStatus +.public TWINEEDLE_HIT_TRACKER +.public TWINEEDLE_POISON_CHANCE +.public TWISTER_CRINGE_CHANCE .public WATERFALL_CRINGE_CHANCE -.public ov29_0230D4A4 diff --git a/asm/include/overlay_29_02329258.inc b/asm/include/overlay_29_02329258.inc index 816c5d54..3d92f693 100644 --- a/asm/include/overlay_29_02329258.inc +++ b/asm/include/overlay_29_02329258.inc @@ -4,6 +4,8 @@ .public GetDamageSourceWrapper .public GetMoveCategory .public GetMoveType +.public ov29_022EA370 +.public ov29_022ECAFC .public PlaySeByIdIfShouldDisplayEntity .public SetTwoTurnInvincibility .public ShouldDisplayEntityAdvanced @@ -11,5 +13,3 @@ .public WaitUntilFadeIsFinished .public WaitUntilMonsterFliesOffscreen .public WaitUntilMonsterIsBackOnGround -.public ov29_022EA370 -.public ov29_022ECAFC diff --git a/asm/include/overlay_29_023293F8.inc b/asm/include/overlay_29_023293F8.inc index 2c62504c..75bd8a83 100644 --- a/asm/include/overlay_29_023293F8.inc +++ b/asm/include/overlay_29_023293F8.inc @@ -7,6 +7,6 @@ .public GetMoveType .public LogMessageByIdWithPopupCheckUserTarget .public MOONLIGHT_HP_RESTORATION_TABLE +.public ov29_0230D4A4 .public SubstitutePlaceholderStringTags .public TryIncreaseHp -.public ov29_0230D4A4 diff --git a/asm/include/overlay_29_02329898.inc b/asm/include/overlay_29_02329898.inc index 848e20fd..9c7e0f51 100644 --- a/asm/include/overlay_29_02329898.inc +++ b/asm/include/overlay_29_02329898.inc @@ -1,9 +1,9 @@ #pragma once .public AbilityIsActiveVeneer .public AddHeldItemToBag +.public BeginChargedMove .public BOUNCE_DAMAGE_MULTIPLIER .public BOUNCE_PARALYZE_CHANCE -.public BeginChargedMove .public CalcDamage .public CalcRecoilDamageFixed .public DealDamage @@ -16,6 +16,7 @@ .public GetMoveTypeForMonster .public IsChargingTwoTurnMove .public LogMessageByIdWithPopupCheckUserTarget +.public ov29_022F9EA0 .public POISON_FANG_POISON_CHANCE .public POISON_STING_POISON_CHANCE .public RemoveEmptyItemsInBagWrapper @@ -23,11 +24,10 @@ .public SetPreprocessorArgsStringToName .public StringFromId .public SubstitutePlaceholderStringTags -.public TRIPLE_KICK_SUCCESSIVE_HITS .public TRI_ATTACK_STATUS_CHANCE +.public TRIPLE_KICK_SUCCESSIVE_HITS .public TryInflictBadlyPoisonedStatus .public TryInflictBurnStatus .public TryInflictFrozenStatus .public TryInflictParalysisStatus .public TryInflictPoisonedStatus -.public ov29_022F9EA0 diff --git a/asm/include/overlay_29_0232A148.inc b/asm/include/overlay_29_0232A148.inc index 5635601f..c07f0ff9 100644 --- a/asm/include/overlay_29_0232A148.inc +++ b/asm/include/overlay_29_0232A148.inc @@ -1,7 +1,7 @@ #pragma once -.public DUNGEON_PTR .public DealDamage .public DefenderAbilityIsActiveMoveEffects__02329F14 +.public DUNGEON_PTR .public LogMessageByIdWithPopupCheckUserTarget .public TryActivateWeather .public TryEndStatusWithAbility diff --git a/asm/include/overlay_29_0232A2BC.inc b/asm/include/overlay_29_0232A2BC.inc index e9d9a338..6276429d 100644 --- a/asm/include/overlay_29_0232A2BC.inc +++ b/asm/include/overlay_29_0232A2BC.inc @@ -6,6 +6,6 @@ .public FAKE_OUT_CRINGE_CHANCE .public GenerateStandardItem .public LogMessageByIdWithPopupCheckUserTarget -.public TryInflictCringeStatus .public ov29_0232A834 .public ov29_02352B18 +.public TryInflictCringeStatus diff --git a/asm/include/overlay_29_0232A524.inc b/asm/include/overlay_29_0232A524.inc index c1c71bb7..ccfa1e8d 100644 --- a/asm/include/overlay_29_0232A524.inc +++ b/asm/include/overlay_29_0232A524.inc @@ -1,13 +1,14 @@ #pragma once -.public ATK_STAT_IDX +.public _s32_div_f .public AbilityIsActiveVeneer .public AdvanceFrame +.public ATK_STAT_IDX .public BoostDefensiveStat .public CalcDamageFixedWrapper .public ChangeMonsterAnimation -.public DIRECTIONS_XY .public DealDamage .public DefenderAbilityIsActiveMoveEffects__02329F14 +.public DIRECTIONS_XY .public DungeonRandInt .public DungeonRandOutcomeUserTargetInteraction .public EntityIsValidMoveEffects__0232A3D8 @@ -21,17 +22,16 @@ .public LowerDefensiveStat .public LowerOffensiveStat .public MoveMonsterToPos -.public RemoveEquivItem -.public STEEL_WING_BOOST_DEFENSE_CHANCE -.public SetEntityPixelPosXY -.public SpawnDroppedItem -.public SubstitutePlaceholderStringTags -.public TryInflictConfusedStatus -.public TwoTurnMoveForcedMiss -.public UpdateEntityPixelPos -.public _s32_div_f .public ov10_022C44B4 .public ov29_022E2CA0 .public ov29_022FFB90 .public ov29_02321164 .public ov29_02321260 +.public RemoveEquivItem +.public SetEntityPixelPosXY +.public SpawnDroppedItem +.public STEEL_WING_BOOST_DEFENSE_CHANCE +.public SubstitutePlaceholderStringTags +.public TryInflictConfusedStatus +.public TwoTurnMoveForcedMiss +.public UpdateEntityPixelPos diff --git a/asm/include/overlay_29_0232AC54.inc b/asm/include/overlay_29_0232AC54.inc index c3932abf..35d983f8 100644 --- a/asm/include/overlay_29_0232AC54.inc +++ b/asm/include/overlay_29_0232AC54.inc @@ -3,5 +3,5 @@ .public BoostOffensiveStat .public CeilFixedPoint .public LogMessageByIdWithPopupCheckUserTarget -.public SubstitutePlaceholderStringTags .public sub_02050FF8 +.public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_0232AD18.inc b/asm/include/overlay_29_0232AD18.inc index be971872..7f1fe54c 100644 --- a/asm/include/overlay_29_0232AD18.inc +++ b/asm/include/overlay_29_0232AD18.inc @@ -3,15 +3,16 @@ .public BoostDefensiveStat .public BoostOffensiveStat .public CalcStatusDuration +.public DealDamage .public DIZZY_PUNCH_CONFUSE_CHANCE .public DUNGEON_PTR -.public DealDamage .public DungeonRandOutcomeUserTargetInteraction .public IMPRISON_TURN_RANGE .public LowerDefensiveStat .public LowerHitChanceStat .public LowerOffensiveStat .public LowerSpeed +.public ov10_022C6321 .public SECRET_POWER_EFFECT_CHANCE .public SLEEP_TURN_RANGE .public TryInflictConfusedStatus @@ -21,4 +22,3 @@ .public TryInflictPausedStatus .public TryInflictPoisonedStatus .public TryInflictSleepStatus -.public ov10_022C6321 diff --git a/asm/include/overlay_29_0232B024.inc b/asm/include/overlay_29_0232B024.inc index 8a5c661d..8918f7c4 100644 --- a/asm/include/overlay_29_0232B024.inc +++ b/asm/include/overlay_29_0232B024.inc @@ -2,18 +2,18 @@ .public ATK_STAT_IDX .public BLAZE_KICK_BURN_CHANCE .public CRUSH_CLAW_LOWER_DEFENSE_CHANCE -.public DUNGEON_PTR .public DealDamage +.public DUNGEON_PTR .public DungeonRandInt .public DungeonRandOutcomeUserTargetInteraction -.public ERUPTION_DAMAGE_MULT_TABLE .public EndFrozenStatus .public EntityIsValidMoveEffects__0232A3D8 +.public ERUPTION_DAMAGE_MULT_TABLE .public GetTreatmentBetweenMonsters .public IsExperienceLocked .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat +.public ov29_02332F18 .public TryIncreaseHp .public TryInflictBurnStatus .public TryWarp -.public ov29_02332F18 diff --git a/asm/include/overlay_29_0232B518.inc b/asm/include/overlay_29_0232B518.inc index ddc3fc83..c74653de 100644 --- a/asm/include/overlay_29_0232B518.inc +++ b/asm/include/overlay_29_0232B518.inc @@ -3,6 +3,6 @@ .public AllocateTemp1024ByteBufferFromPool .public DUNGEON_PTR .public LogMessageByIdWithPopupCheckUserTarget +.public ov10_022C6322 .public SetPreprocessorArgsIdVal .public SubstitutePlaceholderStringTags -.public ov10_022C6322 diff --git a/asm/include/overlay_29_0232B6C8.inc b/asm/include/overlay_29_0232B6C8.inc index 58a0bd10..50cd0182 100644 --- a/asm/include/overlay_29_0232B6C8.inc +++ b/asm/include/overlay_29_0232B6C8.inc @@ -2,9 +2,9 @@ .public AreLateGameTrapsEnabledWrapper .public DUNGEON_PTR .public LogMessageByIdWithPopupCheckUserTarget -.public TrySpawnTrap -.public UpdateTrapsVisibility .public ov10_022C4924 .public ov29_02332F18 .public ov29_02352B1C .public ov29_0237CA84 +.public TrySpawnTrap +.public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_0232B940.inc b/asm/include/overlay_29_0232B940.inc index e7468ccb..21a549bf 100644 --- a/asm/include/overlay_29_0232B940.inc +++ b/asm/include/overlay_29_0232B940.inc @@ -17,11 +17,11 @@ .public METAL_CLAW_BOOST_ATTACK_CHANCE .public METRONOME_NEXT_INDEX .public METRONOME_TABLE -.public SubstitutePlaceholderStringTags -.public TryIncreaseHp -.public TryInflictInfatuatedStatus -.public TryInflictLeechSeedStatus .public ov10_022C4C3C .public ov10_022C4C3E .public ov10_022C5DE0 .public ov29_02324D60 +.public SubstitutePlaceholderStringTags +.public TryIncreaseHp +.public TryInflictInfatuatedStatus +.public TryInflictLeechSeedStatus diff --git a/asm/include/overlay_29_0232BF88.inc b/asm/include/overlay_29_0232BF88.inc index e5732324..861ded98 100644 --- a/asm/include/overlay_29_0232BF88.inc +++ b/asm/include/overlay_29_0232BF88.inc @@ -1,12 +1,12 @@ #pragma once -.public ATK_STAT_IDX .public AnimationDelayOrSomething +.public ATK_STAT_IDX .public BeginChargedMove .public BoostOffensiveStat .public BoostSpeedOneStage .public CalcDamageFixedWrapper -.public DRAGON_RAGE_FIXED_DAMAGE .public DealDamage +.public DRAGON_RAGE_FIXED_DAMAGE .public DungeonRandOutcomeUserAction .public DungeonRandOutcomeUserTargetInteraction .public EndTwoTurnMove @@ -14,11 +14,11 @@ .public GetMoveCategory .public GetMoveType .public IsChargingTwoTurnMove -.public LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE .public LogMessageByIdWithPopupCheckUserTarget .public LowerDefensiveStat +.public LUSTER_PURGE_LOWER_SPECIAL_DEFENSE_CHANCE +.public ov29_022F8FF8 .public SKULL_BASH_DAMAGE_MULTIPLIER .public SPATK_STAT_IDX .public StringFromId .public TrySmashWall -.public ov29_022F8FF8 diff --git a/asm/include/overlay_29_0232C310.inc b/asm/include/overlay_29_0232C310.inc index a5c38ccd..2a6fcbd9 100644 --- a/asm/include/overlay_29_0232C310.inc +++ b/asm/include/overlay_29_0232C310.inc @@ -7,6 +7,6 @@ .public IsBagFull .public ItemZInit .public LogMessageByIdWithPopupCheckUserTarget +.public ov29_022F9EA0 .public RemoveEquivItem .public SubstitutePlaceholderStringTags -.public ov29_022F9EA0 diff --git a/asm/include/overlay_29_0232C578.inc b/asm/include/overlay_29_0232C578.inc index dad08789..b23e4553 100644 --- a/asm/include/overlay_29_0232C578.inc +++ b/asm/include/overlay_29_0232C578.inc @@ -7,7 +7,7 @@ .public GetDamageSourceWrapper .public GetMoveCategory .public LogMessageByIdWithPopupCheckUserTarget -.public SLEEP_TURN_RANGE -.public TryInflictSleepStatus .public ov29_022E8104 .public ov29_022E81F8 +.public SLEEP_TURN_RANGE +.public TryInflictSleepStatus diff --git a/asm/include/overlay_29_0232C84C.inc b/asm/include/overlay_29_0232C84C.inc index 98ee1faa..d97a2aa6 100644 --- a/asm/include/overlay_29_0232C84C.inc +++ b/asm/include/overlay_29_0232C84C.inc @@ -7,9 +7,9 @@ .public IsMonsterLoneOutlaw .public LogMessageByIdWithPopupCheckUserTarget .public MewSpawnCheck -.public SetMessageLogPreprocessorArgsString -.public SubstitutePlaceholderStringTags .public ov29_022E1AAC .public ov29_022E1AD4 .public ov29_022E1EF8 .public ov29_022FD7A0 +.public SetMessageLogPreprocessorArgsString +.public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_0232CB18.inc b/asm/include/overlay_29_0232CB18.inc index aac6b561..63ce7fa0 100644 --- a/asm/include/overlay_29_0232CB18.inc +++ b/asm/include/overlay_29_0232CB18.inc @@ -10,8 +10,8 @@ .public IsFullFloorFixedRoom .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget +.public ov29_02352B38 .public TryRemoveTrap .public TryWarp .public UpdateMinimap .public UpdateTrapsVisibility -.public ov29_02352B38 diff --git a/asm/include/overlay_29_0232CF84.inc b/asm/include/overlay_29_0232CF84.inc index 9efb3c11..9d162f43 100644 --- a/asm/include/overlay_29_0232CF84.inc +++ b/asm/include/overlay_29_0232CF84.inc @@ -1,8 +1,8 @@ #pragma once .public AreLateGameTrapsEnabledWrapper -.public DIRECTIONS_XY .public DetermineAllMonsterShadow .public DetermineTileWalkableNeighbors +.public DIRECTIONS_XY .public GenerateStandardItem .public GetItemIdToSpawn .public GetTileSafe @@ -10,10 +10,10 @@ .public IsCurrentFixedRoomBossFight .public LogMessageByIdWithPopupCheckUser .public LogMessageByIdWithPopupCheckUserTarget +.public ov29_022E6770 +.public ov29_022E6784 +.public ov29_02336694 .public PrepareTrapperTrap .public SpawnDroppedItemWrapper .public UpdateMinimap .public UpdateTrapsVisibility -.public ov29_022E6770 -.public ov29_022E6784 -.public ov29_02336694 diff --git a/asm/include/overlay_29_0232D418.inc b/asm/include/overlay_29_0232D418.inc index 1f769237..305780d5 100644 --- a/asm/include/overlay_29_0232D418.inc +++ b/asm/include/overlay_29_0232D418.inc @@ -1,6 +1,7 @@ #pragma once -.public DUNGEON_PTR +.public _s32_div_f .public DealDamage +.public DUNGEON_PTR .public DungeonRandOutcomeUserTargetInteraction .public EndReflectClassStatus .public GetApparentWeather @@ -18,4 +19,3 @@ .public TryInflictFrozenStatus .public TryInflictParalysisStatus .public WEATHER_MOVE_TURN_COUNT -.public _s32_div_f diff --git a/asm/include/overlay_29_0232D90C.inc b/asm/include/overlay_29_0232D90C.inc index 6e26b305..f8b4c99c 100644 --- a/asm/include/overlay_29_0232D90C.inc +++ b/asm/include/overlay_29_0232D90C.inc @@ -1,19 +1,19 @@ #pragma once -.public ATK_STAT_IDX .public AbilityIsActiveVeneer .public AreLateGameTrapsEnabledWrapper +.public ATK_STAT_IDX .public BoostDefensiveStat .public BoostOffensiveStat .public CHARGE_BEAM_BOOST_SPECIAL_ATTACK_CHANCE -.public DUNGEON_PTR .public DealDamage +.public DUNGEON_PTR .public DungeonRandInt .public DungeonRandOutcomeUserTargetInteraction .public LogMessageByIdWithPopupCheckUserTarget +.public ov29_022E34A8_EU +.public ov29_02352B3C .public SPATK_STAT_IDX .public SubstitutePlaceholderStringTags .public TryEatItem .public TrySpawnTrap .public UpdateTrapsVisibility -.public ov29_022E34A8_EU -.public ov29_02352B3C diff --git a/asm/include/overlay_29_0232E744.inc b/asm/include/overlay_29_0232E744.inc index fbe5c329..c5e82082 100644 --- a/asm/include/overlay_29_0232E744.inc +++ b/asm/include/overlay_29_0232E744.inc @@ -3,7 +3,7 @@ .public DoMoveEscape .public EndNegativeStatusConditionWrapper .public EntityIsValid__0232E840 -.public RestoreAllMovePP -.public TryRestoreHp .public ov29_0234AFFC .public ov29_02353718 +.public RestoreAllMovePP +.public TryRestoreHp diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc index 5eea067b..c22b3305 100644 --- a/asm/include/overlay_29_0232E864.inc +++ b/asm/include/overlay_29_0232E864.inc @@ -379,7 +379,6 @@ .public ov29_022E6388 .public ov29_022E6424 .public ov29_022EA370 -.public ov29_022F9840 .public ov29_022FB1A8 .public ov29_02300D50 .public ov29_02300DC0 @@ -414,6 +413,7 @@ .public TryActivateNondamagingDefenderExclusiveItem .public TryActivateTraceAndColorChange .public TryEndPetrifiedOrSleepStatus +.public TryPointCameraToFarOffTeammate .public TryWarp .public TwoTurnMoveForcedMiss .public UpdateShopkeeperModeAfterAttack diff --git a/asm/include/overlay_29_02338684.inc b/asm/include/overlay_29_02338684.inc index 37ed5649..5926ff2a 100644 --- a/asm/include/overlay_29_02338684.inc +++ b/asm/include/overlay_29_02338684.inc @@ -1,11 +1,11 @@ #pragma once -.public DUNGEON_PTR .public DrawMinimapTile +.public DUNGEON_PTR .public GetLeader .public GetTileSafe .public IsSecretBazaar .public IsSecretRoom .public LogMessageByIdWithPopupCheckUser +.public ov29_022E2418 .public PlayEffectAnimationPos .public UpdateTrapsVisibility -.public ov29_022E2418 diff --git a/asm/include/overlay_29_023388B0.inc b/asm/include/overlay_29_023388B0.inc index f963e9a1..17ad9c67 100644 --- a/asm/include/overlay_29_023388B0.inc +++ b/asm/include/overlay_29_023388B0.inc @@ -1,4 +1,5 @@ #pragma once +.public _020AFC70 .public DelayWteFree .public DirectoryFileMngr_OpenDirectoryFile .public DungeonRandInt @@ -9,10 +10,6 @@ .public LoadWteFromFileDirectory .public MemZero .public MultiplyByFixedPoint -.public ProcessWte -.public SinAbs4096 -.public UnloadFile -.public _020AFC70 .public ov10_022C6326 .public ov29_022DE288 .public ov29_022E7F7C @@ -28,4 +25,7 @@ .public ov29_0237CACC .public ov29_0237CD40 .public ov29_0237CFB8 +.public ProcessWte +.public SinAbs4096 .public sub_0201F2A0 +.public UnloadFile diff --git a/asm/include/overlay_29_02339138.inc b/asm/include/overlay_29_02339138.inc index 3ca76dfa..3fa03404 100644 --- a/asm/include/overlay_29_02339138.inc +++ b/asm/include/overlay_29_02339138.inc @@ -11,11 +11,9 @@ .public IsBehaviorLoneOutlaw .public IsExperienceLocked .public IsMapShownOnEitherScreen -.public MemZero .public Memcpy32 +.public MemZero .public OBJ_GRAPHICS_CONTROLS_PTR -.public ShouldMinimapDisplayEntity -.public TILESET_PROPERTIES .public ov10_022BFD20 .public ov29_022E7F7C .public ov29_022EA408 @@ -28,5 +26,7 @@ .public ov29_0235376C .public ov29_0235377C .public ov29_0237CFB8 +.public ShouldMinimapDisplayEntity .public sub_0200B330 .public sub_0200B3FC +.public TILESET_PROPERTIES diff --git a/asm/include/overlay_29_0233A248.inc b/asm/include/overlay_29_0233A248.inc index ec176c21..338eb304 100644 --- a/asm/include/overlay_29_0233A248.inc +++ b/asm/include/overlay_29_0233A248.inc @@ -1,4 +1,6 @@ #pragma once +.public _s32_div_f +.public abs .public ConvertSecondaryTerrainToChasms .public ConvertWallsToChasms .public DUNGEON_PTR @@ -6,9 +8,9 @@ .public DungeonRandInt .public DungeonRandRange .public EnsureImpassableTilesAreWalls -.public FLOOR_GENERATION_STATUS .public FinalizeJunctions .public FlagHallwayJunctions +.public FLOOR_GENERATION_STATUS .public GenerateBeetleFloor .public GenerateCrossFloor .public GenerateCrossroadsFloor @@ -38,15 +40,6 @@ .public MarkEnemySpawns .public MarkNonEnemySpawns .public MarkShopkeeperSpawn -.public ResetFloor -.public ResetHiddenStairsSpawn -.public ResetImportantSpawnPositions -.public ResetInnerBoundaryTileRows -.public ResolveInvalidSpawns -.public SECONDARY_TERRAIN_TYPES -.public StairsAlwaysReachable -.public _s32_div_f -.public abs .public ov29_0233A0E8 .public ov29_023427E4 .public ov29_02343DC4 @@ -54,5 +47,12 @@ .public ov29_0235352C .public ov29_0235376C .public ov29_0235377C +.public ResetFloor +.public ResetHiddenStairsSpawn +.public ResetImportantSpawnPositions +.public ResetInnerBoundaryTileRows +.public ResolveInvalidSpawns +.public SECONDARY_TERRAIN_TYPES +.public StairsAlwaysReachable .public sub_0200A174 .public sub_0200C008 diff --git a/asm/include/overlay_29_0233AE84.inc b/asm/include/overlay_29_0233AE84.inc index 7f621056..f374758b 100644 --- a/asm/include/overlay_29_0233AE84.inc +++ b/asm/include/overlay_29_0233AE84.inc @@ -1,4 +1,6 @@ #pragma once +.public _s32_div_f +.public abs .public CORNER_CARDINAL_NEIGHBOR_IS_OPEN .public DIRECTIONS_XY .public DUNGEON_PTR @@ -13,10 +15,8 @@ .public IsCurrentTilesetBackground .public IsDestinationFloorWithMonster .public IsOutlawMonsterHouseFloor +.public ov29_0234217C +.public ov29_02342594 .public PlaceFixedRoomTile .public PosIsOutOfBounds .public ResetHiddenStairsSpawn -.public _s32_div_f -.public abs -.public ov29_0234217C -.public ov29_02342594 diff --git a/asm/include/overlay_29_02341E6C.inc b/asm/include/overlay_29_02341E6C.inc index 7860d6db..a4aa9c86 100644 --- a/asm/include/overlay_29_02341E6C.inc +++ b/asm/include/overlay_29_02341E6C.inc @@ -1,4 +1,5 @@ #pragma once +.public _s32_div_f .public DUNGEON_PTR .public DungeonRand16Bit .public DungeonRandInt @@ -7,8 +8,8 @@ .public DungeonRngSetSecondary .public FIXED_ROOM_ENTITY_SPAWN_TABLE .public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE -.public FLOOR_GENERATION_STATUS .public FixedRoomActionParamToDirection +.public FLOOR_GENERATION_STATUS .public GenerateAndSpawnItem .public GetExplorerMazeMonster .public GetFloorType @@ -23,8 +24,8 @@ .public GetTileSafe .public HIDDEN_STAIRS_SPAWN_BLOCKED .public HIDDEN_STAIRS_SPAWN_CHANCE_MULTIPLIER -.public InitOtherMonsterData .public InitializeTile +.public InitOtherMonsterData .public IsDestinationFloor .public IsFullFloorFixedRoom .public IsGoldenChamber @@ -33,15 +34,6 @@ .public KECLEON_SHOP_BOOST_CHANCE_MULTIPLIER .public MemAlloc .public MultiplyByFixedPoint -.public SHOP_ITEM_CHANCES -.public SetShouldBoostHiddenStairsSpawnChance -.public SetShouldBoostKecleonShopSpawnChance -.public ShouldBoostHiddenStairsSpawnChance -.public ShouldBoostKecleonShopSpawnChance -.public SpawnEnemyTrapAtPos -.public SpawnMonster -.public TREASURE_BOX_1_ITEM_IDS -.public _s32_div_f .public ov10_022C4B34 .public ov29_023365E8 .public ov29_023442B8 @@ -50,3 +42,11 @@ .public ov29_02353050 .public ov29_023534F0 .public ov29_0237CFC0 +.public SetShouldBoostHiddenStairsSpawnChance +.public SetShouldBoostKecleonShopSpawnChance +.public SHOP_ITEM_CHANCES +.public ShouldBoostHiddenStairsSpawnChance +.public ShouldBoostKecleonShopSpawnChance +.public SpawnEnemyTrapAtPos +.public SpawnMonster +.public TREASURE_BOX_1_ITEM_IDS diff --git a/asm/include/overlay_29_02343980.inc b/asm/include/overlay_29_02343980.inc index 06b51b74..7752b056 100644 --- a/asm/include/overlay_29_02343980.inc +++ b/asm/include/overlay_29_02343980.inc @@ -1,6 +1,6 @@ #pragma once -.public DUNGEON_PTR .public DetermineAllTilesWalkableNeighbors +.public DUNGEON_PTR .public FIXED_ROOM_DATA_PTR .public FIXED_ROOM_ENTITY_SPAWN_TABLE .public FIXED_ROOM_MONSTER_SPAWN_STATS_TABLE @@ -18,6 +18,11 @@ .public MemAlloc .public MemFree .public MemZero +.public ov29_022EA370 +.public ov29_02336694 +.public ov29_02342BEC +.public ov29_02348BE8 +.public ov29_02353110 .public PlaceFixedRoomTile .public PlayKeyDoorUnlockEffect .public PointsToZero @@ -26,8 +31,3 @@ .public UpdateMinimap .public UpdateTrapsVisibility .public ZInit8 -.public ov29_022EA370 -.public ov29_02336694 -.public ov29_02342BEC -.public ov29_02348BE8 -.public ov29_02353110 diff --git a/asm/include/overlay_29_02344BA8.inc b/asm/include/overlay_29_02344BA8.inc index c0f46f94..0f60b703 100644 --- a/asm/include/overlay_29_02344BA8.inc +++ b/asm/include/overlay_29_02344BA8.inc @@ -1,3 +1,3 @@ #pragma once -.public SubstitutePlaceholderItemTags .public ov29_023531BC +.public SubstitutePlaceholderItemTags diff --git a/asm/include/overlay_29_02344BF8.inc b/asm/include/overlay_29_02344BF8.inc index f1197714..cdbb034b 100644 --- a/asm/include/overlay_29_02344BF8.inc +++ b/asm/include/overlay_29_02344BF8.inc @@ -1,9 +1,10 @@ #pragma once +.public _s32_div_f .public AddItemToBagNoHeld .public AddMoneyCarried .public AdvanceFrame -.public DUNGEON_PTR .public DisplayItemTip +.public DUNGEON_PTR .public DungeonRand16Bit .public DungeonRandInt .public DungeonRandRange @@ -29,16 +30,6 @@ .public LogMessageByIdWithPopupCheckUser .public MemAlloc .public MemFree -.public PlaySeByIdIfNotSilence -.public RemoveEmptyItemsInBag -.public RemoveEquivItemNoHole -.public RemoveGroundItem -.public SetPreprocessorArgsIdVal -.public ShouldMonsterRunAwayAndShowEffect -.public SpawnItemEntity -.public SubstitutePlaceholderItemTags -.public SubstitutePlaceholderStringTags -.public _s32_div_f .public ov29_022FB920 .public ov29_02347040 .public ov29_02348D3C @@ -48,3 +39,12 @@ .public ov29_023531BC .public ov29_023531CC .public ov29_023537B0 +.public PlaySeByIdIfNotSilence +.public RemoveEmptyItemsInBag +.public RemoveEquivItemNoHole +.public RemoveGroundItem +.public SetPreprocessorArgsIdVal +.public ShouldMonsterRunAwayAndShowEffect +.public SpawnItemEntity +.public SubstitutePlaceholderItemTags +.public SubstitutePlaceholderStringTags diff --git a/asm/include/overlay_29_02348D3C.inc b/asm/include/overlay_29_02348D3C.inc index 60418de2..f5711fae 100644 --- a/asm/include/overlay_29_02348D3C.inc +++ b/asm/include/overlay_29_02348D3C.inc @@ -10,10 +10,6 @@ .public IsItemWithFlagsInBag .public LogMessageByIdWithPopupCheckUser .public MissionTargetEnemyIsDefeated -.public PrepareItemForPrinting__02345728 -.public SubstitutePlaceholderStringTags -.public TreasureMemoComplete -.public TryCompleteMission .public ov29_02348ABC .public ov29_02348B28 .public ov29_02348BA0 @@ -22,3 +18,7 @@ .public ov29_0234A8BC .public ov29_0234AA98 .public ov29_0234ABB0 +.public PrepareItemForPrinting__02345728 +.public SubstitutePlaceholderStringTags +.public TreasureMemoComplete +.public TryCompleteMission diff --git a/asm/include/overlay_29_0234AEE8.inc b/asm/include/overlay_29_0234AEE8.inc index ee5f3313..a0ce3ef6 100644 --- a/asm/include/overlay_29_0234AEE8.inc +++ b/asm/include/overlay_29_0234AEE8.inc @@ -3,13 +3,13 @@ .public ChangeDungeonMusic .public DUNGEON_PTR .public HandleFaint -.public MESSAGE_LOG_INFO .public MemAlloc .public MemFree .public MemZero +.public MESSAGE_LOG_INFO .public MissionExitPrompt .public MusicTableIdxToMusicId -.public SetUnkMusicFlag .public ov29_022E68F0 .public ov29_022EAEFC .public ov29_0234B130 +.public SetUnkMusicFlag diff --git a/asm/include/overlay_29_0234B130.inc b/asm/include/overlay_29_0234B130.inc index f48f57c1..94e40567 100644 --- a/asm/include/overlay_29_0234B130.inc +++ b/asm/include/overlay_29_0234B130.inc @@ -5,8 +5,8 @@ .public LogMessage .public LogMessageByIdWithPopupCheckUserTarget .public MESSAGE_LOG_INFO +.public ov29_022E9FC0 .public ShouldDisplayEntityWrapper .public StringFromId .public UnkMapRelatedFunc .public WaitUntilAlertBoxTextIsLoaded -.public ov29_022E9FC0 diff --git a/asm/include/overlay_29_0234B350.inc b/asm/include/overlay_29_0234B350.inc index c84645b1..5eec7f07 100644 --- a/asm/include/overlay_29_0234B350.inc +++ b/asm/include/overlay_29_0234B350.inc @@ -1,5 +1,5 @@ #pragma once .public LogMessage +.public ov29_022E2CA0 .public ShouldDisplayEntityWrapper .public StringFromId -.public ov29_022E2CA0 diff --git a/asm/include/overlay_29_0234B4CC.inc b/asm/include/overlay_29_0234B4CC.inc index b2c45872..d2d69421 100644 --- a/asm/include/overlay_29_0234B4CC.inc +++ b/asm/include/overlay_29_0234B4CC.inc @@ -6,16 +6,16 @@ .public DUNGEON_PTR .public IsAlertBoxActive .public MESSAGE_LOG_INFO -.public PreprocessString -.public StringFromId -.public UnkMapRelatedFunc .public ov10_022BFD20 .public ov29_022F2FE4 .public ov29_0234BB44 .public ov29_02353214 +.public PreprocessString +.public StringFromId .public strlen .public strncmp .public strncpy .public sub_02001808 .public sub_0202836C .public sub_02030214 +.public UnkMapRelatedFunc diff --git a/asm/main_0201C000.s b/asm/main_0201C000.s index 1fa553df..52fe7107 100644 --- a/asm/main_0201C000.s +++ b/asm/main_0201C000.s @@ -1132,8 +1132,8 @@ sub_0201CF80: ; 0x0201CF80 bx lr arm_func_end sub_0201CF80 - arm_func_start sub_0201CF90 -sub_0201CF90: ; 0x0201CF90 + arm_func_start GetPixelOffsetFromSprite +GetPixelOffsetFromSprite: ; 0x0201CF90 stmdb sp!, {r3, lr} mov ip, #0 strh ip, [r0] @@ -1176,10 +1176,10 @@ _0201D024: strh r1, [r0] strh r1, [r0, #2] ldmia sp!, {r3, pc} - arm_func_end sub_0201CF90 + arm_func_end GetPixelOffsetFromSprite - arm_func_start sub_0201D034 -sub_0201D034: ; 0x0201D034 + arm_func_start FillPixelOffsetArrayFromSprite +FillPixelOffsetArrayFromSprite: ; 0x0201D034 stmdb sp!, {r4, r5, r6, lr} ldrh r3, [r2] tst r3, #0x8000 @@ -1235,7 +1235,7 @@ _0201D0EC: cmp r2, r1 blo _0201D0D8 ldmia sp!, {r4, r5, r6, pc} - arm_func_end sub_0201D034 + arm_func_end FillPixelOffsetArrayFromSprite arm_func_start sub_0201D0F8 sub_0201D0F8: ; 0x0201D0F8 diff --git a/asm/overlay_10_022BCDF4.s b/asm/overlay_10_022BCDF4.s index 81ad3d0e..c0e46779 100644 --- a/asm/overlay_10_022BCDF4.s +++ b/asm/overlay_10_022BCDF4.s @@ -1284,13 +1284,13 @@ _022BDEA4: _022BDEB0: .word ov10_022DC1C0 arm_func_end ov10_022BDE50 - arm_func_start GetEffectAnimationField0x19 -GetEffectAnimationField0x19: ; 0x022BDEB4 + arm_func_start GetEffectAnimationWanOffset +GetEffectAnimationWanOffset: ; 0x022BDEB4 stmdb sp!, {r3, lr} bl GetEffectAnimation ldrsb r0, [r0, #0x19] ldmia sp!, {r3, pc} - arm_func_end GetEffectAnimationField0x19 + arm_func_end GetEffectAnimationWanOffset arm_func_start ov10_022BDEC4 ov10_022BDEC4: ; 0x022BDEC4 diff --git a/asm/overlay_10_022BFF78.s b/asm/overlay_10_022BFF78.s index cd2023ee..f1dc69f0 100644 --- a/asm/overlay_10_022BFF78.s +++ b/asm/overlay_10_022BFF78.s @@ -1427,7 +1427,7 @@ _022C1178: add r0, sp, #0x10 mov r2, r4 mov r1, #4 - bl sub_0201D034 + bl FillPixelOffsetArrayFromSprite ldrb r0, [sp, #0x48] cmp r0, #0 beq _022C11C4 @@ -1549,7 +1549,7 @@ _022C12EC: mov r2, r6 add r0, sp, #0x10 mov r1, #4 - bl sub_0201D034 + bl FillPixelOffsetArrayFromSprite ldrb r0, [r7, #0x4f] cmp r0, #0 beq _022C1378 diff --git a/asm/overlay_11_022EE5E4.s b/asm/overlay_11_022EE5E4.s index 3626b10f..d8a6eaf0 100644 --- a/asm/overlay_11_022EE5E4.s +++ b/asm/overlay_11_022EE5E4.s @@ -9416,7 +9416,7 @@ _022F5CEC: ldrb r2, [r7, #0xa4] add r0, sp, #8 add r1, r7, #0xc - bl sub_0201CF90 + bl GetPixelOffsetFromSprite ldrsh lr, [sp, #8] ldrsh ip, [sp, #0xa] add r2, sp, #0 diff --git a/asm/overlay_29_022E335C.s b/asm/overlay_29_022E335C.s index 495ac49b..dd35a9af 100644 --- a/asm/overlay_29_022E335C.s +++ b/asm/overlay_29_022E335C.s @@ -218,7 +218,7 @@ ov29_022E3590: ; 0x022E3590 mov r6, r0 mov r0, r5 mov r4, r2 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov ip, #0 @@ -275,7 +275,7 @@ _022E365C: add r0, sp, #0 mov r2, r7 add r1, r8, #0x2c - bl sub_0201CF90 + bl GetPixelOffsetFromSprite ldrsh r7, [sp] cmp r7, #0x63 ldrnesh r2, [sp, #2] diff --git a/asm/overlay_29_022E37DC.s b/asm/overlay_29_022E37DC.s index cbfd0744..ee84a0dc 100644 --- a/asm/overlay_29_022E37DC.s +++ b/asm/overlay_29_022E37DC.s @@ -465,7 +465,7 @@ PlayQuestionMarkEffect: ; 0x022E3DD8 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x144 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -488,7 +488,7 @@ PlayExclamationPointEffect__022E47D4: ; 0x022E3E24 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E3E70 ; =0x00000143 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -513,7 +513,7 @@ ov29_022E3E74: ; 0x022E3E74 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x25 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -541,7 +541,7 @@ PlayExclamationPointEffect__022E4880: ; 0x022E3ED0 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E3F1C ; =0x00000143 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 diff --git a/asm/overlay_29_022E41F0.s b/asm/overlay_29_022E41F0.s index 79593d1b..fcdc07c0 100644 --- a/asm/overlay_29_022E41F0.s +++ b/asm/overlay_29_022E41F0.s @@ -9,7 +9,7 @@ ov29_022E41F0: ; 0x022E41F0 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E423C ; =0x000001A7 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -34,7 +34,7 @@ PlayParalysisEffect: ; 0x022E4240 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E428C ; =0x000001A7 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -64,7 +64,7 @@ ov29_022E4294: ; 0x022E4294 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x4c - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -98,7 +98,7 @@ PlayEffectAnimationEntityStandard: ; 0x022E42E8 mov r4, r1 mov r5, r0 mov r0, r4 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 diff --git a/asm/overlay_29_022E45CC.s b/asm/overlay_29_022E45CC.s index 4ade9eb8..5827a744 100644 --- a/asm/overlay_29_022E45CC.s +++ b/asm/overlay_29_022E45CC.s @@ -15,7 +15,7 @@ ov29_022E45D0: ; 0x022E45D0 mov r5, r0 mov r0, #0x2f mov r4, r1 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -29,7 +29,7 @@ ov29_022E45D0: ; 0x022E45D0 str ip, [sp, #0xc] bl PlayEffectAnimationEntity mov r0, #0x30 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r1, #2 @@ -83,7 +83,7 @@ ov29_022E4674: ; 0x022E4674 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x21 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 diff --git a/asm/overlay_29_022E4868.s b/asm/overlay_29_022E4868.s index b44dc1d4..66ecba9c 100644 --- a/asm/overlay_29_022E4868.s +++ b/asm/overlay_29_022E4868.s @@ -14,7 +14,7 @@ ov29_022E486C: ; 0x022E486C sub sp, sp, #0x10 mov r4, r0 mov r0, #0x41 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -37,7 +37,7 @@ ov29_022E48B8: ; 0x022E48B8 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E4910 ; =0x0000011E - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -65,7 +65,7 @@ ov29_022E4914: ; 0x022E4914 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E4960 ; =0x000001AE - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -90,7 +90,7 @@ ShowPpRestoreEffect: ; 0x022E4964 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E49B0 ; =0x000001B1 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -115,7 +115,7 @@ ov29_022E49B4: ; 0x022E49B4 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E4A00 ; =0x000001A9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -140,7 +140,7 @@ ov29_022E4A04: ; 0x022E4A04 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E4A50 ; =0x00000192 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -165,7 +165,7 @@ ov29_022E4A54: ; 0x022E4A54 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E4AA0 ; =0x0000018E - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -190,7 +190,7 @@ ov29_022E4AA4: ; 0x022E4AA4 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x190 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -213,7 +213,7 @@ ov29_022E4AF0: ; 0x022E4AF0 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x15 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -236,7 +236,7 @@ ov29_022E4B3C: ; 0x022E4B3C sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E4B88 ; =0x00000171 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 diff --git a/asm/overlay_29_022E4BB4.s b/asm/overlay_29_022E4BB4.s index c9e55853..d203aab0 100644 --- a/asm/overlay_29_022E4BB4.s +++ b/asm/overlay_29_022E4BB4.s @@ -9,7 +9,7 @@ ov29_022E4BB4: ; 0x022E4BB4 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x15 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -32,7 +32,7 @@ ov29_022E4C00: ; 0x022E4C00 sub sp, sp, #0x10 mov r4, r0 mov r0, #0xf - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -73,7 +73,7 @@ ov29_022E4C84: ; 0x022E4C84 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E4CD0 ; =0x000001F7 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -98,7 +98,7 @@ ov29_022E4CD4: ; 0x022E4CD4 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E4D20 ; =0x000001F9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -132,7 +132,7 @@ PlayOffensiveStatDownEffect: ; 0x022E4D28 cmp r1, #0 bne _022E4D80 mov r0, #0x194 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -148,7 +148,7 @@ PlayOffensiveStatDownEffect: ; 0x022E4D28 b _022E4DB8 _022E4D80: ldr r0, _022E4DC8 ; =0x00000193 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -180,7 +180,7 @@ PlayDefensiveStatDownEffect: ; 0x022E4DCC cmp r1, #0 bne _022E4E24 ldr r0, _022E4E6C ; =0x0000018F - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -196,7 +196,7 @@ PlayDefensiveStatDownEffect: ; 0x022E4DCC b _022E4E5C _022E4E24: ldr r0, _022E4E70 ; =0x00000191 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -229,7 +229,7 @@ PlayOffensiveStatUpEffect: ; 0x022E4E74 cmp r1, #0 bne _022E4ECC ldr r0, _022E4F14 ; =0x000001A9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -245,7 +245,7 @@ PlayOffensiveStatUpEffect: ; 0x022E4E74 b _022E4F04 _022E4ECC: ldr r0, _022E4F18 ; =0x00000192 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -278,7 +278,7 @@ PlayDefensiveStatUpEffect: ; 0x022E4F1C cmp r1, #0 bne _022E4F74 ldr r0, _022E4FBC ; =0x0000018E - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -294,7 +294,7 @@ PlayDefensiveStatUpEffect: ; 0x022E4F1C b _022E4FAC _022E4F74: mov r0, #0x190 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -326,7 +326,7 @@ PlayOffensiveStatMultiplierUpEffect: ; 0x022E4FC0 cmp r1, #0 bne _022E5018 ldr r0, _022E5060 ; =0x000001A9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -342,7 +342,7 @@ PlayOffensiveStatMultiplierUpEffect: ; 0x022E4FC0 b _022E5050 _022E5018: ldr r0, _022E5064 ; =0x00000192 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -375,7 +375,7 @@ PlayOffensiveStatMultiplierDownEffect: ; 0x022E5068 cmp r1, #0 bne _022E50C0 mov r0, #0x194 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -391,7 +391,7 @@ PlayOffensiveStatMultiplierDownEffect: ; 0x022E5068 b _022E50F8 _022E50C0: ldr r0, _022E5108 ; =0x00000193 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -423,7 +423,7 @@ PlayDefensiveStatMultiplierUpEffect: ; 0x022E510C cmp r1, #0 bne _022E5164 ldr r0, _022E51AC ; =0x0000018E - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -439,7 +439,7 @@ PlayDefensiveStatMultiplierUpEffect: ; 0x022E510C b _022E519C _022E5164: mov r0, #0x190 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -471,7 +471,7 @@ PlayDefensiveStatMultiplierDownEffect: ; 0x022E51B0 cmp r1, #0 bne _022E5208 ldr r0, _022E5250 ; =0x0000018F - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -487,7 +487,7 @@ PlayDefensiveStatMultiplierDownEffect: ; 0x022E51B0 b _022E5240 _022E5208: ldr r0, _022E5254 ; =0x00000191 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -520,7 +520,7 @@ PlayHitChanceUpEffect: ; 0x022E5258 cmp r1, #0 bne _022E52B0 mov r0, #0x18c - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -536,7 +536,7 @@ PlayHitChanceUpEffect: ; 0x022E5258 b _022E52E8 _022E52B0: mov r0, #0xd - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -566,7 +566,7 @@ PlayHitChanceDownEffect: ; 0x022E52F8 cmp r1, #0 bne _022E5350 ldr r0, _022E5398 ; =0x0000018D - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -582,7 +582,7 @@ PlayHitChanceDownEffect: ; 0x022E52F8 b _022E5388 _022E5350: mov r0, #0xe - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -610,7 +610,7 @@ PlayExclamationPointEffect__022E5D4C: ; 0x022E539C sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E53E8 ; =0x00000143 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -640,7 +640,7 @@ ov29_022E53F0: ; 0x022E53F0 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x19 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -735,7 +735,7 @@ ov29_022E550C: ; 0x022E550C sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E5558 ; =0x0000013E - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -767,7 +767,7 @@ ov29_022E5560: ; 0x022E5560 cmp r2, #1 bne _022E55B0 mov r0, #0xf8 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -783,7 +783,7 @@ ov29_022E5560: ; 0x022E5560 b _022E55E8 _022E55B0: mov r0, #0xf9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -807,7 +807,7 @@ ov29_022E55F0: ; 0x022E55F0 sub sp, sp, #0x10 mov r0, #0x2a mov r4, r1 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 diff --git a/asm/overlay_29_022E5650.s b/asm/overlay_29_022E5650.s index e04ea6a8..a29ac02e 100644 --- a/asm/overlay_29_022E5650.s +++ b/asm/overlay_29_022E5650.s @@ -9,7 +9,7 @@ ov29_022E5650: ; 0x022E5650 sub sp, sp, #0x10 ldr r0, _022E569C ; =0x00000167 mov r4, r1 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -144,7 +144,7 @@ ov29_022E57D4: ; 0x022E57D4 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E585C ; =0x0000025A - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -158,7 +158,7 @@ ov29_022E57D4: ; 0x022E57D4 str ip, [sp, #0xc] bl PlayEffectAnimationEntity ldr r0, _022E5860 ; =0x0000025B - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r1, #2 @@ -185,7 +185,7 @@ ov29_022E5864: ; 0x022E5864 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x16 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -332,7 +332,7 @@ ov29_022E5A00: ; 0x022E5A00 mov r3, r1, asr #1 mov r1, #4 add r5, r3, #1 - bl sub_0201D034 + bl FillPixelOffsetArrayFromSprite add r1, sp, #4 add r2, sp, #8 mov r0, r4 @@ -403,7 +403,7 @@ ov29_022E5AE4: ; 0x022E5AE4 mov r3, r1, lsl #0x10 mov r1, #4 mov r5, r3, asr #0x10 - bl sub_0201D034 + bl FillPixelOffsetArrayFromSprite add r1, sp, #4 add r2, sp, #8 mov r0, r4 @@ -729,7 +729,7 @@ _022E5F44: beq _022E5FC8 ldr r0, _022E5FDC ; =0x00000199 strb r7, [sl, #0xfc] - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset str r6, [sp] str r5, [sp, #4] str r4, [sp, #8] @@ -802,7 +802,7 @@ _022E6034: cmp r0, #0 bne _022E6090 mov r0, r7 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 @@ -819,7 +819,7 @@ _022E6090: ldr r0, _022E60E0 ; =ov29_0235124C ldr r5, [r0, r6, lsl #2] mov r0, r5 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 @@ -847,7 +847,7 @@ ov29_022E60E4: ; 0x022E60E4 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x29 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -870,7 +870,7 @@ PlayEffectAnimation0x1A9__022E6130: ; 0x022E6130 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E6178 ; =0x000001A9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 @@ -894,7 +894,7 @@ PlayEffectAnimation0x1A9__022E617C: ; 0x022E617C sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E61C4 ; =0x000001A9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 @@ -918,7 +918,7 @@ PlayEffectAnimation0x1A9__022E61C8: ; 0x022E61C8 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E6210 ; =0x000001A9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 @@ -942,7 +942,7 @@ PlayEffectAnimation0x1A9__022E6214: ; 0x022E6214 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E625C ; =0x000001A9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 @@ -966,7 +966,7 @@ ov29_022E6260: ; 0x022E6260 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x1a8 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -988,7 +988,7 @@ PlayEffectAnimation0x29: ; 0x022E62A8 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x29 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -1010,7 +1010,7 @@ ov29_022E62F0: ; 0x022E62F0 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x48 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -1032,7 +1032,7 @@ ov29_022E6338: ; 0x022E6338 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E6384 ; =0x000001A6 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -1057,7 +1057,7 @@ ov29_022E6388: ; 0x022E6388 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E63D4 ; =0x00000297 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 @@ -1082,7 +1082,7 @@ PlayEffectAnimation0x18E: ; 0x022E63D8 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E6420 ; =0x0000018E - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r2, #0 mov r1, #2 @@ -1106,7 +1106,7 @@ ov29_022E6424: ; 0x022E6424 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x1b0 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -1132,7 +1132,7 @@ ov29_022E647C: ; 0x022E647C sub sp, sp, #0x10 mov r4, r0 mov r0, #0x1a8 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -1154,7 +1154,7 @@ PlayEffectAnimation0x1A9__022E64C4: ; 0x022E64C4 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E650C ; =0x000001A9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 @@ -1178,7 +1178,7 @@ PlayEffectAnimation0x1A9__022E6510: ; 0x022E6510 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E6558 ; =0x000001A9 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 @@ -1202,7 +1202,7 @@ ov29_022E655C: ; 0x022E655C sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E65A4 ; =0x000001AB - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 @@ -1226,7 +1226,7 @@ ov29_022E65A8: ; 0x022E65A8 sub sp, sp, #0x10 mov r4, r0 mov r0, #4 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -1249,7 +1249,7 @@ ov29_022E65F4: ; 0x022E65F4 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E6640 ; =0x0000011E - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 mov ip, #0 mov r1, #2 @@ -1274,7 +1274,7 @@ ov29_022E6644: ; 0x022E6644 sub sp, sp, #0x10 mov r4, r0 ldr r0, _022E6690 ; =0x0000011D - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r2, r0 and r3, r2, #0xff mov r0, #2 diff --git a/asm/overlay_29_022E6798.s b/asm/overlay_29_022E6798.s index 7b127ab7..2c786fd7 100644 --- a/asm/overlay_29_022E6798.s +++ b/asm/overlay_29_022E6798.s @@ -9,7 +9,7 @@ ov29_022E6798: ; 0x022E6798 sub sp, sp, #0x10 mov r4, r0 mov r0, #0x18 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r1, r0 and r3, r1, #0xff mov r0, #2 @@ -39,7 +39,7 @@ ov29_022E67E4: ; 0x022E67E4 cmp r0, #0 beq _022E68AC mov r0, r7 - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, r0 mov r0, #2 mov r2, #0 diff --git a/asm/overlay_29_022E6928.s b/asm/overlay_29_022E6928.s index e84ecbf1..0608e963 100644 --- a/asm/overlay_29_022E6928.s +++ b/asm/overlay_29_022E6928.s @@ -18,7 +18,7 @@ _022E6944: strh r0, [r2], #2 bne _022E6944 ldr r0, _022E69FC ; =0x0000027A - bl GetEffectAnimationField0x19 + bl GetEffectAnimationWanOffset mov r3, #2 mov r1, r4, lsr #0x1f mov ip, r0 @@ -459,7 +459,7 @@ _022E6ED0: and r2, r1, #0xff add r0, sp, #0x14 add r1, sl, #0x2c - bl sub_0201CF90 + bl GetPixelOffsetFromSprite _022E6F54: ldrb r0, [sb, #0x4c] ldr r3, [sp, #4] diff --git a/asm/overlay_29_022EDCBC.s b/asm/overlay_29_022EDCBC.s index 5d2ca68b..e0e8d961 100644 --- a/asm/overlay_29_022EDCBC.s +++ b/asm/overlay_29_022EDCBC.s @@ -284,7 +284,7 @@ TryTriggerTrap: ; 0x022EDFA0 strb r0, [r4, #0x20] beq _022EE1D8 mov r0, r5 - bl ov29_022F9840 + bl TryPointCameraToFarOffTeammate cmp r7, #0 ldrneb r0, [r6] cmpne r0, #0x11 diff --git a/asm/overlay_29_022F0654.s b/asm/overlay_29_022F0654.s index 4e37b15c..552a502b 100644 --- a/asm/overlay_29_022F0654.s +++ b/asm/overlay_29_022F0654.s @@ -448,7 +448,7 @@ GetEntityTouchscreenArea: ; 0x022F0BAC mov r2, #3 ldrsh r4, [r3, #0x48] ldrsh r5, [r3, #0x4a] - bl sub_0201CF90 + bl GetPixelOffsetFromSprite ldrsh r0, [sp] add r0, r4, r0 sub r0, r0, #0xc diff --git a/asm/overlay_29_022F9744.s b/asm/overlay_29_022F9744.s index 5ef8899f..87935644 100644 --- a/asm/overlay_29_022F9744.s +++ b/asm/overlay_29_022F9744.s @@ -29,7 +29,7 @@ TryActivateConversion2: ; 0x022F9744 movs r4, r0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} mov r0, r6 - bl ov29_02307CE0 + bl ResetTypeChanges mov r0, r6 strb r4, [r5, #0x5e] mov r1, #0 @@ -80,8 +80,8 @@ _022F9838: ldmia sp!, {r4, pc} arm_func_end TryActivateTruant - arm_func_start ov29_022F9840 -ov29_022F9840: ; 0x022F9840 + arm_func_start TryPointCameraToFarOffTeammate +TryPointCameraToFarOffTeammate: ; 0x022F9840 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, #0 @@ -112,7 +112,7 @@ _022F987C: mov r2, r1 bl TryPointCameraToMonster ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_022F9840 + arm_func_end TryPointCameraToFarOffTeammate arm_func_start TryPointCameraToMonster TryPointCameraToMonster: ; 0x022F98B4 diff --git a/asm/overlay_29_022FB678.s b/asm/overlay_29_022FB678.s index eaf61a67..3a31539c 100644 --- a/asm/overlay_29_022FB678.s +++ b/asm/overlay_29_022FB678.s @@ -118,7 +118,7 @@ _022FB7C0: cmp r0, #0 bne _022FB7FC mov r0, sl - bl ov29_02307CE0 + bl ResetTypeChanges _022FB7FC: ldrsh r1, [sb, #0x12] ldrsh r0, [sb, #0x16] diff --git a/asm/overlay_29_022FE4BC.s b/asm/overlay_29_022FE4BC.s index a6706c40..c0910d3d 100644 --- a/asm/overlay_29_022FE4BC.s +++ b/asm/overlay_29_022FE4BC.s @@ -112,7 +112,7 @@ _022FF048: cmp r0, #0 bne _022FF05C mov r0, r6 - bl ov29_022F9840 + bl TryPointCameraToFarOffTeammate _022FF05C: mov r0, #0xa bl AdvanceFrame @@ -747,7 +747,7 @@ _022FE61C: cmp r0, #0 bne _022FE630 mov r0, sb - bl ov29_022F9840 + bl TryPointCameraToFarOffTeammate _022FE630: mov r0, #0xa bl AdvanceFrame diff --git a/asm/overlay_29_02302A5C.s b/asm/overlay_29_02302A5C.s index 897e8f82..48c8748b 100644 --- a/asm/overlay_29_02302A5C.s +++ b/asm/overlay_29_02302A5C.s @@ -1873,7 +1873,7 @@ _02304310: sub r3, r6, r3 mov r3, r3, asr #8 strh r3, [sp, #0x1a] - bl sub_0201D034 + bl FillPixelOffsetArrayFromSprite ldr r1, _023046C8 ; =DUNGEON_PTR ldr r0, [r5, #0xb0] ldr r2, [r1] diff --git a/asm/overlay_29_02305C28.s b/asm/overlay_29_02305C28.s index 638cf03c..d08e8378 100644 --- a/asm/overlay_29_02305C28.s +++ b/asm/overlay_29_02305C28.s @@ -805,7 +805,7 @@ _0230661C: mov r0, r5 bl ov29_022E65F4 mov r0, r5 - bl ov29_02307CE0 + bl ResetTypeChanges b _02306688 _0230663C: ldr r1, _023066C8 ; =0x00000CB4 @@ -2553,8 +2553,8 @@ _02307CDC: .word 0x00000C9F #endif arm_func_end EndFrozenStatus - arm_func_start ov29_02307CE0 -ov29_02307CE0: ; 0x02307CE0 + arm_func_start ResetTypeChanges +ResetTypeChanges: ; 0x02307CE0 stmdb sp!, {r4, lr} ldr r4, [r0, #0xb4] mov r1, #0 @@ -2569,7 +2569,7 @@ ov29_02307CE0: ; 0x02307CE0 bl GetType strb r0, [r4, #0x5f] ldmia sp!, {r4, pc} - arm_func_end ov29_02307CE0 + arm_func_end ResetTypeChanges arm_func_start EndProtectStatus EndProtectStatus: ; 0x02307D18 diff --git a/asm/overlay_29_0232145C.s b/asm/overlay_29_0232145C.s index 8c576d84..6cad6f23 100644 --- a/asm/overlay_29_0232145C.s +++ b/asm/overlay_29_0232145C.s @@ -1650,7 +1650,7 @@ _02322A68: str r1, [sp, #0x20] cmp r0, #0 beq _02322AC0 - bl ov29_022F9840 + bl TryPointCameraToFarOffTeammate _02322AC0: ldr r1, [r6, #0xb4] ldrb r0, [r1, #0xd0] diff --git a/asm/overlay_29_02322DDC.s b/asm/overlay_29_02322DDC.s index 9d6dc282..fdee008b 100644 --- a/asm/overlay_29_02322DDC.s +++ b/asm/overlay_29_02322DDC.s @@ -198,7 +198,7 @@ _02322FC8: add r0, sp, #0xc add r1, r7, #0x2c and r2, r2, #0xff - bl sub_0201CF90 + bl GetPixelOffsetFromSprite _02323084: mov r0, r7 bl GetApparentWeather diff --git a/asm/overlay_29_02324BE8.s b/asm/overlay_29_02324BE8.s index 7a96223d..3a80eda1 100644 --- a/asm/overlay_29_02324BE8.s +++ b/asm/overlay_29_02324BE8.s @@ -292,7 +292,7 @@ ov29_02324E78: ; 0x02324E78 add r0, sp, #8 add r1, r7, #0x2c and r2, r2, #0xff - bl sub_0201CF90 + bl GetPixelOffsetFromSprite _02324F98: strh r4, [sp] ldrsh r1, [r5, #4] @@ -443,7 +443,7 @@ ov29_023250D4: ; 0x023250D4 add r0, sp, #0xc add r1, sl, #0x2c and r2, r2, #0xff - bl sub_0201CF90 + bl GetPixelOffsetFromSprite _023251A8: strh r5, [sp, #4] ldrsh r1, [r6, #4] diff --git a/asm/overlay_29_02325644.s b/asm/overlay_29_02325644.s index 28aec64e..bc2e2401 100644 --- a/asm/overlay_29_02325644.s +++ b/asm/overlay_29_02325644.s @@ -106,7 +106,7 @@ _02325740: add r0, sp, #0xc add r1, sb, #0x2c and r2, r5, #0xff - bl sub_0201CF90 + bl GetPixelOffsetFromSprite b _023257D8 _023257C8: ldrh r1, [sp] @@ -267,11 +267,11 @@ _02325958: add r0, sp, #0x20 mov r2, r6 add r1, r4, #0x2c - bl sub_0201CF90 + bl GetPixelOffsetFromSprite add r0, sp, #0xc mov r2, r6 add r1, r5, #0x2c - bl sub_0201CF90 + bl GetPixelOffsetFromSprite b _02325A3C _02325A24: ldrh r1, [sp] diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s index 23275176..8cfe7abc 100644 --- a/asm/overlay_29_0232E864.s +++ b/asm/overlay_29_0232E864.s @@ -463,7 +463,7 @@ _0232EE54: ldrneh r1, [sb, #6] strneh r1, [r0, #0x80 + EXECUTE_MOVE_EFFECT_OFFSET] mov r0, r4 - bl ov29_022F9840 + bl TryPointCameraToFarOffTeammate mov r0, sb mov r1, r4 bl TryEndPetrifiedOrSleepStatus diff --git a/lib/DSE/asm/include/main_020721D4.inc b/lib/DSE/asm/include/main_020721D4.inc index 6f70f09b..3f59c932 100644 --- a/lib/DSE/asm/include/main_020721D4.inc +++ b/lib/DSE/asm/include/main_020721D4.inc @@ -1 +1,2 @@ #pragma once + diff --git a/lib/DSE/asm/include/main_020727FC.inc b/lib/DSE/asm/include/main_020727FC.inc index 6f70f09b..3f59c932 100644 --- a/lib/DSE/asm/include/main_020727FC.inc +++ b/lib/DSE/asm/include/main_020727FC.inc @@ -1 +1,2 @@ #pragma once + diff --git a/lib/DSE/asm/include/main_020729A4.inc b/lib/DSE/asm/include/main_020729A4.inc index 21e27bfa..2b5e4c30 100644 --- a/lib/DSE/asm/include/main_020729A4.inc +++ b/lib/DSE/asm/include/main_020729A4.inc @@ -1,4 +1,14 @@ #pragma once +.public _020B0D50 +.public _020B1310 +.public _020B1394 +.public _022B7370 +.public _022B7988 +.public _022B7A30 +.public _022B7A6C +.public _022B8330 +.public _022B9584 +.public _s32_div_f .public DRIVER_WORK .public DseMem_Allocate .public DseMem_Free @@ -16,26 +26,16 @@ .public Snd_SetupChannelPsg .public Snd_StartTimer .public Snd_StopTimer -.public SoundEnvelopeParameters_CheckValidity -.public SoundEnvelopeParameters_Reset .public SoundEnvelope_Release .public SoundEnvelope_Reset .public SoundEnvelope_SetParameters .public SoundEnvelope_Stop .public SoundEnvelope_Stop2 .public SoundEnvelope_Tick +.public SoundEnvelopeParameters_CheckValidity +.public SoundEnvelopeParameters_Reset .public SoundLfoBank_Reset .public SoundLfoBank_Set .public SoundLfoBank_SetConstEnvelopes .public SoundLfoBank_Tick .public UpdateTrackVolumeEnvelopes -.public _020B0D50 -.public _020B1310 -.public _020B1394 -.public _022B7370 -.public _022B7988 -.public _022B7A30 -.public _022B7A6C -.public _022B8330 -.public _022B9584 -.public _s32_div_f diff --git a/src/overlay_29_022E3F20.c b/src/overlay_29_022E3F20.c index 859ac633..0b363074 100644 --- a/src/overlay_29_022E3F20.c +++ b/src/overlay_29_022E3F20.c @@ -1,6 +1,6 @@ #include "overlay_29_022E3F20.h" -extern s32 GetEffectAnimationField0x19(s32 id); +extern s32 GetEffectAnimationWanOffset(s32 id); extern void PlayEffectAnimationEntity(struct entity *entity, s32 id, s32 a, u8 b, s32 c, s32 d, s32 e, s32 f); @@ -12,7 +12,7 @@ void ov29_022E3F20(void) void ov29_022E3F24(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x141, 1, GetEffectAnimationField0x19(0x141), + PlayEffectAnimationEntity(entity, 0x141, 1, GetEffectAnimationWanOffset(0x141), 2, 0, -1, 0); } @@ -28,7 +28,7 @@ void ov29_022E3F78(void) void ov29_022E3F7C(struct entity *entity) { - PlayEffectAnimationEntity(entity, 7, 1, GetEffectAnimationField0x19(7), + PlayEffectAnimationEntity(entity, 7, 1, GetEffectAnimationWanOffset(7), 2, 0, -1, 0); } @@ -39,7 +39,7 @@ void ov29_022E3FC8(void) void ov29_022E3FCC(struct entity *entity) { - PlayEffectAnimationEntity(entity, 4, 0, GetEffectAnimationField0x19(4), + PlayEffectAnimationEntity(entity, 4, 0, GetEffectAnimationWanOffset(4), 2, 0, -1, 0); } @@ -50,7 +50,7 @@ void ov29_022E4014(void) void PlayEffectAnimation0x171Full(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x171, 1, GetEffectAnimationField0x19(0x171), + PlayEffectAnimationEntity(entity, 0x171, 1, GetEffectAnimationWanOffset(0x171), 2, 0, -1, 0); } diff --git a/src/overlay_29_022E406C.c b/src/overlay_29_022E406C.c index c2c1b53d..9489226f 100644 --- a/src/overlay_29_022E406C.c +++ b/src/overlay_29_022E406C.c @@ -1,13 +1,13 @@ #include "overlay_29_022E406C.h" -extern s32 GetEffectAnimationField0x19(s32 id); +extern s32 GetEffectAnimationWanOffset(s32 id); extern void PlayEffectAnimationEntity(struct entity *entity, s32 id, s32 a, u8 b, s32 c, s32 d, s32 e, s32 f); void PlayEffectAnimation0x171(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x171, 0, GetEffectAnimationField0x19(0x171), + PlayEffectAnimationEntity(entity, 0x171, 0, GetEffectAnimationWanOffset(0x171), 2, 0, -1, 0); } @@ -23,7 +23,7 @@ void ov29_022E40BC(void) void ov29_022E40C0(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x1AC, 0, GetEffectAnimationField0x19(0x1AC), + PlayEffectAnimationEntity(entity, 0x1AC, 0, GetEffectAnimationWanOffset(0x1AC), 2, 0, -1, 0); } @@ -39,7 +39,7 @@ void ov29_022E410C(void) void ov29_022E4110(struct entity *entity) { - PlayEffectAnimationEntity(entity, 4, 1, GetEffectAnimationField0x19(4), + PlayEffectAnimationEntity(entity, 4, 1, GetEffectAnimationWanOffset(4), 2, 0, -1, 0); } @@ -50,7 +50,7 @@ void ov29_022E415C(void) void ov29_022E4160(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x1A8, 1, GetEffectAnimationField0x19(0x1A8), + PlayEffectAnimationEntity(entity, 0x1A8, 1, GetEffectAnimationWanOffset(0x1A8), 2, 0, -1, 0); } diff --git a/src/overlay_29_022E4338.c b/src/overlay_29_022E4338.c index 16c69c71..feb66273 100644 --- a/src/overlay_29_022E4338.c +++ b/src/overlay_29_022E4338.c @@ -1,25 +1,25 @@ #include "overlay_29_022E4338.h" -extern s32 GetEffectAnimationField0x19(s32 id); +extern s32 GetEffectAnimationWanOffset(s32 id); extern void PlayEffectAnimationEntity(struct entity *entity, s32 id, s32 a, u8 b, s32 c, s32 d, s32 e, s32 f); void ov29_022E4338(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x1A9, 1, GetEffectAnimationField0x19(0x1A9), + PlayEffectAnimationEntity(entity, 0x1A9, 1, GetEffectAnimationWanOffset(0x1A9), 2, 0, -1, 0); } void ov29_022E4388(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x13A, 1, GetEffectAnimationField0x19(0x13A), + PlayEffectAnimationEntity(entity, 0x13A, 1, GetEffectAnimationWanOffset(0x13A), 2, 0, -1, 0); } void ov29_022E43D8(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x13A, 1, GetEffectAnimationField0x19(0x13A), + PlayEffectAnimationEntity(entity, 0x13A, 1, GetEffectAnimationWanOffset(0x13A), 2, 0, -1, 0); } @@ -35,30 +35,30 @@ void ov29_022E442C(void) void ov29_022E4430(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x171, 1, GetEffectAnimationField0x19(0x171), + PlayEffectAnimationEntity(entity, 0x171, 1, GetEffectAnimationWanOffset(0x171), 2, 0, -1, 0); } void ov29_022E4480(struct entity *entity) { - PlayEffectAnimationEntity(entity, 7, 1, GetEffectAnimationField0x19(7), + PlayEffectAnimationEntity(entity, 7, 1, GetEffectAnimationWanOffset(7), 2, 0, -1, 0); } void PlaySpeedUpEffect(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x18B, 1, GetEffectAnimationField0x19(0x18B), + PlayEffectAnimationEntity(entity, 0x18B, 1, GetEffectAnimationWanOffset(0x18B), 2, 0, -1, 0); } void PlaySpeedDownEffect(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x18A, 1, GetEffectAnimationField0x19(0x18A), + PlayEffectAnimationEntity(entity, 0x18A, 1, GetEffectAnimationWanOffset(0x18A), 2, 0, -1, 0); } void ov29_022E456C(struct entity *entity) { - PlayEffectAnimationEntity(entity, 5, 1, GetEffectAnimationField0x19(5), + PlayEffectAnimationEntity(entity, 5, 1, GetEffectAnimationWanOffset(5), 2, 0, -1, 0); } diff --git a/src/overlay_29_022E4704.c b/src/overlay_29_022E4704.c index 43ba83a8..7f42a749 100644 --- a/src/overlay_29_022E4704.c +++ b/src/overlay_29_022E4704.c @@ -2,7 +2,7 @@ extern bool8 MonsterIsType(struct entity *entity, enum type_id type_id); -extern s32 GetEffectAnimationField0x19(s32 id); +extern s32 GetEffectAnimationWanOffset(s32 id); extern void PlayEffectAnimationEntity(struct entity *entity, s32 id, s32 a, u8 b, s32 c, s32 d, s32 e, s32 f); @@ -26,13 +26,13 @@ void ov29_022E4718(void) void ov29_022E471C(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x131, 1, GetEffectAnimationField0x19(0x131), + PlayEffectAnimationEntity(entity, 0x131, 1, GetEffectAnimationWanOffset(0x131), 2, 0, -1, 0); } void ov29_022E476C(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x30, 1, GetEffectAnimationField0x19(0x30), + PlayEffectAnimationEntity(entity, 0x30, 1, GetEffectAnimationWanOffset(0x30), 2, 0, -1, 0); } @@ -64,10 +64,10 @@ void ov29_022E47C8(void) void ov29_022E47CC(struct entity *entity, s32 id) { if (MonsterIsType(entity, TYPE_GHOST)) { - PlayEffectAnimationEntity(entity, id, 1, GetEffectAnimationField0x19(id), + PlayEffectAnimationEntity(entity, id, 1, GetEffectAnimationWanOffset(id), 2, 0, -1, 0); } else { - PlayEffectAnimationEntity(entity, 0xE, 1, GetEffectAnimationField0x19(0xE), + PlayEffectAnimationEntity(entity, 0xE, 1, GetEffectAnimationWanOffset(0xE), 2, 0, -1, 0); } } diff --git a/src/overlay_29_022E66C4.c b/src/overlay_29_022E66C4.c index f46a8eb2..e3b7656c 100644 --- a/src/overlay_29_022E66C4.c +++ b/src/overlay_29_022E66C4.c @@ -1,6 +1,6 @@ #include "overlay_29_022E66C4.h" -extern s32 GetEffectAnimationField0x19(s32 id); +extern s32 GetEffectAnimationWanOffset(s32 id); extern void PlayEffectAnimationEntity(struct entity *entity, s32 id, s32 a, u8 b, s32 c, s32 d, s32 e, s32 f); @@ -14,12 +14,12 @@ void ov29_022E66C4(struct entity *entity) void ov29_022E66D8(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x15, 1, GetEffectAnimationField0x19(0x15), + PlayEffectAnimationEntity(entity, 0x15, 1, GetEffectAnimationWanOffset(0x15), 2, 0, -1, 0); } void ov29_022E6724(struct entity *entity) { - PlayEffectAnimationEntity(entity, 0x1B4, 1, GetEffectAnimationField0x19(0x1B4), + PlayEffectAnimationEntity(entity, 0x1B4, 1, GetEffectAnimationWanOffset(0x1B4), 2, 0, -1, 0); }