falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

swap useAbility and update

This commit is contained in:
Alex Bates 2020-12-23 11:08:01 +00:00
parent 7d99274b5e
commit 43caadae41
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/world/partners.c
View File

@ -38,8 +38,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = FALSE, .isFlying = FALSE,
.init = world_goombario_init, .init = world_goombario_init,
.takeOut = world_goombario_take_out, .takeOut = world_goombario_take_out,
.useAbility = 0x802BDD8C, .update = 0x802BDD8C,
.update = 0x802BDDA8, .useAbility = 0x802BDDA8,
.putAway = 0x802BDE60, .putAway = 0x802BDE60,
.idle = NPC_ANIM(world_goombario, normal, idle), .idle = NPC_ANIM(world_goombario, normal, idle),
.canUseAbility = func_802BD5A8, .canUseAbility = func_802BD5A8,
@ -54,8 +54,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = FALSE, .isFlying = FALSE,
.init = 0x802BD200, .init = 0x802BD200,
.takeOut = 0x802BEB44, .takeOut = 0x802BEB44,
.useAbility = 0x802BEB64, .update = 0x802BEB64,
.update = 0x802BEB80, .useAbility = 0x802BEB80,
.putAway = 0x802BEB9C, .putAway = 0x802BEB9C,
.idle = NPC_ANIM(world_kooper, Palette_00, Anim_3), .idle = NPC_ANIM(world_kooper, Palette_00, Anim_3),
.testFirstStrike = 0x802BE818, .testFirstStrike = 0x802BE818,
@ -72,8 +72,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = FALSE, .isFlying = FALSE,
.init = 0x802BD2D8, .init = 0x802BD2D8,
.takeOut = 0x802BE880, .takeOut = 0x802BE880,
.useAbility = 0x802BE8A0, .update = 0x802BE8A0,
.update = 0x802BE8BC, .useAbility = 0x802BE8BC,
.putAway = 0x802BE8D8, .putAway = 0x802BE8D8,
.idle = NPC_ANIM(world_bombette, Palette_00, Anim_3), .idle = NPC_ANIM(world_bombette, Palette_00, Anim_3),
.testFirstStrike = 0x802BE520, .testFirstStrike = 0x802BE520,
@ -89,8 +89,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = TRUE, .isFlying = TRUE,
.init = 0x802BD100, .init = 0x802BD100,
.takeOut = 0x802BEA90, .takeOut = 0x802BEA90,
.useAbility = 0x802BEAB0, .update = 0x802BEAB0,
.update = 0x802BEACC, .useAbility = 0x802BEACC,
.putAway = 0x802BEAE8, .putAway = 0x802BEAE8,
.idle = NPC_ANIM(world_parakarry, Palette_00, Anim_1), .idle = NPC_ANIM(world_parakarry, Palette_00, Anim_1),
.canPlayerPause = 0x800EA514, .canPlayerPause = 0x800EA514,
@ -105,8 +105,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = FALSE, .isFlying = FALSE,
.init = 0x802BD100, .init = 0x802BD100,
.takeOut = 0x802BD570, .takeOut = 0x802BD570,
.useAbility = 0x802BD590, .update = 0x802BD590,
.update = 0x802BD5AC, .useAbility = 0x802BD5AC,
.putAway = 0x802BD5C8, .putAway = 0x802BD5C8,
.idle = NPC_ANIM(goompa, Palette_00, Anim_1), .idle = NPC_ANIM(goompa, Palette_00, Anim_1),
}, },
@ -118,8 +118,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = TRUE, .isFlying = TRUE,
.init = 0x802BD23C, .init = 0x802BD23C,
.takeOut = 0x802BE258, .takeOut = 0x802BE258,
.useAbility = 0x802BE27C, .update = 0x802BE27C,
.update = 0x802BE298, .useAbility = 0x802BE298,
.putAway = 0x802BE2B4, .putAway = 0x802BE2B4,
.idle = NPC_ANIM(world_watt, Palette_00, Anim_1), .idle = NPC_ANIM(world_watt, Palette_00, Anim_1),
.canPlayerPause = 0x800EA524, .canPlayerPause = 0x800EA524,
@ -135,8 +135,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = FALSE, .isFlying = FALSE,
.init = 0x802BF520, .init = 0x802BF520,
.takeOut = 0x802BFDDC, .takeOut = 0x802BFDDC,
.useAbility = 0x802BFDFC, .update = 0x802BFDFC,
.update = 0x802BFDC0, .useAbility = 0x802BFDC0,
.putAway = 0x802BFE18, .putAway = 0x802BFE18,
.idle = NPC_ANIM(world_sushie, Palette_00, Anim_1), .idle = NPC_ANIM(world_sushie, Palette_00, Anim_1),
.canPlayerPause = 0x800EA524, .canPlayerPause = 0x800EA524,
@ -152,8 +152,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = TRUE, .isFlying = TRUE,
.init = 0x802BD21C, .init = 0x802BD21C,
.takeOut = 0x802BFE60, .takeOut = 0x802BFE60,
.useAbility = 0x802BFE80, .update = 0x802BFE80,
.update = 0x802BFE9C, .useAbility = 0x802BFE9C,
.putAway = 0x802BFEB8, .putAway = 0x802BFEB8,
.idle = NPC_ANIM(world_lakilester, Palette_00, Anim_1), .idle = NPC_ANIM(world_lakilester, Palette_00, Anim_1),
.canPlayerPause = 0x800EA524, .canPlayerPause = 0x800EA524,
@ -169,8 +169,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = TRUE, .isFlying = TRUE,
.init = 0x802BD100, .init = 0x802BD100,
.takeOut = 0x802BDFE0, .takeOut = 0x802BDFE0,
.useAbility = 0x802BE000, .update = 0x802BE000,
.update = 0x802BE01C, .useAbility = 0x802BE01C,
.putAway = 0x802BE038, .putAway = 0x802BE038,
.idle = NPC_ANIM(world_bow, Palette_00, Anim_1), .idle = NPC_ANIM(world_bow, Palette_00, Anim_1),
.canUseAbility = 0x800EA514, .canUseAbility = 0x800EA514,
@ -185,8 +185,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = FALSE, .isFlying = FALSE,
.init = 0x802BD100, .init = 0x802BD100,
.takeOut = 0x802BD1F0, .takeOut = 0x802BD1F0,
.useAbility = 0x802BD20C, .update = 0x802BD20C,
.update = 0x802BD228, .useAbility = 0x802BD228,
.putAway = 0x802BD244, .putAway = 0x802BD244,
.idle = NPC_ANIM(goombaria, Palette_00, Anim_1), .idle = NPC_ANIM(goombaria, Palette_00, Anim_1),
.canUseAbility = 0x800EA514, .canUseAbility = 0x800EA514,
@ -200,8 +200,8 @@ WorldPartner gWorldPartners[] = {
.isFlying = TRUE, .isFlying = TRUE,
.init = 0x802BD100, .init = 0x802BD100,
.takeOut = 0x802BD1F0, .takeOut = 0x802BD1F0,
.useAbility = 0x802BD20C, .update = 0x802BD20C,
.update = 0x802BD228, .useAbility = 0x802BD228,
.putAway = 0x802BD244, .putAway = 0x802BD244,
.idle = NPC_ANIM(twink, Palette_00, Anim_1), .idle = NPC_ANIM(twink, Palette_00, Anim_1),
.canUseAbility = 0x800EA514, .canUseAbility = 0x800EA514,

4
src/world/partners.h
View File

@ -10,8 +10,8 @@ typedef struct WorldPartner {
/* 0x10 */ s32 isFlying; /* 0x10 */ s32 isFlying;
/* 0x14 */ void (*init)(Npc* partner); /* 0x14 */ void (*init)(Npc* partner);
/* 0x18 */ Bytecode* takeOut; /* 0x18 */ Bytecode* takeOut;
/* 0x1C */ Bytecode* useAbility; /* 0x1C */ Bytecode* update;
/* 0x20 */ Bytecode* update; /* 0x20 */ Bytecode* useAbility;
/* 0x24 */ Bytecode* putAway; /* 0x24 */ Bytecode* putAway;
/* 0x28 */ NpcAnimID idle; /* 0x28 */ NpcAnimID idle;
/* 0x2C */ UNK_FUN_PTR(testFirstStrike); /* 0x2C */ UNK_FUN_PTR(testFirstStrike);