Game-Decompilation/mzm
1
0
Fork 0
mirror of https://github.com/YohannDR/mzm.git synced 2024-10-07 10:33:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
YohannDR 2022-09-16 11:55:20 +02:00
parent 3d805837a4
commit 26223df320
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
linker.ld
View File

@ -6,14 +6,13 @@ MEMORY {
SECTIONS {
ewram (NOLOAD) : ALIGN(4) {
. = 0x00027780; gMakeSolidBlocks = .;
. = 0x00035400; unk_02035400 = .;
. = 0x00027780; gMakeSolidBlocks = .;
. = 0x00033800; gMinimapTilesWithObtainedItems = .;
. = 0x00036c00; gItemsCollected = .;
. = 0x00037400; gVisitedMinimapTiles = .;
. = 0x00034000; gDecompressedMinimapVisitedTiles = .;
. = 0x00034800; gDecompressedMinimapData = .;
. = 0x00035400; unk_02035400 = .;
. = 0x00036c00; gItemsCollected = .;
. = 0x00037400; gVisitedMinimapTiles = .;
. = 0x00037e00; gEventsTriggered = .;
. = 0x00038000; unk_02038000 = .;
} >ewram

5
src/data/pointers.h
View File

@ -1,3 +1,6 @@
#ifndef POINTERS_DATA
#define POINTERS_DATA
#include "../types.h"
#include "../samus.h"
#include "../projectile.h"
@ -810,3 +813,5 @@ static const ParticleFunc_T sProcessParticleFunctionPointers[61] = {
[PE_CHARGING_BEAM] = ParticleChargingBeam,
[PE_ESCAPE] = ParticleEscape,
};
#endif

2
src/minimap.h
View File

@ -13,7 +13,7 @@ extern u16 gDecompressedMinimapData[MINIMAP_SIZE * MINIMAP_SIZE];
extern u8 gMinimapX;
extern u8 gMinimapY;
extern u8 gUpdateMinimapFlag;
extern u32 gMinimapTilesGFX[5][24];
extern u32 gMinimapTilesGFX[5 * 24];
extern struct LastAreaName gLastAreaNameVisited;

2
src/sprite.h
View File

@ -45,7 +45,7 @@ extern u8 gSpriteRNG;
#define PSPRITE_UNUSED0 0x0
#define PSPRITE_UNUSED1 0x1
#define PSPRITE_UNUSED2 0x3
#define PSPRITE_UNUSED2 0x2
#define PSPRITE_UNUSED3 0x3
#define PSPRITE_UNUSED4 0x4
#define PSPRITE_UNUSED5 0x5

4
src/syscalls.h
View File

@ -62,8 +62,8 @@ void CPUFastSet(void *src, void *dst, u16 size);
void CPUSet(void *src, void *dst, u16 size);
i32 DivarmDiv(i32 number, i32 denom);
i32 DivarmMod(i32 denom, i32 number);
void LZ77UncompVRAM(void *src, void *dst);
void LZ77UncompWRAM(void *src, void *dst);
void LZ77UncompVRAM(const void *src, void *dst);
void LZ77UncompWRAM(const void *src, void *dst);
u32 Midikey2Freq(struct wavedata *wd, u8 mk, u8 fp);
int Multiboot(void *mbp); /* TODO: proper struct */
void SoundBias0(void);