Remove all address comments

This commit is contained in:
mid-kid
2018-06-24 16:09:41 +02:00
parent 131875d3e3
commit 1d9a68dbdd
616 changed files with 12133 additions and 20380 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,11 +1,11 @@
_BillsPC: ; e3fd
_BillsPC:
call .CheckCanUsePC
ret c
call .LogIn
call .UseBillsPC
jp .LogOut
.CheckCanUsePC: ; e40a (3:640a)
.CheckCanUsePC:
ld a, [wPartyCount]
and a
ret nz
@@ -19,7 +19,7 @@ _BillsPC: ; e3fd
text_jump UnknownText_0x1c1006
db "@"
.LogIn: ; e41c (3:641c)
.LogIn:
xor a
ld [hBGMapMode], a
call LoadStandardMenuHeader
@@ -40,11 +40,11 @@ _BillsPC: ; e3fd
text_jump UnknownText_0x1c1024
db "@"
.LogOut: ; e43f (3:643f)
.LogOut:
call CloseSubmenu
ret
.UseBillsPC: ; e443 (3:6443)
.UseBillsPC:
ld hl, .MenuHeader
call LoadMenuHeader
ld a, $1
@@ -81,21 +81,21 @@ _BillsPC: ; e3fd
dw PlaceMenuStrings
dw .strings
.strings ; e47f
.strings
db "WITHDRAW <PK><MN>@"
db "DEPOSIT <PK><MN>@"
db "CHANGE BOX@"
db "MOVE <PK><MN> W/O MAIL@"
db "SEE YA!@"
.Jumptable: ; e4ba (3:64ba)
.Jumptable:
dw BillsPC_WithdrawMenu
dw BillsPC_DepositMenu
dw BillsPC_ChangeBoxMenu
dw BillsPC_MovePKMNMenu
dw BillsPC_SeeYa
.items ; e4c4
.items
db 5 ; # items
db 0 ; WITHDRAW
db 1 ; DEPOSIT
@@ -104,11 +104,11 @@ _BillsPC: ; e3fd
db 4 ; SEE YA!
db -1
BillsPC_SeeYa: ; e4cb
BillsPC_SeeYa:
scf
ret
BillsPC_MovePKMNMenu: ; e4cd
BillsPC_MovePKMNMenu:
call LoadStandardMenuHeader
farcall IsAnyMonHoldingMail
jr nc, .no_mail
@@ -133,7 +133,7 @@ BillsPC_MovePKMNMenu: ; e4cd
text_jump UnknownText_0x1c102b
db "@"
BillsPC_DepositMenu: ; e4fe (3:64fe)
BillsPC_DepositMenu:
call LoadStandardMenuHeader
farcall _DepositPKMN
call ReturnToMapFromSubmenu
@@ -173,7 +173,7 @@ Unreferenced_Functione512:
text_jump UnknownText_0x1c1080
db "@"
CheckCurPartyMonFainted: ; e538
CheckCurPartyMonFainted:
ld hl, wPartyMon1HP
ld de, PARTYMON_STRUCT_LENGTH
ld b, $0
@@ -202,7 +202,7 @@ CheckCurPartyMonFainted: ; e538
and a
ret
BillsPC_WithdrawMenu: ; e559 (3:6559)
BillsPC_WithdrawMenu:
call LoadStandardMenuHeader
farcall _WithdrawPKMN
call ReturnToMapFromSubmenu
@@ -229,12 +229,12 @@ UnknownText_0xe57e: ; 0xe57e
text_jump UnknownText_0x1c10a2
db "@"
BillsPC_ChangeBoxMenu: ; e583 (3:6583)
BillsPC_ChangeBoxMenu:
farcall _ChangeBox
and a
ret
ClearPCItemScreen: ; e58b
ClearPCItemScreen:
call DisableSpriteUpdates
xor a
ld [hBGMapMode], a
@@ -254,7 +254,7 @@ ClearPCItemScreen: ; e58b
call SetPalettes ; load regular palettes?
ret
CopyBoxmonToTempMon: ; e5bb
CopyBoxmonToTempMon:
ld a, [wCurPartyMon]
ld hl, sBoxMon1Species
ld bc, BOXMON_STRUCT_LENGTH
@@ -370,7 +370,7 @@ Unreferenced_Functione5d9:
call CloseSRAM
ret
.BoxAddrs: ; e66e
.BoxAddrs:
dba sBox1
dba sBox2
dba sBox3

View File

