mirror of
https://github.com/HarbourMasters/Starship
synced 2026-09-02 18:52:52 -04:00
fox_rcp (#20)
* func_800B8E14 & func_800B8DD0 * func_800B94D0 * func_800B9618 * func_800B9760 * func_800B9790 * func_800B98A8 * func_800B99C0 * func_800B99F0 * func_800B9A20 * func_800B9B38 * func_800B9C50 * func_800B9D68 * func_800B9E80 * func_800B9EB0 * func_800B9FC8 * func_800BA0E0 * func_800BA110 * func_800BA140 * func_800BA1A0 * func_800BA1D0 * func_800BA2E8 * func_800BA400 * func_800BA430 * func_800BA460 * func_800BA490 * func_800BA4C0 * func_800BA520 * func_800BA550 * func_800BA5E0 * func_800BA640 * func_800843FC * func_80084370 * func_80084688 * gSetupDLs * gSetupDLs * fox_rcp * break * newline * mvoe screen_width and screen_height to gfx.h * remove space * correct size * clang-tidy from mm
This commit is contained in:
Alejandro Asenjo Nitti
committed by
GitHub
GitHub
parent
77894de848
commit
59475cd4f6
@@ -0,0 +1,256 @@
|
||||
#include "global.h"
|
||||
|
||||
void func_800B8DD0(Gfx** gfxP, s16 i) {
|
||||
gSPDisplayList((*gfxP)++, &((Gfx*) gSetupDLs)[i * 9]);
|
||||
}
|
||||
|
||||
void func_800B8E14(Gfx** gfxP, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gDPSetFogColor((*gfxP)++, r, g, b, a);
|
||||
gSPFogPosition((*gfxP)++, near, far);
|
||||
}
|
||||
|
||||
void dummy_800B8F08(void) {
|
||||
}
|
||||
|
||||
void dummy_800B8F10(void) {
|
||||
}
|
||||
|
||||
void func_800B8F18(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_0]);
|
||||
}
|
||||
|
||||
void func_800B8F48(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_1]);
|
||||
}
|
||||
|
||||
void func_800B8F78(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_11]);
|
||||
}
|
||||
|
||||
void func_800B8FA8(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_12]);
|
||||
}
|
||||
|
||||
void func_800B8FD8(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_2]);
|
||||
}
|
||||
|
||||
void func_800B9008(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_3]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B9120(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_4]);
|
||||
}
|
||||
|
||||
void func_800B9150(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_7]);
|
||||
}
|
||||
|
||||
void func_800B9180(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_9]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B9298(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_8]);
|
||||
}
|
||||
|
||||
void func_800B92C8(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_13]);
|
||||
}
|
||||
|
||||
void func_800B92F8(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_14]);
|
||||
}
|
||||
|
||||
void func_800B9328(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_17]);
|
||||
}
|
||||
|
||||
void func_800B9358(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_36]);
|
||||
}
|
||||
|
||||
void func_800B9388(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_52]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B94A0(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_62]);
|
||||
}
|
||||
|
||||
void func_800B94D0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_37]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B95E8(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_18]);
|
||||
}
|
||||
|
||||
void func_800B9618(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_20]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B9730(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_19]);
|
||||
}
|
||||
|
||||
void func_800B9760(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_21]);
|
||||
}
|
||||
|
||||
void func_800B9790(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_33]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B98A8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_34]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B99C0(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_40]);
|
||||
}
|
||||
|
||||
void func_800B99F0(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_42]);
|
||||
}
|
||||
|
||||
void func_800B9A20(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_43]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B9B38(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_60]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B9C50(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_47]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B9D68(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_66]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B9E80(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_55]);
|
||||
}
|
||||
|
||||
void func_800B9EB0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_57]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800B9FC8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_45]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800BA0E0(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_46]);
|
||||
}
|
||||
|
||||
void func_800BA110(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_41]);
|
||||
}
|
||||
|
||||
void func_800BA140(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_64]);
|
||||
}
|
||||
|
||||
void func_800BA170(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_64]);
|
||||
}
|
||||
|
||||
void func_800BA1A0(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_23]);
|
||||
}
|
||||
|
||||
void func_800BA1D0(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_29]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800BA2E8(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_30]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
|
||||
void func_800BA400(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_27]);
|
||||
}
|
||||
|
||||
void func_800BA430(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_32]);
|
||||
}
|
||||
|
||||
void func_800BA460(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_73]);
|
||||
}
|
||||
|
||||
void func_800BA490(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_76]);
|
||||
}
|
||||
|
||||
void func_800BA4C0(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_74]);
|
||||
}
|
||||
|
||||
void func_800BA4F0(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_78]);
|
||||
}
|
||||
|
||||
void func_800BA520(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_81]);
|
||||
}
|
||||
|
||||
void func_800BA550(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_48]);
|
||||
}
|
||||
|
||||
void func_800BA580(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_68]);
|
||||
}
|
||||
|
||||
void func_800BA5B0(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_49]);
|
||||
}
|
||||
|
||||
void func_800BA5E0(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_44]);
|
||||
}
|
||||
|
||||
void func_800BA610(void) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_50]);
|
||||
}
|
||||
|
||||
void func_800BA640(s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) {
|
||||
gSPDisplayList(gMasterDisp++, gSetupDLs[SETUPDL_61]);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogPosition(gMasterDisp++, near, far);
|
||||
}
|
||||
+26
-4
@@ -1,12 +1,34 @@
|
||||
#include "common.h"
|
||||
#include "global.h"
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_80084370.s")
|
||||
void func_80084370(s32 arg0) {
|
||||
func_8009F574(&gMasterDisp, 0, 0, arg0, SCREEN_HEIGHT, 0, 0, 0, 255);
|
||||
func_8009F574(&gMasterDisp, SCREEN_WIDTH - arg0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0, 255);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_800843FC.s")
|
||||
void func_800843FC(s32 arg0) {
|
||||
func_8009F574(&gMasterDisp, 0, 0, SCREEN_WIDTH, arg0, 0, 0, 0, 255);
|
||||
func_8009F574(&gMasterDisp, 0, SCREEN_HEIGHT - arg0, SCREEN_WIDTH, SCREEN_HEIGHT, 0, 0, 0, 255);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_80084488.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_80084688.s")
|
||||
void func_80084688(s32 arg0, s32 arg1) {
|
||||
if (arg1 != 0) {
|
||||
switch (arg0) {
|
||||
case 0:
|
||||
func_80084488(arg1);
|
||||
break;
|
||||
|
||||
case 1:
|
||||
func_80084370(arg1);
|
||||
break;
|
||||
|
||||
case 2:
|
||||
func_800843FC(arg1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_84F70/func_800846F0.s")
|
||||
|
||||
|
||||
@@ -1,145 +0,0 @@
|
||||
#include "global.h"
|
||||
|
||||
extern Gfx D_800D31B0[];
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B8DD0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B8E14.s")
|
||||
|
||||
void func_800B8F18(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D31B0);
|
||||
}
|
||||
|
||||
void func_800B8F48(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D31F8);
|
||||
}
|
||||
|
||||
void func_800B8F78(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D34C8);
|
||||
}
|
||||
|
||||
void func_800B8FA8(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D3510);
|
||||
}
|
||||
|
||||
void func_800B8FD8(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D3240);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9008.s")
|
||||
|
||||
void func_800B9120(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D32D0);
|
||||
}
|
||||
|
||||
void func_800B9150(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D33A8);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9180.s")
|
||||
|
||||
void func_800B9298(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D33F0);
|
||||
}
|
||||
|
||||
void func_800B92C8(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D3558);
|
||||
}
|
||||
|
||||
void func_800B92F8(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D35A0);
|
||||
}
|
||||
|
||||
void func_800B9328(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D3678);
|
||||
}
|
||||
|
||||
void func_800B9358(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D3BD0);
|
||||
}
|
||||
|
||||
void func_800B9388(s32 r, s32 g, s32 b, s32 a, s32 nr, s32 fr) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D4050);
|
||||
gDPSetFogColor(gMasterDisp++, r, g, b, a);
|
||||
gSPFogFactor(gMasterDisp++, (0x1F400 / (fr - nr)), (((0x1F4 - nr) * 256) / (fr - nr)));
|
||||
}
|
||||
|
||||
void func_800B94A0(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D4320);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B94D0.s")
|
||||
|
||||
void func_800B95E8(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D36C0);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9618.s")
|
||||
|
||||
void func_800B9730(void) {
|
||||
gSPDisplayList(gMasterDisp++, D_800D3708);
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9760.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9790.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B98A8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B99C0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B99F0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9A20.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9B38.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9C50.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9D68.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9E80.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9EB0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800B9FC8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA0E0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA110.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA140.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA170.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA1A0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA1D0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA2E8.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA400.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA430.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA460.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA490.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA4C0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA4F0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA520.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA550.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA580.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA5B0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA5E0.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA610.s")
|
||||
|
||||
#pragma GLOBAL_ASM("asm/us/nonmatchings/main/sf_B99D0/func_800BA640.s")
|
||||
Reference in New Issue
Block a user