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

Merge pull request #151 from notyourav/rooms 

merge + fix
This commit is contained in:
notyourav 2021-04-20 21:29:59 -07:00 committed by GitHub
parent aa2540af60 dd249eb456
commit 5dbe7f700f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1186 additions and 1188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/code_080526F8.s
View File

@ -960,7 +960,7 @@ sub_08052E10: @ 0x08052E10
adds r0, r3, r0
ldr r0, [r0]
str r0, [r5, #0x18]
ldr r0, _08052E88 @ =gAreaEntities
ldr r0, _08052E88 @ =gAreaTable
adds r2, r2, r0
ldr r0, [r2]
cmp r0, #0
@ -976,7 +976,7 @@ _08052E78: .4byte gAreaRoomMaps
_08052E7C: .4byte gAreaMetatiles
_08052E80: .4byte gUnk_080B755C
_08052E84: .4byte gUnk_0813A7F0
_08052E88: .4byte gAreaEntities
_08052E88: .4byte gAreaTable
thumb_func_start sub_08052E8C
sub_08052E8C: @ 0x08052E8C

4
asm/non_matching/sub_0804DE00.inc
View File

@ -20,7 +20,7 @@ _0804DE22:
movs r0, #0x18
bl SetGlobalFlag
_0804DE32:
ldr r5, _0804DE50 @ =gAreaRoomEntities_HyruleTown
ldr r5, _0804DE50 @ =Area_HyruleTown
ldr r4, _0804DE54 @ =gSave
ldrb r0, [r4, #8]
lsls r0, r0, #2
@ -35,7 +35,7 @@ _0804DE32:
str r0, [r1]
b _0804DECC
.align 2, 0
_0804DE50: .4byte gAreaRoomEntities_HyruleTown
_0804DE50: .4byte Area_HyruleTown
_0804DE54: .4byte gSave
_0804DE58: .4byte gUnk_02017654
_0804DE5C:

1024
data/data_080D5360.s
View File

File diff suppressed because it is too large Load Diff

1324
data/entity_headers.s
View File

File diff suppressed because it is too large Load Diff

6
src/loadRoom.c
View File

@ -10,7 +10,7 @@ extern Entity* LoadRoomEntity(EntityData*);
extern void* GetRoomProperty(u32, u32, u32);
extern u32 gUnk_02017654;
extern u32* gAreaEntities;
extern u32* gAreaTable;
extern void sub_080186EC();
extern void sub_0804B16C();
@ -74,7 +74,7 @@ void sub_0804B0B0(u32 arg0, u32 arg1) {
void SetCurrentRoomPropertyList(u32 arg0, u32 arg1) {
u32** arr;
gUnk_02017654 = 0;
arr = &gAreaEntities;
arr = &gAreaTable;
if (arr[arg0] != 0) {
gUnk_02017654 = arr[arg0][arg1];
}
@ -94,7 +94,7 @@ void* GetRoomProperty(u32 arg0, u32 arg1, u32 arg2) {
u32 temp;
u32** arr;
temp = 0;
arr = &gAreaEntities;
arr = &gAreaTable;
if (arr[arg0] != NULL) {
temp = arr[arg0][arg1];
if (temp != 0) {

12
src/room.c
View File

@ -5595,7 +5595,7 @@ extern void sub_0804F5E8();
extern u32 gUnk_080F7C80;
extern void sub_0804F4E4();
u32 sub_0804F468(void) {
u32 Vars_HyruleField_OutsideCastle(void) {
if (CheckGlobalFlag(TABIDACHI) && !GetInventoryValue(0x11)) {
gRoomVars.field_0x6c = &gUnk_080F7CD0;
gRoomVars.field_0x88 = sub_0804F5E8;
@ -5618,7 +5618,7 @@ void sub_0804F4E4() {
extern EntityData gUnk_080F7D70;
void sub_0804F4F4(void) {
void Load_HyruleField_OutsideCastle(void) {
sub_0804F4E4();
if (!CheckLocalFlag(0x8b)) {
LoadRoomEntityList(&gUnk_080F7D70);
@ -5781,13 +5781,13 @@ void sub_0804F9C8(void) {
sub_0807BA8C(0x4d9, 1);
}
u32 sub_0804F9FC() {
u32 Vars_HyruleField_OutsideCastleWest() {
return 1;
}
extern EntityData gUnk_080F806C;
void sub_0804FA00(void) {
void Load_HyruleField_OutsideCastleWest(void) {
sub_0805ADD8(0);
if ((gSave.unk8 > 3) && CheckGlobalFlag(TINGLE_TALK1ST)) {
@ -5795,13 +5795,13 @@ void sub_0804FA00(void) {
}
}
u32 sub_0804FA2C() {
u32 Vars_HyruleField_TrilbyHighlands() {
return 1;
}
extern EntityData gUnk_080F82E0;
void sub_0804FA30(void) {
void Load_HyruleField_TrilbyHighlands(void) {
sub_0805ADD8(0);
if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x9c)) {