mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-13 10:21:18 +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

2
src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.c
View file

@ -3077,7 +3077,7 @@ void KaleidoScope_UpdateDungeonMap(PlayState* play) {
PRINTF("ＭＡＰ ＤＭＡ = %d\n", play->interfaceCtx.mapPaletteIndex);
#if PLATFORM_N64
if (B_80121AF0 != NULL && B_80121AF0->unk_44 != NULL && B_80121AF0->unk_44(play)) {
if (B_80121220 != NULL && B_80121220->unk_44 != NULL && B_80121220->unk_44(play)) {
} else {
KaleidoScope_LoadDungeonMap(play);

8
src/overlays/misc/ovl_kaleido_scope/z_lmap_mark.c
View file

@ -31,16 +31,16 @@ void PauseMapMark_Init(PlayState* play) {
gBossMarkScale = 1.0f;
gLoadedPauseMarkDataTable = gPauseMapMarkDataTable;
#if PLATFORM_N64
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_34 != NULL)) {
B_80121AF0->unk_34(&gLoadedPauseMarkDataTable);
if ((B_80121220 != NULL) && (B_80121220->unk_34 != NULL)) {
B_80121220->unk_34(&gLoadedPauseMarkDataTable);
}
#endif
}
void PauseMapMark_Clear(PlayState* play) {
#if PLATFORM_N64
if ((B_80121AF0 != NULL) && (B_80121AF0->unk_38 != NULL)) {
B_80121AF0->unk_38(&gLoadedPauseMarkDataTable);
if ((B_80121220 != NULL) && (B_80121220->unk_38 != NULL)) {
B_80121220->unk_38(&gLoadedPauseMarkDataTable);
}
#endif
gLoadedPauseMarkDataTable = NULL;