diff options
| -rwxr-xr-x | .gitignore | 3 | ||||
| m--------- | extras | 0 | ||||
| -rwxr-xr-x | src/constants/card_constants.asm | 2 | ||||
| -rw-r--r-- | src/constants/card_data_constants.asm | 2 | ||||
| -rwxr-xr-x | src/constants/npc_constants.asm | 2 | ||||
| -rwxr-xr-x | src/wram.asm | 11 |
6 files changed, 12 insertions, 8 deletions
@@ -20,3 +20,6 @@ # converted image/palette data *.1bpp *.2bpp + +# disasm output +*disasm_output.asm
\ No newline at end of file diff --git a/extras b/extras -Subproject dfe657177453423987544798d9763b2938874b4 +Subproject f286f17bde37d0469b1e0203cc45cc69cea4a4c diff --git a/src/constants/card_constants.asm b/src/constants/card_constants.asm index 330de69..30560c2 100755 --- a/src/constants/card_constants.asm +++ b/src/constants/card_constants.asm @@ -1,4 +1,4 @@ -const_value set 1 + const_def 1 const GRASS_ENERGY ; $01 const FIRE_ENERGY ; $02 const WATER_ENERGY ; $03 diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm index 192624a..0816008 100644 --- a/src/constants/card_data_constants.asm +++ b/src/constants/card_data_constants.asm @@ -24,7 +24,7 @@ TYPE_PKMN_FIGHTING EQUS "FIGHTING" TYPE_PKMN_PSYCHIC EQUS "PSYCHIC" TYPE_PKMN_COLORLESS EQUS "COLORLESS" TYPE_PKMN_UNUSED EQUS "UNUSED_TYPE" -const_value set TYPE_PKMN_UNUSED + 1 - TYPE_PKMN_FIRE + const_def TYPE_PKMN_UNUSED + 1 - TYPE_PKMN_FIRE const TYPE_ENERGY_FIRE ; $8 const TYPE_ENERGY_GRASS ; $9 const TYPE_ENERGY_LIGHTNING ; $A diff --git a/src/constants/npc_constants.asm b/src/constants/npc_constants.asm index be57c3c..f4972dc 100755 --- a/src/constants/npc_constants.asm +++ b/src/constants/npc_constants.asm @@ -1,4 +1,4 @@ -const_value set 1 + const_def 1 const PLAYER_PIC ; $01 const RONALD_PIC ; $02 const SAM_PIC ; $03 diff --git a/src/wram.asm b/src/wram.asm index c0d6632..8e06099 100755 --- a/src/wram.asm +++ b/src/wram.asm @@ -196,17 +196,18 @@ wOpponentArenaCardDisabledMoveIndex:: ; c3f2 UNION -wPlayerDeck:: ; c400 - ds $80 - -NEXTU - wBoosterCardsDrawn:: ; c400 wBoosterTempNonEnergiesDrawn:: ; c400 ds $b wBoosterTempEnergiesDrawn:: ; c40b ds $b wBoosterCardsDrawnEnd:: + ds $6a + +NEXTU + +wPlayerDeck:: ; c400 + ds $80 ENDU |