Leahnaya/pokepinball
1
0
Fork 0
mirror of https://github.com/pret/pokepinball.git synced 2026-04-25 23:36:59 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed a few mistakes.

Browse Source
This commit is contained in:
Xillicis 2024-12-30 09:54:34 -07:00
parent d2aac5aaf4
commit 0cc65abaf0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
constants.asm
View File

@ -11,6 +11,7 @@ INCLUDE "constants/joy_constants.asm"
INCLUDE "constants/map_constants.asm"
INCLUDE "constants/pinball_game_constants.asm"
INCLUDE "constants/pokemon_constants.asm"
INCLUDE "constants/pokedex_constants.asm"
INCLUDE "constants/screen_constants.asm"
INCLUDE "constants/song_constants.asm"
INCLUDE "constants/sound_effect_constants.asm"

8
engine/pokedex.asm
View File

@ -190,17 +190,17 @@ MonInfoPokedexScreen: ; 0x28178
bit BIT_A_BUTTON, a
jr z, .checkIfBPressed
call Func_28912
jr .asm_281a2
jr .checkIfGameboyColorAndStartPressed
.checkIfBPressed
bit BIT_B_BUTTON, a
jr z, .checkIfGameboyColorStartPressed
jr z, .checkIfGameboyColorAndStartPressed
jr .BButtonPressed
.asm_28190
ldh a, [hNewlyPressedButtons]
and $3
jr z, .checkIfGameboyColorStartPressed
jr z, .checkIfGameboyColorAndStartPressed
.BButtonPressed
call Func_288a2
call Func_285db
@ -668,7 +668,7 @@ Func_284bc: ; 0x284bc
ldh a, [hPressedButtons]
ld b, a
ld a, [wdaa2]
bit BIT_D_RIGHT, b
bit BIT_D_LEFT, b
jr z, .checkIfRightPressed
dec a
bit 7, a