mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-07-09 05:13:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update some attempts, got a couple matches (#591)

Browse Source 
* Update some attempts, got a couple matches

* More matches and updates

Signed-off-by: Taggerung <tyler.taggerung@email.com>
This commit is contained in:
Tyler McGavran
2024-04-02 15:00:35 -04:00
committed by GitHub
parent 893ecbe838
commit 6af653ad3d
16 changed files with 481 additions and 1888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/some_data.c
+35 -33
View File
@@ -351,7 +351,7 @@ f32 D_800E594C[][2] = {
{ -0.0, 0.0 },
};
u16 D_800E597C[] = { 0x0000, 0x0000, 0x4000, 0x8000, 0x8000, 0xc000 };
s16 D_800E597C[] = { 0x0000, 0x0000, 0x4000, 0x8000, 0x8000, 0xc000 };
// Seems to be related to the Boos in Banshee Boardwalk
SplineData23 D_800E5988 = {
@@ -766,38 +766,40 @@ Vec3s D_800E634C[] = {
{ 0xf380, 0x0013, 0xfe14 },
};
Vec3s gMoleSpawns[] = {
{ 0x0303, 0x0014, 0xf81a },
{ 0x0327, 0x000f, 0xf7f1 },
{ 0x034f, 0x0012, 0xf808 },
{ 0x0391, 0x000e, 0xf7fa },
{ 0x03ab, 0x0015, 0xf833 },
{ 0x03ad, 0x0011, 0xf818 },
{ 0x03e2, 0x0011, 0xf836 },
{ 0x035f, 0x0016, 0xf826 },
{ 0x05dc, 0x0002, 0x0474 },
{ 0x05e6, 0x000f, 0x041a },
{ 0x0649, 0x0015, 0x03a7 },
{ 0x0509, 0x0003, 0x04f5 },
{ 0x05bc, 0x0016, 0x0416 },
{ 0x0564, 0x000c, 0x0482 },
{ 0x0511, 0x0013, 0x0492 },
{ 0x0635, 0x000b, 0x03ec },
{ 0x0586, 0x0003, 0x04a1 },
{ 0x057d, 0x0004, 0x04e6 },
{ 0x05b7, 0x0008, 0x045e },
{ 0x02bd, 0x0002, 0x04ff },
{ 0x032b, 0x0008, 0x04fe },
{ 0x0317, 0x0010, 0x04cd },
{ 0x036c, 0x000f, 0x04f2 },
{ 0x03d8, 0x0017, 0x04e0 },
{ 0x037b, 0x0014, 0x04da },
{ 0x0398, 0x000f, 0x0518 },
{ 0x0337, 0x0006, 0x052f },
{ 0x02cd, 0x0008, 0x04d7 },
{ 0x02b7, 0x0013, 0x0498 },
{ 0x0274, 0x0008, 0x04a7 },
{ 0x02d4, 0x0004, 0x053b },
MoleSpawnUnion gMoleSpawns = {
{
{ 0x0303, 0x0014, 0xf81a },
{ 0x0327, 0x000f, 0xf7f1 },
{ 0x034f, 0x0012, 0xf808 },
{ 0x0391, 0x000e, 0xf7fa },
{ 0x03ab, 0x0015, 0xf833 },
{ 0x03ad, 0x0011, 0xf818 },
{ 0x03e2, 0x0011, 0xf836 },
{ 0x035f, 0x0016, 0xf826 },
{ 0x05dc, 0x0002, 0x0474 },
{ 0x05e6, 0x000f, 0x041a },
{ 0x0649, 0x0015, 0x03a7 },
{ 0x0509, 0x0003, 0x04f5 },
{ 0x05bc, 0x0016, 0x0416 },
{ 0x0564, 0x000c, 0x0482 },
{ 0x0511, 0x0013, 0x0492 },
{ 0x0635, 0x000b, 0x03ec },
{ 0x0586, 0x0003, 0x04a1 },
{ 0x057d, 0x0004, 0x04e6 },
{ 0x05b7, 0x0008, 0x045e },
{ 0x02bd, 0x0002, 0x04ff },
{ 0x032b, 0x0008, 0x04fe },
{ 0x0317, 0x0010, 0x04cd },
{ 0x036c, 0x000f, 0x04f2 },
{ 0x03d8, 0x0017, 0x04e0 },
{ 0x037b, 0x0014, 0x04da },
{ 0x0398, 0x000f, 0x0518 },
{ 0x0337, 0x0006, 0x052f },
{ 0x02cd, 0x0008, 0x04d7 },
{ 0x02b7, 0x0013, 0x0498 },
{ 0x0274, 0x0008, 0x04a7 },
{ 0x02d4, 0x0004, 0x053b },
}
};
// Referenced by D_800E6724, which is unused
src/data/some_data.h
+2 -2
View File
@@ -37,7 +37,7 @@ extern ThwompSpawn gThwompSpawns100CCExtra[];
extern ThwompSpawn gThomwpSpawns150CC[];
extern f32 D_800E594C[][2];
extern u64 D_800E5974;
extern u16 D_800E597C[];
extern s16 D_800E597C[];
extern SplineData23 D_800E5988;
extern SplineData24 D_800E5A44;
extern SplineData25 D_800E5B08;
@@ -60,7 +60,7 @@ extern SplineData25 D_800E61B4;
extern SplineData23 D_800E6280;
extern SplineData *D_800E633C[];
extern Vec3s D_800E634C[];
extern Vec3s gMoleSpawns[];
extern MoleSpawnUnion gMoleSpawns;
extern SplineData23 D_800E641C;
extern SplineData24 D_800E64D8;
extern SplineData25 D_800E659C;