summaryrefslogtreecommitdiff
path: root/asm/pokemon_summary_screen.s
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-10-12 12:18:17 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-10-12 12:18:17 -0400
commit9377dc23e2dcb8a293d8c0d1193c4d708045e08d (patch)
tree45eca3d96fe89f574a4f187bd82c9aedf1f614e4 /asm/pokemon_summary_screen.s
parent714d387cbd8e3a9a9e5b522eed42c8132d41e0b0 (diff)
through sub_8111F8C
Diffstat (limited to 'asm/pokemon_summary_screen.s')
-rw-r--r--asm/pokemon_summary_screen.s16
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index ead0c8a01..b44f2f9f9 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -463,7 +463,7 @@ _08134890:
.align 2, 0
_081348A8: .4byte gUnknown_203B140
_081348AC:
- ldr r0, _081348C8 @ =gUnknown_2037AB8
+ ldr r0, _081348C8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -476,7 +476,7 @@ _081348AC:
adds r0, r2
b _08134AF6
.align 2, 0
-_081348C8: .4byte gUnknown_2037AB8
+_081348C8: .4byte gPaletteFade
_081348CC: .4byte gUnknown_203B140
_081348D0: .4byte 0x00003270
_081348D4:
@@ -803,7 +803,7 @@ _08134B60:
_08134B80: .4byte gUnknown_203B140
_08134B84: .4byte 0x00003270
_08134B88:
- ldr r0, _08134BA8 @ =gUnknown_2037AB8
+ ldr r0, _08134BA8 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -819,7 +819,7 @@ _08134B9A:
pop {r0}
bx r0
.align 2, 0
-_08134BA8: .4byte gUnknown_2037AB8
+_08134BA8: .4byte gPaletteFade
thumb_func_end sub_8134840
thumb_func_start sub_8134BAC
@@ -9566,7 +9566,7 @@ _08139420:
_0813943C: .4byte gUnknown_203B140
_08139440: .4byte 0x00003288
_08139444:
- ldr r0, _08139460 @ =gUnknown_2037AB8
+ ldr r0, _08139460 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -9581,7 +9581,7 @@ _08139452:
adds r1, r0
b _08139728
.align 2, 0
-_08139460: .4byte gUnknown_2037AB8
+_08139460: .4byte gPaletteFade
_08139464: .4byte gUnknown_203B140
_08139468: .4byte 0x00003288
_0813946C:
@@ -9926,7 +9926,7 @@ _08139738:
.align 2, 0
_08139744: .4byte gUnknown_203B16D
_08139748:
- ldr r0, _08139764 @ =gUnknown_2037AB8
+ ldr r0, _08139764 @ =gPaletteFade
ldrb r1, [r0, 0x7]
movs r0, 0x80
ands r0, r1
@@ -9940,7 +9940,7 @@ _0813975A:
pop {r0}
bx r0
.align 2, 0
-_08139764: .4byte gUnknown_2037AB8
+_08139764: .4byte gPaletteFade
thumb_func_end sub_81393D4
thumb_func_start sub_8139768