diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-06-30 12:47:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 12:47:22 -0400 |
| commit | 56c405de09ce267c4cfbc68a15c37b2ff51c635a (patch) | |
| tree | 47d25c237e9af824f7a57295a2d2e298b194a8e6 /home/pokemon.asm | |
| parent | Distinguish single trainer pics section from Pokemon pics (diff) | |
| download | pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.gz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.xz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.zip | |
Replace hardware_constants.asm with hardware.inc (#511)
Diffstat (limited to 'home/pokemon.asm')
| -rw-r--r-- | home/pokemon.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/home/pokemon.asm b/home/pokemon.asm index afa0d129..3b990848 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -130,7 +130,7 @@ LoadFrontSpriteByMonIndex:: push af ld a, BANK(CopyUncompressedPicToHL) ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a xor a ldh [hStartTileID], a call CopyUncompressedPicToHL @@ -138,7 +138,7 @@ LoadFrontSpriteByMonIndex:: ld [wSpriteFlipped], a pop af ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a ret @@ -226,11 +226,11 @@ PartyMenuInit:: ld [hli], a ; max menu item ID ld a, [wForcePlayerToChooseMon] and a - ld a, A_BUTTON | B_BUTTON + ld a, PAD_A | PAD_B jr z, .next xor a ld [wForcePlayerToChooseMon], a - inc a ; a = A_BUTTON + inc a ; a = PAD_A .next ld [hli], a ; menu watched keys pop af @@ -256,7 +256,7 @@ HandlePartyMenuInput:: jp nz, .swappingPokemon pop af ldh [hTileAnimations], a - bit BIT_B_BUTTON, b + bit B_PAD_B, b jr nz, .noPokemonChosen ld a, [wPartyCount] and a @@ -278,7 +278,7 @@ HandlePartyMenuInput:: scf ret .swappingPokemon - bit BIT_B_BUTTON, b + bit B_PAD_B, b jr z, .handleSwap ; if not, handle swapping the pokemon .cancelSwap ; if the B button was pressed farcall ErasePartyMenuCursors @@ -381,7 +381,7 @@ GetMonHeader:: push af ld a, BANK(BaseStats) ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a push bc push de push hl @@ -436,7 +436,7 @@ GetMonHeader:: pop bc pop af ldh [hLoadedROMBank], a - ld [MBC1RomBank], a + ld [rROMB], a ret ; copy party pokemon's name to wNameBuffer |