pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -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
Show Stats 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 call .InitGFX
ld a, [rBGP] ld a, [rBGP]
ld [wBGP], a ld [wBGP], a
@ -16,7 +16,7 @@ Predef_StartBattle: ; 8c20f
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
bit 7, a bit 7, a
jr nz, .done jr nz, .done
call FlashyTransitionToBattle call BattleTransitionJumptable
call DelayFrame call DelayFrame
jr .loop jr .loop
@ -144,7 +144,7 @@ TrainerBattlePokeballTiles: ; 8c2f4
INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp" INCBIN "gfx/overworld/trainer_battle_pokeball_tiles.2bpp"
FlashyTransitionToBattle: ; 8c314 BattleTransitionJumptable: ; 8c314
jumptable .dw, wJumptableIndex jumptable .dw, wJumptableIndex
; 8c323 ; 8c323

2
engine/battle/start_battle.asm
View File

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

2
engine/cgb_layouts.asm
View File

@ -6,7 +6,7 @@ CheckCGB: ; 8d55
ret ret
; 8d59 ; 8d59
Predef_LoadSGBLayoutCGB: ; 8d59 LoadSGBLayoutCGB: ; 8d59
ld a, b ld a, b
cp SCGB_RAM cp SCGB_RAM
jr nz, .not_ram jr nz, .not_ram

6
engine/events/bug_contest/display_stats.asm
View File

@ -101,7 +101,7 @@ DisplayAlreadyCaughtText: ; cc0c7
text_jump UnknownText_0x1c10dd text_jump UnknownText_0x1c10dd
db "@" db "@"
Predef2F: DummyPredef2F:
Predef38: DummyPredef38:
Predef39: ; cc0d5 DummyPredef39: ; cc0d5
ret ret

2
engine/events/mom_phone.asm
View File

@ -257,7 +257,7 @@ _MomText_ItsInRoom: ; 0xfd1ca
db 0 ; unused db 0 ; unused
Predef3A: ; fd1d0 DummyPredef3A: ; fd1d0
ret ret
; fd1d1 ; fd1d1

3
engine/events/special.asm
View File

@ -230,6 +230,5 @@ CopyPokemonName_Buffer1_Buffer3: ; 746e
ld bc, PKMN_NAME_LENGTH ld bc, PKMN_NAME_LENGTH
jp CopyBytes jp CopyBytes
Predef1: ; 747a DummyPredef1: ; 747a
; not used
ret ret

24
engine/link.asm
View File

@ -1362,7 +1362,7 @@ Function28926: ; 28926
hlcoord 0, 15 hlcoord 0, 15
ld b, 1 ld b, 1
ld c, 18 ld c, 18
call Predef_LinkTextbox call LinkTextboxPredef
hlcoord 2, 16 hlcoord 2, 16
ld de, .String_Stats_Trade ld de, .String_Stats_Trade
call PlaceString call PlaceString
@ -1471,7 +1471,7 @@ Function28926: ; 28926
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Predef_LinkTextbox call LinkTextboxPredef
farcall Link_WaitBGMap farcall Link_WaitBGMap
ld hl, .Text_CantTradeLastMon ld hl, .Text_CantTradeLastMon
bccoord 1, 14 bccoord 1, 14
@ -1493,7 +1493,7 @@ Function28926: ; 28926
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Predef_LinkTextbox call LinkTextboxPredef
farcall Link_WaitBGMap farcall Link_WaitBGMap
ld hl, .Text_Abnormal ld hl, .Text_Abnormal
bccoord 1, 14 bccoord 1, 14
@ -1503,7 +1503,7 @@ Function28926: ; 28926
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Predef_LinkTextbox call LinkTextboxPredef
hlcoord 1, 14 hlcoord 1, 14
ld de, String_TooBadTheTradeWasCanceled ld de, String_TooBadTheTradeWasCanceled
call PlaceString call PlaceString
@ -1649,7 +1649,7 @@ LinkTrade: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, $4 ld b, $4
ld c, $12 ld c, $12
call Predef_LinkTextbox call LinkTextboxPredef
farcall Link_WaitBGMap farcall Link_WaitBGMap
ld a, [wd002] ld a, [wd002]
ld hl, PartySpecies ld hl, PartySpecies
@ -1678,7 +1678,7 @@ LinkTrade: ; 28b87
hlcoord 10, 7 hlcoord 10, 7
ld b, 3 ld b, 3
ld c, 7 ld c, 7
call Predef_LinkTextbox call LinkTextboxPredef
ld de, String28eab ld de, String28eab
hlcoord 12, 8 hlcoord 12, 8
call PlaceString call PlaceString
@ -1718,7 +1718,7 @@ LinkTrade: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Predef_LinkTextbox call LinkTextboxPredef
hlcoord 1, 14 hlcoord 1, 14
ld de, String_TooBadTheTradeWasCanceled ld de, String_TooBadTheTradeWasCanceled
call PlaceString call PlaceString
@ -1735,7 +1735,7 @@ LinkTrade: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Predef_LinkTextbox call LinkTextboxPredef
hlcoord 1, 14 hlcoord 1, 14
ld de, String_TooBadTheTradeWasCanceled ld de, String_TooBadTheTradeWasCanceled
call PlaceString call PlaceString
@ -1965,7 +1965,7 @@ LinkTrade: ; 28b87
hlcoord 0, 12 hlcoord 0, 12
ld b, 4 ld b, 4
ld c, 18 ld c, 18
call Predef_LinkTextbox call LinkTextboxPredef
hlcoord 1, 14 hlcoord 1, 14
ld de, String28ebd ld de, String28ebd
call PlaceString call PlaceString
@ -2002,7 +2002,7 @@ String_TooBadTheTradeWasCanceled: ; 28ece
next "was canceled!@" next "was canceled!@"
Predef_LinkTextbox: ; 28eef LinkTextboxPredef: ; 28eef
ld d, h ld d, h
ld e, l ld e, l
farcall LinkTextbox farcall LinkTextbox
@ -2025,11 +2025,11 @@ Function28f09: ; 28f09
hlcoord 0, 0 hlcoord 0, 0
ld b, 6 ld b, 6
ld c, 18 ld c, 18
call Predef_LinkTextbox call LinkTextboxPredef
hlcoord 0, 8 hlcoord 0, 8
ld b, 6 ld b, 6
ld c, 18 ld c, 18
call Predef_LinkTextbox call LinkTextboxPredef
farcall PlaceTradePartnerNamesAndParty farcall PlaceTradePartnerNamesAndParty
ret ret
; 28f24 ; 28f24

