From 1a82c65375706c5ce91e92ee6aa57e8c29cf002e Mon Sep 17 00:00:00 2001 From: AnonymousRandomPerson Date: Sun, 1 Sep 2024 21:07:31 -0400 Subject: [PATCH] Synced from pmdsky-debug --- asm/include/overlay_29_022F7388.inc | 2 +- asm/include/overlay_29_022FEDBC.inc | 2 +- asm/include/overlay_29_02300108.inc | 2 +- asm/include/overlay_29_023118D8.inc | 2 +- asm/include/overlay_29_0232E864.inc | 2 +- asm/overlay_29_022F7388.s | 2 +- asm/overlay_29_022FEDBC.s | 2 +- asm/overlay_29_02300108.s | 4 ++-- asm/overlay_29_0230F02C.s | 6 +++--- asm/overlay_29_023118D8.s | 6 +++--- asm/overlay_29_0232E864.s | 12 ++++++------ 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc index 3409ad8a..a3ac3108 100644 --- a/asm/include/overlay_29_022F7388.inc +++ b/asm/include/overlay_29_022F7388.inc @@ -52,6 +52,7 @@ .public GetConversion2ConvertToType .public GetDefensiveStatAtLevel .public GetDirectionTowardsPosition +.public GetExclusiveItemWithEffectFromBag .public GetExp .public GetExplorerMazeMonster .public GetFloorType @@ -167,7 +168,6 @@ .public ov29_02304BAC .public ov29_02307CE0 .public ov29_02307DD0 -.public ov29_0230F654 .public ov29_0230F9A4 .public ov29_023159D4 .public ov29_02337EC0 diff --git a/asm/include/overlay_29_022FEDBC.inc b/asm/include/overlay_29_022FEDBC.inc index 33b99562..79366103 100644 --- a/asm/include/overlay_29_022FEDBC.inc +++ b/asm/include/overlay_29_022FEDBC.inc @@ -12,6 +12,7 @@ .public EXCL_ITEM_EFFECTS_WEATHER_MOVE_SPEED_BOOST .public ExclusiveItemEffectFlagTest .public GetApparentWeather +.public GetExclusiveItemWithEffectFromBag .public GetMobilityType .public GetSpeedStatus .public GetTile @@ -28,7 +29,6 @@ .public ov29_022E655C .public ov29_022FAA04 .public ov29_02300DCC -.public ov29_0230F654 .public ov29_02318D58 .public ov29_02322374 .public ov29_02344B44 diff --git a/asm/include/overlay_29_02300108.inc b/asm/include/overlay_29_02300108.inc index d57e71bc..bdf5a95c 100644 --- a/asm/include/overlay_29_02300108.inc +++ b/asm/include/overlay_29_02300108.inc @@ -23,6 +23,7 @@ .public GetEntityNaturalGiftInfo .public GetEntityWeatherBallType .public GetEvolutions +.public GetExclusiveItemWithEffectFromBag .public GetExplorerMazeMonster .public GetForcedLossReason .public GetMobilityTypeCheckSlipAndFloating @@ -60,7 +61,6 @@ .public ov29_022FBDE0 .public ov29_02302C04 .public ov29_02302CC8 -.public ov29_0230F654 .public ov29_02314DC4 .public ov29_02324BE8 .public ov29_02344B44 diff --git a/asm/include/overlay_29_023118D8.inc b/asm/include/overlay_29_023118D8.inc index 88284ce6..c5fbd3a3 100644 --- a/asm/include/overlay_29_023118D8.inc +++ b/asm/include/overlay_29_023118D8.inc @@ -12,6 +12,7 @@ .public EntityIsValid__023118B4 .public EntityIsValid__02315118 .public ExclusiveItemEffectFlagTest +.public GetExclusiveItemWithEffectFromBag .public GetTile .public GetTileAtEntity .public HasHeldItem @@ -78,7 +79,6 @@ .public ov29_023018AC .public ov29_02304A48 .public ov29_02304A84 -.public ov29_0230F654 .public ov29_02344B44 .public ov29_0234B034 .public ov29_0234B084 diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc index 43dc1198..1643b57d 100644 --- a/asm/include/overlay_29_0232E864.inc +++ b/asm/include/overlay_29_0232E864.inc @@ -343,6 +343,7 @@ .public GetDamageSourceWrapper .public GetDirectionTowardsPosition .public GetEntityMoveTargetAndRange +.public GetExclusiveItemWithEffectFromBag .public GetMoveCategory .public GetMoveCritChance .public GetMovePower @@ -402,7 +403,6 @@ .public ov29_02304C3C .public ov29_02307BDC .public ov29_0230D088 -.public ov29_0230F654 .public ov29_02314DC4 .public ov29_0231AD38 .public ov29_023201D0 diff --git a/asm/overlay_29_022F7388.s b/asm/overlay_29_022F7388.s index 4ddb3de4..3e3d50ae 100644 --- a/asm/overlay_29_022F7388.s +++ b/asm/overlay_29_022F7388.s @@ -4728,7 +4728,7 @@ _022FAC04: mov r0, sb mov r1, #0x47 add r2, sp, #0xc - bl ov29_0230F654 + bl GetExclusiveItemWithEffectFromBag mov r0, #1 add r1, sp, #0xc bl ov29_02344B44 diff --git a/asm/overlay_29_022FEDBC.s b/asm/overlay_29_022FEDBC.s index f95e83e7..481036ef 100644 --- a/asm/overlay_29_022FEDBC.s +++ b/asm/overlay_29_022FEDBC.s @@ -1608,7 +1608,7 @@ _02300068: add r2, sp, #0 mov r0, sl mov r1, r7 - bl ov29_0230F654 + bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #0 bl ov29_02344B44 diff --git a/asm/overlay_29_02300108.s b/asm/overlay_29_02300108.s index cfa8a8b5..6461d05d 100644 --- a/asm/overlay_29_02300108.s +++ b/asm/overlay_29_02300108.s @@ -2344,7 +2344,7 @@ ov29_02301A84: ; 0x02301A84 add r2, sp, #0 mov r0, r4 mov r1, r6 - bl ov29_0230F654 + bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #1 bl ov29_02344B44 @@ -3173,7 +3173,7 @@ IsProtectedFromNegativeStatus: ; 0x02302430 add r2, sp, #0 mov r0, r5 mov r1, #0x59 - bl ov29_0230F654 + bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #1 bl ov29_02344B44 diff --git a/asm/overlay_29_0230F02C.s b/asm/overlay_29_0230F02C.s index 6178fa7f..1ae9086c 100644 --- a/asm/overlay_29_0230F02C.s +++ b/asm/overlay_29_0230F02C.s @@ -483,8 +483,8 @@ _0230F64C: .word 0x00000C62 + TRY_NON_LEADER_ITEM_PICK_UP_OFFSET _0230F650: .word 0x00000C63 + TRY_NON_LEADER_ITEM_PICK_UP_OFFSET arm_func_end TryNonLeaderItemPickUp - arm_func_start ov29_0230F654 -ov29_0230F654: ; 0x0230F654 + arm_func_start GetExclusiveItemWithEffectFromBag +GetExclusiveItemWithEffectFromBag: ; 0x0230F654 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0xc mov r6, r0 @@ -515,7 +515,7 @@ ov29_0230F654: ; 0x0230F654 _0230F6C0: add sp, sp, #0xc ldmia sp!, {r3, r4, r5, r6, pc} - arm_func_end ov29_0230F654 + arm_func_end GetExclusiveItemWithEffectFromBag arm_func_start AuraBowIsActive AuraBowIsActive: ; 0x0230F6C8 diff --git a/asm/overlay_29_023118D8.s b/asm/overlay_29_023118D8.s index 4bcb320f..0cad02f5 100644 --- a/asm/overlay_29_023118D8.s +++ b/asm/overlay_29_023118D8.s @@ -3468,7 +3468,7 @@ _023145F4: add r2, sp, #4 mov r0, sb mov r1, #1 - bl ov29_0230F654 + bl GetExclusiveItemWithEffectFromBag add r1, sp, #4 mov r0, #1 bl ov29_02344B44 @@ -4062,7 +4062,7 @@ ExclusiveItemEffectIsActiveWithLogging: ; 0x02314D40 ldrb r1, [sp, #0x20] add r2, sp, #0 mov r0, r6 - bl ov29_0230F654 + bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #1 bl ov29_02344B44 @@ -4094,7 +4094,7 @@ ov29_02314DC4: ; 0x02314DC4 add r2, sp, #0 mov r0, r6 mov r1, r4 - bl ov29_0230F654 + bl GetExclusiveItemWithEffectFromBag add r1, sp, #0 mov r0, #1 bl ov29_02344B44 diff --git a/asm/overlay_29_0232E864.s b/asm/overlay_29_0232E864.s index 6c2ba9f7..b991b844 100644 --- a/asm/overlay_29_0232E864.s +++ b/asm/overlay_29_0232E864.s @@ -556,7 +556,7 @@ _0232EFDC: beq _0232F188 mov r0, sb mov r1, r4 - bl ov29_02332FC8 + bl CanHitWithRegularAttack cmp r0, #0 beq _0232F188 ldr r0, [sp, #0x40] @@ -565,7 +565,7 @@ _0232EFDC: mov r0, r4 mov r1, #0x21 add r2, sp, #0xac - bl ov29_0230F654 + bl GetExclusiveItemWithEffectFromBag cmp r0, #0 beq _0232F060 mov r0, #0 @@ -625,7 +625,7 @@ _0232F090: bne _0232F188 mov r0, sb mov r1, r4 - bl ov29_02332FC8 + bl CanHitWithRegularAttack cmp r0, #0 beq _0232F188 mov r0, r4 @@ -5125,8 +5125,8 @@ _02332FC0: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} arm_func_end ov29_02332F18 - arm_func_start ov29_02332FC8 -ov29_02332FC8: ; 0x02332FC8 + arm_func_start CanHitWithRegularAttack +CanHitWithRegularAttack: ; 0x02332FC8 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r1 @@ -5160,7 +5160,7 @@ _02333018: moveq r0, #0 and r0, r0, #0xff ldmia sp!, {r3, r4, r5, pc} - arm_func_end ov29_02332FC8 + arm_func_end CanHitWithRegularAttack arm_func_start ov29_02333044 ov29_02333044: ; 0x02333044