diff options
| -rw-r--r-- | data/bg.s | 7 | ||||
| -rw-r--r-- | data/data2.s | 191 | ||||
| -rw-r--r-- | data/main.s | 31 | ||||
| -rw-r--r-- | data/sprite.s | 68 | ||||
| -rw-r--r-- | data/string_util.s (renamed from data/string_util.inc) | 5 | ||||
| -rw-r--r-- | data/text.s | 94 | ||||
| -rw-r--r-- | data/window.s | 7 | ||||
| -rw-r--r-- | ld_script.txt | 6 |
8 files changed, 218 insertions, 191 deletions
diff --git a/data/bg.s b/data/bg.s new file mode 100644 index 000000000..2881d4347 --- /dev/null +++ b/data/bg.s @@ -0,0 +1,7 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gZeroedBgControlStruct:: @ 82E9580 + .4byte 0 diff --git a/data/data2.s b/data/data2.s index 35076df11..f5516505c 100644 --- a/data/data2.s +++ b/data/data2.s @@ -5,197 +5,6 @@ .section .rodata -gUnknown_82E9530:: @ 82E9530 - .byte 3 - -gUnknown_82E9531:: @ 82E9531 - .byte 2 - - .align 2 -@ compile time - .asciz "2005 02 21 11:10" - - .align 2 -gRomInterruptTable:: @ 82E9548 - .4byte VCountIntr - .4byte SerialIntr - .4byte Timer3Intr - .4byte HBlankIntr - .4byte VBlankIntr - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - .4byte DummyIntrHandler - -gZeroedBgControlStruct:: @ 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 "baserom.gba", 0x2e968c, 0xc0 - -gDarkDownArrowTiles:: @ 82E974C - .incbin "baserom.gba", 0x2e974c, 0xc0 - -@ Seemingly unreferenced data. It contains some kind of arrow graphics. - .incbin "baserom.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 "baserom.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 - - .align 2 -gFont9JapaneseGlyphs:: @ 82EA61C - .incbin "data/graphics/fonts/font9.hwjpnfont" - -@ Unreferenced data. This also comes before the gpu_bg.s data in Ruby and seems -@ to be unreferenced there too. - .incbin "baserom.gba", 0x2ec61c, 0x18 - -gUnknown_082EC634:: @ 82EC634 - .incbin "baserom.gba", 0x2ec634, 0x18 - -gUnknown_082EC64C:: @ 82EC64C - .incbin "baserom.gba", 0x2ec64c, 0x44 - -@ off-screen and low priority relative to background -gDefaultOamAttributes:: @ 82EC690 - .2byte 160 @ Y - .2byte 304 @ X - .2byte 3 << 10 @ priority - - .align 2 -gDummyObjectImageAnim:: @ 82EC698 - obj_image_anim_end - - .align 2 -gDummyObjectImageAnimTable:: @ 82EC69C - .4byte gDummyObjectImageAnim - - .align 2 -gDummyObjectRotScalAnim:: @ 82EC6A0 - obj_rot_scal_anim_end - - .align 2 -gDummyObjectRotScalAnimTable:: @ 82EC6A8 - .4byte gDummyObjectRotScalAnim - -gUnknown_082EC6AC:: @ 82EC6AC - .incbin "baserom.gba", 0x2ec6ac, 0x18 - -gUnknown_082EC6C4:: @ 82EC6C4 - .incbin "baserom.gba", 0x2ec6c4, 0x8 - -gUnknown_082EC6CC:: @ 82EC6CC - .incbin "baserom.gba", 0x2ec6cc, 0x8 - -gUnknown_082EC6D4:: @ 82EC6D4 - .incbin "baserom.gba", 0x2ec6d4, 0x10 - -gUnknown_082EC6E4:: @ 82EC6E4 - .incbin "baserom.gba", 0x2ec6e4, 0x10 - -gUnknown_082EC6F4:: @ 82EC6F4 - .incbin "baserom.gba", 0x2ec6f4, 0x60 - -gUnknown_082EC754:: @ 82EC754 - .incbin "baserom.gba", 0x2ec754, 0x70 - -gUnknown_82EC7C4:: @ 82EC7C4 - .2byte 0x0100 - .2byte 0x0200 - .2byte 0x0400 - .2byte 0x0800 - -gUnknown_82EC7CC:: @ 82EC7CC - .2byte 0x0001 - .2byte 0x0002 - .2byte 0x0004 - .2byte 0x0008 - -@ 82EC7D4 - .include "data/string_util.inc" - .align 2 gUnknown_082EC86C:: @ 82EC86C .incbin "baserom.gba", 0x2ec86c, 0x20 diff --git a/data/main.s b/data/main.s new file mode 100644 index 000000000..9a5a44dfd --- /dev/null +++ b/data/main.s @@ -0,0 +1,31 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gUnknown_82E9530:: @ 82E9530 + .byte 3 + +gUnknown_82E9531:: @ 82E9531 + .byte 2 + + .align 2 +@ compile time + .asciz "2005 02 21 11:10" + + .align 2 +gRomInterruptTable:: @ 82E9548 + .4byte VCountIntr + .4byte SerialIntr + .4byte Timer3Intr + .4byte HBlankIntr + .4byte VBlankIntr + .4byte DummyIntrHandler + .4byte DummyIntrHandler + .4byte DummyIntrHandler + .4byte DummyIntrHandler + .4byte DummyIntrHandler + .4byte DummyIntrHandler + .4byte DummyIntrHandler + .4byte DummyIntrHandler + .4byte DummyIntrHandler diff --git a/data/sprite.s b/data/sprite.s new file mode 100644 index 000000000..59308d286 --- /dev/null +++ b/data/sprite.s @@ -0,0 +1,68 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +@ Unreferenced data. Also unreferenced in Ruby. + .incbin "baserom.gba", 0x2ec61c, 0x18 + +gUnknown_082EC634:: @ 82EC634 + .incbin "baserom.gba", 0x2ec634, 0x18 + +gUnknown_082EC64C:: @ 82EC64C + .incbin "baserom.gba", 0x2ec64c, 0x44 + +@ off-screen and low priority relative to background +gDefaultOamAttributes:: @ 82EC690 + .2byte 160 @ Y + .2byte 304 @ X + .2byte 3 << 10 @ priority + + .align 2 +gDummyObjectImageAnim:: @ 82EC698 + obj_image_anim_end + + .align 2 +gDummyObjectImageAnimTable:: @ 82EC69C + .4byte gDummyObjectImageAnim + + .align 2 +gDummyObjectRotScalAnim:: @ 82EC6A0 + obj_rot_scal_anim_end + + .align 2 +gDummyObjectRotScalAnimTable:: @ 82EC6A8 + .4byte gDummyObjectRotScalAnim + +gUnknown_082EC6AC:: @ 82EC6AC + .incbin "baserom.gba", 0x2ec6ac, 0x18 + +gUnknown_082EC6C4:: @ 82EC6C4 + .incbin "baserom.gba", 0x2ec6c4, 0x8 + +gUnknown_082EC6CC:: @ 82EC6CC + .incbin "baserom.gba", 0x2ec6cc, 0x8 + +gUnknown_082EC6D4:: @ 82EC6D4 + .incbin "baserom.gba", 0x2ec6d4, 0x10 + +gUnknown_082EC6E4:: @ 82EC6E4 + .incbin "baserom.gba", 0x2ec6e4, 0x10 + +gUnknown_082EC6F4:: @ 82EC6F4 + .incbin "baserom.gba", 0x2ec6f4, 0x60 + +gUnknown_082EC754:: @ 82EC754 + .incbin "baserom.gba", 0x2ec754, 0x70 + +gUnknown_82EC7C4:: @ 82EC7C4 + .2byte 0x0100 + .2byte 0x0200 + .2byte 0x0400 + .2byte 0x0800 + +gUnknown_82EC7CC:: @ 82EC7CC + .2byte 0x0001 + .2byte 0x0002 + .2byte 0x0004 + .2byte 0x0008 diff --git a/data/string_util.inc b/data/string_util.s index be783d2c0..0c540b5ba 100644 --- a/data/string_util.inc +++ b/data/string_util.s @@ -1,3 +1,8 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + gDigits:: @ 82EC7D4 .string "0123456789ABCDEF" diff --git a/data/text.s b/data/text.s new file mode 100644 index 000000000..e5d48fe4e --- /dev/null +++ b/data/text.s @@ -0,0 +1,94 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +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 "baserom.gba", 0x2e968c, 0xc0 + +gDarkDownArrowTiles:: @ 82E974C + .incbin "baserom.gba", 0x2e974c, 0xc0 + +@ Seemingly unreferenced data. It contains some kind of arrow graphics. + .incbin "baserom.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 "baserom.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 + + .align 2 +gFont9JapaneseGlyphs:: @ 82EA61C + .incbin "data/graphics/fonts/font9.hwjpnfont" diff --git a/data/window.s b/data/window.s new file mode 100644 index 000000000..204152b3e --- /dev/null +++ b/data/window.s @@ -0,0 +1,7 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + +gDummyWindowTemplate:: @ 82E9584 + window_template -1, 0, 0, 0, 0, 0, 0 diff --git a/ld_script.txt b/ld_script.txt index 520aaa6e0..fe6fea1d9 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -239,6 +239,12 @@ SECTIONS { .rodata : ALIGN(4) { + data/main.o(.rodata); + data/bg.o(.rodata); + data/window.o(.rodata); + data/text.o(.rodata); + data/sprite.o(.rodata); + data/string_util.o(.rodata); data/data2.o(.rodata); src/m4a_tables.o(.rodata); data/sound_data.o(.rodata); |