pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-18 23:42:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Match phys_peach_update (#638)

Browse Source
This commit is contained in:
JoshDuMan 2022-02-02 12:19:52 -05:00 committed by GitHub
parent e1766601f8
commit 9394e1ee21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 45 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -798,6 +798,7 @@ void func_80268770(s32, s32, s32);
void func_80268C9C(void);
void func_802B6CF0_E2B3A0(void);
void func_80269160(void);
void func_800E24F8(void);
void load_tattle_flags(s32);
void remove_consumable(void);
void delete_shadow(s32);
@ -814,6 +815,9 @@ void draw_encounters_neutral(void);
void show_first_strike_message(void);
void entity_upgrade_block_hide_content(s32);
s32 lookup_defense(s32*, s32);
void peach_check_for_parasol_input(void);
void peach_sync_disguise_npc(void);
s32 check_conversation_trigger(void);
void clear_player_status(void);
void clear_entity_models(void);

2
src/1a1f0_len_5390.c
View File

@ -674,7 +674,7 @@ void update_encounters_conversation(void) {
void draw_encounters_conversation(void) {
}
s8 check_conversation_trigger(void) {
s32 check_conversation_trigger(void) {
PlayerStatus* playerStatus = &gPlayerStatus;
Camera* camera = &gCameras[gCurrentCameraID];
EncounterStatus* encounterStatus = &gCurrentEncounter;

42
src/7E9D0.c
View File

@ -5,7 +5,7 @@
#include "world/actions.h"
#include "npc.h"
extern s32 D_8010C924;
extern void* D_8010C924;
extern s32 D_8010C964;
extern s32 gSpinHistoryBufferPos;
extern s16 D_8010C9B0;
@ -61,12 +61,48 @@ void phys_reset_spin_history(void) {
}
D_8010C964 = 0;
D_8010C924 = 0;
D_8010C924 = NULL;
}
INCLUDE_ASM(s32, "7bb60_len_41b0", phys_update_action_state);
INCLUDE_ASM(s32, "7bb60_len_41b0", phys_peach_update);
void phys_peach_update(void) {
PlayerStatus* playerStatus = &gPlayerStatus;
Action* action;
func_800E24F8();
do {
if (!(playerStatus->flags & PLAYER_STATUS_FLAGS_20) && check_conversation_trigger()) {
set_action_state(ACTION_STATE_TALK);
}
if (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED) {
action = &D_800F7C8C[playerStatus->actionState];
if (action->flag) {
if (action->dmaStart != NULL && action->dmaStart != D_8010C924) {
D_8010C924 = action->dmaStart;
// TODO: This needs to be a defined linker define for full shiftability
dma_copy(D_8010C924, D_800F7C8C[playerStatus->actionState].dmaEnd, (void* )0x802B6000);
}
if (D_800F7C8C[playerStatus->actionState].flag) {
D_800F7C8C[playerStatus->actionState].update();
}
}
} else {
if (D_800F7C8C[playerStatus->actionState].flag) {
D_800F7C8C[playerStatus->actionState].update();
}
}
} while (playerStatus->flags & PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED);
peach_check_for_parasol_input();
if (playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_IN_DISGUISE) {
peach_sync_disguise_npc();
}
}
void set_action_state(s32 actionState) {
PlayerStatus* playerStatus = &gPlayerStatus;

2
src/bss2.c
View File

@ -9,7 +9,7 @@
#endif
BSS s32 D_8010C920;
BSS s32 D_8010C924;
BSS void* D_8010C924;
BSS s32 D_8010C928;
BSS s32 D_8010C92C;
BSS s32 wPartnerNpc;

84
ver/us/asm/nonmatchings/7bb60_len_41b0/phys_peach_update.s
View File

@ -1,84 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel phys_peach_update
/* 7F128 800E5C78 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 7F12C 800E5C7C AFB00010 */ sw $s0, 0x10($sp)
/* 7F130 800E5C80 3C108011 */ lui $s0, %hi(gPlayerStatus)
/* 7F134 800E5C84 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus)
/* 7F138 800E5C88 AFBF0020 */ sw $ra, 0x20($sp)
/* 7F13C 800E5C8C AFB3001C */ sw $s3, 0x1c($sp)
/* 7F140 800E5C90 AFB20018 */ sw $s2, 0x18($sp)
/* 7F144 800E5C94 0C03893E */ jal func_800E24F8
/* 7F148 800E5C98 AFB10014 */ sw $s1, 0x14($sp)
/* 7F14C 800E5C9C 3C138000 */ lui $s3, 0x8000
/* 7F150 800E5CA0 3C11800F */ lui $s1, %hi(D_800F7C8C)
/* 7F154 800E5CA4 26317C8C */ addiu $s1, $s1, %lo(D_800F7C8C)
/* 7F158 800E5CA8 3C128011 */ lui $s2, %hi(D_8010C924)
/* 7F15C 800E5CAC 2652C924 */ addiu $s2, $s2, %lo(D_8010C924)
.L800E5CB0:
/* 7F160 800E5CB0 8E020000 */ lw $v0, ($s0)
/* 7F164 800E5CB4 30420020 */ andi $v0, $v0, 0x20
/* 7F168 800E5CB8 14400007 */ bnez $v0, .L800E5CD8
/* 7F16C 800E5CBC 00000000 */ nop
/* 7F170 800E5CC0 0C010C77 */ jal check_conversation_trigger
/* 7F174 800E5CC4 00000000 */ nop
/* 7F178 800E5CC8 10400003 */ beqz $v0, .L800E5CD8
/* 7F17C 800E5CCC 00000000 */ nop
/* 7F180 800E5CD0 0C039769 */ jal set_action_state
/* 7F184 800E5CD4 2404000C */ addiu $a0, $zero, 0xc
.L800E5CD8:
/* 7F188 800E5CD8 8E020000 */ lw $v0, ($s0)
/* 7F18C 800E5CDC 00531024 */ and $v0, $v0, $s3
/* 7F190 800E5CE0 10400014 */ beqz $v0, .L800E5D34
/* 7F194 800E5CE4 00000000 */ nop
/* 7F198 800E5CE8 820200B4 */ lb $v0, 0xb4($s0)
/* 7F19C 800E5CEC 00021100 */ sll $v0, $v0, 4
/* 7F1A0 800E5CF0 00512021 */ addu $a0, $v0, $s1
/* 7F1A4 800E5CF4 8082000C */ lb $v0, 0xc($a0)
/* 7F1A8 800E5CF8 10400017 */ beqz $v0, .L800E5D58
/* 7F1AC 800E5CFC 00000000 */ nop
/* 7F1B0 800E5D00 8C840004 */ lw $a0, 4($a0)
/* 7F1B4 800E5D04 1080000B */ beqz $a0, .L800E5D34
/* 7F1B8 800E5D08 00000000 */ nop
/* 7F1BC 800E5D0C 8E420000 */ lw $v0, ($s2)
/* 7F1C0 800E5D10 10820008 */ beq $a0, $v0, .L800E5D34
/* 7F1C4 800E5D14 3C06802B */ lui $a2, 0x802b
/* 7F1C8 800E5D18 820200B4 */ lb $v0, 0xb4($s0)
/* 7F1CC 800E5D1C 00021100 */ sll $v0, $v0, 4
/* 7F1D0 800E5D20 00511021 */ addu $v0, $v0, $s1
/* 7F1D4 800E5D24 8C450008 */ lw $a1, 8($v0)
/* 7F1D8 800E5D28 34C66000 */ ori $a2, $a2, 0x6000
/* 7F1DC 800E5D2C 0C00A5CF */ jal dma_copy
/* 7F1E0 800E5D30 AE440000 */ sw $a0, ($s2)
.L800E5D34:
/* 7F1E4 800E5D34 820200B4 */ lb $v0, 0xb4($s0)
/* 7F1E8 800E5D38 00021100 */ sll $v0, $v0, 4
/* 7F1EC 800E5D3C 00511821 */ addu $v1, $v0, $s1
/* 7F1F0 800E5D40 8062000C */ lb $v0, 0xc($v1)
/* 7F1F4 800E5D44 10400004 */ beqz $v0, .L800E5D58
/* 7F1F8 800E5D48 00000000 */ nop
/* 7F1FC 800E5D4C 8C620000 */ lw $v0, ($v1)
/* 7F200 800E5D50 0040F809 */ jalr $v0
/* 7F204 800E5D54 00000000 */ nop
.L800E5D58:
/* 7F208 800E5D58 8E020000 */ lw $v0, ($s0)
/* 7F20C 800E5D5C 00531024 */ and $v0, $v0, $s3
/* 7F210 800E5D60 1440FFD3 */ bnez $v0, .L800E5CB0
/* 7F214 800E5D64 00000000 */ nop
/* 7F218 800E5D68 0C03990A */ jal peach_check_for_parasol_input
/* 7F21C 800E5D6C 00000000 */ nop
/* 7F220 800E5D70 8E020004 */ lw $v0, 4($s0)
/* 7F224 800E5D74 30422000 */ andi $v0, $v0, 0x2000
/* 7F228 800E5D78 10400003 */ beqz $v0, .L800E5D88
/* 7F22C 800E5D7C 00000000 */ nop
/* 7F230 800E5D80 0C039940 */ jal peach_sync_disguise_npc
/* 7F234 800E5D84 00000000 */ nop
.L800E5D88:
/* 7F238 800E5D88 8FBF0020 */ lw $ra, 0x20($sp)
/* 7F23C 800E5D8C 8FB3001C */ lw $s3, 0x1c($sp)
/* 7F240 800E5D90 8FB20018 */ lw $s2, 0x18($sp)
/* 7F244 800E5D94 8FB10014 */ lw $s1, 0x14($sp)
/* 7F248 800E5D98 8FB00010 */ lw $s0, 0x10($sp)
/* 7F24C 800E5D9C 03E00008 */ jr $ra
/* 7F250 800E5DA0 27BD0028 */ addiu $sp, $sp, 0x28