diff options
| author | anmart <andrewrmartinek@gmail.com> | 2016-02-27 20:27:27 -0500 |
|---|---|---|
| committer | anmart <andrewrmartinek@gmail.com> | 2016-02-27 20:27:27 -0500 |
| commit | f6e334247f61ab72576a6e6aedffd611bcde749a (patch) | |
| tree | 8869005a48785d47f999b7dc5b1e9f3d88699535 /src/engine/home.asm | |
| parent | a78bf961bf7862684cc6d12a3cbf624727ff9408 (diff) | |
Misc fixes
Labeled some things and fixed a few labels
Diffstat (limited to 'src/engine/home.asm')
| -rwxr-xr-x | src/engine/home.asm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/engine/home.asm b/src/engine/home.asm index d29ffaa..180bb18 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -2413,7 +2413,7 @@ LoadDeckCardToBuffer1: ; 1376 (0:1376) call LoadCardDataToBuffer1 pop af ld hl, wCardBuffer1 - bank1call ConvertItemToPokemon + bank1call ConvertTrainerCardToPokemon ld a, e pop bc pop de @@ -2429,7 +2429,7 @@ LoadDeckCardToBuffer2: ; 138c (0:138c) call LoadCardDataToBuffer2 pop af ld hl, wCardBuffer2 - bank1call ConvertItemToPokemon + bank1call ConvertTrainerCardToPokemon ld a, e pop bc pop de @@ -4237,7 +4237,8 @@ InitializeCursorParameters: ; 2636 (0:2636) ld [wCursorBlinkCounter], a ret -Func_264b: ; 264b (0:264b) +; returns with the carry flag set if a or b were pressed +MenuCursorAcceptInput: ; 264b (0:264b) xor a ld [wcd99], a ldh a, [hButtonsPressed2] |