2
engine/link_trade.asm
View File

@ -181,7 +181,7 @@ Function16d6e1: ; 16d6e1
hlcoord 4, 10 hlcoord 4, 10
ld b, 1 ld b, 1
ld c, 10 ld c, 10
predef Predef_LinkTextbox predef LinkTextboxPredef
hlcoord 5, 11 hlcoord 5, 11
ld de, .Waiting ld de, .Waiting
call PlaceString call PlaceString

2
engine/mon_stats.asm
View File

@ -335,7 +335,7 @@ Unreferenced_Function50cd0: ; 50cd0
jr nz, .loop jr nz, .loop
ret ret
Predef22: ; unreferenced predef UnreferencedPredef22:
push hl push hl
push hl push hl
ld hl, PartyMonNicknames ld hl, PartyMonNicknames

3
engine/pic_animation.asm
View File

@ -1110,9 +1110,10 @@ PokeAnim_GetSpeciesOrUnown: ; d065c
ret ret
; d0669 ; d0669
Predef48: ; d0669 Predef 48 UnreferencedPredef48: ; d0669 Predef 48
ld a, $1 ld a, $1
ld [wBoxAlignment], a ld [wBoxAlignment], a
HOF_AnimateFrontpic: ; d066e Predef 49 HOF_AnimateFrontpic: ; d066e Predef 49
call AnimateMon_CheckIfPokemon call AnimateMon_CheckIfPokemon
jr c, .fail jr c, .fail

2
engine/pokedex.asm
View File

@ -441,7 +441,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
call Pokedex_GetSelectedMon call Pokedex_GetSelectedMon
ld a, [wDexCurrentLocation] ld a, [wDexCurrentLocation]
ld e, a ld e, a
predef _Area predef Pokedex_GetArea
call Pokedex_BlackOutBG call Pokedex_BlackOutBG
call DelayFrame call DelayFrame
xor a xor a

2
engine/pokegear.asm
View File

@ -2440,7 +2440,7 @@ FlyMap: ; 91c90
; 91d11 ; 91d11
_Area: ; 91d11 Pokedex_GetArea: ; 91d11
; e: Current landmark ; e: Current landmark
ld a, [wTownMapPlayerIconLandmark] ld a, [wTownMapPlayerIconLandmark]
push af push af

26
engine/predef.asm
View File

