diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-07-16 11:11:50 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-07-16 11:11:50 -0500 |
| commit | 707ba908f780d42e1f26af85bef0bf0eb478b877 (patch) | |
| tree | 88fba78e2d9c590c4860a2e63eed00a2e29d4005 /constants.asm | |
| parent | ce3ec76762d9e2f0c560e2ea7868678418883143 (diff) | |
| parent | 28de20b9f6e1db97ec69643a907f78562f90ec74 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'constants.asm')
| -rw-r--r-- | constants.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/constants.asm b/constants.asm index 554f89ca..cc636558 100644 --- a/constants.asm +++ b/constants.asm @@ -29,5 +29,5 @@ INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" INCLUDE "constants/event_constants.asm" INCLUDE "constants/event_macros.asm" -INCLUDE "constants/pikachu_emotion_constants.asm" INCLUDE "constants/text_constants.asm" +INCLUDE "constants/pikachu_emotion_constants.asm" |