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

lockedDoor.c: move rodata

This commit is contained in:
Ibot02 2021-04-29 17:56:10 +02:00
parent 5eb9894caf
commit da68765792
3 changed files with 67 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
data/const/object/lockedDoor.s
View File

@ -1,31 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0811F65C:: @ 0811F65C
.4byte sub_08083338
.4byte sub_080834B4
.4byte sub_080834EC
.4byte sub_08083518
.4byte sub_08083540
.4byte nullsub_513
.4byte sub_08083598
.4byte sub_080835C8
.4byte sub_080835F8
gUnk_0811F680:: @ 0811F680
.incbin "baserom.gba", 0x11F680, 0x0000008
gUnk_0811F688:: @ 0811F688
.incbin "baserom.gba", 0x11F688, 0x0000008
gUnk_0811F690:: @ 0811F690
.incbin "baserom.gba", 0x11F690, 0x00000A0
gUnk_0811F730:: @ 0811F730
.incbin "baserom.gba", 0x11F730, 0x0000010
gUnk_0811F740:: @ 0811F740
.incbin "baserom.gba", 0x11F740, 0x0000004

2
linker.ld
View File

@ -1414,7 +1414,7 @@ SECTIONS {
data/const/object/object6.o(.rodata);
data/animations/object/object6.o(.rodata);
data/const/object/blockPushed.o(.rodata);
data/const/object/lockedDoor.o(.rodata);
src/object/lockedDoor.o(.rodata);
data/const/object/object9.o(.rodata);
data/animations/object/object9.o(.rodata);
data/const/object/objectB.o(.rodata);

83
src/object/lockedDoor.c
View File

@ -5,44 +5,93 @@
#include "audio.h"
#include "functions.h"
extern void (* const gUnk_0811F65C[])(Entity*);
void sub_08083338(Entity*);
void sub_080834B4(Entity*);
void sub_080834EC(Entity*);
void sub_08083518(Entity*);
void sub_08083540(Entity*);
void nullsub_513(Entity*);
void sub_08083598(Entity*);
void sub_080835C8(Entity*);
void sub_080835F8(Entity*);
void sub_08083638(Entity*);
void sub_08083658(Entity*);
void sub_080836A0(Entity*);
void sub_080836DC(Entity*, u32, u32);
u32 sub_08083734(Entity*, u32);
u32 sub_080837B0(Entity*);
void sub_08083814(Entity*, u32);
void (* const gUnk_0811F65C[])(Entity*) = {
sub_08083338,
sub_080834B4,
sub_080834EC,
sub_08083518,
sub_08083540,
nullsub_513,
sub_08083598,
sub_080835C8,
sub_080835F8
};
void LockedDoor(Entity* this) {
gUnk_0811F65C[this->action](this);
}
extern u32 sub_080837B0(Entity*);
extern Hitbox gUnk_080FD170;
extern void sub_08083638(Entity*);
extern void sub_080836A0(Entity*);
extern u8 gUnk_0811F740[];
extern u32 sub_080001DA(u32, u32);
extern void sub_080836DC(Entity*, u32, u32);
extern void sub_08078850(Entity*, u32, u32, u32);
extern u32 sub_08083734(Entity*, u32);
extern void sub_08083814(Entity*, u32);
extern void sub_08083658(Entity*);
extern void sub_0805E4E0(Entity*, u32);
typedef struct PACKED {
s8 x;
s8 y;
} struct_0811F680;
extern const struct_0811F680 gUnk_0811F680[];
extern const struct_0811F680 gUnk_0811F688[];
extern const u16 gUnk_0811F690[];
const struct_0811F680 gUnk_0811F680[] = {
{0, -2},
{2, 0},
{0, 2},
{-2, 0}
};
const struct_0811F680 gUnk_0811F688[] = {
{0, -21},
{21, 0},
{0, 21},
{-21, 0}
};
const u16 gUnk_0811F690[] = {
0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A,
0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15,
0x52, 0x52, 0x52, 0x52, 0x52, 0x52, 0x52, 0x52,
0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53, 0x53,
0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54, 0x54,
0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55,
0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56, 0x56,
0x57, 0x57, 0x57, 0x57, 0x57, 0x57, 0x57, 0x57,
0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58, 0x58,
0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59, 0x59
};
typedef struct {
struct_0811F680 unk_00;
struct_0811F680 unk_02;
} struct_0811F730;
extern const struct_0811F730 gUnk_0811F730[];
const struct_0811F730 gUnk_0811F730[] = {
{{ 8, 8}, {-8, 8}},
{{-8, 8}, {-8,-8}},
{{ 8,-8}, {-8,-8}},
{{ 8, 8}, { 8,-8}}
};
const u8 gUnk_0811F740[] = {
0xBE, 0x7D, 0xEB, 0xD7
};
void sub_08083338(Entity *this) {
if (this->cutsceneBeh.HWORD != 0xFFFF && CheckFlags(this->cutsceneBeh.HWORD)) {