Merge branch 'master' into final_battle_files_touches

This commit is contained in:
DizzyEggg
2018-07-07 14:11:04 +02:00
34 changed files with 786 additions and 1634 deletions
+1 -1
View File
@@ -2070,7 +2070,7 @@ sub_81C4F44: @ 81C4F44
cmp r0, 0
bne _081C4F6E
bl overworld_free_bg_tilemaps
ldr r0, =gUnknown_03005DB0
ldr r0, =gFieldCallback2
ldr r1, =hm_add_c3_without_phase_2
str r1, [r0]
ldr r1, =CB2_ReturnToField