Game-Decompilation/sf64
1
0
Fork 0
mirror of https://github.com/sonicdcer/sf64.git synced 2024-11-23 04:50:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fox_rcp (#20)

Browse Source 
* 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 2023-11-13 13:18:43 -03:00 committed by GitHub
parent 77894de848
commit 59475cd4f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 400 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.clang-tidy
View File

@ -1,9 +1,10 @@
Checks: 'readability-*,-readability-magic-numbers,-readability-uppercase-literal-suffix,-readability-non-const-parameter,-readability-else-after-return,clang-diagnostic-*,clang-analyzer-*,-clang-analyzer-security.insecureAPI.*,-clang-analyzer-deadcode.DeadStores,-clang-analyzer-core.uninitialized.ArraySubscript,-clang-analyzer-core.UndefinedBinaryOperatorResult,bugprone*,-bugprone-macro-parentheses,-bugprone-reserved-identifier,-bugprone-narrowing-conversions,-bugprone-too-small-loop-variable,-bugprone-integer-division,-bugprone-sizeof-expression,-bugprone-suspicious-include,modernize*,-bugprone-branch-clone,-bugprone-signed-char-misuse,performance*,portability*,diagnostic-*,analyzer-*,misc*'
Checks: '-*,readability-braces-around-statements,readability-inconsistent-declaration-parameter-name'
WarningsAsErrors: ''
HeaderFilterRegex: '^(?!.*\/libultra\/)(src|include)\/.*\.h$'
HeaderFilterRegex: '(src|include)\/.*\.h$'
FormatStyle: 'file'
CheckOptions:
# Require argument names to match exactly (instead of allowing a name to be a prefix/suffix of another)
# Note: 'true' is expected by clang-tidy 12+ but '1' is used for compatibility with older versions
- key: readability-inconsistent-declaration-parameter-name.Strict
value: 1

4
.vscode/settings.json vendored
View File

@ -34,6 +34,8 @@
"variables.h": "c",
"functions.h": "c",
"macros.h": "c",
"random": "c"
"random": "c",
"limits": "c",
"algorithm": "c"
},
}

3
include/functions.h
View File

