pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean up wPartners

Browse Source
This commit is contained in:
Alex Bates 2021-02-09 16:49:45 +00:00
parent 0075864560
commit 62e04bccc4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/world/partner/goombario.c
View File

@ -61,7 +61,7 @@ ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall) {
// Something is up with D_8010EBB0 I think. It might be a struct or something // Something is up with D_8010EBB0 I think. It might be a struct or something
#ifdef NON_MATCHING #ifdef NON_MATCHING
void world_goombario_pre_battle(s32 arg0) { void world_goombario_pre_battle(Npc* partner) {
if (D_8010EBB0[0] != 0) { if (D_8010EBB0[0] != 0) {
func_80027088(0); func_80027088(0);
enable_player_input(); enable_player_input();
@ -74,7 +74,7 @@ void world_goombario_pre_battle(s32 arg0) {
D_8010EBB0[3] = 1; D_8010EBB0[3] = 1;
} }
#else #else
INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, s32 arg0); INCLUDE_ASM(void, "world/partner/goombario", world_goombario_pre_battle, Npc* partner);
#endif #endif
s32 D_802BDC40_317B60[] = { s32 D_802BDC40_317B60[] = {

2
src/world/partner/goombario.h
View File

@ -7,7 +7,7 @@
void world_goombario_init(Npc* partner); void world_goombario_init(Npc* partner);
s32 world_goombario_can_pause(Npc* partner); s32 world_goombario_can_pause(Npc* partner);
ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall); ApiStatus func_802BDB84(ScriptInstance* script, s32 isInitialCall);
void world_goombario_pre_battle(s32 arg0); void world_goombario_pre_battle(Npc* partner);
Script world_goombario_take_out; Script world_goombario_take_out;
Script world_goombario_update; Script world_goombario_update;

2
src/world/partners.c
View File

@ -64,7 +64,7 @@ f32 D_800F8030 = 0.0f;
s8 D_800F8034[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; s8 D_800F8034[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
s16 D_800F803A = 0; s16 D_800F803A = 0;
WorldPartner wPartners[] = { WorldPartner wPartners[12] = {
{}, // None {}, // None
{ {
// Goombario // Goombario

2
src/world/partners.h
View File

@ -25,7 +25,7 @@ typedef struct WorldPartner {
/// Set to 0 when partner NPC loaded /// Set to 0 when partner NPC loaded
extern s32 D_8010C954; extern s32 D_8010C954;
extern s32 D_8010CFD8; extern s32 D_8010CFD8;
WorldPartner wPartners[0x11]; // wPartners WorldPartner wPartners[12]; // wPartners
extern WorldPartner* D_8010CFEC; // wPartner extern WorldPartner* D_8010CFEC; // wPartner
extern NpcId D_8010CFD0; // wPartnerNpcIndex extern NpcId D_8010CFD0; // wPartnerNpcIndex
extern Npc* D_8010C930; // wPartnerNpc extern Npc* D_8010C930; // wPartnerNpc