diff options
| author | anmart <andrewrmartinek@gmail.com> | 2016-02-09 03:10:12 -0500 |
|---|---|---|
| committer | anmart <andrewrmartinek@gmail.com> | 2016-02-09 03:10:12 -0500 |
| commit | 67ef216c62b726bcee05d615cb6b831d62b75038 (patch) | |
| tree | fb99dbe082ecf1eb6800bbff31a3f685067d8ea1 /src/engine/home.asm | |
| parent | 5f0525837668e6388034b90445cce42d2516183b (diff) | |
Provided labels for various data
Defined two new labels in wram.
Defined names for the oddly arbitrary values representing whose turn it
is in battle.
Renamed labels for some parts of the dueling main loop and loss
function.
Diffstat (limited to 'src/engine/home.asm')
| -rwxr-xr-x | src/engine/home.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/home.asm b/src/engine/home.asm index 7a6d96f..41ac92a 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -2078,7 +2078,7 @@ INCBIN "baserom.gbc",$0ebf,$1072 - $0ebf CopyDeckData: ; 1072 (0:1072) ld hl, wPlayerDeck ldh a, [hWhoseTurn] - cp $c2 + cp PLAYER_TURN jr z, .copyDeckData ld hl, wOpponentDeck .copyDeckData @@ -2257,10 +2257,10 @@ GetTurnDuelistVariable: ; 160b (0:160b) GetOpposingTurnDuelistVariable: ; 1611 (0:1611) ld l, a ldh a, [hWhoseTurn] - ld h, $c3 - cp $c2 + ld h, OPPONENT_TURN + cp PLAYER_TURN jr z, .asm_161c - ld h, $c2 + ld h, PLAYER_TURN .asm_161c ld a, [hl] ret @@ -3986,7 +3986,7 @@ Func_2e2c: ; 2e2c (0:2e2c) ld de, $caa0 push de ldh a, [hWhoseTurn] - cp $c3 + cp OPPONENT_TURN jp z, .opponentTurn call PrintPlayerName pop hl @@ -4066,7 +4066,7 @@ PrintTextBoxBorderLabel: ; 2e89 (0:2e89) ret .special ldh a, [hWhoseTurn] - cp $c3 + cp OPPONENT_TURN jp z, PrintOpponentName jp PrintPlayerName ; 0x2ea9 |