diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/data.s | 129 | ||||
-rw-r--r-- | data/data_80B9BB8.s | 44 |
2 files changed, 138 insertions, 35 deletions
diff --git a/data/data.s b/data/data.s index fe5a062..33bd937 100644 --- a/data/data.s +++ b/data/data.s @@ -20,7 +20,9 @@ gUnknown_80B69F8: @ 80B69F8 .global gUnknown_80B6A28 gUnknown_80B6A28: @ 80B6A28 - .incbin "baserom.gba", 0xB6A28, 0xC + .byte 0x04, 0x6A, 0x0B, 0x08 @ Pointer to titlen0p + .byte 0x10, 0x6A, 0x0B, 0x08 @ Pointer to titlen1p + .byte 0x1C, 0x6A, 0x0B, 0x08 @ Pointer to titlen2p .include "data/text/save.inc" @@ -35,11 +37,48 @@ gUnknown_80B7144: @ 80B7144 .global gUnknown_80B714C gUnknown_80B714C: @ 80B714C - .incbin "baserom.gba", 0xB714C, 0x54 + .byte 0x9C, 0x71, 0x0B, 0x08 + .byte 0x9C, 0x71, 0x0B, 0x08 + .byte 0x94, 0x71, 0x0B, 0x08 + .byte 0x90, 0x71, 0x0B, 0x08 + .byte 0x8C, 0x71, 0x0B, 0x08 + .byte 0x88, 0x71, 0x0B, 0x08 + .byte 0x80, 0x71, 0x0B, 0x08 + .byte 0x7C, 0x71, 0x0B, 0x08 + .byte 0x78, 0x71, 0x0B, 0x08 + .byte 0x74, 0x71, 0x0B, 0x08 + .asciz "END" + .asciz "9" + .align 2,0 + .asciz "3" + .align 2,0 + .asciz "2-2 8" + .align 2,0 + .asciz "6" + .align 2,0 + .asciz "5" + .align 2,0 + .asciz "4" + .align 2,0 + .asciz "1-2 7" + .align 2,0 + .asciz "2-1" + .align 2,0 .global gUnknown_80B71A0 gUnknown_80B71A0: @ 80B71A0 - .incbin "baserom.gba", 0xB71A0, 0x44 + .byte 0xD8, 0x71, 0x0B, 0x08 @ Pointer to CISTART + .byte 0xC8, 0x71, 0x0B, 0x08 @ Pointer to CECONTINUE + .byte 0xBC, 0x71, 0x0B, 0x08 @ Pointer to CNLAST + .byte 0xB0, 0x71, 0x0B, 0x08 @ Pointer to CWEND + .asciz "#CWEND#R" + .align 2,0 + .asciz "#CNLAST#R" + .align 2,0 + .asciz "#CECONTINUE#R" + .align 2,0 + .asciz "#CISTART#R" + .align 2,0 .global gUnknown_80B71E4 gUnknown_80B71E4: @ 80B71E4 @@ -59,7 +98,9 @@ gUnknown_80B7324: @ 80B7324 .global gUnknown_80B7350 gUnknown_80B7350: @ 80B7350 - .incbin "baserom.gba", 0xB7350, 0xC + .byte 0xF4, 0x72, 0x0B, 0x08 @ Pointer to ../main/event_flag.c + .byte 0x7C, 0x05, 0x00, 0x00 + .byte 0x44, 0x73, 0x0B, 0x08 @ Pointer to _FlagJudge .global gUnknown_80B735C gUnknown_80B735C: @ 80B735C @@ -67,11 +108,13 @@ gUnknown_80B735C: @ 80B735C .global gUnknown_80B7378 gUnknown_80B7378: @ 80B7378 - .incbin "baserom.gba", 0xB7378, 0x10 + .asciz "error number" + .align 2,0 .global gUnknown_80B7388 gUnknown_80B7388: @ 80B7388 - .incbin "baserom.gba", 0xB7388, 0xC + .asciz "1-1" + .asciz "pksdir0" .global gUnknown_80B7394 gUnknown_80B7394: @ 80B7394 @@ -95,7 +138,9 @@ gUnknown_80B7EFC: @ 80B7EFC .global gUnknown_80B7F14 gUnknown_80B7F14: @ 80B7F14 - .incbin "baserom.gba", 0xB7F14, 0xC + .byte 0x8C, 0x7E, 0x0B, 0x08 + .byte 0x2C, 0x03, 0x00, 0x00 + .byte 0x08, 0x7F, 0x0B, 0x08 .global gUnknown_80B7F20 gUnknown_80B7F20: @ 80B7F20 @@ -103,11 +148,22 @@ gUnknown_80B7F20: @ 80B7F20 .global gUnknown_80B7F88 gUnknown_80B7F88: @ 80B7F88 - .incbin "baserom.gba", 0xB7F88, 0xC + .byte 0x8C, 0x7E, 0x0B, 0x08 @ Pointer to ../system/memory_locate.c + .byte 0x55, 0x04, 0x00, 0x00 + .byte 0x6C, 0x7F, 0x0B, 0x08 @ Pointer to MemoryLocate_LocalCreate .global gUnknown_80B7F94 gUnknown_80B7F94: @ 80B7F94 - .incbin "baserom.gba", 0xB7F94, 0x74 + .asciz "Memroy LocalCreate buffer %08x size can\'t locate" @ Spelling error is intentional + .align 2,0 + .asciz "pksdir0" + .asciz "pksdir0" + .asciz "pksdir0" + .asciz "pksdir0" + .asciz "pksdir0" + .asciz "pksdir0" + .asciz "pksdir0" + .asciz "pksdir0" .global gUnknown_80B8008 gUnknown_80B8008: @ 80B8008 @@ -143,7 +199,10 @@ gUnknown_80B85DC: @ 80B85DC .global gUnknown_80B86A4 gUnknown_80B86A4: @ 80B86A4 - .incbin "baserom.gba", 0xB86A4, 0x10 + .byte 0x5C, 0x86, 0x0B, 0x08 + .byte 0xA1, 0x81, 0x07, 0x00 + .byte 0x0A, 0x00, 0x00, 0x00 + .byte 0x08, 0x00, 0x00, 0x00 .global gUnknown_80B86B4 gUnknown_80B86B4: @ 80B86B4 @@ -151,27 +210,49 @@ gUnknown_80B86B4: @ 80B86B4 .global gUnknown_80B87B4 gUnknown_80B87B4: @ 80B87B4 - .incbin "baserom.gba", 0xB87B4, 0x8 + .asciz "kanji_a" + .align 2,0 .global gUnknown_80B87BC gUnknown_80B87BC: @ 80B87BC - .incbin "baserom.gba", 0xB87BC, 0x8 + .asciz "kanji_b" + .align 2,0 .global gUnknown_80B87C4 gUnknown_80B87C4: @ 80B87C4 - .incbin "baserom.gba", 0xB87C4, 0x20 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80B87E4 gUnknown_80B87E4: @ 80B87E4 - .incbin "baserom.gba", 0xB87E4, 0x20 + .byte 0x88, 0x88, 0x88, 0x88 + .byte 0x88, 0x88, 0x88, 0x88 + .byte 0x88, 0x88, 0x88, 0x88 + .byte 0x88, 0x88, 0x88, 0x88 + .byte 0x88, 0x88, 0x88, 0x88 + .byte 0x88, 0x88, 0x88, 0x88 + .byte 0x88, 0x88, 0x88, 0x88 + .byte 0x88, 0x88, 0x88, 0x88 .global gUnknown_80B8804 gUnknown_80B8804: @ 80B8804 - .incbin "baserom.gba", 0xB8804, 0x10 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 .global gUnknown_80B8814 gUnknown_80B8814: @ 80B8814 - .incbin "baserom.gba", 0xB8814, 0x10 + .byte 0x01, 0x00, 0x00, 0x00 + .byte 0x02, 0x00, 0x00, 0x00 + .byte 0x03, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00 .global gUnknown_80B8824 gUnknown_80B8824: @ 80B8824 @@ -187,22 +268,28 @@ gUnknown_80B8868: @ 80B8868 .global gUnknown_80B88B0 gUnknown_80B88B0: @ 80B88B0 - .incbin "baserom.gba", 0xB88B0, 0x8 + .asciz "font" + .align 2,0 .global gUnknown_80B88B8 gUnknown_80B88B8: @ 80B88B8 - .incbin "baserom.gba", 0xB88B8, 0x8 + .asciz "fontsp" + .align 2,0 .global gUnknown_80B88C0 gUnknown_80B88C0: @ 80B88C0 - .incbin "baserom.gba", 0xB88C0, 0xC + .asciz "fontsppa" + .align 2,0 .global gUnknown_80B88CC gUnknown_80B88CC: @ 80B88CC - .incbin "baserom.gba", 0xB88CC, 0x18 + .asciz "fontpal" + .align 2,0 + .asciz "pksdir0" + .asciz "pksdir0" .global gUnknown_80B88E4 -gUnknown_80B88E4: @ 80B88E4 +gUnknown_80B88E4: @ 80B88E4 @ (uppercase font table??) .incbin "baserom.gba", 0xB88E4, 0x200 .global gUnknown_80B8AE4 diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s index df4e021..1b523e3 100644 --- a/data/data_80B9BB8.s +++ b/data/data_80B9BB8.s @@ -10270,59 +10270,75 @@ gUnknown_810DE0C: @ 810DE0C .global gUnknown_810DE20 gUnknown_810DE20: @ 810DE20 - .incbin "baserom.gba", 0x10DE20, 0x4 + .byte 0x10, 0xDE, 0x10, 0x08 .global gUnknown_810DE24 gUnknown_810DE24: @ 810DE24 - .incbin "baserom.gba", 0x10DE24, 0x4 + .byte 0x00, 0xDE, 0x10, 0x08 .global gUnknown_810DE28 gUnknown_810DE28: @ 810DE28 - .incbin "baserom.gba", 0x10DE28, 0x10 + .byte 0x10, 0xDE, 0x10, 0x08 + .asciz "#>118.$v03" + .align 2,0 .global gUnknown_810DE38 gUnknown_810DE38: @ 810DE38 - .incbin "baserom.gba", 0x10DE38, 0x14 + .byte 0x2C, 0xDE, 0x10, 0x08 + .asciz "#>118.#c2$v03#r" + .align 2,0 .global gUnknown_810DE4C gUnknown_810DE4C: @ 810DE4C - .incbin "baserom.gba", 0x10DE4C, 0x4 + .byte 0x3C, 0xDE, 0x10, 0x08 .global gUnknown_810DE50 gUnknown_810DE50: @ 810DE50 - .incbin "baserom.gba", 0x10DE50, 0x4 + .byte 0x2C, 0xDE, 0x10, 0x08 .global gUnknown_810DE54 gUnknown_810DE54: @ 810DE54 - .incbin "baserom.gba", 0x10DE54, 0x4 + .byte 0x3C, 0xDE, 0x10, 0x08 .global gUnknown_810DE58 gUnknown_810DE58: @ 810DE58 - .incbin "baserom.gba", 0x10DE58, 0x14 + .byte 0x1C, 0xAE, 0x10, 0x08 + .asciz "Item:#>46.$i0 " + .align 2,0 .global gUnknown_810DE6C gUnknown_810DE6C: @ 810DE6C - .incbin "baserom.gba", 0x10DE6C, 0x14 + .byte 0x5C, 0xDE, 0x10, 0x08 + .asciz "IQ:#>52.$m0 " + .align 2,0 .global gUnknown_810DE80 gUnknown_810DE80: @ 810DE80 - .incbin "baserom.gba", 0x10DE80, 0x18 + .byte 0x70, 0xDE, 0x10, 0x08 + .asciz "Tactics:#>52.$m0 " + .align 2,0 .global gUnknown_810DE98 gUnknown_810DE98: @ 810DE98 - .incbin "baserom.gba", 0x10DE98, 0x1C + .byte 0x84, 0xDE, 0x10, 0x08 + .asciz "Species:#>54.#C6$m0#R " + .align 2,0 .global gUnknown_810DEB4 gUnknown_810DEB4: @ 810DEB4 - .incbin "baserom.gba", 0x10DEB4, 0x14 + .byte 0x9C, 0xDE, 0x10, 0x08 + .asciz "Friend Area: " + .align 2,0 .global gUnknown_810DEC8 gUnknown_810DEC8: @ 810DEC8 - .incbin "baserom.gba", 0x10DEC8, 0x14 + .byte 0xB8, 0xDE, 0x10, 0x08 + .asciz "#>22.#C4$i0#R" + .align 2,0 .global gUnknown_810DEDC gUnknown_810DEDC: @ 810DEDC - .incbin "baserom.gba", 0x10DEDC, 0x18 + .incbin "baserom.gba", 0x10DEDC, 0x18 .global gUnknown_810DEF4 gUnknown_810DEF4: @ 810DEF4 |