Leahnaya/pokestadium
1
0
Fork 0
mirror of https://github.com/pret/pokestadium.git synced 2026-03-21 17:24:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #203 from fantasmashy/master
Some checks failed
C/C++ CI / build (push) Has been cancelled
Details

Browse Source 
renamings on fragment3 and 18 to 21
This commit is contained in:
Revo 2025-08-02 09:37:42 -04:00 committed by GitHub
commit 0f0e3ea3b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 2409 additions and 2398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/global.h
View File

@ -139,14 +139,14 @@ typedef struct unk_D_86002F58_004_000 {
/* 0x01A */ s16 unk_01A;
/* 0x01C */ u8 unk_01C;
/* 0x01D */ u8 unk_01D;
/* 0x01E */ Vec3s unk_01E;
/* 0x024 */ Vec3f unk_024;
/* 0x030 */ Vec3f unk_030;
/* 0x01E */ Vec3s unk_01E; // total Rotation
/* 0x024 */ Vec3f unk_024; // global Position
/* 0x030 */ Vec3f unk_030; // scale
/* 0x03C */ Color_RGBA8_u32 unk_03C;
/* 0x040 */ unk_D_86002F58_004_000_040 unk_040;
/* 0x054 */ unk_D_86002F58_004_000_054 unk_054;
/* 0x060 */ MtxF unk_060;
/* 0x0A0 */ Color_RGBA8_u32 unk_0A0;
/* 0x0A0 */ Color_RGBA8_u32 unk_0A0; // vertex color ?
/* 0x0A4 */ char unk0A4[2];
/* 0x0A6 */ u8 unk_0A6;
/* 0x0A7 */ u8 unk_0A7;
@ -245,10 +245,10 @@ typedef struct unk_D_86002F34_00C_0CC {
typedef struct unk_D_86002F34_00C {
/* 0x00 */ GraphNode unk_00;
/* 0x18 */ unk_D_86002F34_00C_018 unk_18;
/* 0x24 */ unk_D_86002F34_00C_024 unk_24;
/* 0x18 */ unk_D_86002F34_00C_018 unk_18; // viewPort
/* 0x24 */ unk_D_86002F34_00C_024 unk_24; // projection
/* 0x40 */ unk_D_86002F34_00C_040 unk_40;
/* 0x60 */ unk_D_86002F34_00C_060 unk_60;
/* 0x60 */ unk_D_86002F34_00C_060 unk_60; // camera
/* 0xCC */ unk_D_86002F34_00C_0CC unk_CC;
/* 0xEC */ char unkEC[0x4];
} unk_D_86002F34_00C; // size = 0xF0
@ -434,7 +434,7 @@ typedef struct unk_D_86002F34_018 {
/* 0x02 */ s16 width;
/* 0x04 */ s16 height;
/* 0x06 */ s16 num_texels;
/* 0x08 */ u8* texture;
/* 0x08 */ u32* texture;
} unk_D_86002F34_018; // size = 0xC
typedef struct unk_D_86002F34_01C {

24
linker_scripts/us/symbol_addrs.txt
View File

@ -72,17 +72,17 @@ gEepromMesgQueue = 0x800A7400;
gEepromMesgBuf = 0x800A73FC;
.L8120A860 = 0x8120A860;
D_8780FA30 = 0x8780FA30; // size:0x8
D_87906044 = 0x87906044;
miniShowHUB = 0x87906044;
D_87906048 = 0x87906048;
D_87906060 = 0x87906060;
D_87906064 = 0x87906064;
D_87906068 = 0x87906068;
miniCameraXRot = 0x87906060;
miniCameraDistance = 0x87906064;
miniCameraNear = 0x87906068;
D_87906070 = 0x87906070;
D_87906094 = 0x87906094;
D_87906098 = 0x87906098;
D_879060A4 = 0x879060A4;
D_879060C4 = 0x879060C4;
D_879060C8 = 0x879060C8;
miniHudTransparency = 0x879060C8;
gShowCPUProfiler = 0x80068BC0;
gShowMEMProfiler = 0x80068BC4;
gDisplayListHead = 0x800A7420;
@ -308,7 +308,7 @@ gGeoLayoutStackIndex = 0x800ABDFA; // size:0x2
gGeoLayoutReturnIndex = 0x800ABDFE; // size:0x2
gCurGraphNodeList = 0x800ABD78; // size:0x80
gCurGraphNodeIndex = 0x800ABDF8; // size:0x2
D_8790606C = 0x8790606C; // size:0x6
miniCameraCoords = 0x8790606C; // size:0x6
D_87906088 = 0x87906088; // size:0xC
D_8790609C = 0x8790609C; // size:0x6
D_879060AC = 0x879060AC; // size:0x6
@ -352,12 +352,12 @@ D_8690B5D0 = 0x8690B5D0; // size:0x24
D_86A06228 = 0x86A06228; // size:0xC
D_86A06238 = 0x86A06238; // size:0xC
D_86A06248 = 0x86A06248; // size:0xC
D_86C0E480 = 0x86C0E480; // size:0x1854
D_86C0FCD8 = 0x86C0FCD8; // size:0x1854
D_86C11530 = 0x86C11530; // size:0xAD0
D_879060BC = 0x879060BC; // size:0x2
D_86E04D60 = 0x86E04D60; // size:0xAD0
D_86E05830 = 0x86E05830; // size:0x3610
minigameDigletActors = 0x86C0E480; // size:0x1854
minigameDiglettHoleActors = 0x86C0FCD8; // size:0x1854
minigameEkansActors = 0x86C11530; // size:0xAD0
miniControllerPtr = 0x879060BC; // size:0x2
metadodPlayers = 0x86E04D60; // size:0xAD0
metapodMinigameFallingRocks = 0x86E05830; // size:0x3610
D_4006A60 = 0x4006A60;
D_40022E0 = 0x40022E0;
D_4002368 = 0x4002368;

168
linker_scripts/us/symbol_addrs_code.txt
View File

@ -2091,33 +2091,33 @@ func_87804320 = 0x87804320; // type:func
func_87804AD0 = 0x87804AD0; // type:func
func_87804FD4 = 0x87804FD4; // type:func
func_87900020 = 0x87900020; // type:func
func_8790002C = 0x8790002C; // type:func
func_87900070 = 0x87900070; // type:func
MinigameGetVec3Distance_2d = 0x8790002C; // type:func
MinigameGetVec3Distance_3d = 0x87900070; // type:func
func_879000C4 = 0x879000C4; // type:func
func_879001A4 = 0x879001A4; // type:func
func_879002B8 = 0x879002B8; // type:func
func_879002FC = 0x879002FC; // type:func
func_87900344 = 0x87900344; // type:func
func_87900384 = 0x87900384; // type:func
metapodRockCollisionCheck = 0x879001A4; // type:func
miniChangeActorAnim = 0x879002B8; // type:func
miniChangeActorAnim_alt1 = 0x879002FC; // type:func
miniChangeActorAnim_alt2 = 0x87900344; // type:func
miniPokeIsIdleCheck = 0x87900384; // type:func
func_879003A0 = 0x879003A0; // type:func
func_879004F8 = 0x879004F8; // type:func
func_87900528 = 0x87900528; // type:func
func_87900558 = 0x87900558; // type:func
hideMiniGameHUD = 0x87900558; // type:func
func_87900564 = 0x87900564; // type:func
func_87900594 = 0x87900594; // type:func
minigameActorLocalOriginToZero = 0x87900594; // type:func
func_879005AC = 0x879005AC; // type:func
func_879005C4 = 0x879005C4; // type:func
func_8790060C = 0x8790060C; // type:func
func_87900770 = 0x87900770; // type:func
miniEkansUpdatePos = 0x879005C4; // type:func
miniActorAllToZero = 0x8790060C; // type:func
miniActorUpdateTransform = 0x87900770; // type:func
func_87900808 = 0x87900808; // type:func
func_87900854 = 0x87900854; // type:func
func_87900920 = 0x87900920; // type:func
func_879009B4 = 0x879009B4; // type:func
func_87900A50 = 0x87900A50; // type:func
func_87900B64 = 0x87900B64; // type:func
func_87900C5C = 0x87900C5C; // type:func
func_87900F44 = 0x87900F44; // type:func
func_879010A4 = 0x879010A4; // type:func
miniUpdateCamera = 0x87900B64; // type:func
minigameDebuggModeControl = 0x87900C5C; // type:func
showDebuggCameraInfo = 0x87900F44; // type:func
showDebuggJoystickInfo = 0x879010A4; // type:func
func_87901200 = 0x87901200; // type:func
func_87901620 = 0x87901620; // type:func
func_8790168C = 0x8790168C; // type:func
@ -2715,7 +2715,7 @@ func_86B0B810 = 0x86B0B810; // type:func
func_86B0B8DC = 0x86B0B8DC; // type:func
func_86B0BA18 = 0x86B0BA18; // type:func
func_86C00020 = 0x86C00020; // type:func
func_86C00090 = 0x86C00090; // type:func
miniDiglettGoldCheck = 0x86C00090; // type:func
func_86C00110 = 0x86C00110; // type:func
func_86C00368 = 0x86C00368; // type:func
func_86C003AC = 0x86C003AC; // type:func
@ -2723,7 +2723,7 @@ func_86C00424 = 0x86C00424; // type:func
func_86C005D0 = 0x86C005D0; // type:func
func_86C0063C = 0x86C0063C; // type:func
func_86C00668 = 0x86C00668; // type:func
func_86C00770 = 0x86C00770; // type:func
miniEkansHumanControls = 0x86C00770; // type:func
func_86C00AA4 = 0x86C00AA4; // type:func
func_86C00B0C = 0x86C00B0C; // type:func
func_86C00BB4 = 0x86C00BB4; // type:func
@ -2731,143 +2731,143 @@ func_86C00C40 = 0x86C00C40; // type:func
func_86C00D50 = 0x86C00D50; // type:func
func_86C00EF8 = 0x86C00EF8; // type:func
func_86C00F70 = 0x86C00F70; // type:func
func_86C01100 = 0x86C01100; // type:func
miniEkansCompGetForce = 0x86C01100; // type:func
func_86C01408 = 0x86C01408; // type:func
func_86C014A0 = 0x86C014A0; // type:func
func_86C01538 = 0x86C01538; // type:func
miniEkansCompControls = 0x86C01538; // type:func
func_86C016C8 = 0x86C016C8; // type:func
func_86C01748 = 0x86C01748; // type:func
func_86C01750 = 0x86C01750; // type:func
func_86C018B8 = 0x86C018B8; // type:func
ekansFixDirToDiglett = 0x86C01750; // type:func
checkCollitionWithDigletts = 0x86C018B8; // type:func
func_86C01AF8 = 0x86C01AF8; // type:func
func_86C01D2C = 0x86C01D2C; // type:func
func_86C01FAC = 0x86C01FAC; // type:func
miniGetCloser2Diglett = 0x86C01FAC; // type:func
func_86C021FC = 0x86C021FC; // type:func
func_86C022D8 = 0x86C022D8; // type:func
func_86C02324 = 0x86C02324; // type:func
func_86C02514 = 0x86C02514; // type:func
miniEkansAnycontrols = 0x86C022D8; // type:func
miniEkansMinigameStateMachine = 0x86C02324; // type:func
miniEkansPlayersUpdate = 0x86C02514; // type:func
func_86C02610 = 0x86C02610; // type:func
func_86C026F0 = 0x86C026F0; // type:func
initDiglettHole = 0x86C026F0; // type:func
func_86C0276C = 0x86C0276C; // type:func
func_86C027BC = 0x86C027BC; // type:func
func_86C02804 = 0x86C02804; // type:func
func_86C028C0 = 0x86C028C0; // type:func
miniEkansChooseRandDiglett = 0x86C028C0; // type:func
func_86C02A1C = 0x86C02A1C; // type:func
func_86C02B78 = 0x86C02B78; // type:func
func_86C02C28 = 0x86C02C28; // type:func
miniEkansRecolorDiglet = 0x86C02B78; // type:func
miniDiglettStateMachine = 0x86C02C28; // type:func
func_86C03008 = 0x86C03008; // type:func
func_86C03080 = 0x86C03080; // type:func
ekansMinigameInitObjects = 0x86C03080; // type:func
func_86C030EC = 0x86C030EC; // type:func
func_86C03128 = 0x86C03128; // type:func
func_86C031E4 = 0x86C031E4; // type:func
func_86C03258 = 0x86C03258; // type:func
func_86C03344 = 0x86C03344; // type:func
func_86C03500 = 0x86C03500; // type:func
miniEkansMinigameStateMachine = 0x86C03344; // type:func
miniEkansInitCam = 0x86C03500; // type:func
func_86C035E0 = 0x86C035E0; // type:func
func_86C03608 = 0x86C03608; // type:func
func_86C03AB8 = 0x86C03AB8; // type:func
func_86C03BE8 = 0x86C03BE8; // type:func
func_86C03C64 = 0x86C03C64; // type:func
miniEkansDrawCountdown = 0x86C03BE8; // type:func
miniEkansDrawHub = 0x86C03C64; // type:func
func_86C03E4C = 0x86C03E4C; // type:func
func_86C03E8C = 0x86C03E8C; // type:func
func_86C03ED4 = 0x86C03ED4; // type:func
func_86C040B4 = 0x86C040B4; // type:func
func_86C04170 = 0x86C04170; // type:func
func_86C041E8 = 0x86C041E8; // type:func
func_86C043C4 = 0x86C043C4; // type:func
initEkansMinigameAssets = 0x86C04170; // type:func
miniEkansTutoScreenControls = 0x86C041E8; // type:func
ekansMinigameUpdate = 0x86C043C4; // type:func
func_86C044B4 = 0x86C044B4; // type:func
func_86C046B0 = 0x86C046B0; // type:func
ekansMinigameLoad = 0x86C046B0; // type:func
func_86D00020 = 0x86D00020; // type:func
func_86D000A8 = 0x86D000A8; // type:func
func_86D000D0 = 0x86D000D0; // type:func
miniUnkUpdateCamera = 0x86D000A8; // type:func
miniUnkDrawHUB = 0x86D000D0; // type:func
func_86D00134 = 0x86D00134; // type:func
func_86D0015C = 0x86D0015C; // type:func
miniUnkControls = 0x86D0015C; // type:func
func_86D0032C = 0x86D0032C; // type:func
func_86D0037C = 0x86D0037C; // type:func
func_86D003EC = 0x86D003EC; // type:func
func_86E00020 = 0x86E00020; // type:func
func_86E001A0 = 0x86E001A0; // type:func
func_86E001E4 = 0x86E001E4; // type:func
func_86E002E4 = 0x86E002E4; // type:func
miniInitMetapodPlayer = 0x86E001E4; // type:func
miniInitMetapodPlayers = 0x86E002E4; // type:func
func_86E0034C = 0x86E0034C; // type:func
func_86E0036C = 0x86E0036C; // type:func
miniMetapodHumanControls = 0x86E0036C; // type:func
func_86E004FC = 0x86E004FC; // type:func
func_86E00518 = 0x86E00518; // type:func
func_86E0063C = 0x86E0063C; // type:func
func_86E0073C = 0x86E0073C; // type:func
func_86E007BC = 0x86E007BC; // type:func
func_86E007CC = 0x86E007CC; // type:func
func_86E00924 = 0x86E00924; // type:func
func_86E00AF4 = 0x86E00AF4; // type:func
func_86E00BDC = 0x86E00BDC; // type:func
miniMetapodCompControls = 0x86E00924; // type:func
miniUpdateMetapods = 0x86E00AF4; // type:func
metapodRockCollisionCheck_void = 0x86E00BDC; // type:func
func_86E00C34 = 0x86E00C34; // type:func
func_86E00CAC = 0x86E00CAC; // type:func
func_86E00D78 = 0x86E00D78; // type:func
func_86E00ED0 = 0x86E00ED0; // type:func
miniRockChecks = 0x86E00CAC; // type:func
miniMatapodChecks = 0x86E00D78; // type:func
miniMatapodMinigameChecks = 0x86E00ED0; // type:func
func_86E00F60 = 0x86E00F60; // type:func
func_86E00FD8 = 0x86E00FD8; // type:func
func_86E0103C = 0x86E0103C; // type:func
func_86E010E8 = 0x86E010E8; // type:func
miniInitRock = 0x86E0103C; // type:func
miniInitRocks = 0x86E010E8; // type:func
func_86E01188 = 0x86E01188; // type:func
func_86E01310 = 0x86E01310; // type:func
func_86E01414 = 0x86E01414; // type:func
func_86E01428 = 0x86E01428; // type:func
func_86E016EC = 0x86E016EC; // type:func
func_86E0172C = 0x86E0172C; // type:func
func_86E017C0 = 0x86E017C0; // type:func
miniRockStateMachine = 0x86E01428; // type:func
miniRockUpdatePosition = 0x86E016EC; // type:func
miniUpdateRockTransform = 0x86E0172C; // type:func
miniUpdateRocks = 0x86E017C0; // type:func
func_86E0182C = 0x86E0182C; // type:func
func_86E01898 = 0x86E01898; // type:func
miniUpdateRocksPositions = 0x86E01898; // type:func
func_86E01904 = 0x86E01904; // type:func
func_86E01990 = 0x86E01990; // type:func
func_86E019B8 = 0x86E019B8; // type:func
miniMetapodCameraControls = 0x86E01990; // type:func
initMetapodMinigameAssets = 0x86E019B8; // type:func
func_86E019F4 = 0x86E019F4; // type:func
func_86E01B08 = 0x86E01B08; // type:func
func_86E01E34 = 0x86E01E34; // type:func
func_86E01EB0 = 0x86E01EB0; // type:func
func_86E01EE8 = 0x86E01EE8; // type:func
func_86E01F50 = 0x86E01F50; // type:func
func_86E01F8C = 0x86E01F8C; // type:func
miniMetapodMinigameStateMachine = 0x86E01F8C; // type:func
func_86E02150 = 0x86E02150; // type:func
func_86E02170 = 0x86E02170; // type:func
func_86E021D8 = 0x86E021D8; // type:func
miniDrawMetapodHealth = 0x86E02170; // type:func
miniDrawMetapodHeads = 0x86E021D8; // type:func
func_86E02308 = 0x86E02308; // type:func
func_86E026D0 = 0x86E026D0; // type:func
func_86E027D4 = 0x86E027D4; // type:func
func_86E027FC = 0x86E027FC; // type:func
miniMetapodDrawPlayerHUBs = 0x86E027FC; // type:func
func_86E02880 = 0x86E02880; // type:func
func_86E02924 = 0x86E02924; // type:func
metapodMinigameInit = 0x86E02924; // type:func
func_86E0296C = 0x86E0296C; // type:func
func_86E02974 = 0x86E02974; // type:func
miniMetapodTutoScreenControls = 0x86E02974; // type:func
func_86E02A28 = 0x86E02A28; // type:func
func_86E02A64 = 0x86E02A64; // type:func
func_86E02BB0 = 0x86E02BB0; // type:func
func_86E02C5C = 0x86E02C5C; // type:func
func_86E02E40 = 0x86E02E40; // type:func
metapodMinigameLoad = 0x86E02E40; // type:func
func_86F00020 = 0x86F00020; // type:func
func_86F00188 = 0x86F00188; // type:func
func_86F001CC = 0x86F001CC; // type:func
func_86F002F4 = 0x86F002F4; // type:func
func_86F0035C = 0x86F0035C; // type:func
func_86F00370 = 0x86F00370; // type:func
func_86F003FC = 0x86F003FC; // type:func
func_86F00450 = 0x86F00450; // type:func
func_86F0048C = 0x86F0048C; // type:func
func_86F0050C = 0x86F0050C; // type:func
func_86F00778 = 0x86F00778; // type:func
initSandshrew = 0x86F001CC; // type:func
initSandshrews = 0x86F002F4; // type:func
miniSandshewReangle = 0x86F0035C; // type:func
miniSandshewReangleAll = 0x86F00370; // type:func
miniSandshewChangeAnim = 0x86F003FC; // type:func
sandshrewDecreaseVel = 0x86F00450; // type:func
sandshrewChangeState = 0x86F0048C; // type:func
sandshrewHumanControls = 0x86F0050C; // type:func
sandshrewCompControls = 0x86F00778; // type:func
func_86F00920 = 0x86F00920; // type:func
func_86F00D04 = 0x86F00D04; // type:func
func_86F00E34 = 0x86F00E34; // type:func
func_86F00F00 = 0x86F00F00; // type:func
initSandshrewHole = 0x86F00E34; // type:func
initSandshrewHoles = 0x86F00F00; // type:func
func_86F00F68 = 0x86F00F68; // type:func
func_86F01014 = 0x86F01014; // type:func
func_86F010B4 = 0x86F010B4; // type:func
func_86F01180 = 0x86F01180; // type:func
initSandshrewWaterGeiser = 0x86F010B4; // type:func
initSandshrewGeisers = 0x86F01180; // type:func
func_86F011E8 = 0x86F011E8; // type:func
func_86F012B8 = 0x86F012B8; // type:func
func_86F0132C = 0x86F0132C; // type:func
func_86F013B8 = 0x86F013B8; // type:func
func_86F01488 = 0x86F01488; // type:func
func_86F014B8 = 0x86F014B8; // type:func
sandshrewMinigameInitObjects = 0x86F014B8; // type:func
func_86F014F8 = 0x86F014F8; // type:func
func_86F0164C = 0x86F0164C; // type:func
func_86F016D8 = 0x86F016D8; // type:func
@ -2875,15 +2875,15 @@ func_86F0174C = 0x86F0174C; // type:func
func_86F018E4 = 0x86F018E4; // type:func
func_86F01904 = 0x86F01904; // type:func
func_86F01C40 = 0x86F01C40; // type:func
func_86F01D78 = 0x86F01D78; // type:func
fixSandshrewMinigameHUD = 0x86F01D78; // type:func
func_86F01EB4 = 0x86F01EB4; // type:func
func_86F01EF4 = 0x86F01EF4; // type:func
func_86F01F58 = 0x86F01F58; // type:func
func_86F02004 = 0x86F02004; // type:func
sandshrewMinigameInit = 0x86F02004; // type:func
func_86F0204C = 0x86F0204C; // type:func
func_86F02230 = 0x86F02230; // type:func
func_86F02320 = 0x86F02320; // type:func
func_86F02520 = 0x86F02520; // type:func
sandshrewMinigameLoad = 0x86F02520; // type:func
func_88000020 = 0x88000020; // type:func
func_8800008C = 0x8800008C; // type:func
func_880001A8 = 0x880001A8; // type:func

1714
src/fragments/18/fragment18.c
View File

File diff suppressed because it is too large Load Diff

80
src/fragments/18/fragment18.h
View File

@ -4,73 +4,73 @@
#include "global.h"
#include "src/fragments/3/fragment3.h"
s32 func_86C00020(unk_func_8790002C* arg0);
void func_86C00090(s16 arg0, s32* arg1, s32* arg2);
s32 func_86C00020(MiniActor* arg0);
void miniDiglettGoldCheck(s16 arg0, s32* arg1, s32* arg2);
void func_86C00110(s16 arg0, s16 arg1);
void func_86C00368(s16 arg0, s16 arg1);
void func_86C003AC(unk_func_8790002C* arg0);
void func_86C00424(unk_func_8790002C* arg0, s16 arg1);
void func_86C005D0(void);
f32 func_86C0063C(unk_func_8790002C* arg0);
s16 func_86C00668(unk_func_8790002C* arg0, s16 arg1);
void func_86C00770(unk_func_8790002C* arg0);
void func_86C003AC(MiniActor* arg0);
void initEkans(MiniActor* ekans, s16 player);
void initAllEkans(void);
f32 func_86C0063C(MiniActor* arg0);
s16 func_86C00668(MiniActor* arg0, s16 arg1);
void miniEkansHumanControls(MiniActor* ekans);
void func_86C00AA4(void);
s32 func_86C00B0C(unk_func_8790002C* arg0);
s32 func_86C00B0C(MiniActor* arg0);
s16 func_86C00BB4(void);
s16 func_86C00C40(unk_func_8790002C* arg0);
s16 func_86C00D50(unk_func_8790002C* arg0);
s32 func_86C00EF8(unk_func_8790002C* arg0);
void func_86C00F70(unk_func_8790002C* arg0);
void func_86C01100(unk_func_8790002C* arg0);
s16 func_86C00C40(MiniActor* arg0);
s16 func_86C00D50(MiniActor* arg0);
s32 func_86C00EF8(MiniActor* arg0);
void func_86C00F70(MiniActor* compEkans);
void miniEkansCompGetForce(MiniActor* compEkans);
s16 func_86C01408(void);
s16 func_86C014A0(void);
void func_86C01538(unk_func_8790002C* arg0);
void func_86C016C8(unk_func_8790002C* arg0);
void miniEkansCompControls(MiniActor* compEkans);
void func_86C016C8(MiniActor* ekans);
void func_86C01748(void);
void func_86C01750(unk_func_8790002C* arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5);
void func_86C018B8(unk_func_8790002C* arg0, s32 arg1);
void ekansFixDirToDiglett(MiniActor* arg0, s32 arg1, s32 arg2, f32 arg3, f32 arg4, f32 arg5);
void checkCollitionWithDigletts(MiniActor* ekans, s32 nPlayer);
void func_86C01AF8(void);
void func_86C01D2C(unk_func_8790002C* arg0, s32 arg1);
void func_86C01FAC(unk_func_8790002C* arg0, s32 arg1);
void func_86C021FC(unk_func_8790002C* arg0);
void func_86C022D8(unk_func_8790002C* arg0);
void func_86C02324(unk_func_8790002C* arg0, s32 arg1);
void func_86C01D2C(MiniActor* ekans, s32 nPlayer);
void miniGetCloser2Diglett(MiniActor* ekans, s32 nPlayer);
void func_86C021FC(MiniActor* ekans);
void miniEkansAnycontrols(MiniActor* ekans);
void miniEkansPlayerStateMachine(MiniActor* ekans, s32 nPlayer);
void func_86C0250C(void);
void func_86C02514(void);
void func_86C02610(unk_func_8790002C* arg0, s32 arg1);
void func_86C026F0(unk_func_8790002C* arg0, s32 arg1);
void miniEkansPlayersUpdate(void);
void initDiglett(MiniActor* diglett, s32 nDiglett);
void initDiglettHole(MiniActor* hole, s32 arg1);
void func_86C0276C(void);
void func_86C027A4(void);
void func_86C027AC(void);
void func_86C027B4(void);
void func_86C027BC(void);
void func_86C02804(void);
s16 func_86C028C0(s16 arg0);
void func_86C02A1C(unk_func_8790002C* arg0);
void func_86C02B78(unk_func_8790002C* arg0, s32 arg1);
void func_86C02C28(void);
void initDigletts(void);
s16 miniEkansChooseRandDiglett(s16 arg0);
void func_86C02A1C(MiniActor* diglett);
void miniEkansRecolorDiglet(MiniActor* diglett, s32 nActiveDiglett);
void miniDiglettStateMachine(void);
void func_86C03008(void);
void func_86C03080(void);
void ekansMinigameInitObjects(void);
s32 func_86C030EC(void);
void func_86C03128(void);
s32 func_86C031E4(void);
s32 func_86C03258(void);
void func_86C03344(void);
void miniEkansMinigameStateMachine(void);
void func_86C034F8(void);
void func_86C03500(void);
void miniEkansInitCam(void);
void func_86C035E0(void);
void func_86C03608(void);
void func_86C03AB8(void);
void func_86C03BE8(void);
void func_86C03C64(void);
void miniEkansDrawCountdown(void);
void miniEkansDrawHub(void);
void func_86C03E4C(void);
void func_86C03E8C(s32 arg0);
void func_86C03ED4(void);
void func_86C040B4(s32 arg0);
void func_86C04170(void);
void func_86C041E8(void);
void func_86C043C4(void);
void initEkansMinigameAssets(void);
void miniEkansTutoScreenControls(void);
void ekansMinigameUpdate(void);
void func_86C044B4(void);
s32 func_86C046B0(s32 arg0, UNUSED s32 arg1);
s32 ekansMinigameLoad(s32 arg0, UNUSED s32 arg1);
#endif // _FRAGMENT18_H_

54
src/fragments/19/fragment19.c
View File

@ -21,33 +21,33 @@ static u32 D_86D00530[] = {
void func_86D00020(void) {
D_87906054 = D_87906050->unk_00.unk_0C;
D_87906060 = 0xA00;
D_87906062 = 0;
D_87906064 = 0x17C;
D_87906066 = 0x1E;
D_87906068 = 0x32;
D_8790606A = 0x1900;
miniCameraXRot = 0xA00;
miniCameraYRot = 0;
miniCameraDistance = 0x17C;
miniCameraFov = 0x1E;
miniCameraNear = 0x32;
miniCameraFar = 0x1900;
D_8790606C.x = 0;
D_8790606C.y = 0x1E;
D_8790606C.z = 0;
miniCameraCoords.x = 0;
miniCameraCoords.y = 0x1E;
miniCameraCoords.z = 0;
func_87900B64();
miniUpdateCamera();
}
void func_86D000A8(void) {
func_87900C5C();
func_87900B64();
void miniUnkUpdateCamera(void) {
minigameDebuggModeControl();
miniUpdateCamera();
}
void func_86D000D0(UNUSED s32 arg0) {
void miniUnkDrawHUB(UNUSED s32 arg0) {
func_800079C4();
func_8000699C(&gDisplayListHead, 1);
func_80015348();
func_80015094(&D_87906050->unk_00);
if (D_87903DB0 != 0) {
func_87900F44();
if (miniDebugMode != 0) {
showDebuggCameraInfo();
}
func_80007778();
@ -55,10 +55,10 @@ void func_86D000D0(UNUSED s32 arg0) {
void func_86D00134(void) {
func_80006C6C(0x10);
D_87903DC4 = 3;
miniTutoScreenState = 3;
}
void func_86D0015C(void) {
void miniUnkControls(void) {
s32 var_s1 = 1;
while (var_s1 != 0) {
@ -77,21 +77,21 @@ void func_86D0015C(void) {
}
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_Z)) {
D_87903DB0 = (D_87903DB0 + 1) & 1;
miniDebugMode = (miniDebugMode + 1) & 1;
}
if ((D_87903DB0 == 0) && BTN_IS_PRESSED(gPlayer1Controller, BTN_START)) {
D_87903DA0 = 1;
if ((miniDebugMode == 0) && BTN_IS_PRESSED(gPlayer1Controller, BTN_START)) {
minigameState = 1;
}
func_8790370C();
func_86D000A8();
miniUnkUpdateCamera();
if ((D_87903DB0 == 0) && BTN_IS_PRESSED(gPlayer1Controller, BTN_CDOWN)) {
if ((miniDebugMode == 0) && BTN_IS_PRESSED(gPlayer1Controller, BTN_CDOWN)) {
var_s1 = 0;
}
func_86D000D0(1);
miniUnkDrawHUB(1);
}
}
@ -101,8 +101,8 @@ void func_86D0032C(void) {
func_80006CB4(0x1E);
for (i = 0; i < 30; i++) {
func_87900528();
func_86D000D0(2);
func_87900528(); // inputs
miniUnkDrawHUB(2);
}
}
@ -134,7 +134,7 @@ s32 func_86D003EC(s32 arg0, s32 arg1) {
func_86D0037C();
func_80007678(sp24);
func_86D00134();
func_86D0015C();
miniUnkControls();
func_86D0032C();
func_800076C0();
func_8001E9CC();

6
src/fragments/19/fragment19.h
View File

@ -4,10 +4,10 @@
#include "global.h"
void func_86D00020(void);
void func_86D000A8(void);
void func_86D000D0(UNUSED s32 arg0);
void miniUnkUpdateCamera(void);
void miniUnkDrawHUB(UNUSED s32 arg0);
void func_86D00134(void);
void func_86D0015C(void);
void miniUnkControls(void);
void func_86D0032C(void);
void func_86D0037C(void);
s32 func_86D003EC(s32 arg0, s32 arg1);

4
src/fragments/2/fragment2.c
View File

@ -339,8 +339,8 @@ u32* D_8780FA70;
#pragma GLOBAL_ASM("asm/us/nonmatchings/fragments/2/fragment2/func_87801400.s")
#endif
void func_87801644(s32 arg0, s16 arg1, s16 arg2, f32 arg3) {
func_87801400(arg0, arg1, arg2, arg3, arg3);
void func_87801644(s32 arg0, s16 arg1, s16 arg2, f32 _scale) {
func_87801400(arg0, arg1, arg2, _scale, _scale);
}
void func_87801684(s16 arg0, s16 arg1, unk_func_87801684* arg2) {

883
src/fragments/20/fragment20.c
View File

File diff suppressed because it is too large Load Diff

70
src/fragments/20/fragment20.h
View File

@ -6,61 +6,61 @@
void func_86E00020(s16 arg0, s16 arg1);
void func_86E001A0(s16 arg0, s16 arg1);
void func_86E001E4(unk_func_8790002C* arg0, s32 arg1);
void func_86E002E4(void);
void func_86E0034C(unk_func_8790002C* arg0);
void func_86E0036C(unk_func_8790002C* arg0);
void func_86E004FC(unk_func_8790002C* arg0);
s32 func_86E00518(unk_func_8790002C* arg0, s32 arg1);
void func_86E0063C(unk_func_8790002C* arg0, s32 arg1);
void func_86E0073C(unk_func_8790002C* arg0, s32 arg1);
void func_86E007BC(unk_func_8790002C* arg0, s32 arg1);
void func_86E007CC(unk_func_8790002C* arg0, s32 arg1);
void func_86E00924(unk_func_8790002C* arg0, s32 arg1);
void func_86E00AF4(void);
s32 func_86E00BDC(void);
void miniInitMetapodPlayer(MiniActor* metapod, s32 arg1);
void miniInitMetapodPlayers(void);
void func_86E0034C(MiniActor* metapod);
void miniMetapodHumanControls(MiniActor* metapod);
void func_86E004FC(MiniActor* metapod);
s32 func_86E00518(MiniActor* arg0, s32 arg1);
void func_86E0063C(MiniActor* metapod, s32 arg1);
void func_86E0073C(MiniActor* arg0, s32 arg1);
void func_86E007BC(MiniActor* metapod, s32 arg1);
void func_86E007CC(MiniActor* metapod, s32 player);
void miniMetapodCompControls(MiniActor* compMetapod, s32 nPlayer);
void miniUpdateMetapods(void);
s32 metapodRockCollisionCheck_void(void);
s32 func_86E00C34(s32 arg0);
void func_86E00CAC(unk_func_8790002C* arg0, s32 arg1);
void func_86E00D78(unk_func_8790002C* arg0, s32 arg1);
void func_86E00ED0(void);
void miniRockChecks(MiniActor* arg0, s32 nPlayer);
void miniMatapodChecks(MiniActor* metapod, s32 nPlayer);
void miniMatapodMinigameChecks(void);
void func_86E00F60(void);
void func_86E00FD8(void);
void func_86E0103C(unk_func_8790002C* arg0, s32 arg1);
void func_86E010E8(void);
void miniInitRock(MiniActor* rock, s32 arg1);
void miniInitRocks(void);
void func_86E01188(void);
void func_86E01310(unk_func_8790002C* arg0);
void func_86E01414(unk_func_8790002C* arg0);
void func_86E01428(unk_func_8790002C* arg0);
void func_86E016EC(unk_func_8790002C* arg0);
void func_86E0172C(unk_func_8790002C* arg0);
void func_86E017C0(void);
void func_86E0182C(unk_func_8790002C* arg0);
void func_86E01898(void);
void func_86E01310(MiniActor* rock);
void func_86E01414(MiniActor* rock);
void miniRockStateMachine(MiniActor* rock);
void miniRockUpdatePosition(MiniActor* rock);
void miniUpdateRockTransform(MiniActor* rock);
void miniUpdateRocks(void);
void func_86E0182C(MiniActor* arg0);
void miniUpdateRocksPositions(void);
void func_86E01904(void);
void func_86E01990(void);
void func_86E019B8(void);
void miniMetapodCameraControls(void);
void initMetapodMinigameAssets(void);
void func_86E019F4(void);
s32 func_86E01B08(void);
s32 func_86E01E34(void);
void func_86E01EB0(void);
s32 func_86E01EE8(void);
s32 func_86E01F50(void);
void func_86E01F8C(void);
void miniMetapodMinigameStateMachine(void);
void func_86E02150(void);
void func_86E02170(void);
void func_86E021D8(void);
void miniDrawMetapodHealth(void);
void miniDrawMetapodHeads(void);
void func_86E02308(void);
void func_86E026D0(void);
void func_86E027D4(void);
void func_86E027FC(s32 arg0);
void miniMetapodDrawPlayerHUBs(s32 arg0);
void func_86E02880(s32 arg0);
void func_86E02924(void);
void metapodMinigameInit(void);
void func_86E0296C(void);
void func_86E02974(void);
void miniMetapodTutoScreenControls(void);
void func_86E02A28(void);
void func_86E02A64(void);
void func_86E02BB0(void);
void func_86E02C5C(void);
s32 func_86E02E40(s32 arg0, s32 arg1);
s32 metapodMinigameLoad(s32 arg0, s32 arg1);
#endif // _FRAGMENT20_H_

804
src/fragments/21/fragment21.c
View File

File diff suppressed because it is too large Load Diff

40
src/fragments/21/fragment21.h
View File

@ -6,29 +6,29 @@
void func_86F00020(s16 arg0, s16 arg1);
void func_86F00188(s16 arg0, s16 arg1);
void func_86F001CC(unk_func_8790002C* arg0, s32 arg1);
void func_86F002F4(void);
void func_86F0035C(unk_func_8790002C* arg0);
void func_86F00370(void);
void func_86F003FC(unk_func_8790002C* arg0, s32 arg1);
void func_86F00450(unk_func_8790002C* arg0, f32 arg1);
void func_86F0048C(unk_func_8790002C* arg0, s32 arg1);
void func_86F0050C(unk_func_8790002C* arg0);
void func_86F00778(unk_func_8790002C* arg0);
void func_86F00920(unk_func_8790002C* arg0);
void initSandshrew(MiniActor* sandshrew, s32 player);
void initSandshrews(void);
void miniSandshewReangle(MiniActor* sandshrew);
void miniSandshewReangleAll(void);
void miniSandshewChangeAnim(MiniActor* actor, s32 animID);
void sandshrewDecreaseVel(MiniActor* arg0, f32 arg1);
void sandshrewChangeState(MiniActor* sandshrew, s32 arg1);
void sandshrewHumanControls(MiniActor* sandshrew);
void sandshrewCompControls(MiniActor* arg0);
void func_86F00920(MiniActor* sandshrew);
void func_86F00D04(void);
void func_86F00E34(unk_func_8790002C* a0, s32 arg1);
void func_86F00F00(void);
void func_86F00F68(unk_func_8790002C* arg0, unk_func_8790002C* arg1);
void initSandshrewHole(MiniActor* a0, s32 arg1);
void initSandshrewHoles(void);
void func_86F00F68(MiniActor* sandshrewHole, MiniActor* sandshrewPlayer);
void func_86F01014(void);
void func_86F010B4(unk_func_8790002C* a0, s32 arg1);
void func_86F01180(void);
void func_86F011E8(unk_func_8790002C* arg0);
void initSandshrewWaterGeiser(MiniActor* arg0, s32 arg1);
void initSandshrewGeisers(void);
void func_86F011E8(MiniActor* geiser);
void func_86F012B8(void);
void func_86F0132C(void);
void func_86F013B8(void);
void func_86F01488(void);
void func_86F014B8(void);
void sandshrewMinigameInitObjects(void);
s32 func_86F014F8(void);
void func_86F0164C(void);
s32 func_86F016D8(void);
@ -36,14 +36,14 @@ void func_86F0174C(void);
void func_86F018E4(void);
void func_86F01904(void);
void func_86F01C40(void);
void func_86F01D78(void);
void fixSandshrewMinigameHUD(void);
void func_86F01EB4(void);
void func_86F01EF4(s32 arg0);
void func_86F01F58(s32 arg0);
void func_86F02004(void);
void sandshrewMinigameInit(void);
void func_86F0204C(void);
void func_86F02230(void);
void func_86F02320(void);
s32 func_86F02520(s32 arg0, UNUSED s32 arg1);
s32 sandshrewMinigameLoad(s32 arg0, UNUSED s32 arg1);
#endif // _FRAGMENT21_H_

279
src/fragments/3/fragment3.h
View File

@ -6,101 +6,118 @@
#include "src/3FB0.h"
#include "src/controller.h"
typedef struct unk_func_8790002C {
/* 0x000 */ unk_D_86002F58_004_000 unk_000;
typedef struct MiniActor {
/* 0x000 */ unk_D_86002F58_004_000 unk_000; // collider ? model ?
/* 0x168 */ unk_D_86002F30* unk_168;
/* 0x16C */ Vec3f unk_16C;
/* 0x178 */ char unk178[0x18];
/* 0x190 */ Vec3f unk_190;
/* 0x19C */ Vec3f unk_19C;
/* 0x1A8 */ Vec3f unk_1A8;
/* 0x1B4 */ Vec3f unk_1B4;
/* 0x1C0 */ Vec3f unk_1C0;
/* 0x1CC */ f32 unk_1CC;
/* 0x1D0 */ f32 unk_1D0;
/* 0x1D4 */ f32 unk_1D4;
/* 0x1D8 */ Vec3f unk_1D8;
/* 0x1E4 */ f32 unk_1E4;
/* 0x1E8 */ char unk1E8[0x4];
/* 0x1EC */ f32 unk_1EC;
/* 0x1F0 */ f32 unk_1F0;
/* 0x1F4 */ f32 unk_1F4;
/* 0x1F8 */ f32 unk_1F8;
/* 0x1FC */ f32 unk_1FC;
/* 0x200 */ f32 unk_200;
/* 0x204 */ f32 unk_204;
/* 0x208 */ f32 unk_208;
/* 0x20C */ f32 unk_20C;
/* 0x210 */ f32 unk_210;
/* 0x214 */ Vec3s unk_214;
/* 0x21A */ s16 unk_21A;
/* 0x21C */ s16 unk_21C;
/* 0x21E */ s16 unk_21E;
/* 0x220 */ s16 unk_220;
/* 0x222 */ s16 unk_222;
/* 0x224 */ s16 unk_224;
/* 0x226 */ s16 unk_226;
/* 0x228 */ s16 unk_228;
/* 0x22A */ s16 unk_22A;
/* 0x22C */ s16 unk_22C;
/* 0x22E */ s16 unk_22E;
/* 0x230 */ s16 unk_230;
/* 0x232 */ s16 unk_232;
/* 0x234 */ s16 unk_234;
/* 0x236 */ s16 unk_236;
/* 0x238 */ s16 unk_238;
/* 0x23A */ s16 unk_23A;
/* 0x23A */ s16 unk_23C;
/* 0x23E */ s16 unk_23E;
/* 0x240 */ s16 unk_240;
/* 0x242 */ s16 unk_242;
/* 0x244 */ s16 unk_244;
/* 0x246 */ char unk246[0x2];
/* 0x248 */ s16 unk_248;
/* 0x24A */ s16 unk_24A;
/* 0x24C */ s16 unk_24C;
/* 0x24E */ char unk24E[0x6];
/* 0x254 */ s32 unk_254;
/* 0x258 */ s16 unk_258;
/* 0x25A */ s16 unk_25A;
/* 0x25C */ s16 unk_25C;
/* 0x25E */ s16 unk_25E;
/* 0x260 */ s16 unk_260;
/* 0x262 */ s16 unk_262;
/* 0x264 */ s16 unk_264;
/* 0x264 */ s16 unk_266;
/* 0x268 */ s16 unk_268;
/* 0x26A */ s16 unk_26A;
/* 0x26C */ s16 unk_26C;
/* 0x26E */ s16 unk_26E;
/* 0x270 */ s16 unk_270;
/* 0x272 */ s16 unk_272;
/* 0x274 */ f32 unk_274;
/* 0x278 */ char unk278[0x4];
/* 0x27C */ f32 unk_27C;
/* 0x280 */ f32 unk_280;
/* 0x284 */ f32 unk_284;
/* 0x288 */ f32 unk_288;
/* 0x28C */ f32 unk_28C;
/* 0x290 */ s16 unk_290;
/* 0x292 */ s16 unk_292;
/* 0x294 */ s16 unk_294;
/* 0x16C */ Vec3f scale;
/* 0x178 */ char unk178[0x18]; // unused
/* 0x190 */ Vec3f totalPos; // all positions
/* 0x19C */ Vec3f totalPos_alt; // all positions + height/2
/* 0x1A8 */ Vec3f position_1;
/* 0x1B4 */ Vec3f closestDiglettPos;// ** ekans only
/* 0x1C0 */ Vec3f position_2;
/* 0x1CC */ f32 dist2DiglettLevelX; // 1,2,4
/* 0x1D0 */ f32 dist2DiglettLevelY; // unused
/* 0x1D4 */ f32 dist2DiglettLevelZ; // 1,2,4
/* 0x1D8 */ Vec3f unk_1D8; // also position, unused
/* 0x1E4 */ f32 middleHeight;
/* 0x1E8 */ char unk1E8[0x4]; // unused ?
/* 0x1EC */ f32 unk_1EC; // always zero
/* 0x1F0 */ f32 unk_1F0; // always zero
/* 0x1F4 */ f32 unk_1F4; // always zero
/* 0x1F8 */ f32 xSpeed;
/* 0x1FC */ f32 ySpeed;
/* 0x200 */ f32 zSpeed;
/* 0x204 */ f32 xAccel;
/* 0x208 */ f32 yAccel;
/* 0x20C */ f32 zAccel;
/* 0x210 */ f32 antiAcceleration;
/* 0x214 */ Vec3s totalRot;
/* 0x21A */ s16 xRot_1;
/* 0x21C */ s16 yRot_1;
/* 0x21E */ s16 zRot_1;
/* 0x220 */ s16 unk_220; // x something
/* 0x222 */ s16 unk_222; // y something ; ??? ; stick direction on sandshrew (?)
/* 0x224 */ s16 unk_224; // z something
/* 0x226 */ s16 xRot_2;
/* 0x228 */ s16 yRot_2; // throwing direction on ekans
/* 0x22A */ s16 zRot_2;
/* 0x22C */ s16 unk_22C; // zero, x spinning speed ?
/* 0x22E */ s16 ySpinSpeed; // y spinning speed on ekans
/* 0x230 */ s16 unk_230; // zero, z spinning speed ?
/* 0x232 */ s16 xRot_3;
/* 0x234 */ s16 yRot_3;
/* 0x236 */ s16 zRot_3;
/* 0x238 */ s16 unk_238; // always zero
/* 0x23A */ s16 unk_23A; // always zero
/* 0x23C */ s16 unk_23C; // ??? some value to send to unk_000->unk_018
/* 0x23E */ s16 mainState;
/* 0x240 */ s16 isSquashed; // on metapod
/* 0x242 */ s16 compState;
/* 0x244 */ s16 unk_244; // something metapod comp AI RNG
/* 0x246 */ char unk246[0x2]; // unused
/* 0x248 */ s16 unk_248; // animation something 0,1,2
/* 0x24A */ s16 unk_24A; // animation id or state?
/* 0x24C */ s16 unk_24C; // texture animation ?
/* 0x24E */ char unk24E[0x6]; // unused
/* 0x254 */ s32 unk_254; // always zero
/* 0x258 */ s16 miniHealth;
/* 0x25A */ s16 damageTimer; // ** metapod only
/* 0x25C */ s16 miniMaxHealth; // 400 instead of 100 on metapod
/* 0x25E */ s16 ekansAbbleToHoop; // ** ekans only
/* 0x260 */ s16 midAirState; // mid air state, ekanses and falling rocks
/* 0x262 */ s16 ekansIsMidAir; // ekans is in mid air ** ekans only
/* 0x264 */ s16 unk_264; // always zero
/* 0x266 */ s16 collidingActorId;
/* 0x268 */ s16 collidingActorId_alt; // ** ekans only
/* 0x26A */ s16 unk_26A; // some flag related to collisions
/* 0x26C */ s16 unk_26C; // animation something
/* 0x26E */ s16 unk_26E; // animation something
/* 0x270 */ s16 unk_270; // ??? ** metapod only
/* 0x272 */ s16 unk_272; // colliding with a rock on metapod's minigame ? ;
/* 0x274 */ union{
f32 unk_274;
f32 diggingSpeed;
f32 launchForce;
};
/* 0x278 */ char unk278[0x4]; // unused
/* 0x27C */ f32 diggingAccel2; //
/* 0x280 */ union {
f32 unk_280;
f32 stickMagnitude1;
f32 diggingAccel1;
};
/* 0x284 */ f32 stickMagnitude2; // launch forse on ekans
/* 0x288 */ f32 cubeRadio; // bottom of the hitbox / bounding box ?
/* 0x28C */ f32 halfHeight;
/* 0x290 */ s16 unk_290; // always zero
/* 0x292 */ s16 unk_292; // always zero
/* 0x294 */ s16 unk_294; // always zero
/* 0x296 */ s16 unk_296;
/* 0x298 */ s16 unk_298;
/* 0x29A */ s16 unk_29A;
/* 0x29C */ s16 unk_29C;
/* 0x29E */ s16 unk_29E;
/* 0x2A0 */ s16 unk_2A0;
/* 0x2A2 */ s16 unk_2A2;
/* 0x298 */ s16 unk_298; // timer after bouncin on digletts on ekans
/* 0x29A */ union {
s16 unk_29A;
s16 sandshrewLastDir;
s16 ekansDiglettHitScore;
s16 metapodInputLockTimer;
};
/* 0x29C */ s16 diglettIsGold; // ** diglett only
/* 0x29E */ s16 unk_29E; // something comp AI RNG maybe timer to launch
/* 0x2A0 */ union {
s16 unk_2A0;
s16 leftRightTimer; // on sandshrew, 20 to 0
s16 leftRightCount; // on ekans
};
/* 0x2A2 */ s16 ekansScore; // ** ekans only
/* 0x2A4 */ s16 unk_2A4;
/* 0x2A6 */ s16 unk_2A6;
/* 0x2A8 */ s16 unk_2A8;
/* 0x2A6 */ s16 unk_2A6; // metapod state ?
/* 0x2A8 */ s16 isWinner;
/* 0x2AA */ s16 unk_2AA;
/* 0x2AC */ s16 unk_2AC;
/* 0x2AE */ s16 unk_2AE;
/* 0x2B0 */ s16 unk_2B0;
/* 0x2AC */ s16 isComp;
/* 0x2AE */ s16 unk_2AE; // ??? ** metapod only
/* 0x2B0 */ s16 sandshrewFailChances; // 3,2,1,0 ** sandsrew only
/* 0x2B2 */ s16 unk_2B2;
} unk_func_8790002C; // size = 0x2B4
} MiniActor; // size = 0x2B4
// Possibly unk_D_86002F34_alt7, unk_D_86002F34_alt8,
// unk_D_86002F34_alt9 or unk_D_86002F34_alt2
@ -121,13 +138,13 @@ typedef struct unk_D_87903E10 {
/* 0x04 */ unk_D_87903E00* unk_04;
} unk_D_87903E10; // size = 0x8
extern s16 D_87903DA0;
extern s16 D_87903DA4;
extern s16 minigameState;
extern s16 minigameInputLock;
extern s16 D_87903DA8;
extern s16 D_87903DAC;
extern s16 D_87903DBC;
extern s16 D_87903DC0;
extern s16 D_87903DC4;
extern s16 miniTutoScreenState;
extern s16 D_87903DC8;
extern s16 D_87903DCC;
extern s16 D_87903DD0;
@ -137,21 +154,21 @@ extern unk_D_87903E10 D_87903E10;
extern unk_D_87903E10 D_87903E28;
extern unk_D_87903E10 D_87903E40;
extern unk_D_87903E10 D_87903E58;
extern s16 D_87906040;
extern s16 miniInputLockTimer;
extern s16 D_87906042;
extern s16 D_87906044;
extern s16 D_87906046;
extern s16 miniShowHUB;
extern s16 miniDifficulty;
extern s16 D_87906048;
extern s16 D_8790604A;
extern unk_D_86002F34_00C* D_87906050;
extern unk_D_86002F34_00C* D_87906050; // geo layout
extern unk_D_86002F34_00C* D_87906054;
extern s16 D_87906060;
extern s16 D_87906062;
extern s16 D_87906064;
extern s16 D_87906066;
extern s16 D_87906068;
extern s16 D_8790606A;
extern Vec3s D_8790606C;
extern s16 miniCameraXRot;
extern s16 miniCameraYRot;
extern s16 miniCameraDistance;
extern s16 miniCameraFov;
extern s16 miniCameraNear;
extern s16 miniCameraFar;
extern Vec3s miniCameraCoords;
extern s16 D_87906072;
extern s16 D_87906076;
extern s16 D_87906078;
@ -170,13 +187,13 @@ extern s16 D_879060A6;
extern s16 D_879060A8;
extern Vec3s D_879060AC;
extern s16 D_87903DB0;
extern s16 miniDebugMode;
extern s16 D_87903DB8;
extern Controller* D_879060BC;
extern Controller* miniControllerPtr;
extern s16 D_879060C0;
extern s16 D_879060C2;
extern s16 miniEkansCountdown;
extern s8 D_879060C4[4];
extern s16 D_879060C8;
extern s16 miniHudTransparency;
extern s16 D_879060CA;
extern Vec3f D_879060E0;
@ -184,34 +201,34 @@ extern Vec3f D_87906100;
extern Vec3f D_87906110;
ret_func_80004454 func_87900020(void);
void func_8790002C(unk_func_8790002C* arg0, unk_func_8790002C* arg1);
void func_87900070(unk_func_8790002C* arg0, unk_func_8790002C* arg1);
s32 func_879000C4(unk_func_8790002C* arg0, unk_func_8790002C* arg1);
s32 func_879001A4(unk_func_8790002C* arg0, unk_func_8790002C* arg1);
void func_879002B8(unk_func_8790002C* arg0, s16 arg1, s16 arg2, s16 arg3);
void func_879002FC(unk_func_8790002C* arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4);
void func_87900344(unk_func_8790002C* arg0, s16 arg1, s16 arg2, s16 arg3);
s32 func_87900384(unk_func_8790002C* arg0);
void func_879003A0(unk_func_8790002C* arg0);
float MinigameGetVec3Distance_2d(MiniActor* arg0, MiniActor* arg1);
void MinigameGetVec3Distance_3d(MiniActor* arg0, MiniActor* arg1);
s32 func_879000C4(MiniActor* arg0, MiniActor* arg1);
s32 metapodRockCollisionCheck(MiniActor* arg0, MiniActor* arg1);
void miniChangeActorAnim(MiniActor* arg0, s16 arg1, s16 arg2, s16 arg3);
void miniChangeActorAnim_alt1(MiniActor* arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4);
void miniChangeActorAnim_alt2(MiniActor* arg0, s16 arg1, s16 arg2, s16 arg3);
s32 miniPokeIsIdleCheck(MiniActor* arg0);
void func_879003A0(MiniActor* poke);
void func_879004F8(unk_D_86002F58_004_000* arg0);
void func_87900528(void);
void func_87900558(void);
void func_87900564(unk_func_8790002C* arg0);
void func_87900594(unk_func_8790002C* arg0);
void func_879005AC(unk_func_8790002C* arg0);
void func_879005C4(unk_func_8790002C* arg0);
void func_8790060C(unk_func_8790002C* arg0);
void func_87900770(unk_func_8790002C* arg0);
void func_87900808(unk_func_8790002C* arg0);
void hideMiniGameHUD(void);
void func_87900564(MiniActor* actor);
void minigameActorLocalOriginToZero(MiniActor* arg0);
void func_879005AC(MiniActor* arg0);
void miniEkansUpdatePos(MiniActor* ekans);
void miniActorAllToZero(MiniActor* actor);
void miniActorUpdateTransform(MiniActor* poke);
void func_87900808(MiniActor* arg0);
void func_87900854(void);
void func_87900920(void);
void func_879009B4(void);
void func_87900A50(void);
void func_87900B64(void);
s32 func_87900C5C(void);
void func_87900F44(void);
void func_879010A4(void);
void miniUpdateCamera(void);
s32 minigameDebuggModeControl(void);
void showDebuggCameraInfo(void);
void showDebuggJoystickInfo(void);
void func_87901200(void);
void func_87901620(void);
@ -252,11 +269,11 @@ void func_87903260(void);
void func_87903294(void);
void func_879032BC(s16 arg0);
void func_87903358(s16 arg0, s16 arg1);
void func_879033FC(unk_func_8790002C* arg0);
void func_879033FC(MiniActor* arg0);
void func_8790354C(void);
void func_87903600(void);
void func_879036B4(unk_func_8790002C* arg0);
void func_879036B4(MiniActor* arg0);
void func_8790370C(void);
void func_879037D0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6);
void func_87903838(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6);

422
src/fragments/3/fragment3_1189B0.c
View File

@ -4,20 +4,20 @@
#include "src/18140.h"
#include "src/1C720.h"
#include "src/20330.h"
#include "src/3FB0.h"
// #include "src/3FB0.h"
#include "src/controller.h"
#include "src/fragments/2/fragment2.h"
s16 D_87903DA0 = 0;
s16 D_87903DA4 = 0;
s16 minigameState = 0;
s16 minigameInputLock = 0;
s16 D_87903DA8 = 0;
s16 D_87903DAC = 0;
s16 D_87903DB0 = 0;
s16 miniDebugMode = 0;
s32 pad_D_87903DB4 = 0;
s16 D_87903DB8 = 0;
s16 D_87903DBC = 0;
s16 D_87903DC0 = 0;
s16 D_87903DC4 = 0;
s16 miniTutoScreenState = 0;
s16 D_87903DC8 = 0;
s16 D_87903DCC = 0;
s16 D_87903DD0 = 0;
@ -27,86 +27,89 @@ ret_func_80004454 func_87900020(void) {
return func_87900020;
}
void func_8790002C(unk_func_8790002C* arg0, unk_func_8790002C* arg1) {
sqrtf(SQ(arg1->unk_19C.x - arg0->unk_19C.x) + SQ(arg1->unk_19C.z - arg0->unk_19C.z));
// func_8790002C
float MinigameGetVec3Distance_2d(MiniActor* arg0, MiniActor* arg1) {
return sqrtf(SQ(arg1->totalPos_alt.x - arg0->totalPos_alt.x) + SQ(arg1->totalPos_alt.z - arg0->totalPos_alt.z));
}
// func_87900070
void MinigameGetVec3Distance_3d(MiniActor* arg0, MiniActor* arg1) {
sqrtf(SQ(arg1->totalPos_alt.x - arg0->totalPos_alt.x) + SQ(arg1->totalPos_alt.y - arg0->totalPos_alt.y) +
SQ(arg1->totalPos_alt.z - arg0->totalPos_alt.z));
}
void func_87900070(unk_func_8790002C* arg0, unk_func_8790002C* arg1) {
sqrtf(SQ(arg1->unk_19C.x - arg0->unk_19C.x) + SQ(arg1->unk_19C.y - arg0->unk_19C.y) +
SQ(arg1->unk_19C.z - arg0->unk_19C.z));
// unused,
s32 func_879000C4(MiniActor* arg0, MiniActor* arg1) {
f32 totalX = arg1->totalPos_alt.x - arg0->totalPos_alt.x;
f32 totalY = arg1->totalPos_alt.y - arg0->totalPos_alt.y;
f32 totalZ = arg1->totalPos_alt.z - arg0->totalPos_alt.z;
f32 totalTops = (arg0->cubeRadio * arg0->scale.y) + (arg1->cubeRadio * arg1->scale.y);
s32 ret = FALSE;
if (totalX < 0.0f) {
totalX = -totalX;
}
if (totalY < 0.0f) {
totalY = -totalY;
}
if (totalZ < 0.0f) {
totalZ = -totalZ;
}
if (totalTops < 0.0f) {
totalTops = -totalTops;
}
if (CB(totalZ) < ((CB(totalTops) - CB(totalX)) - CB(totalY))) {
ret = TRUE;
}
return ret;
}
s32 func_879000C4(unk_func_8790002C* arg0, unk_func_8790002C* arg1) {
f32 var_fv0 = arg1->unk_19C.x - arg0->unk_19C.x;
f32 var_fv1 = arg1->unk_19C.y - arg0->unk_19C.y;
f32 var_fa0 = arg1->unk_19C.z - arg0->unk_19C.z;
f32 var_fa1 = (arg0->unk_288 * arg0->unk_16C.y) + (arg1->unk_288 * arg1->unk_16C.y);
s32 ret = 0;
s32 metapodRockCollisionCheck(MiniActor* fallingRock, MiniActor* metapod) {
f32 totalX;
f32 totalY;
f32 totalZ;
f32 var_fa1;
f32 var_fs0;
f32 tmp;
s32 ret;
if (var_fv0 < 0.0f) {
var_fv0 = -var_fv0;
}
totalX = metapod->totalPos_alt.x - fallingRock->totalPos_alt.x;
totalY = metapod->totalPos_alt.y - fallingRock->totalPos_alt.y;
totalZ = metapod->totalPos_alt.z - fallingRock->totalPos_alt.z;
ret = 0;
if (var_fv1 < 0.0f) {
var_fv1 = -var_fv1;
}
var_fa1 = (fallingRock->cubeRadio * fallingRock->scale.y) + (metapod->cubeRadio * metapod->scale.y);
var_fs0 = ((fallingRock->halfHeight * fallingRock->scale.y) + (metapod->halfHeight * metapod->scale.y)) / 2.0f;
if (var_fa0 < 0.0f) {
var_fa0 = -var_fa0;
}
totalX = ABS(totalX);
totalY = ABS(totalY);
totalZ = ABS(totalZ);
var_fa1 = ABS(var_fa1);
var_fs0 = ABS(var_fs0);
tmp = var_fs0 - totalY;
if (var_fa1 < 0.0f) {
var_fa1 = -var_fa1;
}
if (CB(var_fa0) < ((CB(var_fa1) - CB(var_fv0)) - CB(var_fv1))) {
if ((SQ(totalZ) < (SQ(var_fa1) - SQ(totalX))) && (tmp > 0)) {
ret = 1;
}
return ret;
}
s32 func_879001A4(unk_func_8790002C* arg0, unk_func_8790002C* arg1) {
f32 var_fa0;
f32 var_fa1;
f32 var_fs0;
f32 var_fv0;
f32 var_fv1;
f32 tmp;
s32 var_v1;
var_fv0 = arg1->unk_19C.x - arg0->unk_19C.x;
var_fv1 = arg1->unk_19C.y - arg0->unk_19C.y;
var_fa0 = arg1->unk_19C.z - arg0->unk_19C.z;
var_v1 = 0;
var_fa1 = (arg0->unk_288 * arg0->unk_16C.y) + (arg1->unk_288 * arg1->unk_16C.y);
var_fs0 = ((arg0->unk_28C * arg0->unk_16C.y) + (arg1->unk_28C * arg1->unk_16C.y)) * 0.5f;
var_fv0 = ABS(var_fv0);
var_fv1 = ABS(var_fv1);
var_fa0 = ABS(var_fa0);
var_fa1 = ABS(var_fa1);
var_fs0 = ABS(var_fs0);
tmp = var_fs0 - var_fv1;
if ((SQ(var_fa0) < (SQ(var_fa1) - SQ(var_fv0))) && (tmp > 0)) {
var_v1 = 1;
}
return var_v1;
void miniChangeActorAnim(MiniActor* poke, s16 anim, s16 arg2, s16 arg3) {
poke->unk_248 = 1;
poke->unk_24A = anim;
poke->unk_24C = arg2;
poke->unk_26A = arg3;
poke->unk_26C = 0;
poke->unk_26E = 0;
}
void func_879002B8(unk_func_8790002C* arg0, s16 arg1, s16 arg2, s16 arg3) {
arg0->unk_248 = 1;
arg0->unk_24A = arg1;
arg0->unk_24C = arg2;
arg0->unk_26A = arg3;
arg0->unk_26C = 0;
arg0->unk_26E = 0;
}
void func_879002FC(unk_func_8790002C* arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4) {
// unused
void miniChangeActorAnim_alt1(MiniActor* arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4) {
arg0->unk_248 = 1;
arg0->unk_24A = arg1;
arg0->unk_24C = arg2;
@ -115,15 +118,15 @@ void func_879002FC(unk_func_8790002C* arg0, s16 arg1, s16 arg2, s16 arg3, s16 ar
arg0->unk_26E = arg4;
}
void func_87900344(unk_func_8790002C* arg0, s16 arg1, s16 arg2, s16 arg3) {
arg0->unk_248 = 1;
arg0->unk_24A = arg1;
arg0->unk_24C = arg2;
arg0->unk_26A = arg3;
arg0->unk_26C = 1;
void miniChangeActorAnim_alt2(MiniActor* diglett, s16 anim, s16 arg2, s16 arg3) {
diglett->unk_248 = 1;
diglett->unk_24A = anim;
diglett->unk_24C = arg2;
diglett->unk_26A = arg3;
diglett->unk_26C = 1;
}
s32 func_87900384(unk_func_8790002C* arg0) {
s32 miniPokeIsIdleCheck(MiniActor* arg0) {
s32 var_v1 = 0;
if (arg0->unk_248 == 0) {
@ -132,42 +135,42 @@ s32 func_87900384(unk_func_8790002C* arg0) {
return var_v1;
}
void func_879003A0(unk_func_8790002C* arg0) {
switch (arg0->unk_248) {
void func_879003A0(MiniActor* poke) {
switch (poke->unk_248) {
case 1:
func_8001BD04(&arg0->unk_000, arg0->unk_24A);
if (arg0->unk_26C != 0) {
func_800173DC(&arg0->unk_000, 0, arg0->unk_000.unk_040.unk_04, -0x10000);
func_80017464(&arg0->unk_000, arg0->unk_000.unk_040.unk_04->unk_0A - 1);
func_8001BD04(&poke->unk_000, poke->unk_24A);
if (poke->unk_26C != 0) {
func_800173DC(&poke->unk_000, 0, poke->unk_000.unk_040.unk_04, -0x10000);
func_80017464(&poke->unk_000, poke->unk_000.unk_040.unk_04->unk_0A - 1);
} else {
func_800173DC(&arg0->unk_000, 0, arg0->unk_000.unk_040.unk_04, 0x10000);
func_80017464(&arg0->unk_000, arg0->unk_26E);
func_80017788(&arg0->unk_000);
if (arg0->unk_24C != -1) {
func_8001BD9C(&arg0->unk_000, arg0->unk_24C);
func_80017804(&arg0->unk_000, arg0->unk_26E);
func_800173DC(&poke->unk_000, 0, poke->unk_000.unk_040.unk_04, 0x10000);
func_80017464(&poke->unk_000, poke->unk_26E);
func_80017788(&poke->unk_000);
if (poke->unk_24C != -1) {
func_8001BD9C(&poke->unk_000, poke->unk_24C);
func_80017804(&poke->unk_000, poke->unk_26E);
}
}
arg0->unk_248++;
poke->unk_248++;
break;
case 2:
if (arg0->unk_26C == 0) {
if (func_800174E4(&arg0->unk_000) != 0) {
arg0->unk_248++;
if (poke->unk_26C == 0) {
if (func_800174E4(&poke->unk_000) != 0) {
poke->unk_248++;
}
} else {
if (arg0->unk_000.unk_040.unk_08 == 0) {
arg0->unk_248++;
if (poke->unk_000.unk_040.unk_08 == 0) {
poke->unk_248++;
}
}
break;
case 3:
if (arg0->unk_26A != 0) {
func_8001BD04(&arg0->unk_000, 0);
if (poke->unk_26A != 0) {
func_8001BD04(&poke->unk_000, 0);
}
arg0->unk_248 = 0;
poke->unk_248 = 0;
break;
}
}
@ -179,137 +182,140 @@ void func_879004F8(unk_D_86002F58_004_000* arg0) {
void func_87900528(void) {
Cont_StartReadInputs();
Cont_ReadInputs();
func_8001F730();
func_8001F730(); // nothing
}
void func_87900558(void) {
D_87906044 = 0;
void hideMiniGameHUD(void) {
miniShowHUB = 0;
}
void func_87900564(unk_func_8790002C* arg0) {
arg0->unk_1C0.x = 0.0f;
arg0->unk_1A8.x = 0.0f;
arg0->unk_190.x = 0.0f;
arg0->unk_1C0.y = 0.0f;
arg0->unk_1A8.y = 0.0f;
arg0->unk_190.y = 0.0f;
arg0->unk_1C0.z = 0.0f;
arg0->unk_1A8.z = 0.0f;
arg0->unk_190.z = 0.0f;
void func_87900564(MiniActor* actor) {
actor->position_2.x = 0.0f;
actor->position_1.x = 0.0f;
actor->totalPos.x = 0.0f;
actor->position_2.y = 0.0f;
actor->position_1.y = 0.0f;
actor->totalPos.y = 0.0f;
actor->position_2.z = 0.0f;
actor->position_1.z = 0.0f;
actor->totalPos.z = 0.0f;
}
void func_87900594(unk_func_8790002C* arg0) {
arg0->unk_1A8.x = 0.0f;
arg0->unk_1A8.y = 0.0f;
arg0->unk_1A8.z = 0.0f;
void minigameActorLocalOriginToZero(MiniActor* arg0) {
arg0->position_1.x = 0.0f;
arg0->position_1.y = 0.0f;
arg0->position_1.z = 0.0f;
}
void func_879005AC(unk_func_8790002C* arg0) {
arg0->unk_1C0.x = 0.0f;
arg0->unk_1C0.y = 0.0f;
arg0->unk_1C0.z = 0.0f;
void func_879005AC(MiniActor* arg0) {
arg0->position_2.x = 0.0f;
arg0->position_2.y = 0.0f;
arg0->position_2.z = 0.0f;
}
void func_879005C4(unk_func_8790002C* arg0) {
arg0->unk_1FC = arg0->unk_1FC - arg0->unk_210;
arg0->unk_1C0.x = arg0->unk_1C0.x + arg0->unk_1F8;
arg0->unk_1C0.y = arg0->unk_1C0.y + (arg0->unk_1FC - arg0->unk_210);
arg0->unk_1C0.z = arg0->unk_1C0.z + arg0->unk_200;
void miniEkansUpdatePos(MiniActor* ekans) {
ekans->ySpeed = ekans->ySpeed - ekans->antiAcceleration;
ekans->position_2.x = ekans->position_2.x + ekans->xSpeed;
ekans->position_2.y = ekans->position_2.y + (ekans->ySpeed - ekans->antiAcceleration);
ekans->position_2.z = ekans->position_2.z + ekans->zSpeed;
}
void func_8790060C(unk_func_8790002C* arg0) {
arg0->unk_214.x = arg0->unk_214.y = arg0->unk_214.z = 0;
arg0->unk_21A = arg0->unk_21C = arg0->unk_21E = 0;
arg0->unk_220 = arg0->unk_222 = arg0->unk_224 = 0;
arg0->unk_226 = arg0->unk_228 = arg0->unk_22A = 0;
arg0->unk_22C = arg0->unk_22E = arg0->unk_230 = 0;
arg0->unk_232 = arg0->unk_234 = arg0->unk_236 = 0;
arg0->unk_23E = arg0->unk_240 = arg0->unk_242 = arg0->unk_248 = 0;
void miniActorAllToZero(MiniActor* actor) {
actor->totalRot.x = actor->totalRot.y = actor->totalRot.z = 0;
actor->xRot_1 = actor->yRot_1 = actor->zRot_1 = 0;
actor->unk_220 = actor->unk_222 = actor->unk_224 = 0;
actor->xRot_2 = actor->yRot_2 = actor->zRot_2 = 0;
actor->unk_22C = actor->ySpinSpeed = actor->unk_230 = 0;
actor->xRot_3 = actor->yRot_3 = actor->zRot_3 = 0;
actor->mainState = actor->isSquashed = actor->compState = actor->unk_248 = 0;
arg0->unk_254 = 0;
arg0->unk_272 = 0;
arg0->unk_238 = 0;
arg0->unk_25A = 0;
arg0->unk_2A8 = 0;
arg0->unk_2A4 = 0;
arg0->unk_2A2 = 0;
arg0->unk_29A = 0;
arg0->unk_2AA = 0;
arg0->unk_29C = 0;
arg0->unk_2A0 = 0;
arg0->unk_29E = 0;
arg0->unk_296 = 0;
arg0->unk_298 = 0;
actor->unk_254 = 0;
actor->unk_272 = 0;
actor->unk_238 = 0;
actor->damageTimer = 0;
actor->isWinner = 0;
actor->unk_2A4 = 0;
actor->ekansScore = 0;
actor->unk_29A = 0;
actor->unk_2AA = 0;
actor->diglettIsGold = 0;
actor->unk_2A0 = 0;
actor->unk_29E = 0;
actor->unk_296 = 0;
actor->unk_298 = 0;
arg0->unk_16C.x = arg0->unk_16C.y = arg0->unk_16C.z = 1.0f;
arg0->unk_190.x = arg0->unk_190.y = arg0->unk_190.z = 0.0f;
arg0->unk_1A8.x = arg0->unk_1A8.y = arg0->unk_1A8.z = 0.0f;
actor->scale.x = actor->scale.y = actor->scale.z = 1.0f;
actor->totalPos.x = actor->totalPos.y = actor->totalPos.z = 0.0f;
actor->position_1.x = actor->position_1.y = actor->position_1.z = 0.0f;
arg0->unk_1B4.z = 0.0f;
arg0->unk_1B4.y = 0.0f;
arg0->unk_1B4.x = 0.0f;
arg0->unk_1C0.x = arg0->unk_1C0.y = arg0->unk_1C0.z = 0.0f;
actor->closestDiglettPos.z = 0.0f;
actor->closestDiglettPos.y = 0.0f;
actor->closestDiglettPos.x = 0.0f;
actor->position_2.x = actor->position_2.y = actor->position_2.z = 0.0f;
arg0->unk_1D4 = 0.0f;
arg0->unk_1D0 = 0.0f;
arg0->unk_1CC = 0.0f;
arg0->unk_1E4 = 0.0f;
arg0->unk_210 = 0.0f;
arg0->unk_20C = 0.0f;
arg0->unk_208 = 0.0f;
arg0->unk_204 = 0.0f;
arg0->unk_200 = 0.0f;
arg0->unk_1FC = 0.0f;
arg0->unk_1F8 = 0.0f;
arg0->unk_1F4 = 0.0f;
arg0->unk_1F0 = 0.0f;
arg0->unk_1EC = 0.0f;
arg0->unk_284 = 0.0f;
arg0->unk_280 = 0.0f;
arg0->unk_27C = 0.0f;
arg0->unk_274 = 0.0f;
actor->dist2DiglettLevelZ = 0.0f;
actor->dist2DiglettLevelY = 0.0f;
actor->dist2DiglettLevelX = 0.0f;
actor->middleHeight = 0.0f;
actor->antiAcceleration = 0.0f;
actor->zAccel = 0.0f;
actor->yAccel = 0.0f;
actor->xAccel = 0.0f;
actor->zSpeed = 0.0f;
actor->ySpeed = 0.0f;
actor->xSpeed = 0.0f;
actor->unk_1F4 = 0.0f;
actor->unk_1F0 = 0.0f;
actor->unk_1EC = 0.0f;
actor->stickMagnitude2 = 0.0f;
actor->unk_280 = 0.0f;
actor->diggingAccel2 = 0.0f;
actor->unk_274 = 0.0f;
arg0->unk_260 = arg0->unk_262 = arg0->unk_264 = arg0->unk_266 = 0;
arg0->unk_290 = arg0->unk_292 = arg0->unk_294 = 0;
actor->midAirState = actor->ekansIsMidAir = actor->unk_264 = actor->collidingActorId = 0;
actor->unk_290 = actor->unk_292 = actor->unk_294 = 0;
}
void func_87900770(unk_func_8790002C* arg0) {
arg0->unk_190.x = arg0->unk_19C.x = arg0->unk_1A8.x + arg0->unk_1C0.x;
arg0->unk_190.y = arg0->unk_19C.y = arg0->unk_1A8.y + arg0->unk_1C0.y;
arg0->unk_190.z = arg0->unk_19C.z = arg0->unk_1A8.z + arg0->unk_1C0.z;
void miniActorUpdateTransform(MiniActor* poke) {
poke->totalPos.x = poke->totalPos_alt.x = poke->position_1.x + poke->position_2.x;
poke->totalPos.y = poke->totalPos_alt.y = poke->position_1.y + poke->position_2.y;
poke->totalPos.z = poke->totalPos_alt.z = poke->position_1.z + poke->position_2.z;
arg0->unk_19C.y = arg0->unk_19C.y + arg0->unk_1E4;
poke->totalPos_alt.y = poke->totalPos_alt.y + poke->middleHeight;
arg0->unk_214.x = arg0->unk_21A + arg0->unk_226 + arg0->unk_232;
arg0->unk_214.y = arg0->unk_21C + arg0->unk_228 + arg0->unk_234;
arg0->unk_214.z = arg0->unk_21E + arg0->unk_22A + arg0->unk_236;
poke->totalRot.x = poke->xRot_1 + poke->xRot_2 + poke->xRot_3;
poke->totalRot.y = poke->yRot_1 + poke->yRot_2 + poke->yRot_3;
poke->totalRot.z = poke->zRot_1 + poke->zRot_2 + poke->zRot_3;
}
void func_87900808(unk_func_8790002C* arg0) {
arg0->unk_000.unk_030.x = arg0->unk_16C.x;
arg0->unk_000.unk_030.y = arg0->unk_16C.y;
arg0->unk_000.unk_030.z = arg0->unk_16C.z;
// updates an object's collider ?
void func_87900808(MiniActor* arg0) {
arg0->unk_000.unk_030.x = arg0->scale.x;
arg0->unk_000.unk_030.y = arg0->scale.y;
arg0->unk_000.unk_030.z = arg0->scale.z;
arg0->unk_000.unk_024.x = arg0->unk_190.x;
arg0->unk_000.unk_024.y = arg0->unk_190.y;
arg0->unk_000.unk_024.z = arg0->unk_190.z;
arg0->unk_000.unk_024.x = arg0->totalPos.x;
arg0->unk_000.unk_024.y = arg0->totalPos.y;
arg0->unk_000.unk_024.z = arg0->totalPos.z;
arg0->unk_000.unk_01E.x = arg0->unk_214.x;
arg0->unk_000.unk_01E.y = arg0->unk_214.y;
arg0->unk_000.unk_01E.z = arg0->unk_214.z;
arg0->unk_000.unk_01E.x = arg0->totalRot.x;
arg0->unk_000.unk_01E.y = arg0->totalRot.y;
arg0->unk_000.unk_01E.z = arg0->totalRot.z;
}
void func_87900854(void) {
s16* ptr = D_8780FA30;
D_87903DA4 = 0;
minigameInputLock = 0;
D_87903DA8 = 0;
D_87903DAC = 0;
D_87906040 = 0;
miniInputLockTimer = 0;
D_87906048 = 0;
D_8790604A = 0;
D_87903DC0 = 0;
D_87903DC4 = 0;
miniTutoScreenState = 0;
D_87903DC8 = 0;
D_87903DCC = 0;
D_87903DD0 = 0;
@ -323,29 +329,29 @@ void func_87900854(void) {
D_879060C4[2] = ptr[2];
D_879060C4[3] = ptr[3];
D_879060C8 = 0xFF;
miniHudTransparency = 0xFF;
}
void func_87900920(void) {
D_8790607C = D_87906064;
D_87906080 = D_87906066;
D_8790607C = miniCameraDistance;
D_87906080 = miniCameraFov;
D_87906088.x = D_8790606C.x;
D_87906088.y = D_8790606C.y;
D_87906088.z = D_8790606C.z;
D_87906088.x = miniCameraCoords.x;
D_87906088.y = miniCameraCoords.y;
D_87906088.z = miniCameraCoords.z;
D_87906076 = D_87906060;
D_87906078 = D_87906062;
D_87906076 = miniCameraXRot;
D_87906078 = miniCameraYRot;
}
void func_879009B4(void) {
D_87906064 = D_8790607C;
D_87906066 = D_87906080;
miniCameraDistance = D_8790607C;
miniCameraFov = D_87906080;
D_8790606C.x = D_87906088.x;
D_8790606C.y = D_87906088.y;
D_8790606C.z = D_87906088.z;
miniCameraCoords.x = D_87906088.x;
miniCameraCoords.y = D_87906088.y;
miniCameraCoords.z = D_87906088.z;
D_87906060 = D_87906076;
D_87906062 = D_87906078;
miniCameraXRot = D_87906076;
miniCameraYRot = D_87906078;
}

158
src/fragments/3/fragment3_1193E0.c
View File

@ -3,23 +3,23 @@
#include "src/20470.h"
#include "src/F420.h"
s16 D_87906040;
s16 miniInputLockTimer;
s16 D_87906042;
s16 D_87906044;
s16 D_87906046;
s16 D_87906048;
s16 miniShowHUB;
s16 miniDifficulty;
s16 D_87906048; // unused?
s16 D_8790604A;
s32 pad_D_8790604C;
s32 pad_D_8790604C; // unused?
unk_D_86002F34_00C* D_87906050;
unk_D_86002F34_00C* D_87906054;
s32 pad_D_87906058[2];
s16 D_87906060;
s16 D_87906062;
s16 D_87906064;
s16 D_87906066;
s16 D_87906068;
s16 D_8790606A;
Vec3s D_8790606C;
s32 pad_D_87906058[2]; // unused?
s16 miniCameraXRot;
s16 miniCameraYRot;
s16 miniCameraDistance;
s16 miniCameraFov;
s16 miniCameraNear;
s16 miniCameraFar;
Vec3s miniCameraCoords;
s16 D_87906072;
s16 pad_D_87906074;
s16 D_87906076;
@ -40,11 +40,11 @@ s16 D_879060A8;
Vec3s D_879060AC;
s32 pad_D_879060B4;
s32 pad_D_879060B8;
Controller* D_879060BC;
Controller* miniControllerPtr;
s16 D_879060C0;
s16 D_879060C2;
s16 miniEkansCountdown;
s8 D_879060C4[4];
s16 D_879060C8;
s16 miniHudTransparency;
s16 D_879060CA;
s32 pad_D_879060D0[4];
Vec3f D_879060E0;
@ -53,61 +53,61 @@ Vec3f D_87906100;
Vec3f D_87906110;
void func_87900A50(void) {
D_87906060 = D_879060A2 + D_87906094;
D_87906062 = D_879060A4 + D_87906096;
miniCameraXRot = D_879060A2 + D_87906094;
miniCameraYRot = D_879060A4 + D_87906096;
D_8790606C.x = D_879060AC.x + D_8790609C.x;
D_8790606C.y = D_879060AC.y + D_8790609C.y;
D_8790606C.z = D_879060AC.z + D_8790609C.z;
miniCameraCoords.x = D_879060AC.x + D_8790609C.x;
miniCameraCoords.y = D_879060AC.y + D_8790609C.y;
miniCameraCoords.z = D_879060AC.z + D_8790609C.z;
D_87906064 = D_879060A6 + D_87906098;
D_87906066 = D_879060A8 + D_8790609A;
miniCameraDistance = D_879060A6 + D_87906098;
miniCameraFov = D_879060A8 + D_8790609A;
if (D_87906064 < 0x32) {
D_87906064 = 0x32;
D_87906098 = D_87906064 - D_879060A6;
if (miniCameraDistance < 0x32) {
miniCameraDistance = 0x32;
D_87906098 = miniCameraDistance - D_879060A6;
}
if (D_87906066 < 0xA) {
D_87906066 = 0xA;
D_8790609A = D_87906066 - D_879060A8;
if (miniCameraFov < 0xA) {
miniCameraFov = 0xA;
D_8790609A = miniCameraFov - D_879060A8;
}
}
void func_87900B64(void) {
D_87906054->unk_24.fovy = D_87906066;
D_87906054->unk_24.near = D_87906068;
D_87906054->unk_24.far = D_8790606A;
void miniUpdateCamera(void) {
D_87906054->unk_24.fovy = miniCameraFov;
D_87906054->unk_24.near = miniCameraNear;
D_87906054->unk_24.far = miniCameraFar;
D_87906054->unk_60.at.x = D_8790606C.x;
D_87906054->unk_60.at.y = D_8790606C.y;
D_87906054->unk_60.at.z = D_8790606C.z;
D_87906054->unk_60.at.x = miniCameraCoords.x;
D_87906054->unk_60.at.y = miniCameraCoords.y;
D_87906054->unk_60.at.z = miniCameraCoords.z;
func_80010354(&D_87906054->unk_60.at, &D_87906054->unk_60.eye, D_87906064, D_87906060, D_87906062);
func_80010354(&D_87906054->unk_60.at, &D_87906054->unk_60.eye, miniCameraDistance, miniCameraXRot, miniCameraYRot);
}
s32 func_87900C5C(void) {
s32 minigameDebuggModeControl(void) {
s16 sp6;
if (D_87903DB0 == 0) {
if (miniDebugMode == 0) {
return;
}
if (gPlayer1Controller->buttonPressed & 0x20) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_L)) {
D_87903DB8++;
if (D_87903DB8 == 1) {
D_87903DB8 = 0;
}
}
if (gPlayer1Controller->buttonPressed & 0x10) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_R)) {
D_87903DB8--;
if (D_87903DB8 < 0) {
D_87903DB8 = 0;
}
}
if (gPlayer1Controller->buttonPressed & 0x1000) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_START)) {
D_8790609C.x = 0;
D_8790609C.y = 0;
D_8790609C.z = 0;
@ -119,29 +119,29 @@ s32 func_87900C5C(void) {
}
if (D_87903DB8 == 0) {
if (gPlayer1Controller->buttonDown & 0xCF00) {
if (gPlayer1Controller->buttonDown & 0x800) {
sp6 = D_87906062 + 0x8000;
if (BTN_IS_DOWN(gPlayer1Controller, 0xCF00)) {
if (BTN_IS_DOWN(gPlayer1Controller, BTN_DUP)) {
sp6 = miniCameraYRot + 0x8000;
}
if (gPlayer1Controller->buttonDown & 0x400) {
sp6 = D_87906062;
if (BTN_IS_DOWN(gPlayer1Controller, BTN_DDOWN)) {
sp6 = miniCameraYRot;
}
if (gPlayer1Controller->buttonDown & 0x200) {
sp6 = D_87906062 + 0xC000;
if (BTN_IS_DOWN(gPlayer1Controller, BTN_DLEFT)) {
sp6 = miniCameraYRot + 0xC000;
}
if (gPlayer1Controller->buttonDown & 0x100) {
sp6 = D_87906062 + 0x4000;
if (BTN_IS_DOWN(gPlayer1Controller, BTN_DRIGHT)) {
sp6 = miniCameraYRot + 0x4000;
}
if (gPlayer1Controller->buttonDown & 0x8000) {
sp6 = D_87906062 + 0x8000;
if (BTN_IS_DOWN(gPlayer1Controller, BTN_A)) {
sp6 = miniCameraYRot + 0x8000;
}
if (gPlayer1Controller->buttonDown & 0x4000) {
sp6 = D_87906062;
if (BTN_IS_DOWN(gPlayer1Controller, BTN_B)) {
sp6 = miniCameraYRot;
}
D_8790609C.x += SINS(sp6) * 16.0f;
@ -151,25 +151,25 @@ s32 func_87900C5C(void) {
D_87906096 += gPlayer1Controller->stickX * 4.0f;
D_87906094 += gPlayer1Controller->stickY * 4.0f;
if (gPlayer1Controller->buttonDown & 8) {
if (BTN_IS_DOWN(gPlayer1Controller, BTN_CUP)) {
D_8790609C.y += 4;
}
if (gPlayer1Controller->buttonDown & 4) {
if (BTN_IS_DOWN(gPlayer1Controller, BTN_CDOWN)) {
D_8790609C.y -= 4;
}
if (gPlayer1Controller->buttonDown & 1) {
if (BTN_IS_DOWN(gPlayer1Controller, BTN_CRIGHT)) {
D_87906098 += 0xA;
}
if (gPlayer1Controller->buttonDown & 2) {
if (BTN_IS_DOWN(gPlayer1Controller, BTN_CLEFT)) {
D_87906098 -= 0xA;
}
}
}
void func_87900F44(void) {
void showDebuggCameraInfo(void) {
u8 sp24[3] = { 0, 0, 30 }; // D_87903DE0
u8 sp20[3] = { 0, 0, 250 }; // D_87903DE4
@ -182,16 +182,16 @@ void func_87900F44(void) {
func_8001F1E8(0x19, 0x1C, "TRANSRATE");
}
func_8001F1E8(0x19, 0x28, "CAMERA X:%d", D_8790606C.x);
func_8001F1E8(0x19, 0x34, "CAMERA Y:%d", D_8790606C.y);
func_8001F1E8(0x19, 0x40, "CAMERA Z:%d", D_8790606C.z);
func_8001F1E8(0xA7, 0x28, "CAMERA D:%d", D_87906064);
func_8001F1E8(0xA7, 0x34, "CAMERA F:%d", D_87906066);
func_8001F1E8(0xA7, 0x40, "X:%04hX Y:%04hX", D_87906060, D_87906062);
func_8001F1E8(0x19, 0x28, "CAMERA X:%d", miniCameraCoords.x);
func_8001F1E8(0x19, 0x34, "CAMERA Y:%d", miniCameraCoords.y);
func_8001F1E8(0x19, 0x40, "CAMERA Z:%d", miniCameraCoords.z);
func_8001F1E8(0xA7, 0x28, "CAMERA D:%d", miniCameraDistance);
func_8001F1E8(0xA7, 0x34, "CAMERA F:%d", miniCameraFov);
func_8001F1E8(0xA7, 0x40, "X:%04hX Y:%04hX", miniCameraXRot, miniCameraYRot);
func_8001F444();
}
void func_879010A4(void) {
void showDebuggJoystickInfo(void) {
u8 sp2C[3] = { 0, 0, 30 }; // D_87903DE8
u8 sp28[3] = { 0, 0, 250 }; // D_87903DEC
@ -213,14 +213,14 @@ void func_87901200(void) {
u8 sp30[3] = { 0, 0, 30 }; // D_87903DF0
u8 sp2C[3] = { 0, 0, 250 }; // D_87903DF4
if (gPlayer1Controller->buttonPressed & 8) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CUP)) {
D_879060CA--;
if (D_879060CA < 0) {
D_879060CA = 4;
}
}
if (gPlayer1Controller->buttonPressed & 4) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CDOWN)) {
D_879060CA++;
if (D_879060CA >= 5) {
D_879060CA = 0;
@ -229,46 +229,46 @@ void func_87901200(void) {
switch (D_879060CA) {
case 0:
if (gPlayer1Controller->buttonPressed & 2) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CLEFT)) {
D_87906100.x -= 0.1f;
}
if (gPlayer1Controller->buttonPressed & 1) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CRIGHT)) {
D_87906100.x += 0.1f;
}
break;
case 1:
if (gPlayer1Controller->buttonPressed & 2) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CLEFT)) {
D_87906100.y -= 0.1;
}
if (gPlayer1Controller->buttonPressed & 1) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CRIGHT)) {
D_87906100.y += 0.1;
}
break;
case 2:
if (gPlayer1Controller->buttonPressed & 2) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CLEFT)) {
D_879060E0.x -= 1.0;
}
if (gPlayer1Controller->buttonPressed & 1) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CRIGHT)) {
D_879060E0.x += 1.0;
}
break;
case 3:
if (gPlayer1Controller->buttonPressed & 2) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CLEFT)) {
D_879060E0.y -= 1.0;
}
if (gPlayer1Controller->buttonPressed & 1) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CRIGHT)) {
D_879060E0.y += 1.0;
}
break;
case 4:
if (gPlayer1Controller->buttonPressed & 2) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CLEFT)) {
D_87906110.y -= 0.02;
}
if (gPlayer1Controller->buttonPressed & 1) {
if (BTN_IS_PRESSED(gPlayer1Controller, BTN_CRIGHT)) {
D_87906110.y += 0.02;
}
break;

18
src/fragments/3/fragment3_11BBF0.c
View File

@ -309,15 +309,15 @@ u32 D_87905680[] = {
};
void func_87903260(void) {
if (D_87903DC4 > 0) {
D_87903DCC = D_87903DC4;
D_87903DC4 = -2;
if (miniTutoScreenState > 0) {
D_87903DCC = miniTutoScreenState;
miniTutoScreenState = -2;
D_87903DC0 = 1;
}
}
void func_87903294(void) {
D_87903DC4 = -1;
miniTutoScreenState = -1;
D_87903DC0 = 0;
D_87903DCC = 0;
D_87903DD0 = 0;
@ -343,7 +343,7 @@ void func_879032BC(s16 arg0) {
void func_87903358(s16 arg0, s16 arg1) {
switch (D_87903DC0) {
case 1:
D_87903DD0 = arg0;
D_87903DD0 = arg0; // 0x11
D_87903DC8 = arg1;
D_87903DC0++;
break;
@ -357,7 +357,7 @@ void func_87903358(s16 arg0, s16 arg1) {
}
}
void func_879033FC(unk_func_8790002C* arg0) {
void func_879033FC(MiniActor* arg0) {
s32 i;
s16 temp_a2;
s32 var_s2;
@ -369,9 +369,9 @@ void func_879033FC(unk_func_8790002C* arg0) {
var_s2 = 0;
for (i = 0; i < 4; i++) {
if (arg0[i].unk_2A8 != 0) {
if (arg0[i].isWinner != 0) {
temp_a2 = D_87903E60[D_87903DD4][var_s2];
if (arg0[i].unk_2AC != 0) {
if (arg0[i].isComp != 0) {
func_87801644(-1 - i, 0x78, temp_a2, 1.0f);
} else {
func_87801644(i, 0x78, temp_a2, 1.0f);
@ -384,7 +384,7 @@ void func_879033FC(unk_func_8790002C* arg0) {
}
void func_8790354C(void) {
switch (D_87906046) {
switch (miniDifficulty) {
case 0:
func_8001F1E8(0xC8, 0x20, "(EASY)");
break;

67
src/fragments/3/fragment3_11BF90.c
View File

@ -4,13 +4,13 @@
#include "src/12D80.h"
#include "src/memory.h"
static unk_func_8790002C* D_87906120;
static MiniActor* D_87906120;
void func_87903600(void) {
s32 i;
unk_func_8790002C* ptr;
MiniActor* ptr;
D_87906120 = main_pool_alloc(sizeof(unk_func_8790002C) * 3, 0);
D_87906120 = main_pool_alloc(sizeof(MiniActor) * 3, 0);
ptr = D_87906120;
for (i = 0; i < 3; i++, ptr++) {
@ -19,64 +19,63 @@ void func_87903600(void) {
func_8001BC34(&ptr->unk_000, 0, ptr->unk_23C, ptr->unk_168->unk_08->unk_00[0]);
func_8001BD04(&ptr->unk_000, 0);
ptr->unk_000.unk_000.unk_01 &= ~1;
func_8790060C(ptr);
miniActorAllToZero(ptr);
}
}
void func_879036B4(unk_func_8790002C* arg0) {
if (arg0->unk_23E == 1) {
void func_879036B4(MiniActor* arg0) {
if (arg0->mainState == 1) {
arg0->unk_000.unk_000.unk_01 |= 1;
func_879002B8(arg0, 0, -1, 0);
arg0->unk_23E++;
miniChangeActorAnim(arg0, 0, -1, 0);
arg0->mainState++;
}
}
void func_8790370C(void) {
s32 i;
unk_func_8790002C* ptr = D_87906120;
MiniActor* ptr = D_87906120;
func_8140C5D0();
for (i = 0; i < 3; i++, ptr++) {
func_879036B4(ptr);
func_879003A0(ptr);
func_87900770(ptr);
miniActorUpdateTransform(ptr);
func_87900808(ptr);
}
}
void func_87903778(unk_func_8790002C* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s16 arg5, s16 arg6, s16 arg7,
s16 arg8) {
arg0->unk_16C.x = arg1;
arg0->unk_16C.y = arg1;
arg0->unk_16C.z = arg1;
void func_87903778(MiniActor* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, s16 arg5, s16 arg6, s16 arg7, s16 arg8) {
arg0->scale.x = arg1;
arg0->scale.y = arg1;
arg0->scale.z = arg1;
arg0->unk_1A8.x = arg2;
arg0->unk_1A8.y = arg3;
arg0->unk_1A8.z = arg4;
arg0->unk_21A = arg5;
arg0->unk_21C = arg6;
arg0->unk_21E = arg7;
arg0->unk_266 = arg8;
arg0->unk_23E = 1;
arg0->position_1.x = arg2;
arg0->position_1.y = arg3;
arg0->position_1.z = arg4;
arg0->xRot_1 = arg5;
arg0->yRot_1 = arg6;
arg0->zRot_1 = arg7;
arg0->collidingActorId = arg8;
arg0->mainState = 1;
}
void func_879037D0(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6) {
unk_func_8790002C* sp34 = D_87906120;
MiniActor* sp34 = D_87906120;
func_87903778(sp34, arg0, arg1, arg2, arg3, arg4, arg5, arg6, 0);
sp34->unk_000.unk_000.unk_14 = 0;
}
void func_87903838(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6) {
unk_func_8790002C* sp34 = &D_87906120[1];
MiniActor* sp34 = &D_87906120[1];
func_87903778(sp34, arg0, arg1, arg2, arg3, arg4, arg5, arg6, 1);
sp34->unk_000.unk_000.unk_14 = 1;
}
void func_879038AC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, s16 arg4, s16 arg5, s16 arg6) {
unk_func_8790002C* sp34 = &D_87906120[2];
MiniActor* sp34 = &D_87906120[2];
func_87903778(sp34, arg0, arg1, arg2, arg3, arg4, arg5, arg6, 2);
sp34->unk_000.unk_000.unk_14 = 2;
@ -94,18 +93,18 @@ Gfx* func_87903920(Gfx* arg0, arg1_func_87903D64_014* arg1) {
unk_D_86002F34_000_014_010* sp20;
s32 temp_a2;
s32 temp_t1;
s32 temp_t1_2;
s32 temp_t2;
s32 temp_t2_2;
s32 temp_t2_3;
s32 temp_t4;
UNUSED s32 temp_t1;
UNUSED s32 temp_t1_2;
UNUSED s32 temp_t2;
UNUSED s32 temp_t2_2;
UNUSED s32 temp_t2_3;
UNUSED s32 temp_t4;
s32 var_a0;
s32 var_v1;
u32 temp_a3;
u32 var_v0;
u8* temp_t1_3;
u8* temp_v1;
UNUSED u8* temp_t1_3;
UNUSED u8* temp_v1;
unk_D_86002F34_000_014_004* var_a1;
unk_D_86002F34_000_014_004* var_a2;
unk_D_86002F34_000_014_010* var_a3;