mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-29 03:34:07 +00:00
Code Issues Projects Releases Wiki Activity

Migrate z_common_data.c's .bss to C (#157)

Browse source
This commit is contained in:
Roman971 2020-05-26 14:50:51 +02:00 committed by GitHub
parent 3d050f2861
commit 2c5ad24c3f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
data/z_common_data.bss.s
View file

@ -1,19 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .bss
# Starts at # 0x8015E660 and has a confirmed size of 0x1428
# Any address in that range should be an offset to gSaveContext
glabel gSaveContext
.space 0x1428
glabel D_8015FA88
.space 0x4
glabel D_8015FA8C
.space 0x4

2
include/variables.h
View file

@ -3386,8 +3386,6 @@ extern u8 D_80157D30[];
//extern ? D_8015E638; //extern ? D_8015E638;
//extern ? D_8015E648; //extern ? D_8015E648;
extern SaveContext gSaveContext; // 0x8015E660 extern SaveContext gSaveContext; // 0x8015E660
extern u32 D_8015FA88;
extern u32 D_8015FA8C;
extern GameInfo* gGameInfo; // 0x8015FA90 extern GameInfo* gGameInfo; // 0x8015FA90
//extern ? D_8015FA98; //extern ? D_8015FA98;
//extern ? D_8015FA9B; //extern ? D_8015FA9B;

1
spec
View file

@ -303,7 +303,6 @@ beginseg
include "build/src/code/z_collision_check.o" include "build/src/code/z_collision_check.o"
include "build/data/z_collision_check.bss.o" include "build/data/z_collision_check.bss.o"
include "build/src/code/z_common_data.o" include "build/src/code/z_common_data.o"
include "build/data/z_common_data.bss.o"
include "build/src/code/z_debug.o" include "build/src/code/z_debug.o"
include "build/src/code/z_debug_display.o" include "build/src/code/z_debug_display.o"
include "build/src/code/z_demo.o" include "build/src/code/z_demo.o"

4
src/code/z_common_data.c
View file

@ -1,6 +1,10 @@
#include <ultra64.h> #include <ultra64.h>
#include <global.h> #include <global.h>
SaveContext gSaveContext;
u32 D_8015FA88;
u32 D_8015FA8C;
void SaveContext_Init(void) { void SaveContext_Init(void) {
bzero(&gSaveContext, sizeof(gSaveContext)); bzero(&gSaveContext, sizeof(gSaveContext));
D_8015FA88 = 0; D_8015FA88 = 0;