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

correct the prototype of CreateObject

Browse Source
This commit is contained in:
Zhengwen Jiang 2021-05-29 15:05:22 -05:00 committed by Cleverking2003
parent 3968ac971f
commit 4c38a3d217
37 changed files with 62 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/big_waddle_dee.h
View File

@ -3,7 +3,7 @@
#include "data.h"
struct Object2* CreateBigWaddleDee(struct Object* arg0, u8 arg1);
void* CreateBigWaddleDee(struct Object* arg0, u8 arg1);
void sub_080A4B68(struct Object2* arg0);
void BigWaddleDeeChooseXSpeed0(struct Object2* arg0);
void BigWaddleDeeChooseXSpeed1(struct Object2* arg0);

2
include/blockin.h
View File

@ -4,7 +4,7 @@
#include "data.h"
#include "object.h"
struct Object2* CreateBlockin(struct Object* arg0, u8 arg1);
void* CreateBlockin(struct Object* arg0, u8 arg1);
void sub_080A4728(struct Object2* arg0);
void sub_080A47C8(struct Object2* arg0);
void sub_080A4840(struct Object2* arg0);

2
include/bomber.h
View File

@ -5,6 +5,6 @@
#include "global.h"
#include "object.h"
struct Object2* CreateBomber(struct Object*, u8);
void* CreateBomber(struct Object*, u8);
#endif

2
include/bonus.h
View File

@ -6,7 +6,7 @@
#include "functions.h"
#include "task.h"
struct Object2* CreateBonus(struct Object* arg0, u8 arg1);
void* CreateBonus(struct Object* arg0, u8 arg1);
void sub_08122CEC(struct Object2* arg0);
void sub_08122E08(struct Object2* arg0);
void sub_08122ED4(struct Object2* arg0);

2
include/bronto_burt.h
View File

@ -3,7 +3,7 @@
#include "data.h"
struct Object2* CreateBrontoBurt(struct Object* arg0, u8 arg1);
void* CreateBrontoBurt(struct Object* arg0, u8 arg1);
void sub_080AD7C0(struct Object2* obj);
void sub_080AD870(struct Object2* obj);
void sub_080AD8AC(struct Object2* obj);

2
include/code_0800A868.h
View File

@ -4,7 +4,7 @@
#include "global.h"
#include "data.h"
extern struct Object2 *CreateObject(u8 playerId, struct Object *obj);
extern void *CreateObject(u8 playerId, struct Object *obj);
extern void sub_0800A8BC(void);
extern void sub_0800A8C8(u8 arg0, u8 arg1, u8 arg2);
extern void sub_0800A8F8(u8 arg0, u8 arg1, u8 arg2);

4
include/cupie.h
View File

@ -5,7 +5,7 @@
#include "data.h"
#include "object.h"
struct Object2* CreateCupie(struct Object*, u8);
struct Object2* CreateCupieArrow(struct Object*, u8);
void* CreateCupie(struct Object*, u8);
void* CreateCupieArrow(struct Object*, u8);
#endif

20
include/dark_mind.h
View File

