Merge branch 'master' into decompile_use_pokeblock

This commit is contained in:
DizzyEggg
2017-12-16 11:42:59 +01:00
133 changed files with 17392 additions and 19451 deletions

View File

@@ -1,8 +1,12 @@
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/vars.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
.include "constants/variables.inc"
.include "constants/flags.inc"
.section script_data, "aw", %progbits