@@ -1,4 +1,4 @@
CheckBreedmonCompatibility: ; 16e1d
CheckBreedmonCompatibility:
call .CheckBreedingGroupCompatibility
ld c, $0
jp nc, .done
@@ -83,10 +83,9 @@ CheckBreedmonCompatibility: ; 16e1d
ld a, c
ld [wd265], a
ret
; 16ebc
.CheckDVs: ; 16ebc (5:6ebc)
.CheckDVs:
; If Defense DVs match and the lower 3 bits of the Special DVs match,
; avoid breeding
ld a, [wBreedMon1DVs]
@@ -103,9 +102,8 @@ CheckBreedmonCompatibility: ; 16e1d
and %111
cp b
ret
; 16ed6
.CheckBreedingGroupCompatibility: ; 16ed6
.CheckBreedingGroupCompatibility:
; If either mon is in the No Eggs group,
; they are not compatible.
ld a, [wBreedMon2Species]
@@ -173,9 +171,8 @@ CheckBreedmonCompatibility: ; 16e1d
.Compatible:
scf
ret
; 16f3e
DoEggStep:: ; 16f3e
DoEggStep::
ld de, wPartySpecies
ld hl, wPartyMon1Happiness
ld c, 0
@@ -198,24 +195,22 @@ DoEggStep:: ; 16f3e
add hl, de
pop de
jr .loop
; 16f5e
OverworldHatchEgg:: ; 16f5e
OverworldHatchEgg::
call RefreshScreen
call LoadStandardMenuHeader
call HatchEggs
call ExitAllMenus
call RestartMapMusic
jp CloseText
; 16f70
HatchEggs: ; 16f70 (5:6f70)
HatchEggs:
ld de, wPartySpecies
ld hl, wPartyMon1Happiness
xor a
ld [wCurPartyMon], a
.loop ; 16f7a (5:6f7a)
.loop
ld a, [de]
inc de
cp -1
@@ -348,7 +343,7 @@ HatchEggs: ; 16f70 (5:6f70)
ld bc, MON_NAME_LENGTH
call CopyBytes
.next ; 1707d (5:707d)
.next
ld hl, wCurPartyMon
inc [hl]
pop hl
@@ -357,9 +352,8 @@ HatchEggs: ; 16f70 (5:6f70)
pop de
jp .loop
.done ; 1708a (5:708a)
.done
ret
; 1708b (5:708b)
.Text_HatchEgg: ; 0x1708b
; Huh? @ @
@@ -382,7 +376,6 @@ HatchEggs: ; 16f70 (5:6f70)
pop hl
ld hl, .CameOutOfItsEgg
ret
; 170b0 (5:70b0)
.ClearTextbox: ; 0x170b0
;
@@ -402,7 +395,7 @@ HatchEggs: ; 16f70 (5:6f70)
db "@"
; 0x170bf
InitEggMoves: ; 170bf
InitEggMoves:
call GetHeritableMoves
ld d, h
ld e, l
@@ -431,9 +424,8 @@ InitEggMoves: ; 170bf
.done
ret
; 170e4
GetEggMove: ; 170e4
GetEggMove:
push bc
ld a, [wEggMonSpecies]
dec a
@@ -526,9 +518,8 @@ GetEggMove: ; 170e4
pop bc
and a
ret
; 17169
LoadEggMove: ; 17169
LoadEggMove:
push de
push bc
ld a, [de]
@@ -561,9 +552,8 @@ LoadEggMove: ; 17169
pop bc
pop de
ret
; 17197
GetHeritableMoves: ; 17197
GetHeritableMoves:
ld hl, wBreedMon2Moves
ld a, [wBreedMon1Species]
cp DITTO
@@ -619,9 +609,8 @@ GetHeritableMoves: ; 17197
pop af
ld [wCurPartySpecies], a
ret
; 1720b
GetBreedmonMovePointer: ; 1720b
GetBreedmonMovePointer:
ld hl, wBreedMon1Moves
ld a, [wBreedMon1Species]
cp DITTO
@@ -636,10 +625,9 @@ GetBreedmonMovePointer: ; 1720b
.ditto
ld hl, wBreedMon2Moves
ret
; 17224
GetEggFrontpic: ; 17224 (5:7224)
GetEggFrontpic:
push de
ld [wCurPartySpecies], a
ld [wCurSpecies], a
@@ -649,7 +637,7 @@ GetEggFrontpic: ; 17224 (5:7224)
pop de
predef_jump GetMonFrontpic
GetHatchlingFrontpic: ; 1723c (5:723c)
GetHatchlingFrontpic:
push de
ld [wCurPartySpecies], a
ld [wCurSpecies], a
@@ -659,7 +647,7 @@ GetHatchlingFrontpic: ; 1723c (5:723c)
pop de
predef_jump GetAnimatedFrontpic
Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
Hatch_UpdateFrontpicBGMapCenter:
push af
call WaitTop
push hl
@@ -681,7 +669,7 @@ Hatch_UpdateFrontpicBGMapCenter: ; 17254 (5:7254)
call SetPalettes
jp WaitBGMap
EggHatch_DoAnimFrame: ; 1727f (5:727f)
EggHatch_DoAnimFrame:
push hl
push de
push bc
@@ -692,7 +680,7 @@ EggHatch_DoAnimFrame: ; 1727f (5:727f)
pop hl
ret
EggHatch_AnimationSequence: ; 1728f (5:728f)
EggHatch_AnimationSequence:
ld a, [wd265]
ld [wJumptableIndex], a
ld a, [wCurSpecies]
@@ -782,13 +770,13 @@ EggHatch_AnimationSequence: ; 1728f (5:728f)
ld [wCurSpecies], a
ret
Hatch_LoadFrontpicPal: ; 17363 (5:7363)
Hatch_LoadFrontpicPal:
ld [wPlayerHPPal], a
ld b, SCGB_EVOLUTION
ld c, $0
jp GetSGBLayout
EggHatch_CrackShell: ; 1736d (5:736d)
EggHatch_CrackShell:
ld a, [wFrameCounter]
dec a
and $7
@@ -808,13 +796,11 @@ EggHatch_CrackShell: ; 1736d (5:736d)
ld [hl], $0
ld de, SFX_EGG_CRACK
jp PlaySFX
; 17393 (5:7393)
EggHatchGFX: ; 17393
EggHatchGFX:
INCBIN "gfx/evo/egg_hatch.2bpp"
; 173b3
Hatch_InitShellFragments: ; 173b3 (5:73b3)
Hatch_InitShellFragments:
farcall ClearSpriteAnims
ld hl, .SpriteData
.loop
@@ -856,14 +842,13 @@ Hatch_InitShellFragments: ; 173b3 (5:73b3)
call PlaySFX
call EggHatch_DoAnimFrame
ret
; 173ef (5:73ef)
shell_fragment: MACRO
; y tile, y pxl, x tile, x pxl, frameset offset, ???
db (\1 * 8) % $100 + \2, (\3 * 8) % $100 + \4, \5 - SPRITE_ANIM_FRAMESET_EGG_HATCH_1, \6
ENDM
.SpriteData: ; 173ef
.SpriteData:
shell_fragment 10, 4, 9, 0, SPRITE_ANIM_FRAMESET_EGG_HATCH_1, $3c
shell_fragment 11, 4, 9, 0, SPRITE_ANIM_FRAMESET_EGG_HATCH_2, $04
shell_fragment 10, 4, 10, 0, SPRITE_ANIM_FRAMESET_EGG_HATCH_1, $30
@@ -875,9 +860,8 @@ ENDM
shell_fragment 10, 0, 10, 4, SPRITE_ANIM_FRAMESET_EGG_HATCH_3, $2a
shell_fragment 12, 0, 10, 4, SPRITE_ANIM_FRAMESET_EGG_HATCH_4, $16
db -1
; 17418
Hatch_ShellFragmentLoop: ; 17418 (5:7418)
Hatch_ShellFragmentLoop:
ld c, 129
.loop
call EggHatch_DoAnimFrame
@@ -885,7 +869,7 @@ Hatch_ShellFragmentLoop: ; 17418 (5:7418)
jr nz, .loop
ret
DayCareMon1: ; 17421
DayCareMon1:
ld hl, DayCareMon1Text
call PrintText
ld a, [wBreedMon1Species]
@@ -898,7 +882,7 @@ DayCareMon1: ; 17421
call DayCareMonCompatibilityText
jp PrintText
DayCareMon2: ; 17440
DayCareMon2:
ld hl, DayCareMon2Text
call PrintText
ld a, [wBreedMon2Species]
@@ -911,9 +895,8 @@ DayCareMon2: ; 17440
call DayCareMonCompatibilityText
jp PrintText
DayCareMonCursor: ; 1745f
DayCareMonCursor:
jp WaitPressAorB_BlinkCursor
; 17462
DayCareMon2Text: ; 0x17462
; It's @ that was left with the DAY-CARE LADY.
@@ -927,7 +910,7 @@ DayCareMon1Text: ; 0x17467
db "@"
; 0x1746c
DayCareMonCompatibilityText: ; 1746c
DayCareMonCompatibilityText:
push bc
ld de, wStringBuffer1
ld bc, NAME_LENGTH
@@ -951,7 +934,6 @@ DayCareMonCompatibilityText: ; 1746c
.done
ret
; 1749c
.AllAlone: ; 0x1749c
; It's brimming with energy.
@@ -983,12 +965,10 @@ DayCareMonCompatibilityText: ; 1746c
db "@"
; 0x174b5
Unreferenced_DayCareMonPrintEmptyString: ; 174b5
Unreferenced_DayCareMonPrintEmptyString:
ld hl, .string
ret
; 174b9
.string ; 174b9
.string
db "@"
; 174ba

View File

@@ -1,4 +1,4 @@
GetBreedMon1LevelGrowth: ; e698
GetBreedMon1LevelGrowth:
ld hl, wBreedMon1Stats
ld de, wTempMon
ld bc, BOXMON_STRUCT_LENGTH
@@ -12,7 +12,7 @@ GetBreedMon1LevelGrowth: ; e698
ld d, a
ret
GetBreedMon2LevelGrowth: ; e6b3
GetBreedMon2LevelGrowth:
ld hl, wBreedMon2Stats
ld de, wTempMon
ld bc, BOXMON_STRUCT_LENGTH

