From 28aec67f6e99db64582f66b26a5c898fe9943e00 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Fri, 15 Dec 2017 00:05:53 -0500 Subject: Document one more bug/oversight Move FleeMons table into data/ --- data/ball_colors.asm | 16 ---------------- data/battle/ball_colors.asm | 16 ++++++++++++++++ data/battle/flee_mons.asm | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 16 deletions(-) delete mode 100644 data/ball_colors.asm create mode 100644 data/battle/ball_colors.asm create mode 100644 data/battle/flee_mons.asm (limited to 'data') diff --git a/data/ball_colors.asm b/data/ball_colors.asm deleted file mode 100644 index c3ba9d2b4..000000000 --- a/data/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/ball_colors.asm b/data/battle/ball_colors.asm new file mode 100644 index 000000000..c3ba9d2b4 --- /dev/null +++ b/data/battle/ball_colors.asm @@ -0,0 +1,16 @@ +; 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 new file mode 100644 index 000000000..1b1cea036 --- /dev/null +++ b/data/battle/flee_mons.asm @@ -0,0 +1,36 @@ +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 -- cgit v1.2.3