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

rename bActorCamOffsets to bActorOffsets

Browse Source
This commit is contained in:
Alex Bates 2021-02-10 23:35:37 +00:00
parent 8f1fac4e17
commit 545eeb3591
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/nonmatchings/battle/partner/goombario_6F10E0/func_80238BCC_6F1CAC.s generated
View File

@ -121,9 +121,9 @@ glabel func_80238BCC_6F1CAC
/* 6F1E6C 80238D8C AE020090 */ sw $v0, 0x90($s0) /* 6F1E6C 80238D8C AE020090 */ sw $v0, 0x90($s0)
/* 6F1E70 80238D90 90820136 */ lbu $v0, 0x136($a0) /* 6F1E70 80238D90 90820136 */ lbu $v0, 0x136($a0)
/* 6F1E74 80238D94 00021080 */ sll $v0, $v0, 2 /* 6F1E74 80238D94 00021080 */ sll $v0, $v0, 2
/* 6F1E78 80238D98 3C038028 */ lui $v1, %hi(bActorCamOffsets) /* 6F1E78 80238D98 3C038028 */ lui $v1, %hi(bActorOffsets)
/* 6F1E7C 80238D9C 00621821 */ addu $v1, $v1, $v0 /* 6F1E7C 80238D9C 00621821 */ addu $v1, $v1, $v0
/* 6F1E80 80238DA0 80632EE8 */ lb $v1, %lo(bActorCamOffsets)($v1) /* 6F1E80 80238DA0 80632EE8 */ lb $v1, %lo(bActorOffsets)($v1)
/* 6F1E84 80238DA4 8E020084 */ lw $v0, 0x84($s0) /* 6F1E84 80238DA4 8E020084 */ lw $v0, 0x84($s0)
/* 6F1E88 80238DA8 00431021 */ addu $v0, $v0, $v1 /* 6F1E88 80238DA8 00431021 */ addu $v0, $v0, $v1
/* 6F1E8C 80238DAC AE020084 */ sw $v0, 0x84($s0) /* 6F1E8C 80238DAC AE020084 */ sw $v0, 0x84($s0)

4
asm/nonmatchings/code_182B30/update_actor_shadow.s generated
View File

@ -347,9 +347,9 @@ glabel update_actor_shadow
/* 1847A0 80255EC0 E6220014 */ swc1 $f2, 0x14($s1) /* 1847A0 80255EC0 E6220014 */ swc1 $f2, 0x14($s1)
/* 1847A4 80255EC4 92420136 */ lbu $v0, 0x136($s2) /* 1847A4 80255EC4 92420136 */ lbu $v0, 0x136($s2)
/* 1847A8 80255EC8 00021080 */ sll $v0, $v0, 2 /* 1847A8 80255EC8 00021080 */ sll $v0, $v0, 2
/* 1847AC 80255ECC 3C018028 */ lui $at, %hi(bActorCamOffsets+3) /* 1847AC 80255ECC 3C018028 */ lui $at, %hi(bActorOffsets+3)
/* 1847B0 80255ED0 00220821 */ addu $at, $at, $v0 /* 1847B0 80255ED0 00220821 */ addu $at, $at, $v0
/* 1847B4 80255ED4 80222EEB */ lb $v0, %lo(bActorCamOffsets+3)($at) /* 1847B4 80255ED4 80222EEB */ lb $v0, %lo(bActorOffsets+3)($at)
/* 1847B8 80255ED8 C7A00020 */ lwc1 $f0, 0x20($sp) /* 1847B8 80255ED8 C7A00020 */ lwc1 $f0, 0x20($sp)
/* 1847BC 80255EDC 44821000 */ mtc1 $v0, $f2 /* 1847BC 80255EDC 44821000 */ mtc1 $v0, $f2
/* 1847C0 80255EE0 00000000 */ nop /* 1847C0 80255EE0 00000000 */ nop

4
asm/nonmatchings/code_6F10E0/func_80238BCC_6F1CAC.s generated
View File

