summaryrefslogtreecommitdiff
path: root/asm/trade.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-01 18:54:01 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-01 18:54:01 +0200
commit1fcafaf35aaf92251e7802e1e3ea36e8d5a6067b (patch)
treeafcfa3b51d96b15bcddfcfc9665bb95b46b2a972 /asm/trade.s
parent729f4e10ed8a53155d992b8904926a10181acafa (diff)
more of battle2 done
Diffstat (limited to 'asm/trade.s')
-rw-r--r--asm/trade.s14
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/trade.s b/asm/trade.s
index 42ed85948..d4c54cef6 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -8939,7 +8939,7 @@ _0807C04C:
adds r1, r0
lsls r1, 2
adds r1, r3
- ldr r2, =gUnknown_08300D38
+ ldr r2, =gMonFrontPicCoords
adds r0, r4, 0
adds r0, 0xF0
ldrh r0, [r0]
@@ -10395,7 +10395,7 @@ _0807CD1C:
adds r1, r0
lsls r1, 2
adds r1, r4
- ldr r3, =gUnknown_08300D38
+ ldr r3, =gMonFrontPicCoords
adds r2, 0xF2
ldrh r0, [r2]
lsls r0, 2
@@ -10663,7 +10663,7 @@ _0807CF5C:
movs r0, 0
bl GetBgTilemapBuffer
bl Free
- bl sub_805F094
+ bl FreeMonSpritesGfx
ldr r0, [r7]
bl Free
str r4, [r7]
@@ -11001,7 +11001,7 @@ _0807D428:
adds r1, r0
lsls r1, 2
adds r1, r3
- ldr r2, =gUnknown_08300D38
+ ldr r2, =gMonFrontPicCoords
adds r0, r4, 0
adds r0, 0xF0
ldrh r0, [r0]
@@ -12500,7 +12500,7 @@ _0807E168:
adds r1, r0
lsls r1, 2
adds r1, r4
- ldr r3, =gUnknown_08300D38
+ ldr r3, =gMonFrontPicCoords
adds r2, 0xF2
ldrh r0, [r2]
lsls r0, 2
@@ -12768,7 +12768,7 @@ _0807E3A8:
movs r0, 0
bl GetBgTilemapBuffer
bl Free
- bl sub_805F094
+ bl FreeMonSpritesGfx
ldr r0, [r7]
bl Free
str r4, [r7]
@@ -14136,7 +14136,7 @@ c2_080543C4: @ 807F068
movs r0, 0
bl GetBgTilemapBuffer
bl Free
- bl sub_805F094
+ bl FreeMonSpritesGfx
ldr r4, =gUnknown_020322A0
ldr r0, [r4]
bl Free