falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Camera0MoveFlag1

This commit is contained in:
Ethan Roseman 2020-10-30 19:25:07 -04:00
parent a840d81a29
commit fc5dcf43ea
31 changed files with 38 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s
View File

@ -1,11 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024033C_8C82CC
/* 8C82CC 8024033C 3C03800B */ lui $v1, %hi(gCameras)
/* 8C82D0 80240340 24631D80 */ addiu $v1, $v1, %lo(gCameras)
/* 8C82D4 80240344 94620002 */ lhu $v0, 2($v1)
/* 8C82D8 80240348 34420001 */ ori $v0, $v0, 1
/* 8C82DC 8024034C A4620002 */ sh $v0, 2($v1)
/* 8C82E0 80240350 03E00008 */ jr $ra
/* 8C82E4 80240354 24020002 */ addiu $v0, $zero, 2

11
asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s
View File

@ -1,11 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80242D1C_C63A2C
/* C63A2C 80242D1C 3C03800B */ lui $v1, %hi(gCameras)
/* C63A30 80242D20 24631D80 */ addiu $v1, $v1, %lo(gCameras)
/* C63A34 80242D24 94620002 */ lhu $v0, 2($v1)
/* C63A38 80242D28 34420001 */ ori $v0, $v0, 1
/* C63A3C 80242D2C A4620002 */ sh $v0, 2($v1)
/* C63A40 80242D30 03E00008 */ jr $ra
/* C63A44 80242D34 24020002 */ addiu $v0, $zero, 2

11
asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s
View File

@ -1,11 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024001C_BBD1BC
/* BBD1BC 8024001C 3C03800B */ lui $v1, %hi(gCameras)
/* BBD1C0 80240020 24631D80 */ addiu $v1, $v1, %lo(gCameras)
/* BBD1C4 80240024 94620002 */ lhu $v0, 2($v1)
/* BBD1C8 80240028 34420001 */ ori $v0, $v0, 1
/* BBD1CC 8024002C A4620002 */ sh $v0, 2($v1)
/* BBD1D0 80240030 03E00008 */ jr $ra
/* BBD1D4 80240034 24020002 */ addiu $v0, $zero, 2

11
asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s
View File

@ -1,11 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024001C_BCD07C
/* BCD07C 8024001C 3C03800B */ lui $v1, %hi(gCameras)
/* BCD080 80240020 24631D80 */ addiu $v1, $v1, %lo(gCameras)
/* BCD084 80240024 94620002 */ lhu $v0, 2($v1)
/* BCD088 80240028 34420001 */ ori $v0, $v0, 1
/* BCD08C 8024002C A4620002 */ sh $v0, 2($v1)
/* BCD090 80240030 03E00008 */ jr $ra
/* BCD094 80240034 24020002 */ addiu $v0, $zero, 2

13
asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s
View File

@ -1,13 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_8024001C_D9D4EC
/* D9D4EC 8024001C 3C03800B */ lui $v1, %hi(gCameras)
/* D9D4F0 80240020 24631D80 */ addiu $v1, $v1, %lo(gCameras)
/* D9D4F4 80240024 94620002 */ lhu $v0, 2($v1)
/* D9D4F8 80240028 34420001 */ ori $v0, $v0, 1
/* D9D4FC 8024002C A4620002 */ sh $v0, 2($v1)
/* D9D500 80240030 03E00008 */ jr $ra
/* D9D504 80240034 24020002 */ addiu $v0, $zero, 2
/* D9D508 80240038 00000000 */ nop
/* D9D50C 8024003C 00000000 */ nop

11
asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s
View File

@ -1,11 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802402D8_DAD6D8
/* DAD6D8 802402D8 3C03800B */ lui $v1, %hi(gCameras)
/* DAD6DC 802402DC 24631D80 */ addiu $v1, $v1, %lo(gCameras)
/* DAD6E0 802402E0 94620002 */ lhu $v0, 2($v1)
/* DAD6E4 802402E4 34420001 */ ori $v0, $v0, 1
/* DAD6E8 802402E8 A4620002 */ sh $v0, 2($v1)
/* DAD6EC 802402EC 03E00008 */ jr $ra
/* DAD6F0 802402F0 24020002 */ addiu $v0, $zero, 2

14
asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s
View File

@ -1,14 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802431F8_DC04A8
/* DC04A8 802431F8 3C03800B */ lui $v1, %hi(gCameras)
/* DC04AC 802431FC 24631D80 */ addiu $v1, $v1, %lo(gCameras)
/* DC04B0 80243200 94620002 */ lhu $v0, 2($v1)
/* DC04B4 80243204 34420001 */ ori $v0, $v0, 1
/* DC04B8 80243208 A4620002 */ sh $v0, 2($v1)
/* DC04BC 8024320C 03E00008 */ jr $ra
/* DC04C0 80243210 24020002 */ addiu $v0, $zero, 2
/* DC04C4 80243214 00000000 */ nop
/* DC04C8 80243218 00000000 */ nop
/* DC04CC 8024321C 00000000 */ nop

11
asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s
View File

