Merge pull request #28 from DizzyEggg/decomp_pokemon

decompile pokemon1/2/3
2017-09-16 14:14:50 -05:00
parent 1220a139db 117f8a6abd
commit 19d2d73c70
81 changed files with 4133 additions and 8926 deletions
@@ -578,7 +578,7 @@ sub_8159800: @ 8159800
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r6, 0
-	bl template_build_for_pokemon_or_trainer
+	bl sub_806A12C
 	ldr r0, =gUnknown_0202499C
 	ldr r2, =gUnknown_08305D2C
 	ldr r1, [r4]
@@ -923,7 +923,7 @@ sub_8159B14: @ 8159B14
 	adds r0, r1
 	ldr r1, =sub_8159660
 	str r1, [r0]
-	ldr r1, =gUnknown_020244B8
+	ldr r1, =gBankInMenu
 	ldrb r0, [r2]
 	strb r0, [r1]
 	add sp, 0x4