falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Label memory allocation with proper size (#388) 

* Renamed D_8015F734 to FreeMemoryResetAnchor
This commit is contained in:
MegaMech 2023-08-28 12:14:19 -06:00 committed by GitHub
parent 31d3ac14ec
commit 05d3636835
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/bss_800029B0.s
View File

@ -154,7 +154,7 @@ glabel gHeapEndPtr # 0x8015F72C
glabel D_8015F730
.word 0x00000000
glabel D_8015F734
glabel FreeMemoryResetAnchor
.word 0x00000000
glabel D_8015F738

4
src/code_800029B0.c
View File

@ -38,7 +38,7 @@ extern s8 gCupSelection;
extern s32 gScreenModeSelection;
extern u32 D_8015F730;
extern s32 D_8015F734;
extern s32 FreeMemoryResetAnchor;
extern u32 gNextFreeMemoryAddress;
extern s32 D_80150120;
@ -110,7 +110,7 @@ void setup_race(void) {
if (gCurrentCourseId != gCurrentlyLoadedCourseId) {
D_80150120 = 0;
gCurrentlyLoadedCourseId = gCurrentCourseId;
gNextFreeMemoryAddress = D_8015F734;
gNextFreeMemoryAddress = FreeMemoryResetAnchor;
load_course(gCurrentCourseId);
func_80295D88();
D_8015F730 = gNextFreeMemoryAddress;

4
src/code_80091750.c
View File

@ -225,10 +225,10 @@ void func_80091B78(void) {
}
}
if (gMenuSelection == LOGO_INTRO_MENU) {
gNextFreeMemoryAddress = D_8015F734;
gNextFreeMemoryAddress = FreeMemoryResetAnchor;
set_segment_base_addr(6, decompress_segments((u8 *) &_data_825800SegmentRomStart, (u8 *) &_course_mario_raceway_dl_mio0SegmentRomStart));
}
gNextFreeMemoryAddress = D_8015F734;
gNextFreeMemoryAddress = FreeMemoryResetAnchor;
// Hypothetically, this should be a ptr... But only hypothetically.
D_8018D9B0 = (intptr_t) get_next_available_memory_addr(0x000900B0);
D_8018D9B4 = (uintptr_t *) get_next_available_memory_addr(0x0000CE00);

2
src/code_80280000.c
View File

@ -129,7 +129,7 @@ void load_credits(void) {
D_800DC5EC->screenStartY = 120;
gScreenModeSelection = SCREEN_MODE_1P;
gActiveScreenMode = SCREEN_MODE_1P;
gNextFreeMemoryAddress = D_8015F734;
gNextFreeMemoryAddress = FreeMemoryResetAnchor;
load_course(gCurrentCourseId);
D_8015F730 = gNextFreeMemoryAddress;
set_segment_base_addr(0xB, (void *) decompress_segments((u8 *)&_data_821D10SegmentRomStart, (u8 *)&_data_825800SegmentRomStart));

2
src/code_80281780.c
View File

@ -101,7 +101,7 @@ void load_ceremony_cutscene(void) {
D_800DC5EC->screenStartX = 160;
D_800DC5EC->screenStartY = 120;
gScreenModeSelection = SCREEN_MODE_1P;
gNextFreeMemoryAddress = (s32) D_8015F734;
gNextFreeMemoryAddress = (s32) FreeMemoryResetAnchor;
gActiveScreenMode = SCREEN_MODE_1P;
gModeSelection = GRAND_PRIX;
load_course(gCurrentCourseId);

2
src/code_80281780.h
View File

@ -31,7 +31,7 @@ extern s32 D_80287554;
extern f32 D_801647A4;
extern f32 D_80150130[];
extern s32 D_8015F734;
extern s32 FreeMemoryResetAnchor;
extern s32 D_8015F730;

2
src/main.c
View File

@ -521,7 +521,7 @@ void setup_game_memory(void) {
set_segment_base_addr(0xD, (void *) sp38);
gNextFreeMemoryAddress += sp40;
D_8015F734 = gNextFreeMemoryAddress;
FreeMemoryResetAnchor = gNextFreeMemoryAddress;
}
/**

2
src/main.h
View File

@ -107,7 +107,7 @@ extern u64 gGfxSPTaskOutputBuffer[];
extern u32 gGfxSPTaskOutputBufferSize;
extern u32 gNextFreeMemoryAddress;
extern s32 D_8015F734;
extern s32 FreeMemoryResetAnchor;
extern u8 _data_segment2SegmentRomStart[];
extern u8 _data_segment2SegmentRomEnd[];
extern u8 _common_texturesSegmentRomStart[];

4
src/podium_ceremony_actors.c
View File

@ -287,8 +287,8 @@ void unused_80280FA8(UNUSED CeremonyActor *actor) {
void balloons_and_fireworks_init(void) {
sActorTimer = 0;
sPodiumActorList = (CeremonyActor *) get_next_available_memory_addr(0x3B60);
bzero(sPodiumActorList, 0x3B60);
sPodiumActorList = (CeremonyActor *) get_next_available_memory_addr(sizeof(CeremonyActor) * 200);
bzero(sPodiumActorList, (sizeof(CeremonyActor) * 200));
new_actor(&initDummy);
}