Merge branch 'master' into document-eventscripts

This commit is contained in:
GriffinR
2019-09-26 15:03:22 -04:00
committed by GitHub
17 changed files with 442 additions and 482 deletions

View File

@@ -1,8 +1,11 @@
#include "constants/global.h"
#include "constants/battle.h"
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
#include "constants/berry.h"
#include "constants/contest.h"
#include "constants/daycare.h"
#include "constants/decorations.h"
#include "constants/easy_chat.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
@@ -10,26 +13,24 @@
#include "constants/field_specials.h"
#include "constants/flags.h"
#include "constants/game_stat.h"
#include "constants/decorations.h"
#include "constants/item.h"
#include "constants/items.h"
#include "constants/heal_locations.h"
#include "constants/layouts.h"
#include "constants/lilycove_lady.h"
#include "constants/map_scripts.h"
#include "constants/maps.h"
#include "constants/metatile_labels.h"
#include "constants/moves.h"
#include "constants/pokemon.h"
#include "constants/script_menu.h"
#include "constants/secret_bases.h"
#include "constants/songs.h"
#include "constants/species.h"
#include "constants/trainer_hill.h"
#include "constants/trainers.h"
#include "constants/vars.h"
#include "constants/weather.h"
#include "constants/trainer_hill.h"
#include "constants/lilycove_lady.h"
#include "constants/battle.h"
#include "constants/metatile_labels.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"