Merge pull request #3 from Henny022p/eeprom_globals

matched eeprom global data
This commit is contained in:
Henny022p 2021-02-26 23:57:32 +01:00 committed by GitHub
commit 2697b736e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions

View File

@ -10301,10 +10301,4 @@ gUnk_08DE7D18:: @ 08DE7D18
.incbin "baserom.gba", 0xDE7D18, 0x0000010
gUnk_08DE7D28:: @ 08DE7D28
.incbin "baserom.gba", 0xDE7D28, 0x0000018
gEEPROMConfig512:: @ 08DE7D40
.incbin "baserom.gba", 0xDE7D40, 0x000000C
gEEPROMConfig8k:: @ 08DE7D4C
.incbin "baserom.gba", 0xDE7D4C, 0x0000058
.incbin "baserom.gba", 0xDE7D28, 0x000000C

View File

@ -1033,6 +1033,7 @@ SECTIONS {
data/strings.o(.rodata);
data/sprite_table.o(.rodata);
data/data_089FC6C4.o(.rodata);
src/code_080B1520.o(.rodata);
} >rom
/* DWARF 2 sections */

View File

@ -1,16 +1,17 @@
#include "global.h"
typedef struct struct_08DE7D40 {
typedef struct EEPROMConfig {
u32 unk_00;
u16 size;
u16 waitcnt;
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 };
extern EEPROMConfig* gEEPROMConfig;
extern EEPROMConfig gEEPROMConfig512;
extern EEPROMConfig gEEPROMConfig8k;
u16 sub_080B16AC(u16, u16*, u8);
@ -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";