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

Set80151310_0

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-29 22:15:51 -04:00
parent c19a29d951
commit f94c542a9d
45 changed files with 45 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024159C_95C79C.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024159C_95C79C
/* 95C79C 8024159C 3C018015 */ lui $at, %hi(D_80151310)
/* 95C7A0 802415A0 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 95C7A4 802415A4 03E00008 */ jr $ra
/* 95C7A8 802415A8 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024042C_9695EC.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024042C_9695EC
/* 9695EC 8024042C 3C018015 */ lui $at, %hi(D_80151310)
/* 9695F0 80240430 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 9695F4 80240434 03E00008 */ jr $ra
/* 9695F8 80240438 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802425D0_A1D6D0
/* A1D6D0 802425D0 3C018015 */ lui $at, %hi(D_80151310)
/* A1D6D4 802425D4 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* A1D6D8 802425D8 03E00008 */ jr $ra
/* A1D6DC 802425DC 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241740_B2DBB0
/* B2DBB0 80241740 3C018015 */ lui $at, %hi(D_80151310)
/* B2DBB4 80241744 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* B2DBB8 80241748 03E00008 */ jr $ra
/* B2DBBC 8024174C 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CC8_B36898.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241CC8_B36898
/* B36898 80241CC8 3C018015 */ lui $at, %hi(D_80151310)
/* B3689C 80241CCC AC201310 */ sw $zero, %lo(D_80151310)($at)
/* B368A0 80241CD0 03E00008 */ jr $ra
/* B368A4 80241CD4 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802404BC_8B052C
/* 8B052C 802404BC 3C018015 */ lui $at, %hi(D_80151310)
/* 8B0530 802404C0 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 8B0534 802404C4 03E00008 */ jr $ra
/* 8B0538 802404C8 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024075C_7EB46C
/* 7EB46C 8024075C 3C018015 */ lui $at, %hi(D_80151310)
/* 7EB470 80240760 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 7EB474 80240764 03E00008 */ jr $ra
/* 7EB478 80240768 24020002 */ addiu $v0, $zero, 2

21
asm/nonmatchings/world/area_mac/mac_01/800880/func_80240000_800880.s
View File

@ -1,21 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240000_800880
/* 800880 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 800884 80240004 AFBF0010 */ sw $ra, 0x10($sp)
/* 800888 80240008 8C82000C */ lw $v0, 0xc($a0)
/* 80088C 8024000C 0C0B1EAF */ jal get_variable
/* 800890 80240010 8C450000 */ lw $a1, ($v0)
/* 800894 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr)
/* 800898 80240018 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1)
/* 80089C 8024001C 8C630140 */ lw $v1, 0x140($v1)
/* 8008A0 80240020 00021100 */ sll $v0, $v0, 4
/* 8008A4 80240024 00431021 */ addu $v0, $v0, $v1
/* 8008A8 80240028 8C440000 */ lw $a0, ($v0)
/* 8008AC 8024002C 0C04D052 */ jal set_item_entity_flags
/* 8008B0 80240030 24050040 */ addiu $a1, $zero, 0x40
/* 8008B4 80240034 8FBF0010 */ lw $ra, 0x10($sp)
/* 8008B8 80240038 24020002 */ addiu $v0, $zero, 2
/* 8008BC 8024003C 03E00008 */ jr $ra
/* 8008C0 80240040 27BD0018 */ addiu $sp, $sp, 0x18

37
asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s
View File

