dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle_refactor

Browse Source
This commit is contained in:
camthesaxman
2018-02-05 17:38:23 -06:00
parent 663ecd0014 eb6aed50e5
commit 607cba8c2e
139 changed files with 14426 additions and 26247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/contest.s
+2 -2
View File
@@ -563,7 +563,7 @@ _080D7B4E:
bl sub_80D779C
bl sub_80D77E4
bl sub_80D7678
bl dp12_8087EA4
bl ScanlineEffect_Clear
bl ResetPaletteFade
ldr r2, =gPaletteFade
ldrb r0, [r2, 0x8]
@@ -1367,7 +1367,7 @@ vblank_cb_battle: @ 80D827C
bl TransferPlttBuffer
bl LoadOam
bl ProcessSpriteCopyRequests
bl sub_80BA0A8
bl ScanlineEffect_InitHBlankDmaTransfer
pop {r0}
bx r0
.pool