From 8fee68e0a28bc54dee580c7a5faf892d54f229a9 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Fri, 26 Feb 2021 23:32:02 +0100 Subject: [PATCH] matched eeprom rodata... --- data/data_089FC6C4.s | 2 +- data/data_08DE7D58.s | 6 ------ linker.ld | 1 - src/code_080B1520.c | 7 ++++++- 4 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 data/data_08DE7D58.s diff --git a/data/data_089FC6C4.s b/data/data_089FC6C4.s index 78507def..fb6fb436 100644 --- a/data/data_089FC6C4.s +++ b/data/data_089FC6C4.s @@ -10301,4 +10301,4 @@ gUnk_08DE7D18:: @ 08DE7D18 .incbin "baserom.gba", 0xDE7D18, 0x0000010 gUnk_08DE7D28:: @ 08DE7D28 - .incbin "baserom.gba", 0xDE7D28, 0x0000018 + .incbin "baserom.gba", 0xDE7D28, 0x000000C diff --git a/data/data_08DE7D58.s b/data/data_08DE7D58.s deleted file mode 100644 index b36b3768..00000000 --- a/data/data_08DE7D58.s +++ /dev/null @@ -1,6 +0,0 @@ - - .section .rodata - .align 2 - -gUnk_08DE7D58:: @ 08DE7D58 - .incbin "baserom.gba", 0xDE7D58, 0x000004c diff --git a/linker.ld b/linker.ld index c141c87e..70dee721 100644 --- a/linker.ld +++ b/linker.ld @@ -1034,7 +1034,6 @@ SECTIONS { data/sprite_table.o(.rodata); data/data_089FC6C4.o(.rodata); src/code_080B1520.o(.rodata); - data/data_08DE7D58.o(.rodata); } >rom /* DWARF 2 sections */ diff --git a/src/code_080B1520.c b/src/code_080B1520.c index 1543aa33..69cdff2d 100644 --- a/src/code_080B1520.c +++ b/src/code_080B1520.c @@ -7,11 +7,12 @@ typedef struct EEPROMConfig { u8 address_width; // u8 filler[3]; } EEPROMConfig; - +const char EEPROM_V124[] = "EEPROM_V124"; extern const EEPROMConfig* gEEPROMConfig; const EEPROMConfig gEEPROMConfig512 = { 0x200, 0x40, 0x300, 0x6 }; const EEPROMConfig gEEPROMConfig8k = { 0x2000, 0x400, 0x300, 0xe }; + u16 sub_080B16AC(u16, u16*, u8); u32 sub_080B1520(u16 unk_1) { @@ -200,6 +201,8 @@ u16 sub_080B180C(u16 unk_1, u16* unk_2) { return ret; } +const char EEPROM_NOWAIT[] = "EEPROM_NOWAIT"; + u32 sub_080B1864(u16 unk_1, u16* unk_2) { u8 i; u32 ret; @@ -241,3 +244,5 @@ u32 sub_080B18DC(u16 unk_1, u16* unk_2) { } return ret; } + +const char thing[0x1c] = "\xff\xff\xff\xff";