mirror/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship synced 2026-05-23 06:54:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fox_map functions (#56)

Browse Source 
* func_EBFBE0_80187520

* func_EBFBE0_8019E85C

* func_EBFBE0_8019E8D0

* funcs

* func_EBFBE0_801A6A24

* func_EBFBE0_801A4D0C

* func_EBFBE0_801A62FC

* names

* func_EBFBE0_801A5770

* dec

* boolean

* func_EBFBE0_801A4A38

* func_EBFBE0_8019F83C

* func_EBFBE0_8019F910

* func_EBFBE0_8019F97C

* func_EBFBE0_8019FA1C

* comment

* func_EBFBE0_8019FC04

* func_EBFBE0_8019FD1C

* func_EBFBE0_8019FF48

* func_EBFBE0_801A01A8

* func_EBFBE0_801A05B4

* func_EBFBE0_801A07E8

* func_EBFBE0_801A655C

* func_EBFBE0_801AB284

* func_EBFBE0_801AB17C

* func_EBFBE0_801AD048

* func_EBFBE0_801A914C

* func_EBFBE0_801A9EE4

* func_EBFBE0_801A9DE8

* func_EBFBE0_801A9814

* func_EBFBE0_801A25C8

* func_EBFBE0_801A6DAC

* func_EBFBE0_801A6DAC

* func_EBFBE0_801A3440

* func_EBFBE0_801A7684

* primColor

* planetId

* func_EBFBE0_801A77B0

* func_EBFBE0_801A791C

* func_EBFBE0_801A7A84

* func_EBFBE0_801A7BEC

* func_EBFBE0_801A7BEC

* func_EBFBE0_801A7D3C

* progress script permissions

* func_EBFBE0_801A7F1C

* func_EBFBE0_801A74F4

* format

* func_EBFBE0_801A7230

* func_EBFBE0_801A6EC0

* func_EBFBE0_801AD718

* func_EBFBE0_801AD7EC

* func_EBFBE0_801AC80C

* func_EBFBE0_801ABF1C

* func_EBFBE0_801ABCDC

* scopes

* func_EBFBE0_801A68E4

* func_EBFBE0_801A6694

* func_EBFBE0_801A6480

* func_EBFBE0_801A6368

* func_EBFBE0_801A61B4

* LevelId

* LevelId

* func_EBFBE0_801A62FC

* level enum

* levelIDs

* enum
This commit is contained in:
Alejandro Asenjo Nitti
2023-12-24 13:12:09 -03:00
committed by GitHub
parent 92b2bed0f5
commit f76ce38ad1
12 changed files with 1899 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/fox_option.h
+1 -2
View File
@@ -173,7 +173,6 @@ extern UnkStruct_D_EBFBE0_801B9250 D_EBFBE0_801B9408;
extern void* D_EBFBE0_801B68B0[];
extern void* D_EBFBE0_801B68D4[];
extern s32 D_EBFBE0_801B68F8;
extern s32 D_EBFBE0_801B81A8[][3];
@@ -325,7 +324,7 @@ s32 func_EBFBE0_8019C5A0(s32*);
s32 func_EBFBE0_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_EBFBE0_801B9250* arg3);
void func_EBFBE0_8019E8D0(void);
void func_EBFBE0_801A07E8(u8*, u8*, f32*);
void func_EBFBE0_801AD7EC(s32, s32, u8);
void func_EBFBE0_801AD7EC(s32, s32, s32);
void func_EBFBE0_801A9FD4(s32);
#endif
include/functions.h
+1
View File
@@ -195,6 +195,7 @@ s32 func_8005F9DC(Vec3f*);
void func_80060714(s32 );
void func_8006089C(u8 );
void func_80060968(void);
void func_80060D94(s32);
void func_80060F30(Vec3f* , u32 , s32 );
void Object_Kill(Object*, Vec3f*);
s32 func_80060FE4(Vec3f*, f32);
include/sf64level.h
+26 -22
View File
@@ -3,6 +3,10 @@
#include "structs.h"
#define SAVE_SLOT_SOLAR 13
#define SAVE_SLOT_VENOM_1 14
#define SAVE_SLOT_VENOM_2 15
typedef enum {
LEVELTYPE_GROUND,
LEVELTYPE_SPACE,
@@ -59,28 +63,28 @@ typedef enum {
OVL_SETUP_LOGO = 99,
} OverlaySetups;
typedef enum {
LEVEL_CORNERIA,
LEVEL_METEO,
LEVEL_SECTOR_X,
LEVEL_AREA_6,
LEVEL_UNK_4,
LEVEL_SECTOR_Y,
LEVEL_VENOM_1,
LEVEL_SOLAR,
LEVEL_ZONESS,
LEVEL_VENOM_2,
LEVEL_TRAINING,
LEVEL_MACBETH,
LEVEL_TITANIA,
LEVEL_AQUAS,
LEVEL_FORTUNA,
LEVEL_UNK_15,
LEVEL_KATINA,
LEVEL_BOLSE,
LEVEL_SECTOR_Z,
LEVEL_VENOM_SW,
LEVEL_VERSUS,
typedef enum LevelId {
/* 0 */ LEVEL_CORNERIA,
/* 1 */ LEVEL_METEO,
/* 2 */ LEVEL_SECTOR_X,
/* 3 */ LEVEL_AREA_6,
/* 4 */ LEVEL_UNK_4,
/* 5 */ LEVEL_SECTOR_Y,
/* 6 */ LEVEL_VENOM_1,
/* 7 */ LEVEL_SOLAR,
/* 8 */ LEVEL_ZONESS,
/* 9 */ LEVEL_VENOM_2,
/* 10 */ LEVEL_TRAINING,
/* 11 */ LEVEL_MACBETH,
/* 12 */ LEVEL_TITANIA,
/* 13 */ LEVEL_AQUAS,
/* 14 */ LEVEL_FORTUNA,
/* 15 */ LEVEL_UNK_15,
/* 16 */ LEVEL_KATINA,
/* 17 */ LEVEL_BOLSE,
/* 18 */ LEVEL_SECTOR_Z,
/* 19 */ LEVEL_VENOM_SW,
/* 80 */ LEVEL_VERSUS,
} LevelId;
typedef enum {
include/structs.h
+2 -2
View File
@@ -47,7 +47,7 @@ typedef struct {
/* bit 5 */ u8 unk_5 : 1;
/* bit 6 */ u8 unk_6 : 1;
/* bit 7 */ u8 unk_7 : 1;
} Save_SubStruct_00; // size = 0x1
} PlanetData; // size = 0x1
typedef struct {
/* bit 0 */ u16 unk_0 : 8;
@@ -59,7 +59,7 @@ typedef struct {
} Save_SubStruct_5E; // size = 0x10
typedef struct{
/* 0x00 */ Save_SubStruct_00 unk_00[16];
/* 0x00 */ PlanetData planet[16];
/* 0x10 */ char pad10[0x4];
/* 0x14 */ u8 soundMode;
/* 0x15 */ u8 musicVolume;
include/variables.h
+1
View File
@@ -494,6 +494,7 @@ extern s8 D_80177BAC;
extern s32 D_80177BB0[7];
//
extern s16 D_80177BD0[4]; // up to [48]
extern s32 D_80177BD8[];
// 0x58
extern u16 D_80177C30[4];
extern UNK_TYPE D_80177C38[6];
linker_scripts/us/symbol_addrs.txt
+3 -1
View File
@@ -90,6 +90,8 @@ D_800D8570 = 0x800D8570; // force_migration:True
D_800D8594 = 0x800D8594; // force_migration:True
D_800C93EC = 0x800C93EC; // force_migration:True
D_80177BD8 = 0x80177BD8;
D_DF4260_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_DF4260
D_E16C50_801C171C = 0x801C171C; // force_migration:True segment:ovl_E16C50
D_E16C50_801C1728 = 0x801C1728; // force_migration:True segment:ovl_E16C50
@@ -103,4 +105,4 @@ D_EF0260_80196BF4 = 0x80196BF4; // force_migration:True segment:ovl_EF0260
D_E51970_8019FE74 = 0x8019FE74; // force_migration:True segment:ovl_E51970
D_E51970_8019FEFC = 0x8019FEFC; // force_migration:True segment:ovl_E51970
D_E9F1D0_801A7560 = 0x801A7560; // force_migration:True segment:ovl_E9F1D0
D_E9F1D0_801A792C = 0x801A792C; // force_migration:True segment:ovl_E9F1D0
D_E9F1D0_801A792C = 0x801A792C; // force_migration:True segment:ovl_E9F1D0
linker_scripts/us/symbol_addrs_EBFBE0.txt
+1
View File
@@ -1,3 +1,4 @@
planet = 0x801AF4A0; // type:Planet segment:ovl_EBFBE0 size:0x38
D_EBFBE0_801AE638 = 0x801AE638; // type:MenuContext segment:ovl_EBFBE0 size:0x240
D_EBFBE0_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_EBFBE0
spectrumAnalizerMode = 0x801B9318;
src/overlays/ovl_EBFBE0/EBFBE0.c
+47 -2
View File
@@ -1,3 +1,48 @@
#include "common.h"
#include "global.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_EBFBE0/EBFBE0/func_EBFBE0_80187520.s")
void func_EBFBE0_80187754(void);
void func_EBFBE0_801878D8(void);
void func_EBFBE0_801920C4(void);
void func_EBFBE0_80192340(void);
void func_EBFBE0_8019E85C(void);
void func_EBFBE0_8019E8C8(void);
void func_EBFBE0_8019E8D0(void);
void func_EBFBE0_801A01A8(void);
void func_EBFBE0_80187520(s32 arg0, s32 arg1) {
switch (arg0) {
case 0x67:
func_EBFBE0_80187754();
break;
case 0x68:
func_EBFBE0_801878D8();
break;
case 0x69:
func_EBFBE0_8019E8D0();
break;
case 0x6A:
func_EBFBE0_801A01A8();
break;
case 0x6B:
func_EBFBE0_801920C4();
break;
case 0x6C:
func_EBFBE0_80192340();
break;
case 0x6D:
func_EBFBE0_8019E85C();
break;
case 0x6E:
func_EBFBE0_8019E8C8();
default:
break;
}
}
src/overlays/ovl_EBFBE0/ED6EC0.c
+1785 -52
View File
File diff suppressed because it is too large Load Diff
src/overlays/ovl_EBFBE0/fox_map.h
+22
View File
@@ -0,0 +1,22 @@
#ifndef FOX_MAP_H
#define FOX_MAP_H
typedef enum PlanetId {
/* 0 */ PLANET_METEO,
/* 1 */ PLANET_AREA_6,
/* 2 */ PLANET_BOLSE,
/* 3 */ PLANET_SECTOR_Z,
/* 4 */ PLANET_SECTOR_X,
/* 5 */ PLANET_SECTOR_Y,
/* 6 */ PLANET_KATINA,
/* 7 */ PLANET_MACBETH,
/* 8 */ PLANET_ZONESS,
/* 9 */ PLANET_CORNERIA,
/* 10 */ PLANET_TITANIA,
/* 11 */ PLANET_AQUAS,
/* 12 */ PLANET_FORTUNA,
/* 13 */ PLANET_VENOM,
/* 14 */ PLANET_SOLAR,
} PlanetId;
#endif
src/overlays/ovl_EBFBE0/fox_option.c
+9 -9
View File
@@ -359,7 +359,7 @@ void func_EBFBE0_80191B20(void) {
if (i == 14) {
continue;
}
if (!(gSaveFile.save.data.unk_00[i].unk_6 & 1)) {
if (!(gSaveFile.save.data.planet[i].unk_6 & 1)) {
var_a1_2 = 0;
break;
}
@@ -398,22 +398,22 @@ void func_EBFBE0_80191B20(void) {
if (D_80161A34 == 8) {
D_80177B90[D_80177B48] = 13;
if (D_800D3180[9] == 1) {
gSaveFile.save.data.unk_00[14].unk_5 = 1;
gSaveFile.save.data.planet[14].unk_5 = 1;
if (var_v0_2 != 0) {
gSaveFile.save.data.unk_00[14].unk_4 = 1;
gSaveFile.save.data.planet[14].unk_4 = 1;
} else {
gSaveFile.save.data.unk_00[14].unk_7 = 1;
gSaveFile.save.data.planet[14].unk_7 = 1;
}
Save_Write();
} else if (D_800D3180[9] == 2) {
D_80177BB0[D_80177B48] = 1;
gSaveFile.save.data.unk_00[15].unk_5 = 1;
gSaveFile.save.data.planet[15].unk_5 = 1;
if (var_v0_2) {
gSaveFile.save.data.unk_00[15].unk_4 = 1;
gSaveFile.save.data.unk_00[15].unk_3 = 1;
gSaveFile.save.data.planet[15].unk_4 = 1;
gSaveFile.save.data.planet[15].unk_3 = 1;
} else {
gSaveFile.save.data.unk_00[15].unk_7 = 1;
gSaveFile.save.data.unk_00[15].unk_6 = 1;
gSaveFile.save.data.planet[15].unk_7 = 1;
gSaveFile.save.data.planet[15].unk_6 = 1;
}
Save_Write();
}
src/overlays/ovl_EBFBE0/fox_title.c
+1 -1
View File
@@ -365,7 +365,7 @@ void func_EBFBE0_801881FC(void) {
s32 i;
for (i = 0; i < 16; i++) {
if ((i != 14) && (!(gSaveFile.save.data.unk_00[i].unk_3 & 1))) {
if ((i != 14) && (!(gSaveFile.save.data.planet[i].unk_3 & 1))) {
var_a1 = false;
break;
}