thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename predef functions so they aren't excessive in length.

Browse source 
This is mostly because of an rgbasm bug that prevents macro arguments
from exceeding 16 characters, but the names were bad anyway.
This commit is contained in:
yenatch 2014-06-16 13:03:05 -07:00
parent 38ac74f222
commit 35f2bb90d4
29 changed files with 81 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engine/battle/1c.asm
View file

@ -430,6 +430,7 @@ BattleTransition_OutwardSpiral_: ; 70af9 (1c:4af9)
ld [wd09f], a
jr .done2_
FlashScreen:
BattleTransition_FlashScreen_: ; 70b5d (1c:4b5d)
ld hl, BattleTransition_FlashScreenPalettes
.loop

12
engine/battle/core.asm
View file

@ -241,7 +241,7 @@ Func_3c11e: ; 3c11e (f:411e)
call DelayFrames
call SaveScreenTilesToBuffer1
.asm_3c14f
call AnyPlayerPokemonAliveCheck
call AnyPartyAlive
ld a, d
and a
jp z, HandlePlayerBlackOut
@ -774,7 +774,7 @@ HandleEnemyMonFainted: ; 3c525 (f:4525)
xor a
ld [wccf0], a
call FaintEnemyPokemon
call AnyPlayerPokemonAliveCheck
call AnyPartyAlive
ld a, d
and a
jp z, HandlePlayerBlackOut
@ -870,7 +870,7 @@ FaintEnemyPokemon ; 0x3c567
jr nz, .playermonnotfaint
call Func_3c741
.playermonnotfaint
call AnyPlayerPokemonAliveCheck
call AnyPartyAlive
ld a, d
and a
ret z
@ -1021,7 +1021,7 @@ HandlePlayerMonFainted: ; 3c700 (f:4700)
ld a, $1
ld [wccf0], a
call Func_3c741
call AnyPlayerPokemonAliveCheck ; test if any more mons are alive
call AnyPartyAlive ; test if any more mons are alive
ld a, d
and a
jp z, HandlePlayerBlackOut
@ -1492,7 +1492,7 @@ TrainerSentOutText: ; 3ca7e (f:4a7e)
; tests if the player has any pokemon that are not fainted
; sets d = 0 if all fainted, d != 0 if some mons are still alive
AnyPlayerPokemonAliveCheck: ; 3ca83 (f:4a83)
AnyPartyAlive: ; 3ca83 (f:4a83)
ld a, [wPartyCount] ; wPartyCount
ld e, a
xor a
@ -6930,7 +6930,7 @@ asm_3f0d0: ; 3f0d0 (f:70d0)
jr nz, .asm_3f0f4
ret
LoadMonBackSprite:
LoadMonBackPic:
; Assumes the monster's attributes have
; been loaded with GetMonHeader.
ld a, [wBattleMonSpecies2]

4
engine/battle/e.asm
View file

@ -758,7 +758,7 @@ ReadTrainer: ; 39c53 (e:5c53)
ld a,1
ld [wcc49],a
push hl
call AddPokemonToParty
call AddPartyMon
pop hl
jr .LoopTrainerData
.SpecialTrainer
@ -775,7 +775,7 @@ ReadTrainer: ; 39c53 (e:5c53)
ld a,1
ld [wcc49],a
push hl
call AddPokemonToParty
call AddPartyMon
pop hl
jr .SpecialTrainer
.AddLoneMove