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

UnkSetDurationFunc

Browse Source
This commit is contained in:
Ethan Roseman 2020-11-20 18:00:44 -05:00
parent e0e8885781
commit 266e94ddfd
30 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80241F6C_91161C.s
View File

@ -186,7 +186,7 @@ glabel func_80241F6C_91161C
/* 9118D0 80242220 0260202D */ daddu $a0, $s3, $zero
/* 9118D4 80242224 08090899 */ j .L80242264
/* 9118D8 80242228 00000000 */ nop
/* 9118DC 8024222C 0C090255 */ jal func_80240954_910004
/* 9118DC 8024222C 0C090255 */ jal UnkSetDurationFunc
/* 9118E0 80242230 0260202D */ daddu $a0, $s3, $zero
/* 9118E4 80242234 08090899 */ j .L80242264
/* 9118E8 80242238 00000000 */ nop

2
asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802404D4_A4F4D4.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802404D4_A4F4D4
glabel UnkSetDurationFunc
/* A4F4D4 802404D4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* A4F4D8 802404D8 AFB10014 */ sw $s1, 0x14($sp)
/* A4F4DC 802404DC 0080882D */ daddu $s1, $a0, $zero

2
asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_80240F94_A4FF94.s
View File

@ -186,7 +186,7 @@ glabel func_80240F94_A4FF94
/* A50248 80241248 0260202D */ daddu $a0, $s3, $zero
/* A5024C 8024124C 080904A3 */ j .L8024128C
/* A50250 80241250 00000000 */ nop
/* A50254 80241254 0C090135 */ jal func_802404D4_A4F4D4
/* A50254 80241254 0C090135 */ jal UnkSetDurationFunc
/* A50258 80241258 0260202D */ daddu $a0, $s3, $zero
/* A5025C 8024125C 080904A3 */ j .L8024128C
/* A50260 80241260 00000000 */ nop

2
asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80240744_A93E84.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240744_A93E84
glabel UnkSetDurationFunc
/* A93E84 80240744 27BDFFE0 */ addiu $sp, $sp, -0x20
/* A93E88 80240748 AFB10014 */ sw $s1, 0x14($sp)
/* A93E8C 8024074C 0080882D */ daddu $s1, $a0, $zero

2
asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241204_A94944.s
View File

@ -186,7 +186,7 @@ glabel func_80241204_A94944
/* A94BF8 802414B8 0260202D */ daddu $a0, $s3, $zero
/* A94BFC 802414BC 0809053F */ j .L802414FC
/* A94C00 802414C0 00000000 */ nop
/* A94C04 802414C4 0C0901D1 */ jal func_80240744_A93E84
/* A94C04 802414C4 0C0901D1 */ jal UnkSetDurationFunc
/* A94C08 802414C8 0260202D */ daddu $a0, $s3, $zero
/* A94C0C 802414CC 0809053F */ j .L802414FC
/* A94C10 802414D0 00000000 */ nop

2
asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_802405A4_A99B34.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802405A4_A99B34
glabel UnkSetDurationFunc
/* A99B34 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* A99B38 802405A8 AFB10014 */ sw $s1, 0x14($sp)
/* A99B3C 802405AC 0080882D */ daddu $s1, $a0, $zero

2
asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241064_A9A5F4.s
View File

@ -186,7 +186,7 @@ glabel func_80241064_A9A5F4
/* A9A8A8 80241318 0260202D */ daddu $a0, $s3, $zero
/* A9A8AC 8024131C 080904D7 */ j .L8024135C
/* A9A8B0 80241320 00000000 */ nop
/* A9A8B4 80241324 0C090169 */ jal func_802405A4_A99B34
/* A9A8B4 80241324 0C090169 */ jal UnkSetDurationFunc
/* A9A8B8 80241328 0260202D */ daddu $a0, $s3, $zero
/* A9A8BC 8024132C 080904D7 */ j .L8024135C
/* A9A8C0 80241330 00000000 */ nop

2
asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_802405A4_A9F2E4.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802405A4_A9F2E4
glabel UnkSetDurationFunc
/* A9F2E4 802405A4 27BDFFE0 */ addiu $sp, $sp, -0x20
/* A9F2E8 802405A8 AFB10014 */ sw $s1, 0x14($sp)
/* A9F2EC 802405AC 0080882D */ daddu $s1, $a0, $zero

