summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-09-12 22:59:04 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-09-12 22:59:04 +0200
commita08d9dd451dd87a24b833eef2d3c09daae2a524d (patch)
tree024875f0465dea995ea30a0d30adf2cd73f4d87a /data
parent8a81bd1bce852e58efb9f48f4e8db225a3ee2f15 (diff)
parent095cbbc5c297055d2cb2c01a2c8c04dc7d055cb6 (diff)
Merge branch 'master' into anims
Diffstat (limited to 'data')
-rw-r--r--data/braille_puzzles.s16
-rw-r--r--data/data2b.s219
-rw-r--r--data/data2c.s173
-rw-r--r--data/field_ground_effect.s6
-rw-r--r--data/field_special_scene.s15
-rw-r--r--data/item_use.s21
6 files changed, 0 insertions, 450 deletions
diff --git a/data/braille_puzzles.s b/data/braille_puzzles.s
deleted file mode 100644
index 55dcb3a26..000000000
--- a/data/braille_puzzles.s
+++ /dev/null
@@ -1,16 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_085EFE74:: @ 85EFE74
- .byte 0x04, 0x15, 0x05, 0x15, 0x06, 0x15, 0x07, 0x15
- .byte 0x08, 0x15, 0x09, 0x15, 0x0a, 0x15, 0x0b, 0x15
- .byte 0x0c, 0x15, 0x0c, 0x16, 0x0c, 0x17, 0x0d, 0x17
- .byte 0x0d, 0x18, 0x0d, 0x19, 0x0d, 0x1a, 0x0d, 0x1b
- .byte 0x0c, 0x1b, 0x0c, 0x1c, 0x04, 0x1d, 0x05, 0x1d
- .byte 0x06, 0x1d, 0x07, 0x1d, 0x08, 0x1d, 0x09, 0x1d
- .byte 0x0a, 0x1d, 0x0b, 0x1d, 0x0c, 0x1d, 0x04, 0x1c
- .byte 0x04, 0x1b, 0x03, 0x1b, 0x03, 0x1a, 0x03, 0x19
- .byte 0x03, 0x18, 0x03, 0x17, 0x04, 0x17, 0x04, 0x16
diff --git a/data/data2b.s b/data/data2b.s
deleted file mode 100644
index db378d1a5..000000000
--- a/data/data2b.s
+++ /dev/null
@@ -1,219 +0,0 @@
-#include "constants/items.h"
-#include "constants/moves.h"
-#include "constants/species.h"
-#include "constants/trainers.h"
-#include "constants/pokemon.h"
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gUnknown_082FF1D8:: @ 82FF1D8
- .incbin "graphics/link/minigame_digits.gbapal"
-
- .align 2
-gUnknown_082FF1F8:: @ 82FF1F8
- .incbin "graphics/link/minigame_digits.4bpp.lz"
-
- .align 2
-gUnknown_082FF2B8:: @ 82FF2B8
- .incbin "graphics/link/minigame_digits2.4bpp.lz"
-
- .align 2
-gUnknown_082FF3A8:: @ 82FF3A8
- obj_frame_tiles gHeap + 0x8000, 0x800
- obj_frame_tiles gHeap + 0x8800, 0x800
- obj_frame_tiles gHeap + 0x9000, 0x800
- obj_frame_tiles gHeap + 0x9800, 0x800
-
- .align 2
-gUnknown_082FF3C8:: @ 82FF3C8
- obj_frame_tiles gHeap + 0xA000, 0x800
- obj_frame_tiles gHeap + 0xA800, 0x800
- obj_frame_tiles gHeap + 0xB000, 0x800
- obj_frame_tiles gHeap + 0xB800, 0x800
-
- .align 2
-gUnknown_082FF3E8:: @ 82FF3E8
- obj_frame_tiles gHeap + 0xC000, 0x800
- obj_frame_tiles gHeap + 0xC800, 0x800
- obj_frame_tiles gHeap + 0xD000, 0x800
- obj_frame_tiles gHeap + 0xD800, 0x800
-
- .align 2
-gUnknown_082FF408:: @ 82FF408
- obj_frame_tiles gHeap + 0xE000, 0x800
- obj_frame_tiles gHeap + 0xE800, 0x800
- obj_frame_tiles gHeap + 0xF000, 0x800
- obj_frame_tiles gHeap + 0xF800, 0x800
-
- .align 2
-gUnknown_082FF428:: @ 82FF428
- obj_frame_tiles gTrainerBackPic_Brendan, 0x0800
- obj_frame_tiles gTrainerBackPic_Brendan + 0x0800, 0x0800
- obj_frame_tiles gTrainerBackPic_Brendan + 0x1000, 0x0800
- obj_frame_tiles gTrainerBackPic_Brendan + 0x1800, 0x0800
-
- .align 2
-gUnknown_082FF448:: @ 82FF448
- obj_frame_tiles gTrainerBackPic_May, 0x0800
- obj_frame_tiles gTrainerBackPic_May + 0x0800, 0x0800
- obj_frame_tiles gTrainerBackPic_May + 0x1000, 0x0800
- obj_frame_tiles gTrainerBackPic_May + 0x1800, 0x0800
-
- .align 2
-gUnknown_082FF468:: @ 82FF468
- obj_frame_tiles gTrainerBackPic_Red, 0x0800
- obj_frame_tiles gTrainerBackPic_Red + 0x0800, 0x0800
- obj_frame_tiles gTrainerBackPic_Red + 0x1000, 0x0800
- obj_frame_tiles gTrainerBackPic_Red + 0x1800, 0x0800
- obj_frame_tiles gTrainerBackPic_Red + 0x2000, 0x0800
-
- .align 2
-gUnknown_082FF490:: @ 82FF490
- obj_frame_tiles gTrainerBackPic_Leaf, 0x0800
- obj_frame_tiles gTrainerBackPic_Leaf + 0x0800, 0x0800
- obj_frame_tiles gTrainerBackPic_Leaf + 0x1000, 0x0800
- obj_frame_tiles gTrainerBackPic_Leaf + 0x1800, 0x0800
- obj_frame_tiles gTrainerBackPic_Leaf + 0x2000, 0x0800
-
- .align 2
-gUnknown_082FF4B8:: @ 82FF4B8
- obj_frame_tiles gTrainerBackPic_RubySapphireBrendan, 0x0800
- obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x0800, 0x0800
- obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1000, 0x0800
- obj_frame_tiles gTrainerBackPic_RubySapphireBrendan + 0x1800, 0x0800
-
- .align 2
-gUnknown_082FF4D8:: @ 82FF4D8
- obj_frame_tiles gTrainerBackPic_RubySapphireMay, 0x0800
- obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x0800, 0x0800
- obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1000, 0x0800
- obj_frame_tiles gTrainerBackPic_RubySapphireMay + 0x1800, 0x0800
-
- .align 2
-gUnknown_082FF4F8:: @ 82FF4F8
- obj_frame_tiles gTrainerBackPic_Wally, 0x0800
- obj_frame_tiles gTrainerBackPic_Wally + 0x0800, 0x0800
- obj_frame_tiles gTrainerBackPic_Wally + 0x1000, 0x0800
- obj_frame_tiles gTrainerBackPic_Wally + 0x1800, 0x0800
-
- .align 2
-gUnknown_082FF518:: @ 82FF518
- obj_frame_tiles gTrainerBackPic_Steven, 0x0800
- obj_frame_tiles gTrainerBackPic_Steven + 0x0800, 0x0800
- obj_frame_tiles gTrainerBackPic_Steven + 0x1000, 0x0800
- obj_frame_tiles gTrainerBackPic_Steven + 0x1800, 0x0800
-
- .align 2
-gAnimCmd_General_Frame0:: @ 82FF538
- obj_image_anim_frame 0, 0
- obj_image_anim_end
-
- .align 2
-AnimCmd_82FF540:: @ 82FF540
- .2byte 0x0003, 0x0000, 0xffff, 0x0000
-
- .align 2
-gUnknown_082FF548:: @ 82FF548
- .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF558:: @ 82FF558
- .2byte 0xff00, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF568:: @ 82FF568
- .2byte 0x0028, 0x0028, 0x0000, 0x0000, 0x0012, 0x0012, 0x0c00, 0x0000
- .2byte 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF580:: @ 82FF580
- .2byte 0xfffe, 0xfffe, 0x1200, 0x0000, 0xfff0, 0xfff0, 0x0f00, 0x0000
- .2byte 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF598:: @ 82FF598
- .2byte 0x00a0, 0x0100, 0x0000, 0x0000, 0x0004, 0x0000, 0x0800, 0x0000
- .2byte 0xfffc, 0x0000, 0x0800, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF5B8:: @ 82FF5B8
- .2byte 0x0002, 0x0002, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF5C8:: @ 82FF5C8
- .2byte 0xfffe, 0xfffe, 0x1400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF5D8:: @ 82FF5D8
- .2byte 0x0100, 0x0100, 0x0000, 0x0000, 0xfff0, 0xfff0, 0x0900, 0x0000
- .2byte 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF5F0:: @ 82FF5F0
- .2byte 0x0004, 0x0004, 0x3f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF600:: @ 82FF600
- .2byte 0x0000, 0x0000, 0x05fd, 0x0000, 0x0000, 0x0000, 0x0503, 0x0000
- .2byte 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF618:: @ 82FF618
- .4byte gUnknown_082FF548
- .4byte gUnknown_082FF568
- .4byte gUnknown_082FF580
- .4byte gUnknown_082FF598
- .4byte gUnknown_082FF5B8
- .4byte gUnknown_082FF5C8
- .4byte gUnknown_082FF5F0
- .4byte gUnknown_082FF600
- .4byte gUnknown_082FF5D8
-
- .align 2
-gUnknown_082FF63C:: @ 82FF63C
- .2byte 0xfffc, 0xfffc, 0x3f04, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF64C:: @ 82FF64C
- .2byte 0x0000, 0x0000, 0x0503, 0x0000, 0x0000, 0x0000, 0x05fd, 0x0000
- .2byte 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF664:: @ 82FF664
- .2byte 0x0000, 0x0000, 0x14fb, 0x0000, 0x0000, 0x0000, 0x1400, 0x0000
- .2byte 0x0000, 0x0000, 0x1405, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF684:: @ 82FF684
- .2byte 0x0000, 0x0000, 0x6e09, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_082FF694:: @ 82FF694
- .4byte gUnknown_082FF548
- .4byte gUnknown_082FF568
- .4byte gUnknown_082FF580
- .4byte gUnknown_082FF598
- .4byte gUnknown_082FF5B8
- .4byte gUnknown_082FF5C8
- .4byte gUnknown_082FF63C
- .4byte gUnknown_082FF64C
- .4byte gUnknown_082FF664
- .4byte gUnknown_082FF5D8
- .4byte gUnknown_082FF684
-
- .align 2
-gUnknown_082FF6C0:: @ 82FF6C0
- .4byte gUnknown_082FF558
- .4byte gUnknown_082FF568
- .4byte gUnknown_082FF580
- .4byte gUnknown_082FF598
- .4byte gUnknown_082FF5B8
- .4byte gUnknown_082FF5C8
- .4byte gUnknown_082FF63C
- .4byte gUnknown_082FF64C
- .4byte gUnknown_082FF664
- .4byte gUnknown_082FF5D8
- .4byte gUnknown_082FF684
diff --git a/data/data2c.s b/data/data2c.s
index a661dc165..1946f5bdb 100644
--- a/data/data2c.s
+++ b/data/data2c.s
@@ -9,179 +9,6 @@
.section .rodata
.align 2
- .2byte 0x0300, 0x0000
-
- .align 2
-gUnknown_0831A988:: @ 831A988
- .byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_0831A990:: @ 831A990
- .byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_0831A998:: @ 831A998
- .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_0831A9A8:: @ 831A9A8
- .2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
- .2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
-
- .align 2
-gUnknown_0831A9C8:: @ 831A9C8
- .4byte gUnknown_0831A998
- .4byte gUnknown_0831A9A8
-
- .align 2
-gUnknown_0831A9D0:: @ 831A9D0
- spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
-
- .align 2
-gUnknown_0831A9E8:: @ 831A9E8
- spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
-
- .align 2
-gUnknown_0831AA00:: @ 831AA00
- obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
-
- .align 2
-gBattleBgTemplates:: @ 831AA08
- .4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
-
- .align 2
-gUnknown_0831AA18:: @ 831AA18
- window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
- window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
- window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
- window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
- window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
- window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
- window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
- window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
- window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
- window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
- window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
- window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
- window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
- window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
- window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
- window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
- window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
- window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
- window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
- window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
- window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
- window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
- window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
- window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
- null_window_template
-
- .align 2
-gUnknown_0831AAE0:: @ 831AAE0
- window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
- window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
- window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
- window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
- window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
- window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
- window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
- window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
- window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
- window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
- window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
- window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
- window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
- window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
- window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
- window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
- window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
- window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
- window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
- window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
- window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
- window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
- window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
- null_window_template
-
- .align 2
-gBattleWindowTemplates:: @ 831ABA0
- .4byte gUnknown_0831AA18
- .4byte gUnknown_0831AAE0
-
- .align 2
-gBattleTerrainTable:: @ 831ABA8
- @ tall_grass
- .4byte gBattleTerrainTiles_TallGrass
- .4byte gBattleTerrainTilemap_TallGrass
- .4byte gBattleTerrainAnimTiles_TallGrass
- .4byte gBattleTerrainAnimTilemap_TallGrass
- .4byte gBattleTerrainPalette_TallGrass
-
- @ long_grass
- .4byte gBattleTerrainTiles_LongGrass
- .4byte gBattleTerrainTilemap_LongGrass
- .4byte gBattleTerrainAnimTiles_LongGrass
- .4byte gBattleTerrainAnimTilemap_LongGrass
- .4byte gBattleTerrainPalette_LongGrass
-
- @ sand
- .4byte gBattleTerrainTiles_Sand
- .4byte gBattleTerrainTilemap_Sand
- .4byte gBattleTerrainAnimTiles_Sand
- .4byte gBattleTerrainAnimTilemap_Sand
- .4byte gBattleTerrainPalette_Sand
-
- @ underwater
- .4byte gBattleTerrainTiles_Underwater
- .4byte gBattleTerrainTilemap_Underwater
- .4byte gBattleTerrainAnimTiles_Underwater
- .4byte gBattleTerrainAnimTilemap_Underwater
- .4byte gBattleTerrainPalette_Underwater
-
- @ water
- .4byte gBattleTerrainTiles_Water
- .4byte gBattleTerrainTilemap_Water
- .4byte gBattleTerrainAnimTiles_Water
- .4byte gBattleTerrainAnimTilemap_Water
- .4byte gBattleTerrainPalette_Water
-
- @ pond_water
- .4byte gBattleTerrainTiles_PondWater
- .4byte gBattleTerrainTilemap_PondWater
- .4byte gBattleTerrainAnimTiles_PondWater
- .4byte gBattleTerrainAnimTilemap_PondWater
- .4byte gBattleTerrainPalette_PondWater
-
- @ rock
- .4byte gBattleTerrainTiles_Rock
- .4byte gBattleTerrainTilemap_Rock
- .4byte gBattleTerrainAnimTiles_Rock
- .4byte gBattleTerrainAnimTilemap_Rock
- .4byte gBattleTerrainPalette_Rock
-
- @ cave
- .4byte gBattleTerrainTiles_Cave
- .4byte gBattleTerrainTilemap_Cave
- .4byte gBattleTerrainAnimTiles_Cave
- .4byte gBattleTerrainAnimTilemap_Cave
- .4byte gBattleTerrainPalette_Cave
-
- @ building
- .4byte gBattleTerrainTiles_Building
- .4byte gBattleTerrainTilemap_Building
- .4byte gBattleTerrainAnimTiles_Building
- .4byte gBattleTerrainAnimTilemap_Building
- .4byte gBattleTerrainPalette_Building
-
- @ plain
- .4byte gBattleTerrainTiles_Building
- .4byte gBattleTerrainTilemap_Building
- .4byte gBattleTerrainAnimTiles_Building
- .4byte gBattleTerrainAnimTilemap_Building
- .4byte gBattleTerrainPalette_Plain
-
- .align 2
gUnknown_0831AC70:: @ 831AC70
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s
deleted file mode 100644
index 686d9396b..000000000
--- a/data/field_ground_effect.s
+++ /dev/null
@@ -1,6 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
diff --git a/data/field_special_scene.s b/data/field_special_scene.s
deleted file mode 100644
index 16e5a366d..000000000
--- a/data/field_special_scene.s
+++ /dev/null
@@ -1,15 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2, 0
-
-gTruckCamera_HorizontalTable:: @ 858E898
- .byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0
-
-gUnknown_0858E8AB:: @ 858E8AB
- .byte 0x18, 0xFE
-
-gUnknown_0858E8AD:: @ 858E8AD
- .byte 0x17, 0xFE
diff --git a/data/item_use.s b/data/item_use.s
deleted file mode 100644
index 6c9affbc8..000000000
--- a/data/item_use.s
+++ /dev/null
@@ -1,21 +0,0 @@
-
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
- .align 2
-gUnknown_085920D8:: @ 85920D8
- .4byte sub_81B617C
- .4byte CB2_ReturnToField
- .4byte NULL
-
- .align 2
-gUnknown_085920E4:: @ 85920E4
- .byte 0x02, 0x04, 0x01, 0x03
-
- .align 2
-gUnknown_085920E8:: @ 85920E8
- .4byte sub_80FE03C
- .4byte bag_menu_inits_lists_menu