mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-19 21:41:59 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.2] Organize n64dd declarations and convert to 1.0 addresses (#2127)

Browse source 
* Reorganize n64dd declarations

* Fix bss

* Really fix bss
This commit is contained in:
cadmic 2024-09-04 11:56:24 -07:00 • committed by GitHub
parent aa1c7f3155
commit 8153c952f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 156 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/gamestates/ovl_select/z_select.c
View file

@ -12,8 +12,6 @@
#if PLATFORM_N64
#include "n64dd.h"
// TODO n64dd functions
void n64dd_SetDiskVersion(s32);
#endif
void MapSelect_LoadTitle(MapSelectState* this) {
@ -53,13 +51,13 @@ void MapSelect_LoadGame(MapSelectState* this, s32 entranceIndex) {
#if PLATFORM_N64
void func_80800AD0_unknown(MapSelectState* this, s32 arg1) {
if (B_80121AE2 != 0) {
if (D_80121212 != 0) {
n64dd_SetDiskVersion(1);
}
}
void func_80800B08_unknown(MapSelectState* this, s32 arg1) {
if (B_80121AE2 != 0) {
if (D_80121212 != 0) {
n64dd_SetDiskVersion(0);
}
}

17
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -9,17 +9,12 @@
#include "versions.h"
#if PLATFORM_N64
#include "cic6105.h"
#include "n64dd.h"
#endif
#include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h"
// TODO
void func_800014E8_unknown(void);
s32 func_801C8090_unknown(void);
void func_801C7BC4_unknown(void);
s32 func_801C7ED0_unknown(void);
#if OOT_DEBUG
void ConsoleLogo_PrintBuildInfo(Gfx** gfxP) {
Gfx* gfx;
@ -186,17 +181,17 @@ void ConsoleLogo_Destroy(GameState* thisx) {
#if PLATFORM_N64
if (this->unk_1E0) {
if (func_801C8090_unknown() != 0) {
if (func_801C7818() != 0) {
func_800D31A0();
}
func_801C7BC4_unknown();
func_801C7268();
}
#endif
Sram_InitSram(&this->state, &this->sramCtx);
#if PLATFORM_N64
func_800014E8_unknown();
func_800014E8();
#endif
}
@ -205,8 +200,8 @@ void ConsoleLogo_Init(GameState* thisx) {
ConsoleLogoState* this = (ConsoleLogoState*)thisx;
#if PLATFORM_N64
if ((B_80121AE0 != 0) && ((u8)B_80121AE1 != 0) && (B_80121AE2 == 0)) {
if (func_801C7ED0_unknown() != 0) {
if ((D_80121210 != 0) && (D_80121211 != 0) && (D_80121212 == 0)) {
if (func_801C7658() != 0) {
func_800D31A0();
}
this->unk_1E0 = true;