2
asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241064_A9FDA4.s
View File

@ -186,7 +186,7 @@ glabel func_80241064_A9FDA4
/* AA0058 80241318 0260202D */ daddu $a0, $s3, $zero
/* AA005C 8024131C 080904D7 */ j .L8024135C
/* AA0060 80241320 00000000 */ nop
/* AA0064 80241324 0C090169 */ jal func_802405A4_A9F2E4
/* AA0064 80241324 0C090169 */ jal UnkSetDurationFunc
/* AA0068 80241328 0260202D */ daddu $a0, $s3, $zero
/* AA006C 8024132C 080904D7 */ j .L8024135C
/* AA0070 80241330 00000000 */ nop

2
asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240434_A60E04.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240434_A60E04
glabel UnkSetDurationFunc
/* A60E04 80240434 27BDFFE0 */ addiu $sp, $sp, -0x20
/* A60E08 80240438 AFB10014 */ sw $s1, 0x14($sp)
/* A60E0C 8024043C 0080882D */ daddu $s1, $a0, $zero

2
asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80240EF4_A618C4.s
View File

@ -186,7 +186,7 @@ glabel func_80240EF4_A618C4
/* A61B78 802411A8 0260202D */ daddu $a0, $s3, $zero
/* A61B7C 802411AC 0809047B */ j .L802411EC
/* A61B80 802411B0 00000000 */ nop
/* A61B84 802411B4 0C09010D */ jal func_80240434_A60E04
/* A61B84 802411B4 0C09010D */ jal UnkSetDurationFunc
/* A61B88 802411B8 0260202D */ daddu $a0, $s3, $zero
/* A61B8C 802411BC 0809047B */ j .L802411EC
/* A61B90 802411C0 00000000 */ nop

2
asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240514_A67614.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240514_A67614
glabel UnkSetDurationFunc
/* A67614 80240514 27BDFFE0 */ addiu $sp, $sp, -0x20
/* A67618 80240518 AFB10014 */ sw $s1, 0x14($sp)
/* A6761C 8024051C 0080882D */ daddu $s1, $a0, $zero

2
asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_80240FD4_A680D4.s
View File

@ -186,7 +186,7 @@ glabel func_80240FD4_A680D4
/* A68388 80241288 0260202D */ daddu $a0, $s3, $zero
/* A6838C 8024128C 080904B3 */ j .L802412CC
/* A68390 80241290 00000000 */ nop
/* A68394 80241294 0C090145 */ jal func_80240514_A67614
/* A68394 80241294 0C090145 */ jal UnkSetDurationFunc
/* A68398 80241298 0260202D */ daddu $a0, $s3, $zero
/* A6839C 8024129C 080904B3 */ j .L802412CC
/* A683A0 802412A0 00000000 */ nop

2
asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80241D7C_D9F24C.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241D7C_D9F24C
glabel UnkSetDurationFunc
/* D9F24C 80241D7C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* D9F250 80241D80 AFB10014 */ sw $s1, 0x14($sp)
/* D9F254 80241D84 0080882D */ daddu $s1, $a0, $zero

2
asm/nonmatchings/world/area_omo/omo_02/D9D510/func_8024283C_D9FD0C.s
View File

@ -186,7 +186,7 @@ glabel func_8024283C_D9FD0C
/* D9FFC0 80242AF0 0260202D */ daddu $a0, $s3, $zero
/* D9FFC4 80242AF4 08090ACD */ j .L80242B34
/* D9FFC8 80242AF8 00000000 */ nop
/* D9FFCC 80242AFC 0C09075F */ jal func_80241D7C_D9F24C
/* D9FFCC 80242AFC 0C09075F */ jal UnkSetDurationFunc
/* D9FFD0 80242B00 0260202D */ daddu $a0, $s3, $zero
/* D9FFD4 80242B04 08090ACD */ j .L80242B34
/* D9FFD8 80242B08 00000000 */ nop

2
asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024278C_DCF45C.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024278C_DCF45C
glabel UnkSetDurationFunc
/* DCF45C 8024278C 27BDFFE0 */ addiu $sp, $sp, -0x20
/* DCF460 80242790 AFB10014 */ sw $s1, 0x14($sp)
/* DCF464 80242794 0080882D */ daddu $s1, $a0, $zero

