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

Put const data in phonograh

This commit is contained in:
Tal Hayon 2022-04-16 18:47:51 +03:00
parent 90442081c4
commit f377233075
4 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/assets.json
View File

@ -39945,11 +39945,6 @@
"size": 7, "size": 7,
"type": "animation" "type": "animation"
}, },
{
"path": "phonograph/gUnk_081145E4.bin",
"start": 1132004,
"size": 212
},
{ {
"path": "npc58/gUnk_081146B8.bin", "path": "npc58/gUnk_081146B8.bin",
"start": 1132216, "start": 1132216,

8
data/const/npc/phonograph.s
View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081145E4:: @ 081145E4
.incbin "phonograph/gUnk_081145E4.bin"

2
linker.ld
View File

@ -1296,7 +1296,7 @@ SECTIONS {
data/animations/npc/hurdyGurdyMan.o(.rodata); data/animations/npc/hurdyGurdyMan.o(.rodata);
src/npc/cucco.o(.rodata); src/npc/cucco.o(.rodata);
src/npc/cuccoChick.o(.rodata); src/npc/cuccoChick.o(.rodata);
data/const/npc/phonograph.o(.rodata); src/npc/phonograph.o(.rodata);
data/const/npc/npc58.o(.rodata); data/const/npc/npc58.o(.rodata);
src/npcDefinitions.o(.rodata); src/npcDefinitions.o(.rodata);
data/data_081146D0.o(.rodata); data/data_081146D0.o(.rodata);

26
src/npc/phonograph.c
View File

@ -14,7 +14,6 @@ void sub_0806EABC(Entity* this, u32 param);
#endif #endif
extern Font gUnk_081146B8; extern Font gUnk_081146B8;
extern s8 gUnk_081145E4[];
void Phonograph(Entity* this) { void Phonograph(Entity* this) {
if (this->action == 0) { if (this->action == 0) {
@ -29,6 +28,15 @@ void Phonograph(Entity* this) {
HandleEntity0x82Actions(this); HandleEntity0x82Actions(this);
} }
static const s16 gUnk_081145E4[] = {
0x0, -0x1, 0x3, 0x1c8, 0x4, 0x171, 0x5, 0x236, 0x6, -0x1, 0xa, -0x1, 0xc, 0x23a, 0xd, -0x1, 0xe, -0x1,
0xf, -0x1, 0x13, -0x1, 0x14, -0x1, 0x15, -0x1, 0x16, -0x1, 0x17, -0x1, 0x18, -0x1, 0x19, -0x1, 0x1a, -0x1,
0x1c, -0x1, 0x1d, -0x1, 0x20, -0x1, 0x2d, -0x1, 0x2e, -0x1, 0x2f, -0x1, 0x33, -0x1, 0x35, -0x1, 0x37, -0x1,
0x38, -0x1, 0x3a, -0x1, 0x1, -0x1, 0x9, 0x320e, 0xb, -0x1, 0x11, -0x1, 0x1e, -0x1, 0x1f, -0x1, 0x21, -0x1,
0x22, -0x1, 0x23, -0x1, 0x24, -0x1, 0x25, -0x1, 0x26, -0x1, 0x27, -0x1, 0x28, -0x1, 0x29, -0x1, 0x2a, -0x1,
0x2b, -0x1, 0x2c, -0x1, 0x30, -0x1, 0x31, -0x1, 0x32, -0x1, 0x34, -0x1, 0x36, -0x1, 0x3b, -0x1
};
#ifdef EU #ifdef EU
void sub_0806E964(Entity* this, ScriptExecutionContext* context) { void sub_0806E964(Entity* this, ScriptExecutionContext* context) {
if (gInput.newKeys & B_BUTTON) { if (gInput.newKeys & B_BUTTON) {
@ -73,13 +81,13 @@ void sub_0806E964(Entity* this, ScriptExecutionContext* context) {
if (gInput.newKeys & A_BUTTON) { if (gInput.newKeys & A_BUTTON) {
if ((s16)this->field_0x68.HWORD != (s16)this->field_0x6a.HWORD || (s16)this->field_0x6c.HWORD == 0) { if ((s16)this->field_0x68.HWORD != (s16)this->field_0x6a.HWORD || (s16)this->field_0x6c.HWORD == 0) {
s8* ptr2 = gUnk_081145E4; const s16* ptr2 = gUnk_081145E4;
s32 field_0x68; s32 field_0x68;
SoundReq(*(s16*)(ptr2 + (s16)this->field_0x68.HWORD * 4)); SoundReq(*(ptr2 + (s16)this->field_0x68.HWORD * 2));
this->field_0x6a.HWORD = this->field_0x68.HWORD; this->field_0x6a.HWORD = this->field_0x68.HWORD;
field_0x68 = (s16)this->field_0x68.HWORD * 4; field_0x68 = (s16)this->field_0x68.HWORD * 4;
ptr2 += 2; ptr2++;
this->field_0x6c.HWORD = *(s16*)(((ptr2 + field_0x68))); this->field_0x6c.HWORD = *(s16*)((((int)ptr2 + field_0x68)));
} else { } else {
SoundReq(SONG_STOP_ALL); SoundReq(SONG_STOP_ALL);
this->field_0x6a.HWORD = 0; this->field_0x6a.HWORD = 0;
@ -155,13 +163,13 @@ void sub_0806E964(Entity* this, ScriptExecutionContext* context) {
if (gInput.newKeys & A_BUTTON) { if (gInput.newKeys & A_BUTTON) {
if ((s16)this->field_0x68.HWORD != (s16)this->field_0x6a.HWORD || (s16)this->field_0x6c.HWORD == 0) { if ((s16)this->field_0x68.HWORD != (s16)this->field_0x6a.HWORD || (s16)this->field_0x6c.HWORD == 0) {
s8* ptr2 = gUnk_081145E4; const s16* ptr2 = gUnk_081145E4;
s32 field_0x68; s32 field_0x68;
SoundReq(*(s16*)(ptr2 + (s16)this->field_0x68.HWORD * 4)); SoundReq(*(ptr2 + (s16)this->field_0x68.HWORD * 2));
this->field_0x6a.HWORD = this->field_0x68.HWORD; this->field_0x6a.HWORD = this->field_0x68.HWORD;
field_0x68 = (s16)this->field_0x68.HWORD * 4; field_0x68 = (s16)this->field_0x68.HWORD * 4;
ptr2 += 2; ptr2++;
this->field_0x6c.HWORD = *(s16*)(((ptr2 + field_0x68))); this->field_0x6c.HWORD = *(s16*)((((int)ptr2 + field_0x68)));
} else { } else {
SoundReq(SONG_STOP_ALL); SoundReq(SONG_STOP_ALL);
this->field_0x6a.HWORD = 0; this->field_0x6a.HWORD = 0;