dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-25 09:22:50 +08:00
parent 6ca932e5e9 7579fc65c1
commit 2f87855072
136 changed files with 3963 additions and 6605 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/post_battle_event_funcs.s
+3 -3
View File
@@ -106,8 +106,8 @@ _080CA3BC: .4byte 0x0000083b
_080CA3C0: .4byte CB2_DoHallOfFameScreen
thumb_func_end Special_HallOfFame
thumb_func_start sub_80CA3C4
sub_80CA3C4: @ 80CA3C4
thumb_func_start sp0C8_whiteout_maybe
sp0C8_whiteout_maybe: @ 80CA3C4
push {lr}
ldr r0, _080CA3D4 @ =CB2_WhiteOut
bl SetMainCallback2
@@ -116,6 +116,6 @@ sub_80CA3C4: @ 80CA3C4
bx r1
.align 2, 0
_080CA3D4: .4byte CB2_WhiteOut
thumb_func_end sub_80CA3C4
thumb_func_end sp0C8_whiteout_maybe
.align 2, 0 @ Don't pad with nop.