PikalaxALT 4d8f66774e Merge branch 'master' into trainers

2019-10-18 10:20:01 -04:00

..

macros

Merge branch 'master' into trainers

2019-10-18 10:20:01 -04:00

battle_1.s

…

battle_2.s

…

battle_anim_effects_1.s

…

battle_anim_effects_2.s

…

battle_anim_effects_3.s

…

battle_anim_special.s

…

battle_anim_status_effects.s

…

battle_anim.s

…

battle_controller_oak.s

…

battle_controller_pokedude.s

…

battle_interface.s

…

battle_message.s

…

battle_setup.s

Merge branch 'master' into trainers

2019-10-18 10:20:01 -04:00

battle_tower.s

…

berry_crush_2.s

…

berry_crush_3.s

…

berry_crush.s

…

bike.s

…

box_party_pokemon_dropdown.s

…

cable_club.s

…

clear_save_data_screen.s

…

crt0.s

…

dodrio_berry_picking_2.s

…

dodrio_berry_picking.s

…

easy_chat.s

…

electric.s

…

event_data.s

…

evolution_graphics.s

…

evolution_scene.s

…

field_camera.s

…

field_control_avatar.s

…

field_door.s

…

field_effect_helpers.s

…

field_effect.s

…

field_ground_effect.s

…

field_map_obj.s

…

field_message_box.s

…

field_player_avatar.s

…

field_screen_effect.s

…

field_specials.s

…

field_tasks.s

…

field_weather_effects.s

…

field_weather.s

…

fighting.s

…

fire.s

…

fldeff_cut.s

…

fldeff_flash.s

…

hall_of_fame.s

…

ice.s

…

item_menu.s

…

learn_move.s

…

libagbsyscall.s

…

libgcnmultiboot.s

…

librfu.s

…

link_rfu_2.s

…

link_rfu_3.s

…

link_rfu.s

…

m4a_1.s

…

macros.inc

…

map_name_popup.s

…

map_obj_80688E4.s

…

mon_markings.s

…

naming_screen.s

…

option_menu.s

…

overworld.s

…

party_menu.s

…

pc_screen_effect.s

…

poison.s

…

pokeball.s

…

pokedex_screen.s

…

pokemon_jump_2.s

…

pokemon_jump.s

…

pokemon_size_record.s

…

pokemon_special_anim.s

…

pokemon_storage_system.s

…

pokemon_summary_screen.s

…

post_battle_event_funcs.s

…

region_map.s

…

rom_header.inc

…

save_failed_screen.s

…

save_menu_util.s

…

script_menu.s

…

script_movement.s

…

script_pokemon_util_80A0058.s

…

script_pokemon_util_80BF8FC.s

…

shop.s

…

smokescreen.s

…

text_printer.s

…

trade.s

…

trainer_card.s

…

trainer_see.s

…

union_room_chat.s

…

water.s

…

wild_encounter.s

…