diff options
| -rw-r--r-- | engine/battle/battle_transition.asm | 6 | ||||
| -rw-r--r-- | engine/battle/start_battle.asm | 2 | ||||
| -rw-r--r-- | engine/cgb_layouts.asm | 2 | ||||
| -rw-r--r-- | engine/events/bug_contest/display_stats.asm | 6 | ||||
| -rwxr-xr-x | engine/events/mom_phone.asm | 2 | ||||
| -rwxr-xr-x | engine/events/special.asm | 3 | ||||
| -rwxr-xr-x | engine/link.asm | 24 | ||||
| -rwxr-xr-x | engine/link_trade.asm | 2 | ||||
| -rw-r--r-- | engine/mon_stats.asm | 2 | ||||
| -rw-r--r-- | engine/pic_animation.asm | 3 | ||||
| -rw-r--r-- | engine/pokedex.asm | 2 | ||||
| -rwxr-xr-x | engine/pokegear.asm | 2 | ||||
| -rw-r--r-- | engine/predef.asm | 26 | ||||
| -rw-r--r-- | engine/routines/placewaitingtext.asm | 2 | ||||
| -rw-r--r-- | engine/sgb_layouts.asm | 5 | ||||
| -rw-r--r-- | engine/timeofdaypals.asm | 4 | ||||
| -rw-r--r-- | home.asm | 2 |
17 files changed, 47 insertions, 48 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index d3ac22698..2b3f5510e 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -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 diff --git a/engine/battle/start_battle.asm b/engine/battle/start_battle.asm index 7f0bff96b..18ca2df8d 100644 --- a/engine/battle/start_battle.asm +++ b/engine/battle/start_battle.asm @@ -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 diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm index 74d476dec..a6de042fe 100644 --- a/engine/cgb_layouts.asm +++ b/engine/cgb_layouts.asm @@ -6,7 +6,7 @@ CheckCGB: ; 8d55 ret ; 8d59 -Predef_LoadSGBLayoutCGB: ; 8d59 +LoadSGBLayoutCGB: ; 8d59 ld a, b cp SCGB_RAM jr nz, .not_ram diff --git a/engine/events/bug_contest/display_stats.asm b/engine/events/bug_contest/display_stats.asm index d6ad3997e..0e2567c28 100644 --- a/engine/events/bug_contest/display_stats.asm +++ b/engine/events/bug_contest/display_stats.asm @@ -101,7 +101,7 @@ DisplayAlreadyCaughtText: ; cc0c7 text_jump UnknownText_0x1c10dd db "@" -Predef2F: -Predef38: -Predef39: ; cc0d5 +DummyPredef2F: +DummyPredef38: +DummyPredef39: ; cc0d5 ret diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm index 614c18943..50496e663 100755 --- a/engine/events/mom_phone.asm +++ b/engine/events/mom_phone.asm @@ -257,7 +257,7 @@ _MomText_ItsInRoom: ; 0xfd1ca db 0 ; unused -Predef3A: ; fd1d0 +DummyPredef3A: ; fd1d0 ret ; fd1d1 diff --git a/engine/events/special.asm b/engine/events/special.asm index 939db4a25..f1cd3f4e0 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -230,6 +230,5 @@ CopyPokemonName_Buffer1_Buffer3: ; 746e ld bc, PKMN_NAME_LENGTH jp CopyBytes -Predef1: ; 747a -; not used +DummyPredef1: ; 747a ret diff --git a/engine/link.asm b/engine/link.asm index 5c45707d7..70fd3b852 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1362,7 +1362,7 @@ Function28926: ; 28926 hlcoord 0, 15 ld b, 1 ld c, 18 - call Predef_LinkTextbox + call LinkTextboxPredef hlcoord 2, 16 ld de, .String_Stats_Trade call PlaceString @@ -1471,7 +1471,7 @@ Function28926: ; 28926 hlcoord 0, 12 ld b, 4 ld c, 18 - call Predef_LinkTextbox + call LinkTextboxPredef farcall Link_WaitBGMap ld hl, .Text_CantTradeLastMon bccoord 1, 14 @@ -1493,7 +1493,7 @@ Function28926: ; 28926 hlcoord 0, 12 ld b, 4 ld c, 18 - call Predef_LinkTextbox + call LinkTextboxPredef farcall Link_WaitBGMap ld hl, .Text_Abnormal bccoord 1, 14 @@ -1503,7 +1503,7 @@ Function28926: ; 28926 hlcoord 0, 12 ld b, 4 ld c, 18 - call Predef_LinkTextbox + call LinkTextboxPredef hlcoord 1, 14 ld de, String_TooBadTheTradeWasCanceled call PlaceString @@ -1649,7 +1649,7 @@ LinkTrade: ; 28b87 hlcoord 0, 12 ld b, $4 ld c, $12 - call Predef_LinkTextbox + call LinkTextboxPredef farcall Link_WaitBGMap ld a, [wd002] ld hl, PartySpecies @@ -1678,7 +1678,7 @@ LinkTrade: ; 28b87 hlcoord 10, 7 ld b, 3 ld c, 7 - call Predef_LinkTextbox + call LinkTextboxPredef ld de, String28eab hlcoord 12, 8 call PlaceString @@ -1718,7 +1718,7 @@ LinkTrade: ; 28b87 hlcoord 0, 12 ld b, 4 ld c, 18 - call Predef_LinkTextbox + call LinkTextboxPredef hlcoord 1, 14 ld de, String_TooBadTheTradeWasCanceled call PlaceString @@ -1735,7 +1735,7 @@ LinkTrade: ; 28b87 hlcoord 0, 12 ld b, 4 ld c, 18 - call Predef_LinkTextbox + call LinkTextboxPredef hlcoord 1, 14 ld de, String_TooBadTheTradeWasCanceled call PlaceString @@ -1965,7 +1965,7 @@ LinkTrade: ; 28b87 hlcoord 0, 12 ld b, 4 ld c, 18 - call Predef_LinkTextbox + call LinkTextboxPredef hlcoord 1, 14 ld de, String28ebd call PlaceString @@ -2002,7 +2002,7 @@ String_TooBadTheTradeWasCanceled: ; 28ece next "was canceled!@" -Predef_LinkTextbox: ; 28eef +LinkTextboxPredef: ; 28eef ld d, h ld e, l farcall LinkTextbox @@ -2025,11 +2025,11 @@ Function28f09: ; 28f09 hlcoord 0, 0 ld b, 6 ld c, 18 - call Predef_LinkTextbox + call LinkTextboxPredef hlcoord 0, 8 ld b, 6 ld c, 18 - call Predef_LinkTextbox + call LinkTextboxPredef farcall PlaceTradePartnerNamesAndParty ret ; 28f24 diff --git a/engine/link_trade.asm b/engine/link_trade.asm index f85403a29..07b471640 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -181,7 +181,7 @@ Function16d6e1: ; 16d6e1 hlcoord 4, 10 ld b, 1 ld c, 10 - predef Predef_LinkTextbox + predef LinkTextboxPredef hlcoord 5, 11 ld de, .Waiting call PlaceString diff --git a/engine/mon_stats.asm b/engine/mon_stats.asm index 522c3743e..994f56011 100644 --- a/engine/mon_stats.asm +++ b/engine/mon_stats.asm @@ -335,7 +335,7 @@ Unreferenced_Function50cd0: ; 50cd0 jr nz, .loop ret -Predef22: ; unreferenced predef +UnreferencedPredef22: push hl push hl ld hl, PartyMonNicknames diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index b20dfef8b..65e067298 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1110,9 +1110,10 @@ PokeAnim_GetSpeciesOrUnown: ; d065c ret ; d0669 -Predef48: ; d0669 Predef 48 +UnreferencedPredef48: ; d0669 Predef 48 ld a, $1 ld [wBoxAlignment], a + HOF_AnimateFrontpic: ; d066e Predef 49 call AnimateMon_CheckIfPokemon jr c, .fail diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 5dc3dc2a7..9e5f0c411 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -441,7 +441,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2 call Pokedex_GetSelectedMon ld a, [wDexCurrentLocation] ld e, a - predef _Area + predef Pokedex_GetArea call Pokedex_BlackOutBG call DelayFrame xor a diff --git a/engine/pokegear.asm b/engine/pokegear.asm index b79ec5484..2d9dfdbb6 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -2440,7 +2440,7 @@ FlyMap: ; 91c90 ; 91d11 -_Area: ; 91d11 +Pokedex_GetArea: ; 91d11 ; e: Current landmark ld a, [wTownMapPlayerIconLandmark] push af diff --git a/engine/predef.asm b/engine/predef.asm index 837f7b96b..c0a10a91b 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -31,7 +31,7 @@ PredefPointers:: ; 856b ; address, bank add_predef LearnMove ; $0 - add_predef Predef1 + add_predef DummyPredef1 add_predef HealParty add_predef FlagPredef add_predef ComputeHPBarPixels @@ -46,7 +46,7 @@ PredefPointers:: ; 856b add_predef CalcPkmnStatC add_predef CanLearnTMHMMove add_predef GetTMHMMove - add_predef Predef_LinkTextbox ; $ 10 + add_predef LinkTextboxPredef ; $ 10 add_predef PrintMoveDesc add_predef UpdatePlayerHUD add_predef PlaceGraphic @@ -64,7 +64,7 @@ PredefPointers:: ; 856b add_predef CopyPkmnToTempMon add_predef ListMoves ; $20 add_predef PlaceNonFaintStatus - add_predef Predef22 + add_predef UnreferencedPredef22 add_predef ListMovePP add_predef GetGender add_predef StatsScreenInit @@ -77,18 +77,18 @@ PredefPointers:: ; 856b add_predef PrintMonTypes add_predef GetUnownLetter add_predef LoadPoisonBGPals - add_predef Predef2F + add_predef DummyPredef2F add_predef InitSGBBorder ; $30 - add_predef Predef_LoadSGBLayout - add_predef _Area + add_predef LoadSGBLayout + add_predef Pokedex_GetArea add_predef CheckContestMon - add_predef Predef_StartBattle - add_predef Predef35 - add_predef Predef36 + add_predef DoBattleTransition + add_predef DummyPredef35 + add_predef DummyPredef36 add_predef PlayBattleAnim - add_predef Predef38 ; $38 - add_predef Predef39 - add_predef Predef3A + add_predef DummyPredef38 ; $38 + add_predef DummyPredef39 + add_predef DummyPredef3A add_predef PartyMonItemName add_predef GetMonFrontpic add_predef GetMonBackpic @@ -102,7 +102,7 @@ PredefPointers:: ; 856b add_predef PlaceStatusString add_predef LoadMonAnimation add_predef AnimateFrontpic - add_predef Predef48 ; $48 + add_predef UnreferencedPredef48 ; $48 add_predef HOF_AnimateFrontpic dbw $ff, InexplicablyEmptyFunction ; ??? ; 864c diff --git a/engine/routines/placewaitingtext.asm b/engine/routines/placewaitingtext.asm index 37fc2a056..11b747ec5 100644 --- a/engine/routines/placewaitingtext.asm +++ b/engine/routines/placewaitingtext.asm @@ -11,7 +11,7 @@ PlaceWaitingText:: ; 4000 jr .proceed .notinbattle - predef Predef_LinkTextbox + predef LinkTextboxPredef .proceed hlcoord 4, 11 diff --git a/engine/sgb_layouts.asm b/engine/sgb_layouts.asm index 36dbde84c..b6bbe582f 100644 --- a/engine/sgb_layouts.asm +++ b/engine/sgb_layouts.asm @@ -1,7 +1,6 @@ -Predef_LoadSGBLayout: ; 864c -; LoadSGBLayout +LoadSGBLayout: ; 864c call CheckCGB - jp nz, Predef_LoadSGBLayoutCGB + jp nz, LoadSGBLayoutCGB ld a, b cp SCGB_RAM diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 0b1ea71a2..393a9e84a 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -1,5 +1,5 @@ -Predef35: ; 8c000 -Predef36: +DummyPredef35: ; 8c000 +DummyPredef36: ret UpdateTimeOfDayPal:: ; 8c001 @@ -712,7 +712,7 @@ GetSGBLayout:: ; 3340 ret z .sgb - predef_jump Predef_LoadSGBLayout ; LoadSGBLayout + predef_jump LoadSGBLayout ; 334e SetHPPal:: ; 334e |