@ -121,9 +121,9 @@ glabel func_80238BCC_6F1CAC
/* 6F1E6C 80238D8C AE020090 */ sw $v0, 0x90($s0) /* 6F1E6C 80238D8C AE020090 */ sw $v0, 0x90($s0)
/* 6F1E70 80238D90 90820136 */ lbu $v0, 0x136($a0) /* 6F1E70 80238D90 90820136 */ lbu $v0, 0x136($a0)
/* 6F1E74 80238D94 00021080 */ sll $v0, $v0, 2 /* 6F1E74 80238D94 00021080 */ sll $v0, $v0, 2
/* 6F1E78 80238D98 3C038028 */ lui $v1, %hi(bActorCamOffsets) /* 6F1E78 80238D98 3C038028 */ lui $v1, %hi(bActorOffsets)
/* 6F1E7C 80238D9C 00621821 */ addu $v1, $v1, $v0 /* 6F1E7C 80238D9C 00621821 */ addu $v1, $v1, $v0
/* 6F1E80 80238DA0 80632EE8 */ lb $v1, %lo(bActorCamOffsets)($v1) /* 6F1E80 80238DA0 80632EE8 */ lb $v1, %lo(bActorOffsets)($v1)
/* 6F1E84 80238DA4 8E020084 */ lw $v0, 0x84($s0) /* 6F1E84 80238DA4 8E020084 */ lw $v0, 0x84($s0)
/* 6F1E88 80238DA8 00431021 */ addu $v0, $v0, $v1 /* 6F1E88 80238DA8 00431021 */ addu $v0, $v0, $v1
/* 6F1E8C 80238DAC AE020084 */ sw $v0, 0x84($s0) /* 6F1E8C 80238DAC AE020084 */ sw $v0, 0x84($s0)

2
src/code_190B20.c
View File

@ -653,7 +653,7 @@ MessageID bActorTattles[ACTOR_TYPE_COUNT] = {
/* 0xD3 */ MSG_actor_slot_machine_start_tattle, /* 0xD3 */ MSG_actor_slot_machine_start_tattle,
}; };
ActorOffsets bActorCamOffsets[ACTOR_TYPE_COUNT] = { ActorOffsets bActorOffsets[ACTOR_TYPE_COUNT] = {
/* 0x00 */ { .tattleCam = { 0, 0, 0 }, .shadow = 0 }, /* 0x00 */ { .tattleCam = { 0, 0, 0 }, .shadow = 0 },
/* 0x01 */ { .tattleCam = { 0, 0, 0 }, .shadow = 0 }, /* 0x01 */ { .tattleCam = { 0, 0, 0 }, .shadow = 0 },
/* 0x02 */ { .tattleCam = { 0, 5, 0 }, .shadow = 0 }, /* 0x02 */ { .tattleCam = { 0, 5, 0 }, .shadow = 0 },

2
tools/symbol_addrs.txt
View File

@ -11948,7 +11948,7 @@ func_8004D428 = 0x8004D428; // type:func
func_802CCCB0 = 0x802CCCB0; // type:func func_802CCCB0 = 0x802CCCB0; // type:func
func_802CABE8 = 0x802CABE8; // type:func func_802CABE8 = 0x802CABE8; // type:func
func_802CAE50 = 0x802CAE50; // type:func func_802CAE50 = 0x802CAE50; // type:func
bActorCamOffsets = 0x80282ee8; // type:data size:0x350 bActorOffsets = 0x80282ee8; // type:data size:0x350
bActorTattles = 0x80282b98; // type:data size:0x350 bActorTattles = 0x80282b98; // type:data size:0x350
bActorSoundTable = 0x80281468; // type:data size:0x1730 bActorSoundTable = 0x80281468; // type:data size:0x1730
bActorNames = 0x80281104; // type:data rom:0x1AF9E4 bActorNames = 0x80281104; // type:data rom:0x1AF9E4