Skip to content

Commit

Permalink
Match 33.59% of mpisland (3.52 KB) (doldecomp#1224)
Browse files Browse the repository at this point in the history 
Co-authored-by: davidgfb <20667923+davidgfb@users.noreply.github.com>
Co-authored-by: roeming <25447777+roeming@users.noreply.github.com>
Co-authored-by: ssbmcortex <10965625+ssbmcortex@users.noreply.github.com>
Co-authored-by: VetriTheRetri <74500716+VetriTheRetri@users.noreply.github.com>
  • Loading branch information
@ribbanya @davidgfb
@roeming @ssbmcortex @VetriTheRetri
5 people authored Feb 14, 2024
1 parent 046d964 commit 292f8b4
Show file tree
Hide file tree
Showing 9 changed files with 455 additions and 29 deletions.
32 changes: 16 additions & 16 deletions config/GALE01/scratches.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -579,22 +579,22 @@ mpColl_800477E0 = OK:0x800477E0; // author:Walnut356 id:QRCuA updated:2024-01-16
func_8004D164 = OK:0x8004D164; // id:LavJZ updated:2023-03-30T19:44:57.012007Z created:2023-03-30T19:44:55.234045Z
func_8004E97C = OK:0x8004E97C; // author:ribbanya id:HMlVj updated:2022-06-29T04:10:52.731148Z created:2022-06-29T00:50:26.92094Z
func_80054ED8 = OK:0x80054ED8; // author:r-burns id:IcKS4 updated:2022-04-09T23:52:58.528765Z created:2022-04-09T21:43:36.99401Z
func_8005A6F8 = 100%:0x8005A6F8; // author:ssbmcortex id:GBQEN updated:2022-11-26T04:29:18.672914Z created:2022-11-26T03:58:14.523128Z
func_8005A728 = 54.4%:0x8005A728; // author:VetriTheRetri id:SvV3B parent:3Jxhp updated:2022-12-18T19:03:25.171744Z created:2022-12-17T21:20:35.686389Z
func_8005A728 = 52.94%:0x8005A728; // author:davidgfb id:I4F5w parent:SvV3B updated:2022-12-18T12:38:06.9951Z created:2022-12-18T12:37:52.894306Z
func_8005A728 = 36.44%:0x8005A728; // author:ssbmcortex id:3Jxhp updated:2022-12-18T18:55:40.203438Z created:2022-11-26T04:30:50.923974Z
func_8005AB54 = 100%:0x8005AB54; // author:roeming id:noL8z parent:0AL74 updated:2023-01-27T20:21:35.863508Z created:2023-01-15T22:23:19.063657Z
func_8005AB54 = 97.19%:0x8005AB54; // author:ssbmcortex id:wsXMc parent:GXI8p updated:2023-01-13T17:07:27.822002Z created:2022-12-05T23:01:55.160823Z
func_8005AB54 = 97.19%:0x8005AB54; // author:roeming id:0AL74 parent:ZXnBm updated:2023-01-26T15:21:55.333069Z created:2023-01-15T22:06:38.295247Z
func_8005AB54 = 93.19%:0x8005AB54; // id:qS2u7 parent:noL8z updated:2023-01-26T22:36:11.844549Z created:2023-01-26T22:08:22.027649Z
func_8005AB54 = 90%:0x8005AB54; // author:ssbmcortex id:ZXnBm parent:wsXMc updated:2023-01-15T13:09:53.449065Z created:2023-01-15T12:49:55.340312Z
func_8005AB54 = 46.46%:0x8005AB54; // author:ssbmcortex id:SQYfv updated:2022-12-05T23:01:49.110357Z created:2022-11-28T14:19:26.009405Z
func_8005AB54 = 46.46%:0x8005AB54; // author:ssbmcortex id:GXI8p parent:SQYfv updated:2022-12-05T23:01:53.072156Z created:2022-12-05T23:01:52.930934Z
func_8005AC14 = 100%:0x8005AC14; // author:ssbmcortex id:8ofPQ updated:2023-01-27T23:02:50.05282Z created:2023-01-27T22:02:28.652536Z
func_8005AC8C = 100%:0x8005AC8C; // id:p5dgh parent:52CHk updated:2023-01-30T21:06:33.671596Z created:2023-01-30T20:55:19.506976Z
func_8005AC8C = 81.96%:0x8005AC8C; // author:ssbmcortex id:52CHk updated:2023-01-30T20:52:03.63059Z created:2023-01-27T23:03:08.172048Z
func_8005ACE8 = 99.35%:0x8005ACE8; // id:QxHkk parent:cXB25 updated:2023-02-09T12:08:50.849266Z created:2023-02-09T12:07:51.04481Z
func_8005ACE8 = 85.26%:0x8005ACE8; // author:ssbmcortex id:cXB25 updated:2023-02-09T05:00:09.210693Z created:2023-02-01T17:13:16.864626Z
func_8005A6F8 = OK:0x8005A6F8; // author:ssbmcortex id:GBQEN updated:2022-11-26T04:29:18.672914Z created:2022-11-26T03:58:14.523128Z
func_8005A728 = OK:0x8005A728; // author:davidgfb id:I4F5w parent:SvV3B updated:2022-12-18T12:38:06.9951Z created:2022-12-18T12:37:52.894306Z
func_8005A728 = OK:0x8005A728; // author:ssbmcortex id:3Jxhp updated:2022-12-18T18:55:40.203438Z created:2022-11-26T04:30:50.923974Z
func_8005A728 = OK:0x8005A728; // author:VetriTheRetri id:SvV3B parent:3Jxhp updated:2022-12-18T19:03:25.171744Z created:2022-12-17T21:20:35.686389Z
func_8005AB54 = OK:0x8005AB54; // author:ssbmcortex id:SQYfv updated:2022-12-05T23:01:49.110357Z created:2022-11-28T14:19:26.009405Z
func_8005AB54 = OK:0x8005AB54; // author:ssbmcortex id:GXI8p parent:SQYfv updated:2022-12-05T23:01:53.072156Z created:2022-12-05T23:01:52.930934Z
func_8005AB54 = OK:0x8005AB54; // author:ssbmcortex id:wsXMc parent:GXI8p updated:2023-01-13T17:07:27.822002Z created:2022-12-05T23:01:55.160823Z
func_8005AB54 = OK:0x8005AB54; // author:ssbmcortex id:ZXnBm parent:wsXMc updated:2023-01-15T13:09:53.449065Z created:2023-01-15T12:49:55.340312Z
func_8005AB54 = OK:0x8005AB54; // author:roeming id:0AL74 parent:ZXnBm updated:2023-01-26T15:21:55.333069Z created:2023-01-15T22:06:38.295247Z
func_8005AB54 = OK:0x8005AB54; // id:qS2u7 parent:noL8z updated:2023-01-26T22:36:11.844549Z created:2023-01-26T22:08:22.027649Z
func_8005AB54 = OK:0x8005AB54; // author:roeming id:noL8z parent:0AL74 updated:2023-01-27T20:21:35.863508Z created:2023-01-15T22:23:19.063657Z
func_8005AC14 = OK:0x8005AC14; // author:ssbmcortex id:8ofPQ updated:2023-01-27T23:02:50.05282Z created:2023-01-27T22:02:28.652536Z
func_8005AC8C = OK:0x8005AC8C; // author:ssbmcortex id:52CHk updated:2023-01-30T20:52:03.63059Z created:2023-01-27T23:03:08.172048Z
func_8005AC8C = OK:0x8005AC8C; // id:p5dgh parent:52CHk updated:2023-01-30T21:06:33.671596Z created:2023-01-30T20:55:19.506976Z
func_8005ACE8 = OK:0x8005ACE8; // author:ssbmcortex id:cXB25 updated:2023-02-09T05:00:09.210693Z created:2023-02-01T17:13:16.864626Z
func_8005ACE8 = OK:0x8005ACE8; // id:QxHkk parent:cXB25 updated:2023-02-09T12:08:50.849266Z created:2023-02-09T12:07:51.04481Z
efLib_8005CC2C = 100%:0x8005CC2C; // author:RevoSucks id:5etom updated:2023-12-17T22:09:48.448833Z created:2023-12-17T22:02:34.883806Z
func_8005FCD8 = 66.77%:0x8005FCD8; // author:ribbanya id:C3oLq parent:mPRxu updated:2022-12-06T04:44:16.194032Z created:2022-12-06T04:35:16.653878Z
Fighter_800679B0 = 100%:0x800679B0; // author:RevoSucks id:vHQNe updated:2022-12-24T23:49:02.60415Z created:2022-12-24T23:47:30.524476Z
Expand Down
3 changes: 3 additions & 0 deletions src/Runtime/platform.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ typedef unsigned long u32;
/// An unsigned 64-bit integer
typedef unsigned long long u64;

/// An unsigned short integer of platform-dependent size
typedef unsigned short ushort;

/// An unsigned integer of platform-dependent size
typedef unsigned int uint;

Expand Down
1 change: 1 addition & 0 deletions src/melee/lb/lb_00B0.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "sc/forward.h"
#include <baselib/forward.h>

#include <placeholder.h>
#include <dolphin/mtx/types.h>
#include <baselib/jobj.h>
#include <baselib/texp.h>
Expand Down
9 changes: 9 additions & 0 deletions src/melee/mp/forward.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@
#include <platform.h>
#include "ft/forward.h"

typedef struct mp_UnkStruct0 mp_UnkStruct0;
typedef struct mp_UnkStruct1 mp_UnkStruct1;
typedef struct mp_UnkStruct2 mp_UnkStruct2;
typedef struct mp_UnkStruct3 mp_UnkStruct3;
typedef struct mp_UnkStruct4 mp_UnkStruct4;
typedef struct mp_UnkStruct5 mp_UnkStruct5;
typedef struct mp_UnkStruct6 mp_UnkStruct6;
typedef struct mpisland mpisland;

typedef void (*mpLib_Callback)(s32, s32, CollData*, s32, s32, f32);
typedef bool (*mpColl_Callback)(CollData*, u32);

Expand Down
4 changes: 2 additions & 2 deletions src/melee/mp/mpcoll.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1042,8 +1042,8 @@ void mpColl_80043C6C(CollData* arg0, s32 arg1, s32 arg2)
temp_f2);
sp8 = 0;
if (mpLib_8004F008(&arg0->x140, 0, 0, 0, arg0->x3C, arg0->x48,
arg0->x4C, 0, temp_f1_3, temp_f2, sp20, sp24,
0.0f) != 0)
arg0->x4C, 0, temp_f1_3, temp_f2, sp20, sp24, 0.0f,
/* TODO */ 0) != 0)
{
sp20 = arg0->x140.x;
if (arg2 != 0) {
Expand Down
Loading

0 comments on commit 292f8b4

Please sign in to comment.