From 25df1460549f97f51c68f9feb205d324582491a2 Mon Sep 17 00:00:00 2001 From: Sahith Nallapareddy Date: Mon, 20 Jan 2020 03:30:12 -0500 Subject: [PATCH 1/6] using item constant --- src/pokemon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pokemon.c b/src/pokemon.c index 5a4e6df087..6dd09902d4 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -5079,7 +5079,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov friendship += var_34; if (var_34 > 0) { - if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) friendship++; if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; @@ -5105,7 +5105,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov friendship += var_34; if (var_34 > 0) { - if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) friendship++; if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; @@ -5130,7 +5130,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov friendship += var_34; if (var_34 > 0) { - if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == 11) + if (GetMonData(mon, MON_DATA_POKEBALL, NULL) == ITEM_LUXURY_BALL) friendship++; if (GetMonData(mon, MON_DATA_MET_LOCATION, NULL) == GetCurrentRegionMapSectionId()) friendship++; From 6f392632c29bfe990eba30146a7e8a3b22aca672 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 22 Jan 2020 18:05:42 -0500 Subject: [PATCH 2/6] Note AI weather bug --- data/battle_ai_scripts.s | 55 +++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 26 deletions(-) diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 633c3b38e2..18eaf80403 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -743,7 +743,7 @@ AI_CheckViability: if_effect EFFECT_MIRROR_COAT, AI_CV_MirrorCoat if_effect EFFECT_SKULL_BASH, AI_CV_ChargeUpMove if_effect EFFECT_SOLARBEAM, AI_CV_ChargeUpMove - if_effect EFFECT_SEMI_INVULNERABLE, AI_CV_Fly + if_effect EFFECT_SEMI_INVULNERABLE, AI_CV_SemiInvulnerable if_effect EFFECT_SOFTBOILED, AI_CV_Heal if_effect EFFECT_FAKE_OUT, AI_CV_FakeOut if_effect EFFECT_SPIT_UP, AI_CV_SpitUp @@ -2317,48 +2317,51 @@ AI_CV_ChargeUpMove_ScoreDown2: AI_CV_ChargeUpMove_End: end -AI_CV_Fly: - if_doesnt_have_move_with_effect AI_TARGET, EFFECT_PROTECT, AI_CV_Fly2 +AI_CV_SemiInvulnerable: + if_doesnt_have_move_with_effect AI_TARGET, EFFECT_PROTECT, AI_CV_SemiInvulnerable2 score -1 - goto AI_CV_Fly_End + goto AI_CV_SemiInvulnerable_End -AI_CV_Fly2: - if_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_Fly6 - if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_Fly6 - if_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_Fly6 +@ BUG: The scripts for checking type-resistance to weather for semi-invulnerable moves are swapped +@ The result is that the AI is encouraged to stall while taking damage from weather +@ To fix, swap _CheckSandstormTypes/_CheckIceType in the below script +AI_CV_SemiInvulnerable2: + if_status AI_TARGET, STATUS1_TOXIC_POISON, AI_CV_SemiInvulnerable_TryEncourage + if_status2 AI_TARGET, STATUS2_CURSED, AI_CV_SemiInvulnerable_TryEncourage + if_status3 AI_TARGET, STATUS3_LEECHSEED, AI_CV_SemiInvulnerable_TryEncourage get_weather - if_equal AI_WEATHER_HAIL, AI_CV_Fly3 - if_equal AI_WEATHER_SANDSTORM, AI_CV_Fly4 - goto AI_CV_Fly5 + if_equal AI_WEATHER_HAIL, AI_CV_SemiInvulnerable_CheckSandstormTypes + if_equal AI_WEATHER_SANDSTORM, AI_CV_SemiInvulnerable_CheckIceType + goto AI_CV_SemiInvulnerable5 -AI_CV_Fly3: +AI_CV_SemiInvulnerable_CheckSandstormTypes: get_user_type1 - if_in_bytes AI_CV_Fly_TypesToEncourage, AI_CV_Fly6 + if_in_bytes AI_CV_SandstormResistantTypes, AI_CV_SemiInvulnerable_TryEncourage get_user_type2 - if_in_bytes AI_CV_Fly_TypesToEncourage, AI_CV_Fly6 - goto AI_CV_Fly5 + if_in_bytes AI_CV_SandstormResistantTypes, AI_CV_SemiInvulnerable_TryEncourage + goto AI_CV_SemiInvulnerable5 -AI_CV_Fly4: +AI_CV_SemiInvulnerable_CheckIceType: get_user_type1 - if_equal TYPE_ICE, AI_CV_Fly6 + if_equal TYPE_ICE, AI_CV_SemiInvulnerable_TryEncourage get_user_type2 - if_equal TYPE_ICE, AI_CV_Fly6 + if_equal TYPE_ICE, AI_CV_SemiInvulnerable_TryEncourage -AI_CV_Fly5: - if_target_faster AI_CV_Fly_End +AI_CV_SemiInvulnerable5: + if_target_faster AI_CV_SemiInvulnerable_End get_last_used_bank_move AI_TARGET get_move_effect_from_result - if_not_equal EFFECT_LOCK_ON, AI_CV_Fly6 - goto AI_CV_Fly_End + if_not_equal EFFECT_LOCK_ON, AI_CV_SemiInvulnerable_TryEncourage + goto AI_CV_SemiInvulnerable_End -AI_CV_Fly6: - if_random_less_than 80, AI_CV_Fly_End +AI_CV_SemiInvulnerable_TryEncourage: + if_random_less_than 80, AI_CV_SemiInvulnerable_End score +1 -AI_CV_Fly_End: +AI_CV_SemiInvulnerable_End: end -AI_CV_Fly_TypesToEncourage: +AI_CV_SandstormResistantTypes: .byte TYPE_GROUND .byte TYPE_ROCK .byte TYPE_STEEL From 25d7577d9de59afab75967dda4ad12ca971001c1 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 20 Jan 2020 19:36:17 -0500 Subject: [PATCH 3/6] Label animated doors --- .../door_anims/{28 => abandoned_ship}/0.png | Bin .../door_anims/{28 => abandoned_ship}/1.png | Bin .../door_anims/{28 => abandoned_ship}/2.png | Bin .../{30 => abandoned_ship_room}/0.png | Bin .../{30 => abandoned_ship_room}/1.png | Bin .../{30 => abandoned_ship_room}/2.png | Bin .../door_anims/{38 => battle_arena}/0.png | Bin .../door_anims/{38 => battle_arena}/1.png | Bin .../door_anims/{38 => battle_arena}/2.png | Bin .../{39 => battle_arena_lobby}/0.png | Bin .../{39 => battle_arena_lobby}/1.png | Bin .../{39 => battle_arena_lobby}/2.png | Bin graphics/door_anims/{35 => battle_dome}/0.png | Bin graphics/door_anims/{35 => battle_dome}/1.png | Bin graphics/door_anims/{35 => battle_dome}/2.png | Bin .../{43 => battle_dome_corridor}/0.png | Bin .../{43 => battle_dome_corridor}/1.png | Bin .../{43 => battle_dome_corridor}/2.png | Bin .../{40 => battle_dome_lobby}/0.png | Bin .../{40 => battle_dome_lobby}/1.png | Bin .../{40 => battle_dome_lobby}/2.png | Bin .../{47 => battle_dome_pre_battle_room}/0.png | Bin .../{47 => battle_dome_pre_battle_room}/1.png | Bin .../{47 => battle_dome_pre_battle_room}/2.png | Bin .../door_anims/{36 => battle_factory}/0.png | Bin .../door_anims/{36 => battle_factory}/1.png | Bin .../door_anims/{36 => battle_factory}/2.png | Bin .../door_anims/{45 => battle_frontier}/0.png | Bin .../door_anims/{45 => battle_frontier}/1.png | Bin .../door_anims/{45 => battle_frontier}/2.png | Bin .../{46 => battle_frontier_sliding}/0.png | Bin .../{46 => battle_frontier_sliding}/1.png | Bin .../{46 => battle_frontier_sliding}/2.png | Bin .../{41 => battle_palace_lobby}/0.png | Bin .../{41 => battle_palace_lobby}/1.png | Bin .../{41 => battle_palace_lobby}/2.png | Bin graphics/door_anims/{42 => battle_tent}/0.png | Bin graphics/door_anims/{42 => battle_tent}/1.png | Bin graphics/door_anims/{42 => battle_tent}/2.png | Bin graphics/door_anims/{42 => battle_tent}/3.png | Bin .../{48 => battle_tent_interior}/0.png | Bin .../{48 => battle_tent_interior}/1.png | Bin .../{48 => battle_tent_interior}/2.png | Bin .../{48 => battle_tent_interior}/3.png | Bin .../door_anims/{37 => battle_tower}/0.png | Bin .../door_anims/{37 => battle_tower}/1.png | Bin .../door_anims/{37 => battle_tower}/2.png | Bin .../{22 => battle_tower_corridor}/0.png | Bin .../{22 => battle_tower_corridor}/1.png | Bin .../{22 => battle_tower_corridor}/2.png | Bin .../{33 => battle_tower_elevator}/0.png | Bin .../{33 => battle_tower_elevator}/1.png | Bin .../{33 => battle_tower_elevator}/2.png | Bin .../0_left.png | Bin .../0_right.png | Bin .../1_left.png | Bin .../1_right.png | Bin .../2_left.png | Bin .../2_right.png | Bin .../door_anims/{32 => battle_tower_old}/0.png | Bin .../door_anims/{32 => battle_tower_old}/1.png | Bin .../door_anims/{32 => battle_tower_old}/2.png | Bin graphics/door_anims/{05 => birchs_lab}/0.png | Bin graphics/door_anims/{05 => birchs_lab}/1.png | Bin graphics/door_anims/{05 => birchs_lab}/2.png | Bin graphics/door_anims/{27 => cable_club}/0.png | Bin graphics/door_anims/{27 => cable_club}/1.png | Bin graphics/door_anims/{27 => cable_club}/2.png | Bin graphics/door_anims/{14 => contest}/0.png | Bin graphics/door_anims/{14 => contest}/1.png | Bin graphics/door_anims/{14 => contest}/2.png | Bin .../door_anims/{23 => cycling_road}/0.png | Bin .../door_anims/{23 => cycling_road}/1.png | Bin .../door_anims/{23 => cycling_road}/2.png | Bin graphics/door_anims/{13 => dewford}/0.png | Bin graphics/door_anims/{13 => dewford}/1.png | Bin graphics/door_anims/{13 => dewford}/2.png | Bin .../{08 => fallarbor_dark_roof}/0.png | Bin .../{08 => fallarbor_dark_roof}/1.png | Bin .../{08 => fallarbor_dark_roof}/2.png | Bin .../{29 => fallarbor_light_roof}/0.png | Bin .../{29 => fallarbor_light_roof}/1.png | Bin .../{29 => fallarbor_light_roof}/2.png | Bin graphics/door_anims/{00 => general}/0.png | Bin graphics/door_anims/{00 => general}/1.png | Bin graphics/door_anims/{00 => general}/2.png | Bin graphics/door_anims/{02 => gym}/0.png | Bin graphics/door_anims/{02 => gym}/1.png | Bin graphics/door_anims/{02 => gym}/2.png | Bin graphics/door_anims/{15 => lilycove}/0.png | Bin graphics/door_anims/{15 => lilycove}/1.png | Bin graphics/door_anims/{15 => lilycove}/2.png | Bin .../{24 => lilycove_dept_store}/0.png | Bin .../{24 => lilycove_dept_store}/1.png | Bin .../{24 => lilycove_dept_store}/2.png | Bin .../0.png | Bin .../1.png | Bin .../2.png | Bin .../door_anims/{16 => lilycove_wooden}/0.png | Bin .../door_anims/{16 => lilycove_wooden}/1.png | Bin .../door_anims/{16 => lilycove_wooden}/2.png | Bin graphics/door_anims/{04 => littleroot}/0.png | Bin graphics/door_anims/{04 => littleroot}/1.png | Bin graphics/door_anims/{04 => littleroot}/2.png | Bin graphics/door_anims/{10 => mauville}/0.png | Bin graphics/door_anims/{10 => mauville}/1.png | Bin graphics/door_anims/{10 => mauville}/2.png | Bin graphics/door_anims/{17 => mossdeep}/0.png | Bin graphics/door_anims/{17 => mossdeep}/1.png | Bin graphics/door_anims/{17 => mossdeep}/2.png | Bin .../{26 => mossdeep_space_center}/0.png | Bin .../{26 => mossdeep_space_center}/1.png | Bin .../{26 => mossdeep_space_center}/2.png | Bin graphics/door_anims/{09 => oldale}/0.png | Bin graphics/door_anims/{09 => oldale}/1.png | Bin graphics/door_anims/{09 => oldale}/2.png | Bin graphics/door_anims/{21 => pacifidlog}/0.png | Bin graphics/door_anims/{21 => pacifidlog}/1.png | Bin graphics/door_anims/{21 => pacifidlog}/2.png | Bin graphics/door_anims/{01 => poke_center}/0.png | Bin graphics/door_anims/{01 => poke_center}/1.png | Bin graphics/door_anims/{01 => poke_center}/2.png | Bin graphics/door_anims/{03 => poke_mart}/0.png | Bin graphics/door_anims/{03 => poke_mart}/1.png | Bin graphics/door_anims/{03 => poke_mart}/2.png | Bin .../door_anims/{20 => pokemon_league}/0.png | Bin .../door_anims/{20 => pokemon_league}/1.png | Bin .../door_anims/{20 => pokemon_league}/2.png | Bin .../door_anims/{06 => rustboro_gray}/0.png | Bin .../door_anims/{06 => rustboro_gray}/1.png | Bin .../door_anims/{06 => rustboro_gray}/2.png | Bin .../door_anims/{07 => rustboro_tan}/0.png | Bin .../door_anims/{07 => rustboro_tan}/1.png | Bin .../door_anims/{07 => rustboro_tan}/2.png | Bin graphics/door_anims/{25 => safari_zone}/0.png | Bin graphics/door_anims/{25 => safari_zone}/1.png | Bin graphics/door_anims/{25 => safari_zone}/2.png | Bin graphics/door_anims/{12 => slateport}/0.png | Bin graphics/door_anims/{12 => slateport}/1.png | Bin graphics/door_anims/{12 => slateport}/2.png | Bin graphics/door_anims/{19 => sootopolis}/0.png | Bin graphics/door_anims/{19 => sootopolis}/1.png | Bin graphics/door_anims/{19 => sootopolis}/2.png | Bin .../{18 => sootopolis_peaked_roof}/0.png | Bin .../{18 => sootopolis_peaked_roof}/1.png | Bin .../{18 => sootopolis_peaked_roof}/2.png | Bin .../{49 => trainer_hill_lobby_elevator}/0.png | Bin .../{49 => trainer_hill_lobby_elevator}/1.png | Bin .../{49 => trainer_hill_lobby_elevator}/2.png | Bin .../{50 => trainer_hill_roof_elevator}/0.png | Bin .../{50 => trainer_hill_roof_elevator}/1.png | Bin .../{50 => trainer_hill_roof_elevator}/2.png | Bin graphics/door_anims/{34 => unknown}/0.png | Bin graphics/door_anims/{34 => unknown}/1.png | Bin graphics/door_anims/{34 => unknown}/2.png | Bin graphics/door_anims/{11 => verdanturf}/0.png | Bin graphics/door_anims/{11 => verdanturf}/1.png | Bin graphics/door_anims/{11 => verdanturf}/2.png | Bin include/constants/metatile_labels.h | 109 ++- include/field_door.h | 21 +- src/field_door.c | 693 +++++++++--------- 161 files changed, 455 insertions(+), 368 deletions(-) rename graphics/door_anims/{28 => abandoned_ship}/0.png (100%) rename graphics/door_anims/{28 => abandoned_ship}/1.png (100%) rename graphics/door_anims/{28 => abandoned_ship}/2.png (100%) rename graphics/door_anims/{30 => abandoned_ship_room}/0.png (100%) rename graphics/door_anims/{30 => abandoned_ship_room}/1.png (100%) rename graphics/door_anims/{30 => abandoned_ship_room}/2.png (100%) rename graphics/door_anims/{38 => battle_arena}/0.png (100%) rename graphics/door_anims/{38 => battle_arena}/1.png (100%) rename graphics/door_anims/{38 => battle_arena}/2.png (100%) rename graphics/door_anims/{39 => battle_arena_lobby}/0.png (100%) rename graphics/door_anims/{39 => battle_arena_lobby}/1.png (100%) rename graphics/door_anims/{39 => battle_arena_lobby}/2.png (100%) rename graphics/door_anims/{35 => battle_dome}/0.png (100%) rename graphics/door_anims/{35 => battle_dome}/1.png (100%) rename graphics/door_anims/{35 => battle_dome}/2.png (100%) rename graphics/door_anims/{43 => battle_dome_corridor}/0.png (100%) rename graphics/door_anims/{43 => battle_dome_corridor}/1.png (100%) rename graphics/door_anims/{43 => battle_dome_corridor}/2.png (100%) rename graphics/door_anims/{40 => battle_dome_lobby}/0.png (100%) rename graphics/door_anims/{40 => battle_dome_lobby}/1.png (100%) rename graphics/door_anims/{40 => battle_dome_lobby}/2.png (100%) rename graphics/door_anims/{47 => battle_dome_pre_battle_room}/0.png (100%) rename graphics/door_anims/{47 => battle_dome_pre_battle_room}/1.png (100%) rename graphics/door_anims/{47 => battle_dome_pre_battle_room}/2.png (100%) rename graphics/door_anims/{36 => battle_factory}/0.png (100%) rename graphics/door_anims/{36 => battle_factory}/1.png (100%) rename graphics/door_anims/{36 => battle_factory}/2.png (100%) rename graphics/door_anims/{45 => battle_frontier}/0.png (100%) rename graphics/door_anims/{45 => battle_frontier}/1.png (100%) rename graphics/door_anims/{45 => battle_frontier}/2.png (100%) rename graphics/door_anims/{46 => battle_frontier_sliding}/0.png (100%) rename graphics/door_anims/{46 => battle_frontier_sliding}/1.png (100%) rename graphics/door_anims/{46 => battle_frontier_sliding}/2.png (100%) rename graphics/door_anims/{41 => battle_palace_lobby}/0.png (100%) rename graphics/door_anims/{41 => battle_palace_lobby}/1.png (100%) rename graphics/door_anims/{41 => battle_palace_lobby}/2.png (100%) rename graphics/door_anims/{42 => battle_tent}/0.png (100%) rename graphics/door_anims/{42 => battle_tent}/1.png (100%) rename graphics/door_anims/{42 => battle_tent}/2.png (100%) rename graphics/door_anims/{42 => battle_tent}/3.png (100%) rename graphics/door_anims/{48 => battle_tent_interior}/0.png (100%) rename graphics/door_anims/{48 => battle_tent_interior}/1.png (100%) rename graphics/door_anims/{48 => battle_tent_interior}/2.png (100%) rename graphics/door_anims/{48 => battle_tent_interior}/3.png (100%) rename graphics/door_anims/{37 => battle_tower}/0.png (100%) rename graphics/door_anims/{37 => battle_tower}/1.png (100%) rename graphics/door_anims/{37 => battle_tower}/2.png (100%) rename graphics/door_anims/{22 => battle_tower_corridor}/0.png (100%) rename graphics/door_anims/{22 => battle_tower_corridor}/1.png (100%) rename graphics/door_anims/{22 => battle_tower_corridor}/2.png (100%) rename graphics/door_anims/{33 => battle_tower_elevator}/0.png (100%) rename graphics/door_anims/{33 => battle_tower_elevator}/1.png (100%) rename graphics/door_anims/{33 => battle_tower_elevator}/2.png (100%) rename graphics/door_anims/{44 => battle_tower_multi_corridor}/0_left.png (100%) rename graphics/door_anims/{44 => battle_tower_multi_corridor}/0_right.png (100%) rename graphics/door_anims/{44 => battle_tower_multi_corridor}/1_left.png (100%) rename graphics/door_anims/{44 => battle_tower_multi_corridor}/1_right.png (100%) rename graphics/door_anims/{44 => battle_tower_multi_corridor}/2_left.png (100%) rename graphics/door_anims/{44 => battle_tower_multi_corridor}/2_right.png (100%) rename graphics/door_anims/{32 => battle_tower_old}/0.png (100%) rename graphics/door_anims/{32 => battle_tower_old}/1.png (100%) rename graphics/door_anims/{32 => battle_tower_old}/2.png (100%) rename graphics/door_anims/{05 => birchs_lab}/0.png (100%) rename graphics/door_anims/{05 => birchs_lab}/1.png (100%) rename graphics/door_anims/{05 => birchs_lab}/2.png (100%) rename graphics/door_anims/{27 => cable_club}/0.png (100%) rename graphics/door_anims/{27 => cable_club}/1.png (100%) rename graphics/door_anims/{27 => cable_club}/2.png (100%) rename graphics/door_anims/{14 => contest}/0.png (100%) rename graphics/door_anims/{14 => contest}/1.png (100%) rename graphics/door_anims/{14 => contest}/2.png (100%) rename graphics/door_anims/{23 => cycling_road}/0.png (100%) rename graphics/door_anims/{23 => cycling_road}/1.png (100%) rename graphics/door_anims/{23 => cycling_road}/2.png (100%) rename graphics/door_anims/{13 => dewford}/0.png (100%) rename graphics/door_anims/{13 => dewford}/1.png (100%) rename graphics/door_anims/{13 => dewford}/2.png (100%) rename graphics/door_anims/{08 => fallarbor_dark_roof}/0.png (100%) rename graphics/door_anims/{08 => fallarbor_dark_roof}/1.png (100%) rename graphics/door_anims/{08 => fallarbor_dark_roof}/2.png (100%) rename graphics/door_anims/{29 => fallarbor_light_roof}/0.png (100%) rename graphics/door_anims/{29 => fallarbor_light_roof}/1.png (100%) rename graphics/door_anims/{29 => fallarbor_light_roof}/2.png (100%) rename graphics/door_anims/{00 => general}/0.png (100%) rename graphics/door_anims/{00 => general}/1.png (100%) rename graphics/door_anims/{00 => general}/2.png (100%) rename graphics/door_anims/{02 => gym}/0.png (100%) rename graphics/door_anims/{02 => gym}/1.png (100%) rename graphics/door_anims/{02 => gym}/2.png (100%) rename graphics/door_anims/{15 => lilycove}/0.png (100%) rename graphics/door_anims/{15 => lilycove}/1.png (100%) rename graphics/door_anims/{15 => lilycove}/2.png (100%) rename graphics/door_anims/{24 => lilycove_dept_store}/0.png (100%) rename graphics/door_anims/{24 => lilycove_dept_store}/1.png (100%) rename graphics/door_anims/{24 => lilycove_dept_store}/2.png (100%) rename graphics/door_anims/{31 => lilycove_dept_store_elevator}/0.png (100%) rename graphics/door_anims/{31 => lilycove_dept_store_elevator}/1.png (100%) rename graphics/door_anims/{31 => lilycove_dept_store_elevator}/2.png (100%) rename graphics/door_anims/{16 => lilycove_wooden}/0.png (100%) rename graphics/door_anims/{16 => lilycove_wooden}/1.png (100%) rename graphics/door_anims/{16 => lilycove_wooden}/2.png (100%) rename graphics/door_anims/{04 => littleroot}/0.png (100%) rename graphics/door_anims/{04 => littleroot}/1.png (100%) rename graphics/door_anims/{04 => littleroot}/2.png (100%) rename graphics/door_anims/{10 => mauville}/0.png (100%) rename graphics/door_anims/{10 => mauville}/1.png (100%) rename graphics/door_anims/{10 => mauville}/2.png (100%) rename graphics/door_anims/{17 => mossdeep}/0.png (100%) rename graphics/door_anims/{17 => mossdeep}/1.png (100%) rename graphics/door_anims/{17 => mossdeep}/2.png (100%) rename graphics/door_anims/{26 => mossdeep_space_center}/0.png (100%) rename graphics/door_anims/{26 => mossdeep_space_center}/1.png (100%) rename graphics/door_anims/{26 => mossdeep_space_center}/2.png (100%) rename graphics/door_anims/{09 => oldale}/0.png (100%) rename graphics/door_anims/{09 => oldale}/1.png (100%) rename graphics/door_anims/{09 => oldale}/2.png (100%) rename graphics/door_anims/{21 => pacifidlog}/0.png (100%) rename graphics/door_anims/{21 => pacifidlog}/1.png (100%) rename graphics/door_anims/{21 => pacifidlog}/2.png (100%) rename graphics/door_anims/{01 => poke_center}/0.png (100%) rename graphics/door_anims/{01 => poke_center}/1.png (100%) rename graphics/door_anims/{01 => poke_center}/2.png (100%) rename graphics/door_anims/{03 => poke_mart}/0.png (100%) rename graphics/door_anims/{03 => poke_mart}/1.png (100%) rename graphics/door_anims/{03 => poke_mart}/2.png (100%) rename graphics/door_anims/{20 => pokemon_league}/0.png (100%) rename graphics/door_anims/{20 => pokemon_league}/1.png (100%) rename graphics/door_anims/{20 => pokemon_league}/2.png (100%) rename graphics/door_anims/{06 => rustboro_gray}/0.png (100%) rename graphics/door_anims/{06 => rustboro_gray}/1.png (100%) rename graphics/door_anims/{06 => rustboro_gray}/2.png (100%) rename graphics/door_anims/{07 => rustboro_tan}/0.png (100%) rename graphics/door_anims/{07 => rustboro_tan}/1.png (100%) rename graphics/door_anims/{07 => rustboro_tan}/2.png (100%) rename graphics/door_anims/{25 => safari_zone}/0.png (100%) rename graphics/door_anims/{25 => safari_zone}/1.png (100%) rename graphics/door_anims/{25 => safari_zone}/2.png (100%) rename graphics/door_anims/{12 => slateport}/0.png (100%) rename graphics/door_anims/{12 => slateport}/1.png (100%) rename graphics/door_anims/{12 => slateport}/2.png (100%) rename graphics/door_anims/{19 => sootopolis}/0.png (100%) rename graphics/door_anims/{19 => sootopolis}/1.png (100%) rename graphics/door_anims/{19 => sootopolis}/2.png (100%) rename graphics/door_anims/{18 => sootopolis_peaked_roof}/0.png (100%) rename graphics/door_anims/{18 => sootopolis_peaked_roof}/1.png (100%) rename graphics/door_anims/{18 => sootopolis_peaked_roof}/2.png (100%) rename graphics/door_anims/{49 => trainer_hill_lobby_elevator}/0.png (100%) rename graphics/door_anims/{49 => trainer_hill_lobby_elevator}/1.png (100%) rename graphics/door_anims/{49 => trainer_hill_lobby_elevator}/2.png (100%) rename graphics/door_anims/{50 => trainer_hill_roof_elevator}/0.png (100%) rename graphics/door_anims/{50 => trainer_hill_roof_elevator}/1.png (100%) rename graphics/door_anims/{50 => trainer_hill_roof_elevator}/2.png (100%) rename graphics/door_anims/{34 => unknown}/0.png (100%) rename graphics/door_anims/{34 => unknown}/1.png (100%) rename graphics/door_anims/{34 => unknown}/2.png (100%) rename graphics/door_anims/{11 => verdanturf}/0.png (100%) rename graphics/door_anims/{11 => verdanturf}/1.png (100%) rename graphics/door_anims/{11 => verdanturf}/2.png (100%) diff --git a/graphics/door_anims/28/0.png b/graphics/door_anims/abandoned_ship/0.png similarity index 100% rename from graphics/door_anims/28/0.png rename to graphics/door_anims/abandoned_ship/0.png diff --git a/graphics/door_anims/28/1.png b/graphics/door_anims/abandoned_ship/1.png similarity index 100% rename from graphics/door_anims/28/1.png rename to graphics/door_anims/abandoned_ship/1.png diff --git a/graphics/door_anims/28/2.png b/graphics/door_anims/abandoned_ship/2.png similarity index 100% rename from graphics/door_anims/28/2.png rename to graphics/door_anims/abandoned_ship/2.png diff --git a/graphics/door_anims/30/0.png b/graphics/door_anims/abandoned_ship_room/0.png similarity index 100% rename from graphics/door_anims/30/0.png rename to graphics/door_anims/abandoned_ship_room/0.png diff --git a/graphics/door_anims/30/1.png b/graphics/door_anims/abandoned_ship_room/1.png similarity index 100% rename from graphics/door_anims/30/1.png rename to graphics/door_anims/abandoned_ship_room/1.png diff --git a/graphics/door_anims/30/2.png b/graphics/door_anims/abandoned_ship_room/2.png similarity index 100% rename from graphics/door_anims/30/2.png rename to graphics/door_anims/abandoned_ship_room/2.png diff --git a/graphics/door_anims/38/0.png b/graphics/door_anims/battle_arena/0.png similarity index 100% rename from graphics/door_anims/38/0.png rename to graphics/door_anims/battle_arena/0.png diff --git a/graphics/door_anims/38/1.png b/graphics/door_anims/battle_arena/1.png similarity index 100% rename from graphics/door_anims/38/1.png rename to graphics/door_anims/battle_arena/1.png diff --git a/graphics/door_anims/38/2.png b/graphics/door_anims/battle_arena/2.png similarity index 100% rename from graphics/door_anims/38/2.png rename to graphics/door_anims/battle_arena/2.png diff --git a/graphics/door_anims/39/0.png b/graphics/door_anims/battle_arena_lobby/0.png similarity index 100% rename from graphics/door_anims/39/0.png rename to graphics/door_anims/battle_arena_lobby/0.png diff --git a/graphics/door_anims/39/1.png b/graphics/door_anims/battle_arena_lobby/1.png similarity index 100% rename from graphics/door_anims/39/1.png rename to graphics/door_anims/battle_arena_lobby/1.png diff --git a/graphics/door_anims/39/2.png b/graphics/door_anims/battle_arena_lobby/2.png similarity index 100% rename from graphics/door_anims/39/2.png rename to graphics/door_anims/battle_arena_lobby/2.png diff --git a/graphics/door_anims/35/0.png b/graphics/door_anims/battle_dome/0.png similarity index 100% rename from graphics/door_anims/35/0.png rename to graphics/door_anims/battle_dome/0.png diff --git a/graphics/door_anims/35/1.png b/graphics/door_anims/battle_dome/1.png similarity index 100% rename from graphics/door_anims/35/1.png rename to graphics/door_anims/battle_dome/1.png diff --git a/graphics/door_anims/35/2.png b/graphics/door_anims/battle_dome/2.png similarity index 100% rename from graphics/door_anims/35/2.png rename to graphics/door_anims/battle_dome/2.png diff --git a/graphics/door_anims/43/0.png b/graphics/door_anims/battle_dome_corridor/0.png similarity index 100% rename from graphics/door_anims/43/0.png rename to graphics/door_anims/battle_dome_corridor/0.png diff --git a/graphics/door_anims/43/1.png b/graphics/door_anims/battle_dome_corridor/1.png similarity index 100% rename from graphics/door_anims/43/1.png rename to graphics/door_anims/battle_dome_corridor/1.png diff --git a/graphics/door_anims/43/2.png b/graphics/door_anims/battle_dome_corridor/2.png similarity index 100% rename from graphics/door_anims/43/2.png rename to graphics/door_anims/battle_dome_corridor/2.png diff --git a/graphics/door_anims/40/0.png b/graphics/door_anims/battle_dome_lobby/0.png similarity index 100% rename from graphics/door_anims/40/0.png rename to graphics/door_anims/battle_dome_lobby/0.png diff --git a/graphics/door_anims/40/1.png b/graphics/door_anims/battle_dome_lobby/1.png similarity index 100% rename from graphics/door_anims/40/1.png rename to graphics/door_anims/battle_dome_lobby/1.png diff --git a/graphics/door_anims/40/2.png b/graphics/door_anims/battle_dome_lobby/2.png similarity index 100% rename from graphics/door_anims/40/2.png rename to graphics/door_anims/battle_dome_lobby/2.png diff --git a/graphics/door_anims/47/0.png b/graphics/door_anims/battle_dome_pre_battle_room/0.png similarity index 100% rename from graphics/door_anims/47/0.png rename to graphics/door_anims/battle_dome_pre_battle_room/0.png diff --git a/graphics/door_anims/47/1.png b/graphics/door_anims/battle_dome_pre_battle_room/1.png similarity index 100% rename from graphics/door_anims/47/1.png rename to graphics/door_anims/battle_dome_pre_battle_room/1.png diff --git a/graphics/door_anims/47/2.png b/graphics/door_anims/battle_dome_pre_battle_room/2.png similarity index 100% rename from graphics/door_anims/47/2.png rename to graphics/door_anims/battle_dome_pre_battle_room/2.png diff --git a/graphics/door_anims/36/0.png b/graphics/door_anims/battle_factory/0.png similarity index 100% rename from graphics/door_anims/36/0.png rename to graphics/door_anims/battle_factory/0.png diff --git a/graphics/door_anims/36/1.png b/graphics/door_anims/battle_factory/1.png similarity index 100% rename from graphics/door_anims/36/1.png rename to graphics/door_anims/battle_factory/1.png diff --git a/graphics/door_anims/36/2.png b/graphics/door_anims/battle_factory/2.png similarity index 100% rename from graphics/door_anims/36/2.png rename to graphics/door_anims/battle_factory/2.png diff --git a/graphics/door_anims/45/0.png b/graphics/door_anims/battle_frontier/0.png similarity index 100% rename from graphics/door_anims/45/0.png rename to graphics/door_anims/battle_frontier/0.png diff --git a/graphics/door_anims/45/1.png b/graphics/door_anims/battle_frontier/1.png similarity index 100% rename from graphics/door_anims/45/1.png rename to graphics/door_anims/battle_frontier/1.png diff --git a/graphics/door_anims/45/2.png b/graphics/door_anims/battle_frontier/2.png similarity index 100% rename from graphics/door_anims/45/2.png rename to graphics/door_anims/battle_frontier/2.png diff --git a/graphics/door_anims/46/0.png b/graphics/door_anims/battle_frontier_sliding/0.png similarity index 100% rename from graphics/door_anims/46/0.png rename to graphics/door_anims/battle_frontier_sliding/0.png diff --git a/graphics/door_anims/46/1.png b/graphics/door_anims/battle_frontier_sliding/1.png similarity index 100% rename from graphics/door_anims/46/1.png rename to graphics/door_anims/battle_frontier_sliding/1.png diff --git a/graphics/door_anims/46/2.png b/graphics/door_anims/battle_frontier_sliding/2.png similarity index 100% rename from graphics/door_anims/46/2.png rename to graphics/door_anims/battle_frontier_sliding/2.png diff --git a/graphics/door_anims/41/0.png b/graphics/door_anims/battle_palace_lobby/0.png similarity index 100% rename from graphics/door_anims/41/0.png rename to graphics/door_anims/battle_palace_lobby/0.png diff --git a/graphics/door_anims/41/1.png b/graphics/door_anims/battle_palace_lobby/1.png similarity index 100% rename from graphics/door_anims/41/1.png rename to graphics/door_anims/battle_palace_lobby/1.png diff --git a/graphics/door_anims/41/2.png b/graphics/door_anims/battle_palace_lobby/2.png similarity index 100% rename from graphics/door_anims/41/2.png rename to graphics/door_anims/battle_palace_lobby/2.png diff --git a/graphics/door_anims/42/0.png b/graphics/door_anims/battle_tent/0.png similarity index 100% rename from graphics/door_anims/42/0.png rename to graphics/door_anims/battle_tent/0.png diff --git a/graphics/door_anims/42/1.png b/graphics/door_anims/battle_tent/1.png similarity index 100% rename from graphics/door_anims/42/1.png rename to graphics/door_anims/battle_tent/1.png diff --git a/graphics/door_anims/42/2.png b/graphics/door_anims/battle_tent/2.png similarity index 100% rename from graphics/door_anims/42/2.png rename to graphics/door_anims/battle_tent/2.png diff --git a/graphics/door_anims/42/3.png b/graphics/door_anims/battle_tent/3.png similarity index 100% rename from graphics/door_anims/42/3.png rename to graphics/door_anims/battle_tent/3.png diff --git a/graphics/door_anims/48/0.png b/graphics/door_anims/battle_tent_interior/0.png similarity index 100% rename from graphics/door_anims/48/0.png rename to graphics/door_anims/battle_tent_interior/0.png diff --git a/graphics/door_anims/48/1.png b/graphics/door_anims/battle_tent_interior/1.png similarity index 100% rename from graphics/door_anims/48/1.png rename to graphics/door_anims/battle_tent_interior/1.png diff --git a/graphics/door_anims/48/2.png b/graphics/door_anims/battle_tent_interior/2.png similarity index 100% rename from graphics/door_anims/48/2.png rename to graphics/door_anims/battle_tent_interior/2.png diff --git a/graphics/door_anims/48/3.png b/graphics/door_anims/battle_tent_interior/3.png similarity index 100% rename from graphics/door_anims/48/3.png rename to graphics/door_anims/battle_tent_interior/3.png diff --git a/graphics/door_anims/37/0.png b/graphics/door_anims/battle_tower/0.png similarity index 100% rename from graphics/door_anims/37/0.png rename to graphics/door_anims/battle_tower/0.png diff --git a/graphics/door_anims/37/1.png b/graphics/door_anims/battle_tower/1.png similarity index 100% rename from graphics/door_anims/37/1.png rename to graphics/door_anims/battle_tower/1.png diff --git a/graphics/door_anims/37/2.png b/graphics/door_anims/battle_tower/2.png similarity index 100% rename from graphics/door_anims/37/2.png rename to graphics/door_anims/battle_tower/2.png diff --git a/graphics/door_anims/22/0.png b/graphics/door_anims/battle_tower_corridor/0.png similarity index 100% rename from graphics/door_anims/22/0.png rename to graphics/door_anims/battle_tower_corridor/0.png diff --git a/graphics/door_anims/22/1.png b/graphics/door_anims/battle_tower_corridor/1.png similarity index 100% rename from graphics/door_anims/22/1.png rename to graphics/door_anims/battle_tower_corridor/1.png diff --git a/graphics/door_anims/22/2.png b/graphics/door_anims/battle_tower_corridor/2.png similarity index 100% rename from graphics/door_anims/22/2.png rename to graphics/door_anims/battle_tower_corridor/2.png diff --git a/graphics/door_anims/33/0.png b/graphics/door_anims/battle_tower_elevator/0.png similarity index 100% rename from graphics/door_anims/33/0.png rename to graphics/door_anims/battle_tower_elevator/0.png diff --git a/graphics/door_anims/33/1.png b/graphics/door_anims/battle_tower_elevator/1.png similarity index 100% rename from graphics/door_anims/33/1.png rename to graphics/door_anims/battle_tower_elevator/1.png diff --git a/graphics/door_anims/33/2.png b/graphics/door_anims/battle_tower_elevator/2.png similarity index 100% rename from graphics/door_anims/33/2.png rename to graphics/door_anims/battle_tower_elevator/2.png diff --git a/graphics/door_anims/44/0_left.png b/graphics/door_anims/battle_tower_multi_corridor/0_left.png similarity index 100% rename from graphics/door_anims/44/0_left.png rename to graphics/door_anims/battle_tower_multi_corridor/0_left.png diff --git a/graphics/door_anims/44/0_right.png b/graphics/door_anims/battle_tower_multi_corridor/0_right.png similarity index 100% rename from graphics/door_anims/44/0_right.png rename to graphics/door_anims/battle_tower_multi_corridor/0_right.png diff --git a/graphics/door_anims/44/1_left.png b/graphics/door_anims/battle_tower_multi_corridor/1_left.png similarity index 100% rename from graphics/door_anims/44/1_left.png rename to graphics/door_anims/battle_tower_multi_corridor/1_left.png diff --git a/graphics/door_anims/44/1_right.png b/graphics/door_anims/battle_tower_multi_corridor/1_right.png similarity index 100% rename from graphics/door_anims/44/1_right.png rename to graphics/door_anims/battle_tower_multi_corridor/1_right.png diff --git a/graphics/door_anims/44/2_left.png b/graphics/door_anims/battle_tower_multi_corridor/2_left.png similarity index 100% rename from graphics/door_anims/44/2_left.png rename to graphics/door_anims/battle_tower_multi_corridor/2_left.png diff --git a/graphics/door_anims/44/2_right.png b/graphics/door_anims/battle_tower_multi_corridor/2_right.png similarity index 100% rename from graphics/door_anims/44/2_right.png rename to graphics/door_anims/battle_tower_multi_corridor/2_right.png diff --git a/graphics/door_anims/32/0.png b/graphics/door_anims/battle_tower_old/0.png similarity index 100% rename from graphics/door_anims/32/0.png rename to graphics/door_anims/battle_tower_old/0.png diff --git a/graphics/door_anims/32/1.png b/graphics/door_anims/battle_tower_old/1.png similarity index 100% rename from graphics/door_anims/32/1.png rename to graphics/door_anims/battle_tower_old/1.png diff --git a/graphics/door_anims/32/2.png b/graphics/door_anims/battle_tower_old/2.png similarity index 100% rename from graphics/door_anims/32/2.png rename to graphics/door_anims/battle_tower_old/2.png diff --git a/graphics/door_anims/05/0.png b/graphics/door_anims/birchs_lab/0.png similarity index 100% rename from graphics/door_anims/05/0.png rename to graphics/door_anims/birchs_lab/0.png diff --git a/graphics/door_anims/05/1.png b/graphics/door_anims/birchs_lab/1.png similarity index 100% rename from graphics/door_anims/05/1.png rename to graphics/door_anims/birchs_lab/1.png diff --git a/graphics/door_anims/05/2.png b/graphics/door_anims/birchs_lab/2.png similarity index 100% rename from graphics/door_anims/05/2.png rename to graphics/door_anims/birchs_lab/2.png diff --git a/graphics/door_anims/27/0.png b/graphics/door_anims/cable_club/0.png similarity index 100% rename from graphics/door_anims/27/0.png rename to graphics/door_anims/cable_club/0.png diff --git a/graphics/door_anims/27/1.png b/graphics/door_anims/cable_club/1.png similarity index 100% rename from graphics/door_anims/27/1.png rename to graphics/door_anims/cable_club/1.png diff --git a/graphics/door_anims/27/2.png b/graphics/door_anims/cable_club/2.png similarity index 100% rename from graphics/door_anims/27/2.png rename to graphics/door_anims/cable_club/2.png diff --git a/graphics/door_anims/14/0.png b/graphics/door_anims/contest/0.png similarity index 100% rename from graphics/door_anims/14/0.png rename to graphics/door_anims/contest/0.png diff --git a/graphics/door_anims/14/1.png b/graphics/door_anims/contest/1.png similarity index 100% rename from graphics/door_anims/14/1.png rename to graphics/door_anims/contest/1.png diff --git a/graphics/door_anims/14/2.png b/graphics/door_anims/contest/2.png similarity index 100% rename from graphics/door_anims/14/2.png rename to graphics/door_anims/contest/2.png diff --git a/graphics/door_anims/23/0.png b/graphics/door_anims/cycling_road/0.png similarity index 100% rename from graphics/door_anims/23/0.png rename to graphics/door_anims/cycling_road/0.png diff --git a/graphics/door_anims/23/1.png b/graphics/door_anims/cycling_road/1.png similarity index 100% rename from graphics/door_anims/23/1.png rename to graphics/door_anims/cycling_road/1.png diff --git a/graphics/door_anims/23/2.png b/graphics/door_anims/cycling_road/2.png similarity index 100% rename from graphics/door_anims/23/2.png rename to graphics/door_anims/cycling_road/2.png diff --git a/graphics/door_anims/13/0.png b/graphics/door_anims/dewford/0.png similarity index 100% rename from graphics/door_anims/13/0.png rename to graphics/door_anims/dewford/0.png diff --git a/graphics/door_anims/13/1.png b/graphics/door_anims/dewford/1.png similarity index 100% rename from graphics/door_anims/13/1.png rename to graphics/door_anims/dewford/1.png diff --git a/graphics/door_anims/13/2.png b/graphics/door_anims/dewford/2.png similarity index 100% rename from graphics/door_anims/13/2.png rename to graphics/door_anims/dewford/2.png diff --git a/graphics/door_anims/08/0.png b/graphics/door_anims/fallarbor_dark_roof/0.png similarity index 100% rename from graphics/door_anims/08/0.png rename to graphics/door_anims/fallarbor_dark_roof/0.png diff --git a/graphics/door_anims/08/1.png b/graphics/door_anims/fallarbor_dark_roof/1.png similarity index 100% rename from graphics/door_anims/08/1.png rename to graphics/door_anims/fallarbor_dark_roof/1.png diff --git a/graphics/door_anims/08/2.png b/graphics/door_anims/fallarbor_dark_roof/2.png similarity index 100% rename from graphics/door_anims/08/2.png rename to graphics/door_anims/fallarbor_dark_roof/2.png diff --git a/graphics/door_anims/29/0.png b/graphics/door_anims/fallarbor_light_roof/0.png similarity index 100% rename from graphics/door_anims/29/0.png rename to graphics/door_anims/fallarbor_light_roof/0.png diff --git a/graphics/door_anims/29/1.png b/graphics/door_anims/fallarbor_light_roof/1.png similarity index 100% rename from graphics/door_anims/29/1.png rename to graphics/door_anims/fallarbor_light_roof/1.png diff --git a/graphics/door_anims/29/2.png b/graphics/door_anims/fallarbor_light_roof/2.png similarity index 100% rename from graphics/door_anims/29/2.png rename to graphics/door_anims/fallarbor_light_roof/2.png diff --git a/graphics/door_anims/00/0.png b/graphics/door_anims/general/0.png similarity index 100% rename from graphics/door_anims/00/0.png rename to graphics/door_anims/general/0.png diff --git a/graphics/door_anims/00/1.png b/graphics/door_anims/general/1.png similarity index 100% rename from graphics/door_anims/00/1.png rename to graphics/door_anims/general/1.png diff --git a/graphics/door_anims/00/2.png b/graphics/door_anims/general/2.png similarity index 100% rename from graphics/door_anims/00/2.png rename to graphics/door_anims/general/2.png diff --git a/graphics/door_anims/02/0.png b/graphics/door_anims/gym/0.png similarity index 100% rename from graphics/door_anims/02/0.png rename to graphics/door_anims/gym/0.png diff --git a/graphics/door_anims/02/1.png b/graphics/door_anims/gym/1.png similarity index 100% rename from graphics/door_anims/02/1.png rename to graphics/door_anims/gym/1.png diff --git a/graphics/door_anims/02/2.png b/graphics/door_anims/gym/2.png similarity index 100% rename from graphics/door_anims/02/2.png rename to graphics/door_anims/gym/2.png diff --git a/graphics/door_anims/15/0.png b/graphics/door_anims/lilycove/0.png similarity index 100% rename from graphics/door_anims/15/0.png rename to graphics/door_anims/lilycove/0.png diff --git a/graphics/door_anims/15/1.png b/graphics/door_anims/lilycove/1.png similarity index 100% rename from graphics/door_anims/15/1.png rename to graphics/door_anims/lilycove/1.png diff --git a/graphics/door_anims/15/2.png b/graphics/door_anims/lilycove/2.png similarity index 100% rename from graphics/door_anims/15/2.png rename to graphics/door_anims/lilycove/2.png diff --git a/graphics/door_anims/24/0.png b/graphics/door_anims/lilycove_dept_store/0.png similarity index 100% rename from graphics/door_anims/24/0.png rename to graphics/door_anims/lilycove_dept_store/0.png diff --git a/graphics/door_anims/24/1.png b/graphics/door_anims/lilycove_dept_store/1.png similarity index 100% rename from graphics/door_anims/24/1.png rename to graphics/door_anims/lilycove_dept_store/1.png diff --git a/graphics/door_anims/24/2.png b/graphics/door_anims/lilycove_dept_store/2.png similarity index 100% rename from graphics/door_anims/24/2.png rename to graphics/door_anims/lilycove_dept_store/2.png diff --git a/graphics/door_anims/31/0.png b/graphics/door_anims/lilycove_dept_store_elevator/0.png similarity index 100% rename from graphics/door_anims/31/0.png rename to graphics/door_anims/lilycove_dept_store_elevator/0.png diff --git a/graphics/door_anims/31/1.png b/graphics/door_anims/lilycove_dept_store_elevator/1.png similarity index 100% rename from graphics/door_anims/31/1.png rename to graphics/door_anims/lilycove_dept_store_elevator/1.png diff --git a/graphics/door_anims/31/2.png b/graphics/door_anims/lilycove_dept_store_elevator/2.png similarity index 100% rename from graphics/door_anims/31/2.png rename to graphics/door_anims/lilycove_dept_store_elevator/2.png diff --git a/graphics/door_anims/16/0.png b/graphics/door_anims/lilycove_wooden/0.png similarity index 100% rename from graphics/door_anims/16/0.png rename to graphics/door_anims/lilycove_wooden/0.png diff --git a/graphics/door_anims/16/1.png b/graphics/door_anims/lilycove_wooden/1.png similarity index 100% rename from graphics/door_anims/16/1.png rename to graphics/door_anims/lilycove_wooden/1.png diff --git a/graphics/door_anims/16/2.png b/graphics/door_anims/lilycove_wooden/2.png similarity index 100% rename from graphics/door_anims/16/2.png rename to graphics/door_anims/lilycove_wooden/2.png diff --git a/graphics/door_anims/04/0.png b/graphics/door_anims/littleroot/0.png similarity index 100% rename from graphics/door_anims/04/0.png rename to graphics/door_anims/littleroot/0.png diff --git a/graphics/door_anims/04/1.png b/graphics/door_anims/littleroot/1.png similarity index 100% rename from graphics/door_anims/04/1.png rename to graphics/door_anims/littleroot/1.png diff --git a/graphics/door_anims/04/2.png b/graphics/door_anims/littleroot/2.png similarity index 100% rename from graphics/door_anims/04/2.png rename to graphics/door_anims/littleroot/2.png diff --git a/graphics/door_anims/10/0.png b/graphics/door_anims/mauville/0.png similarity index 100% rename from graphics/door_anims/10/0.png rename to graphics/door_anims/mauville/0.png diff --git a/graphics/door_anims/10/1.png b/graphics/door_anims/mauville/1.png similarity index 100% rename from graphics/door_anims/10/1.png rename to graphics/door_anims/mauville/1.png diff --git a/graphics/door_anims/10/2.png b/graphics/door_anims/mauville/2.png similarity index 100% rename from graphics/door_anims/10/2.png rename to graphics/door_anims/mauville/2.png diff --git a/graphics/door_anims/17/0.png b/graphics/door_anims/mossdeep/0.png similarity index 100% rename from graphics/door_anims/17/0.png rename to graphics/door_anims/mossdeep/0.png diff --git a/graphics/door_anims/17/1.png b/graphics/door_anims/mossdeep/1.png similarity index 100% rename from graphics/door_anims/17/1.png rename to graphics/door_anims/mossdeep/1.png diff --git a/graphics/door_anims/17/2.png b/graphics/door_anims/mossdeep/2.png similarity index 100% rename from graphics/door_anims/17/2.png rename to graphics/door_anims/mossdeep/2.png diff --git a/graphics/door_anims/26/0.png b/graphics/door_anims/mossdeep_space_center/0.png similarity index 100% rename from graphics/door_anims/26/0.png rename to graphics/door_anims/mossdeep_space_center/0.png diff --git a/graphics/door_anims/26/1.png b/graphics/door_anims/mossdeep_space_center/1.png similarity index 100% rename from graphics/door_anims/26/1.png rename to graphics/door_anims/mossdeep_space_center/1.png diff --git a/graphics/door_anims/26/2.png b/graphics/door_anims/mossdeep_space_center/2.png similarity index 100% rename from graphics/door_anims/26/2.png rename to graphics/door_anims/mossdeep_space_center/2.png diff --git a/graphics/door_anims/09/0.png b/graphics/door_anims/oldale/0.png similarity index 100% rename from graphics/door_anims/09/0.png rename to graphics/door_anims/oldale/0.png diff --git a/graphics/door_anims/09/1.png b/graphics/door_anims/oldale/1.png similarity index 100% rename from graphics/door_anims/09/1.png rename to graphics/door_anims/oldale/1.png diff --git a/graphics/door_anims/09/2.png b/graphics/door_anims/oldale/2.png similarity index 100% rename from graphics/door_anims/09/2.png rename to graphics/door_anims/oldale/2.png diff --git a/graphics/door_anims/21/0.png b/graphics/door_anims/pacifidlog/0.png similarity index 100% rename from graphics/door_anims/21/0.png rename to graphics/door_anims/pacifidlog/0.png diff --git a/graphics/door_anims/21/1.png b/graphics/door_anims/pacifidlog/1.png similarity index 100% rename from graphics/door_anims/21/1.png rename to graphics/door_anims/pacifidlog/1.png diff --git a/graphics/door_anims/21/2.png b/graphics/door_anims/pacifidlog/2.png similarity index 100% rename from graphics/door_anims/21/2.png rename to graphics/door_anims/pacifidlog/2.png diff --git a/graphics/door_anims/01/0.png b/graphics/door_anims/poke_center/0.png similarity index 100% rename from graphics/door_anims/01/0.png rename to graphics/door_anims/poke_center/0.png diff --git a/graphics/door_anims/01/1.png b/graphics/door_anims/poke_center/1.png similarity index 100% rename from graphics/door_anims/01/1.png rename to graphics/door_anims/poke_center/1.png diff --git a/graphics/door_anims/01/2.png b/graphics/door_anims/poke_center/2.png similarity index 100% rename from graphics/door_anims/01/2.png rename to graphics/door_anims/poke_center/2.png diff --git a/graphics/door_anims/03/0.png b/graphics/door_anims/poke_mart/0.png similarity index 100% rename from graphics/door_anims/03/0.png rename to graphics/door_anims/poke_mart/0.png diff --git a/graphics/door_anims/03/1.png b/graphics/door_anims/poke_mart/1.png similarity index 100% rename from graphics/door_anims/03/1.png rename to graphics/door_anims/poke_mart/1.png diff --git a/graphics/door_anims/03/2.png b/graphics/door_anims/poke_mart/2.png similarity index 100% rename from graphics/door_anims/03/2.png rename to graphics/door_anims/poke_mart/2.png diff --git a/graphics/door_anims/20/0.png b/graphics/door_anims/pokemon_league/0.png similarity index 100% rename from graphics/door_anims/20/0.png rename to graphics/door_anims/pokemon_league/0.png diff --git a/graphics/door_anims/20/1.png b/graphics/door_anims/pokemon_league/1.png similarity index 100% rename from graphics/door_anims/20/1.png rename to graphics/door_anims/pokemon_league/1.png diff --git a/graphics/door_anims/20/2.png b/graphics/door_anims/pokemon_league/2.png similarity index 100% rename from graphics/door_anims/20/2.png rename to graphics/door_anims/pokemon_league/2.png diff --git a/graphics/door_anims/06/0.png b/graphics/door_anims/rustboro_gray/0.png similarity index 100% rename from graphics/door_anims/06/0.png rename to graphics/door_anims/rustboro_gray/0.png diff --git a/graphics/door_anims/06/1.png b/graphics/door_anims/rustboro_gray/1.png similarity index 100% rename from graphics/door_anims/06/1.png rename to graphics/door_anims/rustboro_gray/1.png diff --git a/graphics/door_anims/06/2.png b/graphics/door_anims/rustboro_gray/2.png similarity index 100% rename from graphics/door_anims/06/2.png rename to graphics/door_anims/rustboro_gray/2.png diff --git a/graphics/door_anims/07/0.png b/graphics/door_anims/rustboro_tan/0.png similarity index 100% rename from graphics/door_anims/07/0.png rename to graphics/door_anims/rustboro_tan/0.png diff --git a/graphics/door_anims/07/1.png b/graphics/door_anims/rustboro_tan/1.png similarity index 100% rename from graphics/door_anims/07/1.png rename to graphics/door_anims/rustboro_tan/1.png diff --git a/graphics/door_anims/07/2.png b/graphics/door_anims/rustboro_tan/2.png similarity index 100% rename from graphics/door_anims/07/2.png rename to graphics/door_anims/rustboro_tan/2.png diff --git a/graphics/door_anims/25/0.png b/graphics/door_anims/safari_zone/0.png similarity index 100% rename from graphics/door_anims/25/0.png rename to graphics/door_anims/safari_zone/0.png diff --git a/graphics/door_anims/25/1.png b/graphics/door_anims/safari_zone/1.png similarity index 100% rename from graphics/door_anims/25/1.png rename to graphics/door_anims/safari_zone/1.png diff --git a/graphics/door_anims/25/2.png b/graphics/door_anims/safari_zone/2.png similarity index 100% rename from graphics/door_anims/25/2.png rename to graphics/door_anims/safari_zone/2.png diff --git a/graphics/door_anims/12/0.png b/graphics/door_anims/slateport/0.png similarity index 100% rename from graphics/door_anims/12/0.png rename to graphics/door_anims/slateport/0.png diff --git a/graphics/door_anims/12/1.png b/graphics/door_anims/slateport/1.png similarity index 100% rename from graphics/door_anims/12/1.png rename to graphics/door_anims/slateport/1.png diff --git a/graphics/door_anims/12/2.png b/graphics/door_anims/slateport/2.png similarity index 100% rename from graphics/door_anims/12/2.png rename to graphics/door_anims/slateport/2.png diff --git a/graphics/door_anims/19/0.png b/graphics/door_anims/sootopolis/0.png similarity index 100% rename from graphics/door_anims/19/0.png rename to graphics/door_anims/sootopolis/0.png diff --git a/graphics/door_anims/19/1.png b/graphics/door_anims/sootopolis/1.png similarity index 100% rename from graphics/door_anims/19/1.png rename to graphics/door_anims/sootopolis/1.png diff --git a/graphics/door_anims/19/2.png b/graphics/door_anims/sootopolis/2.png similarity index 100% rename from graphics/door_anims/19/2.png rename to graphics/door_anims/sootopolis/2.png diff --git a/graphics/door_anims/18/0.png b/graphics/door_anims/sootopolis_peaked_roof/0.png similarity index 100% rename from graphics/door_anims/18/0.png rename to graphics/door_anims/sootopolis_peaked_roof/0.png diff --git a/graphics/door_anims/18/1.png b/graphics/door_anims/sootopolis_peaked_roof/1.png similarity index 100% rename from graphics/door_anims/18/1.png rename to graphics/door_anims/sootopolis_peaked_roof/1.png diff --git a/graphics/door_anims/18/2.png b/graphics/door_anims/sootopolis_peaked_roof/2.png similarity index 100% rename from graphics/door_anims/18/2.png rename to graphics/door_anims/sootopolis_peaked_roof/2.png diff --git a/graphics/door_anims/49/0.png b/graphics/door_anims/trainer_hill_lobby_elevator/0.png similarity index 100% rename from graphics/door_anims/49/0.png rename to graphics/door_anims/trainer_hill_lobby_elevator/0.png diff --git a/graphics/door_anims/49/1.png b/graphics/door_anims/trainer_hill_lobby_elevator/1.png similarity index 100% rename from graphics/door_anims/49/1.png rename to graphics/door_anims/trainer_hill_lobby_elevator/1.png diff --git a/graphics/door_anims/49/2.png b/graphics/door_anims/trainer_hill_lobby_elevator/2.png similarity index 100% rename from graphics/door_anims/49/2.png rename to graphics/door_anims/trainer_hill_lobby_elevator/2.png diff --git a/graphics/door_anims/50/0.png b/graphics/door_anims/trainer_hill_roof_elevator/0.png similarity index 100% rename from graphics/door_anims/50/0.png rename to graphics/door_anims/trainer_hill_roof_elevator/0.png diff --git a/graphics/door_anims/50/1.png b/graphics/door_anims/trainer_hill_roof_elevator/1.png similarity index 100% rename from graphics/door_anims/50/1.png rename to graphics/door_anims/trainer_hill_roof_elevator/1.png diff --git a/graphics/door_anims/50/2.png b/graphics/door_anims/trainer_hill_roof_elevator/2.png similarity index 100% rename from graphics/door_anims/50/2.png rename to graphics/door_anims/trainer_hill_roof_elevator/2.png diff --git a/graphics/door_anims/34/0.png b/graphics/door_anims/unknown/0.png similarity index 100% rename from graphics/door_anims/34/0.png rename to graphics/door_anims/unknown/0.png diff --git a/graphics/door_anims/34/1.png b/graphics/door_anims/unknown/1.png similarity index 100% rename from graphics/door_anims/34/1.png rename to graphics/door_anims/unknown/1.png diff --git a/graphics/door_anims/34/2.png b/graphics/door_anims/unknown/2.png similarity index 100% rename from graphics/door_anims/34/2.png rename to graphics/door_anims/unknown/2.png diff --git a/graphics/door_anims/11/0.png b/graphics/door_anims/verdanturf/0.png similarity index 100% rename from graphics/door_anims/11/0.png rename to graphics/door_anims/verdanturf/0.png diff --git a/graphics/door_anims/11/1.png b/graphics/door_anims/verdanturf/1.png similarity index 100% rename from graphics/door_anims/11/1.png rename to graphics/door_anims/verdanturf/1.png diff --git a/graphics/door_anims/11/2.png b/graphics/door_anims/verdanturf/2.png similarity index 100% rename from graphics/door_anims/11/2.png rename to graphics/door_anims/verdanturf/2.png diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h index a0ea6855b0..4bcf47ea85 100644 --- a/include/constants/metatile_labels.h +++ b/include/constants/metatile_labels.h @@ -16,6 +16,11 @@ #define METATILE_General_MuddySlope_Frame2 0x0EA #define METATILE_General_MuddySlope_Frame3 0x0EB #define METATILE_General_SandPit_Center 0x121 +#define METATILE_General_Door 0x021 +#define METATILE_General_Door_PokeMart 0x041 +#define METATILE_General_Door_PokeCenter 0x061 +#define METATILE_General_Door_Gym 0x1CD +#define METATILE_General_Door_Contest 0x1DB #define METATILE_General_CaveEntrance_Top 0x09F #define METATILE_General_CaveEntrance_Bottom 0x0A7 #define METATILE_General_RockWall_GrassBase 0x079 @@ -40,6 +45,21 @@ #define METATILE_Building_PC_Off 0x004 #define METATILE_Building_PC_On 0x005 +// gTileset_PokemonCenter +#define METATILE_PokemonCenter_Door_CableClub 0x264 + +// gTileset_Shop +#define METATILE_Shop_Door_Elevator 0x285 + +// gTileset_Petalburg +#define METATILE_Petalburg_Door_Littleroot 0x248 +#define METATILE_Petalburg_Door_BirchsLab 0x249 +#define METATILE_Petalburg_Door_Oldale 0x287 + +// gTileset_Rustboro +#define METATILE_Rustboro_Door_Gray 0x21F +#define METATILE_Rustboro_Door_Tan 0x22F + // gTileset_MauvilleGym #define METATILE_MauvilleGym_RaisedSwitch 0x205 #define METATILE_MauvilleGym_PressedSwitch 0x206 @@ -105,6 +125,9 @@ #define METATILE_Shop_Laptop2_Flash 0x260 // gTileset_BattleFrontier +#define METATILE_BattleFrontier_Door_Elevator 0x20E +#define METATILE_BattleFrontier_Door_Corridor 0x224 +#define METATILE_BattleFrontier_Door_MultiCorridor 0x2AD #define METATILE_BattleFrontier_CorridorOpenDoor_Top 0x207 #define METATILE_BattleFrontier_CorridorOpenDoor_Bottom 0x20F #define METATILE_BattleFrontier_Elevator_Top0 0x329 @@ -117,6 +140,29 @@ #define METATILE_BattleFrontier_Elevator_Bottom1 0x33A #define METATILE_BattleFrontier_Elevator_Bottom2 0x33B +// gTileset_BattleFrontierOutsideWest +#define METATILE_BattleFrontierOutsideWest_Door_BattleFactory 0x263 +#define METATILE_BattleFrontierOutsideWest_Door_BattleDome 0x28A +#define METATILE_BattleFrontierOutsideWest_Door_Sliding 0x396 +#define METATILE_BattleFrontierOutsideWest_Door 0x3FC + +// gTileset_BattleFrontierOutsideEast +#define METATILE_BattleFrontierOutsideEast_Door_BattleArena 0x291 +#define METATILE_BattleFrontierOutsideEast_Door_BattleTower 0x329 +#define METATILE_BattleFrontierOutsideEast_Door_Sliding 0x396 +#define METATILE_BattleFrontierOutsideEast_Door 0x3FC + +// gTileset_BattleDome +#define METATILE_BattleDome_Door_Lobby 0x209 +#define METATILE_BattleDome_Door_PreBattleRoom 0x20A +#define METATILE_BattleDome_Door_Corridor 0x25E + +// gTileset_BattleArena +#define METATILE_BattleArena_Door 0x21B + +// gTileset_BattlePalace +#define METATILE_BattlePalace_Door 0x219 + // gTileset_Cave #define METATILE_Cave_EntranceCover 0x229 #define METATILE_Cave_SealedChamberEntrance_TopLeft 0x22A @@ -132,6 +178,7 @@ #define METATILE_Cave_ShoalCave_BlueStone_Small 0x35B // gTileset_Pacifidlog +#define METATILE_Pacifidlog_Door 0x21A #define METATILE_Pacifidlog_FloatingLogs_Horizontal0 0x250 #define METATILE_Pacifidlog_FloatingLogs_Horizontal1 0x251 #define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal0 0x252 @@ -165,14 +212,16 @@ #define METATILE_Fortree_WoodBridge1_Bottom 0x29F // gTileset_Sootopolis -#define METATILE_Sootopolis_Door_Closed 0x248 -#define METATILE_Sootopolis_GymDoor_Closed 0x250 -#define METATILE_Sootopolis_RoughWater 0x290 +#define METATILE_Sootopolis_Door 0x21E +#define METATILE_Sootopolis_Door_PeakedRoof 0x21C +#define METATILE_Sootopolis_Door_Closed 0x248 +#define METATILE_Sootopolis_GymDoor_Closed 0x250 +#define METATILE_Sootopolis_RoughWater 0x290 // gTileset_SootopolisGym -#define METATILE_SootopolisGym_Ice_Cracked 0x20E -#define METATILE_SootopolisGym_Ice_Broken 0x206 -#define METATILE_SootopolisGym_Stairs 0x207 +#define METATILE_SootopolisGym_Ice_Cracked 0x20E +#define METATILE_SootopolisGym_Ice_Broken 0x206 +#define METATILE_SootopolisGym_Stairs 0x207 // gTileset_Fallarbor #define METATILE_Fallarbor_AshGrass 0x20A @@ -186,6 +235,9 @@ #define METATILE_Fallarbor_RedCaveEntrance_Bottom 0x34F #define METATILE_Fallarbor_BrownRockWall 0x265 #define METATILE_Fallarbor_RedRockWall 0x269 +#define METATILE_Fallarbor_Door_LightRoof 0x2A5 +#define METATILE_Fallarbor_Door_DarkRoof 0x2F7 +#define METATILE_Fallarbor_Door_BattleTent 0x36C // gTileset_Lavaridge #define METATILE_Lavaridge_NormalGrass 0x206 @@ -196,6 +248,10 @@ #define METATILE_Lavaridge_CaveEntrance_Bottom 0x25E // gTileset_Mauville +#define METATILE_Mauville_Door 0x2AC +#define METATILE_Mauville_Door_CyclingRoad 0x289 +#define METATILE_Mauville_Door_Verdanturf 0x3A1 +#define METATILE_Mauville_Door_BattleTent 0x3D4 #define METATILE_Mauville_DeepSand_Center 0x251 #define METATILE_Mauville_DeepSand_BottomMid 0x259 #define METATILE_Mauville_MirageTower_Tile0 0x3D8 @@ -217,6 +273,21 @@ #define METATILE_Mauville_MirageTower_Tile10 0x3E4 #define METATILE_Mauville_MirageTower_Tile11 0x3E5 +// gTileset_Dewford +#define METATILE_Dewford_Door 0x225 +#define METATILE_Dewford_Door_BattleTower 0x25D + +// gTileset_Slateport +#define METATILE_Slateport_Door 0x2DC +#define METATILE_Slateport_Door_BattleTent 0x393 + +// gTileset_Mossdeep +#define METATILE_Mossdeep_Door 0x2A1 +#define METATILE_Mossdeep_Door_SpaceCenter 0x2ED + +// gTileset_EverGrande +#define METATILE_EverGrande_Door_PokemonLeague 0x21D + // gTileset_PokemonCenter #define METATILE_PokemonCenter_Elevator1F_Tile0_Frame0 0x280 #define METATILE_PokemonCenter_Elevator1F_Tile0_Frame1 0x282 @@ -273,6 +344,7 @@ #define METATILE_InsideShip_IntactDoor_Bottom_Locked 0x233 #define METATILE_InsideShip_DoorIndent_Unlocked 0x21A #define METATILE_InsideShip_DoorIndent_Locked 0x234 +#define METATILE_InsideShip_IntactDoor_Bottom_Interior 0x297 // gTileset_BattlePike #define METATILE_BattlePike_Curtain_Stage0_Tile0 0x24A @@ -305,12 +377,16 @@ #define METATILE_BattlePike_Curtain_Stage3_Tile6 0x2BC // gTileset_Lilycove -#define METATILE_Lilycove_Wailmer0 0x290 -#define METATILE_Lilycove_Wailmer1 0x291 -#define METATILE_Lilycove_Wailmer2 0x2A0 -#define METATILE_Lilycove_Wailmer3 0x2A1 -#define METATILE_Lilycove_Wailmer0_Alt 0x298 -#define METATILE_Lilycove_Wailmer1_Alt 0x299 +#define METATILE_Lilycove_Door 0x246 +#define METATILE_Lilycove_Door_Wooden 0x28E +#define METATILE_Lilycove_Door_DeptStore 0x30C +#define METATILE_Lilycove_Door_SafariZone 0x32D +#define METATILE_Lilycove_Wailmer0 0x290 +#define METATILE_Lilycove_Wailmer1 0x291 +#define METATILE_Lilycove_Wailmer2 0x2A0 +#define METATILE_Lilycove_Wailmer3 0x2A1 +#define METATILE_Lilycove_Wailmer0_Alt 0x298 +#define METATILE_Lilycove_Wailmer1_Alt 0x299 // gTileset_Contest #define METATILE_Contest_WallShadow 0x221 @@ -318,6 +394,9 @@ #define METATILE_Contest_CounterFlap_Top 0x2D1 #define METATILE_Contest_CounterFlap_Bottom 0x2D9 +// gTileset_BattleTent +#define METATILE_BattleTent_Door 0x26B + // gTileset_LilycoveMuseum #define METATILE_LilycoveMuseum_Painting0_Left 0x25A #define METATILE_LilycoveMuseum_Painting0_Right 0x25B @@ -421,8 +500,10 @@ #define METATILE_BikeShop_Generator_Off_Tile7 0x2F7 // gTileset_TrainerHill -#define METATILE_TrainerHill_GreenFloorTile 0x307 -#define METATILE_TrainerHill_CounterDoor 0x334 +#define METATILE_TrainerHill_GreenFloorTile 0x307 +#define METATILE_TrainerHill_CounterDoor 0x334 +#define METATILE_TrainerHill_Door_Elevator_Lobby 0x32C +#define METATILE_TrainerHill_Door_Elevator_Roof 0x383 // gTileset_Underwater #define METATILE_Underwater_RockWall 0x21E diff --git a/include/field_door.h b/include/field_door.h index 8b4955cacd..2e32005c6c 100644 --- a/include/field_door.h +++ b/include/field_door.h @@ -1,20 +1,5 @@ -#ifndef GUARD_FIELDDOOR_H -#define GUARD_FIELDDOOR_H - -struct DoorGraphics -{ - u16 metatileNum; - u8 sound; - u8 size; - const void *tiles; - const void *palette; -}; - -struct DoorAnimFrame -{ - u8 time; - u16 offset; -}; +#ifndef GUARD_FIELD_DOOR_H +#define GUARD_FIELD_DOOR_H void FieldSetDoorOpened(u32, u32); void FieldSetDoorClosed(u32, u32); @@ -23,4 +8,4 @@ s8 FieldAnimateDoorOpen(u32, u32); bool8 FieldIsDoorAnimationRunning(void); u32 GetDoorSoundEffect(u32 x, u32 y); -#endif +#endif //GUARD_FIELD_DOOR_H diff --git a/src/field_door.c b/src/field_door.c index 8fb5cb948b..bedb61683b 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -8,113 +8,133 @@ #include "constants/flags.h" #include "constants/maps.h" #include "constants/songs.h" +#include "constants/metatile_labels.h" + +#define DOOR_SOUND_NORMAL 0 +#define DOOR_SOUND_SLIDING 1 +#define DOOR_SOUND_ARENA 2 + +struct DoorGraphics +{ + u16 metatileNum; + u8 sound; + u8 size; + const void *tiles; + const void *palette; +}; + +struct DoorAnimFrame +{ + u8 time; + u16 offset; +}; static bool8 ShouldUseMultiCorridorDoor(void); -const u8 DoorAnimTiles_04[][0x100] = +const u8 sDoorAnimTiles_Littleroot[][0x100] = { - INCBIN_U8("graphics/door_anims/04/0.4bpp"), - INCBIN_U8("graphics/door_anims/04/1.4bpp"), - INCBIN_U8("graphics/door_anims/04/2.4bpp"), + INCBIN_U8("graphics/door_anims/littleroot/0.4bpp"), + INCBIN_U8("graphics/door_anims/littleroot/1.4bpp"), + INCBIN_U8("graphics/door_anims/littleroot/2.4bpp"), }; // TODO: Make these blank palette includes? asm(".space 32"); -const u8 DoorAnimTiles_05[][0x100] = +const u8 sDoorAnimTiles_BirchsLab[][0x100] = { - INCBIN_U8("graphics/door_anims/05/0.4bpp"), - INCBIN_U8("graphics/door_anims/05/1.4bpp"), - INCBIN_U8("graphics/door_anims/05/2.4bpp"), + INCBIN_U8("graphics/door_anims/birchs_lab/0.4bpp"), + INCBIN_U8("graphics/door_anims/birchs_lab/1.4bpp"), + INCBIN_U8("graphics/door_anims/birchs_lab/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_08[][0x100] = +const u8 sDoorAnimTiles_FallarborLightRoof[][0x100] = { - INCBIN_U8("graphics/door_anims/08/0.4bpp"), - INCBIN_U8("graphics/door_anims/08/1.4bpp"), - INCBIN_U8("graphics/door_anims/08/2.4bpp"), + INCBIN_U8("graphics/door_anims/fallarbor_light_roof/0.4bpp"), + INCBIN_U8("graphics/door_anims/fallarbor_light_roof/1.4bpp"), + INCBIN_U8("graphics/door_anims/fallarbor_light_roof/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_15[][0x100] = +const u8 sDoorAnimTiles_Lilycove[][0x100] = { - INCBIN_U8("graphics/door_anims/15/0.4bpp"), - INCBIN_U8("graphics/door_anims/15/1.4bpp"), - INCBIN_U8("graphics/door_anims/15/2.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove/0.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove/1.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_16[][0x100] = +const u8 sDoorAnimTiles_LilycoveWooden[][0x100] = { - INCBIN_U8("graphics/door_anims/16/0.4bpp"), - INCBIN_U8("graphics/door_anims/16/1.4bpp"), - INCBIN_U8("graphics/door_anims/16/2.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove_wooden/0.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove_wooden/1.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove_wooden/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_00[][0x100] = +const u8 sDoorAnimTiles_General[][0x100] = { - INCBIN_U8("graphics/door_anims/00/0.4bpp"), - INCBIN_U8("graphics/door_anims/00/1.4bpp"), - INCBIN_U8("graphics/door_anims/00/2.4bpp"), + INCBIN_U8("graphics/door_anims/general/0.4bpp"), + INCBIN_U8("graphics/door_anims/general/1.4bpp"), + INCBIN_U8("graphics/door_anims/general/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_01[][0x100] = +const u8 sDoorAnimTiles_PokeCenter[][0x100] = { - INCBIN_U8("graphics/door_anims/01/0.4bpp"), - INCBIN_U8("graphics/door_anims/01/1.4bpp"), - INCBIN_U8("graphics/door_anims/01/2.4bpp"), + INCBIN_U8("graphics/door_anims/poke_center/0.4bpp"), + INCBIN_U8("graphics/door_anims/poke_center/1.4bpp"), + INCBIN_U8("graphics/door_anims/poke_center/2.4bpp"), }; -const u8 DoorAnimTiles_02[][0x100] = +const u8 sDoorAnimTiles_Gym[][0x100] = { - INCBIN_U8("graphics/door_anims/02/0.4bpp"), - INCBIN_U8("graphics/door_anims/02/1.4bpp"), - INCBIN_U8("graphics/door_anims/02/2.4bpp"), + INCBIN_U8("graphics/door_anims/gym/0.4bpp"), + INCBIN_U8("graphics/door_anims/gym/1.4bpp"), + INCBIN_U8("graphics/door_anims/gym/2.4bpp"), }; -const u8 DoorAnimTiles_03[][0x100] = +const u8 sDoorAnimTiles_PokeMart[][0x100] = { - INCBIN_U8("graphics/door_anims/03/0.4bpp"), - INCBIN_U8("graphics/door_anims/03/1.4bpp"), - INCBIN_U8("graphics/door_anims/03/2.4bpp"), + INCBIN_U8("graphics/door_anims/poke_mart/0.4bpp"), + INCBIN_U8("graphics/door_anims/poke_mart/1.4bpp"), + INCBIN_U8("graphics/door_anims/poke_mart/2.4bpp"), }; -const u8 DoorAnimTiles_06[][0x100] = +const u8 sDoorAnimTiles_RustboroTan[][0x100] = { - INCBIN_U8("graphics/door_anims/06/0.4bpp"), - INCBIN_U8("graphics/door_anims/06/1.4bpp"), - INCBIN_U8("graphics/door_anims/06/2.4bpp"), + INCBIN_U8("graphics/door_anims/rustboro_tan/0.4bpp"), + INCBIN_U8("graphics/door_anims/rustboro_tan/1.4bpp"), + INCBIN_U8("graphics/door_anims/rustboro_tan/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_07[][0x100] = +const u8 sDoorAnimTiles_RustboroGray[][0x100] = { - INCBIN_U8("graphics/door_anims/07/0.4bpp"), - INCBIN_U8("graphics/door_anims/07/1.4bpp"), - INCBIN_U8("graphics/door_anims/07/2.4bpp"), + INCBIN_U8("graphics/door_anims/rustboro_gray/0.4bpp"), + INCBIN_U8("graphics/door_anims/rustboro_gray/1.4bpp"), + INCBIN_U8("graphics/door_anims/rustboro_gray/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_09[][0x100] = +const u8 sDoorAnimTiles_Oldale[][0x100] = { - INCBIN_U8("graphics/door_anims/09/0.4bpp"), - INCBIN_U8("graphics/door_anims/09/1.4bpp"), - INCBIN_U8("graphics/door_anims/09/2.4bpp"), + INCBIN_U8("graphics/door_anims/oldale/0.4bpp"), + INCBIN_U8("graphics/door_anims/oldale/1.4bpp"), + INCBIN_U8("graphics/door_anims/oldale/2.4bpp"), }; asm(".space 0x5900"); -const u8 DoorAnimTiles_UnusedTops[][0x40] = +const u8 sDoorAnimTiles_UnusedTops[][0x40] = { INCBIN_U8("graphics/door_anims/unused_848EDEC/0_top.4bpp"), INCBIN_U8("graphics/door_anims/unused_848EDEC/1_top.4bpp"), @@ -123,7 +143,7 @@ const u8 DoorAnimTiles_UnusedTops[][0x40] = asm(".space 0x140"); -const u8 DoorAnimTiles_UnusedBottoms[][0x40] = +const u8 sDoorAnimTiles_UnusedBottoms[][0x40] = { INCBIN_U8("graphics/door_anims/unused_848EDEC/0_bottom.4bpp"), INCBIN_U8("graphics/door_anims/unused_848EDEC/1_bottom.4bpp"), @@ -132,361 +152,361 @@ const u8 DoorAnimTiles_UnusedBottoms[][0x40] = asm(".space 32"); -const u8 DoorAnimTiles_10[][0x100] = +const u8 sDoorAnimTiles_Mauville[][0x100] = { - INCBIN_U8("graphics/door_anims/10/0.4bpp"), - INCBIN_U8("graphics/door_anims/10/1.4bpp"), - INCBIN_U8("graphics/door_anims/10/2.4bpp"), + INCBIN_U8("graphics/door_anims/mauville/0.4bpp"), + INCBIN_U8("graphics/door_anims/mauville/1.4bpp"), + INCBIN_U8("graphics/door_anims/mauville/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_11[][0x100] = +const u8 sDoorAnimTiles_Verdanturf[][0x100] = { - INCBIN_U8("graphics/door_anims/11/0.4bpp"), - INCBIN_U8("graphics/door_anims/11/1.4bpp"), - INCBIN_U8("graphics/door_anims/11/2.4bpp"), + INCBIN_U8("graphics/door_anims/verdanturf/0.4bpp"), + INCBIN_U8("graphics/door_anims/verdanturf/1.4bpp"), + INCBIN_U8("graphics/door_anims/verdanturf/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_12[][0x100] = +const u8 sDoorAnimTiles_Slateport[][0x100] = { - INCBIN_U8("graphics/door_anims/12/0.4bpp"), - INCBIN_U8("graphics/door_anims/12/1.4bpp"), - INCBIN_U8("graphics/door_anims/12/2.4bpp"), + INCBIN_U8("graphics/door_anims/slateport/0.4bpp"), + INCBIN_U8("graphics/door_anims/slateport/1.4bpp"), + INCBIN_U8("graphics/door_anims/slateport/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_13[][0x100] = +const u8 sDoorAnimTiles_Dewford[][0x100] = { - INCBIN_U8("graphics/door_anims/13/0.4bpp"), - INCBIN_U8("graphics/door_anims/13/1.4bpp"), - INCBIN_U8("graphics/door_anims/13/2.4bpp"), + INCBIN_U8("graphics/door_anims/dewford/0.4bpp"), + INCBIN_U8("graphics/door_anims/dewford/1.4bpp"), + INCBIN_U8("graphics/door_anims/dewford/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_14[][0x100] = +const u8 sDoorAnimTiles_Contest[][0x100] = { - INCBIN_U8("graphics/door_anims/14/0.4bpp"), - INCBIN_U8("graphics/door_anims/14/1.4bpp"), - INCBIN_U8("graphics/door_anims/14/2.4bpp"), + INCBIN_U8("graphics/door_anims/contest/0.4bpp"), + INCBIN_U8("graphics/door_anims/contest/1.4bpp"), + INCBIN_U8("graphics/door_anims/contest/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_17[][0x100] = +const u8 sDoorAnimTiles_Mossdeep[][0x100] = { - INCBIN_U8("graphics/door_anims/17/0.4bpp"), - INCBIN_U8("graphics/door_anims/17/1.4bpp"), - INCBIN_U8("graphics/door_anims/17/2.4bpp"), + INCBIN_U8("graphics/door_anims/mossdeep/0.4bpp"), + INCBIN_U8("graphics/door_anims/mossdeep/1.4bpp"), + INCBIN_U8("graphics/door_anims/mossdeep/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_18[][0x100] = +const u8 sDoorAnimTiles_SootopolisPeakedRoof[][0x100] = { - INCBIN_U8("graphics/door_anims/18/0.4bpp"), - INCBIN_U8("graphics/door_anims/18/1.4bpp"), - INCBIN_U8("graphics/door_anims/18/2.4bpp"), + INCBIN_U8("graphics/door_anims/sootopolis_peaked_roof/0.4bpp"), + INCBIN_U8("graphics/door_anims/sootopolis_peaked_roof/1.4bpp"), + INCBIN_U8("graphics/door_anims/sootopolis_peaked_roof/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_19[][0x100] = +const u8 sDoorAnimTiles_Sootopolis[][0x100] = { - INCBIN_U8("graphics/door_anims/19/0.4bpp"), - INCBIN_U8("graphics/door_anims/19/1.4bpp"), - INCBIN_U8("graphics/door_anims/19/2.4bpp"), + INCBIN_U8("graphics/door_anims/sootopolis/0.4bpp"), + INCBIN_U8("graphics/door_anims/sootopolis/1.4bpp"), + INCBIN_U8("graphics/door_anims/sootopolis/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_20[][0x100] = +const u8 sDoorAnimTiles_PokemonLeague[][0x100] = { - INCBIN_U8("graphics/door_anims/20/0.4bpp"), - INCBIN_U8("graphics/door_anims/20/1.4bpp"), - INCBIN_U8("graphics/door_anims/20/2.4bpp"), + INCBIN_U8("graphics/door_anims/pokemon_league/0.4bpp"), + INCBIN_U8("graphics/door_anims/pokemon_league/1.4bpp"), + INCBIN_U8("graphics/door_anims/pokemon_league/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_21[][0x100] = +const u8 sDoorAnimTiles_Pacifidlog[][0x100] = { - INCBIN_U8("graphics/door_anims/21/0.4bpp"), - INCBIN_U8("graphics/door_anims/21/1.4bpp"), - INCBIN_U8("graphics/door_anims/21/2.4bpp"), + INCBIN_U8("graphics/door_anims/pacifidlog/0.4bpp"), + INCBIN_U8("graphics/door_anims/pacifidlog/1.4bpp"), + INCBIN_U8("graphics/door_anims/pacifidlog/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_22[][0x100] = +const u8 sDoorAnimTiles_BattleTowerCorridor[][0x100] = { - INCBIN_U8("graphics/door_anims/22/0.4bpp"), - INCBIN_U8("graphics/door_anims/22/1.4bpp"), - INCBIN_U8("graphics/door_anims/22/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_corridor/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_corridor/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_corridor/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_23[][0x100] = +const u8 sDoorAnimTiles_CyclingRoad[][0x100] = { - INCBIN_U8("graphics/door_anims/23/0.4bpp"), - INCBIN_U8("graphics/door_anims/23/1.4bpp"), - INCBIN_U8("graphics/door_anims/23/2.4bpp"), + INCBIN_U8("graphics/door_anims/cycling_road/0.4bpp"), + INCBIN_U8("graphics/door_anims/cycling_road/1.4bpp"), + INCBIN_U8("graphics/door_anims/cycling_road/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_24[][0x100] = +const u8 sDoorAnimTiles_LilycoveDeptStore[][0x100] = { - INCBIN_U8("graphics/door_anims/24/0.4bpp"), - INCBIN_U8("graphics/door_anims/24/1.4bpp"), - INCBIN_U8("graphics/door_anims/24/2.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove_dept_store/0.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove_dept_store/1.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove_dept_store/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_25[][0x100] = +const u8 sDoorAnimTiles_SafariZone[][0x100] = { - INCBIN_U8("graphics/door_anims/25/0.4bpp"), - INCBIN_U8("graphics/door_anims/25/1.4bpp"), - INCBIN_U8("graphics/door_anims/25/2.4bpp"), + INCBIN_U8("graphics/door_anims/safari_zone/0.4bpp"), + INCBIN_U8("graphics/door_anims/safari_zone/1.4bpp"), + INCBIN_U8("graphics/door_anims/safari_zone/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_26[][0x100] = +const u8 sDoorAnimTiles_MossdeepSpaceCenter[][0x100] = { - INCBIN_U8("graphics/door_anims/26/0.4bpp"), - INCBIN_U8("graphics/door_anims/26/1.4bpp"), - INCBIN_U8("graphics/door_anims/26/2.4bpp"), + INCBIN_U8("graphics/door_anims/mossdeep_space_center/0.4bpp"), + INCBIN_U8("graphics/door_anims/mossdeep_space_center/1.4bpp"), + INCBIN_U8("graphics/door_anims/mossdeep_space_center/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_27[][0x100] = +const u8 sDoorAnimTiles_CableClub[][0x100] = { - INCBIN_U8("graphics/door_anims/27/0.4bpp"), - INCBIN_U8("graphics/door_anims/27/1.4bpp"), - INCBIN_U8("graphics/door_anims/27/2.4bpp"), + INCBIN_U8("graphics/door_anims/cable_club/0.4bpp"), + INCBIN_U8("graphics/door_anims/cable_club/1.4bpp"), + INCBIN_U8("graphics/door_anims/cable_club/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_28[][0x100] = +const u8 sDoorAnimTiles_AbandonedShip[][0x100] = { - INCBIN_U8("graphics/door_anims/28/0.4bpp"), - INCBIN_U8("graphics/door_anims/28/1.4bpp"), - INCBIN_U8("graphics/door_anims/28/2.4bpp"), + INCBIN_U8("graphics/door_anims/abandoned_ship/0.4bpp"), + INCBIN_U8("graphics/door_anims/abandoned_ship/1.4bpp"), + INCBIN_U8("graphics/door_anims/abandoned_ship/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_29[][0x100] = +const u8 sDoorAnimTiles_FallarborDarkRoof[][0x100] = { - INCBIN_U8("graphics/door_anims/29/0.4bpp"), - INCBIN_U8("graphics/door_anims/29/1.4bpp"), - INCBIN_U8("graphics/door_anims/29/2.4bpp"), + INCBIN_U8("graphics/door_anims/fallarbor_dark_roof/0.4bpp"), + INCBIN_U8("graphics/door_anims/fallarbor_dark_roof/1.4bpp"), + INCBIN_U8("graphics/door_anims/fallarbor_dark_roof/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_30[][0x100] = +const u8 sDoorAnimTiles_AbandonedShipRoom[][0x100] = { - INCBIN_U8("graphics/door_anims/30/0.4bpp"), - INCBIN_U8("graphics/door_anims/30/1.4bpp"), - INCBIN_U8("graphics/door_anims/30/2.4bpp"), + INCBIN_U8("graphics/door_anims/abandoned_ship_room/0.4bpp"), + INCBIN_U8("graphics/door_anims/abandoned_ship_room/1.4bpp"), + INCBIN_U8("graphics/door_anims/abandoned_ship_room/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_31[][0x100] = +const u8 sDoorAnimTiles_LilycoveDeptStoreElevator[][0x100] = { - INCBIN_U8("graphics/door_anims/31/0.4bpp"), - INCBIN_U8("graphics/door_anims/31/1.4bpp"), - INCBIN_U8("graphics/door_anims/31/2.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove_dept_store_elevator/0.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove_dept_store_elevator/1.4bpp"), + INCBIN_U8("graphics/door_anims/lilycove_dept_store_elevator/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_32[][0x100] = +const u8 sDoorAnimTiles_BattleTowerOld[][0x100] = { - INCBIN_U8("graphics/door_anims/32/0.4bpp"), - INCBIN_U8("graphics/door_anims/32/1.4bpp"), - INCBIN_U8("graphics/door_anims/32/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_old/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_old/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_old/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_33[][0x100] = +const u8 sDoorAnimTiles_BattleTowerElevator[][0x100] = { - INCBIN_U8("graphics/door_anims/33/0.4bpp"), - INCBIN_U8("graphics/door_anims/33/1.4bpp"), - INCBIN_U8("graphics/door_anims/33/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_elevator/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_elevator/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_elevator/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_34[][0x100] = +const u8 sDoorAnimTiles_34[][0x100] = { - INCBIN_U8("graphics/door_anims/34/0.4bpp"), - INCBIN_U8("graphics/door_anims/34/1.4bpp"), - INCBIN_U8("graphics/door_anims/34/2.4bpp"), + INCBIN_U8("graphics/door_anims/unknown/0.4bpp"), + INCBIN_U8("graphics/door_anims/unknown/1.4bpp"), + INCBIN_U8("graphics/door_anims/unknown/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_35[][0x100] = +const u8 sDoorAnimTiles_BattleDome[][0x100] = { - INCBIN_U8("graphics/door_anims/35/0.4bpp"), - INCBIN_U8("graphics/door_anims/35/1.4bpp"), - INCBIN_U8("graphics/door_anims/35/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_36[][0x100] = +const u8 sDoorAnimTiles_BattleFactory[][0x100] = { - INCBIN_U8("graphics/door_anims/36/0.4bpp"), - INCBIN_U8("graphics/door_anims/36/1.4bpp"), - INCBIN_U8("graphics/door_anims/36/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_factory/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_factory/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_factory/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_37[][0x100] = +const u8 sDoorAnimTiles_BattleTower[][0x100] = { - INCBIN_U8("graphics/door_anims/37/0.4bpp"), - INCBIN_U8("graphics/door_anims/37/1.4bpp"), - INCBIN_U8("graphics/door_anims/37/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_38[][0x100] = +const u8 sDoorAnimTiles_BattleArena[][0x100] = { - INCBIN_U8("graphics/door_anims/38/0.4bpp"), - INCBIN_U8("graphics/door_anims/38/1.4bpp"), - INCBIN_U8("graphics/door_anims/38/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_arena/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_arena/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_arena/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_39[][0x100] = +const u8 sDoorAnimTiles_BattleArenaLobby[][0x100] = { - INCBIN_U8("graphics/door_anims/39/0.4bpp"), - INCBIN_U8("graphics/door_anims/39/1.4bpp"), - INCBIN_U8("graphics/door_anims/39/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_arena_lobby/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_arena_lobby/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_arena_lobby/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_40[][0x100] = +const u8 sDoorAnimTiles_BattleDomeLobby[][0x100] = { - INCBIN_U8("graphics/door_anims/40/0.4bpp"), - INCBIN_U8("graphics/door_anims/40/1.4bpp"), - INCBIN_U8("graphics/door_anims/40/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome_lobby/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome_lobby/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome_lobby/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_41[][0x100] = +const u8 sDoorAnimTiles_BattlePalaceLobby[][0x100] = { - INCBIN_U8("graphics/door_anims/41/0.4bpp"), - INCBIN_U8("graphics/door_anims/41/1.4bpp"), - INCBIN_U8("graphics/door_anims/41/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_palace_lobby/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_palace_lobby/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_palace_lobby/2.4bpp"), }; -const u8 DoorAnimTiles_42[][0x100] = +const u8 sDoorAnimTiles_BattleTent[][0x100] = { - INCBIN_U8("graphics/door_anims/42/0.4bpp"), - INCBIN_U8("graphics/door_anims/42/1.4bpp"), - INCBIN_U8("graphics/door_anims/42/2.4bpp"), - INCBIN_U8("graphics/door_anims/42/3.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tent/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tent/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tent/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tent/3.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_43[][0x100] = +const u8 sDoorAnimTiles_BattleDomeCorridor[][0x100] = { - INCBIN_U8("graphics/door_anims/43/0.4bpp"), - INCBIN_U8("graphics/door_anims/43/1.4bpp"), - INCBIN_U8("graphics/door_anims/43/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome_corridor/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome_corridor/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome_corridor/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_44[][0x100] = +const u8 sDoorAnimTiles_BattleTowerMultiCorridor[][0x100] = { - INCBIN_U8("graphics/door_anims/44/0_left.4bpp"), - INCBIN_U8("graphics/door_anims/44/0_right.4bpp"), - INCBIN_U8("graphics/door_anims/44/1_left.4bpp"), - INCBIN_U8("graphics/door_anims/44/1_right.4bpp"), - INCBIN_U8("graphics/door_anims/44/2_left.4bpp"), - INCBIN_U8("graphics/door_anims/44/2_right.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_multi_corridor/0_left.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_multi_corridor/0_right.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_multi_corridor/1_left.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_multi_corridor/1_right.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_multi_corridor/2_left.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tower_multi_corridor/2_right.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_45[][0x100] = +const u8 sDoorAnimTiles_BattleFrontier[][0x100] = { - INCBIN_U8("graphics/door_anims/45/0.4bpp"), - INCBIN_U8("graphics/door_anims/45/1.4bpp"), - INCBIN_U8("graphics/door_anims/45/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_frontier/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_frontier/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_frontier/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_46[][0x100] = +const u8 sDoorAnimTiles_BattleFrontierSliding[][0x100] = { - INCBIN_U8("graphics/door_anims/46/0.4bpp"), - INCBIN_U8("graphics/door_anims/46/1.4bpp"), - INCBIN_U8("graphics/door_anims/46/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_frontier_sliding/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_frontier_sliding/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_frontier_sliding/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_47[][0x100] = +const u8 sDoorAnimTiles_BattleDomePreBattleRoom[][0x100] = { - INCBIN_U8("graphics/door_anims/47/0.4bpp"), - INCBIN_U8("graphics/door_anims/47/1.4bpp"), - INCBIN_U8("graphics/door_anims/47/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome_pre_battle_room/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome_pre_battle_room/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_dome_pre_battle_room/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_48[][0x100] = +const u8 sDoorAnimTiles_BattleTentInterior[][0x100] = { - INCBIN_U8("graphics/door_anims/48/0.4bpp"), - INCBIN_U8("graphics/door_anims/48/1.4bpp"), - INCBIN_U8("graphics/door_anims/48/2.4bpp"), - INCBIN_U8("graphics/door_anims/48/3.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tent_interior/0.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tent_interior/1.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tent_interior/2.4bpp"), + INCBIN_U8("graphics/door_anims/battle_tent_interior/3.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_49[][0x100] = +const u8 sDoorAnimTiles_TrainerHillLobbyElevator[][0x100] = { - INCBIN_U8("graphics/door_anims/49/0.4bpp"), - INCBIN_U8("graphics/door_anims/49/1.4bpp"), - INCBIN_U8("graphics/door_anims/49/2.4bpp"), + INCBIN_U8("graphics/door_anims/trainer_hill_lobby_elevator/0.4bpp"), + INCBIN_U8("graphics/door_anims/trainer_hill_lobby_elevator/1.4bpp"), + INCBIN_U8("graphics/door_anims/trainer_hill_lobby_elevator/2.4bpp"), }; asm(".space 32"); -const u8 DoorAnimTiles_50[][0x100] = +const u8 sDoorAnimTiles_TrainerHillRoofElevator[][0x100] = { - INCBIN_U8("graphics/door_anims/50/0.4bpp"), - INCBIN_U8("graphics/door_anims/50/1.4bpp"), - INCBIN_U8("graphics/door_anims/50/2.4bpp"), + INCBIN_U8("graphics/door_anims/trainer_hill_roof_elevator/0.4bpp"), + INCBIN_U8("graphics/door_anims/trainer_hill_roof_elevator/1.4bpp"), + INCBIN_U8("graphics/door_anims/trainer_hill_roof_elevator/2.4bpp"), }; asm(".space 32"); -static const struct DoorAnimFrame gDoorOpenAnimFrames[] = +static const struct DoorAnimFrame sDoorOpenAnimFrames[] = { {4, -1}, {4, 0}, @@ -495,7 +515,7 @@ static const struct DoorAnimFrame gDoorOpenAnimFrames[] = {0, 0}, }; -static const struct DoorAnimFrame gDoorCloseAnimFrames[] = +static const struct DoorAnimFrame sDoorCloseAnimFrames[] = { {4, 0x200}, {4, 0x100}, @@ -504,7 +524,7 @@ static const struct DoorAnimFrame gDoorCloseAnimFrames[] = {0, 0}, }; -static const struct DoorAnimFrame gBigDoorOpenAnimFrames[] = +static const struct DoorAnimFrame sBigDoorOpenAnimFrames[] = { {4, -1}, {4, 0}, @@ -513,7 +533,7 @@ static const struct DoorAnimFrame gBigDoorOpenAnimFrames[] = {0, 0}, }; -static const struct DoorAnimFrame gBigDoorCloseAnimFrames[] = +static const struct DoorAnimFrame sBigDoorCloseAnimFrames[] = { {4, 0x400}, {4, 0x200}, @@ -522,114 +542,114 @@ static const struct DoorAnimFrame gBigDoorCloseAnimFrames[] = {0, 0}, }; -const u8 DoorAnimPalettes_8496FDC[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 00 -const u8 DoorAnimPalettes_8496FE4[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 01 -const u8 DoorAnimPalettes_8496FEC[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 02 -const u8 DoorAnimPalettes_8496FF4[] = {0, 0, 1, 1, 1, 1, 1, 1}; // door 03 -const u8 DoorAnimPalettes_8496FFC[] = {10, 10, 6, 6, 6, 6, 6, 6}; // door 04 -const u8 DoorAnimPalettes_8497004[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 05 -const u8 DoorAnimPalettes_849700C[] = {11, 11, 11, 11, 11, 11, 11, 11}; // door 06 -const u8 DoorAnimPalettes_8497014[] = {10, 10, 10, 10, 10, 10, 10, 10}; // door 07 -const u8 DoorAnimPalettes_849701C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 08 -const u8 DoorAnimPalettes_8497024[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 09 -const u8 DoorAnimPalettes_849702C[] = {10, 10, 9, 9, 9, 9, 9, 9}; // door 10 -const u8 DoorAnimPalettes_8497034[] = {9, 9, 1, 1, 1, 1, 1, 1}; // door 11 -const u8 DoorAnimPalettes_849703C[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 12 -const u8 DoorAnimPalettes_8497044[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 13 -const u8 DoorAnimPalettes_849704C[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 14 -const u8 DoorAnimPalettes_8497054[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 15 -const u8 DoorAnimPalettes_849705C[] = {0, 0, 5, 5, 5, 5, 5, 5}; // door 16 -const u8 DoorAnimPalettes_8497064[] = {6, 6, 1, 1, 1, 1, 1, 1}; // door 17 -const u8 DoorAnimPalettes_849706C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 18 -const u8 DoorAnimPalettes_8497074[] = {6, 6, 5, 5, 5, 5, 5, 5}; // door 19 -const u8 DoorAnimPalettes_849707C[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 20 -const u8 DoorAnimPalettes_8497084[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 21 -const u8 DoorAnimPalettes_849708C[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 22 -const u8 DoorAnimPalettes_8497094[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 23 -const u8 DoorAnimPalettes_849709C[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 24 -const u8 DoorAnimPalettes_84970A4[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 25 -const u8 DoorAnimPalettes_84970AC[] = {8, 8, 8, 8, 8, 8, 8, 8}; // door 26 -const u8 DoorAnimPalettes_84970B4[] = {6, 6, 6, 6, 6, 6, 6, 6}; // door 27 -const u8 DoorAnimPalettes_84970BC[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 28 -const u8 DoorAnimPalettes_84970C4[] = {11, 11, 7, 7, 7, 7, 7, 7}; // door 29 -const u8 DoorAnimPalettes_84970CC[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 30 -const u8 DoorAnimPalettes_84970D4[] = {6, 6, 7, 7, 7, 7, 7, 7}; // door 31 -const u8 DoorAnimPalettes_84970DC[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 32 -const u8 DoorAnimPalettes_84970E4[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 33 -const u8 DoorAnimPalettes_84970EC[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 34 -const u8 DoorAnimPalettes_84970F4[] = {1, 1, 1, 1, 1, 1, 1, 1}; // door 35 -const u8 DoorAnimPalettes_84970FC[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 36 -const u8 DoorAnimPalettes_8497104[] = {0, 0, 0, 0, 0, 0, 0, 0}; // door 37 -const u8 DoorAnimPalettes_849710C[] = {5, 5, 5, 5, 5, 5, 5, 5}; // door 38 -const u8 DoorAnimPalettes_8497114[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 39 -const u8 DoorAnimPalettes_849711C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 40 -const u8 DoorAnimPalettes_8497124[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 41 -const u8 DoorAnimPalettes_849712C[] = {1, 1, 1, 1, 1, 1, 1, 1}; // doors 42, 43, and 44 -const u8 DoorAnimPalettes_8497134[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 45 -const u8 DoorAnimPalettes_849713C[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 46 -const u8 DoorAnimPalettes_8497144[] = {1, 1, 1, 1, 1, 1, 1, 1}; // unused -const u8 DoorAnimPalettes_849714C[] = {1, 1, 1, 1, 1, 1, 1, 1}; // doors 47 and 48 -const u8 DoorAnimPalettes_8497154[] = {9, 9, 7, 7, 7, 7, 7, 7}; // door 49 -const u8 DoorAnimPalettes_849715C[] = {9, 9, 9, 9, 9, 9, 9, 9}; // door 50 -const u8 DoorAnimPalettes_8497164[] = {7, 7, 7, 7, 7, 7, 7, 7}; // door 51 -const u8 DoorAnimPalettes_849716C[] = {9, 9, 7, 7, 7, 7, 7, 7}; // door 52 +static const u8 sDoorAnimPalettes_General[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_PokeCenter[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_Gym[] = {5, 5, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_PokeMart[] = {0, 0, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_Littleroot[] = {10, 10, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_BirchsLab[] = {8, 8, 8, 8, 8, 8, 8, 8}; +static const u8 sDoorAnimPalettes_RustboroTan[] = {11, 11, 11, 11, 11, 11, 11, 11}; +static const u8 sDoorAnimPalettes_RustboroGray[] = {10, 10, 10, 10, 10, 10, 10, 10}; +static const u8 sDoorAnimPalettes_FallarborLightRoof[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_Lilycove[] = {8, 8, 8, 8, 8, 8, 8, 8}; +static const u8 sDoorAnimPalettes_Oldale[] = {10, 10, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_Mossdeep[] = {9, 9, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_PokemonLeague[] = {8, 8, 8, 8, 8, 8, 8, 8}; +static const u8 sDoorAnimPalettes_Pacifidlog[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_SootopolisPeakedRoof[] = {6, 6, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_Sootopolis[] = {6, 6, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_Dewford[] = {0, 0, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_Slateport[] = {6, 6, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_Mauville[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_Verdanturf[] = {6, 6, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_LilycoveWooden[] = {5, 5, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_Contest[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleTowerCorridor[] = {6, 6, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_CyclingRoad[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_LilycoveDeptStore[] = {5, 5, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_SafariZone[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_MossdeepSpaceCenter[] = {8, 8, 8, 8, 8, 8, 8, 8}; +static const u8 sDoorAnimPalettes_CableClub[] = {6, 6, 6, 6, 6, 6, 6, 6}; +static const u8 sDoorAnimPalettes_AbandonedShip[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_FallarborDarkRoof[] = {11, 11, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_AbandonedShipRoom[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_LilycoveDeptStoreElevator[] = {6, 6, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleTowerOld[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_BattleTowerElevator[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_34[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_BattleDome[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleFactory[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_BattleTower[] = {0, 0, 0, 0, 0, 0, 0, 0}; +static const u8 sDoorAnimPalettes_BattleArena[] = {5, 5, 5, 5, 5, 5, 5, 5}; +static const u8 sDoorAnimPalettes_BattleArenaLobby[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleDomeLobby[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattlePalaceLobby[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleTent[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleDomeCorridor[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleTowerMultiCorridor[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_Unused[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleFrontier[] = {1, 1, 1, 1, 1, 1, 1, 1}; +static const u8 sDoorAnimPalettes_BattleDomePreBattleRoom[] = {9, 9, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_BattleTentInterior[] = {9, 9, 9, 9, 9, 9, 9, 9}; +static const u8 sDoorAnimPalettes_TrainerHillLobbyElevator[] = {7, 7, 7, 7, 7, 7, 7, 7}; +static const u8 sDoorAnimPalettes_TrainerHillRoofElevator[] = {9, 9, 7, 7, 7, 7, 7, 7}; -static const struct DoorGraphics gDoorAnimGraphicsTable[] = +static const struct DoorGraphics sDoorAnimGraphicsTable[] = { - {0x021, 0, 1, DoorAnimTiles_00, DoorAnimPalettes_8496FDC}, // door 00 - {0x061, 1, 1, DoorAnimTiles_01, DoorAnimPalettes_8496FE4}, // door 01 - {0x1CD, 1, 1, DoorAnimTiles_02, DoorAnimPalettes_8496FEC}, // door 02 - {0x041, 1, 1, DoorAnimTiles_03, DoorAnimPalettes_8496FF4}, // door 03 - {0x248, 0, 1, DoorAnimTiles_04, DoorAnimPalettes_8496FFC}, // door 04 - {0x249, 0, 1, DoorAnimTiles_05, DoorAnimPalettes_8497004}, // door 05 - {0x22F, 0, 1, DoorAnimTiles_06, DoorAnimPalettes_849700C}, // door 06 - {0x21F, 0, 1, DoorAnimTiles_07, DoorAnimPalettes_8497014}, // door 07 - {0x2A5, 0, 1, DoorAnimTiles_08, DoorAnimPalettes_849701C}, // door 08 - {0x287, 0, 1, DoorAnimTiles_09, DoorAnimPalettes_849702C}, // door 09 - {0x2AC, 0, 1, DoorAnimTiles_10, DoorAnimPalettes_849706C}, // door 10 - {0x3A1, 0, 1, DoorAnimTiles_11, DoorAnimPalettes_8497074}, // door 11 - {0x2DC, 0, 1, DoorAnimTiles_12, DoorAnimPalettes_8497064}, // door 12 - {0x225, 0, 1, DoorAnimTiles_13, DoorAnimPalettes_849705C}, // door 13 - {0x1DB, 1, 1, DoorAnimTiles_14, DoorAnimPalettes_8497084}, // door 14 - {0x246, 0, 1, DoorAnimTiles_15, DoorAnimPalettes_8497024}, // door 15 - {0x28E, 0, 1, DoorAnimTiles_16, DoorAnimPalettes_849707C}, // door 16 - {0x2A1, 0, 1, DoorAnimTiles_17, DoorAnimPalettes_8497034}, // door 17 - {0x21C, 0, 1, DoorAnimTiles_18, DoorAnimPalettes_849704C}, // door 18 - {0x21E, 0, 1, DoorAnimTiles_19, DoorAnimPalettes_8497054}, // door 19 - {0x21D, 1, 1, DoorAnimTiles_20, DoorAnimPalettes_849703C}, // door 20 - {0x21A, 0, 1, DoorAnimTiles_21, DoorAnimPalettes_8497044}, // door 21 - {0x224, 0, 1, DoorAnimTiles_22, DoorAnimPalettes_849708C}, // door 22 - {0x289, 0, 1, DoorAnimTiles_23, DoorAnimPalettes_8497094}, // door 23 - {0x30C, 1, 1, DoorAnimTiles_24, DoorAnimPalettes_849709C}, // door 24 - {0x32D, 1, 1, DoorAnimTiles_25, DoorAnimPalettes_84970A4}, // door 25 - {0x2ED, 1, 1, DoorAnimTiles_26, DoorAnimPalettes_84970AC}, // door 26 - {0x264, 1, 1, DoorAnimTiles_27, DoorAnimPalettes_84970B4}, // door 27 - {0x22B, 0, 1, DoorAnimTiles_28, DoorAnimPalettes_84970BC}, // door 28 - {0x2F7, 0, 1, DoorAnimTiles_29, DoorAnimPalettes_84970C4}, // door 29 - {0x297, 0, 1, DoorAnimTiles_30, DoorAnimPalettes_84970CC}, // door 30 - {0x285, 1, 1, DoorAnimTiles_31, DoorAnimPalettes_84970D4}, // door 31 - {0x25D, 1, 1, DoorAnimTiles_32, DoorAnimPalettes_84970DC}, // door 32 - {0x20E, 1, 1, DoorAnimTiles_33, DoorAnimPalettes_84970E4}, // door 33 - {0x3B0, 1, 1, DoorAnimTiles_34, DoorAnimPalettes_84970EC}, // door 34 - {0x28A, 1, 1, DoorAnimTiles_35, DoorAnimPalettes_84970F4}, // door 35 - {0x263, 1, 1, DoorAnimTiles_36, DoorAnimPalettes_84970FC}, // door 36 - {0x329, 1, 1, DoorAnimTiles_37, DoorAnimPalettes_8497104}, // door 37 - {0x291, 0, 1, DoorAnimTiles_38, DoorAnimPalettes_849710C}, // door 38 - {0x21B, 2, 1, DoorAnimTiles_39, DoorAnimPalettes_8497114}, // door 39 - {0x209, 1, 1, DoorAnimTiles_40, DoorAnimPalettes_849711C}, // door 40 - {0x219, 0, 1, DoorAnimTiles_41, DoorAnimPalettes_8497124}, // door 41 - {0x393, 1, 1, DoorAnimTiles_42, DoorAnimPalettes_849712C}, // door 42 - {0x3D4, 1, 1, DoorAnimTiles_42, DoorAnimPalettes_849712C}, // door 43 - {0x36C, 1, 1, DoorAnimTiles_42, DoorAnimPalettes_849712C}, // door 44 - {0x25E, 1, 1, DoorAnimTiles_43, DoorAnimPalettes_8497134}, // door 45 - {0x2AD, 1, 2, DoorAnimTiles_44, DoorAnimPalettes_849713C}, // door 46 - {0x3FC, 0, 1, DoorAnimTiles_45, DoorAnimPalettes_849714C}, // door 47 - {0x396, 1, 1, DoorAnimTiles_46, DoorAnimPalettes_849714C}, // door 48 - {0x20A, 1, 1, DoorAnimTiles_47, DoorAnimPalettes_8497154}, // door 49 - {0x26B, 1, 1, DoorAnimTiles_48, DoorAnimPalettes_849715C}, // door 50 - {0x32C, 1, 1, DoorAnimTiles_49, DoorAnimPalettes_8497164}, // door 51 - {0x383, 1, 1, DoorAnimTiles_50, DoorAnimPalettes_849716C}, // door 52 - {0, 0, 0, NULL, NULL}, + {METATILE_General_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_General, sDoorAnimPalettes_General}, + {METATILE_General_Door_PokeCenter, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_PokeCenter, sDoorAnimPalettes_PokeCenter}, + {METATILE_General_Door_Gym, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_Gym, sDoorAnimPalettes_Gym}, + {METATILE_General_Door_PokeMart, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_PokeMart, sDoorAnimPalettes_PokeMart}, + {METATILE_Petalburg_Door_Littleroot, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Littleroot, sDoorAnimPalettes_Littleroot}, + {METATILE_Petalburg_Door_BirchsLab, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BirchsLab, sDoorAnimPalettes_BirchsLab}, + {METATILE_Rustboro_Door_Tan, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_RustboroTan, sDoorAnimPalettes_RustboroTan}, + {METATILE_Rustboro_Door_Gray, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_RustboroGray, sDoorAnimPalettes_RustboroGray}, + {METATILE_Fallarbor_Door_LightRoof, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_FallarborLightRoof, sDoorAnimPalettes_FallarborLightRoof}, + {METATILE_Petalburg_Door_Oldale, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Oldale, sDoorAnimPalettes_Oldale}, + {METATILE_Mauville_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Mauville, sDoorAnimPalettes_Mauville}, + {METATILE_Mauville_Door_Verdanturf, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Verdanturf, sDoorAnimPalettes_Verdanturf}, + {METATILE_Slateport_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Slateport, sDoorAnimPalettes_Slateport}, + {METATILE_Dewford_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Dewford, sDoorAnimPalettes_Dewford}, + {METATILE_General_Door_Contest, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_Contest, sDoorAnimPalettes_Contest}, + {METATILE_Lilycove_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Lilycove, sDoorAnimPalettes_Lilycove}, + {METATILE_Lilycove_Door_Wooden, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_LilycoveWooden, sDoorAnimPalettes_LilycoveWooden}, + {METATILE_Mossdeep_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Mossdeep, sDoorAnimPalettes_Mossdeep}, + {METATILE_Sootopolis_Door_PeakedRoof, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_SootopolisPeakedRoof, sDoorAnimPalettes_SootopolisPeakedRoof}, + {METATILE_Sootopolis_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Sootopolis, sDoorAnimPalettes_Sootopolis}, + {METATILE_EverGrande_Door_PokemonLeague, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_PokemonLeague, sDoorAnimPalettes_PokemonLeague}, + {METATILE_Pacifidlog_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_Pacifidlog, sDoorAnimPalettes_Pacifidlog}, + {METATILE_BattleFrontier_Door_Corridor, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BattleTowerCorridor, sDoorAnimPalettes_BattleTowerCorridor}, + {METATILE_Mauville_Door_CyclingRoad, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_CyclingRoad, sDoorAnimPalettes_CyclingRoad}, + {METATILE_Lilycove_Door_DeptStore, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_LilycoveDeptStore, sDoorAnimPalettes_LilycoveDeptStore}, + {METATILE_Lilycove_Door_SafariZone, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_SafariZone, sDoorAnimPalettes_SafariZone}, + {METATILE_Mossdeep_Door_SpaceCenter, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_MossdeepSpaceCenter, sDoorAnimPalettes_MossdeepSpaceCenter}, + {METATILE_PokemonCenter_Door_CableClub, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_CableClub, sDoorAnimPalettes_CableClub}, + {METATILE_InsideShip_IntactDoor_Bottom_Unlocked, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_AbandonedShip, sDoorAnimPalettes_AbandonedShip}, + {METATILE_Fallarbor_Door_DarkRoof, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_FallarborDarkRoof, sDoorAnimPalettes_FallarborDarkRoof}, + {METATILE_InsideShip_IntactDoor_Bottom_Interior, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_AbandonedShipRoom, sDoorAnimPalettes_AbandonedShipRoom}, + {METATILE_Shop_Door_Elevator, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_LilycoveDeptStoreElevator, sDoorAnimPalettes_LilycoveDeptStoreElevator}, + {METATILE_Dewford_Door_BattleTower, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTowerOld, sDoorAnimPalettes_BattleTowerOld}, + {METATILE_BattleFrontier_Door_Elevator, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTowerElevator, sDoorAnimPalettes_BattleTowerElevator}, + {0x3B0, /* TODO: Missing metatile ID */ DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_34, sDoorAnimPalettes_34}, + {METATILE_BattleFrontierOutsideWest_Door_BattleDome, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleDome, sDoorAnimPalettes_BattleDome}, + {METATILE_BattleFrontierOutsideWest_Door_BattleFactory, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleFactory, sDoorAnimPalettes_BattleFactory}, + {METATILE_BattleFrontierOutsideEast_Door_BattleTower, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTower, sDoorAnimPalettes_BattleTower}, + {METATILE_BattleFrontierOutsideEast_Door_BattleArena, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BattleArena, sDoorAnimPalettes_BattleArena}, + {METATILE_BattleArena_Door, DOOR_SOUND_ARENA, 1, sDoorAnimTiles_BattleArenaLobby, sDoorAnimPalettes_BattleArenaLobby}, + {METATILE_BattleDome_Door_Lobby, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleDomeLobby, sDoorAnimPalettes_BattleDomeLobby}, + {METATILE_BattlePalace_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BattlePalaceLobby, sDoorAnimPalettes_BattlePalaceLobby}, + {METATILE_Slateport_Door_BattleTent, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTent, sDoorAnimPalettes_BattleTent}, + {METATILE_Mauville_Door_BattleTent, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTent, sDoorAnimPalettes_BattleTent}, + {METATILE_Fallarbor_Door_BattleTent, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTent, sDoorAnimPalettes_BattleTent}, + {METATILE_BattleDome_Door_Corridor, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleDomeCorridor, sDoorAnimPalettes_BattleDomeCorridor}, + {METATILE_BattleFrontier_Door_MultiCorridor, DOOR_SOUND_SLIDING, 2, sDoorAnimTiles_BattleTowerMultiCorridor, sDoorAnimPalettes_BattleTowerMultiCorridor}, + {METATILE_BattleFrontierOutsideWest_Door, DOOR_SOUND_NORMAL, 1, sDoorAnimTiles_BattleFrontier, sDoorAnimPalettes_BattleFrontier}, + {METATILE_BattleFrontierOutsideWest_Door_Sliding, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleFrontierSliding, sDoorAnimPalettes_BattleFrontier}, + {METATILE_BattleDome_Door_PreBattleRoom, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleDomePreBattleRoom, sDoorAnimPalettes_BattleDomePreBattleRoom}, + {METATILE_BattleTent_Door, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_BattleTentInterior, sDoorAnimPalettes_BattleTentInterior}, + {METATILE_TrainerHill_Door_Elevator_Lobby, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_TrainerHillLobbyElevator, sDoorAnimPalettes_TrainerHillLobbyElevator}, + {METATILE_TrainerHill_Door_Elevator_Roof, DOOR_SOUND_SLIDING, 1, sDoorAnimTiles_TrainerHillRoofElevator, sDoorAnimPalettes_TrainerHillRoofElevator}, + {}, }; static void CopyDoorTilesToVram(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frame) @@ -796,7 +816,7 @@ static void DrawOpenedDoor(const struct DoorGraphics *gfx, u32 x, u32 y) { gfx = GetDoorGraphics(gfx, MapGridGetMetatileIdAt(x, y)); if (gfx != NULL) - DrawDoor(gfx, GetLastDoorFrame(gDoorOpenAnimFrames, gDoorOpenAnimFrames), x, y); + DrawDoor(gfx, GetLastDoorFrame(sDoorOpenAnimFrames, sDoorOpenAnimFrames), x, y); } static s8 StartDoorOpenAnimation(const struct DoorGraphics *gfx, u32 x, u32 y) @@ -809,9 +829,9 @@ static s8 StartDoorOpenAnimation(const struct DoorGraphics *gfx, u32 x, u32 y) else { if (gfx->size == 2) - return StartDoorAnimationTask(gfx, gBigDoorOpenAnimFrames, x, y); + return StartDoorAnimationTask(gfx, sBigDoorOpenAnimFrames, x, y); else - return StartDoorAnimationTask(gfx, gDoorOpenAnimFrames, x, y); + return StartDoorAnimationTask(gfx, sDoorOpenAnimFrames, x, y); } } @@ -821,10 +841,10 @@ static s8 StartDoorCloseAnimation(const struct DoorGraphics *gfx, u32 x, u32 y) if (gfx == NULL) return -1; else - return StartDoorAnimationTask(gfx, gDoorCloseAnimFrames, x, y); + return StartDoorAnimationTask(gfx, sDoorCloseAnimFrames, x, y); } -static s8 cur_mapdata_get_door_x2_at(const struct DoorGraphics *gfx, u32 x, u32 y) +static s8 GetDoorSoundType(const struct DoorGraphics *gfx, u32 x, u32 y) { gfx = GetDoorGraphics(gfx, MapGridGetMetatileIdAt(x, y)); if (gfx == NULL) @@ -833,21 +853,22 @@ static s8 cur_mapdata_get_door_x2_at(const struct DoorGraphics *gfx, u32 x, u32 return gfx->sound; } -void unref_sub_808A83C(u32 x, u32 y) +// Unused. Debug? Same as FieldAnimateDoorOpen but doesnt return or check if metatile is actually a door +static void Debug_FieldAnimateDoorOpen(u32 x, u32 y) { - StartDoorOpenAnimation(gDoorAnimGraphicsTable, x, y); + StartDoorOpenAnimation(sDoorAnimGraphicsTable, x, y); } void FieldSetDoorOpened(u32 x, u32 y) { if (MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y))) - DrawOpenedDoor(gDoorAnimGraphicsTable, x, y); + DrawOpenedDoor(sDoorAnimGraphicsTable, x, y); } void FieldSetDoorClosed(u32 x, u32 y) { if (MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y))) - DrawClosedDoor(gDoorAnimGraphicsTable, x, y); + DrawClosedDoor(sDoorAnimGraphicsTable, x, y); } s8 FieldAnimateDoorClose(u32 x, u32 y) @@ -855,7 +876,7 @@ s8 FieldAnimateDoorClose(u32 x, u32 y) if (!MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y))) return -1; else - return StartDoorCloseAnimation(gDoorAnimGraphicsTable, x, y); + return StartDoorCloseAnimation(sDoorAnimGraphicsTable, x, y); } s8 FieldAnimateDoorOpen(u32 x, u32 y) @@ -863,7 +884,7 @@ s8 FieldAnimateDoorOpen(u32 x, u32 y) if (!MetatileBehavior_IsDoor(MapGridGetMetatileBehaviorAt(x, y))) return -1; else - return StartDoorOpenAnimation(gDoorAnimGraphicsTable, x, y); + return StartDoorOpenAnimation(sDoorAnimGraphicsTable, x, y); } bool8 FieldIsDoorAnimationRunning(void) @@ -873,13 +894,13 @@ bool8 FieldIsDoorAnimationRunning(void) u32 GetDoorSoundEffect(u32 x, u32 y) { - int sound = cur_mapdata_get_door_x2_at(gDoorAnimGraphicsTable, x, y); + int sound = GetDoorSoundType(sDoorAnimGraphicsTable, x, y); - if (sound == 0) + if (sound == DOOR_SOUND_NORMAL) return SE_DOOR; - else if (sound == 1) + else if (sound == DOOR_SOUND_SLIDING) return SE_JIDO_DOA; - else if (sound == 2) + else if (sound == DOOR_SOUND_ARENA) return SE_TU_SAA; else return SE_DOOR; From a15290021115d8041dbbf44a767395fd0af707e8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 21 Jan 2020 01:22:17 -0500 Subject: [PATCH 4/6] Combine animated door frames --- graphics/door_anims/abandoned_ship.png | Bin 0 -> 420 bytes graphics/door_anims/abandoned_ship/0.png | Bin 167 -> 0 bytes graphics/door_anims/abandoned_ship/1.png | Bin 155 -> 0 bytes graphics/door_anims/abandoned_ship/2.png | Bin 118 -> 0 bytes graphics/door_anims/abandoned_ship_room.png | Bin 0 -> 419 bytes graphics/door_anims/abandoned_ship_room/0.png | Bin 167 -> 0 bytes graphics/door_anims/abandoned_ship_room/1.png | Bin 154 -> 0 bytes graphics/door_anims/abandoned_ship_room/2.png | Bin 117 -> 0 bytes graphics/door_anims/battle_arena.png | Bin 0 -> 509 bytes graphics/door_anims/battle_arena/0.png | Bin 206 -> 0 bytes graphics/door_anims/battle_arena/1.png | Bin 213 -> 0 bytes graphics/door_anims/battle_arena/2.png | Bin 161 -> 0 bytes graphics/door_anims/battle_arena_lobby.png | Bin 0 -> 408 bytes graphics/door_anims/battle_arena_lobby/0.png | Bin 133 -> 0 bytes graphics/door_anims/battle_arena_lobby/1.png | Bin 146 -> 0 bytes graphics/door_anims/battle_arena_lobby/2.png | Bin 132 -> 0 bytes graphics/door_anims/battle_dome.png | Bin 0 -> 394 bytes graphics/door_anims/battle_dome/0.png | Bin 161 -> 0 bytes graphics/door_anims/battle_dome/1.png | Bin 155 -> 0 bytes graphics/door_anims/battle_dome/2.png | Bin 148 -> 0 bytes graphics/door_anims/battle_dome_corridor.png | Bin 0 -> 462 bytes .../door_anims/battle_dome_corridor/0.png | Bin 170 -> 0 bytes .../door_anims/battle_dome_corridor/1.png | Bin 168 -> 0 bytes .../door_anims/battle_dome_corridor/2.png | Bin 161 -> 0 bytes graphics/door_anims/battle_dome_lobby.png | Bin 0 -> 486 bytes graphics/door_anims/battle_dome_lobby/0.png | Bin 205 -> 0 bytes graphics/door_anims/battle_dome_lobby/1.png | Bin 194 -> 0 bytes graphics/door_anims/battle_dome_lobby/2.png | Bin 168 -> 0 bytes .../battle_dome_pre_battle_room.png | Bin 0 -> 488 bytes .../battle_dome_pre_battle_room/0.png | Bin 193 -> 0 bytes .../battle_dome_pre_battle_room/1.png | Bin 189 -> 0 bytes .../battle_dome_pre_battle_room/2.png | Bin 183 -> 0 bytes graphics/door_anims/battle_factory.png | Bin 0 -> 366 bytes graphics/door_anims/battle_factory/0.png | Bin 138 -> 0 bytes graphics/door_anims/battle_factory/1.png | Bin 150 -> 0 bytes graphics/door_anims/battle_factory/2.png | Bin 144 -> 0 bytes graphics/door_anims/battle_frontier.png | Bin 0 -> 421 bytes graphics/door_anims/battle_frontier/0.png | Bin 167 -> 0 bytes graphics/door_anims/battle_frontier/1.png | Bin 153 -> 0 bytes graphics/door_anims/battle_frontier/2.png | Bin 127 -> 0 bytes .../door_anims/battle_frontier_sliding.png | Bin 0 -> 390 bytes .../door_anims/battle_frontier_sliding/0.png | Bin 144 -> 0 bytes .../door_anims/battle_frontier_sliding/1.png | Bin 142 -> 0 bytes .../door_anims/battle_frontier_sliding/2.png | Bin 127 -> 0 bytes graphics/door_anims/battle_palace_lobby.png | Bin 0 -> 432 bytes graphics/door_anims/battle_palace_lobby/0.png | Bin 198 -> 0 bytes graphics/door_anims/battle_palace_lobby/1.png | Bin 184 -> 0 bytes graphics/door_anims/battle_palace_lobby/2.png | Bin 159 -> 0 bytes graphics/door_anims/battle_tent.png | Bin 0 -> 544 bytes graphics/door_anims/battle_tent/0.png | Bin 211 -> 0 bytes graphics/door_anims/battle_tent/1.png | Bin 216 -> 0 bytes graphics/door_anims/battle_tent/2.png | Bin 190 -> 0 bytes graphics/door_anims/battle_tent/3.png | Bin 180 -> 0 bytes graphics/door_anims/battle_tent_interior.png | Bin 0 -> 504 bytes .../door_anims/battle_tent_interior/0.png | Bin 167 -> 0 bytes .../door_anims/battle_tent_interior/1.png | Bin 193 -> 0 bytes .../door_anims/battle_tent_interior/2.png | Bin 150 -> 0 bytes .../door_anims/battle_tent_interior/3.png | Bin 133 -> 0 bytes graphics/door_anims/battle_tower.png | Bin 0 -> 467 bytes graphics/door_anims/battle_tower/0.png | Bin 201 -> 0 bytes graphics/door_anims/battle_tower/1.png | Bin 188 -> 0 bytes graphics/door_anims/battle_tower/2.png | Bin 115 -> 0 bytes graphics/door_anims/battle_tower_corridor.png | Bin 0 -> 404 bytes .../door_anims/battle_tower_corridor/0.png | Bin 154 -> 0 bytes .../door_anims/battle_tower_corridor/1.png | Bin 136 -> 0 bytes .../door_anims/battle_tower_corridor/2.png | Bin 119 -> 0 bytes graphics/door_anims/battle_tower_elevator.png | Bin 0 -> 398 bytes .../door_anims/battle_tower_elevator/0.png | Bin 144 -> 0 bytes .../door_anims/battle_tower_elevator/1.png | Bin 147 -> 0 bytes .../door_anims/battle_tower_elevator/2.png | Bin 144 -> 0 bytes .../battle_tower_multi_corridor.png | Bin 0 -> 554 bytes .../battle_tower_multi_corridor/0_left.png | Bin 172 -> 0 bytes .../battle_tower_multi_corridor/0_right.png | Bin 172 -> 0 bytes .../battle_tower_multi_corridor/1_left.png | Bin 162 -> 0 bytes .../battle_tower_multi_corridor/1_right.png | Bin 161 -> 0 bytes .../battle_tower_multi_corridor/2_left.png | Bin 120 -> 0 bytes .../battle_tower_multi_corridor/2_right.png | Bin 121 -> 0 bytes graphics/door_anims/battle_tower_old.png | Bin 0 -> 458 bytes graphics/door_anims/battle_tower_old/0.png | Bin 194 -> 0 bytes graphics/door_anims/battle_tower_old/1.png | Bin 198 -> 0 bytes graphics/door_anims/battle_tower_old/2.png | Bin 138 -> 0 bytes graphics/door_anims/birchs_lab.png | Bin 0 -> 402 bytes graphics/door_anims/birchs_lab/0.png | Bin 165 -> 0 bytes graphics/door_anims/birchs_lab/1.png | Bin 156 -> 0 bytes graphics/door_anims/birchs_lab/2.png | Bin 138 -> 0 bytes graphics/door_anims/cable_club.png | Bin 0 -> 368 bytes graphics/door_anims/cable_club/0.png | Bin 126 -> 0 bytes graphics/door_anims/cable_club/1.png | Bin 137 -> 0 bytes graphics/door_anims/cable_club/2.png | Bin 124 -> 0 bytes graphics/door_anims/contest.png | Bin 0 -> 452 bytes graphics/door_anims/contest/0.png | Bin 187 -> 0 bytes graphics/door_anims/contest/1.png | Bin 180 -> 0 bytes graphics/door_anims/contest/2.png | Bin 117 -> 0 bytes graphics/door_anims/cycling_road.png | Bin 0 -> 441 bytes graphics/door_anims/cycling_road/0.png | Bin 186 -> 0 bytes graphics/door_anims/cycling_road/1.png | Bin 176 -> 0 bytes graphics/door_anims/cycling_road/2.png | Bin 143 -> 0 bytes graphics/door_anims/dewford.png | Bin 0 -> 436 bytes graphics/door_anims/dewford/0.png | Bin 178 -> 0 bytes graphics/door_anims/dewford/1.png | Bin 177 -> 0 bytes graphics/door_anims/dewford/2.png | Bin 149 -> 0 bytes graphics/door_anims/fallarbor_dark_roof.png | Bin 0 -> 432 bytes graphics/door_anims/fallarbor_dark_roof/0.png | Bin 186 -> 0 bytes graphics/door_anims/fallarbor_dark_roof/1.png | Bin 171 -> 0 bytes graphics/door_anims/fallarbor_dark_roof/2.png | Bin 151 -> 0 bytes graphics/door_anims/fallarbor_light_roof.png | Bin 0 -> 432 bytes .../door_anims/fallarbor_light_roof/0.png | Bin 186 -> 0 bytes .../door_anims/fallarbor_light_roof/1.png | Bin 171 -> 0 bytes .../door_anims/fallarbor_light_roof/2.png | Bin 151 -> 0 bytes graphics/door_anims/general.png | Bin 0 -> 425 bytes graphics/door_anims/general/0.png | Bin 170 -> 0 bytes graphics/door_anims/general/1.png | Bin 158 -> 0 bytes graphics/door_anims/general/2.png | Bin 134 -> 0 bytes graphics/door_anims/gym.png | Bin 0 -> 404 bytes graphics/door_anims/gym/0.png | Bin 151 -> 0 bytes graphics/door_anims/gym/1.png | Bin 153 -> 0 bytes graphics/door_anims/gym/2.png | Bin 129 -> 0 bytes graphics/door_anims/lilycove.png | Bin 0 -> 426 bytes graphics/door_anims/lilycove/0.png | Bin 177 -> 0 bytes graphics/door_anims/lilycove/1.png | Bin 171 -> 0 bytes graphics/door_anims/lilycove/2.png | Bin 146 -> 0 bytes graphics/door_anims/lilycove_dept_store.png | Bin 0 -> 430 bytes graphics/door_anims/lilycove_dept_store/0.png | Bin 176 -> 0 bytes graphics/door_anims/lilycove_dept_store/1.png | Bin 176 -> 0 bytes graphics/door_anims/lilycove_dept_store/2.png | Bin 152 -> 0 bytes .../lilycove_dept_store_elevator.png | Bin 0 -> 345 bytes .../lilycove_dept_store_elevator/0.png | Bin 129 -> 0 bytes .../lilycove_dept_store_elevator/1.png | Bin 121 -> 0 bytes .../lilycove_dept_store_elevator/2.png | Bin 104 -> 0 bytes graphics/door_anims/lilycove_wooden.png | Bin 0 -> 401 bytes graphics/door_anims/lilycove_wooden/0.png | Bin 162 -> 0 bytes graphics/door_anims/lilycove_wooden/1.png | Bin 152 -> 0 bytes graphics/door_anims/lilycove_wooden/2.png | Bin 136 -> 0 bytes graphics/door_anims/littleroot.png | Bin 0 -> 426 bytes graphics/door_anims/littleroot/0.png | Bin 180 -> 0 bytes graphics/door_anims/littleroot/1.png | Bin 167 -> 0 bytes graphics/door_anims/littleroot/2.png | Bin 145 -> 0 bytes graphics/door_anims/mauville.png | Bin 0 -> 432 bytes graphics/door_anims/mauville/0.png | Bin 177 -> 0 bytes graphics/door_anims/mauville/1.png | Bin 167 -> 0 bytes graphics/door_anims/mauville/2.png | Bin 139 -> 0 bytes graphics/door_anims/mossdeep.png | Bin 0 -> 411 bytes graphics/door_anims/mossdeep/0.png | Bin 162 -> 0 bytes graphics/door_anims/mossdeep/1.png | Bin 152 -> 0 bytes graphics/door_anims/mossdeep/2.png | Bin 130 -> 0 bytes graphics/door_anims/mossdeep_space_center.png | Bin 0 -> 509 bytes .../door_anims/mossdeep_space_center/0.png | Bin 232 -> 0 bytes .../door_anims/mossdeep_space_center/1.png | Bin 223 -> 0 bytes .../door_anims/mossdeep_space_center/2.png | Bin 185 -> 0 bytes graphics/door_anims/oldale.png | Bin 0 -> 434 bytes graphics/door_anims/oldale/0.png | Bin 181 -> 0 bytes graphics/door_anims/oldale/1.png | Bin 169 -> 0 bytes graphics/door_anims/oldale/2.png | Bin 145 -> 0 bytes graphics/door_anims/pacifidlog.png | Bin 0 -> 452 bytes graphics/door_anims/pacifidlog/0.png | Bin 198 -> 0 bytes graphics/door_anims/pacifidlog/1.png | Bin 192 -> 0 bytes graphics/door_anims/pacifidlog/2.png | Bin 162 -> 0 bytes graphics/door_anims/poke_center.png | Bin 0 -> 419 bytes graphics/door_anims/poke_center/0.png | Bin 183 -> 0 bytes graphics/door_anims/poke_center/1.png | Bin 179 -> 0 bytes graphics/door_anims/poke_center/2.png | Bin 161 -> 0 bytes graphics/door_anims/poke_mart.png | Bin 0 -> 419 bytes graphics/door_anims/poke_mart/0.png | Bin 183 -> 0 bytes graphics/door_anims/poke_mart/1.png | Bin 179 -> 0 bytes graphics/door_anims/poke_mart/2.png | Bin 161 -> 0 bytes graphics/door_anims/pokemon_league.png | Bin 0 -> 445 bytes graphics/door_anims/pokemon_league/0.png | Bin 205 -> 0 bytes graphics/door_anims/pokemon_league/1.png | Bin 205 -> 0 bytes graphics/door_anims/pokemon_league/2.png | Bin 180 -> 0 bytes graphics/door_anims/rustboro_gray.png | Bin 0 -> 440 bytes graphics/door_anims/rustboro_gray/0.png | Bin 172 -> 0 bytes graphics/door_anims/rustboro_gray/1.png | Bin 171 -> 0 bytes graphics/door_anims/rustboro_gray/2.png | Bin 142 -> 0 bytes graphics/door_anims/rustboro_tan.png | Bin 0 -> 440 bytes graphics/door_anims/rustboro_tan/0.png | Bin 172 -> 0 bytes graphics/door_anims/rustboro_tan/1.png | Bin 171 -> 0 bytes graphics/door_anims/rustboro_tan/2.png | Bin 142 -> 0 bytes graphics/door_anims/safari_zone.png | Bin 0 -> 458 bytes graphics/door_anims/safari_zone/0.png | Bin 188 -> 0 bytes graphics/door_anims/safari_zone/1.png | Bin 183 -> 0 bytes graphics/door_anims/safari_zone/2.png | Bin 157 -> 0 bytes graphics/door_anims/slateport.png | Bin 0 -> 425 bytes graphics/door_anims/slateport/0.png | Bin 170 -> 0 bytes graphics/door_anims/slateport/1.png | Bin 158 -> 0 bytes graphics/door_anims/slateport/2.png | Bin 134 -> 0 bytes graphics/door_anims/sootopolis.png | Bin 0 -> 435 bytes graphics/door_anims/sootopolis/0.png | Bin 196 -> 0 bytes graphics/door_anims/sootopolis/1.png | Bin 168 -> 0 bytes graphics/door_anims/sootopolis/2.png | Bin 152 -> 0 bytes .../door_anims/sootopolis_peaked_roof.png | Bin 0 -> 435 bytes .../door_anims/sootopolis_peaked_roof/0.png | Bin 194 -> 0 bytes .../door_anims/sootopolis_peaked_roof/1.png | Bin 167 -> 0 bytes .../door_anims/sootopolis_peaked_roof/2.png | Bin 152 -> 0 bytes .../trainer_hill_lobby_elevator.png | Bin 0 -> 348 bytes .../trainer_hill_lobby_elevator/0.png | Bin 125 -> 0 bytes .../trainer_hill_lobby_elevator/1.png | Bin 120 -> 0 bytes .../trainer_hill_lobby_elevator/2.png | Bin 116 -> 0 bytes .../door_anims/trainer_hill_roof_elevator.png | Bin 0 -> 344 bytes .../trainer_hill_roof_elevator/0.png | Bin 121 -> 0 bytes .../trainer_hill_roof_elevator/1.png | Bin 116 -> 0 bytes .../trainer_hill_roof_elevator/2.png | Bin 113 -> 0 bytes graphics/door_anims/unknown.png | Bin 0 -> 394 bytes graphics/door_anims/unknown/0.png | Bin 148 -> 0 bytes graphics/door_anims/unknown/1.png | Bin 157 -> 0 bytes graphics/door_anims/unknown/2.png | Bin 126 -> 0 bytes .../door_anims/unused_848EDEC/0_bottom.png | Bin 106 -> 0 bytes graphics/door_anims/unused_848EDEC/0_top.png | Bin 111 -> 0 bytes .../door_anims/unused_848EDEC/1_bottom.png | Bin 105 -> 0 bytes graphics/door_anims/unused_848EDEC/1_top.png | Bin 99 -> 0 bytes .../door_anims/unused_848EDEC/2_bottom.png | Bin 89 -> 0 bytes graphics/door_anims/unused_848EDEC/2_top.png | Bin 90 -> 0 bytes graphics/door_anims/unused_bottom.png | Bin 0 -> 317 bytes graphics/door_anims/unused_top.png | Bin 0 -> 329 bytes graphics/door_anims/verdanturf.png | Bin 0 -> 451 bytes graphics/door_anims/verdanturf/0.png | Bin 199 -> 0 bytes graphics/door_anims/verdanturf/1.png | Bin 177 -> 0 bytes graphics/door_anims/verdanturf/2.png | Bin 148 -> 0 bytes src/field_door.c | 478 ++---------------- 218 files changed, 53 insertions(+), 425 deletions(-) create mode 100644 graphics/door_anims/abandoned_ship.png delete mode 100644 graphics/door_anims/abandoned_ship/0.png delete mode 100644 graphics/door_anims/abandoned_ship/1.png delete mode 100644 graphics/door_anims/abandoned_ship/2.png create mode 100644 graphics/door_anims/abandoned_ship_room.png delete mode 100644 graphics/door_anims/abandoned_ship_room/0.png delete mode 100644 graphics/door_anims/abandoned_ship_room/1.png delete mode 100644 graphics/door_anims/abandoned_ship_room/2.png create mode 100644 graphics/door_anims/battle_arena.png delete mode 100644 graphics/door_anims/battle_arena/0.png delete mode 100644 graphics/door_anims/battle_arena/1.png delete mode 100644 graphics/door_anims/battle_arena/2.png create mode 100644 graphics/door_anims/battle_arena_lobby.png delete mode 100644 graphics/door_anims/battle_arena_lobby/0.png delete mode 100644 graphics/door_anims/battle_arena_lobby/1.png delete mode 100644 graphics/door_anims/battle_arena_lobby/2.png create mode 100644 graphics/door_anims/battle_dome.png delete mode 100644 graphics/door_anims/battle_dome/0.png delete mode 100644 graphics/door_anims/battle_dome/1.png delete mode 100644 graphics/door_anims/battle_dome/2.png create mode 100644 graphics/door_anims/battle_dome_corridor.png delete mode 100644 graphics/door_anims/battle_dome_corridor/0.png delete mode 100644 graphics/door_anims/battle_dome_corridor/1.png delete mode 100644 graphics/door_anims/battle_dome_corridor/2.png create mode 100644 graphics/door_anims/battle_dome_lobby.png delete mode 100644 graphics/door_anims/battle_dome_lobby/0.png delete mode 100644 graphics/door_anims/battle_dome_lobby/1.png delete mode 100644 graphics/door_anims/battle_dome_lobby/2.png create mode 100644 graphics/door_anims/battle_dome_pre_battle_room.png delete mode 100644 graphics/door_anims/battle_dome_pre_battle_room/0.png delete mode 100644 graphics/door_anims/battle_dome_pre_battle_room/1.png delete mode 100644 graphics/door_anims/battle_dome_pre_battle_room/2.png create mode 100644 graphics/door_anims/battle_factory.png delete mode 100644 graphics/door_anims/battle_factory/0.png delete mode 100644 graphics/door_anims/battle_factory/1.png delete mode 100644 graphics/door_anims/battle_factory/2.png create mode 100644 graphics/door_anims/battle_frontier.png delete mode 100644 graphics/door_anims/battle_frontier/0.png delete mode 100644 graphics/door_anims/battle_frontier/1.png delete mode 100644 graphics/door_anims/battle_frontier/2.png create mode 100644 graphics/door_anims/battle_frontier_sliding.png delete mode 100644 graphics/door_anims/battle_frontier_sliding/0.png delete mode 100644 graphics/door_anims/battle_frontier_sliding/1.png delete mode 100644 graphics/door_anims/battle_frontier_sliding/2.png create mode 100644 graphics/door_anims/battle_palace_lobby.png delete mode 100644 graphics/door_anims/battle_palace_lobby/0.png delete mode 100644 graphics/door_anims/battle_palace_lobby/1.png delete mode 100644 graphics/door_anims/battle_palace_lobby/2.png create mode 100644 graphics/door_anims/battle_tent.png delete mode 100644 graphics/door_anims/battle_tent/0.png delete mode 100644 graphics/door_anims/battle_tent/1.png delete mode 100644 graphics/door_anims/battle_tent/2.png delete mode 100644 graphics/door_anims/battle_tent/3.png create mode 100644 graphics/door_anims/battle_tent_interior.png delete mode 100644 graphics/door_anims/battle_tent_interior/0.png delete mode 100644 graphics/door_anims/battle_tent_interior/1.png delete mode 100644 graphics/door_anims/battle_tent_interior/2.png delete mode 100644 graphics/door_anims/battle_tent_interior/3.png create mode 100644 graphics/door_anims/battle_tower.png delete mode 100644 graphics/door_anims/battle_tower/0.png delete mode 100644 graphics/door_anims/battle_tower/1.png delete mode 100644 graphics/door_anims/battle_tower/2.png create mode 100644 graphics/door_anims/battle_tower_corridor.png delete mode 100644 graphics/door_anims/battle_tower_corridor/0.png delete mode 100644 graphics/door_anims/battle_tower_corridor/1.png delete mode 100644 graphics/door_anims/battle_tower_corridor/2.png create mode 100644 graphics/door_anims/battle_tower_elevator.png delete mode 100644 graphics/door_anims/battle_tower_elevator/0.png delete mode 100644 graphics/door_anims/battle_tower_elevator/1.png delete mode 100644 graphics/door_anims/battle_tower_elevator/2.png create mode 100644 graphics/door_anims/battle_tower_multi_corridor.png delete mode 100644 graphics/door_anims/battle_tower_multi_corridor/0_left.png delete mode 100644 graphics/door_anims/battle_tower_multi_corridor/0_right.png delete mode 100644 graphics/door_anims/battle_tower_multi_corridor/1_left.png delete mode 100644 graphics/door_anims/battle_tower_multi_corridor/1_right.png delete mode 100644 graphics/door_anims/battle_tower_multi_corridor/2_left.png delete mode 100644 graphics/door_anims/battle_tower_multi_corridor/2_right.png create mode 100644 graphics/door_anims/battle_tower_old.png delete mode 100644 graphics/door_anims/battle_tower_old/0.png delete mode 100644 graphics/door_anims/battle_tower_old/1.png delete mode 100644 graphics/door_anims/battle_tower_old/2.png create mode 100644 graphics/door_anims/birchs_lab.png delete mode 100644 graphics/door_anims/birchs_lab/0.png delete mode 100644 graphics/door_anims/birchs_lab/1.png delete mode 100644 graphics/door_anims/birchs_lab/2.png create mode 100644 graphics/door_anims/cable_club.png delete mode 100644 graphics/door_anims/cable_club/0.png delete mode 100644 graphics/door_anims/cable_club/1.png delete mode 100644 graphics/door_anims/cable_club/2.png create mode 100644 graphics/door_anims/contest.png delete mode 100644 graphics/door_anims/contest/0.png delete mode 100644 graphics/door_anims/contest/1.png delete mode 100644 graphics/door_anims/contest/2.png create mode 100644 graphics/door_anims/cycling_road.png delete mode 100644 graphics/door_anims/cycling_road/0.png delete mode 100644 graphics/door_anims/cycling_road/1.png delete mode 100644 graphics/door_anims/cycling_road/2.png create mode 100644 graphics/door_anims/dewford.png delete mode 100644 graphics/door_anims/dewford/0.png delete mode 100644 graphics/door_anims/dewford/1.png delete mode 100644 graphics/door_anims/dewford/2.png create mode 100644 graphics/door_anims/fallarbor_dark_roof.png delete mode 100644 graphics/door_anims/fallarbor_dark_roof/0.png delete mode 100644 graphics/door_anims/fallarbor_dark_roof/1.png delete mode 100644 graphics/door_anims/fallarbor_dark_roof/2.png create mode 100644 graphics/door_anims/fallarbor_light_roof.png delete mode 100644 graphics/door_anims/fallarbor_light_roof/0.png delete mode 100644 graphics/door_anims/fallarbor_light_roof/1.png delete mode 100644 graphics/door_anims/fallarbor_light_roof/2.png create mode 100644 graphics/door_anims/general.png delete mode 100644 graphics/door_anims/general/0.png delete mode 100644 graphics/door_anims/general/1.png delete mode 100644 graphics/door_anims/general/2.png create mode 100644 graphics/door_anims/gym.png delete mode 100644 graphics/door_anims/gym/0.png delete mode 100644 graphics/door_anims/gym/1.png delete mode 100644 graphics/door_anims/gym/2.png create mode 100644 graphics/door_anims/lilycove.png delete mode 100644 graphics/door_anims/lilycove/0.png delete mode 100644 graphics/door_anims/lilycove/1.png delete mode 100644 graphics/door_anims/lilycove/2.png create mode 100644 graphics/door_anims/lilycove_dept_store.png delete mode 100644 graphics/door_anims/lilycove_dept_store/0.png delete mode 100644 graphics/door_anims/lilycove_dept_store/1.png delete mode 100644 graphics/door_anims/lilycove_dept_store/2.png create mode 100644 graphics/door_anims/lilycove_dept_store_elevator.png delete mode 100644 graphics/door_anims/lilycove_dept_store_elevator/0.png delete mode 100644 graphics/door_anims/lilycove_dept_store_elevator/1.png delete mode 100644 graphics/door_anims/lilycove_dept_store_elevator/2.png create mode 100644 graphics/door_anims/lilycove_wooden.png delete mode 100644 graphics/door_anims/lilycove_wooden/0.png delete mode 100644 graphics/door_anims/lilycove_wooden/1.png delete mode 100644 graphics/door_anims/lilycove_wooden/2.png create mode 100644 graphics/door_anims/littleroot.png delete mode 100644 graphics/door_anims/littleroot/0.png delete mode 100644 graphics/door_anims/littleroot/1.png delete mode 100644 graphics/door_anims/littleroot/2.png create mode 100644 graphics/door_anims/mauville.png delete mode 100644 graphics/door_anims/mauville/0.png delete mode 100644 graphics/door_anims/mauville/1.png delete mode 100644 graphics/door_anims/mauville/2.png create mode 100644 graphics/door_anims/mossdeep.png delete mode 100644 graphics/door_anims/mossdeep/0.png delete mode 100644 graphics/door_anims/mossdeep/1.png delete mode 100644 graphics/door_anims/mossdeep/2.png create mode 100644 graphics/door_anims/mossdeep_space_center.png delete mode 100644 graphics/door_anims/mossdeep_space_center/0.png delete mode 100644 graphics/door_anims/mossdeep_space_center/1.png delete mode 100644 graphics/door_anims/mossdeep_space_center/2.png create mode 100644 graphics/door_anims/oldale.png delete mode 100644 graphics/door_anims/oldale/0.png delete mode 100644 graphics/door_anims/oldale/1.png delete mode 100644 graphics/door_anims/oldale/2.png create mode 100644 graphics/door_anims/pacifidlog.png delete mode 100644 graphics/door_anims/pacifidlog/0.png delete mode 100644 graphics/door_anims/pacifidlog/1.png delete mode 100644 graphics/door_anims/pacifidlog/2.png create mode 100644 graphics/door_anims/poke_center.png delete mode 100644 graphics/door_anims/poke_center/0.png delete mode 100644 graphics/door_anims/poke_center/1.png delete mode 100644 graphics/door_anims/poke_center/2.png create mode 100644 graphics/door_anims/poke_mart.png delete mode 100644 graphics/door_anims/poke_mart/0.png delete mode 100644 graphics/door_anims/poke_mart/1.png delete mode 100644 graphics/door_anims/poke_mart/2.png create mode 100644 graphics/door_anims/pokemon_league.png delete mode 100644 graphics/door_anims/pokemon_league/0.png delete mode 100644 graphics/door_anims/pokemon_league/1.png delete mode 100644 graphics/door_anims/pokemon_league/2.png create mode 100644 graphics/door_anims/rustboro_gray.png delete mode 100644 graphics/door_anims/rustboro_gray/0.png delete mode 100644 graphics/door_anims/rustboro_gray/1.png delete mode 100644 graphics/door_anims/rustboro_gray/2.png create mode 100644 graphics/door_anims/rustboro_tan.png delete mode 100644 graphics/door_anims/rustboro_tan/0.png delete mode 100644 graphics/door_anims/rustboro_tan/1.png delete mode 100644 graphics/door_anims/rustboro_tan/2.png create mode 100644 graphics/door_anims/safari_zone.png delete mode 100644 graphics/door_anims/safari_zone/0.png delete mode 100644 graphics/door_anims/safari_zone/1.png delete mode 100644 graphics/door_anims/safari_zone/2.png create mode 100644 graphics/door_anims/slateport.png delete mode 100644 graphics/door_anims/slateport/0.png delete mode 100644 graphics/door_anims/slateport/1.png delete mode 100644 graphics/door_anims/slateport/2.png create mode 100644 graphics/door_anims/sootopolis.png delete mode 100644 graphics/door_anims/sootopolis/0.png delete mode 100644 graphics/door_anims/sootopolis/1.png delete mode 100644 graphics/door_anims/sootopolis/2.png create mode 100644 graphics/door_anims/sootopolis_peaked_roof.png delete mode 100644 graphics/door_anims/sootopolis_peaked_roof/0.png delete mode 100644 graphics/door_anims/sootopolis_peaked_roof/1.png delete mode 100644 graphics/door_anims/sootopolis_peaked_roof/2.png create mode 100644 graphics/door_anims/trainer_hill_lobby_elevator.png delete mode 100644 graphics/door_anims/trainer_hill_lobby_elevator/0.png delete mode 100644 graphics/door_anims/trainer_hill_lobby_elevator/1.png delete mode 100644 graphics/door_anims/trainer_hill_lobby_elevator/2.png create mode 100644 graphics/door_anims/trainer_hill_roof_elevator.png delete mode 100644 graphics/door_anims/trainer_hill_roof_elevator/0.png delete mode 100644 graphics/door_anims/trainer_hill_roof_elevator/1.png delete mode 100644 graphics/door_anims/trainer_hill_roof_elevator/2.png create mode 100644 graphics/door_anims/unknown.png delete mode 100644 graphics/door_anims/unknown/0.png delete mode 100644 graphics/door_anims/unknown/1.png delete mode 100644 graphics/door_anims/unknown/2.png delete mode 100644 graphics/door_anims/unused_848EDEC/0_bottom.png delete mode 100644 graphics/door_anims/unused_848EDEC/0_top.png delete mode 100644 graphics/door_anims/unused_848EDEC/1_bottom.png delete mode 100644 graphics/door_anims/unused_848EDEC/1_top.png delete mode 100644 graphics/door_anims/unused_848EDEC/2_bottom.png delete mode 100644 graphics/door_anims/unused_848EDEC/2_top.png create mode 100644 graphics/door_anims/unused_bottom.png create mode 100644 graphics/door_anims/unused_top.png create mode 100644 graphics/door_anims/verdanturf.png delete mode 100644 graphics/door_anims/verdanturf/0.png delete mode 100644 graphics/door_anims/verdanturf/1.png delete mode 100644 graphics/door_anims/verdanturf/2.png diff --git a/graphics/door_anims/abandoned_ship.png b/graphics/door_anims/abandoned_ship.png new file mode 100644 index 0000000000000000000000000000000000000000..e46aca9ba94b1b66552d49666d925b87b1dfea1d GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0IEi7Q8@egp~$Bq#cnfoLFB0AesmJ-~bw$k^lQ;uxZF ze(wc)u0sYQ$3L3yvJ%-<#qj=;Im<4W4{DKIw%y?$WSUNEyJ(bno=f=mXHi6^V?h1o zcAv_4tK=_za*KtxvGuzegnOxL++*r$^uDb6VsB+DYhL>|t}nH0;xdf++!d^*1~Yw| zcqT7oP!D8O3Y4|<{G@V2c>jyXYgd^ZD1LEA{lJ+G)eGhxu46F2CTV2C`S4d~(EJMr zp4dI)tWD9VeUe}MNPoIvo#?}DJd81o4C@>i!W9k_&9~0m?BaiY#VIkMKU7OxBT7;d zOH!?pi&B9UgOP!efv$m}u90DgfvJ_TrInG1wt<0_fkFNZD=!ocx%nxXX_dG&$Q^C^ P1`0AyS3j3^P6^~tI4iqI3v<}r3_4>x Q`83EtPgg&ebxsLQ0Pxx)5C8xG diff --git a/graphics/door_anims/abandoned_ship_room.png b/graphics/door_anims/abandoned_ship_room.png new file mode 100644 index 0000000000000000000000000000000000000000..a5284af7e17391f3c87f3ac1b4d8a5587d8b7833 GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0IEJ?T1z44{xea-v@uhz4Q>AO?ff1I$-}jNP6tjv*T7 z_g*mMI%FVn>|@V5zSebe2X=qqZPXLo<2lV~{ewuG_6MK11i4}-8UL766R5LIVa5F~ z%E9;Izs|5q&bCO*7udkD$ZIx>Z?uDOLFO)&&D+-(9C&*nu5sV_1x?BVF^p>$u&M3# ze2}=w>w%@$0hz0s=RF+_za7#4#j;$R`GSnvcflKyW&B%;ckn+rZq?kb=D2Qt$SY;u zoOjCpFAh7uJY4@;xPE8P$JG;V8%ca%<@v$HR>R1Ay7t|SC`b9FGq;HYy`fs-8c~vx zSdwa$T$Bo=7>o>z40H_)b&U)|3{0(zEv-zLQ7m z(X$sxe?Hsxrgpo+xw{Y5nICOepX1ppv&>`SR|AnEub2*xIZJ~t*>LXJ$zU{pZB_KV R^bC*-JYD@<);T3K0RVp~J&*tZ diff --git a/graphics/door_anims/abandoned_ship_room/1.png b/graphics/door_anims/abandoned_ship_room/1.png deleted file mode 100644 index 15beb5a362a62a60f12215eb1f16bd19fd9e6629..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsYFi~#}J9B$uAn1+U^E4^cxCu zZ7{g!$T;JpL5PXiDGrzPBWzooBzZG2CL`i|+qGmU_DSxvX8sMT P43K%Au6{1-oD!M<_i!X5 diff --git a/graphics/door_anims/battle_arena.png b/graphics/door_anims/battle_arena.png new file mode 100644 index 0000000000000000000000000000000000000000..ef665281560d2407e53b419f49dff207dc6beb3b GIT binary patch literal 509 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0G`Msst;e?TFDPV&9*H$8=og>^lXcknxhr8iYIoJXtCIo$u3tkA4@9dF7a6T zL+DfTf%-T6XIKM|@+2wnM_gxly~;qyRFWl7WZU}CuR9NJ zbqyiHjpp*@4gMU@ghNg~uk0(Vyez!$SVj7!2%#qtMt{0g!1AZLTaov#h6ul|nz!6^7JBH+@Ady{}6rCQ<|QIe8al4_M)lnSI6 zj0}tnbPWu3jSNE!Osz}|tPBjb4S=MV1CN|G6v7QkH9lCE7oUnXoxo z@h~IvnT`85Ki_)#U#~{gW=X9CgJ_P#c!Qu{zl^x_4~w*GA3ZPfSM7~~tBJ^pSt}pa z7fZbBZ;g7@7ZtyKabMZpG@1FqtGxX+@1DBE#c}TB=OgSYT(ONt%zVE<4)t{Pb6Mw< G&;$U0u~4-D diff --git a/graphics/door_anims/battle_arena/1.png b/graphics/door_anims/battle_arena/1.png deleted file mode 100644 index a7dd729d33c534819d6b5bea87bbec2ec97857cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsX3l5jv*3L*Pc=2JLDkH`mnq; z@-oZz;EhMGeTli-rFcT>*u)22&Vt``r2U*$O*~WPxr1Ty%Q6aRg}aOrM?7A_A5QI=b(uib8}d&w-YFrU-G=$#74 Ny`HXqF6*2UngF=+Rk;8F diff --git a/graphics/door_anims/battle_arena/2.png b/graphics/door_anims/battle_arena/2.png deleted file mode 100644 index cad72bd9d2aeb464bb11c3994503bba09f6576f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsSHmS#}J9B$r}3NK|w(}`sptk z46FotjME)}xS>Z)Rh8FZv2(x%<`Wg)pYaIHsXqRJk4wU80fYQv8K>#SGn^%k^1Kpo z6Ku9<3G^^6PIF>Bd?qx(U~-~Z%f?BGq9O_sp#oKwYRn7`ZQVPI)&JcD+3o4-=d#Wz Gp$PyT)h~De diff --git a/graphics/door_anims/battle_arena_lobby.png b/graphics/door_anims/battle_arena_lobby.png new file mode 100644 index 0000000000000000000000000000000000000000..b9a2134e3f5707da95b9ac9a468f925387391343 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0G`zU3V@`9L9o z_or>@kMQJPl*E4e$*Z0PdoSnZen04>ANu@o{{JujTYzp?Epd$~Nl7e8wMs5Z1yT$~ z21W+D28Oyuh9L%~Rwf2kh9=qu237_JCYH<(P&DM`r(~v8;@04rvO5N-fx*+&&t;uc GLK6T^XOOG_ literal 0 HcmV?d00001 diff --git a/graphics/door_anims/battle_arena_lobby/0.png b/graphics/door_anims/battle_arena_lobby/0.png deleted file mode 100644 index 60e9831411b69bb8c7ff852d73d24e298d997ac4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDIZT4#}J9B$sDarZABUfj(apS zu`sXudv|yFZpQ{Wp5$a}4rkBzclTX?!Bb-D_1^EWL^=qcbGY(`anm^l*DqzwlJ6HV dXrw-3Vq$PmUvOwLYl#fVd{0+Dmvv4FO#r8(D$M`@ diff --git a/graphics/door_anims/battle_arena_lobby/1.png b/graphics/door_anims/battle_arena_lobby/1.png deleted file mode 100644 index 3173d57c83bee801a2b3d2e982b33a1f5fe334ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsYp*3#}J9B$sDarZABUfj(apS zu`sXuE6cIx-rm_k$C8s34(NUL@Z>yX(6+L%W6$lg3zjTd(tgAtj9DbG>O0%13)RJJ t=PZ~*nNu2Ero_FsWZuZlp%A2}r^g^(JYyYyzTIJvWuC5nF6*2UngAnJFIxZr diff --git a/graphics/door_anims/battle_arena_lobby/2.png b/graphics/door_anims/battle_arena_lobby/2.png deleted file mode 100644 index 04f77999d2001e898feaf14e921e25212af266c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDQ`~~#}J9B$sDarZABUfj(apS zu`sXuD=Tt9V*SY!8#6XW>o-|brcC+Lz>~~TarT1;C(D;OV+}_JA?8)jczsx;ne+H! e#P5g)Xo@prDR+MQ^r27*WW1-VpUXO@geCxo0VTTt diff --git a/graphics/door_anims/battle_dome.png b/graphics/door_anims/battle_dome.png new file mode 100644 index 0000000000000000000000000000000000000000..729385b3fc7063eb1f781ecfe03d58bd183868e3 GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0G`t2Ubxw}3(d$%%etAR34jfEWx?4=`T^G8TEdIEHAP zKYQUICzGK7>xE3ks!uOU6vC3-BlG22&g@{dxO{Mv=#8nLeO+wcI@$bCJkzW)p~h-k zfcmylxenp9q$EGVw60c_NxaYEGWH~7e_v2I>4dJq{Gxs5WF@=~|Gc;0+Jk)zs{@P# z%LP@{!byW>wLzl8$j2pmbgZgq$HN4S|t~y0x1R~10w@n14CUS!w>^gD-#1N pQwwba11kfA^2_OYC>nC}Q!>*kacf}fyMGB3FrKb{F6*2UngECmgDU_4 literal 0 HcmV?d00001 diff --git a/graphics/door_anims/battle_dome/0.png b/graphics/door_anims/battle_dome/0.png deleted file mode 100644 index d9703db87ada1502c726626325c7695e75bac8d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsSHmS#}J9BOV4fOZBP(seYl+| zDzZviVtJwRmdyqq{n#elK48!oeUi0``(Mi*{he%QOidQ)TQ|;Gt1PfnM)1>SnH`&D zB@?$_{-9(tXSdO%M}H?uZI~x|J63U{(^vM54gxbnXR=DYO7KVvdwt!FV?FTMN3Oat!~k-rb^@!Qg}$g@VgHGbYL=0)!c4+-4ibOG7w>FVdQ&MBb@ E0Ch7roB#j- diff --git a/graphics/door_anims/battle_dome/2.png b/graphics/door_anims/battle_dome/2.png deleted file mode 100644 index 32acbcaa29d0b08a91ac077e97ab88e0c8834b41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsc26Z#}J9BOM5r+HW=`*)U!If zcA7iraH`7oZED!d8U0Y*V~U97$zPLmUT@sDAo$oc?vNRa0;al%TDl}K7n@yaUj5Q( wYx|U9?{D%Cb&o1N3}0BWy<+kwPmA4NcTB$)d=pWgeFkKmr>mdKI;Vst0A)rr00000 diff --git a/graphics/door_anims/battle_dome_corridor.png b/graphics/door_anims/battle_dome_corridor.png new file mode 100644 index 0000000000000000000000000000000000000000..198ad9acca356dd0b5025adcdb576b26ba046fd1 GIT binary patch literal 462 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0Hx{*zN|cL0S1k`w*PKr|3505KS(9$>x-WIXe9aSYKo zzxKjL!Da&<)_}DWM2)y}uLNG&#a*0YamqnGe2#T?+Y4oRrRgnNS{JMZPSjiqE6Ehy zv5l+7?pFN#Wu8~{3e}eeZe3E+wog9f`9A)VyS`s%zvJ}F{gUcHd%r?$lZR>^fr z)26It*l_xhqeDx`1aF3q3JOkICsaTDuh}DSXHlh}E+JF=;8_LRjg3L2PxKR9rOXch zYhJzfM!<`>#yuAvY>3@-)o1bI3070&`i}RBdrCe&V)cus4d`Rl64!{5l*E!$tK_0o zAjM#0U}T_cV5n*WnyS$XsT^sU}a!X+moDyq9HdwB{QuOw+5bzx37T$*VEO{ JWt~$(69C{dqW=H@ literal 0 HcmV?d00001 diff --git a/graphics/door_anims/battle_dome_corridor/0.png b/graphics/door_anims/battle_dome_corridor/0.png deleted file mode 100644 index eec2d2c65436ddc1f2350b7a37efbb88f6f5ce6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsX|W|#}J9BwdV}^8WaRr9QHpD zui;)>GG$xIuOP3j(OSvJ_c?yhOGql=HfmI^mNkuCpDAI&`+oT^+ZKmsi|pAV+w*`njxgN@xNA%E~-@ diff --git a/graphics/door_anims/battle_dome_corridor/1.png b/graphics/door_anims/battle_dome_corridor/1.png deleted file mode 100644 index a013b2990a8a507fc13500c933b1c7d520e99586..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wseDft#}J9BwdV}^8Wea~1J*qd zwc%c!)3@&KlO?iO*ZLgeJ(pmgdBEjy{4XX|`EZ@Q4JAF(`o4!&pX)hz$6q5U=1Y4e z_apiEMOX;(1Ug8ICK)4blw3mbQB RT{Q>f1W#8#mvv4FO#u5MJ{SN1 diff --git a/graphics/door_anims/battle_dome_corridor/2.png b/graphics/door_anims/battle_dome_corridor/2.png deleted file mode 100644 index 8f3dc2a181c5decc1a78f43c65655e565a07fde8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsSHmS#}J9BwP!a9HYo74KHT1< zy`w+p0f!O$;lQrg6*g8z%`YB%EPQ_d$!-SrE$u7QXH>U+zgQt>xj5G*{pVpXmBUVN z*xcu=aQWA8S!>d5+2xnAKDZnV%YVYGeevI<k7H_*0{Q2H`klmiH KelF{r5}E)GNj@L| diff --git a/graphics/door_anims/battle_dome_lobby.png b/graphics/door_anims/battle_dome_lobby.png new file mode 100644 index 0000000000000000000000000000000000000000..bd4e4e895baef67bd6e8104f8b3d248b6496ae70 GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0Hx^*@SJoq$3D$%%etAR34jfEWx?4=`T^GX8nGIEHAP z-+RH(kJ(Uw^+G)>pTl9sj2A1n-P-zMn`h8&jt9j#M>Sf_O zUu3R%w2sO8Y(}EB+vTLYA7{HI-tE~CK5w1f?fC^FZsK!4@0_}@FX_|^QL`q=L#EEs zcU0Ye9WwZ^{BVQ)o&JZ)FSx|!397S(IZXDNttP7R=E?)FK#IZ0z{o(?z);u7FvP&r%EZvh*izfTz{x~Hq3%Q~loCIA+?tFr(A literal 0 HcmV?d00001 diff --git a/graphics/door_anims/battle_dome_lobby/0.png b/graphics/door_anims/battle_dome_lobby/0.png deleted file mode 100644 index 5e1504117cea28ca5f9564942c03d258c92b4d06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsVSZ=jv*3LlW*{{@ zI>@8nrg~4Ity}!CVEzOtarri7y?|pv`>P#Rs>hw^+3moPRIz_=^>?`l@fi=Brwj5X zwfr)WX*Ecan3vitky*)8``)3aTwlV<%3)er2?K+n&b diff --git a/graphics/door_anims/battle_dome_lobby/1.png b/graphics/door_anims/battle_dome_lobby/1.png deleted file mode 100644 index cf185c5ab06598d8fbc00fb571d7f46da0609bd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsZLK9#}J9B$v1dec_Jjz4)Tn8gQ>3n~8H@ngyHvc`-LE8m-9EaJtA8WJ-HYdn58x%>* qbCjs$seSLzQ?4&zW#tf7Qo_Ixm%ZgmxCcuQ$Z?*oelF{r5}E+9l|mE% diff --git a/graphics/door_anims/battle_dome_lobby/2.png b/graphics/door_anims/battle_dome_lobby/2.png deleted file mode 100644 index 7b34bef944e80cd35c78dc0494d6b7361aaa503a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wseDft#}J9B$v1dec_Jjz4;vGkWdrlJHC4Sv&d{M41VP)lDR#L*i5SX&xVD1IE Qiy$X>y85}Sb4q9e08xfDp8x;= diff --git a/graphics/door_anims/battle_dome_pre_battle_room.png b/graphics/door_anims/battle_dome_pre_battle_room.png new file mode 100644 index 0000000000000000000000000000000000000000..6e4e7ee183d55c4016dfef13fcd70218f9b96294 GIT binary patch literal 488 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0Hx>lX?qd4WO#$%%etAR34jfEWx?4=`V4U|?kMba4#P zIKTFSV&7o{0oDsE#q?HQ>3*}SA~NGFlk?e0#a}E=SGR63OH3A-S$S^5XWOtjUUwHr zsra9axc~1+>P0S1@BKA*^W=YC|Ni{F=Hoh>KQ})7{Iexn#$B-X%G-PVN*90IZpl?Q z+M4TnImSiKcXO+7q|qdgAMARpvkT8OxEVx;owtb=D?Vwo#<(gbZBFIU2(i8E<=<4k zN{AiQOv@j1O687^*1>=+Z5om&uD_N0@|S;dee zmiM}7{mUAQy3^gMioifoEpd$~Nl7e8wMs5Z1yT$~21W+D28Oyuh9L%~Rwjm4rk2_U l237_Jc4_QSP&DM`r(~v8;@04Ay*~mJ?4GWEF6*2Ung9awu&@9C literal 0 HcmV?d00001 diff --git a/graphics/door_anims/battle_dome_pre_battle_room/0.png b/graphics/door_anims/battle_dome_pre_battle_room/0.png deleted file mode 100644 index 0dbf2ece9056df58d97039d5d4130eba0c4909bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsSZyU#}J9B$ve1Nc?ynMYcO<4 zyt#LlXPVKIdkQ>hF=7c@S~bkf+%A?rJ2SKVeFKYAbyU>7-R0*mUHV|?a@VnlTb$51`uXlX2 st6DruyoE8Gx#Zp5-3sQ1CDRu$Fl60aK9@l$)CS}>Pgg&ebxsLQ0AJEh&;S4c diff --git a/graphics/door_anims/battle_dome_pre_battle_room/1.png b/graphics/door_anims/battle_dome_pre_battle_room/1.png deleted file mode 100644 index 7e16467fa018e220235b3c490aa91e86e12f54ac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsTNNc#}J9B$ve1Nc?ynMYcO<4 zyt#LlXPVKIdkQ>hF=7c@S~bkf+%A?rhF=7c@S~bkf+%A@~Eqcl0R4vz1*VZq{ofzY4P@~wR&Cw>`^0DQi zZc8CQ_u=<fV#xtXhUA%-xtlr*%Rw&kboFyt=akR{0By-a6#xJL diff --git a/graphics/door_anims/battle_factory.png b/graphics/door_anims/battle_factory.png new file mode 100644 index 0000000000000000000000000000000000000000..7ed6c876b89fcf6701668add452862a571c62fec GIT binary patch literal 366 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0HR`Tu-%@<1VhtT-`M>4Be@h*jZkp~0#Sb3O*?Ii5pHm!(lynfn%?Z#_|^Ts9XST1gE z;OWp#Q?R+gXjtjda-K`zs%wmbz~k~Hi4ZP%hEsp~zfJS|tOInBYKdz^NlIc#s#S7P zDv)9@GB7gGH89jQG7K>=wK6fXGB(sUFt9Q(P`LP;9YsTKeoAIqC2kFYJU@5Xl=h}Da?~*P_mBY;^qdP4s9UQ vQNp2EL9JY2jl&Jr#5E2b2YlPI_1l>k0#-HGR#wM&gDmuP^>bP0l+XkK9`G*q diff --git a/graphics/door_anims/battle_factory/2.png b/graphics/door_anims/battle_factory/2.png deleted file mode 100644 index 33b2a1e0245d091287ea9c775b1db3ffe0bf4706..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsc=sh#}J9By}cKC4=8ZBC%_KABr6K+M8qZ)Sonh_rEHD^&M-s%LqarEi$r zi`zLe3(ro7NN2wIY;%vtM2573xjo^BBMJkL>{e>hwtnb(uew$Hg!_UM=XY{t6fjL$ zQq&zdaq>b14;vlBC*5{ji~mSvsiy&(F4{*A4|A z4f_3XbP0l+XkKzsQrc literal 0 HcmV?d00001 diff --git a/graphics/door_anims/battle_frontier/0.png b/graphics/door_anims/battle_frontier/0.png deleted file mode 100644 index 867a8b0e9bf7e5d088bf85e632a6ea6484d8b4c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsXR{?#}J9Bwdcpw9mK4j%G*8i&|fpyzw+w z;9bLKE8}&i{8MaF58t~C<)SU+HV(o$0@+#Np)zY{N^H71IWAd@`NCeiYkp}up&{o# PgIwV0>gTe~DWM4f1eG{u diff --git a/graphics/door_anims/battle_frontier/1.png b/graphics/door_anims/battle_frontier/1.png deleted file mode 100644 index 263a31f87a5047e5979d9cecf3ded33ecfbc14f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsRU0K#}J9BwdXeS9#G(M2@ETk zX=$Vw8?(#U=fMV7Gw%jwZNXFe7bX`JHU|7S*e4dx&b9N4n8%6!*UC<}CaOK*owimv z*5qQ}Pmu)-Ke_ezvR5=eYOsB%inkF#QxJLaR|pwV{8xFfZpq*+qI*s4n7d#tyxRS-Jn3XnjUB1M}w&Hd; ZBSXgPYQNkUS6x9Sd%F6$taD0e0su}%BcuQT diff --git a/graphics/door_anims/battle_frontier_sliding.png b/graphics/door_anims/battle_frontier_sliding.png new file mode 100644 index 0000000000000000000000000000000000000000..a43cf519dda91ceaa86aa2b89c4b73e978aabc88 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0I6<&#y$H-SO|$%%etAR34jfEWx?4=`T^GUj=@IEHAP zzj|RKZ?l02OThXGq7jXe6E+2?EN+qe&$(u{f)ICrfrC_8W4^r7KhG71MPGQfJKB{e z-eJso=KWMM-0=75`5b31mVYVCo|WCW!LdV3Ea@WC_r!{Qjt$36dabXq-L=_&YQK6z z;r|`|-|wV5bJ%`&e4-ucvYrMLXY>mdKI;Vst06Rr|u>b%7 literal 0 HcmV?d00001 diff --git a/graphics/door_anims/battle_frontier_sliding/0.png b/graphics/door_anims/battle_frontier_sliding/0.png deleted file mode 100644 index 5d2fd8b8da84d223a2e5facd7262bc8f8bb0c0cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsc=sh#}J9B$pS4*Y&JZ}8V8iF zGP3e`1vCWooSebQ`r{0v;M#=?1vPqR8XVKnSX?Y>l`LkpxcKU-cXxM}D;TD&jk;R= s>h pHYPNrgst6C&3v~^Az4&}fq{8#QhV~j#RVXXJYD@<);T3K0RSQKD**ri diff --git a/graphics/door_anims/battle_frontier_sliding/2.png b/graphics/door_anims/battle_frontier_sliding/2.png deleted file mode 100644 index 1a1afcaa1f02c10bf5914d61927cd4060747a75e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDK}3S#}J9B$pS4*Y&JZ}8V8iF zGP3e`1vCWooSebQ`s2*OQw*827?aLKZOyvMrLeeI)GArbidm=m(2Uk|4JR5(7e?>m a;$m35KJ}ZxVj{_jU(+AI`l!<9bnreee;lUovJh%iYdA?60$P`FbOh z{TY7|&`+u*t`Q|Ei6yC4$wjF^iowXh$UxV?P}j&X#K6?b#MsKzOxwV~%D~{v?d1k2 c8glbfGSez?YuMW+-vbIhPgg&ebxsLQ00^m%=>Px# literal 0 HcmV?d00001 diff --git a/graphics/door_anims/battle_palace_lobby/0.png b/graphics/door_anims/battle_palace_lobby/0.png deleted file mode 100644 index 61d365737cc20db972720222d6efb867a515c7c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsa{VP#}J9BQ+rnP9(E95Z9k%N zMz%uVi}8BH(hz|n_r8dUdybrKy>TRUXT#ZAp|nZuY4e}yDsgEYiuKg~m2^}8_NP1M z_l{Vei*SnAVoLwAUcW5du^ndns)0zI# zhpqGf9GTkTeK7HrOwd~czpF=!B6;E@kHu_?T;f>unR(-(DNos6p54DXSpSo`*lmN7 iJJR=hc%$9#6+dA9TCreBv}0Be$Vr~AelF{r5}E+;K}%-< diff --git a/graphics/door_anims/battle_palace_lobby/2.png b/graphics/door_anims/battle_palace_lobby/2.png deleted file mode 100644 index 5b8c3fa442ade7405ba71c5870afd0e16d9436e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsWeX)#}J9B$pJxL$q638K}iAL z$sPAjO_+9M!rs}X(PanT9g}!+7G`EHHS^q@yZo**%?+i&%(zN^2&$9M+s;Thi&c$}8rXb6tPamq(` zTskAaXWpsi`cn&bDx71@Tz7u$|1;^CZ_BdcB6t6m3{8G(@bq%jY2i;#)lZ1zK4+Q3 zxLB{@@k<%@BN!DUSN`LE>z+zf9h7V8d;DMS3j3^P6 zjf)MB)D^LX#?A?g6@KoznHKQ=>H@2Xkd2xL1B6cRF4ilq|JfL|D=@0r!@g6X)Q$V3 zfW`K=%NG|HTrH{!^L8>|}6XJ2IV)E~l=_|=@}`h7iOULEhV z$LtQHtVp|OwH({KDKman9%aqYuJ2^+ z10F@mSvwOi2Ux#zuG*sfz`2XT&GI(K>*e0D<~#m>Sn8s1eZ>`z?E4p`C%ASRTLj2~ P{J`Mp>gTe~DWM4fr43QH diff --git a/graphics/door_anims/battle_tent/2.png b/graphics/door_anims/battle_tent/2.png deleted file mode 100644 index e9e5122b4cbf5a54da5fa0d4ec9b66a9e474f026..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsa8)H#}J9BwWl`n9x@PVc^KWO zy6NK7g&q$hnS?(C1*or2m_23LVusGyjo&+3T_(p*dp|kn%dc%s-|v_oOnxL75Gv!O zot>&bq2}%*t`o70nLR2pQ4-M)wtf6LsruIOITpgH&Ym-J4a&Jo&L1gtNavIen0B&u p<|#XyU(Kp(4n%zryYkDnmSHFBRIxUjTMZzGdAjB{Eh za?d}WZ`MV}KDo~57Q!8z`!Wr>Eak- zaeD71!@R==JgfopT%C{IadX@x#SvKfLRTo@u5O2&L%?SpTi3Q8TW3%2Q0^-RlNLTq zu=kku#Z_X5Sj{!2m8|kxuU)Xq`yHVB;of`yUj{O5sc!_FootxI7W96ZZk6Ovkas!W z>iL1(_3O94Ep_uS-nV?u_Wsht+g9aP@JG!P`}cnDzlHYIi!R^kWxlwfCsx7Bo%Neb zmGfDf!-u{bN^fEBI@h>OJuP>F(vda1n>5pAUwZmDWV&>LtfR``wr7cQ&;IS{++)Ae z{^?tJX0Zj0I~BT8jje1Lnt)xo3(R- zb;D&Lx5HaHCcXBXviXw#kBvUQ@fOjpg&TLW@&W@%wZt`|BqgyV)hf9t6-Y4{85kMp z8W`#t8HN~`Ss9pE8Cz-_7+4t?2piwZM$wR)pOTqYiCaTbUea|?GEaGcx=Iv zCDXR*czSj^dcF_5XS~-v!R?ue0kfK@6ju_F(qco?t`#~{}|1XNIj2W6{w`v9j7&+%8DsfGTw>|m%vUz69J;5x&Dz|GJY~ubo zw#+C$F!SaH_GABVs4bA;DPqYxq$1y;9PYlokVp3GWzFm1_L4#CjwUFF%HRC;Rq!=m rqDJv-_3vjf7H#g?(b8cV2y&aJtDnm{r-UW|!4^r% diff --git a/graphics/door_anims/battle_tent_interior/2.png b/graphics/door_anims/battle_tent_interior/2.png deleted file mode 100644 index 72eb0bc550894cffb4a58e3049df1553ce895c22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsaQ`J#}J9BQ_pYYZ7|?*xj4J6 zcaHS7E$^X=)u}eWKMl|B#ny?wupIh&3>Iwem$ZjHNn6SkD yM%9Fi(q`Tj&A0sI)@480XL_V)*J<;Af3Nc%Iz2sNqG{42kcFPEelF{r5}E)^Pc}>d diff --git a/graphics/door_anims/battle_tent_interior/3.png b/graphics/door_anims/battle_tent_interior/3.png deleted file mode 100644 index ea5d9843cc68b979fa519c1c1184e1c8ccdb2584..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDIZT4#}J9B$ul@vdEPH*NE8(@ znA6Bq!?Po4hox-5feDNYZ+oPaH2KVAOmR4qoqS>r=ca^bCOJKk3dg+G@O13%NO5>G gtF7RVPRA85hPOB82YB)y;s=@U>FVdQ&MBb@0BAcafB*mh diff --git a/graphics/door_anims/battle_tower.png b/graphics/door_anims/battle_tower.png new file mode 100644 index 0000000000000000000000000000000000000000..3b9fe547c1a64d71dfd3477650f8c6946c708c47 GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0HB-l(@LE&_!Fk`w*PKr|3505KS(9$>x-WW4rtaSYKo ze{_Ox7n7kt>wVE8hWF8e>G|e6_+2lHXWY@A!dTAtm{G*(oI&W^Z|xjS98t4tmIzh6 zcQ)pgYh2Fg`&sJD>GuV@3(xUApLghu!Fzo(e)Xn>pGPx12d#z`u)=>kM0Ru&=DitF6D?|4zAV z%X~SxDWS?oU`c~nsIBj2p&4?|^bUV9_@0!%rAXa_^~#J_7pHa^*=lht7X4bp{#b3r ze5P9^JhJhG=L;#lPhw|l`Lpb`q+pU`N5YOs zStUoS)n13Hudl57-)U1Qxr+6?_vdSR>v!Gz$FTa$^esDWt~$(69AVd BPtpJY diff --git a/graphics/door_anims/battle_tower/1.png b/graphics/door_anims/battle_tower/1.png deleted file mode 100644 index a5fcb7e271ac81e9e0664c731c9b87d23677c457..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsb)_X#}J9BQ_nkc9dh7dy-?pO zci?wl()YPdzXekC48#L|h~0_&z`(UMz2Fj0r~u1zopr0Oy@WQUCw| diff --git a/graphics/door_anims/battle_tower/2.png b/graphics/door_anims/battle_tower/2.png deleted file mode 100644 index 70774fcf704ab990dd4051e7642dc7704c8590d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDJxGG#}J9B$ul@vd1my41{}D+ z$hyREm%^^_2`go#7Yjc!P+)$xA@W7fxzHCqP)biCS=5S|LAhgE$d|WLAj23uUHx3v IIVCg!0F=@q?f?J) diff --git a/graphics/door_anims/battle_tower_corridor.png b/graphics/door_anims/battle_tower_corridor.png new file mode 100644 index 0000000000000000000000000000000000000000..06ad24c9fcef6ab615989c933d6d67f19dab7a94 GIT binary patch literal 404 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0HB)%*wsZJ>}qa-v@uhz4Q>AO?ff1I$-}j5VGvjv*T7 z&tBZfdssn$H6U$a?~{#2++J!4%#)N_qm7waZFv$n(@qqYYy4QEq2V<#-uA8}cl~N( z_p=8IuFN%VJ>_`dLF0}{?}FQ69IvI09GNe$(|^6Bd8Yr%}aVC#>4_ zZt}-Aj8cfZ}y#_!Q7Xv(iLo3>8jg$%uS1qzWBV?f2C~A_)z4*}Q$iB}pJysF diff --git a/graphics/door_anims/battle_tower_corridor/2.png b/graphics/door_anims/battle_tower_corridor/2.png deleted file mode 100644 index 59438d105c7e7dc75df266f2088b73f5c06f8235..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDLYRW#}J9B$sWy2Y)KNb0S7j4 zadjl^X=eH)S>E_SuA|Ts2>4G_tZq5CqvagK=>-OQ3yl?w5@KIW({f~F@SHp&z&lH2 PJ;+2)S3j3^P67Aq}96QGbla-v@uhz4Q>AO?ff1I$-}jAfoKjv*T7 z_g*mMI&8qh8Zh_T?7ddz9xoKFrcao+z}#T2t;mv#7aXmebyGT=jY~2%(PTcPcT19cJX zM`d~1KK5&zYt@yQSfz6KlH(TMm47$LId7f6M!Me1{$QG=kn4F)(Xs^o^(REXUFJJF zk7>hJ#|gQQ_y7LM@OWxi6Z^MM?m!o-mbgZgq$HN4S|t~y0x1R~10w@n14CUS!w>^g tD-%;I0~2in11kdqxm_o$P&DM`r(~v8;?|J=yr2yfIG(P4F6*2UngCQTf;s>I literal 0 HcmV?d00001 diff --git a/graphics/door_anims/battle_tower_elevator/0.png b/graphics/door_anims/battle_tower_elevator/0.png deleted file mode 100644 index 3597efaa653316f362272c360c9c4213fdda89bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsc=sh#}J9B$rjA4Ji8Y*XdH{x zNT^_E<;j14x7PCgyW7qrz3<^W(+M8$Vt24J)+|3ccZ%M%-5}dMUHx3vIVCg!0QDC(cmMzZ diff --git a/graphics/door_anims/battle_tower_elevator/2.png b/graphics/door_anims/battle_tower_elevator/2.png deleted file mode 100644 index d52c8243f7d2dd51bbc58ae34420a8462763e81b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsc=sh#}J9B$rjA4Ji8Y*XdH{x zNT^_E<;j14x7PCgyW7Nn{1`nUcKS zT^RVSjO-QzdF&;gzOL*~7)9CG%s-xC76J+hBq#cnfoLFB0AesmJ-~dGfq~J<)5S5w z;`H7td$X7gc^DGx*KV))>brg3&h{5FJQumYh+3s{oLKD3`pr1xlmDzIQ5n+fnwt5W zQzONe->X`2UCy5ATfoxxQ;hfH4cgC(W@|=rZI95qs%ianOF`gzx9wjHiNxW025PT^14vC26hlq(Mytg0oh5hW>!C8<`)MX5lF!N|bK zK-a)f*T^u$z|0DWOpLV+46FQektc!x{SBHa&GAH?Q$8+x!k zhElJ@=U9xaylu`U|A^1SU-u)aJFa-zWS~HbQNC U^t&ZBt3b~1boFyt=akR{0EkC7X#fBK diff --git a/graphics/door_anims/battle_tower_multi_corridor/0_right.png b/graphics/door_anims/battle_tower_multi_corridor/0_right.png deleted file mode 100644 index f7a5d4dc7f9fd49c60f6c37b8bdc8a8c9236fa79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsbWtT#}J9BOV1l}H5l-;KAf{H z`FdGVs7=e}k_zz;T<7u%Lv&2i4c3Yl3jbN&@4&Her(5t_;T>*4i?@6-EQp%lsj`FZ z+};P$Ke+S0=ejL_A@W=PhV-*zi!Ma7+8U%OFeIw%6EITfV4W>0T`KFg`H0ffgTnv0 VccssL8{+|ThNr8a%Q~loCIGZzK0^Qi diff --git a/graphics/door_anims/battle_tower_multi_corridor/1_left.png b/graphics/door_anims/battle_tower_multi_corridor/1_left.png deleted file mode 100644 index cb3474672d830c70a1daa43d23ee23ddc85f9514..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsZ387#}J9B$rjA4Ji8Y*XdH{x zNT^_E<;j14x7PCgyW7V45~2of>_U%qXZECLX7b3cpSOSSbhhLt zOtNfg4KX)Zi`ZH|avh5J%6F`SEp?6e>1Kn5w6(0WnV;;bW>;azxp9HSf diff --git a/graphics/door_anims/battle_tower_multi_corridor/1_right.png b/graphics/door_anims/battle_tower_multi_corridor/1_right.png deleted file mode 100644 index ed367c276c975a9f1cdc521f5adc741d3412a258..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsSHmS#}J9B$rjA4Ji8Y*XdH{x zNT^_E<;j14x7PCgyW7Wx%Sp?He*l#O|Jxk`@h4h?XVoAOcTt>}$8(GJ0mO7HJ6ax&aBI-zK!_vH=9ZckS~ Jmvv4FO#qPvIaL4v diff --git a/graphics/door_anims/battle_tower_multi_corridor/2_left.png b/graphics/door_anims/battle_tower_multi_corridor/2_left.png deleted file mode 100644 index d66ecc90d24e864557615fe2b1bd3560b03717fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDSJ;B#}J9B$rjA4Ji8Y*XdH{x zNT^_E<;j14x7PCgyW7k4PVD9`+gvC(STWu$ACft$%%etAR34jfEWx?4=`T^G9G!lIEHAP zKRRJACzGQ<>vC4Z?d;M9yN)pNZ4`*y&?K46dndxOX6ucX8Tq{Dim%(+o@J4h_>pk$ zkFDo)&m=D?f8pRurPF3i^7>Msr}$gQHiJ`g>WhP?S6z{rwe!`s%qKVWLd$c1bBbkO z&3h`qv2d#1;Zu!L?cdi$t$K7Tj=gAip|zq=!(>G!8@s0Ci(UBbKen@8zaS^2Qq$dE z%TRZ?UL}RY|AEx)_lIJ0G-4+T7~MI_R^tDF`7V>ZM>xa%duR4KEwC+UZaI5k|DTmh z*B_MIts_7Ge--0lfky&7&Nuel{L~=ryKcS3sm+gNfxcBOag8WRNi0dVN-jzTQVd20 zMh3bDhPp+4gV8UjJi4)@8?pe$VMu zeP&W=xyj1+!HI*JLAM!IFVdQ&MBb@0Q5OX8~^|S diff --git a/graphics/door_anims/battle_tower_old/2.png b/graphics/door_anims/battle_tower_old/2.png deleted file mode 100644 index 6d05fcc1187904797cec1b1553d1e57bbad82271..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsX$K`#}J9B$raxN-pO(p?-4eu zVL!z4Uhei@=ES!0fQE!QjZAGbfpm!jW3z&Yf<%F4m*iZ7-B#g^3=<5w=Q2)oOgrP0 j?vOe`BG%xTRtXzJ^W_r5EZ;P6CAlk`w*PKr|3505KS(9$>x-WUTUZaSYKo zfAqpd!9xl>Y!B8vsIU@z$G{^EQiYVDn&JvC}Gl&B|x|%hr`P zv{imwBk{cLp|DGrrrkyN@3DUml(BNkh;iC1e%fU8u;EfB|CNg= zjHEzX1S>0#@xq3M%v=IWGkUJ>R%DQ0EWD_U?T~|#WI^oahIdhnDJAQi($6@hH>3tg lY`!2VAh|)W#5=K(f#K)LdDE9%-`)nY#M9N!Wt~$(696j@EDHbt diff --git a/graphics/door_anims/cable_club.png b/graphics/door_anims/cable_club.png new file mode 100644 index 0000000000000000000000000000000000000000..a1dfd7bc27f1a5a636ae3df52445b2c7f7eda8fa GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0H>-HI7IBY;8z$%%etAR34jfEWx?4=`T^GCDk6978nD zpS^UEm&uTa`NEk)3~P>atvR6M;nQ$K;qHN%4=*JI2hM%RtjJftx8EaoO@u*NYFI(q zn?pQvW*BZZ{8OdPG%qvXBBjs%knQIU4G&&)-{WaA-WF_sadxKhtIzY9nuG=BG)(AT z{7bM(bVXf<{fp<(1=qM6*&}anPq)9k){5~UC&#OFMyD%kwwjlY1_0fpTH+c}l9E`G zYL#4+3Zxi}42%qP4GeXS3_}b|txP~j+rYrez`&;cYzc~n-29Zxv`X9>d~cPW0D0fj L)z4*}Q$iB}idS`c literal 0 HcmV?d00001 diff --git a/graphics/door_anims/cable_club/0.png b/graphics/door_anims/cable_club/0.png deleted file mode 100644 index 45056f579d729bf15148a3f9be2364d59a6e37f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDOXPy#}J9B$rbFZJi8Y%a4%-& zl1Ou6YzpLKmdKI;Vst0D@2?_W%F@ diff --git a/graphics/door_anims/cable_club/1.png b/graphics/door_anims/cable_club/1.png deleted file mode 100644 index 287f7e55a7d7ebbb6893578d6b954587865a84e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsQ^zG#}J9B$rbFZJi8Y%a4%-& zl1Ou6YzpLKk`A)N)78&qol`;+0EUYzx&QzG diff --git a/graphics/door_anims/cable_club/2.png b/graphics/door_anims/cable_club/2.png deleted file mode 100644 index 02c81063764f1f3a7689c3bedd3af79c7ef4171d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDQ8a?#}J9BYtI_;9xxDLzIfhB z#7i-v>1gVMqz;j}vsGVRnSC$e(2oxyH YQoMe)=9=oHl^|n1UHx3vIVCg!0G8<~tpET3 diff --git a/graphics/door_anims/contest.png b/graphics/door_anims/contest.png new file mode 100644 index 0000000000000000000000000000000000000000..dc466be116c595fa1ceeed0f4542a215f7d211c3 GIT binary patch literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0H>%Os~AO?ff1I$-}j60q#jv*T7 z&t7okYBmsHy|B~iyi$em!PuQ(=wG{hSuXIl~a0!x6Ck~xclFo z(gVBpC9p*uz1P8W+UsrOaxMj>DGtI5p^^Cd;Qn{G&yiU{S0}W#t+<%MhGM~ezeZ!{+M#_$wwRQqJIwpSPnj&d3}oFov5As2bSzO m6@O_`VPtdU^^6SZebeo>->*+lRXX$*n+a diff --git a/graphics/door_anims/contest/2.png b/graphics/door_anims/contest/2.png deleted file mode 100644 index 1b3a8e1785f9059b156db9c77376bd379573cf1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDH~50#}J9B$q}rqJQWhg3mFtI zF|u-KI%*s^-tby!>P60NOh+1S+HudlxRYzHA&hEf+${1en4$So$9Aa$r|*Ew^K|ud JS?83{1OQfcBCP-b diff --git a/graphics/door_anims/cycling_road.png b/graphics/door_anims/cycling_road.png new file mode 100644 index 0000000000000000000000000000000000000000..0c22c918236a01a8999f86d665d79f7647a3813f GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0Hh4vCF+cYs0y$%%etAR34jfEWx?4=`T^GA??$IEHAP zKRe+p?_mX=)<{Mp#&?>}*IZEDHuqf{v&)r8^aWr4E|374xTJGN%GpHQuv+<(wIitQ-FqyyQ$54s*X z*hiP8oj$jwWs%AWFRMC+Hce(d6OkEFr_|kkPyZS6yQV!?E52>x5h*9$l0Sk@yicC2 z^#5tYP?50xlQCO^Fwk?VC9V-ADTyViR>?)FK#IZ0z{o(?z);u7FvP&r%EZjdz(U)= lz{Wt~$(69BShk-q={ literal 0 HcmV?d00001 diff --git a/graphics/door_anims/cycling_road/0.png b/graphics/door_anims/cycling_road/0.png deleted file mode 100644 index a331665a8b568a012ab134757cfb4e23a4414e97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsYXv1#}J9BxqTOT8x(k4b~70? zma>Ewa9;n&&1N8|9uO9wK0)+`t9SRT7pmfM?}{`xbScOgPI~AUH$26B|AtDnm{r-UW|RDMA( diff --git a/graphics/door_anims/cycling_road/1.png b/graphics/door_anims/cycling_road/1.png deleted file mode 100644 index 7ea47bba0d5a9646deeba0be6652445fe125b9f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsd7&j#}J9Bx#te@HYo70URbw4 z`oiq&szuBbID{FrR|ucrdZRQ&$?(_Yw(0jB8e*AVdadNM@jdr*4RdPY70Dm>iY5xz zC8#>Qz2lJW%O!qL=fKK?T2~XQk^}aJi=?k*>|yByNiF&J5eFEmbD qXnep(qbKqOPX|wg_^zd^7celqj#`q&-S2n-WRs_>pUXO@geCxolPk&q diff --git a/graphics/door_anims/dewford.png b/graphics/door_anims/dewford.png new file mode 100644 index 0000000000000000000000000000000000000000..86ac1fe4a673c8f452782bce6c52b83df0a77ef8 GIT binary patch literal 436 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0Hh!J1psWPm~f$%%etAR34jfEWx?4=`T^GR}CqIEHAP zKYPJi=#T>kTf(}ASTEZy^V@y8o?CNfo_fd?=NEC}ut=1av31>K9l^RC(_X$~H@jkF zYVV-*g#A%Fiw3t!_HkWqgY5dRXKvl@j1bsq=~LX0>UoCoVd?_W$i~9up?jXBa-O)B z$F<bbZth@M&4-`bbbWdDKC^b^NEAw^zX^1f*rKfxPB*W%i1RW zsOWmm`=3Xq^_Lw^?sYvL*TInSm47&GsSJW}LluRP6u(R{)DFTr;D zC)RiF_-tQz66i1064!{5l*E!$tK_0oAjM#0U}T_cV5n*WnyM!Xs&HwU}a#y haX!-uMMG|WN@iLmZVi=_F1CS!(9_k=Wt~$(699v#m5BfV literal 0 HcmV?d00001 diff --git a/graphics/door_anims/dewford/0.png b/graphics/door_anims/dewford/0.png deleted file mode 100644 index 8c3b8506875ede94c1985b86477fd9f6dbfaa2d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsY*{5#}J9BuID!LGAr`12CRQj z5+3JvGOc9(rSOlzaVNPV_1Jzt@D}qw#CAHe@4QCjil-TiSybFSWfmwXpUK%{yl7_a z*VAtb53I<_Jy6QpQ~rqS!n@9}9}bI`ht{SVGsiq$*Kq0C>452r%Z@C+|E}oDyMr;w dy3=0Fw7;~VenPhRlusbXc)I$ztaD0e0s#F`NALgu diff --git a/graphics/door_anims/dewford/1.png b/graphics/door_anims/dewford/1.png deleted file mode 100644 index 1b92f4bcaed5f9a545064485f6dafbd91c419009..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsR~aQ#}J9Bq5T_q4=C`k>}66- zHS#iByxF^a2B*^c2~V3I`v=5TS=`+7<-)aBg3I`qT$NKZdu;IZs2k5jNA9u?t}S8W zTOJjzm^yF4tc0xpof*CcnhnbWdyWdupU~f~Y-b?&y~p2T{*Qw1&*K@N_ni0b`4zop beH-81n0JkjKP^AE1mqS^S3j3^P6RC@s zG2oiLwAie}xG6lr^2w9d)=Z0+PbbH1+jzaG>VwDXrPT_n9vzfgB*3Jq$bQgm(JqfQ y#ozWnN?*ofT%0*AHD%^mZ?|bzZ+u^Q-~?~{<_-(nzJ2#V_IbMcxvXk1vk*WR< z)3!8mF;urs7dAiAsQjnFxS+NEl={zJ{e$`^#5PGDXVQ$}ntA8o(vF`e!qUO_QmvAUQh^kMk%5tcu7RPhkzt5|sg;SDm9e3=fq|8Qfu>b7 fC`1t&a`RI%(<*Umh)92Y5EOi#u6{1-oD!M-uLwixiR2CSbT zx?TY7GdWBVe$5&ZhSw+T5dzQu5 km)`p=>DiXNi~V}6`jri{ja))*xq=+!>FVdQ&MBb@0G!l7T>t<8 diff --git a/graphics/door_anims/fallarbor_dark_roof/1.png b/graphics/door_anims/fallarbor_dark_roof/1.png deleted file mode 100644 index f6a402eec4cd1b7d19668f82cc158a30d2f7a8fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsUlAo#}J9B$pJ<4marV+Ii@$c z*Kvm9g~~+=9L5smCeqCY%?ct0B@T>DhQeGDWzLLZY%w4E`ug4(r=LHgcHqLXgab>{ zoF(V3z9_j_pl5S}+w)bS)$g1nS07Z`9LCt1&~w${*tt-J4bnMA93{#U2K9^#Q+%i1 T{_)@48srL3S3j3^P6DhQeGDWzLLZY%w4CIPUryF{d2P5lFtaDs*)i yv*g^>7bG`dkW7#iIi^!`>|CgUAdh$AKPH9?UVVWM3QsFQHhQ}HxvXxJ z*&iwLn|1q1^Y%HnQ;zCAHruINoHsdBa<%E>6{$_vgng#_hw;r~^ayu#Sk%!lw`o`5 z5(USdhdSQQQhM{$SnJL14u{-uLwixiR2CSbT zx?TY7GdWBVe$5&ZhSw+T5dzQu5 km)`p=>DiXNi~V}6`jri{ja))*xq=+!>FVdQ&MBb@0G!l7T>t<8 diff --git a/graphics/door_anims/fallarbor_light_roof/1.png b/graphics/door_anims/fallarbor_light_roof/1.png deleted file mode 100644 index f6a402eec4cd1b7d19668f82cc158a30d2f7a8fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsUlAo#}J9B$pJ<4marV+Ii@$c z*Kvm9g~~+=9L5smCeqCY%?ct0B@T>DhQeGDWzLLZY%w4E`ug4(r=LHgcHqLXgab>{ zoF(V3z9_j_pl5S}+w)bS)$g1nS07Z`9LCt1&~w${*tt-J4bnMA93{#U2K9^#Q+%i1 T{_)@48srL3S3j3^P6DhQeGDWzLLZY%w4CIPUryF{d2P5lFtaDs*)i yv*g^>7bG`dkW7#iIi^!`>|CgUAdh$AKPH9?UVVWM3QsFQHhQ}HxvX*a~@r+`8N$%%etAR34jfEWx?4=`T^G7fsWIEHAP zKYHOT?_mWV)(2}6^7f`J@44VuWbCfAwQFWWRrfvXkX#-U)xc^Vp-bu?zgIXjFwAv6 zY}B{-T;r)945uw3x^f;f{C?cg_+)Kp;p_~}8CvVuc1d%@+<+vbd6)CQ(?5B*=cKWZ1!32^?=#xKrnyHGLzTYu2{=S?@9?e0&= z(zOX+a*O}`+WDo|{jJu|&z)C);j(1a@~fAWzil|5FIatp>;H@P`>ZD2zD8wC3xJ+c zEpd$~Nl7e8wMs5Z1yT$~21W+D28Oyuh9L%~Rwiavrk2_U237_JcXr9lMbVI(pOTqY XiCe?k=SviU8W=oX{an^LB{Ts5Pbn0EDN3*Nr{3tPvTUjGqR_!u>IsyPhb>Pxe&c`qT{5AO4&A2hG7Qn>G}E-`zu>6 SYkyb)a)hU=pUXO@geCx{$T)8R diff --git a/graphics/door_anims/general/1.png b/graphics/door_anims/general/1.png deleted file mode 100644 index cfe812f75e5be966386b98c2a6c42398151abde9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsZ>uF#}J9Bx#te@9#G(54G4d5 zLwk0WwtJP6`i8uVXQNn5bN_NaQ%(59%-rB7VIdHxu5$j!yT~;~TXjDCU&n9Up~(9| z`p9g>Sc40FFH_u0pXjgfo5H3mVttA^>+hm3Nk-CD-;0AO?ff1I$-}j5VGvjv*T7 z&t5pld00V&Eg}2`*WHy5oEW9Q-m_@@Bg_$bz?uET(%oP7{^&R&<>ddizT#(x#;?_@ zU1C+ZCh_&S_)gljY*__+%F3A}y9xm%$SlE;)#KKX)V6EQZ#{O<5qm<~stqdlw zj@r%tGrLZy-tCpUF9vB^d%C+C%&;PHVb$>iyZpZU5v;5c z60!jY41~D^f(jpZU5v;5c z60!jY41~D^f(j<%id9k;#K%#9rqY}f!TN`SUW`XSVboFyt=akR{0HX3P Aga7~l diff --git a/graphics/door_anims/gym/2.png b/graphics/door_anims/gym/2.png deleted file mode 100644 index 0ee9ba8f0943c1ec52fd32b0d3b62e3274955a04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDGyH<#}J9B$pKAFY>pZU5v;5c z60!jY41~D^f(jAO?ff1I$-}j61-6&Xirzgxy4r2!lc(&5 zLmqsdlQJV{ufJaHZvQ>M?C#q9-&j8N>=&Jl?e85yxU6OV_fC1=nl%$lD}Po3eWP09 z8c~vxSdwa$T$Bo=7>o>z40H_)b&U)|3{0&|%&m;gv<(cb3=Ej#`Oczf$jwj5OsmAL Up@?Z)At>NHUHx3vIVCg!0No&ubpQYW literal 0 HcmV?d00001 diff --git a/graphics/door_anims/lilycove/0.png b/graphics/door_anims/lilycove/0.png deleted file mode 100644 index d9f37092b579861f866a1ff135c106e3057de298..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsR~aQ#}J9Bwdc?BHYo70J~;Q_ z?CQ(giaxm=W$Y35IK|O(z#yp3B&O!1_dbS94VPkd-5LjPr+;nN awVw>V2PSL@IJ@UL$St0(elF{r5}E*~YC!h@ diff --git a/graphics/door_anims/lilycove/1.png b/graphics/door_anims/lilycove/1.png deleted file mode 100644 index b9dbb58c4f9955d378db29ea972a428c092748ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsUlAo#}J9BwdW6V9#G(6y>RA& zpw(J=|GlbjnXYkatpoCWdVK|Kz8r3MS4eu%cYX2FMgck9(1NRz8eF{(I^8tduqOT= z!^^~4c6UwruEkx4)gIkQbI6fhzV`j{wdP+qi~9PmY}{UdXrk1G{d{ueXW5sDAKcd8 T_0RjYGRPI4u6{1-oD!MvR*;aD zEq9oaSpK}{uEH6E&Be!j1kzqKFtvpSG$e3nIx^U~J@+w~(P+@_!4`8}XF;fTL(jR; s7d??LcsB5GC5u@xD=}Yd&C@&+&v2!_$F=xWatg>YPgg&ebxsLQ0C27?-v9sr diff --git a/graphics/door_anims/lilycove_dept_store.png b/graphics/door_anims/lilycove_dept_store.png new file mode 100644 index 0000000000000000000000000000000000000000..4f036c51db1cce8e59a6a6ce35f7560c15925720 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0IM!?^YBQ-MMP$%%etAR34jfEWx?4=`T^GLCt=IEHAP zzk1;yZ?gdp>xDNLJhjqJwlWqa2rU-<&v4El&R9x6ms_-PiagO4LQ-N^m?PuiSd9aRZt$}591A$0kdwjV#<7x5gF*7fMMfh76O&bolQT0koTH+` z+>dYCVzNkLclrBQFCutN1kPC$KMQd`KFc`$K#!!tvAessTZOM-wc^RRzeY5`TXA25 ZAw#awl6BALx2u7i;_2$=vd$@?2>=r*JO}^) diff --git a/graphics/door_anims/lilycove_dept_store/1.png b/graphics/door_anims/lilycove_dept_store/1.png deleted file mode 100644 index 10bb6c2f45e953bcfedbd0c25762e46aefe7f8b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsd7&j#}J9B$riQG&d3R*IT-l8 zzsY>4LQ-N^m?PuiSd9aRZt$}591A$0kdwjV#<7x5gF%X8Q3G3>Tcd=xv*e{s4n3)v zE{0|AU%hxSXJeK548v^J35Cx>+@G%!%|6#4vH3vH?(J6LYoj)P)4Omf(t+(p&4LQ-N^m?PuiSd9aRZt$}591A$0kdwjV#<7x5BO!uu;cgB?tMqd%25D=fSkp?@ xH5sKjN-8iKB#TX96k{+1as(PfWjW#xNH8>(E(^N+EnNX*rKhW(%Q~loCII2*E5-l- diff --git a/graphics/door_anims/lilycove_dept_store_elevator.png b/graphics/door_anims/lilycove_dept_store_elevator.png new file mode 100644 index 0000000000000000000000000000000000000000..8285e69c428fa16406ba8acfb572ce19a8cbfb71 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0G+{-7yS7663=k`w*PKr|3505KS(9$>x-WE6V3IEHAP zPqtuY<=MTEftz{VGd+=n#68VSZPw|E0tXL-1jogxfB#TfY1uS!+O+cbZ#Qo-sWNDo zcCWfS$$G-acd{Lf<%)OCG7H=BJ5GrKD*7gNWXE(jemBdO#+2%x)*8tZTKZ*L>MSB8 z3fdD}_!(wi4zp@LVfqbdxoU}PL`h0wNvc(HQ7VvPFfuSQ&^0jBH8Kn_FtswVurf5& oHZZUeIwZhlH;S|x4`AC7#G0cv3IboFyt=akR{0G;P$^#A|> literal 0 HcmV?d00001 diff --git a/graphics/door_anims/lilycove_dept_store_elevator/0.png b/graphics/door_anims/lilycove_dept_store_elevator/0.png deleted file mode 100644 index 94c738d3ffb6b9a6e8cab4450e9a8b752f0d2627..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDGyH<#}J9B$rjA4Ji8Y%a5Jxa zrYDk+xTl$^%{pCC;NXFf;J7&T?;k2FEt@7zn^yk*?dB~eRR#^y?p1duSx@-*PPT)w cT=C3VhJO*8pD`7rH-XIdboFyt=akR{0LNG==l}o! diff --git a/graphics/door_anims/lilycove_dept_store_elevator/1.png b/graphics/door_anims/lilycove_dept_store_elevator/1.png deleted file mode 100644 index 817eff6e707939717b52eb328b04134c63fb9bfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDF;s%#}J9B$rjA4Ji8Y%a5Jxa zrYDk+xTl$^%{pCC;NXFf;C})xC#Nb)Wac~eRA+uknBpwqv2FVPW}^psEjuL{HUyp3 TH;8%>0y5Ln)z4*}Q$iB}`cxy; diff --git a/graphics/door_anims/lilycove_dept_store_elevator/2.png b/graphics/door_anims/lilycove_dept_store_elevator/2.png deleted file mode 100644 index cf05cc48896abad02e1b7e0a4f67b1da8164978c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDSb~D#}J9B$rjA4Ji8Y%a5Jxa zrYDk+xTl$^%{pCC;NXD}W%h;gd}3^O5)0VQoMq6vc9oOwkmhob5uUDoF6*2UngDV2 B8fyRm diff --git a/graphics/door_anims/lilycove_wooden.png b/graphics/door_anims/lilycove_wooden.png new file mode 100644 index 0000000000000000000000000000000000000000..99b94e72db320fac8c5607f3ffb3b7c4a6e71ab9 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0G+2VO0$cBWnD%(#)KYk_ w7?@g_SXddGY8x0>85kVi<9`=LLvDUbW?Cg~4VxZ*PXvXJr>mdKI;Vst0Py&PT>t<8 literal 0 HcmV?d00001 diff --git a/graphics/door_anims/lilycove_wooden/0.png b/graphics/door_anims/lilycove_wooden/0.png deleted file mode 100644 index a385f7ad03f8795e32b7203b7189630c78b4b449..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsZ387#}J9BwdW7=HYo70URZa4 ztM5VEod+5ISCo&hd%(q`I@SN`ksp)Q^mV5=c=N0lwNzo-sN|@jXkPQgVuHQRx14EA zA6!@~7D;XTa;){5G{gCe7N2)Ltv>dwW&5UOjj_J1n^vu?sR@`UEI4aofsW|z)ga3~ MUHx3vIVCg!0Cvti6#xJL diff --git a/graphics/door_anims/lilycove_wooden/1.png b/graphics/door_anims/lilycove_wooden/1.png deleted file mode 100644 index 67b16f45da710ecad6263b2d0494e9a414ee1891..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsd!Hp#}J9B$pKj+CQONJ7RhOg zANUBQ&ERC^kqu}_II#3V&)tBA{>G$pM>>Vm1rpA*7(QEIY?T-^clCmv$QM25LOG6c z86;m@6}nm~u}9Q_Er3nMg!$P9Ne=OKO%0+96Xs6jF)O*M1G3W7)z4*}Q$iB}rNl5Z diff --git a/graphics/door_anims/lilycove_wooden/2.png b/graphics/door_anims/lilycove_wooden/2.png deleted file mode 100644 index e796302f0ba934dc5aee2bb474d0a469f0e4ac5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 136 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDSuBF#}J9B$pKj+CQONJ7RhOg zANUBQ&ERC^kqu}_II#3V&)tBA{>Hp>JV}xY(g%7XSBI@-GPDX`Xq>jt_<)f{Pvi@p ijx$<5-qsRfj*JX!K9j}j4u5|Nvcl8V&t;ucLK6Tn8Yo!+ diff --git a/graphics/door_anims/littleroot.png b/graphics/door_anims/littleroot.png new file mode 100644 index 0000000000000000000000000000000000000000..8c1ca34a5238a2854838d7f42ebb7aa620a0bae8 GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0H}&4*%$aniaWnHy@j{RNYyj=J6WYCB5Z& zQ_SxD4!p(k-tiX8TG=IAAFnNC)2U7u7EsGx&ZF>Khhde3)|>{9je8!HxkOJo`_y3- zgHkK2(3ykNyp`K`Gt9JPompf1;o#0mJJseZ?C0lNA>5$6BI#vgDQCD=hqlR+$=i=B zYXt36+SDV$>1B8OMYvr}somYi=Na)&r+ez$QU2!ePOv(G_hG)>A4a=^TK+@bn>c{J zQ7v(eC`m~yNwrEYN(E93Mg~R(x(0^2Mus5N0CkM+9Zu@7tO7L#A4|H*FyLG|L%1d5;%ET&0;p0^wdgVJN PgIwV0>gTe~DWM4fu1GnL diff --git a/graphics/door_anims/littleroot/2.png b/graphics/door_anims/littleroot/2.png deleted file mode 100644 index 8c8e37b7dfe7d72c136b8453293ecc38dd6a9b16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsR&OO#}J9B$pJzlB20;F$*QV} z0%-BN! diff --git a/graphics/door_anims/mauville.png b/graphics/door_anims/mauville.png new file mode 100644 index 0000000000000000000000000000000000000000..63167408ad65d2c4447ed7ad1cb220a02a51ea0f GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0G+-S#h6U4TLY$%%etAR34jfEWx?4=`T^GER89IEHAP zKRe+p?_mX=)<{Mp#&?>}*IZEDhu;c&>XRz4+3CmWjEqbwV+M1dweX(!Gat8uu zYd0`>oyW9lO=)SJiFgc$Q*6F-(3W`tTl9{8`du^OorLHdrijKTdmVDTSpH|V#;)D4 zdeZEm#;H|*n7E{wb+?$@a67qt%7^JcOMch1CwJ*Dj_~5&$!__NXD54M#j9XDeuG`1 zHPig`P6PdppRKq&UOu{Ba!c9#G(6y|Cs& z-h?~5mMu?VSZLLlc50SHG?(oc=MNu6ITbGEG1nh($zg8YdBdU8A=Ll>fxm9gDw&MA zFA3gY-r_5Aq;t((eyts26Y8*e#x8*k}V&oGn$iBJg R;B}A-JYD@<);T3K0RY;XJmUZW diff --git a/graphics/door_anims/mauville/2.png b/graphics/door_anims/mauville/2.png deleted file mode 100644 index 48e2d3a8c197ea4f08e005b24142a80de57c773d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsUS}m#}J9B$pIljLQIKlNfNSN zUa|^j3^p%LR^u=})56pix%xnYsu)|0uX@Y8gBKWCj~G4J<&d_H!N@9np>f(m;{!$- mJ&`YXI(Q<)cP(ALfPvxQ+2ZNy=d#Wzp$PzROe(+t diff --git a/graphics/door_anims/mossdeep.png b/graphics/door_anims/mossdeep.png new file mode 100644 index 0000000000000000000000000000000000000000..163b2d6dd7f40d67b77cbdd8cdf11a6740f39894 GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0G+(Lzu(mN*-ChUaidjU z4zI{0%l8J?1o=G}IyWZYU}-q0ZRYx=iAUe@kIcOdHw7zdC39BW8l9Lvar0-fM0f6% zo)a4bl6n%jE*0{Bz5FP8L+9NKs}Em+P3b@oLeL{y%wVdsR&sTYYIH%+$Bk4mq4V; z!rUico;ZJzaA92Mr;TT>S^n L{an^LB{Ts5x{f>( diff --git a/graphics/door_anims/mossdeep/1.png b/graphics/door_anims/mossdeep/1.png deleted file mode 100644 index 06a278c0c18f4caf0b5a5659897310b9ae257ed9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsd!Hp#}J9BwdZ#89#G(M4Gdf0 zJ=gbT!OU|8jUUBs_9Xn7s8PgSqLT7*>9VEK+$p*NTc3pYoxAj-dH(w6D<%13+V(KE zeUocg7=NIvj>*EIY3pK%7tANtHJR}wKb&{Qgz?0}%HxgRT_qqZJzf1=);T3K0RX72 BIP3rb diff --git a/graphics/door_anims/mossdeep/2.png b/graphics/door_anims/mossdeep/2.png deleted file mode 100644 index e0e60042c2fbe7475d11099c73a6dc73871cb0ca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDNj!q#}J9B$ul@vdAtG|5;&X~ zn=Uf4@)X1t99t8but7+kd7Z4+d4*|=n;6e9NU|oCtaC~~7Rp c4AwL;F}NypG~F)FVdQ&MBb@0L618U;qFB diff --git a/graphics/door_anims/mossdeep_space_center.png b/graphics/door_anims/mossdeep_space_center.png new file mode 100644 index 0000000000000000000000000000000000000000..4f2ccb6ffd4ba359bcff496b98673b98669bc41b GIT binary patch literal 509 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0Hn-ldI4&H{x5k`w*PKr|3505KS(9$>!8z`!W#>Ealo zasKQ@$Gm0(0oDta;@>4!TQ=wxP6%s0BGw%dXqIyzkiVgbanUc9sZ|X*MQ#5KFQ}DV z4Yih@cZ{vyK1AJdY3HjFkC%&Pd|M&4LT7WPy3qNYSk0C;!*kodEaE-x|7DJJgO01b zcVJA{u65P5`dyEz{d<}{4hVhrTaxJftW4DMo{Zr+!S@WzChyiI-|#kQt8zo?GyOllcFj*FdgwR4oOnL8&_!zL zq1~w`@0XfvSoQUU`^D-f&9)2kC!FWn6M9tF$!(Vg-wF1WN92~z4|_8I>i_vQw|++c zm9n}S*ZBJgKYk_7?@g_SXvnxYa19?85r<(i!DLXkei>9nO2EgL(R2y5}>&7boFyt I=akR{07nnK>;M1& literal 0 HcmV?d00001 diff --git a/graphics/door_anims/mossdeep_space_center/0.png b/graphics/door_anims/mossdeep_space_center/0.png deleted file mode 100644 index a4e6ef57c3283a6b06ae8aba7e9e16fd474bf243..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmVP) iq4ZG@+pNV>=S@D&rHIjtdD)Wy0000fn0kV(kXM2KG49B#V#?rWU{3P;y+U{4q>I&^ ZD?SVpjN>b<9d`f#002ovPDHLkV1j>HT;Tu! diff --git a/graphics/door_anims/mossdeep_space_center/2.png b/graphics/door_anims/mossdeep_space_center/2.png deleted file mode 100644 index dece153ab1866a0b568ac8f715d4bd3da21ad3b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsRmCM#}J9BQ_nea9aa!vy-=_B z-tZE)#uo)$u65lL-`v^a^gc1cFW^P2mD)6c@}ILS{|HL5lnJflurb!>EuF;DXzpSa zwu61*#&CAcE!)%{-Q)5WzjMv$LDh%1jxQb0{rnr~^)~;J+2719rp%>o-i?Jv!u0h*-&c9}IA&5ULT)NSUl{x(I+>Quts_D0I^2<<{uVTKY zx`Z+LVmipDswJ)wB`Jv|saDBFsX&Us$iT=z*T7KM$S}mf)XK!t%E(CDz`)ADK($!v eGm3`X{FKbJO57Sk^cMMp0?^ad&t;ucLK6V_V2|Gb literal 0 HcmV?d00001 diff --git a/graphics/door_anims/oldale/0.png b/graphics/door_anims/oldale/0.png deleted file mode 100644 index 6205d426d8b0d666786568f7409bf43e9c5dd753..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsTxlg#}J9BwdXE!9yZ`%30SXC z&b;)qEMElr`4Mt5TG$dD9o#yizCd=d&#QbD uf8$Sog$qM-WC1(zQ=^_{D#wP7cEI)bW zPq_Ws;5%ni&W1I6-1;snE2*n(Xi$$hY|`)DaloeCz)1bWoHVx^Gn83)17@-;X`Fvg zBFkUx@Qkp+TOYR`){0@9sBKYy-NJ8gHJj#|#eN^WuT46TeE;OjrjFj6K5;n*-aT9A zzuv09HD!jnMXR>Qe0_`S65lQt1pj!}pn9<3hNWxN)2NiC88I)}C)%x?KWBR3bdH+3 z;#I8KKctwieK6Il=KTNtGyA5)NoU>eZ7%})Q?2OC7#SED=o%R6 z8X1Ndm|B@wTA7$=8yHv_7&M$w^Fz^)o1c=IR*74~$BFYkfr8Z2)z4*}Q$iB}Hm9I~ literal 0 HcmV?d00001 diff --git a/graphics/door_anims/pacifidlog/0.png b/graphics/door_anims/pacifidlog/0.png deleted file mode 100644 index 839dc109d5724b5b722875ee4d913dc09a7f830c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsa{VP#}J9BspmEdGARnMUdU}c z@rOsFp&{taQ4ryQzZwDT~)7x9O&ul=d#Wzp$PzW15xt; diff --git a/graphics/door_anims/pacifidlog/1.png b/graphics/door_anims/pacifidlog/1.png deleted file mode 100644 index 5cabacdc964ce467a5d0219244f55efeb2945926..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsdi5n#}J9Bspk#~GAZ)3KHM_l z@-zoVxfkBY9kmNA-<_1(6mnoO(*liVX-W70-upcD7S3C6)o<%U(J5bgnU*p!dt6a@ zy4Oolq5Dk(Q{;2$ON~xRffi{C5-#S(%AcD%_u$`y(tjEs@LrEUa$eJp_qI_X7xToQ rk9cgTe~DWM4fc{oXT diff --git a/graphics/door_anims/pacifidlog/2.png b/graphics/door_anims/pacifidlog/2.png deleted file mode 100644 index 73353c9bba2e2b3ce18fdd89f37decf1af3291d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsZ387#}J9BQ_pSWJ)pqj61e_B zrl*;Q*QqrLGa5d#90)LERCJks|A*)G8Cfk;wVyUEy0F73(PRPR#I7SEn=}|bRT$V* zcFQke@-kAozFygU(c@Qtk6q6CkRzFQ?_v3u)YkijpAP&fNYeSk)UmYUZdUg97Leth Lu6{1-oD!M z>o=#Mbc2%+gGp-+ufq1dN$g4q8YP9u_k85}=H&9e)XE6%nnoE@ z_W+l(HLrfZW;#+Mw)4D%^gf=$$#q9tUaqpgy?j+oi>O0Rt^B*1X&hY_j+gK2Zxq?* z-)45_?_0amziZn6t>0REjQyq#qsYYB<^e6HKd&sWowr76`n=}-wShoysFt`!l%yn< zq*^5xr2;7iBLgD?T?0d1Bf}5_Q!5ioD^nwF0|P4q1O08nuTV7P=BH$)RpQnV_j+|0 PD8xKn{an^LB{Ts5Hm8kG literal 0 HcmV?d00001 diff --git a/graphics/door_anims/poke_center/0.png b/graphics/door_anims/poke_center/0.png deleted file mode 100644 index cb8c6fc4ce5eb6d673735f98b966f08f86264bcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsX9*=#}J9B$ulgApSd_X&NSv} zYHAWrJ;&iJ(Ui`2t3hH?Q~Eg$CkdnU13?Nqjd_e69RgnPIJ1j5xHK>vyur)LlfIxK zQBJ8mBEZwhCYS>fYXJcA?~Jt3qwl&&_c#XfRq`_5R-8 f#t*D>7>l(ST=Sdn?&Cj^338FAtDnm{r-UW|;HNz{ diff --git a/graphics/door_anims/poke_center/1.png b/graphics/door_anims/poke_center/1.png deleted file mode 100644 index 102db4cef880a1393b041b2c52a93caaf6f701d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsVYww#}J9Bz2`Ub9x@PUeHi_4 zqShq$#9ogcmQ<^A!V%_-L90qc@)>5maniGUq#;`W^`!r_oWQGs9wH3MN#Ts=!rl3W zL_2Rkk#@C>(fGb%-WpS%i3UR5kFFK`7GHI~D<}2v;d3X_*K|*PS?W;s;qHU(sZTH0 dZG8OwivH83?R_WLeP9H+#?#f$Wt~$(6977AMm+!k diff --git a/graphics/door_anims/poke_center/2.png b/graphics/door_anims/poke_center/2.png deleted file mode 100644 index 0a97da6cec80741183d5d885e67c2a3ff89d417a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsSHmS#}J9Bz2`RaHYkX&T-bjo zGxd-L-wM^a^Er96BW~Ug`1DX(X=?c10!xPwQ>I2H1-5g%5B5rlO~~L_GqqG?Yr>+O zd1XPD3M*UWPR`r+i*xsTgC(2nxWCyb^{zO}p6QbPDy!zp-&f3*96f3W7c1+7?Dll^ Kb6Mw<&;$T>6FATS diff --git a/graphics/door_anims/poke_mart.png b/graphics/door_anims/poke_mart.png new file mode 100644 index 0000000000000000000000000000000000000000..2d9b7d3190853e309aa905fc601b64f9f860d7ed GIT binary patch literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0HH_PokEkZytGM87f+4a5pS3n^C(%jyAKJt8Xa(Q2BWdwIkql~G0 zfXmsMSHE8~9jOu9d0s+#AJ5_Bx}z;GSJ~fQzN)50)FG!<{$0&9j;;&G%lGv+itO`m zGrRNmt=;M0HSPb_Z>>GXep820Wa4b|fELrASC-e#TO&1nUi1FiK%h5NOI#yLQW8s2 zt&)pUffR$0fsui(fuXLEVTggLm8pT1fw{H;kTl@vyur)LlfIxK zQBJ8mBEZwhCYS>fYXJcA?~Jt3qwl&&_c#XfRq`_5R-8 f#t*D>7>l(ST=Sdn?&Cj^338FAtDnm{r-UW|;HNz{ diff --git a/graphics/door_anims/poke_mart/1.png b/graphics/door_anims/poke_mart/1.png deleted file mode 100644 index 102db4cef880a1393b041b2c52a93caaf6f701d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsVYww#}J9Bz2`Ub9x@PUeHi_4 zqShq$#9ogcmQ<^A!V%_-L90qc@)>5maniGUq#;`W^`!r_oWQGs9wH3MN#Ts=!rl3W zL_2Rkk#@C>(fGb%-WpS%i3UR5kFFK`7GHI~D<}2v;d3X_*K|*PS?W;s;qHU(sZTH0 dZG8OwivH83?R_WLeP9H+#?#f$Wt~$(6977AMm+!k diff --git a/graphics/door_anims/poke_mart/2.png b/graphics/door_anims/poke_mart/2.png deleted file mode 100644 index 0a97da6cec80741183d5d885e67c2a3ff89d417a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsSHmS#}J9Bz2`RaHYkX&T-bjo zGxd-L-wM^a^Er96BW~Ug`1DX(X=?c10!xPwQ>I2H1-5g%5B5rlO~~L_GqqG?Yr>+O zd1XPD3M*UWPR`r+i*xsTgC(2nxWCyb^{zO}p6QbPDy!zp-&f3*96f3W7c1+7?Dll^ Kb6Mw<&;$T>6FATS diff --git a/graphics/door_anims/pokemon_league.png b/graphics/door_anims/pokemon_league.png new file mode 100644 index 0000000000000000000000000000000000000000..cac740f561669701a81214107f4b3424fa7f3113 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0HHKJlf;wg80$k`w*PKr|3505KS(9$>x-WL))haSYKo zfAxYP*I@+_wgls}?g>l1*_OZ4i{*}UJi)o-d4}i4=v|@y0eeFA9!UQB=c44f;Oz}N zk9+LDMCy-OuIKt?_-hWc#NuZwLRI@GerJ80D*X7u<$2XhZuLsc;xswrz9M;T!=|uT z9ub0CUh^dTU5o2woa6mLQL%* zwqsMn{RhQ%`iyS{3#Z-wm=wK6rZ rGBnXPFt9Q(_`3a$0*Z#*{FKbJO57S+UZubP0l+XkK*mRX; literal 0 HcmV?d00001 diff --git a/graphics/door_anims/pokemon_league/0.png b/graphics/door_anims/pokemon_league/0.png deleted file mode 100644 index 5e93af90bbbcb3ec1b369cb1d7c22c1c71d47b47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsVSZ=jv*3Ld(Rs39ai9B4My^A}f%CR^=t|FE`*asEOz#|_`SAE+lLI~*z8!2QNRoFO7n zd$Duq9X1E^)$eA1t+`TUx#7He4h#PUqrk@59b(zr3KtpOv&+%Gbt#6~aGmA;q&FTf z=Y6(b%Ji&jeaMOX91qn#@hm+2d-aLKzxT;zzj^6%m_Jx9SoA@T;3<$hJzf1=);T3K F0RZ3EP;vkO diff --git a/graphics/door_anims/pokemon_league/1.png b/graphics/door_anims/pokemon_league/1.png deleted file mode 100644 index 438d0f16adcdd77bc71a3363ba732e12628463e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsVSZ=jv*3LQ_os+9X8-$OGy19 z<~U7H(x&wMCDR4kELBYxidD93iMG;m|FE`*ajxQ|+?lQxOf^3FZ{i2*(pGD8AK6)Ws!lIn<=EMW5MS-(R=bSip`cTm#ncC+EO16KRqxG!) zp{eu?%S3*~N5XX*|0}BSm>;$Z`LR0j<5#O^4d*p27(3@i3GwOPv<11-)78&qol`;+ E0N_nd$p8QV diff --git a/graphics/door_anims/pokemon_league/2.png b/graphics/door_anims/pokemon_league/2.png deleted file mode 100644 index 4483dacd05437dac5c49cad5cd70af816fcb8562..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wscKIb#}J9Bt!EAS8Wea~FBomQ zdE{v8!PyhO6zqDbHs?Trw*Cdx-WL)rcaSYKo zfA&%=U$X)aLqgwuKK=veStrCYG_%i`=)87IsMz$kg^|1uxwjlMn{_Sf?ddmLzM48L z&yHu_bn$BE<~^A+YNw_@*z-w>O($%{HN!nh#}=*VJ`lb~A#DAIS;72MG&Z=#SsYxH z(ZIw0mQhym^1~-Q&*li5SY4DjA@ywf=ao`_jRoeEGet;TdBnI}!&6}Gvx>6^BZ~|6 zaUSX^cYP?F6}O6`b2Zaf?%7JYM)T)<%ztM5Z~pf8Kl|d2#1^F2>ip~~Xf^o{B<>Vk zUH;RCammd;e>C2gM*#h%TH+c}l9E`GYL#4+3Zxi}42%qP4GeXS3_}b|txOH9j4ZSb m46F*qK_Zj1m4mS4s||lHKiQ|ar@BYt$1m)?ST!cy;ylmVNj3s{Ofi?Lb7nM@7E9@Z!*k4lX{0 z-F&-vw5Q7pYMd-wGvlVgVM*gT;>YLxWa-+wp(9^&Qtn$NC;kZ{w=Qn@n=@133G>bC Vt9JXWU{3(K!qe5yWt~$(696%}L8<@% diff --git a/graphics/door_anims/rustboro_gray/2.png b/graphics/door_anims/rustboro_gray/2.png deleted file mode 100644 index 8883dad1c5231f755ef5e83a65992fcdd917bea6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsZdWB#}J9By}cJX4>)i*%kICs zptR``SGn{Y=c{uTU0Lte#P2*Ir1Zd+oP(@oa|;^vyM;EbQ;fR2Tw$@bi~9@x1tp9T pE^^JmRt4>IYZ|O8Hbwtk*%Ft}x#E?9`!AO?ff1I$-}j0>JFjv*T7 z&t8hx5W_X7(8qo!4#&6`TIHFp~En_m*R3v#v$GJ^g0OS5t@O z+40PqE?({2yeD%;?bP%Kdp=3A>4dGgX1GV`*rFBP2g3I#gstB&E0}+Z#s=3oi-U_Y z8hF^>GRi7me)xpv*&JaLtBVpRq@GRxyi)3~vA~>irU;2Ej~JJ0cnYk2R&n-VWO2bh z&O<%rt`CK?;#P5Vu4ekmJzFW)X#Sj!`Ol31&ENk1XJ6cr*n;$0ou6F=ttS70#GQhx z%YWK1F1h*VkH-7*2%z6oOI#yLQW8s2t&)pUffR$0fsui(fuXLEVTggLm8pT1v4ysQ lft7(lfzd`y6b-rgDVb@NxHT~5b4~>Xqo=E%%Q~loCIJ13ngIX+ literal 0 HcmV?d00001 diff --git a/graphics/door_anims/rustboro_tan/0.png b/graphics/door_anims/rustboro_tan/0.png deleted file mode 100644 index 2b3cade895f047f0348e1a4a437ecdc796bc47e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsbWtT#}J9Bv1b~2k0@}k1{^zn zgK>*qK_Zj1m4mS4s||lHKiQ|ar@BYt$1m)?ST!cy;ylmVNj3s{Ofi?Lb7nM@7E9@Z!*k4lX{0 z-F&-vw5Q7pYMd-wGvlVgVM*gT;>YLxWa-+wp(9^&Qtn$NC;kZ{w=Qn@n=@133G>bC Vt9JXWU{3(K!qe5yWt~$(696%}L8<@% diff --git a/graphics/door_anims/rustboro_tan/2.png b/graphics/door_anims/rustboro_tan/2.png deleted file mode 100644 index 8883dad1c5231f755ef5e83a65992fcdd917bea6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsZdWB#}J9By}cJX4>)i*%kICs zptR``SGn{Y=c{uTU0Lte#P2*Ir1Zd+oP(@oa|;^vyM;EbQ;fR2Tw$@bi~9@x1tp9T pE^^JmRt4>IYZ|O8Hbwtk*%Ft}x#E?9`!X<$%%etAR34jfEWx?4=`T^G9G!lIEHAP zzdGR{CzGLo>vFN|o0Gq9nb6!(>LbQ|VNNP%qIJP}C98-wbx+=N{*Tr@cofO*Bxhf5 zbY}VL6AjM7G3|`cwQEX_Moq~&dtjrOZkDfsU7>Exi5~u5!8F6RoGOF+la`h?3g=$x z+UZ@sNi5;*>`zAh3QPilJ3g!n&zQB8yM5Wg0QpxJHXY@#pTn>BM47>`#dYH==`{?o zO3?@WxNP#m&)R8Z*yy#*epZ|)@4Wt}PHd0V1ir6a|EKzElzTsCx-Hpo{O$K#wphdF zcQVD(xdhWVBx@Qcu+FG$RXQ@WW}dR~zukq0Cu{=xR<*=6q9i4;B-JXpC>2OC7#SED z=o%R68X1Ndm|B?{SeY7W8yHv_7zpV;e}JMPH$NpatrE9}4LQ-N^m?Pt1YmEbkZt$}5cm*^h99U|#fFUKpo&Cgt3m1%KWz(IUB`@9E`|^dw zcfDRk_CprOCVbahy*T;i?sT5aOa-?nsYx6@hI0y^@pJ(3gu+$H$D|YvA3eId_^6P$ l_=KgK!yI&5e=r?mV7R|z)e1wA&MzQmdAj%o2O$!pZ9k1!ftq)+1{M_iu zJayTFeMVAw8q(%Do({TCR62e(#u=o(@GE)hlJ#c6(R0QclHGPf7qVo2&0LVDvq(N$ g?v=#xfWJpuWtB=+|BBrd#0qker>mdKI;Vst0B{aL5&!@I diff --git a/graphics/door_anims/safari_zone/2.png b/graphics/door_anims/safari_zone/2.png deleted file mode 100644 index a19c6c27b722d68407a88aea2d0c35fa67dbd796..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsT5Ba#}J9BwdXH#9#G(6xp3xE zX6UYlnGTzrWF0O<&RG~U=~}-Re^bA4okwj?*TU8~?Puci!yhetdGo=i3lAeJ);G0x z&F!4^@D78u;qxU4g03P9G8H4-7A81fWIFw3gVUj3N1LVl{Z{a-UNgZFWUr^IpUXO@ GgeCw)ojnf# diff --git a/graphics/door_anims/slateport.png b/graphics/door_anims/slateport.png new file mode 100644 index 0000000000000000000000000000000000000000..1283395eac6e4f2f17aac986d291c89dafe02e47 GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0HHYezAr=|CZYw`53d3)2A_gru+GIm$m+BLJGs{5XGNG^|wYG5^w&?WVc-z%IM80I=3 zHtJh^uJP0lhSL@iT{({#en0MLe6lvQaCU~~46Su+yQDc{?mdooERu|A(`j^ES1fwr zfr!S1?KX=YCoMdbZF9yjY6H`{hyJhJAGHhV1UUa_;}>VPU8tDDq)Zxy65e?flZ~{#NVf=gzCYa9Ofy`PECx-!`1j7p%U)_5VfteO8lhU!yXn1whZJ zmbgZgq$HN4S|t~y0x1R~10w@n14CUS!w>^gD^mk2Q%h|F11kdq0jnC}Q!>*k Wacf8{=UxWXz~JfX=d#Wzp$Py(5st|K literal 0 HcmV?d00001 diff --git a/graphics/door_anims/slateport/0.png b/graphics/door_anims/slateport/0.png deleted file mode 100644 index ac2c4b43829fc35d59d0d1edc33ca5590e66a633..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsX|W|#}J9Bx#te@9#G(54G3=# zymL};7q^^gX0TP$W{VKV3vybVC%qkhE@WsZi&$ak_Vz%W{E2Mis##ar{y%qVeR^%J zg>bn0EDN3*Nr{3tPvTUjGqR_!u>IsyPhb>Pxe&c`qT{5AO4&A2hG7Qn>G}E-`zu>6 SYkyb)a)hU=pUXO@geCx{$T)8R diff --git a/graphics/door_anims/slateport/1.png b/graphics/door_anims/slateport/1.png deleted file mode 100644 index cfe812f75e5be966386b98c2a6c42398151abde9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsZ>uF#}J9Bx#te@9#G(54G4d5 zLwk0WwtJP6`i8uVXQNn5bN_NaQ%(59%-rB7VIdHxu5$j!yT~;~TXjDCU&n9Up~(9| z`p9g>Sc40FFH_u0pXjgfo5H3mVttA^>+hm3Nk-CD-;0x-WSsVNaSYKo zfA+#b-a`r^Yzbi*apEgdJNO=?RWux#E$$_C{_D=hGKSf^I>gfjD)`r4IkNa4`=?fM zjlV~yDo>kn&anB${p7qwi%mg6J9-b--4eP!|nM` zXkU37wLJ1G&|9h{t`Q|Ei6yC4$wjF^iowXh$UxV?P}j&X#K6?b)X>VnLfgQ=%D_Od g{_YnP4Y~O#nQ4`{H6$pddVoUE)78&qol`;+0Qeb`NdN!< literal 0 HcmV?d00001 diff --git a/graphics/door_anims/sootopolis/0.png b/graphics/door_anims/sootopolis/0.png deleted file mode 100644 index 80309914b0bbf23ab2e2bbacf69ed09df2294786..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wscugf#}J9Bx#te@9x~u@xVWZa z4y%`q3wy%mf&$gN7_ZQ;J!jZ1Fs?YIwAX-nTk$r33>;Flri%6EZcTMQm zrkVd7j{OZgm;UVH2NkPa`8^elHjd1uPs27g|H^3K;$vOublCD?+(m!RjS7p_A7B*N v-yj<37`f!dx|;mb-+Egw^QM+z!-q+t-N{qFgPiB->gTe~DWM4fm;_82 diff --git a/graphics/door_anims/sootopolis/1.png b/graphics/door_anims/sootopolis/1.png deleted file mode 100644 index 5097cd859d6bbf7550e8d25a93b4363382d6337a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wseDft#}J9Bx#te@HYo5oTwLcM zag$qxkAe5&no{Oe241~KM diff --git a/graphics/door_anims/sootopolis/2.png b/graphics/door_anims/sootopolis/2.png deleted file mode 100644 index 52487c3c33f44f25060249078ecfc6d7783f5c8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsd!Hp#}J9B$rjA4JTrPO?>?Bo ze|S%M!iPzTd@j#a#Mma>*ebQ?@0V4f)dzZnWo2zou$^mRYU9&rFiaCjXfSD%+#I$x ziZ!WZom2W5r}T!@0Ex{PBn4)M&X`tau%?NLfi-6(?;n+itspBsUHx3vIVCg!04&`x A_y7O^ diff --git a/graphics/door_anims/sootopolis_peaked_roof.png b/graphics/door_anims/sootopolis_peaked_roof.png new file mode 100644 index 0000000000000000000000000000000000000000..b4ccfb5f993ba33e06842e571e7cfb1813b871f5 GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0H{k)<<(_Hcs7ogGU8*)`Ib6BqR&cj%`uKS-RQ+3|AySILRjRYAW@p9aNme!MOO(?^+g(!2R#k|F-J~a8}LS z!MKWNUdtY?>bAo|3t6r1YhWYqJ_cJ)z4*}Q$iB}FRzdh literal 0 HcmV?d00001 diff --git a/graphics/door_anims/sootopolis_peaked_roof/0.png b/graphics/door_anims/sootopolis_peaked_roof/0.png deleted file mode 100644 index 2605a89a243a97dc3b90cd65547bd53c3467a43f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsZLK9#}J9Bspk&z9x~u@2wWdv z$vvf_gYQ7v!v|h>c1-DFoN$vtg25#$fi>+w8IS8D`8Dd%T}-ho{~vJZ3EC)ExSn2i zt;+6YfQ`$#KIzZbE;iL}*>lF`(ScN>5{n#}8;^G>et&W!HA<52yU&#g8h#QEKJpL5 sPabehozZ{Puxo|L<{8WG|7TIDVlH{n5T#dGTLW^Or>mdKI;Vst0B%D`Qvd(} diff --git a/graphics/door_anims/sootopolis_peaked_roof/1.png b/graphics/door_anims/sootopolis_peaked_roof/1.png deleted file mode 100644 index d76dd3157958271c084af7b63fd1c640a784a23c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsXR{?#}J9BspsBuHYkX+KHS}8 zQB=R@0)rNBz;@nMj7>2MMQ176_j!E#H=$j*V~N1uM1i**c`p1}-W-Y1j|B@mWh9py zCcAaYWa%$&-nvaz+Sc@a~; P3djYXu6{1-oD!M<J8gZ)2a+zkc^k*XPo))i>mteSU3V!Np>r+B4>-{zBn zhZem$ee1dW6Yo9;qvVwC3y0L@Tf|Zi{R?Kk%6&3)deD>G2akcQ^mO%eS?83{1OTAf BHctQm diff --git a/graphics/door_anims/trainer_hill_lobby_elevator.png b/graphics/door_anims/trainer_hill_lobby_elevator.png new file mode 100644 index 0000000000000000000000000000000000000000..aeb7eaf26050aff021cc812dde0faf71a994fab5 GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0H{HEZs8exQ&*a-v@uhz4Q>AO?ff1I$-}j1o^5#}JM4 z$ve1Nd3G;sFgd2B;m|Rsk*RHSxq`sK3U*eWr%y|3_2*5Wt}M~iRP;H{PDEr0JM+zN z>qm=0&Aagv_0?^NS>!)D{*4m{k_~tJlj6JY`&l`&{HXJ%)83q z!L)tN6@O*tePCo*^IE^XaJs4_(01GbWneJ>!!2N19Pgg&ebxsLQ0F3HsQ~&?~ literal 0 HcmV?d00001 diff --git a/graphics/door_anims/trainer_hill_lobby_elevator/0.png b/graphics/door_anims/trainer_hill_lobby_elevator/0.png deleted file mode 100644 index 3125df9b4c22f5a5f24162866cec61432edd7d04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 125 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDHl%{#}J9B$ve1Nd3G;sFgd2B z;m|Rsk*RHSxq`sK3U*eWr%y|3_2*5Wt}M~iRP;H{PDEr0JM+zNd@s>@BKZK6VQ1{?x+w`{leUn5%`$1>sV+;)PXZ8h) S?R9hn8R_Zj=d#Wzp$P!r{33Dy diff --git a/graphics/door_anims/trainer_hill_lobby_elevator/2.png b/graphics/door_anims/trainer_hill_lobby_elevator/2.png deleted file mode 100644 index 6234d8928f36f8020699b22d155ffc26d698ca03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDQiy`#}J9B$ve1Nd3G;sFgd2B z;m|Rsk*RHSxq`sK3U*eWT7h4zO@{o3Dm?kw?p!JtSij%df=5oufQ_NL_1e>J^KD;2 O#(BE>xvXkfjhyqv6;`bWDyZR1IwQPh@Z@K^bE$lS zK}EZI4MTSRl?B%R(>4L^RxNRjC`m~yNwrEYN(E93Mg~R(x(0^2Mus540pRIM)LnhKFL+ UuRjNDS^zTB)78&qol`;+0DILYi~s-t diff --git a/graphics/door_anims/trainer_hill_roof_elevator/1.png b/graphics/door_anims/trainer_hill_roof_elevator/1.png deleted file mode 100644 index 1a5a8c05cc95c632938a8da7213e7e01272b0fb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDQiy`#}J9B$pwu}Y+RDN7dAZP z5iyvvm${MSn6*ZNMm^)AU#A3l4o+7%X5(08Fd=t;wfK<+>oEWmW OGS1W0&t;ucLK6T{pdkwY diff --git a/graphics/door_anims/trainer_hill_roof_elevator/2.png b/graphics/door_anims/trainer_hill_roof_elevator/2.png deleted file mode 100644 index 38242302c70196c6d3ca1b6d3cbe76c72ed40e97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 113 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wDGN^*#}J9B$pwu}Y+RDN7dAZP z5iyvvm${MSn6*a2i{=aZ0zH)i$Gocy9!%S}o15*u0N-wI)&e$$iuF6@ZmM0j4rG?6 LtDnm{r-UW|10^8@ diff --git a/graphics/door_anims/unknown.png b/graphics/door_anims/unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..811c086a8f6b3c083105e8cfac0945035f7ce5af GIT binary patch literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0H1W_v%`exQ&*a-v@uhz4Q>AO?ff1I$-}j76RX&+%m#oGVCoKb;3Bo7i_131i2m0Cs z70s)#OUzWg=GAAvCfE3$=BzVmp*x?Sd^7Fy$_FLSOO!YsJmhFN&A!7XYHxv;UCtHj zo_0pg@Mo9qAD+%RdP`(kYX@0Ff!0JFw`|N3^6dZGBvU? pFxECOure_C;cvu?q9HdwB{QuOw}wuku8p98@pScbS?83{1OV$lfhhn0 literal 0 HcmV?d00001 diff --git a/graphics/door_anims/unknown/0.png b/graphics/door_anims/unknown/0.png deleted file mode 100644 index 26e0a06544fd22cfc39ddd84e96be9f4e9dea04a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 148 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsc26Z#}J9Bd;2zW9x&ixF`XmD zzu?g1l-Bb3B86{7ernETf2cOWh@GEZ=+fRiJo*RT x<%Nel==c%(W$(+~OT16)-Z)w7{>o22(|lAUs@!`56Ea!u+22&p36AZF{$LB#Oe!@ Y40@M(IHU_UsDTXjboFyt=akR{06-Zcb^rhX diff --git a/graphics/door_anims/unused_848EDEC/0_bottom.png b/graphics/door_anims/unused_848EDEC/0_bottom.png deleted file mode 100644 index 51c6243969ecfb67b907e583e4165cacb54bf388..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c0wfp&-k$XWQih%`jv*W~lV7};p#cOY%?lSV zWL9T>tTDn^!YX_%)5Zf?2N(`Uu(C3&{3QE&`!Ut29N@^tlc JS?83{1OUl!9vc7v diff --git a/graphics/door_anims/unused_848EDEC/1_bottom.png b/graphics/door_anims/unused_848EDEC/1_bottom.png deleted file mode 100644 index a3cc83febf778f4c3d91c6ce960a9309dde43dea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 105 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c0wfp&-k$XWQU;zbjv*W~lV7}u*_yRz!2=#P zfn?ShhS^tFh4va8<5FPOU>0KPa$uNq@!$q7rZ5JE&5Fvb3%CC_0GZ+G>gTe~DWM4f DHDVmm diff --git a/graphics/door_anims/unused_848EDEC/1_top.png b/graphics/door_anims/unused_848EDEC/1_top.png deleted file mode 100644 index e6c96394c1f20b9dcad539350d60d28d91bb20db..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c0wfp&-k$XWQd*uajv*W~lV312bsDRmOJKM( wS6EfCXC^!ALmo$g#l=ruG?GQ97;;Z#WM~wXoB2_C^G}d&Pgg&ebxsLQ08d65OaK4? diff --git a/graphics/door_anims/unused_848EDEC/2_bottom.png b/graphics/door_anims/unused_848EDEC/2_bottom.png deleted file mode 100644 index f8466fa9c91239a9566295998ee737f8c806106b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c0wfp&-k$XWQVO0fjv*W~lV7}uVP!Iw5a@|~ l!PCLx!NT;Qhp#O(fPtaARGp_we$5n+9#2<4mvv4FO#m%K6;J>G diff --git a/graphics/door_anims/unused_848EDEC/2_top.png b/graphics/door_anims/unused_848EDEC/2_top.png deleted file mode 100644 index 1864760e32aa1862968c24714981ec56e0f69b81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c0wfp&-k$XWQi`4~jv*W~lV3D6Nb;QMnd!ig nb|z|TmT1Stom_Jbxu-HR$bM06zP|OWH%ODGtDnm{r-UW|rtTRj diff --git a/graphics/door_anims/unused_bottom.png b/graphics/door_anims/unused_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..3aa56594008e2c9b66d21be1e3315c1c0add2959 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^0zfRm0wfrOtnEHS{3Q>lbqZ<5&t>_qVl?AtfRG@&wN*-@(vmBU0sm6+ z64aw4cJr;aiaMCZ{`S_z^L?pz7xSMnzs72BZNWJ0P5Q50mzrJyEl@3SjVMV;EJ?LW zE=mPb3`Pb<2D%1@x<-Z}24+@#q978y+ zr=B^;+n^x8;t&;4SNHOy&>Ply>5D$TXn1{Szbj{XM$^0ONoUt}Pux}+$sc}jcjLpI zim@V21{JPr6BG{EH!PB!pmZ_ifw2CC30$Qf?*AN(o3ceBU2^`p$`vw4amTGMc$U}z zv`n?cHKHUXu_VKYk_7?@cZ8d#YcX&V?=85qdh{aAydAvZrI YGp!Q0hP-44koOooUHx3vIVCg!0KlAIJpcdz literal 0 HcmV?d00001 diff --git a/graphics/door_anims/verdanturf.png b/graphics/door_anims/verdanturf.png new file mode 100644 index 0000000000000000000000000000000000000000..204a47612e98ec6839bb44171f59695ee5e3683a GIT binary patch literal 451 zcmeAS@N?(olHy`uVBq!ia0vp^0zjO=0wfr|csbMpDVB6cUq=Rpjs4tz5?O(KrX+87 z7Y2SSBfG^w9(#$WuPgf#Mp0H1KF9xwMnEBfKc*MF`^y?lx!pXKo`lRsZhW$7B7p)9Y zwcyH{z0rGvWG&}p@3b}UZPHhJx&+$urzRxqxKS|MFeKCd-t7H%{4bs_KeNBWD5_ik zq1Td!@j!y>|F13c*)PnP@b}Ma3pb!QRZCnWN>UO_QmvAUQh^kMk%5tcu7RPhkzt5| usg#VQ>F18a&CUzSg^fa9ruPZm&95M_!XD6@uN!8nb8@IGw$ wxAVFK!OJBg*K5oWx-YV@=0nQc3bQTj;U?k@Ee2CwDT7?->FVdQ&MBb@0RM$T_5c6? diff --git a/graphics/door_anims/verdanturf/1.png b/graphics/door_anims/verdanturf/1.png deleted file mode 100644 index 72ed6d14870afaf68eb9f9649e8c5711b1332f17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<50wfrI3wa3wsR~aQ#}J9Bspk)JHW=`*Ua;@h z{&Hnr?4im%DivRnUNdbI=IFbybc$C94=6nx~6}_ZH}|pk~eZc*z{6Mx_l?B Date: Tue, 21 Jan 2020 08:46:26 -0500 Subject: [PATCH 5/6] Name null palettes --- .../field_event_obj/event_object_graphics.h | 58 +++++------ src/field_door.c | 98 +++++++++---------- 2 files changed, 78 insertions(+), 78 deletions(-) diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h index 1702392cac..1b00201a5d 100755 --- a/src/data/field_event_obj/event_object_graphics.h +++ b/src/data/field_event_obj/event_object_graphics.h @@ -4,21 +4,21 @@ const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/f const u32 gEventObjectPic_RubySapphireBrendanNormal[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/walking.4bpp"); const u32 gEventObjectPic_RubySapphireBrendanRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_brendan/running.4bpp"); const u16 gEventObjectPalette33[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_33.gbapal"); -const u16 NullPalette_8499A38[16] = {}; -const u16 NullPalette_8499A58[16] = {}; -const u16 NullPalette_8499A78[16] = {}; -const u16 NullPalette_8499A98[16] = {}; -const u16 NullPalette_8499AB8[16] = {}; -const u16 NullPalette_8499AD8[16] = {}; -const u16 NullPalette_8499AF8[16] = {}; -const u16 NullPalette_8499B18[16] = {}; -const u16 NullPalette_8499B38[16] = {}; -const u16 NullPalette_8499B58[16] = {}; -const u16 NullPalette_8499B78[16] = {}; -const u16 NullPalette_8499B98[16] = {}; -const u16 NullPalette_8499BB8[16] = {}; -const u16 NullPalette_8499BD8[16] = {}; -const u16 NullPalette_8499BF8[16] = {}; +const u16 gEventObjectPaletteNull1[16] = {}; +const u16 gEventObjectPaletteNull2[16] = {}; +const u16 gEventObjectPaletteNull3[16] = {}; +const u16 gEventObjectPaletteNull4[16] = {}; +const u16 gEventObjectPaletteNull5[16] = {}; +const u16 gEventObjectPaletteNull6[16] = {}; +const u16 gEventObjectPaletteNull7[16] = {}; +const u16 gEventObjectPaletteNull8[16] = {}; +const u16 gEventObjectPaletteNull9[16] = {}; +const u16 gEventObjectPaletteNull10[16] = {}; +const u16 gEventObjectPaletteNull11[16] = {}; +const u16 gEventObjectPaletteNull12[16] = {}; +const u16 gEventObjectPaletteNull13[16] = {}; +const u16 gEventObjectPaletteNull14[16] = {}; +const u16 gEventObjectPaletteNull15[16] = {}; const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_09.gbapal"); const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_10.gbapal"); const u32 gEventObjectPic_BrendanFieldMove[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move.4bpp"); @@ -40,20 +40,20 @@ const u32 gEventObjectPic_RubySapphireMayNormal[] = INCBIN_U32("graphics/event_o const u32 gEventObjectPic_RubySapphireMayRunning[] = INCBIN_U32("graphics/event_objects/pics/people/ruby_sapphire_may/running.4bpp"); const u16 gEventObjectPalette34[] = INCBIN_U16("graphics/event_objects/palettes/field_object_palette_34.gbapal"); const u16 gUnusedEventObjectPalette[] = INCBIN_U16("graphics/event_objects/palettes/unused_palette.gbapal"); -const u16 NullPalette_84A54F8[16] = {}; -const u16 NullPalette_84A5518[16] = {}; -const u16 NullPalette_84A5538[16] = {}; -const u16 NullPalette_84A5558[16] = {}; -const u16 NullPalette_84A5578[16] = {}; -const u16 NullPalette_84A5598[16] = {}; -const u16 NullPalette_84A55B8[16] = {}; -const u16 NullPalette_84A55D8[16] = {}; -const u16 NullPalette_84A55F8[16] = {}; -const u16 NullPalette_84A5618[16] = {}; -const u16 NullPalette_84A5638[16] = {}; -const u16 NullPalette_84A5658[16] = {}; -const u16 NullPalette_84A5678[16] = {}; -const u16 NullPalette_84A5698[16] = {}; +const u16 gEventObjectPaletteNull16[16] = {}; +const u16 gEventObjectPaletteNull17[16] = {}; +const u16 gEventObjectPaletteNull18[16] = {}; +const u16 gEventObjectPaletteNull19[16] = {}; +const u16 gEventObjectPaletteNull20[16] = {}; +const u16 gEventObjectPaletteNull21[16] = {}; +const u16 gEventObjectPaletteNull22[16] = {}; +const u16 gEventObjectPaletteNull23[16] = {}; +const u16 gEventObjectPaletteNull24[16] = {}; +const u16 gEventObjectPaletteNull25[16] = {}; +const u16 gEventObjectPaletteNull26[16] = {}; +const u16 gEventObjectPaletteNull27[16] = {}; +const u16 gEventObjectPaletteNull28[16] = {}; +const u16 gEventObjectPaletteNull29[16] = {}; const u32 gEventObjectPic_MayMachBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike.4bpp"); const u32 gEventObjectPic_MayAcroBike[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike.4bpp"); const u32 gEventObjectPic_MaySurfing[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing.4bpp"); diff --git a/src/field_door.c b/src/field_door.c index 337ab20c79..b4794349cd 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -32,107 +32,107 @@ struct DoorAnimFrame static bool8 ShouldUseMultiCorridorDoor(void); static const u8 sDoorAnimTiles_Littleroot[] = INCBIN_U8("graphics/door_anims/littleroot.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette1[16] = {}; static const u8 sDoorAnimTiles_BirchsLab[] = INCBIN_U8("graphics/door_anims/birchs_lab.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette2[16] = {}; static const u8 sDoorAnimTiles_FallarborLightRoof[] = INCBIN_U8("graphics/door_anims/fallarbor_light_roof.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette3[16] = {}; static const u8 sDoorAnimTiles_Lilycove[] = INCBIN_U8("graphics/door_anims/lilycove.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette4[16] = {}; static const u8 sDoorAnimTiles_LilycoveWooden[] = INCBIN_U8("graphics/door_anims/lilycove_wooden.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette5[16] = {}; static const u8 sDoorAnimTiles_General[] = INCBIN_U8("graphics/door_anims/general.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette6[16] = {}; static const u8 sDoorAnimTiles_PokeCenter[] = INCBIN_U8("graphics/door_anims/poke_center.4bpp"); static const u8 sDoorAnimTiles_Gym[] = INCBIN_U8("graphics/door_anims/gym.4bpp"); static const u8 sDoorAnimTiles_PokeMart[] = INCBIN_U8("graphics/door_anims/poke_mart.4bpp"); static const u8 sDoorAnimTiles_RustboroTan[] = INCBIN_U8("graphics/door_anims/rustboro_tan.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette7[16] = {}; static const u8 sDoorAnimTiles_RustboroGray[] = INCBIN_U8("graphics/door_anims/rustboro_gray.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette8[16] = {}; static const u8 sDoorAnimTiles_Oldale[] = INCBIN_U8("graphics/door_anims/oldale.4bpp"); -asm(".space 0x5900"); +static const u8 sFiller1[0x5900] = {}; static const u8 sDoorAnimTiles_UnusedTops[] = INCBIN_U8("graphics/door_anims/unused_top.4bpp"); -asm(".space 0x140"); +static const u8 sFiller2[0x140] = {}; static const u8 sDoorAnimTiles_UnusedBottoms[] = INCBIN_U8("graphics/door_anims/unused_bottom.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette11[16] = {}; static const u8 sDoorAnimTiles_Mauville[] = INCBIN_U8("graphics/door_anims/mauville.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette12[16] = {}; static const u8 sDoorAnimTiles_Verdanturf[] = INCBIN_U8("graphics/door_anims/verdanturf.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette13[16] = {}; static const u8 sDoorAnimTiles_Slateport[] = INCBIN_U8("graphics/door_anims/slateport.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette14[16] = {}; static const u8 sDoorAnimTiles_Dewford[] = INCBIN_U8("graphics/door_anims/dewford.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette15[16] = {}; static const u8 sDoorAnimTiles_Contest[] = INCBIN_U8("graphics/door_anims/contest.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette16[16] = {}; static const u8 sDoorAnimTiles_Mossdeep[] = INCBIN_U8("graphics/door_anims/mossdeep.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette17[16] = {}; static const u8 sDoorAnimTiles_SootopolisPeakedRoof[] = INCBIN_U8("graphics/door_anims/sootopolis_peaked_roof.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette18[16] = {}; static const u8 sDoorAnimTiles_Sootopolis[] = INCBIN_U8("graphics/door_anims/sootopolis.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette19[16] = {}; static const u8 sDoorAnimTiles_PokemonLeague[] = INCBIN_U8("graphics/door_anims/pokemon_league.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette20[16] = {}; static const u8 sDoorAnimTiles_Pacifidlog[] = INCBIN_U8("graphics/door_anims/pacifidlog.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette21[16] = {}; static const u8 sDoorAnimTiles_BattleTowerCorridor[] = INCBIN_U8("graphics/door_anims/battle_tower_corridor.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette22[16] = {}; static const u8 sDoorAnimTiles_CyclingRoad[] = INCBIN_U8("graphics/door_anims/cycling_road.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette23[16] = {}; static const u8 sDoorAnimTiles_LilycoveDeptStore[] = INCBIN_U8("graphics/door_anims/lilycove_dept_store.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette24[16] = {}; static const u8 sDoorAnimTiles_SafariZone[] = INCBIN_U8("graphics/door_anims/safari_zone.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette25[16] = {}; static const u8 sDoorAnimTiles_MossdeepSpaceCenter[] = INCBIN_U8("graphics/door_anims/mossdeep_space_center.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette26[16] = {}; static const u8 sDoorAnimTiles_CableClub[] = INCBIN_U8("graphics/door_anims/cable_club.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette27[16] = {}; static const u8 sDoorAnimTiles_AbandonedShip[] = INCBIN_U8("graphics/door_anims/abandoned_ship.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette28[16] = {}; static const u8 sDoorAnimTiles_FallarborDarkRoof[] = INCBIN_U8("graphics/door_anims/fallarbor_dark_roof.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette29[16] = {}; static const u8 sDoorAnimTiles_AbandonedShipRoom[] = INCBIN_U8("graphics/door_anims/abandoned_ship_room.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette30[16] = {}; static const u8 sDoorAnimTiles_LilycoveDeptStoreElevator[] = INCBIN_U8("graphics/door_anims/lilycove_dept_store_elevator.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette31[16] = {}; static const u8 sDoorAnimTiles_BattleTowerOld[] = INCBIN_U8("graphics/door_anims/battle_tower_old.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette32[16] = {}; static const u8 sDoorAnimTiles_BattleTowerElevator[] = INCBIN_U8("graphics/door_anims/battle_tower_elevator.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette33[16] = {}; static const u8 sDoorAnimTiles_34[] = INCBIN_U8("graphics/door_anims/unknown.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette34[16] = {}; static const u8 sDoorAnimTiles_BattleDome[] = INCBIN_U8("graphics/door_anims/battle_dome.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette35[16] = {}; static const u8 sDoorAnimTiles_BattleFactory[] = INCBIN_U8("graphics/door_anims/battle_factory.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette36[16] = {}; static const u8 sDoorAnimTiles_BattleTower[] = INCBIN_U8("graphics/door_anims/battle_tower.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette37[16] = {}; static const u8 sDoorAnimTiles_BattleArena[] = INCBIN_U8("graphics/door_anims/battle_arena.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette38[16] = {}; static const u8 sDoorAnimTiles_BattleArenaLobby[] = INCBIN_U8("graphics/door_anims/battle_arena_lobby.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette39[16] = {}; static const u8 sDoorAnimTiles_BattleDomeLobby[] = INCBIN_U8("graphics/door_anims/battle_dome_lobby.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette40[16] = {}; static const u8 sDoorAnimTiles_BattlePalaceLobby[] = INCBIN_U8("graphics/door_anims/battle_palace_lobby.4bpp"); static const u8 sDoorAnimTiles_BattleTent[] = INCBIN_U8("graphics/door_anims/battle_tent.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette41[16] = {}; static const u8 sDoorAnimTiles_BattleDomeCorridor[] = INCBIN_U8("graphics/door_anims/battle_dome_corridor.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette42[16] = {}; static const u8 sDoorAnimTiles_BattleTowerMultiCorridor[] = INCBIN_U8("graphics/door_anims/battle_tower_multi_corridor.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette43[16] = {}; static const u8 sDoorAnimTiles_BattleFrontier[] = INCBIN_U8("graphics/door_anims/battle_frontier.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette44[16] = {}; static const u8 sDoorAnimTiles_BattleFrontierSliding[] = INCBIN_U8("graphics/door_anims/battle_frontier_sliding.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette45[16] = {}; static const u8 sDoorAnimTiles_BattleDomePreBattleRoom[] = INCBIN_U8("graphics/door_anims/battle_dome_pre_battle_room.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette46[16] = {}; static const u8 sDoorAnimTiles_BattleTentInterior[] = INCBIN_U8("graphics/door_anims/battle_tent_interior.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette47[16] = {}; static const u8 sDoorAnimTiles_TrainerHillLobbyElevator[] = INCBIN_U8("graphics/door_anims/trainer_hill_lobby_elevator.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette48[16] = {}; static const u8 sDoorAnimTiles_TrainerHillRoofElevator[] = INCBIN_U8("graphics/door_anims/trainer_hill_roof_elevator.4bpp"); -asm(".space 32"); +static const u16 sDoorNullPalette49[16] = {}; static const struct DoorAnimFrame sDoorOpenAnimFrames[] = { From 9a6c2c25d08ef157cc4800014651bd0c679f6fc5 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 26 Jan 2020 04:02:15 -0500 Subject: [PATCH 6/6] Add some capacity constants --- include/constants/items.h | 4 ++++ src/item.c | 32 ++++++++++++++++---------------- src/shop.c | 4 ++-- src/slot_machine.c | 17 +++++++++-------- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/include/constants/items.h b/include/constants/items.h index db3474a728..c238169010 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -491,6 +491,10 @@ #define NUM_TECHNICAL_MACHINES 50 #define NUM_HIDDEN_MACHINES 8 +#define MAX_BAG_ITEM_CAPACITY 99 +#define MAX_PC_ITEM_CAPACITY 999 +#define MAX_BERRY_CAPACITY 999 + // Check if the item is one that can be used on a Pokemon. #define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2) diff --git a/src/item.c b/src/item.c index 61069ca736..44b73802bc 100644 --- a/src/item.c +++ b/src/item.c @@ -202,9 +202,9 @@ bool8 CheckBagHasSpace(u16 itemId, u16 count) pocket = ItemId_GetPocket(itemId) - 1; if (pocket != BERRIES_POCKET) - slotCapacity = 99; + slotCapacity = MAX_BAG_ITEM_CAPACITY; else - slotCapacity = 999; + slotCapacity = MAX_BERRY_CAPACITY; // Check space in any existing item slots that already contain this item for (i = 0; i < gBagPockets[pocket].capacity; i++) @@ -422,9 +422,9 @@ bool8 AddBagItem(u16 itemId, u16 count) memcpy(newItems, itemPocket->itemSlots, itemPocket->capacity * sizeof(struct ItemSlot)); if (pocket != BERRIES_POCKET) - slotCapacity = 99; + slotCapacity = MAX_BAG_ITEM_CAPACITY; else - slotCapacity = 999; + slotCapacity = MAX_BERRY_CAPACITY; for (i = 0; i < itemPocket->capacity; i++) { @@ -667,15 +667,15 @@ bool8 AddPCItem(u16 itemId, u16 count) if (newItems[i].itemId == itemId) { ownedCount = GetPCItemQuantity(&newItems[i].quantity); - if (ownedCount + count <= 999) + if (ownedCount + count <= MAX_PC_ITEM_CAPACITY) { SetPCItemQuantity(&newItems[i].quantity, ownedCount + count); memcpy(gSaveBlock1Ptr->pcItems, newItems, sizeof(gSaveBlock1Ptr->pcItems)); Free(newItems); return TRUE; } - count += ownedCount - 999; - SetPCItemQuantity(&newItems[i].quantity, 999); + count += ownedCount - MAX_PC_ITEM_CAPACITY; + SetPCItemQuantity(&newItems[i].quantity, MAX_PC_ITEM_CAPACITY); if (count == 0) { memcpy(gSaveBlock1Ptr->pcItems, newItems, sizeof(gSaveBlock1Ptr->pcItems)); @@ -883,10 +883,10 @@ static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count) { if (items[i] == itemId || items[i] == ITEM_NONE) { - if (quantities[i] + count <= 99) + if (quantities[i] + count <= MAX_BAG_ITEM_CAPACITY) return TRUE; - count = (quantities[i] + count) - 99; + count = (quantities[i] + count) - MAX_BAG_ITEM_CAPACITY; if (count == 0) return TRUE; } @@ -910,13 +910,13 @@ bool8 AddPyramidBagItem(u16 itemId, u16 count) for (i = 0; i < PYRAMID_BAG_ITEMS_COUNT; i++) { - if (newItems[i] == itemId && newQuantities[i] < 99) + if (newItems[i] == itemId && newQuantities[i] < MAX_BAG_ITEM_CAPACITY) { newQuantities[i] += count; - if (newQuantities[i] > 99) + if (newQuantities[i] > MAX_BAG_ITEM_CAPACITY) { - count = newQuantities[i] - 99; - newQuantities[i] = 99; + count = newQuantities[i] - MAX_BAG_ITEM_CAPACITY; + newQuantities[i] = MAX_BAG_ITEM_CAPACITY; } else { @@ -936,10 +936,10 @@ bool8 AddPyramidBagItem(u16 itemId, u16 count) { newItems[i] = itemId; newQuantities[i] = count; - if (newQuantities[i] > 99) + if (newQuantities[i] > MAX_BAG_ITEM_CAPACITY) { - count = newQuantities[i] - 99; - newQuantities[i] = 99; + count = newQuantities[i] - MAX_BAG_ITEM_CAPACITY; + newQuantities[i] = MAX_BAG_ITEM_CAPACITY; } else { diff --git a/src/shop.c b/src/shop.c index 6e6c10e430..e1f9ef534b 100755 --- a/src/shop.c +++ b/src/shop.c @@ -994,9 +994,9 @@ static void Task_BuyHowManyDialogueInit(u8 taskId) maxQuantity = GetMoney(&gSaveBlock1Ptr->money) / gShopDataPtr->totalCost; - if (maxQuantity > 99) + if (maxQuantity > MAX_BAG_ITEM_CAPACITY) { - gShopDataPtr->maxQuantity = 99; + gShopDataPtr->maxQuantity = MAX_BAG_ITEM_CAPACITY; } else { diff --git a/src/slot_machine.c b/src/slot_machine.c index a7dcd1613d..db1291ceb2 100644 --- a/src/slot_machine.c +++ b/src/slot_machine.c @@ -24,6 +24,7 @@ #include "main_menu.h" #include "bg.h" #include "window.h" +#include "constants/coins.h" // Text extern const u8 gText_YouDontHaveThreeCoins[]; @@ -974,7 +975,7 @@ static bool8 SlotAction4(struct Task *task) { sub_8104CAC(0); sSlotMachine->state = 5; - if (sSlotMachine->coins >= 9999) + if (sSlotMachine->coins >= MAX_COINS) sSlotMachine->state = 23; return TRUE; } @@ -1186,8 +1187,8 @@ static bool8 SlotAction_CheckMatches(struct Task *task) { sub_8104CAC(3); sSlotMachine->state = 20; - if ((sSlotMachine->netCoinLoss += sSlotMachine->bet) > 9999) - sSlotMachine->netCoinLoss = 9999; + if ((sSlotMachine->netCoinLoss += sSlotMachine->bet) > MAX_COINS) + sSlotMachine->netCoinLoss = MAX_COINS; } return FALSE; } @@ -1693,7 +1694,7 @@ static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task) if (IsFanfareTaskInactive()) PlaySE(SE_PIN); sSlotMachine->payout--; - if (sSlotMachine->coins < 9999) + if (sSlotMachine->coins < MAX_COINS) sSlotMachine->coins++; task->data[1] = 8; if (gMain.heldKeys & A_BUTTON) @@ -1703,8 +1704,8 @@ static bool8 AwardPayoutAction_GivePayoutToPlayer(struct Task *task) { PlaySE(SE_PIN); sSlotMachine->coins += sSlotMachine->payout; - if (sSlotMachine->coins > 9999) - sSlotMachine->coins = 9999; + if (sSlotMachine->coins > MAX_COINS) + sSlotMachine->coins = MAX_COINS; sSlotMachine->payout = 0; } if (sSlotMachine->payout == 0) @@ -3291,9 +3292,9 @@ static void sub_8104F8C(void) s16 i; s16 x; - for (x = 203, i = 1; i < 10000; i *= 10, x -= 7) + for (x = 203, i = 1; i <= MAX_COINS; i *= 10, x -= 7) sub_8104FF4(x, 23, 0, i); - for (x = 235, i = 1; i < 10000; i *= 10, x -= 7) + for (x = 235, i = 1; i <= MAX_COINS; i *= 10, x -= 7) sub_8104FF4(x, 23, 1, i); }