Marcus Huderle a5ee2c14fd Merge remote-tracking branch 'upstream/master' into use_pokeblock ...

# Conflicts:
#	include/menu_specialized.h

2019-03-23 10:14:31 -05:00

..

graphics/fonts

…

layouts

Give proper names to dynamic map layouts

2019-02-09 09:57:30 -06:00

maps

Document Field Effects and some related text

2019-03-23 09:57:37 -05:00

scripts

EventScript and Text Documentation

2019-03-23 09:57:37 -05:00

text

Document Field Effects and some related text

2019-03-23 09:57:37 -05:00

tilesets

Fully document tileset animations

2019-02-08 15:07:42 -06:00

battle_ai_scripts.s

…

battle_anim_scripts.s

Document more battle anim effects

2018-12-31 16:53:38 -06:00

battle_scripts_1.s

Rename an erroneously named battlescript

2019-03-05 17:06:29 +01:00

battle_scripts_2.s

…

berry_fix.mb

…

contest_ai_scripts.s

…

contest_link_80F57C4.s

…

contest_opponents.inc

…

contest_painting_effects.s

…

contest.s

Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present.

2019-01-06 13:41:18 -08:00

ereader_helpers.s

Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c

2019-03-22 14:16:26 -05:00

ereader_screen.s

Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c

2019-03-22 14:16:26 -05:00

event_scripts.s

Document Field Effects and some related text

2019-03-23 09:57:37 -05:00

field_effect_scripts.s

Document Field Effects and some related text

2019-03-23 09:57:37 -05:00

fonts.s

…

io_reg.s

Reverse engineered many of the multiplayer events

2019-02-10 20:42:50 -05:00

librfu_rodata.s

…

librtc_rodata.s

…

map_events.s

I guess I'm documenting Trainer Hill now

2019-02-27 21:31:05 -05:00

maps.s

I guess I'm documenting Trainer Hill now

2019-02-27 21:31:05 -05:00

menu_specialized.s

Change filename to something more descriptive

2019-03-08 02:17:01 -05:00

mossdeep_gym.s

…

multiboot_berry_glitch_fix.s

…

multiboot_pokemon_colosseum.s

…

mystery_event_msg.s

Source file part of map script renaming

2019-02-25 08:01:22 -06:00

mystery_event_script_cmd_table.s

…

pokemon_colosseum.mb

…

pokenav.s

More data moved into C code

2019-02-17 23:14:14 -05:00

rom_8011DC0.s

…

script_cmd_table.inc

Clear up misnamed time-based flags and functions

2019-02-12 00:40:34 -06:00

slot_machine.s

fixed issues in data and include dirs

2019-02-28 21:21:56 -06:00

smokescreen.s

…

sound_data.s

…

specials.inc

Rename move tutor to move relearner

2019-03-04 20:56:39 -05:00

text_input_strings.s

…

tilesets.s

…

unknown_jp_62609C.bin

…

unknown_serial_data.bin

…

unknown_serial_data.s

…

use_pokeblock.s

Decompile through sub_8167930.

2019-02-23 09:08:07 -08:00