match: func_8001F460 (#652)

* match: func_8001F460

* chore: remove comment

* Update src/objects.c

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>

---------

Co-authored-by: Dominik Peters <dominik.peters@committance.com>
Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
This commit is contained in:
Dominik Peters
2025-06-26 21:07:45 +02:00
committed by GitHub
co-authored by Dominik Peters Ryan Myers
parent c106e87a01
commit 6e27848a47
3 changed files with 235 additions and 262 deletions
+24 -24
View File
@@ -7,7 +7,7 @@ All versions are supported, and the US 1.0 version (SHA1 = 0cb115d8716dbbc2922fd
<!-- README_SCORE_SUMMARY_BEGIN -->
As of June 26, 2025, this is our current score:
&emsp;&emsp;&emsp;&emsp;Decomp progress: 94.75%
&emsp;&emsp;&emsp;&emsp;Decomp progress: 95.57%
&emsp;&emsp;&emsp;&emsp;Documentation progress: 61.34%
<!-- README_SCORE_SUMMARY_END -->
@@ -119,28 +119,28 @@ s32 is_drumstick_unlocked(void) {
<!-- README_SCORE_BEGIN -->
As of June 26, 2025, this is our current score:
```
=====================================================================
ADVENTURE ONE (ASM -> C Decompilation)
--------------- 94.75% Complete (95.45% NON_MATCHING) ---------------
# Decompiled functions: 1935
# GLOBAL_ASM remaining: 17
# NON_MATCHING functions: 4
# NON_EQUIVALENT WIP functions: 13
---------------------------- Game Status ----------------------------
Balloons: 45/47, Keys: 4/4, Trophies: 4/5
T.T. Amulets: 4/4, Wizpig Amulets: 4/4
---------------------------------------------------------------------
We are collecting silver coins in Spaceport Alpha. (4/8 silver coins)
=====================================================================
ADVENTURE TWO (Cleanup & Documentation)
-------------------------- 61.34% Complete --------------------------
# Documented functions: 1219
# Undocumented remaining: 433
---------------------------- Game Status ----------------------------
Balloons: 30/47, Keys: 3/4, Trophies: 2/5
T.T. Amulets: 3/4, Wizpig Amulets: 2/4
---------------------------------------------------------------------
We are racing in the rematch against Bubbler. (Lap 2/3)
=====================================================================
===============================================================
ADVENTURE ONE (ASM -> C Decompilation)
------------ 95.57% Complete (96.28% NON_MATCHING) ------------
# Decompiled functions: 1936
# GLOBAL_ASM remaining: 16
# NON_MATCHING functions: 4
# NON_EQUIVALENT WIP functions: 12
------------------------- Game Status -------------------------
Balloons: 46/47, Keys: 4/4, Trophies: 4/5
T.T. Amulets: 4/4, Wizpig Amulets: 4/4
---------------------------------------------------------------
We are collecting silver coins in Star City. (0/8 silver coins)
===============================================================
ADVENTURE TWO (Cleanup & Documentation)
----------------------- 61.34% Complete -----------------------
# Documented functions: 1219
# Undocumented remaining: 433
------------------------- Game Status -------------------------
Balloons: 30/47, Keys: 3/4, Trophies: 2/5
T.T. Amulets: 3/4, Wizpig Amulets: 2/4
---------------------------------------------------------------
We are racing in the rematch against Bubbler. (Lap 2/3)
===============================================================
```
<!-- README_SCORE_END -->
+8 -8
View File
@@ -1515,11 +1515,11 @@ typedef struct Object_AnimatedObject {
/* 0x2C */ u8 unk2C;
/* 0x2D */ u8 unk2D;
/* 0x2E */ u8 unk2E;
/* 0x2F */ u8 unk2F;
/* 0x2F */ s8 unk2F;
/* 0x30 */ s8 cameraID;
/* 0x31 */ u8 unk31;
/* 0x32 */ u8 unk32;
/* 0x33 */ u8 unk33;
/* 0x31 */ s8 unk31;
/* 0x32 */ s8 unk32;
/* 0x33 */ s8 unk33;
/* 0x34 */ u8 unk34;
/* 0x35 */ u8 unk35;
/* 0x36 */ s16 pauseCounter;
@@ -1531,12 +1531,12 @@ typedef struct Object_AnimatedObject {
/* 0x3D */ u8 unk3D;
/* 0x3E */ s8 unk3E;
/* 0x3F */ s8 unk3F;
/* 0x40 */ u8 unk40;
/* 0x41 */ u8 unk41;
/* 0x40 */ s8 unk40;
/* 0x41 */ s8 unk41;
/* 0x42 */ u8 unk42;
/* 0x43 */ u8 unk43;
/* 0x43 */ s8 unk43;
/* 0x44 */ u8 unk44;
/* 0x45 */ u8 unk45;
/* 0x45 */ s8 unk45;
} Object_AnimatedObject;
/* Size: 0x018 bytes */
+203 -230
View File
File diff suppressed because it is too large Load Diff