View File

@@ -1,4 +1,4 @@
CheckPartyFullAfterContest: ; 4d9e5
CheckPartyFullAfterContest:
ld a, [wContestMon]
and a
jp z, .DidntCatchAnything
@@ -85,7 +85,7 @@ CheckPartyFullAfterContest: ; 4d9e5
ld [wScriptVar], a
ret
.TryAddToBox: ; 4daa3
.TryAddToBox:
ld a, BANK(sBoxCount)
call GetSRAMBank
ld hl, sBoxCount
@@ -146,12 +146,12 @@ CheckPartyFullAfterContest: ; 4d9e5
ld [wScriptVar], a
ret
.DidntCatchAnything: ; 4db35
.DidntCatchAnything:
ld a, BUGCONTEST_NO_CATCH
ld [wScriptVar], a
ret
GiveANickname_YesNo: ; 4db3b
GiveANickname_YesNo:
ld hl, TextJump_GiveANickname
call PrintText
jp YesNoBox
@@ -161,12 +161,12 @@ TextJump_GiveANickname: ; 0x4db44
text_jump UnknownText_0x1c12fc
db "@"
SetCaughtData: ; 4db49
SetCaughtData:
ld a, [wPartyCount]
dec a
ld hl, wPartyMon1CaughtLevel
call GetPartyLocation
SetBoxmonOrEggmonCaughtData: ; 4db53
SetBoxmonOrEggmonCaughtData:
ld a, [wTimeOfDay]
inc a
rrca
@@ -199,7 +199,7 @@ SetBoxmonOrEggmonCaughtData: ; 4db53
ld [hl], a
ret
SetBoxMonCaughtData: ; 4db83
SetBoxMonCaughtData:
ld a, BANK(sBoxMon1CaughtLevel)
call GetSRAMBank
ld hl, sBoxMon1CaughtLevel
@@ -207,7 +207,7 @@ SetBoxMonCaughtData: ; 4db83
call CloseSRAM
ret
SetGiftBoxMonCaughtData: ; 4db92
SetGiftBoxMonCaughtData:
push bc
ld a, BANK(sBoxMon1CaughtLevel)
call GetSRAMBank
@@ -217,14 +217,14 @@ SetGiftBoxMonCaughtData: ; 4db92
call CloseSRAM
ret
SetGiftPartyMonCaughtData: ; 4dba3
SetGiftPartyMonCaughtData:
ld a, [wPartyCount]
dec a
ld hl, wPartyMon1CaughtLevel
push bc
call GetPartyLocation
pop bc
SetGiftMonCaughtData: ; 4dbaf
SetGiftMonCaughtData:
xor a
ld [hli], a
ld a, GIFT_LOCATION
@@ -233,7 +233,7 @@ SetGiftMonCaughtData: ; 4dbaf
ld [hl], a
ret
SetEggMonCaughtData: ; 4dbb8 (13:5bb8)
SetEggMonCaughtData:
ld a, [wCurPartyMon]
ld hl, wPartyMon1CaughtLevel
call GetPartyLocation

View File

@@ -1,4 +1,4 @@
CorrectNickErrors:: ; 669f
CorrectNickErrors::
; error-check monster nick before use
; must be a peace offering to gamesharkers
@@ -60,7 +60,7 @@ CorrectNickErrors:: ; 669f
pop bc
ret
.textcommands ; 66cf
.textcommands
; table defining which characters are actually text commands
; format:
; ≥ <

View File

@@ -201,13 +201,11 @@ Unreferenced_CorrectPartyErrors:
dec b
jr nz, .loop5
ret
; 13b6b
.TAMAGO: ; 13b6b
.TAMAGO:
db "タマゴ@@@"
; 13b71
.GetLengthOfStringWith6CharCap: ; 13b71
.GetLengthOfStringWith6CharCap:
push de
ld c, 1
ld b, NAME_LENGTH_JAPANESE
@@ -226,4 +224,3 @@ Unreferenced_CorrectPartyErrors:
.done
pop de
ret
; 13b87

View File

@@ -1,4 +1,4 @@
IsMailEuropean: ; 1de5c8
IsMailEuropean:
; return 1 if French
; return 2 if German
; return 3 if Italian
@@ -27,18 +27,18 @@ IsMailEuropean: ; 1de5c8
ret
; The regular font.
StandardEnglishFont: ; 1de5e6
StandardEnglishFont:
INCBIN "gfx/font/english.1bpp"
; An extended font.
FrenchGermanFont: ; 1de9e6
FrenchGermanFont:
INCBIN "gfx/font/french_german.1bpp"
; An even more extended font.
SpanishItalianFont: ; 1dede6
SpanishItalianFont:
INCBIN "gfx/font/spanish_italian.1bpp"
HandleFrenchGermanMail: ; 1df1e6
HandleFrenchGermanMail:
; called if mail is french or german
; fix 's 't 'v
ld b, sPartyMon1MailAuthor - sPartyMon1Mail
@@ -68,7 +68,7 @@ HandleFrenchGermanMail: ; 1df1e6
ret
LireLeCourrierAnglais:
DeutenEnglischenPost: ; 1df203
DeutenEnglischenPost:
; Cette fonction convertit certains des caractères anglais pour
; leur équivalent dans le jeu de caractères français.
; Diese Funktion wandelt bestimmte englische Zeichen, um ihre
@@ -99,7 +99,7 @@ DeutenEnglischenPost: ; 1df203
jr nz, .loop
ret
HandleSpanishItalianMail: ; 1df220
HandleSpanishItalianMail:
LeerCorreosIngleses:
LeggiPostaInglese:
; This function converts certain characters between

View File

