summaryrefslogtreecommitdiff
path: root/engine/pokemon
diff options
context:
space:
mode:
Diffstat (limited to 'engine/pokemon')
-rw-r--r--engine/pokemon/bills_pc.asm4
-rw-r--r--engine/pokemon/breeding.asm3
-rw-r--r--engine/pokemon/evolve.asm8
-rw-r--r--engine/pokemon/mail.asm3
-rw-r--r--engine/pokemon/mon_stats.asm1
-rw-r--r--engine/pokemon/move_mon.asm1
-rw-r--r--engine/pokemon/party_menu.asm10
-rw-r--r--engine/pokemon/search.asm3
-rw-r--r--engine/pokemon/stats_screen.asm5
-rw-r--r--engine/pokemon/types.asm4
10 files changed, 0 insertions, 42 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm
index c5904e9b0..65621192d 100644
--- a/engine/pokemon/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -152,7 +152,6 @@ BillsPCDepositJumptable:
dw BillsPCDepositFuncRelease ; Release Pokemon
dw BillsPCDepositFuncCancel ; Cancel
-
BillsPCDepositFuncDeposit:
call BillsPC_CheckMail_PreventBlackout
jp c, BillsPCDepositFuncCancel
@@ -410,7 +409,6 @@ BillsPC_Withdraw:
dw .release ; Release
dw .cancel ; Cancel
-
.withdraw
call BillsPC_CheckMail_PreventBlackout
jp c, .cancel
@@ -1874,7 +1872,6 @@ TryWithdrawPokemon:
scf
ret
-
ReleasePKMN_ByePKMN:
hlcoord 0, 0
lb bc, 15, 8
@@ -2230,7 +2227,6 @@ PCString_BoxFull: db "The BOX is full.@"
PCString_PartyFull: db "The party's full!@"
PCString_NoReleasingEGGS: db "No releasing EGGS!@"
-
_ChangeBox:
call LoadStandardMenuHeader
call BillsPC_ClearTilemap
diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm
index f4aafe5d9..7e7f0e097 100644
--- a/engine/pokemon/breeding.asm
+++ b/engine/pokemon/breeding.asm
@@ -84,7 +84,6 @@ CheckBreedmonCompatibility:
ld [wd265], a
ret
-
.CheckDVs:
; If Defense DVs match and the lower 3 bits of the Special DVs match,
; avoid breeding
@@ -623,7 +622,6 @@ GetBreedmonMovePointer:
ld hl, wBreedMon2Moves
ret
-
GetEggFrontpic:
push de
ld [wCurPartySpecies], a
@@ -961,4 +959,3 @@ Unreferenced_DayCareMonPrintEmptyString:
.string
db "@"
-
diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm
index dab58a44f..571cff0b8 100644
--- a/engine/pokemon/evolve.asm
+++ b/engine/pokemon/evolve.asm
@@ -87,7 +87,6 @@ EvolveAfterBattle_MasterLoop:
cp EVOLVE_HAPPINESS
jr z, .happiness
-
; EVOLVE_STAT
ld a, [wTempMonLevel]
cp [hl]
@@ -116,7 +115,6 @@ EvolveAfterBattle_MasterLoop:
inc hl
jr .proceed
-
.happiness
ld a, [wTempMonHappiness]
cp HAPPINESS_TO_EVOLVE
@@ -143,7 +141,6 @@ EvolveAfterBattle_MasterLoop:
jp z, .dont_evolve_3
jr .proceed
-
.trade
ld a, [wLinkMode]
and a
@@ -169,7 +166,6 @@ EvolveAfterBattle_MasterLoop:
ld [wTempMonItem], a
jr .proceed
-
.item
ld a, [hli]
ld b, a
@@ -185,7 +181,6 @@ EvolveAfterBattle_MasterLoop:
jp nz, .dont_evolve_3
jr .proceed
-
.level
ld a, [hli]
ld b, a
@@ -419,7 +414,6 @@ Text_WhatEvolving:
text_jump UnknownText_0x1c4be3
db "@"
-
LearnLevelMoves:
ld a, [wd265]
ld [wCurPartySpecies], a
@@ -484,7 +478,6 @@ LearnLevelMoves:
ld [wd265], a
ret
-
FillMoves:
; Fill in moves at de for wCurPartySpecies at wCurPartyLevel
@@ -605,7 +598,6 @@ ShiftMoves:
jr nz, .loop
ret
-
EvoFlagAction:
push de
ld d, $0
diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm
index caaf6f01b..359d2ac8e 100644
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -188,7 +188,6 @@ CheckPokeMail::
ld [wScriptVar], a
ret
-
GivePokeMail::
ld a, [wPartyCount]
dec a
@@ -237,7 +236,6 @@ GivePokeMail::
ld [de], a
jp CloseSRAM
-
BackupPartyMonMail:
ld a, BANK(sPartyMail)
call GetSRAMBank
@@ -277,7 +275,6 @@ DeletePartyMonMail:
call ByteFill
jp CloseSRAM
-
IsAnyMonHoldingMail:
ld a, [wPartyCount]
and a
diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm
index 829e99e6b..76f09b461 100644
--- a/engine/pokemon/mon_stats.asm
+++ b/engine/pokemon/mon_stats.asm
@@ -170,7 +170,6 @@ GetGender:
call AddNTimes
.DVs:
-
; sBoxMon data is read directly from SRAM.
ld a, [wMonType]
cp BOXMON
diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm
index 9e253846a..7074dafd8 100644
--- a/engine/pokemon/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
@@ -1367,7 +1367,6 @@ RemoveMonFromPartyOrBox:
.close_sram
jp CloseSRAM
-
ComputeNPCTrademonStats:
ld a, MON_LEVEL
call GetPartyParamLocation
diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm
index 638e046b4..c3a70dbdc 100644
--- a/engine/pokemon/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
@@ -11,7 +11,6 @@ SelectMonFromParty:
call ReturnToMapWithSpeechTextbox
ret
-
SelectTradeOrDayCareMon:
ld a, b
ld [wPartyMenuActionText], a
@@ -41,7 +40,6 @@ LoadPartyMenuGFX:
callfar ClearSpriteAnims2
ret
-
WritePartyMenuTilemap:
ld hl, wOptions
ld a, [hl]
@@ -114,7 +112,6 @@ PlacePartyNicknames:
.CANCEL:
db "CANCEL@"
-
PlacePartyHPBar:
xor a
ld [wSGBPals], a
@@ -349,7 +346,6 @@ PlacePartyMonTMHMCompatibility:
.string_not_able
db "NOT ABLE@"
-
PlacePartyMonEvoStoneCompatibility:
ld a, [wPartyCount]
and a
@@ -429,7 +425,6 @@ PlacePartyMonEvoStoneCompatibility:
.string_not_able
db "NOT ABLE@"
-
PlacePartyMonGender:
ld a, [wPartyCount]
and a
@@ -478,7 +473,6 @@ PlacePartyMonGender:
.unknown
db "…UNKNOWN@"
-
PlacePartyMonMobileBattleSelection:
ld a, [wPartyCount]
and a
@@ -556,7 +550,6 @@ PlacePartyMonMobileBattleSelection:
.Strings_1_2_3:
db "1@", "2@", "3@" ; 1st, 2nd, 3rd
-
PartyMenuCheckEgg:
ld a, LOW(wPartySpecies)
add b
@@ -590,7 +583,6 @@ GetPartyMenuQualityIndexes:
INCLUDE "data/party_menu_qualities.asm"
-
InitPartyMenuGFX:
ld hl, wPartyCount
ld a, [hli]
@@ -717,7 +709,6 @@ PartyMenuSelect:
scf
ret
-
PrintPartyMenuText:
hlcoord 0, 14
lb bc, 2, 18
@@ -862,7 +853,6 @@ PrintPartyMenuActionText:
text_jump UnknownText_0x1bc16e
db "@"
-
.PrintText:
ld e, a
ld d, 0
diff --git a/engine/pokemon/search.asm b/engine/pokemon/search.asm
index 9a66169fb..c8d4439df 100644
--- a/engine/pokemon/search.asm
+++ b/engine/pokemon/search.asm
@@ -28,7 +28,6 @@ BeastsCheck:
ld [wScriptVar], a
ret
-
MonCheck:
; Check if the player owns any Pokémon of the species in wScriptVar.
; Return the result in wScriptVar.
@@ -46,7 +45,6 @@ MonCheck:
ld [wScriptVar], a
ret
-
CheckOwnMonAnywhere:
; Check if the player owns any monsters of the species in wScriptVar.
; It must exist in either party or PC, and have the player's OT and ID.
@@ -178,7 +176,6 @@ CheckOwnMonAnywhere:
and a
ret
-
CheckOwnMon:
; Check if a Pokémon belongs to the player and is of a specific species.
diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm
index c69d822a2..dfc704f1a 100644
--- a/engine/pokemon/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
@@ -112,7 +112,6 @@ StatsScreenPointerTable:
dw MonStatsJoypad
dw StatsScreen_Exit
-
StatsScreen_WaitAnim:
ld hl, wcf64
bit 6, [hl]
@@ -174,7 +173,6 @@ EggStatsInit:
ld [wJumptableIndex], a
ret
-
EggStatsJoypad:
call StatsScreen_GetJoypad
jr nc, .check
@@ -783,7 +781,6 @@ IDNoString:
OTString:
db "OT/@"
-
StatsScreen_PlaceFrontpic:
ld hl, wTempMonDVs
predef GetUnownLetter
@@ -1029,7 +1026,6 @@ EggALotMoreTimeString:
next "lot more time to"
next "hatch.@"
-
StatsScreen_AnimateEgg:
call StatsScreen_GetAnimationParam
ret nc
@@ -1126,7 +1122,6 @@ GetNicknamePointer:
ld a, [wCurPartyMon]
jp SkipNames
-
CheckFaintedFrzSlp:
ld hl, MON_HP
add hl, bc
diff --git a/engine/pokemon/types.asm b/engine/pokemon/types.asm
index 76c7665a4..4e2ca3e45 100644
--- a/engine/pokemon/types.asm
+++ b/engine/pokemon/types.asm
@@ -38,7 +38,6 @@ PrintMonTypes:
ld bc, NAME_LENGTH_JAPANESE - 1
jp ByteFill
-
PrintMoveType:
; Print the type of move b at hl.
@@ -56,7 +55,6 @@ PrintMoveType:
ld b, a
-
PrintType:
; Print type b at hl.
@@ -75,7 +73,6 @@ PrintType:
jp PlaceString
-
GetTypeName:
; Copy the name of type [wd265] to wStringBuffer1.
@@ -92,5 +89,4 @@ GetTypeName:
ld bc, MOVE_NAME_LENGTH
jp CopyBytes
-
INCLUDE "data/types/names.asm"