Marcus Huderle b24559d69b Merge remote-tracking branch 'upstream/master' into shop ...

# Conflicts:
#	asm/shop.s

2018-10-13 10:22:58 -05:00

..

battle_frontier

…

graphics

Merge pull request #304 from Slawter666/graphics

2018-09-05 20:32:23 -05:00

layouts

Formatting

2018-06-20 19:54:21 -05:00

maps

Document battle dome.

2018-08-25 19:59:47 +02:00

pokenav

…

scripts

Revert "Rename some specials"

2018-08-11 15:16:41 -07:00

text

Continue documentation and cleanup of pokemon_summary_screen

2018-08-15 11:51:47 -07:00

tilesets

Re-dump tileset images as RGB-indexed, rather than greyscale

2018-09-16 11:07:48 -05:00

battle_ai_scripts.s

Label various battle scripts

2018-09-01 20:00:13 +02:00

battle_anim_80A9C70.s

Decompile battle_anim_80A9C70

2018-10-07 15:39:46 +02:00

battle_anim_80FE840.s

battle anim 80a5c6c decompiled

2018-10-07 12:32:20 +02:00

battle_anim_815A0D4.s

Sync battle anim labels with pokeruby

2018-09-12 22:58:03 +02:00

battle_anim_8170478.s

Sync battle anim labels with pokeruby

2018-09-12 22:58:03 +02:00

battle_anim_scripts.s

port 80d51ac

2018-10-07 17:45:37 +02:00

battle_anims.s

…

battle_frontier_1.s

Convert battle dome data to C

2018-08-26 13:40:36 +01:00

battle_frontier_2.s

Battle Factory is decompiled and documented.

2018-09-10 01:01:39 +02:00

battle_scripts_1.s

Merge pull request #320 from DizzyEggg/anims

2018-10-06 08:20:41 -05:00

battle_scripts_2.s

Document battle animation scripts.

2018-09-10 21:19:19 +02:00

battle_tower.s

…

berry_fix.mb

…

cable_car.s

…

cable_club.s

…

contest_ai_scripts.s

…

contest_link_80F57C4.s

…

contest_opponents.inc

…

contest_painting.s

…

contest.s

…

cry_id_table.inc

…

cute_sketch.s

…

data2c.s

Move battle_bg data to C

2018-09-11 23:37:47 +01:00

easy_chat.s

…

event_scripts.s

Decompile a bit of pokemon storarage system

2018-08-12 16:40:31 +02:00

fanfares.s

…

field_effect_helpers.s

…

field_effect_misc.s

…

field_effect_scripts.s

cut field effect is decompiled and documented

2018-06-16 14:04:29 +02:00

field_screen.s

…

fonts.s

…

io_reg.s

…

layouts_table.inc

Formatting

2018-06-20 19:54:21 -05:00

layouts.inc

Move 'map attributes' into 'layouts'

2018-06-20 19:54:21 -05:00

librfu_rodata.s

…

librtc_rodata.s

…

map_events.s

Sync bg_event macros with pokeruby

2018-07-11 11:12:26 -05:00

maps.s

Use map type constants in map headers

2018-07-12 22:39:38 -05:00

multiboot_berry_glitch_fix.s

…

multiboot_pokemon_colosseum.s

…

mystery_event_msg.s

…

mystery_event_script_cmd_table.s

…

party_menu.s

cut field effect is decompiled and documented

2018-06-16 14:04:29 +02:00

pokedex_area_screen.s

…

pokedex_cry_screen.s

…

pokedex_entries.inc

…

pokedex.s

…

pokemon_colosseum.mb

…

pokemon_storage_system.s

Decompile a bit of pokemon storarage system

2018-08-12 16:40:31 +02:00

pokenav.s

Clean up files and add entries to charmap

2018-07-24 21:18:23 -07:00

rom_8011DC0.s

Clean up files and add entries to charmap

2018-07-24 21:18:23 -07:00

roulette.s

…

script_cmd_table.inc

…

script_menu.s

…

script_pokemon_util_80F87D8.s

…

shop.s

checkpoint

2018-09-06 11:37:45 -05:00

slot_machine.s

Slot machine is decompiled.

2018-09-15 23:19:37 +02:00

smokescreen.s

…

sound_data.s

…

specials.inc

Document battle dome.

2018-08-25 19:59:47 +02:00

text_input_strings.s

Clean up files and add entries to charmap

2018-07-24 21:18:23 -07:00

tilesets.s

…

trade.s

…

trainer_card.s

…

unk_transition.s

…

unknown_jp_62609C.bin

…

unknown_serial_data.bin

…

unknown_serial_data.s

…

use_pokeblock.s

…