Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix GetItemHoldEffect -> GetItemVar #179

Merged
merged 9 commits into from
Jun 30, 2023
Merged

Fix GetItemHoldEffect -> GetItemVar #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
715e64f
Document embargo flag
adrienntindall Jun 30, 2023
8e9e28e
Functions related to items
adrienntindall Jun 30, 2023
612dd7b
GetItemHoldEffect -> GetItemVar
adrienntindall Jun 30, 2023
aa29dd3
Merge branch 'master' into master
adrienntindall Jun 30, 2023
315764b
tempData, battleScriptBuffer
adrienntindall Jun 30, 2023
632111e
Merge branch 'master' of https://github.com/adrienntindall/pokeheartgold
adrienntindall Jun 30, 2023
e7318de
battlerIdTemp, itemTemp
adrienntindall Jun 30, 2023
6ecfad9
moveTemp, abilityTemp, msgTemp, calcTemp, hpCalc
adrienntindall Jun 30, 2023
9f62f19
Merge branch 'master' into master
adrienntindall Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asm/include/overlay_10.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
.public GetNaturalGiftType
.public ov12_022558F8
.public CalcMoveDamage
.public GetItemHoldEffect
.public GetItemVar
.public ov12_02258800
.public ov12_02258BB4
8 changes: 4 additions & 4 deletions asm/include/overlay_12_0224E4FC.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@
.public TrySyncronizeStatus
.public TryUseHeldItem
.public CheckItemGradualHPRestore
.public ov12_02254E7C
.public ov12_0225551C
.public CheckUseHeldItem
.public TryHeldItemNegativeEffect
.public GetBattlerHeldItem
.public ov12_0225561C
.public CheckItemEffectOnHit
.public GetBattlerHeldItemEffect
.public BattleSystem_GetHeldItemDamageBoost
.public GetHeldItemModifier
.public GetNaturalGiftPower
.public GetNaturalGiftType
.public ov12_022558F8
Expand All @@ -164,7 +164,7 @@
.public CheckLegalMetronomeMove
.public IsMoveEncored
.public CheckLegalMeFirstMove
.public GetItemHoldEffect
.public GetItemVar
.public ov12_02257E98
.public ov12_02257EC0
.public CheckStatusEffectsSubstitute
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_command.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@
.public BtlCmd_TrickRoom
.public BtlCmd_CheckMoveFinished
.public BtlCmd_CheckItemEffect
.public BtlCmd_GetItemEffect
.public BtlCmd_GetItemHoldEffect
.public BtlCmd_GetItemModifier
.public BtlCmd_TryCamouflage
.public BtlCmd_NaturePower
.public BtlCmd_SecretPower
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_controller_opponent.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
.public ov12_02253DA0
.public GetBattlerHeldItemEffect
.public CalcMoveDamage
.public GetItemHoldEffect
.public GetItemVar
.public ov12_022581BC
.public ov12_022581D4
.public ov12_022582B8
Expand Down
6 changes: 3 additions & 3 deletions asm/include/overlay_12_battle_controller_player.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@
.public TrySyncronizeStatus
.public TryUseHeldItem
.public CheckItemGradualHPRestore
.public ov12_02254E7C
.public ov12_0225551C
.public CheckUseHeldItem
.public TryHeldItemNegativeEffect
.public ov12_0225561C
.public CheckItemEffectOnHit
.public GetBattlerHeldItemEffect
.public BattleSystem_GetHeldItemDamageBoost
.public GetHeldItemModifier
.public ov12_02255920
.public ov12_022565E0
.public ov12_02256694
Expand Down
42 changes: 21 additions & 21 deletions asm/overlay_10.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4195,7 +4195,7 @@ ov10_0221DE24: ; 0x0221DE24
ldrh r1, [r2, r1]
add r0, r4, #0
mov r2, #1
bl GetItemHoldEffect
bl GetItemVar
mov r1, #0xd7
lsl r1, r1, #2
str r0, [r4, r1]
Expand All @@ -4208,7 +4208,7 @@ _0221DE64:
add r0, r4, #0
ldrh r1, [r2, r1]
mov r2, #1
bl GetItemHoldEffect
bl GetItemVar
mov r1, #0xd7
lsl r1, r1, #2
str r0, [r4, r1]
Expand Down Expand Up @@ -6696,13 +6696,13 @@ _0221F132:
ldr r1, [sp, #0x1c]
add r0, r6, #0
mov r2, #0xb
bl GetItemHoldEffect
bl GetItemVar
add r4, r0, #0
beq _0221F166
ldr r1, [sp, #0x1c]
add r0, r6, #0
mov r2, #0xc
bl GetItemHoldEffect
bl GetItemVar
add r7, r0, #0
b _0221F3B4
_0221F15A:
Expand All @@ -6718,7 +6718,7 @@ _0221F168:
ldr r1, [sp, #0x1c]
add r0, r6, #0
mov r2, #1
bl GetItemHoldEffect
bl GetItemVar
sub r0, #0x7e
cmp r0, #0xf
bhi _0221F1E4
Expand Down Expand Up @@ -8771,7 +8771,7 @@ _02220104:
add r0, r5, #0
lsr r1, r1, #0x10
mov r2, #1
bl GetItemHoldEffect
bl GetItemVar
str r0, [sp, #0x44]
add r0, r6, #0
mov r1, #0xb1
Expand Down Expand Up @@ -9595,13 +9595,13 @@ _022207BC:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x26
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _022207FE
add r0, r4, #0
add r1, r6, #0
mov r2, #0x36
bl GetItemHoldEffect
bl GetItemVar
lsl r0, r0, #0x18
lsr r2, r0, #0x18
beq _02220816
Expand All @@ -9628,7 +9628,7 @@ _022207FE:
add r0, r4, #0
add r1, r6, #0
mov r2, #0xf
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _02220834
ldr r0, _022209DC ; =0x00002DAC
Expand Down Expand Up @@ -9656,7 +9656,7 @@ _02220834:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x10
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _0222086E
ldr r0, _022209DC ; =0x00002DAC
Expand Down Expand Up @@ -9685,7 +9685,7 @@ _0222086E:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x11
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _022208A2
ldr r0, _022209DC ; =0x00002DAC
Expand All @@ -9710,7 +9710,7 @@ _022208A2:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x12
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _022208D6
ldr r0, _022209DC ; =0x00002DAC
Expand All @@ -9735,7 +9735,7 @@ _022208D6:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x13
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _0222090A
ldr r0, _022209DC ; =0x00002DAC
Expand All @@ -9760,7 +9760,7 @@ _0222090A:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x14
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _02220940
ldr r0, _022209E0 ; =0x00002DB0
Expand Down Expand Up @@ -9797,7 +9797,7 @@ _02220950:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x1b
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _02220970
ldr r0, _022209C4 ; =0x000003D3
Expand All @@ -9813,7 +9813,7 @@ _02220970:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x1c
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _02220990
ldr r0, _022209C4 ; =0x000003D3
Expand All @@ -9829,7 +9829,7 @@ _02220990:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x1d
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _022209B0
ldr r0, _022209C4 ; =0x000003D3
Expand All @@ -9845,7 +9845,7 @@ _022209B0:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x1e
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _022209F8
ldr r0, _022209C4 ; =0x000003D3
Expand Down Expand Up @@ -9873,7 +9873,7 @@ _022209F8:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x1f
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _02220A16
ldr r0, _02220AA0 ; =0x000003D3
Expand All @@ -9888,7 +9888,7 @@ _02220A16:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x20
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _02220A36
ldr r0, _02220AA0 ; =0x000003D3
Expand All @@ -9904,7 +9904,7 @@ _02220A36:
add r0, r4, #0
add r1, r6, #0
mov r2, #0x16
bl GetItemHoldEffect
bl GetItemVar
cmp r0, #0
beq _02220A62
mov r0, #7
Expand Down
Loading