@@ -1,4 +1,4 @@
EvolvePokemon: ; 421d8
EvolvePokemon:
ld hl, wEvolvableFlags
xor a
ld [hl], a
@@ -6,7 +6,7 @@ EvolvePokemon: ; 421d8
ld c, a
ld b, SET_FLAG
call EvoFlagAction
EvolveAfterBattle: ; 421e6
EvolveAfterBattle:
xor a
ld [wMonTriedToEvolve], a
dec a
@@ -323,7 +323,6 @@ EvolveAfterBattle_MasterLoop:
ld l, e
ld h, d
jp EvolveAfterBattle_MasterLoop
; 423f8
.dont_evolve_1
inc hl
@@ -349,9 +348,8 @@ EvolveAfterBattle_MasterLoop:
and a
call nz, RestartMapMusic
ret
; 42414
UpdateSpeciesNameIfNotNicknamed: ; 42414
UpdateSpeciesNameIfNotNicknamed:
ld a, [wCurSpecies]
push af
ld a, [wBaseDexNo]
@@ -382,17 +380,15 @@ UpdateSpeciesNameIfNotNicknamed: ; 42414
pop de
ld bc, MON_NAME_LENGTH
jp CopyBytes
; 42454
CancelEvolution: ; 42454
CancelEvolution:
ld hl, Text_StoppedEvolving
call PrintText
call ClearTileMap
pop hl
jp EvolveAfterBattle_MasterLoop
; 42461
IsMonHoldingEverstone: ; 42461
IsMonHoldingEverstone:
push hl
ld a, [wCurPartyMon]
ld hl, wPartyMon1Item
@@ -402,7 +398,6 @@ IsMonHoldingEverstone: ; 42461
cp EVERSTONE
pop hl
ret
; 42473
Text_CongratulationsYourPokemon: ; 0x42473
; Congratulations! Your @ @
@@ -429,7 +424,7 @@ Text_WhatEvolving: ; 0x42482
; 0x42487
LearnLevelMoves: ; 42487
LearnLevelMoves:
ld a, [wd265]
ld [wCurPartySpecies], a
dec a
@@ -492,10 +487,9 @@ LearnLevelMoves: ; 42487
ld a, [wCurPartySpecies]
ld [wd265], a
ret
; 424e1
FillMoves: ; 424e1
FillMoves:
; Fill in moves at de for wCurPartySpecies at wCurPartyLevel
push hl
@@ -604,9 +598,8 @@ FillMoves: ; 424e1
pop de
pop hl
ret
; 4256e
ShiftMoves: ; 4256e
ShiftMoves:
ld c, NUM_MOVES - 1
.loop
inc de
@@ -615,18 +608,16 @@ ShiftMoves: ; 4256e
dec c
jr nz, .loop
ret
; 42577
EvoFlagAction: ; 42577
EvoFlagAction:
push de
ld d, $0
predef SmallFarFlagAction
pop de
ret
; 42581
GetPreEvolution: ; 42581
GetPreEvolution:
; Find the first mon to evolve into wCurPartySpecies.
; Return carry and the new species in wCurPartySpecies
@@ -673,4 +664,3 @@ GetPreEvolution: ; 42581
ld [wCurPartySpecies], a
scf
ret
; 425b1

View File

@@ -1,4 +1,4 @@
CalcLevel: ; 50e1b
CalcLevel:
ld a, [wTempMonSpecies]
ld [wCurSpecies], a
call GetBaseData
@@ -30,7 +30,7 @@ CalcLevel: ; 50e1b
dec d
ret
CalcExpAtLevel: ; 50e47
CalcExpAtLevel:
; (a/b)*n**3 + c*n**2 + d*n - e
ld a, [wBaseGrowthRate]
add a
@@ -150,7 +150,7 @@ CalcExpAtLevel: ; 50e47
ld [hMultiplicand], a
ret
.LevelSquared: ; 50eed
.LevelSquared:
xor a
ld [hMultiplicand + 0], a
ld [hMultiplicand + 1], a

View File

@@ -1,4 +1,4 @@
HealParty: ; c658
HealParty:
xor a
ld [wCurPartyMon], a
ld hl, wPartySpecies
@@ -22,7 +22,7 @@ HealParty: ; c658
.done
ret
HealPartyMon: ; c677
HealPartyMon:
ld a, MON_SPECIES
call GetPartyParamLocation
ld d, h
@@ -52,7 +52,7 @@ HealPartyMon: ; c677
farcall RestoreAllPP
ret
ComputeHPBarPixels: ; c699
ComputeHPBarPixels:
; e = bc * (6 * 8) / de
ld a, b
or c
@@ -103,7 +103,7 @@ ComputeHPBarPixels: ; c699
ld e, 0
ret
AnimateHPBar: ; c6e0
AnimateHPBar:
call WaitBGMap
call _AnimateHPBar
call WaitBGMap

View File

@@ -1,4 +1,4 @@
KnowsMove: ; f9ea
KnowsMove:
ld a, MON_MOVES
call GetPartyParamLocation
ld a, [wPutativeTMHMMove]

View File

@@ -1,4 +1,4 @@
LearnMove: ; 6508
LearnMove:
call LoadTileMapToTempTileMap
ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames
@@ -117,9 +117,8 @@ LearnMove: ; 6508
call PrintText
ld b, 1
ret
; 65d3
ForgetMove: ; 65d3
ForgetMove:
push hl
ld hl, Text_TryingToLearn
call PrintText
@@ -200,40 +199,34 @@ ForgetMove: ; 65d3
.cancel
scf
ret
; 666b
Text_LearnedMove: ; 666b
Text_LearnedMove:
; <MON> learned <MOVE>!
text_jump UnknownText_0x1c5660
db "@"
; 6670
Text_ForgetWhich: ; 6670
Text_ForgetWhich:
; Which move should be forgotten?
text_jump UnknownText_0x1c5678
db "@"
; 6675
Text_StopLearning: ; 6675
Text_StopLearning:
; Stop learning <MOVE>?
text_jump UnknownText_0x1c5699
db "@"
; 667a
Text_DidNotLearn: ; 667a
Text_DidNotLearn:
; <MON> did not learn <MOVE>.
text_jump UnknownText_0x1c56af
db "@"
; 667f
Text_TryingToLearn: ; 667f
Text_TryingToLearn:
; <MON> is trying to learn <MOVE>. But <MON> can't learn more than
; four moves. Delete an older move to make room for <MOVE>?
text_jump UnknownText_0x1c56c9
db "@"
; 6684
Text_1_2_and_Poof: ; 6684
Text_1_2_and_Poof:
text_jump UnknownText_0x1c5740 ; 1, 2 and…
start_asm
push de
@@ -247,10 +240,8 @@ Text_1_2_and_Poof: ; 6684
; Poof! <MON> forgot <MOVE>. And…
text_jump UnknownText_0x1c574e
db "@"
; 669a
Text_CantForgetHM: ; 669a
Text_CantForgetHM:
; HM moves can't be forgotten now.
text_jump UnknownText_0x1c5772
db "@"
; 669f

View File

@@ -1,4 +1,4 @@
LevelUpHappinessMod: ; 2709e
LevelUpHappinessMod:
ld a, [wCurPartyMon]
ld hl, wPartyMon1CaughtLocation
call GetPartyLocation

View File

