diff --git a/asm/include/main_0200C4CC.inc b/asm/include/main_0200C4CC.inc index 27e9a661..71411c02 100644 --- a/asm/include/main_0200C4CC.inc +++ b/asm/include/main_0200C4CC.inc @@ -1,11 +1,14 @@ #pragma once +.public _02094C0C +.public _02094C18 +.public _0209E7A6 .public AllInventoriesZInit .public AllKecleonShopsZInit .public AllocateTemp1024ByteBufferFromPool .public BAG_ITEMS .public BAG_ITEMS_PTR_MIRROR -.public DUNGEON_RETURN_STATUS_TABLE .public DrawTextInWindow +.public DUNGEON_RETURN_STATUS_TABLE .public FormatMoveString .public GetDungeonResultString .public GetItemCategoryVeneer @@ -19,9 +22,6 @@ .public SpecialEpisodeInventoryZInit .public SpecialEpisodeKecleonShopZInit .public StringFromId -.public _02094C0C -.public _02094C18 -.public _0209E7A6 .public sub_0200D670 .public sub_0200FD38 .public sub_0200FD3C diff --git a/asm/include/main_0200CAFC.inc b/asm/include/main_0200CAFC.inc index 9851ec0e..36ccae11 100644 --- a/asm/include/main_0200CAFC.inc +++ b/asm/include/main_0200CAFC.inc @@ -1,30 +1,4 @@ #pragma once -.public AVAILABLE_ITEMS_IN_GROUP_TABLE -.public BAG_ITEMS_PTR_MIRROR -.public CopyBitsFrom -.public CopyBitsTo -.public GetDungeonGroup -.public GetItemActionName -.public GetItemBuyPrice -.public GetItemCategory -.public GetItemMoveId -.public GetItemName -.public GetItemPaletteId -.public GetItemSellPrice -.public GetLanguage -.public GetThrownItemQuantityLimit -.public HandleSir0Translation -.public ITEM_DATA_TABLE_PTRS -.public ITEM_TABLES_PTRS_1 -.public IsItemValid -.public LoadFileFromRom -.public MONEY_QUANTITY_TABLE -.public MemAlloc -.public MemFree -.public MultiplyByFixedPoint -.public PointsToZero -.public RandRangeSafe -.public ZInit8 .public _02094D0C .public _02094D20 .public _02097F34 @@ -46,6 +20,31 @@ .public _020AF6C4 .public _020AF6C8 .public _020AFF88_EU +.public AVAILABLE_ITEMS_IN_GROUP_TABLE +.public BAG_ITEMS_PTR_MIRROR +.public CopyBitsFrom +.public CopyBitsTo +.public GetDungeonGroup +.public GetItemActionName +.public GetItemBuyPrice +.public GetItemCategory +.public GetItemMoveId +.public GetItemName +.public GetItemPaletteId +.public GetItemSellPrice +.public GetLanguage +.public GetThrownItemQuantityLimit +.public HandleSir0Translation +.public IsItemValid +.public ITEM_DATA_TABLE_PTRS +.public ITEM_TABLES_PTRS_1 +.public LoadFileFromRom +.public MemAlloc +.public MemFree +.public MONEY_QUANTITY_TABLE +.public MultiplyByFixedPoint +.public PointsToZero +.public RandRangeSafe .public strcpy .public strncpy .public sub_0200EB64 @@ -54,3 +53,4 @@ .public sub_02050990 .public sub_020509BC .public vsprintf +.public ZInit8 diff --git a/asm/include/main_0200E864.inc b/asm/include/main_0200E864.inc index c1f3b099..5e1884dd 100644 --- a/asm/include/main_0200E864.inc +++ b/asm/include/main_0200E864.inc @@ -1,16 +1,16 @@ #pragma once -.public ARM9_UNKNOWN_TABLE__NA_2097FF8 -.public BAG_ITEMS_PTR_MIRROR -.public EnsureValidItem -.public GET_ITEM_NAME_FORMATTED_SPRINTF -.public ITEM_DATA_TABLE_PTRS -.public IsItemValid -.public ItemZInit -.public SprintfStatic__0200E808_EU -.public StringFromId .public _0209808C .public _0209809C .public _020980AC .public _020980B0 +.public ARM9_UNKNOWN_TABLE__NA_2097FF8 +.public BAG_ITEMS_PTR_MIRROR +.public EnsureValidItem +.public GET_ITEM_NAME_FORMATTED_SPRINTF +.public IsItemValid +.public ITEM_DATA_TABLE_PTRS +.public ItemZInit +.public SprintfStatic__0200E808_EU .public strcpy +.public StringFromId .public vsprintf diff --git a/asm/include/overlay_29_022ECDE4.inc b/asm/include/overlay_29_022ECDE4.inc index 6986af30..5481e7a1 100644 --- a/asm/include/overlay_29_022ECDE4.inc +++ b/asm/include/overlay_29_022ECDE4.inc @@ -28,7 +28,6 @@ .public LogMessageByIdWithPopupCheckUserUnknown .public memset .public MemZero -.public ov10_022C445C .public ov29_022E2CA0 .public ov29_022E56A0 .public ov29_022E58B0 @@ -51,5 +50,6 @@ .public sub_0201F2A0 .public sub_02024FC8 .public SubstitutePlaceholderStringTags +.public TRAP_BUSTER_ACTIVATION_CHANCE .public UpdateShopkeeperModeAfterTrap .public UpdateTrapsVisibility diff --git a/asm/include/overlay_29_023016A8.inc b/asm/include/overlay_29_023016A8.inc index 78dd05c4..ce71f221 100644 --- a/asm/include/overlay_29_023016A8.inc +++ b/asm/include/overlay_29_023016A8.inc @@ -1,5 +1,5 @@ #pragma once .public AbilityIsActive +.public ov29_022E62A8 .public ShouldMonsterRunAway .public UpdateStateFlags -.public ov29_022E62A8 diff --git a/asm/overlay_10.s b/asm/overlay_10.s index ed575a33..59cc0095 100644 --- a/asm/overlay_10.s +++ b/asm/overlay_10.s @@ -9399,8 +9399,8 @@ ov10_022C4454: .global ov10_022C4458 ov10_022C4458: .byte 0x0A, 0x00, 0x00, 0x00 - .global ov10_022C445C -ov10_022C445C: + .global TRAP_BUSTER_ACTIVATION_CHANCE +TRAP_BUSTER_ACTIVATION_CHANCE: .byte 0x1E, 0x00, 0x00, 0x00 .global ov10_022C4460 ov10_022C4460: diff --git a/asm/overlay_29_022ECDE4.s b/asm/overlay_29_022ECDE4.s index 546049c2..a7e85f82 100644 --- a/asm/overlay_29_022ECDE4.s +++ b/asm/overlay_29_022ECDE4.s @@ -1504,7 +1504,7 @@ _022EE148: bl IqSkillIsEnabled cmp r0, #0 beq _022EE1D8 - ldr r0, _022EE310 ; =ov10_022C445C + ldr r0, _022EE310 ; =TRAP_BUSTER_ACTIVATION_CHANCE ldrsh r0, [r0] bl DungeonRandOutcome__022EAB20 cmp r0, #0 @@ -1647,7 +1647,7 @@ _022EE300: .word 0x00000E5B + TRY_TRIGGER_TRAP_DATA_OFFSET _022EE304: .word 0x00000E5A + TRY_TRIGGER_TRAP_DATA_OFFSET _022EE308: .word DUNGEON_PTR _022EE30C: .word 0x00000E5C + TRY_TRIGGER_TRAP_DATA_OFFSET -_022EE310: .word ov10_022C445C +_022EE310: .word TRAP_BUSTER_ACTIVATION_CHANCE _022EE314: .word 0x00000E5D + TRY_TRIGGER_TRAP_DATA_OFFSET arm_func_end TryTriggerTrap