pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 08:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

match load_partner_npc

Browse Source
This commit is contained in:
Alex Bates 2021-02-09 15:03:21 +00:00
parent 78c2615e58
commit 7d34a06136
4 changed files with 55 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
asm/nonmatchings/code_838b0_len_5900/load_partner_npc.s generated
View File

@ -1,58 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel load_partner_npc
/* 83A80 800EA5D0 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 83A84 800EA5D4 3C028011 */ lui $v0, %hi(D_8010CFD8)
/* 83A88 800EA5D8 8C42CFD8 */ lw $v0, %lo(D_8010CFD8)($v0)
/* 83A8C 800EA5DC 3C038010 */ lui $v1, %hi(D_800F803C)
/* 83A90 800EA5E0 2463803C */ addiu $v1, $v1, %lo(D_800F803C)
/* 83A94 800EA5E4 AFBF0024 */ sw $ra, 0x24($sp)
/* 83A98 800EA5E8 AFB00020 */ sw $s0, 0x20($sp)
/* 83A9C 800EA5EC 00021180 */ sll $v0, $v0, 6
/* 83AA0 800EA5F0 00431021 */ addu $v0, $v0, $v1
/* 83AA4 800EA5F4 8C440000 */ lw $a0, ($v0)
/* 83AA8 800EA5F8 8C450004 */ lw $a1, 4($v0)
/* 83AAC 800EA5FC 8C460008 */ lw $a2, 8($v0)
/* 83AB0 800EA600 3C108011 */ lui $s0, %hi(D_8010CFEC)
/* 83AB4 800EA604 2610CFEC */ addiu $s0, $s0, %lo(D_8010CFEC)
/* 83AB8 800EA608 0C00A5CF */ jal dma_copy
/* 83ABC 800EA60C AE020000 */ sw $v0, ($s0)
/* 83AC0 800EA610 3C020400 */ lui $v0, 0x400
/* 83AC4 800EA614 34420100 */ ori $v0, $v0, 0x100
/* 83AC8 800EA618 AFA20010 */ sw $v0, 0x10($sp)
/* 83ACC 800EA61C 8E020000 */ lw $v0, ($s0)
/* 83AD0 800EA620 8C420024 */ lw $v0, 0x24($v0)
/* 83AD4 800EA624 27A40010 */ addiu $a0, $sp, 0x10
/* 83AD8 800EA628 AFA00018 */ sw $zero, 0x18($sp)
/* 83ADC 800EA62C AFA0001C */ sw $zero, 0x1c($sp)
/* 83AE0 800EA630 0C00E211 */ jal create_basic_npc
/* 83AE4 800EA634 AFA20014 */ sw $v0, 0x14($sp)
/* 83AE8 800EA638 0040202D */ daddu $a0, $v0, $zero
/* 83AEC 800EA63C 3C018011 */ lui $at, %hi(D_8010CFD0)
/* 83AF0 800EA640 AC24CFD0 */ sw $a0, %lo(D_8010CFD0)($at)
/* 83AF4 800EA644 0C00E2B7 */ jal get_npc_by_index
/* 83AF8 800EA648 00000000 */ nop
/* 83AFC 800EA64C 3C048011 */ lui $a0, %hi(D_8010C930)
/* 83B00 800EA650 2484C930 */ addiu $a0, $a0, %lo(D_8010C930)
/* 83B04 800EA654 2403FFFC */ addiu $v1, $zero, -4
/* 83B08 800EA658 AC820000 */ sw $v0, ($a0)
/* 83B0C 800EA65C A04300A4 */ sb $v1, 0xa4($v0)
/* 83B10 800EA660 8C840000 */ lw $a0, ($a0)
/* 83B14 800EA664 3C01C47A */ lui $at, 0xc47a
/* 83B18 800EA668 44810000 */ mtc1 $at, $f0
/* 83B1C 800EA66C 2403000A */ addiu $v1, $zero, 0xa
/* 83B20 800EA670 A44300A6 */ sh $v1, 0xa6($v0)
/* 83B24 800EA674 A44300A8 */ sh $v1, 0xa8($v0)
/* 83B28 800EA678 AC800038 */ sw $zero, 0x38($a0)
/* 83B2C 800EA67C E480003C */ swc1 $f0, 0x3c($a0)
/* 83B30 800EA680 AC800040 */ sw $zero, 0x40($a0)
/* 83B34 800EA684 AC800054 */ sw $zero, 0x54($a0)
/* 83B38 800EA688 AC800058 */ sw $zero, 0x58($a0)
/* 83B3C 800EA68C AC80005C */ sw $zero, 0x5c($a0)
/* 83B40 800EA690 8FBF0024 */ lw $ra, 0x24($sp)
/* 83B44 800EA694 8FB00020 */ lw $s0, 0x20($sp)
/* 83B48 800EA698 3C018011 */ lui $at, %hi(D_8010C954)
/* 83B4C 800EA69C AC20C954 */ sw $zero, %lo(D_8010C954)($at)
/* 83B50 800EA6A0 03E00008 */ jr $ra
/* 83B54 800EA6A4 27BD0028 */ addiu $sp, $sp, 0x28