@@ -1,4 +1,4 @@
SendMailToPC: ; 4456e
SendMailToPC:
ld a, MON_ITEM
call GetPartyParamLocation
ld d, [hl]
@@ -37,9 +37,8 @@ SendMailToPC: ; 4456e
.full
scf
ret
; 445c0
DeleteMailFromPC: ; 445c0 (11:45c0)
DeleteMailFromPC:
; Shift all mail messages in the mailbox
ld a, BANK(sMailboxCount)
call GetSRAMBank
@@ -71,9 +70,8 @@ DeleteMailFromPC: ; 445c0 (11:45c0)
ld hl, sMailboxCount
dec [hl]
jp CloseSRAM
; 445f4 (11:45f4)
ReadMailMessage: ; 445f4
ReadMailMessage:
ld a, b
ld hl, sMailbox
ld bc, MAIL_STRUCT_LENGTH
@@ -83,7 +81,7 @@ ReadMailMessage: ; 445f4
farcall ReadAnyMail
ret
MoveMailFromPCToParty: ; 44607
MoveMailFromPCToParty:
ld a, BANK(sMailboxCount)
call GetSRAMBank
push bc
@@ -114,17 +112,15 @@ MoveMailFromPCToParty: ; 44607
call CloseSRAM
pop bc
jp DeleteMailFromPC
; 44648 (11:4648)
GetMailboxCount: ; 44648
GetMailboxCount:
ld a, BANK(sMailboxCount)
call GetSRAMBank
ld a, [sMailboxCount]
ld c, a
jp CloseSRAM
; 44654
CheckPokeMail:: ; 44654
CheckPokeMail::
push bc
push de
farcall SelectMonFromParty
@@ -191,10 +187,9 @@ CheckPokeMail:: ; 44654
.return
ld [wScriptVar], a
ret
; 446cc
GivePokeMail:: ; 446cc
GivePokeMail::
ld a, [wPartyCount]
dec a
push af
@@ -241,10 +236,9 @@ GivePokeMail:: ; 446cc
ld a, b
ld [de], a
jp CloseSRAM
; 44725
BackupPartyMonMail: ; 44725
BackupPartyMonMail:
ld a, BANK(sPartyMail)
call GetSRAMBank
ld hl, sPartyMail
@@ -256,9 +250,8 @@ BackupPartyMonMail: ; 44725
ld bc, 1 + 10 * MAIL_STRUCT_LENGTH
call CopyBytes
jp CloseSRAM
; 44745
RestorePartyMonMail: ; 44745 (11:4745)
RestorePartyMonMail:
ld a, BANK(sPartyMail)
call GetSRAMBank
ld hl, sPartyMailBackup
@@ -271,7 +264,7 @@ RestorePartyMonMail: ; 44745 (11:4745)
call CopyBytes
jp CloseSRAM
DeletePartyMonMail: ; 44765 (11:4765)
DeletePartyMonMail:
ld a, BANK(sPartyMail)
call GetSRAMBank
xor a
@@ -283,10 +276,9 @@ DeletePartyMonMail: ; 44765 (11:4765)
ld bc, 1 + 10 * MAIL_STRUCT_LENGTH
call ByteFill
jp CloseSRAM
; 44781 (11:4781)
IsAnyMonHoldingMail: ; 44781
IsAnyMonHoldingMail:
ld a, [wPartyCount]
and a
jr z, .no_mons
@@ -308,7 +300,6 @@ IsAnyMonHoldingMail: ; 44781
.no_mons
and a
ret
; 447a0
_PlayerMailBoxMenu: ; 0x447a0
call InitMail

View File

