summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/items/names.asm4
-rw-r--r--data/pokemon/base_stats/kirinriki.inc4
-rw-r--r--data/tileset_headers.asm5
3 files changed, 1 insertions, 12 deletions
diff --git a/data/items/names.asm b/data/items/names.asm
index 3ae826d..b8d6d75 100644
--- a/data/items/names.asm
+++ b/data/items/names.asm
@@ -1,10 +1,6 @@
INCLUDE "constants.asm"
-; if DEBUG
SECTION "data/items/names.asm", ROMX
-; else
-; SECTION "ItemNames", ROMX[$6FE9], BANK[$01]
-; endc
ItemNames::
db "マスターボール@" ; MASTER_BALL
diff --git a/data/pokemon/base_stats/kirinriki.inc b/data/pokemon/base_stats/kirinriki.inc
index 30b2312..400a807 100644
--- a/data/pokemon/base_stats/kirinriki.inc
+++ b/data/pokemon/base_stats/kirinriki.inc
@@ -6,11 +6,7 @@
db TYPE_DARK, TYPE_NORMAL ; type
db 255 ; catch rate
db 100 ; base exp
-if DEBUG || def(SILVER)
db ITEM_BERRY, ITEM_TAG ; items
-else
- db ITEM_APPLE, ITEM_TAG ; item
-endc
db GENDER_50_50 ; gender ratio
db 100, 4, 70 ; unknown
dn 7, 7 ; sprite dimensions
diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm
index f739d1b..2c00ffe 100644
--- a/data/tileset_headers.asm
+++ b/data/tileset_headers.asm
@@ -1,10 +1,7 @@
INCLUDE "constants.asm"
-; if DEBUG
SECTION "data/tileset_headers.asm", ROMX
-; else
-; SECTION "Tileset Headers", ROMX[$4875], BANK[$03]
-; endc
+
Tilesets::
Tileset_00: ; 0xc88d