diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-21 13:08:20 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-21 13:08:20 -0400 |
| commit | def16f56d0212de6dc99f7b733fb190e3784aad9 (patch) | |
| tree | 8c31f10206477422c6b53148ddf3c20160abdbda /constants | |
| parent | dc48fd153a0ed7a9236da657f72a7b7fde4034fd (diff) | |
engine/health.asm; overworld move/item fns pt 1
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/item_constants.asm | 4 | ||||
| -rw-r--r-- | constants/sfx_constants.asm | 18 | ||||
| -rw-r--r-- | constants/tilemap_constants.asm | 59 |
3 files changed, 26 insertions, 55 deletions
diff --git a/constants/item_constants.asm b/constants/item_constants.asm index efb4211d..1c69ba57 100644 --- a/constants/item_constants.asm +++ b/constants/item_constants.asm @@ -255,10 +255,6 @@ NUM_TMS = const_value - TM01 - 2 NUM_HMS = const_value - HM01 const HM_08 ; $FA - add_mt FLAMETHROWER - add_mt THUNDERBOLT - add_mt ICE_BEAM - ITEM_FROM_MEM EQU $ff diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm index 65abfc3c..3b88e820 100644 --- a/constants/sfx_constants.asm +++ b/constants/sfx_constants.asm @@ -190,21 +190,3 @@ const SFX_2_BOOPS ; bb const SFX_GLASS_TING ; bc const SFX_GLASS_TING_2 ; bd - - const SFX_INTRO_UNOWN_1 ; be - const SFX_INTRO_UNOWN_2 ; bf - const SFX_INTRO_UNOWN_3 ; c0 - const SFX_DITTO_POP_UP ; c1 - const SFX_DITTO_TRANSFORM ; c2 - const SFX_INTRO_SUICUNE_1 ; c3 - const SFX_INTRO_PICHU ; c4 - const SFX_INTRO_SUICUNE_2 ; c5 - const SFX_INTRO_SUICUNE_3 ; c6 - const SFX_DITTO_BOUNCE ; c7 - const SFX_INTRO_SUICUNE_4 ; c8 - const SFX_GAME_FREAK_PRESENTS ; c9 - const SFX_TINGLE ; ca - const SFX_UNKNOWN_CB ; cb - const SFX_TWO_PC_BEEPS ; cc - const SFX_4_NOTE_DITTY ; cd - const SFX_TWINKLE ; ce diff --git a/constants/tilemap_constants.asm b/constants/tilemap_constants.asm index 9307a22a..b1185bf2 100644 --- a/constants/tilemap_constants.asm +++ b/constants/tilemap_constants.asm @@ -8,39 +8,32 @@ const_value SET 1 const TILESET_JOHTO_1 ; 01 const TILESET_JOHTO_2 ; 02 const TILESET_KANTO ; 03 - const TILESET_BATTLE_TOWER_OUTSIDE ; 04 - const TILESET_HOUSE_1 ; 05 - const TILESET_KRISS_HOUSE ; 06 - const TILESET_POKECENTER ; 07 - const TILESET_GATE ; 08 - const TILESET_PORT ; 09 - const TILESET_LAB ; 0a - const TILESET_POWER_PLANT ; 0b - const TILESET_MART ; 0c - const TILESET_CELADON_MANSION ; 0d - const TILESET_GAME_CORNER ; 0e - const TILESET_GYM_1 ; 0f - const TILESET_KURT_HOUSE ; 10 - const TILESET_TRAIN_STATION ; 11 - const TILESET_OLIVINE_GYM ; 12 - const TILESET_LIGHTHOUSE ; 13 - const TILESET_KRISS_HOUSE_2F ; 14 - const TILESET_POKECOM_CENTER ; 15 - const TILESET_BATTLE_TOWER ; 16 - const TILESET_SPROUT_TOWER ; 17 - const TILESET_CAVE ; 18 - const TILESET_PARK ; 19 - const TILESET_RUINS_OF_ALPH ; 1a - const TILESET_RADIO_TOWER ; 1b - const TILESET_UNDERGROUND ; 1c - const TILESET_ICE_PATH ; 1d - const TILESET_WHIRL_ISLANDS ; 1e - const TILESET_ILEX_FOREST ; 1f - const TILESET_32 ; 20 - const TILESET_HO_OH_WORD_ROOM ; 21 - const TILESET_KABUTO_WORD_ROOM ; 22 - const TILESET_OMANYTE_WORD_ROOM ; 23 - const TILESET_AERODACTYL_WORD_ROOM ; 24 + const TILESET_HOUSE_1 ; 04 + const TILESET_KRISS_HOUSE ; 05 + const TILESET_POKECENTER ; 06 + const TILESET_GATE ; 07 + const TILESET_PORT ; 08 + const TILESET_LAB ; 09 + const TILESET_POWER_PLANT ; 0a + const TILESET_MART ; 0b + const TILESET_CELADON_MANSION ; 0c + const TILESET_GAME_CORNER ; 0d + const TILESET_GYM_1 ; 0e + const TILESET_KURT_HOUSE ; 0f + const TILESET_TRAIN_STATION ; 10 + const TILESET_OLIVINE_GYM ; 11 + const TILESET_LIGHTHOUSE ; 12 + const TILESET_KRISS_HOUSE_2F ; 13 + const TILESET_SPROUT_TOWER ; 14 + const TILESET_CAVE ; 15 + const TILESET_PARK ; 16 + const TILESET_RUINS_OF_ALPH ; 17 + const TILESET_RADIO_TOWER ; 18 + const TILESET_UNDERGROUND ; 19 + const TILESET_ICE_PATH ; 1a + const TILESET_WHIRL_ISLANDS ; 1b + const TILESET_ILEX_FOREST ; 1c + const TILESET_29 ; 1d const_def const PAL_BG_GRAY |