summaryrefslogtreecommitdiff
path: root/data/battle
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-26 17:47:05 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-26 17:47:05 -0500
commitb5417fafec7dd37cb4be391f3bd3d4541a2a381e (patch)
treea4e7d08afb2e862186a138e82c8ef4785d82786d /data/battle
parent2f98c2032fd47ada3484bfc37d590992f286d3d4 (diff)
Split battle/ into data/ and engine/ components
Diffstat (limited to 'data/battle')
-rw-r--r--data/battle/ball_colors.asm16
-rw-r--r--data/battle/flee_mons.asm36
2 files changed, 0 insertions, 52 deletions
diff --git a/data/battle/ball_colors.asm b/data/battle/ball_colors.asm
deleted file mode 100644
index c3ba9d2b4..000000000
--- a/data/battle/ball_colors.asm
+++ /dev/null
@@ -1,16 +0,0 @@
-; colors of balls thrown in battle
-
-BallColors: ; cd26c (33:526c)
- db MASTER_BALL, PAL_BATTLE_OB_GREEN
- db ULTRA_BALL, PAL_BATTLE_OB_YELLOW
- db GREAT_BALL, PAL_BATTLE_OB_BLUE
- db POKE_BALL, PAL_BATTLE_OB_RED
- db HEAVY_BALL, PAL_BATTLE_OB_GRAY
- db LEVEL_BALL, PAL_BATTLE_OB_BROWN
- db LURE_BALL, PAL_BATTLE_OB_BLUE
- db FAST_BALL, PAL_BATTLE_OB_BLUE
- db FRIEND_BALL, PAL_BATTLE_OB_YELLOW
- db MOON_BALL, PAL_BATTLE_OB_GRAY
- db LOVE_BALL, PAL_BATTLE_OB_RED
- db -1, PAL_BATTLE_OB_GRAY
-; cd284
diff --git a/data/battle/flee_mons.asm b/data/battle/flee_mons.asm
deleted file mode 100644
index 1b1cea036..000000000
--- a/data/battle/flee_mons.asm
+++ /dev/null
@@ -1,36 +0,0 @@
-FleeMons:
-; referenced by TryEnemyFlee and FastBallMultiplier
-
-SometimesFleeMons: ; 3c59a
- db MAGNEMITE
- db GRIMER
- db TANGELA
- db MR__MIME
- db EEVEE
- db PORYGON
- db DRATINI
- db DRAGONAIR
- db TOGETIC
- db UMBREON
- db UNOWN
- db SNUBBULL
- db HERACROSS
- db -1
-
-OftenFleeMons: ; 3c5a8
- db CUBONE
- db ARTICUNO
- db ZAPDOS
- db MOLTRES
- db QUAGSIRE
- db DELIBIRD
- db PHANPY
- db TEDDIURSA
- db -1
-
-AlwaysFleeMons: ; 3c5b1
- db RAIKOU
- db ENTEI
-; db SUICUNE
- db -1
-; 3c5b4