@ -1,37 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240044_8008C4
/* 8008C4 80240044 27BDFFE0 */ addiu $sp, $sp, -0x20
/* 8008C8 80240048 AFBF0018 */ sw $ra, 0x18($sp)
/* 8008CC 8024004C AFB10014 */ sw $s1, 0x14($sp)
/* 8008D0 80240050 AFB00010 */ sw $s0, 0x10($sp)
/* 8008D4 80240054 8C82000C */ lw $v0, 0xc($a0)
/* 8008D8 80240058 0C0B1EAF */ jal get_variable
/* 8008DC 8024005C 8C450000 */ lw $a1, ($v0)
/* 8008E0 80240060 0000202D */ daddu $a0, $zero, $zero
/* 8008E4 80240064 3C05FD05 */ lui $a1, 0xfd05
/* 8008E8 80240068 34A50F82 */ ori $a1, $a1, 0xf82
/* 8008EC 8024006C 0C0B1EAF */ jal get_variable
/* 8008F0 80240070 0040802D */ daddu $s0, $v0, $zero
/* 8008F4 80240074 3C038007 */ lui $v1, %hi(gGameStatusPtr)
/* 8008F8 80240078 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1)
/* 8008FC 8024007C 24050040 */ addiu $a1, $zero, 0x40
/* 800900 80240080 8C640140 */ lw $a0, 0x140($v1)
/* 800904 80240084 00101900 */ sll $v1, $s0, 4
/* 800908 80240088 00641821 */ addu $v1, $v1, $a0
/* 80090C 8024008C 8C640000 */ lw $a0, ($v1)
/* 800910 80240090 0C04D052 */ jal set_item_entity_flags
/* 800914 80240094 0040882D */ daddu $s1, $v0, $zero
/* 800918 80240098 0000202D */ daddu $a0, $zero, $zero
/* 80091C 8024009C 00108080 */ sll $s0, $s0, 2
/* 800920 802400A0 02118021 */ addu $s0, $s0, $s1
/* 800924 802400A4 8E050000 */ lw $a1, ($s0)
/* 800928 802400A8 0C0B2026 */ jal set_variable
/* 80092C 802400AC 24060001 */ addiu $a2, $zero, 1
/* 800930 802400B0 8FBF0018 */ lw $ra, 0x18($sp)
/* 800934 802400B4 8FB10014 */ lw $s1, 0x14($sp)
/* 800938 802400B8 8FB00010 */ lw $s0, 0x10($sp)
/* 80093C 802400BC 24020002 */ addiu $v0, $zero, 2
/* 800940 802400C0 03E00008 */ jr $ra
/* 800944 802400C4 27BD0020 */ addiu $sp, $sp, 0x20

8
asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024203C_8028BC
/* 8028BC 8024203C 3C018015 */ lui $at, %hi(D_80151310)
/* 8028C0 80242040 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 8028C4 80242044 03E00008 */ jr $ra
/* 8028C8 80242048 24020002 */ addiu $v0, $zero, 2

6
asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s
View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80243AA0_804320
/* 804320 80243AA0 03E00008 */ jr $ra
/* 804324 80243AA4 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802418EC_824BAC
/* 824BAC 802418EC 3C018015 */ lui $at, %hi(D_80151310)
/* 824BB0 802418F0 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 824BB4 802418F4 03E00008 */ jr $ra
/* 824BB8 802418F8 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802405DC_831DDC
/* 831DDC 802405DC 3C018015 */ lui $at, %hi(D_80151310)
/* 831DE0 802405E0 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 831DE4 802405E4 03E00008 */ jr $ra
/* 831DE8 802405E8 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024058C_84315C
/* 84315C 8024058C 3C018015 */ lui $at, %hi(D_80151310)
/* 843160 80240590 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 843164 80240594 03E00008 */ jr $ra
/* 843168 80240598 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_mac/mac_05/852170/func_8024144C_8535BC.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024144C_8535BC
/* 8535BC 8024144C 3C018015 */ lui $at, %hi(D_80151310)
/* 8535C0 80241450 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 8535C4 80241454 03E00008 */ jr $ra
/* 8535C8 80241458 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240E94_9C6274
/* 9C6274 80240E94 3C018015 */ lui $at, %hi(D_80151310)
/* 9C6278 80240E98 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 9C627C 80240E9C 03E00008 */ jr $ra
/* 9C6280 80240EA0 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80241A3C_9D8A5C
/* 9D8A5C 80241A3C 3C018015 */ lui $at, %hi(D_80151310)
/* 9D8A60 80241A40 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* 9D8A64 80241A44 03E00008 */ jr $ra
/* 9D8A68 80241A48 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024082C_CF839C.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024082C_CF839C
/* CF839C 8024082C 3C018015 */ lui $at, %hi(D_80151310)
/* CF83A0 80240830 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* CF83A4 80240834 03E00008 */ jr $ra
/* CF83A8 80240838 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C58_D06388.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240C58_D06388
/* D06388 80240C58 3C018015 */ lui $at, %hi(D_80151310)
/* D0638C 80240C5C AC201310 */ sw $zero, %lo(D_80151310)($at)
/* D06390 80240C60 03E00008 */ jr $ra
/* D06394 80240C64 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240554_D3AB24.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240554_D3AB24
/* D3AB24 80240554 3C018015 */ lui $at, %hi(D_80151310)
/* D3AB28 80240558 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* D3AB2C 8024055C 03E00008 */ jr $ra
/* D3AB30 80240560 24020002 */ addiu $v0, $zero, 2

