Merge branch 'master' into link

This commit is contained in:
PikalaxALT committed 2017-11-19 00:07:56 -05:00
commit d6d315d817
59 files changed
+4682 -7627

No files matched your search

+3
View File
@@ -1,7 +1,10 @@
#ifndef GUARD_FLAGS_H
#define GUARD_FLAGS_H
#define FLAG_PENDING_DAYCARE_EGG 0x86
#define FLAG_TRAINER_FLAG_START 0x500
#define TRAINERS_FLAG_NO 0x356
#define CODE_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860