Marcus Huderle e9a3cc6d51 Merge remote-tracking branch 'upstream/master' into move-tutor ...

# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c

2019-03-17 17:20:40 -05:00

..

macros

Fix typos

2019-03-03 09:31:47 -06:00

crt0.s

move pokeball data to rom

2017-12-02 21:27:00 +01:00

libagbsyscall.s

make VBlankIntr() match

2017-02-17 10:52:03 -08:00

libgcnmultiboot.s

.s -> .inc

2016-11-01 08:29:13 -07:00

librfu_intr.s

Decompile up to ARM functions in librfu, split ARM interrupt functions into their own .s

2017-09-12 20:11:51 -06:00

librfu.s

Reformat asm/librfu.s to clarify what is being accessed in pc-relative loads

2017-12-07 00:29:58 -05:00

m4a_1.s

port siirtc from pokeruby

2016-11-02 14:06:41 -07:00

macros.inc

Extract door animations

2018-01-07 01:29:26 -06:00

menu_specialized.s

Change filename to something more descriptive

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

pokenav.s

pokenav

2019-02-23 13:34:01 +01:00

rom_81D1C44.s

Split rom asm file in half

2019-03-04 23:26:51 -05:00

rom_8011DC0.s

Fix backwards names

2019-02-26 22:30:40 -05:00

rom_header.inc

Use gbafix to generate header and checksum

2018-08-29 16:34:59 -05:00

use_pokeblock.s

3.5 asm left

2018-12-17 23:00:08 +01:00