diff options
Diffstat (limited to 'asm/battle_anim_812C144.s')
| -rw-r--r-- | asm/battle_anim_812C144.s | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index 2ff8bc1ca..cdf70f483 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -3163,7 +3163,7 @@ _0812D906: lsls r0, 24 cmp r0, 0 beq _0812DA20 - ldr r5, _0812D9E0 @ =0x02019348 + ldr r5, _0812D9E0 @ =gSharedMem + 0x19348 ldrh r0, [r5] bl sub_80AEB1C adds r4, r0, 0 @@ -3221,7 +3221,7 @@ _0812D98E: cmp r5, 0x7 ble _0812D986 _0812D9A2: - ldr r0, _0812D9E0 @ =0x02019348 + ldr r0, _0812D9E0 @ =gSharedMem + 0x19348 ldrh r0, [r0, 0x2] bl sub_80AEB1C lsls r0, 24 @@ -3247,7 +3247,7 @@ _0812D9D0: .4byte gBattleMonForms _0812D9D4: .4byte gBattleAnimBankAttacker _0812D9D8: .4byte 0x040000d4 _0812D9DC: .4byte 0x84000200 -_0812D9E0: .4byte 0x02019348 +_0812D9E0: .4byte gSharedMem + 0x19348 _0812D9E4: .4byte gSprites _0812D9E8: .4byte gObjectBankIDs _0812D9EC: .4byte gSpriteAffineAnimTable_81E7C18 @@ -3373,7 +3373,7 @@ _0812DAAE: bne _0812DAF4 ldrb r0, [r4] lsls r1, r0, 2 - ldr r2, _0812DB14 @ =0x02017800 + ldr r2, _0812DB14 @ =gSharedMem + 0x17800 adds r1, r2 ldrh r1, [r1, 0x2] bl sub_8032984 @@ -3392,7 +3392,7 @@ _0812DAFA: _0812DB08: .4byte REG_BG2CNT _0812DB0C: .4byte gBattleAnimBankAttacker _0812DB10: .4byte gTasks -_0812DB14: .4byte 0x02017800 +_0812DB14: .4byte gSharedMem + 0x17800 thumb_func_end sub_812D7E8 thumb_func_start c3_80DFBE4 @@ -6053,7 +6053,7 @@ sub_812EFC8: @ 812EFC8 beq _0812F004 movs r0, 0x1 str r0, [sp, 0x14] - ldr r0, _0812F000 @ =0x02019348 + ldr r0, _0812F000 @ =gSharedMem + 0x19348 ldr r1, [r0, 0x10] mov r9, r1 ldr r2, [r0, 0xC] @@ -6062,7 +6062,7 @@ sub_812EFC8: @ 812EFC8 movs r3, 0x14 b _0812F13C .align 2, 0 -_0812F000: .4byte 0x02019348 +_0812F000: .4byte gSharedMem + 0x19348 _0812F004: ldr r0, _0812F070 @ =gBattleAnimBankAttacker ldrb r0, [r0] @@ -6096,7 +6096,7 @@ _0812F004: mov r8, r0 ldrb r2, [r4] lsls r1, r2, 2 - ldr r0, _0812F080 @ =0x02017800 + ldr r0, _0812F080 @ =gSharedMem + 0x17800 adds r1, r0 ldrh r0, [r1, 0x2] cmp r0, 0 @@ -6118,7 +6118,7 @@ _0812F070: .4byte gBattleAnimBankAttacker _0812F074: .4byte gBattlePartyID _0812F078: .4byte gBattleAnimBankTarget _0812F07C: .4byte gPlayerParty -_0812F080: .4byte 0x02017800 +_0812F080: .4byte gSharedMem + 0x17800 _0812F084: ldrb r0, [r4] lsls r0, 1 @@ -6168,7 +6168,7 @@ _0812F0AC: mov r8, r0 ldrb r2, [r4] lsls r1, r2, 2 - ldr r0, _0812F118 @ =0x02017800 + ldr r0, _0812F118 @ =gSharedMem + 0x17800 adds r1, r0 ldrh r0, [r1, 0x2] cmp r0, 0 @@ -6190,7 +6190,7 @@ _0812F0AC: _0812F10C: .4byte gBattlePartyID _0812F110: .4byte gBattleAnimBankTarget _0812F114: .4byte gEnemyParty -_0812F118: .4byte 0x02017800 +_0812F118: .4byte gSharedMem + 0x17800 _0812F11C: .4byte gPlayerParty _0812F120: ldrb r0, [r4] @@ -11564,7 +11564,7 @@ _08131A44: lsls r0, 24 cmp r0, 0 beq _08131A74 - ldr r0, _08131A6C @ =0x02019348 + ldr r0, _08131A6C @ =gSharedMem + 0x19348 ldr r2, [r0, 0x8] mov r10, r2 ldr r3, [r0, 0xC] @@ -11578,7 +11578,7 @@ _08131A44: movs r7, 0 b _08131B92 .align 2, 0 -_08131A6C: .4byte 0x02019348 +_08131A6C: .4byte gSharedMem + 0x19348 _08131A70: .4byte gBattleAnimBankAttacker _08131A74: ldr r4, _08131AD4 @ =gBattleAnimBankAttacker @@ -11610,7 +11610,7 @@ _08131A74: mov r9, r0 ldrb r2, [r4] lsls r1, r2, 2 - ldr r0, _08131AE0 @ =0x02017800 + ldr r0, _08131AE0 @ =gSharedMem + 0x17800 adds r1, r0 ldrh r0, [r1, 0x2] cmp r0, 0 @@ -11629,7 +11629,7 @@ _08131A74: _08131AD4: .4byte gBattleAnimBankAttacker _08131AD8: .4byte gBattlePartyID _08131ADC: .4byte gPlayerParty -_08131AE0: .4byte 0x02017800 +_08131AE0: .4byte gSharedMem + 0x17800 _08131AE4: ldrh r5, [r1, 0x2] _08131AE6: @@ -11677,7 +11677,7 @@ _08131B10: mov r9, r0 ldrb r2, [r4] lsls r1, r2, 2 - ldr r0, _08131B6C @ =0x02017800 + ldr r0, _08131B6C @ =gSharedMem + 0x17800 adds r1, r0 ldrh r0, [r1, 0x2] cmp r0, 0 @@ -11695,7 +11695,7 @@ _08131B10: .align 2, 0 _08131B64: .4byte gBattlePartyID _08131B68: .4byte gEnemyParty -_08131B6C: .4byte 0x02017800 +_08131B6C: .4byte gSharedMem + 0x17800 _08131B70: ldrh r5, [r1, 0x2] _08131B72: @@ -11740,7 +11740,7 @@ _08131B94: ldr r0, _08131C10 @ =gBattleAnimBankAttacker ldrb r0, [r0] lsls r0, 2 - ldr r1, _08131C14 @ =0x02017800 + ldr r1, _08131C14 @ =gSharedMem + 0x17800 adds r0, r1 ldrh r0, [r0, 0x2] cmp r0, 0 @@ -11775,7 +11775,7 @@ _08131C04: .4byte gSprites _08131C08: .4byte 0x0000ffe0 _08131C0C: .4byte gBattleAnimBankTarget _08131C10: .4byte gBattleAnimBankAttacker -_08131C14: .4byte 0x02017800 +_08131C14: .4byte gSharedMem + 0x17800 _08131C18: .4byte 0x00007fff _08131C1C: .4byte gTasks _08131C20: |