8
asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408FC_D3AECC.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802408FC_D3AECC
/* D3AECC 802408FC 3C018015 */ lui $at, %hi(D_80151310)
/* D3AED0 80240900 AC201310 */ sw $zero, %lo(D_80151310)($at)
/* D3AED4 80240904 03E00008 */ jr $ra
/* D3AED8 80240908 24020002 */ addiu $v0, $zero, 2

2
include/common_structs.h
View File

@ -916,7 +916,7 @@ typedef struct GameStatus {
/* 0x136 */ char unk_136[2]; /* 0x136 */ char unk_136[2];
/* 0x138 */ s32 nextRNG; /* 0x138 */ s32 nextRNG;
/* 0x13C */ char unk_13C[4]; /* 0x13C */ char unk_13C[4];
/* 0x140 */ UNK_PTR shopItemData; /* 0x140 */ s32* shopItemData;
/* 0x144 */ struct Shop* mapShop; /* 0x144 */ struct Shop* mapShop;
/* 0x148 */ s16 enableBackground; /* (bit 2 is also used for something) */ /* 0x148 */ s16 enableBackground; /* (bit 2 is also used for something) */
/* 0x14A */ s16 backgroundMinW; /* 0x14A */ s16 backgroundMinW;

2
include/functions.h
View File

@ -97,7 +97,7 @@ void make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 unk1, s32 unk
void set_item_entity_position(s32 itemEntityIndex, f32 x, f32 y, f32 z); void set_item_entity_position(s32 itemEntityIndex, f32 x, f32 y, f32 z);
ItemEntity* get_item_entity(s32 itemEntityIndex); ItemEntity* get_item_entity(s32 itemEntityIndex);
s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, ItemSpawnMode itemSpawnMode, s32 pickupVar); s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, ItemSpawnMode itemSpawnMode, s32 pickupVar);
void set_item_entity_flags(s32 itemEntityIndex, s32 flag);
void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height); void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height);

1
src/code_7E2AA0.c
View File

@ -96,6 +96,7 @@ ApiStatus func_80282610(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2; return ApiStatus_DONE2;
} }
// common probably
ApiStatus func_80282624(ScriptInstance* script, s32 isInitialCall) { ApiStatus func_80282624(ScriptInstance* script, s32 isInitialCall) {
D_80151310 = 0; D_80151310 = 0;
return ApiStatus_DONE2; return ApiStatus_DONE2;

2
src/code_b72b0_len_15ed0.c
View File

@ -232,7 +232,7 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", test_item_player_collision);
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80133FC8); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80133FC8);
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_item_entity_flags); INCLUDE_ASM(void, "code_b72b0_len_15ed0", set_item_entity_flags, s32 itemEntityIndex, s32 flag);
INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_item_entity_flags); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_item_entity_flags);

2
src/world/area_dro/dro_01/95B7E0.c
View File

@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470_95C670);
INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241588_95C788); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241588_95C788);
INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024159C_95C79C); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC);

2
src/world/area_dro/dro_02/9694C0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240300_9694C0);
INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240418_9695D8); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240418_9695D8);
INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024042C_9695EC); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC);

2
src/world/area_hos/hos_03/A1BDB0.c
View File

@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4);
INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425BC_A1D6BC); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425BC_A1D6BC);
INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425D0_A1D6D0); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0);

2
src/world/area_jan/jan_02/B2C8A0.c
View File

