summaryrefslogtreecommitdiff
path: root/contents.asm
diff options
context:
space:
mode:
authorJimB16 <f1@jimb.de>2015-10-26 03:26:53 +0100
committerJimB16 <f1@jimb.de>2015-10-26 03:26:53 +0100
commit9a9cb38e39c991e102a1c6da7e8e16b2a1c61e07 (patch)
tree46c064628b3d8015da22d6396b3c711e80646745 /contents.asm
parent3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (diff)
parent0d17d4a75866d053f5e0b48c66deb2508071d98b (diff)
merge with newest update
Diffstat (limited to 'contents.asm')
-rw-r--r--contents.asm1
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