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

Match check_for_interactables (#553)

Browse Source 
* Match check_for_interactables

* Delete check_for_interactables.s

* Update enums.h

* unk_C8 -> Npc*

* Update 77480.c

* Update 77480.c

* Update 77480.c

* Update 77480.c

* Update 77480.c (#7)

* Update functions.h

* Merge branch 'master' of https://github.com/pmret/papermario into arn

* Fix build.

* Update src/77480.c

Co-authored-by: Alex Bates <hi@imalex.xyz>

* Comments

Co-authored-by: Alex Bates <hi@imalex.xyz>
This commit is contained in:
JoshDuMan 2021-12-17 23:04:54 -05:00 committed by GitHub
parent 9e1d4db698
commit 2b6323a6b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 120 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common_structs.h
View File

@ -1818,7 +1818,7 @@ typedef struct PlayerStatus {
/* 0x0C4 */ char unk_C4; /* 0x0C4 */ char unk_C4;
/* 0x0C5 */ s8 unk_C5; /* 0x0C5 */ s8 unk_C5;
/* 0x0C6 */ s16 unk_C6; /* 0x0C6 */ s16 unk_C6;
/* 0x0C8 */ s32* unk_C8; /* 0x0C8 */ Npc* unk_C8;
/* 0x0CC */ s32 shadowID; /* 0x0CC */ s32 shadowID;
/* 0x0D0 */ f32* unk_D0; /* 0x0D0 */ f32* unk_D0;
/* 0x0D4 */ f32 unk_D4; /* 0x0D4 */ f32 unk_D4;

2
include/enums.h
View File

@ -1652,6 +1652,7 @@ enum NpcFlags {
/// - Allow falling below Y=-2000 (by default, NPC_FLAG_NO_Y_MOVEMENT is set when an NPC falls out-of-bounds) /// - Allow falling below Y=-2000 (by default, NPC_FLAG_NO_Y_MOVEMENT is set when an NPC falls out-of-bounds)
NPC_FLAG_PARTICLE = 0x04000000, NPC_FLAG_PARTICLE = 0x04000000,
NPC_FLAG_8000000 = 0x08000000, NPC_FLAG_8000000 = 0x08000000,
NPC_FLAG_10000000 = 0x10000000,
NPC_FLAG_NO_ANIMS_LOADED = 0x40000000, ///< Npc has no animations loaded NPC_FLAG_NO_ANIMS_LOADED = 0x40000000, ///< Npc has no animations loaded
NPC_FLAG_80000000 = 0x80000000, NPC_FLAG_80000000 = 0x80000000,
}; };
@ -1670,6 +1671,7 @@ enum PlayerStatusFlags {
PLAYER_STATUS_FLAGS_40000 = 0x00040000, PLAYER_STATUS_FLAGS_40000 = 0x00040000,
PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC = 0x02000000, PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC = 0x02000000,
PLAYER_STATUS_FLAGS_CAMERA_DOESNT_FOLLOW = 0x04000000, PLAYER_STATUS_FLAGS_CAMERA_DOESNT_FOLLOW = 0x04000000,
PLAYER_STATUS_FLAGS_8000000 = 0x08000000,
PLAYER_STATUS_FLAGS_10000000 = 0x10000000, PLAYER_STATUS_FLAGS_10000000 = 0x10000000,
PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED = 0x80000000, PLAYER_STATUS_FLAGS_ACTION_STATE_CHANGED = 0x80000000,
}; };

2
include/functions.h
View File

@ -602,7 +602,7 @@ void clear_item_entity_data(void);
void clear_player_data(void); void clear_player_data(void);
void enforce_hpfp_limits(void); void enforce_hpfp_limits(void);
s32 should_collider_allow_interact(s32);
void func_800E98EC(void); void func_800E98EC(void);
void func_800E9900(void); void func_800E9900(void);
void show_coin_counter(void); void show_coin_counter(void);

2
include/variables.h
View File

@ -282,7 +282,7 @@ extern s32 D_80104BEC;
extern UNK_FUN_PTR(D_8010C920); extern UNK_FUN_PTR(D_8010C920);
extern s32 D_8010C940; extern s32 D_8010C940;
extern Entity* D_8010C954; extern Entity* D_8010C954;
extern s32 D_8010C958; extern UNK_FUN_PTR(D_8010C958);
extern s32 D_8010C95C; extern s32 D_8010C95C;
extern s32 D_8010C96C; extern s32 D_8010C96C;
extern s32 D_8010C980; extern s32 D_8010C980;

118
src/77480.c
View File

@ -1,6 +1,7 @@
#include "common.h" #include "common.h"
#include "ld_addrs.h" #include "ld_addrs.h"
#define E20110_VRAM_DEF 0x802B7000
#define E21870_VRAM_DEF 0x802B7000 #define E21870_VRAM_DEF 0x802B7000
#define E225B0_VRAM_DEF 0x802B7000 #define E225B0_VRAM_DEF 0x802B7000
@ -8,13 +9,13 @@ extern UNK_FUN_PTR(D_8010C920);
extern UNK_FUN_PTR(D_8010C93C); extern UNK_FUN_PTR(D_8010C93C);
extern s32 D_8010C940; extern s32 D_8010C940;
extern s32 D_8010C950; extern s32 D_8010C950;
extern s32 D_8010C958;
extern s32 D_802BDF60; extern s32 D_802BDF60;
extern s8 D_8015A57A; extern s8 D_8015A57A;
s32 func_802B7140(void); s32 func_802B7140(void);
void func_802B72C0_E22870(void); void func_802B72C0_E22870(void);
void func_802B70B4_E201C4(void);
s32 func_800E0208(void); s32 func_800E0208(void);
void func_800E0330(void); void func_800E0330(void);
@ -27,6 +28,7 @@ void func_800E0AD0(void);
void func_800E0B14(void); void func_800E0B14(void);
void update_partner_timers(void); void update_partner_timers(void);
void update_player_shadow(void); void update_player_shadow(void);
void check_for_interactables(void);
s32 player_raycast_below(f32 yaw, f32 diameter, f32* outX, f32* outY, f32* outZ, f32* outLength, f32* hitRx, f32* hitRz, s32 player_raycast_below(f32 yaw, f32 diameter, f32* outX, f32* outY, f32* outZ, f32* outLength, f32* hitRx, f32* hitRz,
f32* hitDirX, f32* hitDirZ) { f32* hitDirX, f32* hitDirZ) {
@ -573,11 +575,11 @@ void func_800E0514(void) {
s32 has_valid_conversation_npc(void) { s32 has_valid_conversation_npc(void) {
PlayerStatus* playerStatus = &gPlayerStatus; PlayerStatus* playerStatus = &gPlayerStatus;
s32* unk_C8 = playerStatus->unk_C8; Npc* unk_C8 = playerStatus->unk_C8;
s32 ret = 0; s32 ret = 0;
s32 cond; s32 cond;
if (unk_C8 != NULL && !(*unk_C8 & 0x10000000)) { if (unk_C8 != NULL && !(unk_C8->flags & 0x10000000)) {
cond = (playerStatus->flags & 0x2002000) == 0x2000000; cond = (playerStatus->flags & 0x2002000) == 0x2000000;
ret = cond; ret = cond;
} }
@ -603,7 +605,115 @@ void func_800E06C0(s32 arg0) {
INCLUDE_ASM(s32, "77480", func_800E06D8); INCLUDE_ASM(s32, "77480", func_800E06D8);
INCLUDE_ASM(s32, "77480", check_for_interactables); void check_for_interactables(void) {
PlayerStatus* playerStatus = &gPlayerStatus;
Npc* npc = gPlayerStatus.unk_C8;
s32 phi_s2;
if ((playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_100) || D_8010C940 || D_8010C920) {
return;
}
if (D_8010C958 == NULL) {
s32 phi_s0 = gCollisionStatus.currentWall;
if (playerStatus->statusMenuCounterinputEnabledCounter != 0) {
if (gPlayerStatus.unk_C6 != phi_s0) {
gPlayerStatus.unk_C6 = phi_s0;
}
return;
}
if (playerStatus->decorationList != NULL) {
return;
}
if (phi_s0 == -1) {
s32 floor = gCollisionStatus.currentFloor;
if ((floor >= 0) && (floor & 0x4000)) {
phi_s2 = 1;
phi_s0 = floor;
switch (get_entity_type(floor)) {
case 0x3:
case 0x4:
case 0x5:
case 0x6:
case 0xC:
case 0x32:
case 0x33:
phi_s0 = -1;
break;
}
} else if (((playerStatus->flags & (PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC | PLAYER_STATUS_FLAGS_INPUT_DISABLED)) == PLAYER_STATUS_FLAGS_HAS_CONVERSATION_NPC)
&& (npc != NULL) && (npc->flags & NPC_FLAG_10000000)) {
phi_s0 = npc->npcID | 0x2000;
if (playerStatus->unk_C6 == phi_s0) {
return;
}
phi_s2 = 0;
} else {
playerStatus->unk_C6 = -1;
playerStatus->flags &= ~PLAYER_STATUS_FLAGS_8000000;
return;
}
} else {
if (!(phi_s0 & 0x4000)) {
phi_s2 = 0;
if (!(phi_s0 & 0x2000)) {
if (!should_collider_allow_interact(phi_s0)) {
playerStatus->unk_C6 = -1;
playerStatus->flags &= ~PLAYER_STATUS_FLAGS_8000000;
return;
}
}
} else {
if (!phys_can_player_interact()) {
phi_s2 = 1;
playerStatus->unk_C6 = -1;
playerStatus->flags &= ~PLAYER_STATUS_FLAGS_8000000;
return;
}
phi_s2 = 1;
}
}
if (playerStatus->unk_C6 == phi_s0) {
if ((playerStatus->flags & PLAYER_STATUS_FLAGS_8000000)) {
return;
}
} else {
playerStatus->flags &= ~PLAYER_STATUS_FLAGS_8000000;
}
playerStatus->unk_C6 = phi_s0;
if ((phi_s2 == 0) || phi_s0 >= 0 && get_entity_by_index(phi_s0)->flags & ENTITY_FLAGS_SHOWS_INSPECT_PROMPT) {
if (playerStatus->actionState == ACTION_STATE_IDLE || playerStatus->actionState == ACTION_STATE_WALK || playerStatus->actionState == ACTION_STATE_RUN) {
playerStatus->animFlags |= PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE;
func_800EF3D4(2);
}
}
}
if (!(playerStatus->animFlags & PLAYER_STATUS_ANIM_FLAGS_INTERACT_PROMPT_AVAILABLE)) {
func_800EF3D4(0);
repartner_set_tether_distance();
return;
}
if (D_8010C958 == NULL) {
dma_copy(E20110_ROM_START, E20110_ROM_END, (void *) E20110_VRAM_DEF);
D_8010C958 = &func_802B70B4_E201C4;
}
if (D_8010C958 != NULL) {
D_8010C958();
}
}
// TODO: Remove after func_800E24F8 is matching.
static const pad[3] = { 0.0f, 0.0f, 0.0f };
void func_800E0AD0(void) { void func_800E0AD0(void) {
if ((gPlayerStatusPtr->animFlags & 0x10) && (D_8010C958 != 0)) { if ((gPlayerStatusPtr->animFlags & 0x10) && (D_8010C958 != 0)) {

200
ver/us/asm/nonmatchings/77480/check_for_interactables.s
View File

@ -1,200 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.section .rodata
dlabel jtbl_8010BC60
.word .L800E08F8_79DA8, .L800E08F8_79DA8, .L800E08F8_79DA8, .L800E08F8_79DA8, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E08F8_79DA8, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E09C0_79E70, .L800E08F8_79DA8, .L800E08F8_79DA8, 0, 0, 0
.section .text
glabel check_for_interactables
/* 79CC8 800E0818 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 79CCC 800E081C AFB10014 */ sw $s1, 0x14($sp)
/* 79CD0 800E0820 3C118011 */ lui $s1, %hi(gPlayerStatus)
/* 79CD4 800E0824 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus)
/* 79CD8 800E0828 AFBF0020 */ sw $ra, 0x20($sp)
/* 79CDC 800E082C AFB3001C */ sw $s3, 0x1c($sp)
/* 79CE0 800E0830 AFB20018 */ sw $s2, 0x18($sp)
/* 79CE4 800E0834 AFB00010 */ sw $s0, 0x10($sp)
/* 79CE8 800E0838 8E220004 */ lw $v0, 4($s1)
/* 79CEC 800E083C 8E2500C8 */ lw $a1, 0xc8($s1)
/* 79CF0 800E0840 30420100 */ andi $v0, $v0, 0x100
/* 79CF4 800E0844 1440009B */ bnez $v0, .L800E0AB4
/* 79CF8 800E0848 00000000 */ nop
/* 79CFC 800E084C 3C028011 */ lui $v0, %hi(D_8010C940)
/* 79D00 800E0850 8C42C940 */ lw $v0, %lo(D_8010C940)($v0)
/* 79D04 800E0854 14400097 */ bnez $v0, .L800E0AB4
/* 79D08 800E0858 00000000 */ nop
/* 79D0C 800E085C 3C028011 */ lui $v0, %hi(D_8010C920)
/* 79D10 800E0860 8C42C920 */ lw $v0, %lo(D_8010C920)($v0)
/* 79D14 800E0864 14400093 */ bnez $v0, .L800E0AB4
/* 79D18 800E0868 00000000 */ nop
/* 79D1C 800E086C 3C028011 */ lui $v0, %hi(D_8010C958)
/* 79D20 800E0870 8C42C958 */ lw $v0, %lo(D_8010C958)($v0)
/* 79D24 800E0874 14400073 */ bnez $v0, .L800E0A44
/* 79D28 800E0878 00000000 */ nop
/* 79D2C 800E087C 3C038016 */ lui $v1, %hi(gCollisionStatus)
/* 79D30 800E0880 2463A550 */ addiu $v1, $v1, %lo(gCollisionStatus)
/* 79D34 800E0884 82220015 */ lb $v0, 0x15($s1)
/* 79D38 800E0888 10400006 */ beqz $v0, .L800E08A4
/* 79D3C 800E088C 84700012 */ lh $s0, 0x12($v1)
/* 79D40 800E0890 862200C6 */ lh $v0, 0xc6($s1)
/* 79D44 800E0894 54500087 */ bnel $v0, $s0, .L800E0AB4
/* 79D48 800E0898 A63000C6 */ sh $s0, 0xc6($s1)
/* 79D4C 800E089C 080382AD */ j .L800E0AB4
/* 79D50 800E08A0 00000000 */ nop
.L800E08A4:
/* 79D54 800E08A4 862200C0 */ lh $v0, 0xc0($s1)
/* 79D58 800E08A8 14400082 */ bnez $v0, .L800E0AB4
/* 79D5C 800E08AC 2413FFFF */ addiu $s3, $zero, -1
/* 79D60 800E08B0 1613002E */ bne $s0, $s3, .L800E096C
/* 79D64 800E08B4 32024000 */ andi $v0, $s0, 0x4000
/* 79D68 800E08B8 84640002 */ lh $a0, 2($v1)
/* 79D6C 800E08BC 04800010 */ bltz $a0, .L800E0900
/* 79D70 800E08C0 30824000 */ andi $v0, $a0, 0x4000
/* 79D74 800E08C4 1040000E */ beqz $v0, .L800E0900
/* 79D78 800E08C8 24120001 */ addiu $s2, $zero, 1
/* 79D7C 800E08CC 0C0441A9 */ jal get_entity_type
/* 79D80 800E08D0 0080802D */ daddu $s0, $a0, $zero
/* 79D84 800E08D4 2443FFFD */ addiu $v1, $v0, -3
/* 79D88 800E08D8 2C620031 */ sltiu $v0, $v1, 0x31
/* 79D8C 800E08DC 10400038 */ beqz $v0, .L800E09C0_79E70
/* 79D90 800E08E0 00031080 */ sll $v0, $v1, 2
/* 79D94 800E08E4 3C018011 */ lui $at, %hi(jtbl_8010BC60)
/* 79D98 800E08E8 00220821 */ addu $at, $at, $v0
/* 79D9C 800E08EC 8C22BC60 */ lw $v0, %lo(jtbl_8010BC60)($at)
/* 79DA0 800E08F0 00400008 */ jr $v0
/* 79DA4 800E08F4 00000000 */ nop
.L800E08F8_79DA8:
/* 79DA8 800E08F8 08038270 */ j .L800E09C0_79E70
/* 79DAC 800E08FC 2410FFFF */ addiu $s0, $zero, -1
.L800E0900:
/* 79DB0 800E0900 3C020200 */ lui $v0, 0x200
/* 79DB4 800E0904 8E230000 */ lw $v1, ($s1)
/* 79DB8 800E0908 34422000 */ ori $v0, $v0, 0x2000
/* 79DBC 800E090C 00621824 */ and $v1, $v1, $v0
/* 79DC0 800E0910 3C020200 */ lui $v0, 0x200
/* 79DC4 800E0914 1462000E */ bne $v1, $v0, .L800E0950
/* 79DC8 800E0918 3C02F7FF */ lui $v0, 0xf7ff
/* 79DCC 800E091C 10A0000C */ beqz $a1, .L800E0950
/* 79DD0 800E0920 3C031000 */ lui $v1, 0x1000
/* 79DD4 800E0924 8CA20000 */ lw $v0, ($a1)
/* 79DD8 800E0928 00431024 */ and $v0, $v0, $v1
/* 79DDC 800E092C 10400008 */ beqz $v0, .L800E0950
/* 79DE0 800E0930 3C02F7FF */ lui $v0, 0xf7ff
/* 79DE4 800E0934 80A200A4 */ lb $v0, 0xa4($a1)
/* 79DE8 800E0938 862300C6 */ lh $v1, 0xc6($s1)
/* 79DEC 800E093C 34502000 */ ori $s0, $v0, 0x2000
/* 79DF0 800E0940 1070005C */ beq $v1, $s0, .L800E0AB4
/* 79DF4 800E0944 0000902D */ daddu $s2, $zero, $zero
/* 79DF8 800E0948 08038270 */ j .L800E09C0_79E70
/* 79DFC 800E094C 00000000 */ nop
.L800E0950:
/* 79E00 800E0950 3442FFFF */ ori $v0, $v0, 0xffff
/* 79E04 800E0954 8E230000 */ lw $v1, ($s1)
/* 79E08 800E0958 2404FFFF */ addiu $a0, $zero, -1
/* 79E0C 800E095C A62400C6 */ sh $a0, 0xc6($s1)
/* 79E10 800E0960 00621824 */ and $v1, $v1, $v0
/* 79E14 800E0964 080382AD */ j .L800E0AB4
/* 79E18 800E0968 AE230000 */ sw $v1, ($s1)
.L800E096C:
/* 79E1C 800E096C 14400009 */ bnez $v0, .L800E0994
/* 79E20 800E0970 32022000 */ andi $v0, $s0, 0x2000
/* 79E24 800E0974 14400012 */ bnez $v0, .L800E09C0_79E70
/* 79E28 800E0978 0000902D */ daddu $s2, $zero, $zero
/* 79E2C 800E097C 0C05173A */ jal should_collider_allow_interact
/* 79E30 800E0980 0200202D */ daddu $a0, $s0, $zero
/* 79E34 800E0984 1440000E */ bnez $v0, .L800E09C0_79E70
/* 79E38 800E0988 3C03F7FF */ lui $v1, 0xf7ff
/* 79E3C 800E098C 0803826A */ j .L800E09A8
/* 79E40 800E0990 00000000 */ nop
.L800E0994:
/* 79E44 800E0994 0C0394BE */ jal phys_can_player_interact
/* 79E48 800E0998 00000000 */ nop
/* 79E4C 800E099C 14400008 */ bnez $v0, .L800E09C0_79E70
/* 79E50 800E09A0 24120001 */ addiu $s2, $zero, 1
/* 79E54 800E09A4 3C03F7FF */ lui $v1, 0xf7ff
.L800E09A8:
/* 79E58 800E09A8 8E220000 */ lw $v0, ($s1)
/* 79E5C 800E09AC 3463FFFF */ ori $v1, $v1, 0xffff
/* 79E60 800E09B0 A63300C6 */ sh $s3, 0xc6($s1)
/* 79E64 800E09B4 00431024 */ and $v0, $v0, $v1
/* 79E68 800E09B8 080382AD */ j .L800E0AB4
/* 79E6C 800E09BC AE220000 */ sw $v0, ($s1)
.L800E09C0_79E70:
/* 79E70 800E09C0 862200C6 */ lh $v0, 0xc6($s1)
/* 79E74 800E09C4 14500008 */ bne $v0, $s0, .L800E09E8
/* 79E78 800E09C8 3C03F7FF */ lui $v1, 0xf7ff
/* 79E7C 800E09CC 8E220000 */ lw $v0, ($s1)
/* 79E80 800E09D0 3C030800 */ lui $v1, 0x800
/* 79E84 800E09D4 00431024 */ and $v0, $v0, $v1
/* 79E88 800E09D8 14400036 */ bnez $v0, .L800E0AB4
/* 79E8C 800E09DC 00000000 */ nop
/* 79E90 800E09E0 0803827F */ j .L800E09FC
/* 79E94 800E09E4 A63000C6 */ sh $s0, 0xc6($s1)
.L800E09E8:
/* 79E98 800E09E8 8E220000 */ lw $v0, ($s1)
/* 79E9C 800E09EC 3463FFFF */ ori $v1, $v1, 0xffff
/* 79EA0 800E09F0 00431024 */ and $v0, $v0, $v1
/* 79EA4 800E09F4 AE220000 */ sw $v0, ($s1)
/* 79EA8 800E09F8 A63000C6 */ sh $s0, 0xc6($s1)
.L800E09FC:
/* 79EAC 800E09FC 12400009 */ beqz $s2, .L800E0A24
/* 79EB0 800E0A00 00000000 */ nop
/* 79EB4 800E0A04 0600000F */ bltz $s0, .L800E0A44
/* 79EB8 800E0A08 00000000 */ nop
/* 79EBC 800E0A0C 0C04417A */ jal get_entity_by_index
/* 79EC0 800E0A10 0200202D */ daddu $a0, $s0, $zero
/* 79EC4 800E0A14 8C420000 */ lw $v0, ($v0)
/* 79EC8 800E0A18 30421000 */ andi $v0, $v0, 0x1000
/* 79ECC 800E0A1C 10400009 */ beqz $v0, .L800E0A44
/* 79ED0 800E0A20 00000000 */ nop
.L800E0A24:
/* 79ED4 800E0A24 922200B4 */ lbu $v0, 0xb4($s1)
/* 79ED8 800E0A28 2C420003 */ sltiu $v0, $v0, 3
/* 79EDC 800E0A2C 10400005 */ beqz $v0, .L800E0A44
/* 79EE0 800E0A30 24040002 */ addiu $a0, $zero, 2
/* 79EE4 800E0A34 8E220004 */ lw $v0, 4($s1)
/* 79EE8 800E0A38 34420010 */ ori $v0, $v0, 0x10
/* 79EEC 800E0A3C 0C03BCF5 */ jal func_800EF3D4
/* 79EF0 800E0A40 AE220004 */ sw $v0, 4($s1)
.L800E0A44:
/* 79EF4 800E0A44 8E220004 */ lw $v0, 4($s1)
/* 79EF8 800E0A48 30420010 */ andi $v0, $v0, 0x10
/* 79EFC 800E0A4C 14400007 */ bnez $v0, .L800E0A6C
/* 79F00 800E0A50 00000000 */ nop
/* 79F04 800E0A54 0C03BCF5 */ jal func_800EF3D4
/* 79F08 800E0A58 0000202D */ daddu $a0, $zero, $zero
/* 79F0C 800E0A5C 0C03BCE9 */ jal repartner_set_tether_distance
/* 79F10 800E0A60 00000000 */ nop
/* 79F14 800E0A64 080382AD */ j .L800E0AB4
/* 79F18 800E0A68 00000000 */ nop
.L800E0A6C:
/* 79F1C 800E0A6C 3C108011 */ lui $s0, %hi(D_8010C958)
/* 79F20 800E0A70 2610C958 */ addiu $s0, $s0, %lo(D_8010C958)
/* 79F24 800E0A74 8E020000 */ lw $v0, ($s0)
/* 79F28 800E0A78 1440000C */ bnez $v0, .L800E0AAC
/* 79F2C 800E0A7C 3C06802B */ lui $a2, 0x802b
/* 79F30 800E0A80 3C0400E2 */ lui $a0, 0xe2
/* 79F34 800E0A84 24840110 */ addiu $a0, $a0, 0x110
/* 79F38 800E0A88 3C0500E2 */ lui $a1, 0xe2
/* 79F3C 800E0A8C 24A50EB0 */ addiu $a1, $a1, 0xeb0
/* 79F40 800E0A90 0C00A5CF */ jal dma_copy
/* 79F44 800E0A94 34C67000 */ ori $a2, $a2, 0x7000
/* 79F48 800E0A98 3C02802B */ lui $v0, %hi(func_802B70B4_E201C4)
/* 79F4C 800E0A9C 244270B4 */ addiu $v0, $v0, %lo(func_802B70B4_E201C4)
/* 79F50 800E0AA0 10400004 */ beqz $v0, .L800E0AB4
/* 79F54 800E0AA4 AE020000 */ sw $v0, ($s0)
/* 79F58 800E0AA8 8E020000 */ lw $v0, ($s0)
.L800E0AAC:
/* 79F5C 800E0AAC 0040F809 */ jalr $v0
/* 79F60 800E0AB0 00000000 */ nop
.L800E0AB4:
/* 79F64 800E0AB4 8FBF0020 */ lw $ra, 0x20($sp)
/* 79F68 800E0AB8 8FB3001C */ lw $s3, 0x1c($sp)
/* 79F6C 800E0ABC 8FB20018 */ lw $s2, 0x18($sp)
/* 79F70 800E0AC0 8FB10014 */ lw $s1, 0x14($sp)
/* 79F74 800E0AC4 8FB00010 */ lw $s0, 0x10($sp)
/* 79F78 800E0AC8 03E00008 */ jr $ra
/* 79F7C 800E0ACC 27BD0028 */ addiu $sp, $sp, 0x28

1
ver/us/asm/nonmatchings/77480/func_800E0B90.s
View File

@ -1,6 +1,7 @@
.set noat # allow manual use of $at .set noat # allow manual use of $at
.set noreorder # don't insert nops after branches .set noreorder # don't insert nops after branches
.section .text
glabel func_800E0B90 glabel func_800E0B90
/* 7A040 800E0B90 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 7A040 800E0B90 3C038007 */ lui $v1, %hi(gCurrentCameraID)
/* 7A044 800E0B94 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 7A044 800E0B94 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1)