merge branch master

2017-10-10 11:48:16 +02:00
parent ab03b03c4b 8914645231
commit e382a73e9d
94 changed files with 18136 additions and 6683 deletions
@@ -419,11 +419,11 @@ _080A5FE8:
 	lsls r0, 1
 	cmp r4, r0
 	bls _080A5FF8
-	ldr r0, =gUnknown_08305DCC
+	ldr r0, =gEnemyMonElevation
 	b _080A5FFC
 	.pool
 _080A5FF8:
-	ldr r0, =gUnknown_08305DCC
+	ldr r0, =gEnemyMonElevation
 	adds r0, r7, r0
 _080A5FFC:
 	ldrb r5, [r0]