mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-25 09:45:02 +00:00
2 more
This commit is contained in:
Ethan Roseman
parent
b3f865dc58
commit
29cbc5c999
4 changed files with 19 additions and 105 deletions
|
|
@ -1,58 +0,0 @@
|
|||
.rdata
|
||||
|
||||
glabel D_80AF5188
|
||||
.asciz "En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"
|
||||
.balign 4
|
||||
|
||||
.text
|
||||
|
||||
glabel func_80AF3564
|
||||
/* 01014 80AF3564 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0
|
||||
/* 01018 80AF3568 AFA40020 */ sw $a0, 0x0020($sp)
|
||||
/* 0101C 80AF356C AFBF0014 */ sw $ra, 0x0014($sp)
|
||||
/* 01020 80AF3570 AFA50024 */ sw $a1, 0x0024($sp)
|
||||
/* 01024 80AF3574 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
|
||||
/* 01028 80AF3578 0C2BC9EB */ jal func_80AF27AC
|
||||
/* 0102C 80AF357C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003
|
||||
/* 01030 80AF3580 1040001C */ beq $v0, $zero, .L80AF35F4
|
||||
/* 01034 80AF3584 8FA70020 */ lw $a3, 0x0020($sp)
|
||||
/* 01038 80AF3588 94460000 */ lhu $a2, 0x0000($v0) ## 00000000
|
||||
/* 0103C 80AF358C 8CE302BC */ lw $v1, 0x02BC($a3) ## 000002BC
|
||||
/* 01040 80AF3590 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007
|
||||
/* 01044 80AF3594 50C30018 */ beql $a2, $v1, .L80AF35F8
|
||||
/* 01048 80AF3598 8FBF0014 */ lw $ra, 0x0014($sp)
|
||||
/* 0104C 80AF359C 10C10006 */ beq $a2, $at, .L80AF35B8
|
||||
/* 01050 80AF35A0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000
|
||||
/* 01054 80AF35A4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008
|
||||
/* 01058 80AF35A8 10C10008 */ beq $a2, $at, .L80AF35CC
|
||||
/* 0105C 80AF35AC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000
|
||||
/* 01060 80AF35B0 1000000A */ beq $zero, $zero, .L80AF35DC
|
||||
/* 01064 80AF35B4 3C0480AF */ lui $a0, %hi(D_80AF5188) ## $a0 = 80AF0000
|
||||
.L80AF35B8:
|
||||
/* 01068 80AF35B8 8FA50024 */ lw $a1, 0x0024($sp)
|
||||
/* 0106C 80AF35BC 0C2BCD1B */ jal func_80AF346C
|
||||
/* 01070 80AF35C0 AFA60018 */ sw $a2, 0x0018($sp)
|
||||
/* 01074 80AF35C4 10000009 */ beq $zero, $zero, .L80AF35EC
|
||||
/* 01078 80AF35C8 8FA60018 */ lw $a2, 0x0018($sp)
|
||||
.L80AF35CC:
|
||||
/* 0107C 80AF35CC 0C2BCD3C */ jal func_80AF34F0
|
||||
/* 01080 80AF35D0 AFA60018 */ sw $a2, 0x0018($sp)
|
||||
/* 01084 80AF35D4 10000005 */ beq $zero, $zero, .L80AF35EC
|
||||
/* 01088 80AF35D8 8FA60018 */ lw $a2, 0x0018($sp)
|
||||
.L80AF35DC:
|
||||
/* 0108C 80AF35DC 24845188 */ addiu $a0, $a0, %lo(D_80AF5188) ## $a0 = 00005188
|
||||
/* 01090 80AF35E0 0C00084C */ jal osSyncPrintf
|
||||
|
||||
/* 01094 80AF35E4 AFA60018 */ sw $a2, 0x0018($sp)
|
||||
/* 01098 80AF35E8 8FA60018 */ lw $a2, 0x0018($sp)
|
||||
.L80AF35EC:
|
||||
/* 0109C 80AF35EC 8FAE0020 */ lw $t6, 0x0020($sp)
|
||||
/* 010A0 80AF35F0 ADC602BC */ sw $a2, 0x02BC($t6) ## 000002BC
|
||||
.L80AF35F4:
|
||||
/* 010A4 80AF35F4 8FBF0014 */ lw $ra, 0x0014($sp)
|
||||
.L80AF35F8:
|
||||
/* 010A8 80AF35F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000
|
||||
/* 010AC 80AF35FC 03E00008 */ jr $ra
|
||||
/* 010B0 80AF3600 00000000 */ nop
|
||||
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
glabel func_80AF3B74
|
||||
/* 01624 80AF3B74 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000
|
||||
/* 01628 80AF3B78 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90
|
||||
/* 0162C 80AF3B7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
|
||||
/* 01630 80AF3B80 AFBF0014 */ sw $ra, 0x0014($sp)
|
||||
/* 01634 80AF3B84 AFA5001C */ sw $a1, 0x001C($sp)
|
||||
/* 01638 80AF3B88 8459145A */ lh $t9, 0x145A($v0) ## 8016145A
|
||||
/* 0163C 80AF3B8C 844E1458 */ lh $t6, 0x1458($v0) ## 80161458
|
||||
/* 01640 80AF3B90 948C02C0 */ lhu $t4, 0x02C0($a0) ## 000002C0
|
||||
/* 01644 80AF3B94 27290028 */ addiu $t1, $t9, 0x0028 ## $t1 = 00000028
|
||||
/* 01648 80AF3B98 25D80096 */ addiu $t8, $t6, 0x0096 ## $t8 = 00000096
|
||||
/* 0164C 80AF3B9C 03095021 */ addu $t2, $t8, $t1
|
||||
/* 01650 80AF3BA0 314BFFFF */ andi $t3, $t2, 0xFFFF ## $t3 = 00000000
|
||||
/* 01654 80AF3BA4 016C082A */ slt $at, $t3, $t4
|
||||
/* 01658 80AF3BA8 50200004 */ beql $at, $zero, .L80AF3BBC
|
||||
/* 0165C 80AF3BAC 8FBF0014 */ lw $ra, 0x0014($sp)
|
||||
/* 01660 80AF3BB0 0C00B55C */ jal Actor_Kill
|
||||
|
||||
/* 01664 80AF3BB4 00000000 */ nop
|
||||
/* 01668 80AF3BB8 8FBF0014 */ lw $ra, 0x0014($sp)
|
||||
.L80AF3BBC:
|
||||
/* 0166C 80AF3BBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
|
||||
/* 01670 80AF3BC0 03E00008 */ jr $ra
|
||||
/* 01674 80AF3BC4 00000000 */ nop
|
||||
|
||||
|
||||
|
|
@ -646,14 +646,15 @@ void func_80AF3530(EnRu2* this, UNK_TYPE arg1) {
|
|||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s")
|
||||
/*void func_80AF3564(EnRu2* this, GlobalContext* globalCtx) {
|
||||
void func_80AF3564(EnRu2* this, GlobalContext* globalCtx) {
|
||||
CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, 3);
|
||||
s32 action;
|
||||
s32 unk_2BC;
|
||||
|
||||
if (csCmdActorAction != NULL) {
|
||||
action = csCmdActorAction->action;
|
||||
if (action != this->unk_2BC) {
|
||||
unk_2BC = this->unk_2BC;
|
||||
if (action != unk_2BC) {
|
||||
switch (action) {
|
||||
case 7:
|
||||
func_80AF346C(this, globalCtx);
|
||||
|
|
@ -668,7 +669,7 @@ void func_80AF3530(EnRu2* this, UNK_TYPE arg1) {
|
|||
this->unk_2BC = action;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
void func_80AF3604(EnRu2* this, GlobalContext* globalCtx) {
|
||||
func_80AF3564(this, globalCtx);
|
||||
|
|
@ -769,22 +770,20 @@ void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) {
|
|||
/*void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) {
|
||||
s32 pad;
|
||||
MessageContext* msgCtx;
|
||||
u8* unk_2C2;
|
||||
s32 pad2;
|
||||
u8 dialogState;
|
||||
Player* player;
|
||||
s32 pad2;
|
||||
s32 pad3;
|
||||
|
||||
msgCtx = &globalCtx->msgCtx;
|
||||
if (!globalCtx){}
|
||||
dialogState = func_8010BDBC(msgCtx);
|
||||
|
||||
if (dialogState == 3) {
|
||||
if (this->unk_2C3 != 3) {
|
||||
osSyncPrintf("おれが小松だ！ \n");
|
||||
unk_2C2 = &this->unk_2C2;
|
||||
*unk_2C2 += 1;
|
||||
*unk_2C2 = *unk_2C2 % 6;
|
||||
|
||||
if (*unk_2C2 == 3) {
|
||||
this->unk_2C2++;
|
||||
if (this->unk_2C2 % 6 == 3) {
|
||||
player = PLAYER;
|
||||
osSyncPrintf("うおりゃー！ \n");
|
||||
func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[0]);
|
||||
|
|
@ -795,6 +794,8 @@ void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
}
|
||||
|
||||
if (globalCtx->cameraCtx.activeCameraPtrs){}
|
||||
|
||||
this->unk_2C3 = dialogState;
|
||||
if (func_8010BDBC(msgCtx) == 2) {
|
||||
this->action = 18;
|
||||
|
|
@ -811,14 +812,11 @@ void func_80AF3ADC(EnRu2* this, GlobalContext* globalCtx) {
|
|||
}
|
||||
}
|
||||
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s")
|
||||
/*void func_80AF3B74(EnRu2* this, GlobalContext* globalCtx) {
|
||||
u16 temp = (((u16)(kREG(3) + 0x28)) + ((u16)(kREG(2) + 0x96))) & 0xFFFFFFFFFFFFFFFF;
|
||||
|
||||
if (this->unk_2C0 > temp) {
|
||||
void func_80AF3B74(EnRu2* this, GlobalContext* globalCtx) {
|
||||
if (this->unk_2C0 > (((u16)(kREG(3) + 0x28)) + ((u16)(kREG(2) + 0x96)) & 0xFFFF)) {
|
||||
Actor_Kill(&this->actor);
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx) {
|
||||
func_80AF3878(this, globalCtx);
|
||||
|
|
@ -907,7 +905,7 @@ void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) {
|
|||
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s")
|
||||
/*void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) {
|
||||
s32 pad[3];
|
||||
u32 something = D_80AF410C[this->unk_2A4];
|
||||
u32 addr = D_80AF410C[this->unk_2A4];
|
||||
SkelAnime* skelAnime = &this->skelAnime;
|
||||
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
|
||||
Gfx* gfxArr[4];
|
||||
|
|
@ -915,8 +913,8 @@ void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) {
|
|||
func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642);
|
||||
func_80093D18(globalCtx->state.gfxCtx);
|
||||
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(something));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(something));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr));
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr));
|
||||
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF);
|
||||
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116290);
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ typedef struct {
|
|||
/* 0x02B8 */ s32 unk_2B8;
|
||||
/* 0x02BC */ s32 unk_2BC;
|
||||
/* 0x02C0 */ u16 unk_2C0;
|
||||
/* 0x02C2 */ s8 unk_2C2;
|
||||
/* 0x02C2 */ u8 unk_2C2;
|
||||
/* 0x02C3 */ u8 unk_2C3;
|
||||
/* 0x02C4 */ f32 unk_2C4;
|
||||
/* 0x02C8 */ ColliderCylinderMain collider;
|
||||
|
|
|
|||
Loading…
Reference in a new issue