@ -1,11 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240580_D3AB50
/* D3AB50 80240580 3C03800B */ lui $v1, %hi(gCameras)
/* D3AB54 80240584 24631D80 */ addiu $v1, $v1, %lo(gCameras)
/* D3AB58 80240588 94620002 */ lhu $v0, 2($v1)
/* D3AB5C 8024058C 34420001 */ ori $v0, $v0, 1
/* D3AB60 80240590 A4620002 */ sh $v0, 2($v1)
/* D3AB64 80240594 03E00008 */ jr $ra
/* D3AB68 80240598 24020002 */ addiu $v0, $zero, 2

2
src/world/area_flo/flo_21/CE7240.c
View File

@ -2,4 +2,4 @@
INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240B40_CE7240);
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"

2
src/world/area_hos/hos_01/A11650.c
View File

@ -1,5 +1,5 @@
#include "hos_01.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DEC_A1166C);

4
src/world/area_kmr/kmr_03/8C82B0.c
View File

@ -1,8 +1,8 @@
#include "kmr_03.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_8024033C_8C82CC);
#include "world/common/SetCamera0MoveFlag1.inc.c"
ApiStatus func_80240358_8C82E8(ScriptInstance* script, s32 isInitialCall) {
PlayerStatus* playerStatus = PLAYER_STATUS;

2
src/world/area_kpa/kpa_08/A4CA20.c
View File

@ -1,5 +1,5 @@
#include "kpa_08.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CA20", func_8024001C_A4CA3C);

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

@ -1,5 +1,5 @@
#include "kpa_09.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F000", func_8024001C_A4F01C);

4
src/world/area_kzn/kzn_03/C63A10.c
View File

@ -1,8 +1,8 @@
#include "kzn_03.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D1C_C63A2C);
#include "world/common/SetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D38_C63A48);

2
src/world/area_kzn/kzn_23/C9C610.c
View File

@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240310_C9C610);
INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240478_C9C778);
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240520_C9C820);

4
src/world/area_obk/obk_01/BBD1A0.c
View File

@ -1,8 +1,8 @@
#include "obk_01.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_8024001C_BBD1BC);
#include "world/common/SetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240038_BBD1D8);

4
src/world/area_obk/obk_05/BCD060.c
View File

@ -1,8 +1,8 @@
#include "obk_05.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_8024001C_BCD07C);
#include "world/common/SetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_80240038_BCD098);

4
src/world/area_omo/omo_02/D9D4D0.c
View File

@ -1,5 +1,5 @@
#include "omo_02.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D4D0", func_8024001C_D9D4EC);
#include "world/common/SetCamera0MoveFlag1.inc.c"

2
src/world/area_omo/omo_03/DA5240.c
View File

@ -1,3 +1,3 @@
#include "omo_03.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"

2
src/world/area_omo/omo_03/DA5260.c
View File

@ -1,6 +1,6 @@
#include "omo_03.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024003C_DA527C);

4
src/world/area_omo/omo_04/DAD400.c
View File

@ -8,9 +8,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400);
INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240268_DAD668);
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402D8_DAD6D8);
#include "world/common/SetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402F4_DAD6F4);

2
src/world/area_omo/omo_06/DB7910.c
View File

@ -1,6 +1,6 @@
#include "omo_06.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_8024001C_DB792C);

4
src/world/area_omo/omo_07/DC01D0.c
View File

@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0);
INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438);
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431F8_DC04A8);
#include "world/common/SetCamera0MoveFlag1.inc.c"

2
src/world/area_omo/omo_08/DC43D0.c
View File

@ -1,6 +1,6 @@
#include "omo_08.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_8024001C_DC43EC);

2
src/world/area_omo/omo_10/DD79B0.c
View File

@ -1,6 +1,6 @@
#include "omo_10.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_8024001C_DD79CC);

2
src/world/area_omo/omo_16/DEBED0.c
View File

@ -1,6 +1,6 @@
#include "omo_16.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_8024001C_DEBEEC);

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

@ -1,6 +1,6 @@
#include "omo_17.h"
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_8024001C_DEEEBC);

2
src/world/area_sam/sam_07/D2BD30.c
View File

@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240448_D2C178);
INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0);
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240650_D2C380);

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

@ -15,9 +15,9 @@ static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#include "world/common/SetCamera0MoveFlagNeg1.inc.c"
#include "world/common/UnsetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240580_D3AB50);
#include "world/common/SetCamera0MoveFlag1.inc.c"
INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024059C_D3AB6C);

8
src/world/common/SetCamera0MoveFlag1.inc.c Normal file
View File

@ -0,0 +1,8 @@
#include "common.h"
static ApiStatus SetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) {
Camera* camera = &gCameras[0];
camera->moveFlags |= 1;
return ApiStatus_DONE2;
}

2
src/world/common/SetCamera0MoveFlagNeg1.inc.c → src/world/common/UnsetCamera0MoveFlag1.inc.c
View File

@ -1,6 +1,6 @@
#include "common.h"
static ApiStatus SetCamera0MoveFlagNeg1(ScriptInstance* script, s32 isInitialCall) {
static ApiStatus UnsetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) {
Camera* camera = &gCameras[0];
camera->moveFlags &= ~1;