From 47a5b153a142d4789f6732df83428ca9873bdb51 Mon Sep 17 00:00:00 2001 From: engineer124 Date: Thu, 23 Dec 2021 02:47:19 +1100 Subject: [PATCH] Migrate data and bss --- spec | 2 - src/code/z_parameter.c | 689 +++++++++++++++++++++++++++++++++++++ tools/disasm/variables.txt | 78 ++--- 3 files changed, 720 insertions(+), 49 deletions(-) diff --git a/spec b/spec index 7e142f3bb..89c69dd5e 100644 --- a/spec +++ b/spec @@ -511,8 +511,6 @@ beginseg include "build/src/code/z_olib.o" pad_text include "build/src/code/z_parameter.o" - include "build/data/code/z_parameter.data.o" - include "build/data/code/z_parameter.bss.o" include "build/src/code/z_path.o" include "build/src/code/z_pause.o" include "build/src/code/z_player_lib.o" diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index ec227aaa9..6136a546b 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -1,5 +1,694 @@ #include "global.h" +typedef struct { + /* 0x00 */ u8 scene; + /* 0x01 */ u8 flags1; + /* 0x02 */ u8 flags2; + /* 0x03 */ u8 flags3; +} RestrictionFlags; + +// bss +Input D_801F5850[4]; + +// data +static RestrictionFlags sRestrictionFlags[] = { + { SCENE_20SICHITAI2, 0x00, 0x00, 0x00 }, + { SCENE_UNSET_1, 0x00, 0x00, 0x00 }, + { SCENE_UNSET_2, 0x00, 0x00, 0x00 }, + { SCENE_UNSET_3, 0x00, 0x00, 0x00 }, + { SCENE_UNSET_4, 0x00, 0x00, 0x00 }, + { SCENE_UNSET_5, 0x00, 0x00, 0x00 }, + { SCENE_UNSET_6, 0x00, 0x00, 0x00 }, + { SCENE_KAKUSIANA, 0x00, 0x00, 0x00 }, + { SCENE_SPOT00, 0x00, 0x00, 0x00 }, + { SCENE_UNSET_9, 0x00, 0x00, 0x00 }, + { SCENE_WITCH_SHOP, 0x10, 0x30, 0xC1 }, + { SCENE_LAST_BS, 0x00, 0x3F, 0x00 }, + { SCENE_HAKASHITA, 0x00, 0x00, 0x00 }, + { SCENE_AYASHIISHOP, 0x10, 0x30, 0xC1 }, + { SCENE_UNSET_E, 0x00, 0x00, 0x00 }, + { SCENE_UNSET_F, 0x00, 0x00, 0x00 }, + { SCENE_OMOYA, 0x00, 0x33, 0x00 }, + { SCENE_BOWLING, 0x10, 0x30, 0xC1 }, + { SCENE_SONCHONOIE, 0x10, 0x30, 0xC1 }, + { SCENE_IKANA, 0x00, 0x00, 0x00 }, + { SCENE_KAIZOKU, 0x00, 0x00, 0x00 }, + { SCENE_MILK_BAR, 0x10, 0x30, 0xC1 }, + { SCENE_INISIE_N, 0x00, 0x00, 0x00 }, + { SCENE_TAKARAYA, 0x10, 0x30, 0xC1 }, + { SCENE_INISIE_R, 0x00, 0x00, 0x00 }, + { SCENE_OKUJOU, 0x00, 0x3F, 0xF0 }, + { SCENE_OPENINGDAN, 0x00, 0x00, 0x00 }, + { SCENE_MITURIN, 0x00, 0x00, 0x00 }, + { SCENE_13HUBUKINOMITI, 0x00, 0x00, 0x00 }, + { SCENE_CASTLE, 0x00, 0x00, 0x00 }, + { SCENE_DEKUTES, 0x10, 0x30, 0x01 }, + { SCENE_MITURIN_BS, 0x00, 0x00, 0x00 }, + { SCENE_SYATEKI_MIZU, 0x10, 0x30, 0xC1 }, + { SCENE_HAKUGIN, 0x00, 0x00, 0x00 }, + { SCENE_ROMANYMAE, 0x00, 0x00, 0x00 }, + { SCENE_PIRATE, 0x00, 0x00, 0x00 }, + { SCENE_SYATEKI_MORI, 0x10, 0x30, 0xC1 }, + { SCENE_SINKAI, 0x00, 0x00, 0x00 }, + { SCENE_YOUSEI_IZUMI, 0x00, 0x00, 0x00 }, + { SCENE_KINSTA1, 0x00, 0x30, 0x00 }, + { SCENE_KINDAN2, 0x00, 0x30, 0x00 }, + { SCENE_TENMON_DAI, 0x00, 0x03, 0xC0 }, + { SCENE_LAST_DEKU, 0x00, 0x3F, 0x00 }, + { SCENE_22DEKUCITY, 0x00, 0x00, 0x00 }, + { SCENE_KAJIYA, 0x00, 0x30, 0xC0 }, + { SCENE_00KEIKOKU, 0x00, 0x00, 0x00 }, + { SCENE_POSTHOUSE, 0x00, 0x30, 0xC1 }, + { SCENE_LABO, 0x00, 0x30, 0xC1 }, + { SCENE_DANPEI2TEST, 0x00, 0x30, 0x00 }, + { SCENE_UNSET_31, 0x00, 0x00, 0x00 }, + { SCENE_16GORON_HOUSE, 0x00, 0x00, 0x00 }, + { SCENE_33ZORACITY, 0x00, 0x00, 0xC0 }, + { SCENE_8ITEMSHOP, 0x00, 0x30, 0xC1 }, + { SCENE_F01, 0x00, 0x00, 0x00 }, + { SCENE_INISIE_BS, 0x00, 0x00, 0x00 }, + { SCENE_30GYOSON, 0x00, 0x00, 0x00 }, + { SCENE_31MISAKI, 0x00, 0x00, 0x00 }, + { SCENE_TAKARAKUJI, 0x00, 0x30, 0xC1 }, + { SCENE_UNSET_3A, 0x00, 0x00, 0x00 }, + { SCENE_TORIDE, 0x00, 0x00, 0x00 }, + { SCENE_FISHERMAN, 0x00, 0x30, 0xC1 }, + { SCENE_GORONSHOP, 0x10, 0x30, 0xC1 }, + { SCENE_DEKU_KING, 0x00, 0x30, 0xC0 }, + { SCENE_LAST_GORON, 0x00, 0x3F, 0x00 }, + { SCENE_24KEMONOMITI, 0x00, 0x00, 0x00 }, + { SCENE_F01_B, 0x00, 0x30, 0x00 }, + { SCENE_F01C, 0x00, 0x30, 0x00 }, + { SCENE_BOTI, 0x00, 0x00, 0x00 }, + { SCENE_HAKUGIN_BS, 0x00, 0x00, 0x00 }, + { SCENE_20SICHITAI, 0x00, 0x00, 0x00 }, + { SCENE_21MITURINMAE, 0x00, 0x00, 0x00 }, + { SCENE_LAST_ZORA, 0x00, 0x3F, 0x00 }, + { SCENE_11GORONNOSATO2, 0x00, 0x00, 0x00 }, + { SCENE_SEA, 0x00, 0x00, 0x00 }, + { SCENE_35TAKI, 0x00, 0x00, 0x00 }, + { SCENE_REDEAD, 0x00, 0x00, 0x00 }, + { SCENE_BANDROOM, 0x00, 0x30, 0xC0 }, + { SCENE_11GORONNOSATO, 0x00, 0x00, 0x00 }, + { SCENE_GORON_HAKA, 0x00, 0x00, 0x00 }, + { SCENE_SECOM, 0x00, 0x3C, 0xC0 }, + { SCENE_10YUKIYAMANOMURA, 0x00, 0x00, 0x00 }, + { SCENE_TOUGITES, 0x00, 0x3F, 0xF0 }, + { SCENE_DANPEI, 0x00, 0x30, 0x00 }, + { SCENE_IKANAMAE, 0x00, 0x00, 0x00 }, + { SCENE_DOUJOU, 0x00, 0x30, 0xC1 }, + { SCENE_MUSICHOUSE, 0x00, 0x30, 0xC0 }, + { SCENE_IKNINSIDE, 0x00, 0x3F, 0xC0 }, + { SCENE_MAP_SHOP, 0x10, 0x30, 0xC1 }, + { SCENE_F40, 0x00, 0x00, 0x00 }, + { SCENE_F41, 0x00, 0x00, 0x00 }, + { SCENE_10YUKIYAMANOMURA2, 0x00, 0x00, 0x00 }, + { SCENE_14YUKIDAMANOMITI, 0x00, 0x00, 0x00 }, + { SCENE_12HAKUGINMAE, 0x00, 0x00, 0x00 }, + { SCENE_17SETUGEN, 0x00, 0x00, 0x00 }, + { SCENE_17SETUGEN2, 0x00, 0x00, 0x00 }, + { SCENE_SEA_BS, 0x00, 0x00, 0x00 }, + { SCENE_RANDOM, 0x00, 0x00, 0x00 }, + { SCENE_YADOYA, 0x10, 0x30, 0xC1 }, + { SCENE_KONPEKI_ENT, 0x00, 0x00, 0x00 }, + { SCENE_INSIDETOWER, 0x00, 0xFF, 0xC0 }, + { SCENE_26SARUNOMORI, 0x00, 0x30, 0x00 }, + { SCENE_LOST_WOODS, 0x00, 0x00, 0x00 }, + { SCENE_LAST_LINK, 0x00, 0x3F, 0x00 }, + { SCENE_SOUGEN, 0x00, 0x3F, 0x00 }, + { SCENE_BOMYA, 0x10, 0x30, 0xC1 }, + { SCENE_KYOJINNOMA, 0x00, 0x00, 0x00 }, + { SCENE_KOEPONARACE, 0x00, 0x30, 0x00 }, + { SCENE_GORONRACE, 0x00, 0x00, 0x00 }, + { SCENE_TOWN, 0x00, 0x00, 0x00 }, + { SCENE_ICHIBA, 0x00, 0x00, 0x00 }, + { SCENE_BACKTOWN, 0x00, 0x00, 0x00 }, + { SCENE_CLOCKTOWER, 0x00, 0x00, 0x00 }, + { SCENE_ALLEY, 0x00, 0x00, 0x00 }, +}; + +s32 D_801BF884[] = { + 0x00000000, +}; + +s32 D_801BF888[] = { + 0x00000000, +}; + +s16 D_801BF88C = 0; + +s32 D_801BF890[] = { + 0x00000000, + 0x00000000, +}; + +s32 D_801BF898[] = { + 0x00000000, +}; + +s32 D_801BF89C[] = { + 0x00000000, +}; + +s32 D_801BF8A0[] = { + 0x00FF0000, +}; + +s32 D_801BF8A4[] = { + 0x00FF0000, +}; + +s32 D_801BF8A8[] = { + 0x00FF0000, +}; + +s32 D_801BF8AC[] = { + 0x00020000, +}; + +s32 D_801BF8B0[] = { + 0x00010000, 0x00080008, 0x00090009, 0x00060006, 0x00060006, 0x00010001, + 0x00010007, 0x00070007, 0x00070008, 0x00080009, 0x00090000, +}; + +s32 D_801BF8DC[] = { + 0x00000000, +}; + +s16 D_801BF8E0 = 0; + +s16 D_801BF8E4 = 0; + +s32 D_801BF8E8[] = { + 0x00000000, + 0x00000000, +}; + +s32 D_801BF8F0[] = { + 0x00000000, +}; + +s32 D_801BF8F4[] = { + 0x00000000, +}; + +s32 D_801BF8F8[] = { + 0x00000000, +}; + +s32 D_801BF8FC[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 D_801BF930[] = { + 0x00000000, +}; + +s32 D_801BF934[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 D_801BF968[] = { + 0x00000000, +}; + +s32 D_801BF96C[] = { + 0x00000000, +}; + +s32 D_801BF970[] = { + 0x00630000, +}; + +s32 D_801BF974[] = { + 0x00000000, +}; + +s32 D_801BF978[] = { + 0x000A0000, +}; + +s32 D_801BF97C[] = { + 0x00FF0000, +}; + +s32 D_801BF980[] = { + 0x3F800000, // f32: 1.0 + 0x00000000, +}; + +s32 D_801BF988[] = { + 0xE7000000, + 0x00000000, + 0xD9C0F9FA, + 0x00000000, +}; + +s32 D_801BF998[] = { + 0xEF802C30, 0x00504340, 0xFCFFFFFF, 0xFFFDF6FB, 0xDF000000, 0x00000000, +}; + +s32 D_801BF9B0[] = { + 0x00000000, +}; + +s32 D_801BF9B4[] = { + 0x42C80000, // f32: 100.0 + 0x42DA0000, // f32: 109.0 +}; + +s32 D_801BF9BC[] = { + 0x022602A8, + 0x02A802A8, +}; + +s32 D_801BF9C4[] = { + 0x009E009B, +}; + +s32 D_801BF9C8[] = { + 0x00170016, +}; + +s32 D_801BF9CC[] = { + 0xC3BE0000, // f32: -380.0 + 0xC3AF0000, // f32: -350.0 +}; + +s32 D_801BF9D4[] = { + 0x00A700E3, +}; + +s32 D_801BF9D8[] = { + 0x00F9010F, +}; + +s32 D_801BF9DC[] = { + 0x00110012, +}; + +s32 D_801BF9E0[] = { + 0x00220012, +}; + +s32 D_801BF9E4[] = { + 0x023F026C, +}; + +s32 D_801BF9E8[] = { + 0x026C026C, +}; + +s32 D_801BF9EC[] = { + 0x00000000, +}; + +s32 D_801BF9F0[] = { + 0x00000000, +}; + +s32 D_801BF9F4[] = { + 0x00000000, +}; + +s32 D_801BF9F8[] = { + 0x00000000, +}; + +s32 D_801BF9FC[] = { + 0x000F0000, +}; + +s32 D_801BFA00[] = { + 0x00000000, +}; + +s32 D_801BFA04[] = { + 0xFFF2FFF2, 0xFFE8FFF8, 0xFFF4FFF4, 0xFFF9FFF8, 0xFFF9FFF8, 0xFFF40000, +}; + +s32 D_801BFA1C[] = { + 0x001C001C, 0x00300010, 0x00180018, 0x00100010, 0x00100010, 0x00180000, +}; + +s32 D_801BFA34[] = { + 0x000E000E, 0x00080018, 0xFFAEFFAE, 0x003A003B, 0x003A003B, 0x00200000, +}; + +s32 D_801BFA4C[] = { + 0x001C001C, 0x00100010, 0x00180018, 0x000B000B, 0x000B000B, 0x00200000, +}; + +s32 D_801BFA64[] = { + 0xFFC3FFD3, + 0x001D0068, + 0xFF8BFFD6, + 0x00200037, +}; + +s32 D_801BFA74[] = { + 0x0001FFBA, + 0xFF9DFFBA, + 0x00470065, + 0x00480001, +}; + +// Possibly? +// s32 D_801BFA84 = 0; +// s16 D_801BFA88 = {...}; +s32 D_801BFA84[] = { + 0x00000000, 0x0005000A, 0x0014001E, 0x000A001E, 0x00280032, 0x0014000A, + 0x00010005, 0x00010005, 0x000A0014, 0x00320064, 0x00C80000, +}; + +s32 D_801BFAB0[] = { + 0x09000000, + 0x09000180, +}; + +s32 D_801BFAB8[] = { + 0x00FF00FF, + 0x00FF0096, + 0x00960096, +}; + +s32 D_801BFAC4[] = { + 0x00000001, + 0x00010000, +}; + +s32 D_801BFACC[] = { + 0x00020001, + 0x00020001, +}; + +s32 D_801BFAD4[] = { + 0x02002AE0, 0x02002AE0, 0x02002BA0, 0x02002C60, 0x02002D20, 0x00820088, 0x00880088, 0x00880000, +}; + +s32 D_801BFAF4[] = { + 0x001D001B, +}; + +s32 D_801BFAF8[] = { + 0x001B001B, +}; + +s32 D_801BFAFC[] = { + 0x001E0018, + 0x00180018, +}; + +s32 D_801BFB04[] = { + 0x00A200E4, + 0x00FA0110, +}; + +s32 D_801BFB0C[] = { + 0x00230023, + 0x00330023, +}; + +s32 D_801BFB14[] = { + 0x00FF0064, + 0x00FF0000, +}; + +s32 D_801BFB1C[] = { + 0x00000064, + 0x00FF0000, +}; + +s32 D_801BFB24[] = { + 0x000000FF, + 0x00640000, +}; + +s32 D_801BFB2C[] = { + 0x00FF0000, +}; + +s32 D_801BFB30[] = { + 0x00000000, +}; + +s32 D_801BFB34[] = { + 0x00000000, +}; + +s32 D_801BFB38[] = { + 0x00000AAA, 0x15552000, 0x2AAA3555, 0x40004AAA, 0x55556000, 0x6AAA7555, 0x80008AAA, + 0x9555A000, 0xAAAAB555, 0xC000CAAA, 0xD555E000, 0xEAAAF555, 0xFFFF0000, +}; + +s32 D_801BFB6C[] = { + 0x02006440, 0x02006498, 0x020064F0, 0x02006548, 0x020065A0, 0x020065F8, 0x02006650, 0x020066A8, + 0x02006700, 0x02006758, 0x020067B0, 0x02006808, 0x02006440, 0x02006498, 0x020064F0, 0x02006548, + 0x020065A0, 0x020065F8, 0x02006650, 0x020066A8, 0x02006700, 0x02006758, 0x020067B0, 0x02006808, +}; + +s32 D_801BFBCC[] = { + 0x00000000, +}; + +s32 D_801BFBD0[] = { + 0x009B0000, +}; + +s32 D_801BFBD4[] = { + 0x00FF0000, +}; + +s32 D_801BFBD8[] = { + 0x00000000, +}; + +s32 D_801BFBDC[] = { + 0x00000000, +}; + +s32 D_801BFBE0[] = { + 0x00000000, +}; + +s32 D_801BFBE4[] = { + 0x000F0000, +}; + +s32 D_801BFBE8[] = { + 0x00000000, +}; + +s32 D_801BFBEC[] = { + 0x00640000, +}; + +s32 D_801BFBF0[] = { + 0x00CD009B, +}; + +s32 D_801BFBF4[] = { + 0x00FF00FF, +}; + +s32 D_801BFBF8[] = { + 0x001E0000, +}; + +s32 D_801BFBFC[] = { + 0x001E0000, +}; + +s32 D_801BFC00[] = { + 0x00640000, +}; + +s32 D_801BFC04[] = { + 0x00FF0000, +}; + +s32 D_801BFC08[] = { + 0x00640000, +}; + +s32 D_801BFC0C[] = { + 0x001E0000, +}; + +s32 D_801BFC10[] = { + 0x00640000, +}; + +s32 D_801BFC14[] = { + 0x02006860, 0x020068A0, 0x020068E0, 0x02006920, 0x02006960, 0x020069A0, + 0x020069E0, 0x02006A20, 0x02006A60, 0x02006AA0, 0x02006AE0, +}; + +s32 D_801BFC40[] = { + 0x007F0088, + 0x00900097, + 0x00A000A8, + 0x00AF00B8, +}; + +s32 D_801BFC50[] = { + 0xC000E000, + 0x00002000, + 0xA0008000, + 0x60004000, +}; + +s32 D_801BFC60[] = { + 0x00FF00FF, +}; + +s32 D_801BFC64[] = { + 0x00FF00FF, + 0x00A50037, +}; + +s32 D_801BFC6C[] = { + 0x004E0036, + 0x001D0005, + 0xFFEEFFD6, + 0xFFBDFFAB, +}; + +s32 D_801BFC7C[] = { + 0x00B400B4, + 0x00B400B4, + 0xFF4CFF4C, + 0xFF4CFF4C, +}; + +s32 D_801BFC8C[] = { + 0x00FF00FF, + 0x00FF00FF, + 0x00A50037, +}; + +s32 D_801BFC98[] = { + 0x004E0036, + 0x001D0005, + 0xFFEEFFD6, + 0xFFBDFFAB, +}; + +s32 D_801BFCA8[] = { + 0xC000E000, + 0x00002000, + 0xA0008000, + 0x60004000, +}; + +s32 D_801BFCB8[] = { + 0x00FF00FF, + 0x00FF00FF, + 0x00A50037, +}; + +s32 D_801BFCC4[] = { + 0x02007B28, 0x02007D38, 0x02007F48, 0x02008158, 0x02007D38, 0x02008368, 0x02008578, 0x02008788, +}; + +s32 D_801BFCE4[] = { + 0x00000000, +}; + +s32 D_801BFCE8[] = { + 0x00000000, +}; + +s32 D_801BFCEC[] = { + 0x00000000, +}; + +s32 D_801BFCF0[] = { + 0x00000000, +}; + +s32 D_801BFCF4[] = { + 0x00000000, +}; + +s32 D_801BFCF8[] = { + 0x00630000, +}; + +s32 D_801BFCFC[] = { + 0x00100019, + 0x0022002A, + 0x0033003C, + 0x0044004D, +}; + +s32 D_801BFD0C[] = { + 0x00090009, + 0x00080009, + 0x00090008, + 0x00090009, +}; + +s32 D_801BFD1C[] = { + 0x00010000, + 0x00000000, +}; + +s32 D_801BFD24[] = { + 0x00020003, + 0x00030000, +}; + +s32 D_801BFD2C[] = { + 0x00C800FF, 0x006400AA, 0x00AA00FF, 0x00FF0069, 0x00690000, +}; + +s32 D_801BFD40[] = { + 0x00000050, 0x0000000A, 0x000A0050, 0x0028000A, 0x00000000, +}; + +s32 D_801BFD54[] = { + 0x02007828, + 0x02007528, + 0x02007228, + 0x02006D28, +}; + +s32 D_801BFD64[] = { + 0x00180018, + 0x00180028, +}; + +s32 D_801BFD6C[] = { + 0x006400FF, 0x006400FF, 0x00FF003C, 0x00FF0064, 0x00000078, 0x00AA00FF, +}; + +s32 D_801BFD84[] = { + 0x07000000, + 0x07012C00, +}; + +s32 D_801BFD8C[] = { + 0x07025800, + 0x07025A00, +}; + +s32 D_801BFD94[] = { + 0x00000000, +}; + +s32 D_801BFD98[] = { + 0x00000000, + 0x00000000, +}; + +s32 D_801BFDA0[] = { + 0x01DE01FF, 0x025D01DB, 0x01DA01FE, 0x0219024C, 0x0221025E, 0x020001FD, + 0x025C025F, 0x01DC024E, 0x025201DD, 0x01D90214, 0x01E401E1, 0x01E201E3, +}; + #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010CB80.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_8010CD98.s") diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index d5d2eb0e7..5fd381bac 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -1063,8 +1063,7 @@ 0x801BF5B0:("D_801BF5B0","UNK_TYPE2","",0x2), 0x801BF5C0:("D_801BF5C0","UNK_PTR","",0x4), 0x801BF68C:("D_801BF68C","UNK_TYPE1","",0x1), - 0x801BF6C0:("D_801BF6C0","UNK_TYPE1","",0x1), - 0x801BF79E:("D_801BF79E","UNK_TYPE1","",0x1), + 0x801BF6C0:("sRestrictionFlags","RestrictionFlags","[113]",0x1c4), 0x801BF884:("D_801BF884","UNK_TYPE2","",0x2), 0x801BF888:("D_801BF888","UNK_TYPE2","",0x2), 0x801BF88C:("D_801BF88C","UNK_TYPE2","",0x2), @@ -1086,15 +1085,12 @@ 0x801BF8FC:("D_801BF8FC","UNK_TYPE4","",0x4), 0x801BF930:("D_801BF930","UNK_TYPE4","",0x4), 0x801BF934:("D_801BF934","UNK_TYPE4","",0x4), - 0x801BF968:("D_801BF968","UNK_TYPE1","",0x1), - 0x801BF96A:("D_801BF96A","UNK_TYPE1","",0x1), - 0x801BF96C:("D_801BF96C","UNK_TYPE1","",0x1), - 0x801BF96E:("D_801BF96E","UNK_TYPE1","",0x1), - 0x801BF970:("D_801BF970","UNK_TYPE2","",0x2), - 0x801BF972:("D_801BF972","UNK_TYPE1","",0x1), - 0x801BF974:("D_801BF974","UNK_TYPE2","",0x2), - 0x801BF978:("D_801BF978","UNK_TYPE2","",0x2), - 0x801BF97C:("D_801BF97C","UNK_TYPE2","",0x2), + 0x801BF968:("D_801BF968","UNK_TYPE4","",0x4), + 0x801BF96C:("D_801BF96C","UNK_TYPE4","",0x4), + 0x801BF970:("D_801BF970","UNK_TYPE4","",0x4), + 0x801BF974:("D_801BF974","UNK_TYPE4","",0x4), + 0x801BF978:("D_801BF978","UNK_TYPE4","",0x4), + 0x801BF97C:("D_801BF97C","UNK_TYPE4","",0x4), 0x801BF980:("D_801BF980","UNK_TYPE4","",0x4), 0x801BF988:("D_801BF988","UNK_TYPE1","",0x1), 0x801BF998:("D_801BF998","UNK_TYPE1","",0x1), @@ -1104,19 +1100,13 @@ 0x801BF9C4:("D_801BF9C4","UNK_TYPE1","",0x1), 0x801BF9C8:("D_801BF9C8","UNK_TYPE1","",0x1), 0x801BF9CC:("D_801BF9CC","UNK_TYPE1","",0x1), - 0x801BF9D4:("D_801BF9D4","UNK_TYPE2","",0x2), - 0x801BF9D6:("D_801BF9D6","UNK_TYPE2","",0x2), - 0x801BF9D8:("D_801BF9D8","UNK_TYPE2","",0x2), - 0x801BF9DA:("D_801BF9DA","UNK_TYPE2","",0x2), - 0x801BF9DC:("D_801BF9DC","UNK_TYPE2","",0x2), - 0x801BF9DE:("D_801BF9DE","UNK_TYPE2","",0x2), - 0x801BF9E0:("D_801BF9E0","UNK_TYPE2","",0x2), - 0x801BF9E2:("D_801BF9E2","UNK_TYPE2","",0x2), - 0x801BF9E4:("D_801BF9E4","UNK_TYPE2","",0x2), - 0x801BF9E6:("D_801BF9E6","UNK_TYPE2","",0x2), - 0x801BF9E8:("D_801BF9E8","UNK_TYPE2","",0x2), - 0x801BF9EA:("D_801BF9EA","UNK_TYPE2","",0x2), - 0x801BF9EC:("D_801BF9EC","UNK_TYPE2","",0x2), + 0x801BF9D4:("D_801BF9D4","UNK_TYPE4","",0x4), + 0x801BF9D8:("D_801BF9D8","UNK_TYPE4","",0x4), + 0x801BF9DC:("D_801BF9DC","UNK_TYPE4","",0x4), + 0x801BF9E0:("D_801BF9E0","UNK_TYPE4","",0x4), + 0x801BF9E4:("D_801BF9E4","UNK_TYPE4","",0x4), + 0x801BF9E8:("D_801BF9E8","UNK_TYPE4","",0x4), + 0x801BF9EC:("D_801BF9EC","UNK_TYPE4","",0x4), 0x801BF9F0:("D_801BF9F0","UNK_TYPE2","",0x2), 0x801BF9F4:("D_801BF9F4","UNK_TYPE2","",0x2), 0x801BF9F8:("D_801BF9F8","UNK_TYPE2","",0x2), @@ -1134,11 +1124,9 @@ 0x801BFAC4:("D_801BFAC4","UNK_TYPE1","",0x1), 0x801BFACC:("D_801BFACC","UNK_TYPE1","",0x1), 0x801BFAD4:("D_801BFAD4","UNK_TYPE1","",0x1), - 0x801BFAF4:("D_801BFAF4","UNK_TYPE2","",0x2), - 0x801BFAF6:("D_801BFAF6","UNK_TYPE2","",0x2), - 0x801BFAF8:("D_801BFAF8","UNK_TYPE2","",0x2), - 0x801BFAFA:("D_801BFAFA","UNK_TYPE2","",0x2), - 0x801BFAFC:("D_801BFAFC","UNK_TYPE1","",0x1), + 0x801BFAF4:("D_801BFAF4","UNK_TYPE4","",0x4), + 0x801BFAF8:("D_801BFAF8","UNK_TYPE4","",0x4), + 0x801BFAFC:("D_801BFAFC","UNK_TYPE4","",0x4), 0x801BFB04:("D_801BFB04","UNK_TYPE1","",0x1), 0x801BFB0C:("D_801BFB0C","UNK_TYPE1","",0x1), 0x801BFB14:("D_801BFB14","UNK_TYPE1","",0x1), @@ -1170,27 +1158,23 @@ 0x801BFC14:("D_801BFC14","UNK_TYPE1","",0x1), 0x801BFC40:("D_801BFC40","UNK_TYPE1","",0x1), 0x801BFC50:("D_801BFC50","UNK_TYPE2","",0x2), - 0x801BFC60:("D_801BFC60","UNK_TYPE2","",0x2), - 0x801BFC62:("D_801BFC62","UNK_TYPE2","",0x2), - 0x801BFC64:("D_801BFC64","UNK_TYPE2","",0x2), - 0x801BFC6C:("D_801BFC6C","UNK_TYPE2","",0x2), + 0x801BFC60:("D_801BFC60","UNK_TYPE4","",0x4), + 0x801BFC64:("D_801BFC64","UNK_TYPE4","",0x4), + 0x801BFC6C:("D_801BFC6C","UNK_TYPE4","",0x4), 0x801BFC7C:("D_801BFC7C","UNK_TYPE2","",0x2), 0x801BFC8C:("D_801BFC8C","UNK_TYPE1","",0x1), 0x801BFC98:("D_801BFC98","UNK_TYPE2","",0x2), 0x801BFCA8:("D_801BFCA8","UNK_TYPE2","",0x2), 0x801BFCB8:("D_801BFCB8","UNK_TYPE1","",0x1), 0x801BFCC4:("D_801BFCC4","UNK_TYPE4","",0x4), - 0x801BFCE4:("D_801BFCE4","UNK_TYPE2","",0x2), - 0x801BFCE8:("D_801BFCE8","UNK_TYPE2","",0x2), - 0x801BFCEA:("D_801BFCEA","UNK_TYPE2","",0x2), - 0x801BFCEC:("D_801BFCEC","UNK_TYPE2","",0x2), - 0x801BFCEE:("D_801BFCEE","UNK_TYPE2","",0x2), - 0x801BFCF0:("D_801BFCF0","UNK_TYPE2","",0x2), - 0x801BFCF2:("D_801BFCF2","UNK_TYPE2","",0x2), - 0x801BFCF4:("D_801BFCF4","UNK_TYPE2","",0x2), - 0x801BFCF8:("D_801BFCF8","UNK_TYPE2","",0x2), - 0x801BFCFC:("D_801BFCFC","UNK_TYPE2","",0x2), - 0x801BFD0C:("D_801BFD0C","UNK_TYPE2","",0x2), + 0x801BFCE4:("D_801BFCE4","UNK_TYPE4","",0x4), + 0x801BFCE8:("D_801BFCE8","UNK_TYPE4","",0x4), + 0x801BFCEC:("D_801BFCEC","UNK_TYPE4","",0x4), + 0x801BFCF0:("D_801BFCF0","UNK_TYPE4","",0x4), + 0x801BFCF4:("D_801BFCF4","UNK_TYPE4","",0x4), + 0x801BFCF8:("D_801BFCF8","UNK_TYPE4","",0x4), + 0x801BFCFC:("D_801BFCFC","UNK_TYPE4","",0x4), + 0x801BFD0C:("D_801BFD0C","UNK_TYPE4","",0x4), 0x801BFD1C:("D_801BFD1C","UNK_TYPE1","",0x1), 0x801BFD24:("D_801BFD24","UNK_TYPE1","",0x1), 0x801BFD2C:("D_801BFD2C","UNK_TYPE1","",0x1), @@ -1200,9 +1184,9 @@ 0x801BFD6C:("D_801BFD6C","UNK_TYPE2","",0x2), 0x801BFD84:("D_801BFD84","UNK_TYPE1","",0x1), 0x801BFD8C:("D_801BFD8C","UNK_TYPE1","",0x1), - 0x801BFD94:("D_801BFD94","UNK_TYPE1","",0x1), - 0x801BFD98:("D_801BFD98","UNK_TYPE2","",0x2), - 0x801BFD9E:("D_801BFD9E","UNK_TYPE1","",0x1), + 0x801BFD94:("D_801BFD94","UNK_TYPE4","",0x4), + 0x801BFD98:("D_801BFD98","UNK_TYPE4","[2]",0x8), + 0x801BFDA0:("D_801BFDA0","UNK_TYPE1","",0x1), 0x801BFDD0:("D_801BFDD0","UNK_TYPE1","",0x1), 0x801BFDE8:("D_801BFDE8","UNK_TYPE1","",0x1), 0x801BFE00:("D_801BFE00","UNK_TYPE1","",0x1),