summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-06-29 21:19:45 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-06-29 21:19:45 -0400
commiteefb510a3c442d6997a6a681e919046a775766be (patch)
treea86cb839bc048b210b012fb4962a695dade6bbee /data
parent4e02c236d8594ab81ae46c54d6f1ccc8e7929bea (diff)
Nonmatching sub_8136DC0
Diffstat (limited to 'data')
-rwxr-xr-x[-rw-r--r--]data/use_pokeblock.s29
1 files changed, 0 insertions, 29 deletions
diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s
index 2eabe9ce3..88f8cc336 100644..100755
--- a/data/use_pokeblock.s
+++ b/data/use_pokeblock.s
@@ -3,35 +3,6 @@
.section .rodata
-.ifndef GERMAN
- .align 2
-ConditionUpDownPalette:
- .incbin "graphics/misc/condition_up_down.gbapal"
-
- .align 2
-ConditionUpDownTiles:
- .incbin "graphics/misc/condition_up_down.4bpp"
-.endif
-
-gUnknown_08406118:: @ 8406118
- .4byte 22 @ MON_DATA_COOL
- .4byte 47 @ MON_DATA_TOUGH
- .4byte 33 @ MON_DATA_SMART
- .4byte 24 @ MON_DATA_CUTE
- .4byte 23 @ MON_DATA_BEAUTY
-
- .align 2
-gUnknown_0840612C:: @ 840612C
- obj_pal 0x02030400, 0x0001
-
- .align 2
-gUnknown_08406134:: @ 8406134
- .4byte OtherText_Coolness
- .4byte OtherText_Toughness
- .4byte OtherText_Smartness
- .4byte OtherText_Cuteness
- .4byte OtherText_Beauty
-
.align 2
gSpriteSheet_ConditionUpDown:: @ 8406148
obj_tiles ConditionUpDownTiles, 0x200, 0