From b217f4509508a5c16540fa00f1ec458c8984846a Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Mon, 7 Dec 2020 17:56:31 -0500 Subject: Replaced hex values with constants --- src/constants/deck_constants.asm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/constants') diff --git a/src/constants/deck_constants.asm b/src/constants/deck_constants.asm index 4105242..5efc329 100644 --- a/src/constants/deck_constants.asm +++ b/src/constants/deck_constants.asm @@ -66,3 +66,5 @@ ENDM deck_const RESHUFFLE_DECK ; $35 deck_const IMAKUNI_DECK ; $36 DECKS_END EQU const_value + -1 +DECK_IDS_END EQU DECKS_END - 2 + -- cgit v1.2.3 From dec84633711c8f3a1f5c8d815fb41dfcc58a809e Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 8 Dec 2020 14:35:10 -0500 Subject: Changed hex value to IMAKUNI_DECK_ID --- src/constants/deck_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/constants') diff --git a/src/constants/deck_constants.asm b/src/constants/deck_constants.asm index 5efc329..8c8e8c9 100644 --- a/src/constants/deck_constants.asm +++ b/src/constants/deck_constants.asm @@ -66,5 +66,5 @@ ENDM deck_const RESHUFFLE_DECK ; $35 deck_const IMAKUNI_DECK ; $36 DECKS_END EQU const_value + -1 -DECK_IDS_END EQU DECKS_END - 2 +DECK_IDS_END EQU DECKS_END -2 -- cgit v1.2.3 From a134c1f9a9c197ee9662c8177fa487ec938f5294 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Tue, 15 Dec 2020 11:32:10 -0600 Subject: Mark a few duplicate hiragana characters This fixes compatibility with rgbds v0.4.2 --- src/constants/charmaps.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/constants') diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm index baa3f46..d223e1f 100644 --- a/src/constants/charmaps.asm +++ b/src/constants/charmaps.asm @@ -279,11 +279,11 @@ ENDM fwcharmap 0, "ぷ", $54 fwcharmap 0, "ぺ", $55 fwcharmap 0, "ぽ", $56 - fwcharmap 0, "あ", $57 - fwcharmap 0, "い", $58 - fwcharmap 0, "う", $59 - fwcharmap 0, "え", $5a - fwcharmap 0, "お", $5b + fwcharmap 0, "あ(2)", $57 + fwcharmap 0, "い(2)", $58 + fwcharmap 0, "う(2)", $59 + fwcharmap 0, "え(2)", $5a + fwcharmap 0, "お(2)", $5b fwcharmap 0, "ゃ", $5c fwcharmap 0, "ゅ", $5d fwcharmap 0, "ょ", $5e -- cgit v1.2.3 From 117efe39b6b297dc52c1b5ad4d3012e7b00c8bd7 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 15 Dec 2020 20:47:13 +0100 Subject: Misc progress related to duel effect functions --- src/constants/duel_constants.asm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/constants') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 928e78c..473021a 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -166,16 +166,16 @@ CAN_EVOLVE_THIS_TURN EQU 1 << CAN_EVOLVE_THIS_TURN_F ; effect command constants (TryExecuteEffectCommandFunction) ; ordered by (roughly) execution time -EFFECTCMDTYPE_INITIAL_EFFECT_1 EQU $01 -EFFECTCMDTYPE_INITIAL_EFFECT_2 EQU $02 -EFFECTCMDTYPE_DISCARD_ENERGY EQU $06 -EFFECTCMDTYPE_REQUIRE_SELECTION EQU $05 -EFFECTCMDTYPE_BEFORE_DAMAGE EQU $03 -EFFECTCMDTYPE_AFTER_DAMAGE EQU $04 -EFFECTCMDTYPE_SWITCH_DEFENDING_PKMN EQU $0a -EFFECTCMDTYPE_PKMN_POWER_TRIGGER EQU $07 -EFFECTCMDTYPE_AI EQU $09 -EFFECTCMDTYPE_UNKNOWN_08 EQU $08 +EFFECTCMDTYPE_INITIAL_EFFECT_1 EQU $01 +EFFECTCMDTYPE_INITIAL_EFFECT_2 EQU $02 +EFFECTCMDTYPE_DISCARD_ENERGY EQU $06 +EFFECTCMDTYPE_REQUIRE_SELECTION EQU $05 +EFFECTCMDTYPE_BEFORE_DAMAGE EQU $03 +EFFECTCMDTYPE_AFTER_DAMAGE EQU $04 +EFFECTCMDTYPE_AI_SELECTION EQU $08 +EFFECTCMDTYPE_AI_SWITCH_DEFENDING_PKMN EQU $0a +EFFECTCMDTYPE_PKMN_POWER_TRIGGER EQU $07 +EFFECTCMDTYPE_AI EQU $09 ; wDamageEffectiveness constants WEAKNESS EQU 1 -- cgit v1.2.3 From 467f016e401386a8a30d38429d96056df66bf38c Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 10 May 2020 21:58:45 +0100 Subject: Oddish Sprout effect --- src/constants/duel_constants.asm | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'src/constants') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 928e78c..d3883fe 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -234,9 +234,16 @@ EFFECT_FAILED_UNSUCCESSFUL EQU $02 ; wAnimationQueue length ANIMATION_QUEUE_LENGTH EQU 7 -PRIZES_1 EQU $01 -PRIZES_2 EQU $02 -PRIZES_3 EQU $03 -PRIZES_4 EQU $04 -PRIZES_5 EQU $05 -PRIZES_6 EQU $06 +PRIZES_1 EQU $01 +PRIZES_2 EQU $02 +PRIZES_3 EQU $03 +PRIZES_4 EQU $04 +PRIZES_5 EQU $05 +PRIZES_6 EQU $06 + +; constants to use as input to LookForCardInDeck +SEARCHEFFECT_CARD_ID EQU $0 +SEARCHEFFECT_NIDORAN EQU $1 +SEARCHEFFECT_BASIC_FIGHTING EQU $2 +SEARCHEFFECT_BASIC_ENERGY EQU $3 +SEARCHEFFECT_POKEMON EQU $4 -- cgit v1.2.3 From 5d155daebbd51d2346046e42694c4893fc1d8dbb Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 12 May 2020 17:30:12 +0100 Subject: Some effects and changed ChangedType to ChangedColor --- src/constants/duel_constants.asm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/constants') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index d3883fe..89e61a4 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -45,12 +45,12 @@ DUELVARS_BENCH2_CARD_STAGE EQUS "LOW(wPlayerBench2CardStage)" DUELVARS_BENCH3_CARD_STAGE EQUS "LOW(wPlayerBench3CardStage)" ; d1 DUELVARS_BENCH4_CARD_STAGE EQUS "LOW(wPlayerBench4CardStage)" ; d2 DUELVARS_BENCH5_CARD_STAGE EQUS "LOW(wPlayerBench5CardStage)" ; d3 -DUELVARS_ARENA_CARD_CHANGED_TYPE EQUS "LOW(wPlayerArenaCardChangedType)" ; d4 -DUELVARS_BENCH1_CARD_CHANGED_TYPE EQUS "LOW(wPlayerBench1CardChangedType)" ; d5 -DUELVARS_BENCH2_CARD_CHANGED_TYPE EQUS "LOW(wPlayerBench2CardChangedType)" ; d6 -DUELVARS_BENCH3_CARD_CHANGED_TYPE EQUS "LOW(wPlayerBench3CardChangedType)" ; d7 -DUELVARS_BENCH4_CARD_CHANGED_TYPE EQUS "LOW(wPlayerBench4CardChangedType)" ; d8 -DUELVARS_BENCH5_CARD_CHANGED_TYPE EQUS "LOW(wPlayerBench5CardChangedType)" ; d9 +DUELVARS_ARENA_CARD_CHANGED_COLOR EQUS "LOW(wPlayerArenaCardChangedColor)" ; d4 +DUELVARS_BENCH1_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench1CardChangedColor)" ; d5 +DUELVARS_BENCH2_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench2CardChangedColor)" ; d6 +DUELVARS_BENCH3_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench3CardChangedColor)" ; d7 +DUELVARS_BENCH4_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench4CardChangedColor)" ; d8 +DUELVARS_BENCH5_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench5CardChangedColor)" ; d9 DUELVARS_ARENA_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerArenaCardAttachedDefender)" ; da DUELVARS_BENCH1_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench1CardAttachedDefender)" ; db DUELVARS_BENCH2_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench2CardAttachedDefender)" ; dc @@ -161,8 +161,14 @@ SUBSTATUS3_THIS_TURN_DOUBLE_DAMAGE EQU 0 SUBSTATUS3_HEADACHE EQU 1 ; DUELVARS_ARENA_CARD_FLAGS_C2 constants -CAN_EVOLVE_THIS_TURN_F EQU 7 -CAN_EVOLVE_THIS_TURN EQU 1 << CAN_EVOLVE_THIS_TURN_F +USED_PKMN_POWER_THIS_TURN_F EQU 5 +CAN_EVOLVE_THIS_TURN_F EQU 7 +USED_PKMN_POWER_THIS_TURN EQU 1 << USED_PKMN_POWER_THIS_TURN_F +CAN_EVOLVE_THIS_TURN EQU 1 << CAN_EVOLVE_THIS_TURN_F + +; *_CHANGED_COLOR constants +HAS_CHANGED_COLOR_F EQU 7 +HAS_CHANGED_COLOR EQU 1 << HAS_CHANGED_COLOR_F ; effect command constants (TryExecuteEffectCommandFunction) ; ordered by (roughly) execution time -- cgit v1.2.3 From b18a90284bed0f381c924c1bd9bddc6f254ad36c Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 13 May 2020 17:30:24 +0100 Subject: Finish Grass effects --- src/constants/duel_constants.asm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/constants') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 89e61a4..ff9da29 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -45,12 +45,12 @@ DUELVARS_BENCH2_CARD_STAGE EQUS "LOW(wPlayerBench2CardStage)" DUELVARS_BENCH3_CARD_STAGE EQUS "LOW(wPlayerBench3CardStage)" ; d1 DUELVARS_BENCH4_CARD_STAGE EQUS "LOW(wPlayerBench4CardStage)" ; d2 DUELVARS_BENCH5_CARD_STAGE EQUS "LOW(wPlayerBench5CardStage)" ; d3 -DUELVARS_ARENA_CARD_CHANGED_COLOR EQUS "LOW(wPlayerArenaCardChangedColor)" ; d4 -DUELVARS_BENCH1_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench1CardChangedColor)" ; d5 -DUELVARS_BENCH2_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench2CardChangedColor)" ; d6 -DUELVARS_BENCH3_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench3CardChangedColor)" ; d7 -DUELVARS_BENCH4_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench4CardChangedColor)" ; d8 -DUELVARS_BENCH5_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench5CardChangedColor)" ; d9 +DUELVARS_ARENA_CARD_CHANGED_COLOR EQUS "LOW(wPlayerArenaCardChangedColor)" ; d4 +DUELVARS_BENCH1_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench1CardChangedColor)" ; d5 +DUELVARS_BENCH2_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench2CardChangedColor)" ; d6 +DUELVARS_BENCH3_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench3CardChangedColor)" ; d7 +DUELVARS_BENCH4_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench4CardChangedColor)" ; d8 +DUELVARS_BENCH5_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench5CardChangedColor)" ; d9 DUELVARS_ARENA_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerArenaCardAttachedDefender)" ; da DUELVARS_BENCH1_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench1CardAttachedDefender)" ; db DUELVARS_BENCH2_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench2CardAttachedDefender)" ; dc @@ -163,6 +163,7 @@ SUBSTATUS3_HEADACHE EQU 1 ; DUELVARS_ARENA_CARD_FLAGS_C2 constants USED_PKMN_POWER_THIS_TURN_F EQU 5 CAN_EVOLVE_THIS_TURN_F EQU 7 + USED_PKMN_POWER_THIS_TURN EQU 1 << USED_PKMN_POWER_THIS_TURN_F CAN_EVOLVE_THIS_TURN EQU 1 << CAN_EVOLVE_THIS_TURN_F -- cgit v1.2.3 From 2fa7cf63dfe4920d3b1081dd9728e4c9af89aa0a Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 14 May 2020 16:12:41 +0100 Subject: Disassemble Water effects --- src/constants/duel_constants.asm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/constants') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index ff9da29..dce9540 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -77,6 +77,7 @@ DUELVARS_DUELIST_TYPE EQUS "LOW(wPlayerDuelistType)" DUELVARS_ARENA_CARD_DISABLED_MOVE_INDEX EQUS "LOW(wPlayerArenaCardDisabledMoveIndex)" ; f2 DUELVARS_ARENA_CARD_LAST_TURN_DAMAGE EQUS "LOW(wPlayerArenaCardLastTurnDamage)" ; f3 DUELVARS_ARENA_CARD_LAST_TURN_STATUS EQUS "LOW(wPlayerArenaCardLastTurnStatus)" ; f5 +DUELVARS_ARENA_CARD_LAST_TURN_EFFECT EQUS "LOW(wPlayerArenaCardLastTurnEffect)" ; f8 ; card location constants (DUELVARS_CARD_LOCATIONS) CARD_LOCATION_DECK EQU $00 @@ -167,6 +168,12 @@ CAN_EVOLVE_THIS_TURN_F EQU 7 USED_PKMN_POWER_THIS_TURN EQU 1 << USED_PKMN_POWER_THIS_TURN_F CAN_EVOLVE_THIS_TURN EQU 1 << CAN_EVOLVE_THIS_TURN_F +; DUELVARS_ARENA_CARD_LAST_TURN_EFFECT constants + const_def + const LAST_TURN_EFFECT_NONE ; $00 + const LAST_TURN_EFFECT_DISCARD_ENERGY ; $01 + const LAST_TURN_EFFECT_AMNESIA ; $02 + ; *_CHANGED_COLOR constants HAS_CHANGED_COLOR_F EQU 7 HAS_CHANGED_COLOR EQU 1 << HAS_CHANGED_COLOR_F -- cgit v1.2.3 From b75d9712271fc49b7c3f83fc65c4b260624af386 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 3 Jun 2020 00:06:25 +0100 Subject: Psychic attack effects --- src/constants/duel_constants.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/constants') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index dce9540..028cc10 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -189,7 +189,7 @@ EFFECTCMDTYPE_AFTER_DAMAGE EQU $04 EFFECTCMDTYPE_SWITCH_DEFENDING_PKMN EQU $0a EFFECTCMDTYPE_PKMN_POWER_TRIGGER EQU $07 EFFECTCMDTYPE_AI EQU $09 -EFFECTCMDTYPE_UNKNOWN_08 EQU $08 +EFFECTCMDTYPE_AI_SELECTION EQU $08 ; wDamageEffectiveness constants WEAKNESS EQU 1 -- cgit v1.2.3 From 046cb28bde1c0d6716380f83e26df4a568d7691c Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Wed, 3 Jun 2020 15:03:24 +0100 Subject: Fighting attack effects --- src/constants/deck_ai_constants.asm | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'src/constants') diff --git a/src/constants/deck_ai_constants.asm b/src/constants/deck_ai_constants.asm index a0b87f7..a10729c 100644 --- a/src/constants/deck_ai_constants.asm +++ b/src/constants/deck_ai_constants.asm @@ -54,8 +54,24 @@ AI_ENERGY_TRANS_TO_BENCH EQU $e ; moves energy cards away from Arena card ; used to know which AI routine to call in ; the AIAction pointer tables in AIDoAction const_def 1 - const AIACTION_DO_TURN ; $1 - const AIACTION_START_DUEL ; $2 - const AIACTION_FORCED_SWITCH ; $3 - const AIACTION_KO_SWITCH ; $4 - const AIACTION_TAKE_PRIZE ; $5 + const AIACTION_DO_TURN ; $1 + const AIACTION_START_DUEL ; $2 + const AIACTION_FORCED_SWITCH ; $3 + const AIACTION_KO_SWITCH ; $4 + const AIACTION_TAKE_PRIZE ; $5 + +; this bit is set when the AI decides to use Peek on their Prize cards, +; with the following bits deciding which one to Peek. That is: +; %10'0000 = first prize card +; %10'0001 = second prize card +; %10'0010 = third prize card +; etc... +AI_PEEK_TARGET_PRIZE_F EQU 6 +AI_PEEK_TARGET_PRIZE EQU 1 << AI_PEEK_TARGET_PRIZE_F +; this bit is set when the AI decides to use Peek on Player hand card, +; with the following bits deciding which one to Peek. That is: +; %1XXX XXXX, where XXX XXXX is the deck index of card chosen +AI_PEEK_TARGET_HAND_F EQU 7 +AI_PEEK_TARGET_HAND EQU 1 << AI_PEEK_TARGET_HAND_F +; all bits set means AI chose to look at Player's top deck card +AI_PEEK_TARGET_DECK EQU $ff -- cgit v1.2.3 From 75fa5549f3a5e7fe5a690454852559e6e1705cb1 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Thu, 4 Jun 2020 16:28:16 +0100 Subject: Lightning attack effects --- src/constants/charmaps.asm | 1 + src/constants/deck_ai_constants.asm | 3 ++- src/constants/duel_constants.asm | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src/constants') diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm index baa3f46..f87e841 100644 --- a/src/constants/charmaps.asm +++ b/src/constants/charmaps.asm @@ -94,6 +94,7 @@ ENDM fwcharmap 3, "＼", $98 fwcharmap 3, "┐", $99 fwcharmap 3, "|", $9a + fwcharmap 3, " ", $9c fwcharmap 3, "!", $9d fwcharmap 3, "#", $9f fwcharmap 3, "$", $a0 diff --git a/src/constants/deck_ai_constants.asm b/src/constants/deck_ai_constants.asm index a10729c..52b0283 100644 --- a/src/constants/deck_ai_constants.asm +++ b/src/constants/deck_ai_constants.asm @@ -42,7 +42,8 @@ AI_ENERGY_FLAG_SKIP_ARENA_CARD EQU 1 << 7 ; whether to include Arena card in det ; used by wAIBarrierFlagCounter to determine ; whether Player is running Mewtwo1 mill deck. ; flag set means true, flag not set means false. -AI_FLAG_MEWTWO_MILL EQU 1 << 7 +AI_MEWTWO_MILL_F EQU 7 +AI_MEWTWO_MILL EQU 1 << AI_MEWTWO_MILL_F ; defines the behaviour of HandleAIEnergyTrans, for determining ; whether to move energy cards from the Bench to the Arena or vice-versa diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 028cc10..a9ff54b 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -178,6 +178,10 @@ CAN_EVOLVE_THIS_TURN EQU 1 << CAN_EVOLVE_THIS_TURN_F HAS_CHANGED_COLOR_F EQU 7 HAS_CHANGED_COLOR EQU 1 << HAS_CHANGED_COLOR_F +; flag in wDamage + 1 that indicates +; whether damage is unaffected by Weakness/Resistance +UNAFFECTED_BY_WEAKNESS_RESISTANCE_F EQU 7 + ; effect command constants (TryExecuteEffectCommandFunction) ; ordered by (roughly) execution time EFFECTCMDTYPE_INITIAL_EFFECT_1 EQU $01 -- cgit v1.2.3 From f1479c9e5072e362ab8c4ed5cd30d578b675dbb2 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 7 Jun 2020 17:11:57 +0100 Subject: Colorless attack effects --- src/constants/duel_constants.asm | 113 ++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 54 deletions(-) (limited to 'src/constants') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index a9ff54b..750fac0 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -25,59 +25,61 @@ DUEL_WIN EQU $0 DUEL_LOSS EQU $1 ; wPlayerDuelVariables or wOpponentDuelVariables constants -DUELVARS_CARD_LOCATIONS EQUS "LOW(wPlayerCardLocations)" ; 00 -DUELVARS_PRIZE_CARDS EQUS "LOW(wPlayerPrizeCards)" ; 3c -DUELVARS_HAND EQUS "LOW(wPlayerHand)" ; 42 -DUELVARS_DECK_CARDS EQUS "LOW(wPlayerDeckCards)" ; 7e -DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK EQUS "LOW(wPlayerNumberOfCardsNotInDeck)" ; ba -DUELVARS_ARENA_CARD EQUS "LOW(wPlayerArenaCard)" ; bb -DUELVARS_BENCH EQUS "LOW(wPlayerBench)" ; bc -DUELVARS_ARENA_CARD_FLAGS_C2 EQU $c2 -DUELVARS_ARENA_CARD_HP EQUS "LOW(wPlayerArenaCardHP)" ; c8 -DUELVARS_BENCH1_CARD_HP EQUS "LOW(wPlayerBench1CardHP)" ; c9 -DUELVARS_BENCH2_CARD_HP EQUS "LOW(wPlayerBench2CardHP)" ; ca -DUELVARS_BENCH3_CARD_HP EQUS "LOW(wPlayerBench3CardHP)" ; cb -DUELVARS_BENCH4_CARD_HP EQUS "LOW(wPlayerBench4CardHP)" ; cc -DUELVARS_BENCH5_CARD_HP EQUS "LOW(wPlayerBench5CardHP)" ; cd -DUELVARS_ARENA_CARD_STAGE EQUS "LOW(wPlayerArenaCardStage)" ; ce -DUELVARS_BENCH1_CARD_STAGE EQUS "LOW(wPlayerBench1CardStage)" ; cf -DUELVARS_BENCH2_CARD_STAGE EQUS "LOW(wPlayerBench2CardStage)" ; d0 -DUELVARS_BENCH3_CARD_STAGE EQUS "LOW(wPlayerBench3CardStage)" ; d1 -DUELVARS_BENCH4_CARD_STAGE EQUS "LOW(wPlayerBench4CardStage)" ; d2 -DUELVARS_BENCH5_CARD_STAGE EQUS "LOW(wPlayerBench5CardStage)" ; d3 -DUELVARS_ARENA_CARD_CHANGED_COLOR EQUS "LOW(wPlayerArenaCardChangedColor)" ; d4 -DUELVARS_BENCH1_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench1CardChangedColor)" ; d5 -DUELVARS_BENCH2_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench2CardChangedColor)" ; d6 -DUELVARS_BENCH3_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench3CardChangedColor)" ; d7 -DUELVARS_BENCH4_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench4CardChangedColor)" ; d8 -DUELVARS_BENCH5_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench5CardChangedColor)" ; d9 -DUELVARS_ARENA_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerArenaCardAttachedDefender)" ; da -DUELVARS_BENCH1_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench1CardAttachedDefender)" ; db -DUELVARS_BENCH2_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench2CardAttachedDefender)" ; dc -DUELVARS_BENCH3_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench3CardAttachedDefender)" ; dd -DUELVARS_BENCH4_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench4CardAttachedDefender)" ; de -DUELVARS_BENCH5_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench5CardAttachedDefender)" ; df -DUELVARS_ARENA_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerArenaCardAttachedPluspower)" ; e0 -DUELVARS_BENCH1_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench1CardAttachedPluspower)" ; e1 -DUELVARS_BENCH2_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench2CardAttachedPluspower)" ; e2 -DUELVARS_BENCH3_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench3CardAttachedPluspower)" ; e3 -DUELVARS_BENCH4_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench4CardAttachedPluspower)" ; e4 -DUELVARS_BENCH5_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench5CardAttachedPluspower)" ; e5 -DUELVARS_ARENA_CARD_SUBSTATUS1 EQUS "LOW(wPlayerArenaCardSubstatus1)" ; e7 -DUELVARS_ARENA_CARD_SUBSTATUS2 EQUS "LOW(wPlayerArenaCardSubstatus2)" ; e8 -DUELVARS_ARENA_CARD_CHANGED_WEAKNESS EQUS "LOW(wPlayerArenaCardChangedWeakness)" ; e9 -DUELVARS_ARENA_CARD_CHANGED_RESISTANCE EQUS "LOW(wPlayerArenaCardChangedResistance)" ; ea -DUELVARS_ARENA_CARD_SUBSTATUS3 EQUS "LOW(wPlayerArenaCardSubstatus3)" ; eb -DUELVARS_PRIZES EQUS "LOW(wPlayerPrizes)" ; ec -DUELVARS_NUMBER_OF_CARDS_IN_DISCARD_PILE EQUS "LOW(wPlayerNumberOfCardsInDiscardPile)" ; ed -DUELVARS_NUMBER_OF_CARDS_IN_HAND EQUS "LOW(wPlayerNumberOfCardsInHand)" ; ee -DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA EQUS "LOW(wPlayerNumberOfPokemonInPlayArea)" ; ef -DUELVARS_ARENA_CARD_STATUS EQUS "LOW(wPlayerArenaCardStatus)" ; f0 -DUELVARS_DUELIST_TYPE EQUS "LOW(wPlayerDuelistType)" ; f1 -DUELVARS_ARENA_CARD_DISABLED_MOVE_INDEX EQUS "LOW(wPlayerArenaCardDisabledMoveIndex)" ; f2 -DUELVARS_ARENA_CARD_LAST_TURN_DAMAGE EQUS "LOW(wPlayerArenaCardLastTurnDamage)" ; f3 -DUELVARS_ARENA_CARD_LAST_TURN_STATUS EQUS "LOW(wPlayerArenaCardLastTurnStatus)" ; f5 -DUELVARS_ARENA_CARD_LAST_TURN_EFFECT EQUS "LOW(wPlayerArenaCardLastTurnEffect)" ; f8 +DUELVARS_CARD_LOCATIONS EQUS "LOW(wPlayerCardLocations)" ; 00 +DUELVARS_PRIZE_CARDS EQUS "LOW(wPlayerPrizeCards)" ; 3c +DUELVARS_HAND EQUS "LOW(wPlayerHand)" ; 42 +DUELVARS_DECK_CARDS EQUS "LOW(wPlayerDeckCards)" ; 7e +DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK EQUS "LOW(wPlayerNumberOfCardsNotInDeck)" ; ba +DUELVARS_ARENA_CARD EQUS "LOW(wPlayerArenaCard)" ; bb +DUELVARS_BENCH EQUS "LOW(wPlayerBench)" ; bc +DUELVARS_ARENA_CARD_FLAGS_C2 EQU $c2 +DUELVARS_ARENA_CARD_HP EQUS "LOW(wPlayerArenaCardHP)" ; c8 +DUELVARS_BENCH1_CARD_HP EQUS "LOW(wPlayerBench1CardHP)" ; c9 +DUELVARS_BENCH2_CARD_HP EQUS "LOW(wPlayerBench2CardHP)" ; ca +DUELVARS_BENCH3_CARD_HP EQUS "LOW(wPlayerBench3CardHP)" ; cb +DUELVARS_BENCH4_CARD_HP EQUS "LOW(wPlayerBench4CardHP)" ; cc +DUELVARS_BENCH5_CARD_HP EQUS "LOW(wPlayerBench5CardHP)" ; cd +DUELVARS_ARENA_CARD_STAGE EQUS "LOW(wPlayerArenaCardStage)" ; ce +DUELVARS_BENCH1_CARD_STAGE EQUS "LOW(wPlayerBench1CardStage)" ; cf +DUELVARS_BENCH2_CARD_STAGE EQUS "LOW(wPlayerBench2CardStage)" ; d0 +DUELVARS_BENCH3_CARD_STAGE EQUS "LOW(wPlayerBench3CardStage)" ; d1 +DUELVARS_BENCH4_CARD_STAGE EQUS "LOW(wPlayerBench4CardStage)" ; d2 +DUELVARS_BENCH5_CARD_STAGE EQUS "LOW(wPlayerBench5CardStage)" ; d3 +DUELVARS_ARENA_CARD_CHANGED_COLOR EQUS "LOW(wPlayerArenaCardChangedColor)" ; d4 +DUELVARS_BENCH1_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench1CardChangedColor)" ; d5 +DUELVARS_BENCH2_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench2CardChangedColor)" ; d6 +DUELVARS_BENCH3_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench3CardChangedColor)" ; d7 +DUELVARS_BENCH4_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench4CardChangedColor)" ; d8 +DUELVARS_BENCH5_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench5CardChangedColor)" ; d9 +DUELVARS_ARENA_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerArenaCardAttachedDefender)" ; da +DUELVARS_BENCH1_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench1CardAttachedDefender)" ; db +DUELVARS_BENCH2_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench2CardAttachedDefender)" ; dc +DUELVARS_BENCH3_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench3CardAttachedDefender)" ; dd +DUELVARS_BENCH4_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench4CardAttachedDefender)" ; de +DUELVARS_BENCH5_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench5CardAttachedDefender)" ; df +DUELVARS_ARENA_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerArenaCardAttachedPluspower)" ; e0 +DUELVARS_BENCH1_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench1CardAttachedPluspower)" ; e1 +DUELVARS_BENCH2_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench2CardAttachedPluspower)" ; e2 +DUELVARS_BENCH3_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench3CardAttachedPluspower)" ; e3 +DUELVARS_BENCH4_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench4CardAttachedPluspower)" ; e4 +DUELVARS_BENCH5_CARD_ATTACHED_PLUSPOWER EQUS "LOW(wPlayerBench5CardAttachedPluspower)" ; e5 +DUELVARS_ARENA_CARD_SUBSTATUS1 EQUS "LOW(wPlayerArenaCardSubstatus1)" ; e7 +DUELVARS_ARENA_CARD_SUBSTATUS2 EQUS "LOW(wPlayerArenaCardSubstatus2)" ; e8 +DUELVARS_ARENA_CARD_CHANGED_WEAKNESS EQUS "LOW(wPlayerArenaCardChangedWeakness)" ; e9 +DUELVARS_ARENA_CARD_CHANGED_RESISTANCE EQUS "LOW(wPlayerArenaCardChangedResistance)" ; ea +DUELVARS_ARENA_CARD_SUBSTATUS3 EQUS "LOW(wPlayerArenaCardSubstatus3)" ; eb +DUELVARS_PRIZES EQUS "LOW(wPlayerPrizes)" ; ec +DUELVARS_NUMBER_OF_CARDS_IN_DISCARD_PILE EQUS "LOW(wPlayerNumberOfCardsInDiscardPile)" ; ed +DUELVARS_NUMBER_OF_CARDS_IN_HAND EQUS "LOW(wPlayerNumberOfCardsInHand)" ; ee +DUELVARS_NUMBER_OF_POKEMON_IN_PLAY_AREA EQUS "LOW(wPlayerNumberOfPokemonInPlayArea)" ; ef +DUELVARS_ARENA_CARD_STATUS EQUS "LOW(wPlayerArenaCardStatus)" ; f0 +DUELVARS_DUELIST_TYPE EQUS "LOW(wPlayerDuelistType)" ; f1 +DUELVARS_ARENA_CARD_DISABLED_MOVE_INDEX EQUS "LOW(wPlayerArenaCardDisabledMoveIndex)" ; f2 +DUELVARS_ARENA_CARD_LAST_TURN_DAMAGE EQUS "LOW(wPlayerArenaCardLastTurnDamage)" ; f3 +DUELVARS_ARENA_CARD_LAST_TURN_STATUS EQUS "LOW(wPlayerArenaCardLastTurnStatus)" ; f5 +DUELVARS_ARENA_CARD_LAST_TURN_SUBSTATUS2 EQUS "LOW(wPlayerArenaCardLastTurnSubstatus2)" ; f6 +DUELVARS_ARENA_CARD_LAST_TURN_CHANGE_WEAK EQUS "LOW(wPlayerArenaCardLastTurnChangeWeak)" ; f7 +DUELVARS_ARENA_CARD_LAST_TURN_EFFECT EQUS "LOW(wPlayerArenaCardLastTurnEffect)" ; f8 ; card location constants (DUELVARS_CARD_LOCATIONS) CARD_LOCATION_DECK EQU $00 @@ -154,6 +156,7 @@ SUBSTATUS2_AMNESIA EQU $04 SUBSTATUS2_TAIL_WAG EQU $05 SUBSTATUS2_LEER EQU $06 SUBSTATUS2_POUNCE EQU $07 +SUBSTATUS2_CONVERSION2 EQU $08 SUBSTATUS2_UNABLE_RETREAT EQU $09 SUBSTATUS2_BONE_ATTACK EQU $0b SUBSTATUS2_GROWL EQU $12 @@ -163,9 +166,11 @@ SUBSTATUS3_HEADACHE EQU 1 ; DUELVARS_ARENA_CARD_FLAGS_C2 constants USED_PKMN_POWER_THIS_TURN_F EQU 5 +USED_LEEK_SLAP_THIS_DUEL_F EQU 6 CAN_EVOLVE_THIS_TURN_F EQU 7 USED_PKMN_POWER_THIS_TURN EQU 1 << USED_PKMN_POWER_THIS_TURN_F +USED_LEEK_SLAP_THIS_DUEL EQU 1 << USED_LEEK_SLAP_THIS_DUEL_F CAN_EVOLVE_THIS_TURN EQU 1 << CAN_EVOLVE_THIS_TURN_F ; DUELVARS_ARENA_CARD_LAST_TURN_EFFECT constants @@ -228,7 +233,7 @@ NO_DAMAGE_OR_EFFECT_NSHIELD EQU $05 const OPPACTION_TOSS_COIN_A_TIMES ; $11 const OPPACTION_6B30 ; $12 const OPPACTION_NO_ACTION_13 ; $13 - const OPPACTION_6B3E ; $14 + const OPPACTION_USE_METRONOME_ATTACK ; $14 const OPPACTION_6B15 ; $15 const OPPACTION_DUEL_MAIN_SCENE ; $16 -- cgit v1.2.3 From 999e27c0a2ca7984e02b29595cc53515868e7644 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Tue, 15 Dec 2020 21:48:36 +0000 Subject: (Most) trainer effects --- src/constants/card_data_constants.asm | 1 + 1 file changed, 1 insertion(+) (limited to 'src/constants') diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm index 3f26e4d..0731218 100644 --- a/src/constants/card_data_constants.asm +++ b/src/constants/card_data_constants.asm @@ -146,6 +146,7 @@ PRO EQU $8 BASIC EQU $00 STAGE1 EQU $01 STAGE2 EQU $02 +STAGE2_WITHOUT_STAGE1 EQU $03 ; CARD_DATA_WEAKNESS and CARD_DATA_RESISTANCE constants WR_FIRE EQU $80 -- cgit v1.2.3 From 166dc2eda578a07cb21950bc752dc90ff877929c Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 20 Dec 2020 14:28:15 +0000 Subject: Rename DUELVARS_ARENA_CARD_FLAGS --- src/constants/duel_constants.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/constants') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 750fac0..769e16b 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -32,7 +32,7 @@ DUELVARS_DECK_CARDS EQUS "LOW(wPlayerDeckCards)" DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK EQUS "LOW(wPlayerNumberOfCardsNotInDeck)" ; ba DUELVARS_ARENA_CARD EQUS "LOW(wPlayerArenaCard)" ; bb DUELVARS_BENCH EQUS "LOW(wPlayerBench)" ; bc -DUELVARS_ARENA_CARD_FLAGS_C2 EQU $c2 +DUELVARS_ARENA_CARD_FLAGS EQUS "LOW(wPlayerArenaCardFlags)" ; c2 DUELVARS_ARENA_CARD_HP EQUS "LOW(wPlayerArenaCardHP)" ; c8 DUELVARS_BENCH1_CARD_HP EQUS "LOW(wPlayerBench1CardHP)" ; c9 DUELVARS_BENCH2_CARD_HP EQUS "LOW(wPlayerBench2CardHP)" ; ca @@ -164,7 +164,7 @@ SUBSTATUS2_GROWL EQU $12 SUBSTATUS3_THIS_TURN_DOUBLE_DAMAGE EQU 0 SUBSTATUS3_HEADACHE EQU 1 -; DUELVARS_ARENA_CARD_FLAGS_C2 constants +; DUELVARS_ARENA_CARD_FLAGS constants USED_PKMN_POWER_THIS_TURN_F EQU 5 USED_LEEK_SLAP_THIS_DUEL_F EQU 6 CAN_EVOLVE_THIS_TURN_F EQU 7 -- cgit v1.2.3 From 6943eea3d770b935020086008054c8a9bd2c28af Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 20 Dec 2020 14:28:15 +0000 Subject: Typos and other effect function fixeS --- src/constants/deck_ai_constants.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/constants') diff --git a/src/constants/deck_ai_constants.asm b/src/constants/deck_ai_constants.asm index 52b0283..4533c99 100644 --- a/src/constants/deck_ai_constants.asm +++ b/src/constants/deck_ai_constants.asm @@ -55,11 +55,11 @@ AI_ENERGY_TRANS_TO_BENCH EQU $e ; moves energy cards away from Arena card ; used to know which AI routine to call in ; the AIAction pointer tables in AIDoAction const_def 1 - const AIACTION_DO_TURN ; $1 - const AIACTION_START_DUEL ; $2 - const AIACTION_FORCED_SWITCH ; $3 - const AIACTION_KO_SWITCH ; $4 - const AIACTION_TAKE_PRIZE ; $5 + const AIACTION_DO_TURN ; $1 + const AIACTION_START_DUEL ; $2 + const AIACTION_FORCED_SWITCH ; $3 + const AIACTION_KO_SWITCH ; $4 + const AIACTION_TAKE_PRIZE ; $5 ; this bit is set when the AI decides to use Peek on their Prize cards, ; with the following bits deciding which one to Peek. That is: -- cgit v1.2.3 From 180af7b96f32afa74d6fc77e0132de8655fee318 Mon Sep 17 00:00:00 2001 From: ElectroDeoxys Date: Sun, 20 Dec 2020 15:21:24 +0000 Subject: Change color to type --- src/constants/duel_constants.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/constants') diff --git a/src/constants/duel_constants.asm b/src/constants/duel_constants.asm index 769e16b..4d2daf2 100644 --- a/src/constants/duel_constants.asm +++ b/src/constants/duel_constants.asm @@ -45,12 +45,12 @@ DUELVARS_BENCH2_CARD_STAGE EQUS "LOW(wPlayerBench2CardStage)" DUELVARS_BENCH3_CARD_STAGE EQUS "LOW(wPlayerBench3CardStage)" ; d1 DUELVARS_BENCH4_CARD_STAGE EQUS "LOW(wPlayerBench4CardStage)" ; d2 DUELVARS_BENCH5_CARD_STAGE EQUS "LOW(wPlayerBench5CardStage)" ; d3 -DUELVARS_ARENA_CARD_CHANGED_COLOR EQUS "LOW(wPlayerArenaCardChangedColor)" ; d4 -DUELVARS_BENCH1_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench1CardChangedColor)" ; d5 -DUELVARS_BENCH2_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench2CardChangedColor)" ; d6 -DUELVARS_BENCH3_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench3CardChangedColor)" ; d7 -DUELVARS_BENCH4_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench4CardChangedColor)" ; d8 -DUELVARS_BENCH5_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench5CardChangedColor)" ; d9 +DUELVARS_ARENA_CARD_CHANGED_TYPE EQUS "LOW(wPlayerArenaCardChangedType)" ; d4 +DUELVARS_BENCH1_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench1CardChangedType)" ; d5 +DUELVARS_BENCH2_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench2CardChangedType)" ; d6 +DUELVARS_BENCH3_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench3CardChangedType)" ; d7 +DUELVARS_BENCH4_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench4CardChangedType)" ; d8 +DUELVARS_BENCH5_CARD_CHANGED_COLOR EQUS "LOW(wPlayerBench5CardChangedType)" ; d9 DUELVARS_ARENA_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerArenaCardAttachedDefender)" ; da DUELVARS_BENCH1_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench1CardAttachedDefender)" ; db DUELVARS_BENCH2_CARD_ATTACHED_DEFENDER EQUS "LOW(wPlayerBench2CardAttachedDefender)" ; dc -- cgit v1.2.3 From f7346b9491715307b31ff3d8003e16a976e60961 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 20 Dec 2020 13:22:52 -0600 Subject: No more '+ -x' it was only needed because of a very old rgbds bug --- src/constants/card_constants.asm | 2 +- src/constants/card_data_constants.asm | 2 +- src/constants/charmaps.asm | 2 +- src/constants/deck_constants.asm | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/constants') diff --git a/src/constants/card_constants.asm b/src/constants/card_constants.asm index df6da6b..a079f72 100644 --- a/src/constants/card_constants.asm +++ b/src/constants/card_constants.asm @@ -227,4 +227,4 @@ const POKEMON_FLUTE ; $e2 const GAMBLER ; $e3 const RECYCLE ; $e4 -NUM_CARDS EQU const_value + -1 +NUM_CARDS EQU const_value - 1 diff --git a/src/constants/card_data_constants.asm b/src/constants/card_data_constants.asm index 0731218..cfb855b 100644 --- a/src/constants/card_data_constants.asm +++ b/src/constants/card_data_constants.asm @@ -116,7 +116,7 @@ TYPE_ENERGY EQU const_value const TYPE_ENERGY_UNUSED ; $0f const TYPE_TRAINER ; $10 const TYPE_TRAINER_UNUSED ; $11 -NUM_CARD_TYPES EQU const_value + -1 +NUM_CARD_TYPES EQU const_value - 1 TYPE_PKMN EQU %111 TYPE_ENERGY_F EQU 3 diff --git a/src/constants/charmaps.asm b/src/constants/charmaps.asm index 4803d29..44b8e0b 100644 --- a/src/constants/charmaps.asm +++ b/src/constants/charmaps.asm @@ -317,7 +317,7 @@ FW_SPACE EQU $70 txsymbol: MACRO const SYM_\1 - charmap "\1>", const_value + -1 + charmap "\1>", const_value - 1 ENDM ; TX_SYMBOL diff --git a/src/constants/deck_constants.asm b/src/constants/deck_constants.asm index 8c8e8c9..02c8ac9 100644 --- a/src/constants/deck_constants.asm +++ b/src/constants/deck_constants.asm @@ -1,6 +1,6 @@ deck_const: MACRO if const_value >= 2 -\1_ID EQU const_value + -2 +\1_ID EQU const_value - 2 endc const \1 ENDM @@ -65,6 +65,6 @@ ENDM deck_const FLAMETHROWER_DECK ; $34 deck_const RESHUFFLE_DECK ; $35 deck_const IMAKUNI_DECK ; $36 -DECKS_END EQU const_value + -1 -DECK_IDS_END EQU DECKS_END -2 +DECKS_END EQU const_value - 1 +DECK_IDS_END EQU DECKS_END - 2 -- cgit v1.2.3 From 9fab715759ddf919b0c4bb9a01095c4c225fcac0 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 20 Dec 2020 14:11:21 -0600 Subject: Fix typos --- src/constants/animation_constants.asm | 2 +- src/constants/hardware_constants.asm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/constants') diff --git a/src/constants/animation_constants.asm b/src/constants/animation_constants.asm index bdf93f8..645cb5e 100644 --- a/src/constants/animation_constants.asm +++ b/src/constants/animation_constants.asm @@ -2,7 +2,7 @@ ANIM_SPELL_MOVE EQU $01 ANIM_GET_HIT EQU $07 ANIM_THUNDER_SHOCK EQU $0a -ANIM_FURY_SWEEPES EQU $24 +ANIM_FURY_SWIPES EQU $24 ; Special animations ANIM_SHOW_DAMAGE EQU $09 diff --git a/src/constants/hardware_constants.asm b/src/constants/hardware_constants.asm index 3b36a9d..6879ffd 100644 --- a/src/constants/hardware_constants.asm +++ b/src/constants/hardware_constants.asm @@ -101,7 +101,7 @@ rNR34 EQU $ff1e ; Channel 3 Frequency's higher data (R/W) rNR41 EQU $ff20 ; Channel 4 Sound Length (R/W) rNR42 EQU $ff21 ; Channel 4 Volume Envelope (R/W) rNR43 EQU $ff22 ; Channel 4 Polynomial Counter (R/W) -rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Inital (R/W) +rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Initial (R/W) rNR50 EQU $ff24 ; Channel control / ON-OFF / Volume (R/W) rNR51 EQU $ff25 ; Selection of Sound output terminal (R/W) -- cgit v1.2.3