2
asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_8024324C_DCFF1C.s
View File

@ -186,7 +186,7 @@ glabel func_8024324C_DCFF1C
/* DD01D0 80243500 0260202D */ daddu $a0, $s3, $zero
/* DD01D4 80243504 08090D51 */ j .L80243544
/* DD01D8 80243508 00000000 */ nop
/* DD01DC 8024350C 0C0909E3 */ jal func_8024278C_DCF45C
/* DD01DC 8024350C 0C0909E3 */ jal UnkSetDurationFunc
/* DD01E0 80243510 0260202D */ daddu $a0, $s3, $zero
/* DD01E4 80243514 08090D51 */ j .L80243544
/* DD01E8 80243518 00000000 */ nop

2
asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802428E0_DF1780.s
View File

@ -1,7 +1,7 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802428E0_DF1780
glabel UnkSetDurationFunc
/* DF1780 802428E0 27BDFFE0 */ addiu $sp, $sp, -0x20
/* DF1784 802428E4 AFB10014 */ sw $s1, 0x14($sp)
/* DF1788 802428E8 0080882D */ daddu $s1, $a0, $zero

2
asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802433A0_DF2240.s
View File

@ -186,7 +186,7 @@ glabel func_802433A0_DF2240
/* DF24F4 80243654 0260202D */ daddu $a0, $s3, $zero
/* DF24F8 80243658 08090DA6 */ j .L80243698
/* DF24FC 8024365C 00000000 */ nop
/* DF2500 80243660 0C090A38 */ jal func_802428E0_DF1780
/* DF2500 80243660 0C090A38 */ jal UnkSetDurationFunc
/* DF2504 80243664 0260202D */ daddu $a0, $s3, $zero
/* DF2508 80243668 08090DA6 */ j .L80243698
/* DF250C 8024366C 00000000 */ nop

2
src/world/area_iwa/iwa_01/90FBD0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240710_90FDC0);
INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240854_90FF04);
INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240954_910004);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80240998_910048);

2
src/world/area_kpa/kpa_09/A4F0A0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240290_A4F290);
INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802403D4_A4F3D4);
INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802404D4_A4F4D4);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240518_A4F518);

2
src/world/area_kpa/kpa_102/A93A50.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240500_A93C40);
INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240644_A93D84);
INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240744_A93E84);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240788_A93EC8);

2
src/world/area_kpa/kpa_111/A99590.c
View File

@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240360_A998F0);
INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802404A4_A99A34);
INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405A4_A99B34);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_802405E8_A99B78);

2
src/world/area_kpa/kpa_115/A9ED40.c
View File

@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240360_A9F0A0);
INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802404A4_A9F1E4);
INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802405A4_A9F2E4);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_802405E8_A9F328);

2
src/world/area_kpa/kpa_50/A609D0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_802401F0_A60BC0);
INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240334_A60D04);
INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240434_A60E04);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240478_A60E48);

2
src/world/area_kpa/kpa_52/A671E0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802402D0_A673D0);
INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240414_A67514);
INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240514_A67614);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240558_A67658);

2
src/world/area_omo/omo_02/D9D510.c
View File

@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241B38_D9F008);
INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241C7C_D9F14C);
INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241D7C_D9F24C);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80241DC0_D9F290);

2
src/world/area_omo/omo_09/DCD6B0.c
View File

@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80242548_DCF218);
INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024268C_DCF35C);
INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024278C_DCF45C);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802427D0_DCF4A0);

2
src/world/area_omo/omo_17/DEF400.c
View File

@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_8024269C_DF153C);
INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802427E0_DF1680);
INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802428E0_DF1780);
#include "world/common/UnkSetDurationFunc.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_80242924_DF17C4);

9
src/world/common/UnkSetDurationFunc.inc.c Normal file
View File

@ -0,0 +1,9 @@
#include "common.h"
#include "map.h"
static void UnkSetDurationFunc(ScriptInstance* script) {
Enemy* enemy = script->owner1.enemy;
get_npc_unsafe(enemy->npcID)->duration = enemy->varTable[2];
script->functionTemp[0].s = 33;
}