diff options
Diffstat (limited to 'battle/moves')
| -rw-r--r-- | battle/moves/move_descriptions.asm | 4 | ||||
| -rw-r--r-- | battle/moves/move_effects.asm | 4 | ||||
| -rw-r--r-- | battle/moves/move_effects_pointers.asm | 2 | ||||
| -rw-r--r-- | battle/moves/moves.asm | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/battle/moves/move_descriptions.asm b/battle/moves/move_descriptions.asm index df31fd38a..d86ceea37 100644 --- a/battle/moves/move_descriptions.asm +++ b/battle/moves/move_descriptions.asm @@ -1,4 +1,5 @@ -; MoveDescriptions: ; 2cb52 +MoveDescriptions:: ; 2cb52 +; entries correspond to move ids (see constants/move_constants.asm) dw PoundDescription dw KarateChopDescription dw DoubleslapDescription @@ -262,7 +263,6 @@ MoveFDDescription: MoveFEDescription: MoveFFDescription: Move00Description: -UnknownMoveDescription: db "?@" PoundDescription: diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm index 73bc3cbec..c56ff2560 100644 --- a/battle/moves/move_effects.asm +++ b/battle/moves/move_effects.asm @@ -1,3 +1,5 @@ +MoveEffects: ; 2732e + NormalHit: checkobedience usedmovetext @@ -571,7 +573,7 @@ DefenseDownHit: supereffectivetext checkdestinybond buildopponentrage - effectchance + effectchance ; bug: duplicate effectchance shouldn't be here defensedown statdownmessage endmove diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm index 2e4f1ea31..a12092881 100644 --- a/battle/moves/move_effects_pointers.asm +++ b/battle/moves/move_effects_pointers.asm @@ -1,3 +1,5 @@ +MoveEffectsPointers: ; 271f4 +; entries correspond to EFFECT_* constants dw NormalHit dw DoSleep dw PoisonHit diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm index 43ba6f10d..b576fbaff 100644 --- a/battle/moves/moves.asm +++ b/battle/moves/moves.asm @@ -1,4 +1,3 @@ -Moves: ; 41afb ; Characteristics of each move. move: MACRO @@ -11,6 +10,8 @@ move: MACRO db \7 percent ; effect chance ENDM +Moves: ; 41afb +; entries correspond to constants/move_constants.asm move POUND, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0 move KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, 100, 25, 0 move DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, 85, 10, 0 |