Merge branch 'master' into decompile_battle_message

2017-10-09 13:58:24 +02:00
parent 95e4ae06ce 96c5966ff3
commit 7fb4a54e39
15 changed files with 410 additions and 638 deletions
@@ -4705,7 +4705,7 @@ _08137CAC:
 	thumb_func_start sub_8137CB4
 sub_8137CB4: @ 8137CB4
 	push {lr}
-	ldr r0, =sub_8177888
+	ldr r0, =CB2_ShowDiploma
 	bl SetMainCallback2
 	bl ScriptContext2_Enable
 	pop {r0}