You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
Fix triple newlines left over from removing address comments
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -1367,7 +1367,6 @@ RemoveMonFromPartyOrBox:
|
||||
.close_sram
|
||||
jp CloseSRAM
|
||||
|
||||
|
||||
ComputeNPCTrademonStats:
|
||||
ld a, MON_LEVEL
|
||||
call GetPartyParamLocation
|
||||
|
@@ -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
|
||||
|
@@ -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.
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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"
|
||||
|
Reference in New Issue
Block a user