diff options
| author | anmart <andrewrmartinek@gmail.com> | 2016-02-21 20:48:03 -0500 |
|---|---|---|
| committer | anmart <andrewrmartinek@gmail.com> | 2016-02-21 20:48:03 -0500 |
| commit | 5797eff9a179e6ed01945e4153b709640d6fae4a (patch) | |
| tree | d18edbd3479aa4075156bfb8998127ffde944328 /src/constants | |
| parent | 1d291602536740893e66d1adab49c22321ad4706 (diff) | |
| parent | 0a642f8f1442397c75e06b14ae0da3f7f0af3241 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'src/constants')
| -rw-r--r-- | src/constants/duel_constants.asm | 4 | ||||
| -rw-r--r-- | src/constants/hardware_constants.asm | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 84749fc..95bbe8d 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -17,6 +17,7 @@ DUELVARS_BENCH2_CARD_HP EQUS "wPlayerBench2CardHP & $ff" DUELVARS_BENCH3_CARD_HP EQUS "wPlayerBench3CardHP & $ff" ; cb DUELVARS_BENCH4_CARD_HP EQUS "wPlayerBench4CardHP & $ff" ; cc DUELVARS_BENCH5_CARD_HP EQUS "wPlayerBench5CardHP & $ff" ; cd +DUELVARS_CANT_ATTACK_STATUS EQUS "wPlayerCantAttackStatus & $ff" ; e8 DUELVARS_PRIZES EQUS "wPlayerPrizes & $ff" ; ec DUELVARS_NUMBER_OF_CARDS_IN_DISCARD_PILE EQUS "wPlayerNumberOfCardsInDiscardPile & $ff" ; ed DUELVARS_NUMBER_OF_CARDS_IN_HAND EQUS "wPlayerNumberOfCardsInHand & $ff" ; ee @@ -24,10 +25,9 @@ DUELVARS_NUMBER_OF_POKEMON_IN_PLAY EQUS "wPlayerNumberOfPokemonInPlay & $f DUELVARS_ARENA_CARD_STATUS EQUS "wPlayerArenaCardStatus & $ff" ; f0 DUELVARS_DUELIST_TYPE EQUS "wPlayerDuelistType & $ff" ; f1 - ; status condition constants CARD_NOSTATUS EQU $00 ;TODO - ??? EQU $01 CARD_ASLEEP EQU $02 CARD_PARALYZED EQU $03 -;TODO - beyond
\ No newline at end of file +;TODO - beyond diff --git a/src/constants/hardware_constants.asm b/src/constants/hardware_constants.asm index 8e926a1..0471e74 100644 --- a/src/constants/hardware_constants.asm +++ b/src/constants/hardware_constants.asm @@ -40,7 +40,6 @@ OAM_X_FLIP EQU 5 OAM_Y_FLIP EQU 6 OAM_PRIORITY EQU 7 ; 0: OBJ above BG, 1: OBJ behind BG (colors 1-3) - ; Hardware registers rJOYP EQU $ff00 ; Joypad (R/W) rSB EQU $ff01 ; Serial transfer data (R/W) |