Merge branch 'master' into continue_union_room

This commit is contained in:
PikalaxALT
2019-03-30 12:41:10 -04:00
26 changed files with 3595 additions and 8781 deletions
-2
View File
@@ -5,8 +5,6 @@
.text
@ file boundary?
thumb_func_start sub_8018424
sub_8018424: @ 8018424
push {lr}