6
include/enums.h
View File

@ -1010,9 +1010,9 @@ typedef s8 ActionState;
#define ActionState_USE_SPRING 0x00000026
typedef s32 NpcId;
#define NpcId_SELF 0xFFFFFFFF
#define NpcId_PLAYER 0xFFFFFFFE
#define NpcId_PARTNER 0xFFFFFFFC
#define NpcId_SELF -1
#define NpcId_PLAYER -2
#define NpcId_PARTNER -4
typedef UNK_TYPE TriggerFlag;
#define TriggerFlag_FLOOR_TOUCH 0x00000080

45
src/code_838b0_len_5900.c
View File

@ -1,4 +1,8 @@
#include "common.h"
#include "map.h"
#include "world/partners.h"
NpcId create_basic_npc(NpcBlueprint* blueprint);
INCLUDE_ASM(s32, "code_838b0_len_5900", use_consumable);
@ -23,7 +27,46 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", is_current_partner_flying, void);
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA5B8);
INCLUDE_ASM(s32, "code_838b0_len_5900", load_partner_npc);
void load_partner_npc(void) {
WorldPartner* partnerEntry = &D_800F803C[D_8010CFD8];
Npc** partnerNpcPtr = &D_8010C930;
WorldPartner** partner = &D_8010CFEC;
NpcId npcIndex;
NpcBlueprint blueprint;
NpcBlueprint* blueprintPtr;
*partner = partnerEntry;
blueprintPtr = &blueprint;
dma_copy(partnerEntry->dmaStart, partnerEntry->dmaEnd, partnerEntry->dmaDest);
blueprint.flags = 0x4000100;
blueprint.initialAnim = (*partner)->idle;
blueprint.onUpdate = NULL;
blueprint.onRender = NULL;
D_8010CFD0 = npcIndex = create_basic_npc(blueprintPtr);
*partnerNpcPtr = get_npc_by_index(npcIndex);
{
Npc* npc = *partnerNpcPtr;
npc->npcID = NpcId_PARTNER;
npc->collisionRadius = 10;
npc->collisionHeight = 10;
}
{
Npc* npc = *partnerNpcPtr;
npc->pos.x = 0.0f;
npc->pos.y = -1000.0f;
npc->pos.z = 0.0f;
npc->scale.x = 0.0f;
npc->scale.y = 0.0f;
npc->scale.z = 0.0f;
}
D_8010C954 = 0;
}
INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6A8);

8
src/world/partners.h
View File

@ -24,4 +24,12 @@ typedef struct WorldPartner {
WorldPartner gWorldPartners[11];
/// Set to 0 when partner NPC loaded
extern s32 D_8010C954;
extern s32 D_8010CFD8; // gPartnerID
extern WorldPartner D_800F803C[0x11]; // wPartners
extern WorldPartner* D_8010CFEC; // wPartner
extern NpcId D_8010CFD0; // wPartnerNpcIndex
extern Npc* D_8010C930; // wPartnerNpc
#endif