summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-20 21:24:16 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-20 21:24:16 -0400
commit9aa5709329f4cbd497d0f21af10218f8a7547151 (patch)
treecfab322854a597cbbe794ed6260303d29d167f87 /asm
parent6b503e306d73c749794cf7b61126287e3941f12f (diff)
use TRUE and FALSE for flag conditionals; more story flags
Diffstat (limited to 'asm')
-rw-r--r--asm/field_specials.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s
index a4df8b6ea..3bcc47ce6 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -1081,8 +1081,8 @@ sub_80CADC4: @ 80CADC4
bx r0
thumb_func_end sub_80CADC4
- thumb_func_start sub_80CADEC
-sub_80CADEC: @ 80CADEC
+ thumb_func_start Special_SetVermilionTrashCans
+Special_SetVermilionTrashCans: @ 80CADEC
push {r4,r5,lr}
bl Random
lsls r0, 16
@@ -1377,7 +1377,7 @@ _080CB04C:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80CADEC
+ thumb_func_end Special_SetVermilionTrashCans
thumb_func_start sub_80CB054
sub_80CB054: @ 80CB054