diff options
author | Seth Barberee <seth.barberee@gmail.com> | 2020-10-01 13:48:10 -0500 |
---|---|---|
committer | Seth Barberee <seth.barberee@gmail.com> | 2020-10-01 13:48:10 -0500 |
commit | 51de478e603d08b01942449f71a72801da65ede7 (patch) | |
tree | 97b02a03404413552e1ca89237c4e81447783394 | |
parent | 96fdd3aae0ba1d923b358128012979a9a1a0eb38 (diff) |
changed hex boundary to decimal and format corresponding data
-rw-r--r-- | data/data.s | 303 | ||||
-rw-r--r-- | src/file_system.c | 4 |
2 files changed, 304 insertions, 3 deletions
diff --git a/data/data.s b/data/data.s index c3ae623..983ea05 100644 --- a/data/data.s +++ b/data/data.s @@ -642,4 +642,305 @@ gUnknown_80B92E4: @ 80B92E4 .global gUnknown_80B96E4 gUnknown_80B96E4: @ 80B96E4 - .incbin "baserom.gba", 0xB96E4, 0x4B0 +@ replacing .incbin "baserom.gba", 0x000b96e4, 0x4b0 +@ It's an array.. +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x00, 0x00, 0x00, 0x00 +.byte 0x72, 0xb1, 0x00, 0x00 +.byte 0x3e, 0x19, 0x01, 0x00 +.byte 0xe4, 0x62, 0x01, 0x00 +.byte 0x04, 0x9c, 0x01, 0x00 +.byte 0xb0, 0xca, 0x01, 0x00 +.byte 0x27, 0xf2, 0x01, 0x00 +.byte 0x56, 0x14, 0x02, 0x00 +.byte 0x7d, 0x32, 0x02, 0x00 +.byte 0x76, 0x4d, 0x02, 0x00 +.byte 0xdc, 0x65, 0x02, 0x00 +.byte 0x22, 0x7c, 0x02, 0x00 +.byte 0xa0, 0x90, 0x02, 0x00 +.byte 0x99, 0xa3, 0x02, 0x00 +.byte 0x42, 0xb5, 0x02, 0x00 +.byte 0xc8, 0xc5, 0x02, 0x00 +.byte 0x4d, 0xd5, 0x02, 0x00 +.byte 0xef, 0xe3, 0x02, 0x00 +.byte 0xc6, 0xf1, 0x02, 0x00 +.byte 0xe8, 0xfe, 0x02, 0x00 +.byte 0x65, 0x0b, 0x03, 0x00 +.byte 0x4e, 0x17, 0x03, 0x00 +.byte 0xaf, 0x22, 0x03, 0x00 +.byte 0x94, 0x2d, 0x03, 0x00 +.byte 0x08, 0x38, 0x03, 0x00 +.byte 0x12, 0x42, 0x03, 0x00 +.byte 0xbb, 0x4b, 0x03, 0x00 +.byte 0x0b, 0x55, 0x03, 0x00 +.byte 0x07, 0x5e, 0x03, 0x00 +.byte 0xb4, 0x66, 0x03, 0x00 +.byte 0x19, 0x6f, 0x03, 0x00 +.byte 0x3a, 0x77, 0x03, 0x00 +.byte 0x1b, 0x7f, 0x03, 0x00 +.byte 0xbf, 0x86, 0x03, 0x00 +.byte 0x2b, 0x8e, 0x03, 0x00 +.byte 0x61, 0x95, 0x03, 0x00 +.byte 0x65, 0x9c, 0x03, 0x00 +.byte 0x38, 0xa3, 0x03, 0x00 +.byte 0xdf, 0xa9, 0x03, 0x00 +.byte 0x5a, 0xb0, 0x03, 0x00 +.byte 0xac, 0xb6, 0x03, 0x00 +.byte 0xd7, 0xbc, 0x03, 0x00 +.byte 0xde, 0xc2, 0x03, 0x00 +.byte 0xc0, 0xc8, 0x03, 0x00 +.byte 0x81, 0xce, 0x03, 0x00 +.byte 0x21, 0xd4, 0x03, 0x00 +.byte 0xa3, 0xd9, 0x03, 0x00 +.byte 0x07, 0xdf, 0x03, 0x00 +.byte 0x4e, 0xe4, 0x03, 0x00 +.byte 0x7a, 0xe9, 0x03, 0x00 +.byte 0x8c, 0xee, 0x03, 0x00 +.byte 0x84, 0xf3, 0x03, 0x00 +.byte 0x65, 0xf8, 0x03, 0x00 +.byte 0x2e, 0xfd, 0x03, 0x00 +.byte 0xe0, 0x01, 0x04, 0x00 +.byte 0x7d, 0x06, 0x04, 0x00 +.byte 0x05, 0x0b, 0x04, 0x00 +.byte 0x79, 0x0f, 0x04, 0x00 +.byte 0xd9, 0x13, 0x04, 0x00 +.byte 0x26, 0x18, 0x04, 0x00 +.byte 0x62, 0x1c, 0x04, 0x00 +.byte 0x8b, 0x20, 0x04, 0x00 +.byte 0xa4, 0x24, 0x04, 0x00 +.byte 0xac, 0x28, 0x04, 0x00 +.byte 0xa4, 0x2c, 0x04, 0x00 +.byte 0x8d, 0x30, 0x04, 0x00 +.byte 0x66, 0x34, 0x04, 0x00 +.byte 0x31, 0x38, 0x04, 0x00 +.byte 0xee, 0x3b, 0x04, 0x00 +.byte 0x9d, 0x3f, 0x04, 0x00 +.byte 0x3e, 0x43, 0x04, 0x00 +.byte 0xd3, 0x46, 0x04, 0x00 +.byte 0x5b, 0x4a, 0x04, 0x00 +.byte 0xd7, 0x4d, 0x04, 0x00 +.byte 0x46, 0x51, 0x04, 0x00 +.byte 0xaa, 0x54, 0x04, 0x00 +.byte 0x03, 0x58, 0x04, 0x00 +.byte 0x51, 0x5b, 0x04, 0x00 +.byte 0x94, 0x5e, 0x04, 0x00 +.byte 0xcc, 0x61, 0x04, 0x00 +.byte 0xfa, 0x64, 0x04, 0x00 +.byte 0x1e, 0x68, 0x04, 0x00 +.byte 0x39, 0x6b, 0x04, 0x00 +.byte 0x4a, 0x6e, 0x04, 0x00 +.byte 0x51, 0x71, 0x04, 0x00 +.byte 0x50, 0x74, 0x04, 0x00 +.byte 0x45, 0x77, 0x04, 0x00 +.byte 0x32, 0x7a, 0x04, 0x00 +.byte 0x17, 0x7d, 0x04, 0x00 +.byte 0xf3, 0x7f, 0x04, 0x00 +.byte 0xc7, 0x82, 0x04, 0x00 +.byte 0x93, 0x85, 0x04, 0x00 +.byte 0x58, 0x88, 0x04, 0x00 +.byte 0x15, 0x8b, 0x04, 0x00 +.byte 0xca, 0x8d, 0x04, 0x00 +.byte 0x79, 0x90, 0x04, 0x00 +.byte 0x20, 0x93, 0x04, 0x00 +.byte 0xc0, 0x95, 0x04, 0x00 +.byte 0x59, 0x98, 0x04, 0x00 +.byte 0xec, 0x9a, 0x04, 0x00 +.byte 0x78, 0x9d, 0x04, 0x00 +.byte 0xfe, 0x9f, 0x04, 0x00 +.byte 0x7d, 0xa2, 0x04, 0x00 +.byte 0xf6, 0xa4, 0x04, 0x00 +.byte 0x69, 0xa7, 0x04, 0x00 +.byte 0xd7, 0xa9, 0x04, 0x00 +.byte 0x3e, 0xac, 0x04, 0x00 +.byte 0xa0, 0xae, 0x04, 0x00 +.byte 0xfc, 0xb0, 0x04, 0x00 +.byte 0x52, 0xb3, 0x04, 0x00 +.byte 0xa3, 0xb5, 0x04, 0x00 +.byte 0xef, 0xb7, 0x04, 0x00 +.byte 0x36, 0xba, 0x04, 0x00 +.byte 0x77, 0xbc, 0x04, 0x00 +.byte 0xb3, 0xbe, 0x04, 0x00 +.byte 0xeb, 0xc0, 0x04, 0x00 +.byte 0x1d, 0xc3, 0x04, 0x00 +.byte 0x4b, 0xc5, 0x04, 0x00 +.byte 0x74, 0xc7, 0x04, 0x00 +.byte 0x99, 0xc9, 0x04, 0x00 +.byte 0xb8, 0xcb, 0x04, 0x00 +.byte 0xd4, 0xcd, 0x04, 0x00 +.byte 0xeb, 0xcf, 0x04, 0x00 +.byte 0xfd, 0xd1, 0x04, 0x00 +.byte 0x0c, 0xd4, 0x04, 0x00 +.byte 0x16, 0xd6, 0x04, 0x00 +.byte 0x1c, 0xd8, 0x04, 0x00 +.byte 0x1e, 0xda, 0x04, 0x00 +.byte 0x1c, 0xdc, 0x04, 0x00 +.byte 0x16, 0xde, 0x04, 0x00 +.byte 0x0c, 0xe0, 0x04, 0x00 +.byte 0xff, 0xe1, 0x04, 0x00 +.byte 0xed, 0xe3, 0x04, 0x00 +.byte 0xd8, 0xe5, 0x04, 0x00 +.byte 0xc0, 0xe7, 0x04, 0x00 +.byte 0xa3, 0xe9, 0x04, 0x00 +.byte 0x83, 0xeb, 0x04, 0x00 +.byte 0x60, 0xed, 0x04, 0x00 +.byte 0x39, 0xef, 0x04, 0x00 +.byte 0x0f, 0xf1, 0x04, 0x00 +.byte 0xe1, 0xf2, 0x04, 0x00 +.byte 0xb1, 0xf4, 0x04, 0x00 +.byte 0x7c, 0xf6, 0x04, 0x00 +.byte 0x45, 0xf8, 0x04, 0x00 +.byte 0x0b, 0xfa, 0x04, 0x00 +.byte 0xcd, 0xfb, 0x04, 0x00 +.byte 0x8c, 0xfd, 0x04, 0x00 +.byte 0x49, 0xff, 0x04, 0x00 +.byte 0x02, 0x01, 0x05, 0x00 +.byte 0xb8, 0x02, 0x05, 0x00 +.byte 0x6c, 0x04, 0x05, 0x00 +.byte 0x1d, 0x06, 0x05, 0x00 +.byte 0xca, 0x07, 0x05, 0x00 +.byte 0x75, 0x09, 0x05, 0x00 +.byte 0x1d, 0x0b, 0x05, 0x00 +.byte 0xc3, 0x0c, 0x05, 0x00 +.byte 0x66, 0x0e, 0x05, 0x00 +.byte 0x06, 0x10, 0x05, 0x00 +.byte 0xa3, 0x11, 0x05, 0x00 +.byte 0x3e, 0x13, 0x05, 0x00 +.byte 0xd6, 0x14, 0x05, 0x00 +.byte 0x6c, 0x16, 0x05, 0x00 +.byte 0x00, 0x18, 0x05, 0x00 +.byte 0x90, 0x19, 0x05, 0x00 +.byte 0x1f, 0x1b, 0x05, 0x00 +.byte 0xab, 0x1c, 0x05, 0x00 +.byte 0x34, 0x1e, 0x05, 0x00 +.byte 0xbc, 0x1f, 0x05, 0x00 +.byte 0x41, 0x21, 0x05, 0x00 +.byte 0xc3, 0x22, 0x05, 0x00 +.byte 0x44, 0x24, 0x05, 0x00 +.byte 0xc2, 0x25, 0x05, 0x00 +.byte 0x3e, 0x27, 0x05, 0x00 +.byte 0xb7, 0x28, 0x05, 0x00 +.byte 0x2f, 0x2a, 0x05, 0x00 +.byte 0xa4, 0x2b, 0x05, 0x00 +.byte 0x18, 0x2d, 0x05, 0x00 +.byte 0x89, 0x2e, 0x05, 0x00 +.byte 0xf8, 0x2f, 0x05, 0x00 +.byte 0x65, 0x31, 0x05, 0x00 +.byte 0xd0, 0x32, 0x05, 0x00 +.byte 0x39, 0x34, 0x05, 0x00 +.byte 0xa0, 0x35, 0x05, 0x00 +.byte 0x06, 0x37, 0x05, 0x00 +.byte 0x69, 0x38, 0x05, 0x00 +.byte 0xca, 0x39, 0x05, 0x00 +.byte 0x29, 0x3b, 0x05, 0x00 +.byte 0x87, 0x3c, 0x05, 0x00 +.byte 0xe3, 0x3d, 0x05, 0x00 +.byte 0x3c, 0x3f, 0x05, 0x00 +.byte 0x94, 0x40, 0x05, 0x00 +.byte 0xeb, 0x41, 0x05, 0x00 +.byte 0x3f, 0x43, 0x05, 0x00 +.byte 0x92, 0x44, 0x05, 0x00 +.byte 0xe3, 0x45, 0x05, 0x00 +.byte 0x32, 0x47, 0x05, 0x00 +.byte 0x80, 0x48, 0x05, 0x00 +.byte 0xcb, 0x49, 0x05, 0x00 +.byte 0x16, 0x4b, 0x05, 0x00 +.byte 0x5e, 0x4c, 0x05, 0x00 +.byte 0xa5, 0x4d, 0x05, 0x00 +.byte 0xea, 0x4e, 0x05, 0x00 +.byte 0x2e, 0x50, 0x05, 0x00 +.byte 0x70, 0x51, 0x05, 0x00 +.byte 0xb0, 0x52, 0x05, 0x00 +.byte 0xef, 0x53, 0x05, 0x00 +.byte 0x2d, 0x55, 0x05, 0x00 +.byte 0x68, 0x56, 0x05, 0x00 +.byte 0xa3, 0x57, 0x05, 0x00 +.byte 0xdc, 0x58, 0x05, 0x00 +.byte 0x13, 0x5a, 0x05, 0x00 +.byte 0x49, 0x5b, 0x05, 0x00 +.byte 0x7d, 0x5c, 0x05, 0x00 +.byte 0xb0, 0x5d, 0x05, 0x00 +.byte 0xe2, 0x5e, 0x05, 0x00 +.byte 0x12, 0x60, 0x05, 0x00 +.byte 0x40, 0x61, 0x05, 0x00 +.byte 0x6e, 0x62, 0x05, 0x00 +.byte 0x9a, 0x63, 0x05, 0x00 +.byte 0xc4, 0x64, 0x05, 0x00 +.byte 0xed, 0x65, 0x05, 0x00 +.byte 0x15, 0x67, 0x05, 0x00 +.byte 0x3c, 0x68, 0x05, 0x00 +.byte 0x61, 0x69, 0x05, 0x00 +.byte 0x85, 0x6a, 0x05, 0x00 +.byte 0xa8, 0x6b, 0x05, 0x00 +.byte 0xc9, 0x6c, 0x05, 0x00 +.byte 0xe9, 0x6d, 0x05, 0x00 +.byte 0x08, 0x6f, 0x05, 0x00 +.byte 0x25, 0x70, 0x05, 0x00 +.byte 0x42, 0x71, 0x05, 0x00 +.byte 0x5d, 0x72, 0x05, 0x00 +.byte 0x77, 0x73, 0x05, 0x00 +.byte 0x8f, 0x74, 0x05, 0x00 +.byte 0xa7, 0x75, 0x05, 0x00 +.byte 0xbd, 0x76, 0x05, 0x00 +.byte 0xd2, 0x77, 0x05, 0x00 +.byte 0xe6, 0x78, 0x05, 0x00 +.byte 0xf9, 0x79, 0x05, 0x00 +.byte 0x0b, 0x7b, 0x05, 0x00 +.byte 0x1b, 0x7c, 0x05, 0x00 +.byte 0x2b, 0x7d, 0x05, 0x00 +.byte 0x39, 0x7e, 0x05, 0x00 +.byte 0x46, 0x7f, 0x05, 0x00 +.byte 0x52, 0x80, 0x05, 0x00 +.byte 0x5d, 0x81, 0x05, 0x00 +.byte 0x67, 0x82, 0x05, 0x00 +.byte 0x70, 0x83, 0x05, 0x00 +.byte 0x77, 0x84, 0x05, 0x00 +.byte 0x7e, 0x85, 0x05, 0x00 +.byte 0x84, 0x86, 0x05, 0x00 +.byte 0x88, 0x87, 0x05, 0x00 +.byte 0x8c, 0x88, 0x05, 0x00 +.byte 0x8e, 0x89, 0x05, 0x00 +.byte 0x90, 0x8a, 0x05, 0x00 +.byte 0x90, 0x8b, 0x05, 0x00 +.byte 0x90, 0x8c, 0x05, 0x00 +.byte 0x8e, 0x8d, 0x05, 0x00 +.byte 0x8c, 0x8e, 0x05, 0x00 +.byte 0x88, 0x8f, 0x05, 0x00 +.byte 0x84, 0x90, 0x05, 0x00 +.byte 0x7f, 0x91, 0x05, 0x00 +.byte 0x78, 0x92, 0x05, 0x00 +.byte 0x71, 0x93, 0x05, 0x00 +.byte 0x69, 0x94, 0x05, 0x00 +.byte 0x60, 0x95, 0x05, 0x00 +.byte 0x55, 0x96, 0x05, 0x00 +.byte 0x4a, 0x97, 0x05, 0x00 +.byte 0x3f, 0x98, 0x05, 0x00 +.byte 0x32, 0x99, 0x05, 0x00 +.byte 0x24, 0x9a, 0x05, 0x00 +.byte 0x15, 0x9b, 0x05, 0x00 +.byte 0x06, 0x9c, 0x05, 0x00 +.byte 0xf5, 0x9c, 0x05, 0x00 +.byte 0xe4, 0x9d, 0x05, 0x00 +.byte 0xd2, 0x9e, 0x05, 0x00 +.byte 0xbf, 0x9f, 0x05, 0x00 +.byte 0xab, 0xa0, 0x05, 0x00 +.byte 0x97, 0xa1, 0x05, 0x00 +.byte 0x81, 0xa2, 0x05, 0x00 +.byte 0x6b, 0xa3, 0x05, 0x00 +.byte 0x54, 0xa4, 0x05, 0x00 +.byte 0x3c, 0xa5, 0x05, 0x00 +.byte 0x23, 0xa6, 0x05, 0x00 +.byte 0x09, 0xa7, 0x05, 0x00 +.byte 0xef, 0xa7, 0x05, 0x00 +.byte 0xd3, 0xa8, 0x05, 0x00 +.byte 0xb7, 0xa9, 0x05, 0x00 +.byte 0x9a, 0xaa, 0x05, 0x00 +.byte 0x7d, 0xab, 0x05, 0x00 +.byte 0x5e, 0xac, 0x05, 0x00 +.byte 0x3f, 0xad, 0x05, 0x00 +.byte 0x1f, 0xae, 0x05, 0x00 +.byte 0xff, 0xae, 0x05, 0x00 +.byte 0xdd, 0xaf, 0x05, 0x00 +.byte 0xbb, 0xb0, 0x05, 0x00 +.byte 0x98, 0xb1, 0x05, 0x00 +.byte 0x74, 0xb2, 0x05, 0x00 +.byte 0x50, 0xb3, 0x05, 0x00 diff --git a/src/file_system.c b/src/file_system.c index 71b5534..c328d6a 100644 --- a/src/file_system.c +++ b/src/file_system.c @@ -26,8 +26,8 @@ void sub_800A894(struct UnkFileStruct *r0, s32 r1) temp = r1; if(r1 <= 0) temp = 1; - if(temp > 0x12b) - temp = 0x12b; + if(temp > 299) + temp = 299; r0->unk4 = gUnknown_80B96E4[temp]; r0->unk0 = 0; } |