@@ -1,11 +1,11 @@
ReadPartyMonMail: ; b9229
ReadPartyMonMail:
ld a, [wCurPartyMon]
ld hl, sPartyMail
ld bc, MAIL_STRUCT_LENGTH
call AddNTimes
ld d, h
ld e, l
ReadAnyMail: ; b9237
ReadAnyMail:
push de
call ClearBGPalettes
call ClearSprites
@@ -63,9 +63,8 @@ ReadAnyMail: ; b9237
pop af
ld [wJumptableIndex], a
jr .loop
; b92b8
.LoadGFX: ; b92b8
.LoadGFX:
ld h, d
ld l, e
push hl
@@ -110,9 +109,8 @@ ReadAnyMail: ; b9237
jp hl
.done
ret
; b92f8
MailGFXPointers: ; b92f8
MailGFXPointers:
dbw FLOWER_MAIL, LoadFlowerMailGFX
dbw SURF_MAIL, LoadSurfMailGFX
dbw LITEBLUEMAIL, LoadLiteBlueMailGFX
@@ -124,9 +122,8 @@ MailGFXPointers: ; b92f8
dbw MUSIC_MAIL, LoadMusicMailGFX
dbw MIRAGE_MAIL, LoadMirageMailGFX
db -1
; b9317
LoadSurfMailGFX: ; b9317
LoadSurfMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, SurfMailBorderGFX
@@ -140,7 +137,7 @@ LoadSurfMailGFX: ; b9317
call LoadMailGFX_Color2
jr FinishLoadingSurfLiteBlueMailGFX
LoadLiteBlueMailGFX: ; b9335
LoadLiteBlueMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, LiteBlueMailBorderGFX
@@ -153,7 +150,7 @@ LoadLiteBlueMailGFX: ; b9335
ld c, 1 * 8
call LoadMailGFX_Color2
FinishLoadingSurfLiteBlueMailGFX: ; b9351
FinishLoadingSurfLiteBlueMailGFX:
ld de, SurfLiteBlueMailSmallShapesGFX
ld c, 2 * 8
call LoadMailGFX_Color2
@@ -209,9 +206,8 @@ FinishLoadingSurfLiteBlueMailGFX: ; b9351
ld [hli], a
pop hl
jp MailGFX_PlaceMessage
; b93d2
LoadEonMailGFX: ; b93d2
LoadEonMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, EonMailBorder1GFX
@@ -259,9 +255,8 @@ LoadEonMailGFX: ; b93d2
call LovelyEonMail_PlaceIcons
pop hl
jp MailGFX_PlaceMessage
; b944b
LoadLovelyMailGFX: ; b944b
LoadLovelyMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, LovelyMailBorderGFX
@@ -290,9 +285,8 @@ LoadLovelyMailGFX: ; b944b
call LovelyEonMail_PlaceIcons
pop hl
jp MailGFX_PlaceMessage
; b9491
LovelyEonMail_PlaceIcons: ; b9491
LovelyEonMail_PlaceIcons:
ld a, $3d
hlcoord 2, 2
call Mail_Draw2x2Graphic
@@ -322,9 +316,8 @@ LovelyEonMail_PlaceIcons: ; b9491
hlcoord 16, 12
ld [hl], a
ret
; b94d6
LoadMorphMailGFX: ; b94d6
LoadMorphMailGFX:
push bc
ld hl, vTiles2 tile $31
ld bc, 5 * 8
@@ -398,9 +391,8 @@ LoadMorphMailGFX: ; b94d6
call Mail_Draw3x2Graphic
pop hl
jp MailGFX_PlaceMessage
; b9582
LoadBlueSkyMailGFX: ; b9582
LoadBlueSkyMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, EonMailBorder1GFX
@@ -476,9 +468,8 @@ LoadBlueSkyMailGFX: ; b9582
call Mail_Draw2x2Graphic
pop hl
jp MailGFX_PlaceMessage
; b9636
Mail_Place6TileRow: ; b9636
Mail_Place6TileRow:
ld b, $6
.loop
ld [hli], a
@@ -486,9 +477,8 @@ Mail_Place6TileRow: ; b9636
dec b
jr nz, .loop
ret
; b963e
LoadFlowerMailGFX: ; b963e
LoadFlowerMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, FlowerMailBorderGFX
@@ -541,9 +531,8 @@ LoadFlowerMailGFX: ; b963e
call Mail_Draw2x2Graphic
pop hl
jp MailGFX_PlaceMessage
; b96ca
LoadPortraitMailGFX: ; b96ca
LoadPortraitMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, PortraitMailBorderGFX
@@ -572,9 +561,8 @@ LoadPortraitMailGFX: ; b96ca
call PrepMonFrontpic
pop hl
jp MailGFX_PlaceMessage
; b9710
LoadMusicMailGFX: ; b9710
LoadMusicMailGFX:
push bc
ld hl, vTiles2 tile $31
ld de, MusicMailBorderGFX
@@ -615,9 +603,8 @@ LoadMusicMailGFX: ; b9710
call LovelyEonMail_PlaceIcons
pop hl
jp MailGFX_PlaceMessage
; b9776
LoadMirageMailGFX: ; b9776
LoadMirageMailGFX:
push bc
ld hl, vTiles2 tile $31
ld bc, 5 * 8
@@ -676,9 +663,8 @@ LoadMirageMailGFX: ; b9776
call Mail_Draw16TileRow
pop hl
jp MailGFX_PlaceMessage
; b97f8
MailGFX_GenerateMonochromeTilesColor2: ; b97f8
MailGFX_GenerateMonochromeTilesColor2:
.loop
xor a
ld [hli], a
@@ -689,9 +675,8 @@ MailGFX_GenerateMonochromeTilesColor2: ; b97f8
or c
jr nz, .loop
ret
; b9803
MailGFX_PlaceMessage: ; b9803
MailGFX_PlaceMessage:
ld bc, MAIL_STRUCT_LENGTH
ld de, wTempMail
ld a, BANK(sPartyMail)
@@ -723,9 +708,8 @@ MailGFX_PlaceMessage: ; b9803
.place_author
jp PlaceString
; b984e
Unreferenced_Functionb984e: ; b984e
Unreferenced_Functionb984e:
.loop
ld a, [hl]
xor $ff
@@ -735,9 +719,8 @@ Unreferenced_Functionb984e: ; b984e
or c
jr nz, .loop
ret
; b9858
DrawMailBorder: ; b9858
DrawMailBorder:
hlcoord 0, 0
ld a, $31
ld [hli], a
@@ -757,9 +740,8 @@ DrawMailBorder: ; b9858
ld a, $38
ld [hl], a
ret
; b987b
DrawMailBorder2: ; b987b
DrawMailBorder2:
hlcoord 0, 0
ld a, $31
ld [hli], a
@@ -778,23 +760,22 @@ DrawMailBorder2: ; b987b
call Mail_DrawLeftRightBorder
ld [hl], $31
ret
; b989e
Mail_Place14TileAlternatingRow: ; b989e
Mail_Place14TileAlternatingRow:
push af
ld b, 14 / 2
jr Mail_PlaceAlternatingRow
Mail_Place16TileAlternatingRow: ; b98a3
Mail_Place16TileAlternatingRow:
push af
ld b, 16 / 2
jr Mail_PlaceAlternatingRow
Mail_Place18TileAlternatingRow: ; b98a8
Mail_Place18TileAlternatingRow:
push af
ld b, 18 / 2
Mail_PlaceAlternatingRow: ; b98ab
Mail_PlaceAlternatingRow:
.loop
ld [hli], a
inc a
@@ -805,18 +786,17 @@ Mail_PlaceAlternatingRow: ; b98ab
ld [hl], a
pop af
ret
; b98b5
Mail_Place14TileAlternatingColumn: ; b98b5
Mail_Place14TileAlternatingColumn:
push af
ld b, 14 / 2
jr Mail_PlaceAlternatingColumn
Mail_Place16TileAlternatingColumn: ; b98ba
Mail_Place16TileAlternatingColumn:
push af
ld b, 16 / 2
Mail_PlaceAlternatingColumn: ; b98bd
Mail_PlaceAlternatingColumn:
.loop
ld [hl], a
ld de, SCREEN_WIDTH
@@ -830,36 +810,34 @@ Mail_PlaceAlternatingColumn: ; b98bd
ld [hl], a
pop af
ret
; b98cc
Mail_Draw7TileRow: ; b98cc
Mail_Draw7TileRow:
ld b, $7
jr Mail_DrawRowLoop
Mail_Draw13TileRow: ; b98d0
Mail_Draw13TileRow:
ld b, $d
jr Mail_DrawRowLoop
Mail_Draw16TileRow: ; b98d4
Mail_Draw16TileRow:
ld b, $10
jr Mail_DrawRowLoop
Mail_DrawTopBottomBorder: ; b98d8
Mail_DrawTopBottomBorder:
ld b, SCREEN_WIDTH - 2
jr Mail_DrawRowLoop
Mail_DrawFullWidthBorder: ; b98dc
Mail_DrawFullWidthBorder:
ld b, SCREEN_WIDTH
Mail_DrawRowLoop: ; b98de
Mail_DrawRowLoop:
.loop
ld [hli], a
dec b
jr nz, .loop
ret
; b98e3
Mail_DrawLeftRightBorder: ; b98e3
Mail_DrawLeftRightBorder:
ld b, SCREEN_HEIGHT - 2
ld de, SCREEN_WIDTH
.loop
@@ -868,9 +846,8 @@ Mail_DrawLeftRightBorder: ; b98e3
dec b
jr nz, .loop
ret
; b98ee
Mail_Draw2x2Graphic: ; b98ee
Mail_Draw2x2Graphic:
push af
ld [hli], a
inc a
@@ -883,9 +860,8 @@ Mail_Draw2x2Graphic: ; b98ee
ld [hl], a
pop af
ret
; b98fc
Mail_Draw3x2Graphic: ; b98fc
Mail_Draw3x2Graphic:
ld [hli], a
inc a
ld [hli], a
@@ -900,9 +876,8 @@ Mail_Draw3x2Graphic: ; b98fc
inc a
ld [hl], a
ret
; b990c
LoadMailGFX_Color1: ; b990c
LoadMailGFX_Color1:
.loop
ld a, [de]
inc de
@@ -912,9 +887,8 @@ LoadMailGFX_Color1: ; b990c
dec c
jr nz, .loop
ret
; b9915
LoadMailGFX_Color2: ; b9915
LoadMailGFX_Color2:
.loop
xor a
ld [hli], a
@@ -924,9 +898,8 @@ LoadMailGFX_Color2: ; b9915
dec c
jr nz, .loop
ret
; b991e
LoadMailGFX_Color3: ; b991e
LoadMailGFX_Color3:
.loop
ld a, [de]
inc de
@@ -935,15 +908,13 @@ LoadMailGFX_Color3: ; b991e
dec c
jr nz, .loop
ret
; b9926
INCLUDE "gfx/mail.asm"
ItemIsMail: ; b9e76
ItemIsMail:
ld a, d
ld hl, MailItems
ld de, 1
jp IsInArray
; b9e80
INCLUDE "data/items/mail_items.asm"

View File

