summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_7.s6
-rwxr-xr-xasm/battle_tower.s14
-rwxr-xr-xasm/pokenav.s4
3 files changed, 12 insertions, 12 deletions
diff --git a/asm/battle_7.s b/asm/battle_7.s
index 87c7b2713..94cc1ba8e 100644
--- a/asm/battle_7.s
+++ b/asm/battle_7.s
@@ -2229,8 +2229,8 @@ _0805E3EA:
.pool
thumb_func_end sub_805E394
- thumb_func_start SetBattleSpriteInvisibilityBitToSpriteInvisibility
-SetBattleSpriteInvisibilityBitToSpriteInvisibility: @ 805E408
+ thumb_func_start CopyBattleSpriteInvisibility
+CopyBattleSpriteInvisibility: @ 805E408
lsls r0, 24
lsrs r0, 24
ldr r1, =gBattleSpritesDataPtr
@@ -2258,7 +2258,7 @@ SetBattleSpriteInvisibilityBitToSpriteInvisibility: @ 805E408
strb r0, [r3]
bx lr
.pool
- thumb_func_end SetBattleSpriteInvisibilityBitToSpriteInvisibility
+ thumb_func_end CopyBattleSpriteInvisibility
thumb_func_start sub_805E448
sub_805E448: @ 805E448
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 0415ffe5c..122d9d27c 100755
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -1340,7 +1340,7 @@ GetFrontierTrainerFrontSpriteId: @ 8162AA0
lsls r0, 1
cmp r4, r0
bne _08162AD0
- ldr r1, =gTrainerClassToFrontPicId
+ ldr r1, =gUnknown_0831F578
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000bed
@@ -1362,7 +1362,7 @@ _08162AE4:
ldr r0, =0x0000012b
cmp r4, r0
bhi _08162B08
- ldr r2, =gTrainerClassToFrontPicId
+ ldr r2, =gUnknown_0831F578
ldr r0, =gUnknown_0203BC88
ldr r1, [r0]
movs r0, 0x34
@@ -1383,7 +1383,7 @@ _08162B08:
ands r0, r1
cmp r0, 0
beq _08162B38
- ldr r4, =gTrainerClassToFrontPicId
+ ldr r4, =gUnknown_0831F578
bl sub_818649C
lsls r0, 24
lsrs r0, 24
@@ -1391,7 +1391,7 @@ _08162B08:
b _08162BC8
.pool
_08162B38:
- ldr r3, =gTrainerClassToFrontPicId
+ ldr r3, =gUnknown_0831F578
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r1, =0xfffffed4
@@ -1413,7 +1413,7 @@ _08162B64:
ands r0, r1
cmp r0, 0
bne _08162BB0
- ldr r4, =gTrainerClassToFrontPicId
+ ldr r4, =gUnknown_0831F578
ldr r3, =gUnknown_08610970
ldr r0, =gSaveBlock2Ptr
ldr r1, [r0]
@@ -1436,7 +1436,7 @@ _08162B64:
b _08162BC8
.pool
_08162BB0:
- ldr r5, =gTrainerClassToFrontPicId
+ ldr r5, =gUnknown_0831F578
ldr r4, =gUnknown_08610970
bl sub_81864A8
lsls r0, 24
@@ -5845,7 +5845,7 @@ _08165206:
thumb_func_start GetEreaderTrainerFrontSpriteId
GetEreaderTrainerFrontSpriteId: @ 8165244
- ldr r1, =gTrainerClassToFrontPicId
+ ldr r1, =gUnknown_0831F578
ldr r0, =gSaveBlock2Ptr
ldr r0, [r0]
ldr r2, =0x00000bed
diff --git a/asm/pokenav.s b/asm/pokenav.s
index d115f2a67..0c7a80742 100755
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -7890,7 +7890,7 @@ _081CAF34:
adds r0, r5, 0
bl sub_81D1BD0
adds r4, r0, 0
- ldr r0, =gTrainerClassToFrontPicId
+ ldr r0, =gUnknown_0831F578
adds r0, r4, r0
ldrb r0, [r0]
b _081CAF6C
@@ -28947,7 +28947,7 @@ sub_81D5588: @ 81D5588
adds r3, r0
ldrb r4, [r3, 0x1B]
bl sub_81D5710
- ldr r0, =gTrainerClassToFrontPicId
+ ldr r0, =gUnknown_0831F578
adds r4, r0
ldrb r0, [r4]
pop {r4}