pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Clean up Predef function names

Browse Source
This commit is contained in:
xCrystal
2018-01-02 15:05:14 +01:00
parent 9a3088e50c
commit 7a24703398
17 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/battle/battle_transition.asm
View File

@@ -1,4 +1,4 @@
Predef_StartBattle: ; 8c20f
DoBattleTransition: ; 8c20f
call .InitGFX
ld a, [rBGP]
ld [wBGP], a
@@ -16,7 +16,7 @@ Predef_StartBattle: ; 8c20f
ld a, [wJumptableIndex]
bit 7, a
jr nz, .done
call FlashyTransitionToBattle
call BattleTransitionJumptable
call DelayFrame
jr .loop
@@ -144,7 +144,7 @@ TrainerBattlePokeballTiles: ; 8c2f4
INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
FlashyTransitionToBattle: ; 8c314
BattleTransitionJumptable: ; 8c314
jumptable .dw, wJumptableIndex
; 8c323

2
engine/battle/start_battle.asm
View File

@@ -33,7 +33,7 @@ FindFirstAliveMonAndStartBattle: ; 2ee2f
add hl, de
ld a, [hl]
ld [BattleMonLevel], a
predef Predef_StartBattle
predef DoBattleTransition
farcall _LoadBattleFontsHPBar
ld a, 1
ld [hBGMapMode], a