@@ -1,6 +1,6 @@
INCLUDE "data/mon_menu.asm"
MonSubmenu: ; 24d19
MonSubmenu:
xor a
ld [hBGMapMode], a
call GetMonSubmenuItems
@@ -17,16 +17,14 @@ MonSubmenu: ; 24d19
call ExitMenu
ret
; 24d3f
.MenuHeader: ; 24d3f
.MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 6, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw 0
db 1 ; default option
; 24d47
.GetTopCoord: ; 24d47
.GetTopCoord:
; TopCoord = 1 + BottomCoord - 2 * (NumSubmenuItems + 1)
ld a, [wBuffer1]
inc a
@@ -38,9 +36,8 @@ MonSubmenu: ; 24d19
ld [wMenuBorderTopCoord], a
call MenuBox
ret
; 24d59
MonMenuLoop: ; 24d59
MonMenuLoop:
.loop
ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags
ld [wMenuDataFlags], a
@@ -72,9 +69,8 @@ MonMenuLoop: ; 24d59
add hl, bc
ld a, [hl]
ret
; 24d91
PopulateMonMenu: ; 24d91
PopulateMonMenu:
call MenuBoxCoord2Tile
ld bc, 2 * SCREEN_WIDTH + 2
add hl, bc
@@ -93,9 +89,8 @@ PopulateMonMenu: ; 24d91
add hl, bc
pop de
jr .loop
; 24db0
GetMonMenuString: ; 24db0
GetMonMenuString:
ld hl, MonMenuOptions + 1
ld de, 3
call IsInArray
@@ -118,9 +113,8 @@ GetMonMenuString: ; 24db0
ld d, h
ld e, l
ret
; 24dd4
GetMonSubmenuItems: ; 24dd4
GetMonSubmenuItems:
call ResetMonSubmenu
ld a, [wCurPartySpecies]
cp EGG
@@ -195,9 +189,8 @@ GetMonSubmenuItems: ; 24dd4
call AddMonMenuItem
call TerminateMonSubmenu
ret
; 24e52
IsFieldMove: ; 24e52
IsFieldMove:
ld b, a
ld hl, MonMenuOptions
.next
@@ -216,18 +209,16 @@ IsFieldMove: ; 24e52
.nope
ret
; 24e68
ResetMonSubmenu: ; 24e68
ResetMonSubmenu:
xor a
ld [wBuffer1], a
ld hl, wBuffer2
ld bc, NUM_MONMENU_ITEMS + 1
call ByteFill
ret
; 24e76
TerminateMonSubmenu: ; 24e76
TerminateMonSubmenu:
ld a, [wBuffer1]
ld e, a
ld d, 0
@@ -235,9 +226,8 @@ TerminateMonSubmenu: ; 24e76
add hl, de
ld [hl], -1
ret
; 24e83
AddMonMenuItem: ; 24e83
AddMonMenuItem:
push hl
push de
push af
@@ -253,9 +243,8 @@ AddMonMenuItem: ; 24e83
pop de
pop hl
ret
; 24e99
BattleMonMenu: ; 24e99
BattleMonMenu:
ld hl, MenuHeader_0x24ed4
call CopyMenuHeader
xor a
@@ -286,19 +275,16 @@ BattleMonMenu: ; 24e99
.clear_carry
and a
ret
; 24ed4
MenuHeader_0x24ed4: ; 24ed4
MenuHeader_0x24ed4:
db 0 ; flags
menu_coords 11, 11, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw MenuData_0x24edc
db 1 ; default option
; 24edc
MenuData_0x24edc: ; 24edc
MenuData_0x24edc:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3 ; items
db "SWITCH@"
db "STATS@"
db "CANCEL@"
; 24ef2

View File

@@ -1,11 +1,11 @@
DrawPlayerHP: ; 50b0a
DrawPlayerHP:
ld a, $1
jr DrawHP
DrawEnemyHP: ; 50b0e
DrawEnemyHP:
ld a, $2
DrawHP: ; 50b10
DrawHP:
ld [wWhichHPBar], a
push hl
push bc
@@ -82,7 +82,7 @@ DrawHP: ; 50b10
pop de
ret
PrintTempMonStats: ; 50b7b
PrintTempMonStats:
; Print wTempMon's stats at hl, with spacing bc.
push bc
push hl
@@ -105,7 +105,7 @@ PrintTempMonStats: ; 50b7b
ld de, wTempMonSpeed
jp PrintNum
.PrintStat: ; 50bab
.PrintStat:
push hl
call PrintNum
pop hl
@@ -113,7 +113,7 @@ PrintTempMonStats: ; 50b7b
add hl, de
ret
.StatNames: ; 50bb5
.StatNames:
db "ATTACK"
next "DEFENSE"
next "SPCL.ATK"
@@ -121,7 +121,7 @@ PrintTempMonStats: ; 50b7b
next "SPEED"
next "@"
GetGender: ; 50bdd
GetGender:
; Return the gender of a given monster (wCurPartyMon/wCurOTMon/wCurWildMon).
; When calling this function, a should be set to an appropriate wMonType value.
@@ -235,7 +235,7 @@ GetGender: ; 50bdd
scf
ret
ListMovePP: ; 50c50
ListMovePP:
ld a, [wNumMoves]
inc a
ld c, a
@@ -316,7 +316,7 @@ ListMovePP: ; 50c50
.done
ret
.load_loop ; 50cc9
.load_loop
ld [hli], a
ld [hld], a
add hl, de
@@ -324,7 +324,7 @@ ListMovePP: ; 50c50
jr nz, .load_loop
ret
Unreferenced_Function50cd0: ; 50cd0
Unreferenced_Function50cd0:
.loop
ld [hl], $32
inc hl
@@ -363,7 +363,7 @@ Unused_PlaceEnemyHPLevel:
.egg
ret
PlaceStatusString: ; 50d0a
PlaceStatusString:
push de
inc de
inc de
@@ -382,10 +382,10 @@ PlaceStatusString: ; 50d0a
and a
ret
FntString: ; 50d22
FntString:
db "FNT@"
CopyStatusString: ; 50d25
CopyStatusString:
ld a, [de]
inc de
ld [hli], a
@@ -396,7 +396,7 @@ CopyStatusString: ; 50d25
ld [hl], a
ret
PlaceNonFaintStatus: ; 50d2e
PlaceNonFaintStatus:
push de
ld a, [de]
ld de, PsnString
@@ -430,7 +430,7 @@ BrnString: db "BRN@"
FrzString: db "FRZ@"
ParString: db "PAR@"
ListMoves: ; 50d6f
ListMoves:
; List moves at hl, spaced every [wBuffer1] tiles.
ld de, wListMoves_MoveIndicesBuffer
ld b, $0

View File

