Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
pokecrystal/engine/pokemon/bills_pc_top.asm

382 lines
5.2 KiB
NASM
Raw Normal View History

Remove all address comments
2018-06-24 14:09:41 +00:00
_BillsPC:
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call .CheckCanUsePC
ret c
call .LogIn
call .UseBillsPC
jp .LogOut
Remove all address comments
2018-06-24 14:09:41 +00:00
.CheckCanUsePC:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPartyCount]
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
and a
ret nz
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .PCGottaHavePokemonText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call MenuTextboxBackup
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
scf
ret
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.PCGottaHavePokemonText:
text_far _PCGottaHavePokemonText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
.LogIn:
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hBGMapMode], a
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 21:08:43 +00:00
call LoadStandardMenuHeader
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call ClearPCItemScreen
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wOptions
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
ld a, [hl]
push af
set NO_TEXT_SCROLL, [hl]
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .PCWhatText
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call PrintText
pop af
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wOptions], a
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call LoadFontsBattleExtra
ret
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.PCWhatText:
text_far _PCWhatText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
.LogOut:
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call CloseSubmenu
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
.UseBillsPC:
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 21:08:43 +00:00
ld hl, .MenuHeader
call LoadMenuHeader
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
ld a, $1
.loop
ld [wMenuCursorBuffer], a
call SetPalettes
xor a
ld [wWhichIndexSet], a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hBGMapMode], a
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call DoNthMenu
jr c, .cancel
ld a, [wMenuCursorBuffer]
push af
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wMenuSelection]
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
ld hl, .Jumptable
rst JumpTable
pop bc
ld a, b
jr nc, .loop
.cancel
call CloseWindow
ret
Remove even more address comments That should be all of them this time
2018-06-25 00:10:37 +00:00
.MenuHeader:
Use constants for menu flags Added a bunch of constants for the bitflags of each kind of menu. Some are slightly vague or too long, but I'm not sure how to else name them.
2018-01-14 10:59:56 +00:00
db MENU_BACKUP_TILES ; flags
menu_coords macro for (x1, y1, x2, y2) order (see issue #440)
2018-01-13 21:38:14 +00:00
menu_coords 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 21:08:43 +00:00
dw .MenuData
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
db 1 ; default option
Remove even more address comments That should be all of them this time
2018-06-25 00:10:37 +00:00
.MenuData:
Use constants for menu flags Added a bunch of constants for the bitflags of each kind of menu. Some are slightly vague or too long, but I'm not sure how to else name them.
2018-01-14 10:59:56 +00:00
db STATICMENU_CURSOR ; flags
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
db 0 ; items
dw .items
dw PlaceMenuStrings
dw .strings
Remove all address comments
2018-06-24 14:09:41 +00:00
.strings
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
db "WITHDRAW <PK><MN>@"
db "DEPOSIT <PK><MN>@"
db "CHANGE BOX@"
db "MOVE <PK><MN> W/O MAIL@"
db "SEE YA!@"
Remove all address comments
2018-06-24 14:09:41 +00:00
.Jumptable:
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
dw BillsPC_WithdrawMenu
dw BillsPC_DepositMenu
dw BillsPC_ChangeBoxMenu
dw BillsPC_MovePKMNMenu
dw BillsPC_SeeYa
Remove all address comments
2018-06-24 14:09:41 +00:00
.items
adc a, 0 → adc 0; fix comments
2018-05-20 21:55:27 +00:00
db 5 ; # items
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
db 0 ; WITHDRAW
adc a, 0 → adc 0; fix comments
2018-05-20 21:55:27 +00:00
db 1 ; DEPOSIT
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
db 2 ; CHANGE BOX
db 3 ; MOVE PKMN
db 4 ; SEE YA!
db -1
Remove all address comments
2018-06-24 14:09:41 +00:00
BillsPC_SeeYa:
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
scf
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
BillsPC_MovePKMNMenu:
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 21:08:43 +00:00
call LoadStandardMenuHeader
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall IsAnyMonHoldingMail
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
jr nc, .no_mail
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .PCMonHoldingMailText
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call PrintText
jr .quit
.no_mail
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 16:13:29 +00:00
farcall StartMoveMonWOMail_SaveGame
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
jr c, .quit
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall _MovePKMNWithoutMail
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call ReturnToMapFromSubmenu
call ClearPCItemScreen
.quit
call CloseWindow
and a
ret
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.PCMonHoldingMailText:
text_far _PCMonHoldingMailText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BillsPC_DepositMenu:
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 21:08:43 +00:00
call LoadStandardMenuHeader
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall _DepositPKMN
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call ReturnToMapFromSubmenu
call ClearPCItemScreen
call CloseWindow
and a
ret
Identify some more unnamed labels
2020-10-06 00:10:01 +00:00
BillsPC_Deposit_CheckPartySize: ; unreferenced
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPartyCount]
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
and a
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 16:13:29 +00:00
jr z, .no_mon
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
cp 2
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 16:13:29 +00:00
jr c, .only_one_mon
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
and a
ret
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 16:13:29 +00:00
.no_mon
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .PCNoSingleMonText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call MenuTextboxBackup
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
scf
ret
Pkmn -> Mon Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-22 16:13:29 +00:00
.only_one_mon
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, .PCCantDepositLastMonText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call MenuTextboxBackup
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
scf
ret
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.PCNoSingleMonText:
text_far _PCNoSingleMonText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
.PCCantDepositLastMonText:
text_far _PCCantDepositLastMonText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
CheckCurPartyMonFainted:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld hl, wPartyMon1HP
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
ld de, PARTYMON_STRUCT_LENGTH
ld b, $0
.loop
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurPartyMon]
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
cp b
jr z, .skip
ld a, [hli]
or [hl]
jr nz, .notfainted
dec hl
.skip
inc b
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPartyCount]
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
cp b
jr z, .done
add hl, de
jr .loop
.done
scf
ret
.notfainted
and a
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
BillsPC_WithdrawMenu:
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440)
2018-01-23 21:08:43 +00:00
call LoadStandardMenuHeader
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall _WithdrawPKMN
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call ReturnToMapFromSubmenu
call ClearPCItemScreen
call CloseWindow
and a
ret
Identify some more unnamed labels
2020-10-06 00:10:01 +00:00
BillsPC_Withdraw_CheckPartySize: ; unreferenced
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wPartyCount]
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
cp PARTY_LENGTH
Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM) To do: engine/{menus, overworld}
2020-06-17 21:03:38 +00:00
jr nc, .party_full
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
and a
ret
Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM) To do: engine/{menus, overworld}
2020-06-17 21:03:38 +00:00
.party_full
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
ld hl, PCCantTakeText
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call MenuTextboxBackup
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
scf
ret
#641 fixes and additions. (#646) Name a lot of text labels according to our conventions
2019-10-20 22:24:17 +00:00
PCCantTakeText:
text_far _PCCantTakeText
Resolve issue #575: Rename text commands
2018-11-17 18:33:03 +00:00
text_end
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
Remove all address comments
2018-06-24 14:09:41 +00:00
BillsPC_ChangeBoxMenu:
callba/callab → farcall/callfar
2017-12-24 17:47:30 +00:00
farcall _ChangeBox
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
and a
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
ClearPCItemScreen:
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call DisableSpriteUpdates
xor a
Use labels instead of constants for HRAM Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 18:28:22 +00:00
ldh [hBGMapMode], a
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call ClearBGPalettes
call ClearSprites
hlcoord 0, 0
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
ld a, " "
call ByteFill
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-10 05:06:20 +00:00
hlcoord 0, 0
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
lb bc, 10, 18
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call Textbox
Consistent code formatting: no redundant `a`s and spaces after commas
2017-12-10 05:06:20 +00:00
hlcoord 0, 12
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
lb bc, 4, 18
TextBox -> Textbox Homogenizing names.
2019-04-08 12:15:10 +00:00
call Textbox
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call WaitBGMap2
call SetPalettes ; load regular palettes?
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
CopyBoxmonToTempMon:
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wCurPartyMon]
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
ld hl, sBoxMon1Species
ld bc, BOXMON_STRUCT_LENGTH
call AddNTimes
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld de, wTempMonSpecies
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
ld bc, BOXMON_STRUCT_LENGTH
ld a, BANK(sBoxMon1Species)
Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM) To do: engine/{menus, overworld}
2020-06-17 21:03:38 +00:00
call OpenSRAM
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call CopyBytes
call CloseSRAM
ret
Replace "Unreferenced" labels with "; unreferenced" comments
2020-06-21 20:27:43 +00:00
LoadBoxMonListing: ; unreferenced
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
ld a, [wCurBox]
cp b
jr z, .same_box
ld a, b
ld hl, .BoxAddrs
ld bc, 3
call AddNTimes
ld a, [hli]
push af
ld a, [hli]
ld h, [hl]
ld l, a
pop af
jr .okay
.same_box
ld a, BANK(sBoxCount)
ld hl, sBoxCount
.okay
Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM) To do: engine/{menus, overworld}
2020-06-17 21:03:38 +00:00
call OpenSRAM
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
ld a, [hl]
Fix miscellaneous points made in #658
2019-11-24 01:56:22 +00:00
ld bc, sBoxMons - sBox
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
add hl, bc
ld b, a
ld c, $0
Fix miscellaneous points made in #658
2019-11-24 01:56:22 +00:00
ld de, wBoxPartialData
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
ld a, b
and a
jr z, .empty_box
.loop
push hl
push bc
ld a, c
Fix miscellaneous points made in #658
2019-11-24 01:56:22 +00:00
ld bc, sBoxMon1Species - sBoxMons
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
add hl, bc
ld bc, BOXMON_STRUCT_LENGTH
call AddNTimes
ld a, [hl]
ld [de], a
inc de
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld [wCurSpecies], a
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
call GetBaseData
pop bc
pop hl
push hl
push bc
ld a, c
Fix miscellaneous points made in #658
2019-11-24 01:56:22 +00:00
ld bc, sBoxMonNicknames - sBoxMons
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
add hl, bc
call SkipNames
call CopyBytes
pop bc
pop hl
push hl
push bc
ld a, c
ld bc, MON_LEVEL
add hl, bc
ld bc, BOXMON_STRUCT_LENGTH
call AddNTimes
ld a, [hl]
ld [de], a
inc de
pop bc
pop hl
push hl
push bc
ld a, c
ld bc, MON_DVS
add hl, bc
ld bc, BOXMON_STRUCT_LENGTH
call AddNTimes
ld a, [hli]
and $f0
ld b, a
ld a, [hl]
and $f0
swap a
or b
ld b, a
Prefix wram labels with w, part 2.
2018-01-23 22:39:09 +00:00
ld a, [wBaseGender]
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
cp b
ld a, $1
jr c, .okay2
xor a
.okay2
ld [de], a
inc de
pop bc
pop hl
inc c
dec b
jr nz, .loop
.empty_box
call CloseSRAM
ret
Remove all address comments
2018-06-24 14:09:41 +00:00
.BoxAddrs:
Split up banks 1-3 of main.asm
2016-03-27 16:47:28 +00:00
dba sBox1
dba sBox2
dba sBox3
dba sBox4
dba sBox5
dba sBox6
dba sBox7
dba sBox8
dba sBox9
dba sBox10
dba sBox11
dba sBox12
dba sBox13
dba sBox14