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 backgroundCloud

This commit is contained in:
Tal Hayon 2022-04-18 00:00:59 +03:00
parent 778173eb4a
commit 8dd7d84cef
4 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/assets.json
View File

@ -42652,16 +42652,6 @@
"size": 31,
"type": "animation"
},
{
"path": "backgroundCloud/gUnk_08121EB0.bin",
"start": 1187504,
"size": 3
},
{
"path": "backgroundCloud/gUnk_08121EB3.bin",
"start": 1187507,
"size": 5
},
{
"path": "furniture/gUnk_08122128.bin",
"start": 1188136,

16
data/const/object/backgroundCloud.s
View File

@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08121EA4:: @ 08121EA4
.4byte sub_0808F658
.4byte sub_0808F6E0
.4byte sub_0808F70C
gUnk_08121EB0:: @ 08121EB0
.incbin "backgroundCloud/gUnk_08121EB0.bin"
gUnk_08121EB3:: @ 08121EB3
.incbin "backgroundCloud/gUnk_08121EB3.bin"

2
linker.ld
View File

@ -1425,7 +1425,7 @@ SECTIONS {
src/object/fileScreenObjects.o(.rodata);
data/animations/object/fileScreenObjects.o(.rodata);
src/object/object49.o(.rodata);
data/const/object/backgroundCloud.o(.rodata);
src/object/backgroundCloud.o(.rodata);
src/object/object4B.o(.rodata);
src/object/pushableFurniture.o(.rodata);
data/const/object/furniture.o(.rodata);

15
src/object/backgroundCloud.c
View File

@ -1,14 +1,20 @@
#include "object.h"
extern void (*const gUnk_08121EA4[])(Entity*);
extern const u8 gUnk_08121EB0[];
extern const u8 gUnk_08121EB3[];
void sub_0808F658(Entity*);
void sub_0808F6E0(Entity*);
void sub_0808F70C(Entity*);
void BackgroundCloud(Entity* this) {
gUnk_08121EA4[this->action](this);
static void (*const actionFuncs[])(Entity*) = {
sub_0808F658,
sub_0808F6E0,
sub_0808F70C,
};
actionFuncs[this->action](this);
}
void sub_0808F658(Entity* this) {
static const u8 gUnk_08121EB0[] = { 0x30, 0x28, 0x20 };
this->action = 1;
this->spriteSettings.draw = 1;
this->spriteOrientation.flipY = 3;
@ -33,6 +39,7 @@ void sub_0808F6E0(Entity* this) {
}
void sub_0808F70C(Entity* this) {
static const u8 gUnk_08121EB3[] = { 0x8, 0x28, 0x48, 0x98, 0 };
if (this->subAction == 0) {
this->subAction = 1;
this->timer = ((Random() & 7) << 3) + 31;