Merge branch 'master' into fix-eventobj

2020-01-19 20:21:53 -05:00
parent ea8b1011d3 a40f054900
commit 4c12ad00d2
30 changed files with 3398 additions and 7590 deletions
@@ -1,17 +0,0 @@
-	.section .rodata
-
-gUnknown_089A3220:: @ 89A3220
-	.byte 2, 14, 0, 10, 9, 5, 7, 2
-	.byte 0, 15, 1, 3, 3, 0, 31, 0
-	.byte 3, 22, 18, 14, 13, 9, 11, 3
-	.byte 15, 15, 1, 3, 3, 0, 0x7f, 0
-
-	.asciz "RFU_V1026"
-
-	.align 2
-gUnknown_089A324C:: @ 89A324C
-	.asciz "RFU-MBOOT"
-
-	.align 2
-gUnknown_089A3258:: @ 89A3258
-	.asciz "NINTENDOSio32ID_030820"
@@ -28,7 +28,7 @@ gSpecials:: @ 81DBA64
 	def_special GetSecretBaseOwnerAndState
 	def_special InitSecretBaseDecorationSprites
 	def_special SetDecoration
-	def_special GetEventObjectLocalIdByFlag
+	def_special GetObjectEventLocalIdByFlag
 	def_special GetSecretBaseTypeInFrontOfPlayer
 	def_special SetSecretBaseOwnerGfxId
 	def_special sub_8129708