diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-04 16:19:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-04 16:19:15 -0400 |
| commit | 2718c36065e7eb201a149938bcdd51987c4e56b6 (patch) | |
| tree | 4a1c0294193a497e15ec8e6be59390eb1f84b5d3 /data/moves | |
| parent | Merge pull request #256 from Rangi42/master (diff) | |
| parent | UPDATE_PARTY_MENU_BLK_PACKET -> SET_PAL_PARTY_MENU_HP_BARS, and introduce SET... (diff) | |
| download | pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.gz pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.tar.xz pokeyellow-2718c36065e7eb201a149938bcdd51987c4e56b6.zip | |
Merge pull request #257 from Rangi42/master
More reorganization
Diffstat (limited to '')
| -rw-r--r-- | data/moves/animation_special_effect_pointers.asm (renamed from data/move_animation_pointers.asm) | 0 | ||||
| -rw-r--r-- | data/moves/animation_special_effects.asm (renamed from data/move_animation_special_effects.asm) | 0 | ||||
| -rwxr-xr-x | data/moves/animations.asm (renamed from data/animations.asm) | 0 | ||||
| -rw-r--r-- | data/moves/effects_pointers.asm (renamed from data/effects_pointers.asm) | 14 | ||||
| -rw-r--r-- | data/moves/grammar.asm (renamed from data/move_grammar.asm) | 0 | ||||
| -rw-r--r-- | data/moves/hm_moves.asm | 10 | ||||
| -rwxr-xr-x | data/moves/moves.asm (renamed from data/moves.asm) | 0 | ||||
| -rw-r--r-- | data/moves/names.asm (renamed from text/move_names.asm) | 0 | ||||
| -rw-r--r-- | data/moves/sfx.asm (renamed from data/move_sfx.asm) | 0 | ||||
| -rwxr-xr-x | data/moves/tmhm_moves.asm (renamed from data/tms.asm) | 0 |
10 files changed, 17 insertions, 7 deletions
diff --git a/data/move_animation_pointers.asm b/data/moves/animation_special_effect_pointers.asm index ba607141..ba607141 100644 --- a/data/move_animation_pointers.asm +++ b/data/moves/animation_special_effect_pointers.asm diff --git a/data/move_animation_special_effects.asm b/data/moves/animation_special_effects.asm index 9dfb5645..9dfb5645 100644 --- a/data/move_animation_special_effects.asm +++ b/data/moves/animation_special_effects.asm diff --git a/data/animations.asm b/data/moves/animations.asm index 8c388afd..8c388afd 100755 --- a/data/animations.asm +++ b/data/moves/animations.asm diff --git a/data/effects_pointers.asm b/data/moves/effects_pointers.asm index 0d36e887..02f6e5c6 100644 --- a/data/effects_pointers.asm +++ b/data/moves/effects_pointers.asm @@ -7,7 +7,7 @@ MoveEffectPointerTable: dw FreezeBurnParalyzeEffect ; PARALYZE_SIDE_EFFECT1 dw ExplodeEffect ; EXPLODE_EFFECT dw DrainHPEffect ; DREAM_EATER_EFFECT - dw $0000 ; MIRROR_MOVE_EFFECT + dw NULL ; MIRROR_MOVE_EFFECT dw StatModifierUpEffect ; ATTACK_UP1_EFFECT dw StatModifierUpEffect ; DEFENSE_UP1_EFFECT dw StatModifierUpEffect ; SPEED_UP1_EFFECT @@ -15,7 +15,7 @@ MoveEffectPointerTable: dw StatModifierUpEffect ; ACCURACY_UP1_EFFECT dw StatModifierUpEffect ; EVASION_UP1_EFFECT dw PayDayEffect ; PAY_DAY_EFFECT - dw $0000 ; SWIFT_EFFECT + dw NULL ; SWIFT_EFFECT dw StatModifierDownEffect ; ATTACK_DOWN1_EFFECT dw StatModifierDownEffect ; DEFENSE_DOWN1_EFFECT dw StatModifierDownEffect ; SPEED_DOWN1_EFFECT @@ -38,12 +38,12 @@ MoveEffectPointerTable: dw FlinchSideEffect ; FLINCH_SIDE_EFFECT2 dw OneHitKOEffect ; OHKO_EFFECT dw ChargeEffect ; CHARGE_EFFECT - dw $0000 ; SUPER_FANG_EFFECT - dw $0000 ; SPECIAL_DAMAGE_EFFECT + dw NULL ; SUPER_FANG_EFFECT + dw NULL ; SPECIAL_DAMAGE_EFFECT dw TrappingEffect ; TRAPPING_EFFECT dw ChargeEffect ; FLY_EFFECT dw TwoToFiveAttacksEffect ; ATTACK_TWICE_EFFECT - dw $0000 ; JUMP_KICK_EFFECT + dw NULL ; JUMP_KICK_EFFECT dw MistEffect ; MIST_EFFECT dw FocusEnergyEffect ; FOCUS_ENERGY_EFFECT dw RecoilEffect ; RECOIL_EFFECT @@ -76,12 +76,12 @@ MoveEffectPointerTable: dw StatModifierDownEffect ; unused effect dw ConfusionSideEffect ; CONFUSION_SIDE_EFFECT dw TwoToFiveAttacksEffect ; TWINEEDLE_EFFECT - dw $0000 ; unused effect + dw NULL ; unused effect dw SubstituteEffect ; SUBSTITUTE_EFFECT dw HyperBeamEffect ; HYPER_BEAM_EFFECT dw RageEffect ; RAGE_EFFECT dw MimicEffect ; MIMIC_EFFECT - dw $0000 ; METRONOME_EFFECT + dw NULL ; METRONOME_EFFECT dw LeechSeedEffect ; LEECH_SEED_EFFECT dw SplashEffect ; SPLASH_EFFECT dw DisableEffect ; DISABLE_EFFECT diff --git a/data/move_grammar.asm b/data/moves/grammar.asm index 8113ab7c..8113ab7c 100644 --- a/data/move_grammar.asm +++ b/data/moves/grammar.asm diff --git a/data/moves/hm_moves.asm b/data/moves/hm_moves.asm new file mode 100644 index 00000000..4f14b8df --- /dev/null +++ b/data/moves/hm_moves.asm @@ -0,0 +1,10 @@ +; This file is INCLUDEd twice: +; - for HMMoves in home/names.asm +; - for HMMoveArray in engine/pokemon/bills_pc.asm + + db CUT + db FLY + db SURF + db STRENGTH + db FLASH + db -1 ; end diff --git a/data/moves.asm b/data/moves/moves.asm index 44859681..44859681 100755 --- a/data/moves.asm +++ b/data/moves/moves.asm diff --git a/text/move_names.asm b/data/moves/names.asm index f8706ee3..f8706ee3 100644 --- a/text/move_names.asm +++ b/data/moves/names.asm diff --git a/data/move_sfx.asm b/data/moves/sfx.asm index 28ad0b63..28ad0b63 100644 --- a/data/move_sfx.asm +++ b/data/moves/sfx.asm diff --git a/data/tms.asm b/data/moves/tmhm_moves.asm index 23c1685e..23c1685e 100755 --- a/data/tms.asm +++ b/data/moves/tmhm_moves.asm |