From 140b01bbd6dac2c29c4fbc2cbe4360380851448e Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 16 Apr 2014 13:19:06 -0400 Subject: Use bits for status constants instead of masks. --- constants/status_constants.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'constants') diff --git a/constants/status_constants.asm b/constants/status_constants.asm index 8dd99e1d..866ea03c 100755 --- a/constants/status_constants.asm +++ b/constants/status_constants.asm @@ -1,6 +1,6 @@ -; status ailments (masks) -SLP EQU %00000111 -PSN EQU %00001000 -BRN EQU %00010000 -FRZ EQU %00100000 -PAR EQU %01000000 \ No newline at end of file +; status ailments +SLP EQU %111 ; mask +PSN EQU 3 +BRN EQU 4 +FRZ EQU 5 +PAR EQU 6 -- cgit v1.2.3 From 7eeaad6ab072898a4b69666bdbfc3f4cd041fe0f Mon Sep 17 00:00:00 2001 From: yenatch Date: Wed, 16 Apr 2014 13:21:22 -0400 Subject: More move effect constants. --- constants/move_effect_constants.asm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'constants') diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm index 088482dc..1a6d1be6 100644 --- a/constants/move_effect_constants.asm +++ b/constants/move_effect_constants.asm @@ -13,14 +13,18 @@ DREAM_EATER_EFFECT EQU $08 MIRROR_MOVE_EFFECT EQU $09 ATTACK_UP1_EFFECT EQU $0A DEFENSE_UP1_EFFECT EQU $0B +SPEED_UP1_EFFECT EQU $0C SPECIAL_UP1_EFFECT EQU $0D +ACCURACY_UP1_EFFECT EQU $0E EVASION_UP1_EFFECT EQU $0F PAY_DAY_EFFECT EQU $10 SWIFT_EFFECT EQU $11 ATTACK_DOWN1_EFFECT EQU $12 DEFENSE_DOWN1_EFFECT EQU $13 SPEED_DOWN1_EFFECT EQU $14 +SPECIAL_DOWN1_EFFECT EQU $15 ACCURACY_DOWN1_EFFECT EQU $16 +EVASION_DOWN1_EFFECT EQU $17 CONVERSION_EFFECT EQU $18 HAZE_EFFECT EQU $19 BIDE_EFFECT EQU $1A @@ -49,9 +53,16 @@ ATTACK_UP2_EFFECT EQU $32 DEFENSE_UP2_EFFECT EQU $33 SPEED_UP2_EFFECT EQU $34 SPECIAL_UP2_EFFECT EQU $35 +ACCURACY_UP2_EFFECT EQU $36 +EVASION_UP2_EFFECT EQU $37 HEAL_EFFECT EQU $38 ; Recover, Softboiled, Rest TRANSFORM_EFFECT EQU $39 +ATTACK_DOWN2_EFFECT EQU $3A DEFENSE_DOWN2_EFFECT EQU $3B +SPEED_DOWN2_EFFECT EQU $3C +SPECIAL_DOWN2_EFFECT EQU $3D +ACCURACY_DOWN2_EFFECT EQU $3E +EVASION_DOWN2_EFFECT EQU $3F LIGHT_SCREEN_EFFECT EQU $40 REFLECT_EFFECT EQU $41 POISON_EFFECT EQU $42 @@ -73,4 +84,4 @@ DISABLE_EFFECT EQU $56 ; fixed damage constants SONICBOOM_DAMAGE EQU 20 -DRAGON_RAGE_DAMAGE EQU 40 \ No newline at end of file +DRAGON_RAGE_DAMAGE EQU 40 -- cgit v1.2.3 From d0e2fc78c0c25e1b6508f7173d4e85c4b6949b2d Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 22 Apr 2014 13:35:55 -0400 Subject: More move and effect constants. Use a constant for total move count. --- constants/move_constants.asm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'constants') diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 524e7814..9fdb1ce7 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -1,3 +1,5 @@ +NUM_MOVES EQU $A4 + POUND EQU $01 KARATE_CHOP EQU $02 DOUBLESLAP EQU $03 @@ -163,6 +165,7 @@ SUPER_FANG EQU $A2 SLASH EQU $A3 SUBSTITUTE EQU $A4 STRUGGLE EQU $A5 + ; these do double duty as animation identifiers SHOWPIC_ANIM EQU $A6 ; redraw monster pic STATUS_AFFECTED_ANIM EQU $A7 ; effect when monster receives a status aliment @@ -178,4 +181,4 @@ GREATTOSS_ANIM EQU $C5 ; toss Great Ball ULTRATOSS_ANIM EQU $C6 ; toss Ultra Ball or Master Ball HIDEPIC_ANIM EQU $C8 ; monster disappears ROCK_ANIM EQU $C9 ; throw rock -BAIT_ANIM EQU $CA ; throw bait \ No newline at end of file +BAIT_ANIM EQU $CA ; throw bait -- cgit v1.2.3 From b73ed53ab77844d8e6fcf1d1c8f5dbb780e3cd06 Mon Sep 17 00:00:00 2001 From: yenatch Date: Tue, 22 Apr 2014 13:37:07 -0400 Subject: Comment in-game trade evolution. --- constants/wram_constants.asm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'constants') diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 111ae584..51c5c604 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -5,3 +5,6 @@ SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile) W_WATERRATE EQU $d8a4 W_WATERMONS EQU $d8a5 +; Overload enemy stat modifiers +wTradeMonNick EQU $cd1e + -- cgit v1.2.3 From ebecf8f7b540e670afa974104a3aa9317f696316 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 12 May 2014 23:22:14 -0500 Subject: Finished documenting/labeling functions in the MoveEffectPointerTable. --- constants/move_effect_constants.asm | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'constants') diff --git a/constants/move_effect_constants.asm b/constants/move_effect_constants.asm index 1a6d1be6..ff7ddc12 100644 --- a/constants/move_effect_constants.asm +++ b/constants/move_effect_constants.asm @@ -31,10 +31,12 @@ BIDE_EFFECT EQU $1A THRASH_PETAL_DANCE_EFFECT EQU $1B SWITCH_AND_TELEPORT_EFFECT EQU $1C TWO_TO_FIVE_ATTACKS_EFFECT EQU $1D +; unused effect EQU $1E FLINCH_SIDE_EFFECT1 EQU $1F SLEEP_EFFECT EQU $20 POISON_SIDE_EFFECT2 EQU $21 BURN_SIDE_EFFECT2 EQU $22 +; unused effect EQU $23 PARALYZE_SIDE_EFFECT2 EQU $24 FLINCH_SIDE_EFFECT2 EQU $25 OHKO_EFFECT EQU $26 ; moves like Horn Drill @@ -71,8 +73,13 @@ ATTACK_DOWN_SIDE_EFFECT EQU $44 DEFENSE_DOWN_SIDE_EFFECT EQU $45 SPEED_DOWN_SIDE_EFFECT EQU $46 SPECIAL_DOWN_SIDE_EFFECT EQU $47 +; unused effect EQU $48 +; unused effect EQU $49 +; unused effect EQU $4A +; unused effect EQU $4B CONFUSION_SIDE_EFFECT EQU $4C TWINEEDLE_EFFECT EQU $4D +; unused effect EQU $4E SUBSTITUTE_EFFECT EQU $4F HYPER_BEAM_EFFECT EQU $50 RAGE_EFFECT EQU $51 -- cgit v1.2.3