@ -4,7 +4,7 @@
#include "global.h"
#include "object.h"
struct DarkMind
struct DarkMind // struct DarkMindForm1?
{
struct Object2 unk0;
struct Object2 *unkB4;
@ -41,7 +41,19 @@ struct Object9
s16 unk68[4][2];
}; /* size = 0x78 */
struct Object10 // struct DarkMindMirrors?
struct Object12 // sub_0810F320, form 2 mirror?
{
struct Object2 unk0;
struct Sprite unkB4;
u32 unkDC;
u8 unkE0;
u8 unkE1;
u8 unkE2;
u8 unkE3;
s16 unkE4;
}; /* size = 0xE8 */
struct Object10 // struct DarkMindForm2?
{
struct Object2 unk0;
struct Sprite unkB4;
@ -49,8 +61,8 @@ struct Object10 // struct DarkMindMirrors?
const u8 *unkE0;
struct Object11 unkE4;
struct Object11 unkF0;
u32 unkFC;
u32 unk100;
struct Object12 *unkFC;
struct Object12 *unk100;
u32 unk104;
u32 unk108;
u32 unk10C;

4
include/data.h
View File

@ -453,8 +453,8 @@ extern const struct Unk_082D7850* gUnk_082D7850[];
extern const u32 gUnk_082D88B8[];
extern const u16 gUnk_082DE69C[];
extern struct Object2 *(*const gSpawnFuncTable2[])(struct Object *, u8);
extern struct Object2 *(*const gSpawnFuncTable1[])(struct Object *, u8);
extern void *(*const gSpawnFuncTable2[])(struct Object *, u8);
extern void *(*const gSpawnFuncTable1[])(struct Object *, u8);
extern const u8 gUnk_08350BB0[][2];
extern const u8 gUnk_08350BCC[][2];

2
include/destroyable_rock_block.h
View File

@ -11,6 +11,6 @@ struct RockBlock {
u16 unkB6;
}; /* size = 0xB8 */
struct RockBlock* CreateDestroyableRockBlock(struct Object* arg0, u8 arg1);
void* CreateDestroyableRockBlock(struct Object* arg0, u8 arg1);
#endif

2
include/giant_rocky.h
View File

@ -5,6 +5,6 @@
#include "data.h"
#include "object.h"
struct Object2 *CreateGiantRocky(struct Object *, u8);
void *CreateGiantRocky(struct Object *, u8);
#endif

2
include/gordo.h
View File

@ -4,7 +4,7 @@
#include "data.h"
#include "functions.h"
struct Object2* CreateGordo(struct Object* arg0, u8 arg1);
void* CreateGordo(struct Object* arg0, u8 arg1);
void GordoSlowDownX(struct Object2* arg0);
void GordoSetYSpeed(struct Object2* arg0);
void GordoSetXYSpeed(struct Object2* arg0);

2
include/laser_ball.h
View File

@ -16,7 +16,7 @@ struct Laser {
u16 unk8A;
};
struct Object2* CreateLaserBall(struct Object* arg0, u8 arg1);
void* CreateLaserBall(struct Object* arg0, u8 arg1);
void sub_080B2330(struct Object2* arg0);
void sub_080B2710(struct Object2* arg0);
void sub_080B2780(struct Object2* arg0);

2
include/minny.h
View File

@ -4,7 +4,7 @@
#include "data.h"
#include "object.h"
struct Object2* CreateMinny(struct Object* arg0, u8 arg1);
void* CreateMinny(struct Object* arg0, u8 arg1);
void MinnySetDirection(struct Object2* arg0);
void MinnyInitSpeed(struct Object2* arg0);
void MinnyCalcSpeed(struct Object2* arg0);

2
include/mirra.h
View File

@ -5,6 +5,6 @@
#include "global.h"
#include "object.h"
struct Object2* CreateMirra(struct Object*, u8);
void* CreateMirra(struct Object*, u8);
#endif

2
include/object.h
View File

@ -101,7 +101,7 @@ void ObjectDestroy(struct Task *);
void InitObject(struct Object2 *, struct Object *, u8);
void ObjectInitSprite(struct Object2 *);
void ObjectSetFunc(struct Object2 *, s16, void (*func)(struct Object2 *));
struct Object2 *CreateEmpty(struct Object *, u8);
void *CreateEmpty(struct Object *, u8);
void sub_0809B1E4(struct Object2 *);
void sub_0809C6D0(struct Object2 *);
void sub_0809CFC4(struct Object2 *);

2
include/scarfy.h
View File

@ -4,7 +4,7 @@
#include "data.h"
#include "object.h"
struct Object2* CreateScarfy(struct Object* arg0, u8 arg1);
void* CreateScarfy(struct Object* arg0, u8 arg1);
void sub_080A75C4(struct Object2* arg0);
void sub_080A78E4(struct Object2* arg0);
void sub_080A7A88(struct Object2* arg0);

2
include/sparky.h
View File

@ -5,7 +5,7 @@
#include "global.h"
#include "object.h"
struct Object2* CreateSparky(struct Object* arg0, u8 arg1);
void* CreateSparky(struct Object* arg0, u8 arg1);
void sub_080C41B8(struct Object2* arg0);
void sub_080C4248(struct Object2* arg0);
void sub_080C4300(struct Object2* arg0);

2
include/waddle_dee.h
View File

@ -4,7 +4,7 @@
#include "data.h"
#include "functions.h"
struct Object2* CreateWaddleDee(struct Object* arg0, u8 arg1);
void* CreateWaddleDee(struct Object* arg0, u8 arg1);
void sub_080A3CF0(struct Object2* arg0);
void sub_080A3D8C(struct Object2* arg0);
void WaddleDeeChooseXSpeed0(struct Object2* arg0);

2
src/big_waddle_dee.c
View File

@ -3,7 +3,7 @@
#include "object.h"
#include "task.h"
struct Object2* CreateBigWaddleDee(struct Object* arg0, u8 arg1) {
void* CreateBigWaddleDee(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Kirby *kirby;
struct Task *task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);

2
src/blockin.c
View File

@ -1,7 +1,7 @@
#include "blockin.h"
#include "functions.h"
struct Object2* CreateBlockin(struct Object* arg0, u8 arg1) {
void* CreateBlockin(struct Object* arg0, u8 arg1) {
struct Task *task;
struct Object2 *obj;
task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);

2
src/bomber.c
View File

@ -10,7 +10,7 @@ static void sub_080C4900(struct Object2*);
static void sub_080C4928(struct Object2*);
static void sub_080C4968(struct Object2*);
struct Object2* CreateBomber(struct Object* arg0, u8 arg1) {
void* CreateBomber(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Task *task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
obj = TaskGetStructPtr(task, obj2);

2
src/bonus.c
View File

@ -5,7 +5,7 @@
#include "object.h"
#include "main.h"
struct Object2* CreateBonus(struct Object* arg0, u8 arg1) {
void* CreateBonus(struct Object* arg0, u8 arg1) {
struct Task* task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x2f9c, 0x10, ObjectDestroy);
struct Object2 *obj, *obj2;

2
src/bronto_burt.c
View File

@ -3,7 +3,7 @@
#include "object.h"
#include "task.h"
struct Object2* CreateBrontoBurt(struct Object* arg0, u8 arg1) {
void* CreateBrontoBurt(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Task *task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
obj = TaskGetStructPtr(task, obj2);

2
src/code_0800A868.c
View File

@ -5,7 +5,7 @@
// TODO: define file boundaries
struct Object2 *CreateObject(u8 playerId, struct Object *obj)
void *CreateObject(u8 playerId, struct Object *obj)
{
struct Unk_02023720 *var0;
struct Object2 *var1;

4
src/cupie.c
View File

@ -136,7 +136,7 @@ static void sub_080A3AFC(struct Object2* arg0);
static void sub_080A3B5C(struct Object2* arg0);
static void sub_080A3B94(struct Object2* arg0);
struct Object2* CreateCupie(struct Object* arg0, u8 arg1) {
void* CreateCupie(struct Object* arg0, u8 arg1) {
struct Task* task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
struct Object2 *obj2, *obj = TaskGetStructPtr(task, obj2);
InitObject(obj, arg0, arg1);
@ -665,7 +665,7 @@ static void sub_080A35C8(struct Object2* arg0) {
}
}
struct Object2* CreateCupieArrow(struct Object* arg0, u8 arg1) {
void* CreateCupieArrow(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Task *task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
obj = TaskGetStructPtr(task, obj2);

12
src/dark_mind.c
View File

@ -117,7 +117,7 @@ void sub_081142B0(struct Object10 *);
#define DarkMindSetFunc(dm, param, func) ObjectSetFunc(&(dm)->unk0, (param), (void *)(func))
struct Object2 *CreateDarkMind(struct Object *r6, u8 r4_)
void *CreateDarkMind(struct Object *r6, u8 r4_)
{
u16 r4;
struct Task *task = TaskCreate(ObjectMain, sizeof(struct DarkMind), 0x1000, 0x10, ObjectDestroy);
@ -165,7 +165,7 @@ struct Object2 *CreateDarkMind(struct Object *r6, u8 r4_)
r5->unk0.unk9E = 0;
r5->unk0.unk7C = (void *)sub_08104E04;
sub_081099D4(r5);
return &r5->unk0;
return r5;
}
void sub_081003EC(struct DarkMind *r5)
@ -3269,7 +3269,7 @@ void sub_081059A8(struct DarkMind *r5)
sp08->unkB8 = obj;
}
struct Object2 *CreateShadowKirbyBomb(struct Object *r6, u8 r5)
void *CreateShadowKirbyBomb(struct Object *r6, u8 r5)
{
struct Task *t = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
struct Object2 *r4 = TaskGetStructPtr(t, r4);
@ -3511,7 +3511,7 @@ void sub_081062B4(struct DarkMind *r2)
sub_08109EF8(r2);
}
struct Object2 *CreateDarkMindStar(struct Object *r5, u8 r4)
void *CreateDarkMindStar(struct Object *r5, u8 r4)
{
struct Task *t = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
struct Object2 *obj = TaskGetStructPtr(t, obj);
@ -3906,7 +3906,7 @@ struct Object2 *sub_08107254(struct Object2 *r3)
return r3;
}
struct Object2 *CreateDarkMindBomb(struct Object *r5, u8 r4)
void *CreateDarkMindBomb(struct Object *r5, u8 r4)
{
struct Task *t = TaskCreate(ObjectMain, sizeof(struct Object8), 0x1000, 0x10, ObjectDestroy);
struct Object8 *obj8 = TaskGetStructPtr(t, obj8);
@ -3927,7 +3927,7 @@ struct Object2 *CreateDarkMindBomb(struct Object *r5, u8 r4)
obj8->unk0.base.unk10.unk14 = 0x600;
sub_081099A4(obj8);
obj8->unk0.base.counter = 200;
return (void *)obj8;
return obj8;
}
void sub_08107408(struct Object8 *r4)

2
src/destroyable_rock_block.c
View File

@ -4,7 +4,7 @@
static void DestroyableRockBlockInit(struct RockBlock*);
static void DestroyDestroyableRockBlock(struct Task*);
struct RockBlock* CreateDestroyableRockBlock(struct Object* arg0, u8 arg1) {
void* CreateDestroyableRockBlock(struct Object* arg0, u8 arg1) {
struct Task *task;
struct RockBlock *obj, *obj2;
task = TaskCreate(ObjectMain, sizeof(struct RockBlock), 0x1000, 0, DestroyDestroyableRockBlock);

2
src/giant_rocky.c
View File

@ -16,7 +16,7 @@ static void sub_080C0514(struct Object2 *);
static void sub_080C056C(struct Object2 *);
static void sub_080C059C(struct Object2 *);
struct Object2 *CreateGiantRocky(struct Object *r5, u8 r4)
void *CreateGiantRocky(struct Object *r5, u8 r4)
{
struct Task *task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
struct Object2 *r0, *r6 = TaskGetStructPtr(task, r0);

2
src/gordo.c
View File

@ -1,7 +1,7 @@
#include "gordo.h"
#include "object.h"
struct Object2* CreateGordo(struct Object* arg0, u8 arg1) {
void* CreateGordo(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Task* task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
obj = TaskGetStructPtr(task, obj2);

2
src/laser_ball.c
View File

@ -1,7 +1,7 @@
#include "functions.h"
#include "laser_ball.h"
struct Object2* CreateLaserBall(struct Object* arg0, u8 arg1) {
void* CreateLaserBall(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Task *task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
obj = TaskGetStructPtr(task, obj2);

2
src/minny.c
View File

@ -1,7 +1,7 @@
#include "functions.h"
#include "minny.h"
struct Object2* CreateMinny(struct Object* arg0, u8 arg1) {
void* CreateMinny(struct Object* arg0, u8 arg1) {
struct Task* task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
struct Object2 *obj2, *obj = TaskGetStructPtr(task, obj2);
InitObject(obj, arg0, arg1);

2
src/mirra.c
View File

@ -6,7 +6,7 @@ static void sub_080B1174(struct Object2*);
static void sub_080B1218(struct Object2*);
static void sub_080B1254(struct Object2*);
struct Object2* CreateMirra(struct Object* arg0, u8 arg1) {
void* CreateMirra(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Task *task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x3064, 0x10, ObjectDestroy);
obj = TaskGetStructPtr(task, obj2);

6
src/object.c
View File

@ -1274,7 +1274,7 @@ static void sub_0809C994(struct Object2 *r5) {
gUnk_020229E0[r3_].unk14 = 0;
gUnk_020229E0[r3_].unk16 = 0;
gUnk_020229E0[r3_].unk18 = 0;
CreateObject(r7->base.base.unk56, &gUnk_020229E0[r3_])->base.parent = r7;
((struct Object2 *)CreateObject(r7->base.base.unk56, &gUnk_020229E0[r3_]))->base.parent = r7;
if (!r7->base.base.unk0) --r7->unkDE;
r5->base.flags |= 0x1000;
r5->base.y -= 0x800;
@ -1353,7 +1353,7 @@ static void sub_0809CE80(struct Object2 *r4) {
gUnk_020229E0[r3].unk14 = 0;
gUnk_020229E0[r3].unk16 = 0;
gUnk_020229E0[r3].unk18 = 0;
CreateObject(r4->base.unk56, &gUnk_020229E0[r3])->base.parent = r9;
((struct Object2 *)CreateObject(r4->base.unk56, &gUnk_020229E0[r3]))->base.parent = r9;
r4->base.flags |= 0x1000;
sub_0808AE30(r4, 0, 0x2B4, 0);
}
@ -2167,7 +2167,7 @@ void ObjectInitSprite(struct Object2* arg0) {
}
}
struct Object2 *CreateEmpty(struct Object *r6, u8 r7) {
void *CreateEmpty(struct Object *r6, u8 r7) {
struct Task *task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0, ObjectDestroy);
struct Object2 *r4;

2
src/scarfy.c
View File

@ -1,7 +1,7 @@
#include "scarfy.h"
#include "functions.h"
struct Object2* CreateScarfy(struct Object* arg0, u8 arg1) {
void* CreateScarfy(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Task* task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
obj = TaskGetStructPtr(task, obj2);

2
src/sparky.c
View File

@ -1,7 +1,7 @@
#include "functions.h"
#include "sparky.h"
struct Object2* CreateSparky(struct Object* arg0, u8 arg1) {
void* CreateSparky(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Task *task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);
obj = TaskGetStructPtr(task, obj2);

2
src/waddle_dee.c
View File

@ -1,7 +1,7 @@
#include "object.h"
#include "waddle_dee.h"
struct Object2* CreateWaddleDee(struct Object* arg0, u8 arg1) {
void* CreateWaddleDee(struct Object* arg0, u8 arg1) {
struct Object2 *obj, *obj2;
struct Kirby* kirby;
struct Task* task = TaskCreate(ObjectMain, sizeof(struct Object2), 0x1000, 0x10, ObjectDestroy);