From 1ffa1f4eb6b09c3ccae2788323353caa379446f3 Mon Sep 17 00:00:00 2001 From: Henny022p Date: Fri, 26 Feb 2021 23:01:23 +0100 Subject: [PATCH] testing globals stuff --- data/data_089FC6C4.s | 5 ----- linker.ld | 1 + src/code_080B1520.c | 8 ++++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/data/data_089FC6C4.s b/data/data_089FC6C4.s index 2a53d0cf..ce772176 100644 --- a/data/data_089FC6C4.s +++ b/data/data_089FC6C4.s @@ -10303,8 +10303,3 @@ gUnk_08DE7D18:: @ 08DE7D18 gUnk_08DE7D28:: @ 08DE7D28 .incbin "baserom.gba", 0xDE7D28, 0x0000018 -gEEPROMConfig512:: @ 08DE7D40 - .incbin "baserom.gba", 0xDE7D40, 0x000000C - -gEEPROMConfig8k:: @ 08DE7D4C - .incbin "baserom.gba", 0xDE7D4C, 0x0000058 diff --git a/linker.ld b/linker.ld index 41e04872..70dee721 100644 --- a/linker.ld +++ b/linker.ld @@ -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 */ diff --git a/src/code_080B1520.c b/src/code_080B1520.c index 389be1b4..1543aa33 100644 --- a/src/code_080B1520.c +++ b/src/code_080B1520.c @@ -1,6 +1,6 @@ #include "global.h" -typedef struct struct_08DE7D40 { +typedef struct EEPROMConfig { u32 unk_00; u16 size; u16 waitcnt; @@ -8,9 +8,9 @@ typedef struct struct_08DE7D40 { // u8 filler[3]; } EEPROMConfig; -extern EEPROMConfig* gEEPROMConfig; -extern EEPROMConfig gEEPROMConfig512; -extern EEPROMConfig gEEPROMConfig8k; +extern const EEPROMConfig* gEEPROMConfig; +const EEPROMConfig gEEPROMConfig512 = { 0x200, 0x40, 0x300, 0x6 }; +const EEPROMConfig gEEPROMConfig8k = { 0x2000, 0x400, 0x300, 0xe }; u16 sub_080B16AC(u16, u16*, u8);