diff options
Diffstat (limited to 'asm')
63 files changed, 1 insertions, 81 deletions
diff --git a/asm/aurora.s b/asm/aurora.s index 98ee84515..e5de7c419 100755 --- a/asm/aurora.s +++ b/asm/aurora.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_1.s b/asm/battle_1.s index a0db27bf5..c37418e5c 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -1,5 +1,5 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_2.s b/asm/battle_2.s index b325276fc..c8f8eb0f4 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_9.s b/asm/battle_9.s index 8d59770f0..dce32d076 100644 --- a/asm/battle_9.s +++ b/asm/battle_9.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s index d59c2f1ca..6705c0fd7 100644 --- a/asm/battle_anim_81258BC.s +++ b/asm/battle_anim_81258BC.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index ff6aeaa64..91033c777 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index ef30b0458..f09d42062 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/battle_intro.s b/asm/battle_intro.s index 3ff14b441..721583c30 100755 --- a/asm/battle_intro.s +++ b/asm/battle_intro.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/beta_beat_up.s b/asm/beta_beat_up.s index 35e807dfe..d6e1ba675 100755 --- a/asm/beta_beat_up.s +++ b/asm/beta_beat_up.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/bubble.s b/asm/bubble.s index 2bd45e8da..466e31b0d 100755 --- a/asm/bubble.s +++ b/asm/bubble.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/cable_car.s b/asm/cable_car.s index e1131c549..52bc2668b 100644 --- a/asm/cable_car.s +++ b/asm/cable_car.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/cable_car_util.s b/asm/cable_car_util.s index d02c5bb2e..50ef19dec 100644 --- a/asm/cable_car_util.s +++ b/asm/cable_car_util.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/contest.s b/asm/contest.s index 2d24f5bb0..2f048fbc3 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/contest_ai.s b/asm/contest_ai.s index ae5d8c03e..d2061c84e 100644 --- a/asm/contest_ai.s +++ b/asm/contest_ai.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/contest_effect.s b/asm/contest_effect.s index 63cae8c82..4b21b780b 100644 --- a/asm/contest_effect.s +++ b/asm/contest_effect.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 0f69dcb51..2f281593c 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index 164b1ac03..63280f0f8 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/current.s b/asm/current.s index ba5f5c842..df72b56af 100755 --- a/asm/current.s +++ b/asm/current.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/cute_sketch.s b/asm/cute_sketch.s index 14c28327d..da5dea0ce 100644 --- a/asm/cute_sketch.s +++ b/asm/cute_sketch.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/dark.s b/asm/dark.s index f4ef9cc1a..5175d84f0 100755 --- a/asm/dark.s +++ b/asm/dark.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/devil.s b/asm/devil.s index b12dab8a8..ae552f231 100755 --- a/asm/devil.s +++ b/asm/devil.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/dragon.s b/asm/dragon.s index 9bf606993..c384e3b6c 100755 --- a/asm/dragon.s +++ b/asm/dragon.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/easy_chat.s b/asm/easy_chat.s index d97fc58ad..547ce174e 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/fight.s b/asm/fight.s index cb1783b77..c6ef33840 100755 --- a/asm/fight.s +++ b/asm/fight.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/fire.s b/asm/fire.s index 05a3e8073..bafe1d7e1 100755 --- a/asm/fire.s +++ b/asm/fire.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/fire_2.s b/asm/fire_2.s index 521c7fd3f..b96962bdf 100755 --- a/asm/fire_2.s +++ b/asm/fire_2.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/flying.s b/asm/flying.s index bbb1939a5..cf0b1053c 100755 --- a/asm/flying.s +++ b/asm/flying.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/fury_cutter_count.s b/asm/fury_cutter_count.s index 6de1d268e..10444b254 100755 --- a/asm/fury_cutter_count.s +++ b/asm/fury_cutter_count.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/ghost.s b/asm/ghost.s index 5d90a4aed..09458dec1 100755 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/ground.s b/asm/ground.s index c7207331d..7a401e9e8 100755 --- a/asm/ground.s +++ b/asm/ground.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/guard.s b/asm/guard.s index 6a540af6e..13ead6879 100755 --- a/asm/guard.s +++ b/asm/guard.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/heated_rock.s b/asm/heated_rock.s index 10d7da0fc..eb957a6f1 100755 --- a/asm/heated_rock.s +++ b/asm/heated_rock.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/libagbsyscall.s b/asm/libagbsyscall.s index c874e8a77..de59d4c27 100644 --- a/asm/libagbsyscall.s +++ b/asm/libagbsyscall.s @@ -1,5 +1,4 @@ .include "asm/macros.inc" - .syntax unified .text diff --git a/asm/liquid_ball.s b/asm/liquid_ball.s index abe629bfc..6af030ecf 100755 --- a/asm/liquid_ball.s +++ b/asm/liquid_ball.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/macros/ec.inc b/asm/macros/ec.inc index 44c974e53..d3fd45c2f 100644 --- a/asm/macros/ec.inc +++ b/asm/macros/ec.inc @@ -1,22 +1,3 @@ - .macro ec_word word - .2byte EC_WORD_\word - .endm - - .macro ec_move1 name - .2byte (EC_GROUP_MOVE_1 << 9) | MOVE_\name - .endm - - .macro ec_move2 name - .2byte (EC_GROUP_MOVE_2 << 9) | MOVE_\name - .endm - - .macro ec_pokemon1 name - .2byte (EC_GROUP_POKEMON << 9) | SPECIES_\name - .endm - - .macro ec_pokemon2 name - .2byte (EC_GROUP_POKEMON_2 << 9) | SPECIES_\name - .endm .macro ec_duplicates count .2byte 0xff00 + \count diff --git a/asm/noise.s b/asm/noise.s index 3b21bfc97..930b77309 100755 --- a/asm/noise.s +++ b/asm/noise.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/normal.s b/asm/normal.s index 38c5b7141..2d084dcf1 100755 --- a/asm/normal.s +++ b/asm/normal.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/note_spin.s b/asm/note_spin.s index 7f3c125ca..d0df90fd1 100755 --- a/asm/note_spin.s +++ b/asm/note_spin.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s index 3c4f96e32..665978d19 100755 --- a/asm/pc_screen_effect.s +++ b/asm/pc_screen_effect.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/poison.s b/asm/poison.s index 12a046c06..4411027e9 100755 --- a/asm/poison.s +++ b/asm/poison.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s index c8caf3628..fd5555524 100644 --- a/asm/pokedex_area_screen.s +++ b/asm/pokedex_area_screen.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s index ecb215abb..5eea28b99 100644 --- a/asm/pokedex_cry_screen.s +++ b/asm/pokedex_cry_screen.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s index dcd0cada5..822c4c566 100644 --- a/asm/pokemon_item_effect.s +++ b/asm/pokemon_item_effect.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 447141b79..7670d867d 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/pokenav.s b/asm/pokenav.s index cbae6d0cc..066d16d5d 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/psychic.s b/asm/psychic.s index e4d0e8ff7..fb024a00d 100755 --- a/asm/psychic.s +++ b/asm/psychic.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/rain.s b/asm/rain.s index a057cb813..f8f68dd28 100755 --- a/asm/rain.s +++ b/asm/rain.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/rock.s b/asm/rock.s index dc7eeb7d1..66c698577 100755 --- a/asm/rock.s +++ b/asm/rock.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/roulette.s b/asm/roulette.s index 2dc191630..04b3ac9b8 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/roulette_util.s b/asm/roulette_util.s index 191c9592f..5ddaa3a6e 100644 --- a/asm/roulette_util.s +++ b/asm/roulette_util.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/shock.s b/asm/shock.s index 10a79af34..743aefe8a 100755 --- a/asm/shock.s +++ b/asm/shock.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 1ae5b718d..62792245d 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/struggle.s b/asm/struggle.s index d3139e932..2d618ed8f 100755 --- a/asm/struggle.s +++ b/asm/struggle.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/sunlight.s b/asm/sunlight.s index 891997b07..07895e1b9 100755 --- a/asm/sunlight.s +++ b/asm/sunlight.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/swipe.s b/asm/swipe.s index 8de82b257..7f5284d7c 100755 --- a/asm/swipe.s +++ b/asm/swipe.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/thunder.s b/asm/thunder.s index fee26627d..df97608f9 100755 --- a/asm/thunder.s +++ b/asm/thunder.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/unk_text_8095904.s b/asm/unk_text_8095904.s index 4c1b662b3..f144eab26 100755 --- a/asm/unk_text_8095904.s +++ b/asm/unk_text_8095904.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/uproar.s b/asm/uproar.s index a6942a05d..04f428d4e 100755 --- a/asm/uproar.s +++ b/asm/uproar.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/water.s b/asm/water.s index fae8e7905..e982d4265 100755 --- a/asm/water.s +++ b/asm/water.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/wisp_fire.s b/asm/wisp_fire.s index 60692f01b..a22903e6b 100755 --- a/asm/wisp_fire.s +++ b/asm/wisp_fire.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified diff --git a/asm/wisp_orb.s b/asm/wisp_orb.s index ce3930fab..cb5920ba4 100755 --- a/asm/wisp_orb.s +++ b/asm/wisp_orb.s @@ -1,5 +1,4 @@ .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" .include "asm/macros.inc" .syntax unified |