@ -31,7 +31,7 @@ PredefPointers:: ; 856b
; address, bank ; address, bank
add_predef LearnMove ; $0 add_predef LearnMove ; $0
add_predef Predef1 add_predef DummyPredef1
add_predef HealParty add_predef HealParty
add_predef FlagPredef add_predef FlagPredef
add_predef ComputeHPBarPixels add_predef ComputeHPBarPixels
@ -46,7 +46,7 @@ PredefPointers:: ; 856b
add_predef CalcPkmnStatC add_predef CalcPkmnStatC
add_predef CanLearnTMHMMove add_predef CanLearnTMHMMove
add_predef GetTMHMMove add_predef GetTMHMMove
add_predef Predef_LinkTextbox ; $ 10 add_predef LinkTextboxPredef ; $ 10
add_predef PrintMoveDesc add_predef PrintMoveDesc
add_predef UpdatePlayerHUD add_predef UpdatePlayerHUD
add_predef PlaceGraphic add_predef PlaceGraphic
@ -64,7 +64,7 @@ PredefPointers:: ; 856b
add_predef CopyPkmnToTempMon add_predef CopyPkmnToTempMon
add_predef ListMoves ; $20 add_predef ListMoves ; $20
add_predef PlaceNonFaintStatus add_predef PlaceNonFaintStatus
add_predef Predef22 add_predef UnreferencedPredef22
add_predef ListMovePP add_predef ListMovePP
add_predef GetGender add_predef GetGender
add_predef StatsScreenInit add_predef StatsScreenInit
@ -77,18 +77,18 @@ PredefPointers:: ; 856b
add_predef PrintMonTypes add_predef PrintMonTypes
add_predef GetUnownLetter add_predef GetUnownLetter
add_predef LoadPoisonBGPals add_predef LoadPoisonBGPals
add_predef Predef2F add_predef DummyPredef2F
add_predef InitSGBBorder ; $30 add_predef InitSGBBorder ; $30
add_predef Predef_LoadSGBLayout add_predef LoadSGBLayout
add_predef _Area add_predef Pokedex_GetArea
add_predef CheckContestMon add_predef CheckContestMon
add_predef Predef_StartBattle add_predef DoBattleTransition
add_predef Predef35 add_predef DummyPredef35
add_predef Predef36 add_predef DummyPredef36
add_predef PlayBattleAnim add_predef PlayBattleAnim
add_predef Predef38 ; $38 add_predef DummyPredef38 ; $38
add_predef Predef39 add_predef DummyPredef39
add_predef Predef3A add_predef DummyPredef3A
add_predef PartyMonItemName add_predef PartyMonItemName
add_predef GetMonFrontpic add_predef GetMonFrontpic
add_predef GetMonBackpic add_predef GetMonBackpic
@ -102,7 +102,7 @@ PredefPointers:: ; 856b
add_predef PlaceStatusString add_predef PlaceStatusString
add_predef LoadMonAnimation add_predef LoadMonAnimation
add_predef AnimateFrontpic add_predef AnimateFrontpic
add_predef Predef48 ; $48 add_predef UnreferencedPredef48 ; $48
add_predef HOF_AnimateFrontpic add_predef HOF_AnimateFrontpic
dbw $ff, InexplicablyEmptyFunction ; ??? dbw $ff, InexplicablyEmptyFunction ; ???
; 864c ; 864c

2
engine/routines/placewaitingtext.asm
View File

@ -11,7 +11,7 @@ PlaceWaitingText:: ; 4000
jr .proceed jr .proceed
.notinbattle .notinbattle
predef Predef_LinkTextbox predef LinkTextboxPredef
.proceed .proceed
hlcoord 4, 11 hlcoord 4, 11

5
engine/sgb_layouts.asm
View File

@ -1,7 +1,6 @@
Predef_LoadSGBLayout: ; 864c LoadSGBLayout: ; 864c
; LoadSGBLayout
call CheckCGB call CheckCGB
jp nz, Predef_LoadSGBLayoutCGB jp nz, LoadSGBLayoutCGB
ld a, b ld a, b
cp SCGB_RAM cp SCGB_RAM

4
engine/timeofdaypals.asm
View File

@ -1,5 +1,5 @@
Predef35: ; 8c000 DummyPredef35: ; 8c000
Predef36: DummyPredef36:
ret ret
UpdateTimeOfDayPal:: ; 8c001 UpdateTimeOfDayPal:: ; 8c001

2
home.asm
View File

@ -712,7 +712,7 @@ GetSGBLayout:: ; 3340
ret z ret z
.sgb .sgb
predef_jump Predef_LoadSGBLayout ; LoadSGBLayout predef_jump LoadSGBLayout
; 334e ; 334e
SetHPPal:: ; 334e SetHPPal:: ; 334e