Evan 9f2a53eec3 fix merge conflicts

2019-12-04 21:35:31 -07:00

..

bag

…

credits

…

fame_checker

…

field_specials

…

graphics

…

itemfinder

…

layouts

…

main_menu

…

map_preview

…

maps

…

oak_speech

…

pokedex_area_markers

…

script_menu

…

seagallop

…

text

…

tilesets

…

trainer_tower

…

battle_ai_scripts.s

…

battle_anim_effects_misc.s

resolve references

2019-12-04 14:54:52 -07:00

battle_anim_scripts.s

matching up battle_anim_special

2019-12-04 14:54:52 -07:00

battle_bg.s

…

battle_interface.s

…

battle_scripts_1.s

Address review comments

2019-12-04 14:54:50 -07:00

battle_scripts_2.s

…

berry_crush.s

start anim objtemplates

2019-12-04 14:54:52 -07:00

bike.s

…

box_party_pokemon_dropdown.s

Move gText_Decimal to strings.h; dump box_party_pokemon_dropdown rodata

2019-11-11 17:08:21 -05:00

cable_club.s

…

clear_save_data_screen.s

Knock out a few more incbins

2019-11-12 15:20:54 -05:00

data_8471F00.s

Dump data/union_room_chat

2019-12-04 14:54:49 -07:00

decoration_tiles.inc

…

decorations.s

…

event_scripts.s

party_menu fourth quarter

2019-12-04 14:54:50 -07:00

field_effect_helpers.s

Decump SaveStatToString

2019-11-11 09:33:24 -05:00

field_effect_scripts.s

Rename fldeff scripts

2019-11-08 11:27:22 -05:00

field_effect.s

Dump data/field_effects.s

2019-12-04 14:54:51 -07:00

field_ground_effect.s

Disassemble data/field_ground_effect

2019-12-04 14:54:49 -07:00

field_map_obj.s

Poke field_map_obj with a long pole

2019-11-19 15:23:22 -05:00

field_player_avatar.s

Dump data/field_player_avatar.s

2019-12-04 14:54:49 -07:00

field_screen_effect.s

…

field_tasks.s

Knock out a few more incbins

2019-11-12 15:20:54 -05:00

field_weather.s

start anim objtemplates

2019-12-04 14:54:52 -07:00

fldeff_cut.s

Dism data/fldeff_cut.s

2019-11-11 10:14:07 -05:00

fldeff_flash.s

Dump data/fldeff_flash

2019-11-19 16:58:17 -05:00

garbage_8DD2290.bin

get rid of baseroms in graphics.s

2019-12-03 03:26:31 -05:00

graphics.s

fix merge conflicts

2019-12-04 21:35:31 -07:00

item_menu.s

Dump item_menu data

2019-12-04 14:54:49 -07:00

librfu_rodata.s

…

link_rfu_2.s

Disassemble data/link_rfu_2.s

2019-12-04 14:54:49 -07:00

link_rfu_3.s

…

link_rfu.s

Dump link_rfu graphics

2019-12-04 14:54:51 -07:00

map_events.s

…

map_obj_80688E4.s

dism data/map_obj_80688E4

2019-11-20 09:35:11 -05:00

maps.s

…

multiboot_berry_glitch_fix.s

…

multiboot_pokemon_colosseum.s

…

mystery_event_msg.s

…

mystery_event_script_cmd_table.s

…

naming_screen.s

Dump data/naming_screen

2019-11-29 10:51:23 -05:00

overworld.s

…

pokedex_screen.s

…

pokemon_colosseum.mb

…

pokemon_jump.s

start anim objtemplates

2019-12-04 14:54:52 -07:00

pokemon_special_anim.s

Dump data/pokemon_special_anim.s

2019-12-04 14:54:49 -07:00

pokemon_storage_system.s

Fix filenames

2019-12-04 14:54:51 -07:00

pokemon_summary_screen.s

Cleanup

2019-12-04 14:54:51 -07:00

region_map.s

…

save_failed_screen.s

Knock out a few more incbins

2019-11-12 15:20:54 -05:00

script_cmd_table.inc

…

smokescreen.s

Dump smokescreen data

2019-11-19 15:29:57 -05:00

sound_data.s

…

specials.inc

party_menu fourth quarter

2019-12-04 14:54:50 -07:00

strings.s

Dump data/berry_crush

2019-12-04 14:54:51 -07:00

tilesets.s

…

trainer_card.s

get rid of baseroms in graphics.s

2019-12-03 03:26:31 -05:00

trainer_see.s

…

union_room_chat.s

Dump data/union_room_chat

2019-12-04 14:54:49 -07:00

unknown_serial_data.bin

…

unknown_serial_data.s

Decump SaveStatToString

2019-11-11 09:33:24 -05:00