@@ -1,4 +1,4 @@
TryAddMonToParty: ; d88c
TryAddMonToParty:
; Check if to copy wild mon or generate a new one
; Whose is it?
ld de, wPartyCount
@@ -76,7 +76,7 @@ TryAddMonToParty: ; d88c
dec a
ld bc, PARTYMON_STRUCT_LENGTH
call AddNTimes
GeneratePartyMonStats: ; d906
GeneratePartyMonStats:
; wBattleMode specifies whether it's a wild mon or not.
; wMonType specifies whether it's an opposing mon or not.
; wCurPartySpecies/wCurPartyLevel specify the species and level.
@@ -360,9 +360,8 @@ endr
.done
scf ; When this function returns, the carry flag indicates success vs failure.
ret
; da6d
FillPP: ; da6d
FillPP:
push bc
ld b, NUM_MOVES
.loop
@@ -391,9 +390,8 @@ FillPP: ; da6d
jr nz, .loop
pop bc
ret
; da96
AddTempmonToParty: ; da96
AddTempmonToParty:
ld hl, wPartyCount
ld a, [hl]
cp PARTY_LENGTH
@@ -477,7 +475,7 @@ AddTempmonToParty: ; da96
and a
ret
SendGetMonIntoFromBox: ; db3f
SendGetMonIntoFromBox:
; Sents/Gets mon into/from Box depending on Parameter
; wPokemonWithdrawDepositParameter == 0: get mon into Party
; wPokemonWithdrawDepositParameter == 1: sent mon into Box
@@ -702,15 +700,13 @@ SendGetMonIntoFromBox: ; db3f
call CloseSRAM
and a
ret
; dcb1
CloseSRAM_And_SetCarryFlag: ; dcb1
CloseSRAM_And_SetCarryFlag:
call CloseSRAM
scf
ret
; dcb6
RestorePPofDepositedPokemon: ; dcb6
RestorePPofDepositedPokemon:
ld a, b
ld hl, sBoxMons
ld bc, BOXMON_STRUCT_LENGTH
@@ -773,9 +769,8 @@ RestorePPofDepositedPokemon: ; dcb6
pop af
ld [wMenuCursorY], a
ret
; dd21
RetrieveMonFromDayCareMan: ; dd21
RetrieveMonFromDayCareMan:
ld a, [wBreedMon1Species]
ld [wCurPartySpecies], a
ld de, SFX_TRANSACTION
@@ -789,9 +784,8 @@ RetrieveMonFromDayCareMan: ; dd21
xor a
ld [wPokemonWithdrawDepositParameter], a
jp RetrieveBreedmon
; dd42
RetrieveMonFromDayCareLady: ; dd42
RetrieveMonFromDayCareLady:
ld a, [wBreedMon2Species]
ld [wCurPartySpecies], a
ld de, SFX_TRANSACTION
@@ -805,9 +799,8 @@ RetrieveMonFromDayCareLady: ; dd42
ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a
jp RetrieveBreedmon
; dd64
RetrieveBreedmon: ; dd64
RetrieveBreedmon:
ld hl, wPartyCount
ld a, [hl]
cp PARTY_LENGTH
@@ -902,9 +895,8 @@ RetrieveBreedmon: ; dd64
ld [hl], a
and a
ret
; de1a
GetLastPartyMon: ; de1a
GetLastPartyMon:
ld a, [wPartyCount]
dec a
ld hl, wPartyMon1Species
@@ -913,25 +905,22 @@ GetLastPartyMon: ; de1a
ld d, h
ld e, l
ret
; de2a
DepositMonWithDayCareMan: ; de2a
DepositMonWithDayCareMan:
ld de, wBreedMon1Nick
call DepositBreedmon
xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a
jp RemoveMonFromPartyOrBox
; de37
DepositMonWithDayCareLady: ; de37
DepositMonWithDayCareLady:
ld de, wBreedMon2Nick
call DepositBreedmon
xor a ; REMOVE_PARTY
ld [wPokemonWithdrawDepositParameter], a
jp RemoveMonFromPartyOrBox
; de44
DepositBreedmon: ; de44
DepositBreedmon:
ld a, [wCurPartyMon]
ld hl, wPartyMonNicknames
call SkipNames
@@ -947,7 +936,7 @@ DepositBreedmon: ; de44
ld bc, BOXMON_STRUCT_LENGTH
jp CopyBytes
SendMonIntoBox: ; de6e
SendMonIntoBox:
; Sends the mon into one of Bills Boxes
; the data comes mainly from 'wEnemyMon:'
ld a, BANK(sBoxCount)
@@ -1073,15 +1062,13 @@ SendMonIntoBox: ; de6e
call CloseSRAM
scf
ret
; df42
.full ; df42
.full
call CloseSRAM
and a
ret
; df47
ShiftBoxMon: ; df47
ShiftBoxMon:
ld hl, sBoxMonOT
ld bc, NAME_LENGTH
call .shift
@@ -1127,9 +1114,8 @@ ShiftBoxMon: ; df47
or b
jr nz, .loop
ret
; df8c
GiveEgg:: ; df8c
GiveEgg::
ld a, [wCurPartySpecies]
push af
callfar GetPreEvolution
@@ -1226,13 +1212,11 @@ GiveEgg:: ; df8c
ld [hl], a
and a
ret
; e035
String_Egg: ; e035
String_Egg:
db "EGG@"
; e039
RemoveMonFromPartyOrBox: ; e039
RemoveMonFromPartyOrBox:
ld hl, wPartyCount
ld a, [wPokemonWithdrawDepositParameter]
@@ -1382,10 +1366,9 @@ RemoveMonFromPartyOrBox: ; e039
jr nz, .loop2
.close_sram
jp CloseSRAM
; e134
ComputeNPCTrademonStats: ; e134
ComputeNPCTrademonStats:
ld a, MON_LEVEL
call GetPartyParamLocation
ld a, [hl]
@@ -1413,9 +1396,8 @@ ComputeNPCTrademonStats: ; e134
ld a, [de]
ld [hl], a
ret
; e167
CalcMonStats: ; e167
CalcMonStats:
; Calculates all 6 Stats of a mon
; b: Take into account stat EXP if TRUE
; 'c' counts from 1-6 and points with 'wBaseStats' to the base value
@@ -1436,9 +1418,8 @@ CalcMonStats: ; e167
cp STAT_SDEF
jr nz, .loop
ret
; e17b
CalcMonStatC: ; e17b
CalcMonStatC:
; 'c' is 1-6 and points to the BaseStat
; 1: HP
; 2: Attack
@@ -1632,9 +1613,8 @@ CalcMonStatC: ; e17b
pop de
pop hl
ret
; e277
GivePoke:: ; e277
GivePoke::
push de
push bc
xor a ; PARTYMON
@@ -1812,14 +1792,12 @@ GivePoke:: ; e277
call CloseSRAM
ld b, $1
ret
; e3d4
.FailedToGiveMon: ; e3d4
.FailedToGiveMon:
pop bc
pop de
ld b, $2
ret
; e3d9
TextJump_WasSentToBillsPC: ; 0xe3d9
; was sent to BILL's PC.
@@ -1827,7 +1805,7 @@ TextJump_WasSentToBillsPC: ; 0xe3d9
db "@"
; 0xe3de
InitNickname: ; e3de
InitNickname:
push de
call LoadStandardMenuHeader
call DisableSpriteUpdates
@@ -1842,4 +1820,3 @@ InitNickname: ; e3de
ld hl, ExitAllMenus
rst FarCall
ret
; e3fd

View File

@@ -1,4 +1,4 @@
InsertPokemonIntoBox: ; 51322
InsertPokemonIntoBox:
ld a, BANK(sBoxCount)
call GetSRAMBank
ld hl, sBoxCount
@@ -37,7 +37,7 @@ InsertPokemonIntoBox: ; 51322
farcall RestorePPofDepositedPokemon
jp CloseSRAM
InsertPokemonIntoParty: ; 5138b
InsertPokemonIntoParty:
ld hl, wPartyCount
call InsertSpeciesIntoBoxOrParty
ld a, [wPartyCount]
@@ -63,7 +63,7 @@ InsertPokemonIntoParty: ; 5138b
call InsertDataIntoBoxOrParty
ret
InsertSpeciesIntoBoxOrParty: ; 513cb
InsertSpeciesIntoBoxOrParty:
inc [hl]
inc hl
ld a, [wCurPartyMon]
@@ -81,7 +81,7 @@ InsertSpeciesIntoBoxOrParty: ; 513cb
jr nz, .loop
ret
InsertDataIntoBoxOrParty: ; 513e0
InsertDataIntoBoxOrParty:
push de
push hl
push bc

Some files were not shown because too many files have changed in this diff Show More