@ -142,6 +142,9 @@ void func_8006EEFC(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void func_8007C120(f32, f32, f32, f32, f32, f32, f32, s32);
void func_8007D10C(f32, f32, f32, f32);
void func_80084370(s32);
void func_800843FC(s32);
void func_80084488(s32);
void func_80084688(s32, s32);
void func_800857DC(f32, f32, f32, f32);
void func_80085890(f32, f32, f32, f32);

101
include/gfx.h Normal file
View File

@ -0,0 +1,101 @@
#ifndef GFX_H
#define GFX_H
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240
typedef enum SetupDL {
/* 0x00 */ SETUPDL_0,
/* 0x01 */ SETUPDL_1,
/* 0x02 */ SETUPDL_2,
/* 0x03 */ SETUPDL_3,
/* 0x04 */ SETUPDL_4,
/* 0x05 */ SETUPDL_5,
/* 0x06 */ SETUPDL_6,
/* 0x07 */ SETUPDL_7,
/* 0x08 */ SETUPDL_8,
/* 0x09 */ SETUPDL_9,
/* 0x0A */ SETUPDL_10,
/* 0x0B */ SETUPDL_11,
/* 0x0C */ SETUPDL_12,
/* 0x0D */ SETUPDL_13,
/* 0x0E */ SETUPDL_14,
/* 0x0F */ SETUPDL_15,
/* 0x10 */ SETUPDL_16,
/* 0x11 */ SETUPDL_17,
/* 0x12 */ SETUPDL_18,
/* 0x13 */ SETUPDL_19,
/* 0x14 */ SETUPDL_20,
/* 0x15 */ SETUPDL_21,
/* 0x16 */ SETUPDL_22,
/* 0x17 */ SETUPDL_23,
/* 0x18 */ SETUPDL_24,
/* 0x19 */ SETUPDL_25,
/* 0x1A */ SETUPDL_26,
/* 0x1B */ SETUPDL_27,
/* 0x1C */ SETUPDL_28,
/* 0x1D */ SETUPDL_29,
/* 0x1E */ SETUPDL_30,
/* 0x1F */ SETUPDL_31,
/* 0x20 */ SETUPDL_32,
/* 0x21 */ SETUPDL_33,
/* 0x22 */ SETUPDL_34,
/* 0x23 */ SETUPDL_35,
/* 0x24 */ SETUPDL_36,
/* 0x25 */ SETUPDL_37,
/* 0x26 */ SETUPDL_38,
/* 0x27 */ SETUPDL_39,
/* 0x28 */ SETUPDL_40,
/* 0x29 */ SETUPDL_41,
/* 0x2A */ SETUPDL_42,
/* 0x2B */ SETUPDL_43,
/* 0x2C */ SETUPDL_44,
/* 0x2D */ SETUPDL_45,
/* 0x2E */ SETUPDL_46,
/* 0x2F */ SETUPDL_47,
/* 0x30 */ SETUPDL_48,
/* 0x31 */ SETUPDL_49,
/* 0x32 */ SETUPDL_50,
/* 0x33 */ SETUPDL_51,
/* 0x34 */ SETUPDL_52,
/* 0x35 */ SETUPDL_53,
/* 0x36 */ SETUPDL_54,
/* 0x37 */ SETUPDL_55,
/* 0x38 */ SETUPDL_56,
/* 0x39 */ SETUPDL_57,
/* 0x3A */ SETUPDL_58,
/* 0x3B */ SETUPDL_59,
/* 0x3C */ SETUPDL_60,
/* 0x3D */ SETUPDL_61,
/* 0x3E */ SETUPDL_62,
/* 0x3F */ SETUPDL_63,
/* 0x40 */ SETUPDL_64,
/* 0x41 */ SETUPDL_65,
/* 0x42 */ SETUPDL_66,
/* 0x43 */ SETUPDL_67,
/* 0x44 */ SETUPDL_68,
/* 0x45 */ SETUPDL_69,
/* 0x46 */ SETUPDL_70,
/* 0x47 */ SETUPDL_71,
/* 0x48 */ SETUPDL_72,
/* 0x49 */ SETUPDL_73,
/* 0x4A */ SETUPDL_74,
/* 0x4B */ SETUPDL_75,
/* 0x4C */ SETUPDL_76,
/* 0x4D */ SETUPDL_77,
/* 0x4E */ SETUPDL_78,
/* 0x4F */ SETUPDL_79,
/* 0x50 */ SETUPDL_80,
/* 0x51 */ SETUPDL_81,
/* 0x52 */ SETUPDL_82,
/* 0x53 */ SETUPDL_83,
/* 0x54 */ SETUPDL_84,
/* 0x55 */ SETUPDL_85,
/* 0x56 */ SETUPDL_86,
/* 0x57 */ SETUPDL_87,
/* 0x58 */ SETUPDL_MAX
} SetupDL;
extern Gfx gSetupDLs[SETUPDL_MAX][9]; // 0x800D31B0
#endif

4
include/global.h
View File

@ -16,6 +16,7 @@
#include "structs.h"
#include "macros.h"
#include "sf64math.h"
#include "gfx.h"
typedef enum {
SI_MESG_10 = 10,
@ -27,9 +28,6 @@ typedef enum {
SI_MESG_16,
} SerialMesg;
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240
#define MSG_QUEUE_EMPTY -1
#define FAULT_MESG_BREAK 1

3
include/macros.h
View File

@ -1,6 +1,9 @@
#ifndef MACROS_H
#define MACROS_H
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 240
#define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
#define SQ(x) ((x) * (x))

17
include/variables.h
View File

@ -73,23 +73,6 @@ extern OverlayInit D_800CBC0C[];
extern UnkStruct_90A00_1C D_800CC124[400];
extern Gfx D_800D31F8[];
extern Gfx D_800D3240[];
extern Gfx D_800D3288[];
extern Gfx D_800D32D0[];
extern Gfx D_800D33A8[];
extern Gfx D_800D33F0[];
extern Gfx D_800D34C8[];
extern Gfx D_800D3510[];
extern Gfx D_800D3558[];
extern Gfx D_800D35A0[];
extern Gfx D_800D3678[];
extern Gfx D_800D3BD0[];
extern Gfx D_800D36C0[];
extern Gfx D_800D3708[];
extern Gfx D_800D4050[];
extern Gfx D_800D4320[];
extern u16 D_800DD8AA;
extern s32 D_800D4A70;

2
linker_scripts/us/symbol_addrs.txt
View File

@ -45,6 +45,8 @@ D_80163FE0 = 0x80163FE0; //size:0xB130
gDmaTable = 0x80178A70;
gSetupDLs = 0x800D31B0; // size:0x18C0
D_800DD880 = 0x800DD880; // size:0x18
D_800DD898 = 0x800DD898; // size:0x18
D_800DD8B0 = 0x800DD8B0; // size:0x4

256
src/main/fox_rcp.c Normal file
View File

@ -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);
}

30
src/main/sf_84F70.c
View File

@ -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")

145
src/main/sf_B99D0.c
View File

@ -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")

BIN
toolsTempComp.bin.mio0 Normal file
View File

Binary file not shown.

4
yamls/us/main.yaml
View File

@ -184,7 +184,7 @@
- [0xA4290, c, sf_A4290]
- [0xA48A0, c, sf_A48A0]
- [0xA4B50, c, sf_A4B50]
- [0xB99D0, c, sf_B99D0]
- [0xB99D0, c, fox_rcp]
- [0xBB360, c, sf_BB360]
- [0xBD360, c, sf_versus]
- [0xC3430, c, sf_C3430]
@ -273,7 +273,7 @@
# # - [0x, data, sf_A48A0]
# - [0xD3B50, data, sf_A4B50]
# - [0xD3D80, data, ???]
# - [0xD3DB0, data, sf_B99D0]
# - [0xD3DB0, data, fox_rcp]
# - [0xD5670, data, sf_BB360]
# - [0xD5690, data, sf_versus]
# - [0xD5910, data, ???]