diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-26 01:34:08 -0400 |
| commit | e638cdb74cabff705d4879568e74b8ed43da64e1 (patch) | |
| tree | 02869ee6058c1b7d00d554af86e6eb6b197cd660 /contents.asm | |
| parent | b8da3874bbc06e858b7b2d7a602fe33baa046e93 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
Merge remote-tracking branch 'origin/master' into pngs-kind-of
Conflicts:
INSTALL.md
Diffstat (limited to 'contents.asm')
| -rw-r--r-- | contents.asm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/contents.asm b/contents.asm index af277dcad..0d55c2dcd 100644 --- a/contents.asm +++ b/contents.asm @@ -34,7 +34,6 @@ POKEDEX_ENTRIES_4 EQU $74 ; engine/events.o ; engine/scripting.o ; engine/events_2.o - EVENTS EQU $25 |