92301398bc
# Conflicts: # asm/macros/battle_script.inc # data/battle_anim_scripts.s # data/battle_scripts_1.s # include/battle.h # include/battle_controllers.h # include/battle_interface.h # include/config/battle.h # include/constants/battle.h # include/constants/battle_anim.h # include/constants/battle_move_effects.h # include/constants/battle_string_ids.h # include/data.h # include/random.h # sound/cry_tables.inc # src/battle_anim_new.c # src/battle_controller_opponent.c # src/battle_controller_player.c # src/battle_controller_player_partner.c # src/battle_interface.c # src/battle_main.c # src/battle_message.c # src/battle_script_commands.c # src/battle_util.c # src/data/pokemon/form_change_table_pointers.h # src/data/pokemon/species_info.h # src/data/text/move_names.h # test/test_runner_battle.c |
||
|---|---|---|
| .. | ||
| bag | ||
| balls | ||
| battle_anims | ||
| battle_frontier | ||
| battle_interface | ||
| battle_terrain | ||
| battle_transitions | ||
| berries | ||
| berry_blender | ||
| berry_crush | ||
| berry_fix | ||
| birch_speech | ||
| cable_car | ||
| cave_transition | ||
| contest | ||
| credits | ||
| decorations | ||
| diploma | ||
| dodrio_berry_picking | ||
| door_anims | ||
| easy_chat | ||
| evolution_scene | ||
| expansion_intro | ||
| field_effects | ||
| fonts | ||
| frontier_pass | ||
| interface | ||
| intro | ||
| items | ||
| link | ||
| map_popup | ||
| misc | ||
| naming_screen | ||
| object_events | ||
| party_menu | ||
| picture_frame | ||
| pokeblock | ||
| pokedex | ||
| pokemon | ||
| pokemon_jump | ||
| pokemon_storage | ||
| pokenav | ||
| rayquaza_scene | ||
| reset_rtc_screen | ||
| rotating_gates | ||
| roulette | ||
| shop | ||
| slot_machine | ||
| spinda_spots | ||
| starter_choose | ||
| summary_screen | ||
| text_window | ||
| title_screen | ||
| trade | ||
| trainer_card | ||
| trainer_hill | ||
| trainers | ||
| types | ||
| union_room_chat | ||
| unused | ||
| wallclock | ||
| weather | ||
| wireless_status_screen | ||
| wonder_card | ||
| wonder_news | ||