diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-06-25 02:10:37 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-06-25 02:10:37 +0200 |
| commit | 5efce10789bc8291ca5517bdeaacab95459b3fdb (patch) | |
| tree | 94eaaa56e9c7d869dd6ffe86be1abc0af3ccc2b9 /engine/pokemon | |
| parent | 0cbe04da44744073c4c164df970b1571b1fda1a6 (diff) | |
Remove even more address comments
That should be all of them this time
Diffstat (limited to 'engine/pokemon')
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 24 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc_top.asm | 16 | ||||
| -rw-r--r-- | engine/pokemon/breeding.asm | 32 | ||||
| -rw-r--r-- | engine/pokemon/caught_data.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/evolve.asm | 12 | ||||
| -rw-r--r-- | engine/pokemon/knows_move.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/mail.asm | 48 | ||||
| -rw-r--r-- | engine/pokemon/move_mon.asm | 3 | ||||
| -rw-r--r-- | engine/pokemon/party_menu.asm | 59 | ||||
| -rw-r--r-- | engine/pokemon/search.asm | 12 | ||||
| -rw-r--r-- | engine/pokemon/stats_screen.asm | 15 |
11 files changed, 86 insertions, 139 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 312164b49..d2de035ae 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -231,7 +231,6 @@ BillsPCDepositMenuHeader: ; 0xe253d (38:653d) menu_coords 9, 4, SCREEN_WIDTH - 1, 13 dw .MenuData db 1 ; default option -; 0xe2545 .MenuData: ; 0xe2545 (38:6545) db STATICMENU_CURSOR ; flags @@ -482,21 +481,19 @@ BillsPC_Withdraw: ld [wJumptableIndex], a ret -.MenuHeader: ; 0xe2731 +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, 13 dw .MenuData db 1 ; default option -; 0xe2739 -.MenuData: ; 0xe2739 +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "WITHDRAW@" db "STATS@" db "RELEASE@" db "CANCEL@" -; 0xe2759 _MovePKMNWithoutMail: ld hl, wOptions @@ -694,20 +691,18 @@ _MovePKMNWithoutMail: ld [wJumptableIndex], a ret -.MenuHeader: ; 0xe28c3 +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 9, 4, SCREEN_WIDTH - 1, 13 dw .MenuData db 1 ; default option -; 0xe28cb -.MenuData: ; 0xe28cb +.MenuData: db STATICMENU_CURSOR ; flags db 3 ; items db "MOVE@" db "STATS@" db "CANCEL@" -; 0xe28df .PrepInsertCursor: xor a @@ -2272,14 +2267,13 @@ BillsPC_ClearTilemap: call ByteFill ret -_ChangeBox_MenuHeader: ; 0xe35f1 +_ChangeBox_MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 1, 5, 9, 12 dw .MenuData db 1 ; default option -; 0xe35f9 -.MenuData ; 0xe35f9 +.MenuData db MENU_UNUSED_1 | MENU_UNUSED_3 ; flags db 4, 0 db 1 @@ -2488,21 +2482,19 @@ BillsPC_ChangeBoxSubmenu: hlcoord 11, 7 ; unused -.MenuHeader: ; 0xe377b +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 11, 4, SCREEN_WIDTH - 1, 13 dw .MenuData db 1 ; default option -; 0xe3783 -.MenuData: ; 0xe3783 +.MenuData: db STATICMENU_CURSOR ; flags db 4 ; items db "SWITCH@" db "NAME@" db "PRINT@" db "QUIT@" -; 0xe379c BillsPC_PlaceChooseABoxString: ld de, .ChooseABox diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index d3b55ccce..550892f65 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -14,7 +14,7 @@ _BillsPC: scf ret -.Text_GottaHavePokemon: ; 0xe417 +.Text_GottaHavePokemon: ; You gotta have #MON to call! text_jump UnknownText_0x1c1006 db "@" @@ -35,7 +35,7 @@ _BillsPC: call LoadFontsBattleExtra ret -.Text_What: ; 0xe43a +.Text_What: ; What? text_jump UnknownText_0x1c1024 db "@" @@ -68,13 +68,13 @@ _BillsPC: call CloseWindow ret -.MenuHeader: ; 0xe46f +.MenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1 dw .MenuData db 1 ; default option -.MenuData: ; 0xe477 +.MenuData: db STATICMENU_CURSOR ; flags db 0 ; items dw .items @@ -128,7 +128,7 @@ BillsPC_MovePKMNMenu: and a ret -.Text_MonHoldingMail: ; 0xe4f9 +.Text_MonHoldingMail: ; There is a #MON holding MAIL. Please remove the MAIL. text_jump UnknownText_0x1c102b db "@" @@ -163,12 +163,12 @@ Unreferenced_Functione512: scf ret -.Text_NoMon: ; 0xe52e +.Text_NoMon: ; You don't have a single #MON! text_jump UnknownText_0x1c1062 db "@" -.Text_ItsYourLastMon: ; 0xe533 +.Text_ItsYourLastMon: ; You can't deposit your last #MON! text_jump UnknownText_0x1c1080 db "@" @@ -224,7 +224,7 @@ Unreferenced_Functione56d: scf ret -UnknownText_0xe57e: ; 0xe57e +UnknownText_0xe57e: ; You can't take any more #MON. text_jump UnknownText_0x1c10a2 db "@" diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index 4f4319be1..f4aafe5d9 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -355,7 +355,7 @@ HatchEggs: .done ret -.Text_HatchEgg: ; 0x1708b +.Text_HatchEgg: ; Huh? @ @ text_jump UnknownText_0x1c0db0 start_asm @@ -377,23 +377,20 @@ HatchEggs: ld hl, .CameOutOfItsEgg ret -.ClearTextbox: ; 0x170b0 +.ClearTextbox: ; text_jump UnknownText_0x1c0db8 db "@" -; 0x170b5 -.CameOutOfItsEgg: ; 0x170b5 +.CameOutOfItsEgg: ; came out of its EGG!@ @ text_jump UnknownText_0x1c0dba db "@" -; 0x170ba -.Text_NicknameHatchling: ; 0x170ba +.Text_NicknameHatchling: ; Give a nickname to @ ? text_jump UnknownText_0x1c0dd8 db "@" -; 0x170bf InitEggMoves: call GetHeritableMoves @@ -898,17 +895,15 @@ DayCareMon2: DayCareMonCursor: jp WaitPressAorB_BlinkCursor -DayCareMon2Text: ; 0x17462 +DayCareMon2Text: ; It's @ that was left with the DAY-CARE LADY. text_jump UnknownText_0x1c0df3 db "@" -; 0x17467 -DayCareMon1Text: ; 0x17467 +DayCareMon1Text: ; It's @ that was left with the DAY-CARE MAN. text_jump UnknownText_0x1c0e24 db "@" -; 0x1746c DayCareMonCompatibilityText: push bc @@ -935,35 +930,30 @@ DayCareMonCompatibilityText: .done ret -.AllAlone: ; 0x1749c +.AllAlone: ; It's brimming with energy. text_jump UnknownText_0x1c0e54 db "@" -; 0x174a1 -.Incompatible: ; 0x174a1 +.Incompatible: ; It has no interest in @ . text_jump UnknownText_0x1c0e6f db "@" -; 0x174a6 -.HighCompatibility: ; 0x174a6 +.HighCompatibility: ; It appears to care for @ . text_jump UnknownText_0x1c0e8d db "@" -; 0x174ab -.ModerateCompatibility: ; 0x174ab +.ModerateCompatibility: ; It's friendly with @ . text_jump UnknownText_0x1c0eac db "@" -; 0x174b0 -.SlightCompatibility: ; 0x174b0 +.SlightCompatibility: ; It shows interest in @ . text_jump UnknownText_0x1c0ec6 db "@" -; 0x174b5 Unreferenced_DayCareMonPrintEmptyString: ld hl, .string diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm index a3edecb2d..89d22fdf6 100644 --- a/engine/pokemon/caught_data.asm +++ b/engine/pokemon/caught_data.asm @@ -156,7 +156,7 @@ GiveANickname_YesNo: call PrintText jp YesNoBox -TextJump_GiveANickname: ; 0x4db44 +TextJump_GiveANickname: ; Give a nickname to the @ you received? text_jump UnknownText_0x1c12fc db "@" diff --git a/engine/pokemon/evolve.asm b/engine/pokemon/evolve.asm index ad17ca43e..dab58a44f 100644 --- a/engine/pokemon/evolve.asm +++ b/engine/pokemon/evolve.asm @@ -399,29 +399,25 @@ IsMonHoldingEverstone: pop hl ret -Text_CongratulationsYourPokemon: ; 0x42473 +Text_CongratulationsYourPokemon: ; Congratulations! Your @ @ text_jump UnknownText_0x1c4b92 db "@" -; 0x42478 -Text_EvolvedIntoPKMN: ; 0x42478 +Text_EvolvedIntoPKMN: ; evolved into @ ! text_jump UnknownText_0x1c4baf db "@" -; 0x4247d -Text_StoppedEvolving: ; 0x4247d +Text_StoppedEvolving: ; Huh? @ stopped evolving! text_jump UnknownText_0x1c4bc5 db "@" -; 0x42482 -Text_WhatEvolving: ; 0x42482 +Text_WhatEvolving: ; What? @ is evolving! text_jump UnknownText_0x1c4be3 db "@" -; 0x42487 LearnLevelMoves: diff --git a/engine/pokemon/knows_move.asm b/engine/pokemon/knows_move.asm index 16021450f..d84a0d424 100644 --- a/engine/pokemon/knows_move.asm +++ b/engine/pokemon/knows_move.asm @@ -19,7 +19,7 @@ KnowsMove: scf ret -.Text_knows: ; 0xfa06 +.Text_knows: ; knows @ . text_jump UnknownText_0x1c5ea8 db "@" diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index c14d1006b..caaf6f01b 100644 --- a/engine/pokemon/mail.asm +++ b/engine/pokemon/mail.asm @@ -301,7 +301,7 @@ IsAnyMonHoldingMail: and a ret -_PlayerMailBoxMenu: ; 0x447a0 +_PlayerMailBoxMenu: call InitMail jr z, .nomail call LoadStandardMenuHeader @@ -311,13 +311,12 @@ _PlayerMailBoxMenu: ; 0x447a0 .nomail ld hl, .EmptyMailboxText jp MenuTextBoxBackup -; 0x447b4 -.EmptyMailboxText: ; 0x447b4 +.EmptyMailboxText: text_jump _EmptyMailboxText db "@" -InitMail: ; 0x447b9 +InitMail: ; initialize wMailboxCount and beyond with incrementing values, one per mail ; set z if no mail ld a, BANK(sMailboxCount) @@ -344,9 +343,8 @@ InitMail: ; 0x447b9 ld a, [wMailboxCount] and a ret -; 0x447da -MailboxPC_GetMailAuthor: ; 0x447da +MailboxPC_GetMailAuthor: dec a ld hl, sMailbox1Author ld bc, MAIL_STRUCT_LENGTH @@ -362,17 +360,15 @@ MailboxPC_GetMailAuthor: ; 0x447da call CloseSRAM pop de ret -; 0x447fb -MailboxPC_PrintMailAuthor: ; 0x447fb +MailboxPC_PrintMailAuthor: push de ld a, [wMenuSelection] call MailboxPC_GetMailAuthor pop hl jp PlaceString -; 0x44806 -MailboxPC: ; 0x44806 +MailboxPC: xor a ld [wCurMessageScrollPosition], a ld a, 1 @@ -405,9 +401,8 @@ MailboxPC: ; 0x44806 .exit xor a ret -; 0x4484a -.Submenu: ; 0x4484a +.Submenu: ld hl, .SubMenuHeader call LoadMenuHeader call VerticalMenu @@ -420,7 +415,6 @@ MailboxPC: ; 0x44806 .subexit ret -; 0x44861 .JumpTable: dw .ReadMail @@ -428,16 +422,15 @@ MailboxPC: ; 0x44806 dw .AttachMail dw .Cancel -.ReadMail: ; 0x44869 +.ReadMail: call FadeToMenu ld a, [wMenuSelection] dec a ld b, a call ReadMailMessage jp CloseSubmenu -; 0x44877 -.PutInPack: ; 0x44877 +.PutInPack: ld hl, .MessageLostText call MenuTextBox call YesNoBox @@ -461,21 +454,20 @@ MailboxPC: ; 0x44806 call DeleteMailFromPC ld hl, .PutAwayText jp MenuTextBoxBackup -; 0x448ac -.PutAwayText: ; 0x448ac +.PutAwayText: text_jump ClearedMailPutAwayText db "@" -.PackFullText: ; 0x448b1 +.PackFullText: text_jump MailPackFullText db "@" -.MessageLostText: ; 0x448b6 +.MessageLostText: text_jump MailMessageLostText db "@" -.GetMailType: ; 0x448bb +.GetMailType: push af ld a, BANK(sMailboxCount) call GetSRAMBank @@ -486,9 +478,8 @@ MailboxPC: ; 0x44806 ld a, [hl] ld [wCurItem], a jp CloseSRAM -; 0x448d2 -.AttachMail: ; 0x448d2 +.AttachMail: call FadeToMenu xor a ld [wPartyMenuActionText], a @@ -531,24 +522,23 @@ MailboxPC: ; 0x44806 .exit2 jp CloseSubmenu -; 0x4493c -.HoldingMailText: ; 0x4493c +.HoldingMailText: text_jump MailAlreadyHoldingItemText db "@" -.EggText: ; 0x44941 +.EggText: text_jump MailEggText db "@" -.MailMovedText: ; 0x44946 +.MailMovedText: text_jump MailMovedFromBoxText db "@" .Cancel: ret -.TopMenuHeader: ; 0x4494c +.TopMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 8, 1, SCREEN_WIDTH - 2, 10 dw .TopMenuData @@ -563,7 +553,7 @@ MailboxPC: ; 0x44806 dba NULL dba NULL -.SubMenuHeader: ; 0x44964 +.SubMenuHeader: db MENU_BACKUP_TILES ; flags menu_coords 0, 0, 13, 9 dw .SubMenuData diff --git a/engine/pokemon/move_mon.asm b/engine/pokemon/move_mon.asm index 12d48e9ba..9e253846a 100644 --- a/engine/pokemon/move_mon.asm +++ b/engine/pokemon/move_mon.asm @@ -1799,11 +1799,10 @@ GivePoke:: ld b, $2 ret -TextJump_WasSentToBillsPC: ; 0xe3d9 +TextJump_WasSentToBillsPC: ; was sent to BILL's PC. text_jump Text_WasSentToBillsPC db "@" -; 0xe3de InitNickname: push de diff --git a/engine/pokemon/party_menu.asm b/engine/pokemon/party_menu.asm index 91509e40d..638e046b4 100644 --- a/engine/pokemon/party_menu.asm +++ b/engine/pokemon/party_menu.asm @@ -42,7 +42,7 @@ LoadPartyMenuGFX: ret -WritePartyMenuTilemap: ; 0x5005f +WritePartyMenuTilemap: ld hl, wOptions ld a, [hl] push af @@ -67,7 +67,6 @@ WritePartyMenuTilemap: ; 0x5005f pop af ld [wOptions], a ret -; 0x50089 .Jumptable: ; entries correspond to PARTYMENUQUALITY_* constants @@ -644,7 +643,7 @@ InitPartyMenuWithCancel: ld [wMenuJoypadFilter], a ret -InitPartyMenuNoCancel: ; 0x5042d +InitPartyMenuNoCancel: ; no cancel ld de, PartyMenuAttributes call SetMenuAttributes @@ -680,7 +679,7 @@ PartyMenuAttributes: dn 2, 0 db 0 -PartyMenuSelect: ; 0x50457 +PartyMenuSelect: ; sets carry if exitted menu. call StaticMenuJoypad call PlaceHollowCursor @@ -717,7 +716,6 @@ PartyMenuSelect: ; 0x50457 call WaitSFX scf ret -; 0x5049a PrintPartyMenuText: @@ -750,9 +748,8 @@ PrintPartyMenuText: pop af ld [wOptions], a ret -; 0x504d2 -PartyMenuStrings: ; 0x504d2 +PartyMenuStrings: dw ChooseAMonString dw UseOnWhichPKMNString dw WhichPKMNString @@ -763,33 +760,33 @@ PartyMenuStrings: ; 0x504d2 dw ChooseAMonString ; Probably used to be ChooseAMalePKMNString dw ToWhichPKMNString -ChooseAMonString: ; 0x504e4 +ChooseAMonString: db "Choose a #MON.@" -UseOnWhichPKMNString: ; 0x504f3 +UseOnWhichPKMNString: db "Use on which <PK><MN>?@" -WhichPKMNString: ; 0x50504 +WhichPKMNString: db "Which <PK><MN>?@" -TeachWhichPKMNString: ; 0x5050e +TeachWhichPKMNString: db "Teach which <PK><MN>?@" -MoveToWhereString: ; 0x5051e +MoveToWhereString: db "Move to where?@" -ChooseAFemalePKMNString: ; 0x5052d +ChooseAFemalePKMNString: ; unused db "Choose a ♀<PK><MN>.@" -ChooseAMalePKMNString: ; 0x5053b +ChooseAMalePKMNString: ; unused db "Choose a ♂<PK><MN>.@" -ToWhichPKMNString: ; 0x50549 +ToWhichPKMNString: db "To which <PK><MN>?@" -YouHaveNoPKMNString: ; 0x50556 +YouHaveNoPKMNString: db "You have no <PK><MN>!@" PrintPartyMenuActionText: @@ -815,65 +812,55 @@ PrintPartyMenuActionText: dw .Text_GrewToLevel dw .Text_CameToItsSenses -.Text_RecoveredSomeHP: ; 0x5058f +.Text_RecoveredSomeHP: ; recovered @ HP! text_jump UnknownText_0x1bc0a2 db "@" -; 0x50594 -.Text_CuredOfPoison: ; 0x50594 +.Text_CuredOfPoison: ; 's cured of poison. text_jump UnknownText_0x1bc0bb db "@" -; 0x50599 -.Text_RidOfParalysis: ; 0x50599 +.Text_RidOfParalysis: ; 's rid of paralysis. text_jump UnknownText_0x1bc0d2 db "@" -; 0x5059e -.Text_BurnWasHealed: ; 0x5059e +.Text_BurnWasHealed: ; 's burn was healed. text_jump UnknownText_0x1bc0ea db "@" -; 0x505a3 -.Text_Defrosted: ; 0x505a3 +.Text_Defrosted: ; was defrosted. text_jump UnknownText_0x1bc101 db "@" -; 0x505a8 -.Text_WokeUp: ; 0x505a8 +.Text_WokeUp: ; woke up. text_jump UnknownText_0x1bc115 db "@" -; 0x505ad -.Text_HealthReturned: ; 0x505ad +.Text_HealthReturned: ; 's health returned. text_jump UnknownText_0x1bc123 db "@" -; 0x505b2 -.Text_Revitalized: ; 0x505b2 +.Text_Revitalized: ; is revitalized. text_jump UnknownText_0x1bc13a db "@" -; 0x505b7 -.Text_GrewToLevel: ; 0x505b7 +.Text_GrewToLevel: ; grew to level @ !@ @ text_jump UnknownText_0x1bc14f db "@" -; 0x505bc -.Text_CameToItsSenses: ; 0x505bc +.Text_CameToItsSenses: ; came to its senses. text_jump UnknownText_0x1bc16e db "@" -; 0x505c1 .PrintText: diff --git a/engine/pokemon/search.asm b/engine/pokemon/search.asm index ec3f838ce..9a66169fb 100644 --- a/engine/pokemon/search.asm +++ b/engine/pokemon/search.asm @@ -1,4 +1,4 @@ -BeastsCheck: ; 0x4a6e8 +BeastsCheck: ; Check if the player owns all three legendary beasts. ; They must exist in either party or PC, and have the player's OT and ID. ; Return the result in wScriptVar. @@ -29,7 +29,7 @@ BeastsCheck: ; 0x4a6e8 ret -MonCheck: ; 0x4a711 +MonCheck: ; Check if the player owns any Pokémon of the species in wScriptVar. ; Return the result in wScriptVar. @@ -47,7 +47,7 @@ MonCheck: ; 0x4a711 ret -CheckOwnMonAnywhere: ; 0x4a721 +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. @@ -179,7 +179,7 @@ CheckOwnMonAnywhere: ; 0x4a721 ret -CheckOwnMon: ; 0x4a7ba +CheckOwnMon: ; Check if a Pokémon belongs to the player and is of a specific species. ; inputs: @@ -246,7 +246,6 @@ endr pop bc scf ret -; 0x4a810 BoxAddressTable1: dba sBox1 @@ -264,7 +263,7 @@ BoxAddressTable1: dba sBox13 dba sBox14 -UpdateOTPointer: ; 0x4a83a +UpdateOTPointer: push hl ld hl, NAME_LENGTH add hl, bc @@ -272,4 +271,3 @@ UpdateOTPointer: ; 0x4a83a ld c, l pop hl ret -; 0x4a843 diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index ad272cad7..c69d822a2 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -56,9 +56,8 @@ StatsScreenInit_gotaddress: pop af ld [hMapAnims], a ret -; 0x4dcd2 -StatsScreenMain: ; 0x4dcd2 +StatsScreenMain: xor a ld [wJumptableIndex], a ; stupid interns @@ -77,7 +76,6 @@ StatsScreenMain: ; 0x4dcd2 bit 7, a jr z, .loop ret -; 0x4dcf7 StatsScreenMobile: xor a @@ -175,7 +173,6 @@ EggStatsInit: inc a ld [wJumptableIndex], a ret -; 0x4ddac EggStatsJoypad: @@ -1004,7 +1001,6 @@ EggStatsScreen: ld de, SFX_2_BOOPS call PlaySFX ret -; 0x4e3c0 EggString: db "EGG@" @@ -1012,27 +1008,26 @@ EggString: FiveQMarkString: db "?????@" -EggSoonString: ; 0x4e3ca +EggSoonString: db "It's making sounds" next "inside. It's going" next "to hatch soon!@" -EggCloseString: ; 0x4e3fd +EggCloseString: db "It moves around" next "inside sometimes." next "It must be close" next "to hatching.@" -EggMoreTimeString: ; 0x4e43d +EggMoreTimeString: db "Wonder what's" next "inside? It needs" next "more time, though.@" -EggALotMoreTimeString: ; 0x4e46e +EggALotMoreTimeString: db "This EGG needs a" next "lot more time to" next "hatch.@" -; 0x4e497 StatsScreen_AnimateEgg: |
