summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/data1.s2
-rw-r--r--asm/data2.s209
-rw-r--r--asm/emerald.s4
3 files changed, 2 insertions, 213 deletions
diff --git a/asm/data1.s b/asm/data1.s
deleted file mode 100644
index 315445340..000000000
--- a/asm/data1.s
+++ /dev/null
@@ -1,2 +0,0 @@
-@ the first big chunk of data
- .incbin "base_emerald.gba", 0x1db67c, 0x2ded70 - 0x1db67c
diff --git a/asm/data2.s b/asm/data2.s
deleted file mode 100644
index 6d9ce123f..000000000
--- a/asm/data2.s
+++ /dev/null
@@ -1,209 +0,0 @@
-@ the second big chunk of data
-
- .align 2, 0
-
-gUnknown_82E9530: @ 82E9530
- .byte 3
-
-gUnknown_82E9531: @ 82E9531
- .byte 2
-
- .align 2, 0
-
-@ compile time
- .asciz "2005 02 21 11:10"
-
- .align 2, 0
-
-gRomInterruptTable: @ 82E9548
- .4byte irq_vcount+1
- .4byte irq_serial+1
- .4byte irq_timer3+1
- .4byte irq_hblank+1
- .4byte irq_vblank+1
- .4byte irq_other+1
- .4byte irq_other+1
- .4byte irq_other+1
- .4byte irq_other+1
- .4byte irq_other+1
- .4byte irq_other+1
- .4byte irq_other+1
- .4byte irq_other+1
- .4byte irq_other+1
-
-gBgConfigZeroValue: @ 82E9580
- .4byte 0
-
-gDummyWindowTemplate: @ 82E9584
- window_template -1, 0, 0, 0, 0, 0, 0
-
-gFontHalfRowOffsets: @ 82E958C
- .byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00
- .byte 0x09,0x0a,0x0b,0x09,0x0c,0x0d,0x0e,0x0c,0x0f,0x10,0x11,0x0f,0x09,0x0a,0x0b,0x09
- .byte 0x12,0x13,0x14,0x12,0x15,0x16,0x17,0x15,0x18,0x19,0x1a,0x18,0x12,0x13,0x14,0x12
- .byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00
- .byte 0x1b,0x1c,0x1d,0x1b,0x1e,0x1f,0x20,0x1e,0x21,0x22,0x23,0x21,0x1b,0x1c,0x1d,0x1b
- .byte 0x24,0x25,0x26,0x24,0x27,0x28,0x29,0x27,0x2a,0x2b,0x2c,0x2a,0x24,0x25,0x26,0x24
- .byte 0x2d,0x2e,0x2f,0x2d,0x30,0x31,0x32,0x30,0x33,0x34,0x35,0x33,0x2d,0x2e,0x2f,0x2d
- .byte 0x1b,0x1c,0x1d,0x1b,0x1e,0x1f,0x20,0x1e,0x21,0x22,0x23,0x21,0x1b,0x1c,0x1d,0x1b
- .byte 0x36,0x37,0x38,0x36,0x39,0x3a,0x3b,0x39,0x3c,0x3d,0x3e,0x3c,0x36,0x37,0x38,0x36
- .byte 0x3f,0x40,0x41,0x3f,0x42,0x43,0x44,0x42,0x45,0x46,0x47,0x45,0x3f,0x40,0x41,0x3f
- .byte 0x48,0x49,0x4a,0x48,0x4b,0x4c,0x4d,0x4b,0x4e,0x4f,0x50,0x4e,0x48,0x49,0x4a,0x48
- .byte 0x36,0x37,0x38,0x36,0x39,0x3a,0x3b,0x39,0x3c,0x3d,0x3e,0x3c,0x36,0x37,0x38,0x36
- .byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00
- .byte 0x09,0x0a,0x0b,0x09,0x0c,0x0d,0x0e,0x0c,0x0f,0x10,0x11,0x0f,0x09,0x0a,0x0b,0x09
- .byte 0x12,0x13,0x14,0x12,0x15,0x16,0x17,0x15,0x18,0x19,0x1a,0x18,0x12,0x13,0x14,0x12
- .byte 0x00,0x01,0x02,0x00,0x03,0x04,0x05,0x03,0x06,0x07,0x08,0x06,0x00,0x01,0x02,0x00
-
-gDownArrowTiles: @ 82E968C
- .incbin "base_emerald.gba", 0x2e968c, 0xc0
-
-gDarkDownArrowTiles: @ 82E974C
- .incbin "base_emerald.gba", 0x2e974c, 0xc0
-
-@ Seemingly unreferenced data. It contains some kind of arrow graphics.
- .incbin "base_emerald.gba", 0x2e980c, 0x500
-
-gDownArrowYCoords: @ 82E9D0C
- .byte 0, 1, 2, 1
-
-gWindowVerticalScrollSpeeds: @ 82E9D10
- .byte 1, 2, 4, 0
-
-gGlyphWidthFuncs: @ 82E9D14
- glyph_width_func 0, GetGlyphWidthFont0+1
- glyph_width_func 1, GetGlyphWidthFont1+1
- glyph_width_func 2, GetGlyphWidthFont2+1
- glyph_width_func 3, GetGlyphWidthFont2+1
- glyph_width_func 4, GetGlyphWidthFont2+1
- glyph_width_func 5, GetGlyphWidthFont2+1
- glyph_width_func 6, GetGlyphWidthFont6+1
- glyph_width_func 7, GetGlyphWidthFont7+1
- glyph_width_func 8, GetGlyphWidthFont8+1
-
-gKeypadIcons: @ 82E9D5C
- keypad_icon 0x0, 8, 12
- keypad_icon 0x1, 8, 12
- keypad_icon 0x2, 16, 12
- keypad_icon 0x4, 16, 12
- keypad_icon 0x6, 24, 12
- keypad_icon 0x9, 24, 12
- keypad_icon 0xC, 8, 12
- keypad_icon 0xD, 8, 12
- keypad_icon 0xE, 8, 12
- keypad_icon 0xF, 8, 12
- keypad_icon 0x20, 8, 12
- keypad_icon 0x21, 8, 12
- keypad_icon 0x22, 8, 12
-
-gKeypadIconTiles: @ 82E9D90
- .incbin "base_emerald.gba", 0x2e9d90, 0x800
-
-gFontInfos: @ 82EA590
- font_info Font0Func+1, 5, 12, 0, 0, 2, 3, 1
- font_info Font1Func+1, 6, 16, 0, 0, 2, 3, 1
- font_info Font2Func+1, 6, 14, 0, 0, 2, 3, 1
- font_info Font3Func+1, 6, 14, 0, 0, 2, 3, 1
- font_info Font4Func+1, 6, 14, 0, 0, 2, 3, 1
- font_info Font5Func+1, 6, 14, 0, 0, 2, 3, 1
- font_info Font6Func+1, 8, 16, 0, 8, 2, 3, 1
- font_info Font7Func+1, 5, 16, 0, 0, 2, 3, 1
- font_info Font8Func+1, 5, 8, 0, 0, 2, 3, 1
- font_info 0, 8, 8, 0, 0, 1, 15, 2
-
-gMenuCursorDimensions: @ 82EA608
- .byte 8, 12
- .byte 8, 15
- .byte 8, 14
- .byte 8, 14
- .byte 8, 14
- .byte 8, 14
- .byte 8, 16
- .byte 8, 15
- .byte 8, 8
- .byte 0, 0
-
-gFont9JapaneseGlyphs: @ 82EA61C
- .incbin "base_emerald.gba", 0x2ea61c, 0x2000
-
-@ Unreferenced data. This also comes before the gpu_bg.s data in Ruby and seems
-@ to be unreferenced there too.
- .incbin "base_emerald.gba", 0x2ec61c, 0x18
-
-@ TODO: gpu_obj.s data
- include_range 0x2ec634, 0x2ec7c4
-
-gUnknown_82EC7C4: @ 82EC7C4
- .2byte 0x0100
- .2byte 0x0200
- .2byte 0x0400
- .2byte 0x0800
-
-gUnknown_82EC7CC: @ 82EC7CC
- .2byte 0x0001
- .2byte 0x0002
- .2byte 0x0004
- .2byte 0x0008
-
- include_range 0x2ec7d4, 0x616128
-
-gFont6BrailleGlyphs: @ 8616128
- .incbin "base_emerald.gba", 0x616128, 0x1000
-
- include_range 0x617128, 0x62bae4
-
-gFont8LatinGlyphs: @ 862BAE4
- .incbin "base_emerald.gba", 0x62bae4, 0x8000
-
-gFont8LatinGlyphWidths: @ 8633AE4
- .incbin "base_emerald.gba", 0x633ae4, 0x200
-
-gFont0LatinGlyphs: @ 8633CE4
- .incbin "base_emerald.gba", 0x633ce4, 0x8000
-
-gFont0LatinGlyphWidths: @ 863BCE4
- .incbin "base_emerald.gba", 0x63bce4, 0x200
-
-gFont7LatinGlyphs: @ 863BEE4
- .incbin "base_emerald.gba", 0x63bee4, 0x8000
-
-gFont7LatinGlyphWidths: @ 8643EE4
- .incbin "base_emerald.gba", 0x643ee4, 0x200
-
-gFont2LatinGlyphs: @ 86440E4
- .incbin "base_emerald.gba", 0x6440e4, 0x8000
-
-gFont2LatinGlyphWidths: @ 864C0E4
- .incbin "base_emerald.gba", 0x64c0e4, 0x200
-
-gFont1LatinGlyphs: @ 864C2E4
- .incbin "base_emerald.gba", 0x64c2e4, 0x8000
-
-gFont1LatinGlyphWidths: @ 86542E4
- .incbin "base_emerald.gba", 0x6542e4, 0x200
-
-gFont0JapaneseGlyphs: @ 86544E4
- .incbin "base_emerald.gba", 0x6544e4, 0x4000
-
-gFont1JapaneseGlyphs: @ 86584E4
- .incbin "base_emerald.gba", 0x6584e4, 0x4000
-
-gUnusedFullwidthJapaneseFontGlyphs: @ 865C4E4
- .incbin "base_emerald.gba", 0x65c4e4, 0x8000
-
-gUnusedFullwidthJapaneseFontGlyphWidths: @ 86644E4
- .incbin "base_emerald.gba", 0x6644e4, 0x200
-
-gUnusedFullwidthJapaneseFont2Glyphs: @ 86646E4
- .incbin "base_emerald.gba", 0x6646e4, 0x8000
-
-gUnusedFullwidthJapaneseFont2GlyphWidths: @ 866C6E4
- .incbin "base_emerald.gba", 0x66c6e4, 0x200
-
-gFont2JapaneseGlyphs: @ 866C8E4
- .incbin "base_emerald.gba", 0x66c8e4, 0x8000
-
-gFont2JapaneseGlyphWidths: @ 86748E4
- .incbin "base_emerald.gba", 0x6748e4, 0x200
-
- .incbin "base_emerald.gba", 0x674ae4
diff --git a/asm/emerald.s b/asm/emerald.s
index f4e6aa798..6e7ff6529 100644
--- a/asm/emerald.s
+++ b/asm/emerald.s
@@ -920531,7 +920531,7 @@ _081DB66C:
.pool
thumb_func_end sub_81DB620
- .include "asm/data1.s"
+ .include "data/data1.s"
.include "asm/unknown_lib_1.s"
.include "asm/libmks4agb.s"
.include "asm/libagbbackup.s"
@@ -920539,4 +920539,4 @@ _081DB66C:
.include "asm/librfu.s"
.include "asm/libagbsyscall.s"
.include "asm/libgcc.s"
- .include "asm/data2.s"
+ .include "data/data2.s"
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 20:51:15 +0000