@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84);
INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024172C_B2DB9C); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024172C_B2DB9C);
INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241740_B2DBB0); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0);

2
src/world/area_jan/jan_03/B34BD0.c
View File

@ -84,7 +84,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C);
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CB4_B36884); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CB4_B36884);
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CC8_B36898); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8);

2
src/world/area_kmr/kmr_02/8B0070.c
View File

@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400);
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404A8_8B0518); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404A8_8B0518);
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404BC_8B052C); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C);

2
src/world/area_mac/mac_00/7EB340.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340);
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240748_7EB458); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240748_7EB458);
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024075C_7EB46C); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C);

16
src/world/area_mac/mac_01/800880.c
View File

@ -1,7 +1,19 @@
#include "mac_01.h" #include "mac_01.h"
INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_80240000_800880); ApiStatus func_80240000_800880(ScriptInstance* script, s32 isInitialCall) {
s32 itemIndex = get_variable(script, *script->ptrReadPos);
INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_80240044_8008C4); set_item_entity_flags(GAME_STATUS->shopItemData[itemIndex * 4], 0x40);
return ApiStatus_DONE2;
}
ApiStatus func_80240044_8008C4(ScriptInstance* script, s32 isInitialCall) {
s32 itemIndex = get_variable(script, *script->ptrReadPos);
s32* var1 = get_variable(NULL, SI_MAP_VAR(2));
set_item_entity_flags(GAME_STATUS->shopItemData[itemIndex * 4], 0x40);
set_variable(NULL, var1[itemIndex], 1);
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_802400C8_800948); INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_802400C8_800948);

6
src/world/area_mac/mac_01/8017D0.c
View File

@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790);
INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242028_8028A8); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242028_8028A8);
INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024203C_8028BC); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC);
@ -116,7 +116,9 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A3C_8042BC);
INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A70_8042F0); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A70_8042F0);
INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243AA0_804320); ApiStatus func_80243AA0_804320(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#include "world/common/GetNpcCollisionHeight.inc.c" #include "world/common/GetNpcCollisionHeight.inc.c"

2
src/world/area_mac/mac_02/823BF0.c
View File

@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80);
INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418D8_824B98); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418D8_824B98);
INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418EC_824BAC); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC);

2
src/world/area_mac/mac_03/831B20.c
View File

@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0);
INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405C8_831DC8); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405C8_831DC8);
INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405DC_831DDC); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC);

2
src/world/area_mac/mac_04/843030.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030);
INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240578_843148); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240578_843148);
INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024058C_84315C); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C);

2
src/world/area_mac/mac_05/852170.c
View File

@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490);
INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241438_8535A8); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241438_8535A8);
INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024144C_8535BC); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC);

2
src/world/area_nok/nok_01/9C53E0.c
View File

@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", delete_player_actor_9C6148);
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E80_9C6260); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E80_9C6260);
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E94_9C6274); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284);

2
src/world/area_nok/nok_02/9D7AA0.c
View File

@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930);
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A28_9D8A48); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A28_9D8A48);
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A3C_9D8A5C); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C);

2
src/world/area_sam/sam_01/CF7E80.c
View File

@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270);
INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240818_CF8388); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240818_CF8388);
INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024082C_CF839C); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC);

2
src/world/area_sam/sam_02/D05F60.c
View File

@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C);
INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C44_D06374); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C44_D06374);
INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C58_D06388); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398);

2
src/world/area_sam/sam_11/D3A930.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024052C_D3AAFC);
INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240540_D3AB10); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240540_D3AB10);
INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240554_D3AB24); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240564_D3AB34); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240564_D3AB34);

2
src/world/area_sam/sam_11/D3ADA0.c
View File

@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0);
INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408E8_D3AEB8); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408E8_D3AEB8);
INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408FC_D3AECC); #include "world/common/Set80151310_0.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC);

6
src/world/common/Set80151310_0.inc.c Normal file
View File

@ -0,0 +1,6 @@
#include "common.h"
static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
D_80151310 = 0;
return ApiStatus_DONE2;
}