diff --git a/config/GMPE01_00/rels/w05Dll/symbols.txt b/config/GMPE01_00/rels/w05Dll/symbols.txt index c094add8..591987af 100644 --- a/config/GMPE01_00/rels/w05Dll/symbols.txt +++ b/config/GMPE01_00/rels/w05Dll/symbols.txt @@ -99,21 +99,21 @@ lbl_1_rodata_30 = .rodata:0x00000030; // type:object size:0x4 scope:local data:f lbl_1_rodata_38 = .rodata:0x00000038; // type:object size:0x8 scope:local data:double lbl_1_rodata_40 = .rodata:0x00000040; // type:object size:0x4 scope:local data:float lbl_1_rodata_44 = .rodata:0x00000044; // type:object size:0x4 scope:local data:float -lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 data:float -lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x8 data:double -lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x8 data:double -lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 data:float -lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 data:float -lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 data:float -lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 data:float -lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 data:float -lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 data:float -lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 data:float -lbl_1_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 data:float -lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 data:float -lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 data:float -lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 data:float -lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 data:float +lbl_1_rodata_48 = .rodata:0x00000048; // type:object size:0x4 scope:local data:float +lbl_1_rodata_50 = .rodata:0x00000050; // type:object size:0x8 scope:local data:float +lbl_1_rodata_58 = .rodata:0x00000058; // type:object size:0x8 scope:local data:float +lbl_1_rodata_60 = .rodata:0x00000060; // type:object size:0x4 scope:local data:float +lbl_1_rodata_64 = .rodata:0x00000064; // type:object size:0x4 scope:local data:float +lbl_1_rodata_68 = .rodata:0x00000068; // type:object size:0x4 scope:local data:float +lbl_1_rodata_6C = .rodata:0x0000006C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_70 = .rodata:0x00000070; // type:object size:0x4 scope:local data:float +lbl_1_rodata_74 = .rodata:0x00000074; // type:object size:0x4 scope:local data:float +lbl_1_rodata_78 = .rodata:0x00000078; // type:object size:0x4 scope:local data:float +lbl_1_rodata_7C = .rodata:0x0000007C; // type:object size:0x4 scope:local data:float +lbl_1_rodata_80 = .rodata:0x00000080; // type:object size:0x4 scope:local data:float +lbl_1_rodata_84 = .rodata:0x00000084; // type:object size:0x4 scope:local data:float +lbl_1_rodata_88 = .rodata:0x00000088; // type:object size:0x4 scope:local data:float +lbl_1_rodata_8C = .rodata:0x0000008C; // type:object size:0x4 scope:local data:float lbl_1_rodata_90 = .rodata:0x00000090; // type:object size:0x4 data:float lbl_1_rodata_94 = .rodata:0x00000094; // type:object size:0x4 data:float lbl_1_rodata_98 = .rodata:0x00000098; // type:object size:0x4 data:float @@ -256,13 +256,13 @@ lbl_1_data_144 = .data:0x00000144; // type:object size:0x8 lbl_1_data_14C = .data:0x0000014C; // type:object size:0x4 lbl_1_data_150 = .data:0x00000150; // type:object size:0x14 lbl_1_data_164 = .data:0x00000164; // type:object size:0x2 data:2byte -lbl_1_data_166 = .data:0x00000166; // type:object size:0x7 data:string +lbl_1_data_166 = .data:0x00000166; // type:object size:0x7 scope:local data:string lbl_1_data_170 = .data:0x00000170; // type:object size:0x10 lbl_1_data_180 = .data:0x00000180; // type:object size:0x4 data:4byte -lbl_1_data_184 = .data:0x00000184; // type:object size:0x3 data:string +lbl_1_data_184 = .data:0x00000184; // type:object size:0x3 scope:local data:string lbl_1_data_188 = .data:0x00000188; // type:object size:0x10 lbl_1_data_198 = .data:0x00000198; // type:object size:0x8 -lbl_1_data_1A0 = .data:0x000001A0; // type:object size:0x8 data:string +lbl_1_data_1A0 = .data:0x000001A0; // type:object size:0x8 scope:local data:float lbl_1_data_1A8 = .data:0x000001A8; // type:object size:0xC lbl_1_data_1B4 = .data:0x000001B4; // type:object size:0x7 data:string lbl_1_data_1BB = .data:0x000001BB; // type:object size:0x9 diff --git a/configure.py b/configure.py index c5870a14..5b67c31a 100644 --- a/configure.py +++ b/configure.py @@ -1282,7 +1282,7 @@ config.libs = [ objects = { Object(Matching, "REL/board_executor.c"), Object(Matching, "REL/w05Dll/main.c"), - Object(NonMatching, "REL/w05Dll/hotel.c"), + Object(Matching, "REL/w05Dll/hotel.c"), Object(NonMatching, "REL/w05Dll/monkey.c"), Object(NonMatching, "REL/w05Dll/dolphin.c"), Object(NonMatching, "REL/w05Dll/mg_item.c"), diff --git a/src/REL/w05Dll/hotel.c b/src/REL/w05Dll/hotel.c index 811bc1c2..313ba6ed 100644 --- a/src/REL/w05Dll/hotel.c +++ b/src/REL/w05Dll/hotel.c @@ -198,7 +198,6 @@ void fn_1_155C(void) { BoardDiceDigit2DShowSet(1); } -s16 lbl_1_data_184 = 0x2564; s32 lbl_1_data_188[4] = { 0x79000C, 0x79000E, 0x79000F, 0x790010 }; s32 lbl_1_data_198[2] = { 28, 25 };