summaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorTyler McGavran <tyler.taggerung@gmail.com>2023-03-29 20:52:15 -0400
committerGitHub <noreply@github.com>2023-03-29 18:52:15 -0600
commit782ed71f6135152697c6da5a232cef4aa1804d85 (patch)
treed6aeccc50bebbfa7c9319dfb6428a1b025c7e9ae /src/main.h
parent8d118db0b25edfbabb059e4b977e339ca9d8f885 (diff)
Massive data relocation (#295)
Mostly relocating rodata from data/* files to the appropriate asm/nonmatching/* files, although there is some plain data relocating to be found in here too. Big change to note is the addition of the code_802AAA70.c file, split from memory.c. Based on some padding in the ro/data for memory it seems clear that a split is needed, although it is not clear that exact spot chosen for the split is correct. Still, it gets the file padding for the ro/data and text segments correct so it can't be too wrong. Also included is an update to the asm_processor tool to support the .hword directive. I made a PR to the main repo of that project with an identical change and it was accepted. Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h
index d6d7c8feb..adc737900 100644
--- a/src/main.h
+++ b/src/main.h
@@ -114,6 +114,4 @@ extern struct UnkStruct_800DC5EC *D_800DC5EC;
extern u16 D_800DC5B0;
extern s32 gPlayerWinningIndex;
-extern s32 gEnableResourceMeters;
-
#endif