From 636f54dd2e08e1f72908844ab62791e3a50fe310 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Wed, 16 May 2018 17:54:53 -0400 Subject: [PATCH 001/151] Create .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..af2b963be --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.*.sw* +*.pyc From 2d51adfc2edd065da7efa553dc816a7b00791812 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Wed, 16 May 2018 17:57:49 -0400 Subject: [PATCH 002/151] Initial commit of ASM files --- ASM/.gitignore | 4 + ASM/README.md | 3 + ASM/notes/dungeons.txt | 17 ++ ASM/notes/grottos.txt | 45 ++++ ASM/notes/notes.txt | 40 ++++ ASM/roms/.gitkeep | 0 ASM/src/build.asm | 42 ++++ ASM/src/config.asm | 31 +++ ASM/src/constants.asm | 3 + ASM/src/fixes.asm | 10 + ASM/src/hacks.asm | 190 +++++++++++++++ ASM/src/item_data.asm | 91 ++++++++ ASM/src/items.asm | 513 +++++++++++++++++++++++++++++++++++++++++ ASM/src/menu.asm | 28 +++ ASM/src/state.asm | 6 + ASM/src/util.asm | 15 ++ 16 files changed, 1038 insertions(+) create mode 100644 ASM/.gitignore create mode 100644 ASM/README.md create mode 100755 ASM/notes/dungeons.txt create mode 100755 ASM/notes/grottos.txt create mode 100755 ASM/notes/notes.txt create mode 100644 ASM/roms/.gitkeep create mode 100755 ASM/src/build.asm create mode 100755 ASM/src/config.asm create mode 100755 ASM/src/constants.asm create mode 100755 ASM/src/fixes.asm create mode 100755 ASM/src/hacks.asm create mode 100755 ASM/src/item_data.asm create mode 100755 ASM/src/items.asm create mode 100755 ASM/src/menu.asm create mode 100755 ASM/src/state.asm create mode 100755 ASM/src/util.asm diff --git a/ASM/.gitignore b/ASM/.gitignore new file mode 100644 index 000000000..be9708648 --- /dev/null +++ b/ASM/.gitignore @@ -0,0 +1,4 @@ +/inject +/roms/* +armips* +!.gitkeep diff --git a/ASM/README.md b/ASM/README.md new file mode 100644 index 000000000..cb17dba22 --- /dev/null +++ b/ASM/README.md @@ -0,0 +1,3 @@ +- Download the armips assembler: +- Put the ROM you want to patch at `roms/base.z64` +- Run `armips src/build.asm`, which will create `roms/patched.z64` diff --git a/ASM/notes/dungeons.txt b/ASM/notes/dungeons.txt new file mode 100755 index 000000000..f6eefe2be --- /dev/null +++ b/ASM/notes/dungeons.txt @@ -0,0 +1,17 @@ +0: Deku Tree +1: Dodongo's Cavern +2: Jabu Jabu +3: Forest Temple +4: Fire Temple +5: Water Temple +6: Spirit Temple +7: Shadow Temple +8: BOTW +9: (nothing?) +10: Ganon's Tower +11: Gerudo Training Ground +12: Gerudo Fortress +13: Ganon's Castle + +0x8011A678 (save + 0xA8) = dungeon items +0x8011A68C (save + 0xBC) = small keys \ No newline at end of file diff --git a/ASM/notes/grottos.txt b/ASM/notes/grottos.txt new file mode 100755 index 000000000..cbbd2681e --- /dev/null +++ b/ASM/notes/grottos.txt @@ -0,0 +1,45 @@ +grotto data scene contents +0x00 (0x00) (00000) 0x70 0x4D (5 rupees) boulder west of market entrance +0x02 (0x22) (00010) 0x72 0x4E (20 rupees) boulder in trees near lake hylia +0x03 (0x03) (00011) 0x73 0x4D (5 rupees) outside lake hylia fences +0x08 (0x28) (01000) 0x78 0x4E (20 rupees) kak potion shop hole +0x09 (0x29) (01001) 0x79 0x4D (5 rupees) zora's domain high open hole +0x0C (0x2C) (01100) 0x7C 0x4E (20 rupees) kokiri forest gossip stone (SoS) +0x14 (0x14) (10100) 0x84 0x4D (5 rupees) lost woods boulder by goron city +0x17 (0x57) (10111) 0x87 0x56 (200 rupees) outside goron city (SoS) +0x1A (0x7A) (11010) 0x8A 0x67 (20 bombs) crater top entrance, rock circle + + + +item grottos: +inside lake hylia fences heart piece merchant +lone tree by river heart piece under water +boulder near sacred meadow nut capacity merchant +front of sacred meadow wolfos chest +kakariko center redead chest + + + +skull grottos: +between market and kak skull +hyrule castle tree (SoS) skull + hint stone +outside gerudo valley skull + hint stone + cow + + + +no-item grottos: +death mountain steps cow + free standing rupees +gerudo valley silver rock free standing rupees +crater bottom entrance ammo merchants +goron city lava room ammo merchants +lake hylia under grave ammo merchants +lon lon ranch ammo merchants +desert colossus silver rock potion merchants +behind carpenter tent (SoS) potion merchants +forest temple area (SoS) potion merchants +zora's domain rock circle potion merchants +zora's domain high boulder fairies +gerudo fortress boxes (SoS) fairies +bolder across river fairies +middle of sacred meadow fairies +zora's domain square island fairies diff --git a/ASM/notes/notes.txt b/ASM/notes/notes.txt new file mode 100755 index 000000000..2a634eb32 --- /dev/null +++ b/ASM/notes/notes.txt @@ -0,0 +1,40 @@ +0x8011A5D0 = save context + +0x1394 = grotto details + first 2 bytes: Entrance used to reach area we were in before the grotto + last byte: chest variable (contents + 5 bit chest flag) + +0x801C84A0 = global context + +0x00A4 = current scene number (2 bytes) + +0x801DAA30 = player instance + +0x0424 = item to be obtained (set negative by chests) + gets written @ 0x80022CD0 + +0x802190AC = Chest info as stored in ROM + +0x803A9E84 = item table (6 bytes per entry) + +SOLD OUT texture: 0x008A9C00 in ROM (0x400 long), gets DMA'd to 0x8036B8A0 + +chest instance + 0x1C = contents + +Mido's house chest actor instances: +top left: 0x801EAF80 +top right: 0x801EB1A0 +bottom left: 0x801EB3C0 +bottom right: 0x801EB5E0 + +warp function? @ 0x8009CEEC + a0 = pointer to global context + a1 = target scene number + a2 = target entrance + a3 = entrance index + +Equipment (relative to save context): +0xA1: 0x30 = nuts 0x06 = sticks +0xA2: 0xC0 = bullets 0x30 = wallet 0x06 = scale +0xA3: 0xC0 = strength 0x18 = bombs 0x03 = quiver + +silver gauntlets warp: checks at 0x803A4BE0 (in player instance) + T6: Destination (e.g. 0x00A0) + T8: Cutscene index? (e.g. 0xFFF0) diff --git a/ASM/roms/.gitkeep b/ASM/roms/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/ASM/src/build.asm b/ASM/src/build.asm new file mode 100755 index 000000000..b53c9c991 --- /dev/null +++ b/ASM/src/build.asm @@ -0,0 +1,42 @@ +.n64 +.relativeinclude on + +.create "../roms/patched.z64", 0 +.incbin "../roms/base.z64" + +;================================================================================================== +; Base game editing region +;================================================================================================== + +.include "hacks.asm" + +;================================================================================================== +; New code region +;================================================================================================== + +; 0x80400000 in memory -> 0x03480000 in ROM +.headersize 0x7CF80000 +.org 0x80400000 + +NEW_CODE_BASE: + +; 0x000 - 0x5FF: Settings and tables which the front-end may write +.area 0x600, 0 +.include "config.asm" +.include "item_data.asm" ; Placed here temporarily, won't fit in the code area +.endarea + +; 0x600 - 0x9FF: Currently reserved for code blocks written by Rom.py +.skip 0x400 + +; 0xA00 - 0xFFF: New code blocks +.area 0x600, 0 +.include "util.asm" +.include "constants.asm" +.include "state.asm" +.include "items.asm" +.include "fixes.asm" +.include "menu.asm" +.endarea + +.close diff --git a/ASM/src/config.asm b/ASM/src/config.asm new file mode 100755 index 000000000..aeec32ec1 --- /dev/null +++ b/ASM/src/config.asm @@ -0,0 +1,31 @@ +;================================================================================================== +; Settings and tables which the front-end may write +;================================================================================================== + +; Item override table: +; +; This table changes the meaning of a given item ID within a given scene. It must be terminated with +; two 0x00 bytes (which will happen by default as long as you don't fill the allotted space). +; +; Generic grotto virtual scene numbers: +; 0x70: Hyrule Field: under boulder west of drawbridge +; 0x72: Hyrule Field: under boulder between Kokiri Forest and Lake Hylia +; 0x73: Hyrule Field: open hole outside Lake Hylia fences +; 0x78: Kakariko: open hole behind fence +; 0x79: Zora River: open hole on the high ground +; 0x7C: Kokiri Forest: SoS hole by the gossip stone +; 0x84: Lost Woods: under boulder next to Goron City warp +; 0x87: Death Mountain: SoS hole outside Goron City +; 0x8A: Death Mountain Crater: under boulder in circle of rocks near top entrance + +.area 0x180, 0 +ITEM_OVERRIDES: +; SS = Scene +; OO = Old item ID +; NN = New item ID +; SS OO NN +.db 0x28, 0x2C, 0x84 +.db 0x28, 0x2D, 0x84 +.db 0x28, 0x29, 0x84 +.db 0x28, 0x2A, 0x84 +.endarea diff --git a/ASM/src/constants.asm b/ASM/src/constants.asm new file mode 100755 index 000000000..f57c3a9bf --- /dev/null +++ b/ASM/src/constants.asm @@ -0,0 +1,3 @@ +; Pointers to game state +.definelabel SAVE_CONTEXT, 0x8011A5D0 +.definelabel GLOBAL_CONTEXT, 0x801C84A0 diff --git a/ASM/src/fixes.asm b/ASM/src/fixes.asm new file mode 100755 index 000000000..8806dd8ad --- /dev/null +++ b/ASM/src/fixes.asm @@ -0,0 +1,10 @@ +Save_Child_B_Equip: +; t0 = save context +LW at, 0x04 (t0) +BEQZ at, @@return ; Only do this as child +NOP +LBU at, 0x68 (t0) ; Load current B equip +SB at, 0x40 (t0) ; Save B equip, will be loaded on next adult -> child transition +@@return: +JR ra +SB t6, 0x68 (t0) ; Displaced code diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm new file mode 100755 index 000000000..36e9308a4 --- /dev/null +++ b/ASM/src/hacks.asm @@ -0,0 +1,190 @@ +;================================================================================================== +; Remove free Kokiri Sword +;================================================================================================== + +; Child -> Adult: Don't save hard-coded 0x3B (Kokiri Sword) as child's B equip +; Replaces: +; SB a0, 0x0040 (v1) +.org 0xAE57A8 ; In memory: 0x8006F848 +NOP + +; Adult -> Child: Don't skip restoring child's B equip if 0xFF is the saved value +; Replaces: +; ADDIU V1, R0, 0x00FF +.org 0xAE58F4 ; In memory: 0x8006F994 +NOP + +; Child -> Adult: Save the child's B equip before it gets overwritten +; Replaces: +; SB t6, 0x0068 (t0) +; LW a0, 0x0030 (sp) +.org 0xAE5F74 ; In memory: 0x80070014 +JAL Save_Child_B_Equip +LW a0, 0x0030 (sp) + +; Prevent Kokiri Sword from being added to inventory on game load +; Replaces: +; SH t9, 0x009C (v0) +.org 0xBAED6C ; In memory: 0x803B2B6C +NOP + +;================================================================================================== +; Item hacks +;================================================================================================== + +; Runs when storing the pending item to the player instance +; Replaces: +; SB a2, 0x0424 (a3) +; SW a0, 0x0428 (a3) +.org 0xA98C30 ; In memory: 0x80022CD0 +JAL Store_Item_Data +SW a0, 0x0428 (a3) + +; Override object ID (NPCs) +; Replaces: +; LW a2, 0x0030 (sp) +; OR a0, s0, r0 +; JAL ... +; LH a1, 0x0004 (a2) +.org 0xBDA0D8 ; In memory: 0x803950C8 +JAL Override_Object_NPC +OR a0, s0, r0 +.skip 4 +NOP + +; Override object ID (Chests) +; Replaces: +; LW t9, 0x002C (sp) +; OR a0, s0, r0 +; JAL ... +; LH a1, 0x0004 (t9) +.org 0xBDA264 ; In memory: 0x80395254 +JAL Override_Object_Chest +OR a0, s0, r0 +.skip 4 +NOP + +; Override graphic ID +; Replaces: +; BLTZ v1, A +; SUBU t0, r0, v1 +; JR ra +; SB v1, 0x0852 (a0) +; A: SB t0, 0x0852 (a0) +; JR ra +.org 0xBCECBC ; In memory: 0x80389CAC +J Override_Graphic +NOP +NOP +NOP +NOP +NOP + +; Override text ID +; Replaces: +; LBU a1, 0x03 (v0) +; SW a3, 0x0028 (sp) +.org 0xBE9AC0 ; In memory: 0x803A4AB0 +JAL Override_Text +SW a3, 0x0028 (sp) + +; Override action ID +; Replaces: +; LW v0, 0x0024 (sp) +; LW a0, 0x0028 (sp) +; JAL 0x8006FDCC +; LBU a1, 0x0000 (v0) +.org 0xBE9AD8 ; In memory: 0x803A4AC8 +JAL Override_Action +LW a0, 0x0028 (sp) +.skip 4 +NOP + +; Inventory fix +; Replaces: +; ADDU A2, T7, T8 +; SW s0, 0x0118 (t9) +.org 0xBDA094 ; In memory: 0x80395084 +JAL Inventory_Fix +SW s0, 0x0118 (t9) + +; Prevent Silver Gauntlets warp +; Replaces: +; ADDIU at, r0, 0x0035 +.org 0xBE9BDC ; In memory: 0x803A4BCC +ADDIU at, r0, 0x8383 ; Make branch impossible + +;================================================================================================== +; Menu hacks +;================================================================================================== + +; Make the "SOLD OUT" menu text blank +.org 0x8A9C00 +.fill 0x400, 0 + +; Item Menu hooks: +; +; There are 4 removed checks for whether the cursor is allowed to move to an adjacent space, +; one for each cardinal direction. +; +; There are 4 hooks that override the item ID used to display the item description. +; One runs periodically (because the description flips between the item name and "< v > to Equip"). +; The other three run immediately when the cursor moves. + +; Left movement check +; Replaces: +; BEQ S4, T5, 0x8038F2B4 +; NOP +.org 0xBB77B4 ; In memory: 0x8038F134 +NOP +NOP + +; Right movement check AND an immediate description update +; Replaces: +; LBU T4, 0x0074 (T9) +; BEQ S4, T4, 0x8038F2B4 +; NOP +.org 0xBB7890 ; In memory: 0x8038F210 +JAL ItemMenu_Description_ID_Immediate1 +NOP +NOP + +; Immediate description update +; Replaces: +; LBU T6, 0x0074 (T5) +; SH T6, 0x009A (SP) +.org 0xBB7950 ; In memory: 0x8038F2D0 +JAL ItemMenu_Description_ID_Immediate2 +NOP + +; Upward movement check +; Replaces: +; BEQ S4, T4, 0x8038F598 +; NOP +.org 0xBB7BA0 ; In memory: 0x8038F520 +NOP +NOP + +; Downward movement check +; Replaces: +; BEQ S4, T4, 0x8038F598 +; NOP +.org 0xBB7BFC ; In memory: 0x8038F57C +NOP +NOP + +; Immediate description update +; Replaces: +; LBU T7, 0x0074 (T6) +; SH T7, 0x009A (SP) +.org 0xBB7C3C ; In memory: 0x8038F5BC +JAL ItemMenu_Description_ID_Immediate3 +NOP + +; Periodic description update +; Replaces: +; LBU T9, 0x0074 (T8) +; SH T9, 0x009A (SP) +.org 0xBB7C58 ; In memory: 0x8038F5D8 +JAL ItemMenu_Description_ID_Periodic +NOP \ No newline at end of file diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm new file mode 100755 index 000000000..191874b93 --- /dev/null +++ b/ASM/src/item_data.asm @@ -0,0 +1,91 @@ +;================================================================================================== +; Item data +;================================================================================================== + +; Dungeon indexes, used with the dungeon item / small key tables in the save context +.definelabel DEKU, 0 +.definelabel DODONGO, 1 +.definelabel JABU, 2 +.definelabel FOREST, 3 +.definelabel FIRE, 4 +.definelabel WATER, 5 +.definelabel SPIRIT, 6 +.definelabel SHADOW, 7 +.definelabel BOTW, 8 +.definelabel TOWER, 10 +.definelabel GTG, 11 +.definelabel FORT, 12 +.definelabel CASTLE, 13 + +; Item rows are 12 bytes long +.macro Item_Row, action_id, graphic_id, text_id, object_id, upgrade_fn, effect_fn, effect_arg1, effect_arg2 + .dh action_id ; 0x00 + .db graphic_id ; 0x02 + .db text_id ; 0x03 + .dh object_id ; 0x04 + .dh upgrade_fn ; 0x06 (lower 16 bits only) + .dh effect_fn ; 0x08 (lower 16 bits only) + .db effect_arg1 ; 0x0A + .db effect_arg2 ; 0x0B +.endmacro + +ITEM_TABLE: +; AAAA GG TT OOOO +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Hookshot_Upgrade, No_Effect, 0xFF, 0xFF ; 0x80 = Progressive Hookshot +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Strength_Upgrade, No_Effect, 0xFF, 0xFF ; 0x81 = Progressive Strength +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Bomb_Bag_Upgrade, No_Effect, 0xFF, 0xFF ; 0x82 = Progressive Bomb Bag +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Bow_Upgrade, No_Effect, 0xFF, 0xFF ; 0x83 = Progressive Bow +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Slingshot_Upgrade, No_Effect, 0xFF, 0xFF ; 0x84 = Progressive Slingshot +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Wallet_Upgrade, No_Effect, 0xFF, 0xFF ; 0x85 = Progressive Wallet +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Scale_Upgrade, No_Effect, 0xFF, 0xFF ; 0x86 = Progressive Scale +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Nut_Upgrade, No_Effect, 0xFF, 0xFF ; 0x87 = Progressive Nut Capacity +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Stick_Upgrade, No_Effect, 0xFF, 0xFF ; 0x88 = Progressive Stick Capacity + +Item_Row 0x00FF, 0x01, 0x43, 0x00C6, No_Upgrade, Give_Bottle, 0x15, 0xFF ; 0x89 = Bottle with Red Potion +Item_Row 0x00FF, 0x01, 0x44, 0x00C6, No_Upgrade, Give_Bottle, 0x16, 0xFF ; 0x8A = Bottle with Green Potion +Item_Row 0x00FF, 0x01, 0x45, 0x00C6, No_Upgrade, Give_Bottle, 0x17, 0xFF ; 0x8B = Bottle with Blue Potion +Item_Row 0x00FF, 0x01, 0x46, 0x00C6, No_Upgrade, Give_Bottle, 0x18, 0xFF ; 0x8C = Bottle with Fairy +Item_Row 0x00FF, 0x01, 0x47, 0x00C6, No_Upgrade, Give_Bottle, 0x19, 0xFF ; 0x8D = Bottle with Fish +Item_Row 0x00FF, 0x01, 0x5D, 0x00C6, No_Upgrade, Give_Bottle, 0x1C, 0xFF ; 0x8E = Bottle with Blue Fire +Item_Row 0x00FF, 0x01, 0x7A, 0x00C6, No_Upgrade, Give_Bottle, 0x1D, 0xFF ; 0x8F = Bottle with Bugs +Item_Row 0x00FF, 0x01, 0xF9, 0x00C6, No_Upgrade, Give_Bottle, 0x1E, 0xFF ; 0x90 = Bottle with Big Poe +Item_Row 0x00FF, 0x01, 0x97, 0x00C6, No_Upgrade, Give_Bottle, 0x20, 0xFF ; 0x91 = Bottle with Poe + +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, FOREST ; 0x92 = Forest Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, FIRE ; 0x93 = Fire Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, WATER ; 0x94 = Water Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, SPIRIT ; 0x95 = Spirit Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, SHADOW ; 0x96 = Shadow Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, CASTLE ; 0x97 = Ganon's Tower Boss Key + +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, DEKU ; 0x98 = Deku Tree Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, DODONGO ; 0x98 = Dodongo's Cavern Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, JABU ; 0x9A = Jabu Jabu Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, FOREST ; 0x9B = Forest Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, FIRE ; 0x9C = Fire Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, WATER ; 0x9D = Water Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, SPIRIT ; 0x9E = Spirit Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, SHADOW ; 0x9F = Shadow Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, BOTW ; 0xA0 = Bottom of the Well Compass + +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, DEKU ; 0xA1 = Deku Tree Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, DODONGO ; 0xA2 = Dodongo's Cavern Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, JABU ; 0xA3 = Jabu Jabu Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, FOREST ; 0xA4 = Forest Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, FIRE ; 0xA5 = Fire Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, WATER ; 0xA6 = Water Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SPIRIT ; 0xA7 = Spirit Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SHADOW ; 0xA8 = Shadow Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, BOTW ; 0xA9 = Bottom of the Well Map + +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FOREST, 0xFF ; 0xAA = Forest Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FIRE, 0xFF ; 0xAB = Fire Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, WATER, 0xFF ; 0xAC = Water Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, SPIRIT, 0xFF ; 0xAD = Spirit Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, SHADOW, 0xFF ; 0xAE = Shadow Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, BOTW, 0xFF ; 0xAF = Bottom of the Well Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, GTG, 0xFF ; 0xB0 = Gerudo Training Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FORT, 0xFF ; 0xB1 = Gerudo Fortress Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, CASTLE, 0xFF ; 0xB2 = Ganon's Castle Small Key + +Item_Row 0x003D, 0x43, 0x0C, 0x00F8, No_Upgrade, Give_Biggoron_Sword, 0xFF, 0xFF ; 0xB3 = Biggoron Sword diff --git a/ASM/src/items.asm b/ASM/src/items.asm new file mode 100755 index 000000000..9d9be00ef --- /dev/null +++ b/ASM/src/items.asm @@ -0,0 +1,513 @@ +;================================================================================================== +; Item code +;================================================================================================== + +Override_Object_NPC: +LW a2, 0x0030 (sp) +LH a1, 0x0004 (a2) +J Override_Object +NOP + +Override_Object_Chest: +LW t9, 0x002C (sp) +LH a1, 0x0004 (t9) +J Override_Object +NOP + +Override_Object: + +; Load extended Object ID +LI t2, CURRENT_ITEM_DATA +LHU t3, 0x04 (t2) + +BEQ t3, 0xFFFF, @@return +NOP + +; Override Object ID +ORI a1, t3, 0 + +@@return: +JR ra +NOP + +;================================================================================================== + +Override_Graphic: + +; Load extended Graphic ID +LI t0, CURRENT_ITEM_DATA +LB t1, 0x02 (t0) + +BEQ t1, -1, @@return +NOP + +; Override Graphic ID +ORI v1, t1, 0 + +@@return: +; Displaced code +ABS t0, v1 +SB t0, 0x0852 (a0) +JR ra +NOP + +;================================================================================================== + +Override_Text: + +LBU a1, 0x03 (v0) ; Displaced code + +; Load extended Text ID +LI t0, CURRENT_ITEM_DATA +LBU t1, 0x03 (t0) + +BEQ t1, 0xFF, @@return +NOP + +; Override Text ID +ORI a1, t1, 0 + +@@return: +JR ra +NOP + +;================================================================================================== + +Override_Action: + +; Displaced code +LW v0, 0x24 (sp) +LBU a1, 0x0000 (v0) + +; Load extended Action ID +LI t0, CURRENT_ITEM_DATA +LHU t1, 0x00 (t0) + +BEQ t1, 0xFFFF, @@return +NOP + +; Override Action ID +ORI a1, t1, 0 + +Grow_Stack 4 +Push ra, 0 +Push a0, 1 +Push a1, 2 +Push a2, 3 + +; Run effect function +; Conventions for effect functions: +; - They receive a pointer to the save context in a0 +; - They receive their arguments in a1 and a2 +LUI t1, hi(NEW_CODE_BASE) +LHU at, 0x08 (t0) +OR t1, t1, at ; t1 = effect function +LI a0, SAVE_CONTEXT +LBU a1, 0x0A (t0) +LBU a2, 0x0B (t0) +JALR t1 +NOP + +Pop ra, 0 +Pop a0, 1 +Pop a1, 2 +Pop a2, 3 +Shrink_Stack 4 + +@@return: +JR ra +NOP + +;================================================================================================== + +Inventory_Fix: + +LI t0, SAVE_CONTEXT +; v0 = item ID + +; Take away tunics/shields that are about to be received, to avoid breaking NPCs who give them + +BNE v0, 0x2C, @@not_goron_tunic +LB t1, 0x9C (t0) +ANDI t1, t1, 0xFD +SB t1, 0x9C (t0) +@@not_goron_tunic: + +BNE v0, 0x2D, @@not_zora_tunic +LB t1, 0x9C (t0) +ANDI t1, t1, 0xFB +SB t1, 0x9C (t0) +@@not_zora_tunic: + +BNE v0, 0x29, @@not_deku_shield +LB t1, 0x9D (t0) +ANDI t1, t1, 0xEF +SB t1, 0x9D (t0) +@@not_deku_shield: + +BNE v0, 0x2A, @@not_hylian_shield +LB t1, 0x9D (t0) +ANDI t1, t1, 0xDF +SB t1, 0x9D (t0) +@@not_hylian_shield: + +JR ra +ADDU a2, t7, t8 ; Displaced code + +;================================================================================================== + +Store_Item_Data: + +Grow_Stack 3 +Push ra, 0 +Push v0, 1 +Push s0, 2 + +SB a2, 0x0424 (a3) ; Displaced code +BEQZ a2, @@return +NOP + +ABS s0, a2 ; s0 = item ID being received + +; Clear current item data +LI t0, -1 +LI t1, CURRENT_ITEM_DATA +SW t0, 0x00 (t1) +SW t0, 0x04 (t1) +SW t0, 0x08 (t1) + +; Load the current scene number +LI t0, GLOBAL_CONTEXT +LHU t0, 0xA4 (t0) + +; If this is a generic grotto, construct a virtual scene number +BNE t0, 0x3E, @@not_grotto +NOP +LI t0, SAVE_CONTEXT +LW t0, 0x1394 (t0) ; Grotto chest contents + flags +ANDI t0, t0, 0x1F ; Isolate chest flags +ADDIU t0, t0, 0x70 ; Grotto virtual scene numbers will range from 0x70 to 0x8F +@@not_grotto: + +; Construct ID used to search the override table +SLL t0, t0, 8 +OR t0, t0, s0 + +; Look up override +LI t1, (ITEM_OVERRIDES - 0x03) +@@lookup_loop: +ADDIU t1, t1, 0x03 +LBU t2, 0x00 (t1) +SLL t2, t2, 8 +LBU at, 0x01 (t1) +OR t2, t2, at ; t2 = ID column in table +BEQZ t2, @@not_extended ; Reached end of override table +NOP +BNE t2, t0, @@lookup_loop +NOP + +LBU s0, 0x02 (t1) ; s0 = item ID found in ITEM_OVERRIDES +ORI v0, s0, 0 + +@@resolve_item: + +ORI s0, v0, 0 +ADDIU t0, s0, -0x80 ; t0 = index into extended ITEM_TABLE +BLTZ t0, @@not_extended ; Item IDs in range 0x00 - 0x7F are not extended +NOP + +; Load ITEM_TABLE row +LI t1, ITEM_TABLE +LI t2, 12 +MULT t0, t2 +MFLO t0 +ADDU t1, t1, t0 ; t1 = pointer to ITEM_TABLE row +; Check whether this item will upgrade into another item +; Conventions for upgrade functions: +; - They receive a pointer to the save context in a0 +; - They receive their item ID in s0 +; - They store their result in v0 +LUI t2, hi(NEW_CODE_BASE) +LHU at, 0x06 (t1) +OR t2, t2, at ; t2 = upgrade function +LI a0, SAVE_CONTEXT +JALR t2 +NOP +; If the upgrade function returned a new item ID, start resolution over again +BNE v0, s0, @@resolve_item +NOP + +; Store extended item data +LI t2, CURRENT_ITEM_DATA +LW t3, 0x00 (t1) +SW t3, 0x00 (t2) +LW t3, 0x04 (t1) +SW t3, 0x04 (t2) +LW t3, 0x08 (t1) +SW t3, 0x08 (t2) +B @@return +NOP + +@@not_extended: +; For non-extended item IDs, put it back in the player instance and let the game handle it +BGEZ a2, @@not_negative +NOP +; The input was negative (item is coming from a chest), so make the result negative +SUBU s0, r0, s0 +@@not_negative: +SB s0, 0x0424 (a3) + +@@return: +Pop ra, 0 +Pop v0, 1 +Pop s0, 2 +Shrink_Stack 3 +JR ra +NOP + +;================================================================================================== +; Item upgrade functions +;================================================================================================== + +No_Upgrade: +JR ra +NOP + +;================================================================================================== + +Hookshot_Upgrade: + +LBU t0, 0x7D (a0) ; Load hookshot from inventory + +BEQ t0, 0xFF, @@return +LI v0, 0x08 ; Hookshot + +LI v0, 0x09 ; Longshot + +@@return: +JR ra +NOP + +;================================================================================================== + +Strength_Upgrade: + +LBU t0, 0xA3 (a0) ; Load strength from inventory +ANDI t0, t0, 0xC0 ; Mask bits to isolate strength + +BEQZ t0, @@return +LI v0, 0x54 ; Goron Bracelet + +BEQ t0, 0x40, @@return +LI v0, 0x35 ; Silver Gauntlets + +LI v0, 0x36 ; Gold Gauntlets + +@@return: +JR ra +NOP + +;================================================================================================== + +Bomb_Bag_Upgrade: + +LBU t0, 0xA3 (a0) ; Load bomb bag from inventory +ANDI t0, t0, 0x18 ; Mask bits to isolate bomb bag + +BEQZ t0, @@return +LI v0, 0x32 ; Bomb Bag + +BEQ t0, 0x08, @@return +LI v0, 0x33 ; Bigger Bomb Bag + +LI v0, 0x34 ; Biggest Bomb Bag + +@@return: +JR ra +NOP + +;================================================================================================== + +Bow_Upgrade: + +LBU t0, 0xA3 (a0) ; Load quiver from inventory +ANDI t0, t0, 0x03 ; Mask bits to isolate quiver + +BEQZ t0, @@return +LI v0, 0x04 ; Bow + +BEQ t0, 0x01, @@return +LI v0, 0x30 ; Big Quiver + +LI v0, 0x31 ; Biggest Quiver + +@@return: +JR ra +NOP + +;================================================================================================== + +Slingshot_Upgrade: + +LBU t0, 0xA2 (a0) ; Load bullet bag from inventory +ANDI t0, t0, 0xC0 ; Mask bits to isolate bullet bag + +BEQZ t0, @@return +LI v0, 0x05 ; Bow + +BEQ t0, 0x40, @@return +LI v0, 0x5F ; Bullet Bag (30) + +LI v0, 0x60 ; Bullet Bag (40) + +@@return: +JR ra +NOP + +;================================================================================================== + +Wallet_Upgrade: + +LBU t0, 0xA2 (a0) ; Load wallet from inventory +ANDI t0, t0, 0x30 ; Mask bits to isolate wallet + +BEQZ t0, @@return +LI v0, 0x45 ; Adult's Wallet + +LI v0, 0x46 ; Giant's Wallet + +@@return: +JR ra +NOP + +;================================================================================================== + +Scale_Upgrade: + +LBU t0, 0xA2 (a0) ; Load scale from inventory +ANDI t0, t0, 0x06 ; # Mask bits to isolate scale + +BEQZ t0, @@return +LI v0, 0x37 ; Silver Scale + +LI v0, 0x38 ; Gold Scale + +@@return: +JR ra +NOP + +;================================================================================================== + +Nut_Upgrade: + +LBU t0, 0xA1 (a0) ; Load nut limit from inventory +ANDI t0, t0, 0x30 ; Mask bits to isolate nut limit + +BEQZ t0, @@return +LI v0, 0x79 ; 30 Nuts + +LI v0, 0x7A ; 40 Nuts + +@@return: +JR ra +NOP + +;================================================================================================== + +Stick_Upgrade: + +LBU t0, 0xA1 (a0) ; Load stick limit from inventory +ANDI t0, t0, 0x06 ; Mask bits to isolate stick limit + +BEQZ t0, @@return +LI v0, 0x77 ; 20 Sticks + +LI v0, 0x78 ; 30 Sticks + +@@return: +JR ra +NOP + +;================================================================================================== +; Item effect functions +;================================================================================================== + +No_Effect: +JR ra +NOP + +;================================================================================================== + +Give_Biggoron_Sword: +LI t0, 0x01 +SB t0, 0x3E (a0) ; Set flag to make the sword durable +JR ra +NOP + +;================================================================================================== + +Give_Tunic: +; a0 = save context +; a1 = tunic mask +LBU t0, 0x9C (a0) ; Load tunics from inventory +OR t0, t0, a1 +SB t0, 0x9C (a0) +JR ra +NOP + +;================================================================================================== + +Give_Bottle: +; a0 = save context +; a1 = item code to store +ADDIU t0, a0, 0x86 ; t0 = First bottle slot +LI t1, -1 ; t1 = Bottle slot offset + +@@loop: +ADDIU t1, t1, 1 +BGT t1, 3, @@return ; No free bottle slots +NOP + +; Check whether slot is full +ADDU t2, t0, t1 +LBU t3, 0x00 (t2) +BNE t3, 0xFF, @@loop +NOP + +; Found an open slot +SB a1, 0x00 (t2) + +@@return: +JR ra +NOP + +;================================================================================================== + +Give_Dungeon_Item: +; a0 = save context +; a1 = mask (0x01 = boss key, 0x02 = compass, 0x04 = map) +; a2 = dungeon index +ADDIU t0, a0, 0xA8 +ADDU t0, t0, a2 ; t0 = address of this dungeon's items +LBU t1, 0x00 (t0) +OR t1, t1, a1 +SB t1, 0x00 (t0) +JR ra +NOP + +;================================================================================================== + +Give_Small_Key: +; a0 = save context +; a1 = dungeon index +ADDIU t0, a0, 0xBC +ADDU t0, t0, a1 ; t0 = address of this dungeon's key count +LB t1, 0x00 (t0) +BGEZ t1, @not_negative +NOP +LI t1, 0x00 +@not_negative: +ADDIU t1, t1, 1 +SB t1, 0x00 (t0) +JR ra +NOP diff --git a/ASM/src/menu.asm b/ASM/src/menu.asm new file mode 100755 index 000000000..11f073eab --- /dev/null +++ b/ASM/src/menu.asm @@ -0,0 +1,28 @@ +.macro ItemMenu_Description_ID, dest_reg, base_reg +LBU dest_reg, 0x0074 (base_reg) ; Load the item ID at the selected menu slot +ADDIU AT, R0, 0xFF ; 0xFF indicates an empty menu slot +BNE dest_reg, AT, @@return ; If the slot is not empty, return to default behavior +NOP +ADDIU dest_reg, R0, 0x2C ; 0x2C = "SOLD OUT" +@@return: +.endmacro + +ItemMenu_Description_ID_Periodic: +ItemMenu_Description_ID T9, T8 +JR RA +SH T9, 0x009A (SP) + +ItemMenu_Description_ID_Immediate1: +ItemMenu_Description_ID T4, T9 +JR RA +NOP + +ItemMenu_Description_ID_Immediate2: +ItemMenu_Description_ID T6, T5 +JR RA +SH T6, 0x009A (SP) + +ItemMenu_Description_ID_Immediate3: +ItemMenu_Description_ID T7, T6 +JR RA +SH T7, 0x009A (SP) diff --git a/ASM/src/state.asm b/ASM/src/state.asm new file mode 100755 index 000000000..ea13ba014 --- /dev/null +++ b/ASM/src/state.asm @@ -0,0 +1,6 @@ +;================================================================================================== +; Global variable storage for new code +;================================================================================================== + +CURRENT_ITEM_DATA: +.dw 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF diff --git a/ASM/src/util.asm b/ASM/src/util.asm new file mode 100755 index 000000000..4a35a7b32 --- /dev/null +++ b/ASM/src/util.asm @@ -0,0 +1,15 @@ +.macro Grow_Stack, count + ADDIU sp, sp, -0x04 * count +.endmacro + +.macro Shrink_Stack, count + ADDIU sp, sp, 0x04 * count +.endmacro + +.macro Push, reg, index + SW reg, 0x04 * index (sp) +.endmacro + +.macro Pop, reg, index + LW reg, 0x04 * index (sp) +.endmacro From 697ca0146ee53826466e887804bee0d3d399d64d Mon Sep 17 00:00:00 2001 From: Wulfy Date: Wed, 16 May 2018 18:03:20 -0400 Subject: [PATCH 003/151] Remove hacks from Rom.py that exist in ASM --- Rom.py | 193 --------------------------------------------------------- 1 file changed, 193 deletions(-) diff --git a/Rom.py b/Rom.py index 3075b149a..4f8d61074 100644 --- a/Rom.py +++ b/Rom.py @@ -518,18 +518,6 @@ def patch_rom(world, rom): # Poacher's Saw no longer messes up Deku Theater rom.write_bytes(0xAE72CC, [0x00, 0x00, 0x00, 0x00]) - # No more free sword for the kid from pedestal - rom.write_bytes(0xAE57A8, [0x00, 0x00, 0x00, 0x00]) - rom.write_bytes(0xAE58F4, [0x00, 0x00, 0x00, 0x00]) - rom.write_bytes(0xAE5F74, [0x0C, 0x10, 0x01, 0xC8]) - Block_code = [0x8D, 0x01, 0x00, 0x04, 0x10, 0x20, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, - 0x91, 0x01, 0x00, 0x68, 0xA1, 0x01, 0x00, 0x40, 0x03, 0xE0, 0x00, 0x08, - 0xA1, 0x0E, 0x00, 0x68] - rom.write_bytes(0x3480720, Block_code) - - # Prevent Kokiri Sword from being added to inventory on game load - rom.write_bytes(0xBAED6C, [0x00, 0x00, 0x00, 0x00]) - # Learning Serenade tied to opening chest in room Block_code = [0x3C, 0x0F, 0x80, 0x1D, 0x81, 0xE8, 0xA1, 0xDB, 0x24, 0x19, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8C, 0xA2, 0x1C, 0x44, @@ -558,8 +546,6 @@ def patch_rom(world, rom): rom.write_bytes(0xED3378, [0x91, 0xB8, 0xA6, 0x42, 0xA1, 0xA8, 0xA6, 0x42]) rom.write_bytes(0xED6574, [0x00, 0x00, 0x00, 0x00]) - # Overwrite old Hookshot slot with Biggoron Sword - rom.write_bytes(0xBEEEBE, [0x3D, 0x80, 0x43, 0x0C, 0x00, 0xF8]) # Allow Ganon's Tower Boss Key to Shuffle rom.write_bytes(0xAE603C, [0x25, 0x08, 0xA5, 0xD0]) @@ -614,196 +600,17 @@ def patch_rom(world, rom): rom.write_bytes(0x10, Block_code) # Set hooks for various code - rom.write_bytes(0xBE9AC0, [0x0C, 0x10, 0x00, 0x00]) #Progressive Items Text Hook - rom.write_bytes(0xBE9AE0, [0x0C, 0x10, 0x00, 0x81]) #Progressive Items Item ID Hook - rom.write_bytes(0xBCECB4, [0x08, 0x10, 0x00, 0xFF, 0x03, 0x19, 0x10, 0x21]) #Progressive Items Graphic ID Hook - rom.write_bytes(0xBDA26C, [0x0C, 0x22, 0x9E, 0xF0]) #Progressive Items Object Hook, mechanics of parameter bizarre, chests - rom.write_bytes(0xBDA0E0, [0x0C, 0x22, 0x9E, 0xF0]) #Progressive Items Object Hook, mechanics of parameter bizarre, NPCs # rom.write_bytes(0xBD6C94, [0x0C, 0x22, 0x9E, 0xF0]) #Progressive Items Object Hook, unsure where this case is called rom.write_bytes(0xB06C2C, [0x0C, 0x10, 0x01, 0x80]) #Save Writing Hook - rom.write_bytes(0xBDA094, [0x0C, 0x10, 0x02, 0x18]) #Inventory Fix Hook - rom.write_bytes(0xBDA1CC, [0x0C, 0x10, 0x02, 0x6C, 0xAF, 0xAF, 0x00, 0x2C]) #Chest Biggoron Sword Hook rom.write_bytes(0xC89A34, [0x0C, 0x10, 0x02, 0x54, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at death mountain trail rom.write_bytes(0xC89A78, [0x0C, 0x10, 0x02, 0x60, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at crater - # Inventory Fix - Block_code = [0x3C, 0x04, 0x80, 0x11, 0x34, 0x84, 0xA5, 0xD0, 0x34, 0x06, 0x00, 0x08, - 0x14, 0xC2, 0x00, 0x02, 0x34, 0x06, 0x00, 0x01, 0xA0, 0x86, 0x00, 0x3E, - 0x34, 0x06, 0x00, 0x2C, 0x14, 0xC2, 0x00, 0x03, 0x80, 0x86, 0x00, 0x9C, - 0x30, 0xC6, 0x00, 0xFD, 0xA0, 0x86, 0x00, 0x9C, 0x34, 0x06, 0x00, 0x2D, - 0x14, 0xC2, 0x00, 0x03, 0x80, 0x86, 0x00, 0x9C, 0x30, 0xC6, 0x00, 0xFB, - 0xA0, 0x86, 0x00, 0x9C, 0x34, 0x06, 0x00, 0x29, 0x14, 0xC2, 0x00, 0x03, - 0x80, 0x86, 0x00, 0x9D, 0x30, 0xC6, 0x00, 0xEF, 0xA0, 0x86, 0x00, 0x9D, - 0x34, 0x06, 0x00, 0x2A, 0x14, 0xC2, 0x00, 0x03, 0x80, 0x86, 0x00, 0x9D, - 0x30, 0xC6, 0x00, 0xDF, 0xA0, 0x86, 0x00, 0x9D, 0x03, 0xE0, 0x00, 0x08, - 0x01, 0xF8, 0x30, 0x21] - rom.write_bytes(0x3480860, Block_code) - - # Chest Check for Biggoron Sword - Block_code = [0x24, 0x04, 0x00, 0x08, 0x14, 0x8B, 0x00, 0x04, 0x24, 0x04, 0x00, 0x01, - 0x3C, 0x01, 0x80, 0x12, 0x24, 0x21, 0xA5, 0xD0, 0xA0, 0x24, 0x00, 0x3E, - 0x03, 0xE0, 0x00, 0x08, 0x91, 0xE4, 0x00, 0x00] - rom.write_bytes(0x34809B0, Block_code) - - # Menu Fix (Wulfy) - Block_code = [0x93, 0x19, 0x00, 0x74, 0x24, 0x01, 0x00, 0xFF, 0x17, 0x21, 0x00, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x24, 0x19, 0x00, 0x2C, 0x03, 0xE0, 0x00, 0x08, - 0xA7, 0xB9, 0x00, 0x9A] - rom.write_bytes(0x34808D0, Block_code) - Block_code = [0x93, 0x2C, 0x00, 0x74, 0x24, 0x01, 0x00, 0xFF, 0x15, 0x81, 0x00, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x24, 0x0C, 0x00, 0x2C, 0x03, 0xE0, 0x00, 0x08, - 0x00, 0x00, 0x00, 0x00] - rom.write_bytes(0x34808F0, Block_code) - Block_code = [0x91, 0xAE, 0x00, 0x74, 0x24, 0x01, 0x00, 0xFF, 0x15, 0xC1, 0x00, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x24, 0x0E, 0x00, 0x2C, 0x03, 0xE0, 0x00, 0x08, - 0xA7, 0xAE, 0x00, 0x9A] - rom.write_bytes(0x3480910, Block_code) - Block_code = [0x91, 0xCF, 0x00, 0x74, 0x24, 0x01, 0x00, 0xFF, 0x15, 0xE1, 0x00, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x24, 0x0F, 0x00, 0x2C, 0x03, 0xE0, 0x00, 0x08, - 0xA7, 0xAF, 0x00, 0x9A] - rom.write_bytes(0x3480930, Block_code) - rom.write_bytes(0x8A9C00, [0x00] * 0x400) - rom.write_bytes(0xBB77B4, [0x00, 0x00, 0x00, 0x00]) - rom.write_bytes(0xBB7890, [0x0C, 0x10, 0x02, 0x3C, 0x00, 0x00, 0x00, 0x00]) - rom.write_bytes(0xBB7950, [0x0C, 0x10, 0x02, 0x44, 0x00, 0x00, 0x00, 0x00]) - rom.write_bytes(0xBB7BA0, [0x00, 0x00, 0x00, 0x00]) - rom.write_bytes(0xBB7BFC, [0x00, 0x00, 0x00, 0x00]) - rom.write_bytes(0xBB7C3C, [0x0C, 0x10, 0x02, 0x4C, 0x00, 0x00, 0x00, 0x00]) - rom.write_bytes(0xBB7C58, [0x0C, 0x10, 0x02, 0x34, 0x00, 0x00, 0x00, 0x00]) - # Sticks on B fix rom.write_bytes(0xAE4B14, [0x0C, 0x10, 0x02, 0x74]) Block_code = [0x90, 0xCE, 0x13, 0xE2, 0x15, 0xC0, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x25, 0xCE, 0x00, 0xFF, 0xA0, 0xC8, 0x0F, 0x33, 0x03, 0xE0, 0x00, 0x08] rom.write_bytes(0x34809D0, Block_code) - # Progressive Items (Text) - Block_code = [0x90, 0x45, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, 0x25, 0x4A, 0x00, 0x4F, - 0x15, 0x45, 0x00, 0x08, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x4D, 0x25, 0x4A, 0x00, 0xFF, 0x15, 0x4B, 0x00, 0x03, - 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x36, - 0x25, 0x4A, 0x00, 0x5A, 0x15, 0x45, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, - 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0x18, - 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x08, 0x30, 0xA5, 0x00, 0x00, - 0x24, 0xA5, 0x00, 0x58, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x59, 0x25, 0x4A, 0x00, 0x5C, - 0x15, 0x45, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0xC0, 0x15, 0x4B, 0x00, 0x03, - 0x25, 0x4A, 0x00, 0x40, 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x79, - 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, - 0x24, 0xA5, 0x00, 0x5B, 0x25, 0x4A, 0x00, 0xCE, 0x15, 0x45, 0x00, 0x08, - 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x72, - 0x31, 0x6B, 0x00, 0x06, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0xCD, 0x25, 0x4A, 0x00, 0x5F, - 0x15, 0x45, 0x00, 0x08, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x72, 0x31, 0x6B, 0x00, 0x30, 0x15, 0x4B, 0x00, 0x03, - 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x5E, - 0x25, 0x4A, 0x00, 0x90, 0x15, 0x45, 0x00, 0x09, 0x31, 0x4A, 0x00, 0x00, - 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x71, 0x31, 0x6B, 0x00, 0x06, - 0x25, 0x4A, 0x00, 0x04, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x91, 0x25, 0x4A, 0x00, 0xA7, - 0x15, 0x45, 0x00, 0x09, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x71, 0x31, 0x6B, 0x00, 0x30, 0x25, 0x4A, 0x00, 0x20, - 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, - 0x24, 0xA5, 0x00, 0xA8, 0x25, 0x4A, 0x00, 0x6C, 0x15, 0x45, 0x00, 0x0C, - 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x72, - 0x31, 0x6B, 0x00, 0xC0, 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x40, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x30, 0x15, 0x4B, 0x00, 0x03, - 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x07, - 0x25, 0x4A, 0x00, 0x57, 0x15, 0x45, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, - 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0x03, - 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x01, 0x30, 0xA5, 0x00, 0x00, - 0x24, 0xA5, 0x00, 0x31, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x56, 0x03, 0xE0, 0x00, 0x08] - rom.write_bytes(0x3480000, Block_code) - - # Progressive Items (Item IDs) - Block_code = [0x00, 0x00, 0x00, 0x00, 0x31, 0x4A, 0x00, 0x00, 0x25, 0x4A, 0x00, 0x0B, - 0x15, 0x45, 0x00, 0x08, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x4D, 0x25, 0x4A, 0x00, 0xFF, 0x15, 0x4B, 0x00, 0x03, - 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x0A, - 0x25, 0x4A, 0x00, 0x4F, 0x15, 0x45, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, - 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0x18, - 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x08, 0x30, 0xA5, 0x00, 0x00, - 0x24, 0xA5, 0x00, 0x4D, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x4E, 0x25, 0x4A, 0x00, 0x52, - 0x15, 0x45, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0xC0, 0x15, 0x4B, 0x00, 0x03, - 0x25, 0x4A, 0x00, 0x40, 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x50, - 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, - 0x24, 0xA5, 0x00, 0x51, 0x25, 0x4A, 0x00, 0x54, 0x15, 0x45, 0x00, 0x08, - 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x72, - 0x31, 0x6B, 0x00, 0x06, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x53, 0x25, 0x4A, 0x00, 0x57, - 0x15, 0x45, 0x00, 0x08, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x72, 0x31, 0x6B, 0x00, 0x30, 0x15, 0x4B, 0x00, 0x03, - 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x56, - 0x25, 0x4A, 0x00, 0x98, 0x15, 0x45, 0x00, 0x09, 0x31, 0x4A, 0x00, 0x00, - 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x71, 0x31, 0x6B, 0x00, 0x06, - 0x25, 0x4A, 0x00, 0x04, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x99, 0x25, 0x4A, 0x00, 0x9A, - 0x15, 0x45, 0x00, 0x09, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x71, 0x31, 0x6B, 0x00, 0x30, 0x25, 0x4A, 0x00, 0x20, - 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, - 0x24, 0xA5, 0x00, 0x9B, 0x25, 0x4A, 0x00, 0x49, 0x15, 0x45, 0x00, 0x0C, - 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x72, - 0x31, 0x6B, 0x00, 0xC0, 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x40, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x06, 0x15, 0x4B, 0x00, 0x03, - 0x31, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x48, - 0x25, 0x4A, 0x00, 0x4C, 0x15, 0x45, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, - 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0x03, - 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x01, 0x30, 0xA5, 0x00, 0x00, - 0x24, 0xA5, 0x00, 0x03, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0x4B, 0x08, 0x01, 0xBF, 0x73] - rom.write_bytes(0x3480200, Block_code) - - # Progressive Items (Graphic IDs) - Block_code = [0x80, 0x43, 0x00, 0x02, 0x31, 0x4A, 0x00, 0x00, 0x25, 0x4A, 0x00, 0x2E, - 0x15, 0x43, 0x00, 0x08, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x4D, 0x25, 0x4A, 0x00, 0xFF, 0x15, 0x4B, 0x00, 0x03, - 0x31, 0x4A, 0x00, 0x00, 0x30, 0x63, 0x00, 0x00, 0x24, 0x63, 0x00, 0x2D, - 0x25, 0x4A, 0x00, 0x1A, 0x15, 0x43, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, - 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0x18, - 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x08, 0x30, 0x63, 0x00, 0x00, - 0x24, 0x63, 0x00, 0x18, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0x63, 0x00, 0x00, 0x24, 0x63, 0x00, 0x19, 0x25, 0x4A, 0x00, 0x4A, - 0x15, 0x43, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0xC0, 0x15, 0x4B, 0x00, 0x03, - 0x25, 0x4A, 0x00, 0x40, 0x30, 0x63, 0x00, 0x00, 0x24, 0x63, 0x00, 0x58, - 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, 0x30, 0x63, 0x00, 0x00, - 0x24, 0x63, 0x00, 0x49, 0x25, 0x4A, 0x00, 0x2B, 0x15, 0x43, 0x00, 0x08, - 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x72, - 0x31, 0x6B, 0x00, 0x06, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0x63, 0x00, 0x00, 0x24, 0x63, 0x00, 0x2A, 0x25, 0x4A, 0x00, 0x23, - 0x15, 0x43, 0x00, 0x08, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x72, 0x31, 0x6B, 0x00, 0x30, 0x15, 0x4B, 0x00, 0x03, - 0x31, 0x4A, 0x00, 0x00, 0x30, 0x63, 0x00, 0x00, 0x24, 0x63, 0x00, 0x22, - 0x25, 0x4A, 0x00, 0x73, 0x15, 0x43, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, - 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x72, 0x31, 0x6B, 0x00, 0xC0, - 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x40, 0x30, 0x63, 0x00, 0x00, - 0x24, 0x63, 0x00, 0x33, 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, - 0x30, 0x63, 0x00, 0x00, 0x24, 0x63, 0x00, 0x6C, 0x25, 0x4A, 0x00, 0x17, - 0x15, 0x43, 0x00, 0x0C, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0x03, 0x15, 0x4B, 0x00, 0x03, - 0x25, 0x4A, 0x00, 0x01, 0x30, 0x63, 0x00, 0x00, 0x24, 0x63, 0x00, 0x35, - 0x15, 0x4B, 0x00, 0x03, 0x31, 0x4A, 0x00, 0x00, 0x30, 0x63, 0x00, 0x00, - 0x24, 0x63, 0x00, 0x16, 0x08, 0x0E, 0x27, 0x2B] - rom.write_bytes(0x34803FC, Block_code) - - # Progressive Items (Object IDs) - Block_code = [0x31, 0x4A, 0x00, 0x00, 0x25, 0x4A, 0x01, 0x2D, 0x15, 0x45, 0x00, 0x08, - 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x73, - 0x31, 0x6B, 0x00, 0xC0, 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x00, - 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x01, 0x47, 0x25, 0x4A, 0x01, 0x7B, - 0x15, 0x45, 0x00, 0x08, 0x31, 0x4A, 0x00, 0x00, 0x3C, 0x0B, 0x80, 0x12, - 0x91, 0x6B, 0xA6, 0x72, 0x31, 0x6B, 0x00, 0xC0, 0x15, 0x4B, 0x00, 0x03, - 0x25, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, 0x24, 0xA5, 0x00, 0xE7, - 0x25, 0x4A, 0x00, 0xBE, 0x15, 0x45, 0x00, 0x08, 0x31, 0x4A, 0x00, 0x00, - 0x3C, 0x0B, 0x80, 0x12, 0x91, 0x6B, 0xA6, 0x73, 0x31, 0x6B, 0x00, 0x03, - 0x15, 0x4B, 0x00, 0x03, 0x25, 0x4A, 0x00, 0x00, 0x30, 0xA5, 0x00, 0x00, - 0x24, 0xA5, 0x00, 0xE9, 0x08, 0x0E, 0x46, 0x43] - rom.write_bytes(0x3480564, Block_code) - # Progressive Fairies (changes magic meter fairy cutscenes based on current magic level) Block_code = [0x3C, 0x0A, 0x80, 0x12, 0x21, 0x4A, 0xA5, 0xD0, 0x81, 0x4A, 0x00, 0x32, 0x3C, 0x0F, 0x80, 0x1D, 0x21, 0xEF, 0xA1, 0xC8, 0x24, 0x0B, 0x00, 0x01, From 7ce3bb82b2fd2d741ea918dd26be0508641487e5 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Wed, 16 May 2018 21:19:32 -0400 Subject: [PATCH 004/151] Various ASM updates - Add map/compass for Ice Cavern - Simplify some code by making tables less compact - Follow stack conventions - Misc. fixes --- ASM/notes/dungeons.txt | 2 +- ASM/src/build.asm | 3 -- ASM/src/config.asm | 20 ++++++----- ASM/src/item_data.asm | 63 ++++++++++++++++---------------- ASM/src/items.asm | 82 ++++++++++++++++-------------------------- ASM/src/state.asm | 2 +- ASM/src/util.asm | 15 -------- 7 files changed, 77 insertions(+), 110 deletions(-) delete mode 100755 ASM/src/util.asm diff --git a/ASM/notes/dungeons.txt b/ASM/notes/dungeons.txt index f6eefe2be..76c1ef9a1 100755 --- a/ASM/notes/dungeons.txt +++ b/ASM/notes/dungeons.txt @@ -7,7 +7,7 @@ 6: Spirit Temple 7: Shadow Temple 8: BOTW -9: (nothing?) +9: Ice Cavern 10: Ganon's Tower 11: Gerudo Training Ground 12: Gerudo Fortress diff --git a/ASM/src/build.asm b/ASM/src/build.asm index b53c9c991..f1efec1cf 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -18,8 +18,6 @@ .headersize 0x7CF80000 .org 0x80400000 -NEW_CODE_BASE: - ; 0x000 - 0x5FF: Settings and tables which the front-end may write .area 0x600, 0 .include "config.asm" @@ -31,7 +29,6 @@ NEW_CODE_BASE: ; 0xA00 - 0xFFF: New code blocks .area 0x600, 0 -.include "util.asm" .include "constants.asm" .include "state.asm" .include "items.asm" diff --git a/ASM/src/config.asm b/ASM/src/config.asm index aeec32ec1..12e84d8ff 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -7,6 +7,12 @@ ; This table changes the meaning of a given item ID within a given scene. It must be terminated with ; two 0x00 bytes (which will happen by default as long as you don't fill the allotted space). ; +; Row format (4 bytes): +; SSOONNNN +; SS = Scene +; OO = Old item ID +; NN = New item ID +; ; Generic grotto virtual scene numbers: ; 0x70: Hyrule Field: under boulder west of drawbridge ; 0x72: Hyrule Field: under boulder between Kokiri Forest and Lake Hylia @@ -18,14 +24,10 @@ ; 0x87: Death Mountain: SoS hole outside Goron City ; 0x8A: Death Mountain Crater: under boulder in circle of rocks near top entrance -.area 0x180, 0 +.area 0x200, 0 ITEM_OVERRIDES: -; SS = Scene -; OO = Old item ID -; NN = New item ID -; SS OO NN -.db 0x28, 0x2C, 0x84 -.db 0x28, 0x2D, 0x84 -.db 0x28, 0x29, 0x84 -.db 0x28, 0x2A, 0x84 +.byte 0x28, 0x6A, 0x00, 0x98 +.byte 0x28, 0x4B, 0x00, 0xA2 +.byte 0x28, 0x7B, 0x00, 0xAC +.byte 0x28, 0x4A, 0x00, 0xB5 .endarea diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index 191874b93..fc909d0f8 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -12,21 +12,22 @@ .definelabel SPIRIT, 6 .definelabel SHADOW, 7 .definelabel BOTW, 8 +.definelabel ICE, 9 .definelabel TOWER, 10 .definelabel GTG, 11 .definelabel FORT, 12 .definelabel CASTLE, 13 -; Item rows are 12 bytes long +; Item rows are 16 bytes long .macro Item_Row, action_id, graphic_id, text_id, object_id, upgrade_fn, effect_fn, effect_arg1, effect_arg2 - .dh action_id ; 0x00 - .db graphic_id ; 0x02 - .db text_id ; 0x03 - .dh object_id ; 0x04 - .dh upgrade_fn ; 0x06 (lower 16 bits only) - .dh effect_fn ; 0x08 (lower 16 bits only) - .db effect_arg1 ; 0x0A - .db effect_arg2 ; 0x0B + .halfword action_id ; 0x00 + .byte graphic_id ; 0x02 + .byte text_id ; 0x03 + .halfword object_id ; 0x04 + .byte effect_arg1 ; 0x06 + .byte effect_arg2 ; 0x07 + .word effect_fn ; 0x08 + .word upgrade_fn ; 0x0C .endmacro ITEM_TABLE: @@ -56,10 +57,10 @@ Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, FIRE Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, WATER ; 0x94 = Water Temple Boss Key Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, SPIRIT ; 0x95 = Spirit Temple Boss Key Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, SHADOW ; 0x96 = Shadow Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, CASTLE ; 0x97 = Ganon's Tower Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, CASTLE ; 0x97 = Ganon's Castle Boss Key Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, DEKU ; 0x98 = Deku Tree Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, DODONGO ; 0x98 = Dodongo's Cavern Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, DODONGO ; 0x99 = Dodongo's Cavern Compass Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, JABU ; 0x9A = Jabu Jabu Compass Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, FOREST ; 0x9B = Forest Temple Compass Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, FIRE ; 0x9C = Fire Temple Compass @@ -67,25 +68,27 @@ Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, WATER Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, SPIRIT ; 0x9E = Spirit Temple Compass Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, SHADOW ; 0x9F = Shadow Temple Compass Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, BOTW ; 0xA0 = Bottom of the Well Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, ICE ; 0xA1 = Ice Cavern Compass -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, DEKU ; 0xA1 = Deku Tree Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, DODONGO ; 0xA2 = Dodongo's Cavern Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, JABU ; 0xA3 = Jabu Jabu Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, FOREST ; 0xA4 = Forest Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, FIRE ; 0xA5 = Fire Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, WATER ; 0xA6 = Water Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SPIRIT ; 0xA7 = Spirit Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SHADOW ; 0xA8 = Shadow Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, BOTW ; 0xA9 = Bottom of the Well Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, DEKU ; 0xA2 = Deku Tree Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, DODONGO ; 0xA3 = Dodongo's Cavern Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, JABU ; 0xA4 = Jabu Jabu Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, FOREST ; 0xA5 = Forest Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, FIRE ; 0xA6 = Fire Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, WATER ; 0xA7 = Water Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SPIRIT ; 0xA8 = Spirit Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SHADOW ; 0xA9 = Shadow Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, BOTW ; 0xAA = Bottom of the Well Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, ICE ; 0xAB = Bottom of the Well Map -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FOREST, 0xFF ; 0xAA = Forest Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FIRE, 0xFF ; 0xAB = Fire Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, WATER, 0xFF ; 0xAC = Water Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, SPIRIT, 0xFF ; 0xAD = Spirit Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, SHADOW, 0xFF ; 0xAE = Shadow Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, BOTW, 0xFF ; 0xAF = Bottom of the Well Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, GTG, 0xFF ; 0xB0 = Gerudo Training Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FORT, 0xFF ; 0xB1 = Gerudo Fortress Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, CASTLE, 0xFF ; 0xB2 = Ganon's Castle Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FOREST, 0xFF ; 0xAC = Forest Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FIRE, 0xFF ; 0xAD = Fire Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, WATER, 0xFF ; 0xAE = Water Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, SPIRIT, 0xFF ; 0xAF = Spirit Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, SHADOW, 0xFF ; 0xB0 = Shadow Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, BOTW, 0xFF ; 0xB1 = Bottom of the Well Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, GTG, 0xFF ; 0xB2 = Gerudo Training Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FORT, 0xFF ; 0xB3 = Gerudo Fortress Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, CASTLE, 0xFF ; 0xB4 = Ganon's Castle Small Key -Item_Row 0x003D, 0x43, 0x0C, 0x00F8, No_Upgrade, Give_Biggoron_Sword, 0xFF, 0xFF ; 0xB3 = Biggoron Sword +Item_Row 0x003D, 0x43, 0x0C, 0x00F8, No_Upgrade, Give_Biggoron_Sword, 0xFF, 0xFF ; 0xB5 = Biggoron Sword diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 9d9be00ef..cb08daf49 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -89,30 +89,28 @@ NOP ; Override Action ID ORI a1, t1, 0 -Grow_Stack 4 -Push ra, 0 -Push a0, 1 -Push a1, 2 -Push a2, 3 +SW ra, -0x04 (sp) +SW a0, 0x00 (sp) +SW a1, 0x04 (sp) +SW a2, 0x08 (sp) +ADDIU sp, sp, -0x14 ; Run effect function ; Conventions for effect functions: ; - They receive a pointer to the save context in a0 ; - They receive their arguments in a1 and a2 -LUI t1, hi(NEW_CODE_BASE) -LHU at, 0x08 (t0) -OR t1, t1, at ; t1 = effect function +LW t1, 0x08 (t0) ; t1 = effect function LI a0, SAVE_CONTEXT -LBU a1, 0x0A (t0) -LBU a2, 0x0B (t0) +LBU a1, 0x06 (t0) +LBU a2, 0x07 (t0) JALR t1 NOP -Pop ra, 0 -Pop a0, 1 -Pop a1, 2 -Pop a2, 3 -Shrink_Stack 4 +ADDIU sp, sp, 0x14 +LW ra, -0x04 (sp) +LW a0, 0x00 (sp) +LW a1, 0x04 (sp) +LW a2, 0x08 (sp) @@return: JR ra @@ -158,10 +156,10 @@ ADDU a2, t7, t8 ; Displaced code Store_Item_Data: -Grow_Stack 3 -Push ra, 0 -Push v0, 1 -Push s0, 2 +SW ra, -0x04 (sp) +SW v0, -0x08 (sp) +SW s0, -0x0C (sp) +ADDIU sp, sp, -0x1C SB a2, 0x0424 (a3) ; Displaced code BEQZ a2, @@return @@ -194,19 +192,16 @@ SLL t0, t0, 8 OR t0, t0, s0 ; Look up override -LI t1, (ITEM_OVERRIDES - 0x03) +LI t1, (ITEM_OVERRIDES - 0x04) @@lookup_loop: -ADDIU t1, t1, 0x03 -LBU t2, 0x00 (t1) -SLL t2, t2, 8 -LBU at, 0x01 (t1) -OR t2, t2, at ; t2 = ID column in table +ADDIU t1, t1, 0x04 +LHU t2, 0x00 (t1) ; t2 = ID column in table BEQZ t2, @@not_extended ; Reached end of override table NOP BNE t2, t0, @@lookup_loop NOP -LBU s0, 0x02 (t1) ; s0 = item ID found in ITEM_OVERRIDES +LHU s0, 0x02 (t1) ; s0 = item ID found in ITEM_OVERRIDES ORI v0, s0, 0 @@resolve_item: @@ -218,18 +213,14 @@ NOP ; Load ITEM_TABLE row LI t1, ITEM_TABLE -LI t2, 12 -MULT t0, t2 -MFLO t0 +SLL t0, t0, 4 ; t0 = offset into table = index * 16 ADDU t1, t1, t0 ; t1 = pointer to ITEM_TABLE row ; Check whether this item will upgrade into another item ; Conventions for upgrade functions: ; - They receive a pointer to the save context in a0 ; - They receive their item ID in s0 ; - They store their result in v0 -LUI t2, hi(NEW_CODE_BASE) -LHU at, 0x06 (t1) -OR t2, t2, at ; t2 = upgrade function +LW t2, 0x0C (t1) ; t2 = upgrade function LI a0, SAVE_CONTEXT JALR t2 NOP @@ -258,10 +249,10 @@ SUBU s0, r0, s0 SB s0, 0x0424 (a3) @@return: -Pop ra, 0 -Pop v0, 1 -Pop s0, 2 -Shrink_Stack 3 +ADDIU sp, sp, 0x1C +LW ra, -0x04 (sp) +LW v0, -0x08 (sp) +LW s0, -0x0C (sp) JR ra NOP @@ -271,7 +262,7 @@ NOP No_Upgrade: JR ra -NOP +ORI v0, s0, 0 ;================================================================================================== @@ -353,13 +344,13 @@ LBU t0, 0xA2 (a0) ; Load bullet bag from inventory ANDI t0, t0, 0xC0 ; Mask bits to isolate bullet bag BEQZ t0, @@return -LI v0, 0x05 ; Bow +LI v0, 0x05 ; Slingshot BEQ t0, 0x40, @@return -LI v0, 0x5F ; Bullet Bag (30) - LI v0, 0x60 ; Bullet Bag (40) +LI v0, 0x7B ; Bullet Bag (50) + @@return: JR ra NOP @@ -446,17 +437,6 @@ NOP ;================================================================================================== -Give_Tunic: -; a0 = save context -; a1 = tunic mask -LBU t0, 0x9C (a0) ; Load tunics from inventory -OR t0, t0, a1 -SB t0, 0x9C (a0) -JR ra -NOP - -;================================================================================================== - Give_Bottle: ; a0 = save context ; a1 = item code to store diff --git a/ASM/src/state.asm b/ASM/src/state.asm index ea13ba014..c61aed746 100755 --- a/ASM/src/state.asm +++ b/ASM/src/state.asm @@ -3,4 +3,4 @@ ;================================================================================================== CURRENT_ITEM_DATA: -.dw 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF +.word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF diff --git a/ASM/src/util.asm b/ASM/src/util.asm deleted file mode 100755 index 4a35a7b32..000000000 --- a/ASM/src/util.asm +++ /dev/null @@ -1,15 +0,0 @@ -.macro Grow_Stack, count - ADDIU sp, sp, -0x04 * count -.endmacro - -.macro Shrink_Stack, count - ADDIU sp, sp, 0x04 * count -.endmacro - -.macro Push, reg, index - SW reg, 0x04 * index (sp) -.endmacro - -.macro Pop, reg, index - LW reg, 0x04 * index (sp) -.endmacro From 91995c863deb4f8d7b0ad4d50adc087c9c06e04a Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 17 May 2018 05:35:34 -0400 Subject: [PATCH 005/151] Follow stack conventions more closely --- ASM/src/items.asm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index cb08daf49..b0b7c28f1 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -89,11 +89,12 @@ NOP ; Override Action ID ORI a1, t1, 0 -SW ra, -0x04 (sp) + SW a0, 0x00 (sp) SW a1, 0x04 (sp) SW a2, 0x08 (sp) -ADDIU sp, sp, -0x14 +ADDIU sp, sp, -0x18 +SW ra, 0x10 (sp) ; Run effect function ; Conventions for effect functions: @@ -106,8 +107,8 @@ LBU a2, 0x07 (t0) JALR t1 NOP -ADDIU sp, sp, 0x14 -LW ra, -0x04 (sp) +LW ra, 0x10 (sp) +ADDIU sp, sp, 0x18 LW a0, 0x00 (sp) LW a1, 0x04 (sp) LW a2, 0x08 (sp) @@ -156,10 +157,10 @@ ADDU a2, t7, t8 ; Displaced code Store_Item_Data: -SW ra, -0x04 (sp) -SW v0, -0x08 (sp) -SW s0, -0x0C (sp) -ADDIU sp, sp, -0x1C +ADDIU sp, sp, -0x20 +SW s0, 0x10 (sp) +SW v0, 0x14 (sp) +SW ra, 0x18 (sp) SB a2, 0x0424 (a3) ; Displaced code BEQZ a2, @@return @@ -249,10 +250,10 @@ SUBU s0, r0, s0 SB s0, 0x0424 (a3) @@return: -ADDIU sp, sp, 0x1C -LW ra, -0x04 (sp) -LW v0, -0x08 (sp) -LW s0, -0x0C (sp) +LW s0, 0x10 (sp) +LW v0, 0x14 (sp) +LW ra, 0x18 (sp) +ADDIU sp, sp, 0x20 JR ra NOP From 2ac88a844927b6f622f1cad5db91b554bb1ceafd Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 17 May 2018 07:17:12 -0400 Subject: [PATCH 006/151] Fix comment --- ASM/src/item_data.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index fc909d0f8..365d2be0e 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -79,7 +79,7 @@ Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, WATER Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SPIRIT ; 0xA8 = Spirit Temple Map Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SHADOW ; 0xA9 = Shadow Temple Map Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, BOTW ; 0xAA = Bottom of the Well Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, ICE ; 0xAB = Bottom of the Well Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, ICE ; 0xAB = Ice Cavern Map Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FOREST, 0xFF ; 0xAC = Forest Temple Small Key Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FIRE, 0xFF ; 0xAD = Fire Temple Small Key From 164c9dbba76f28236b312ff961c090d2bdcd9097 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 17 May 2018 09:40:46 -0400 Subject: [PATCH 007/151] add to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index af2b963be..b7687ceef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .*.sw* +.sw* *.pyc From 0448fea906bbbe9fb77a333df07f8a31d684e318 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 17 May 2018 09:41:33 -0400 Subject: [PATCH 008/151] Add scene numbers to item locations --- BaseClasses.py | 3 +- Regions.py | 408 ++++++++++++++++++++++++------------------------- 2 files changed, 206 insertions(+), 205 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 204f79a23..0ed9827e1 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -491,7 +491,7 @@ def __unicode__(self): class Location(object): - def __init__(self, name='', address=None, address2=None, default=None, type='Chest', parent=None): + def __init__(self, name='', address=None, address2=None, default=None, type='Chest', scene=None, parent=None): self.name = name self.parent_region = parent self.item = None @@ -499,6 +499,7 @@ def __init__(self, name='', address=None, address2=None, default=None, type='Che self.address2 = address2 self.default = default self.type = type + self.scene = scene self.spot_type = 'Location' self.recursion_count = 0 self.staleness_count = 0 diff --git a/Regions.py b/Regions.py index 104ff6a90..2226baa24 100644 --- a/Regions.py +++ b/Regions.py @@ -196,169 +196,169 @@ def _create_region(name, type, locations=None, exits=None): for exit in exits: ret.exits.append(Entrance(exit, ret)) for location in locations: - address, address2, default, type = location_table[location] - ret.locations.append(Location(location, address, address2, default, type, ret)) + address, address2, default, type, scene = location_table[location] + ret.locations.append(Location(location, address, address2, default, type, scene, ret)) return ret -location_table = {'Kokiri Sword Chest': (0x20A6142, None, 0x04E0, 'Chest'), - 'Mido Chest Top Left': (0x2F7B08A, None, 0x59A0, 'Chest'), - 'Mido Chest Top Right': (0x2F7B09A, None, 0x59A1, 'Chest'), - 'Mido Chest Bottom Left': (0x2F7B0AA, None, 0x5982, 'Chest'), - 'Mido Chest Bottom Right': (0x2F7B0BA, None, 0x5903, 'Chest'), - 'Shield Grave Chest': (0x328B096, None, 0x5540, 'Chest'), - 'Heart Piece Grave Chest': (0x2D0A056, None, 0xA7C0, 'Chest'), - 'Composer Grave Chest': (0x332D0EA, None, 0x8020, 'Chest'), - 'Death Mountain Bombable Chest': (0x223C3CA, 0x223C7B2, 0x5AA1, 'Chest'), - 'Goron City Leftmost Maze Chest': (0x227C23A, 0x227C70A, 0x5AC0, 'Chest'), - 'Goron City Left Maze Chest': (0x227C24A, 0x227C71A, 0x5AA1, 'Chest'), - 'Goron City Right Maze Chest': (0x227C25A, 0x227C72A, 0x5AA2, 'Chest'), - 'Zoras Domain Torch Run': (0x2103166, None, 0xB7C0, 'Chest'), - 'Hookshot Chest': (0x3063092, None, 0x1100, 'Chest'), - 'Gerudo Valley Hammer Rocks Chest': (0x213D676, None, 0x5AA0, 'Chest'), - 'Gerudo Fortress Rooftop Chest': (0x21BD4AA, 0x21BD6EA, 0x07C0, 'Chest'), - 'Haunted Wasteland Structure Chest': (0x21E20DE, None, 0x8AA0, 'Chest'), - 'Redead Grotto Chest': (0x26CF076, None, 0x7ACA, 'Chest'), - 'Wolfos Grotto Chest': (0x26EB076, None, 0x7AB1, 'Chest'), - 'Deku Tree Lobby Chest': (0x24A7146, None, 0x0823, 'Chest'), - 'Deku Tree Slingshot Chest': (0x24C20C6, None, 0x00A1, 'Chest'), - 'Deku Tree Slingshot Room Side Chest': (0x24C20D6, None, 0x5905, 'Chest'), - 'Deku Tree Compass Chest': (0x25040D6, None, 0x0802, 'Chest'), - 'Deku Tree Compass Room Side Chest': (0x25040E6, None, 0x5906, 'Chest'), - 'Deku Tree Basement Chest': (0x24C8166, None, 0x5904, 'Chest'), - 'Dodongos Cavern Map Chest': (0x1F2819E, None, 0x0828, 'Chest'), - 'Dodongos Cavern Compass Chest': (0x1FAF0AA, None, 0x0805, 'Chest'), - 'Dodongos Cavern Bomb Flower Platform': (0x1F890DE, None, 0x59C6, 'Chest'), - 'Dodongos Cavern Bomb Bag Chest': (0x1F890CE, None, 0x0644, 'Chest'), - 'Dodongos Cavern End of Bridge Chest': (0x1F281CE, None, 0x552A, 'Chest'), - 'Chest Above King Dodongo': (0x2EB00BA, None, 0x5020, 'Chest'), - 'Boomerang Chest': (0x278A0BA, None, 0x10C1, 'Chest'), - 'Jabu Jabus Belly Map Chest': (0x278E08A, None, 0x1822, 'Chest'), - 'Jabu Jabus Belly Compass Chest': (0x279608A, None, 0xB804, 'Chest'), - 'Forest Temple First Chest': (0x23E5092, None, 0x5843, 'Chest'), - 'Forest Temple Chest Behind Lobby': (0x2415082, None, 0x7840, 'Chest'), - 'Forest Temple Well Chest': (0x244A062, None, 0x5849, 'Chest'), - 'Forest Temple Map Chest': (0x2455076, None, 0x1821, 'Chest'), - 'Forest Temple Outside Hookshot Chest': (0x241F0D6, None, 0x5905, 'Chest'), - 'Forest Temple Falling Room Chest': (0x247E09E, None, 0x5947, 'Chest'), - 'Forest Temple Block Push Chest': (0x245B096, None, 0x8964, 'Chest'), - 'Forest Temple Boss Key Chest': (0xCB0DC2, None, 0x27EE, 'Chest'), - 'Forest Temple Floormaster Chest': (0x2490072, None, 0x7842, 'Chest'), - 'Forest Temple Bow Chest': (0x2415092, None, 0xB08C, 'Chest'), - 'Forest Temple Red Poe Chest': (0x246607E, None, 0x784D, 'Chest'), - 'Forest Temple Blue Poe Chest': (0x246F07E, None, 0x180F, 'Chest'), - 'Forest Temple Near Boss Chest': (0x2486082, None, 0x592B, 'Chest'), - 'Bottom of the Well Front Left Hidden Wall': (0x32D317E, None, 0x5848, 'Chest'), - 'Bottom of the Well Front Center Bombable': (0x32D30FE, None, 0x5062, 'Chest'), - 'Bottom of the Well Right Bottom Hidden Wall': (0x32D314E, None, 0x5845, 'Chest'), - 'Bottom of the Well Center Large Chest': (0x32D30EE, None, 0x0801, 'Chest'), - 'Bottom of the Well Center Small Chest': (0x32D31AE, None, 0x504E, 'Chest'), - 'Bottom of the Well Back Left Bombable': (0x32D313E, None, 0x5C84, 'Chest'), - 'Bottom of the Well Defeat Boss': (0x32FB0AA, None, 0x1143, 'Chest'), - 'Bottom of the Well Invisible Chest': (0x32FB0BA, None, 0x6AD4, 'Chest'), - 'Bottom of the Well Underwater Front Chest': (0x32D31BE, None, 0x5CD0, 'Chest'), - 'Bottom of the Well Underwater Left Chest': (0x32D318E, None, 0x5909, 'Chest'), - 'Bottom of the Well Basement Chest': (0x32E9252, None, 0x0827, 'Chest'), - 'Bottom of the Well Locked Pits': (0x32F90AA, None, 0x552A, 'Chest'), - 'Bottom of the Well Behind Right Grate': (0x32D319E, None, 0x554C, 'Chest'), - 'Fire Temple Chest Near Boss': (0x230808A, None, 0x5841, 'Chest'), - 'Fire Temple Fire Dancer Chest': (0x2318082, None, 0x7CC0, 'Chest'), - 'Fire Temple Boss Key Chest': (0x238A0D6, None, 0x27EC, 'Chest'), - 'Fire Temple Big Lava Room Bombable Chest': (0x23AD076, None, 0x5842, 'Chest'), - 'Fire Temple Big Lava Room Open Chest': (0x239D0A6, None, 0x5844, 'Chest'), - 'Fire Temple Boulder Maze Lower Chest': (0x2323152, None, 0x5843, 'Chest'), - 'Fire Temple Boulder Maze Upper Chest': (0x2323182, None, 0x5846, 'Chest'), - 'Fire Temple Boulder Maze Side Room': (0x23B40B2, None, 0x5848, 'Chest'), - 'Fire Temple Boulder Maze Bombable Pit': (0x231B0E2, None, 0x584B, 'Chest'), - 'Fire Temple Scarecrow Chest': (0x2339082, None, 0x5ACD, 'Chest'), - 'Fire Temple Map Chest': (0x237E0C2, None, 0x082A, 'Chest'), - 'Fire Temple Compass Chest': (0x23C1082, None, 0x0807, 'Chest'), - 'Fire Temple Highest Goron Chest': (0x2365066, None, 0x5849, 'Chest'), - 'Fire Temple Megaton Hammer Chest': (0x236C102, None, 0x01A5, 'Chest'), - 'Ice Cavern Map Chest': (0x2C4016A, None, 0x0820, 'Chest'), - 'Ice Cavern Compass Chest': (0x2C4E236, None, 0x0801, 'Chest'), - 'Ice Cavern Iron Boots Chest': (0x2C380A2, None, 0x15C2, 'Chest'), - 'Water Temple Map Chest': (0x26690A6, None, 0x1822, 'Chest'), - 'Water Temple Compass Chest': (0x25FC0D2, None, 0x0809, 'Chest'), - 'Water Temple Torches Chest': (0x26640A6, None, 0x7841, 'Chest'), - 'Water Temple Dragon Chest': (0x261F0BA, None, 0x584A, 'Chest'), - 'Water Temple Central Bow Target Chest': (0x266D072, None, 0x5848, 'Chest'), - 'Water Temple Central Pillar Chest': (0x25EF0D6, None, 0x5846, 'Chest'), - 'Water Temple Cracked Wall Chest': (0x265B0A6, None, 0x5840, 'Chest'), - 'Water Temple Boss Key Chest': (0x2657066, None, 0x27E5, 'Chest'), - 'Water Temple Dark Link Chest': (0x261907A, None, 0x0127, 'Chest'), - 'Water Temple River Chest': (0x26740DE, None, 0x5843, 'Chest'), - 'Shadow Temple Map Chest': (0x27CC0AA, None, 0x1821, 'Chest'), - 'Shadow Temple Hover Boots Chest': (0x27DC0CA, None, 0x15E7, 'Chest'), - 'Shadow Temple Compass Chest': (0x27EC09E, None, 0x1803, 'Chest'), - 'Shadow Temple Early Silver Rupee Chest': (0x27E40F6, None, 0x5842, 'Chest'), - 'Shadow Temple Invisible Blades Visible Chest': (0x282212A, None, 0x588C, 'Chest'), - 'Shadow Temple Invisible Blades Invisible Chest': (0x282211A, None, 0x6976, 'Chest'), - 'Shadow Temple Falling Spikes Lower Chest': (0x2801132, None, 0x5945, 'Chest'), - 'Shadow Temple Falling Spikes Upper Chest': (0x2801142, None, 0x5886, 'Chest'), - 'Shadow Temple Falling Spikes Switch Chest': (0x2801122, None, 0x8844, 'Chest'), - 'Shadow Temple Invisible Spikes Chest': (0x28090EE, None, 0x7889, 'Chest'), - 'Shadow Temple Wind Hint Chest': (0x283609A, None, 0x6955, 'Chest'), - 'Shadow Temple After Wind Enemy Chest': (0x28390FE, None, 0x7888, 'Chest'), - 'Shadow Temple After Wind Hidden Chest': (0x28390EE, None, 0x6854, 'Chest'), - 'Shadow Temple Spike Walls Left Chest': (0x28130B6, None, 0x588A, 'Chest'), - 'Shadow Temple Boss Key Chest': (0x28130A6, None, 0x27EB, 'Chest'), - 'Shadow Temple Hidden Floormaster Chest': (0x282508A, None, 0x784D, 'Chest'), - 'Gerudo Training Grounds Lobby Left Chest': (0x28870CA, None, 0x8893, 'Chest'), - 'Gerudo Training Grounds Lobby Right Chest': (0x28870BA, None, 0x8947, 'Chest'), - 'Gerudo Training Grounds Stalfos Chest': (0x28970AA, None, 0x8840, 'Chest'), - 'Gerudo Training Grounds Beamos Chest': (0x28C715E, None, 0x8841, 'Chest'), - 'Gerudo Training Grounds Hidden Ceiling Chest': (0x28D010E, None, 0x584B, 'Chest'), - 'Gerudo Training Grounds Maze Path First Chest': (0x28D00CE, None, 0x5AA6, 'Chest'), - 'Gerudo Training Grounds Maze Path Second Chest': (0x28D00FE, None, 0x59CA, 'Chest'), - 'Gerudo Training Grounds Maze Path Third Chest': (0x28D00EE, None, 0x5969, 'Chest'), - 'Gerudo Training Grounds Maze Path Final Chest': (0x28D011E, None, 0x0B2C, 'Chest'), - 'Gerudo Training Grounds Maze Right Central Chest': (0x28D00BE, None, 0x5D45, 'Chest'), - 'Gerudo Training Grounds Maze Right Side Chest': (0x28D00DE, None, 0x5968, 'Chest'), - 'Gerudo Training Grounds Underwater Silver Rupee Chest': (0x28D91D6, None, 0x884D, 'Chest'), - 'Gerudo Training Grounds Hammer Room Clear Chest': (0x28B91AE, None, 0x7952, 'Chest'), - 'Gerudo Training Grounds Hammer Room Switch Chest': (0x28B919E, None, 0x5850, 'Chest'), - 'Gerudo Training Grounds Eye Statue Chest': (0x28AE09E, None, 0x8843, 'Chest'), - 'Gerudo Training Grounds Near Scarecrow Chest': (0x28D00AE, None, 0x5844, 'Chest'), - 'Gerudo Training Grounds Before Heavy Block Chest': (0x28A611E, None, 0x7971, 'Chest'), - 'Gerudo Training Grounds Heavy Block First Chest': (0x28DD0BE, None, 0x7ACF, 'Chest'), - 'Gerudo Training Grounds Heavy Block Second Chest': (0x28DD0AE, None, 0x788E, 'Chest'), - 'Gerudo Training Grounds Heavy Block Third Chest': (0x28DD08E, None, 0x6854, 'Chest'), - 'Gerudo Training Grounds Heavy Block Fourth Chest': (0x28DD09E, None, 0x5F82, 'Chest'), - 'Spirit Temple Child Left Chest': (0x2B190BA, None, 0x5528, 'Chest'), - 'Spirit Temple Child Right Chest': (0x2B13182, None, 0x8840, 'Chest'), - 'Spirit Temple Compass Chest': (0x2B6B08A, None, 0x3804, 'Chest'), - 'Spirit Temple Early Adult Right Chest': (0x2B6207A, None, 0x5847, 'Chest'), - 'Spirit Temple First Mirror Right Chest': (0x2B700C6, None, 0x890D, 'Chest'), - 'Spirit Temple First Mirror Left Chest': (0x2B700D6, None, 0x8F8E, 'Chest'), - 'Spirit Temple Map Chest': (0x2B25126, None, 0xB823, 'Chest'), - 'Spirit Temple Child Climb East Chest': (0x2B1D122, None, 0x8066, 'Chest'), - 'Spirit Temple Child Climb North Chest': (0x2B1D132, None, 0x852C, 'Chest'), - 'Spirit Temple Sun Block Room Chest': (0x2B481B2, None, 0x8841, 'Chest'), - 'Spirit Temple Statue Hand Chest': (0x2B25136, None, 0x8842, 'Chest'), - 'Spirit Temple NE Main Room Chest': (0x2B25146, None, 0x888F, 'Chest'), - 'Silver Gauntlets Chest': (0x21A02DE, 0x21A06F2, 0x06AB, 'Chest'), - 'Mirror Shield Chest': (0x21A02CE, 0x21A06E2, 0x3569, 'Chest'), - 'Spirit Temple Near Four Armos Chest': (0x2B9F076, None, 0x5845, 'Chest'), - 'Spirit Temple Hallway Left Invisible Chest': (0x2B900B6, None, 0x6914, 'Chest'), - 'Spirit Temple Hallway Right Invisible Chest': (0x2B900C6, None, 0x6915, 'Chest'), - 'Spirit Temple Boss Key Chest': (0x2BA4162, None, 0x27EA, 'Chest'), - 'Spirit Temple Topmost Chest': (0x2BCF0FE, None, 0x8CF2, 'Chest'), - 'Ganons Castle Forest Trial Chest': (0x31F106E, None, 0x7889, 'Chest'), - 'Ganons Castle Water Trial Left Chest': (0x31D7236, None, 0x5F87, 'Chest'), - 'Ganons Castle Water Trial Right Chest': (0x31D7226, None, 0x5906, 'Chest'), - 'Ganons Castle Shadow Trial First Chest': (0x32350CA, None, 0x5888, 'Chest'), - 'Ganons Castle Shadow Trial Second Chest': (0x32350BA, None, 0x36C5, 'Chest'), - 'Ganons Castle Spirit Trial First Chest': (0x3268132, None, 0x8D72, 'Chest'), - 'Ganons Castle Spirit Trial Second Chest': (0x3268142, None, 0x6954, 'Chest'), - 'Ganons Castle Light Trial First Left Chest': (0x321B11E, None, 0x588C, 'Chest'), - 'Ganons Castle Light Trial Second Left Chest': (0x321B10E, None, 0x5F8B, 'Chest'), - 'Ganons Castle Light Trial Third Left Chest': (0x321B12E, None, 0x590D, 'Chest'), - 'Ganons Castle Light Trial First Right Chest': (0x321B13E, None, 0x5F8E, 'Chest'), - 'Ganons Castle Light Trial Second Right Chest': (0x321B0FE, None, 0x596A, 'Chest'), - 'Ganons Castle Light Trial Third Right Chest': (0x321B14E, None, 0x5F8F, 'Chest'), - 'Ganons Castle Light Trail Invisible Enemies Chest': (0x321B15E, None, 0x7850, 'Chest'), - 'Ganons Castle Light Trial Lullaby Chest': (0x321B17E, None, 0x8851, 'Chest'), - 'Ganons Tower Boss Key Chest': (0x2F040EE, None, 0x27EB, 'Chest'), +location_table = {'Kokiri Sword Chest': (0x20A6142, None, 0x04E0, 'Chest', 0x55), + 'Mido Chest Top Left': (0x2F7B08A, None, 0x59A0, 'Chest', 0x28), + 'Mido Chest Top Right': (0x2F7B09A, None, 0x59A1, 'Chest', 0x28), + 'Mido Chest Bottom Left': (0x2F7B0AA, None, 0x5982, 'Chest', 0x28), + 'Mido Chest Bottom Right': (0x2F7B0BA, None, 0x5903, 'Chest', 0x28), + 'Shield Grave Chest': (0x328B096, None, 0x5540, 'Chest', 0x40), + 'Heart Piece Grave Chest': (0x2D0A056, None, 0xA7C0, 'Chest', 0x3F), + 'Composer Grave Chest': (0x332D0EA, None, 0x8020, 'Chest', 0x41), + 'Death Mountain Bombable Chest': (0x223C3CA, 0x223C7B2, 0x5AA1, 'Chest', 0x60), + 'Goron City Leftmost Maze Chest': (0x227C23A, 0x227C70A, 0x5AC0, 'Chest', 0x62), + 'Goron City Left Maze Chest': (0x227C24A, 0x227C71A, 0x5AA1, 'Chest', 0x62), + 'Goron City Right Maze Chest': (0x227C25A, 0x227C72A, 0x5AA2, 'Chest', 0x62), + 'Zoras Domain Torch Run': (0x2103166, None, 0xB7C0, 'Chest', 0x58), + 'Hookshot Chest': (0x3063092, None, 0x1100, 'Chest', 0x48), + 'Gerudo Valley Hammer Rocks Chest': (0x213D676, None, 0x5AA0, 'Chest', 0x5A), + 'Gerudo Fortress Rooftop Chest': (0x21BD4AA, 0x21BD6EA, 0x07C0, 'Chest', 0x5D), + 'Haunted Wasteland Structure Chest': (0x21E20DE, None, 0x8AA0, 'Chest', 0x5E), + 'Redead Grotto Chest': (0x26CF076, None, 0x7ACA, 'Chest', 0x3E), + 'Wolfos Grotto Chest': (0x26EB076, None, 0x7AB1, 'Chest', 0x3E), + 'Deku Tree Lobby Chest': (0x24A7146, None, 0x0823, 'Chest', 0x00), + 'Deku Tree Slingshot Chest': (0x24C20C6, None, 0x00A1, 'Chest', 0x00), + 'Deku Tree Slingshot Room Side Chest': (0x24C20D6, None, 0x5905, 'Chest', 0x00), + 'Deku Tree Compass Chest': (0x25040D6, None, 0x0802, 'Chest', 0x00), + 'Deku Tree Compass Room Side Chest': (0x25040E6, None, 0x5906, 'Chest', 0x00), + 'Deku Tree Basement Chest': (0x24C8166, None, 0x5904, 'Chest', 0x00), + 'Dodongos Cavern Map Chest': (0x1F2819E, None, 0x0828, 'Chest', 0x01), + 'Dodongos Cavern Compass Chest': (0x1FAF0AA, None, 0x0805, 'Chest', 0x01), + 'Dodongos Cavern Bomb Flower Platform': (0x1F890DE, None, 0x59C6, 'Chest', 0x01), + 'Dodongos Cavern Bomb Bag Chest': (0x1F890CE, None, 0x0644, 'Chest', 0x01), + 'Dodongos Cavern End of Bridge Chest': (0x1F281CE, None, 0x552A, 'Chest', 0x01), + 'Chest Above King Dodongo': (0x2EB00BA, None, 0x5020, 'Chest', 0x12), + 'Boomerang Chest': (0x278A0BA, None, 0x10C1, 'Chest', 0x02), + 'Jabu Jabus Belly Map Chest': (0x278E08A, None, 0x1822, 'Chest', 0x02), + 'Jabu Jabus Belly Compass Chest': (0x279608A, None, 0xB804, 'Chest', 0x02), + 'Forest Temple First Chest': (0x23E5092, None, 0x5843, 'Chest', 0x03), + 'Forest Temple Chest Behind Lobby': (0x2415082, None, 0x7840, 'Chest', 0x03), + 'Forest Temple Well Chest': (0x244A062, None, 0x5849, 'Chest', 0x03), + 'Forest Temple Map Chest': (0x2455076, None, 0x1821, 'Chest', 0x03), + 'Forest Temple Outside Hookshot Chest': (0x241F0D6, None, 0x5905, 'Chest', 0x03), + 'Forest Temple Falling Room Chest': (0x247E09E, None, 0x5947, 'Chest', 0x03), + 'Forest Temple Block Push Chest': (0x245B096, None, 0x8964, 'Chest', 0x03), + 'Forest Temple Boss Key Chest': (0xCB0DC2, None, 0x27EE, 'Chest', 0x03), + 'Forest Temple Floormaster Chest': (0x2490072, None, 0x7842, 'Chest', 0x03), + 'Forest Temple Bow Chest': (0x2415092, None, 0xB08C, 'Chest', 0x03), + 'Forest Temple Red Poe Chest': (0x246607E, None, 0x784D, 'Chest', 0x03), + 'Forest Temple Blue Poe Chest': (0x246F07E, None, 0x180F, 'Chest', 0x03), + 'Forest Temple Near Boss Chest': (0x2486082, None, 0x592B, 'Chest', 0x03), + 'Bottom of the Well Front Left Hidden Wall': (0x32D317E, None, 0x5848, 'Chest', 0x08), + 'Bottom of the Well Front Center Bombable': (0x32D30FE, None, 0x5062, 'Chest', 0x08), + 'Bottom of the Well Right Bottom Hidden Wall': (0x32D314E, None, 0x5845, 'Chest', 0x08), + 'Bottom of the Well Center Large Chest': (0x32D30EE, None, 0x0801, 'Chest', 0x08), + 'Bottom of the Well Center Small Chest': (0x32D31AE, None, 0x504E, 'Chest', 0x08), + 'Bottom of the Well Back Left Bombable': (0x32D313E, None, 0x5C84, 'Chest', 0x08), + 'Bottom of the Well Defeat Boss': (0x32FB0AA, None, 0x1143, 'Chest', 0x08), + 'Bottom of the Well Invisible Chest': (0x32FB0BA, None, 0x6AD4, 'Chest', 0x08), + 'Bottom of the Well Underwater Front Chest': (0x32D31BE, None, 0x5CD0, 'Chest', 0x08), + 'Bottom of the Well Underwater Left Chest': (0x32D318E, None, 0x5909, 'Chest', 0x08), + 'Bottom of the Well Basement Chest': (0x32E9252, None, 0x0827, 'Chest', 0x08), + 'Bottom of the Well Locked Pits': (0x32F90AA, None, 0x552A, 'Chest', 0x08), + 'Bottom of the Well Behind Right Grate': (0x32D319E, None, 0x554C, 'Chest', 0x08), + 'Fire Temple Chest Near Boss': (0x230808A, None, 0x5841, 'Chest', 0x04), + 'Fire Temple Fire Dancer Chest': (0x2318082, None, 0x7CC0, 'Chest', 0x04), + 'Fire Temple Boss Key Chest': (0x238A0D6, None, 0x27EC, 'Chest', 0x04), + 'Fire Temple Big Lava Room Bombable Chest': (0x23AD076, None, 0x5842, 'Chest', 0x04), + 'Fire Temple Big Lava Room Open Chest': (0x239D0A6, None, 0x5844, 'Chest', 0x04), + 'Fire Temple Boulder Maze Lower Chest': (0x2323152, None, 0x5843, 'Chest', 0x04), + 'Fire Temple Boulder Maze Upper Chest': (0x2323182, None, 0x5846, 'Chest', 0x04), + 'Fire Temple Boulder Maze Side Room': (0x23B40B2, None, 0x5848, 'Chest', 0x04), + 'Fire Temple Boulder Maze Bombable Pit': (0x231B0E2, None, 0x584B, 'Chest', 0x04), + 'Fire Temple Scarecrow Chest': (0x2339082, None, 0x5ACD, 'Chest', 0x04), + 'Fire Temple Map Chest': (0x237E0C2, None, 0x082A, 'Chest', 0x04), + 'Fire Temple Compass Chest': (0x23C1082, None, 0x0807, 'Chest', 0x04), + 'Fire Temple Highest Goron Chest': (0x2365066, None, 0x5849, 'Chest', 0x04), + 'Fire Temple Megaton Hammer Chest': (0x236C102, None, 0x01A5, 'Chest', 0x04), + 'Ice Cavern Map Chest': (0x2C4016A, None, 0x0820, 'Chest', 0x09), + 'Ice Cavern Compass Chest': (0x2C4E236, None, 0x0801, 'Chest', 0x09), + 'Ice Cavern Iron Boots Chest': (0x2C380A2, None, 0x15C2, 'Chest', 0x09), + 'Water Temple Map Chest': (0x26690A6, None, 0x1822, 'Chest', 0x05), + 'Water Temple Compass Chest': (0x25FC0D2, None, 0x0809, 'Chest', 0x05), + 'Water Temple Torches Chest': (0x26640A6, None, 0x7841, 'Chest', 0x05), + 'Water Temple Dragon Chest': (0x261F0BA, None, 0x584A, 'Chest', 0x05), + 'Water Temple Central Bow Target Chest': (0x266D072, None, 0x5848, 'Chest', 0x05), + 'Water Temple Central Pillar Chest': (0x25EF0D6, None, 0x5846, 'Chest', 0x05), + 'Water Temple Cracked Wall Chest': (0x265B0A6, None, 0x5840, 'Chest', 0x05), + 'Water Temple Boss Key Chest': (0x2657066, None, 0x27E5, 'Chest', 0x05), + 'Water Temple Dark Link Chest': (0x261907A, None, 0x0127, 'Chest', 0x05), + 'Water Temple River Chest': (0x26740DE, None, 0x5843, 'Chest', 0x05), + 'Shadow Temple Map Chest': (0x27CC0AA, None, 0x1821, 'Chest', 0x07), + 'Shadow Temple Hover Boots Chest': (0x27DC0CA, None, 0x15E7, 'Chest', 0x07), + 'Shadow Temple Compass Chest': (0x27EC09E, None, 0x1803, 'Chest', 0x07), + 'Shadow Temple Early Silver Rupee Chest': (0x27E40F6, None, 0x5842, 'Chest', 0x07), + 'Shadow Temple Invisible Blades Visible Chest': (0x282212A, None, 0x588C, 'Chest', 0x07), + 'Shadow Temple Invisible Blades Invisible Chest': (0x282211A, None, 0x6976, 'Chest', 0x07), + 'Shadow Temple Falling Spikes Lower Chest': (0x2801132, None, 0x5945, 'Chest', 0x07), + 'Shadow Temple Falling Spikes Upper Chest': (0x2801142, None, 0x5886, 'Chest', 0x07), + 'Shadow Temple Falling Spikes Switch Chest': (0x2801122, None, 0x8844, 'Chest', 0x07), + 'Shadow Temple Invisible Spikes Chest': (0x28090EE, None, 0x7889, 'Chest', 0x07), + 'Shadow Temple Wind Hint Chest': (0x283609A, None, 0x6955, 'Chest', 0x07), + 'Shadow Temple After Wind Enemy Chest': (0x28390FE, None, 0x7888, 'Chest', 0x07), + 'Shadow Temple After Wind Hidden Chest': (0x28390EE, None, 0x6854, 'Chest', 0x07), + 'Shadow Temple Spike Walls Left Chest': (0x28130B6, None, 0x588A, 'Chest', 0x07), + 'Shadow Temple Boss Key Chest': (0x28130A6, None, 0x27EB, 'Chest', 0x07), + 'Shadow Temple Hidden Floormaster Chest': (0x282508A, None, 0x784D, 'Chest', 0x07), + 'Gerudo Training Grounds Lobby Left Chest': (0x28870CA, None, 0x8893, 'Chest', 0x0B), + 'Gerudo Training Grounds Lobby Right Chest': (0x28870BA, None, 0x8947, 'Chest', 0x0B), + 'Gerudo Training Grounds Stalfos Chest': (0x28970AA, None, 0x8840, 'Chest', 0x0B), + 'Gerudo Training Grounds Beamos Chest': (0x28C715E, None, 0x8841, 'Chest', 0x0B), + 'Gerudo Training Grounds Hidden Ceiling Chest': (0x28D010E, None, 0x584B, 'Chest', 0x0B), + 'Gerudo Training Grounds Maze Path First Chest': (0x28D00CE, None, 0x5AA6, 'Chest', 0x0B), + 'Gerudo Training Grounds Maze Path Second Chest': (0x28D00FE, None, 0x59CA, 'Chest', 0x0B), + 'Gerudo Training Grounds Maze Path Third Chest': (0x28D00EE, None, 0x5969, 'Chest', 0x0B), + 'Gerudo Training Grounds Maze Path Final Chest': (0x28D011E, None, 0x0B2C, 'Chest', 0x0B), + 'Gerudo Training Grounds Maze Right Central Chest': (0x28D00BE, None, 0x5D45, 'Chest', 0x0B), + 'Gerudo Training Grounds Maze Right Side Chest': (0x28D00DE, None, 0x5968, 'Chest', 0x0B), + 'Gerudo Training Grounds Underwater Silver Rupee Chest': (0x28D91D6, None, 0x884D, 'Chest', 0x0B), + 'Gerudo Training Grounds Hammer Room Clear Chest': (0x28B91AE, None, 0x7952, 'Chest', 0x0B), + 'Gerudo Training Grounds Hammer Room Switch Chest': (0x28B919E, None, 0x5850, 'Chest', 0x0B), + 'Gerudo Training Grounds Eye Statue Chest': (0x28AE09E, None, 0x8843, 'Chest', 0x0B), + 'Gerudo Training Grounds Near Scarecrow Chest': (0x28D00AE, None, 0x5844, 'Chest', 0x0B), + 'Gerudo Training Grounds Before Heavy Block Chest': (0x28A611E, None, 0x7971, 'Chest', 0x0B), + 'Gerudo Training Grounds Heavy Block First Chest': (0x28DD0BE, None, 0x7ACF, 'Chest', 0x0B), + 'Gerudo Training Grounds Heavy Block Second Chest': (0x28DD0AE, None, 0x788E, 'Chest', 0x0B), + 'Gerudo Training Grounds Heavy Block Third Chest': (0x28DD08E, None, 0x6854, 'Chest', 0x0B), + 'Gerudo Training Grounds Heavy Block Fourth Chest': (0x28DD09E, None, 0x5F82, 'Chest', 0x0B), + 'Spirit Temple Child Left Chest': (0x2B190BA, None, 0x5528, 'Chest', 0x06), + 'Spirit Temple Child Right Chest': (0x2B13182, None, 0x8840, 'Chest', 0x06), + 'Spirit Temple Compass Chest': (0x2B6B08A, None, 0x3804, 'Chest', 0x06), + 'Spirit Temple Early Adult Right Chest': (0x2B6207A, None, 0x5847, 'Chest', 0x06), + 'Spirit Temple First Mirror Right Chest': (0x2B700C6, None, 0x890D, 'Chest', 0x06), + 'Spirit Temple First Mirror Left Chest': (0x2B700D6, None, 0x8F8E, 'Chest', 0x06), + 'Spirit Temple Map Chest': (0x2B25126, None, 0xB823, 'Chest', 0x06), + 'Spirit Temple Child Climb East Chest': (0x2B1D122, None, 0x8066, 'Chest', 0x06), + 'Spirit Temple Child Climb North Chest': (0x2B1D132, None, 0x852C, 'Chest', 0x06), + 'Spirit Temple Sun Block Room Chest': (0x2B481B2, None, 0x8841, 'Chest', 0x06), + 'Spirit Temple Statue Hand Chest': (0x2B25136, None, 0x8842, 'Chest', 0x06), + 'Spirit Temple NE Main Room Chest': (0x2B25146, None, 0x888F, 'Chest', 0x06), + 'Silver Gauntlets Chest': (0x21A02DE, 0x21A06F2, 0x06AB, 'Chest', 0x5C), + 'Mirror Shield Chest': (0x21A02CE, 0x21A06E2, 0x3569, 'Chest', 0x5C), + 'Spirit Temple Near Four Armos Chest': (0x2B9F076, None, 0x5845, 'Chest', 0x06), + 'Spirit Temple Hallway Left Invisible Chest': (0x2B900B6, None, 0x6914, 'Chest', 0x06), + 'Spirit Temple Hallway Right Invisible Chest': (0x2B900C6, None, 0x6915, 'Chest', 0x06), + 'Spirit Temple Boss Key Chest': (0x2BA4162, None, 0x27EA, 'Chest', 0x06), + 'Spirit Temple Topmost Chest': (0x2BCF0FE, None, 0x8CF2, 'Chest', 0x06), + 'Ganons Castle Forest Trial Chest': (0x31F106E, None, 0x7889, 'Chest', 0x0D), + 'Ganons Castle Water Trial Left Chest': (0x31D7236, None, 0x5F87, 'Chest', 0x0D), + 'Ganons Castle Water Trial Right Chest': (0x31D7226, None, 0x5906, 'Chest', 0x0D), + 'Ganons Castle Shadow Trial First Chest': (0x32350CA, None, 0x5888, 'Chest', 0x0D), + 'Ganons Castle Shadow Trial Second Chest': (0x32350BA, None, 0x36C5, 'Chest', 0x0D), + 'Ganons Castle Spirit Trial First Chest': (0x3268132, None, 0x8D72, 'Chest', 0x0D), + 'Ganons Castle Spirit Trial Second Chest': (0x3268142, None, 0x6954, 'Chest', 0x0D), + 'Ganons Castle Light Trial First Left Chest': (0x321B11E, None, 0x588C, 'Chest', 0x0D), + 'Ganons Castle Light Trial Second Left Chest': (0x321B10E, None, 0x5F8B, 'Chest', 0x0D), + 'Ganons Castle Light Trial Third Left Chest': (0x321B12E, None, 0x590D, 'Chest', 0x0D), + 'Ganons Castle Light Trial First Right Chest': (0x321B13E, None, 0x5F8E, 'Chest', 0x0D), + 'Ganons Castle Light Trial Second Right Chest': (0x321B0FE, None, 0x596A, 'Chest', 0x0D), + 'Ganons Castle Light Trial Third Right Chest': (0x321B14E, None, 0x5F8F, 'Chest', 0x0D), + 'Ganons Castle Light Trail Invisible Enemies Chest': (0x321B15E, None, 0x7850, 'Chest', 0x0D), + 'Ganons Castle Light Trial Lullaby Chest': (0x321B17E, None, 0x8851, 'Chest', 0x0D), + 'Ganons Tower Boss Key Chest': (0x2F040EE, None, 0x27EB, 'Chest', 0x0A), 'Impa at Castle': (0x2E8E925, 0x2E8E925, 0x0A, 'Song'), 'Song from Malon': (0xD7EB53, 0xD7EBCF, 0x09, 'Song'), 'Song from Composer Grave': (0x332A871, 0x332A871, 0x0B, 'Song'), @@ -375,49 +375,49 @@ def _create_region(name, type, locations=None, exits=None): 'Zeldas Letter': (None, None, None, 'NPC'), 'Crater Fairy Reward': (None, None, None, 'Fairy'), 'Mountain Summit Fairy Reward': (None, None, None, 'Fairy'), - 'Hyrule Castle Fairy Reward': (0xC8BD09, 0x2D21E7D, None, 'Special'), - 'Zoras Fountain Fairy Reward': (0xC8BD08, 0x2D20595, None, 'Special'), - 'Desert Colossus Fairy Reward': (0xC8BD0A, 0x2D22375, None, 'Special'), - 'Zelda': (0xC8D557, 0x25338A5, None, 'Special'), - 'Treasure Chest Game': (0xBEF152, None, None, 'Special'), - 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC'), - 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC'), - 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC'), - 'Adult Fishing': (0xDCC087, None, 0x38, 'NPC'), - 'Diving in the Lab': (0xE2CB97, None, 0x3E, 'NPC'), - 'Link the Goron': (0xED30EB, 0xED64F3, 0x2C, 'NPC'), - 'King Zora Thawed': (0xE56AD7, None, 0x2D, 'NPC'), - 'Bombchu Bowling Bomb Bag': (0xE2F093, None, 0x33, 'NPC'), - 'Bombchu Bowling Piece of Heart': (0xE2F097, None, 0x3E, 'NPC'), - 'Dog Lady': (0xE65163, 0xE661BB, 0x3E, 'NPC'), - 'Skull Kid': (0xDF0F33, 0xDF0E9B, 0x3E, 'NPC'), - 'Ocarina Memory Game': (0xDF264F, None, 0x3E, 'NPC'), - '10 Gold Skulltulla Reward': (0xEA7173, None, 0x45, 'NPC'), - '20 Gold Skulltulla Reward': (0xEA7175, None, 0x39, 'NPC'), - '30 Gold Skulltulla Reward': (0xEA7177, None, 0x46, 'NPC'), - '40 Gold Skulltulla Reward': (0xEA7179, None, 0x03, 'NPC'), - '50 Gold Skulltulla Reward': (0xEA717B, None, 0x3E, 'NPC'), - 'Man on Roof': (0xE587E3, None, 0x3E, 'NPC'), - 'Frog Ocarina Game': (0xDB13D3, None, 0x3E, 'NPC'), - 'Frogs in the Rain': (0xDB1387, None, 0x3E, 'NPC'), - 'Horseback Archery 1000 Points': (0xE12B6F, 0xE12AA3, 0x3E, 'NPC'), - 'Horseback Archery 1500 Points': (0xE12BC3, 0xE12AFB, 0x30, 'NPC'), - 'Child Shooting Gallery': (0xD35EF3, None, 0x60, 'NPC'), - 'Adult Shooting Gallery': (0xD35F5B, None, 0x30, 'NPC'), - 'Target in Woods': (0xE59CDF, None, 0x60, 'NPC'), - 'Deku Theater Skull Mask': (0xEC9A87, None, 0x77, 'NPC'), - 'Deku Theater Mask of Truth': (0xEC9CE7, None, 0x79, 'NPC'), - 'Deku Salesman Woods': (0xDF8073, None, 0x77, 'NPC'), - 'Deku Salesman Lost Woods Grotto': (0xDF80E7, None, 0x79, 'NPC'), - 'Deku Salesman Hyrule Field Grotto': (0xDF86AB, None, 0x3E, 'NPC'), - 'Anju as Adult': (0xE1EABB, None, 0x1D, 'NPC'), - 'Biggoron': (0xED338F, None, 0x57, 'NPC'), - 'Anjus Chickens': (0xE1E7A7, None, 0x0F, 'NPC'), - 'Talons Chickens': (0xCC14EB, None, 0x14, 'NPC'), - '10 Big Poes': (0xEE6AEF, None, 0x0F, 'NPC'), - 'Rolling Goron as Child': (0xED296F, None, 0x34, 'NPC'), - 'Lake Hylia Sun': (0xE9E1F2, None, 0x5B08, 'Chest'), - 'Underwater Bottle': (0xDE10FB, None, 0x15, 'NPC'), + 'Hyrule Castle Fairy Reward': (0xC8BD09, 0x2D21E7D, None, 'Special', 0x3D), + 'Zoras Fountain Fairy Reward': (0xC8BD08, 0x2D20595, None, 'Special', 0x3D), + 'Desert Colossus Fairy Reward': (0xC8BD0A, 0x2D22375, None, 'Special', 0x3D), + 'Zelda': (0xC8D557, 0x25338A5, None, 'Special', 0x43), + 'Treasure Chest Game': (0xBEF152, None, None, 'Special', 0x10), + 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), + 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), + 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC', 0x49), + 'Adult Fishing': (0xDCC087, None, 0x38, 'NPC', 0x49), + 'Diving in the Lab': (0xE2CB97, None, 0x3E, 'NPC', 0x38), + 'Link the Goron': (0xED30EB, 0xED64F3, 0x2C, 'NPC', 0x62), + 'King Zora Thawed': (0xE56AD7, None, 0x2D, 'NPC', 0x58), + 'Bombchu Bowling Bomb Bag': (0xE2F093, None, 0x33, 'NPC', 0x4B), + 'Bombchu Bowling Piece of Heart': (0xE2F097, None, 0x3E, 'NPC', 0x4B), + 'Dog Lady': (0xE65163, 0xE661BB, 0x3E, 'NPC', 0x35), + 'Skull Kid': (0xDF0F33, 0xDF0E9B, 0x3E, 'NPC', 0x5B), + 'Ocarina Memory Game': (0xDF264F, None, 0x3E, 'NPC', 0x5B), + '10 Gold Skulltulla Reward': (0xEA7173, None, 0x45, 'NPC', 0x50), + '20 Gold Skulltulla Reward': (0xEA7175, None, 0x39, 'NPC', 0x50), + '30 Gold Skulltulla Reward': (0xEA7177, None, 0x46, 'NPC', 0x50), + '40 Gold Skulltulla Reward': (0xEA7179, None, 0x03, 'NPC', 0x50), + '50 Gold Skulltulla Reward': (0xEA717B, None, 0x3E, 'NPC', 0x50), + 'Man on Roof': (0xE587E3, None, 0x3E, 'NPC', 0x52), + 'Frog Ocarina Game': (0xDB13D3, None, 0x3E, 'NPC', 0x54), + 'Frogs in the Rain': (0xDB1387, None, 0x3E, 'NPC', 0x54), + 'Horseback Archery 1000 Points': (0xE12B6F, 0xE12AA3, 0x3E, 'NPC', 0x5D), + 'Horseback Archery 1500 Points': (0xE12BC3, 0xE12AFB, 0x30, 'NPC', 0x5D), + 'Child Shooting Gallery': (0xD35EF3, None, 0x60, 'NPC', 0x42), + 'Adult Shooting Gallery': (0xD35F5B, None, 0x30, 'NPC', 0x42), + 'Target in Woods': (0xE59CDF, None, 0x60, 'NPC', 0x5B), + 'Deku Theater Skull Mask': (0xEC9A87, None, 0x77, 'NPC', 0x3E), + 'Deku Theater Mask of Truth': (0xEC9CE7, None, 0x79, 'NPC', 0x3E), + 'Deku Salesman Woods': (0xDF8073, None, 0x77, 'NPC', 0x5B), + 'Deku Salesman Lost Woods Grotto': (0xDF80E7, None, 0x79, 'NPC', 0x3E), + 'Deku Salesman Hyrule Field Grotto': (0xDF86AB, None, 0x3E, 'NPC', 0x3E), + 'Anju as Adult': (0xE1EABB, None, 0x1D, 'NPC', 0x52), + 'Biggoron': (0xED338F, None, 0x57, 'NPC', 0x60), + 'Anjus Chickens': (0xE1E7A7, None, 0x0F, 'NPC', 0x52), + 'Talons Chickens': (0xCC14EB, None, 0x14, 'NPC', 0x4C), + '10 Big Poes': (0xEE6AEF, None, 0x0F, 'NPC', 0x4D), + 'Rolling Goron as Child': (0xED296F, None, 0x34, 'NPC', 0x62), + 'Lake Hylia Sun': (0xE9E1F2, None, 0x5B08, 'Chest', 0x57), + 'Underwater Bottle': (0xDE10FB, None, 0x15, 'NPC', 0x57), 'Magic Bean Salesman': (None, None, None, 'Event'), 'King Zora Moves': (None, None, None, 'Event'), 'Ocarina of Time': (None, None, None, 'Event'), From ce5873e78667618a86b3fddd9dc5c2e97ca2038d Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 01:22:40 -0400 Subject: [PATCH 009/151] Rule changes for extended items --- Dungeons.py | 2 +- Items.py | 44 ++++++++++++++++++++++---------------------- Rules.py | 3 +-- 3 files changed, 24 insertions(+), 25 deletions(-) diff --git a/Dungeons.py b/Dungeons.py index 2fa787cee..42e9c51b7 100644 --- a/Dungeons.py +++ b/Dungeons.py @@ -13,7 +13,7 @@ def make_dungeon(name, dungeon_regions, boss_key, small_keys, dungeon_items): return dungeon DT = make_dungeon('Deku Tree', ['Deku Tree Lobby', 'Deku Tree Slingshot Room', 'Deku Tree Boss Room'], None, [], ItemFactory(['Map (Deku Tree)', 'Compass (Deku Tree)'])) - DC = make_dungeon('Dodongos Cavern', ['Dodongos Cavern Beginning', 'Dodongos Cavern Lobby', 'Dodongos Cavern Climb', 'Dodongos Cavern Far Bridge'], None, [], ItemFactory(['Map (Dodongos Cavern)', 'Compass (Dodongos Cavern)'])) + DC = make_dungeon('Dodongos Cavern', ['Dodongos Cavern Beginning', 'Dodongos Cavern Lobby', 'Dodongos Cavern Climb', 'Dodongos Cavern Far Bridge', 'Dodongos Cavern Boss Area'], None, [], ItemFactory(['Map (Dodongos Cavern)', 'Compass (Dodongos Cavern)'])) JB = make_dungeon('Jabu Jabus Belly', ['Jabu Jabus Belly Beginning', 'Jabu Jabus Belly Main', 'Jabu Jabus Belly Depths', 'Jabu Jabus Belly Boss Area'], None, [], ItemFactory(['Map (Jabu Jabus Belly)', 'Compass (Jabu Jabus Belly)'])) FoT = make_dungeon('Forest Temple', ['Forest Temple Lobby', 'Forest Temple NW Outdoors', 'Forest Temple NE Outdoors', 'Forest Temple Falling Room', 'Forest Temple Block Push Room', 'Forest Temple Straightened Hall', 'Forest Temple Outside Upper Ledge', 'Forest Temple Bow Region', 'Forest Temple Boss Region'], ItemFactory('Boss Key (Forest Temple)'), ItemFactory(['Small Key (Forest Temple)'] * 5), ItemFactory(['Map (Forest Temple)', 'Compass (Forest Temple)'])) BW = make_dungeon('Bottom of the Well', ['Bottom of the Well'], None, ItemFactory(['Small Key (Bottom of the Well)'] * 2), ItemFactory(['Map (Bottom of the Well)', 'Compass (Bottom of the Well)'])) diff --git a/Items.py b/Items.py index 7a66dbbeb..ae511bb1f 100644 --- a/Items.py +++ b/Items.py @@ -23,12 +23,12 @@ def ItemFactory(items): # Format: Name: (Advancement, Priority, Type, ItemCode, Index) -item_table = {'Bow': (True, False, None, 0x0620, 0x31), - 'Progressive Hookshot': (True, False, None, 0x0120, 0x09), +item_table = {'Bow': (True, False, None, None, 0x83), + 'Progressive Hookshot': (True, False, None, None, 0x80), 'Hammer': (True, False, None, 0x01A0, 0x0D), - 'Slingshot': (True, False, None, 0x0F60, 0x7B), + 'Slingshot': (True, False, None, None, 0x84), 'Boomerang': (True, False, None, 0x00C0, 0x06), - 'Bomb Bag': (True, False, None, 0x0680, 0x34), + 'Bomb Bag': (True, False, None, None, 0x82), 'Lens of Truth': (True, False, None, 0x0140, 0x0A), 'Dins Fire': (True, False, None, 0x0B80, 0x5C), 'Farores Wind': (True, False, None, 0x0BA0, 0x5D), @@ -54,7 +54,7 @@ def ItemFactory(items): 'Claim Check': (True, False, None, 0x04C0, 0x26), 'Kokiri Sword': (True, False, None, 0x04E0, 0x27), 'Master Sword': (True, False, None, None, None), - 'Biggoron Sword': (True, False, None, 0x0100, 0x08), + 'Biggoron Sword': (True, False, None, None, 0xB5), 'Deku Shield': (False, True, None, 0x0520, 0x29), 'Hylian Shield': (False, True, None, 0x0540, 0x2A), 'Mirror Shield': (True, False, None, 0x0560, 0x2B), @@ -62,11 +62,11 @@ def ItemFactory(items): 'Zora Tunic': (True, False, None, 0x05A0, 0x2D), 'Iron Boots': (True, False, None, 0x05C0, 0x2E), 'Hover Boots': (True, False, None, 0x05E0, 0x2F), - 'Progressive Strength Upgrade': (True, False, None, 0x06C0, 0x36), - 'Progressive Scale': (True, False, None, 0x0700, 0x38), - 'Progressive Wallet': (True, False, None, 0x08C0, 0x46), - 'Deku Stick Capacity': (False, True, None, 0x0EE0, 0x77), - 'Deku Nut Capacity': (False, True, None, 0x0F20, 0x79), + 'Progressive Strength Upgrade': (True, False, None, None, 0x81), + 'Progressive Scale': (True, False, None, None, 0x86), + 'Progressive Wallet': (True, False, None, None, 0x85), + 'Deku Stick Capacity': (False, True, None, None, 0x88), + 'Deku Nut Capacity': (False, True, None, None, 0x87), 'Stone of Agony': (True, False, None, 0x0720, 0x39), 'Piece of Heart': (False, False, None, 0x07C0, 0x3E), 'Recovery Heart': (False, True, None, 0x0900, 0x48), @@ -94,8 +94,8 @@ def ItemFactory(items): 'Small Key': (False, False, 'SmallKey', 0x0840, 0x42), 'Map (Deku Tree)': (False, False, 'Map', 0x0820, 0x41), 'Compass (Deku Tree)': (False, False, 'Compass', 0x0800, 0x40), - 'Map (Dodongos Cavern)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Dodongos Cavern)': (False, False, 'Compass', 0x0800, 0x40), + 'Map (Dodongos Cavern)': (False, False, 'Map', None, 0xA3), + 'Compass (Dodongos Cavern)': (False, False, 'Compass', None, 0x99), 'Map (Jabu Jabus Belly)': (False, False, 'Map', 0x0820, 0x41), 'Compass (Jabu Jabus Belly)': (False, False, 'Compass', 0x0800, 0x40), 'Map (Forest Temple)': (False, False, 'Map', 0x0820, 0x41), @@ -160,12 +160,12 @@ def ItemFactory(items): 'Light Trial Clear': (True, False, 'Event', None, None), 'Triforce': (True, False, 'Event', None, None)} -item_data = {'Bow': [0x4C, 0x80, 0x17, 0x57, 0x00, 0xBE], - 'Progressive Hookshot': [0x0B, 0x80, 0x2E, 0x4F, 0x00, 0xDD], +item_data = {#'Bow': [0x4C, 0x80, 0x17, 0x57, 0x00, 0xBE], + # 'Progressive Hookshot': [0x0B, 0x80, 0x2E, 0x4F, 0x00, 0xDD], 'Hammer': [0x11, 0x80, 0x41, 0x38, 0x00, 0xF6], - 'Slingshot': [0x49, 0x80, 0x73, 0x6C, 0x01, 0x7B], + # 'Slingshot': [0x49, 0x80, 0x73, 0x6C, 0x01, 0x7B], 'Boomerang': [0x0E, 0x80, 0x34, 0x35, 0x00, 0xE8], - 'Bomb Bag': [0x4F, 0x80, 0x1A, 0x5A, 0x00, 0xBF], + # 'Bomb Bag': [0x4F, 0x80, 0x1A, 0x5A, 0x00, 0xBF], 'Lens of Truth': [0x0F, 0x80, 0x36, 0x39, 0x00, 0xEA], 'Dins Fire': [0x05, 0x80, 0x64, 0xAD, 0x01, 0x5D], 'Farores Wind': [0x0D, 0x80, 0x65, 0xAE, 0x01, 0x5D], @@ -188,7 +188,7 @@ def ItemFactory(items): 'Eyedrops': [0x36, 0x80, 0x52, 0x0E, 0x01, 0x3F], 'Claim Check': [0x37, 0x80, 0x55, 0xA4, 0x01, 0x8D], 'Kokiri Sword': [0x3B, 0x80, 0x74, 0xA4, 0x01, 0x8D], - 'Biggoron Sword': [0x3D, 0x80, 0x43, 0x0B, 0x00, 0xF8], + # 'Biggoron Sword': [0x3D, 0x80, 0x43, 0x0B, 0x00, 0xF8], 'Deku Shield': [0x3E, 0xA0, 0xE3, 0x4C, 0x00, 0xCB], 'Hylian Shield': [0x3F, 0xA0, 0xD4, 0x4D, 0x00, 0xDC], 'Mirror Shield': [0x40, 0x80, 0x3A, 0x4E, 0x00, 0xEE], @@ -196,11 +196,11 @@ def ItemFactory(items): 'Zora Tunic': [0x43, 0xA0, 0x3D, 0x51, 0x00, 0xF2], 'Iron Boots': [0x45, 0x80, 0x47, 0x53, 0x01, 0x18], 'Hover Boots': [0x46, 0x80, 0x5F, 0x54, 0x01, 0x57], - 'Progressive Strength Upgrade': [0x52, 0x80, 0x4A, 0x5C, 0x01, 0x2D], - 'Progressive Scale': [0x54, 0x80, 0x2B, 0xCE, 0x00, 0xDB], - 'Progressive Wallet': [0x57, 0x80, 0x23, 0x5F, 0x00, 0xD1], - 'Deku Stick Capacity': [0x98, 0x80, 0xE5, 0x90, 0x00, 0xC7], - 'Deku Nut Capacity': [0x9A, 0x80, 0xEE, 0xA7, 0x00, 0xBB], + # 'Progressive Strength Upgrade': [0x52, 0x80, 0x4A, 0x5C, 0x01, 0x2D], + # 'Progressive Scale': [0x54, 0x80, 0x2B, 0xCE, 0x00, 0xDB], + # 'Progressive Wallet': [0x57, 0x80, 0x23, 0x5F, 0x00, 0xD1], + # 'Deku Stick Capacity': [0x98, 0x80, 0xE5, 0x90, 0x00, 0xC7], + # 'Deku Nut Capacity': [0x9A, 0x80, 0xEE, 0xA7, 0x00, 0xBB], 'Stone of Agony': [0x6F, 0x80, 0x21, 0x68, 0x00, 0xC8], 'Piece of Heart': [0x7A, 0x80, 0x14, 0xC2, 0x00, 0xBD], 'Recovery Heart': [0x83, 0x80, 0x09, 0x55, 0x00, 0xB7], diff --git a/Rules.py b/Rules.py index 5009c3473..bc18a08b1 100644 --- a/Rules.py +++ b/Rules.py @@ -421,5 +421,4 @@ def global_rules(world): forbid_item(world.get_location(location), 'Ice Trap') for location in ['Treasure Chest Game']: - forbid_item(world.get_location(location), 'Ice Trap') - forbid_item(world.get_location(location), 'Biggoron Sword') \ No newline at end of file + forbid_item(world.get_location(location), 'Ice Trap') \ No newline at end of file From 176723fb605afd26d238ec5c33d86123f9d64f24 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 01:25:44 -0400 Subject: [PATCH 010/151] Merge upstream/master into extended-items --- Compress/Compress | Bin 52680 -> 50688 bytes Compress/Compress.exe | Bin 50688 -> 50688 bytes Compress/Compress.out | Bin 16592 -> 15108 bytes Decompress/Decompress | Bin 35416 -> 23040 bytes Decompress/Decompress.exe | Bin 57168 -> 23040 bytes Decompress/Decompress.out | Bin 15480 -> 13944 bytes HintList.py | 24 ++++++++++++------------ Hints.py | 26 +++++++++++++++++--------- 8 files changed, 29 insertions(+), 21 deletions(-) diff --git a/Compress/Compress b/Compress/Compress index 5730026bdfed4858668a0335d5f934d389b1d6cb..5698756fe02838d606db2d10376b5098f8903bd2 100644 GIT binary patch literal 50688 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 Qt|i;rn-`{K={gVm2MVy)xBvhE literal 52680 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 literal 16592 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 diff --git a/Decompress/Decompress b/Decompress/Decompress index 411f67497a1133b0e54e0791dafa4bacd5a4003b..7f46ff6a6c8512396de2841b01367bb7dc0f83e9 100644 GIT binary patch literal 23040 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 diff --git a/Decompress/Decompress.exe b/Decompress/Decompress.exe index 5cd10a2fec1c51e0ba1cb9ffac5ac876d68020a2..7f46ff6a6c8512396de2841b01367bb7dc0f83e9 100644 GIT binary patch literal 23040 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 R;7LT5gNnTKln{PP`9E!y;*tOW diff --git a/Decompress/Decompress.out b/Decompress/Decompress.out index 7eb18051f6a25f9f77fd6eb9348cf3da12e0d095..8c71797d80e0803d3c3442923eee360e22d96488 100644 GIT binary patch literal 13944 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 Nds506w4EgB{{S|}{$KzA diff --git a/HintList.py b/HintList.py index d89919936..bdf76b3eb 100644 --- a/HintList.py +++ b/HintList.py @@ -203,15 +203,15 @@ def getHintGroup(string): '1041': ("You were almost a @&sandwich.", 'junkHint'), '1042': ("I'm a helpful hint Gossip Stone!^See I'm helping.", 'junkHint'), #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx handy marker for how long one line should be in a text box - 'Queen Gohma': ("One inside an #ancient tree#...^", 'dungeon'), - 'King Dodongo': ("One within an #immense cavern#...^", 'dungeon'), - 'Barinade': ("One in the #belly of a deity#...^", 'dungeon'), - 'Phantom Ganon': ("One in a #deep forest#...^", 'dungeon'), - 'Volvagia': ("One on a #high mountain#...^", 'dungeon'), - 'Morpha': ("One under a #vast lake#...^", 'dungeon'), - 'Bongo Bongo': ("One within the #house of the dead#...^", 'dungeon'), - 'Twinrova': ("One inside a #goddess of the sand#...^", 'dungeon'), - 'Links Pocket': ("One in #@'s pocket#...^", 'dungeon'), - 'Spiritual Stone Text Start': ("Ye who owns 3 Spiritual Stones...^", 'dungeon'), - 'Spiritual Stone Text End': ("Stand with the Ocarina of Time&and play the Song of Time.", 'dungeon'), - 'Medllion Text End': ("Together with the Hero of Time,&the awakened ones will bind the&evil and return the light of peace&to the world.", 'dungeon')} + 'Queen Gohma': ("One inside an #ancient tree#...^", 'boss'), + 'King Dodongo': ("One within an #immense cavern#...^", 'boss'), + 'Barinade': ("One in the #belly of a deity#...^", 'boss'), + 'Phantom Ganon': ("One in a #deep forest#...^", 'boss'), + 'Volvagia': ("One on a #high mountain#...^", 'boss'), + 'Morpha': ("One under a #vast lake#...^", 'boss'), + 'Bongo Bongo': ("One within the #house of the dead#...^", 'boss'), + 'Twinrova': ("One inside a #goddess of the sand#...^", 'boss'), + 'Links Pocket': ("One in #@'s pocket#...^", 'boss'), + 'Spiritual Stone Text Start': ("Ye who owns 3 Spiritual Stones...^", 'boss'), + 'Spiritual Stone Text End': ("Stand with the Ocarina of Time&and play the Song of Time.", 'boss'), + 'Medallion Text End': ("Together with the Hero of Time,&the awakened ones will bind the&evil and return the light of peace&to the world.", 'boss')} diff --git a/Hints.py b/Hints.py index 13a18501b..1cf6d2a88 100644 --- a/Hints.py +++ b/Hints.py @@ -68,14 +68,16 @@ def buildGossipHints(world, rom): return rom -def buildDungeonRewardHints(world, rom): - dungeonRewardsSpiritualStones = ['Kokiri Emerald', 'Goron Ruby', 'Zora Sapphire'] - dungeonRewardsMedallions = ['Forest Medallion', 'Fire Medallion', 'Water Medallion', 'Shadow Medallion', 'Spirit Medallion', 'Light Medallion'] +# builds boss reward text that is displayed at the temple of time altar for child and adult, pull based off of item in a fixed order. +def buildBossRewardHints(world, rom): + bossRewardsSpiritualStones = ['Kokiri Emerald', 'Goron Ruby', 'Zora Sapphire'] + bossRewardsMedallions = ['Forest Medallion', 'Fire Medallion', 'Water Medallion', 'Shadow Medallion', 'Spirit Medallion', 'Light Medallion'] + # text that appears at altar as a child. Block_code = [] Block_code = getBytes(getHint('Spiritual Stone Text Start').text) - for reward in dungeonRewardsSpiritualStones: - buildDungeonString(Block_code, reward, world) + for reward in bossRewardsSpiritualStones: + buildBossString(Block_code, reward, world) Block_code = setRewardColor(Block_code) Block_code.extend(getBytes(getHint('Spiritual Stone Text End').text)) @@ -83,19 +85,21 @@ def buildDungeonRewardHints(world, rom): endText(Block_code) rom.write_bytes(0x95ED95, Block_code) + # text that appears at altar as an adult. Block_code = [] - for reward in dungeonRewardsMedallions: - buildDungeonString(Block_code, reward, world) + for reward in bossRewardsMedallions: + buildBossString(Block_code, reward, world) Block_code = setRewardColor(Block_code) - Block_code.extend(getBytes(getHint('Medllion Text End').text)) + Block_code.extend(getBytes(getHint('Medallion Text End').text)) Block_code.extend([0x0B]) endText(Block_code) rom.write_bytes(0x95DB94, Block_code) return rom -def buildDungeonString(Block_code, reward, world): +# pulls text string from hintlist for reward after sending the location to hintlist. +def buildBossString(Block_code, reward, world): for location in world.get_locations(): if location.item.name == reward: Block_code.extend([0x08]) @@ -103,6 +107,8 @@ def buildDungeonString(Block_code, reward, world): return Block_code +# alternates through color set commands in child and adult boss reward hint strings setting the colors at the start of the string to correspond with the reward found at the location. +# skips over color commands at the end of stings to set color back to white. def setRewardColor(Block_code): rewardColors = [0x42, 0x41, 0x43, 0x45, 0x46, 0x44] @@ -116,9 +122,11 @@ def setRewardColor(Block_code): return Block_code +#sets the end of text byte in the text box. def endText(byteArray): return byteArray.extend([0x02]) +# reads array of characters and converts them to an array of bytes. def getBytes(string): byteCode = [] for char in string: From 618d2f77183fdd6bf10763398a7e5323261a2c63 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 06:17:23 -0400 Subject: [PATCH 011/151] Add logic for generic grotto chests --- ASM/src/config.asm | 4 ++-- EntranceShuffle.py | 5 +++-- Regions.py | 33 ++++++++++++++++++++++----------- Rom.py | 2 ++ Rules.py | 7 ++++--- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/ASM/src/config.asm b/ASM/src/config.asm index 12e84d8ff..bb1fb1953 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -15,10 +15,10 @@ ; ; Generic grotto virtual scene numbers: ; 0x70: Hyrule Field: under boulder west of drawbridge -; 0x72: Hyrule Field: under boulder between Kokiri Forest and Lake Hylia +; 0x72: Hyrule Field: under boulder in remote southern trees ; 0x73: Hyrule Field: open hole outside Lake Hylia fences ; 0x78: Kakariko: open hole behind fence -; 0x79: Zora River: open hole on the high ground +; 0x79: Zora River: open hole on plateau ; 0x7C: Kokiri Forest: SoS hole by the gossip stone ; 0x84: Lost Woods: under boulder next to Goron City warp ; 0x87: Death Mountain: SoS hole outside Goron City diff --git a/EntranceShuffle.py b/EntranceShuffle.py index d58e3e134..b6fd999c3 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -286,9 +286,10 @@ def connect_fairy(world, entrancename, exitname): ('Ingo Barn', 'Ingo Barn'), ('Lon Lon Corner Tower', 'Lon Lon Corner Tower'), ('Zora Shop', 'Zora Shop'), - ('Forest Generic Grotto', 'Forest Generic Grotto'), + ('Kokiri Forest Storms Grotto', 'Kokiri Forest Storms Grotto'), + ('Lost Woods Generic Grotto', 'Lost Woods Generic Grotto'), ('Deku Theater', 'Deku Theater'), - ('Forest Sales Grotto', 'Forest Sales Grotto'), + ('Lost Woods Sales Grotto', 'Lost Woods Sales Grotto'), ('Meadow Fairy Grotto', 'Meadow Fairy Grotto'), ('Front of Meadow Grotto', 'Front of Meadow Grotto'), ('Lon Lon Grotto', 'Lon Lon Grotto'), diff --git a/Regions.py b/Regions.py index 2226baa24..3c52d409e 100644 --- a/Regions.py +++ b/Regions.py @@ -5,7 +5,7 @@ def create_regions(world): world.regions = [ - create_ow_region('Kokiri Forest', ['Kokiri Sword Chest', 'GS1', 'GS2', 'GS3'], ['Links House', 'Mido House', 'Saria House', 'House of Twins', 'Know It All House', 'Kokiri Shop', 'Deku Tree', 'Lost Woods', 'Lost Woods Bridge']), + create_ow_region('Kokiri Forest', ['Kokiri Sword Chest', 'GS1', 'GS2', 'GS3'], ['Links House', 'Mido House', 'Saria House', 'House of Twins', 'Know It All House', 'Kokiri Shop', 'Deku Tree', 'Lost Woods', 'Lost Woods Bridge', 'Kokiri Forest Storms Grotto']), create_interior_region('Links House', ['Links Pocket'], ['Links House Exit', 'Child Forest Warp Pad', 'Adult Forest Warp Pad', 'Temple Warp Pad', 'Crater Warp Pad', 'Lake Warp Pad', 'Graveyard Warp Pad', 'Colossus Warp Pad']), create_interior_region('Mido House', ['Mido Chest Top Left', 'Mido Chest Top Right', 'Mido Chest Bottom Left', 'Mido Chest Bottom Right'], ['Mido House Exit']), create_interior_region('Saria House', None, ['Saria House Exit']), @@ -15,7 +15,7 @@ def create_regions(world): create_dungeon_region('Deku Tree Lobby', ['Deku Tree Lobby Chest', 'Deku Tree Compass Chest', 'Deku Tree Compass Room Side Chest', 'Deku Tree Basement Chest', 'GS8', 'GS9', 'GS10'], ['Deku Tree Exit', 'Deku Tree Slingshot Passage', 'Deku Tree Basement Path']), create_dungeon_region('Deku Tree Slingshot Room', ['Deku Tree Slingshot Chest', 'Deku Tree Slingshot Room Side Chest'], ['Deku Tree Slingshot Exit']), create_dungeon_region('Deku Tree Boss Room', ['GS11', 'Queen Gohma'], ['Deku Tree Basement Vines']), - create_ow_region('Lost Woods', ['Skull Kid', 'Ocarina Memory Game', 'Target in Woods', 'Deku Salesman Woods', 'GS4', 'GS5'], ['Lost Woods Front', 'Meadow Entrance', 'Woods to Goron City', 'Lost Woods Dive Warp', 'Adult Meadow Access', 'Forest Generic Grotto', 'Deku Theater', 'Forest Sales Grotto']), + create_ow_region('Lost Woods', ['Skull Kid', 'Ocarina Memory Game', 'Target in Woods', 'Deku Salesman Woods', 'GS4', 'GS5'], ['Lost Woods Front', 'Meadow Entrance', 'Woods to Goron City', 'Lost Woods Dive Warp', 'Adult Meadow Access', 'Lost Woods Generic Grotto', 'Deku Theater', 'Lost Woods Sales Grotto']), create_ow_region('Sacred Forest Meadow Entryway', None, ['Meadow Exit', 'Meadow Gate', 'Front of Meadow Grotto']), create_ow_region('Sacred Forest Meadow', ['Song from Saria'], ['Meadow Gate Exit', 'Meadow Fairy Grotto']), create_ow_region('Lost Woods Bridge', ['Gift from Saria'], ['Kokiri Forest Entrance', 'Forest Exit']), @@ -148,26 +148,28 @@ def create_regions(world): create_dungeon_region('Ganons Castle Spirit Trial', ['Ganons Castle Spirit Trial First Chest', 'Ganons Castle Spirit Trial Second Chest', 'Ganons Castle Spirit Trial Clear']), create_dungeon_region('Ganons Castle Light Trial', ['Ganons Castle Light Trial First Left Chest', 'Ganons Castle Light Trial Second Left Chest', 'Ganons Castle Light Trial Third Left Chest', 'Ganons Castle Light Trial First Right Chest', 'Ganons Castle Light Trial Second Right Chest', 'Ganons Castle Light Trial Third Right Chest', 'Ganons Castle Light Trail Invisible Enemies Chest', 'Ganons Castle Light Trial Lullaby Chest', 'Ganons Castle Light Trial Clear']), create_dungeon_region('Ganons Castle Tower', ['Ganons Tower Boss Key Chest', 'Ganon']), - create_grotto_region('Forest Generic Grotto', ['Wolfos Grotto Chest']), + create_grotto_region('Kokiri Forest Storms Grotto', ['Kokiri Forest Storms Grotto Chest']), + create_grotto_region('Lost Woods Generic Grotto', ['Lost Woods Generic Grotto Chest']), create_grotto_region('Deku Theater', ['Deku Theater Skull Mask', 'Deku Theater Mask of Truth']), - create_grotto_region('Forest Sales Grotto', ['Deku Salesman Lost Woods Grotto']), + create_grotto_region('Lost Woods Sales Grotto', ['Deku Salesman Lost Woods Grotto']), create_grotto_region('Meadow Fairy Grotto'), - create_grotto_region('Front of Meadow Grotto'), + create_grotto_region('Front of Meadow Grotto', ['Wolfos Grotto Chest']), create_grotto_region('Lon Lon Grotto'), - create_grotto_region('Remote Southern Grotto'), - create_grotto_region('Field Near Lake Outside Fence Grotto'), + create_grotto_region('Remote Southern Grotto', ['Remote Southern Grotto Chest']), + create_grotto_region('Field Near Lake Outside Fence Grotto', ['Field Near Lake Outside Fence Grotto Chest']), create_grotto_region('Field Near Lake Inside Fence Grotto', ['Deku Salesman Hyrule Field Grotto']), create_grotto_region('Field Valley Grotto', ['GS13']), - create_grotto_region('Field West Castle Town Grotto'), + create_grotto_region('Field West Castle Town Grotto', ['Field West Castle Town Grotto Chest']), create_grotto_region('Field Far West Castle Town Grotto'), create_grotto_region('Field Kakariko Grotto', ['GS12']), create_grotto_region('Field North Lon Lon Grotto'), create_grotto_region('Castle Storms Grotto', ['GS16']), create_grotto_region('Kakariko Bombable Grotto', ['Redead Grotto Chest']), - create_grotto_region('Kakariko Back Grotto'), + create_grotto_region('Kakariko Back Grotto', ['Kakariko Back Grotto Chest']), create_grotto_region('Mountain Bombable Grotto'), - create_grotto_region('Top of Crater Grotto'), - create_grotto_region('Zora River Plateau Open Grotto'), + create_grotto_region('Mountain Storms Grotto', ['Mountain Storms Grotto Chest']), + create_grotto_region('Top of Crater Grotto', ['Top of Crater Grotto Chest']), + create_grotto_region('Zora River Plateau Open Grotto', ['Zora River Plateau Open Grotto Chest']), create_grotto_region('Zora River Plateau Bombable Grotto'), create_grotto_region('Lake Hylia Grotto') ] @@ -418,6 +420,15 @@ def _create_region(name, type, locations=None, exits=None): 'Rolling Goron as Child': (0xED296F, None, 0x34, 'NPC', 0x62), 'Lake Hylia Sun': (0xE9E1F2, None, 0x5B08, 'Chest', 0x57), 'Underwater Bottle': (0xDE10FB, None, 0x15, 'NPC', 0x57), + 'Field West Castle Town Grotto Chest': (None, None, None, 'Grotto', 0x70), + 'Remote Southern Grotto Chest': (None, None, None, 'Grotto', 0x72), + 'Field Near Lake Outside Fence Grotto Chest': (None, None, None, 'Grotto', 0x73), + 'Kakariko Back Grotto Chest': (None, None, None, 'Grotto', 0x78), + 'Zora River Plateau Open Grotto Chest': (None, None, None, 'Grotto', 0x79), + 'Kokiri Forest Storms Grotto Chest': (None, None, None, 'Grotto', 0x7C), + 'Lost Woods Generic Grotto Chest': (None, None, None, 'Grotto', 0x84), + 'Mountain Storms Grotto Chest': (None, None, None, 'Grotto', 0x87), + 'Top of Crater Grotto Chest': (None, None, None, 'Grotto', 0x8A), 'Magic Bean Salesman': (None, None, None, 'Event'), 'King Zora Moves': (None, None, None, 'Event'), 'Ocarina of Time': (None, None, None, 'Event'), diff --git a/Rom.py b/Rom.py index 56422da21..fbe0aef03 100644 --- a/Rom.py +++ b/Rom.py @@ -836,6 +836,8 @@ def patch_rom(world, rom): elif location.name == 'Twinrova': rom.write_bytes(0xCA3EA2, [item_data[location.item.name][3][0], item_data[location.item.name][3][1]]) rom.write_bytes(0xCA3EA6, [item_data[location.item.name][3][2], item_data[location.item.name][3][3]]) + elif location.type == 'Grotto': + pass # These must be handled with overrides else: locationdefault = location.default & 0xF01F itemid = itemid | locationdefault diff --git a/Rules.py b/Rules.py index bc18a08b1..5dde939f9 100644 --- a/Rules.py +++ b/Rules.py @@ -300,8 +300,9 @@ def global_rules(world): set_rule(world.get_location('Ganons Castle Light Trail Invisible Enemies Chest'), lambda state: state.has('Magic Meter') and state.has('Lens of Truth')) set_rule(world.get_location('Ganons Castle Light Trial Lullaby Chest'), lambda state: state.has('Zeldas Lullaby') and state.has('Small Key (Ganons Castle)', 1)) set_rule(world.get_location('Ganon'), lambda state: state.has('Boss Key (Ganons Castle)')) - set_rule(world.get_entrance('Forest Generic Grotto'), lambda state: state.can_blast()) - set_rule(world.get_entrance('Forest Sales Grotto'), lambda state: state.can_blast()) + set_rule(world.get_entrance('Kokiri Forest Storms Grotto'), lambda state: state.has('Song of Storms')) + set_rule(world.get_entrance('Lost Woods Generic Grotto'), lambda state: state.can_blast()) + set_rule(world.get_entrance('Lost Woods Sales Grotto'), lambda state: state.can_blast()) set_rule(world.get_entrance('Front of Meadow Grotto'), lambda state: state.can_blast()) set_rule(world.get_entrance('Remote Southern Grotto'), lambda state: state.can_blast()) set_rule(world.get_entrance('Field Near Lake Inside Fence Grotto'), lambda state: state.can_blast()) @@ -313,9 +314,9 @@ def global_rules(world): set_rule(world.get_entrance('Castle Storms Grotto'), lambda state: state.has('Song of Storms')) set_rule(world.get_entrance('Kakariko Bombable Grotto'), lambda state: state.can_blast()) set_rule(world.get_entrance('Mountain Bombable Grotto'), lambda state: state.can_blast()) + set_rule(world.get_entrance('Mountain Storms Grotto'), lambda state: state.has('Song of Storms')) set_rule(world.get_entrance('Top of Crater Grotto'), lambda state: state.can_blast()) set_rule(world.get_entrance('Zora River Plateau Bombable Grotto'), lambda state: state.can_blast()) - set_rule(world.get_location('GS2'), lambda state: state.has_bottle()) set_rule(world.get_location('GS3'), lambda state: state.has('Progressive Hookshot') and state.is_adult()) set_rule(world.get_location('GS4'), lambda state: state.has_bottle()) From c8d28121dba47656cf830fd2abd601125d091654 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 12:06:28 -0400 Subject: [PATCH 012/151] Add pre-filled bottles to item pool --- ItemList.py | 9 +++++++-- Items.py | 8 ++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ItemList.py b/ItemList.py index c18fa1281..f7a504967 100644 --- a/ItemList.py +++ b/ItemList.py @@ -9,8 +9,10 @@ #Some basic items that various modes require are placed here, including pendants and crystals. Medallion requirements for the two relevant entrances are also decided. alwaysitems = (['Kokiri Sword', 'Biggoron Sword', 'Boomerang', 'Lens of Truth', 'Hammer', 'Iron Boots', 'Goron Tunic', 'Zora Tunic', 'Hover Boots', 'Mirror Shield', 'Stone of Agony', 'Fire Arrows', 'Ice Arrows', 'Light Arrows', 'Dins Fire', 'Farores Wind', 'Nayrus Love', 'Rupee (1)'] + ['Progressive Hookshot'] * 2 + ['Deku Shield'] * 4 + ['Hylian Shield'] * 2 + ['Ice Trap'] * 6 + - ['Progressive Strength Upgrade'] * 3 + ['Progressive Scale'] * 2 + ['Piece of Heart'] * 16 + ['Recovery Heart'] * 11 + ['Rupees (5)'] * 13 + ['Rupees (20)'] * 2 + ['Rupees (50)'] * 7 + ['Rupees (200)'] * 5 + ['Bow'] * 3 + ['Slingshot'] * 3 + ['Bomb Bag'] * 3 + ['Bottle'] * 2 + ['Bottle with Letter'] + ['Bottle with Milk'] + - ['Bombs (5)'] * 2 + ['Bombs (10)'] * 2 + ['Bombs (20)'] + ['Bombchus (5)'] + ['Bombchus (10)'] * 3 + ['Bombchus (20)'] + ['Arrows (5)'] + ['Arrows (10)'] * 6 + ['Arrows (30)'] * 6 + ['Deku Nuts (5)'] + ['Deku Nuts (10)'] + ['Progressive Wallet'] * 2 + ['Deku Stick Capacity'] * 2 + ['Deku Nut Capacity'] * 2) + ['Progressive Strength Upgrade'] * 3 + ['Progressive Scale'] * 2 + ['Piece of Heart'] * 16 + ['Recovery Heart'] * 11 + ['Rupees (5)'] * 17 + ['Rupees (20)'] * 5 + ['Rupees (50)'] * 7 + ['Rupees (200)'] * 6 + ['Bow'] * 3 + ['Slingshot'] * 3 + ['Bomb Bag'] * 3 + ['Bottle with Letter'] + + ['Bombs (5)'] * 2 + ['Bombs (10)'] * 2 + ['Bombs (20)'] * 2 + ['Bombchus (5)'] + ['Bombchus (10)'] * 3 + ['Bombchus (20)'] + ['Arrows (5)'] + ['Arrows (10)'] * 6 + ['Arrows (30)'] * 6 + ['Deku Nuts (5)'] + ['Deku Nuts (10)'] + ['Progressive Wallet'] * 2 + ['Deku Stick Capacity'] * 2 + ['Deku Nut Capacity'] * 2) +normal_bottles = ['Bottle', 'Bottle with Milk', 'Bottle with Red Potion', 'Bottle with Green Potion', 'Bottle with Blue Potion', 'Bottle with Fairy', 'Bottle with Fish', 'Bottle with Blue Fire', 'Bottle with Bugs', 'Bottle with Poe'] +normal_bottle_count = 3 notmapcompass = ['Rupees (5)'] * 20 rewardlist = ['Kokiri Emerald', 'Goron Ruby', 'Zora Sapphire', 'Forest Medallion', 'Fire Medallion', 'Water Medallion', 'Spirit Medallion', 'Shadow Medallion', 'Light Medallion'] songlist = ['Zeldas Lullaby', 'Eponas Song', 'Suns Song', 'Sarias Song', 'Song of Time', 'Song of Storms', 'Minuet of Forest', 'Prelude of Light', 'Bolero of Fire', 'Serenade of Water', 'Nocturne of Shadow', 'Requiem of Spirit'] @@ -81,6 +83,9 @@ def get_pool_core(dungeon_items): if not dungeon_items: pool.extend(notmapcompass) pool.extend(alwaysitems) + for _ in range(normal_bottle_count): + bottle = random.choice(normal_bottles) + pool.append(bottle) tradeitem = random.choice(tradeitems) pool.append(tradeitem) diff --git a/Items.py b/Items.py index 8b7b2eb36..c5551ac99 100644 --- a/Items.py +++ b/Items.py @@ -41,6 +41,14 @@ def ItemFactory(items): 'Bottle': (True, False, None, 0x01E0, 0x0F), 'Bottle with Letter': (True, False, None, 0x02A0, 0x15), 'Bottle with Milk': (True, False, None, 0x0280, 0x14), + 'Bottle with Red Potion': (True, False, None, None, 0x89), + 'Bottle with Green Potion': (True, False, None, None, 0x8A), + 'Bottle with Blue Potion': (True, False, None, None, 0x8B), + 'Bottle with Fairy': (True, False, None, None, 0x8C), + 'Bottle with Fish': (True, False, None, None, 0x8D), + 'Bottle with Blue Fire': (True, False, None, None, 0x8E), + 'Bottle with Bugs': (True, False, None, None, 0x8F), + 'Bottle with Poe': (True, False, None, None, 0x91), 'Pocket Egg': (True, False, None, 0x03A0, 0x1D), 'Pocket Cucco': (True, False, None, 0x03C0, 0x1E), 'Cojiro': (True, False, None, 0x01C0, 0x0E), From e124f2a6a8be7fb64b5612c475086a860ff0db5f Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 12:07:34 -0400 Subject: [PATCH 013/151] Update has_bottle to account for pre-filled bottles --- BaseClasses.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/BaseClasses.py b/BaseClasses.py index 0ed9827e1..139f21f35 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -311,7 +311,8 @@ def can_finish_adult_trades(self): return (self.has('Claim Check') or ((self.has('Eyedrops') or self.has('Eyeball Frog') or self.has('Prescription') or self.has('Broken Sword')) and zora_thawed) or ((self.has('Poachers Saw') or self.has('Odd Mushroom') or self.has('Cojiro') or self.has('Pocket Cucco') or self.has('Pocket Egg')) and zora_thawed and carpenter_access)) def has_bottle(self): - return (self.has('Bottle') or self.has('Bottle with Milk')) + is_normal_bottle = lambda item: (item.startswith('Bottle') and item != 'Bottle with Letter') + return any(is_normal_bottle(pritem) for pritem in self.prog_items) def bottle_count(self): return len([pritem for pritem in self.prog_items if pritem.startswith('Bottle')]) From 45987e2d8e2dd5f67db851c2d3fcb7a83e7a1043 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 12:08:35 -0400 Subject: [PATCH 014/151] Add Mountain Storms Grotto --- EntranceShuffle.py | 1 + Regions.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index b6fd999c3..bb49f1f6b 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -303,6 +303,7 @@ def connect_fairy(world, entrancename, exitname): ('Kakariko Bombable Grotto', 'Kakariko Bombable Grotto'), ('Kakariko Back Grotto', 'Kakariko Back Grotto'), ('Mountain Bombable Grotto', 'Mountain Bombable Grotto'), + ('Mountain Storms Grotto', 'Mountain Storms Grotto'), ('Top of Crater Grotto', 'Top of Crater Grotto'), ('Field North Lon Lon Grotto', 'Field North Lon Lon Grotto'), ('Castle Storms Grotto', 'Castle Storms Grotto'), diff --git a/Regions.py b/Regions.py index 3c52d409e..4cf319094 100644 --- a/Regions.py +++ b/Regions.py @@ -94,7 +94,7 @@ def create_regions(world): create_dungeon_region('Shadow Temple Huge Pit', ['Shadow Temple Invisible Blades Visible Chest', 'Shadow Temple Invisible Blades Invisible Chest', 'Shadow Temple Falling Spikes Lower Chest', 'Shadow Temple Falling Spikes Upper Chest', 'Shadow Temple Falling Spikes Switch Chest', 'Shadow Temple Invisible Spikes Chest', 'GS81', 'GS82'], ['Shadow Temple Hookshot Target']), create_dungeon_region('Shadow Temple Wind Tunnel', ['Shadow Temple Wind Hint Chest', 'Shadow Temple After Wind Enemy Chest', 'Shadow Temple After Wind Hidden Chest', 'GS83', 'GS84'], ['Shadow Temple Boat']), create_dungeon_region('Shadow Temple Beyond Boat', ['Shadow Temple Spike Walls Left Chest', 'Shadow Temple Boss Key Chest', 'Shadow Temple Hidden Floormaster Chest', 'Bongo Bongo', 'GS85']), - create_ow_region('Death Mountain', ['Death Mountain Bombable Chest', 'Biggoron', 'GS30', 'GS31', 'GS32', 'GS33'], ['Death Mountain Exit', 'Goron City Entrance', 'Mountain Crater Entrance', 'Mountain Summit Fairy', 'Dodongos Cavern Rocks', 'Mountain Bombable Grotto']), + create_ow_region('Death Mountain', ['Death Mountain Bombable Chest', 'Biggoron', 'GS30', 'GS31', 'GS32', 'GS33'], ['Death Mountain Exit', 'Goron City Entrance', 'Mountain Crater Entrance', 'Mountain Summit Fairy', 'Dodongos Cavern Rocks', 'Mountain Bombable Grotto', 'Mountain Storms Grotto']), create_ow_region('Dodongos Cavern Entryway', None, ['Dodongos Cavern', 'Mountain Access from Behind Rock']), create_ow_region('Goron City', ['Goron City Leftmost Maze Chest', 'Goron City Left Maze Chest', 'Goron City Right Maze Chest', 'Rolling Goron as Child', 'Link the Goron', 'GS34', 'GS35'], ['Goron City Exit', 'Goron City Bomb Wall', 'Darunias Chamber', 'Crater Access']), create_ow_region('Goron City Woods Warp', None, ['Goron City from Woods', 'Goron City to Woods']), From 6bb0d797539b8c8cf49f089c82b3ee17cec79a6f Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 12:09:09 -0400 Subject: [PATCH 015/151] Add scene column to all locations --- Regions.py | 276 ++++++++++++++++++++++++++--------------------------- 1 file changed, 138 insertions(+), 138 deletions(-) diff --git a/Regions.py b/Regions.py index 4cf319094..8ecc4ee56 100644 --- a/Regions.py +++ b/Regions.py @@ -361,22 +361,22 @@ def _create_region(name, type, locations=None, exits=None): 'Ganons Castle Light Trail Invisible Enemies Chest': (0x321B15E, None, 0x7850, 'Chest', 0x0D), 'Ganons Castle Light Trial Lullaby Chest': (0x321B17E, None, 0x8851, 'Chest', 0x0D), 'Ganons Tower Boss Key Chest': (0x2F040EE, None, 0x27EB, 'Chest', 0x0A), - 'Impa at Castle': (0x2E8E925, 0x2E8E925, 0x0A, 'Song'), - 'Song from Malon': (0xD7EB53, 0xD7EBCF, 0x09, 'Song'), - 'Song from Composer Grave': (0x332A871, 0x332A871, 0x0B, 'Song'), - 'Song from Saria': (0x20B1DB1, 0x20B1DB1, 0x08, 'Song'), - 'Song from Ocarina of Time': (0x252FC89, 0x252FC89, 0x0C, 'Song'), - 'Song at Windmill': (0xE42C07, 0xE42B8B, 0x0D, 'Song'), - 'Sheik Forest Song': (0x20B0809, 0x20B0809, 0x02, 'Song'), - 'Sheik at Temple': (0x2531329, 0x2531329, 0x07, 'Song'), - 'Sheik in Crater': (0x224D7F1, 0x224D7F1, 0x03, 'Song'), - 'Sheik in Ice Cavern': (0x2BEC889, 0x2BEC889, 0x04, 'Song'), - 'Sheik in Kakariko': (0x2000FE1, 0x2000FE1, 0x06, 'Song'), - 'Sheik at Colossus': (0x218C57D, 0x218C57D, 0x05, 'Song'), - 'Gift from Saria': (None, None, None, 'NPC'), - 'Zeldas Letter': (None, None, None, 'NPC'), - 'Crater Fairy Reward': (None, None, None, 'Fairy'), - 'Mountain Summit Fairy Reward': (None, None, None, 'Fairy'), + 'Impa at Castle': (0x2E8E925, 0x2E8E925, 0x0A, 'Song', None), + 'Song from Malon': (0xD7EB53, 0xD7EBCF, 0x09, 'Song', None), + 'Song from Composer Grave': (0x332A871, 0x332A871, 0x0B, 'Song', None), + 'Song from Saria': (0x20B1DB1, 0x20B1DB1, 0x08, 'Song', None), + 'Song from Ocarina of Time': (0x252FC89, 0x252FC89, 0x0C, 'Song', None), + 'Song at Windmill': (0xE42C07, 0xE42B8B, 0x0D, 'Song', None), + 'Sheik Forest Song': (0x20B0809, 0x20B0809, 0x02, 'Song', None), + 'Sheik at Temple': (0x2531329, 0x2531329, 0x07, 'Song', None), + 'Sheik in Crater': (0x224D7F1, 0x224D7F1, 0x03, 'Song', None), + 'Sheik in Ice Cavern': (0x2BEC889, 0x2BEC889, 0x04, 'Song', None), + 'Sheik in Kakariko': (0x2000FE1, 0x2000FE1, 0x06, 'Song', None), + 'Sheik at Colossus': (0x218C57D, 0x218C57D, 0x05, 'Song', None), + 'Gift from Saria': (None, None, None, 'NPC', None), + 'Zeldas Letter': (None, None, None, 'NPC', None), + 'Crater Fairy Reward': (None, None, None, 'Fairy', None), + 'Mountain Summit Fairy Reward': (None, None, None, 'Fairy', None), 'Hyrule Castle Fairy Reward': (0xC8BD09, 0x2D21E7D, None, 'Special', 0x3D), 'Zoras Fountain Fairy Reward': (0xC8BD08, 0x2D20595, None, 'Special', 0x3D), 'Desert Colossus Fairy Reward': (0xC8BD0A, 0x2D22375, None, 'Special', 0x3D), @@ -429,125 +429,125 @@ def _create_region(name, type, locations=None, exits=None): 'Lost Woods Generic Grotto Chest': (None, None, None, 'Grotto', 0x84), 'Mountain Storms Grotto Chest': (None, None, None, 'Grotto', 0x87), 'Top of Crater Grotto Chest': (None, None, None, 'Grotto', 0x8A), - 'Magic Bean Salesman': (None, None, None, 'Event'), - 'King Zora Moves': (None, None, None, 'Event'), - 'Ocarina of Time': (None, None, None, 'Event'), - 'Master Sword Pedestal': (None, None, None, 'Event'), - 'Epona': (None, None, None, 'Event'), - 'Gerudo Fortress Carpenter Rescue': (None, None, None, 'Event'), - 'Ganons Castle Forest Trial Clear': (None, None, None, 'Event'), - 'Ganons Castle Fire Trial Clear': (None, None, None, 'Event'), - 'Ganons Castle Water Trial Clear': (None, None, None, 'Event'), - 'Ganons Castle Shadow Trial Clear': (None, None, None, 'Event'), - 'Ganons Castle Spirit Trial Clear': (None, None, None, 'Event'), - 'Ganons Castle Light Trial Clear': (None, None, None, 'Event'), - 'Links Pocket': (0x34806FB, 0x34806FF, None, 'Boss'), - 'Queen Gohma': (0xCA315F, 0x2079571, 0x6C, 'Boss'), - 'King Dodongo': (0xCA30DF, 0x2223309, 0x6D, 'Boss'), - 'Barinade': (0xCA36EB, 0x2113C19, 0x6E, 'Boss'), - 'Phantom Ganon': (0xCA3D07, 0xD4ED79, 0x66, 'Boss'), - 'Volvagia': (0xCA3D93, 0xD10135, 0x67, 'Boss'), - 'Morpha': (0xCA3E1F, 0xD5A3A9, 0x68, 'Boss'), - 'Twinrova': (0xCA3EB3, 0xD39FF1, 0x69, 'Boss'), - 'Bongo Bongo': (0xCA3F43, 0xD13E19, 0x6A, 'Boss'), - 'Ganon': (None, None, None, 'Boss'), - 'GS1': (None, None, None, 'GS Token'), - 'GS2': (None, None, None, 'GS Token'), - 'GS3': (None, None, None, 'GS Token'), - 'GS4': (None, None, None, 'GS Token'), - 'GS5': (None, None, None, 'GS Token'), - 'GS6': (None, None, None, 'GS Token'), - 'GS7': (None, None, None, 'GS Token'), - 'GS8': (None, None, None, 'GS Token'), - 'GS9': (None, None, None, 'GS Token'), - 'GS10': (None, None, None, 'GS Token'), - 'GS11': (None, None, None, 'GS Token'), - 'GS12': (None, None, None, 'GS Token'), - 'GS13': (None, None, None, 'GS Token'), - 'GS14': (None, None, None, 'GS Token'), - 'GS15': (None, None, None, 'GS Token'), - 'GS16': (None, None, None, 'GS Token'), - 'GS17': (None, None, None, 'GS Token'), - 'GS18': (None, None, None, 'GS Token'), - 'GS19': (None, None, None, 'GS Token'), - 'GS20': (None, None, None, 'GS Token'), - 'GS21': (None, None, None, 'GS Token'), - 'GS22': (None, None, None, 'GS Token'), - 'GS23': (None, None, None, 'GS Token'), - 'GS24': (None, None, None, 'GS Token'), - 'GS25': (None, None, None, 'GS Token'), - 'GS26': (None, None, None, 'GS Token'), - 'GS27': (None, None, None, 'GS Token'), - 'GS28': (None, None, None, 'GS Token'), - 'GS29': (None, None, None, 'GS Token'), - 'GS30': (None, None, None, 'GS Token'), - 'GS31': (None, None, None, 'GS Token'), - 'GS32': (None, None, None, 'GS Token'), - 'GS33': (None, None, None, 'GS Token'), - 'GS34': (None, None, None, 'GS Token'), - 'GS35': (None, None, None, 'GS Token'), - 'GS36': (None, None, None, 'GS Token'), - 'GS37': (None, None, None, 'GS Token'), - 'GS38': (None, None, None, 'GS Token'), - 'GS39': (None, None, None, 'GS Token'), - 'GS40': (None, None, None, 'GS Token'), - 'GS41': (None, None, None, 'GS Token'), - 'GS42': (None, None, None, 'GS Token'), - 'GS43': (None, None, None, 'GS Token'), - 'GS44': (None, None, None, 'GS Token'), - 'GS45': (None, None, None, 'GS Token'), - 'GS46': (None, None, None, 'GS Token'), - 'GS47': (None, None, None, 'GS Token'), - 'GS48': (None, None, None, 'GS Token'), - 'GS49': (None, None, None, 'GS Token'), - 'GS50': (None, None, None, 'GS Token'), - 'GS51': (None, None, None, 'GS Token'), - 'GS52': (None, None, None, 'GS Token'), - 'GS53': (None, None, None, 'GS Token'), - 'GS54': (None, None, None, 'GS Token'), - 'GS55': (None, None, None, 'GS Token'), - 'GS56': (None, None, None, 'GS Token'), - 'GS57': (None, None, None, 'GS Token'), - 'GS58': (None, None, None, 'GS Token'), - 'GS59': (None, None, None, 'GS Token'), - 'GS60': (None, None, None, 'GS Token'), - 'GS61': (None, None, None, 'GS Token'), - 'GS62': (None, None, None, 'GS Token'), - 'GS63': (None, None, None, 'GS Token'), - 'GS64': (None, None, None, 'GS Token'), - 'GS65': (None, None, None, 'GS Token'), - 'GS66': (None, None, None, 'GS Token'), - 'GS67': (None, None, None, 'GS Token'), - 'GS68': (None, None, None, 'GS Token'), - 'GS69': (None, None, None, 'GS Token'), - 'GS70': (None, None, None, 'GS Token'), - 'GS71': (None, None, None, 'GS Token'), - 'GS72': (None, None, None, 'GS Token'), - 'GS73': (None, None, None, 'GS Token'), - 'GS74': (None, None, None, 'GS Token'), - 'GS75': (None, None, None, 'GS Token'), - 'GS76': (None, None, None, 'GS Token'), - 'GS77': (None, None, None, 'GS Token'), - 'GS78': (None, None, None, 'GS Token'), - 'GS79': (None, None, None, 'GS Token'), - 'GS80': (None, None, None, 'GS Token'), - 'GS81': (None, None, None, 'GS Token'), - 'GS82': (None, None, None, 'GS Token'), - 'GS83': (None, None, None, 'GS Token'), - 'GS84': (None, None, None, 'GS Token'), - 'GS85': (None, None, None, 'GS Token'), - 'GS86': (None, None, None, 'GS Token'), - 'GS87': (None, None, None, 'GS Token'), - 'GS88': (None, None, None, 'GS Token'), - 'GS89': (None, None, None, 'GS Token'), - 'GS90': (None, None, None, 'GS Token'), - 'GS91': (None, None, None, 'GS Token'), - 'GS92': (None, None, None, 'GS Token'), - 'GS93': (None, None, None, 'GS Token'), - 'GS94': (None, None, None, 'GS Token'), - 'GS95': (None, None, None, 'GS Token'), - 'GS96': (None, None, None, 'GS Token'), - 'GS97': (None, None, None, 'GS Token'), - 'GS98': (None, None, None, 'GS Token'), - 'GS99': (None, None, None, 'GS Token'), - 'GS100': (None, None, None, 'GS Token')} + 'Magic Bean Salesman': (None, None, None, 'Event', None), + 'King Zora Moves': (None, None, None, 'Event', None), + 'Ocarina of Time': (None, None, None, 'Event', None), + 'Master Sword Pedestal': (None, None, None, 'Event', None), + 'Epona': (None, None, None, 'Event', None), + 'Gerudo Fortress Carpenter Rescue': (None, None, None, 'Event', None), + 'Ganons Castle Forest Trial Clear': (None, None, None, 'Event', None), + 'Ganons Castle Fire Trial Clear': (None, None, None, 'Event', None), + 'Ganons Castle Water Trial Clear': (None, None, None, 'Event', None), + 'Ganons Castle Shadow Trial Clear': (None, None, None, 'Event', None), + 'Ganons Castle Spirit Trial Clear': (None, None, None, 'Event', None), + 'Ganons Castle Light Trial Clear': (None, None, None, 'Event', None), + 'Links Pocket': (0x34806FB, 0x34806FF, None, 'Boss', None), + 'Queen Gohma': (0xCA315F, 0x2079571, 0x6C, 'Boss', None), + 'King Dodongo': (0xCA30DF, 0x2223309, 0x6D, 'Boss', None), + 'Barinade': (0xCA36EB, 0x2113C19, 0x6E, 'Boss', None), + 'Phantom Ganon': (0xCA3D07, 0xD4ED79, 0x66, 'Boss', None), + 'Volvagia': (0xCA3D93, 0xD10135, 0x67, 'Boss', None), + 'Morpha': (0xCA3E1F, 0xD5A3A9, 0x68, 'Boss', None), + 'Twinrova': (0xCA3EB3, 0xD39FF1, 0x69, 'Boss', None), + 'Bongo Bongo': (0xCA3F43, 0xD13E19, 0x6A, 'Boss', None), + 'Ganon': (None, None, None, 'Boss', None), + 'GS1': (None, None, None, 'GS Token', None), + 'GS2': (None, None, None, 'GS Token', None), + 'GS3': (None, None, None, 'GS Token', None), + 'GS4': (None, None, None, 'GS Token', None), + 'GS5': (None, None, None, 'GS Token', None), + 'GS6': (None, None, None, 'GS Token', None), + 'GS7': (None, None, None, 'GS Token', None), + 'GS8': (None, None, None, 'GS Token', None), + 'GS9': (None, None, None, 'GS Token', None), + 'GS10': (None, None, None, 'GS Token', None), + 'GS11': (None, None, None, 'GS Token', None), + 'GS12': (None, None, None, 'GS Token', None), + 'GS13': (None, None, None, 'GS Token', None), + 'GS14': (None, None, None, 'GS Token', None), + 'GS15': (None, None, None, 'GS Token', None), + 'GS16': (None, None, None, 'GS Token', None), + 'GS17': (None, None, None, 'GS Token', None), + 'GS18': (None, None, None, 'GS Token', None), + 'GS19': (None, None, None, 'GS Token', None), + 'GS20': (None, None, None, 'GS Token', None), + 'GS21': (None, None, None, 'GS Token', None), + 'GS22': (None, None, None, 'GS Token', None), + 'GS23': (None, None, None, 'GS Token', None), + 'GS24': (None, None, None, 'GS Token', None), + 'GS25': (None, None, None, 'GS Token', None), + 'GS26': (None, None, None, 'GS Token', None), + 'GS27': (None, None, None, 'GS Token', None), + 'GS28': (None, None, None, 'GS Token', None), + 'GS29': (None, None, None, 'GS Token', None), + 'GS30': (None, None, None, 'GS Token', None), + 'GS31': (None, None, None, 'GS Token', None), + 'GS32': (None, None, None, 'GS Token', None), + 'GS33': (None, None, None, 'GS Token', None), + 'GS34': (None, None, None, 'GS Token', None), + 'GS35': (None, None, None, 'GS Token', None), + 'GS36': (None, None, None, 'GS Token', None), + 'GS37': (None, None, None, 'GS Token', None), + 'GS38': (None, None, None, 'GS Token', None), + 'GS39': (None, None, None, 'GS Token', None), + 'GS40': (None, None, None, 'GS Token', None), + 'GS41': (None, None, None, 'GS Token', None), + 'GS42': (None, None, None, 'GS Token', None), + 'GS43': (None, None, None, 'GS Token', None), + 'GS44': (None, None, None, 'GS Token', None), + 'GS45': (None, None, None, 'GS Token', None), + 'GS46': (None, None, None, 'GS Token', None), + 'GS47': (None, None, None, 'GS Token', None), + 'GS48': (None, None, None, 'GS Token', None), + 'GS49': (None, None, None, 'GS Token', None), + 'GS50': (None, None, None, 'GS Token', None), + 'GS51': (None, None, None, 'GS Token', None), + 'GS52': (None, None, None, 'GS Token', None), + 'GS53': (None, None, None, 'GS Token', None), + 'GS54': (None, None, None, 'GS Token', None), + 'GS55': (None, None, None, 'GS Token', None), + 'GS56': (None, None, None, 'GS Token', None), + 'GS57': (None, None, None, 'GS Token', None), + 'GS58': (None, None, None, 'GS Token', None), + 'GS59': (None, None, None, 'GS Token', None), + 'GS60': (None, None, None, 'GS Token', None), + 'GS61': (None, None, None, 'GS Token', None), + 'GS62': (None, None, None, 'GS Token', None), + 'GS63': (None, None, None, 'GS Token', None), + 'GS64': (None, None, None, 'GS Token', None), + 'GS65': (None, None, None, 'GS Token', None), + 'GS66': (None, None, None, 'GS Token', None), + 'GS67': (None, None, None, 'GS Token', None), + 'GS68': (None, None, None, 'GS Token', None), + 'GS69': (None, None, None, 'GS Token', None), + 'GS70': (None, None, None, 'GS Token', None), + 'GS71': (None, None, None, 'GS Token', None), + 'GS72': (None, None, None, 'GS Token', None), + 'GS73': (None, None, None, 'GS Token', None), + 'GS74': (None, None, None, 'GS Token', None), + 'GS75': (None, None, None, 'GS Token', None), + 'GS76': (None, None, None, 'GS Token', None), + 'GS77': (None, None, None, 'GS Token', None), + 'GS78': (None, None, None, 'GS Token', None), + 'GS79': (None, None, None, 'GS Token', None), + 'GS80': (None, None, None, 'GS Token', None), + 'GS81': (None, None, None, 'GS Token', None), + 'GS82': (None, None, None, 'GS Token', None), + 'GS83': (None, None, None, 'GS Token', None), + 'GS84': (None, None, None, 'GS Token', None), + 'GS85': (None, None, None, 'GS Token', None), + 'GS86': (None, None, None, 'GS Token', None), + 'GS87': (None, None, None, 'GS Token', None), + 'GS88': (None, None, None, 'GS Token', None), + 'GS89': (None, None, None, 'GS Token', None), + 'GS90': (None, None, None, 'GS Token', None), + 'GS91': (None, None, None, 'GS Token', None), + 'GS92': (None, None, None, 'GS Token', None), + 'GS93': (None, None, None, 'GS Token', None), + 'GS94': (None, None, None, 'GS Token', None), + 'GS95': (None, None, None, 'GS Token', None), + 'GS96': (None, None, None, 'GS Token', None), + 'GS97': (None, None, None, 'GS Token', None), + 'GS98': (None, None, None, 'GS Token', None), + 'GS99': (None, None, None, 'GS Token', None), + 'GS100': (None, None, None, 'GS Token', None)} From 7148b14538f33a979d0817a101a72aaa5f168d72 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 12:09:55 -0400 Subject: [PATCH 016/151] Add front-end support for extended items / overrides --- BaseClasses.py | 1 + ItemOverrides.py | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ Main.py | 8 ++++-- Rom.py | 7 +++++ 4 files changed, 87 insertions(+), 3 deletions(-) create mode 100755 ItemOverrides.py diff --git a/BaseClasses.py b/BaseClasses.py index 139f21f35..c83ac5e0f 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -496,6 +496,7 @@ def __init__(self, name='', address=None, address2=None, default=None, type='Che self.name = name self.parent_region = parent self.item = None + self.override_item = None self.address = address self.address2 = address2 self.default = default diff --git a/ItemOverrides.py b/ItemOverrides.py new file mode 100755 index 000000000..a9331bdf5 --- /dev/null +++ b/ItemOverrides.py @@ -0,0 +1,74 @@ +import itertools + +from Items import ItemFactory + + +def set_overrides(world): + filled = world.get_filled_locations() + by_scene = {} + for loc in filled: + locations = by_scene.get(loc.scene, []) + locations.append(loc) + by_scene[loc.scene] = locations + + for scene, locations in by_scene.items(): + base_items = list(valid_base_items) + used_items = [loc.item.name for loc in locations] + available_base_items = [item for item in base_items if item not in used_items] + for loc in locations: + if loc.item.index is None: + continue + + if loc.type == 'Grotto': + base_item = "Bombs (20)" + elif (0x89 <= loc.item.index <= 0x91) and (loc.scene == 0x3D or loc.name == "Zelda"): + # Temporary hack: Zelda and Great Fairies can't currently accept extended items, + # so if an extended bottle was placed there, replace it with milk. + loc.item = ItemFactory("Bottle with Milk") + loc.item.location = loc + continue + elif loc.item.index >= 0x80: + base_item = available_base_items.pop(0) + if not base_item: + raise RuntimeError('Ran out of base items to override') + else: + continue + + if (scene is None): + raise RuntimeError("Can't place extended item %s in location %s" % (loc.item.name, loc.name)) + loc.override_item = loc.item + loc.item = ItemFactory(base_item) + loc.item.location = loc + +def get_overrides(world): + filled = world.get_locations() + result = [(loc.scene, loc.item.index, loc.override_item.index) for loc in filled if loc.override_item] + result.sort() + return result + +valid_base_items = [ + "Hammer", + "Boomerang", + "Lens of Truth", + "Dins Fire", + "Farores Wind", + "Nayrus Love", + "Fire Arrows", + "Ice Arrows", + "Light Arrows", + "Bottle", + "Bottle with Letter", + "Bottle with Milk", + "Mirror Shield", + "Iron Boots", + "Hover Boots", + "Stone of Agony", + "Arrows (30)", + "Bombs (20)", + "Bombchus (20)", + "Pocket Egg", + "Cojiro", + "Odd Potion", + "Poachers Saw", + "Claim Check", +] diff --git a/Main.py b/Main.py index f4b875d8c..65b30c909 100644 --- a/Main.py +++ b/Main.py @@ -15,6 +15,7 @@ from Dungeons import create_dungeons, fill_dungeons_restrictive from Fill import distribute_items_restrictive from ItemList import generate_itempool +from ItemOverrides import set_overrides from Utils import output_path __version__ = '1.0.0' @@ -69,7 +70,11 @@ def main(args, seed=None): outfilebase = 'OoT_%s%s%s%s_%s' % (world.bridge, "-openforest" if world.open_forest else "", "-opendoor" if world.open_door_of_time else "", "-beatableonly" if world.check_beatable_only else "", world.seed) + if args.create_spoiler: + world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase)) + if not args.suppress_rom: + set_overrides(world) rom = LocalRom(args.rom) patch_rom(world, rom) rom.write_to_file(output_path('%s.z64' % outfilebase)) @@ -84,9 +89,6 @@ def main(args, seed=None): else: logger.info('OS not supported for compression') - if args.create_spoiler: - world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase)) - logger.info('Done. Enjoy.') logger.debug('Total Time: %s', time.clock() - start) diff --git a/Rom.py b/Rom.py index fbe0aef03..81ce72a70 100644 --- a/Rom.py +++ b/Rom.py @@ -9,6 +9,7 @@ from Hints import buildGossipHints, buildBossRewardHints from Utils import local_path from Items import ItemFactory, item_data +from ItemOverrides import get_overrides from TextArray import text_array class LocalRom(object): @@ -848,6 +849,12 @@ def patch_rom(world, rom): if secondaryaddress is not None: rom.write_bytes(secondaryaddress, [itemidhigh, itemidlow]) + # write item overrides + override_table = [] + for (scene, base_id, override_id) in get_overrides(world): + override_table += [scene, base_id, 0x00, override_id] + rom.write_bytes(0x3480000, override_table) + # patch fairy entrances for region in world.regions: for exit in region.exits: From 5d58b15ce2f3e0700bce010045d55405251336ba Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 12:40:50 -0400 Subject: [PATCH 017/151] Change all generic grotto prizes to 20 bombs, for easier overriding --- ASM/src/hacks.asm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 36e9308a4..7b02849dc 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -114,6 +114,10 @@ SW s0, 0x0118 (t9) .org 0xBE9BDC ; In memory: 0x803A4BCC ADDIU at, r0, 0x8383 ; Make branch impossible +; Replace all generic grotto prizes with 20 bombs +.org 0xE9A550 +.fill 8, 0x67 + ;================================================================================================== ; Menu hacks ;================================================================================================== From 52a2ee28b5d820f9fbaabd7dee2d0c788937e78c Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 15:44:38 -0400 Subject: [PATCH 018/151] Remove test entries from override table --- ASM/src/config.asm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ASM/src/config.asm b/ASM/src/config.asm index bb1fb1953..0220218d9 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -26,8 +26,4 @@ .area 0x200, 0 ITEM_OVERRIDES: -.byte 0x28, 0x6A, 0x00, 0x98 -.byte 0x28, 0x4B, 0x00, 0xA2 -.byte 0x28, 0x7B, 0x00, 0xAC -.byte 0x28, 0x4A, 0x00, 0xB5 .endarea From e756d03f067111138e38b75f5b168228e689362a Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 18 May 2018 15:47:07 -0400 Subject: [PATCH 019/151] Load ROM patched from base2current.json --- ASM/README.md | 2 ++ ASM/scripts/rom_diff.py | 30 ++++++++++++++++++++++++++++++ Rom.py | 7 +++++++ data/base2current.json | 1 + 4 files changed, 40 insertions(+) create mode 100644 ASM/scripts/rom_diff.py create mode 100644 data/base2current.json diff --git a/ASM/README.md b/ASM/README.md index cb17dba22..a78825d3e 100644 --- a/ASM/README.md +++ b/ASM/README.md @@ -1,3 +1,5 @@ - Download the armips assembler: - Put the ROM you want to patch at `roms/base.z64` - Run `armips src/build.asm`, which will create `roms/patched.z64` +- To update the front-end patch file, run: + ```python3 scripts/rom_diff.py roms/base.z64 roms/patched.z64 ../data/base2current.json``` diff --git a/ASM/scripts/rom_diff.py b/ASM/scripts/rom_diff.py new file mode 100644 index 000000000..2355b0b2d --- /dev/null +++ b/ASM/scripts/rom_diff.py @@ -0,0 +1,30 @@ +#!/usr/bin/env python3 + +import json +import sys + +if len(sys.argv) < 4: + raise RuntimeError("Usage: python3 rom_diff.py BASE_FILE COMPARISON_FILE OUTPUT_FILE") + +base_path = sys.argv[1] +compare_path = sys.argv[2] +output_path = sys.argv[3] + +with open(base_path, 'rb') as base_file: + base_data = base_file.read() +with open(compare_path, 'rb') as compare_file: + compare_data = compare_file.read() + +diffs = [] +run = [] +for i in range(0, len(base_data)): + if base_data[i] != compare_data[i]: + if run and run[-1][0] != i - 1: + diffs.append({ run[0][0]: [value for (_, value) in run] }) + run = [] + run.append((i, compare_data[i])) +if run: + diffs.append({ run[0][0]: [value for (_, value) in run] }) + +with open(output_path, 'w') as output_file: + json.dump(diffs, output_file) diff --git a/Rom.py b/Rom.py index 81ce72a70..43db58952 100644 --- a/Rom.py +++ b/Rom.py @@ -1,4 +1,5 @@ import io +import json import logging import os import platform @@ -67,6 +68,12 @@ def int32_as_bytes(value): return [value & 0xFF, (value >> 8) & 0xFF, (value >> 16) & 0xFF, (value >> 24) & 0xFF] def patch_rom(world, rom): + with open(local_path('data/base2current.json'), 'r') as stream: + patches = json.load(stream) + for patch in patches: + if isinstance(patch, dict): + for baseaddress, values in patch.items(): + rom.write_bytes(int(baseaddress), values) # Can always return to youth rom.write_byte(0xCB6844, 0x35) diff --git a/data/base2current.json b/data/base2current.json new file mode 100644 index 000000000..1ef6472bf --- /dev/null +++ b/data/base2current.json @@ -0,0 +1 @@ +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 2, 223]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 3, 156]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 3, 170, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 3, 177, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 3, 184, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 3, 163, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 148]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427412": [12, 16, 2, 199]}, {"12427480": [12, 16, 2, 131]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 135]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12491456": [12, 16, 2, 161]}, {"12491480": [12, 16, 2, 171]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050752": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 12, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 12, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 12, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 132, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 160, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 188]}, {"55050897": [255, 1, 67]}, {"55050901": [198, 21, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050913": [255, 1, 68]}, {"55050917": [198, 22, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050929": [255, 1, 69]}, {"55050933": [198, 23, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050945": [255, 1, 70]}, {"55050949": [198, 24, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050961": [255, 1, 71]}, {"55050965": [198, 25, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050977": [255, 1, 93]}, {"55050981": [198, 28, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050993": [255, 1, 122]}, {"55050997": [198, 29, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55051009": [255, 1, 249]}, {"55051013": [198, 30, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55051025": [255, 1, 151]}, {"55051029": [198, 32, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55051041": [255, 10, 199]}, {"55051045": [185, 1, 3, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051057": [255, 10, 199]}, {"55051061": [185, 1, 4, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051073": [255, 10, 199]}, {"55051077": [185, 1, 5, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051089": [255, 10, 199]}, {"55051093": [185, 1, 6, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051105": [255, 10, 199]}, {"55051109": [185, 1, 7, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051121": [255, 10, 199]}, {"55051125": [185, 1, 13, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051137": [255, 11, 103]}, {"55051141": [184, 2]}, {"55051144": [128, 64, 14, 44, 128, 64, 12, 164]}, {"55051153": [255, 11, 103]}, {"55051157": [184, 2, 1, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051169": [255, 11, 103]}, {"55051173": [184, 2, 2, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051185": [255, 11, 103]}, {"55051189": [184, 2, 3, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051201": [255, 11, 103]}, {"55051205": [184, 2, 4, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051217": [255, 11, 103]}, {"55051221": [184, 2, 5, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051233": [255, 11, 103]}, {"55051237": [184, 2, 6, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051249": [255, 11, 103]}, {"55051253": [184, 2, 7, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051265": [255, 11, 103]}, {"55051269": [184, 2, 8, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051281": [255, 11, 103]}, {"55051285": [184, 2, 9, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051297": [255, 28, 102]}, {"55051301": [200, 4]}, {"55051304": [128, 64, 14, 44, 128, 64, 12, 164]}, {"55051313": [255, 28, 102]}, {"55051317": [200, 4, 1, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051329": [255, 28, 102]}, {"55051333": [200, 4, 2, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051345": [255, 28, 102]}, {"55051349": [200, 4, 3, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051361": [255, 28, 102]}, {"55051365": [200, 4, 4, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051377": [255, 28, 102]}, {"55051381": [200, 4, 5, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051393": [255, 28, 102]}, {"55051397": [200, 4, 6, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051409": [255, 28, 102]}, {"55051413": [200, 4, 7, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051425": [255, 28, 102]}, {"55051429": [200, 4, 8, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051441": [255, 28, 102]}, {"55051445": [200, 4, 9, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051457": [255, 254, 96]}, {"55051461": [170, 3, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051473": [255, 254, 96]}, {"55051477": [170, 4, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051489": [255, 254, 96]}, {"55051493": [170, 5, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051505": [255, 254, 96]}, {"55051509": [170, 6, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051521": [255, 254, 96]}, {"55051525": [170, 7, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051537": [255, 254, 96]}, {"55051541": [170, 8, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051553": [255, 254, 96]}, {"55051557": [170, 11, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051569": [255, 254, 96]}, {"55051573": [170, 12, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051585": [255, 254, 96]}, {"55051589": [170, 13, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051601": [61, 67, 12]}, {"55051605": [248, 255, 255, 128, 64, 13, 224, 128, 64, 12, 164]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 166]}, {"55052815": [48, 132, 197]}, {"55052819": [4, 8, 16, 2, 139]}, {"55052828": [143, 185]}, {"55052831": [44, 135, 37]}, {"55052835": [4, 8, 16, 2, 139]}, {"55052844": [60, 10, 128, 64, 37, 74, 10]}, {"55052852": [149, 75]}, {"55052855": [4, 52, 1, 255, 255, 17, 97]}, {"55052863": [2]}, {"55052868": [53, 101]}, {"55052872": [3, 224]}, {"55052875": [8]}, {"55052880": [60, 8, 128, 64, 37, 8, 10]}, {"55052888": [129, 9]}, {"55052891": [2, 36, 1, 255, 255, 17, 33]}, {"55052899": [2]}, {"55052904": [53, 35]}, {"55052909": [3, 15, 195]}, {"55052913": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55052927": [8]}, {"55052932": [144, 69]}, {"55052935": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55052944": [145, 9]}, {"55052947": [3, 52, 1]}, {"55052951": [255, 17, 33]}, {"55052955": [2]}, {"55052960": [53, 37]}, {"55052964": [3, 224]}, {"55052967": [8]}, {"55052972": [143, 162]}, {"55052975": [36, 144, 69]}, {"55052980": [60, 8, 128, 64, 37, 8, 10]}, {"55052988": [149, 9]}, {"55052992": [52, 1, 255, 255, 17, 33]}, {"55052999": [19]}, {"55053004": [53, 37]}, {"55053008": [175, 164]}, {"55053012": [175, 165]}, {"55053015": [4, 175, 166]}, {"55053019": [8, 39, 189, 255, 232, 175, 191]}, {"55053027": [16, 141, 9]}, {"55053031": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053043": [6, 145, 6]}, {"55053047": [7, 1, 32, 248, 9]}, {"55053056": [143, 191]}, {"55053059": [16, 39, 189]}, {"55053063": [24, 143, 164]}, {"55053068": [143, 165]}, {"55053071": [4, 143, 166]}, {"55053075": [8, 3, 224]}, {"55053079": [8]}, {"55053084": [60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55053095": [44, 20, 65]}, {"55053099": [3, 129, 9]}, {"55053103": [156, 49, 41]}, {"55053107": [253, 161, 9]}, {"55053111": [156, 52, 1]}, {"55053115": [45, 20, 65]}, {"55053119": [3, 129, 9]}, {"55053123": [156, 49, 41]}, {"55053127": [251, 161, 9]}, {"55053131": [156, 52, 1]}, {"55053135": [41, 20, 65]}, {"55053139": [3, 129, 9]}, {"55053143": [157, 49, 41]}, {"55053147": [239, 161, 9]}, {"55053151": [157, 52, 1]}, {"55053155": [42, 20, 65]}, {"55053159": [3, 129, 9]}, {"55053163": [157, 49, 41]}, {"55053167": [223, 161, 9]}, {"55053171": [157, 3, 224]}, {"55053175": [8, 1, 248, 48, 33, 39, 189, 255, 224, 175, 176]}, {"55053187": [16, 175, 162]}, {"55053191": [20, 175, 191]}, {"55053195": [24, 160, 230, 4, 36, 16, 192]}, {"55053203": [62]}, {"55053209": [6, 15, 195]}, {"55053213": [193, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053232": [173, 40]}, {"55053236": [173, 40]}, {"55053239": [4, 173, 40]}, {"55053243": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053255": [164, 52, 1]}, {"55053259": [62, 21, 1]}, {"55053263": [6]}, {"55053268": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053283": [31, 37, 8]}, {"55053287": [112]}, {"55053289": [8, 66]}, {"55053292": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053307": [4, 149, 42]}, {"55053312": [17, 64]}, {"55053315": [30]}, {"55053320": [21, 72, 255, 251]}, {"55053328": [149, 48]}, {"55053331": [2, 54, 2]}, {"55053336": [52, 80]}, {"55053340": [38, 8, 255, 128, 5]}, {"55053347": [22]}, {"55053352": [60, 9, 128, 64, 37, 41, 2]}, {"55053361": [8, 65]}, {"55053364": [1, 40, 72, 33, 141, 42]}, {"55053371": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1, 64, 248, 9]}, {"55053388": [20, 80, 255, 242]}, {"55053396": [60, 10, 128, 64, 37, 74, 10]}, {"55053404": [141, 43]}, {"55053408": [173, 75]}, {"55053412": [141, 43]}, {"55053415": [4, 173, 75]}, {"55053419": [4, 141, 43]}, {"55053423": [8, 173, 75]}, {"55053427": [8, 16]}, {"55053431": [5]}, {"55053436": [4, 193]}, {"55053439": [2]}, {"55053445": [16, 128, 35, 160, 240, 4, 36, 143, 176]}, {"55053455": [16, 143, 162]}, {"55053459": [20, 143, 191]}, {"55053463": [24, 39, 189]}, {"55053467": [32, 3, 224]}, {"55053471": [8]}, {"55053476": [3, 224]}, {"55053479": [8, 54, 2]}, {"55053484": [144, 136]}, {"55053487": [125, 52, 1]}, {"55053491": [255, 17, 1]}, {"55053495": [2, 52, 2]}, {"55053499": [8, 52, 2]}, {"55053503": [9, 3, 224]}, {"55053507": [8]}, {"55053512": [144, 136]}, {"55053515": [163, 49, 8]}, {"55053519": [192, 17]}, {"55053523": [5, 52, 2]}, {"55053527": [84, 52, 1]}, {"55053531": [64, 17, 1]}, {"55053535": [2, 52, 2]}, {"55053539": [53, 52, 2]}, {"55053543": [54, 3, 224]}, {"55053547": [8]}, {"55053552": [144, 136]}, {"55053555": [163, 49, 8]}, {"55053559": [24, 17]}, {"55053563": [5, 52, 2]}, {"55053567": [50, 52, 1]}, {"55053571": [8, 17, 1]}, {"55053575": [2, 52, 2]}, {"55053579": [51, 52, 2]}, {"55053583": [52, 3, 224]}, {"55053587": [8]}, {"55053592": [144, 136]}, {"55053595": [163, 49, 8]}, {"55053599": [3, 17]}, {"55053603": [5, 52, 2]}, {"55053607": [4, 52, 1]}, {"55053611": [1, 17, 1]}, {"55053615": [2, 52, 2]}, {"55053619": [48, 52, 2]}, {"55053623": [49, 3, 224]}, {"55053627": [8]}, {"55053632": [144, 136]}, {"55053635": [162, 49, 8]}, {"55053639": [192, 17]}, {"55053643": [5, 52, 2]}, {"55053647": [5, 52, 1]}, {"55053651": [64, 17, 1]}, {"55053655": [2, 52, 2]}, {"55053659": [96, 52, 2]}, {"55053663": [123, 3, 224]}, {"55053667": [8]}, {"55053672": [144, 136]}, {"55053675": [162, 49, 8]}, {"55053679": [48, 17]}, {"55053683": [2, 52, 2]}, {"55053687": [69, 52, 2]}, {"55053691": [70, 3, 224]}, {"55053695": [8]}, {"55053700": [144, 136]}, {"55053703": [162, 49, 8]}, {"55053707": [6, 17]}, {"55053711": [2, 52, 2]}, {"55053715": [55, 52, 2]}, {"55053719": [56, 3, 224]}, {"55053723": [8]}, {"55053728": [144, 136]}, {"55053731": [161, 49, 8]}, {"55053735": [48, 17]}, {"55053739": [2, 52, 2]}, {"55053743": [121, 52, 2]}, {"55053747": [122, 3, 224]}, {"55053751": [8]}, {"55053756": [144, 136]}, {"55053759": [161, 49, 8]}, {"55053763": [6, 17]}, {"55053767": [2, 52, 2]}, {"55053771": [119, 52, 2]}, {"55053775": [120, 3, 224]}, {"55053779": [8]}, {"55053784": [3, 224]}, {"55053787": [8]}, {"55053792": [52, 8]}, {"55053795": [1, 160, 136]}, {"55053799": [62, 3, 224]}, {"55053803": [8]}, {"55053808": [36, 136]}, {"55053811": [134, 36, 9, 255, 255, 37, 41]}, {"55053819": [1, 52, 1]}, {"55053823": [3]}, {"55053825": [41, 8, 42, 20, 32]}, {"55053831": [7]}, {"55053836": [1, 9, 80, 33, 145, 75]}, {"55053844": [52, 1]}, {"55053847": [255, 21, 97, 255, 247]}, {"55053856": [161, 69]}, {"55053860": [3, 224]}, {"55053863": [8]}, {"55053868": [36, 136]}, {"55053871": [168, 1, 6, 64, 33, 145, 9]}, {"55053880": [1, 37, 72, 37, 161, 9]}, {"55053888": [3, 224]}, {"55053891": [8]}, {"55053896": [36, 136]}, {"55053899": [188, 1, 5, 64, 33, 129, 9]}, {"55053908": [5, 33]}, {"55053911": [2]}, {"55053916": [52, 9]}, {"55053920": [37, 41]}, {"55053923": [1, 161, 9]}, {"55053928": [3, 224]}, {"55053931": [8]}, {"55053936": [141, 1]}, {"55053939": [4, 16, 32]}, {"55053943": [3]}, {"55053948": [145, 1]}, {"55053951": [104, 161, 1]}, {"55053955": [64, 3, 224]}, {"55053959": [8, 161, 14]}, {"55053963": [104, 147, 25]}, {"55053967": [116, 36, 1]}, {"55053971": [255, 23, 33]}, {"55053975": [2]}, {"55053980": [36, 25]}, {"55053983": [44, 3, 224]}, {"55053987": [8, 167, 185]}, {"55053991": [154, 147, 44]}, {"55053995": [116, 36, 1]}, {"55053999": [255, 21, 129]}, {"55054003": [2]}, {"55054008": [36, 12]}, {"55054011": [44, 3, 224]}, {"55054015": [8]}, {"55054020": [145, 174]}, {"55054023": [116, 36, 1]}, {"55054027": [255, 21, 193]}, {"55054031": [2]}, {"55054036": [36, 14]}, {"55054039": [44, 3, 224]}, {"55054043": [8, 167, 174]}, {"55054047": [154, 145, 207]}, {"55054051": [116, 36, 1]}, {"55054055": [255, 21, 225]}, {"55054059": [2]}, {"55054064": [36, 15]}, {"55054067": [44, 3, 224]}, {"55054071": [8, 167, 175]}, {"55054075": [154]}] \ No newline at end of file From 73524ed903009b1acb12e5d12a0b7060b10c3e49 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sun, 20 May 2018 21:07:05 -0400 Subject: [PATCH 020/151] Small note update --- ASM/notes/notes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ASM/notes/notes.txt b/ASM/notes/notes.txt index 2a634eb32..efc28faef 100755 --- a/ASM/notes/notes.txt +++ b/ASM/notes/notes.txt @@ -7,7 +7,7 @@ +0x00A4 = current scene number (2 bytes) 0x801DAA30 = player instance - +0x0424 = item to be obtained (set negative by chests) + +0x0424 = item to be obtained (set negative by chests) (801DAE54) gets written @ 0x80022CD0 0x802190AC = Chest info as stored in ROM From 80c377196d4026ba83acfa5081d487c24230162e Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sun, 20 May 2018 21:07:26 -0400 Subject: [PATCH 021/151] Remove useless list copy --- ItemOverrides.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ItemOverrides.py b/ItemOverrides.py index a9331bdf5..5b667be2b 100755 --- a/ItemOverrides.py +++ b/ItemOverrides.py @@ -12,9 +12,8 @@ def set_overrides(world): by_scene[loc.scene] = locations for scene, locations in by_scene.items(): - base_items = list(valid_base_items) used_items = [loc.item.name for loc in locations] - available_base_items = [item for item in base_items if item not in used_items] + available_base_items = [item for item in valid_base_items if item not in used_items] for loc in locations: if loc.item.index is None: continue From b5fe652e5ed250450ed62ab31ac33820f90a23c7 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sun, 20 May 2018 21:11:04 -0400 Subject: [PATCH 022/151] Style changes --- ASM/src/constants.asm | 1 + ASM/src/fixes.asm | 18 +- ASM/src/hacks.asm | 195 ++++++------ ASM/src/item_data.asm | 108 +++---- ASM/src/items.asm | 694 +++++++++++++++++++++--------------------- ASM/src/menu.asm | 43 ++- 6 files changed, 545 insertions(+), 514 deletions(-) diff --git a/ASM/src/constants.asm b/ASM/src/constants.asm index f57c3a9bf..d94f60474 100755 --- a/ASM/src/constants.asm +++ b/ASM/src/constants.asm @@ -1,3 +1,4 @@ ; Pointers to game state .definelabel SAVE_CONTEXT, 0x8011A5D0 .definelabel GLOBAL_CONTEXT, 0x801C84A0 +.definelabel PLAYER_ACTOR, 0x801DAA30 diff --git a/ASM/src/fixes.asm b/ASM/src/fixes.asm index 8806dd8ad..659b7d34b 100755 --- a/ASM/src/fixes.asm +++ b/ASM/src/fixes.asm @@ -1,10 +1,10 @@ -Save_Child_B_Equip: -; t0 = save context -LW at, 0x04 (t0) -BEQZ at, @@return ; Only do this as child -NOP -LBU at, 0x68 (t0) ; Load current B equip -SB at, 0x40 (t0) ; Save B equip, will be loaded on next adult -> child transition +save_child_b_equip: + ; t0 = save context + lw at, 0x04 (t0) + beqz at, @@return ; Only do this as child + nop + lbu at, 0x68 (t0) ; Load current B equip + sb at, 0x40 (t0) ; Save B equip, will be loaded on next adult -> child transition @@return: -JR ra -SB t6, 0x68 (t0) ; Displaced code + jr ra + sb t6, 0x68 (t0) ; Displaced code diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 7b02849dc..ce3c31bb2 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -4,120 +4,139 @@ ; Child -> Adult: Don't save hard-coded 0x3B (Kokiri Sword) as child's B equip ; Replaces: -; SB a0, 0x0040 (v1) +; sb a0, 0x0040 (v1) .org 0xAE57A8 ; In memory: 0x8006F848 -NOP + nop ; Adult -> Child: Don't skip restoring child's B equip if 0xFF is the saved value ; Replaces: -; ADDIU V1, R0, 0x00FF +; addiu v1, r0, 0x00FF .org 0xAE58F4 ; In memory: 0x8006F994 -NOP + nop ; Child -> Adult: Save the child's B equip before it gets overwritten ; Replaces: -; SB t6, 0x0068 (t0) -; LW a0, 0x0030 (sp) +; sb t6, 0x0068 (t0) +; lw a0, 0x0030 (sp) .org 0xAE5F74 ; In memory: 0x80070014 -JAL Save_Child_B_Equip -LW a0, 0x0030 (sp) + jal save_child_b_equip + lw a0, 0x0030 (sp) ; Prevent Kokiri Sword from being added to inventory on game load ; Replaces: -; SH t9, 0x009C (v0) +; sh t9, 0x009C (v0) .org 0xBAED6C ; In memory: 0x803B2B6C -NOP + nop ;================================================================================================== -; Item hacks +; Extended items ;================================================================================================== ; Runs when storing the pending item to the player instance ; Replaces: -; SB a2, 0x0424 (a3) -; SW a0, 0x0428 (a3) +; sb a2, 0x0424 (a3) +; sw a0, 0x0428 (a3) .org 0xA98C30 ; In memory: 0x80022CD0 -JAL Store_Item_Data -SW a0, 0x0428 (a3) + jal store_item_data_hook + sw a0, 0x0428 (a3) ; Override object ID (NPCs) ; Replaces: -; LW a2, 0x0030 (sp) -; OR a0, s0, r0 -; JAL ... -; LH a1, 0x0004 (a2) +; lw a2, 0x0030 (sp) +; or a0, s0, r0 +; jal ... +; lh a1, 0x0004 (a2) .org 0xBDA0D8 ; In memory: 0x803950C8 -JAL Override_Object_NPC -OR a0, s0, r0 + jal override_object_npc + or a0, s0, r0 .skip 4 -NOP + nop ; Override object ID (Chests) ; Replaces: -; LW t9, 0x002C (sp) -; OR a0, s0, r0 -; JAL ... -; LH a1, 0x0004 (t9) +; lw t9, 0x002C (sp) +; or a0, s0, r0 +; jal ... +; lh a1, 0x0004 (t9) .org 0xBDA264 ; In memory: 0x80395254 -JAL Override_Object_Chest -OR a0, s0, r0 + jal override_object_chest + or a0, s0, r0 .skip 4 -NOP + nop ; Override graphic ID ; Replaces: -; BLTZ v1, A -; SUBU t0, r0, v1 -; JR ra -; SB v1, 0x0852 (a0) -; A: SB t0, 0x0852 (a0) -; JR ra +; bltz v1, A +; subu t0, r0, v1 +; jr ra +; sb v1, 0x0852 (a0) +; A: +; sb t0, 0x0852 (a0) +; jr ra .org 0xBCECBC ; In memory: 0x80389CAC -J Override_Graphic -NOP -NOP -NOP -NOP -NOP + j override_graphic + nop + nop + nop + nop + nop ; Override text ID ; Replaces: -; LBU a1, 0x03 (v0) -; SW a3, 0x0028 (sp) +; lbu a1, 0x03 (v0) +; sw a3, 0x0028 (sp) .org 0xBE9AC0 ; In memory: 0x803A4AB0 -JAL Override_Text -SW a3, 0x0028 (sp) + jal override_text + sw a3, 0x0028 (sp) ; Override action ID ; Replaces: -; LW v0, 0x0024 (sp) -; LW a0, 0x0028 (sp) -; JAL 0x8006FDCC -; LBU a1, 0x0000 (v0) +; lw v0, 0x0024 (sp) +; lw a0, 0x0028 (sp) +; jal 0x8006FDCC +; lbu a1, 0x0000 (v0) .org 0xBE9AD8 ; In memory: 0x803A4AC8 -JAL Override_Action -LW a0, 0x0028 (sp) + jal override_action + lw a0, 0x0028 (sp) .skip 4 -NOP + nop ; Inventory fix ; Replaces: -; ADDU A2, T7, T8 -; SW s0, 0x0118 (t9) +; addu a2, t7, t8 +; sw s0, 0x0118 (t9) .org 0xBDA094 ; In memory: 0x80395084 -JAL Inventory_Fix -SW s0, 0x0118 (t9) + jal inventory_fix + sw s0, 0x0118 (t9) ; Prevent Silver Gauntlets warp ; Replaces: -; ADDIU at, r0, 0x0035 +; addiu at, r0, 0x0035 .org 0xBE9BDC ; In memory: 0x803A4BCC -ADDIU at, r0, 0x8383 ; Make branch impossible + addiu at, r0, 0x8383 ; Make branch impossible ; Replace all generic grotto prizes with 20 bombs .org 0xE9A550 .fill 8, 0x67 +;================================================================================================== +; Special item sources +;================================================================================================== + +; Replaces: +; sw r0, 0x0428 (s0) +; sw r0, 0x0118 (v1) +.org 0xBCDD6C ; In memory: 0x80388D5C + jal prevent_item_actor_clear + sw r0, 0x0118 (v1) + +; Replaces: +; sw r0, 0x0428 (s0) +; sh t0, 0x0426 (s0) +.org 0xBE5730 ; In memory: 0x803A0720 + jal prevent_item_actor_clear + sh t0, 0x0426 (s0) + ;================================================================================================== ; Menu hacks ;================================================================================================== @@ -137,58 +156,58 @@ ADDIU at, r0, 0x8383 ; Make branch impossible ; Left movement check ; Replaces: -; BEQ S4, T5, 0x8038F2B4 -; NOP +; beq s4, t5, 0x8038F2B4 +; nop .org 0xBB77B4 ; In memory: 0x8038F134 -NOP -NOP + nop + nop ; Right movement check AND an immediate description update ; Replaces: -; LBU T4, 0x0074 (T9) -; BEQ S4, T4, 0x8038F2B4 -; NOP +; lbu t4, 0x0074 (t9) +; beq s4, t4, 0x8038F2B4 +; nop .org 0xBB7890 ; In memory: 0x8038F210 -JAL ItemMenu_Description_ID_Immediate1 -NOP -NOP + jal item_menu_description_id_immediate_1 + nop + nop ; Immediate description update ; Replaces: -; LBU T6, 0x0074 (T5) -; SH T6, 0x009A (SP) +; lbu t6, 0x0074 (t5) +; sh t6, 0x009A (sp) .org 0xBB7950 ; In memory: 0x8038F2D0 -JAL ItemMenu_Description_ID_Immediate2 -NOP + jal item_menu_description_id_immediate_2 + nop ; Upward movement check ; Replaces: -; BEQ S4, T4, 0x8038F598 -; NOP +; beq s4, t4, 0x8038F598 +; nop .org 0xBB7BA0 ; In memory: 0x8038F520 -NOP -NOP + nop + nop ; Downward movement check ; Replaces: -; BEQ S4, T4, 0x8038F598 -; NOP +; beq s4, t4, 0x8038F598 +; nop .org 0xBB7BFC ; In memory: 0x8038F57C -NOP -NOP + nop + nop ; Immediate description update ; Replaces: -; LBU T7, 0x0074 (T6) -; SH T7, 0x009A (SP) +; lbu t7, 0x0074 (t6) +; sh t7, 0x009A (sp) .org 0xBB7C3C ; In memory: 0x8038F5BC -JAL ItemMenu_Description_ID_Immediate3 -NOP + jal item_menu_description_id_immediate_3 + nop ; Periodic description update ; Replaces: -; LBU T9, 0x0074 (T8) -; SH T9, 0x009A (SP) +; lbu t9, 0x0074 (t8) +; sh t9, 0x009A (sp) .org 0xBB7C58 ; In memory: 0x8038F5D8 -JAL ItemMenu_Description_ID_Periodic -NOP \ No newline at end of file + jal item_menu_description_id_periodic + nop \ No newline at end of file diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index 365d2be0e..c8f6bc8e6 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -32,63 +32,63 @@ ITEM_TABLE: ; AAAA GG TT OOOO -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Hookshot_Upgrade, No_Effect, 0xFF, 0xFF ; 0x80 = Progressive Hookshot -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Strength_Upgrade, No_Effect, 0xFF, 0xFF ; 0x81 = Progressive Strength -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Bomb_Bag_Upgrade, No_Effect, 0xFF, 0xFF ; 0x82 = Progressive Bomb Bag -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Bow_Upgrade, No_Effect, 0xFF, 0xFF ; 0x83 = Progressive Bow -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Slingshot_Upgrade, No_Effect, 0xFF, 0xFF ; 0x84 = Progressive Slingshot -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Wallet_Upgrade, No_Effect, 0xFF, 0xFF ; 0x85 = Progressive Wallet -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Scale_Upgrade, No_Effect, 0xFF, 0xFF ; 0x86 = Progressive Scale -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Nut_Upgrade, No_Effect, 0xFF, 0xFF ; 0x87 = Progressive Nut Capacity -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, Stick_Upgrade, No_Effect, 0xFF, 0xFF ; 0x88 = Progressive Stick Capacity +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, hookshot_upgrade, no_effect, 0xFF, 0xFF ; 0x80 = Progressive Hookshot +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, strength_upgrade, no_effect, 0xFF, 0xFF ; 0x81 = Progressive Strength +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, bomb_bag_upgrade, no_effect, 0xFF, 0xFF ; 0x82 = Progressive Bomb Bag +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, bow_upgrade, no_effect, 0xFF, 0xFF ; 0x83 = Progressive Bow +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, slingshot_upgrade, no_effect, 0xFF, 0xFF ; 0x84 = Progressive Slingshot +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, wallet_upgrade, no_effect, 0xFF, 0xFF ; 0x85 = Progressive Wallet +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, scale_upgrade, no_effect, 0xFF, 0xFF ; 0x86 = Progressive Scale +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, nut_upgrade, no_effect, 0xFF, 0xFF ; 0x87 = Progressive Nut Capacity +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, stick_upgrade, no_effect, 0xFF, 0xFF ; 0x88 = Progressive Stick Capacity -Item_Row 0x00FF, 0x01, 0x43, 0x00C6, No_Upgrade, Give_Bottle, 0x15, 0xFF ; 0x89 = Bottle with Red Potion -Item_Row 0x00FF, 0x01, 0x44, 0x00C6, No_Upgrade, Give_Bottle, 0x16, 0xFF ; 0x8A = Bottle with Green Potion -Item_Row 0x00FF, 0x01, 0x45, 0x00C6, No_Upgrade, Give_Bottle, 0x17, 0xFF ; 0x8B = Bottle with Blue Potion -Item_Row 0x00FF, 0x01, 0x46, 0x00C6, No_Upgrade, Give_Bottle, 0x18, 0xFF ; 0x8C = Bottle with Fairy -Item_Row 0x00FF, 0x01, 0x47, 0x00C6, No_Upgrade, Give_Bottle, 0x19, 0xFF ; 0x8D = Bottle with Fish -Item_Row 0x00FF, 0x01, 0x5D, 0x00C6, No_Upgrade, Give_Bottle, 0x1C, 0xFF ; 0x8E = Bottle with Blue Fire -Item_Row 0x00FF, 0x01, 0x7A, 0x00C6, No_Upgrade, Give_Bottle, 0x1D, 0xFF ; 0x8F = Bottle with Bugs -Item_Row 0x00FF, 0x01, 0xF9, 0x00C6, No_Upgrade, Give_Bottle, 0x1E, 0xFF ; 0x90 = Bottle with Big Poe -Item_Row 0x00FF, 0x01, 0x97, 0x00C6, No_Upgrade, Give_Bottle, 0x20, 0xFF ; 0x91 = Bottle with Poe +Item_Row 0x00FF, 0x01, 0x43, 0x00C6, no_upgrade, give_bottle, 0x15, 0xFF ; 0x89 = Bottle with Red Potion +Item_Row 0x00FF, 0x01, 0x44, 0x00C6, no_upgrade, give_bottle, 0x16, 0xFF ; 0x8A = Bottle with Green Potion +Item_Row 0x00FF, 0x01, 0x45, 0x00C6, no_upgrade, give_bottle, 0x17, 0xFF ; 0x8B = Bottle with Blue Potion +Item_Row 0x00FF, 0x01, 0x46, 0x00C6, no_upgrade, give_bottle, 0x18, 0xFF ; 0x8C = Bottle with Fairy +Item_Row 0x00FF, 0x01, 0x47, 0x00C6, no_upgrade, give_bottle, 0x19, 0xFF ; 0x8D = Bottle with Fish +Item_Row 0x00FF, 0x01, 0x5D, 0x00C6, no_upgrade, give_bottle, 0x1C, 0xFF ; 0x8E = Bottle with Blue Fire +Item_Row 0x00FF, 0x01, 0x7A, 0x00C6, no_upgrade, give_bottle, 0x1D, 0xFF ; 0x8F = Bottle with Bugs +Item_Row 0x00FF, 0x01, 0xF9, 0x00C6, no_upgrade, give_bottle, 0x1E, 0xFF ; 0x90 = Bottle with Big Poe +Item_Row 0x00FF, 0x01, 0x97, 0x00C6, no_upgrade, give_bottle, 0x20, 0xFF ; 0x91 = Bottle with Poe -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, FOREST ; 0x92 = Forest Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, FIRE ; 0x93 = Fire Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, WATER ; 0x94 = Water Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, SPIRIT ; 0x95 = Spirit Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, SHADOW ; 0x96 = Shadow Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, No_Upgrade, Give_Dungeon_Item, 0x01, CASTLE ; 0x97 = Ganon's Castle Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FOREST ; 0x92 = Forest Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FIRE ; 0x93 = Fire Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, WATER ; 0x94 = Water Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SPIRIT ; 0x95 = Spirit Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SHADOW ; 0x96 = Shadow Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, CASTLE ; 0x97 = Ganon's Castle Boss Key -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, DEKU ; 0x98 = Deku Tree Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, DODONGO ; 0x99 = Dodongo's Cavern Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, JABU ; 0x9A = Jabu Jabu Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, FOREST ; 0x9B = Forest Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, FIRE ; 0x9C = Fire Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, WATER ; 0x9D = Water Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, SPIRIT ; 0x9E = Spirit Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, SHADOW ; 0x9F = Shadow Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, BOTW ; 0xA0 = Bottom of the Well Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, No_Upgrade, Give_Dungeon_Item, 0x02, ICE ; 0xA1 = Ice Cavern Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DEKU ; 0x98 = Deku Tree Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DODONGO ; 0x99 = Dodongo's Cavern Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, JABU ; 0x9A = Jabu Jabu Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FOREST ; 0x9B = Forest Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FIRE ; 0x9C = Fire Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, WATER ; 0x9D = Water Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SPIRIT ; 0x9E = Spirit Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SHADOW ; 0x9F = Shadow Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, BOTW ; 0xA0 = Bottom of the Well Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, ICE ; 0xA1 = Ice Cavern Compass -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, DEKU ; 0xA2 = Deku Tree Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, DODONGO ; 0xA3 = Dodongo's Cavern Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, JABU ; 0xA4 = Jabu Jabu Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, FOREST ; 0xA5 = Forest Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, FIRE ; 0xA6 = Fire Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, WATER ; 0xA7 = Water Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SPIRIT ; 0xA8 = Spirit Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, SHADOW ; 0xA9 = Shadow Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, BOTW ; 0xAA = Bottom of the Well Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, No_Upgrade, Give_Dungeon_Item, 0x04, ICE ; 0xAB = Ice Cavern Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DEKU ; 0xA2 = Deku Tree Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DODONGO ; 0xA3 = Dodongo's Cavern Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, JABU ; 0xA4 = Jabu Jabu Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FOREST ; 0xA5 = Forest Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FIRE ; 0xA6 = Fire Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, WATER ; 0xA7 = Water Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SPIRIT ; 0xA8 = Spirit Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SHADOW ; 0xA9 = Shadow Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, BOTW ; 0xAA = Bottom of the Well Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, ICE ; 0xAB = Ice Cavern Map -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FOREST, 0xFF ; 0xAC = Forest Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FIRE, 0xFF ; 0xAD = Fire Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, WATER, 0xFF ; 0xAE = Water Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, SPIRIT, 0xFF ; 0xAF = Spirit Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, SHADOW, 0xFF ; 0xB0 = Shadow Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, BOTW, 0xFF ; 0xB1 = Bottom of the Well Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, GTG, 0xFF ; 0xB2 = Gerudo Training Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, FORT, 0xFF ; 0xB3 = Gerudo Fortress Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, No_Upgrade, Give_Small_Key, CASTLE, 0xFF ; 0xB4 = Ganon's Castle Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FOREST, 0xFF ; 0xAC = Forest Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FIRE, 0xFF ; 0xAD = Fire Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, WATER, 0xFF ; 0xAE = Water Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SPIRIT, 0xFF ; 0xAF = Spirit Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SHADOW, 0xFF ; 0xB0 = Shadow Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, BOTW, 0xFF ; 0xB1 = Bottom of the Well Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, GTG, 0xFF ; 0xB2 = Gerudo Training Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FORT, 0xFF ; 0xB3 = Gerudo Fortress Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, CASTLE, 0xFF ; 0xB4 = Ganon's Castle Small Key -Item_Row 0x003D, 0x43, 0x0C, 0x00F8, No_Upgrade, Give_Biggoron_Sword, 0xFF, 0xFF ; 0xB5 = Biggoron Sword +Item_Row 0x003D, 0x43, 0x0C, 0x00F8, no_upgrade, give_biggoron_sword, 0xFF, 0xFF ; 0xB5 = Biggoron Sword diff --git a/ASM/src/items.asm b/ASM/src/items.asm index b0b7c28f1..a55e8d4f4 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -2,493 +2,505 @@ ; Item code ;================================================================================================== -Override_Object_NPC: -LW a2, 0x0030 (sp) -LH a1, 0x0004 (a2) -J Override_Object -NOP +prevent_item_actor_clear: + addiu sp, sp, -0x08 + sw t0, 0x00 (sp) + sw t1, 0x04 (sp) -Override_Object_Chest: -LW t9, 0x002C (sp) -LH a1, 0x0004 (t9) -J Override_Object -NOP - -Override_Object: - -; Load extended Object ID -LI t2, CURRENT_ITEM_DATA -LHU t3, 0x04 (t2) - -BEQ t3, 0xFFFF, @@return -NOP - -; Override Object ID -ORI a1, t3, 0 + li t0, PLAYER_ACTOR + lw t1, 0x0428 (t0) + beq t0, t1, @@return + nop + sw r0, 0x0428 (t0) @@return: -JR ra -NOP + lw t0, 0x00 (sp) + lw t1, 0x04 (sp) + addiu sp, sp, 0x08 + jr ra + nop ;================================================================================================== -Override_Graphic: +override_object_npc: + lw a2, 0x0030 (sp) + lh a1, 0x0004 (a2) + j override_object + nop -; Load extended Graphic ID -LI t0, CURRENT_ITEM_DATA -LB t1, 0x02 (t0) +override_object_chest: + lw t9, 0x002C (sp) + lh a1, 0x0004 (t9) + j override_object + nop -BEQ t1, -1, @@return -NOP +override_object: + ; Load extended Object ID + li t2, current_item_data + lhu t3, 0x04 (t2) + beq t3, 0xFFFF, @@return + nop -; Override Graphic ID -ORI v1, t1, 0 + ; override object id + ori a1, t3, 0 @@return: -; Displaced code -ABS t0, v1 -SB t0, 0x0852 (a0) -JR ra -NOP + jr ra + nop ;================================================================================================== -Override_Text: +override_graphic: + ; Load extended Graphic ID + li t0, current_item_data + lb t1, 0x02 (t0) + beq t1, -1, @@return + nop -LBU a1, 0x03 (v0) ; Displaced code - -; Load extended Text ID -LI t0, CURRENT_ITEM_DATA -LBU t1, 0x03 (t0) - -BEQ t1, 0xFF, @@return -NOP - -; Override Text ID -ORI a1, t1, 0 + ; Override Graphic ID + ori v1, t1, 0 @@return: -JR ra -NOP + ; Displaced code + abs t0, v1 + sb t0, 0x0852 (a0) + jr ra + nop ;================================================================================================== -Override_Action: - -; Displaced code -LW v0, 0x24 (sp) -LBU a1, 0x0000 (v0) +override_text: + lbu a1, 0x03 (v0) ; Displaced code -; Load extended Action ID -LI t0, CURRENT_ITEM_DATA -LHU t1, 0x00 (t0) + ; Load extended Text ID + li t0, CURRENT_ITEM_DATA + lbu t1, 0x03 (t0) + beq t1, 0xFF, @@return + nop -BEQ t1, 0xFFFF, @@return -NOP + ; Override Text ID + ori a1, t1, 0 -; Override Action ID -ORI a1, t1, 0 - - -SW a0, 0x00 (sp) -SW a1, 0x04 (sp) -SW a2, 0x08 (sp) -ADDIU sp, sp, -0x18 -SW ra, 0x10 (sp) +@@return: + jr ra + nop -; Run effect function -; Conventions for effect functions: -; - They receive a pointer to the save context in a0 -; - They receive their arguments in a1 and a2 -LW t1, 0x08 (t0) ; t1 = effect function -LI a0, SAVE_CONTEXT -LBU a1, 0x06 (t0) -LBU a2, 0x07 (t0) -JALR t1 -NOP +;================================================================================================== -LW ra, 0x10 (sp) -ADDIU sp, sp, 0x18 -LW a0, 0x00 (sp) -LW a1, 0x04 (sp) -LW a2, 0x08 (sp) +override_action: + ; Displaced code + lw v0, 0x24 (sp) + lbu a1, 0x0000 (v0) + + ; Load extended Action ID + li t0, CURRENT_ITEM_DATA + lhu t1, 0x00 (t0) + beq t1, 0xFFFF, @@return + nop + + ; Override Action ID + ori a1, t1, 0 + + sw a0, 0x00 (sp) + sw a1, 0x04 (sp) + sw a2, 0x08 (sp) + addiu sp, sp, -0x18 + sw ra, 0x10 (sp) + + ; Run effect function + ; Conventions for effect functions: + ; - They receive a pointer to the save context in a0 + ; - They receive their arguments in a1 and a2 + lw t1, 0x08 (t0) ; t1 = effect function + li a0, SAVE_CONTEXT + lbu a1, 0x06 (t0) + lbu a2, 0x07 (t0) + jalr t1 + nop + + lw ra, 0x10 (sp) + addiu sp, sp, 0x18 + lw a0, 0x00 (sp) + lw a1, 0x04 (sp) + lw a2, 0x08 (sp) @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== -Inventory_Fix: - -LI t0, SAVE_CONTEXT -; v0 = item ID - ; Take away tunics/shields that are about to be received, to avoid breaking NPCs who give them -BNE v0, 0x2C, @@not_goron_tunic -LB t1, 0x9C (t0) -ANDI t1, t1, 0xFD -SB t1, 0x9C (t0) -@@not_goron_tunic: +inventory_fix: + ; v0 = item ID + li t0, SAVE_CONTEXT -BNE v0, 0x2D, @@not_zora_tunic -LB t1, 0x9C (t0) -ANDI t1, t1, 0xFB -SB t1, 0x9C (t0) + bne v0, 0x2C, @@not_goron_tunic + lb t1, 0x9C (t0) + andi t1, t1, 0xFD + sb t1, 0x9C (t0) +@@not_goron_tunic: + bne v0, 0x2D, @@not_zora_tunic + lb t1, 0x9C (t0) + andi t1, t1, 0xFB + sb t1, 0x9C (t0) @@not_zora_tunic: - -BNE v0, 0x29, @@not_deku_shield -LB t1, 0x9D (t0) -ANDI t1, t1, 0xEF -SB t1, 0x9D (t0) + bne v0, 0x29, @@not_deku_shield + lb t1, 0x9D (t0) + andi t1, t1, 0xEF + sb t1, 0x9D (t0) @@not_deku_shield: - -BNE v0, 0x2A, @@not_hylian_shield -LB t1, 0x9D (t0) -ANDI t1, t1, 0xDF -SB t1, 0x9D (t0) + bne v0, 0x2A, @@not_hylian_shield + lb t1, 0x9D (t0) + andi t1, t1, 0xDF + sb t1, 0x9D (t0) @@not_hylian_shield: + jr ra + addu a2, t7, t8 ; displaced code + +;================================================================================================== -JR ra -ADDU a2, t7, t8 ; Displaced code +store_item_data_hook: + addiu sp, sp, -0x18 + sw v0, 0x10 (sp) + + sb a2, 0x0424 (a3) ; Displaced code + jal store_item_data + nop + + lw v0, 0x10 (sp) + addiu sp, sp, 0x18 + jr ra + nop ;================================================================================================== -Store_Item_Data: - -ADDIU sp, sp, -0x20 -SW s0, 0x10 (sp) -SW v0, 0x14 (sp) -SW ra, 0x18 (sp) - -SB a2, 0x0424 (a3) ; Displaced code -BEQZ a2, @@return -NOP - -ABS s0, a2 ; s0 = item ID being received - -; Clear current item data -LI t0, -1 -LI t1, CURRENT_ITEM_DATA -SW t0, 0x00 (t1) -SW t0, 0x04 (t1) -SW t0, 0x08 (t1) - -; Load the current scene number -LI t0, GLOBAL_CONTEXT -LHU t0, 0xA4 (t0) - -; If this is a generic grotto, construct a virtual scene number -BNE t0, 0x3E, @@not_grotto -NOP -LI t0, SAVE_CONTEXT -LW t0, 0x1394 (t0) ; Grotto chest contents + flags -ANDI t0, t0, 0x1F ; Isolate chest flags -ADDIU t0, t0, 0x70 ; Grotto virtual scene numbers will range from 0x70 to 0x8F +store_item_data: + addiu sp, sp, -0x28 + sw s0, 0x10 (sp) + sw s1, 0x14 (sp) + sw s2, 0x18 (sp) + sw ra, 0x20 (sp) + + li s1, PLAYER_ACTOR + lb t0, 0x0424 (s1) + beqz t0, @@return + + abs s0, t0 ; s0 = item ID being received + + ; Clear current item data + li t0, -1 + li t1, CURRENT_ITEM_DATA + sw t0, 0x00 (t1) + sw t0, 0x04 (t1) + sw t0, 0x08 (t1) + + ; Load the current scene number + li t0, GLOBAL_CONTEXT + lhu t0, 0xA4 (t0) + + ; If this is a generic grotto, construct a virtual scene number + bne t0, 0x3E, @@not_grotto + nop + li t0, SAVE_CONTEXT + lw t0, 0x1394 (t0) ; Grotto chest contents + flags + andi t0, t0, 0x1F ; Isolate chest flags + addiu t0, t0, 0x70 ; Grotto virtual scene numbers will range from 0x70 to 0x8F @@not_grotto: -; Construct ID used to search the override table -SLL t0, t0, 8 -OR t0, t0, s0 + ; Construct ID used to search the override table + sll t0, t0, 8 + or t0, t0, s0 -; Look up override -LI t1, (ITEM_OVERRIDES - 0x04) + ; Look up override + li t1, (ITEM_OVERRIDES - 0x04) @@lookup_loop: -ADDIU t1, t1, 0x04 -LHU t2, 0x00 (t1) ; t2 = ID column in table -BEQZ t2, @@not_extended ; Reached end of override table -NOP -BNE t2, t0, @@lookup_loop -NOP + addiu t1, t1, 0x04 + lhu t2, 0x00 (t1) ; t2 = ID column in table + beqz t2, @@not_extended ; Reached end of override table + nop + bne t2, t0, @@lookup_loop + nop -LHU s0, 0x02 (t1) ; s0 = item ID found in ITEM_OVERRIDES -ORI v0, s0, 0 + lhu s0, 0x02 (t1) ; s0 = item ID found in ITEM_OVERRIDES + ori v0, s0, 0 @@resolve_item: - -ORI s0, v0, 0 -ADDIU t0, s0, -0x80 ; t0 = index into extended ITEM_TABLE -BLTZ t0, @@not_extended ; Item IDs in range 0x00 - 0x7F are not extended -NOP - -; Load ITEM_TABLE row -LI t1, ITEM_TABLE -SLL t0, t0, 4 ; t0 = offset into table = index * 16 -ADDU t1, t1, t0 ; t1 = pointer to ITEM_TABLE row -; Check whether this item will upgrade into another item -; Conventions for upgrade functions: -; - They receive a pointer to the save context in a0 -; - They receive their item ID in s0 -; - They store their result in v0 -LW t2, 0x0C (t1) ; t2 = upgrade function -LI a0, SAVE_CONTEXT -JALR t2 -NOP -; If the upgrade function returned a new item ID, start resolution over again -BNE v0, s0, @@resolve_item -NOP - -; Store extended item data -LI t2, CURRENT_ITEM_DATA -LW t3, 0x00 (t1) -SW t3, 0x00 (t2) -LW t3, 0x04 (t1) -SW t3, 0x04 (t2) -LW t3, 0x08 (t1) -SW t3, 0x08 (t2) -B @@return -NOP + ori s0, v0, 0 + addiu t0, s0, -0x80 ; t0 = index into extended ITEM_TABLE + bltz t0, @@not_extended ; Item IDs in range 0x00 - 0x7F are not extended + nop + ; Load ITEM_TABLE row + li s2, ITEM_TABLE + sll t0, t0, 4 ; t0 = offset into table = index * 16 + addu s2, s2, t0 ; s2 = pointer to ITEM_TABLE row + ; Check whether this item will upgrade into another item + ; Conventions for upgrade functions: + ; - They receive a pointer to the save context in a0 + ; - They receive their item ID in s0 + ; - They store their result in v0 + lw t2, 0x0C (t1) ; t2 = upgrade function + li a0, SAVE_CONTEXT + jalr t2 + nop + ; If the upgrade function returned a new item ID, start resolution over again + bne v0, s0, @@resolve_item + nop + + ; Store extended item data + li t2, CURRENT_ITEM_DATA + lw t3, 0x00 (s2) + sw t3, 0x00 (t2) + lw t3, 0x04 (s2) + sw t3, 0x04 (t2) + lw t3, 0x08 (s2) + sw t3, 0x08 (t2) + b @@return + nop @@not_extended: -; For non-extended item IDs, put it back in the player instance and let the game handle it -BGEZ a2, @@not_negative -NOP -; The input was negative (item is coming from a chest), so make the result negative -SUBU s0, r0, s0 + ; For non-extended item IDs, put it back in the player instance and let the game handle it + lb t0, 0x0424 (s1) + bgez t0, @@not_negative + nop + ; The input was negative (item is coming from a chest), so make the result negative + subu s0, r0, s0 @@not_negative: -SB s0, 0x0424 (a3) + sb s0, 0x0424 (s1) @@return: -LW s0, 0x10 (sp) -LW v0, 0x14 (sp) -LW ra, 0x18 (sp) -ADDIU sp, sp, 0x20 -JR ra -NOP + lw s0, 0x10 (sp) + lw s1, 0x14 (sp) + lw s2, 0x18 (sp) + lw ra, 0x20 (sp) + addiu sp, sp, 0x28 + jr ra + nop ;================================================================================================== ; Item upgrade functions ;================================================================================================== -No_Upgrade: -JR ra -ORI v0, s0, 0 +no_upgrade: + jr ra + ori v0, s0, 0 ;================================================================================================== -Hookshot_Upgrade: - -LBU t0, 0x7D (a0) ; Load hookshot from inventory +hookshot_upgrade: + lbu t0, 0x7D (a0) ; Load hookshot from inventory -BEQ t0, 0xFF, @@return -LI v0, 0x08 ; Hookshot + beq t0, 0xFF, @@return + li v0, 0x08 ; Hookshot -LI v0, 0x09 ; Longshot + li v0, 0x09 ; Longshot @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== -Strength_Upgrade: +strength_upgrade: + lbu t0, 0xA3 (a0) ; Load strength from inventory + andi t0, t0, 0xC0 ; Mask bits to isolate strength -LBU t0, 0xA3 (a0) ; Load strength from inventory -ANDI t0, t0, 0xC0 ; Mask bits to isolate strength + beqz t0, @@return + li v0, 0x54 ; Goron Bracelet -BEQZ t0, @@return -LI v0, 0x54 ; Goron Bracelet + beq t0, 0x40, @@return + li v0, 0x35 ; Silver Gauntlets -BEQ t0, 0x40, @@return -LI v0, 0x35 ; Silver Gauntlets - -LI v0, 0x36 ; Gold Gauntlets + li v0, 0x36 ; Gold Gauntlets @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== -Bomb_Bag_Upgrade: - -LBU t0, 0xA3 (a0) ; Load bomb bag from inventory -ANDI t0, t0, 0x18 ; Mask bits to isolate bomb bag +bomb_bag_upgrade: + lbu t0, 0xA3 (a0) ; Load bomb bag from inventory + andi t0, t0, 0x18 ; Mask bits to isolate bomb bag -BEQZ t0, @@return -LI v0, 0x32 ; Bomb Bag + beqz t0, @@return + li v0, 0x32 ; Bomb Bag -BEQ t0, 0x08, @@return -LI v0, 0x33 ; Bigger Bomb Bag + beq t0, 0x08, @@return + li v0, 0x33 ; Bigger Bomb Bag -LI v0, 0x34 ; Biggest Bomb Bag + li v0, 0x34 ; Biggest Bomb Bag @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== Bow_Upgrade: + lbu t0, 0xA3 (a0) ; Load quiver from inventory + andi t0, t0, 0x03 ; Mask bits to isolate quiver -LBU t0, 0xA3 (a0) ; Load quiver from inventory -ANDI t0, t0, 0x03 ; Mask bits to isolate quiver + beqz t0, @@return + li v0, 0x04 ; Bow -BEQZ t0, @@return -LI v0, 0x04 ; Bow + beq t0, 0x01, @@return + li v0, 0x30 ; Big Quiver -BEQ t0, 0x01, @@return -LI v0, 0x30 ; Big Quiver - -LI v0, 0x31 ; Biggest Quiver + li v0, 0x31 ; Biggest Quiver @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== -Slingshot_Upgrade: - -LBU t0, 0xA2 (a0) ; Load bullet bag from inventory -ANDI t0, t0, 0xC0 ; Mask bits to isolate bullet bag +slingshot_upgrade: + lbu t0, 0xA2 (a0) ; Load bullet bag from inventory + andi t0, t0, 0xC0 ; Mask bits to isolate bullet bag -BEQZ t0, @@return -LI v0, 0x05 ; Slingshot + beqz t0, @@return + li v0, 0x05 ; Slingshot -BEQ t0, 0x40, @@return -LI v0, 0x60 ; Bullet Bag (40) + beq t0, 0x40, @@return + li v0, 0x60 ; Bullet Bag (40) -LI v0, 0x7B ; Bullet Bag (50) + li v0, 0x7B ; Bullet Bag (50) @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== -Wallet_Upgrade: +wallet_upgrade: + lbu t0, 0xA2 (a0) ; Load wallet from inventory + andi t0, t0, 0x30 ; Mask bits to isolate wallet -LBU t0, 0xA2 (a0) ; Load wallet from inventory -ANDI t0, t0, 0x30 ; Mask bits to isolate wallet + beqz t0, @@return + li v0, 0x45 ; Adult's Wallet -BEQZ t0, @@return -LI v0, 0x45 ; Adult's Wallet - -LI v0, 0x46 ; Giant's Wallet + li v0, 0x46 ; Giant's Wallet @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== -Scale_Upgrade: - -LBU t0, 0xA2 (a0) ; Load scale from inventory -ANDI t0, t0, 0x06 ; # Mask bits to isolate scale +scale_upgrade: + lbu t0, 0xA2 (a0) ; Load scale from inventory + andi t0, t0, 0x06 ; # Mask bits to isolate scale -BEQZ t0, @@return -LI v0, 0x37 ; Silver Scale + beqz t0, @@return + li v0, 0x37 ; Silver Scale -LI v0, 0x38 ; Gold Scale + li v0, 0x38 ; Gold Scale @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== -Nut_Upgrade: +nut_upgrade: + lbu t0, 0xA1 (a0) ; Load nut limit from inventory + andi t0, t0, 0x30 ; Mask bits to isolate nut limit -LBU t0, 0xA1 (a0) ; Load nut limit from inventory -ANDI t0, t0, 0x30 ; Mask bits to isolate nut limit + beqz t0, @@return + li v0, 0x79 ; 30 Nuts -BEQZ t0, @@return -LI v0, 0x79 ; 30 Nuts - -LI v0, 0x7A ; 40 Nuts + li v0, 0x7A ; 40 Nuts @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== -Stick_Upgrade: - -LBU t0, 0xA1 (a0) ; Load stick limit from inventory -ANDI t0, t0, 0x06 ; Mask bits to isolate stick limit +stick_upgrade: + lbu t0, 0xA1 (a0) ; Load stick limit from inventory + andi t0, t0, 0x06 ; Mask bits to isolate stick limit -BEQZ t0, @@return -LI v0, 0x77 ; 20 Sticks + beqz t0, @@return + li v0, 0x77 ; 20 Sticks -LI v0, 0x78 ; 30 Sticks + li v0, 0x78 ; 30 Sticks @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== ; Item effect functions ;================================================================================================== -No_Effect: -JR ra -NOP +no_effect: + jr ra + nop ;================================================================================================== -Give_Biggoron_Sword: -LI t0, 0x01 -SB t0, 0x3E (a0) ; Set flag to make the sword durable -JR ra -NOP +give_biggoron_sword: + li t0, 0x01 + sb t0, 0x3E (a0) ; Set flag to make the sword durable + jr ra + nop ;================================================================================================== -Give_Bottle: -; a0 = save context -; a1 = item code to store -ADDIU t0, a0, 0x86 ; t0 = First bottle slot -LI t1, -1 ; t1 = Bottle slot offset +give_bottle: + ; a0 = save context + ; a1 = item code to store + addiu t0, a0, 0x86 ; t0 = First bottle slot + li t1, -1 ; t1 = Bottle slot offset @@loop: -ADDIU t1, t1, 1 -BGT t1, 3, @@return ; No free bottle slots -NOP + addiu t1, t1, 1 + bgt t1, 3, @@return ; No free bottle slots + nop -; Check whether slot is full -ADDU t2, t0, t1 -LBU t3, 0x00 (t2) -BNE t3, 0xFF, @@loop -NOP + ; Check whether slot is full + addu t2, t0, t1 + lbu t3, 0x00 (t2) + bne t3, 0xFF, @@loop + nop -; Found an open slot -SB a1, 0x00 (t2) + ; Found an open slot + sb a1, 0x00 (t2) @@return: -JR ra -NOP + jr ra + nop ;================================================================================================== -Give_Dungeon_Item: -; a0 = save context -; a1 = mask (0x01 = boss key, 0x02 = compass, 0x04 = map) -; a2 = dungeon index -ADDIU t0, a0, 0xA8 -ADDU t0, t0, a2 ; t0 = address of this dungeon's items -LBU t1, 0x00 (t0) -OR t1, t1, a1 -SB t1, 0x00 (t0) -JR ra -NOP +give_dungeon_item: + ; a0 = save context + ; a1 = mask (0x01 = boss key, 0x02 = compass, 0x04 = map) + ; a2 = dungeon index + addiu t0, a0, 0xA8 + addu t0, t0, a2 ; t0 = address of this dungeon's items + lbu t1, 0x00 (t0) + or t1, t1, a1 + sb t1, 0x00 (t0) + jr ra + nop ;================================================================================================== -Give_Small_Key: -; a0 = save context -; a1 = dungeon index -ADDIU t0, a0, 0xBC -ADDU t0, t0, a1 ; t0 = address of this dungeon's key count -LB t1, 0x00 (t0) -BGEZ t1, @not_negative -NOP -LI t1, 0x00 +give_small_key: + ; a0 = save context + ; a1 = dungeon index + addiu t0, a0, 0xBC + addu t0, t0, a1 ; t0 = address of this dungeon's key count + lb t1, 0x00 (t0) + bgez t1, @not_negative + nop + li t1, 0x00 @not_negative: -ADDIU t1, t1, 1 -SB t1, 0x00 (t0) -JR ra -NOP + addiu t1, t1, 1 + sb t1, 0x00 (t0) + jr ra + nop diff --git a/ASM/src/menu.asm b/ASM/src/menu.asm index 11f073eab..26349b8b4 100755 --- a/ASM/src/menu.asm +++ b/ASM/src/menu.asm @@ -1,28 +1,27 @@ -.macro ItemMenu_Description_ID, dest_reg, base_reg -LBU dest_reg, 0x0074 (base_reg) ; Load the item ID at the selected menu slot -ADDIU AT, R0, 0xFF ; 0xFF indicates an empty menu slot -BNE dest_reg, AT, @@return ; If the slot is not empty, return to default behavior -NOP -ADDIU dest_reg, R0, 0x2C ; 0x2C = "SOLD OUT" +.macro item_menu_description_id, dest_reg, base_reg + lbu dest_reg, 0x0074 (base_reg) ; Load the item ID at the selected menu slot + bne dest_reg, 0xFF, @@return ; If the slot is not empty, use default behavior + nop + li dest_reg, 0x2C ; 0x2C = "SOLD OUT" @@return: .endmacro -ItemMenu_Description_ID_Periodic: -ItemMenu_Description_ID T9, T8 -JR RA -SH T9, 0x009A (SP) +item_menu_description_id_periodic: + item_menu_description_id t9, t8 + jr ra + sh t9, 0x009A (sp) -ItemMenu_Description_ID_Immediate1: -ItemMenu_Description_ID T4, T9 -JR RA -NOP +item_menu_description_id_immediate_1: + item_menu_description_id t4, t9 + jr ra + nop -ItemMenu_Description_ID_Immediate2: -ItemMenu_Description_ID T6, T5 -JR RA -SH T6, 0x009A (SP) +item_menu_description_id_immediate_2: + item_menu_description_id t6, t5 + jr ra + sh t6, 0x009A (sp) -ItemMenu_Description_ID_Immediate3: -ItemMenu_Description_ID T7, T6 -JR RA -SH T7, 0x009A (SP) +item_menu_description_id_immediate_3: + item_menu_description_id t7, t6 + jr ra + sh t7, 0x009A (sp) From 1f3eb0c05813875e31e972543f44c9b9b9f1c8d9 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 21 May 2018 07:23:31 -0400 Subject: [PATCH 023/151] Clear item source when done receiving an item --- ASM/src/hacks.asm | 4 ++-- ASM/src/items.asm | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index ce3c31bb2..86870ea32 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -127,14 +127,14 @@ ; sw r0, 0x0428 (s0) ; sw r0, 0x0118 (v1) .org 0xBCDD6C ; In memory: 0x80388D5C - jal prevent_item_actor_clear + jal item_source_clear sw r0, 0x0118 (v1) ; Replaces: ; sw r0, 0x0428 (s0) ; sh t0, 0x0426 (s0) .org 0xBE5730 ; In memory: 0x803A0720 - jal prevent_item_actor_clear + jal item_source_clear sh t0, 0x0426 (s0) ;================================================================================================== diff --git a/ASM/src/items.asm b/ASM/src/items.asm index a55e8d4f4..4bd85c347 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -2,15 +2,20 @@ ; Item code ;================================================================================================== -prevent_item_actor_clear: +item_source_clear: addiu sp, sp, -0x08 sw t0, 0x00 (sp) sw t1, 0x04 (sp) li t0, PLAYER_ACTOR + lb t1, 0x0424 (t0) + beqz t1, @@clear + nop lw t1, 0x0428 (t0) - beq t0, t1, @@return + beq t1, t0, @@return nop + +@@clear: sw r0, 0x0428 (t0) @@return: From e7ad90165e4530cd6063ac67a42c4aebb128fb1e Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 21 May 2018 21:50:43 -0400 Subject: [PATCH 024/151] Add pending item system, skip fairy / light arrow cutscenes --- ASM/src/build.asm | 2 +- ASM/src/config.asm | 12 +++- ASM/src/hacks.asm | 36 +++++++--- ASM/src/items.asm | 175 +++++++++++++++++++++++++++++++-------------- ASM/src/state.asm | 4 ++ 5 files changed, 163 insertions(+), 66 deletions(-) diff --git a/ASM/src/build.asm b/ASM/src/build.asm index f1efec1cf..cbd247b9b 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -22,6 +22,7 @@ .area 0x600, 0 .include "config.asm" .include "item_data.asm" ; Placed here temporarily, won't fit in the code area +.include "menu.asm" ; Placed here temporarily, won't fit in the code area .endarea ; 0x600 - 0x9FF: Currently reserved for code blocks written by Rom.py @@ -33,7 +34,6 @@ .include "state.asm" .include "items.asm" .include "fixes.asm" -.include "menu.asm" .endarea .close diff --git a/ASM/src/config.asm b/ASM/src/config.asm index 0220218d9..6e8768fb7 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -2,7 +2,7 @@ ; Settings and tables which the front-end may write ;================================================================================================== -; Item override table: +; 0x80400000: Item override table: ; ; This table changes the meaning of a given item ID within a given scene. It must be terminated with ; two 0x00 bytes (which will happen by default as long as you don't fill the allotted space). @@ -27,3 +27,13 @@ .area 0x200, 0 ITEM_OVERRIDES: .endarea + +; 0x80400200: Special items + +FAIRY_ITEMS: +.byte 0x00 ; Farore's Wind Fairy +.byte 0x00 ; Din's Fire Fairy +.byte 0x00 ; Nayru's Love Fairy +LIGHT_ARROW_ITEM: +.byte 0x00 +.align 4 \ No newline at end of file diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 86870ea32..b249f95a5 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -123,19 +123,35 @@ ; Special item sources ;================================================================================================== +; Runs every frame (part of player actor) ; Replaces: -; sw r0, 0x0428 (s0) -; sw r0, 0x0118 (v1) -.org 0xBCDD6C ; In memory: 0x80388D5C - jal item_source_clear - sw r0, 0x0118 (v1) +; sw a1, 0x006C (sp) +; lh t6, 0x13C4 (v1) +.org 0xBE5990 ; In memory: 0x803A0980 + jal every_frame + nop + +; Override cutscene for Great Fairy items +; Replaces: +; jal 0x8002049C +; addiu a1, r0, 0x0038 +.org 0xC89744 ; In memory: 0x801E3884 + jal override_item_fairy_cutscene + addiu a1, r0, 0x0038 +; Override Light Arrow cutscene ; Replaces: -; sw r0, 0x0428 (s0) -; sh t0, 0x0426 (s0) -.org 0xBE5730 ; In memory: 0x803A0720 - jal item_source_clear - sh t0, 0x0426 (s0) +; addiu t8, r0, 0x0053 +; ori t9, r0, 0xFFF8 +; sw t8, 0x0000 (s0) +; b 0x80056F84 +; sw t9, 0x0008 (s0) +.org 0xACCE88 ; In memory: 0x80056F28 + jal override_light_arrow_cutscene + nop + nop + nop + nop ;================================================================================================== ; Menu hacks diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 4bd85c347..2c78069f2 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -1,29 +1,31 @@ -;================================================================================================== -; Item code -;================================================================================================== - -item_source_clear: - addiu sp, sp, -0x08 - sw t0, 0x00 (sp) - sw t1, 0x04 (sp) - - li t0, PLAYER_ACTOR - lb t1, 0x0424 (t0) - beqz t1, @@clear - nop - lw t1, 0x0428 (t0) - beq t1, t0, @@return - nop +; Take away tunics/shields that are about to be received, to avoid breaking NPCs who give them -@@clear: - sw r0, 0x0428 (t0) +inventory_fix: + ; v0 = item ID + li t0, SAVE_CONTEXT -@@return: - lw t0, 0x00 (sp) - lw t1, 0x04 (sp) - addiu sp, sp, 0x08 + bne v0, 0x2C, @@not_goron_tunic + lb t1, 0x9C (t0) + andi t1, t1, 0xFD + sb t1, 0x9C (t0) +@@not_goron_tunic: + bne v0, 0x2D, @@not_zora_tunic + lb t1, 0x9C (t0) + andi t1, t1, 0xFB + sb t1, 0x9C (t0) +@@not_zora_tunic: + bne v0, 0x29, @@not_deku_shield + lb t1, 0x9D (t0) + andi t1, t1, 0xEF + sb t1, 0x9D (t0) +@@not_deku_shield: + bne v0, 0x2A, @@not_hylian_shield + lb t1, 0x9D (t0) + andi t1, t1, 0xDF + sb t1, 0x9D (t0) +@@not_hylian_shield: jr ra - nop + addu a2, t7, t8 ; Displaced code ;================================================================================================== @@ -41,15 +43,19 @@ override_object_chest: override_object: ; Load extended Object ID - li t2, current_item_data + li t2, CURRENT_ITEM_DATA lhu t3, 0x04 (t2) beq t3, 0xFFFF, @@return nop - ; override object id + ; Override object ID ori a1, t3, 0 @@return: + ; Clear any pending special item, now that it's being received + li t3, PENDING_SPECIAL_ITEM + sb r0, 0x00 (t3) + jr ra nop @@ -57,7 +63,7 @@ override_object: override_graphic: ; Load extended Graphic ID - li t0, current_item_data + li t0, CURRENT_ITEM_DATA lb t1, 0x02 (t0) beq t1, -1, @@return nop @@ -135,46 +141,107 @@ override_action: ;================================================================================================== -; Take away tunics/shields that are about to be received, to avoid breaking NPCs who give them +every_frame: + sw a0, 0x68 (sp) + sw a1, 0x6C (sp) + sw a2, 0x70 (sp) + sw a3, 0x74 (sp) + addiu sp, sp, -0x18 + sw v1, 0x10 (sp) + sw ra, 0x14 (sp) -inventory_fix: - ; v0 = item ID - li t0, SAVE_CONTEXT + li t0, PENDING_SPECIAL_ITEM + lb t0, 0x00 (t0) + beqz t0, @@no_pending_item + nop + li t1, PLAYER_ACTOR + sb t0, 0x0424 (t1) + sw t1, 0x0428 (t1) + jal store_item_data + nop +@@no_pending_item: + + lw v1, 0x10 (sp) + lw ra, 0x14 (sp) + addiu sp, sp, 0x18 + lw a0, 0x68 (sp) + lw a1, 0x6C (sp) + lw a2, 0x70 (sp) + lw a3, 0x74 (sp) + + lh t6, 0x13C4 (v1) ; Displaced code - bne v0, 0x2C, @@not_goron_tunic - lb t1, 0x9C (t0) - andi t1, t1, 0xFD - sb t1, 0x9C (t0) -@@not_goron_tunic: - bne v0, 0x2D, @@not_zora_tunic - lb t1, 0x9C (t0) - andi t1, t1, 0xFB - sb t1, 0x9C (t0) -@@not_zora_tunic: - bne v0, 0x29, @@not_deku_shield - lb t1, 0x9D (t0) - andi t1, t1, 0xEF - sb t1, 0x9D (t0) -@@not_deku_shield: - bne v0, 0x2A, @@not_hylian_shield - lb t1, 0x9D (t0) - andi t1, t1, 0xDF - sb t1, 0x9D (t0) -@@not_hylian_shield: jr ra - addu a2, t7, t8 ; displaced code + nop + +;================================================================================================== + +override_item_fairy_cutscene: + ; a0 = global context + ; a2 = fairy actor + lw t0, 0x1D2C (a0) ; Load switch flags + li t1, 1 + sll t1, t1, 0x18 + and v0, t0, t1 ; Isolate ZL switch + beqz v0, @@return + nop + + lhu t2, 0xA4 (a0) ; Load scene number + bne t2, 0x3D, @@return ; Use default behavior unless this is an item fairy + nop + + lhu t2, 0x02DC (a2) ; Load item fairy index + li t3, 1 + sllv t3, t3, t2 ; t3 = fairy item mask + li t4, SAVE_CONTEXT + lbu t5, 0x0EF2 (t4) ; Load fairy item flags + and t6, t5, t3 + bnez t6, @@return ; Use default behavior if the item is already obtained + nop + or t5, t5, t3 + sb t5, 0x0EF2 (t4) ; Mark fairy item as obtained + + nor t1, t1, t1 + and t0, t0, t1 ; Unset ZL switch + sw t0, 0x1D2C (a0) + + ; Load fairy item and mark it as pending + li t0, FAIRY_ITEMS + addu t0, t0, t2 + lb t0, 0x00 (t0) + li t1, PENDING_SPECIAL_ITEM + sb t0, 0x00 (t1) + + li v0, 0 ; Prevent fairy animation + +@@return: + jr ra + nop + +;================================================================================================== + +override_light_arrow_cutscene: + li t0, LIGHT_ARROW_ITEM + lb t0, 0x00 (t0) + li t1, PENDING_SPECIAL_ITEM + sb t0, 0x00 (t1) + jr ra + nop ;================================================================================================== store_item_data_hook: + sb a2, 0x0424 (a3) ; Displaced code + addiu sp, sp, -0x18 sw v0, 0x10 (sp) + sw ra, 0x14 (sp) - sb a2, 0x0424 (a3) ; Displaced code jal store_item_data nop lw v0, 0x10 (sp) + lw ra, 0x14 (sp) addiu sp, sp, 0x18 jr ra nop @@ -245,9 +312,9 @@ store_item_data: ; - They receive a pointer to the save context in a0 ; - They receive their item ID in s0 ; - They store their result in v0 - lw t2, 0x0C (t1) ; t2 = upgrade function + lw t0, 0x0C (s2) ; t0 = upgrade function li a0, SAVE_CONTEXT - jalr t2 + jalr t0 nop ; If the upgrade function returned a new item ID, start resolution over again bne v0, s0, @@resolve_item diff --git a/ASM/src/state.asm b/ASM/src/state.asm index c61aed746..ddffd2ae1 100755 --- a/ASM/src/state.asm +++ b/ASM/src/state.asm @@ -4,3 +4,7 @@ CURRENT_ITEM_DATA: .word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF + +PENDING_SPECIAL_ITEM: +.byte 0x00 +.align 4 \ No newline at end of file From a5c9f939a90aed2a0f6457260210a8d4a7a29fb8 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 21 May 2018 23:25:57 -0400 Subject: [PATCH 025/151] Fix comments --- ASM/src/config.asm | 6 +++--- data/base2current.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ASM/src/config.asm b/ASM/src/config.asm index 6e8768fb7..eed3eac94 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -2,7 +2,7 @@ ; Settings and tables which the front-end may write ;================================================================================================== -; 0x80400000: Item override table: +; 0x03480000: Item override table: ; ; This table changes the meaning of a given item ID within a given scene. It must be terminated with ; two 0x00 bytes (which will happen by default as long as you don't fill the allotted space). @@ -28,7 +28,7 @@ ITEM_OVERRIDES: .endarea -; 0x80400200: Special items +; 0x03480200: Special items FAIRY_ITEMS: .byte 0x00 ; Farore's Wind Fairy @@ -36,4 +36,4 @@ FAIRY_ITEMS: .byte 0x00 ; Nayru's Love Fairy LIGHT_ARROW_ITEM: .byte 0x00 -.align 4 \ No newline at end of file +.align 4 diff --git a/data/base2current.json b/data/base2current.json index 1ef6472bf..0cadc16f5 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 2, 223]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 3, 156]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 3, 170, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 3, 177, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 3, 184, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 3, 163, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 148]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427412": [12, 16, 2, 199]}, {"12427480": [12, 16, 2, 131]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 135]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12491456": [12, 16, 2, 161]}, {"12491480": [12, 16, 2, 171]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050752": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 12, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 12, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 12, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 132, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 160, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 13, 216, 128, 64, 13, 188]}, {"55050897": [255, 1, 67]}, {"55050901": [198, 21, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050913": [255, 1, 68]}, {"55050917": [198, 22, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050929": [255, 1, 69]}, {"55050933": [198, 23, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050945": [255, 1, 70]}, {"55050949": [198, 24, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050961": [255, 1, 71]}, {"55050965": [198, 25, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050977": [255, 1, 93]}, {"55050981": [198, 28, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55050993": [255, 1, 122]}, {"55050997": [198, 29, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55051009": [255, 1, 249]}, {"55051013": [198, 30, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55051025": [255, 1, 151]}, {"55051029": [198, 32, 255, 128, 64, 13, 240, 128, 64, 12, 164]}, {"55051041": [255, 10, 199]}, {"55051045": [185, 1, 3, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051057": [255, 10, 199]}, {"55051061": [185, 1, 4, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051073": [255, 10, 199]}, {"55051077": [185, 1, 5, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051089": [255, 10, 199]}, {"55051093": [185, 1, 6, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051105": [255, 10, 199]}, {"55051109": [185, 1, 7, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051121": [255, 10, 199]}, {"55051125": [185, 1, 13, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051137": [255, 11, 103]}, {"55051141": [184, 2]}, {"55051144": [128, 64, 14, 44, 128, 64, 12, 164]}, {"55051153": [255, 11, 103]}, {"55051157": [184, 2, 1, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051169": [255, 11, 103]}, {"55051173": [184, 2, 2, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051185": [255, 11, 103]}, {"55051189": [184, 2, 3, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051201": [255, 11, 103]}, {"55051205": [184, 2, 4, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051217": [255, 11, 103]}, {"55051221": [184, 2, 5, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051233": [255, 11, 103]}, {"55051237": [184, 2, 6, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051249": [255, 11, 103]}, {"55051253": [184, 2, 7, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051265": [255, 11, 103]}, {"55051269": [184, 2, 8, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051281": [255, 11, 103]}, {"55051285": [184, 2, 9, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051297": [255, 28, 102]}, {"55051301": [200, 4]}, {"55051304": [128, 64, 14, 44, 128, 64, 12, 164]}, {"55051313": [255, 28, 102]}, {"55051317": [200, 4, 1, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051329": [255, 28, 102]}, {"55051333": [200, 4, 2, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051345": [255, 28, 102]}, {"55051349": [200, 4, 3, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051361": [255, 28, 102]}, {"55051365": [200, 4, 4, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051377": [255, 28, 102]}, {"55051381": [200, 4, 5, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051393": [255, 28, 102]}, {"55051397": [200, 4, 6, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051409": [255, 28, 102]}, {"55051413": [200, 4, 7, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051425": [255, 28, 102]}, {"55051429": [200, 4, 8, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051441": [255, 28, 102]}, {"55051445": [200, 4, 9, 128, 64, 14, 44, 128, 64, 12, 164]}, {"55051457": [255, 254, 96]}, {"55051461": [170, 3, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051473": [255, 254, 96]}, {"55051477": [170, 4, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051489": [255, 254, 96]}, {"55051493": [170, 5, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051505": [255, 254, 96]}, {"55051509": [170, 6, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051521": [255, 254, 96]}, {"55051525": [170, 7, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051537": [255, 254, 96]}, {"55051541": [170, 8, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051553": [255, 254, 96]}, {"55051557": [170, 11, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051569": [255, 254, 96]}, {"55051573": [170, 12, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051585": [255, 254, 96]}, {"55051589": [170, 13, 255, 128, 64, 14, 72, 128, 64, 12, 164]}, {"55051601": [61, 67, 12]}, {"55051605": [248, 255, 255, 128, 64, 13, 224, 128, 64, 12, 164]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 143, 166]}, {"55052815": [48, 132, 197]}, {"55052819": [4, 8, 16, 2, 139]}, {"55052828": [143, 185]}, {"55052831": [44, 135, 37]}, {"55052835": [4, 8, 16, 2, 139]}, {"55052844": [60, 10, 128, 64, 37, 74, 10]}, {"55052852": [149, 75]}, {"55052855": [4, 52, 1, 255, 255, 17, 97]}, {"55052863": [2]}, {"55052868": [53, 101]}, {"55052872": [3, 224]}, {"55052875": [8]}, {"55052880": [60, 8, 128, 64, 37, 8, 10]}, {"55052888": [129, 9]}, {"55052891": [2, 36, 1, 255, 255, 17, 33]}, {"55052899": [2]}, {"55052904": [53, 35]}, {"55052909": [3, 15, 195]}, {"55052913": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55052927": [8]}, {"55052932": [144, 69]}, {"55052935": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55052944": [145, 9]}, {"55052947": [3, 52, 1]}, {"55052951": [255, 17, 33]}, {"55052955": [2]}, {"55052960": [53, 37]}, {"55052964": [3, 224]}, {"55052967": [8]}, {"55052972": [143, 162]}, {"55052975": [36, 144, 69]}, {"55052980": [60, 8, 128, 64, 37, 8, 10]}, {"55052988": [149, 9]}, {"55052992": [52, 1, 255, 255, 17, 33]}, {"55052999": [19]}, {"55053004": [53, 37]}, {"55053008": [175, 164]}, {"55053012": [175, 165]}, {"55053015": [4, 175, 166]}, {"55053019": [8, 39, 189, 255, 232, 175, 191]}, {"55053027": [16, 141, 9]}, {"55053031": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053043": [6, 145, 6]}, {"55053047": [7, 1, 32, 248, 9]}, {"55053056": [143, 191]}, {"55053059": [16, 39, 189]}, {"55053063": [24, 143, 164]}, {"55053068": [143, 165]}, {"55053071": [4, 143, 166]}, {"55053075": [8, 3, 224]}, {"55053079": [8]}, {"55053084": [60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55053095": [44, 20, 65]}, {"55053099": [3, 129, 9]}, {"55053103": [156, 49, 41]}, {"55053107": [253, 161, 9]}, {"55053111": [156, 52, 1]}, {"55053115": [45, 20, 65]}, {"55053119": [3, 129, 9]}, {"55053123": [156, 49, 41]}, {"55053127": [251, 161, 9]}, {"55053131": [156, 52, 1]}, {"55053135": [41, 20, 65]}, {"55053139": [3, 129, 9]}, {"55053143": [157, 49, 41]}, {"55053147": [239, 161, 9]}, {"55053151": [157, 52, 1]}, {"55053155": [42, 20, 65]}, {"55053159": [3, 129, 9]}, {"55053163": [157, 49, 41]}, {"55053167": [223, 161, 9]}, {"55053171": [157, 3, 224]}, {"55053175": [8, 1, 248, 48, 33, 39, 189, 255, 224, 175, 176]}, {"55053187": [16, 175, 162]}, {"55053191": [20, 175, 191]}, {"55053195": [24, 160, 230, 4, 36, 16, 192]}, {"55053203": [62]}, {"55053209": [6, 15, 195]}, {"55053213": [193, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053232": [173, 40]}, {"55053236": [173, 40]}, {"55053239": [4, 173, 40]}, {"55053243": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053255": [164, 52, 1]}, {"55053259": [62, 21, 1]}, {"55053263": [6]}, {"55053268": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053283": [31, 37, 8]}, {"55053287": [112]}, {"55053289": [8, 66]}, {"55053292": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053307": [4, 149, 42]}, {"55053312": [17, 64]}, {"55053315": [30]}, {"55053320": [21, 72, 255, 251]}, {"55053328": [149, 48]}, {"55053331": [2, 54, 2]}, {"55053336": [52, 80]}, {"55053340": [38, 8, 255, 128, 5]}, {"55053347": [22]}, {"55053352": [60, 9, 128, 64, 37, 41, 2]}, {"55053361": [8, 65]}, {"55053364": [1, 40, 72, 33, 141, 42]}, {"55053371": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1, 64, 248, 9]}, {"55053388": [20, 80, 255, 242]}, {"55053396": [60, 10, 128, 64, 37, 74, 10]}, {"55053404": [141, 43]}, {"55053408": [173, 75]}, {"55053412": [141, 43]}, {"55053415": [4, 173, 75]}, {"55053419": [4, 141, 43]}, {"55053423": [8, 173, 75]}, {"55053427": [8, 16]}, {"55053431": [5]}, {"55053436": [4, 193]}, {"55053439": [2]}, {"55053445": [16, 128, 35, 160, 240, 4, 36, 143, 176]}, {"55053455": [16, 143, 162]}, {"55053459": [20, 143, 191]}, {"55053463": [24, 39, 189]}, {"55053467": [32, 3, 224]}, {"55053471": [8]}, {"55053476": [3, 224]}, {"55053479": [8, 54, 2]}, {"55053484": [144, 136]}, {"55053487": [125, 52, 1]}, {"55053491": [255, 17, 1]}, {"55053495": [2, 52, 2]}, {"55053499": [8, 52, 2]}, {"55053503": [9, 3, 224]}, {"55053507": [8]}, {"55053512": [144, 136]}, {"55053515": [163, 49, 8]}, {"55053519": [192, 17]}, {"55053523": [5, 52, 2]}, {"55053527": [84, 52, 1]}, {"55053531": [64, 17, 1]}, {"55053535": [2, 52, 2]}, {"55053539": [53, 52, 2]}, {"55053543": [54, 3, 224]}, {"55053547": [8]}, {"55053552": [144, 136]}, {"55053555": [163, 49, 8]}, {"55053559": [24, 17]}, {"55053563": [5, 52, 2]}, {"55053567": [50, 52, 1]}, {"55053571": [8, 17, 1]}, {"55053575": [2, 52, 2]}, {"55053579": [51, 52, 2]}, {"55053583": [52, 3, 224]}, {"55053587": [8]}, {"55053592": [144, 136]}, {"55053595": [163, 49, 8]}, {"55053599": [3, 17]}, {"55053603": [5, 52, 2]}, {"55053607": [4, 52, 1]}, {"55053611": [1, 17, 1]}, {"55053615": [2, 52, 2]}, {"55053619": [48, 52, 2]}, {"55053623": [49, 3, 224]}, {"55053627": [8]}, {"55053632": [144, 136]}, {"55053635": [162, 49, 8]}, {"55053639": [192, 17]}, {"55053643": [5, 52, 2]}, {"55053647": [5, 52, 1]}, {"55053651": [64, 17, 1]}, {"55053655": [2, 52, 2]}, {"55053659": [96, 52, 2]}, {"55053663": [123, 3, 224]}, {"55053667": [8]}, {"55053672": [144, 136]}, {"55053675": [162, 49, 8]}, {"55053679": [48, 17]}, {"55053683": [2, 52, 2]}, {"55053687": [69, 52, 2]}, {"55053691": [70, 3, 224]}, {"55053695": [8]}, {"55053700": [144, 136]}, {"55053703": [162, 49, 8]}, {"55053707": [6, 17]}, {"55053711": [2, 52, 2]}, {"55053715": [55, 52, 2]}, {"55053719": [56, 3, 224]}, {"55053723": [8]}, {"55053728": [144, 136]}, {"55053731": [161, 49, 8]}, {"55053735": [48, 17]}, {"55053739": [2, 52, 2]}, {"55053743": [121, 52, 2]}, {"55053747": [122, 3, 224]}, {"55053751": [8]}, {"55053756": [144, 136]}, {"55053759": [161, 49, 8]}, {"55053763": [6, 17]}, {"55053767": [2, 52, 2]}, {"55053771": [119, 52, 2]}, {"55053775": [120, 3, 224]}, {"55053779": [8]}, {"55053784": [3, 224]}, {"55053787": [8]}, {"55053792": [52, 8]}, {"55053795": [1, 160, 136]}, {"55053799": [62, 3, 224]}, {"55053803": [8]}, {"55053808": [36, 136]}, {"55053811": [134, 36, 9, 255, 255, 37, 41]}, {"55053819": [1, 52, 1]}, {"55053823": [3]}, {"55053825": [41, 8, 42, 20, 32]}, {"55053831": [7]}, {"55053836": [1, 9, 80, 33, 145, 75]}, {"55053844": [52, 1]}, {"55053847": [255, 21, 97, 255, 247]}, {"55053856": [161, 69]}, {"55053860": [3, 224]}, {"55053863": [8]}, {"55053868": [36, 136]}, {"55053871": [168, 1, 6, 64, 33, 145, 9]}, {"55053880": [1, 37, 72, 37, 161, 9]}, {"55053888": [3, 224]}, {"55053891": [8]}, {"55053896": [36, 136]}, {"55053899": [188, 1, 5, 64, 33, 129, 9]}, {"55053908": [5, 33]}, {"55053911": [2]}, {"55053916": [52, 9]}, {"55053920": [37, 41]}, {"55053923": [1, 161, 9]}, {"55053928": [3, 224]}, {"55053931": [8]}, {"55053936": [141, 1]}, {"55053939": [4, 16, 32]}, {"55053943": [3]}, {"55053948": [145, 1]}, {"55053951": [104, 161, 1]}, {"55053955": [64, 3, 224]}, {"55053959": [8, 161, 14]}, {"55053963": [104, 147, 25]}, {"55053967": [116, 36, 1]}, {"55053971": [255, 23, 33]}, {"55053975": [2]}, {"55053980": [36, 25]}, {"55053983": [44, 3, 224]}, {"55053987": [8, 167, 185]}, {"55053991": [154, 147, 44]}, {"55053995": [116, 36, 1]}, {"55053999": [255, 21, 129]}, {"55054003": [2]}, {"55054008": [36, 12]}, {"55054011": [44, 3, 224]}, {"55054015": [8]}, {"55054020": [145, 174]}, {"55054023": [116, 36, 1]}, {"55054027": [255, 21, 193]}, {"55054031": [2]}, {"55054036": [36, 14]}, {"55054039": [44, 3, 224]}, {"55054043": [8, 167, 174]}, {"55054047": [154, 145, 207]}, {"55054051": [116, 36, 1]}, {"55054055": [255, 21, 225]}, {"55054059": [2]}, {"55054064": [36, 15]}, {"55054067": [44, 3, 224]}, {"55054071": [8, 167, 175]}, {"55054075": [154]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 41]}, {"11325064": [12, 16, 3, 33, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 3, 245]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 96, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 103, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 110, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 89, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 176]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427412": [12, 16, 2, 132]}, {"12427480": [12, 16, 2, 156]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 160]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12474768": [12, 16, 2, 227, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 189]}, {"12491480": [12, 16, 2, 199]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 255]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 16, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 44, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 84, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 124, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 164, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 204, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 232, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 15, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 15, 32]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 144, 128, 64, 14, 8]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 144, 128, 64, 14, 8]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 68, 128, 64, 14, 8, 147, 25]}, {"55051623": [116, 52, 1]}, {"55051627": [255, 23, 33]}, {"55051631": [2]}, {"55051636": [52, 25]}, {"55051639": [44, 3, 224]}, {"55051643": [8, 167, 185]}, {"55051647": [154, 147, 44]}, {"55051651": [116, 52, 1]}, {"55051655": [255, 21, 129]}, {"55051659": [2]}, {"55051664": [52, 12]}, {"55051667": [44, 3, 224]}, {"55051671": [8]}, {"55051676": [145, 174]}, {"55051679": [116, 52, 1]}, {"55051683": [255, 21, 193]}, {"55051687": [2]}, {"55051692": [52, 14]}, {"55051695": [44, 3, 224]}, {"55051699": [8, 167, 174]}, {"55051703": [154, 145, 207]}, {"55051707": [116, 52, 1]}, {"55051711": [255, 21, 225]}, {"55051715": [2]}, {"55051720": [52, 15]}, {"55051723": [44, 3, 224]}, {"55051727": [8, 167, 175]}, {"55051731": [154]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052827": [44, 20, 65]}, {"55052831": [3, 129, 9]}, {"55052835": [156, 49, 41]}, {"55052839": [253, 161, 9]}, {"55052843": [156, 52, 1]}, {"55052847": [45, 20, 65]}, {"55052851": [3, 129, 9]}, {"55052855": [156, 49, 41]}, {"55052859": [251, 161, 9]}, {"55052863": [156, 52, 1]}, {"55052867": [41, 20, 65]}, {"55052871": [3, 129, 9]}, {"55052875": [157, 49, 41]}, {"55052879": [239, 161, 9]}, {"55052883": [157, 52, 1]}, {"55052887": [42, 20, 65]}, {"55052891": [3, 129, 9]}, {"55052895": [157, 49, 41]}, {"55052899": [223, 161, 9]}, {"55052903": [157, 3, 224]}, {"55052907": [8, 1, 248, 48, 33, 143, 166]}, {"55052915": [48, 132, 197]}, {"55052919": [4, 8, 16, 2, 164]}, {"55052928": [143, 185]}, {"55052931": [44, 135, 37]}, {"55052935": [4, 8, 16, 2, 164]}, {"55052944": [60, 10, 128, 64, 37, 74, 10]}, {"55052952": [149, 75]}, {"55052955": [4, 52, 1, 255, 255, 17, 97]}, {"55052963": [2]}, {"55052968": [53, 101]}, {"55052972": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052984": [3, 224]}, {"55052987": [8]}, {"55052992": [60, 8, 128, 64, 37, 8, 10]}, {"55053000": [129, 9]}, {"55053003": [2, 36, 1, 255, 255, 17, 33]}, {"55053011": [2]}, {"55053016": [53, 35]}, {"55053021": [3, 15, 195]}, {"55053025": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053039": [8]}, {"55053044": [144, 69]}, {"55053047": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053056": [145, 9]}, {"55053059": [3, 52, 1]}, {"55053063": [255, 17, 33]}, {"55053067": [2]}, {"55053072": [53, 37]}, {"55053076": [3, 224]}, {"55053079": [8]}, {"55053084": [143, 162]}, {"55053087": [36, 144, 69]}, {"55053092": [60, 8, 128, 64, 37, 8, 10]}, {"55053100": [149, 9]}, {"55053104": [52, 1, 255, 255, 17, 33]}, {"55053111": [19]}, {"55053116": [53, 37]}, {"55053120": [175, 164]}, {"55053124": [175, 165]}, {"55053127": [4, 175, 166]}, {"55053131": [8, 39, 189, 255, 232, 175, 191]}, {"55053139": [16, 141, 9]}, {"55053143": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053155": [6, 145, 6]}, {"55053159": [7, 1, 32, 248, 9]}, {"55053168": [143, 191]}, {"55053171": [16, 39, 189]}, {"55053175": [24, 143, 164]}, {"55053180": [143, 165]}, {"55053183": [4, 143, 166]}, {"55053187": [8, 3, 224]}, {"55053191": [8]}, {"55053196": [175, 164]}, {"55053199": [104, 175, 165]}, {"55053203": [108, 175, 166]}, {"55053207": [112, 175, 167]}, {"55053211": [116, 39, 189, 255, 232, 175, 163]}, {"55053219": [16, 175, 191]}, {"55053223": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55053236": [17]}, {"55053239": [7]}, {"55053244": [60, 9, 128, 30, 37, 41, 170, 48, 161, 40, 4, 36, 173, 41, 4, 40, 12, 16, 3, 52]}, {"55053268": [143, 163]}, {"55053271": [16, 143, 191]}, {"55053275": [20, 39, 189]}, {"55053279": [24, 143, 164]}, {"55053283": [104, 143, 165]}, {"55053287": [108, 143, 166]}, {"55053291": [112, 143, 167]}, {"55053295": [116, 132, 110, 19, 196, 3, 224]}, {"55053303": [8]}, {"55053308": [140, 136, 29, 44, 52, 9]}, {"55053315": [1]}, {"55053317": [9, 78]}, {"55053320": [1, 9, 16, 36, 16, 64]}, {"55053327": [27]}, {"55053332": [148, 138]}, {"55053335": [164, 52, 1]}, {"55053339": [61, 21, 65]}, {"55053343": [23]}, {"55053348": [148, 202, 2, 220, 52, 11]}, {"55053355": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053379": [14]}, {"55053384": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053412": [1, 10, 64, 33, 129, 8]}, {"55053420": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053432": [52, 2]}, {"55053436": [3, 224]}, {"55053439": [8]}, {"55053444": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053456": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053468": [3, 224]}, {"55053471": [8]}, {"55053476": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053487": [16, 175, 191]}, {"55053491": [20, 12, 16, 3, 52]}, {"55053500": [143, 162]}, {"55053503": [16, 143, 191]}, {"55053507": [20, 39, 189]}, {"55053511": [24, 3, 224]}, {"55053515": [8]}, {"55053520": [39, 189, 255, 216, 175, 176]}, {"55053527": [16, 175, 177]}, {"55053531": [20, 175, 178]}, {"55053535": [24, 175, 191]}, {"55053539": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053555": [62]}, {"55053557": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053580": [173, 40]}, {"55053584": [173, 40]}, {"55053587": [4, 173, 40]}, {"55053591": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053603": [164, 52, 1]}, {"55053607": [62, 21, 1]}, {"55053611": [6]}, {"55053616": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053631": [31, 37, 8]}, {"55053635": [112]}, {"55053637": [8, 66]}, {"55053640": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053655": [4, 149, 42]}, {"55053660": [17, 64]}, {"55053663": [30]}, {"55053668": [21, 72, 255, 251]}, {"55053676": [149, 48]}, {"55053679": [2, 54, 2]}, {"55053684": [52, 80]}, {"55053688": [38, 8, 255, 128, 5]}, {"55053695": [22]}, {"55053700": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053709": [8, 65]}, {"55053712": [2, 72, 144, 33, 142, 72]}, {"55053719": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053730": [248, 9]}, {"55053736": [20, 80, 255, 242]}, {"55053744": [60, 10, 128, 64, 37, 74, 10]}, {"55053752": [142, 75]}, {"55053756": [173, 75]}, {"55053760": [142, 75]}, {"55053763": [4, 173, 75]}, {"55053767": [4, 142, 75]}, {"55053771": [8, 173, 75]}, {"55053775": [8, 16]}, {"55053779": [6]}, {"55053784": [130, 40, 4, 36, 5, 1]}, {"55053791": [2]}, {"55053797": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053807": [16, 143, 177]}, {"55053811": [20, 143, 178]}, {"55053815": [24, 143, 191]}, {"55053819": [32, 39, 189]}, {"55053823": [40, 3, 224]}, {"55053827": [8]}, {"55053832": [3, 224]}, {"55053835": [8, 54, 2]}, {"55053840": [144, 136]}, {"55053843": [125, 52, 1]}, {"55053847": [255, 17, 1]}, {"55053851": [2, 52, 2]}, {"55053855": [8, 52, 2]}, {"55053859": [9, 3, 224]}, {"55053863": [8]}, {"55053868": [144, 136]}, {"55053871": [163, 49, 8]}, {"55053875": [192, 17]}, {"55053879": [5, 52, 2]}, {"55053883": [84, 52, 1]}, {"55053887": [64, 17, 1]}, {"55053891": [2, 52, 2]}, {"55053895": [53, 52, 2]}, {"55053899": [54, 3, 224]}, {"55053903": [8]}, {"55053908": [144, 136]}, {"55053911": [163, 49, 8]}, {"55053915": [24, 17]}, {"55053919": [5, 52, 2]}, {"55053923": [50, 52, 1]}, {"55053927": [8, 17, 1]}, {"55053931": [2, 52, 2]}, {"55053935": [51, 52, 2]}, {"55053939": [52, 3, 224]}, {"55053943": [8]}, {"55053948": [144, 136]}, {"55053951": [163, 49, 8]}, {"55053955": [3, 17]}, {"55053959": [5, 52, 2]}, {"55053963": [4, 52, 1]}, {"55053967": [1, 17, 1]}, {"55053971": [2, 52, 2]}, {"55053975": [48, 52, 2]}, {"55053979": [49, 3, 224]}, {"55053983": [8]}, {"55053988": [144, 136]}, {"55053991": [162, 49, 8]}, {"55053995": [192, 17]}, {"55053999": [5, 52, 2]}, {"55054003": [5, 52, 1]}, {"55054007": [64, 17, 1]}, {"55054011": [2, 52, 2]}, {"55054015": [96, 52, 2]}, {"55054019": [123, 3, 224]}, {"55054023": [8]}, {"55054028": [144, 136]}, {"55054031": [162, 49, 8]}, {"55054035": [48, 17]}, {"55054039": [2, 52, 2]}, {"55054043": [69, 52, 2]}, {"55054047": [70, 3, 224]}, {"55054051": [8]}, {"55054056": [144, 136]}, {"55054059": [162, 49, 8]}, {"55054063": [6, 17]}, {"55054067": [2, 52, 2]}, {"55054071": [55, 52, 2]}, {"55054075": [56, 3, 224]}, {"55054079": [8]}, {"55054084": [144, 136]}, {"55054087": [161, 49, 8]}, {"55054091": [48, 17]}, {"55054095": [2, 52, 2]}, {"55054099": [121, 52, 2]}, {"55054103": [122, 3, 224]}, {"55054107": [8]}, {"55054112": [144, 136]}, {"55054115": [161, 49, 8]}, {"55054119": [6, 17]}, {"55054123": [2, 52, 2]}, {"55054127": [119, 52, 2]}, {"55054131": [120, 3, 224]}, {"55054135": [8]}, {"55054140": [3, 224]}, {"55054143": [8]}, {"55054148": [52, 8]}, {"55054151": [1, 160, 136]}, {"55054155": [62, 3, 224]}, {"55054159": [8]}, {"55054164": [36, 136]}, {"55054167": [134, 36, 9, 255, 255, 37, 41]}, {"55054175": [1, 52, 1]}, {"55054179": [3]}, {"55054181": [41, 8, 42, 20, 32]}, {"55054187": [7]}, {"55054192": [1, 9, 80, 33, 145, 75]}, {"55054200": [52, 1]}, {"55054203": [255, 21, 97, 255, 247]}, {"55054212": [161, 69]}, {"55054216": [3, 224]}, {"55054219": [8]}, {"55054224": [36, 136]}, {"55054227": [168, 1, 6, 64, 33, 145, 9]}, {"55054236": [1, 37, 72, 37, 161, 9]}, {"55054244": [3, 224]}, {"55054247": [8]}, {"55054252": [36, 136]}, {"55054255": [188, 1, 5, 64, 33, 129, 9]}, {"55054264": [5, 33]}, {"55054267": [2]}, {"55054272": [52, 9]}, {"55054276": [37, 41]}, {"55054279": [1, 161, 9]}, {"55054284": [3, 224]}, {"55054287": [8]}, {"55054292": [141, 1]}, {"55054295": [4, 16, 32]}, {"55054299": [3]}, {"55054304": [145, 1]}, {"55054307": [104, 161, 1]}, {"55054311": [64, 3, 224]}, {"55054315": [8, 161, 14]}, {"55054319": [104]}] \ No newline at end of file From 6ceedf046ca1b2304387c730cffcbcc160610ff8 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 21 May 2018 23:27:03 -0400 Subject: [PATCH 026/151] Update fairy / light arrow locations to be NPCs --- Regions.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Regions.py b/Regions.py index 8ecc4ee56..92c528b73 100644 --- a/Regions.py +++ b/Regions.py @@ -377,10 +377,10 @@ def _create_region(name, type, locations=None, exits=None): 'Zeldas Letter': (None, None, None, 'NPC', None), 'Crater Fairy Reward': (None, None, None, 'Fairy', None), 'Mountain Summit Fairy Reward': (None, None, None, 'Fairy', None), - 'Hyrule Castle Fairy Reward': (0xC8BD09, 0x2D21E7D, None, 'Special', 0x3D), - 'Zoras Fountain Fairy Reward': (0xC8BD08, 0x2D20595, None, 'Special', 0x3D), - 'Desert Colossus Fairy Reward': (0xC8BD0A, 0x2D22375, None, 'Special', 0x3D), - 'Zelda': (0xC8D557, 0x25338A5, None, 'Special', 0x43), + 'Hyrule Castle Fairy Reward': (0x3480201, None, None, 'NPC', 0x3D), + 'Zoras Fountain Fairy Reward': (0x3480200, None, None, 'NPC', 0x3D), + 'Desert Colossus Fairy Reward': (0x3480202, None, None, 'NPC', 0x3D), + 'Zelda': (0x3480203, None, None, 'NPC', 0x43), 'Treasure Chest Game': (0xBEF152, None, None, 'Special', 0x10), 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), From 22cc4f2927f20d81408107c1f33c69b6ceaf5cc0 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 21 May 2018 23:27:49 -0400 Subject: [PATCH 027/151] Change fairy / light arrow location rules to match other NPCs --- Rules.py | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/Rules.py b/Rules.py index 5dde939f9..78df37f3e 100644 --- a/Rules.py +++ b/Rules.py @@ -392,21 +392,7 @@ def global_rules(world): set_rule(world.get_location('GS99'), lambda state: state.has('Song of Time') and (state.has('Bow') or state.has('Progressive Hookshot') or state.has('Bomb Bag'))) set_rule(world.get_location('GS100'), lambda state: state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Hover Boots'))) - # Prevent progressive items from appearing in places they won't work. - for location in ['Hyrule Castle Fairy Reward', 'Zoras Fountain Fairy Reward', 'Desert Colossus Fairy Reward', 'Zelda']: - forbid_item(world.get_location(location), 'Progressive Hookshot') - forbid_item(world.get_location(location), 'Progressive Strength Upgrade') - forbid_item(world.get_location(location), 'Progressive Scale') - forbid_item(world.get_location(location), 'Progressive Wallet') - forbid_item(world.get_location(location), 'Bow') - forbid_item(world.get_location(location), 'Slingshot') - forbid_item(world.get_location(location), 'Bomb Bag') - forbid_item(world.get_location(location), 'Deku Stick Capacity') - forbid_item(world.get_location(location), 'Deku Nut Capacity') - forbid_item(world.get_location(location), 'Biggoron Sword') - forbid_item(world.get_location(location), 'Ice Trap') - - for location in ['Darunias Joy', 'Diving Minigame', 'Child Fishing', 'Adult Fishing', 'Diving in the Lab', 'Link the Goron', 'King Zora Thawed', 'Dog Lady', 'Skull Kid', 'Ocarina Memory Game', '10 Gold Skulltulla Reward', '20 Gold Skulltulla Reward', '30 Gold Skulltulla Reward', '40 Gold Skulltulla Reward', '50 Gold Skulltulla Reward', 'Man on Roof', 'Frog Ocarina Game', 'Frogs in the Rain', 'Horseback Archery 1000 Points', 'Horseback Archery 1500 Points', 'Child Shooting Gallery', 'Adult Shooting Gallery', 'Target in Woods', 'Deku Theater Skull Mask', 'Deku Theater Mask of Truth', 'Anju as Adult', 'Biggoron', 'Anjus Chickens', 'Talons Chickens', '10 Big Poes', 'Rolling Goron as Child']: + for location in ['Darunias Joy', 'Diving Minigame', 'Child Fishing', 'Adult Fishing', 'Diving in the Lab', 'Link the Goron', 'King Zora Thawed', 'Dog Lady', 'Skull Kid', 'Ocarina Memory Game', '10 Gold Skulltulla Reward', '20 Gold Skulltulla Reward', '30 Gold Skulltulla Reward', '40 Gold Skulltulla Reward', '50 Gold Skulltulla Reward', 'Man on Roof', 'Frog Ocarina Game', 'Frogs in the Rain', 'Horseback Archery 1000 Points', 'Horseback Archery 1500 Points', 'Child Shooting Gallery', 'Adult Shooting Gallery', 'Target in Woods', 'Deku Theater Skull Mask', 'Deku Theater Mask of Truth', 'Anju as Adult', 'Biggoron', 'Anjus Chickens', 'Talons Chickens', '10 Big Poes', 'Rolling Goron as Child', 'Hyrule Castle Fairy Reward', 'Zoras Fountain Fairy Reward', 'Desert Colossus Fairy Reward', 'Zelda']: forbid_item(world.get_location(location), 'Recovery Heart') forbid_item(world.get_location(location), 'Arrows (5)') forbid_item(world.get_location(location), 'Arrows (10)') @@ -422,4 +408,4 @@ def global_rules(world): forbid_item(world.get_location(location), 'Ice Trap') for location in ['Treasure Chest Game']: - forbid_item(world.get_location(location), 'Ice Trap') \ No newline at end of file + forbid_item(world.get_location(location), 'Ice Trap') From 23e2d1d0f5ba95cfeeb6a11c564f7c6e7b2ac29d Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 21 May 2018 23:28:58 -0400 Subject: [PATCH 028/151] Refactor item override system --- BaseClasses.py | 2 +- ItemOverrides.py | 12 ++------ Main.py | 6 ++-- Rom.py | 77 ++++++++++++++++++++++++------------------------ 4 files changed, 45 insertions(+), 52 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index c83ac5e0f..70e4e237f 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -496,7 +496,7 @@ def __init__(self, name='', address=None, address2=None, default=None, type='Che self.name = name self.parent_region = parent self.item = None - self.override_item = None + self.base_item = None self.address = address self.address2 = address2 self.default = default diff --git a/ItemOverrides.py b/ItemOverrides.py index 5b667be2b..47aaee537 100755 --- a/ItemOverrides.py +++ b/ItemOverrides.py @@ -20,12 +20,6 @@ def set_overrides(world): if loc.type == 'Grotto': base_item = "Bombs (20)" - elif (0x89 <= loc.item.index <= 0x91) and (loc.scene == 0x3D or loc.name == "Zelda"): - # Temporary hack: Zelda and Great Fairies can't currently accept extended items, - # so if an extended bottle was placed there, replace it with milk. - loc.item = ItemFactory("Bottle with Milk") - loc.item.location = loc - continue elif loc.item.index >= 0x80: base_item = available_base_items.pop(0) if not base_item: @@ -35,13 +29,11 @@ def set_overrides(world): if (scene is None): raise RuntimeError("Can't place extended item %s in location %s" % (loc.item.name, loc.name)) - loc.override_item = loc.item - loc.item = ItemFactory(base_item) - loc.item.location = loc + loc.base_item = ItemFactory(base_item) def get_overrides(world): filled = world.get_locations() - result = [(loc.scene, loc.item.index, loc.override_item.index) for loc in filled if loc.override_item] + result = [(loc.scene, loc.base_item.index, loc.item.index) for loc in filled if loc.base_item] result.sort() return result diff --git a/Main.py b/Main.py index 65b30c909..55569b791 100644 --- a/Main.py +++ b/Main.py @@ -70,9 +70,6 @@ def main(args, seed=None): outfilebase = 'OoT_%s%s%s%s_%s' % (world.bridge, "-openforest" if world.open_forest else "", "-opendoor" if world.open_door_of_time else "", "-beatableonly" if world.check_beatable_only else "", world.seed) - if args.create_spoiler: - world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase)) - if not args.suppress_rom: set_overrides(world) rom = LocalRom(args.rom) @@ -89,6 +86,9 @@ def main(args, seed=None): else: logger.info('OS not supported for compression') + if args.create_spoiler: + world.spoiler.to_file(output_path('%s_Spoiler.txt' % outfilebase)) + logger.info('Done. Enjoy.') logger.debug('Total Time: %s', time.clock() - start) diff --git a/Rom.py b/Rom.py index 43db58952..0a9770667 100644 --- a/Rom.py +++ b/Rom.py @@ -751,7 +751,8 @@ def patch_rom(world, rom): # patch items for location in world.get_locations(): - itemid = location.item.code + item = location.base_item or location.item + itemid = item.code locationaddress = location.address secondaryaddress = location.address2 @@ -759,91 +760,91 @@ def patch_rom(world, rom): continue if location.type == 'Special': if location.name == 'Treasure Chest Game': - rom.write_bytes(locationaddress, item_data[location.item.name]) + rom.write_bytes(locationaddress, item_data[item.name]) else: - rom.write_byte(locationaddress, item_data[location.item.name][0]) - rom.write_byte(secondaryaddress, item_data[location.item.name][3]) + rom.write_byte(locationaddress, item_data[item.name][0]) + rom.write_byte(secondaryaddress, item_data[item.name][3]) elif location.type == 'Song': rom.write_byte(locationaddress, itemid) itemid = itemid + 0x0D rom.write_byte(secondaryaddress, itemid) if location.name == 'Impa at Castle': - impa_fix = 0x65 - location.item.index + impa_fix = 0x65 - item.index rom.write_byte(0xD12ECB, impa_fix) - impa_fix = 0x8C34 - (location.item.index * 4) + impa_fix = 0x8C34 - (item.index * 4) impa_fix_high = impa_fix >> 8 impa_fix_low = impa_fix & 0x00FF rom.write_bytes(0xB063FE, [impa_fix_high, impa_fix_low]) - rom.write_byte(0x2E8E931, item_data[location.item.name]) #Fix text box + rom.write_byte(0x2E8E931, item_data[item.name]) #Fix text box elif location.name == 'Song from Malon': - if location.item.name == 'Suns Song': + if item.name == 'Suns Song': rom.write_byte(locationaddress, itemid) - malon_fix = 0x8C34 - (location.item.index * 4) + malon_fix = 0x8C34 - (item.index * 4) malon_fix_high = malon_fix >> 8 malon_fix_low = malon_fix & 0x00FF rom.write_bytes(0xD7E142, [malon_fix_high, malon_fix_low]) #rom.write_bytes(0xD7E8D6, [malon_fix_high, malon_fix_low]) # I don't know what this does, may be useful? rom.write_bytes(0xD7E786, [malon_fix_high, malon_fix_low]) - rom.write_byte(0x29BECB9, item_data[location.item.name]) #Fix text box + rom.write_byte(0x29BECB9, item_data[item.name]) #Fix text box elif location.name == 'Song from Composer Grave': - sun_fix = 0x8C34 - (location.item.index * 4) + sun_fix = 0x8C34 - (item.index * 4) sun_fix_high = sun_fix >> 8 sun_fix_low = sun_fix & 0x00FF rom.write_bytes(0xE09F66, [sun_fix_high, sun_fix_low]) - rom.write_byte(0x332A87D, item_data[location.item.name]) #Fix text box + rom.write_byte(0x332A87D, item_data[item.name]) #Fix text box elif location.name == 'Song from Saria': - saria_fix = 0x65 - location.item.index + saria_fix = 0x65 - item.index rom.write_byte(0xE2A02B, saria_fix) - saria_fix = 0x8C34 - (location.item.index * 4) + saria_fix = 0x8C34 - (item.index * 4) saria_fix_high = saria_fix >> 8 saria_fix_low = saria_fix & 0x00FF rom.write_bytes(0xE29382, [saria_fix_high, saria_fix_low]) - rom.write_byte(0x20B1DBD, item_data[location.item.name]) #Fix text box + rom.write_byte(0x20B1DBD, item_data[item.name]) #Fix text box elif location.name == 'Song from Ocarina of Time': - rom.write_byte(0x252FC95, item_data[location.item.name]) #Fix text box + rom.write_byte(0x252FC95, item_data[item.name]) #Fix text box elif location.name == 'Song at Windmill': - windmill_fix = 0x65 - location.item.index + windmill_fix = 0x65 - item.index rom.write_byte(0xE42ABF, windmill_fix) - rom.write_byte(0x3041091, item_data[location.item.name]) #Fix text box + rom.write_byte(0x3041091, item_data[item.name]) #Fix text box elif location.name == 'Sheik Forest Song': - minuet_fix = 0x65 - location.item.index + minuet_fix = 0x65 - item.index rom.write_byte(0xC7BAA3, minuet_fix) - rom.write_byte(0x20B0815, item_data[location.item.name]) #Fix text box + rom.write_byte(0x20B0815, item_data[item.name]) #Fix text box elif location.name == 'Sheik at Temple': - prelude_fix = 0x65 - location.item.index + prelude_fix = 0x65 - item.index rom.write_byte(0xC805EF, prelude_fix) - rom.write_byte(0x2531335, item_data[location.item.name]) #Fix text box + rom.write_byte(0x2531335, item_data[item.name]) #Fix text box elif location.name == 'Sheik in Crater': - bolero_fix = 0x65 - location.item.index + bolero_fix = 0x65 - item.index rom.write_byte(0xC7BC57, bolero_fix) - rom.write_byte(0x224D7FD, item_data[location.item.name]) #Fix text box + rom.write_byte(0x224D7FD, item_data[item.name]) #Fix text box elif location.name == 'Sheik in Ice Cavern': - serenade_fix = 0x65 - location.item.index + serenade_fix = 0x65 - item.index rom.write_byte(0xC7BD77, serenade_fix) - rom.write_byte(0x2BEC895, item_data[location.item.name]) #Fix text box + rom.write_byte(0x2BEC895, item_data[item.name]) #Fix text box elif location.name == 'Sheik in Kakariko': - nocturne_fix = 0x65 - location.item.index + nocturne_fix = 0x65 - item.index rom.write_byte(0xAC9A5B, nocturne_fix) - rom.write_byte(0x2000FED, item_data[location.item.name]) #Fix text box + rom.write_byte(0x2000FED, item_data[item.name]) #Fix text box elif location.name == 'Sheik at Colossus': - rom.write_byte(0x218C589, item_data[location.item.name]) #Fix text box + rom.write_byte(0x218C589, item_data[item.name]) #Fix text box elif location.type == 'NPC': - rom.write_byte(locationaddress, location.item.index) + rom.write_byte(locationaddress, item.index) if secondaryaddress is not None: - rom.write_byte(secondaryaddress, location.item.index) + rom.write_byte(secondaryaddress, item.index) elif location.type == 'Boss': if location.name == 'Links Pocket': - rom.write_byte(locationaddress, item_data[location.item.name][0]) - rom.write_byte(secondaryaddress, item_data[location.item.name][1]) + rom.write_byte(locationaddress, item_data[item.name][0]) + rom.write_byte(secondaryaddress, item_data[item.name][1]) else: rom.write_byte(locationaddress, itemid) - rom.write_byte(secondaryaddress, item_data[location.item.name][2]) + rom.write_byte(secondaryaddress, item_data[item.name][2]) if location.name == 'Bongo Bongo': - rom.write_bytes(0xCA3F32, [item_data[location.item.name][3][0], item_data[location.item.name][3][1]]) - rom.write_bytes(0xCA3F36, [item_data[location.item.name][3][2], item_data[location.item.name][3][3]]) + rom.write_bytes(0xCA3F32, [item_data[item.name][3][0], item_data[item.name][3][1]]) + rom.write_bytes(0xCA3F36, [item_data[item.name][3][2], item_data[item.name][3][3]]) elif location.name == 'Twinrova': - rom.write_bytes(0xCA3EA2, [item_data[location.item.name][3][0], item_data[location.item.name][3][1]]) - rom.write_bytes(0xCA3EA6, [item_data[location.item.name][3][2], item_data[location.item.name][3][3]]) + rom.write_bytes(0xCA3EA2, [item_data[item.name][3][0], item_data[item.name][3][1]]) + rom.write_bytes(0xCA3EA6, [item_data[item.name][3][2], item_data[item.name][3][3]]) elif location.type == 'Grotto': pass # These must be handled with overrides else: From 21623d89588b9679b0eb73b48330aa9cacb15d05 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 21 May 2018 23:39:20 -0400 Subject: [PATCH 029/151] Merge upstream into extended-items --- Compress/Compress | Bin 22584 -> 50688 bytes Compress/Compress.exe | Bin Compress/Compress.out | Bin Decompress/Decompress | Bin 13552 -> 23040 bytes Decompress/Decompress.exe | Bin Decompress/Decompress.out | Bin Notes/OoT_hex_edit.txt | 242 +++++++++++++++++++++++++++++++++++++- README.md | 26 ++-- 8 files changed, 254 insertions(+), 14 deletions(-) mode change 100644 => 100755 Compress/Compress mode change 100644 => 100755 Compress/Compress.exe mode change 100644 => 100755 Compress/Compress.out mode change 100644 => 100755 Decompress/Decompress mode change 100644 => 100755 Decompress/Decompress.exe mode change 100644 => 100755 Decompress/Decompress.out diff --git a/Compress/Compress b/Compress/Compress old mode 100644 new mode 100755 index 1386ef9776b14f16380a349be5d4eb32cc90ddc6..5698756fe02838d606db2d10376b5098f8903bd2 GIT binary patch literal 50688 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 Qt|i;rn-`{K={gVm2MVy)xBvhE literal 22584 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 diff --git a/Compress/Compress.exe b/Compress/Compress.exe old mode 100644 new mode 100755 diff --git a/Compress/Compress.out b/Compress/Compress.out old mode 100644 new mode 100755 diff --git a/Decompress/Decompress b/Decompress/Decompress old mode 100644 new mode 100755 index f5be39060dfd83415b132ff52787dbc9d0f09004..7f46ff6a6c8512396de2841b01367bb7dc0f83e9 GIT binary patch literal 23040 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 Date: Thu, 24 May 2018 05:30:29 -0400 Subject: [PATCH 030/151] Fix bug in pending item code --- ASM/src/items.asm | 16 +++++++++++++--- data/base2current.json | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 2c78069f2..d196bf2f3 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -150,13 +150,23 @@ every_frame: sw v1, 0x10 (sp) sw ra, 0x14 (sp) + ; If there is a pending item, try to make the player instance receive it. If the player has + ; control on this frame, they will receive the item. Otherwise nothing will happen, and + ; we try again next frame. li t0, PENDING_SPECIAL_ITEM lb t0, 0x00 (t0) beqz t0, @@no_pending_item nop - li t1, PLAYER_ACTOR - sb t0, 0x0424 (t1) - sw t1, 0x0428 (t1) + ; PLAYER_ACTOR+0x0424 holds the item to be received. +0x0428 holds a pointer to the actor + ; giving the item. The game is not picky about this actor, it just needs to read a non-zero + ; value at actor+0x0130, and it overwrites actor+0x0118. Construct a dummy actor in an usused + ; memory area to satisfy these requirements. + li t1, 0x80410000 + li t2, 1 + sw t2, 0x130 (t1) + li t2, PLAYER_ACTOR + sb t0, 0x0424 (t2) + sw t1, 0x0428 (t2) jal store_item_data nop @@no_pending_item: diff --git a/data/base2current.json b/data/base2current.json index 0cadc16f5..02d7cb7cc 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 41]}, {"11325064": [12, 16, 3, 33, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 3, 245]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 96, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 103, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 110, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 89, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 176]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427412": [12, 16, 2, 132]}, {"12427480": [12, 16, 2, 156]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 160]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12474768": [12, 16, 2, 227, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 189]}, {"12491480": [12, 16, 2, 199]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 255]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 16, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 44, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 84, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 124, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 164, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 204, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 14, 232, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 15, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 60, 128, 64, 15, 32]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 84, 128, 64, 14, 8]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 144, 128, 64, 14, 8]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 144, 128, 64, 14, 8]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 144, 128, 64, 14, 8]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 172, 128, 64, 14, 8]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 68, 128, 64, 14, 8, 147, 25]}, {"55051623": [116, 52, 1]}, {"55051627": [255, 23, 33]}, {"55051631": [2]}, {"55051636": [52, 25]}, {"55051639": [44, 3, 224]}, {"55051643": [8, 167, 185]}, {"55051647": [154, 147, 44]}, {"55051651": [116, 52, 1]}, {"55051655": [255, 21, 129]}, {"55051659": [2]}, {"55051664": [52, 12]}, {"55051667": [44, 3, 224]}, {"55051671": [8]}, {"55051676": [145, 174]}, {"55051679": [116, 52, 1]}, {"55051683": [255, 21, 193]}, {"55051687": [2]}, {"55051692": [52, 14]}, {"55051695": [44, 3, 224]}, {"55051699": [8, 167, 174]}, {"55051703": [154, 145, 207]}, {"55051707": [116, 52, 1]}, {"55051711": [255, 21, 225]}, {"55051715": [2]}, {"55051720": [52, 15]}, {"55051723": [44, 3, 224]}, {"55051727": [8, 167, 175]}, {"55051731": [154]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052827": [44, 20, 65]}, {"55052831": [3, 129, 9]}, {"55052835": [156, 49, 41]}, {"55052839": [253, 161, 9]}, {"55052843": [156, 52, 1]}, {"55052847": [45, 20, 65]}, {"55052851": [3, 129, 9]}, {"55052855": [156, 49, 41]}, {"55052859": [251, 161, 9]}, {"55052863": [156, 52, 1]}, {"55052867": [41, 20, 65]}, {"55052871": [3, 129, 9]}, {"55052875": [157, 49, 41]}, {"55052879": [239, 161, 9]}, {"55052883": [157, 52, 1]}, {"55052887": [42, 20, 65]}, {"55052891": [3, 129, 9]}, {"55052895": [157, 49, 41]}, {"55052899": [223, 161, 9]}, {"55052903": [157, 3, 224]}, {"55052907": [8, 1, 248, 48, 33, 143, 166]}, {"55052915": [48, 132, 197]}, {"55052919": [4, 8, 16, 2, 164]}, {"55052928": [143, 185]}, {"55052931": [44, 135, 37]}, {"55052935": [4, 8, 16, 2, 164]}, {"55052944": [60, 10, 128, 64, 37, 74, 10]}, {"55052952": [149, 75]}, {"55052955": [4, 52, 1, 255, 255, 17, 97]}, {"55052963": [2]}, {"55052968": [53, 101]}, {"55052972": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052984": [3, 224]}, {"55052987": [8]}, {"55052992": [60, 8, 128, 64, 37, 8, 10]}, {"55053000": [129, 9]}, {"55053003": [2, 36, 1, 255, 255, 17, 33]}, {"55053011": [2]}, {"55053016": [53, 35]}, {"55053021": [3, 15, 195]}, {"55053025": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053039": [8]}, {"55053044": [144, 69]}, {"55053047": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053056": [145, 9]}, {"55053059": [3, 52, 1]}, {"55053063": [255, 17, 33]}, {"55053067": [2]}, {"55053072": [53, 37]}, {"55053076": [3, 224]}, {"55053079": [8]}, {"55053084": [143, 162]}, {"55053087": [36, 144, 69]}, {"55053092": [60, 8, 128, 64, 37, 8, 10]}, {"55053100": [149, 9]}, {"55053104": [52, 1, 255, 255, 17, 33]}, {"55053111": [19]}, {"55053116": [53, 37]}, {"55053120": [175, 164]}, {"55053124": [175, 165]}, {"55053127": [4, 175, 166]}, {"55053131": [8, 39, 189, 255, 232, 175, 191]}, {"55053139": [16, 141, 9]}, {"55053143": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053155": [6, 145, 6]}, {"55053159": [7, 1, 32, 248, 9]}, {"55053168": [143, 191]}, {"55053171": [16, 39, 189]}, {"55053175": [24, 143, 164]}, {"55053180": [143, 165]}, {"55053183": [4, 143, 166]}, {"55053187": [8, 3, 224]}, {"55053191": [8]}, {"55053196": [175, 164]}, {"55053199": [104, 175, 165]}, {"55053203": [108, 175, 166]}, {"55053207": [112, 175, 167]}, {"55053211": [116, 39, 189, 255, 232, 175, 163]}, {"55053219": [16, 175, 191]}, {"55053223": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55053236": [17]}, {"55053239": [7]}, {"55053244": [60, 9, 128, 30, 37, 41, 170, 48, 161, 40, 4, 36, 173, 41, 4, 40, 12, 16, 3, 52]}, {"55053268": [143, 163]}, {"55053271": [16, 143, 191]}, {"55053275": [20, 39, 189]}, {"55053279": [24, 143, 164]}, {"55053283": [104, 143, 165]}, {"55053287": [108, 143, 166]}, {"55053291": [112, 143, 167]}, {"55053295": [116, 132, 110, 19, 196, 3, 224]}, {"55053303": [8]}, {"55053308": [140, 136, 29, 44, 52, 9]}, {"55053315": [1]}, {"55053317": [9, 78]}, {"55053320": [1, 9, 16, 36, 16, 64]}, {"55053327": [27]}, {"55053332": [148, 138]}, {"55053335": [164, 52, 1]}, {"55053339": [61, 21, 65]}, {"55053343": [23]}, {"55053348": [148, 202, 2, 220, 52, 11]}, {"55053355": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053379": [14]}, {"55053384": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053412": [1, 10, 64, 33, 129, 8]}, {"55053420": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053432": [52, 2]}, {"55053436": [3, 224]}, {"55053439": [8]}, {"55053444": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053456": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053468": [3, 224]}, {"55053471": [8]}, {"55053476": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053487": [16, 175, 191]}, {"55053491": [20, 12, 16, 3, 52]}, {"55053500": [143, 162]}, {"55053503": [16, 143, 191]}, {"55053507": [20, 39, 189]}, {"55053511": [24, 3, 224]}, {"55053515": [8]}, {"55053520": [39, 189, 255, 216, 175, 176]}, {"55053527": [16, 175, 177]}, {"55053531": [20, 175, 178]}, {"55053535": [24, 175, 191]}, {"55053539": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053555": [62]}, {"55053557": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053580": [173, 40]}, {"55053584": [173, 40]}, {"55053587": [4, 173, 40]}, {"55053591": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053603": [164, 52, 1]}, {"55053607": [62, 21, 1]}, {"55053611": [6]}, {"55053616": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053631": [31, 37, 8]}, {"55053635": [112]}, {"55053637": [8, 66]}, {"55053640": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053655": [4, 149, 42]}, {"55053660": [17, 64]}, {"55053663": [30]}, {"55053668": [21, 72, 255, 251]}, {"55053676": [149, 48]}, {"55053679": [2, 54, 2]}, {"55053684": [52, 80]}, {"55053688": [38, 8, 255, 128, 5]}, {"55053695": [22]}, {"55053700": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053709": [8, 65]}, {"55053712": [2, 72, 144, 33, 142, 72]}, {"55053719": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053730": [248, 9]}, {"55053736": [20, 80, 255, 242]}, {"55053744": [60, 10, 128, 64, 37, 74, 10]}, {"55053752": [142, 75]}, {"55053756": [173, 75]}, {"55053760": [142, 75]}, {"55053763": [4, 173, 75]}, {"55053767": [4, 142, 75]}, {"55053771": [8, 173, 75]}, {"55053775": [8, 16]}, {"55053779": [6]}, {"55053784": [130, 40, 4, 36, 5, 1]}, {"55053791": [2]}, {"55053797": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053807": [16, 143, 177]}, {"55053811": [20, 143, 178]}, {"55053815": [24, 143, 191]}, {"55053819": [32, 39, 189]}, {"55053823": [40, 3, 224]}, {"55053827": [8]}, {"55053832": [3, 224]}, {"55053835": [8, 54, 2]}, {"55053840": [144, 136]}, {"55053843": [125, 52, 1]}, {"55053847": [255, 17, 1]}, {"55053851": [2, 52, 2]}, {"55053855": [8, 52, 2]}, {"55053859": [9, 3, 224]}, {"55053863": [8]}, {"55053868": [144, 136]}, {"55053871": [163, 49, 8]}, {"55053875": [192, 17]}, {"55053879": [5, 52, 2]}, {"55053883": [84, 52, 1]}, {"55053887": [64, 17, 1]}, {"55053891": [2, 52, 2]}, {"55053895": [53, 52, 2]}, {"55053899": [54, 3, 224]}, {"55053903": [8]}, {"55053908": [144, 136]}, {"55053911": [163, 49, 8]}, {"55053915": [24, 17]}, {"55053919": [5, 52, 2]}, {"55053923": [50, 52, 1]}, {"55053927": [8, 17, 1]}, {"55053931": [2, 52, 2]}, {"55053935": [51, 52, 2]}, {"55053939": [52, 3, 224]}, {"55053943": [8]}, {"55053948": [144, 136]}, {"55053951": [163, 49, 8]}, {"55053955": [3, 17]}, {"55053959": [5, 52, 2]}, {"55053963": [4, 52, 1]}, {"55053967": [1, 17, 1]}, {"55053971": [2, 52, 2]}, {"55053975": [48, 52, 2]}, {"55053979": [49, 3, 224]}, {"55053983": [8]}, {"55053988": [144, 136]}, {"55053991": [162, 49, 8]}, {"55053995": [192, 17]}, {"55053999": [5, 52, 2]}, {"55054003": [5, 52, 1]}, {"55054007": [64, 17, 1]}, {"55054011": [2, 52, 2]}, {"55054015": [96, 52, 2]}, {"55054019": [123, 3, 224]}, {"55054023": [8]}, {"55054028": [144, 136]}, {"55054031": [162, 49, 8]}, {"55054035": [48, 17]}, {"55054039": [2, 52, 2]}, {"55054043": [69, 52, 2]}, {"55054047": [70, 3, 224]}, {"55054051": [8]}, {"55054056": [144, 136]}, {"55054059": [162, 49, 8]}, {"55054063": [6, 17]}, {"55054067": [2, 52, 2]}, {"55054071": [55, 52, 2]}, {"55054075": [56, 3, 224]}, {"55054079": [8]}, {"55054084": [144, 136]}, {"55054087": [161, 49, 8]}, {"55054091": [48, 17]}, {"55054095": [2, 52, 2]}, {"55054099": [121, 52, 2]}, {"55054103": [122, 3, 224]}, {"55054107": [8]}, {"55054112": [144, 136]}, {"55054115": [161, 49, 8]}, {"55054119": [6, 17]}, {"55054123": [2, 52, 2]}, {"55054127": [119, 52, 2]}, {"55054131": [120, 3, 224]}, {"55054135": [8]}, {"55054140": [3, 224]}, {"55054143": [8]}, {"55054148": [52, 8]}, {"55054151": [1, 160, 136]}, {"55054155": [62, 3, 224]}, {"55054159": [8]}, {"55054164": [36, 136]}, {"55054167": [134, 36, 9, 255, 255, 37, 41]}, {"55054175": [1, 52, 1]}, {"55054179": [3]}, {"55054181": [41, 8, 42, 20, 32]}, {"55054187": [7]}, {"55054192": [1, 9, 80, 33, 145, 75]}, {"55054200": [52, 1]}, {"55054203": [255, 21, 97, 255, 247]}, {"55054212": [161, 69]}, {"55054216": [3, 224]}, {"55054219": [8]}, {"55054224": [36, 136]}, {"55054227": [168, 1, 6, 64, 33, 145, 9]}, {"55054236": [1, 37, 72, 37, 161, 9]}, {"55054244": [3, 224]}, {"55054247": [8]}, {"55054252": [36, 136]}, {"55054255": [188, 1, 5, 64, 33, 129, 9]}, {"55054264": [5, 33]}, {"55054267": [2]}, {"55054272": [52, 9]}, {"55054276": [37, 41]}, {"55054279": [1, 161, 9]}, {"55054284": [3, 224]}, {"55054287": [8]}, {"55054292": [141, 1]}, {"55054295": [4, 16, 32]}, {"55054299": [3]}, {"55054304": [145, 1]}, {"55054307": [104, 161, 1]}, {"55054311": [64, 3, 224]}, {"55054315": [8, 161, 14]}, {"55054319": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 44]}, {"11325064": [12, 16, 3, 36, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 3, 248]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 96, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 103, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 110, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 89, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 176]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427412": [12, 16, 2, 132]}, {"12427480": [12, 16, 2, 156]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 160]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12474768": [12, 16, 2, 227, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 189]}, {"12491480": [12, 16, 2, 199]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 3, 2]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 28, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 56, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 96, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 136, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 176, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 216, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 244, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 15, 16, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 15, 44]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 156, 128, 64, 14, 20]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 156, 128, 64, 14, 20]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 80, 128, 64, 14, 20, 147, 25]}, {"55051623": [116, 52, 1]}, {"55051627": [255, 23, 33]}, {"55051631": [2]}, {"55051636": [52, 25]}, {"55051639": [44, 3, 224]}, {"55051643": [8, 167, 185]}, {"55051647": [154, 147, 44]}, {"55051651": [116, 52, 1]}, {"55051655": [255, 21, 129]}, {"55051659": [2]}, {"55051664": [52, 12]}, {"55051667": [44, 3, 224]}, {"55051671": [8]}, {"55051676": [145, 174]}, {"55051679": [116, 52, 1]}, {"55051683": [255, 21, 193]}, {"55051687": [2]}, {"55051692": [52, 14]}, {"55051695": [44, 3, 224]}, {"55051699": [8, 167, 174]}, {"55051703": [154, 145, 207]}, {"55051707": [116, 52, 1]}, {"55051711": [255, 21, 225]}, {"55051715": [2]}, {"55051720": [52, 15]}, {"55051723": [44, 3, 224]}, {"55051727": [8, 167, 175]}, {"55051731": [154]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052827": [44, 20, 65]}, {"55052831": [3, 129, 9]}, {"55052835": [156, 49, 41]}, {"55052839": [253, 161, 9]}, {"55052843": [156, 52, 1]}, {"55052847": [45, 20, 65]}, {"55052851": [3, 129, 9]}, {"55052855": [156, 49, 41]}, {"55052859": [251, 161, 9]}, {"55052863": [156, 52, 1]}, {"55052867": [41, 20, 65]}, {"55052871": [3, 129, 9]}, {"55052875": [157, 49, 41]}, {"55052879": [239, 161, 9]}, {"55052883": [157, 52, 1]}, {"55052887": [42, 20, 65]}, {"55052891": [3, 129, 9]}, {"55052895": [157, 49, 41]}, {"55052899": [223, 161, 9]}, {"55052903": [157, 3, 224]}, {"55052907": [8, 1, 248, 48, 33, 143, 166]}, {"55052915": [48, 132, 197]}, {"55052919": [4, 8, 16, 2, 164]}, {"55052928": [143, 185]}, {"55052931": [44, 135, 37]}, {"55052935": [4, 8, 16, 2, 164]}, {"55052944": [60, 10, 128, 64, 37, 74, 10]}, {"55052952": [149, 75]}, {"55052955": [4, 52, 1, 255, 255, 17, 97]}, {"55052963": [2]}, {"55052968": [53, 101]}, {"55052972": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052984": [3, 224]}, {"55052987": [8]}, {"55052992": [60, 8, 128, 64, 37, 8, 10]}, {"55053000": [129, 9]}, {"55053003": [2, 36, 1, 255, 255, 17, 33]}, {"55053011": [2]}, {"55053016": [53, 35]}, {"55053021": [3, 15, 195]}, {"55053025": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053039": [8]}, {"55053044": [144, 69]}, {"55053047": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053056": [145, 9]}, {"55053059": [3, 52, 1]}, {"55053063": [255, 17, 33]}, {"55053067": [2]}, {"55053072": [53, 37]}, {"55053076": [3, 224]}, {"55053079": [8]}, {"55053084": [143, 162]}, {"55053087": [36, 144, 69]}, {"55053092": [60, 8, 128, 64, 37, 8, 10]}, {"55053100": [149, 9]}, {"55053104": [52, 1, 255, 255, 17, 33]}, {"55053111": [19]}, {"55053116": [53, 37]}, {"55053120": [175, 164]}, {"55053124": [175, 165]}, {"55053127": [4, 175, 166]}, {"55053131": [8, 39, 189, 255, 232, 175, 191]}, {"55053139": [16, 141, 9]}, {"55053143": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053155": [6, 145, 6]}, {"55053159": [7, 1, 32, 248, 9]}, {"55053168": [143, 191]}, {"55053171": [16, 39, 189]}, {"55053175": [24, 143, 164]}, {"55053180": [143, 165]}, {"55053183": [4, 143, 166]}, {"55053187": [8, 3, 224]}, {"55053191": [8]}, {"55053196": [175, 164]}, {"55053199": [104, 175, 165]}, {"55053203": [108, 175, 166]}, {"55053207": [112, 175, 167]}, {"55053211": [116, 39, 189, 255, 232, 175, 163]}, {"55053219": [16, 175, 191]}, {"55053223": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55053236": [17]}, {"55053239": [10]}, {"55053244": [60, 9, 128, 65, 52, 10]}, {"55053251": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 55]}, {"55053280": [143, 163]}, {"55053283": [16, 143, 191]}, {"55053287": [20, 39, 189]}, {"55053291": [24, 143, 164]}, {"55053295": [104, 143, 165]}, {"55053299": [108, 143, 166]}, {"55053303": [112, 143, 167]}, {"55053307": [116, 132, 110, 19, 196, 3, 224]}, {"55053315": [8]}, {"55053320": [140, 136, 29, 44, 52, 9]}, {"55053327": [1]}, {"55053329": [9, 78]}, {"55053332": [1, 9, 16, 36, 16, 64]}, {"55053339": [27]}, {"55053344": [148, 138]}, {"55053347": [164, 52, 1]}, {"55053351": [61, 21, 65]}, {"55053355": [23]}, {"55053360": [148, 202, 2, 220, 52, 11]}, {"55053367": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053391": [14]}, {"55053396": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053424": [1, 10, 64, 33, 129, 8]}, {"55053432": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053444": [52, 2]}, {"55053448": [3, 224]}, {"55053451": [8]}, {"55053456": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053468": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053480": [3, 224]}, {"55053483": [8]}, {"55053488": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053499": [16, 175, 191]}, {"55053503": [20, 12, 16, 3, 55]}, {"55053512": [143, 162]}, {"55053515": [16, 143, 191]}, {"55053519": [20, 39, 189]}, {"55053523": [24, 3, 224]}, {"55053527": [8]}, {"55053532": [39, 189, 255, 216, 175, 176]}, {"55053539": [16, 175, 177]}, {"55053543": [20, 175, 178]}, {"55053547": [24, 175, 191]}, {"55053551": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053567": [62]}, {"55053569": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053592": [173, 40]}, {"55053596": [173, 40]}, {"55053599": [4, 173, 40]}, {"55053603": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053615": [164, 52, 1]}, {"55053619": [62, 21, 1]}, {"55053623": [6]}, {"55053628": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053643": [31, 37, 8]}, {"55053647": [112]}, {"55053649": [8, 66]}, {"55053652": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053667": [4, 149, 42]}, {"55053672": [17, 64]}, {"55053675": [30]}, {"55053680": [21, 72, 255, 251]}, {"55053688": [149, 48]}, {"55053691": [2, 54, 2]}, {"55053696": [52, 80]}, {"55053700": [38, 8, 255, 128, 5]}, {"55053707": [22]}, {"55053712": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053721": [8, 65]}, {"55053724": [2, 72, 144, 33, 142, 72]}, {"55053731": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053742": [248, 9]}, {"55053748": [20, 80, 255, 242]}, {"55053756": [60, 10, 128, 64, 37, 74, 10]}, {"55053764": [142, 75]}, {"55053768": [173, 75]}, {"55053772": [142, 75]}, {"55053775": [4, 173, 75]}, {"55053779": [4, 142, 75]}, {"55053783": [8, 173, 75]}, {"55053787": [8, 16]}, {"55053791": [6]}, {"55053796": [130, 40, 4, 36, 5, 1]}, {"55053803": [2]}, {"55053809": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053819": [16, 143, 177]}, {"55053823": [20, 143, 178]}, {"55053827": [24, 143, 191]}, {"55053831": [32, 39, 189]}, {"55053835": [40, 3, 224]}, {"55053839": [8]}, {"55053844": [3, 224]}, {"55053847": [8, 54, 2]}, {"55053852": [144, 136]}, {"55053855": [125, 52, 1]}, {"55053859": [255, 17, 1]}, {"55053863": [2, 52, 2]}, {"55053867": [8, 52, 2]}, {"55053871": [9, 3, 224]}, {"55053875": [8]}, {"55053880": [144, 136]}, {"55053883": [163, 49, 8]}, {"55053887": [192, 17]}, {"55053891": [5, 52, 2]}, {"55053895": [84, 52, 1]}, {"55053899": [64, 17, 1]}, {"55053903": [2, 52, 2]}, {"55053907": [53, 52, 2]}, {"55053911": [54, 3, 224]}, {"55053915": [8]}, {"55053920": [144, 136]}, {"55053923": [163, 49, 8]}, {"55053927": [24, 17]}, {"55053931": [5, 52, 2]}, {"55053935": [50, 52, 1]}, {"55053939": [8, 17, 1]}, {"55053943": [2, 52, 2]}, {"55053947": [51, 52, 2]}, {"55053951": [52, 3, 224]}, {"55053955": [8]}, {"55053960": [144, 136]}, {"55053963": [163, 49, 8]}, {"55053967": [3, 17]}, {"55053971": [5, 52, 2]}, {"55053975": [4, 52, 1]}, {"55053979": [1, 17, 1]}, {"55053983": [2, 52, 2]}, {"55053987": [48, 52, 2]}, {"55053991": [49, 3, 224]}, {"55053995": [8]}, {"55054000": [144, 136]}, {"55054003": [162, 49, 8]}, {"55054007": [192, 17]}, {"55054011": [5, 52, 2]}, {"55054015": [5, 52, 1]}, {"55054019": [64, 17, 1]}, {"55054023": [2, 52, 2]}, {"55054027": [96, 52, 2]}, {"55054031": [123, 3, 224]}, {"55054035": [8]}, {"55054040": [144, 136]}, {"55054043": [162, 49, 8]}, {"55054047": [48, 17]}, {"55054051": [2, 52, 2]}, {"55054055": [69, 52, 2]}, {"55054059": [70, 3, 224]}, {"55054063": [8]}, {"55054068": [144, 136]}, {"55054071": [162, 49, 8]}, {"55054075": [6, 17]}, {"55054079": [2, 52, 2]}, {"55054083": [55, 52, 2]}, {"55054087": [56, 3, 224]}, {"55054091": [8]}, {"55054096": [144, 136]}, {"55054099": [161, 49, 8]}, {"55054103": [48, 17]}, {"55054107": [2, 52, 2]}, {"55054111": [121, 52, 2]}, {"55054115": [122, 3, 224]}, {"55054119": [8]}, {"55054124": [144, 136]}, {"55054127": [161, 49, 8]}, {"55054131": [6, 17]}, {"55054135": [2, 52, 2]}, {"55054139": [119, 52, 2]}, {"55054143": [120, 3, 224]}, {"55054147": [8]}, {"55054152": [3, 224]}, {"55054155": [8]}, {"55054160": [52, 8]}, {"55054163": [1, 160, 136]}, {"55054167": [62, 3, 224]}, {"55054171": [8]}, {"55054176": [36, 136]}, {"55054179": [134, 36, 9, 255, 255, 37, 41]}, {"55054187": [1, 52, 1]}, {"55054191": [3]}, {"55054193": [41, 8, 42, 20, 32]}, {"55054199": [7]}, {"55054204": [1, 9, 80, 33, 145, 75]}, {"55054212": [52, 1]}, {"55054215": [255, 21, 97, 255, 247]}, {"55054224": [161, 69]}, {"55054228": [3, 224]}, {"55054231": [8]}, {"55054236": [36, 136]}, {"55054239": [168, 1, 6, 64, 33, 145, 9]}, {"55054248": [1, 37, 72, 37, 161, 9]}, {"55054256": [3, 224]}, {"55054259": [8]}, {"55054264": [36, 136]}, {"55054267": [188, 1, 5, 64, 33, 129, 9]}, {"55054276": [5, 33]}, {"55054279": [2]}, {"55054284": [52, 9]}, {"55054288": [37, 41]}, {"55054291": [1, 161, 9]}, {"55054296": [3, 224]}, {"55054299": [8]}, {"55054304": [141, 1]}, {"55054307": [4, 16, 32]}, {"55054311": [3]}, {"55054316": [145, 1]}, {"55054319": [104, 161, 1]}, {"55054323": [64, 3, 224]}, {"55054327": [8, 161, 14]}, {"55054331": [104]}] \ No newline at end of file From b2dd34c072220cfc7a8aa1402049bd6b6d7410bc Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 24 May 2018 06:02:40 -0400 Subject: [PATCH 031/151] Add quick chest opening hack --- ASM/src/hacks.asm | 8 +++++++- data/base2current.json | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index b249f95a5..1bd4a0222 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -1,3 +1,9 @@ +; Make all chest opening animations fast +; Replaces: +; lb t2, 0x0002 (t1) +.org 0xBDA2E8 ; In memory: 0x803952D8 + addiu t2, r0, -1 + ;================================================================================================== ; Remove free Kokiri Sword ;================================================================================================== @@ -226,4 +232,4 @@ ; sh t9, 0x009A (sp) .org 0xBB7C58 ; In memory: 0x8038F5D8 jal item_menu_description_id_periodic - nop \ No newline at end of file + nop diff --git a/data/base2current.json b/data/base2current.json index 02d7cb7cc..533eb090b 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 44]}, {"11325064": [12, 16, 3, 36, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 3, 248]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 96, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 103, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 110, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 89, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 176]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427412": [12, 16, 2, 132]}, {"12427480": [12, 16, 2, 156]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 160]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12474768": [12, 16, 2, 227, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 189]}, {"12491480": [12, 16, 2, 199]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 3, 2]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 28, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 56, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 96, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 136, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 176, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 216, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 244, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 15, 16, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 15, 44]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 156, 128, 64, 14, 20]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 156, 128, 64, 14, 20]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 80, 128, 64, 14, 20, 147, 25]}, {"55051623": [116, 52, 1]}, {"55051627": [255, 23, 33]}, {"55051631": [2]}, {"55051636": [52, 25]}, {"55051639": [44, 3, 224]}, {"55051643": [8, 167, 185]}, {"55051647": [154, 147, 44]}, {"55051651": [116, 52, 1]}, {"55051655": [255, 21, 129]}, {"55051659": [2]}, {"55051664": [52, 12]}, {"55051667": [44, 3, 224]}, {"55051671": [8]}, {"55051676": [145, 174]}, {"55051679": [116, 52, 1]}, {"55051683": [255, 21, 193]}, {"55051687": [2]}, {"55051692": [52, 14]}, {"55051695": [44, 3, 224]}, {"55051699": [8, 167, 174]}, {"55051703": [154, 145, 207]}, {"55051707": [116, 52, 1]}, {"55051711": [255, 21, 225]}, {"55051715": [2]}, {"55051720": [52, 15]}, {"55051723": [44, 3, 224]}, {"55051727": [8, 167, 175]}, {"55051731": [154]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052827": [44, 20, 65]}, {"55052831": [3, 129, 9]}, {"55052835": [156, 49, 41]}, {"55052839": [253, 161, 9]}, {"55052843": [156, 52, 1]}, {"55052847": [45, 20, 65]}, {"55052851": [3, 129, 9]}, {"55052855": [156, 49, 41]}, {"55052859": [251, 161, 9]}, {"55052863": [156, 52, 1]}, {"55052867": [41, 20, 65]}, {"55052871": [3, 129, 9]}, {"55052875": [157, 49, 41]}, {"55052879": [239, 161, 9]}, {"55052883": [157, 52, 1]}, {"55052887": [42, 20, 65]}, {"55052891": [3, 129, 9]}, {"55052895": [157, 49, 41]}, {"55052899": [223, 161, 9]}, {"55052903": [157, 3, 224]}, {"55052907": [8, 1, 248, 48, 33, 143, 166]}, {"55052915": [48, 132, 197]}, {"55052919": [4, 8, 16, 2, 164]}, {"55052928": [143, 185]}, {"55052931": [44, 135, 37]}, {"55052935": [4, 8, 16, 2, 164]}, {"55052944": [60, 10, 128, 64, 37, 74, 10]}, {"55052952": [149, 75]}, {"55052955": [4, 52, 1, 255, 255, 17, 97]}, {"55052963": [2]}, {"55052968": [53, 101]}, {"55052972": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052984": [3, 224]}, {"55052987": [8]}, {"55052992": [60, 8, 128, 64, 37, 8, 10]}, {"55053000": [129, 9]}, {"55053003": [2, 36, 1, 255, 255, 17, 33]}, {"55053011": [2]}, {"55053016": [53, 35]}, {"55053021": [3, 15, 195]}, {"55053025": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053039": [8]}, {"55053044": [144, 69]}, {"55053047": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053056": [145, 9]}, {"55053059": [3, 52, 1]}, {"55053063": [255, 17, 33]}, {"55053067": [2]}, {"55053072": [53, 37]}, {"55053076": [3, 224]}, {"55053079": [8]}, {"55053084": [143, 162]}, {"55053087": [36, 144, 69]}, {"55053092": [60, 8, 128, 64, 37, 8, 10]}, {"55053100": [149, 9]}, {"55053104": [52, 1, 255, 255, 17, 33]}, {"55053111": [19]}, {"55053116": [53, 37]}, {"55053120": [175, 164]}, {"55053124": [175, 165]}, {"55053127": [4, 175, 166]}, {"55053131": [8, 39, 189, 255, 232, 175, 191]}, {"55053139": [16, 141, 9]}, {"55053143": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053155": [6, 145, 6]}, {"55053159": [7, 1, 32, 248, 9]}, {"55053168": [143, 191]}, {"55053171": [16, 39, 189]}, {"55053175": [24, 143, 164]}, {"55053180": [143, 165]}, {"55053183": [4, 143, 166]}, {"55053187": [8, 3, 224]}, {"55053191": [8]}, {"55053196": [175, 164]}, {"55053199": [104, 175, 165]}, {"55053203": [108, 175, 166]}, {"55053207": [112, 175, 167]}, {"55053211": [116, 39, 189, 255, 232, 175, 163]}, {"55053219": [16, 175, 191]}, {"55053223": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55053236": [17]}, {"55053239": [10]}, {"55053244": [60, 9, 128, 65, 52, 10]}, {"55053251": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 55]}, {"55053280": [143, 163]}, {"55053283": [16, 143, 191]}, {"55053287": [20, 39, 189]}, {"55053291": [24, 143, 164]}, {"55053295": [104, 143, 165]}, {"55053299": [108, 143, 166]}, {"55053303": [112, 143, 167]}, {"55053307": [116, 132, 110, 19, 196, 3, 224]}, {"55053315": [8]}, {"55053320": [140, 136, 29, 44, 52, 9]}, {"55053327": [1]}, {"55053329": [9, 78]}, {"55053332": [1, 9, 16, 36, 16, 64]}, {"55053339": [27]}, {"55053344": [148, 138]}, {"55053347": [164, 52, 1]}, {"55053351": [61, 21, 65]}, {"55053355": [23]}, {"55053360": [148, 202, 2, 220, 52, 11]}, {"55053367": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053391": [14]}, {"55053396": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053424": [1, 10, 64, 33, 129, 8]}, {"55053432": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053444": [52, 2]}, {"55053448": [3, 224]}, {"55053451": [8]}, {"55053456": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053468": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053480": [3, 224]}, {"55053483": [8]}, {"55053488": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053499": [16, 175, 191]}, {"55053503": [20, 12, 16, 3, 55]}, {"55053512": [143, 162]}, {"55053515": [16, 143, 191]}, {"55053519": [20, 39, 189]}, {"55053523": [24, 3, 224]}, {"55053527": [8]}, {"55053532": [39, 189, 255, 216, 175, 176]}, {"55053539": [16, 175, 177]}, {"55053543": [20, 175, 178]}, {"55053547": [24, 175, 191]}, {"55053551": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053567": [62]}, {"55053569": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053592": [173, 40]}, {"55053596": [173, 40]}, {"55053599": [4, 173, 40]}, {"55053603": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053615": [164, 52, 1]}, {"55053619": [62, 21, 1]}, {"55053623": [6]}, {"55053628": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053643": [31, 37, 8]}, {"55053647": [112]}, {"55053649": [8, 66]}, {"55053652": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053667": [4, 149, 42]}, {"55053672": [17, 64]}, {"55053675": [30]}, {"55053680": [21, 72, 255, 251]}, {"55053688": [149, 48]}, {"55053691": [2, 54, 2]}, {"55053696": [52, 80]}, {"55053700": [38, 8, 255, 128, 5]}, {"55053707": [22]}, {"55053712": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053721": [8, 65]}, {"55053724": [2, 72, 144, 33, 142, 72]}, {"55053731": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053742": [248, 9]}, {"55053748": [20, 80, 255, 242]}, {"55053756": [60, 10, 128, 64, 37, 74, 10]}, {"55053764": [142, 75]}, {"55053768": [173, 75]}, {"55053772": [142, 75]}, {"55053775": [4, 173, 75]}, {"55053779": [4, 142, 75]}, {"55053783": [8, 173, 75]}, {"55053787": [8, 16]}, {"55053791": [6]}, {"55053796": [130, 40, 4, 36, 5, 1]}, {"55053803": [2]}, {"55053809": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053819": [16, 143, 177]}, {"55053823": [20, 143, 178]}, {"55053827": [24, 143, 191]}, {"55053831": [32, 39, 189]}, {"55053835": [40, 3, 224]}, {"55053839": [8]}, {"55053844": [3, 224]}, {"55053847": [8, 54, 2]}, {"55053852": [144, 136]}, {"55053855": [125, 52, 1]}, {"55053859": [255, 17, 1]}, {"55053863": [2, 52, 2]}, {"55053867": [8, 52, 2]}, {"55053871": [9, 3, 224]}, {"55053875": [8]}, {"55053880": [144, 136]}, {"55053883": [163, 49, 8]}, {"55053887": [192, 17]}, {"55053891": [5, 52, 2]}, {"55053895": [84, 52, 1]}, {"55053899": [64, 17, 1]}, {"55053903": [2, 52, 2]}, {"55053907": [53, 52, 2]}, {"55053911": [54, 3, 224]}, {"55053915": [8]}, {"55053920": [144, 136]}, {"55053923": [163, 49, 8]}, {"55053927": [24, 17]}, {"55053931": [5, 52, 2]}, {"55053935": [50, 52, 1]}, {"55053939": [8, 17, 1]}, {"55053943": [2, 52, 2]}, {"55053947": [51, 52, 2]}, {"55053951": [52, 3, 224]}, {"55053955": [8]}, {"55053960": [144, 136]}, {"55053963": [163, 49, 8]}, {"55053967": [3, 17]}, {"55053971": [5, 52, 2]}, {"55053975": [4, 52, 1]}, {"55053979": [1, 17, 1]}, {"55053983": [2, 52, 2]}, {"55053987": [48, 52, 2]}, {"55053991": [49, 3, 224]}, {"55053995": [8]}, {"55054000": [144, 136]}, {"55054003": [162, 49, 8]}, {"55054007": [192, 17]}, {"55054011": [5, 52, 2]}, {"55054015": [5, 52, 1]}, {"55054019": [64, 17, 1]}, {"55054023": [2, 52, 2]}, {"55054027": [96, 52, 2]}, {"55054031": [123, 3, 224]}, {"55054035": [8]}, {"55054040": [144, 136]}, {"55054043": [162, 49, 8]}, {"55054047": [48, 17]}, {"55054051": [2, 52, 2]}, {"55054055": [69, 52, 2]}, {"55054059": [70, 3, 224]}, {"55054063": [8]}, {"55054068": [144, 136]}, {"55054071": [162, 49, 8]}, {"55054075": [6, 17]}, {"55054079": [2, 52, 2]}, {"55054083": [55, 52, 2]}, {"55054087": [56, 3, 224]}, {"55054091": [8]}, {"55054096": [144, 136]}, {"55054099": [161, 49, 8]}, {"55054103": [48, 17]}, {"55054107": [2, 52, 2]}, {"55054111": [121, 52, 2]}, {"55054115": [122, 3, 224]}, {"55054119": [8]}, {"55054124": [144, 136]}, {"55054127": [161, 49, 8]}, {"55054131": [6, 17]}, {"55054135": [2, 52, 2]}, {"55054139": [119, 52, 2]}, {"55054143": [120, 3, 224]}, {"55054147": [8]}, {"55054152": [3, 224]}, {"55054155": [8]}, {"55054160": [52, 8]}, {"55054163": [1, 160, 136]}, {"55054167": [62, 3, 224]}, {"55054171": [8]}, {"55054176": [36, 136]}, {"55054179": [134, 36, 9, 255, 255, 37, 41]}, {"55054187": [1, 52, 1]}, {"55054191": [3]}, {"55054193": [41, 8, 42, 20, 32]}, {"55054199": [7]}, {"55054204": [1, 9, 80, 33, 145, 75]}, {"55054212": [52, 1]}, {"55054215": [255, 21, 97, 255, 247]}, {"55054224": [161, 69]}, {"55054228": [3, 224]}, {"55054231": [8]}, {"55054236": [36, 136]}, {"55054239": [168, 1, 6, 64, 33, 145, 9]}, {"55054248": [1, 37, 72, 37, 161, 9]}, {"55054256": [3, 224]}, {"55054259": [8]}, {"55054264": [36, 136]}, {"55054267": [188, 1, 5, 64, 33, 129, 9]}, {"55054276": [5, 33]}, {"55054279": [2]}, {"55054284": [52, 9]}, {"55054288": [37, 41]}, {"55054291": [1, 161, 9]}, {"55054296": [3, 224]}, {"55054299": [8]}, {"55054304": [141, 1]}, {"55054307": [4, 16, 32]}, {"55054311": [3]}, {"55054316": [145, 1]}, {"55054319": [104, 161, 1]}, {"55054323": [64, 3, 224]}, {"55054327": [8, 161, 14]}, {"55054331": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 44]}, {"11325064": [12, 16, 3, 36, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 3, 248]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 96, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 103, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 110, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 89, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 176]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427412": [12, 16, 2, 132]}, {"12427480": [12, 16, 2, 156]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 160]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 227, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 189]}, {"12491480": [12, 16, 2, 199]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 3, 2]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 28, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 56, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 96, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 136, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 176, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 216, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 244, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 15, 16, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 15, 44]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 156, 128, 64, 14, 20]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 156, 128, 64, 14, 20]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 80, 128, 64, 14, 20, 147, 25]}, {"55051623": [116, 52, 1]}, {"55051627": [255, 23, 33]}, {"55051631": [2]}, {"55051636": [52, 25]}, {"55051639": [44, 3, 224]}, {"55051643": [8, 167, 185]}, {"55051647": [154, 147, 44]}, {"55051651": [116, 52, 1]}, {"55051655": [255, 21, 129]}, {"55051659": [2]}, {"55051664": [52, 12]}, {"55051667": [44, 3, 224]}, {"55051671": [8]}, {"55051676": [145, 174]}, {"55051679": [116, 52, 1]}, {"55051683": [255, 21, 193]}, {"55051687": [2]}, {"55051692": [52, 14]}, {"55051695": [44, 3, 224]}, {"55051699": [8, 167, 174]}, {"55051703": [154, 145, 207]}, {"55051707": [116, 52, 1]}, {"55051711": [255, 21, 225]}, {"55051715": [2]}, {"55051720": [52, 15]}, {"55051723": [44, 3, 224]}, {"55051727": [8, 167, 175]}, {"55051731": [154]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052827": [44, 20, 65]}, {"55052831": [3, 129, 9]}, {"55052835": [156, 49, 41]}, {"55052839": [253, 161, 9]}, {"55052843": [156, 52, 1]}, {"55052847": [45, 20, 65]}, {"55052851": [3, 129, 9]}, {"55052855": [156, 49, 41]}, {"55052859": [251, 161, 9]}, {"55052863": [156, 52, 1]}, {"55052867": [41, 20, 65]}, {"55052871": [3, 129, 9]}, {"55052875": [157, 49, 41]}, {"55052879": [239, 161, 9]}, {"55052883": [157, 52, 1]}, {"55052887": [42, 20, 65]}, {"55052891": [3, 129, 9]}, {"55052895": [157, 49, 41]}, {"55052899": [223, 161, 9]}, {"55052903": [157, 3, 224]}, {"55052907": [8, 1, 248, 48, 33, 143, 166]}, {"55052915": [48, 132, 197]}, {"55052919": [4, 8, 16, 2, 164]}, {"55052928": [143, 185]}, {"55052931": [44, 135, 37]}, {"55052935": [4, 8, 16, 2, 164]}, {"55052944": [60, 10, 128, 64, 37, 74, 10]}, {"55052952": [149, 75]}, {"55052955": [4, 52, 1, 255, 255, 17, 97]}, {"55052963": [2]}, {"55052968": [53, 101]}, {"55052972": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052984": [3, 224]}, {"55052987": [8]}, {"55052992": [60, 8, 128, 64, 37, 8, 10]}, {"55053000": [129, 9]}, {"55053003": [2, 36, 1, 255, 255, 17, 33]}, {"55053011": [2]}, {"55053016": [53, 35]}, {"55053021": [3, 15, 195]}, {"55053025": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053039": [8]}, {"55053044": [144, 69]}, {"55053047": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053056": [145, 9]}, {"55053059": [3, 52, 1]}, {"55053063": [255, 17, 33]}, {"55053067": [2]}, {"55053072": [53, 37]}, {"55053076": [3, 224]}, {"55053079": [8]}, {"55053084": [143, 162]}, {"55053087": [36, 144, 69]}, {"55053092": [60, 8, 128, 64, 37, 8, 10]}, {"55053100": [149, 9]}, {"55053104": [52, 1, 255, 255, 17, 33]}, {"55053111": [19]}, {"55053116": [53, 37]}, {"55053120": [175, 164]}, {"55053124": [175, 165]}, {"55053127": [4, 175, 166]}, {"55053131": [8, 39, 189, 255, 232, 175, 191]}, {"55053139": [16, 141, 9]}, {"55053143": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053155": [6, 145, 6]}, {"55053159": [7, 1, 32, 248, 9]}, {"55053168": [143, 191]}, {"55053171": [16, 39, 189]}, {"55053175": [24, 143, 164]}, {"55053180": [143, 165]}, {"55053183": [4, 143, 166]}, {"55053187": [8, 3, 224]}, {"55053191": [8]}, {"55053196": [175, 164]}, {"55053199": [104, 175, 165]}, {"55053203": [108, 175, 166]}, {"55053207": [112, 175, 167]}, {"55053211": [116, 39, 189, 255, 232, 175, 163]}, {"55053219": [16, 175, 191]}, {"55053223": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55053236": [17]}, {"55053239": [10]}, {"55053244": [60, 9, 128, 65, 52, 10]}, {"55053251": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 55]}, {"55053280": [143, 163]}, {"55053283": [16, 143, 191]}, {"55053287": [20, 39, 189]}, {"55053291": [24, 143, 164]}, {"55053295": [104, 143, 165]}, {"55053299": [108, 143, 166]}, {"55053303": [112, 143, 167]}, {"55053307": [116, 132, 110, 19, 196, 3, 224]}, {"55053315": [8]}, {"55053320": [140, 136, 29, 44, 52, 9]}, {"55053327": [1]}, {"55053329": [9, 78]}, {"55053332": [1, 9, 16, 36, 16, 64]}, {"55053339": [27]}, {"55053344": [148, 138]}, {"55053347": [164, 52, 1]}, {"55053351": [61, 21, 65]}, {"55053355": [23]}, {"55053360": [148, 202, 2, 220, 52, 11]}, {"55053367": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053391": [14]}, {"55053396": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053424": [1, 10, 64, 33, 129, 8]}, {"55053432": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053444": [52, 2]}, {"55053448": [3, 224]}, {"55053451": [8]}, {"55053456": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053468": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053480": [3, 224]}, {"55053483": [8]}, {"55053488": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053499": [16, 175, 191]}, {"55053503": [20, 12, 16, 3, 55]}, {"55053512": [143, 162]}, {"55053515": [16, 143, 191]}, {"55053519": [20, 39, 189]}, {"55053523": [24, 3, 224]}, {"55053527": [8]}, {"55053532": [39, 189, 255, 216, 175, 176]}, {"55053539": [16, 175, 177]}, {"55053543": [20, 175, 178]}, {"55053547": [24, 175, 191]}, {"55053551": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053567": [62]}, {"55053569": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053592": [173, 40]}, {"55053596": [173, 40]}, {"55053599": [4, 173, 40]}, {"55053603": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053615": [164, 52, 1]}, {"55053619": [62, 21, 1]}, {"55053623": [6]}, {"55053628": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053643": [31, 37, 8]}, {"55053647": [112]}, {"55053649": [8, 66]}, {"55053652": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053667": [4, 149, 42]}, {"55053672": [17, 64]}, {"55053675": [30]}, {"55053680": [21, 72, 255, 251]}, {"55053688": [149, 48]}, {"55053691": [2, 54, 2]}, {"55053696": [52, 80]}, {"55053700": [38, 8, 255, 128, 5]}, {"55053707": [22]}, {"55053712": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053721": [8, 65]}, {"55053724": [2, 72, 144, 33, 142, 72]}, {"55053731": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053742": [248, 9]}, {"55053748": [20, 80, 255, 242]}, {"55053756": [60, 10, 128, 64, 37, 74, 10]}, {"55053764": [142, 75]}, {"55053768": [173, 75]}, {"55053772": [142, 75]}, {"55053775": [4, 173, 75]}, {"55053779": [4, 142, 75]}, {"55053783": [8, 173, 75]}, {"55053787": [8, 16]}, {"55053791": [6]}, {"55053796": [130, 40, 4, 36, 5, 1]}, {"55053803": [2]}, {"55053809": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053819": [16, 143, 177]}, {"55053823": [20, 143, 178]}, {"55053827": [24, 143, 191]}, {"55053831": [32, 39, 189]}, {"55053835": [40, 3, 224]}, {"55053839": [8]}, {"55053844": [3, 224]}, {"55053847": [8, 54, 2]}, {"55053852": [144, 136]}, {"55053855": [125, 52, 1]}, {"55053859": [255, 17, 1]}, {"55053863": [2, 52, 2]}, {"55053867": [8, 52, 2]}, {"55053871": [9, 3, 224]}, {"55053875": [8]}, {"55053880": [144, 136]}, {"55053883": [163, 49, 8]}, {"55053887": [192, 17]}, {"55053891": [5, 52, 2]}, {"55053895": [84, 52, 1]}, {"55053899": [64, 17, 1]}, {"55053903": [2, 52, 2]}, {"55053907": [53, 52, 2]}, {"55053911": [54, 3, 224]}, {"55053915": [8]}, {"55053920": [144, 136]}, {"55053923": [163, 49, 8]}, {"55053927": [24, 17]}, {"55053931": [5, 52, 2]}, {"55053935": [50, 52, 1]}, {"55053939": [8, 17, 1]}, {"55053943": [2, 52, 2]}, {"55053947": [51, 52, 2]}, {"55053951": [52, 3, 224]}, {"55053955": [8]}, {"55053960": [144, 136]}, {"55053963": [163, 49, 8]}, {"55053967": [3, 17]}, {"55053971": [5, 52, 2]}, {"55053975": [4, 52, 1]}, {"55053979": [1, 17, 1]}, {"55053983": [2, 52, 2]}, {"55053987": [48, 52, 2]}, {"55053991": [49, 3, 224]}, {"55053995": [8]}, {"55054000": [144, 136]}, {"55054003": [162, 49, 8]}, {"55054007": [192, 17]}, {"55054011": [5, 52, 2]}, {"55054015": [5, 52, 1]}, {"55054019": [64, 17, 1]}, {"55054023": [2, 52, 2]}, {"55054027": [96, 52, 2]}, {"55054031": [123, 3, 224]}, {"55054035": [8]}, {"55054040": [144, 136]}, {"55054043": [162, 49, 8]}, {"55054047": [48, 17]}, {"55054051": [2, 52, 2]}, {"55054055": [69, 52, 2]}, {"55054059": [70, 3, 224]}, {"55054063": [8]}, {"55054068": [144, 136]}, {"55054071": [162, 49, 8]}, {"55054075": [6, 17]}, {"55054079": [2, 52, 2]}, {"55054083": [55, 52, 2]}, {"55054087": [56, 3, 224]}, {"55054091": [8]}, {"55054096": [144, 136]}, {"55054099": [161, 49, 8]}, {"55054103": [48, 17]}, {"55054107": [2, 52, 2]}, {"55054111": [121, 52, 2]}, {"55054115": [122, 3, 224]}, {"55054119": [8]}, {"55054124": [144, 136]}, {"55054127": [161, 49, 8]}, {"55054131": [6, 17]}, {"55054135": [2, 52, 2]}, {"55054139": [119, 52, 2]}, {"55054143": [120, 3, 224]}, {"55054147": [8]}, {"55054152": [3, 224]}, {"55054155": [8]}, {"55054160": [52, 8]}, {"55054163": [1, 160, 136]}, {"55054167": [62, 3, 224]}, {"55054171": [8]}, {"55054176": [36, 136]}, {"55054179": [134, 36, 9, 255, 255, 37, 41]}, {"55054187": [1, 52, 1]}, {"55054191": [3]}, {"55054193": [41, 8, 42, 20, 32]}, {"55054199": [7]}, {"55054204": [1, 9, 80, 33, 145, 75]}, {"55054212": [52, 1]}, {"55054215": [255, 21, 97, 255, 247]}, {"55054224": [161, 69]}, {"55054228": [3, 224]}, {"55054231": [8]}, {"55054236": [36, 136]}, {"55054239": [168, 1, 6, 64, 33, 145, 9]}, {"55054248": [1, 37, 72, 37, 161, 9]}, {"55054256": [3, 224]}, {"55054259": [8]}, {"55054264": [36, 136]}, {"55054267": [188, 1, 5, 64, 33, 129, 9]}, {"55054276": [5, 33]}, {"55054279": [2]}, {"55054284": [52, 9]}, {"55054288": [37, 41]}, {"55054291": [1, 161, 9]}, {"55054296": [3, 224]}, {"55054299": [8]}, {"55054304": [141, 1]}, {"55054307": [4, 16, 32]}, {"55054311": [3]}, {"55054316": [145, 1]}, {"55054319": [104, 161, 1]}, {"55054323": [64, 3, 224]}, {"55054327": [8, 161, 14]}, {"55054331": [104]}] \ No newline at end of file From f56dcd3039243fd73655ebe59b32a91c6b351fec Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 25 May 2018 14:37:21 -0400 Subject: [PATCH 032/151] Remove most checks for whether an item is already obtained --- ASM/src/build.asm | 2 +- ASM/src/hacks.asm | 12 +++++------ ASM/src/items.asm | 54 ++++++++++++++++++++++++----------------------- 3 files changed, 35 insertions(+), 33 deletions(-) diff --git a/ASM/src/build.asm b/ASM/src/build.asm index cbd247b9b..76fdcf22e 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -23,6 +23,7 @@ .include "config.asm" .include "item_data.asm" ; Placed here temporarily, won't fit in the code area .include "menu.asm" ; Placed here temporarily, won't fit in the code area +.include "fixes.asm" ; Placed here temporarily, won't fit in the code area .endarea ; 0x600 - 0x9FF: Currently reserved for code blocks written by Rom.py @@ -33,7 +34,6 @@ .include "constants.asm" .include "state.asm" .include "items.asm" -.include "fixes.asm" .endarea .close diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 1bd4a0222..8467545b1 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -107,13 +107,13 @@ .skip 4 nop -; Inventory fix +; Inventory check ; Replaces: -; addu a2, t7, t8 -; sw s0, 0x0118 (t9) -.org 0xBDA094 ; In memory: 0x80395084 - jal inventory_fix - sw s0, 0x0118 (t9) +; jal 0x80071420 +; sw a2, 0x0030 (sp) +.org 0xBDA0A0 ; In memory: 0x80395090 + jal inventory_check + sw a2, 0x0030 (sp) ; Prevent Silver Gauntlets warp ; Replaces: diff --git a/ASM/src/items.asm b/ASM/src/items.asm index d196bf2f3..20003156d 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -1,31 +1,33 @@ -; Take away tunics/shields that are about to be received, to avoid breaking NPCs who give them - -inventory_fix: - ; v0 = item ID +inventory_check: + andi a0, a0, 0xFF li t0, SAVE_CONTEXT - bne v0, 0x2C, @@not_goron_tunic - lb t1, 0x9C (t0) - andi t1, t1, 0xFD - sb t1, 0x9C (t0) -@@not_goron_tunic: - bne v0, 0x2D, @@not_zora_tunic - lb t1, 0x9C (t0) - andi t1, t1, 0xFB - sb t1, 0x9C (t0) -@@not_zora_tunic: - bne v0, 0x29, @@not_deku_shield - lb t1, 0x9D (t0) - andi t1, t1, 0xEF - sb t1, 0x9D (t0) -@@not_deku_shield: - bne v0, 0x2A, @@not_hylian_shield - lb t1, 0x9D (t0) - andi t1, t1, 0xDF - sb t1, 0x9D (t0) -@@not_hylian_shield: + beq a0, 0x8C, @@return ; Deku Nuts (5) + lbu v0, 0x75 (t0) + + beq a0, 0x8D, @@return ; Deku Nuts (10) + lbu v0, 0x75 (t0) + + beq a0, 0x00, @@return ; Deku Stick + lbu v0, 0x74 (t0) + + beq a0, 0x8A, @@return ; Deku Sticks (5) + lbu v0, 0x74 (t0) + + beq a0, 0x8B, @@return ; Deku Sticks (10) + lbu v0, 0x74 (t0) + + beq a0, 0x78, @@return ; Small Magic Jar + li v0, 0x00 + + beq a0, 0x79, @@return ; Large Magic Jar + li v0, 0x00 + + li v0, 0xFF + +@@return: jr ra - addu a2, t7, t8 ; Displaced code + nop ;================================================================================================== @@ -420,7 +422,7 @@ bomb_bag_upgrade: ;================================================================================================== -Bow_Upgrade: +bow_upgrade: lbu t0, 0xA3 (a0) ; Load quiver from inventory andi t0, t0, 0x03 ; Mask bits to isolate quiver From 704076f037862e86fc5bfa11b0439bfbeb35b60e Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sat, 26 May 2018 00:38:52 -0400 Subject: [PATCH 033/151] Create extended items to replace items that break NPCs --- ASM/src/build.asm | 9 +++++--- ASM/src/item_data.asm | 9 ++++++++ ItemOverrides.py | 48 +++++++++++++++++++++--------------------- Items.py | 34 ++++++++++++++++++++++-------- Rules.py | 9 -------- data/base2current.json | 2 +- 6 files changed, 65 insertions(+), 46 deletions(-) diff --git a/ASM/src/build.asm b/ASM/src/build.asm index 76fdcf22e..323a93c2e 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -22,12 +22,15 @@ .area 0x600, 0 .include "config.asm" .include "item_data.asm" ; Placed here temporarily, won't fit in the code area -.include "menu.asm" ; Placed here temporarily, won't fit in the code area -.include "fixes.asm" ; Placed here temporarily, won't fit in the code area .endarea ; 0x600 - 0x9FF: Currently reserved for code blocks written by Rom.py -.skip 0x400 +.skip 0x110 +.area 0xE0, 0 +.include "menu.asm" ; Placed here temporarily, won't fit in the code area +.include "fixes.asm" ; Placed here temporarily, won't fit in the code area +.endarea +.skip 0x210 ; 0xA00 - 0xFFF: New code blocks .area 0x600, 0 diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index c8f6bc8e6..4254843c7 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -92,3 +92,12 @@ Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FORT, 0xFF ; Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, CASTLE, 0xFF ; 0xB4 = Ganon's Castle Small Key Item_Row 0x003D, 0x43, 0x0C, 0x00F8, no_upgrade, give_biggoron_sword, 0xFF, 0xFF ; 0xB5 = Biggoron Sword +Item_Row 0x0083, 0x09, 0x55, 0x00B7, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB6 = Recovery Heart +Item_Row 0x0092, 0xDB, 0xE6, 0x00D8, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB7 = Arrows (5) +Item_Row 0x0093, 0xDA, 0xE6, 0x00D8, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB8 = Arrows (10) +Item_Row 0x0094, 0xD9, 0xE6, 0x00D8, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB9 = Arrows (30) +Item_Row 0x008E, 0xE0, 0x32, 0x00CE, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBA = Bombs (5) +Item_Row 0x008F, 0xE0, 0x32, 0x00CE, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBB = Bombs (10) +Item_Row 0x0090, 0xE0, 0x32, 0x00CE, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBC = Bombs (20) +Item_Row 0x008C, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBD = Deku Nuts (5) +Item_Row 0x008D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBE = Deku Nuts (10) diff --git a/ItemOverrides.py b/ItemOverrides.py index 47aaee537..21cce6acd 100755 --- a/ItemOverrides.py +++ b/ItemOverrides.py @@ -38,28 +38,28 @@ def get_overrides(world): return result valid_base_items = [ - "Hammer", - "Boomerang", - "Lens of Truth", - "Dins Fire", - "Farores Wind", - "Nayrus Love", - "Fire Arrows", - "Ice Arrows", - "Light Arrows", - "Bottle", - "Bottle with Letter", - "Bottle with Milk", - "Mirror Shield", - "Iron Boots", - "Hover Boots", - "Stone of Agony", - "Arrows (30)", - "Bombs (20)", - "Bombchus (20)", - "Pocket Egg", - "Cojiro", - "Odd Potion", - "Poachers Saw", - "Claim Check", + 'Boomerang', + 'Lens of Truth', + 'Hammer', + 'Bottle', + 'Bottle with Letter', + 'Bottle with Milk', + 'Stone of Agony', + 'Fire Arrows', + 'Ice Arrows', + 'Light Arrows', + 'Dins Fire', + 'Farores Wind', + 'Nayrus Love', + 'Mirror Shield', + 'Iron Boots', + 'Hover Boots', + 'Keaton Mask', + 'Skull Mask', + 'Spooky Mask', + 'Bunny Hood', + 'Mask of Truth', + 'Goron Mask', + 'Zora Mask', + 'Gerudo Mask', ] diff --git a/Items.py b/Items.py index 45ec826f8..89f6cb784 100644 --- a/Items.py +++ b/Items.py @@ -77,23 +77,31 @@ def ItemFactory(items): 'Deku Nut Capacity': (False, True, None, None, 0x87), 'Stone of Agony': (True, False, None, 0x0720, 0x39), 'Piece of Heart': (False, False, None, 0x07C0, 0x3E), - 'Recovery Heart': (False, True, None, 0x0900, 0x48), - 'Arrows (5)': (False, True, None, 0x0920, 0x49), - 'Arrows (10)': (False, True, None, 0x0940, 0x4A), - 'Arrows (30)': (False, True, None, 0x0960, 0x4B), - 'Bombs (5)': (False, True, None, 0x0020, 0x01), - 'Bombs (10)': (False, True, None, 0x0CC0, 0x66), - 'Bombs (20)': (False, True, None, 0x0CE0, 0x67), + 'Recovery Heart': (False, True, None, None, 0xB6), + 'Arrows (5)': (False, True, None, None, 0xB7), + 'Arrows (10)': (False, True, None, None, 0xB8), + 'Arrows (30)': (False, True, None, None, 0xB9), + 'Bombs (5)': (False, True, None, None, 0xBA), + 'Bombs (10)': (False, True, None, None, 0xBB), + 'Bombs (20)': (False, True, None, None, 0xBC), 'Bombchus (5)': (False, False, None, 0x0D40, 0x6A), 'Bombchus (10)': (False, False, None, 0x0060, 0x03), 'Bombchus (20)': (False, False, None, 0x0D60, 0x6B), - 'Deku Nuts (5)': (False, True, None, 0x0040, 0x02), - 'Deku Nuts (10)': (False, True, None, 0x0C80, 0x64), + 'Deku Nuts (5)': (False, True, None, None, 0xBD), + 'Deku Nuts (10)': (False, True, None, None, 0xBE), 'Rupee (1)': (False, False, None, 0x0980, 0x4C), 'Rupees (5)': (False, False, None, 0x09A0, 0x4D), 'Rupees (20)': (False, False, None, 0x09C0, 0x4E), 'Rupees (50)': (False, False, None, 0x0AA0, 0x55), 'Rupees (200)': (False, False, None, 0x0AC0, 0x56), + 'Skull Mask': (False, False, None, 0x02E0, 0x17), + 'Spooky Mask': (False, False, None, 0x0300, 0x18), + 'Keaton Mask': (False, False, None, 0x0340, 0x1A), + 'Bunny Hood': (False, False, None, 0x0360, 0x1B), + 'Mask of Truth': (False, False, None, 0x0380, 0x1C), + 'Goron Mask': (False, False, None, 0x0A20, 0x51), + 'Zora Mask': (False, False, None, 0x0A40, 0x52), + 'Gerudo Mask': (False, False, None, 0x0A60, 0x53), 'Ice Trap': (False, True, None, 0x0F80, 0x7C), 'Magic Bean': (True, False, None, 0x02C0, 0x16), 'Map': (False, False, 'Map', 0x0820, 0x41), @@ -219,6 +227,14 @@ def ItemFactory(items): 'Rupees (20)': [0x86, 0x02, 0x91, 0xF0, 0x01, 0x7F], 'Rupees (50)': [0x87, 0x14, 0x8F, 0xF1, 0x01, 0x7F], 'Rupees (200)': [0x88, 0x13, 0x8E, 0xF2, 0x01, 0x7F], + 'Skull Mask': [0x25, 0x80, 0x4F, 0x10, 0x01, 0x36 ], + 'Spooky Mask': [0x26, 0x80, 0x32, 0x11, 0x01, 0x35], + 'Keaton Mask': [0x24, 0x80, 0x31, 0x12, 0x01, 0x34], + 'Bunny Hood': [0x27, 0x80, 0x50, 0x13, 0x01, 0x37], + 'Mask of Truth': [0x2B, 0x80, 0x51, 0x17, 0x01, 0x38], + 'Goron Mask': [0x28, 0x80, 0x5B, 0x14, 0x01, 0x50], + 'Zora Mask': [0x29, 0x80, 0x5C, 0x15, 0x01, 0x51 ], + 'Gerudo Mask': [0x2A, 0x80, 0x5D, 0x16, 0x01, 0x52], 'Ice Trap': [0x85, 0x01, 0x92, 0xCC, 0x01, 0x7F], # Ice Trap in special spots will become a blue rupee. 'Zeldas Lullaby': 0xD4, 'Eponas Song': 0xD2, diff --git a/Rules.py b/Rules.py index 5e602f29c..e12b3bec0 100644 --- a/Rules.py +++ b/Rules.py @@ -394,15 +394,6 @@ def global_rules(world): set_rule(world.get_location('GS100'), lambda state: state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Hover Boots'))) for location in ['Darunias Joy', 'Diving Minigame', 'Child Fishing', 'Adult Fishing', 'Diving in the Lab', 'Link the Goron', 'King Zora Thawed', 'Dog Lady', 'Skull Kid', 'Ocarina Memory Game', '10 Gold Skulltulla Reward', '20 Gold Skulltulla Reward', '30 Gold Skulltulla Reward', '40 Gold Skulltulla Reward', '50 Gold Skulltulla Reward', 'Man on Roof', 'Frog Ocarina Game', 'Frogs in the Rain', 'Horseback Archery 1000 Points', 'Horseback Archery 1500 Points', 'Child Shooting Gallery', 'Adult Shooting Gallery', 'Target in Woods', 'Deku Theater Skull Mask', 'Deku Theater Mask of Truth', 'Anju as Adult', 'Biggoron', 'Anjus Chickens', 'Talons Chickens', '10 Big Poes', 'Rolling Goron as Child', 'Hyrule Castle Fairy Reward', 'Zoras Fountain Fairy Reward', 'Desert Colossus Fairy Reward', 'Zelda']: - forbid_item(world.get_location(location), 'Recovery Heart') - forbid_item(world.get_location(location), 'Arrows (5)') - forbid_item(world.get_location(location), 'Arrows (10)') - forbid_item(world.get_location(location), 'Arrows (30)') - forbid_item(world.get_location(location), 'Bombs (5)') - forbid_item(world.get_location(location), 'Bombs (10)') - forbid_item(world.get_location(location), 'Bombs (20)') - forbid_item(world.get_location(location), 'Deku Nuts (5)') - forbid_item(world.get_location(location), 'Deku Nuts (10)') forbid_item(world.get_location(location), 'Ice Trap') for location in ['Bombchu Bowling Bomb Bag', 'Bombchu Bowling Piece of Heart', 'Deku Salesman Woods', 'Deku Salesman Lost Woods Grotto', 'Deku Salesman Hyrule Field Grotto', 'Underwater Bottle', 'Hyrule Castle Fairy Reward', 'Zoras Fountain Fairy Reward', 'Desert Colossus Fairy Reward']: diff --git a/data/base2current.json b/data/base2current.json index 533eb090b..ea99c0119 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 44]}, {"11325064": [12, 16, 3, 36, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 3, 248]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 96, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 103, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 110, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 89, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 176]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427412": [12, 16, 2, 132]}, {"12427480": [12, 16, 2, 156]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 160]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 227, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 189]}, {"12491480": [12, 16, 2, 199]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 3, 2]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 28, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 56, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 96, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 136, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 176, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 216, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 14, 244, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 15, 16, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 72, 128, 64, 15, 44]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 96, 128, 64, 14, 20]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 156, 128, 64, 14, 20]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 156, 128, 64, 14, 20]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 156, 128, 64, 14, 20]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 184, 128, 64, 14, 20]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 80, 128, 64, 14, 20, 147, 25]}, {"55051623": [116, 52, 1]}, {"55051627": [255, 23, 33]}, {"55051631": [2]}, {"55051636": [52, 25]}, {"55051639": [44, 3, 224]}, {"55051643": [8, 167, 185]}, {"55051647": [154, 147, 44]}, {"55051651": [116, 52, 1]}, {"55051655": [255, 21, 129]}, {"55051659": [2]}, {"55051664": [52, 12]}, {"55051667": [44, 3, 224]}, {"55051671": [8]}, {"55051676": [145, 174]}, {"55051679": [116, 52, 1]}, {"55051683": [255, 21, 193]}, {"55051687": [2]}, {"55051692": [52, 14]}, {"55051695": [44, 3, 224]}, {"55051699": [8, 167, 174]}, {"55051703": [154, 145, 207]}, {"55051707": [116, 52, 1]}, {"55051711": [255, 21, 225]}, {"55051715": [2]}, {"55051720": [52, 15]}, {"55051723": [44, 3, 224]}, {"55051727": [8, 167, 175]}, {"55051731": [154]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052827": [44, 20, 65]}, {"55052831": [3, 129, 9]}, {"55052835": [156, 49, 41]}, {"55052839": [253, 161, 9]}, {"55052843": [156, 52, 1]}, {"55052847": [45, 20, 65]}, {"55052851": [3, 129, 9]}, {"55052855": [156, 49, 41]}, {"55052859": [251, 161, 9]}, {"55052863": [156, 52, 1]}, {"55052867": [41, 20, 65]}, {"55052871": [3, 129, 9]}, {"55052875": [157, 49, 41]}, {"55052879": [239, 161, 9]}, {"55052883": [157, 52, 1]}, {"55052887": [42, 20, 65]}, {"55052891": [3, 129, 9]}, {"55052895": [157, 49, 41]}, {"55052899": [223, 161, 9]}, {"55052903": [157, 3, 224]}, {"55052907": [8, 1, 248, 48, 33, 143, 166]}, {"55052915": [48, 132, 197]}, {"55052919": [4, 8, 16, 2, 164]}, {"55052928": [143, 185]}, {"55052931": [44, 135, 37]}, {"55052935": [4, 8, 16, 2, 164]}, {"55052944": [60, 10, 128, 64, 37, 74, 10]}, {"55052952": [149, 75]}, {"55052955": [4, 52, 1, 255, 255, 17, 97]}, {"55052963": [2]}, {"55052968": [53, 101]}, {"55052972": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052984": [3, 224]}, {"55052987": [8]}, {"55052992": [60, 8, 128, 64, 37, 8, 10]}, {"55053000": [129, 9]}, {"55053003": [2, 36, 1, 255, 255, 17, 33]}, {"55053011": [2]}, {"55053016": [53, 35]}, {"55053021": [3, 15, 195]}, {"55053025": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053039": [8]}, {"55053044": [144, 69]}, {"55053047": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053056": [145, 9]}, {"55053059": [3, 52, 1]}, {"55053063": [255, 17, 33]}, {"55053067": [2]}, {"55053072": [53, 37]}, {"55053076": [3, 224]}, {"55053079": [8]}, {"55053084": [143, 162]}, {"55053087": [36, 144, 69]}, {"55053092": [60, 8, 128, 64, 37, 8, 10]}, {"55053100": [149, 9]}, {"55053104": [52, 1, 255, 255, 17, 33]}, {"55053111": [19]}, {"55053116": [53, 37]}, {"55053120": [175, 164]}, {"55053124": [175, 165]}, {"55053127": [4, 175, 166]}, {"55053131": [8, 39, 189, 255, 232, 175, 191]}, {"55053139": [16, 141, 9]}, {"55053143": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053155": [6, 145, 6]}, {"55053159": [7, 1, 32, 248, 9]}, {"55053168": [143, 191]}, {"55053171": [16, 39, 189]}, {"55053175": [24, 143, 164]}, {"55053180": [143, 165]}, {"55053183": [4, 143, 166]}, {"55053187": [8, 3, 224]}, {"55053191": [8]}, {"55053196": [175, 164]}, {"55053199": [104, 175, 165]}, {"55053203": [108, 175, 166]}, {"55053207": [112, 175, 167]}, {"55053211": [116, 39, 189, 255, 232, 175, 163]}, {"55053219": [16, 175, 191]}, {"55053223": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55053236": [17]}, {"55053239": [10]}, {"55053244": [60, 9, 128, 65, 52, 10]}, {"55053251": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 55]}, {"55053280": [143, 163]}, {"55053283": [16, 143, 191]}, {"55053287": [20, 39, 189]}, {"55053291": [24, 143, 164]}, {"55053295": [104, 143, 165]}, {"55053299": [108, 143, 166]}, {"55053303": [112, 143, 167]}, {"55053307": [116, 132, 110, 19, 196, 3, 224]}, {"55053315": [8]}, {"55053320": [140, 136, 29, 44, 52, 9]}, {"55053327": [1]}, {"55053329": [9, 78]}, {"55053332": [1, 9, 16, 36, 16, 64]}, {"55053339": [27]}, {"55053344": [148, 138]}, {"55053347": [164, 52, 1]}, {"55053351": [61, 21, 65]}, {"55053355": [23]}, {"55053360": [148, 202, 2, 220, 52, 11]}, {"55053367": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053391": [14]}, {"55053396": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053424": [1, 10, 64, 33, 129, 8]}, {"55053432": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053444": [52, 2]}, {"55053448": [3, 224]}, {"55053451": [8]}, {"55053456": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053468": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053480": [3, 224]}, {"55053483": [8]}, {"55053488": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053499": [16, 175, 191]}, {"55053503": [20, 12, 16, 3, 55]}, {"55053512": [143, 162]}, {"55053515": [16, 143, 191]}, {"55053519": [20, 39, 189]}, {"55053523": [24, 3, 224]}, {"55053527": [8]}, {"55053532": [39, 189, 255, 216, 175, 176]}, {"55053539": [16, 175, 177]}, {"55053543": [20, 175, 178]}, {"55053547": [24, 175, 191]}, {"55053551": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053567": [62]}, {"55053569": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053592": [173, 40]}, {"55053596": [173, 40]}, {"55053599": [4, 173, 40]}, {"55053603": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053615": [164, 52, 1]}, {"55053619": [62, 21, 1]}, {"55053623": [6]}, {"55053628": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053643": [31, 37, 8]}, {"55053647": [112]}, {"55053649": [8, 66]}, {"55053652": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053667": [4, 149, 42]}, {"55053672": [17, 64]}, {"55053675": [30]}, {"55053680": [21, 72, 255, 251]}, {"55053688": [149, 48]}, {"55053691": [2, 54, 2]}, {"55053696": [52, 80]}, {"55053700": [38, 8, 255, 128, 5]}, {"55053707": [22]}, {"55053712": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053721": [8, 65]}, {"55053724": [2, 72, 144, 33, 142, 72]}, {"55053731": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053742": [248, 9]}, {"55053748": [20, 80, 255, 242]}, {"55053756": [60, 10, 128, 64, 37, 74, 10]}, {"55053764": [142, 75]}, {"55053768": [173, 75]}, {"55053772": [142, 75]}, {"55053775": [4, 173, 75]}, {"55053779": [4, 142, 75]}, {"55053783": [8, 173, 75]}, {"55053787": [8, 16]}, {"55053791": [6]}, {"55053796": [130, 40, 4, 36, 5, 1]}, {"55053803": [2]}, {"55053809": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053819": [16, 143, 177]}, {"55053823": [20, 143, 178]}, {"55053827": [24, 143, 191]}, {"55053831": [32, 39, 189]}, {"55053835": [40, 3, 224]}, {"55053839": [8]}, {"55053844": [3, 224]}, {"55053847": [8, 54, 2]}, {"55053852": [144, 136]}, {"55053855": [125, 52, 1]}, {"55053859": [255, 17, 1]}, {"55053863": [2, 52, 2]}, {"55053867": [8, 52, 2]}, {"55053871": [9, 3, 224]}, {"55053875": [8]}, {"55053880": [144, 136]}, {"55053883": [163, 49, 8]}, {"55053887": [192, 17]}, {"55053891": [5, 52, 2]}, {"55053895": [84, 52, 1]}, {"55053899": [64, 17, 1]}, {"55053903": [2, 52, 2]}, {"55053907": [53, 52, 2]}, {"55053911": [54, 3, 224]}, {"55053915": [8]}, {"55053920": [144, 136]}, {"55053923": [163, 49, 8]}, {"55053927": [24, 17]}, {"55053931": [5, 52, 2]}, {"55053935": [50, 52, 1]}, {"55053939": [8, 17, 1]}, {"55053943": [2, 52, 2]}, {"55053947": [51, 52, 2]}, {"55053951": [52, 3, 224]}, {"55053955": [8]}, {"55053960": [144, 136]}, {"55053963": [163, 49, 8]}, {"55053967": [3, 17]}, {"55053971": [5, 52, 2]}, {"55053975": [4, 52, 1]}, {"55053979": [1, 17, 1]}, {"55053983": [2, 52, 2]}, {"55053987": [48, 52, 2]}, {"55053991": [49, 3, 224]}, {"55053995": [8]}, {"55054000": [144, 136]}, {"55054003": [162, 49, 8]}, {"55054007": [192, 17]}, {"55054011": [5, 52, 2]}, {"55054015": [5, 52, 1]}, {"55054019": [64, 17, 1]}, {"55054023": [2, 52, 2]}, {"55054027": [96, 52, 2]}, {"55054031": [123, 3, 224]}, {"55054035": [8]}, {"55054040": [144, 136]}, {"55054043": [162, 49, 8]}, {"55054047": [48, 17]}, {"55054051": [2, 52, 2]}, {"55054055": [69, 52, 2]}, {"55054059": [70, 3, 224]}, {"55054063": [8]}, {"55054068": [144, 136]}, {"55054071": [162, 49, 8]}, {"55054075": [6, 17]}, {"55054079": [2, 52, 2]}, {"55054083": [55, 52, 2]}, {"55054087": [56, 3, 224]}, {"55054091": [8]}, {"55054096": [144, 136]}, {"55054099": [161, 49, 8]}, {"55054103": [48, 17]}, {"55054107": [2, 52, 2]}, {"55054111": [121, 52, 2]}, {"55054115": [122, 3, 224]}, {"55054119": [8]}, {"55054124": [144, 136]}, {"55054127": [161, 49, 8]}, {"55054131": [6, 17]}, {"55054135": [2, 52, 2]}, {"55054139": [119, 52, 2]}, {"55054143": [120, 3, 224]}, {"55054147": [8]}, {"55054152": [3, 224]}, {"55054155": [8]}, {"55054160": [52, 8]}, {"55054163": [1, 160, 136]}, {"55054167": [62, 3, 224]}, {"55054171": [8]}, {"55054176": [36, 136]}, {"55054179": [134, 36, 9, 255, 255, 37, 41]}, {"55054187": [1, 52, 1]}, {"55054191": [3]}, {"55054193": [41, 8, 42, 20, 32]}, {"55054199": [7]}, {"55054204": [1, 9, 80, 33, 145, 75]}, {"55054212": [52, 1]}, {"55054215": [255, 21, 97, 255, 247]}, {"55054224": [161, 69]}, {"55054228": [3, 224]}, {"55054231": [8]}, {"55054236": [36, 136]}, {"55054239": [168, 1, 6, 64, 33, 145, 9]}, {"55054248": [1, 37, 72, 37, 161, 9]}, {"55054256": [3, 224]}, {"55054259": [8]}, {"55054264": [36, 136]}, {"55054267": [188, 1, 5, 64, 33, 129, 9]}, {"55054276": [5, 33]}, {"55054279": [2]}, {"55054284": [52, 9]}, {"55054288": [37, 41]}, {"55054291": [1, 161, 9]}, {"55054296": [3, 224]}, {"55054299": [8]}, {"55054304": [141, 1]}, {"55054307": [4, 16, 32]}, {"55054311": [3]}, {"55054316": [145, 1]}, {"55054319": [104, 161, 1]}, {"55054323": [64, 3, 224]}, {"55054327": [8, 161, 14]}, {"55054331": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 46]}, {"11325064": [12, 16, 3, 38, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 178]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 158]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 162]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 229, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 191]}, {"12491480": [12, 16, 2, 201]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 3, 4]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 36, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 184, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 224, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 252, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 15, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 15, 52]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 164, 128, 64, 14, 28]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 164, 128, 64, 14, 28]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 88, 128, 64, 14, 28]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 1]}, {"55052163": [4, 16, 32]}, {"55052167": [3]}, {"55052172": [145, 1]}, {"55052175": [104, 161, 1]}, {"55052179": [64, 3, 224]}, {"55052183": [8, 161, 14]}, {"55052187": [104]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [19, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [16, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [14, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [11, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [8, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [120, 16, 129]}, {"55052891": [5, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [121, 16, 129]}, {"55052903": [2, 52, 2]}, {"55052908": [52, 2]}, {"55052911": [255, 3, 224]}, {"55052915": [8]}, {"55052920": [143, 166]}, {"55052923": [48, 132, 197]}, {"55052927": [4, 8, 16, 2, 166]}, {"55052936": [143, 185]}, {"55052939": [44, 135, 37]}, {"55052943": [4, 8, 16, 2, 166]}, {"55052952": [60, 10, 128, 64, 37, 74, 10]}, {"55052960": [149, 75]}, {"55052963": [4, 52, 1, 255, 255, 17, 97]}, {"55052971": [2]}, {"55052976": [53, 101]}, {"55052980": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052992": [3, 224]}, {"55052995": [8]}, {"55053000": [60, 8, 128, 64, 37, 8, 10]}, {"55053008": [129, 9]}, {"55053011": [2, 36, 1, 255, 255, 17, 33]}, {"55053019": [2]}, {"55053024": [53, 35]}, {"55053029": [3, 15, 195]}, {"55053033": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053047": [8]}, {"55053052": [144, 69]}, {"55053055": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053064": [145, 9]}, {"55053067": [3, 52, 1]}, {"55053071": [255, 17, 33]}, {"55053075": [2]}, {"55053080": [53, 37]}, {"55053084": [3, 224]}, {"55053087": [8]}, {"55053092": [143, 162]}, {"55053095": [36, 144, 69]}, {"55053100": [60, 8, 128, 64, 37, 8, 10]}, {"55053108": [149, 9]}, {"55053112": [52, 1, 255, 255, 17, 33]}, {"55053119": [19]}, {"55053124": [53, 37]}, {"55053128": [175, 164]}, {"55053132": [175, 165]}, {"55053135": [4, 175, 166]}, {"55053139": [8, 39, 189, 255, 232, 175, 191]}, {"55053147": [16, 141, 9]}, {"55053151": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053163": [6, 145, 6]}, {"55053167": [7, 1, 32, 248, 9]}, {"55053176": [143, 191]}, {"55053179": [16, 39, 189]}, {"55053183": [24, 143, 164]}, {"55053188": [143, 165]}, {"55053191": [4, 143, 166]}, {"55053195": [8, 3, 224]}, {"55053199": [8]}, {"55053204": [175, 164]}, {"55053207": [104, 175, 165]}, {"55053211": [108, 175, 166]}, {"55053215": [112, 175, 167]}, {"55053219": [116, 39, 189, 255, 232, 175, 163]}, {"55053227": [16, 175, 191]}, {"55053231": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55053244": [17]}, {"55053247": [10]}, {"55053252": [60, 9, 128, 65, 52, 10]}, {"55053259": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 57]}, {"55053288": [143, 163]}, {"55053291": [16, 143, 191]}, {"55053295": [20, 39, 189]}, {"55053299": [24, 143, 164]}, {"55053303": [104, 143, 165]}, {"55053307": [108, 143, 166]}, {"55053311": [112, 143, 167]}, {"55053315": [116, 132, 110, 19, 196, 3, 224]}, {"55053323": [8]}, {"55053328": [140, 136, 29, 44, 52, 9]}, {"55053335": [1]}, {"55053337": [9, 78]}, {"55053340": [1, 9, 16, 36, 16, 64]}, {"55053347": [27]}, {"55053352": [148, 138]}, {"55053355": [164, 52, 1]}, {"55053359": [61, 21, 65]}, {"55053363": [23]}, {"55053368": [148, 202, 2, 220, 52, 11]}, {"55053375": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053399": [14]}, {"55053404": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053432": [1, 10, 64, 33, 129, 8]}, {"55053440": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053452": [52, 2]}, {"55053456": [3, 224]}, {"55053459": [8]}, {"55053464": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053476": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053488": [3, 224]}, {"55053491": [8]}, {"55053496": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053507": [16, 175, 191]}, {"55053511": [20, 12, 16, 3, 57]}, {"55053520": [143, 162]}, {"55053523": [16, 143, 191]}, {"55053527": [20, 39, 189]}, {"55053531": [24, 3, 224]}, {"55053535": [8]}, {"55053540": [39, 189, 255, 216, 175, 176]}, {"55053547": [16, 175, 177]}, {"55053551": [20, 175, 178]}, {"55053555": [24, 175, 191]}, {"55053559": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053575": [62]}, {"55053577": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053600": [173, 40]}, {"55053604": [173, 40]}, {"55053607": [4, 173, 40]}, {"55053611": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053623": [164, 52, 1]}, {"55053627": [62, 21, 1]}, {"55053631": [6]}, {"55053636": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053651": [31, 37, 8]}, {"55053655": [112]}, {"55053657": [8, 66]}, {"55053660": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053675": [4, 149, 42]}, {"55053680": [17, 64]}, {"55053683": [30]}, {"55053688": [21, 72, 255, 251]}, {"55053696": [149, 48]}, {"55053699": [2, 54, 2]}, {"55053704": [52, 80]}, {"55053708": [38, 8, 255, 128, 5]}, {"55053715": [22]}, {"55053720": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053729": [8, 65]}, {"55053732": [2, 72, 144, 33, 142, 72]}, {"55053739": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053750": [248, 9]}, {"55053756": [20, 80, 255, 242]}, {"55053764": [60, 10, 128, 64, 37, 74, 10]}, {"55053772": [142, 75]}, {"55053776": [173, 75]}, {"55053780": [142, 75]}, {"55053783": [4, 173, 75]}, {"55053787": [4, 142, 75]}, {"55053791": [8, 173, 75]}, {"55053795": [8, 16]}, {"55053799": [6]}, {"55053804": [130, 40, 4, 36, 5, 1]}, {"55053811": [2]}, {"55053817": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053827": [16, 143, 177]}, {"55053831": [20, 143, 178]}, {"55053835": [24, 143, 191]}, {"55053839": [32, 39, 189]}, {"55053843": [40, 3, 224]}, {"55053847": [8]}, {"55053852": [3, 224]}, {"55053855": [8, 54, 2]}, {"55053860": [144, 136]}, {"55053863": [125, 52, 1]}, {"55053867": [255, 17, 1]}, {"55053871": [2, 52, 2]}, {"55053875": [8, 52, 2]}, {"55053879": [9, 3, 224]}, {"55053883": [8]}, {"55053888": [144, 136]}, {"55053891": [163, 49, 8]}, {"55053895": [192, 17]}, {"55053899": [5, 52, 2]}, {"55053903": [84, 52, 1]}, {"55053907": [64, 17, 1]}, {"55053911": [2, 52, 2]}, {"55053915": [53, 52, 2]}, {"55053919": [54, 3, 224]}, {"55053923": [8]}, {"55053928": [144, 136]}, {"55053931": [163, 49, 8]}, {"55053935": [24, 17]}, {"55053939": [5, 52, 2]}, {"55053943": [50, 52, 1]}, {"55053947": [8, 17, 1]}, {"55053951": [2, 52, 2]}, {"55053955": [51, 52, 2]}, {"55053959": [52, 3, 224]}, {"55053963": [8]}, {"55053968": [144, 136]}, {"55053971": [163, 49, 8]}, {"55053975": [3, 17]}, {"55053979": [5, 52, 2]}, {"55053983": [4, 52, 1]}, {"55053987": [1, 17, 1]}, {"55053991": [2, 52, 2]}, {"55053995": [48, 52, 2]}, {"55053999": [49, 3, 224]}, {"55054003": [8]}, {"55054008": [144, 136]}, {"55054011": [162, 49, 8]}, {"55054015": [192, 17]}, {"55054019": [5, 52, 2]}, {"55054023": [5, 52, 1]}, {"55054027": [64, 17, 1]}, {"55054031": [2, 52, 2]}, {"55054035": [96, 52, 2]}, {"55054039": [123, 3, 224]}, {"55054043": [8]}, {"55054048": [144, 136]}, {"55054051": [162, 49, 8]}, {"55054055": [48, 17]}, {"55054059": [2, 52, 2]}, {"55054063": [69, 52, 2]}, {"55054067": [70, 3, 224]}, {"55054071": [8]}, {"55054076": [144, 136]}, {"55054079": [162, 49, 8]}, {"55054083": [6, 17]}, {"55054087": [2, 52, 2]}, {"55054091": [55, 52, 2]}, {"55054095": [56, 3, 224]}, {"55054099": [8]}, {"55054104": [144, 136]}, {"55054107": [161, 49, 8]}, {"55054111": [48, 17]}, {"55054115": [2, 52, 2]}, {"55054119": [121, 52, 2]}, {"55054123": [122, 3, 224]}, {"55054127": [8]}, {"55054132": [144, 136]}, {"55054135": [161, 49, 8]}, {"55054139": [6, 17]}, {"55054143": [2, 52, 2]}, {"55054147": [119, 52, 2]}, {"55054151": [120, 3, 224]}, {"55054155": [8]}, {"55054160": [3, 224]}, {"55054163": [8]}, {"55054168": [52, 8]}, {"55054171": [1, 160, 136]}, {"55054175": [62, 3, 224]}, {"55054179": [8]}, {"55054184": [36, 136]}, {"55054187": [134, 36, 9, 255, 255, 37, 41]}, {"55054195": [1, 52, 1]}, {"55054199": [3]}, {"55054201": [41, 8, 42, 20, 32]}, {"55054207": [7]}, {"55054212": [1, 9, 80, 33, 145, 75]}, {"55054220": [52, 1]}, {"55054223": [255, 21, 97, 255, 247]}, {"55054232": [161, 69]}, {"55054236": [3, 224]}, {"55054239": [8]}, {"55054244": [36, 136]}, {"55054247": [168, 1, 6, 64, 33, 145, 9]}, {"55054256": [1, 37, 72, 37, 161, 9]}, {"55054264": [3, 224]}, {"55054267": [8]}, {"55054272": [36, 136]}, {"55054275": [188, 1, 5, 64, 33, 129, 9]}, {"55054284": [5, 33]}, {"55054287": [2]}, {"55054292": [52, 9]}, {"55054296": [37, 41]}, {"55054299": [1, 161, 9]}, {"55054304": [3, 224]}, {"55054307": [8]}] \ No newline at end of file From 12ee3f3c75a5957959b8a66a377ea1b01b46956f Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sun, 27 May 2018 00:37:34 -0400 Subject: [PATCH 034/151] Remove obsolete hook --- Rom.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index dd810b0f0..4670e3994 100644 --- a/Rom.py +++ b/Rom.py @@ -760,12 +760,11 @@ def patch_rom(world, rom): rom.write_bytes(0x10, Block_code) # Set hooks for various code -# rom.write_bytes(0xBD6C94, [0x0C, 0x22, 0x9E, 0xF0]) #Progressive Items Object Hook, unsure where this case is called +# rom.write_bytes(0xBD6C94, ...) #Progressive Items Object Hook, unsure where this case is called rom.write_bytes(0xB06C2C, [0x0C, 0x10, 0x01, 0x80]) #Save Writing Hook rom.write_bytes(0xC89A34, [0x0C, 0x10, 0x02, 0x54, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at death mountain trail rom.write_bytes(0xC89A78, [0x0C, 0x10, 0x02, 0x60, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at crater rom.write_bytes(0xC8B048, [0x0C, 0x10, 0x02, 0x80, 0x00, 0xA3, 0xAF, 0x21]) #Progressive items from Great Fairies (weirdness with 0xAF) - rom.write_bytes(0xC8D550, [0x0C, 0x10, 0x00, 0x81]) #Progressive Items Item ID Hook # Sticks on B fix rom.write_bytes(0xAE4B14, [0x0C, 0x10, 0x02, 0x74]) From 17c6bcf5d39af90ae27f5432b966d465dea7eb11 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sun, 27 May 2018 01:34:43 -0400 Subject: [PATCH 035/151] Make arrows/bombs fall back to blue rupee when needed --- ASM/src/build.asm | 10 +++++- ASM/src/every_frame.asm | 42 +++++++++++++++++++++++ ASM/src/item_data.asm | 19 ++++++----- ASM/src/items.asm | 75 +++++++++++++++++------------------------ data/base2current.json | 2 +- 5 files changed, 92 insertions(+), 56 deletions(-) create mode 100644 ASM/src/every_frame.asm diff --git a/ASM/src/build.asm b/ASM/src/build.asm index 323a93c2e..2be4c536e 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -26,11 +26,19 @@ ; 0x600 - 0x9FF: Currently reserved for code blocks written by Rom.py .skip 0x110 + .area 0xE0, 0 .include "menu.asm" ; Placed here temporarily, won't fit in the code area .include "fixes.asm" ; Placed here temporarily, won't fit in the code area .endarea -.skip 0x210 + +.skip 0x70 + +.area 0xC0, 0 +.include "every_frame.asm" ; Placed here temporarily, won't fit in the code area +.endarea + +.skip 0xE0 ; 0xA00 - 0xFFF: New code blocks .area 0x600, 0 diff --git a/ASM/src/every_frame.asm b/ASM/src/every_frame.asm new file mode 100644 index 000000000..0575a8a04 --- /dev/null +++ b/ASM/src/every_frame.asm @@ -0,0 +1,42 @@ +every_frame: + sw a0, 0x68 (sp) + sw a1, 0x6C (sp) + sw a2, 0x70 (sp) + sw a3, 0x74 (sp) + addiu sp, sp, -0x18 + sw v1, 0x10 (sp) + sw ra, 0x14 (sp) + + ; If there is a pending item, try to make the player instance receive it. If the player has + ; control on this frame, they will receive the item. Otherwise nothing will happen, and + ; we try again next frame. + li t0, PENDING_SPECIAL_ITEM + lb t0, 0x00 (t0) + beqz t0, @@no_pending_item + nop + ; PLAYER_ACTOR+0x0424 holds the item to be received. +0x0428 holds a pointer to the actor + ; giving the item. The game is not picky about this actor, it just needs to read a non-zero + ; value at actor+0x0130, and it overwrites actor+0x0118. Construct a dummy actor in an usused + ; memory area to satisfy these requirements. + li t1, 0x80410000 + li t2, 1 + sw t2, 0x130 (t1) + li t2, PLAYER_ACTOR + sb t0, 0x0424 (t2) + sw t1, 0x0428 (t2) + jal store_item_data + nop +@@no_pending_item: + + lw v1, 0x10 (sp) + lw ra, 0x14 (sp) + addiu sp, sp, 0x18 + lw a0, 0x68 (sp) + lw a1, 0x6C (sp) + lw a2, 0x70 (sp) + lw a3, 0x74 (sp) + + lh t6, 0x13C4 (v1) ; Displaced code + + jr ra + nop diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index 4254843c7..06267bf17 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -92,12 +92,13 @@ Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FORT, 0xFF ; Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, CASTLE, 0xFF ; 0xB4 = Ganon's Castle Small Key Item_Row 0x003D, 0x43, 0x0C, 0x00F8, no_upgrade, give_biggoron_sword, 0xFF, 0xFF ; 0xB5 = Biggoron Sword -Item_Row 0x0083, 0x09, 0x55, 0x00B7, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB6 = Recovery Heart -Item_Row 0x0092, 0xDB, 0xE6, 0x00D8, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB7 = Arrows (5) -Item_Row 0x0093, 0xDA, 0xE6, 0x00D8, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB8 = Arrows (10) -Item_Row 0x0094, 0xD9, 0xE6, 0x00D8, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB9 = Arrows (30) -Item_Row 0x008E, 0xE0, 0x32, 0x00CE, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBA = Bombs (5) -Item_Row 0x008F, 0xE0, 0x32, 0x00CE, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBB = Bombs (10) -Item_Row 0x0090, 0xE0, 0x32, 0x00CE, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBC = Bombs (20) -Item_Row 0x008C, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBD = Deku Nuts (5) -Item_Row 0x008D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBE = Deku Nuts (10) + +Item_Row 0x0083, 0x09, 0x55, 0x00B7, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB6 = Recovery Heart +Item_Row 0x0092, 0xDB, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB7 = Arrows (5) +Item_Row 0x0093, 0xDA, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB8 = Arrows (10) +Item_Row 0x0094, 0xD9, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB9 = Arrows (30) +Item_Row 0x008E, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBA = Bombs (5) +Item_Row 0x008F, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBB = Bombs (10) +Item_Row 0x0090, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBC = Bombs (20) +Item_Row 0x008C, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBD = Deku Nuts (5) +Item_Row 0x008D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBE = Deku Nuts (10) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 20003156d..ff18ba686 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -143,51 +143,6 @@ override_action: ;================================================================================================== -every_frame: - sw a0, 0x68 (sp) - sw a1, 0x6C (sp) - sw a2, 0x70 (sp) - sw a3, 0x74 (sp) - addiu sp, sp, -0x18 - sw v1, 0x10 (sp) - sw ra, 0x14 (sp) - - ; If there is a pending item, try to make the player instance receive it. If the player has - ; control on this frame, they will receive the item. Otherwise nothing will happen, and - ; we try again next frame. - li t0, PENDING_SPECIAL_ITEM - lb t0, 0x00 (t0) - beqz t0, @@no_pending_item - nop - ; PLAYER_ACTOR+0x0424 holds the item to be received. +0x0428 holds a pointer to the actor - ; giving the item. The game is not picky about this actor, it just needs to read a non-zero - ; value at actor+0x0130, and it overwrites actor+0x0118. Construct a dummy actor in an usused - ; memory area to satisfy these requirements. - li t1, 0x80410000 - li t2, 1 - sw t2, 0x130 (t1) - li t2, PLAYER_ACTOR - sb t0, 0x0424 (t2) - sw t1, 0x0428 (t2) - jal store_item_data - nop -@@no_pending_item: - - lw v1, 0x10 (sp) - lw ra, 0x14 (sp) - addiu sp, sp, 0x18 - lw a0, 0x68 (sp) - lw a1, 0x6C (sp) - lw a2, 0x70 (sp) - lw a3, 0x74 (sp) - - lh t6, 0x13C4 (v1) ; Displaced code - - jr ra - nop - -;================================================================================================== - override_item_fairy_cutscene: ; a0 = global context ; a2 = fairy actor @@ -516,6 +471,36 @@ stick_upgrade: jr ra nop +;================================================================================================== + +arrows_to_rupee: + lbu t0, 0xA3 (a0) ; Load quiver from inventory + andi t0, t0, 0x03 ; Mask bits to isolate quiver + + beqz t0, @@return + li v0, 0x4D ; Blue Rupee + + ori v0, s0, 0 + +@@return: + jr ra + nop + +;================================================================================================== + +bombs_to_rupee: + lbu t0, 0xA3 (a0) ; Load bomb bag from inventory + andi t0, t0, 0x18 ; Mask bits to isolate bomb bag + + beqz t0, @@return + li v0, 0x4D ; Blue Rupee + + ori v0, s0, 0 + +@@return: + jr ra + nop + ;================================================================================================== ; Item effect functions ;================================================================================================== diff --git a/data/base2current.json b/data/base2current.json index ea99c0119..939738fad 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 46]}, {"11325064": [12, 16, 3, 38, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 178]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 158]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 162]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 229, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 191]}, {"12491480": [12, 16, 2, 201]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 3, 4]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 36, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 184, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 224, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 14, 252, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 15, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 80, 128, 64, 15, 52]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 104, 128, 64, 14, 28]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 164, 128, 64, 14, 28]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 164, 128, 64, 14, 28]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 164, 128, 64, 14, 28]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 192, 128, 64, 14, 28]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 88, 128, 64, 14, 28]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 80, 128, 64, 14, 28]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 1]}, {"55052163": [4, 16, 32]}, {"55052167": [3]}, {"55052172": [145, 1]}, {"55052175": [104, 161, 1]}, {"55052179": [64, 3, 224]}, {"55052183": [8, 161, 14]}, {"55052187": [104]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [19, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [16, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [14, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [11, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [8, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [120, 16, 129]}, {"55052891": [5, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [121, 16, 129]}, {"55052903": [2, 52, 2]}, {"55052908": [52, 2]}, {"55052911": [255, 3, 224]}, {"55052915": [8]}, {"55052920": [143, 166]}, {"55052923": [48, 132, 197]}, {"55052927": [4, 8, 16, 2, 166]}, {"55052936": [143, 185]}, {"55052939": [44, 135, 37]}, {"55052943": [4, 8, 16, 2, 166]}, {"55052952": [60, 10, 128, 64, 37, 74, 10]}, {"55052960": [149, 75]}, {"55052963": [4, 52, 1, 255, 255, 17, 97]}, {"55052971": [2]}, {"55052976": [53, 101]}, {"55052980": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052992": [3, 224]}, {"55052995": [8]}, {"55053000": [60, 8, 128, 64, 37, 8, 10]}, {"55053008": [129, 9]}, {"55053011": [2, 36, 1, 255, 255, 17, 33]}, {"55053019": [2]}, {"55053024": [53, 35]}, {"55053029": [3, 15, 195]}, {"55053033": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053047": [8]}, {"55053052": [144, 69]}, {"55053055": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053064": [145, 9]}, {"55053067": [3, 52, 1]}, {"55053071": [255, 17, 33]}, {"55053075": [2]}, {"55053080": [53, 37]}, {"55053084": [3, 224]}, {"55053087": [8]}, {"55053092": [143, 162]}, {"55053095": [36, 144, 69]}, {"55053100": [60, 8, 128, 64, 37, 8, 10]}, {"55053108": [149, 9]}, {"55053112": [52, 1, 255, 255, 17, 33]}, {"55053119": [19]}, {"55053124": [53, 37]}, {"55053128": [175, 164]}, {"55053132": [175, 165]}, {"55053135": [4, 175, 166]}, {"55053139": [8, 39, 189, 255, 232, 175, 191]}, {"55053147": [16, 141, 9]}, {"55053151": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053163": [6, 145, 6]}, {"55053167": [7, 1, 32, 248, 9]}, {"55053176": [143, 191]}, {"55053179": [16, 39, 189]}, {"55053183": [24, 143, 164]}, {"55053188": [143, 165]}, {"55053191": [4, 143, 166]}, {"55053195": [8, 3, 224]}, {"55053199": [8]}, {"55053204": [175, 164]}, {"55053207": [104, 175, 165]}, {"55053211": [108, 175, 166]}, {"55053215": [112, 175, 167]}, {"55053219": [116, 39, 189, 255, 232, 175, 163]}, {"55053227": [16, 175, 191]}, {"55053231": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55053244": [17]}, {"55053247": [10]}, {"55053252": [60, 9, 128, 65, 52, 10]}, {"55053259": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 57]}, {"55053288": [143, 163]}, {"55053291": [16, 143, 191]}, {"55053295": [20, 39, 189]}, {"55053299": [24, 143, 164]}, {"55053303": [104, 143, 165]}, {"55053307": [108, 143, 166]}, {"55053311": [112, 143, 167]}, {"55053315": [116, 132, 110, 19, 196, 3, 224]}, {"55053323": [8]}, {"55053328": [140, 136, 29, 44, 52, 9]}, {"55053335": [1]}, {"55053337": [9, 78]}, {"55053340": [1, 9, 16, 36, 16, 64]}, {"55053347": [27]}, {"55053352": [148, 138]}, {"55053355": [164, 52, 1]}, {"55053359": [61, 21, 65]}, {"55053363": [23]}, {"55053368": [148, 202, 2, 220, 52, 11]}, {"55053375": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053399": [14]}, {"55053404": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053432": [1, 10, 64, 33, 129, 8]}, {"55053440": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053452": [52, 2]}, {"55053456": [3, 224]}, {"55053459": [8]}, {"55053464": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053476": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053488": [3, 224]}, {"55053491": [8]}, {"55053496": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053507": [16, 175, 191]}, {"55053511": [20, 12, 16, 3, 57]}, {"55053520": [143, 162]}, {"55053523": [16, 143, 191]}, {"55053527": [20, 39, 189]}, {"55053531": [24, 3, 224]}, {"55053535": [8]}, {"55053540": [39, 189, 255, 216, 175, 176]}, {"55053547": [16, 175, 177]}, {"55053551": [20, 175, 178]}, {"55053555": [24, 175, 191]}, {"55053559": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053575": [62]}, {"55053577": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053600": [173, 40]}, {"55053604": [173, 40]}, {"55053607": [4, 173, 40]}, {"55053611": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053623": [164, 52, 1]}, {"55053627": [62, 21, 1]}, {"55053631": [6]}, {"55053636": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053651": [31, 37, 8]}, {"55053655": [112]}, {"55053657": [8, 66]}, {"55053660": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053675": [4, 149, 42]}, {"55053680": [17, 64]}, {"55053683": [30]}, {"55053688": [21, 72, 255, 251]}, {"55053696": [149, 48]}, {"55053699": [2, 54, 2]}, {"55053704": [52, 80]}, {"55053708": [38, 8, 255, 128, 5]}, {"55053715": [22]}, {"55053720": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053729": [8, 65]}, {"55053732": [2, 72, 144, 33, 142, 72]}, {"55053739": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053750": [248, 9]}, {"55053756": [20, 80, 255, 242]}, {"55053764": [60, 10, 128, 64, 37, 74, 10]}, {"55053772": [142, 75]}, {"55053776": [173, 75]}, {"55053780": [142, 75]}, {"55053783": [4, 173, 75]}, {"55053787": [4, 142, 75]}, {"55053791": [8, 173, 75]}, {"55053795": [8, 16]}, {"55053799": [6]}, {"55053804": [130, 40, 4, 36, 5, 1]}, {"55053811": [2]}, {"55053817": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053827": [16, 143, 177]}, {"55053831": [20, 143, 178]}, {"55053835": [24, 143, 191]}, {"55053839": [32, 39, 189]}, {"55053843": [40, 3, 224]}, {"55053847": [8]}, {"55053852": [3, 224]}, {"55053855": [8, 54, 2]}, {"55053860": [144, 136]}, {"55053863": [125, 52, 1]}, {"55053867": [255, 17, 1]}, {"55053871": [2, 52, 2]}, {"55053875": [8, 52, 2]}, {"55053879": [9, 3, 224]}, {"55053883": [8]}, {"55053888": [144, 136]}, {"55053891": [163, 49, 8]}, {"55053895": [192, 17]}, {"55053899": [5, 52, 2]}, {"55053903": [84, 52, 1]}, {"55053907": [64, 17, 1]}, {"55053911": [2, 52, 2]}, {"55053915": [53, 52, 2]}, {"55053919": [54, 3, 224]}, {"55053923": [8]}, {"55053928": [144, 136]}, {"55053931": [163, 49, 8]}, {"55053935": [24, 17]}, {"55053939": [5, 52, 2]}, {"55053943": [50, 52, 1]}, {"55053947": [8, 17, 1]}, {"55053951": [2, 52, 2]}, {"55053955": [51, 52, 2]}, {"55053959": [52, 3, 224]}, {"55053963": [8]}, {"55053968": [144, 136]}, {"55053971": [163, 49, 8]}, {"55053975": [3, 17]}, {"55053979": [5, 52, 2]}, {"55053983": [4, 52, 1]}, {"55053987": [1, 17, 1]}, {"55053991": [2, 52, 2]}, {"55053995": [48, 52, 2]}, {"55053999": [49, 3, 224]}, {"55054003": [8]}, {"55054008": [144, 136]}, {"55054011": [162, 49, 8]}, {"55054015": [192, 17]}, {"55054019": [5, 52, 2]}, {"55054023": [5, 52, 1]}, {"55054027": [64, 17, 1]}, {"55054031": [2, 52, 2]}, {"55054035": [96, 52, 2]}, {"55054039": [123, 3, 224]}, {"55054043": [8]}, {"55054048": [144, 136]}, {"55054051": [162, 49, 8]}, {"55054055": [48, 17]}, {"55054059": [2, 52, 2]}, {"55054063": [69, 52, 2]}, {"55054067": [70, 3, 224]}, {"55054071": [8]}, {"55054076": [144, 136]}, {"55054079": [162, 49, 8]}, {"55054083": [6, 17]}, {"55054087": [2, 52, 2]}, {"55054091": [55, 52, 2]}, {"55054095": [56, 3, 224]}, {"55054099": [8]}, {"55054104": [144, 136]}, {"55054107": [161, 49, 8]}, {"55054111": [48, 17]}, {"55054115": [2, 52, 2]}, {"55054119": [121, 52, 2]}, {"55054123": [122, 3, 224]}, {"55054127": [8]}, {"55054132": [144, 136]}, {"55054135": [161, 49, 8]}, {"55054139": [6, 17]}, {"55054143": [2, 52, 2]}, {"55054147": [119, 52, 2]}, {"55054151": [120, 3, 224]}, {"55054155": [8]}, {"55054160": [3, 224]}, {"55054163": [8]}, {"55054168": [52, 8]}, {"55054171": [1, 160, 136]}, {"55054175": [62, 3, 224]}, {"55054179": [8]}, {"55054184": [36, 136]}, {"55054187": [134, 36, 9, 255, 255, 37, 41]}, {"55054195": [1, 52, 1]}, {"55054199": [3]}, {"55054201": [41, 8, 42, 20, 32]}, {"55054207": [7]}, {"55054212": [1, 9, 80, 33, 145, 75]}, {"55054220": [52, 1]}, {"55054223": [255, 21, 97, 255, 247]}, {"55054232": [161, 69]}, {"55054236": [3, 224]}, {"55054239": [8]}, {"55054244": [36, 136]}, {"55054247": [168, 1, 6, 64, 33, 145, 9]}, {"55054256": [1, 37, 72, 37, 161, 9]}, {"55054264": [3, 224]}, {"55054267": [8]}, {"55054272": [36, 136]}, {"55054275": [188, 1, 5, 64, 33, 129, 9]}, {"55054284": [5, 33]}, {"55054287": [2]}, {"55054292": [52, 9]}, {"55054296": [37, 41]}, {"55054299": [1, 161, 9]}, {"55054304": [3, 224]}, {"55054307": [8]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 15]}, {"11325064": [12, 16, 3, 7, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 178]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 158]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 162]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 24, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 191]}, {"12491480": [12, 16, 2, 201]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 229]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 196, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 236, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 156, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 184]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 96, 128, 64, 13, 160]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 96, 128, 64, 13, 160]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 20, 128, 64, 13, 160]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 1]}, {"55052163": [4, 16, 32]}, {"55052167": [3]}, {"55052172": [145, 1]}, {"55052175": [104, 161, 1]}, {"55052179": [64, 3, 224]}, {"55052183": [8, 161, 14]}, {"55052187": [104]}, {"55052384": [175, 164]}, {"55052387": [104, 175, 165]}, {"55052391": [108, 175, 166]}, {"55052395": [112, 175, 167]}, {"55052399": [116, 39, 189, 255, 232, 175, 163]}, {"55052407": [16, 175, 191]}, {"55052411": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55052424": [17]}, {"55052427": [10]}, {"55052432": [60, 9, 128, 65, 52, 10]}, {"55052439": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 26]}, {"55052468": [143, 163]}, {"55052471": [16, 143, 191]}, {"55052475": [20, 39, 189]}, {"55052479": [24, 143, 164]}, {"55052483": [104, 143, 165]}, {"55052487": [108, 143, 166]}, {"55052491": [112, 143, 167]}, {"55052495": [116, 132, 110, 19, 196, 3, 224]}, {"55052503": [8]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [19, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [16, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [14, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [11, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [8, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [120, 16, 129]}, {"55052891": [5, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [121, 16, 129]}, {"55052903": [2, 52, 2]}, {"55052908": [52, 2]}, {"55052911": [255, 3, 224]}, {"55052915": [8]}, {"55052920": [143, 166]}, {"55052923": [48, 132, 197]}, {"55052927": [4, 8, 16, 2, 166]}, {"55052936": [143, 185]}, {"55052939": [44, 135, 37]}, {"55052943": [4, 8, 16, 2, 166]}, {"55052952": [60, 10, 128, 64, 37, 74, 10]}, {"55052960": [149, 75]}, {"55052963": [4, 52, 1, 255, 255, 17, 97]}, {"55052971": [2]}, {"55052976": [53, 101]}, {"55052980": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052992": [3, 224]}, {"55052995": [8]}, {"55053000": [60, 8, 128, 64, 37, 8, 10]}, {"55053008": [129, 9]}, {"55053011": [2, 36, 1, 255, 255, 17, 33]}, {"55053019": [2]}, {"55053024": [53, 35]}, {"55053029": [3, 15, 195]}, {"55053033": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053047": [8]}, {"55053052": [144, 69]}, {"55053055": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053064": [145, 9]}, {"55053067": [3, 52, 1]}, {"55053071": [255, 17, 33]}, {"55053075": [2]}, {"55053080": [53, 37]}, {"55053084": [3, 224]}, {"55053087": [8]}, {"55053092": [143, 162]}, {"55053095": [36, 144, 69]}, {"55053100": [60, 8, 128, 64, 37, 8, 10]}, {"55053108": [149, 9]}, {"55053112": [52, 1, 255, 255, 17, 33]}, {"55053119": [19]}, {"55053124": [53, 37]}, {"55053128": [175, 164]}, {"55053132": [175, 165]}, {"55053135": [4, 175, 166]}, {"55053139": [8, 39, 189, 255, 232, 175, 191]}, {"55053147": [16, 141, 9]}, {"55053151": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053163": [6, 145, 6]}, {"55053167": [7, 1, 32, 248, 9]}, {"55053176": [143, 191]}, {"55053179": [16, 39, 189]}, {"55053183": [24, 143, 164]}, {"55053188": [143, 165]}, {"55053191": [4, 143, 166]}, {"55053195": [8, 3, 224]}, {"55053199": [8]}, {"55053204": [140, 136, 29, 44, 52, 9]}, {"55053211": [1]}, {"55053213": [9, 78]}, {"55053216": [1, 9, 16, 36, 16, 64]}, {"55053223": [27]}, {"55053228": [148, 138]}, {"55053231": [164, 52, 1]}, {"55053235": [61, 21, 65]}, {"55053239": [23]}, {"55053244": [148, 202, 2, 220, 52, 11]}, {"55053251": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053275": [14]}, {"55053280": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053308": [1, 10, 64, 33, 129, 8]}, {"55053316": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053328": [52, 2]}, {"55053332": [3, 224]}, {"55053335": [8]}, {"55053340": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053352": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053364": [3, 224]}, {"55053367": [8]}, {"55053372": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053383": [16, 175, 191]}, {"55053387": [20, 12, 16, 3, 26]}, {"55053396": [143, 162]}, {"55053399": [16, 143, 191]}, {"55053403": [20, 39, 189]}, {"55053407": [24, 3, 224]}, {"55053411": [8]}, {"55053416": [39, 189, 255, 216, 175, 176]}, {"55053423": [16, 175, 177]}, {"55053427": [20, 175, 178]}, {"55053431": [24, 175, 191]}, {"55053435": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053451": [62]}, {"55053453": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053476": [173, 40]}, {"55053480": [173, 40]}, {"55053483": [4, 173, 40]}, {"55053487": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053499": [164, 52, 1]}, {"55053503": [62, 21, 1]}, {"55053507": [6]}, {"55053512": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053527": [31, 37, 8]}, {"55053531": [112]}, {"55053533": [8, 66]}, {"55053536": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053551": [4, 149, 42]}, {"55053556": [17, 64]}, {"55053559": [30]}, {"55053564": [21, 72, 255, 251]}, {"55053572": [149, 48]}, {"55053575": [2, 54, 2]}, {"55053580": [52, 80]}, {"55053584": [38, 8, 255, 128, 5]}, {"55053591": [22]}, {"55053596": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053605": [8, 65]}, {"55053608": [2, 72, 144, 33, 142, 72]}, {"55053615": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053626": [248, 9]}, {"55053632": [20, 80, 255, 242]}, {"55053640": [60, 10, 128, 64, 37, 74, 10]}, {"55053648": [142, 75]}, {"55053652": [173, 75]}, {"55053656": [142, 75]}, {"55053659": [4, 173, 75]}, {"55053663": [4, 142, 75]}, {"55053667": [8, 173, 75]}, {"55053671": [8, 16]}, {"55053675": [6]}, {"55053680": [130, 40, 4, 36, 5, 1]}, {"55053687": [2]}, {"55053693": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053703": [16, 143, 177]}, {"55053707": [20, 143, 178]}, {"55053711": [24, 143, 191]}, {"55053715": [32, 39, 189]}, {"55053719": [40, 3, 224]}, {"55053723": [8]}, {"55053728": [3, 224]}, {"55053731": [8, 54, 2]}, {"55053736": [144, 136]}, {"55053739": [125, 52, 1]}, {"55053743": [255, 17, 1]}, {"55053747": [2, 52, 2]}, {"55053751": [8, 52, 2]}, {"55053755": [9, 3, 224]}, {"55053759": [8]}, {"55053764": [144, 136]}, {"55053767": [163, 49, 8]}, {"55053771": [192, 17]}, {"55053775": [5, 52, 2]}, {"55053779": [84, 52, 1]}, {"55053783": [64, 17, 1]}, {"55053787": [2, 52, 2]}, {"55053791": [53, 52, 2]}, {"55053795": [54, 3, 224]}, {"55053799": [8]}, {"55053804": [144, 136]}, {"55053807": [163, 49, 8]}, {"55053811": [24, 17]}, {"55053815": [5, 52, 2]}, {"55053819": [50, 52, 1]}, {"55053823": [8, 17, 1]}, {"55053827": [2, 52, 2]}, {"55053831": [51, 52, 2]}, {"55053835": [52, 3, 224]}, {"55053839": [8]}, {"55053844": [144, 136]}, {"55053847": [163, 49, 8]}, {"55053851": [3, 17]}, {"55053855": [5, 52, 2]}, {"55053859": [4, 52, 1]}, {"55053863": [1, 17, 1]}, {"55053867": [2, 52, 2]}, {"55053871": [48, 52, 2]}, {"55053875": [49, 3, 224]}, {"55053879": [8]}, {"55053884": [144, 136]}, {"55053887": [162, 49, 8]}, {"55053891": [192, 17]}, {"55053895": [5, 52, 2]}, {"55053899": [5, 52, 1]}, {"55053903": [64, 17, 1]}, {"55053907": [2, 52, 2]}, {"55053911": [96, 52, 2]}, {"55053915": [123, 3, 224]}, {"55053919": [8]}, {"55053924": [144, 136]}, {"55053927": [162, 49, 8]}, {"55053931": [48, 17]}, {"55053935": [2, 52, 2]}, {"55053939": [69, 52, 2]}, {"55053943": [70, 3, 224]}, {"55053947": [8]}, {"55053952": [144, 136]}, {"55053955": [162, 49, 8]}, {"55053959": [6, 17]}, {"55053963": [2, 52, 2]}, {"55053967": [55, 52, 2]}, {"55053971": [56, 3, 224]}, {"55053975": [8]}, {"55053980": [144, 136]}, {"55053983": [161, 49, 8]}, {"55053987": [48, 17]}, {"55053991": [2, 52, 2]}, {"55053995": [121, 52, 2]}, {"55053999": [122, 3, 224]}, {"55054003": [8]}, {"55054008": [144, 136]}, {"55054011": [161, 49, 8]}, {"55054015": [6, 17]}, {"55054019": [2, 52, 2]}, {"55054023": [119, 52, 2]}, {"55054027": [120, 3, 224]}, {"55054031": [8]}, {"55054036": [144, 136]}, {"55054039": [163, 49, 8]}, {"55054043": [3, 17]}, {"55054047": [2, 52, 2]}, {"55054051": [77, 54, 2]}, {"55054056": [3, 224]}, {"55054059": [8]}, {"55054064": [144, 136]}, {"55054067": [163, 49, 8]}, {"55054071": [24, 17]}, {"55054075": [2, 52, 2]}, {"55054079": [77, 54, 2]}, {"55054084": [3, 224]}, {"55054087": [8]}, {"55054092": [3, 224]}, {"55054095": [8]}, {"55054100": [52, 8]}, {"55054103": [1, 160, 136]}, {"55054107": [62, 3, 224]}, {"55054111": [8]}, {"55054116": [36, 136]}, {"55054119": [134, 36, 9, 255, 255, 37, 41]}, {"55054127": [1, 52, 1]}, {"55054131": [3]}, {"55054133": [41, 8, 42, 20, 32]}, {"55054139": [7]}, {"55054144": [1, 9, 80, 33, 145, 75]}, {"55054152": [52, 1]}, {"55054155": [255, 21, 97, 255, 247]}, {"55054164": [161, 69]}, {"55054168": [3, 224]}, {"55054171": [8]}, {"55054176": [36, 136]}, {"55054179": [168, 1, 6, 64, 33, 145, 9]}, {"55054188": [1, 37, 72, 37, 161, 9]}, {"55054196": [3, 224]}, {"55054199": [8]}, {"55054204": [36, 136]}, {"55054207": [188, 1, 5, 64, 33, 129, 9]}, {"55054216": [5, 33]}, {"55054219": [2]}, {"55054224": [52, 9]}, {"55054228": [37, 41]}, {"55054231": [1, 161, 9]}, {"55054236": [3, 224]}, {"55054239": [8]}] \ No newline at end of file From 00d717ebf41ca22077252d63047b17e8430792e1 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sun, 27 May 2018 21:03:27 -0400 Subject: [PATCH 036/151] Fix grotto overrides, always use override for treasure chest game --- ASM/src/hacks.asm | 4 ++-- ItemOverrides.py | 30 ++++++++++++------------- Items.py | 1 + Regions.py | 2 +- Rom.py | 10 ++------- Rules.py | 51 ++++++++++++++++++++++++++++++++++++------ data/base2current.json | 2 +- 7 files changed, 66 insertions(+), 34 deletions(-) diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 8467545b1..5c7dfe7d4 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -121,9 +121,9 @@ .org 0xBE9BDC ; In memory: 0x803A4BCC addiu at, r0, 0x8383 ; Make branch impossible -; Replace all generic grotto prizes with 20 bombs +; Replace all generic grotto prizes with boomerangs .org 0xE9A550 -.fill 8, 0x67 +.fill 8, 0x06 ;================================================================================================== ; Special item sources diff --git a/ItemOverrides.py b/ItemOverrides.py index 21cce6acd..ab4ee2287 100755 --- a/ItemOverrides.py +++ b/ItemOverrides.py @@ -1,5 +1,3 @@ -import itertools - from Items import ItemFactory @@ -19,7 +17,9 @@ def set_overrides(world): continue if loc.type == 'Grotto': - base_item = "Bombs (20)" + base_item = 'Boomerang' + elif loc.name == 'Treasure Chest Game': + base_item = 'Piece of Heart (Treasure Chest Game)' elif loc.item.index >= 0x80: base_item = available_base_items.pop(0) if not base_item: @@ -42,24 +42,24 @@ def get_overrides(world): 'Lens of Truth', 'Hammer', 'Bottle', - 'Bottle with Letter', 'Bottle with Milk', - 'Stone of Agony', - 'Fire Arrows', - 'Ice Arrows', - 'Light Arrows', - 'Dins Fire', - 'Farores Wind', - 'Nayrus Love', - 'Mirror Shield', - 'Iron Boots', - 'Hover Boots', - 'Keaton Mask', + 'Bottle with Letter', 'Skull Mask', 'Spooky Mask', + 'Keaton Mask', 'Bunny Hood', 'Mask of Truth', + 'Mirror Shield', + 'Iron Boots', + 'Hover Boots', + 'Stone of Agony', 'Goron Mask', 'Zora Mask', 'Gerudo Mask', + 'Fire Arrows', + 'Ice Arrows', + 'Light Arrows', + 'Dins Fire', + 'Farores Wind', + 'Nayrus Love', ] diff --git a/Items.py b/Items.py index 89f6cb784..70ad59a56 100644 --- a/Items.py +++ b/Items.py @@ -77,6 +77,7 @@ def ItemFactory(items): 'Deku Nut Capacity': (False, True, None, None, 0x87), 'Stone of Agony': (True, False, None, 0x0720, 0x39), 'Piece of Heart': (False, False, None, 0x07C0, 0x3E), + 'Piece of Heart (Treasure Chest Game)': (False, False, None, None, 0x76), 'Recovery Heart': (False, True, None, None, 0xB6), 'Arrows (5)': (False, True, None, None, 0xB7), 'Arrows (10)': (False, True, None, None, 0xB8), diff --git a/Regions.py b/Regions.py index 340a1987a..164da51be 100644 --- a/Regions.py +++ b/Regions.py @@ -381,7 +381,7 @@ def _create_region(name, type, locations=None, exits=None): 'Zoras Fountain Fairy Reward': (0x3480200, None, None, 'NPC', 0x3D), 'Desert Colossus Fairy Reward': (0x3480202, None, None, 'NPC', 0x3D), 'Zelda': (0x3480203, None, None, 'NPC', 0x43), - 'Treasure Chest Game': (0xBEF152, None, None, 'Special', 0x10), + 'Treasure Chest Game': (None, None, None, 'Special', 0x10), 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC', 0x49), diff --git a/Rom.py b/Rom.py index 4670e3994..a513abf09 100644 --- a/Rom.py +++ b/Rom.py @@ -867,12 +867,8 @@ def patch_rom(world, rom): if itemid is None or location.address is None: continue - if location.type == 'Special': - if location.name == 'Treasure Chest Game': - rom.write_bytes(locationaddress, item_data[item.name]) - else: - rom.write_byte(locationaddress, item_data[item.name][0]) - rom.write_byte(secondaryaddress, item_data[item.name][3]) + if location.type == 'Special' or location.type == 'Grotto': + pass # These must be handled with overrides elif location.type == 'Song': rom.write_byte(locationaddress, itemid) itemid = itemid + 0x0D @@ -954,8 +950,6 @@ def patch_rom(world, rom): elif location.name == 'Twinrova': rom.write_bytes(0xCA3EA2, [item_data[item.name][3][0], item_data[item.name][3][1]]) rom.write_bytes(0xCA3EA6, [item_data[item.name][3][2], item_data[item.name][3][3]]) - elif location.type == 'Grotto': - pass # These must be handled with overrides else: locationdefault = location.default & 0xF01F itemid = itemid | locationdefault diff --git a/Rules.py b/Rules.py index e12b3bec0..11f5675ce 100644 --- a/Rules.py +++ b/Rules.py @@ -393,11 +393,48 @@ def global_rules(world): set_rule(world.get_location('GS99'), lambda state: state.has('Song of Time') and (state.has('Bow') or state.has('Progressive Hookshot') or state.has('Bomb Bag'))) set_rule(world.get_location('GS100'), lambda state: state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Hover Boots'))) - for location in ['Darunias Joy', 'Diving Minigame', 'Child Fishing', 'Adult Fishing', 'Diving in the Lab', 'Link the Goron', 'King Zora Thawed', 'Dog Lady', 'Skull Kid', 'Ocarina Memory Game', '10 Gold Skulltulla Reward', '20 Gold Skulltulla Reward', '30 Gold Skulltulla Reward', '40 Gold Skulltulla Reward', '50 Gold Skulltulla Reward', 'Man on Roof', 'Frog Ocarina Game', 'Frogs in the Rain', 'Horseback Archery 1000 Points', 'Horseback Archery 1500 Points', 'Child Shooting Gallery', 'Adult Shooting Gallery', 'Target in Woods', 'Deku Theater Skull Mask', 'Deku Theater Mask of Truth', 'Anju as Adult', 'Biggoron', 'Anjus Chickens', 'Talons Chickens', '10 Big Poes', 'Rolling Goron as Child', 'Hyrule Castle Fairy Reward', 'Zoras Fountain Fairy Reward', 'Desert Colossus Fairy Reward', 'Zelda']: - forbid_item(world.get_location(location), 'Ice Trap') - - for location in ['Bombchu Bowling Bomb Bag', 'Bombchu Bowling Piece of Heart', 'Deku Salesman Woods', 'Deku Salesman Lost Woods Grotto', 'Deku Salesman Hyrule Field Grotto', 'Underwater Bottle', 'Hyrule Castle Fairy Reward', 'Zoras Fountain Fairy Reward', 'Desert Colossus Fairy Reward']: - forbid_item(world.get_location(location), 'Ice Trap') - - for location in ['Treasure Chest Game', 'Zelda']: + no_ice_traps = [ + 'Darunias Joy', + 'Diving Minigame', + 'Child Fishing', + 'Adult Fishing', + 'Diving in the Lab', + 'Link the Goron', + 'King Zora Thawed', + 'Dog Lady', + 'Skull Kid', + 'Ocarina Memory Game', + '10 Gold Skulltulla Reward', + '20 Gold Skulltulla Reward', + '30 Gold Skulltulla Reward', + '40 Gold Skulltulla Reward', + '50 Gold Skulltulla Reward', + 'Man on Roof', + 'Frog Ocarina Game', + 'Frogs in the Rain', + 'Horseback Archery 1000 Points', + 'Horseback Archery 1500 Points', + 'Child Shooting Gallery', + 'Adult Shooting Gallery', + 'Target in Woods', + 'Deku Theater Skull Mask', + 'Deku Theater Mask of Truth', + 'Anju as Adult', + 'Biggoron', + 'Anjus Chickens', + 'Talons Chickens', + '10 Big Poes', + 'Rolling Goron as Child', + 'Hyrule Castle Fairy Reward', + 'Zoras Fountain Fairy Reward', + 'Desert Colossus Fairy Reward', + 'Zelda', + 'Bombchu Bowling Bomb Bag', + 'Bombchu Bowling Piece of Heart', + 'Deku Salesman Woods', + 'Deku Salesman Lost Woods Grotto', + 'Deku Salesman Hyrule Field Grotto', + 'Underwater Bottle', + ] + for location in no_ice_traps: forbid_item(world.get_location(location), 'Ice Trap') diff --git a/data/base2current.json b/data/base2current.json index 939738fad..eefec9934 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 15]}, {"11325064": [12, 16, 3, 7, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 178]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 158]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 162]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 24, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 191]}, {"12491480": [12, 16, 2, 201]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 229]}, {"15312208": [103, 103, 103]}, {"15312212": [103, 103, 103, 103]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 196, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 236, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 156, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 184]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 96, 128, 64, 13, 160]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 96, 128, 64, 13, 160]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 20, 128, 64, 13, 160]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 1]}, {"55052163": [4, 16, 32]}, {"55052167": [3]}, {"55052172": [145, 1]}, {"55052175": [104, 161, 1]}, {"55052179": [64, 3, 224]}, {"55052183": [8, 161, 14]}, {"55052187": [104]}, {"55052384": [175, 164]}, {"55052387": [104, 175, 165]}, {"55052391": [108, 175, 166]}, {"55052395": [112, 175, 167]}, {"55052399": [116, 39, 189, 255, 232, 175, 163]}, {"55052407": [16, 175, 191]}, {"55052411": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55052424": [17]}, {"55052427": [10]}, {"55052432": [60, 9, 128, 65, 52, 10]}, {"55052439": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 26]}, {"55052468": [143, 163]}, {"55052471": [16, 143, 191]}, {"55052475": [20, 39, 189]}, {"55052479": [24, 143, 164]}, {"55052483": [104, 143, 165]}, {"55052487": [108, 143, 166]}, {"55052491": [112, 143, 167]}, {"55052495": [116, 132, 110, 19, 196, 3, 224]}, {"55052503": [8]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [19, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [16, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [14, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [11, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [8, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [120, 16, 129]}, {"55052891": [5, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [121, 16, 129]}, {"55052903": [2, 52, 2]}, {"55052908": [52, 2]}, {"55052911": [255, 3, 224]}, {"55052915": [8]}, {"55052920": [143, 166]}, {"55052923": [48, 132, 197]}, {"55052927": [4, 8, 16, 2, 166]}, {"55052936": [143, 185]}, {"55052939": [44, 135, 37]}, {"55052943": [4, 8, 16, 2, 166]}, {"55052952": [60, 10, 128, 64, 37, 74, 10]}, {"55052960": [149, 75]}, {"55052963": [4, 52, 1, 255, 255, 17, 97]}, {"55052971": [2]}, {"55052976": [53, 101]}, {"55052980": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052992": [3, 224]}, {"55052995": [8]}, {"55053000": [60, 8, 128, 64, 37, 8, 10]}, {"55053008": [129, 9]}, {"55053011": [2, 36, 1, 255, 255, 17, 33]}, {"55053019": [2]}, {"55053024": [53, 35]}, {"55053029": [3, 15, 195]}, {"55053033": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053047": [8]}, {"55053052": [144, 69]}, {"55053055": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053064": [145, 9]}, {"55053067": [3, 52, 1]}, {"55053071": [255, 17, 33]}, {"55053075": [2]}, {"55053080": [53, 37]}, {"55053084": [3, 224]}, {"55053087": [8]}, {"55053092": [143, 162]}, {"55053095": [36, 144, 69]}, {"55053100": [60, 8, 128, 64, 37, 8, 10]}, {"55053108": [149, 9]}, {"55053112": [52, 1, 255, 255, 17, 33]}, {"55053119": [19]}, {"55053124": [53, 37]}, {"55053128": [175, 164]}, {"55053132": [175, 165]}, {"55053135": [4, 175, 166]}, {"55053139": [8, 39, 189, 255, 232, 175, 191]}, {"55053147": [16, 141, 9]}, {"55053151": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053163": [6, 145, 6]}, {"55053167": [7, 1, 32, 248, 9]}, {"55053176": [143, 191]}, {"55053179": [16, 39, 189]}, {"55053183": [24, 143, 164]}, {"55053188": [143, 165]}, {"55053191": [4, 143, 166]}, {"55053195": [8, 3, 224]}, {"55053199": [8]}, {"55053204": [140, 136, 29, 44, 52, 9]}, {"55053211": [1]}, {"55053213": [9, 78]}, {"55053216": [1, 9, 16, 36, 16, 64]}, {"55053223": [27]}, {"55053228": [148, 138]}, {"55053231": [164, 52, 1]}, {"55053235": [61, 21, 65]}, {"55053239": [23]}, {"55053244": [148, 202, 2, 220, 52, 11]}, {"55053251": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053275": [14]}, {"55053280": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053308": [1, 10, 64, 33, 129, 8]}, {"55053316": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053328": [52, 2]}, {"55053332": [3, 224]}, {"55053335": [8]}, {"55053340": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053352": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053364": [3, 224]}, {"55053367": [8]}, {"55053372": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053383": [16, 175, 191]}, {"55053387": [20, 12, 16, 3, 26]}, {"55053396": [143, 162]}, {"55053399": [16, 143, 191]}, {"55053403": [20, 39, 189]}, {"55053407": [24, 3, 224]}, {"55053411": [8]}, {"55053416": [39, 189, 255, 216, 175, 176]}, {"55053423": [16, 175, 177]}, {"55053427": [20, 175, 178]}, {"55053431": [24, 175, 191]}, {"55053435": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053451": [62]}, {"55053453": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053476": [173, 40]}, {"55053480": [173, 40]}, {"55053483": [4, 173, 40]}, {"55053487": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053499": [164, 52, 1]}, {"55053503": [62, 21, 1]}, {"55053507": [6]}, {"55053512": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053527": [31, 37, 8]}, {"55053531": [112]}, {"55053533": [8, 66]}, {"55053536": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053551": [4, 149, 42]}, {"55053556": [17, 64]}, {"55053559": [30]}, {"55053564": [21, 72, 255, 251]}, {"55053572": [149, 48]}, {"55053575": [2, 54, 2]}, {"55053580": [52, 80]}, {"55053584": [38, 8, 255, 128, 5]}, {"55053591": [22]}, {"55053596": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053605": [8, 65]}, {"55053608": [2, 72, 144, 33, 142, 72]}, {"55053615": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053626": [248, 9]}, {"55053632": [20, 80, 255, 242]}, {"55053640": [60, 10, 128, 64, 37, 74, 10]}, {"55053648": [142, 75]}, {"55053652": [173, 75]}, {"55053656": [142, 75]}, {"55053659": [4, 173, 75]}, {"55053663": [4, 142, 75]}, {"55053667": [8, 173, 75]}, {"55053671": [8, 16]}, {"55053675": [6]}, {"55053680": [130, 40, 4, 36, 5, 1]}, {"55053687": [2]}, {"55053693": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053703": [16, 143, 177]}, {"55053707": [20, 143, 178]}, {"55053711": [24, 143, 191]}, {"55053715": [32, 39, 189]}, {"55053719": [40, 3, 224]}, {"55053723": [8]}, {"55053728": [3, 224]}, {"55053731": [8, 54, 2]}, {"55053736": [144, 136]}, {"55053739": [125, 52, 1]}, {"55053743": [255, 17, 1]}, {"55053747": [2, 52, 2]}, {"55053751": [8, 52, 2]}, {"55053755": [9, 3, 224]}, {"55053759": [8]}, {"55053764": [144, 136]}, {"55053767": [163, 49, 8]}, {"55053771": [192, 17]}, {"55053775": [5, 52, 2]}, {"55053779": [84, 52, 1]}, {"55053783": [64, 17, 1]}, {"55053787": [2, 52, 2]}, {"55053791": [53, 52, 2]}, {"55053795": [54, 3, 224]}, {"55053799": [8]}, {"55053804": [144, 136]}, {"55053807": [163, 49, 8]}, {"55053811": [24, 17]}, {"55053815": [5, 52, 2]}, {"55053819": [50, 52, 1]}, {"55053823": [8, 17, 1]}, {"55053827": [2, 52, 2]}, {"55053831": [51, 52, 2]}, {"55053835": [52, 3, 224]}, {"55053839": [8]}, {"55053844": [144, 136]}, {"55053847": [163, 49, 8]}, {"55053851": [3, 17]}, {"55053855": [5, 52, 2]}, {"55053859": [4, 52, 1]}, {"55053863": [1, 17, 1]}, {"55053867": [2, 52, 2]}, {"55053871": [48, 52, 2]}, {"55053875": [49, 3, 224]}, {"55053879": [8]}, {"55053884": [144, 136]}, {"55053887": [162, 49, 8]}, {"55053891": [192, 17]}, {"55053895": [5, 52, 2]}, {"55053899": [5, 52, 1]}, {"55053903": [64, 17, 1]}, {"55053907": [2, 52, 2]}, {"55053911": [96, 52, 2]}, {"55053915": [123, 3, 224]}, {"55053919": [8]}, {"55053924": [144, 136]}, {"55053927": [162, 49, 8]}, {"55053931": [48, 17]}, {"55053935": [2, 52, 2]}, {"55053939": [69, 52, 2]}, {"55053943": [70, 3, 224]}, {"55053947": [8]}, {"55053952": [144, 136]}, {"55053955": [162, 49, 8]}, {"55053959": [6, 17]}, {"55053963": [2, 52, 2]}, {"55053967": [55, 52, 2]}, {"55053971": [56, 3, 224]}, {"55053975": [8]}, {"55053980": [144, 136]}, {"55053983": [161, 49, 8]}, {"55053987": [48, 17]}, {"55053991": [2, 52, 2]}, {"55053995": [121, 52, 2]}, {"55053999": [122, 3, 224]}, {"55054003": [8]}, {"55054008": [144, 136]}, {"55054011": [161, 49, 8]}, {"55054015": [6, 17]}, {"55054019": [2, 52, 2]}, {"55054023": [119, 52, 2]}, {"55054027": [120, 3, 224]}, {"55054031": [8]}, {"55054036": [144, 136]}, {"55054039": [163, 49, 8]}, {"55054043": [3, 17]}, {"55054047": [2, 52, 2]}, {"55054051": [77, 54, 2]}, {"55054056": [3, 224]}, {"55054059": [8]}, {"55054064": [144, 136]}, {"55054067": [163, 49, 8]}, {"55054071": [24, 17]}, {"55054075": [2, 52, 2]}, {"55054079": [77, 54, 2]}, {"55054084": [3, 224]}, {"55054087": [8]}, {"55054092": [3, 224]}, {"55054095": [8]}, {"55054100": [52, 8]}, {"55054103": [1, 160, 136]}, {"55054107": [62, 3, 224]}, {"55054111": [8]}, {"55054116": [36, 136]}, {"55054119": [134, 36, 9, 255, 255, 37, 41]}, {"55054127": [1, 52, 1]}, {"55054131": [3]}, {"55054133": [41, 8, 42, 20, 32]}, {"55054139": [7]}, {"55054144": [1, 9, 80, 33, 145, 75]}, {"55054152": [52, 1]}, {"55054155": [255, 21, 97, 255, 247]}, {"55054164": [161, 69]}, {"55054168": [3, 224]}, {"55054171": [8]}, {"55054176": [36, 136]}, {"55054179": [168, 1, 6, 64, 33, 145, 9]}, {"55054188": [1, 37, 72, 37, 161, 9]}, {"55054196": [3, 224]}, {"55054199": [8]}, {"55054204": [36, 136]}, {"55054207": [188, 1, 5, 64, 33, 129, 9]}, {"55054216": [5, 33]}, {"55054219": [2]}, {"55054224": [52, 9]}, {"55054228": [37, 41]}, {"55054231": [1, 161, 9]}, {"55054236": [3, 224]}, {"55054239": [8]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 15]}, {"11325064": [12, 16, 3, 7, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 178]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 158]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 162]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 24, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 191]}, {"12491480": [12, 16, 2, 201]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 229]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 196, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 236, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 156, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 184]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 96, 128, 64, 13, 160]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 96, 128, 64, 13, 160]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 20, 128, 64, 13, 160]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 1]}, {"55052163": [4, 16, 32]}, {"55052167": [3]}, {"55052172": [145, 1]}, {"55052175": [104, 161, 1]}, {"55052179": [64, 3, 224]}, {"55052183": [8, 161, 14]}, {"55052187": [104]}, {"55052384": [175, 164]}, {"55052387": [104, 175, 165]}, {"55052391": [108, 175, 166]}, {"55052395": [112, 175, 167]}, {"55052399": [116, 39, 189, 255, 232, 175, 163]}, {"55052407": [16, 175, 191]}, {"55052411": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55052424": [17]}, {"55052427": [10]}, {"55052432": [60, 9, 128, 65, 52, 10]}, {"55052439": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 26]}, {"55052468": [143, 163]}, {"55052471": [16, 143, 191]}, {"55052475": [20, 39, 189]}, {"55052479": [24, 143, 164]}, {"55052483": [104, 143, 165]}, {"55052487": [108, 143, 166]}, {"55052491": [112, 143, 167]}, {"55052495": [116, 132, 110, 19, 196, 3, 224]}, {"55052503": [8]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [19, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [16, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [14, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [11, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [8, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [120, 16, 129]}, {"55052891": [5, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [121, 16, 129]}, {"55052903": [2, 52, 2]}, {"55052908": [52, 2]}, {"55052911": [255, 3, 224]}, {"55052915": [8]}, {"55052920": [143, 166]}, {"55052923": [48, 132, 197]}, {"55052927": [4, 8, 16, 2, 166]}, {"55052936": [143, 185]}, {"55052939": [44, 135, 37]}, {"55052943": [4, 8, 16, 2, 166]}, {"55052952": [60, 10, 128, 64, 37, 74, 10]}, {"55052960": [149, 75]}, {"55052963": [4, 52, 1, 255, 255, 17, 97]}, {"55052971": [2]}, {"55052976": [53, 101]}, {"55052980": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052992": [3, 224]}, {"55052995": [8]}, {"55053000": [60, 8, 128, 64, 37, 8, 10]}, {"55053008": [129, 9]}, {"55053011": [2, 36, 1, 255, 255, 17, 33]}, {"55053019": [2]}, {"55053024": [53, 35]}, {"55053029": [3, 15, 195]}, {"55053033": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053047": [8]}, {"55053052": [144, 69]}, {"55053055": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053064": [145, 9]}, {"55053067": [3, 52, 1]}, {"55053071": [255, 17, 33]}, {"55053075": [2]}, {"55053080": [53, 37]}, {"55053084": [3, 224]}, {"55053087": [8]}, {"55053092": [143, 162]}, {"55053095": [36, 144, 69]}, {"55053100": [60, 8, 128, 64, 37, 8, 10]}, {"55053108": [149, 9]}, {"55053112": [52, 1, 255, 255, 17, 33]}, {"55053119": [19]}, {"55053124": [53, 37]}, {"55053128": [175, 164]}, {"55053132": [175, 165]}, {"55053135": [4, 175, 166]}, {"55053139": [8, 39, 189, 255, 232, 175, 191]}, {"55053147": [16, 141, 9]}, {"55053151": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053163": [6, 145, 6]}, {"55053167": [7, 1, 32, 248, 9]}, {"55053176": [143, 191]}, {"55053179": [16, 39, 189]}, {"55053183": [24, 143, 164]}, {"55053188": [143, 165]}, {"55053191": [4, 143, 166]}, {"55053195": [8, 3, 224]}, {"55053199": [8]}, {"55053204": [140, 136, 29, 44, 52, 9]}, {"55053211": [1]}, {"55053213": [9, 78]}, {"55053216": [1, 9, 16, 36, 16, 64]}, {"55053223": [27]}, {"55053228": [148, 138]}, {"55053231": [164, 52, 1]}, {"55053235": [61, 21, 65]}, {"55053239": [23]}, {"55053244": [148, 202, 2, 220, 52, 11]}, {"55053251": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053275": [14]}, {"55053280": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053308": [1, 10, 64, 33, 129, 8]}, {"55053316": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053328": [52, 2]}, {"55053332": [3, 224]}, {"55053335": [8]}, {"55053340": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053352": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053364": [3, 224]}, {"55053367": [8]}, {"55053372": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053383": [16, 175, 191]}, {"55053387": [20, 12, 16, 3, 26]}, {"55053396": [143, 162]}, {"55053399": [16, 143, 191]}, {"55053403": [20, 39, 189]}, {"55053407": [24, 3, 224]}, {"55053411": [8]}, {"55053416": [39, 189, 255, 216, 175, 176]}, {"55053423": [16, 175, 177]}, {"55053427": [20, 175, 178]}, {"55053431": [24, 175, 191]}, {"55053435": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053451": [62]}, {"55053453": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053476": [173, 40]}, {"55053480": [173, 40]}, {"55053483": [4, 173, 40]}, {"55053487": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053499": [164, 52, 1]}, {"55053503": [62, 21, 1]}, {"55053507": [6]}, {"55053512": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053527": [31, 37, 8]}, {"55053531": [112]}, {"55053533": [8, 66]}, {"55053536": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053551": [4, 149, 42]}, {"55053556": [17, 64]}, {"55053559": [30]}, {"55053564": [21, 72, 255, 251]}, {"55053572": [149, 48]}, {"55053575": [2, 54, 2]}, {"55053580": [52, 80]}, {"55053584": [38, 8, 255, 128, 5]}, {"55053591": [22]}, {"55053596": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053605": [8, 65]}, {"55053608": [2, 72, 144, 33, 142, 72]}, {"55053615": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053626": [248, 9]}, {"55053632": [20, 80, 255, 242]}, {"55053640": [60, 10, 128, 64, 37, 74, 10]}, {"55053648": [142, 75]}, {"55053652": [173, 75]}, {"55053656": [142, 75]}, {"55053659": [4, 173, 75]}, {"55053663": [4, 142, 75]}, {"55053667": [8, 173, 75]}, {"55053671": [8, 16]}, {"55053675": [6]}, {"55053680": [130, 40, 4, 36, 5, 1]}, {"55053687": [2]}, {"55053693": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053703": [16, 143, 177]}, {"55053707": [20, 143, 178]}, {"55053711": [24, 143, 191]}, {"55053715": [32, 39, 189]}, {"55053719": [40, 3, 224]}, {"55053723": [8]}, {"55053728": [3, 224]}, {"55053731": [8, 54, 2]}, {"55053736": [144, 136]}, {"55053739": [125, 52, 1]}, {"55053743": [255, 17, 1]}, {"55053747": [2, 52, 2]}, {"55053751": [8, 52, 2]}, {"55053755": [9, 3, 224]}, {"55053759": [8]}, {"55053764": [144, 136]}, {"55053767": [163, 49, 8]}, {"55053771": [192, 17]}, {"55053775": [5, 52, 2]}, {"55053779": [84, 52, 1]}, {"55053783": [64, 17, 1]}, {"55053787": [2, 52, 2]}, {"55053791": [53, 52, 2]}, {"55053795": [54, 3, 224]}, {"55053799": [8]}, {"55053804": [144, 136]}, {"55053807": [163, 49, 8]}, {"55053811": [24, 17]}, {"55053815": [5, 52, 2]}, {"55053819": [50, 52, 1]}, {"55053823": [8, 17, 1]}, {"55053827": [2, 52, 2]}, {"55053831": [51, 52, 2]}, {"55053835": [52, 3, 224]}, {"55053839": [8]}, {"55053844": [144, 136]}, {"55053847": [163, 49, 8]}, {"55053851": [3, 17]}, {"55053855": [5, 52, 2]}, {"55053859": [4, 52, 1]}, {"55053863": [1, 17, 1]}, {"55053867": [2, 52, 2]}, {"55053871": [48, 52, 2]}, {"55053875": [49, 3, 224]}, {"55053879": [8]}, {"55053884": [144, 136]}, {"55053887": [162, 49, 8]}, {"55053891": [192, 17]}, {"55053895": [5, 52, 2]}, {"55053899": [5, 52, 1]}, {"55053903": [64, 17, 1]}, {"55053907": [2, 52, 2]}, {"55053911": [96, 52, 2]}, {"55053915": [123, 3, 224]}, {"55053919": [8]}, {"55053924": [144, 136]}, {"55053927": [162, 49, 8]}, {"55053931": [48, 17]}, {"55053935": [2, 52, 2]}, {"55053939": [69, 52, 2]}, {"55053943": [70, 3, 224]}, {"55053947": [8]}, {"55053952": [144, 136]}, {"55053955": [162, 49, 8]}, {"55053959": [6, 17]}, {"55053963": [2, 52, 2]}, {"55053967": [55, 52, 2]}, {"55053971": [56, 3, 224]}, {"55053975": [8]}, {"55053980": [144, 136]}, {"55053983": [161, 49, 8]}, {"55053987": [48, 17]}, {"55053991": [2, 52, 2]}, {"55053995": [121, 52, 2]}, {"55053999": [122, 3, 224]}, {"55054003": [8]}, {"55054008": [144, 136]}, {"55054011": [161, 49, 8]}, {"55054015": [6, 17]}, {"55054019": [2, 52, 2]}, {"55054023": [119, 52, 2]}, {"55054027": [120, 3, 224]}, {"55054031": [8]}, {"55054036": [144, 136]}, {"55054039": [163, 49, 8]}, {"55054043": [3, 17]}, {"55054047": [2, 52, 2]}, {"55054051": [77, 54, 2]}, {"55054056": [3, 224]}, {"55054059": [8]}, {"55054064": [144, 136]}, {"55054067": [163, 49, 8]}, {"55054071": [24, 17]}, {"55054075": [2, 52, 2]}, {"55054079": [77, 54, 2]}, {"55054084": [3, 224]}, {"55054087": [8]}, {"55054092": [3, 224]}, {"55054095": [8]}, {"55054100": [52, 8]}, {"55054103": [1, 160, 136]}, {"55054107": [62, 3, 224]}, {"55054111": [8]}, {"55054116": [36, 136]}, {"55054119": [134, 36, 9, 255, 255, 37, 41]}, {"55054127": [1, 52, 1]}, {"55054131": [3]}, {"55054133": [41, 8, 42, 20, 32]}, {"55054139": [7]}, {"55054144": [1, 9, 80, 33, 145, 75]}, {"55054152": [52, 1]}, {"55054155": [255, 21, 97, 255, 247]}, {"55054164": [161, 69]}, {"55054168": [3, 224]}, {"55054171": [8]}, {"55054176": [36, 136]}, {"55054179": [168, 1, 6, 64, 33, 145, 9]}, {"55054188": [1, 37, 72, 37, 161, 9]}, {"55054196": [3, 224]}, {"55054199": [8]}, {"55054204": [36, 136]}, {"55054207": [188, 1, 5, 64, 33, 129, 9]}, {"55054216": [5, 33]}, {"55054219": [2]}, {"55054224": [52, 9]}, {"55054228": [37, 41]}, {"55054231": [1, 161, 9]}, {"55054236": [3, 224]}, {"55054239": [8]}] \ No newline at end of file From 6867f60f3dd51a21703feeafb787dd6fb76a465e Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 28 May 2018 16:48:30 -0400 Subject: [PATCH 037/151] Use virtual scene numbers for overrides in non-generic grottos --- ASM/src/config.asm | 8 ++++++++ Regions.py | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ASM/src/config.asm b/ASM/src/config.asm index eed3eac94..69357c4c1 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -23,6 +23,14 @@ ; 0x84: Lost Woods: under boulder next to Goron City warp ; 0x87: Death Mountain: SoS hole outside Goron City ; 0x8A: Death Mountain Crater: under boulder in circle of rocks near top entrance +; +; Other grotto virtual scene numbers: +; 0x71: Hyrule Field: Underwater heart piece +; 0x76: Hyrule Field: Salesman grotto +; 0x77: Redead grotto +; 0x7D: Wolfos grotto +; 0x83: Deku Theater +; 0x85: Lost Woods: Salesman grotto .area 0x200, 0 ITEM_OVERRIDES: diff --git a/Regions.py b/Regions.py index 164da51be..13f78856c 100644 --- a/Regions.py +++ b/Regions.py @@ -219,8 +219,8 @@ def _create_region(name, type, locations=None, exits=None): 'Gerudo Valley Hammer Rocks Chest': (0x213D676, None, 0x5AA0, 'Chest', 0x5A), 'Gerudo Fortress Rooftop Chest': (0x21BD4AA, 0x21BD6EA, 0x07C0, 'Chest', 0x5D), 'Haunted Wasteland Structure Chest': (0x21E20DE, None, 0x8AA0, 'Chest', 0x5E), - 'Redead Grotto Chest': (0x26CF076, None, 0x7ACA, 'Chest', 0x3E), - 'Wolfos Grotto Chest': (0x26EB076, None, 0x7AB1, 'Chest', 0x3E), + 'Redead Grotto Chest': (0x26CF076, None, 0x7ACA, 'Chest', 0x77), + 'Wolfos Grotto Chest': (0x26EB076, None, 0x7AB1, 'Chest', 0x7D), 'Deku Tree Lobby Chest': (0x24A7146, None, 0x0823, 'Chest', 0x00), 'Deku Tree Slingshot Chest': (0x24C20C6, None, 0x00A1, 'Chest', 0x00), 'Deku Tree Slingshot Room Side Chest': (0x24C20D6, None, 0x5905, 'Chest', 0x00), @@ -407,11 +407,11 @@ def _create_region(name, type, locations=None, exits=None): 'Child Shooting Gallery': (0xD35EF3, None, 0x60, 'NPC', 0x42), 'Adult Shooting Gallery': (0xD35F5B, None, 0x30, 'NPC', 0x42), 'Target in Woods': (0xE59CDF, None, 0x60, 'NPC', 0x5B), - 'Deku Theater Skull Mask': (0xEC9A87, None, 0x77, 'NPC', 0x3E), - 'Deku Theater Mask of Truth': (0xEC9CE7, None, 0x79, 'NPC', 0x3E), + 'Deku Theater Skull Mask': (0xEC9A87, None, 0x77, 'NPC', 0x83), + 'Deku Theater Mask of Truth': (0xEC9CE7, None, 0x79, 'NPC', 0x83), 'Deku Salesman Woods': (0xDF8073, None, 0x77, 'NPC', 0x5B), - 'Deku Salesman Lost Woods Grotto': (0xDF80E7, None, 0x79, 'NPC', 0x3E), - 'Deku Salesman Hyrule Field Grotto': (0xDF86AB, None, 0x3E, 'NPC', 0x3E), + 'Deku Salesman Lost Woods Grotto': (0xDF80E7, None, 0x79, 'NPC', 0x85), + 'Deku Salesman Hyrule Field Grotto': (0xDF86AB, None, 0x3E, 'NPC', 0x76), 'Anju as Adult': (0xE1EABB, None, 0x1D, 'NPC', 0x52), 'Biggoron': (0xED338F, 0xED650F, 0x57, 'NPC', 0x60), 'Anjus Chickens': (0xE1E7A7, None, 0x0F, 'NPC', 0x52), From 7da281979e51192713dc6609e4032cfcd79fc307 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 28 May 2018 20:06:20 -0400 Subject: [PATCH 038/151] Avoid pickup animation for deku seed drops --- ASM/src/items.asm | 3 +++ data/base2current.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index ff18ba686..430769150 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -17,6 +17,9 @@ inventory_check: beq a0, 0x8B, @@return ; Deku Sticks (10) lbu v0, 0x74 (t0) + beq a0, 0x58, @@return ; Deku Seeds (5) + li v0, 0x00 + beq a0, 0x78, @@return ; Small Magic Jar li v0, 0x00 diff --git a/data/base2current.json b/data/base2current.json index eefec9934..224b98510 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 15]}, {"11325064": [12, 16, 3, 7, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 178]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 158]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 162]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 24, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 191]}, {"12491480": [12, 16, 2, 201]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 229]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 196, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 13, 236, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 156, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 12, 128, 64, 14, 184]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 36, 128, 64, 13, 160]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 96, 128, 64, 13, 160]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 96, 128, 64, 13, 160]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 96, 128, 64, 13, 160]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 124, 128, 64, 13, 160]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 20, 128, 64, 13, 160]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 12, 128, 64, 14, 212]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 12, 128, 64, 14, 240]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 12, 128, 64, 13, 160]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 1]}, {"55052163": [4, 16, 32]}, {"55052167": [3]}, {"55052172": [145, 1]}, {"55052175": [104, 161, 1]}, {"55052179": [64, 3, 224]}, {"55052183": [8, 161, 14]}, {"55052187": [104]}, {"55052384": [175, 164]}, {"55052387": [104, 175, 165]}, {"55052391": [108, 175, 166]}, {"55052395": [112, 175, 167]}, {"55052399": [116, 39, 189, 255, 232, 175, 163]}, {"55052407": [16, 175, 191]}, {"55052411": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55052424": [17]}, {"55052427": [10]}, {"55052432": [60, 9, 128, 65, 52, 10]}, {"55052439": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 26]}, {"55052468": [143, 163]}, {"55052471": [16, 143, 191]}, {"55052475": [20, 39, 189]}, {"55052479": [24, 143, 164]}, {"55052483": [104, 143, 165]}, {"55052487": [108, 143, 166]}, {"55052491": [112, 143, 167]}, {"55052495": [116, 132, 110, 19, 196, 3, 224]}, {"55052503": [8]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [19, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [16, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [14, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [11, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [8, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [120, 16, 129]}, {"55052891": [5, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [121, 16, 129]}, {"55052903": [2, 52, 2]}, {"55052908": [52, 2]}, {"55052911": [255, 3, 224]}, {"55052915": [8]}, {"55052920": [143, 166]}, {"55052923": [48, 132, 197]}, {"55052927": [4, 8, 16, 2, 166]}, {"55052936": [143, 185]}, {"55052939": [44, 135, 37]}, {"55052943": [4, 8, 16, 2, 166]}, {"55052952": [60, 10, 128, 64, 37, 74, 10]}, {"55052960": [149, 75]}, {"55052963": [4, 52, 1, 255, 255, 17, 97]}, {"55052971": [2]}, {"55052976": [53, 101]}, {"55052980": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55052992": [3, 224]}, {"55052995": [8]}, {"55053000": [60, 8, 128, 64, 37, 8, 10]}, {"55053008": [129, 9]}, {"55053011": [2, 36, 1, 255, 255, 17, 33]}, {"55053019": [2]}, {"55053024": [53, 35]}, {"55053029": [3, 15, 195]}, {"55053033": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053047": [8]}, {"55053052": [144, 69]}, {"55053055": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053064": [145, 9]}, {"55053067": [3, 52, 1]}, {"55053071": [255, 17, 33]}, {"55053075": [2]}, {"55053080": [53, 37]}, {"55053084": [3, 224]}, {"55053087": [8]}, {"55053092": [143, 162]}, {"55053095": [36, 144, 69]}, {"55053100": [60, 8, 128, 64, 37, 8, 10]}, {"55053108": [149, 9]}, {"55053112": [52, 1, 255, 255, 17, 33]}, {"55053119": [19]}, {"55053124": [53, 37]}, {"55053128": [175, 164]}, {"55053132": [175, 165]}, {"55053135": [4, 175, 166]}, {"55053139": [8, 39, 189, 255, 232, 175, 191]}, {"55053147": [16, 141, 9]}, {"55053151": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053163": [6, 145, 6]}, {"55053167": [7, 1, 32, 248, 9]}, {"55053176": [143, 191]}, {"55053179": [16, 39, 189]}, {"55053183": [24, 143, 164]}, {"55053188": [143, 165]}, {"55053191": [4, 143, 166]}, {"55053195": [8, 3, 224]}, {"55053199": [8]}, {"55053204": [140, 136, 29, 44, 52, 9]}, {"55053211": [1]}, {"55053213": [9, 78]}, {"55053216": [1, 9, 16, 36, 16, 64]}, {"55053223": [27]}, {"55053228": [148, 138]}, {"55053231": [164, 52, 1]}, {"55053235": [61, 21, 65]}, {"55053239": [23]}, {"55053244": [148, 202, 2, 220, 52, 11]}, {"55053251": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053275": [14]}, {"55053280": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053308": [1, 10, 64, 33, 129, 8]}, {"55053316": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053328": [52, 2]}, {"55053332": [3, 224]}, {"55053335": [8]}, {"55053340": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053352": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053364": [3, 224]}, {"55053367": [8]}, {"55053372": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053383": [16, 175, 191]}, {"55053387": [20, 12, 16, 3, 26]}, {"55053396": [143, 162]}, {"55053399": [16, 143, 191]}, {"55053403": [20, 39, 189]}, {"55053407": [24, 3, 224]}, {"55053411": [8]}, {"55053416": [39, 189, 255, 216, 175, 176]}, {"55053423": [16, 175, 177]}, {"55053427": [20, 175, 178]}, {"55053431": [24, 175, 191]}, {"55053435": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053451": [62]}, {"55053453": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053476": [173, 40]}, {"55053480": [173, 40]}, {"55053483": [4, 173, 40]}, {"55053487": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053499": [164, 52, 1]}, {"55053503": [62, 21, 1]}, {"55053507": [6]}, {"55053512": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053527": [31, 37, 8]}, {"55053531": [112]}, {"55053533": [8, 66]}, {"55053536": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053551": [4, 149, 42]}, {"55053556": [17, 64]}, {"55053559": [30]}, {"55053564": [21, 72, 255, 251]}, {"55053572": [149, 48]}, {"55053575": [2, 54, 2]}, {"55053580": [52, 80]}, {"55053584": [38, 8, 255, 128, 5]}, {"55053591": [22]}, {"55053596": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053605": [8, 65]}, {"55053608": [2, 72, 144, 33, 142, 72]}, {"55053615": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053626": [248, 9]}, {"55053632": [20, 80, 255, 242]}, {"55053640": [60, 10, 128, 64, 37, 74, 10]}, {"55053648": [142, 75]}, {"55053652": [173, 75]}, {"55053656": [142, 75]}, {"55053659": [4, 173, 75]}, {"55053663": [4, 142, 75]}, {"55053667": [8, 173, 75]}, {"55053671": [8, 16]}, {"55053675": [6]}, {"55053680": [130, 40, 4, 36, 5, 1]}, {"55053687": [2]}, {"55053693": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053703": [16, 143, 177]}, {"55053707": [20, 143, 178]}, {"55053711": [24, 143, 191]}, {"55053715": [32, 39, 189]}, {"55053719": [40, 3, 224]}, {"55053723": [8]}, {"55053728": [3, 224]}, {"55053731": [8, 54, 2]}, {"55053736": [144, 136]}, {"55053739": [125, 52, 1]}, {"55053743": [255, 17, 1]}, {"55053747": [2, 52, 2]}, {"55053751": [8, 52, 2]}, {"55053755": [9, 3, 224]}, {"55053759": [8]}, {"55053764": [144, 136]}, {"55053767": [163, 49, 8]}, {"55053771": [192, 17]}, {"55053775": [5, 52, 2]}, {"55053779": [84, 52, 1]}, {"55053783": [64, 17, 1]}, {"55053787": [2, 52, 2]}, {"55053791": [53, 52, 2]}, {"55053795": [54, 3, 224]}, {"55053799": [8]}, {"55053804": [144, 136]}, {"55053807": [163, 49, 8]}, {"55053811": [24, 17]}, {"55053815": [5, 52, 2]}, {"55053819": [50, 52, 1]}, {"55053823": [8, 17, 1]}, {"55053827": [2, 52, 2]}, {"55053831": [51, 52, 2]}, {"55053835": [52, 3, 224]}, {"55053839": [8]}, {"55053844": [144, 136]}, {"55053847": [163, 49, 8]}, {"55053851": [3, 17]}, {"55053855": [5, 52, 2]}, {"55053859": [4, 52, 1]}, {"55053863": [1, 17, 1]}, {"55053867": [2, 52, 2]}, {"55053871": [48, 52, 2]}, {"55053875": [49, 3, 224]}, {"55053879": [8]}, {"55053884": [144, 136]}, {"55053887": [162, 49, 8]}, {"55053891": [192, 17]}, {"55053895": [5, 52, 2]}, {"55053899": [5, 52, 1]}, {"55053903": [64, 17, 1]}, {"55053907": [2, 52, 2]}, {"55053911": [96, 52, 2]}, {"55053915": [123, 3, 224]}, {"55053919": [8]}, {"55053924": [144, 136]}, {"55053927": [162, 49, 8]}, {"55053931": [48, 17]}, {"55053935": [2, 52, 2]}, {"55053939": [69, 52, 2]}, {"55053943": [70, 3, 224]}, {"55053947": [8]}, {"55053952": [144, 136]}, {"55053955": [162, 49, 8]}, {"55053959": [6, 17]}, {"55053963": [2, 52, 2]}, {"55053967": [55, 52, 2]}, {"55053971": [56, 3, 224]}, {"55053975": [8]}, {"55053980": [144, 136]}, {"55053983": [161, 49, 8]}, {"55053987": [48, 17]}, {"55053991": [2, 52, 2]}, {"55053995": [121, 52, 2]}, {"55053999": [122, 3, 224]}, {"55054003": [8]}, {"55054008": [144, 136]}, {"55054011": [161, 49, 8]}, {"55054015": [6, 17]}, {"55054019": [2, 52, 2]}, {"55054023": [119, 52, 2]}, {"55054027": [120, 3, 224]}, {"55054031": [8]}, {"55054036": [144, 136]}, {"55054039": [163, 49, 8]}, {"55054043": [3, 17]}, {"55054047": [2, 52, 2]}, {"55054051": [77, 54, 2]}, {"55054056": [3, 224]}, {"55054059": [8]}, {"55054064": [144, 136]}, {"55054067": [163, 49, 8]}, {"55054071": [24, 17]}, {"55054075": [2, 52, 2]}, {"55054079": [77, 54, 2]}, {"55054084": [3, 224]}, {"55054087": [8]}, {"55054092": [3, 224]}, {"55054095": [8]}, {"55054100": [52, 8]}, {"55054103": [1, 160, 136]}, {"55054107": [62, 3, 224]}, {"55054111": [8]}, {"55054116": [36, 136]}, {"55054119": [134, 36, 9, 255, 255, 37, 41]}, {"55054127": [1, 52, 1]}, {"55054131": [3]}, {"55054133": [41, 8, 42, 20, 32]}, {"55054139": [7]}, {"55054144": [1, 9, 80, 33, 145, 75]}, {"55054152": [52, 1]}, {"55054155": [255, 21, 97, 255, 247]}, {"55054164": [161, 69]}, {"55054168": [3, 224]}, {"55054171": [8]}, {"55054176": [36, 136]}, {"55054179": [168, 1, 6, 64, 33, 145, 9]}, {"55054188": [1, 37, 72, 37, 161, 9]}, {"55054196": [3, 224]}, {"55054199": [8]}, {"55054204": [36, 136]}, {"55054207": [188, 1, 5, 64, 33, 129, 9]}, {"55054216": [5, 33]}, {"55054219": [2]}, {"55054224": [52, 9]}, {"55054228": [37, 41]}, {"55054231": [1, 161, 9]}, {"55054236": [3, 224]}, {"55054239": [8]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 18]}, {"11325064": [12, 16, 3, 10, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 181]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 161]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 165]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 24, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 194]}, {"12491480": [12, 16, 2, 204]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 232]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 112, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 196]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 108, 128, 64, 13, 172]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 108, 128, 64, 13, 172]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 32, 128, 64, 13, 172]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 1]}, {"55052163": [4, 16, 32]}, {"55052167": [3]}, {"55052172": [145, 1]}, {"55052175": [104, 161, 1]}, {"55052179": [64, 3, 224]}, {"55052183": [8, 161, 14]}, {"55052187": [104]}, {"55052384": [175, 164]}, {"55052387": [104, 175, 165]}, {"55052391": [108, 175, 166]}, {"55052395": [112, 175, 167]}, {"55052399": [116, 39, 189, 255, 232, 175, 163]}, {"55052407": [16, 175, 191]}, {"55052411": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55052424": [17]}, {"55052427": [10]}, {"55052432": [60, 9, 128, 65, 52, 10]}, {"55052439": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 29]}, {"55052468": [143, 163]}, {"55052471": [16, 143, 191]}, {"55052475": [20, 39, 189]}, {"55052479": [24, 143, 164]}, {"55052483": [104, 143, 165]}, {"55052487": [108, 143, 166]}, {"55052491": [112, 143, 167]}, {"55052495": [116, 132, 110, 19, 196, 3, 224]}, {"55052503": [8]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [22, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [19, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [17, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [14, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [11, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [88, 16, 129]}, {"55052891": [8, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [120, 16, 129]}, {"55052903": [5, 52, 2]}, {"55052908": [52, 1]}, {"55052911": [121, 16, 129]}, {"55052915": [2, 52, 2]}, {"55052920": [52, 2]}, {"55052923": [255, 3, 224]}, {"55052927": [8]}, {"55052932": [143, 166]}, {"55052935": [48, 132, 197]}, {"55052939": [4, 8, 16, 2, 169]}, {"55052948": [143, 185]}, {"55052951": [44, 135, 37]}, {"55052955": [4, 8, 16, 2, 169]}, {"55052964": [60, 10, 128, 64, 37, 74, 10]}, {"55052972": [149, 75]}, {"55052975": [4, 52, 1, 255, 255, 17, 97]}, {"55052983": [2]}, {"55052988": [53, 101]}, {"55052992": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55053004": [3, 224]}, {"55053007": [8]}, {"55053012": [60, 8, 128, 64, 37, 8, 10]}, {"55053020": [129, 9]}, {"55053023": [2, 36, 1, 255, 255, 17, 33]}, {"55053031": [2]}, {"55053036": [53, 35]}, {"55053041": [3, 15, 195]}, {"55053045": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053059": [8]}, {"55053064": [144, 69]}, {"55053067": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053076": [145, 9]}, {"55053079": [3, 52, 1]}, {"55053083": [255, 17, 33]}, {"55053087": [2]}, {"55053092": [53, 37]}, {"55053096": [3, 224]}, {"55053099": [8]}, {"55053104": [143, 162]}, {"55053107": [36, 144, 69]}, {"55053112": [60, 8, 128, 64, 37, 8, 10]}, {"55053120": [149, 9]}, {"55053124": [52, 1, 255, 255, 17, 33]}, {"55053131": [19]}, {"55053136": [53, 37]}, {"55053140": [175, 164]}, {"55053144": [175, 165]}, {"55053147": [4, 175, 166]}, {"55053151": [8, 39, 189, 255, 232, 175, 191]}, {"55053159": [16, 141, 9]}, {"55053163": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053175": [6, 145, 6]}, {"55053179": [7, 1, 32, 248, 9]}, {"55053188": [143, 191]}, {"55053191": [16, 39, 189]}, {"55053195": [24, 143, 164]}, {"55053200": [143, 165]}, {"55053203": [4, 143, 166]}, {"55053207": [8, 3, 224]}, {"55053211": [8]}, {"55053216": [140, 136, 29, 44, 52, 9]}, {"55053223": [1]}, {"55053225": [9, 78]}, {"55053228": [1, 9, 16, 36, 16, 64]}, {"55053235": [27]}, {"55053240": [148, 138]}, {"55053243": [164, 52, 1]}, {"55053247": [61, 21, 65]}, {"55053251": [23]}, {"55053256": [148, 202, 2, 220, 52, 11]}, {"55053263": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053287": [14]}, {"55053292": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053320": [1, 10, 64, 33, 129, 8]}, {"55053328": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053340": [52, 2]}, {"55053344": [3, 224]}, {"55053347": [8]}, {"55053352": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053364": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053376": [3, 224]}, {"55053379": [8]}, {"55053384": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053395": [16, 175, 191]}, {"55053399": [20, 12, 16, 3, 29]}, {"55053408": [143, 162]}, {"55053411": [16, 143, 191]}, {"55053415": [20, 39, 189]}, {"55053419": [24, 3, 224]}, {"55053423": [8]}, {"55053428": [39, 189, 255, 216, 175, 176]}, {"55053435": [16, 175, 177]}, {"55053439": [20, 175, 178]}, {"55053443": [24, 175, 191]}, {"55053447": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053463": [62]}, {"55053465": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053488": [173, 40]}, {"55053492": [173, 40]}, {"55053495": [4, 173, 40]}, {"55053499": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053511": [164, 52, 1]}, {"55053515": [62, 21, 1]}, {"55053519": [6]}, {"55053524": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053539": [31, 37, 8]}, {"55053543": [112]}, {"55053545": [8, 66]}, {"55053548": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053563": [4, 149, 42]}, {"55053568": [17, 64]}, {"55053571": [30]}, {"55053576": [21, 72, 255, 251]}, {"55053584": [149, 48]}, {"55053587": [2, 54, 2]}, {"55053592": [52, 80]}, {"55053596": [38, 8, 255, 128, 5]}, {"55053603": [22]}, {"55053608": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053617": [8, 65]}, {"55053620": [2, 72, 144, 33, 142, 72]}, {"55053627": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053638": [248, 9]}, {"55053644": [20, 80, 255, 242]}, {"55053652": [60, 10, 128, 64, 37, 74, 10]}, {"55053660": [142, 75]}, {"55053664": [173, 75]}, {"55053668": [142, 75]}, {"55053671": [4, 173, 75]}, {"55053675": [4, 142, 75]}, {"55053679": [8, 173, 75]}, {"55053683": [8, 16]}, {"55053687": [6]}, {"55053692": [130, 40, 4, 36, 5, 1]}, {"55053699": [2]}, {"55053705": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053715": [16, 143, 177]}, {"55053719": [20, 143, 178]}, {"55053723": [24, 143, 191]}, {"55053727": [32, 39, 189]}, {"55053731": [40, 3, 224]}, {"55053735": [8]}, {"55053740": [3, 224]}, {"55053743": [8, 54, 2]}, {"55053748": [144, 136]}, {"55053751": [125, 52, 1]}, {"55053755": [255, 17, 1]}, {"55053759": [2, 52, 2]}, {"55053763": [8, 52, 2]}, {"55053767": [9, 3, 224]}, {"55053771": [8]}, {"55053776": [144, 136]}, {"55053779": [163, 49, 8]}, {"55053783": [192, 17]}, {"55053787": [5, 52, 2]}, {"55053791": [84, 52, 1]}, {"55053795": [64, 17, 1]}, {"55053799": [2, 52, 2]}, {"55053803": [53, 52, 2]}, {"55053807": [54, 3, 224]}, {"55053811": [8]}, {"55053816": [144, 136]}, {"55053819": [163, 49, 8]}, {"55053823": [24, 17]}, {"55053827": [5, 52, 2]}, {"55053831": [50, 52, 1]}, {"55053835": [8, 17, 1]}, {"55053839": [2, 52, 2]}, {"55053843": [51, 52, 2]}, {"55053847": [52, 3, 224]}, {"55053851": [8]}, {"55053856": [144, 136]}, {"55053859": [163, 49, 8]}, {"55053863": [3, 17]}, {"55053867": [5, 52, 2]}, {"55053871": [4, 52, 1]}, {"55053875": [1, 17, 1]}, {"55053879": [2, 52, 2]}, {"55053883": [48, 52, 2]}, {"55053887": [49, 3, 224]}, {"55053891": [8]}, {"55053896": [144, 136]}, {"55053899": [162, 49, 8]}, {"55053903": [192, 17]}, {"55053907": [5, 52, 2]}, {"55053911": [5, 52, 1]}, {"55053915": [64, 17, 1]}, {"55053919": [2, 52, 2]}, {"55053923": [96, 52, 2]}, {"55053927": [123, 3, 224]}, {"55053931": [8]}, {"55053936": [144, 136]}, {"55053939": [162, 49, 8]}, {"55053943": [48, 17]}, {"55053947": [2, 52, 2]}, {"55053951": [69, 52, 2]}, {"55053955": [70, 3, 224]}, {"55053959": [8]}, {"55053964": [144, 136]}, {"55053967": [162, 49, 8]}, {"55053971": [6, 17]}, {"55053975": [2, 52, 2]}, {"55053979": [55, 52, 2]}, {"55053983": [56, 3, 224]}, {"55053987": [8]}, {"55053992": [144, 136]}, {"55053995": [161, 49, 8]}, {"55053999": [48, 17]}, {"55054003": [2, 52, 2]}, {"55054007": [121, 52, 2]}, {"55054011": [122, 3, 224]}, {"55054015": [8]}, {"55054020": [144, 136]}, {"55054023": [161, 49, 8]}, {"55054027": [6, 17]}, {"55054031": [2, 52, 2]}, {"55054035": [119, 52, 2]}, {"55054039": [120, 3, 224]}, {"55054043": [8]}, {"55054048": [144, 136]}, {"55054051": [163, 49, 8]}, {"55054055": [3, 17]}, {"55054059": [2, 52, 2]}, {"55054063": [77, 54, 2]}, {"55054068": [3, 224]}, {"55054071": [8]}, {"55054076": [144, 136]}, {"55054079": [163, 49, 8]}, {"55054083": [24, 17]}, {"55054087": [2, 52, 2]}, {"55054091": [77, 54, 2]}, {"55054096": [3, 224]}, {"55054099": [8]}, {"55054104": [3, 224]}, {"55054107": [8]}, {"55054112": [52, 8]}, {"55054115": [1, 160, 136]}, {"55054119": [62, 3, 224]}, {"55054123": [8]}, {"55054128": [36, 136]}, {"55054131": [134, 36, 9, 255, 255, 37, 41]}, {"55054139": [1, 52, 1]}, {"55054143": [3]}, {"55054145": [41, 8, 42, 20, 32]}, {"55054151": [7]}, {"55054156": [1, 9, 80, 33, 145, 75]}, {"55054164": [52, 1]}, {"55054167": [255, 21, 97, 255, 247]}, {"55054176": [161, 69]}, {"55054180": [3, 224]}, {"55054183": [8]}, {"55054188": [36, 136]}, {"55054191": [168, 1, 6, 64, 33, 145, 9]}, {"55054200": [1, 37, 72, 37, 161, 9]}, {"55054208": [3, 224]}, {"55054211": [8]}, {"55054216": [36, 136]}, {"55054219": [188, 1, 5, 64, 33, 129, 9]}, {"55054228": [5, 33]}, {"55054231": [2]}, {"55054236": [52, 9]}, {"55054240": [37, 41]}, {"55054243": [1, 161, 9]}, {"55054248": [3, 224]}, {"55054251": [8]}] \ No newline at end of file From c254bdf8d5114187d681ee00b5fb661e774fac47 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 28 May 2018 22:09:46 -0400 Subject: [PATCH 039/151] Only store 0x3B or 0xFF to saved child B equip --- ASM/src/fixes.asm | 16 ++++++++++++---- ASM/src/hacks.asm | 4 ++-- data/base2current.json | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ASM/src/fixes.asm b/ASM/src/fixes.asm index 659b7d34b..88af94d2c 100755 --- a/ASM/src/fixes.asm +++ b/ASM/src/fixes.asm @@ -1,10 +1,18 @@ save_child_b_equip: ; t0 = save context - lw at, 0x04 (t0) - beqz at, @@return ; Only do this as child + lw t1, 0x04 (t0) + beqz t1, @@return ; Only do this as child nop - lbu at, 0x68 (t0) ; Load current B equip - sb at, 0x40 (t0) ; Save B equip, will be loaded on next adult -> child transition + + lbu t1, 0x68 (t0) ; Load current B equip + beq t1, 0x3B, @@save + nop + + li t1, 0xFF + +@@save: + sb t1, 0x40 (t0) ; Save B equip, will be loaded on next adult -> child transition + @@return: jr ra sb t6, 0x68 (t0) ; Displaced code diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 5c7dfe7d4..86a404228 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -16,8 +16,8 @@ ; Adult -> Child: Don't skip restoring child's B equip if 0xFF is the saved value ; Replaces: -; addiu v1, r0, 0x00FF -.org 0xAE58F4 ; In memory: 0x8006F994 +; beq v1, t6, 0x8006FA28 +.org 0xAE58F8 ; In memory: 0x8006F998 nop ; Child -> Adult: Save the child's B equip before it gets overwritten diff --git a/data/base2current.json b/data/base2current.json index 224b98510..d1ccde7ef 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 18]}, {"11325064": [12, 16, 3, 10, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [0, 0]}, {"11426039": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 181]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 161]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 165]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 24, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 194]}, {"12491480": [12, 16, 2, 204]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 232]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 112, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 196]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 108, 128, 64, 13, 172]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 108, 128, 64, 13, 172]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 32, 128, 64, 13, 172]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 1]}, {"55052163": [4, 16, 32]}, {"55052167": [3]}, {"55052172": [145, 1]}, {"55052175": [104, 161, 1]}, {"55052179": [64, 3, 224]}, {"55052183": [8, 161, 14]}, {"55052187": [104]}, {"55052384": [175, 164]}, {"55052387": [104, 175, 165]}, {"55052391": [108, 175, 166]}, {"55052395": [112, 175, 167]}, {"55052399": [116, 39, 189, 255, 232, 175, 163]}, {"55052407": [16, 175, 191]}, {"55052411": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55052424": [17]}, {"55052427": [10]}, {"55052432": [60, 9, 128, 65, 52, 10]}, {"55052439": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 29]}, {"55052468": [143, 163]}, {"55052471": [16, 143, 191]}, {"55052475": [20, 39, 189]}, {"55052479": [24, 143, 164]}, {"55052483": [104, 143, 165]}, {"55052487": [108, 143, 166]}, {"55052491": [112, 143, 167]}, {"55052495": [116, 132, 110, 19, 196, 3, 224]}, {"55052503": [8]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [22, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [19, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [17, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [14, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [11, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [88, 16, 129]}, {"55052891": [8, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [120, 16, 129]}, {"55052903": [5, 52, 2]}, {"55052908": [52, 1]}, {"55052911": [121, 16, 129]}, {"55052915": [2, 52, 2]}, {"55052920": [52, 2]}, {"55052923": [255, 3, 224]}, {"55052927": [8]}, {"55052932": [143, 166]}, {"55052935": [48, 132, 197]}, {"55052939": [4, 8, 16, 2, 169]}, {"55052948": [143, 185]}, {"55052951": [44, 135, 37]}, {"55052955": [4, 8, 16, 2, 169]}, {"55052964": [60, 10, 128, 64, 37, 74, 10]}, {"55052972": [149, 75]}, {"55052975": [4, 52, 1, 255, 255, 17, 97]}, {"55052983": [2]}, {"55052988": [53, 101]}, {"55052992": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55053004": [3, 224]}, {"55053007": [8]}, {"55053012": [60, 8, 128, 64, 37, 8, 10]}, {"55053020": [129, 9]}, {"55053023": [2, 36, 1, 255, 255, 17, 33]}, {"55053031": [2]}, {"55053036": [53, 35]}, {"55053041": [3, 15, 195]}, {"55053045": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053059": [8]}, {"55053064": [144, 69]}, {"55053067": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053076": [145, 9]}, {"55053079": [3, 52, 1]}, {"55053083": [255, 17, 33]}, {"55053087": [2]}, {"55053092": [53, 37]}, {"55053096": [3, 224]}, {"55053099": [8]}, {"55053104": [143, 162]}, {"55053107": [36, 144, 69]}, {"55053112": [60, 8, 128, 64, 37, 8, 10]}, {"55053120": [149, 9]}, {"55053124": [52, 1, 255, 255, 17, 33]}, {"55053131": [19]}, {"55053136": [53, 37]}, {"55053140": [175, 164]}, {"55053144": [175, 165]}, {"55053147": [4, 175, 166]}, {"55053151": [8, 39, 189, 255, 232, 175, 191]}, {"55053159": [16, 141, 9]}, {"55053163": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053175": [6, 145, 6]}, {"55053179": [7, 1, 32, 248, 9]}, {"55053188": [143, 191]}, {"55053191": [16, 39, 189]}, {"55053195": [24, 143, 164]}, {"55053200": [143, 165]}, {"55053203": [4, 143, 166]}, {"55053207": [8, 3, 224]}, {"55053211": [8]}, {"55053216": [140, 136, 29, 44, 52, 9]}, {"55053223": [1]}, {"55053225": [9, 78]}, {"55053228": [1, 9, 16, 36, 16, 64]}, {"55053235": [27]}, {"55053240": [148, 138]}, {"55053243": [164, 52, 1]}, {"55053247": [61, 21, 65]}, {"55053251": [23]}, {"55053256": [148, 202, 2, 220, 52, 11]}, {"55053263": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053287": [14]}, {"55053292": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053320": [1, 10, 64, 33, 129, 8]}, {"55053328": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053340": [52, 2]}, {"55053344": [3, 224]}, {"55053347": [8]}, {"55053352": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053364": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053376": [3, 224]}, {"55053379": [8]}, {"55053384": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053395": [16, 175, 191]}, {"55053399": [20, 12, 16, 3, 29]}, {"55053408": [143, 162]}, {"55053411": [16, 143, 191]}, {"55053415": [20, 39, 189]}, {"55053419": [24, 3, 224]}, {"55053423": [8]}, {"55053428": [39, 189, 255, 216, 175, 176]}, {"55053435": [16, 175, 177]}, {"55053439": [20, 175, 178]}, {"55053443": [24, 175, 191]}, {"55053447": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053463": [62]}, {"55053465": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053488": [173, 40]}, {"55053492": [173, 40]}, {"55053495": [4, 173, 40]}, {"55053499": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053511": [164, 52, 1]}, {"55053515": [62, 21, 1]}, {"55053519": [6]}, {"55053524": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053539": [31, 37, 8]}, {"55053543": [112]}, {"55053545": [8, 66]}, {"55053548": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053563": [4, 149, 42]}, {"55053568": [17, 64]}, {"55053571": [30]}, {"55053576": [21, 72, 255, 251]}, {"55053584": [149, 48]}, {"55053587": [2, 54, 2]}, {"55053592": [52, 80]}, {"55053596": [38, 8, 255, 128, 5]}, {"55053603": [22]}, {"55053608": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053617": [8, 65]}, {"55053620": [2, 72, 144, 33, 142, 72]}, {"55053627": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053638": [248, 9]}, {"55053644": [20, 80, 255, 242]}, {"55053652": [60, 10, 128, 64, 37, 74, 10]}, {"55053660": [142, 75]}, {"55053664": [173, 75]}, {"55053668": [142, 75]}, {"55053671": [4, 173, 75]}, {"55053675": [4, 142, 75]}, {"55053679": [8, 173, 75]}, {"55053683": [8, 16]}, {"55053687": [6]}, {"55053692": [130, 40, 4, 36, 5, 1]}, {"55053699": [2]}, {"55053705": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053715": [16, 143, 177]}, {"55053719": [20, 143, 178]}, {"55053723": [24, 143, 191]}, {"55053727": [32, 39, 189]}, {"55053731": [40, 3, 224]}, {"55053735": [8]}, {"55053740": [3, 224]}, {"55053743": [8, 54, 2]}, {"55053748": [144, 136]}, {"55053751": [125, 52, 1]}, {"55053755": [255, 17, 1]}, {"55053759": [2, 52, 2]}, {"55053763": [8, 52, 2]}, {"55053767": [9, 3, 224]}, {"55053771": [8]}, {"55053776": [144, 136]}, {"55053779": [163, 49, 8]}, {"55053783": [192, 17]}, {"55053787": [5, 52, 2]}, {"55053791": [84, 52, 1]}, {"55053795": [64, 17, 1]}, {"55053799": [2, 52, 2]}, {"55053803": [53, 52, 2]}, {"55053807": [54, 3, 224]}, {"55053811": [8]}, {"55053816": [144, 136]}, {"55053819": [163, 49, 8]}, {"55053823": [24, 17]}, {"55053827": [5, 52, 2]}, {"55053831": [50, 52, 1]}, {"55053835": [8, 17, 1]}, {"55053839": [2, 52, 2]}, {"55053843": [51, 52, 2]}, {"55053847": [52, 3, 224]}, {"55053851": [8]}, {"55053856": [144, 136]}, {"55053859": [163, 49, 8]}, {"55053863": [3, 17]}, {"55053867": [5, 52, 2]}, {"55053871": [4, 52, 1]}, {"55053875": [1, 17, 1]}, {"55053879": [2, 52, 2]}, {"55053883": [48, 52, 2]}, {"55053887": [49, 3, 224]}, {"55053891": [8]}, {"55053896": [144, 136]}, {"55053899": [162, 49, 8]}, {"55053903": [192, 17]}, {"55053907": [5, 52, 2]}, {"55053911": [5, 52, 1]}, {"55053915": [64, 17, 1]}, {"55053919": [2, 52, 2]}, {"55053923": [96, 52, 2]}, {"55053927": [123, 3, 224]}, {"55053931": [8]}, {"55053936": [144, 136]}, {"55053939": [162, 49, 8]}, {"55053943": [48, 17]}, {"55053947": [2, 52, 2]}, {"55053951": [69, 52, 2]}, {"55053955": [70, 3, 224]}, {"55053959": [8]}, {"55053964": [144, 136]}, {"55053967": [162, 49, 8]}, {"55053971": [6, 17]}, {"55053975": [2, 52, 2]}, {"55053979": [55, 52, 2]}, {"55053983": [56, 3, 224]}, {"55053987": [8]}, {"55053992": [144, 136]}, {"55053995": [161, 49, 8]}, {"55053999": [48, 17]}, {"55054003": [2, 52, 2]}, {"55054007": [121, 52, 2]}, {"55054011": [122, 3, 224]}, {"55054015": [8]}, {"55054020": [144, 136]}, {"55054023": [161, 49, 8]}, {"55054027": [6, 17]}, {"55054031": [2, 52, 2]}, {"55054035": [119, 52, 2]}, {"55054039": [120, 3, 224]}, {"55054043": [8]}, {"55054048": [144, 136]}, {"55054051": [163, 49, 8]}, {"55054055": [3, 17]}, {"55054059": [2, 52, 2]}, {"55054063": [77, 54, 2]}, {"55054068": [3, 224]}, {"55054071": [8]}, {"55054076": [144, 136]}, {"55054079": [163, 49, 8]}, {"55054083": [24, 17]}, {"55054087": [2, 52, 2]}, {"55054091": [77, 54, 2]}, {"55054096": [3, 224]}, {"55054099": [8]}, {"55054104": [3, 224]}, {"55054107": [8]}, {"55054112": [52, 8]}, {"55054115": [1, 160, 136]}, {"55054119": [62, 3, 224]}, {"55054123": [8]}, {"55054128": [36, 136]}, {"55054131": [134, 36, 9, 255, 255, 37, 41]}, {"55054139": [1, 52, 1]}, {"55054143": [3]}, {"55054145": [41, 8, 42, 20, 32]}, {"55054151": [7]}, {"55054156": [1, 9, 80, 33, 145, 75]}, {"55054164": [52, 1]}, {"55054167": [255, 21, 97, 255, 247]}, {"55054176": [161, 69]}, {"55054180": [3, 224]}, {"55054183": [8]}, {"55054188": [36, 136]}, {"55054191": [168, 1, 6, 64, 33, 145, 9]}, {"55054200": [1, 37, 72, 37, 161, 9]}, {"55054208": [3, 224]}, {"55054211": [8]}, {"55054216": [36, 136]}, {"55054219": [188, 1, 5, 64, 33, 129, 9]}, {"55054228": [5, 33]}, {"55054231": [2]}, {"55054236": [52, 9]}, {"55054240": [37, 41]}, {"55054243": [1, 161, 9]}, {"55054248": [3, 224]}, {"55054251": [8]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 18]}, {"11325064": [12, 16, 3, 10, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 181]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 161]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 165]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 24, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 194]}, {"12491480": [12, 16, 2, 204]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 232]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 112, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 196]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 108, 128, 64, 13, 172]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 108, 128, 64, 13, 172]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 32, 128, 64, 13, 172]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 9]}, {"55052163": [4, 17, 32]}, {"55052167": [7]}, {"55052172": [145, 9]}, {"55052175": [104, 52, 1]}, {"55052179": [59, 17, 33]}, {"55052183": [2]}, {"55052188": [52, 9]}, {"55052191": [255, 161, 9]}, {"55052195": [64, 3, 224]}, {"55052199": [8, 161, 14]}, {"55052203": [104]}, {"55052384": [175, 164]}, {"55052387": [104, 175, 165]}, {"55052391": [108, 175, 166]}, {"55052395": [112, 175, 167]}, {"55052399": [116, 39, 189, 255, 232, 175, 163]}, {"55052407": [16, 175, 191]}, {"55052411": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55052424": [17]}, {"55052427": [10]}, {"55052432": [60, 9, 128, 65, 52, 10]}, {"55052439": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 29]}, {"55052468": [143, 163]}, {"55052471": [16, 143, 191]}, {"55052475": [20, 39, 189]}, {"55052479": [24, 143, 164]}, {"55052483": [104, 143, 165]}, {"55052487": [108, 143, 166]}, {"55052491": [112, 143, 167]}, {"55052495": [116, 132, 110, 19, 196, 3, 224]}, {"55052503": [8]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [22, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [19, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [17, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [14, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [11, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [88, 16, 129]}, {"55052891": [8, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [120, 16, 129]}, {"55052903": [5, 52, 2]}, {"55052908": [52, 1]}, {"55052911": [121, 16, 129]}, {"55052915": [2, 52, 2]}, {"55052920": [52, 2]}, {"55052923": [255, 3, 224]}, {"55052927": [8]}, {"55052932": [143, 166]}, {"55052935": [48, 132, 197]}, {"55052939": [4, 8, 16, 2, 169]}, {"55052948": [143, 185]}, {"55052951": [44, 135, 37]}, {"55052955": [4, 8, 16, 2, 169]}, {"55052964": [60, 10, 128, 64, 37, 74, 10]}, {"55052972": [149, 75]}, {"55052975": [4, 52, 1, 255, 255, 17, 97]}, {"55052983": [2]}, {"55052988": [53, 101]}, {"55052992": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55053004": [3, 224]}, {"55053007": [8]}, {"55053012": [60, 8, 128, 64, 37, 8, 10]}, {"55053020": [129, 9]}, {"55053023": [2, 36, 1, 255, 255, 17, 33]}, {"55053031": [2]}, {"55053036": [53, 35]}, {"55053041": [3, 15, 195]}, {"55053045": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053059": [8]}, {"55053064": [144, 69]}, {"55053067": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053076": [145, 9]}, {"55053079": [3, 52, 1]}, {"55053083": [255, 17, 33]}, {"55053087": [2]}, {"55053092": [53, 37]}, {"55053096": [3, 224]}, {"55053099": [8]}, {"55053104": [143, 162]}, {"55053107": [36, 144, 69]}, {"55053112": [60, 8, 128, 64, 37, 8, 10]}, {"55053120": [149, 9]}, {"55053124": [52, 1, 255, 255, 17, 33]}, {"55053131": [19]}, {"55053136": [53, 37]}, {"55053140": [175, 164]}, {"55053144": [175, 165]}, {"55053147": [4, 175, 166]}, {"55053151": [8, 39, 189, 255, 232, 175, 191]}, {"55053159": [16, 141, 9]}, {"55053163": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053175": [6, 145, 6]}, {"55053179": [7, 1, 32, 248, 9]}, {"55053188": [143, 191]}, {"55053191": [16, 39, 189]}, {"55053195": [24, 143, 164]}, {"55053200": [143, 165]}, {"55053203": [4, 143, 166]}, {"55053207": [8, 3, 224]}, {"55053211": [8]}, {"55053216": [140, 136, 29, 44, 52, 9]}, {"55053223": [1]}, {"55053225": [9, 78]}, {"55053228": [1, 9, 16, 36, 16, 64]}, {"55053235": [27]}, {"55053240": [148, 138]}, {"55053243": [164, 52, 1]}, {"55053247": [61, 21, 65]}, {"55053251": [23]}, {"55053256": [148, 202, 2, 220, 52, 11]}, {"55053263": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053287": [14]}, {"55053292": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053320": [1, 10, 64, 33, 129, 8]}, {"55053328": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053340": [52, 2]}, {"55053344": [3, 224]}, {"55053347": [8]}, {"55053352": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053364": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053376": [3, 224]}, {"55053379": [8]}, {"55053384": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053395": [16, 175, 191]}, {"55053399": [20, 12, 16, 3, 29]}, {"55053408": [143, 162]}, {"55053411": [16, 143, 191]}, {"55053415": [20, 39, 189]}, {"55053419": [24, 3, 224]}, {"55053423": [8]}, {"55053428": [39, 189, 255, 216, 175, 176]}, {"55053435": [16, 175, 177]}, {"55053439": [20, 175, 178]}, {"55053443": [24, 175, 191]}, {"55053447": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053463": [62]}, {"55053465": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053488": [173, 40]}, {"55053492": [173, 40]}, {"55053495": [4, 173, 40]}, {"55053499": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053511": [164, 52, 1]}, {"55053515": [62, 21, 1]}, {"55053519": [6]}, {"55053524": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053539": [31, 37, 8]}, {"55053543": [112]}, {"55053545": [8, 66]}, {"55053548": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053563": [4, 149, 42]}, {"55053568": [17, 64]}, {"55053571": [30]}, {"55053576": [21, 72, 255, 251]}, {"55053584": [149, 48]}, {"55053587": [2, 54, 2]}, {"55053592": [52, 80]}, {"55053596": [38, 8, 255, 128, 5]}, {"55053603": [22]}, {"55053608": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053617": [8, 65]}, {"55053620": [2, 72, 144, 33, 142, 72]}, {"55053627": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053638": [248, 9]}, {"55053644": [20, 80, 255, 242]}, {"55053652": [60, 10, 128, 64, 37, 74, 10]}, {"55053660": [142, 75]}, {"55053664": [173, 75]}, {"55053668": [142, 75]}, {"55053671": [4, 173, 75]}, {"55053675": [4, 142, 75]}, {"55053679": [8, 173, 75]}, {"55053683": [8, 16]}, {"55053687": [6]}, {"55053692": [130, 40, 4, 36, 5, 1]}, {"55053699": [2]}, {"55053705": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053715": [16, 143, 177]}, {"55053719": [20, 143, 178]}, {"55053723": [24, 143, 191]}, {"55053727": [32, 39, 189]}, {"55053731": [40, 3, 224]}, {"55053735": [8]}, {"55053740": [3, 224]}, {"55053743": [8, 54, 2]}, {"55053748": [144, 136]}, {"55053751": [125, 52, 1]}, {"55053755": [255, 17, 1]}, {"55053759": [2, 52, 2]}, {"55053763": [8, 52, 2]}, {"55053767": [9, 3, 224]}, {"55053771": [8]}, {"55053776": [144, 136]}, {"55053779": [163, 49, 8]}, {"55053783": [192, 17]}, {"55053787": [5, 52, 2]}, {"55053791": [84, 52, 1]}, {"55053795": [64, 17, 1]}, {"55053799": [2, 52, 2]}, {"55053803": [53, 52, 2]}, {"55053807": [54, 3, 224]}, {"55053811": [8]}, {"55053816": [144, 136]}, {"55053819": [163, 49, 8]}, {"55053823": [24, 17]}, {"55053827": [5, 52, 2]}, {"55053831": [50, 52, 1]}, {"55053835": [8, 17, 1]}, {"55053839": [2, 52, 2]}, {"55053843": [51, 52, 2]}, {"55053847": [52, 3, 224]}, {"55053851": [8]}, {"55053856": [144, 136]}, {"55053859": [163, 49, 8]}, {"55053863": [3, 17]}, {"55053867": [5, 52, 2]}, {"55053871": [4, 52, 1]}, {"55053875": [1, 17, 1]}, {"55053879": [2, 52, 2]}, {"55053883": [48, 52, 2]}, {"55053887": [49, 3, 224]}, {"55053891": [8]}, {"55053896": [144, 136]}, {"55053899": [162, 49, 8]}, {"55053903": [192, 17]}, {"55053907": [5, 52, 2]}, {"55053911": [5, 52, 1]}, {"55053915": [64, 17, 1]}, {"55053919": [2, 52, 2]}, {"55053923": [96, 52, 2]}, {"55053927": [123, 3, 224]}, {"55053931": [8]}, {"55053936": [144, 136]}, {"55053939": [162, 49, 8]}, {"55053943": [48, 17]}, {"55053947": [2, 52, 2]}, {"55053951": [69, 52, 2]}, {"55053955": [70, 3, 224]}, {"55053959": [8]}, {"55053964": [144, 136]}, {"55053967": [162, 49, 8]}, {"55053971": [6, 17]}, {"55053975": [2, 52, 2]}, {"55053979": [55, 52, 2]}, {"55053983": [56, 3, 224]}, {"55053987": [8]}, {"55053992": [144, 136]}, {"55053995": [161, 49, 8]}, {"55053999": [48, 17]}, {"55054003": [2, 52, 2]}, {"55054007": [121, 52, 2]}, {"55054011": [122, 3, 224]}, {"55054015": [8]}, {"55054020": [144, 136]}, {"55054023": [161, 49, 8]}, {"55054027": [6, 17]}, {"55054031": [2, 52, 2]}, {"55054035": [119, 52, 2]}, {"55054039": [120, 3, 224]}, {"55054043": [8]}, {"55054048": [144, 136]}, {"55054051": [163, 49, 8]}, {"55054055": [3, 17]}, {"55054059": [2, 52, 2]}, {"55054063": [77, 54, 2]}, {"55054068": [3, 224]}, {"55054071": [8]}, {"55054076": [144, 136]}, {"55054079": [163, 49, 8]}, {"55054083": [24, 17]}, {"55054087": [2, 52, 2]}, {"55054091": [77, 54, 2]}, {"55054096": [3, 224]}, {"55054099": [8]}, {"55054104": [3, 224]}, {"55054107": [8]}, {"55054112": [52, 8]}, {"55054115": [1, 160, 136]}, {"55054119": [62, 3, 224]}, {"55054123": [8]}, {"55054128": [36, 136]}, {"55054131": [134, 36, 9, 255, 255, 37, 41]}, {"55054139": [1, 52, 1]}, {"55054143": [3]}, {"55054145": [41, 8, 42, 20, 32]}, {"55054151": [7]}, {"55054156": [1, 9, 80, 33, 145, 75]}, {"55054164": [52, 1]}, {"55054167": [255, 21, 97, 255, 247]}, {"55054176": [161, 69]}, {"55054180": [3, 224]}, {"55054183": [8]}, {"55054188": [36, 136]}, {"55054191": [168, 1, 6, 64, 33, 145, 9]}, {"55054200": [1, 37, 72, 37, 161, 9]}, {"55054208": [3, 224]}, {"55054211": [8]}, {"55054216": [36, 136]}, {"55054219": [188, 1, 5, 64, 33, 129, 9]}, {"55054228": [5, 33]}, {"55054231": [2]}, {"55054236": [52, 9]}, {"55054240": [37, 41]}, {"55054243": [1, 161, 9]}, {"55054248": [3, 224]}, {"55054251": [8]}] \ No newline at end of file From 80a558758ce2e87cc139210aade7b425b41c37df Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 28 May 2018 21:39:54 -0500 Subject: [PATCH 040/151] Fishing balance changes --- HintList.py | 4 ++-- Rom.py | 16 ++++++++++++++++ Rules.py | 8 ++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/HintList.py b/HintList.py index bdf76b3eb..a080e9927 100644 --- a/HintList.py +++ b/HintList.py @@ -126,10 +126,10 @@ def getHintGroup(string): '30 Gold Skulltulla Reward': ("They say that slaying 30 Gold&Skulltullas reveals", 'alwaysLocation'), '40 Gold Skulltulla Reward': ("They say that slaying 40 Gold&Skulltullas reveals", 'alwaysLocation'), '50 Gold Skulltulla Reward': ("They say that slaying 50 Gold&Skulltullas reveals", 'alwaysLocation'), - 'Child Fishing': ("They say that fishing in youth&bestows", 'alwaysLocation'), - 'Adult Fishing': ("They say that fishing in maturity&bestows", 'alwaysLocation'), 'Song from Ocarina of Time': ("They say the Ocarina of Time&teaches", 'alwaysLocation'), 'Biggoron': ("They say that Biggoron&crafts", 'alwaysLocation'), + 'Child Fishing': ("They say that fishing in youth&bestows", 'location'), + 'Adult Fishing': ("They say that fishing in maturity&bestows", 'location'), '20 Gold Skulltulla Reward': ("They say that slaying 20 Gold&Skulltullas reveals", 'location'), 'Treasure Chest Game': ("They say that gambling&grants", 'location'), 'Darunias Joy': ("They say that Darunia's dance leads&to", 'location'), diff --git a/Rom.py b/Rom.py index 1630f60e2..2b9ed5b5a 100644 --- a/Rom.py +++ b/Rom.py @@ -639,6 +639,21 @@ def patch_rom(world, rom): rom.write_bytes(0xE2E6A0, [0x80, 0xAA, 0xE2, 0x4C]) rom.write_bytes(0xE2D440, [0x24, 0x19, 0x00, 0x00]) + # Make fishing less obnoxious + Block_code = [0x3c, 0x0A, 0x80, 0x12, 0x8D, 0x4A, 0xA5, 0xD4, 0x14, 0x0a, 0x00, 0x06, + 0x31, 0x78, 0x00, 0x01, 0x14, 0x18, 0x00, 0x02, 0x3c, 0x18, 0x42, 0x30, + 0x3c, 0x18, 0x42, 0x50, 0x03, 0xe0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, + 0x14, 0x18, 0x00, 0x02, 0x3c, 0x18, 0x42, 0x10, 0x3c, 0x18, 0x42, 0x38, + 0x03, 0xe0, 0x00, 0x08] + rom.write_bytes(0x3480C00, Block_code) + rom.write_bytes(0xDBF434, [0x44, 0x98, 0x90, 0x00, 0xe6, 0x52, 0x01, 0x9C]) + rom.write_bytes(0xDBF484, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xDBF4A8, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xDCBEAA, [0x42, 0x48]) #set adult fish size requirement + rom.write_bytes(0xDCBF26, [0x42, 0x48]) #set adult fish size requirement + rom.write_bytes(0xDCBF32, [0x42, 0x30]) #set child fish size requirement + rom.write_bytes(0xDCBF9E, [0x42, 0x30]) #set child fish size requirement + # Forbid Sun's Song from a bunch of cutscenes Suns_scenes = [0x2016FC9, 0x2017219, 0x20173D9, 0x20174C9, 0x2017679, 0x20C1539, 0x20C15D9, 0x21A0719, 0x21A07F9, 0x2E90129, 0x2E901B9, 0x2E90249, 0x225E829, 0x225E939, 0x306D009] for address in Suns_scenes: @@ -789,6 +804,7 @@ def patch_rom(world, rom): rom.write_bytes(0xC89A78, [0x0C, 0x10, 0x02, 0x60, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at crater rom.write_bytes(0xC8B048, [0x0C, 0x10, 0x02, 0x80, 0x00, 0xA3, 0xAF, 0x21]) #Progressive items from Great Fairies (weirdness with 0xAF) rom.write_bytes(0xC8D550, [0x0C, 0x10, 0x00, 0x81]) #Progressive Items Item ID Hook + rom.write_bytes(0xDBF428, [0x0C, 0x10, 0x03, 0x00]) #Set Fishing Hook # Inventory Fix Block_code = [0x3C, 0x04, 0x80, 0x11, 0x34, 0x84, 0xA5, 0xD0, 0x34, 0x06, 0x00, 0x08, diff --git a/Rules.py b/Rules.py index 1bce37234..e2aab0916 100644 --- a/Rules.py +++ b/Rules.py @@ -169,8 +169,8 @@ def global_rules(world): set_rule(world.get_entrance('Temple Warp Pad'), lambda state: state.has('Prelude of Light')) set_rule(world.get_location('Sheik at Temple'), lambda state: state.has('Forest Medallion') and state.is_adult()) set_rule(world.get_location('Diving in the Lab'), lambda state: state.has('Progressive Scale', 2)) - set_rule(world.get_location('Child Fishing'), lambda state: state.has('Kokiri Sword') and state.guarantee_hint()) - set_rule(world.get_location('Adult Fishing'), lambda state: state.is_adult() and (state.has('Progressive Hookshot') or state.has('Magic Bean')) and state.guarantee_hint()) + set_rule(world.get_location('Child Fishing'), lambda state: state.has('Kokiri Sword')) + set_rule(world.get_location('Adult Fishing'), lambda state: state.is_adult() and (state.has('Progressive Hookshot') or state.has('Magic Bean'))) set_rule(world.get_location('Lake Hylia Sun'), lambda state: state.has('Progressive Hookshot', 2) and state.has('Bow') and state.is_adult()) set_rule(world.get_entrance('Crater Hover Boots'), lambda state: state.is_adult() and state.has('Hover Boots')) set_rule(world.get_entrance('Crater Ascent'), lambda state: state.is_adult() and (state.has('Goron Tunic') or (state.has('Progressive Wallet') and state.has('Bomb Bag'))) and (state.has('Hover Boots') or state.has('Hammer'))) @@ -211,7 +211,7 @@ def global_rules(world): set_rule(world.get_location('Water Temple Cracked Wall Chest'), lambda state: state.has('Bomb Bag')) set_rule(world.get_location('Water Temple Dark Link Chest'), lambda state: state.has('Small Key (Water Temple)', 6) and (state.has('Zeldas Lullaby') or world.keysanity)) set_rule(world.get_location('Water Temple River Chest'), lambda state: state.has('Small Key (Water Temple)', 6) and state.has('Song of Time') and state.has('Bow') and (state.has('Zeldas Lullaby') or world.keysanity)) - set_rule(world.get_location('Sheik in Kakariko'), lambda state: state.has('Forest Medallion') and state.has('Fire Medallion') and state.has('Water Medallion') and state.is_adult()) + set_rule(world.get_location('Sheik in Kakariko'), lambda state: state.has('Forest Medallion') and state.has('Fire Medallion') and state.has('Water Medallion')) set_rule(world.get_entrance('Graveyard Warp Pad'), lambda state: state.has('Nocturne of Shadow')) set_rule(world.get_entrance('Shadow Temple Entrance'), lambda state: state.has('Dins Fire') and state.has('Magic Meter') and state.has('Lens of Truth') and state.is_adult() and (state.has('Hover Boots') or state.has('Progressive Hookshot'))) set_rule(world.get_entrance('Shadow Temple First Pit'), lambda state: state.has('Hover Boots')) @@ -410,4 +410,4 @@ def global_rules(world): for location in ['Treasure Chest Game', 'Zelda']: forbid_item(world.get_location(location), 'Ice Trap') - forbid_item(world.get_location(location), 'Biggoron Sword') \ No newline at end of file + forbid_item(world.get_location(location), 'Biggoron Sword') From b9d34fd3ee1fa069b84788f472abd87a674bcd4e Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Mon, 28 May 2018 22:10:03 -0500 Subject: [PATCH 041/151] Increase the size of the extra file --- Rom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 2b9ed5b5a..19a655c7c 100644 --- a/Rom.py +++ b/Rom.py @@ -784,10 +784,10 @@ def patch_rom(world, rom): Block_code = [0x3C, 0x02, 0x80, 0x12, 0x24, 0x42, 0xD2, 0xA0, 0x24, 0x0E, 0x01, 0x40, 0xAC, 0x2E, 0xE5, 0x00, 0x03, 0xE0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00] rom.write_bytes(0x3480800, Block_code) - rom.write_bytes(0xD270, [0x03, 0x48, 0x00, 0x00, 0x03, 0x48, 0x10, 0x00, 0x03, 0x48, 0x00, 0x00]) + rom.write_bytes(0xD270, [0x03, 0x48, 0x00, 0x00, 0x03, 0x48, 0x50, 0x00, 0x03, 0x48, 0x00, 0x00]) # Fix checksum (Thanks Nintendo) - Block_code = [0x93, 0x5E, 0x0E, 0x5B, 0xDA, 0x41, 0x6D, 0x4D] + Block_code = [0x93, 0x5E, 0x8E, 0x5B, 0xD0, 0x9C, 0x5A, 0x58] rom.write_bytes(0x10, Block_code) # Set hooks for various code From 468c37c098d9172e1264a1e38f27f42091b07237 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Mon, 28 May 2018 22:58:19 -0500 Subject: [PATCH 042/151] Delete appveyor.yml --- appveyor.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 5dc771a3b..000000000 --- a/appveyor.yml +++ /dev/null @@ -1,28 +0,0 @@ -version: '{build}' -pull_requests: - do_not_increment_build_number: true -environment: - ProjectVersion: build$(APPVEYOR_BUILD_VERSION) - matrix: - - PYTHON: C:\PYTHON36 -install: - - ps: 'if(Test-Path env:APPVEYOR_REPO_TAG_NAME) {$env:ProjectVersion=$env:APPVEYOR_REPO_TAG_NAME}' - - '%PYTHON%\python.exe --version' - - '%PYTHON%\Scripts\pip install pyinstaller' - - '%PYTHON%\Scripts\pip install markdown' - - '%PYTHON%\python.exe -m markdown README.md > README.html' - - '%PYTHON%\Scripts\pyinstaller bundle\OoTRandomizer.spec' - - 'mkdir dist\OoTRandomizer\ext' - - 'move dist\OoTRandomizer\*.pyd dist\OoTRandomizer\ext' - - 'move dist\OoTRandomizer\tcl*.dll dist\OoTRandomizer\ext' - - 'move dist\OoTRandomizer\tk*.dll dist\OoTRandomizer\ext' - - ps: '$env:OoTR_Version= &"$env:PYTHON\python.exe" -c "import Main; import re; print(re.match(''[0-9]+\\.[0-9]+\\.[0-9]+'',Main.__version__).group(0))"' - - '"%WIX%\bin\heat.exe" dir "dist\OoTRandomizer" -sfrag -srd -suid -dr INSTALLDIR -cg OoTRFiles -ag -template fragment -t bundle\components.xslt -out build\components.wxs' - - '"%WIX%\bin\candle.exe" -out build\ bundle\*.wxs build\*.wxs' - - '"%WIX%\bin\light.exe" -ext WixUIExtension build\*.wixobj -o dist\OoTRandomizer-Installer-%ProjectVersion%-win32.msi -b dist\OoTRandomizer' -build: off -artifacts: -- path: dist/OoTRandomizer*.msi - name: OoTRandomizer-Installer-$(ProjectVersion)-win32.msi -- path: dist/OoTRandomizer/ - name: OoTRandomizer-Raw-$(ProjectVersion)-win32.zip From 976a98dbead75cbf75322b511eae325d7fe257a2 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 29 May 2018 00:51:57 -0400 Subject: [PATCH 043/151] Re-arrange code in expanded area --- ASM/src/build.asm | 33 +++++++++------------------------ ASM/src/config.asm | 6 +++--- ASM/src/constants.asm | 1 + ASM/src/every_frame.asm | 2 +- Regions.py | 8 ++++---- Rom.py | 4 ++-- data/base2current.json | 2 +- 7 files changed, 21 insertions(+), 35 deletions(-) diff --git a/ASM/src/build.asm b/ASM/src/build.asm index 2be4c536e..e62ac817c 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -14,37 +14,22 @@ ; New code region ;================================================================================================== -; 0x80400000 in memory -> 0x03480000 in ROM -.headersize 0x7CF80000 -.org 0x80400000 +.headersize (0x80400000 - 0x03480000) -; 0x000 - 0x5FF: Settings and tables which the front-end may write -.area 0x600, 0 +.org 0x80401000 +.area 0x1000, 0 .include "config.asm" -.include "item_data.asm" ; Placed here temporarily, won't fit in the code area .endarea -; 0x600 - 0x9FF: Currently reserved for code blocks written by Rom.py -.skip 0x110 - -.area 0xE0, 0 -.include "menu.asm" ; Placed here temporarily, won't fit in the code area -.include "fixes.asm" ; Placed here temporarily, won't fit in the code area -.endarea - -.skip 0x70 - -.area 0xC0, 0 -.include "every_frame.asm" ; Placed here temporarily, won't fit in the code area -.endarea - -.skip 0xE0 - -; 0xA00 - 0xFFF: New code blocks -.area 0x600, 0 +.org 0x80402000 +.area 0x1000, 0 .include "constants.asm" .include "state.asm" .include "items.asm" +.include "item_data.asm" +.include "every_frame.asm" +.include "menu.asm" +.include "fixes.asm" .endarea .close diff --git a/ASM/src/config.asm b/ASM/src/config.asm index 69357c4c1..474c280f2 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -2,7 +2,7 @@ ; Settings and tables which the front-end may write ;================================================================================================== -; 0x03480000: Item override table: +; 0x03481000: Item override table: ; ; This table changes the meaning of a given item ID within a given scene. It must be terminated with ; two 0x00 bytes (which will happen by default as long as you don't fill the allotted space). @@ -32,11 +32,11 @@ ; 0x83: Deku Theater ; 0x85: Lost Woods: Salesman grotto -.area 0x200, 0 +.area 0x400, 0 ITEM_OVERRIDES: .endarea -; 0x03480200: Special items +; 0x03481400: Special items FAIRY_ITEMS: .byte 0x00 ; Farore's Wind Fairy diff --git a/ASM/src/constants.asm b/ASM/src/constants.asm index d94f60474..67e5789cd 100755 --- a/ASM/src/constants.asm +++ b/ASM/src/constants.asm @@ -2,3 +2,4 @@ .definelabel SAVE_CONTEXT, 0x8011A5D0 .definelabel GLOBAL_CONTEXT, 0x801C84A0 .definelabel PLAYER_ACTOR, 0x801DAA30 +.definelabel DUMMY_ACTOR, 0x80410000 diff --git a/ASM/src/every_frame.asm b/ASM/src/every_frame.asm index 0575a8a04..15759e769 100644 --- a/ASM/src/every_frame.asm +++ b/ASM/src/every_frame.asm @@ -18,7 +18,7 @@ every_frame: ; giving the item. The game is not picky about this actor, it just needs to read a non-zero ; value at actor+0x0130, and it overwrites actor+0x0118. Construct a dummy actor in an usused ; memory area to satisfy these requirements. - li t1, 0x80410000 + li t1, DUMMY_ACTOR li t2, 1 sw t2, 0x130 (t1) li t2, PLAYER_ACTOR diff --git a/Regions.py b/Regions.py index 13f78856c..01746f059 100644 --- a/Regions.py +++ b/Regions.py @@ -377,10 +377,10 @@ def _create_region(name, type, locations=None, exits=None): 'Zeldas Letter': (None, None, None, 'NPC', None), 'Crater Fairy Reward': (None, None, None, 'Fairy', None), 'Mountain Summit Fairy Reward': (None, None, None, 'Fairy', None), - 'Hyrule Castle Fairy Reward': (0x3480201, None, None, 'NPC', 0x3D), - 'Zoras Fountain Fairy Reward': (0x3480200, None, None, 'NPC', 0x3D), - 'Desert Colossus Fairy Reward': (0x3480202, None, None, 'NPC', 0x3D), - 'Zelda': (0x3480203, None, None, 'NPC', 0x43), + 'Hyrule Castle Fairy Reward': (0x3481401, None, None, 'NPC', 0x3D), + 'Zoras Fountain Fairy Reward': (0x3481400, None, None, 'NPC', 0x3D), + 'Desert Colossus Fairy Reward': (0x3481402, None, None, 'NPC', 0x3D), + 'Zelda': (0x3481403, None, None, 'NPC', 0x43), 'Treasure Chest Game': (None, None, None, 'Special', 0x10), 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), diff --git a/Rom.py b/Rom.py index 55ac85a69..527181afb 100644 --- a/Rom.py +++ b/Rom.py @@ -771,7 +771,7 @@ def patch_rom(world, rom): # DMA in extra code Block_code = [0xAF, 0xBF, 0x00, 0x1C, 0xAF, 0xA4, 0x01, 0x40, 0x3C, 0x05, 0x03, 0x48, - 0x3C, 0x04, 0x80, 0x40, 0x0C, 0x00, 0x03, 0x7C, 0x24, 0x06, 0x10, 0x00, + 0x3C, 0x04, 0x80, 0x40, 0x0C, 0x00, 0x03, 0x7C, 0x24, 0x06, 0x50, 0x00, 0x0C, 0x10, 0x02, 0x00] rom.write_bytes(0xB17BB4, Block_code) Block_code = [0x3C, 0x02, 0x80, 0x12, 0x24, 0x42, 0xD2, 0xA0, 0x24, 0x0E, 0x01, 0x40, @@ -989,7 +989,7 @@ def patch_rom(world, rom): override_table = [] for (scene, base_id, override_id) in get_overrides(world): override_table += [scene, base_id, 0x00, override_id] - rom.write_bytes(0x3480000, override_table) + rom.write_bytes(0x3481000, override_table) # patch fairy entrances for region in world.regions: diff --git a/data/base2current.json b/data/base2current.json index d1ccde7ef..e7d2b8d4e 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 3, 18]}, {"11325064": [12, 16, 3, 10, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 1, 224]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 1, 203, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 1, 210, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 1, 217, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 1, 196, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 2, 181]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 2, 132]}, {"12427480": [12, 16, 2, 161]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 2, 165]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 2, 24, 0, 0, 0, 0]}, {"12491456": [12, 16, 2, 194]}, {"12491480": [12, 16, 2, 204]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 2, 232]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55050756": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 13, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 112, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 15, 24, 128, 64, 14, 196]}, {"55050901": [255, 1, 67]}, {"55050905": [198, 21, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050917": [255, 1, 68]}, {"55050921": [198, 22, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050933": [255, 1, 69]}, {"55050937": [198, 23, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050949": [255, 1, 70]}, {"55050953": [198, 24, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050965": [255, 1, 71]}, {"55050969": [198, 25, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050981": [255, 1, 93]}, {"55050985": [198, 28, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55050997": [255, 1, 122]}, {"55051001": [198, 29, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051013": [255, 1, 249]}, {"55051017": [198, 30, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051029": [255, 1, 151]}, {"55051033": [198, 32, 255, 128, 64, 15, 48, 128, 64, 13, 172]}, {"55051045": [255, 10, 199]}, {"55051049": [185, 1, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051061": [255, 10, 199]}, {"55051065": [185, 1, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051077": [255, 10, 199]}, {"55051081": [185, 1, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051093": [255, 10, 199]}, {"55051097": [185, 1, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051109": [255, 10, 199]}, {"55051113": [185, 1, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051125": [255, 10, 199]}, {"55051129": [185, 1, 13, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051141": [255, 11, 103]}, {"55051145": [184, 2]}, {"55051148": [128, 64, 15, 108, 128, 64, 13, 172]}, {"55051157": [255, 11, 103]}, {"55051161": [184, 2, 1, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051173": [255, 11, 103]}, {"55051177": [184, 2, 2, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051189": [255, 11, 103]}, {"55051193": [184, 2, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051205": [255, 11, 103]}, {"55051209": [184, 2, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051221": [255, 11, 103]}, {"55051225": [184, 2, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051237": [255, 11, 103]}, {"55051241": [184, 2, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051253": [255, 11, 103]}, {"55051257": [184, 2, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051269": [255, 11, 103]}, {"55051273": [184, 2, 8, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051285": [255, 11, 103]}, {"55051289": [184, 2, 9, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051301": [255, 28, 102]}, {"55051305": [200, 4]}, {"55051308": [128, 64, 15, 108, 128, 64, 13, 172]}, {"55051317": [255, 28, 102]}, {"55051321": [200, 4, 1, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051333": [255, 28, 102]}, {"55051337": [200, 4, 2, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051349": [255, 28, 102]}, {"55051353": [200, 4, 3, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051365": [255, 28, 102]}, {"55051369": [200, 4, 4, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051381": [255, 28, 102]}, {"55051385": [200, 4, 5, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051397": [255, 28, 102]}, {"55051401": [200, 4, 6, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051413": [255, 28, 102]}, {"55051417": [200, 4, 7, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051429": [255, 28, 102]}, {"55051433": [200, 4, 8, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051445": [255, 28, 102]}, {"55051449": [200, 4, 9, 128, 64, 15, 108, 128, 64, 13, 172]}, {"55051461": [255, 254, 96]}, {"55051465": [170, 3, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051477": [255, 254, 96]}, {"55051481": [170, 4, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051493": [255, 254, 96]}, {"55051497": [170, 5, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051509": [255, 254, 96]}, {"55051513": [170, 6, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051525": [255, 254, 96]}, {"55051529": [170, 7, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051541": [255, 254, 96]}, {"55051545": [170, 8, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051557": [255, 254, 96]}, {"55051561": [170, 11, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051573": [255, 254, 96]}, {"55051577": [170, 12, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051589": [255, 254, 96]}, {"55051593": [170, 13, 255, 128, 64, 15, 136, 128, 64, 13, 172]}, {"55051605": [61, 67, 12]}, {"55051609": [248, 255, 255, 128, 64, 15, 32, 128, 64, 13, 172]}, {"55051621": [131, 9, 85]}, {"55051625": [183, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55051637": [146, 219, 230]}, {"55051641": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051653": [147, 218, 230]}, {"55051657": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051669": [148, 217, 230]}, {"55051673": [216, 255, 255, 128, 64, 15, 24, 128, 64, 14, 224]}, {"55051685": [142, 224, 50]}, {"55051689": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051701": [143, 224, 50]}, {"55051705": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051717": [144, 224, 50]}, {"55051721": [206, 255, 255, 128, 64, 15, 24, 128, 64, 14, 252]}, {"55051733": [140, 238, 52]}, {"55051737": [187, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55051749": [141, 238, 52]}, {"55051753": [187, 255, 255, 128, 64, 15, 24, 128, 64, 13, 172]}, {"55052048": [147, 25]}, {"55052051": [116, 52, 1]}, {"55052055": [255, 23, 33]}, {"55052059": [2]}, {"55052064": [52, 25]}, {"55052067": [44, 3, 224]}, {"55052071": [8, 167, 185]}, {"55052075": [154, 147, 44]}, {"55052079": [116, 52, 1]}, {"55052083": [255, 21, 129]}, {"55052087": [2]}, {"55052092": [52, 12]}, {"55052095": [44, 3, 224]}, {"55052099": [8]}, {"55052104": [145, 174]}, {"55052107": [116, 52, 1]}, {"55052111": [255, 21, 193]}, {"55052115": [2]}, {"55052120": [52, 14]}, {"55052123": [44, 3, 224]}, {"55052127": [8, 167, 174]}, {"55052131": [154, 145, 207]}, {"55052135": [116, 52, 1]}, {"55052139": [255, 21, 225]}, {"55052143": [2]}, {"55052148": [52, 15]}, {"55052151": [44, 3, 224]}, {"55052155": [8, 167, 175]}, {"55052159": [154, 141, 9]}, {"55052163": [4, 17, 32]}, {"55052167": [7]}, {"55052172": [145, 9]}, {"55052175": [104, 52, 1]}, {"55052179": [59, 17, 33]}, {"55052183": [2]}, {"55052188": [52, 9]}, {"55052191": [255, 161, 9]}, {"55052195": [64, 3, 224]}, {"55052199": [8, 161, 14]}, {"55052203": [104]}, {"55052384": [175, 164]}, {"55052387": [104, 175, 165]}, {"55052391": [108, 175, 166]}, {"55052395": [112, 175, 167]}, {"55052399": [116, 39, 189, 255, 232, 175, 163]}, {"55052407": [16, 175, 191]}, {"55052411": [20, 60, 8, 128, 64, 37, 8, 10, 12, 129, 8]}, {"55052424": [17]}, {"55052427": [10]}, {"55052432": [60, 9, 128, 65, 52, 10]}, {"55052439": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 3, 29]}, {"55052468": [143, 163]}, {"55052471": [16, 143, 191]}, {"55052475": [20, 39, 189]}, {"55052479": [24, 143, 164]}, {"55052483": [104, 143, 165]}, {"55052487": [108, 143, 166]}, {"55052491": [112, 143, 167]}, {"55052495": [116, 132, 110, 19, 196, 3, 224]}, {"55052503": [8]}, {"55052800": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55052816": [48, 132]}, {"55052819": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55052831": [140, 16, 129]}, {"55052835": [22, 145, 2]}, {"55052839": [117, 52, 1]}, {"55052843": [141, 16, 129]}, {"55052847": [19, 145, 2]}, {"55052851": [117, 16, 128]}, {"55052855": [17, 145, 2]}, {"55052859": [116, 52, 1]}, {"55052863": [138, 16, 129]}, {"55052867": [14, 145, 2]}, {"55052871": [116, 52, 1]}, {"55052875": [139, 16, 129]}, {"55052879": [11, 145, 2]}, {"55052883": [116, 52, 1]}, {"55052887": [88, 16, 129]}, {"55052891": [8, 52, 2]}, {"55052896": [52, 1]}, {"55052899": [120, 16, 129]}, {"55052903": [5, 52, 2]}, {"55052908": [52, 1]}, {"55052911": [121, 16, 129]}, {"55052915": [2, 52, 2]}, {"55052920": [52, 2]}, {"55052923": [255, 3, 224]}, {"55052927": [8]}, {"55052932": [143, 166]}, {"55052935": [48, 132, 197]}, {"55052939": [4, 8, 16, 2, 169]}, {"55052948": [143, 185]}, {"55052951": [44, 135, 37]}, {"55052955": [4, 8, 16, 2, 169]}, {"55052964": [60, 10, 128, 64, 37, 74, 10]}, {"55052972": [149, 75]}, {"55052975": [4, 52, 1, 255, 255, 17, 97]}, {"55052983": [2]}, {"55052988": [53, 101]}, {"55052992": [60, 11, 128, 64, 37, 107, 10, 12, 161, 96]}, {"55053004": [3, 224]}, {"55053007": [8]}, {"55053012": [60, 8, 128, 64, 37, 8, 10]}, {"55053020": [129, 9]}, {"55053023": [2, 36, 1, 255, 255, 17, 33]}, {"55053031": [2]}, {"55053036": [53, 35]}, {"55053041": [3, 15, 195]}, {"55053045": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55053059": [8]}, {"55053064": [144, 69]}, {"55053067": [3, 60, 8, 128, 64, 37, 8, 10]}, {"55053076": [145, 9]}, {"55053079": [3, 52, 1]}, {"55053083": [255, 17, 33]}, {"55053087": [2]}, {"55053092": [53, 37]}, {"55053096": [3, 224]}, {"55053099": [8]}, {"55053104": [143, 162]}, {"55053107": [36, 144, 69]}, {"55053112": [60, 8, 128, 64, 37, 8, 10]}, {"55053120": [149, 9]}, {"55053124": [52, 1, 255, 255, 17, 33]}, {"55053131": [19]}, {"55053136": [53, 37]}, {"55053140": [175, 164]}, {"55053144": [175, 165]}, {"55053147": [4, 175, 166]}, {"55053151": [8, 39, 189, 255, 232, 175, 191]}, {"55053159": [16, 141, 9]}, {"55053163": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55053175": [6, 145, 6]}, {"55053179": [7, 1, 32, 248, 9]}, {"55053188": [143, 191]}, {"55053191": [16, 39, 189]}, {"55053195": [24, 143, 164]}, {"55053200": [143, 165]}, {"55053203": [4, 143, 166]}, {"55053207": [8, 3, 224]}, {"55053211": [8]}, {"55053216": [140, 136, 29, 44, 52, 9]}, {"55053223": [1]}, {"55053225": [9, 78]}, {"55053228": [1, 9, 16, 36, 16, 64]}, {"55053235": [27]}, {"55053240": [148, 138]}, {"55053243": [164, 52, 1]}, {"55053247": [61, 21, 65]}, {"55053251": [23]}, {"55053256": [148, 202, 2, 220, 52, 11]}, {"55053263": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55053287": [14]}, {"55053292": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 2]}, {"55053320": [1, 10, 64, 33, 129, 8]}, {"55053328": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053340": [52, 2]}, {"55053344": [3, 224]}, {"55053347": [8]}, {"55053352": [60, 8, 128, 64, 37, 8, 2, 3, 129, 8]}, {"55053364": [60, 9, 128, 64, 37, 41, 10, 12, 161, 40]}, {"55053376": [3, 224]}, {"55053379": [8]}, {"55053384": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55053395": [16, 175, 191]}, {"55053399": [20, 12, 16, 3, 29]}, {"55053408": [143, 162]}, {"55053411": [16, 143, 191]}, {"55053415": [20, 39, 189]}, {"55053419": [24, 3, 224]}, {"55053423": [8]}, {"55053428": [39, 189, 255, 216, 175, 176]}, {"55053435": [16, 175, 177]}, {"55053439": [20, 175, 178]}, {"55053443": [24, 175, 191]}, {"55053447": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55053463": [62]}, {"55053465": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 10]}, {"55053488": [173, 40]}, {"55053492": [173, 40]}, {"55053495": [4, 173, 40]}, {"55053499": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55053511": [164, 52, 1]}, {"55053515": [62, 21, 1]}, {"55053519": [6]}, {"55053524": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55053539": [31, 37, 8]}, {"55053543": [112]}, {"55053545": [8, 66]}, {"55053548": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 255, 252, 37, 41]}, {"55053563": [4, 149, 42]}, {"55053568": [17, 64]}, {"55053571": [30]}, {"55053576": [21, 72, 255, 251]}, {"55053584": [149, 48]}, {"55053587": [2, 54, 2]}, {"55053592": [52, 80]}, {"55053596": [38, 8, 255, 128, 5]}, {"55053603": [22]}, {"55053608": [60, 18, 128, 64, 38, 82, 2, 4]}, {"55053617": [8, 65]}, {"55053620": [2, 72, 144, 33, 142, 72]}, {"55053627": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55053638": [248, 9]}, {"55053644": [20, 80, 255, 242]}, {"55053652": [60, 10, 128, 64, 37, 74, 10]}, {"55053660": [142, 75]}, {"55053664": [173, 75]}, {"55053668": [142, 75]}, {"55053671": [4, 173, 75]}, {"55053675": [4, 142, 75]}, {"55053679": [8, 173, 75]}, {"55053683": [8, 16]}, {"55053687": [6]}, {"55053692": [130, 40, 4, 36, 5, 1]}, {"55053699": [2]}, {"55053705": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55053715": [16, 143, 177]}, {"55053719": [20, 143, 178]}, {"55053723": [24, 143, 191]}, {"55053727": [32, 39, 189]}, {"55053731": [40, 3, 224]}, {"55053735": [8]}, {"55053740": [3, 224]}, {"55053743": [8, 54, 2]}, {"55053748": [144, 136]}, {"55053751": [125, 52, 1]}, {"55053755": [255, 17, 1]}, {"55053759": [2, 52, 2]}, {"55053763": [8, 52, 2]}, {"55053767": [9, 3, 224]}, {"55053771": [8]}, {"55053776": [144, 136]}, {"55053779": [163, 49, 8]}, {"55053783": [192, 17]}, {"55053787": [5, 52, 2]}, {"55053791": [84, 52, 1]}, {"55053795": [64, 17, 1]}, {"55053799": [2, 52, 2]}, {"55053803": [53, 52, 2]}, {"55053807": [54, 3, 224]}, {"55053811": [8]}, {"55053816": [144, 136]}, {"55053819": [163, 49, 8]}, {"55053823": [24, 17]}, {"55053827": [5, 52, 2]}, {"55053831": [50, 52, 1]}, {"55053835": [8, 17, 1]}, {"55053839": [2, 52, 2]}, {"55053843": [51, 52, 2]}, {"55053847": [52, 3, 224]}, {"55053851": [8]}, {"55053856": [144, 136]}, {"55053859": [163, 49, 8]}, {"55053863": [3, 17]}, {"55053867": [5, 52, 2]}, {"55053871": [4, 52, 1]}, {"55053875": [1, 17, 1]}, {"55053879": [2, 52, 2]}, {"55053883": [48, 52, 2]}, {"55053887": [49, 3, 224]}, {"55053891": [8]}, {"55053896": [144, 136]}, {"55053899": [162, 49, 8]}, {"55053903": [192, 17]}, {"55053907": [5, 52, 2]}, {"55053911": [5, 52, 1]}, {"55053915": [64, 17, 1]}, {"55053919": [2, 52, 2]}, {"55053923": [96, 52, 2]}, {"55053927": [123, 3, 224]}, {"55053931": [8]}, {"55053936": [144, 136]}, {"55053939": [162, 49, 8]}, {"55053943": [48, 17]}, {"55053947": [2, 52, 2]}, {"55053951": [69, 52, 2]}, {"55053955": [70, 3, 224]}, {"55053959": [8]}, {"55053964": [144, 136]}, {"55053967": [162, 49, 8]}, {"55053971": [6, 17]}, {"55053975": [2, 52, 2]}, {"55053979": [55, 52, 2]}, {"55053983": [56, 3, 224]}, {"55053987": [8]}, {"55053992": [144, 136]}, {"55053995": [161, 49, 8]}, {"55053999": [48, 17]}, {"55054003": [2, 52, 2]}, {"55054007": [121, 52, 2]}, {"55054011": [122, 3, 224]}, {"55054015": [8]}, {"55054020": [144, 136]}, {"55054023": [161, 49, 8]}, {"55054027": [6, 17]}, {"55054031": [2, 52, 2]}, {"55054035": [119, 52, 2]}, {"55054039": [120, 3, 224]}, {"55054043": [8]}, {"55054048": [144, 136]}, {"55054051": [163, 49, 8]}, {"55054055": [3, 17]}, {"55054059": [2, 52, 2]}, {"55054063": [77, 54, 2]}, {"55054068": [3, 224]}, {"55054071": [8]}, {"55054076": [144, 136]}, {"55054079": [163, 49, 8]}, {"55054083": [24, 17]}, {"55054087": [2, 52, 2]}, {"55054091": [77, 54, 2]}, {"55054096": [3, 224]}, {"55054099": [8]}, {"55054104": [3, 224]}, {"55054107": [8]}, {"55054112": [52, 8]}, {"55054115": [1, 160, 136]}, {"55054119": [62, 3, 224]}, {"55054123": [8]}, {"55054128": [36, 136]}, {"55054131": [134, 36, 9, 255, 255, 37, 41]}, {"55054139": [1, 52, 1]}, {"55054143": [3]}, {"55054145": [41, 8, 42, 20, 32]}, {"55054151": [7]}, {"55054156": [1, 9, 80, 33, 145, 75]}, {"55054164": [52, 1]}, {"55054167": [255, 21, 97, 255, 247]}, {"55054176": [161, 69]}, {"55054180": [3, 224]}, {"55054183": [8]}, {"55054188": [36, 136]}, {"55054191": [168, 1, 6, 64, 33, 145, 9]}, {"55054200": [1, 37, 72, 37, 161, 9]}, {"55054208": [3, 224]}, {"55054211": [8]}, {"55054216": [36, 136]}, {"55054219": [188, 1, 5, 64, 33, 129, 9]}, {"55054228": [5, 33]}, {"55054231": [2]}, {"55054236": [52, 9]}, {"55054240": [37, 41]}, {"55054243": [1, 161, 9]}, {"55054248": [3, 224]}, {"55054251": [8]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 8, 146]}, {"11325064": [12, 16, 8, 138, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 163]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 142, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 149, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 156, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 135, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 8, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 8, 4]}, {"12427480": [12, 16, 8, 33]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 8, 37]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 104, 0, 0, 0, 0]}, {"12491456": [12, 16, 8, 66]}, {"12491480": [12, 16, 8, 76]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 8, 104]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55058432": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55058448": [48, 132]}, {"55058451": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55058463": [140, 16, 129]}, {"55058467": [22, 145, 2]}, {"55058471": [117, 52, 1]}, {"55058475": [141, 16, 129]}, {"55058479": [19, 145, 2]}, {"55058483": [117, 16, 128]}, {"55058487": [17, 145, 2]}, {"55058491": [116, 52, 1]}, {"55058495": [138, 16, 129]}, {"55058499": [14, 145, 2]}, {"55058503": [116, 52, 1]}, {"55058507": [139, 16, 129]}, {"55058511": [11, 145, 2]}, {"55058515": [116, 52, 1]}, {"55058519": [88, 16, 129]}, {"55058523": [8, 52, 2]}, {"55058528": [52, 1]}, {"55058531": [120, 16, 129]}, {"55058535": [5, 52, 2]}, {"55058540": [52, 1]}, {"55058543": [121, 16, 129]}, {"55058547": [2, 52, 2]}, {"55058552": [52, 2]}, {"55058555": [255, 3, 224]}, {"55058559": [8]}, {"55058564": [143, 166]}, {"55058567": [48, 132, 197]}, {"55058571": [4, 8, 16, 8, 41]}, {"55058580": [143, 185]}, {"55058583": [44, 135, 37]}, {"55058587": [4, 8, 16, 8, 41]}, {"55058596": [60, 10, 128, 64, 37, 74, 32]}, {"55058604": [149, 75]}, {"55058607": [4, 52, 1, 255, 255, 17, 97]}, {"55058615": [2]}, {"55058620": [53, 101]}, {"55058624": [60, 11, 128, 64, 37, 107, 32, 12, 161, 96]}, {"55058636": [3, 224]}, {"55058639": [8]}, {"55058644": [60, 8, 128, 64, 37, 8, 32]}, {"55058652": [129, 9]}, {"55058655": [2, 36, 1, 255, 255, 17, 33]}, {"55058663": [2]}, {"55058668": [53, 35]}, {"55058673": [3, 15, 195]}, {"55058677": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55058691": [8]}, {"55058696": [144, 69]}, {"55058699": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55058708": [145, 9]}, {"55058711": [3, 52, 1]}, {"55058715": [255, 17, 33]}, {"55058719": [2]}, {"55058724": [53, 37]}, {"55058728": [3, 224]}, {"55058731": [8]}, {"55058736": [143, 162]}, {"55058739": [36, 144, 69]}, {"55058744": [60, 8, 128, 64, 37, 8, 32]}, {"55058752": [149, 9]}, {"55058756": [52, 1, 255, 255, 17, 33]}, {"55058763": [19]}, {"55058768": [53, 37]}, {"55058772": [175, 164]}, {"55058776": [175, 165]}, {"55058779": [4, 175, 166]}, {"55058783": [8, 39, 189, 255, 232, 175, 191]}, {"55058791": [16, 141, 9]}, {"55058795": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55058807": [6, 145, 6]}, {"55058811": [7, 1, 32, 248, 9]}, {"55058820": [143, 191]}, {"55058823": [16, 39, 189]}, {"55058827": [24, 143, 164]}, {"55058832": [143, 165]}, {"55058835": [4, 143, 166]}, {"55058839": [8, 3, 224]}, {"55058843": [8]}, {"55058848": [140, 136, 29, 44, 52, 9]}, {"55058855": [1]}, {"55058857": [9, 78]}, {"55058860": [1, 9, 16, 36, 16, 64]}, {"55058867": [27]}, {"55058872": [148, 138]}, {"55058875": [164, 52, 1]}, {"55058879": [61, 21, 65]}, {"55058883": [23]}, {"55058888": [148, 202, 2, 220, 52, 11]}, {"55058895": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55058919": [14]}, {"55058924": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55058952": [1, 10, 64, 33, 129, 8]}, {"55058960": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55058972": [52, 2]}, {"55058976": [3, 224]}, {"55058979": [8]}, {"55058984": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55058996": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55059008": [3, 224]}, {"55059011": [8]}, {"55059016": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55059027": [16, 175, 191]}, {"55059031": [20, 12, 16, 8, 157]}, {"55059040": [143, 162]}, {"55059043": [16, 143, 191]}, {"55059047": [20, 39, 189]}, {"55059051": [24, 3, 224]}, {"55059055": [8]}, {"55059060": [39, 189, 255, 216, 175, 176]}, {"55059067": [16, 175, 177]}, {"55059071": [20, 175, 178]}, {"55059075": [24, 175, 191]}, {"55059079": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55059095": [62]}, {"55059097": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 32]}, {"55059120": [173, 40]}, {"55059124": [173, 40]}, {"55059127": [4, 173, 40]}, {"55059131": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55059143": [164, 52, 1]}, {"55059147": [62, 21, 1]}, {"55059151": [6]}, {"55059156": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55059171": [31, 37, 8]}, {"55059175": [112]}, {"55059177": [8, 66]}, {"55059180": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 15, 252, 37, 41]}, {"55059195": [4, 149, 42]}, {"55059200": [17, 64]}, {"55059203": [30]}, {"55059208": [21, 72, 255, 251]}, {"55059216": [149, 48]}, {"55059219": [2, 54, 2]}, {"55059224": [52, 80]}, {"55059228": [38, 8, 255, 128, 5]}, {"55059235": [22]}, {"55059240": [60, 18, 128, 64, 38, 82, 37, 176]}, {"55059249": [8, 65]}, {"55059252": [2, 72, 144, 33, 142, 72]}, {"55059259": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55059270": [248, 9]}, {"55059276": [20, 80, 255, 242]}, {"55059284": [60, 10, 128, 64, 37, 74, 32]}, {"55059292": [142, 75]}, {"55059296": [173, 75]}, {"55059300": [142, 75]}, {"55059303": [4, 173, 75]}, {"55059307": [4, 142, 75]}, {"55059311": [8, 173, 75]}, {"55059315": [8, 16]}, {"55059319": [6]}, {"55059324": [130, 40, 4, 36, 5, 1]}, {"55059331": [2]}, {"55059337": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55059347": [16, 143, 177]}, {"55059351": [20, 143, 178]}, {"55059355": [24, 143, 191]}, {"55059359": [32, 39, 189]}, {"55059363": [40, 3, 224]}, {"55059367": [8]}, {"55059372": [3, 224]}, {"55059375": [8, 54, 2]}, {"55059380": [144, 136]}, {"55059383": [125, 52, 1]}, {"55059387": [255, 17, 1]}, {"55059391": [2, 52, 2]}, {"55059395": [8, 52, 2]}, {"55059399": [9, 3, 224]}, {"55059403": [8]}, {"55059408": [144, 136]}, {"55059411": [163, 49, 8]}, {"55059415": [192, 17]}, {"55059419": [5, 52, 2]}, {"55059423": [84, 52, 1]}, {"55059427": [64, 17, 1]}, {"55059431": [2, 52, 2]}, {"55059435": [53, 52, 2]}, {"55059439": [54, 3, 224]}, {"55059443": [8]}, {"55059448": [144, 136]}, {"55059451": [163, 49, 8]}, {"55059455": [24, 17]}, {"55059459": [5, 52, 2]}, {"55059463": [50, 52, 1]}, {"55059467": [8, 17, 1]}, {"55059471": [2, 52, 2]}, {"55059475": [51, 52, 2]}, {"55059479": [52, 3, 224]}, {"55059483": [8]}, {"55059488": [144, 136]}, {"55059491": [163, 49, 8]}, {"55059495": [3, 17]}, {"55059499": [5, 52, 2]}, {"55059503": [4, 52, 1]}, {"55059507": [1, 17, 1]}, {"55059511": [2, 52, 2]}, {"55059515": [48, 52, 2]}, {"55059519": [49, 3, 224]}, {"55059523": [8]}, {"55059528": [144, 136]}, {"55059531": [162, 49, 8]}, {"55059535": [192, 17]}, {"55059539": [5, 52, 2]}, {"55059543": [5, 52, 1]}, {"55059547": [64, 17, 1]}, {"55059551": [2, 52, 2]}, {"55059555": [96, 52, 2]}, {"55059559": [123, 3, 224]}, {"55059563": [8]}, {"55059568": [144, 136]}, {"55059571": [162, 49, 8]}, {"55059575": [48, 17]}, {"55059579": [2, 52, 2]}, {"55059583": [69, 52, 2]}, {"55059587": [70, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [162, 49, 8]}, {"55059603": [6, 17]}, {"55059607": [2, 52, 2]}, {"55059611": [55, 52, 2]}, {"55059615": [56, 3, 224]}, {"55059619": [8]}, {"55059624": [144, 136]}, {"55059627": [161, 49, 8]}, {"55059631": [48, 17]}, {"55059635": [2, 52, 2]}, {"55059639": [121, 52, 2]}, {"55059643": [122, 3, 224]}, {"55059647": [8]}, {"55059652": [144, 136]}, {"55059655": [161, 49, 8]}, {"55059659": [6, 17]}, {"55059663": [2, 52, 2]}, {"55059667": [119, 52, 2]}, {"55059671": [120, 3, 224]}, {"55059675": [8]}, {"55059680": [144, 136]}, {"55059683": [163, 49, 8]}, {"55059687": [3, 17]}, {"55059691": [2, 52, 2]}, {"55059695": [77, 54, 2]}, {"55059700": [3, 224]}, {"55059703": [8]}, {"55059708": [144, 136]}, {"55059711": [163, 49, 8]}, {"55059715": [24, 17]}, {"55059719": [2, 52, 2]}, {"55059723": [77, 54, 2]}, {"55059728": [3, 224]}, {"55059731": [8]}, {"55059736": [3, 224]}, {"55059739": [8]}, {"55059744": [52, 8]}, {"55059747": [1, 160, 136]}, {"55059751": [62, 3, 224]}, {"55059755": [8]}, {"55059760": [36, 136]}, {"55059763": [134, 36, 9, 255, 255, 37, 41]}, {"55059771": [1, 52, 1]}, {"55059775": [3]}, {"55059777": [41, 8, 42, 20, 32]}, {"55059783": [7]}, {"55059788": [1, 9, 80, 33, 145, 75]}, {"55059796": [52, 1]}, {"55059799": [255, 21, 97, 255, 247]}, {"55059808": [161, 69]}, {"55059812": [3, 224]}, {"55059815": [8]}, {"55059820": [36, 136]}, {"55059823": [168, 1, 6, 64, 33, 145, 9]}, {"55059832": [1, 37, 72, 37, 161, 9]}, {"55059840": [3, 224]}, {"55059843": [8]}, {"55059848": [36, 136]}, {"55059851": [188, 1, 5, 64, 33, 129, 9]}, {"55059860": [5, 33]}, {"55059863": [2]}, {"55059868": [52, 9]}, {"55059872": [37, 41]}, {"55059875": [1, 161, 9]}, {"55059880": [3, 224]}, {"55059883": [8]}, {"55059888": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 35, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 35, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 35, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 112, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 196]}, {"55060033": [255, 1, 67]}, {"55060037": [198, 21, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060049": [255, 1, 68]}, {"55060053": [198, 22, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060065": [255, 1, 69]}, {"55060069": [198, 23, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060081": [255, 1, 70]}, {"55060085": [198, 24, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060097": [255, 1, 71]}, {"55060101": [198, 25, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060113": [255, 1, 93]}, {"55060117": [198, 28, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060129": [255, 1, 122]}, {"55060133": [198, 29, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060145": [255, 1, 249]}, {"55060149": [198, 30, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060161": [255, 1, 151]}, {"55060165": [198, 32, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060177": [255, 10, 199]}, {"55060181": [185, 1, 3, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060193": [255, 10, 199]}, {"55060197": [185, 1, 4, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060209": [255, 10, 199]}, {"55060213": [185, 1, 5, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060225": [255, 10, 199]}, {"55060229": [185, 1, 6, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060241": [255, 10, 199]}, {"55060245": [185, 1, 7, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060257": [255, 10, 199]}, {"55060261": [185, 1, 13, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060273": [255, 11, 103]}, {"55060277": [184, 2]}, {"55060280": [128, 64, 37, 108, 128, 64, 35, 172]}, {"55060289": [255, 11, 103]}, {"55060293": [184, 2, 1, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060305": [255, 11, 103]}, {"55060309": [184, 2, 2, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060321": [255, 11, 103]}, {"55060325": [184, 2, 3, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060337": [255, 11, 103]}, {"55060341": [184, 2, 4, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060353": [255, 11, 103]}, {"55060357": [184, 2, 5, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060369": [255, 11, 103]}, {"55060373": [184, 2, 6, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060385": [255, 11, 103]}, {"55060389": [184, 2, 7, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060401": [255, 11, 103]}, {"55060405": [184, 2, 8, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060417": [255, 11, 103]}, {"55060421": [184, 2, 9, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060433": [255, 28, 102]}, {"55060437": [200, 4]}, {"55060440": [128, 64, 37, 108, 128, 64, 35, 172]}, {"55060449": [255, 28, 102]}, {"55060453": [200, 4, 1, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060465": [255, 28, 102]}, {"55060469": [200, 4, 2, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060481": [255, 28, 102]}, {"55060485": [200, 4, 3, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060497": [255, 28, 102]}, {"55060501": [200, 4, 4, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060513": [255, 28, 102]}, {"55060517": [200, 4, 5, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060529": [255, 28, 102]}, {"55060533": [200, 4, 6, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060545": [255, 28, 102]}, {"55060549": [200, 4, 7, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060561": [255, 28, 102]}, {"55060565": [200, 4, 8, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060577": [255, 28, 102]}, {"55060581": [200, 4, 9, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060593": [255, 254, 96]}, {"55060597": [170, 3, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060609": [255, 254, 96]}, {"55060613": [170, 4, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060625": [255, 254, 96]}, {"55060629": [170, 5, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060641": [255, 254, 96]}, {"55060645": [170, 6, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060657": [255, 254, 96]}, {"55060661": [170, 7, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060673": [255, 254, 96]}, {"55060677": [170, 8, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060689": [255, 254, 96]}, {"55060693": [170, 11, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060705": [255, 254, 96]}, {"55060709": [170, 12, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060721": [255, 254, 96]}, {"55060725": [170, 13, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060737": [61, 67, 12]}, {"55060741": [248, 255, 255, 128, 64, 37, 32, 128, 64, 35, 172]}, {"55060753": [131, 9, 85]}, {"55060757": [183, 255, 255, 128, 64, 37, 24, 128, 64, 35, 172]}, {"55060769": [146, 219, 230]}, {"55060773": [216, 255, 255, 128, 64, 37, 24, 128, 64, 36, 224]}, {"55060785": [147, 218, 230]}, {"55060789": [216, 255, 255, 128, 64, 37, 24, 128, 64, 36, 224]}, {"55060801": [148, 217, 230]}, {"55060805": [216, 255, 255, 128, 64, 37, 24, 128, 64, 36, 224]}, {"55060817": [142, 224, 50]}, {"55060821": [206, 255, 255, 128, 64, 37, 24, 128, 64, 36, 252]}, {"55060833": [143, 224, 50]}, {"55060837": [206, 255, 255, 128, 64, 37, 24, 128, 64, 36, 252]}, {"55060849": [144, 224, 50]}, {"55060853": [206, 255, 255, 128, 64, 37, 24, 128, 64, 36, 252]}, {"55060865": [140, 238, 52]}, {"55060869": [187, 255, 255, 128, 64, 37, 24, 128, 64, 35, 172]}, {"55060881": [141, 238, 52]}, {"55060885": [187, 255, 255, 128, 64, 37, 24, 128, 64, 35, 172, 175, 164]}, {"55060899": [104, 175, 165]}, {"55060903": [108, 175, 166]}, {"55060907": [112, 175, 167]}, {"55060911": [116, 39, 189, 255, 232, 175, 163]}, {"55060919": [16, 175, 191]}, {"55060923": [20, 60, 8, 128, 64, 37, 8, 32, 12, 129, 8]}, {"55060936": [17]}, {"55060939": [10]}, {"55060944": [60, 9, 128, 65, 52, 10]}, {"55060951": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 8, 157]}, {"55060980": [143, 163]}, {"55060983": [16, 143, 191]}, {"55060987": [20, 39, 189]}, {"55060991": [24, 143, 164]}, {"55060995": [104, 143, 165]}, {"55060999": [108, 143, 166]}, {"55061003": [112, 143, 167]}, {"55061007": [116, 132, 110, 19, 196, 3, 224]}, {"55061015": [8]}, {"55061020": [147, 25]}, {"55061023": [116, 52, 1]}, {"55061027": [255, 23, 33]}, {"55061031": [2]}, {"55061036": [52, 25]}, {"55061039": [44, 3, 224]}, {"55061043": [8, 167, 185]}, {"55061047": [154, 147, 44]}, {"55061051": [116, 52, 1]}, {"55061055": [255, 21, 129]}, {"55061059": [2]}, {"55061064": [52, 12]}, {"55061067": [44, 3, 224]}, {"55061071": [8]}, {"55061076": [145, 174]}, {"55061079": [116, 52, 1]}, {"55061083": [255, 21, 193]}, {"55061087": [2]}, {"55061092": [52, 14]}, {"55061095": [44, 3, 224]}, {"55061099": [8, 167, 174]}, {"55061103": [154, 145, 207]}, {"55061107": [116, 52, 1]}, {"55061111": [255, 21, 225]}, {"55061115": [2]}, {"55061120": [52, 15]}, {"55061123": [44, 3, 224]}, {"55061127": [8, 167, 175]}, {"55061131": [154, 141, 9]}, {"55061135": [4, 17, 32]}, {"55061139": [7]}, {"55061144": [145, 9]}, {"55061147": [104, 52, 1]}, {"55061151": [59, 17, 33]}, {"55061155": [2]}, {"55061160": [52, 9]}, {"55061163": [255, 161, 9]}, {"55061167": [64, 3, 224]}, {"55061171": [8, 161, 14]}, {"55061175": [104]}] \ No newline at end of file From 0b7ceb51e06e13bad818a00ce2d737231481d13b Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Tue, 29 May 2018 00:40:08 -0500 Subject: [PATCH 044/151] Minor tweaks and fixes Also activate the anti-graveyard ledge mechanics --- ItemList.py | 232 ++++++++++++++++++++++++++-------------------------- Items.py | 22 ++--- Rom.py | 15 ++-- 3 files changed, 134 insertions(+), 135 deletions(-) diff --git a/ItemList.py b/ItemList.py index f7a504967..5bfbeeae7 100644 --- a/ItemList.py +++ b/ItemList.py @@ -1,96 +1,96 @@ -from collections import namedtuple -import logging -import random - -from Items import ItemFactory -from Fill import FillError, fill_restrictive - -#This file sets the item pools for various modes. Timed modes and triforce hunt are enforced first, and then extra items are specified per mode to fill in the remaining space. -#Some basic items that various modes require are placed here, including pendants and crystals. Medallion requirements for the two relevant entrances are also decided. - -alwaysitems = (['Kokiri Sword', 'Biggoron Sword', 'Boomerang', 'Lens of Truth', 'Hammer', 'Iron Boots', 'Goron Tunic', 'Zora Tunic', 'Hover Boots', 'Mirror Shield', 'Stone of Agony', 'Fire Arrows', 'Ice Arrows', 'Light Arrows', 'Dins Fire', 'Farores Wind', 'Nayrus Love', 'Rupee (1)'] + ['Progressive Hookshot'] * 2 + ['Deku Shield'] * 4 + ['Hylian Shield'] * 2 + ['Ice Trap'] * 6 + - ['Progressive Strength Upgrade'] * 3 + ['Progressive Scale'] * 2 + ['Piece of Heart'] * 16 + ['Recovery Heart'] * 11 + ['Rupees (5)'] * 17 + ['Rupees (20)'] * 5 + ['Rupees (50)'] * 7 + ['Rupees (200)'] * 6 + ['Bow'] * 3 + ['Slingshot'] * 3 + ['Bomb Bag'] * 3 + ['Bottle with Letter'] + - ['Bombs (5)'] * 2 + ['Bombs (10)'] * 2 + ['Bombs (20)'] * 2 + ['Bombchus (5)'] + ['Bombchus (10)'] * 3 + ['Bombchus (20)'] + ['Arrows (5)'] + ['Arrows (10)'] * 6 + ['Arrows (30)'] * 6 + ['Deku Nuts (5)'] + ['Deku Nuts (10)'] + ['Progressive Wallet'] * 2 + ['Deku Stick Capacity'] * 2 + ['Deku Nut Capacity'] * 2) -normal_bottles = ['Bottle', 'Bottle with Milk', 'Bottle with Red Potion', 'Bottle with Green Potion', 'Bottle with Blue Potion', 'Bottle with Fairy', 'Bottle with Fish', 'Bottle with Blue Fire', 'Bottle with Bugs', 'Bottle with Poe'] -normal_bottle_count = 3 -notmapcompass = ['Rupees (5)'] * 20 -rewardlist = ['Kokiri Emerald', 'Goron Ruby', 'Zora Sapphire', 'Forest Medallion', 'Fire Medallion', 'Water Medallion', 'Spirit Medallion', 'Shadow Medallion', 'Light Medallion'] -songlist = ['Zeldas Lullaby', 'Eponas Song', 'Suns Song', 'Sarias Song', 'Song of Time', 'Song of Storms', 'Minuet of Forest', 'Prelude of Light', 'Bolero of Fire', 'Serenade of Water', 'Nocturne of Shadow', 'Requiem of Spirit'] -skulltulla_locations = (['GS1', 'GS2', 'GS3', 'GS4', 'GS5', 'GS6', 'GS7', 'GS8', 'GS9', 'GS10', 'GS11', 'GS12', 'GS13', 'GS14', 'GS15', 'GS16', 'GS17', 'GS18', 'GS19', 'GS20'] + - ['GS21', 'GS22', 'GS23', 'GS24', 'GS25', 'GS26', 'GS27', 'GS28', 'GS29', 'GS30', 'GS31', 'GS32', 'GS33', 'GS34', 'GS35', 'GS36', 'GS37', 'GS38', 'GS39', 'GS40'] + - ['GS41', 'GS42', 'GS43', 'GS44', 'GS45', 'GS46', 'GS47', 'GS48', 'GS49', 'GS50', 'GS51', 'GS52', 'GS53', 'GS54', 'GS55', 'GS56', 'GS57', 'GS58', 'GS59', 'GS60'] + - ['GS61', 'GS62', 'GS63', 'GS64', 'GS65', 'GS66', 'GS67', 'GS68', 'GS69', 'GS70', 'GS71', 'GS72', 'GS73', 'GS74', 'GS75', 'GS76', 'GS77', 'GS78', 'GS79', 'GS80'] + - ['GS81', 'GS82', 'GS83', 'GS84', 'GS85', 'GS86', 'GS87', 'GS88', 'GS89', 'GS90', 'GS91', 'GS92', 'GS93', 'GS94', 'GS95', 'GS96', 'GS97', 'GS98', 'GS99', 'GS100']) -tradeitems = ['Pocket Egg', 'Pocket Cucco', 'Cojiro', 'Odd Mushroom', 'Poachers Saw', 'Broken Sword', 'Prescription', 'Eyeball Frog', 'Eyedrops', 'Claim Check'] - -#total_items_to_place = 5 - -def generate_itempool(world): - - for location in skulltulla_locations: - world.push_item(location, ItemFactory('Gold Skulltulla Token'), False) - world.get_location(location).event = True - - world.push_item('Ganon', ItemFactory('Triforce'), False) - world.get_location('Ganon').event = True - world.push_item('Gift from Saria', ItemFactory('Fairy Ocarina'), False) - world.get_location('Gift from Saria').event = True - world.push_item('Zeldas Letter', ItemFactory('Zeldas Letter'), False) - world.get_location('Zeldas Letter').event = True - world.push_item('Mountain Summit Fairy Reward', ItemFactory('Magic Meter'), False) - world.get_location('Mountain Summit Fairy Reward').event = True - world.push_item('Crater Fairy Reward', ItemFactory('Magic Meter'), False) - world.get_location('Crater Fairy Reward').event = True - world.push_item('Magic Bean Salesman', ItemFactory('Magic Bean'), False) - world.get_location('Magic Bean Salesman').event = True - world.push_item('King Zora Moves', ItemFactory('Bottle'), False) - world.get_location('King Zora Moves').event = True - world.push_item('Ocarina of Time', ItemFactory('Ocarina of Time'), False) - world.get_location('Ocarina of Time').event = True - world.push_item('Master Sword Pedestal', ItemFactory('Master Sword'), False) - world.get_location('Master Sword Pedestal').event = True - world.push_item('Epona', ItemFactory('Epona'), False) - world.get_location('Epona').event = True - world.push_item('Gerudo Fortress Carpenter Rescue', ItemFactory('Gerudo Membership Card'), False) - world.get_location('Gerudo Fortress Carpenter Rescue').event = True - world.push_item('Ganons Castle Forest Trial Clear', ItemFactory('Forest Trial Clear'), False) - world.get_location('Ganons Castle Forest Trial Clear').event = True - world.push_item('Ganons Castle Fire Trial Clear', ItemFactory('Fire Trial Clear'), False) - world.get_location('Ganons Castle Fire Trial Clear').event = True - world.push_item('Ganons Castle Water Trial Clear', ItemFactory('Water Trial Clear'), False) - world.get_location('Ganons Castle Water Trial Clear').event = True - world.push_item('Ganons Castle Shadow Trial Clear', ItemFactory('Shadow Trial Clear'), False) - world.get_location('Ganons Castle Shadow Trial Clear').event = True - world.push_item('Ganons Castle Spirit Trial Clear', ItemFactory('Spirit Trial Clear'), False) - world.get_location('Ganons Castle Spirit Trial Clear').event = True - world.push_item('Ganons Castle Light Trial Clear', ItemFactory('Light Trial Clear'), False) - world.get_location('Ganons Castle Light Trial Clear').event = True - - # set up item pool - (pool, placed_items) = get_pool_core(world.place_dungeon_items) - world.itempool = ItemFactory(pool) - for (location, item) in placed_items: - world.push_item(location, ItemFactory(item), False) - world.get_location(location).event = True - - fill_bosses(world) - fill_songs(world) - -def get_pool_core(dungeon_items): - pool = [] - placed_items = [] - - if not dungeon_items: - pool.extend(notmapcompass) - pool.extend(alwaysitems) - for _ in range(normal_bottle_count): - bottle = random.choice(normal_bottles) - pool.append(bottle) - tradeitem = random.choice(tradeitems) - pool.append(tradeitem) - - return (pool, placed_items) - +from collections import namedtuple +import logging +import random + +from Items import ItemFactory +from Fill import FillError, fill_restrictive + +#This file sets the item pools for various modes. Timed modes and triforce hunt are enforced first, and then extra items are specified per mode to fill in the remaining space. +#Some basic items that various modes require are placed here, including pendants and crystals. Medallion requirements for the two relevant entrances are also decided. + +alwaysitems = (['Kokiri Sword', 'Biggoron Sword', 'Boomerang', 'Lens of Truth', 'Hammer', 'Iron Boots', 'Goron Tunic', 'Zora Tunic', 'Hover Boots', 'Mirror Shield', 'Stone of Agony', 'Fire Arrows', 'Ice Arrows', 'Light Arrows', 'Dins Fire', 'Farores Wind', 'Nayrus Love', 'Rupee (1)'] + ['Progressive Hookshot'] * 2 + ['Deku Shield'] * 4 + ['Hylian Shield'] * 2 + ['Ice Trap'] * 6 + + ['Progressive Strength Upgrade'] * 3 + ['Progressive Scale'] * 2 + ['Piece of Heart'] * 16 + ['Recovery Heart'] * 11 + ['Rupees (5)'] * 17 + ['Rupees (20)'] * 5 + ['Rupees (50)'] * 7 + ['Rupees (200)'] * 6 + ['Bow'] * 3 + ['Slingshot'] * 3 + ['Bomb Bag'] * 3 + ['Bottle with Letter'] + + ['Bombs (5)'] * 2 + ['Bombs (10)'] * 2 + ['Bombs (20)'] * 2 + ['Bombchus (5)'] + ['Bombchus (10)'] * 3 + ['Bombchus (20)'] + ['Arrows (5)'] + ['Arrows (10)'] * 6 + ['Arrows (30)'] * 6 + ['Deku Nuts (5)'] + ['Deku Nuts (10)'] + ['Progressive Wallet'] * 2 + ['Deku Stick Capacity'] * 2 + ['Deku Nut Capacity'] * 2) +normal_bottles = ['Bottle', 'Bottle with Milk', 'Bottle with Red Potion', 'Bottle with Green Potion', 'Bottle with Blue Potion', 'Bottle with Fairy', 'Bottle with Fish', 'Bottle with Blue Fire', 'Bottle with Bugs', 'Bottle with Poe'] +normal_bottle_count = 3 +notmapcompass = ['Rupees (5)'] * 20 +rewardlist = ['Kokiri Emerald', 'Goron Ruby', 'Zora Sapphire', 'Forest Medallion', 'Fire Medallion', 'Water Medallion', 'Spirit Medallion', 'Shadow Medallion', 'Light Medallion'] +songlist = ['Zeldas Lullaby', 'Eponas Song', 'Suns Song', 'Sarias Song', 'Song of Time', 'Song of Storms', 'Minuet of Forest', 'Prelude of Light', 'Bolero of Fire', 'Serenade of Water', 'Nocturne of Shadow', 'Requiem of Spirit'] +skulltulla_locations = (['GS1', 'GS2', 'GS3', 'GS4', 'GS5', 'GS6', 'GS7', 'GS8', 'GS9', 'GS10', 'GS11', 'GS12', 'GS13', 'GS14', 'GS15', 'GS16', 'GS17', 'GS18', 'GS19', 'GS20'] + + ['GS21', 'GS22', 'GS23', 'GS24', 'GS25', 'GS26', 'GS27', 'GS28', 'GS29', 'GS30', 'GS31', 'GS32', 'GS33', 'GS34', 'GS35', 'GS36', 'GS37', 'GS38', 'GS39', 'GS40'] + + ['GS41', 'GS42', 'GS43', 'GS44', 'GS45', 'GS46', 'GS47', 'GS48', 'GS49', 'GS50', 'GS51', 'GS52', 'GS53', 'GS54', 'GS55', 'GS56', 'GS57', 'GS58', 'GS59', 'GS60'] + + ['GS61', 'GS62', 'GS63', 'GS64', 'GS65', 'GS66', 'GS67', 'GS68', 'GS69', 'GS70', 'GS71', 'GS72', 'GS73', 'GS74', 'GS75', 'GS76', 'GS77', 'GS78', 'GS79', 'GS80'] + + ['GS81', 'GS82', 'GS83', 'GS84', 'GS85', 'GS86', 'GS87', 'GS88', 'GS89', 'GS90', 'GS91', 'GS92', 'GS93', 'GS94', 'GS95', 'GS96', 'GS97', 'GS98', 'GS99', 'GS100']) +tradeitems = ['Pocket Egg', 'Pocket Cucco', 'Cojiro', 'Odd Mushroom', 'Poachers Saw', 'Broken Sword', 'Prescription', 'Eyeball Frog', 'Eyedrops', 'Claim Check'] + +#total_items_to_place = 5 + +def generate_itempool(world): + + for location in skulltulla_locations: + world.push_item(location, ItemFactory('Gold Skulltulla Token'), False) + world.get_location(location).event = True + + world.push_item('Ganon', ItemFactory('Triforce'), False) + world.get_location('Ganon').event = True + world.push_item('Gift from Saria', ItemFactory('Fairy Ocarina'), False) + world.get_location('Gift from Saria').event = True + world.push_item('Zeldas Letter', ItemFactory('Zeldas Letter'), False) + world.get_location('Zeldas Letter').event = True + world.push_item('Mountain Summit Fairy Reward', ItemFactory('Magic Meter'), False) + world.get_location('Mountain Summit Fairy Reward').event = True + world.push_item('Crater Fairy Reward', ItemFactory('Magic Meter'), False) + world.get_location('Crater Fairy Reward').event = True + world.push_item('Magic Bean Salesman', ItemFactory('Magic Bean'), False) + world.get_location('Magic Bean Salesman').event = True + world.push_item('King Zora Moves', ItemFactory('Bottle'), False) + world.get_location('King Zora Moves').event = True + world.push_item('Ocarina of Time', ItemFactory('Ocarina of Time'), False) + world.get_location('Ocarina of Time').event = True + world.push_item('Master Sword Pedestal', ItemFactory('Master Sword'), False) + world.get_location('Master Sword Pedestal').event = True + world.push_item('Epona', ItemFactory('Epona'), False) + world.get_location('Epona').event = True + world.push_item('Gerudo Fortress Carpenter Rescue', ItemFactory('Gerudo Membership Card'), False) + world.get_location('Gerudo Fortress Carpenter Rescue').event = True + world.push_item('Ganons Castle Forest Trial Clear', ItemFactory('Forest Trial Clear'), False) + world.get_location('Ganons Castle Forest Trial Clear').event = True + world.push_item('Ganons Castle Fire Trial Clear', ItemFactory('Fire Trial Clear'), False) + world.get_location('Ganons Castle Fire Trial Clear').event = True + world.push_item('Ganons Castle Water Trial Clear', ItemFactory('Water Trial Clear'), False) + world.get_location('Ganons Castle Water Trial Clear').event = True + world.push_item('Ganons Castle Shadow Trial Clear', ItemFactory('Shadow Trial Clear'), False) + world.get_location('Ganons Castle Shadow Trial Clear').event = True + world.push_item('Ganons Castle Spirit Trial Clear', ItemFactory('Spirit Trial Clear'), False) + world.get_location('Ganons Castle Spirit Trial Clear').event = True + world.push_item('Ganons Castle Light Trial Clear', ItemFactory('Light Trial Clear'), False) + world.get_location('Ganons Castle Light Trial Clear').event = True + + # set up item pool + (pool, placed_items) = get_pool_core(world.place_dungeon_items) + world.itempool = ItemFactory(pool) + for (location, item) in placed_items: + world.push_item(location, ItemFactory(item), False) + world.get_location(location).event = True + + fill_bosses(world) + fill_songs(world) + +def get_pool_core(dungeon_items): + pool = [] + placed_items = [] + + if not dungeon_items: + pool.extend(notmapcompass) + pool.extend(alwaysitems) + for _ in range(normal_bottle_count): + bottle = random.choice(normal_bottles) + pool.append(bottle) + tradeitem = random.choice(tradeitems) + pool.append(tradeitem) + + return (pool, placed_items) + def fill_bosses(world, bossCount=9): boss_rewards = ItemFactory(rewardlist) boss_locations = [world.get_location('Queen Gohma'), world.get_location('King Dodongo'), world.get_location('Barinade'), world.get_location('Phantom Ganon'), @@ -109,27 +109,27 @@ def fill_bosses(world, bossCount=9): loc = prize_locs.pop() world.push_item(loc, item, False) world.get_location(loc).event = True - -def fill_songs(world, attempts=15): - songs = ItemFactory(songlist) - song_locations = [world.get_location('Song from Composer Grave'), world.get_location('Impa at Castle'), world.get_location('Song from Malon'), world.get_location('Song from Saria'), world.get_location('Song from Ocarina of Time'), world.get_location('Song at Windmill'), world.get_location('Sheik Forest Song'), world.get_location('Sheik at Temple'), world.get_location('Sheik in Crater'), world.get_location('Sheik in Ice Cavern'), world.get_location('Sheik in Kakariko'), world.get_location('Sheik at Colossus')] - placed_prizes = [loc.item.name for loc in song_locations if loc.item is not None] - unplaced_prizes = [song for song in songs if song.name not in placed_prizes] - empty_song_locations = [loc for loc in song_locations if loc.item is None] - - while attempts: - attempts -= 1 - try: - prizepool = list(unplaced_prizes) - prize_locs = list(empty_song_locations) - random.shuffle(prizepool) - random.shuffle(prize_locs) - fill_restrictive(world, world.get_all_state(keys=True), prize_locs, prizepool) #TODO: Set keys to true once keys are properly implemented - except FillError: - logging.getLogger('').info("Failed to place songs. Will retry %s more times", attempts) - for location in empty_song_locations: - location.item = None - continue - break - else: + +def fill_songs(world, attempts=15): + songs = ItemFactory(songlist) + song_locations = [world.get_location('Song from Composer Grave'), world.get_location('Impa at Castle'), world.get_location('Song from Malon'), world.get_location('Song from Saria'), world.get_location('Song from Ocarina of Time'), world.get_location('Song at Windmill'), world.get_location('Sheik Forest Song'), world.get_location('Sheik at Temple'), world.get_location('Sheik in Crater'), world.get_location('Sheik in Ice Cavern'), world.get_location('Sheik in Kakariko'), world.get_location('Sheik at Colossus')] + placed_prizes = [loc.item.name for loc in song_locations if loc.item is not None] + unplaced_prizes = [song for song in songs if song.name not in placed_prizes] + empty_song_locations = [loc for loc in song_locations if loc.item is None] + + while attempts: + attempts -= 1 + try: + prizepool = list(unplaced_prizes) + prize_locs = list(empty_song_locations) + random.shuffle(prizepool) + random.shuffle(prize_locs) + fill_restrictive(world, world.get_all_state(keys=True), prize_locs, prizepool) #TODO: Set keys to true once keys are properly implemented + except FillError: + logging.getLogger('').info("Failed to place songs. Will retry %s more times", attempts) + for location in empty_song_locations: + location.item = None + continue + break + else: raise FillError('Unable to place songs') \ No newline at end of file diff --git a/Items.py b/Items.py index 70ad59a56..028a66124 100644 --- a/Items.py +++ b/Items.py @@ -73,23 +73,23 @@ def ItemFactory(items): 'Progressive Strength Upgrade': (True, False, None, None, 0x81), 'Progressive Scale': (True, False, None, None, 0x86), 'Progressive Wallet': (True, False, None, None, 0x85), - 'Deku Stick Capacity': (False, True, None, None, 0x88), - 'Deku Nut Capacity': (False, True, None, None, 0x87), + 'Deku Stick Capacity': (False, False, None, None, 0x88), + 'Deku Nut Capacity': (False, False, None, None, 0x87), 'Stone of Agony': (True, False, None, 0x0720, 0x39), 'Piece of Heart': (False, False, None, 0x07C0, 0x3E), 'Piece of Heart (Treasure Chest Game)': (False, False, None, None, 0x76), - 'Recovery Heart': (False, True, None, None, 0xB6), - 'Arrows (5)': (False, True, None, None, 0xB7), - 'Arrows (10)': (False, True, None, None, 0xB8), - 'Arrows (30)': (False, True, None, None, 0xB9), - 'Bombs (5)': (False, True, None, None, 0xBA), - 'Bombs (10)': (False, True, None, None, 0xBB), - 'Bombs (20)': (False, True, None, None, 0xBC), + 'Recovery Heart': (False, False, None, None, 0xB6), + 'Arrows (5)': (False, False, None, None, 0xB7), + 'Arrows (10)': (False, False, None, None, 0xB8), + 'Arrows (30)': (False, False, None, None, 0xB9), + 'Bombs (5)': (False, False, None, None, 0xBA), + 'Bombs (10)': (False, False, None, None, 0xBB), + 'Bombs (20)': (False, False, None, None, 0xBC), 'Bombchus (5)': (False, False, None, 0x0D40, 0x6A), 'Bombchus (10)': (False, False, None, 0x0060, 0x03), 'Bombchus (20)': (False, False, None, 0x0D60, 0x6B), - 'Deku Nuts (5)': (False, True, None, None, 0xBD), - 'Deku Nuts (10)': (False, True, None, None, 0xBE), + 'Deku Nuts (5)': (False, False, None, None, 0xBD), + 'Deku Nuts (10)': (False, False, None, None, 0xBE), 'Rupee (1)': (False, False, None, 0x0980, 0x4C), 'Rupees (5)': (False, False, None, 0x09A0, 0x4D), 'Rupees (20)': (False, False, None, 0x09C0, 0x4E), diff --git a/Rom.py b/Rom.py index 527181afb..fae93bd18 100644 --- a/Rom.py +++ b/Rom.py @@ -148,8 +148,8 @@ def patch_rom(world, rom): rom.write_bytes(0x00C6ED8A, [0x00, 0x18]) # Change graveyard graves to not allow grabbing on to the ledge - # rom.write_byte(0x0202039D, 0x20) - # rom.write_byte(0x0202043C, 0x24) + rom.write_byte(0x0202039D, 0x20) + rom.write_byte(0x0202043C, 0x24) # Fix Link the Goron to always work rom.write_bytes(0xED2FAC, [0x80, 0x6E, 0x0F, 0x18]) @@ -633,13 +633,13 @@ def patch_rom(world, rom): rom.write_bytes(0xE2D440, [0x24, 0x19, 0x00, 0x00]) # Make fishing less obnoxious - Block_code = [0x3c, 0x0A, 0x80, 0x12, 0x8D, 0x4A, 0xA5, 0xD4, 0x14, 0x0a, 0x00, 0x06, + Block_code = [0x3C, 0x0A, 0x80, 0x12, 0x8D, 0x4A, 0xA5, 0xD4, 0x14, 0x0A, 0x00, 0x06, 0x31, 0x78, 0x00, 0x01, 0x14, 0x18, 0x00, 0x02, 0x3c, 0x18, 0x42, 0x30, - 0x3c, 0x18, 0x42, 0x50, 0x03, 0xe0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, - 0x14, 0x18, 0x00, 0x02, 0x3c, 0x18, 0x42, 0x10, 0x3c, 0x18, 0x42, 0x38, - 0x03, 0xe0, 0x00, 0x08] + 0x3C, 0x18, 0x42, 0x50, 0x03, 0xe0, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, + 0x14, 0x18, 0x00, 0x02, 0x3C, 0x18, 0x42, 0x10, 0x3C, 0x18, 0x42, 0x38, + 0x03, 0xE0, 0x00, 0x08] rom.write_bytes(0x3480C00, Block_code) - rom.write_bytes(0xDBF434, [0x44, 0x98, 0x90, 0x00, 0xe6, 0x52, 0x01, 0x9C]) + rom.write_bytes(0xDBF434, [0x44, 0x98, 0x90, 0x00, 0xE6, 0x52, 0x01, 0x9C]) rom.write_bytes(0xDBF484, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xDBF4A8, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xDCBEAA, [0x42, 0x48]) #set adult fish size requirement @@ -788,7 +788,6 @@ def patch_rom(world, rom): rom.write_bytes(0xB06C2C, [0x0C, 0x10, 0x01, 0x80]) #Save Writing Hook rom.write_bytes(0xC89A34, [0x0C, 0x10, 0x02, 0x54, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at death mountain trail rom.write_bytes(0xC89A78, [0x0C, 0x10, 0x02, 0x60, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at crater - rom.write_bytes(0xC8B048, [0x0C, 0x10, 0x02, 0x80, 0x00, 0xA3, 0xAF, 0x21]) #Progressive items from Great Fairies (weirdness with 0xAF) rom.write_bytes(0xDBF428, [0x0C, 0x10, 0x03, 0x00]) #Set Fishing Hook # Sticks on B fix From 4b20259f24d321dd3e82a43ce2ad1fbcf96187bd Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Tue, 29 May 2018 01:53:02 -0500 Subject: [PATCH 045/151] Some generic grotto logic fixes --- Regions.py | 6 +++--- Rules.py | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Regions.py b/Regions.py index 01746f059..4b6772c24 100644 --- a/Regions.py +++ b/Regions.py @@ -100,7 +100,7 @@ def create_regions(world): create_ow_region('Goron City Woods Warp', None, ['Goron City from Woods', 'Goron City to Woods']), create_ow_region('Darunias Chamber', ['Darunias Joy'], ['Darunias Chamber Exit']), create_ow_region('Death Mountain Crater Upper', ['GS36'], ['Crater Exit', 'Crater Hover Boots', 'Crater Scarecrow', 'Top of Crater Grotto']), - create_ow_region('Death Mountain Crater Lower', None, ['Crater to City', 'Crater Fairy', 'Crater Bridge', 'Crater Ascent', 'Top of Crater Grotto']), + create_ow_region('Death Mountain Crater Lower', None, ['Crater to City', 'Crater Fairy', 'Crater Bridge', 'Crater Ascent']), create_ow_region('Death Mountain Crater Central', ['Sheik in Crater', 'GS37'], ['Crater Bridge Reverse', 'Fire Temple Entrance']), create_interior_region('Crater Fairy', ['Crater Fairy Reward']), create_interior_region('Mountain Summit Fairy', ['Mountain Summit Fairy Reward']), @@ -109,8 +109,8 @@ def create_regions(world): create_dungeon_region('Dodongos Cavern Climb', ['Dodongos Cavern Compass Chest', 'Dodongos Cavern Bomb Flower Platform', 'GS39'], ['Dodongos Cavern Bridge Fall', 'Dodongos Cavern Slingshot Target']), create_dungeon_region('Dodongos Cavern Far Bridge', ['Dodongos Cavern Bomb Bag Chest', 'Dodongos Cavern End of Bridge Chest', 'GS41'], ['Dodongos Cavern Bomb Drop', 'Dodongos Cavern Bridge Fall 2']), create_dungeon_region('Dodongos Cavern Boss Area', ['Chest Above King Dodongo', 'King Dodongo', 'GS40'], ['Dodongos Cavern Exit Skull']), - create_ow_region('Zora River Bottom', ['GS43'], ['Zora River Exit', 'Zora River Rocks', 'Zora River Adult']), - create_ow_region('Zora River Top', ['Magic Bean Salesman', 'Frog Ocarina Game', 'Frogs in the Rain', 'GS44'], ['Zora River Downstream', 'Zora River Dive Warp', 'Zora River Waterfall', 'Zora River Plateau Open Grotto', 'Zora River Plateau Bombable Grotto']), + create_ow_region('Zora River Bottom', ['GS43'], ['Zora River Exit', 'Zora River Rocks', 'Zora River Adult', 'Zora River Plateau Open Grotto', 'Zora River Plateau Bombable Grotto']), + create_ow_region('Zora River Top', ['Magic Bean Salesman', 'Frog Ocarina Game', 'Frogs in the Rain', 'GS44'], ['Zora River Downstream', 'Zora River Dive Warp', 'Zora River Waterfall']), create_ow_region('Zora River Adult', ['GS45', 'GS46'], ['Zoras Domain Adult Access']), create_ow_region('Zoras Domain', ['Diving Minigame', 'Zoras Domain Torch Run', 'King Zora Moves'], ['Zoras Domain Exit', 'Zoras Domain Dive Warp', 'Behind King Zora', 'Zora Shop']), create_ow_region('Zoras Fountain', ['GS48', 'GS49'], ['Zoras Fountain Exit', 'Jabu Jabus Belly', 'Zoras Fountain Fairy']), diff --git a/Rules.py b/Rules.py index d10a45c98..abe629c5b 100644 --- a/Rules.py +++ b/Rules.py @@ -317,6 +317,7 @@ def global_rules(world): set_rule(world.get_entrance('Mountain Bombable Grotto'), lambda state: state.can_blast()) set_rule(world.get_entrance('Mountain Storms Grotto'), lambda state: state.has('Song of Storms')) set_rule(world.get_entrance('Top of Crater Grotto'), lambda state: state.can_blast()) + set_rule(world.get_entrance('Zora River Plateau Open Grotto'), lambda state: state.has('Bomb Bag') or state.has('Progressive Scale') or state.is_adult()) set_rule(world.get_entrance('Zora River Plateau Bombable Grotto'), lambda state: state.can_blast()) set_rule(world.get_location('GS2'), lambda state: state.has_bottle()) set_rule(world.get_location('GS3'), lambda state: state.has('Progressive Hookshot') and state.is_adult()) From 0994b9e992333c3070b7c3bd66314288f7177543 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 29 May 2018 04:03:23 -0400 Subject: [PATCH 046/151] Add override logging --- ItemOverrides.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ItemOverrides.py b/ItemOverrides.py index ab4ee2287..d27220903 100755 --- a/ItemOverrides.py +++ b/ItemOverrides.py @@ -1,3 +1,5 @@ +import logging + from Items import ItemFactory @@ -5,11 +7,13 @@ def set_overrides(world): filled = world.get_filled_locations() by_scene = {} for loc in filled: + if loc.scene is None: + continue locations = by_scene.get(loc.scene, []) locations.append(loc) by_scene[loc.scene] = locations - for scene, locations in by_scene.items(): + for scene, locations in sorted(by_scene.items()): used_items = [loc.item.name for loc in locations] available_base_items = [item for item in valid_base_items if item not in used_items] for loc in locations: @@ -30,6 +34,7 @@ def set_overrides(world): if (scene is None): raise RuntimeError("Can't place extended item %s in location %s" % (loc.item.name, loc.name)) loc.base_item = ItemFactory(base_item) + logging.getLogger('').debug('Override %s -> %s in scene %s', loc.base_item, loc.item, '0x{0:0{1}X}'.format(scene, 2)) def get_overrides(world): filled = world.get_locations() From 6cfd75d109ee25f3bee35bec8fb98adc9a725c2a Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 29 May 2018 04:18:12 -0400 Subject: [PATCH 047/151] Remove conditional which is now always false --- ItemOverrides.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/ItemOverrides.py b/ItemOverrides.py index d27220903..df4a9a1ec 100755 --- a/ItemOverrides.py +++ b/ItemOverrides.py @@ -31,8 +31,6 @@ def set_overrides(world): else: continue - if (scene is None): - raise RuntimeError("Can't place extended item %s in location %s" % (loc.item.name, loc.name)) loc.base_item = ItemFactory(base_item) logging.getLogger('').debug('Override %s -> %s in scene %s', loc.base_item, loc.item, '0x{0:0{1}X}'.format(scene, 2)) From 4ce0b51e513b33f9fb65036dce8b2f7a9d3c50c6 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 29 May 2018 22:02:08 -0400 Subject: [PATCH 048/151] Add build scripts --- ASM/.gitignore | 1 + ASM/scripts/build.py | 22 ++++++++++++++++++++++ ASM/scripts/sym2pj64.py | 29 +++++++++++++++++++++++++++++ ASM/temp/.gitkeep | 0 4 files changed, 52 insertions(+) create mode 100644 ASM/scripts/build.py create mode 100644 ASM/scripts/sym2pj64.py create mode 100644 ASM/temp/.gitkeep diff --git a/ASM/.gitignore b/ASM/.gitignore index be9708648..fda3bd009 100644 --- a/ASM/.gitignore +++ b/ASM/.gitignore @@ -1,4 +1,5 @@ /inject /roms/* +/temp/* armips* !.gitkeep diff --git a/ASM/scripts/build.py b/ASM/scripts/build.py new file mode 100644 index 000000000..7d729e65a --- /dev/null +++ b/ASM/scripts/build.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python3 +import argparse +import os +import subprocess + +parser = argparse.ArgumentParser() +parser.add_argument('--pj64sym', help="Output path for PJ64 debugging symbols") +args = parser.parse_args() +pj64_sym_path = args.pj64sym +if pj64_sym_path: + pj64_sym_path = os.path.realpath(pj64_sym_path) + +script_dir = os.path.dirname(os.path.realpath(__file__)) +os.chdir(script_dir) + +try: + subprocess.call(['./armips', '-sym2', '../temp/symbols', '../src/build.asm']) +except FileNotFoundError: + subprocess.call(['armips', '-sym2', '../temp/symbols', '../src/build.asm']) + +if pj64_sym_path: + subprocess.call(['python3', 'sym2pj64.py', '../temp/symbols', pj64_sym_path]) diff --git a/ASM/scripts/sym2pj64.py b/ASM/scripts/sym2pj64.py new file mode 100644 index 000000000..4c6b841b5 --- /dev/null +++ b/ASM/scripts/sym2pj64.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 + +import sys + +if len(sys.argv) < 3: + raise RuntimeError("Usage: python3 sym2pj64.py IN_FILE OUT_FILE") + +in_path = sys.argv[1] +out_path = sys.argv[2] + +in_file = open(in_path, 'r') +out_file = open(out_path, 'w') + +for line in in_file: + line = line.strip() + parts = line.strip().split(' ') + if len(parts) < 2: + continue + address, label = parts + if address[0] != '8': + continue + if label[0] == '.': + continue + label_type = 'data' if label.isupper() else 'code' + out_line = ','.join([address, label_type, label]) + print(out_line, file=out_file) + +in_file.close() +out_file.close() diff --git a/ASM/temp/.gitkeep b/ASM/temp/.gitkeep new file mode 100644 index 000000000..e69de29bb From 6e2e7d6ee7201ef915299500d0461e22dc592023 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 29 May 2018 22:08:07 -0400 Subject: [PATCH 049/151] Update ASM readme --- ASM/README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ASM/README.md b/ASM/README.md index a78825d3e..68654ceaa 100644 --- a/ASM/README.md +++ b/ASM/README.md @@ -1,5 +1,8 @@ -- Download the armips assembler: +- Download the armips assembler: and put the + executable in the `scripts` directory, or somewhere in your PATH - Put the ROM you want to patch at `roms/base.z64` -- Run `armips src/build.asm`, which will create `roms/patched.z64` +- Run `python3 scripts/build.py`, which will create `roms/patched.z64` - To update the front-end patch file, run: ```python3 scripts/rom_diff.py roms/base.z64 roms/patched.z64 ../data/base2current.json``` + +To generate debugging symbols for the Project 64 debugger, run `python3 scripts/build.py --pj64sym 'path_to_pj64/Saves/THE LEGEND OF ZELDA.sym'` From c3ff0059ca8992d2bf16e7473b04a23f938af565 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 29 May 2018 22:27:05 -0400 Subject: [PATCH 050/151] Remove redundant line --- ASM/scripts/sym2pj64.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ASM/scripts/sym2pj64.py b/ASM/scripts/sym2pj64.py index 4c6b841b5..aef4eb7b4 100644 --- a/ASM/scripts/sym2pj64.py +++ b/ASM/scripts/sym2pj64.py @@ -12,7 +12,6 @@ out_file = open(out_path, 'w') for line in in_file: - line = line.strip() parts = line.strip().split(' ') if len(parts) < 2: continue From 553d6e62bd661b205ca473966a9c4b881168dbfc Mon Sep 17 00:00:00 2001 From: Wulfy Date: Wed, 30 May 2018 03:24:52 -0400 Subject: [PATCH 051/151] Add second type of override for free-standing items --- ASM/src/config.asm | 7 ++++--- ASM/src/items.asm | 22 +++++++++++++++++++--- data/base2current.json | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/ASM/src/config.asm b/ASM/src/config.asm index 474c280f2..3eb3de8db 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -5,12 +5,13 @@ ; 0x03481000: Item override table: ; ; This table changes the meaning of a given item ID within a given scene. It must be terminated with -; two 0x00 bytes (which will happen by default as long as you don't fill the allotted space). +; four 0x00 bytes (which will happen by default as long as you don't fill the allotted space). ; ; Row format (4 bytes): -; SSOONNNN +; SSOOCCNN ; SS = Scene -; OO = Old item ID +; OO = Old item ID or Collectible Flag (depending on value of CC) +; CC = 0x01 for collectible overrides, 0x00 otherwise ; NN = New item ID ; ; Generic grotto virtual scene numbers: diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 430769150..e48b0b7ef 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -251,21 +251,37 @@ store_item_data: addiu t0, t0, 0x70 ; Grotto virtual scene numbers will range from 0x70 to 0x8F @@not_grotto: + ; For free-standing collectibles, use their flag variable to look up an override + ; instead of a base item ID. + li t1, 0x00 ; t1 will be 1 for collectibles, 0 otherwise + ori t2, s0, 0 ; t2 will be collectible flag or the base item + lw t3, 0x428 (s1) ; t3 = actor instance giving the item + lhu t4, 0x00 (t3) ; t4 = actor ID + bne t4, 0x0015, @@not_collectible + nop + li t1, 0x01 + lbu t2, 0x0141 (t3) ; t2 = collectible flag +@@not_collectible: + ; Construct ID used to search the override table + ; t0 = (scene << 16) | (item_or_flag << 8) | is_collectible + sll t0, t0, 8 + or t0, t0, t2 sll t0, t0, 8 - or t0, t0, s0 + or t0, t0, t1 ; Look up override li t1, (ITEM_OVERRIDES - 0x04) @@lookup_loop: addiu t1, t1, 0x04 - lhu t2, 0x00 (t1) ; t2 = ID column in table + lw t2, 0x00 (t1) ; t2 = override entry + srl t2, t2, 8 ; t2 = ID part of entry (first 3 bytes) beqz t2, @@not_extended ; Reached end of override table nop bne t2, t0, @@lookup_loop nop - lhu s0, 0x02 (t1) ; s0 = item ID found in ITEM_OVERRIDES + lbu s0, 0x03 (t1) ; s0 = item ID found in ITEM_OVERRIDES ori v0, s0, 0 @@resolve_item: diff --git a/data/base2current.json b/data/base2current.json index e7d2b8d4e..43e25cbe5 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 8, 146]}, {"11325064": [12, 16, 8, 138, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 163]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 142, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 149, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 156, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 135, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 8, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 8, 4]}, {"12427480": [12, 16, 8, 33]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 8, 37]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 104, 0, 0, 0, 0]}, {"12491456": [12, 16, 8, 66]}, {"12491480": [12, 16, 8, 76]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 8, 104]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55058432": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55058448": [48, 132]}, {"55058451": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55058463": [140, 16, 129]}, {"55058467": [22, 145, 2]}, {"55058471": [117, 52, 1]}, {"55058475": [141, 16, 129]}, {"55058479": [19, 145, 2]}, {"55058483": [117, 16, 128]}, {"55058487": [17, 145, 2]}, {"55058491": [116, 52, 1]}, {"55058495": [138, 16, 129]}, {"55058499": [14, 145, 2]}, {"55058503": [116, 52, 1]}, {"55058507": [139, 16, 129]}, {"55058511": [11, 145, 2]}, {"55058515": [116, 52, 1]}, {"55058519": [88, 16, 129]}, {"55058523": [8, 52, 2]}, {"55058528": [52, 1]}, {"55058531": [120, 16, 129]}, {"55058535": [5, 52, 2]}, {"55058540": [52, 1]}, {"55058543": [121, 16, 129]}, {"55058547": [2, 52, 2]}, {"55058552": [52, 2]}, {"55058555": [255, 3, 224]}, {"55058559": [8]}, {"55058564": [143, 166]}, {"55058567": [48, 132, 197]}, {"55058571": [4, 8, 16, 8, 41]}, {"55058580": [143, 185]}, {"55058583": [44, 135, 37]}, {"55058587": [4, 8, 16, 8, 41]}, {"55058596": [60, 10, 128, 64, 37, 74, 32]}, {"55058604": [149, 75]}, {"55058607": [4, 52, 1, 255, 255, 17, 97]}, {"55058615": [2]}, {"55058620": [53, 101]}, {"55058624": [60, 11, 128, 64, 37, 107, 32, 12, 161, 96]}, {"55058636": [3, 224]}, {"55058639": [8]}, {"55058644": [60, 8, 128, 64, 37, 8, 32]}, {"55058652": [129, 9]}, {"55058655": [2, 36, 1, 255, 255, 17, 33]}, {"55058663": [2]}, {"55058668": [53, 35]}, {"55058673": [3, 15, 195]}, {"55058677": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55058691": [8]}, {"55058696": [144, 69]}, {"55058699": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55058708": [145, 9]}, {"55058711": [3, 52, 1]}, {"55058715": [255, 17, 33]}, {"55058719": [2]}, {"55058724": [53, 37]}, {"55058728": [3, 224]}, {"55058731": [8]}, {"55058736": [143, 162]}, {"55058739": [36, 144, 69]}, {"55058744": [60, 8, 128, 64, 37, 8, 32]}, {"55058752": [149, 9]}, {"55058756": [52, 1, 255, 255, 17, 33]}, {"55058763": [19]}, {"55058768": [53, 37]}, {"55058772": [175, 164]}, {"55058776": [175, 165]}, {"55058779": [4, 175, 166]}, {"55058783": [8, 39, 189, 255, 232, 175, 191]}, {"55058791": [16, 141, 9]}, {"55058795": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55058807": [6, 145, 6]}, {"55058811": [7, 1, 32, 248, 9]}, {"55058820": [143, 191]}, {"55058823": [16, 39, 189]}, {"55058827": [24, 143, 164]}, {"55058832": [143, 165]}, {"55058835": [4, 143, 166]}, {"55058839": [8, 3, 224]}, {"55058843": [8]}, {"55058848": [140, 136, 29, 44, 52, 9]}, {"55058855": [1]}, {"55058857": [9, 78]}, {"55058860": [1, 9, 16, 36, 16, 64]}, {"55058867": [27]}, {"55058872": [148, 138]}, {"55058875": [164, 52, 1]}, {"55058879": [61, 21, 65]}, {"55058883": [23]}, {"55058888": [148, 202, 2, 220, 52, 11]}, {"55058895": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55058919": [14]}, {"55058924": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55058952": [1, 10, 64, 33, 129, 8]}, {"55058960": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55058972": [52, 2]}, {"55058976": [3, 224]}, {"55058979": [8]}, {"55058984": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55058996": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55059008": [3, 224]}, {"55059011": [8]}, {"55059016": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55059027": [16, 175, 191]}, {"55059031": [20, 12, 16, 8, 157]}, {"55059040": [143, 162]}, {"55059043": [16, 143, 191]}, {"55059047": [20, 39, 189]}, {"55059051": [24, 3, 224]}, {"55059055": [8]}, {"55059060": [39, 189, 255, 216, 175, 176]}, {"55059067": [16, 175, 177]}, {"55059071": [20, 175, 178]}, {"55059075": [24, 175, 191]}, {"55059079": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55059095": [62]}, {"55059097": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 32]}, {"55059120": [173, 40]}, {"55059124": [173, 40]}, {"55059127": [4, 173, 40]}, {"55059131": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55059143": [164, 52, 1]}, {"55059147": [62, 21, 1]}, {"55059151": [6]}, {"55059156": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55059171": [31, 37, 8]}, {"55059175": [112]}, {"55059177": [8, 66]}, {"55059180": [1, 16, 64, 37, 60, 9, 128, 64, 37, 41, 15, 252, 37, 41]}, {"55059195": [4, 149, 42]}, {"55059200": [17, 64]}, {"55059203": [30]}, {"55059208": [21, 72, 255, 251]}, {"55059216": [149, 48]}, {"55059219": [2, 54, 2]}, {"55059224": [52, 80]}, {"55059228": [38, 8, 255, 128, 5]}, {"55059235": [22]}, {"55059240": [60, 18, 128, 64, 38, 82, 37, 176]}, {"55059249": [8, 65]}, {"55059252": [2, 72, 144, 33, 142, 72]}, {"55059259": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55059270": [248, 9]}, {"55059276": [20, 80, 255, 242]}, {"55059284": [60, 10, 128, 64, 37, 74, 32]}, {"55059292": [142, 75]}, {"55059296": [173, 75]}, {"55059300": [142, 75]}, {"55059303": [4, 173, 75]}, {"55059307": [4, 142, 75]}, {"55059311": [8, 173, 75]}, {"55059315": [8, 16]}, {"55059319": [6]}, {"55059324": [130, 40, 4, 36, 5, 1]}, {"55059331": [2]}, {"55059337": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55059347": [16, 143, 177]}, {"55059351": [20, 143, 178]}, {"55059355": [24, 143, 191]}, {"55059359": [32, 39, 189]}, {"55059363": [40, 3, 224]}, {"55059367": [8]}, {"55059372": [3, 224]}, {"55059375": [8, 54, 2]}, {"55059380": [144, 136]}, {"55059383": [125, 52, 1]}, {"55059387": [255, 17, 1]}, {"55059391": [2, 52, 2]}, {"55059395": [8, 52, 2]}, {"55059399": [9, 3, 224]}, {"55059403": [8]}, {"55059408": [144, 136]}, {"55059411": [163, 49, 8]}, {"55059415": [192, 17]}, {"55059419": [5, 52, 2]}, {"55059423": [84, 52, 1]}, {"55059427": [64, 17, 1]}, {"55059431": [2, 52, 2]}, {"55059435": [53, 52, 2]}, {"55059439": [54, 3, 224]}, {"55059443": [8]}, {"55059448": [144, 136]}, {"55059451": [163, 49, 8]}, {"55059455": [24, 17]}, {"55059459": [5, 52, 2]}, {"55059463": [50, 52, 1]}, {"55059467": [8, 17, 1]}, {"55059471": [2, 52, 2]}, {"55059475": [51, 52, 2]}, {"55059479": [52, 3, 224]}, {"55059483": [8]}, {"55059488": [144, 136]}, {"55059491": [163, 49, 8]}, {"55059495": [3, 17]}, {"55059499": [5, 52, 2]}, {"55059503": [4, 52, 1]}, {"55059507": [1, 17, 1]}, {"55059511": [2, 52, 2]}, {"55059515": [48, 52, 2]}, {"55059519": [49, 3, 224]}, {"55059523": [8]}, {"55059528": [144, 136]}, {"55059531": [162, 49, 8]}, {"55059535": [192, 17]}, {"55059539": [5, 52, 2]}, {"55059543": [5, 52, 1]}, {"55059547": [64, 17, 1]}, {"55059551": [2, 52, 2]}, {"55059555": [96, 52, 2]}, {"55059559": [123, 3, 224]}, {"55059563": [8]}, {"55059568": [144, 136]}, {"55059571": [162, 49, 8]}, {"55059575": [48, 17]}, {"55059579": [2, 52, 2]}, {"55059583": [69, 52, 2]}, {"55059587": [70, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [162, 49, 8]}, {"55059603": [6, 17]}, {"55059607": [2, 52, 2]}, {"55059611": [55, 52, 2]}, {"55059615": [56, 3, 224]}, {"55059619": [8]}, {"55059624": [144, 136]}, {"55059627": [161, 49, 8]}, {"55059631": [48, 17]}, {"55059635": [2, 52, 2]}, {"55059639": [121, 52, 2]}, {"55059643": [122, 3, 224]}, {"55059647": [8]}, {"55059652": [144, 136]}, {"55059655": [161, 49, 8]}, {"55059659": [6, 17]}, {"55059663": [2, 52, 2]}, {"55059667": [119, 52, 2]}, {"55059671": [120, 3, 224]}, {"55059675": [8]}, {"55059680": [144, 136]}, {"55059683": [163, 49, 8]}, {"55059687": [3, 17]}, {"55059691": [2, 52, 2]}, {"55059695": [77, 54, 2]}, {"55059700": [3, 224]}, {"55059703": [8]}, {"55059708": [144, 136]}, {"55059711": [163, 49, 8]}, {"55059715": [24, 17]}, {"55059719": [2, 52, 2]}, {"55059723": [77, 54, 2]}, {"55059728": [3, 224]}, {"55059731": [8]}, {"55059736": [3, 224]}, {"55059739": [8]}, {"55059744": [52, 8]}, {"55059747": [1, 160, 136]}, {"55059751": [62, 3, 224]}, {"55059755": [8]}, {"55059760": [36, 136]}, {"55059763": [134, 36, 9, 255, 255, 37, 41]}, {"55059771": [1, 52, 1]}, {"55059775": [3]}, {"55059777": [41, 8, 42, 20, 32]}, {"55059783": [7]}, {"55059788": [1, 9, 80, 33, 145, 75]}, {"55059796": [52, 1]}, {"55059799": [255, 21, 97, 255, 247]}, {"55059808": [161, 69]}, {"55059812": [3, 224]}, {"55059815": [8]}, {"55059820": [36, 136]}, {"55059823": [168, 1, 6, 64, 33, 145, 9]}, {"55059832": [1, 37, 72, 37, 161, 9]}, {"55059840": [3, 224]}, {"55059843": [8]}, {"55059848": [36, 136]}, {"55059851": [188, 1, 5, 64, 33, 129, 9]}, {"55059860": [5, 33]}, {"55059863": [2]}, {"55059868": [52, 9]}, {"55059872": [37, 41]}, {"55059875": [1, 161, 9]}, {"55059880": [3, 224]}, {"55059883": [8]}, {"55059888": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 35, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 35, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 35, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 112, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 24, 128, 64, 36, 196]}, {"55060033": [255, 1, 67]}, {"55060037": [198, 21, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060049": [255, 1, 68]}, {"55060053": [198, 22, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060065": [255, 1, 69]}, {"55060069": [198, 23, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060081": [255, 1, 70]}, {"55060085": [198, 24, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060097": [255, 1, 71]}, {"55060101": [198, 25, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060113": [255, 1, 93]}, {"55060117": [198, 28, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060129": [255, 1, 122]}, {"55060133": [198, 29, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060145": [255, 1, 249]}, {"55060149": [198, 30, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060161": [255, 1, 151]}, {"55060165": [198, 32, 255, 128, 64, 37, 48, 128, 64, 35, 172]}, {"55060177": [255, 10, 199]}, {"55060181": [185, 1, 3, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060193": [255, 10, 199]}, {"55060197": [185, 1, 4, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060209": [255, 10, 199]}, {"55060213": [185, 1, 5, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060225": [255, 10, 199]}, {"55060229": [185, 1, 6, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060241": [255, 10, 199]}, {"55060245": [185, 1, 7, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060257": [255, 10, 199]}, {"55060261": [185, 1, 13, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060273": [255, 11, 103]}, {"55060277": [184, 2]}, {"55060280": [128, 64, 37, 108, 128, 64, 35, 172]}, {"55060289": [255, 11, 103]}, {"55060293": [184, 2, 1, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060305": [255, 11, 103]}, {"55060309": [184, 2, 2, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060321": [255, 11, 103]}, {"55060325": [184, 2, 3, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060337": [255, 11, 103]}, {"55060341": [184, 2, 4, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060353": [255, 11, 103]}, {"55060357": [184, 2, 5, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060369": [255, 11, 103]}, {"55060373": [184, 2, 6, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060385": [255, 11, 103]}, {"55060389": [184, 2, 7, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060401": [255, 11, 103]}, {"55060405": [184, 2, 8, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060417": [255, 11, 103]}, {"55060421": [184, 2, 9, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060433": [255, 28, 102]}, {"55060437": [200, 4]}, {"55060440": [128, 64, 37, 108, 128, 64, 35, 172]}, {"55060449": [255, 28, 102]}, {"55060453": [200, 4, 1, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060465": [255, 28, 102]}, {"55060469": [200, 4, 2, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060481": [255, 28, 102]}, {"55060485": [200, 4, 3, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060497": [255, 28, 102]}, {"55060501": [200, 4, 4, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060513": [255, 28, 102]}, {"55060517": [200, 4, 5, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060529": [255, 28, 102]}, {"55060533": [200, 4, 6, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060545": [255, 28, 102]}, {"55060549": [200, 4, 7, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060561": [255, 28, 102]}, {"55060565": [200, 4, 8, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060577": [255, 28, 102]}, {"55060581": [200, 4, 9, 128, 64, 37, 108, 128, 64, 35, 172]}, {"55060593": [255, 254, 96]}, {"55060597": [170, 3, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060609": [255, 254, 96]}, {"55060613": [170, 4, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060625": [255, 254, 96]}, {"55060629": [170, 5, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060641": [255, 254, 96]}, {"55060645": [170, 6, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060657": [255, 254, 96]}, {"55060661": [170, 7, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060673": [255, 254, 96]}, {"55060677": [170, 8, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060689": [255, 254, 96]}, {"55060693": [170, 11, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060705": [255, 254, 96]}, {"55060709": [170, 12, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060721": [255, 254, 96]}, {"55060725": [170, 13, 255, 128, 64, 37, 136, 128, 64, 35, 172]}, {"55060737": [61, 67, 12]}, {"55060741": [248, 255, 255, 128, 64, 37, 32, 128, 64, 35, 172]}, {"55060753": [131, 9, 85]}, {"55060757": [183, 255, 255, 128, 64, 37, 24, 128, 64, 35, 172]}, {"55060769": [146, 219, 230]}, {"55060773": [216, 255, 255, 128, 64, 37, 24, 128, 64, 36, 224]}, {"55060785": [147, 218, 230]}, {"55060789": [216, 255, 255, 128, 64, 37, 24, 128, 64, 36, 224]}, {"55060801": [148, 217, 230]}, {"55060805": [216, 255, 255, 128, 64, 37, 24, 128, 64, 36, 224]}, {"55060817": [142, 224, 50]}, {"55060821": [206, 255, 255, 128, 64, 37, 24, 128, 64, 36, 252]}, {"55060833": [143, 224, 50]}, {"55060837": [206, 255, 255, 128, 64, 37, 24, 128, 64, 36, 252]}, {"55060849": [144, 224, 50]}, {"55060853": [206, 255, 255, 128, 64, 37, 24, 128, 64, 36, 252]}, {"55060865": [140, 238, 52]}, {"55060869": [187, 255, 255, 128, 64, 37, 24, 128, 64, 35, 172]}, {"55060881": [141, 238, 52]}, {"55060885": [187, 255, 255, 128, 64, 37, 24, 128, 64, 35, 172, 175, 164]}, {"55060899": [104, 175, 165]}, {"55060903": [108, 175, 166]}, {"55060907": [112, 175, 167]}, {"55060911": [116, 39, 189, 255, 232, 175, 163]}, {"55060919": [16, 175, 191]}, {"55060923": [20, 60, 8, 128, 64, 37, 8, 32, 12, 129, 8]}, {"55060936": [17]}, {"55060939": [10]}, {"55060944": [60, 9, 128, 65, 52, 10]}, {"55060951": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 8, 157]}, {"55060980": [143, 163]}, {"55060983": [16, 143, 191]}, {"55060987": [20, 39, 189]}, {"55060991": [24, 143, 164]}, {"55060995": [104, 143, 165]}, {"55060999": [108, 143, 166]}, {"55061003": [112, 143, 167]}, {"55061007": [116, 132, 110, 19, 196, 3, 224]}, {"55061015": [8]}, {"55061020": [147, 25]}, {"55061023": [116, 52, 1]}, {"55061027": [255, 23, 33]}, {"55061031": [2]}, {"55061036": [52, 25]}, {"55061039": [44, 3, 224]}, {"55061043": [8, 167, 185]}, {"55061047": [154, 147, 44]}, {"55061051": [116, 52, 1]}, {"55061055": [255, 21, 129]}, {"55061059": [2]}, {"55061064": [52, 12]}, {"55061067": [44, 3, 224]}, {"55061071": [8]}, {"55061076": [145, 174]}, {"55061079": [116, 52, 1]}, {"55061083": [255, 21, 193]}, {"55061087": [2]}, {"55061092": [52, 14]}, {"55061095": [44, 3, 224]}, {"55061099": [8, 167, 174]}, {"55061103": [154, 145, 207]}, {"55061107": [116, 52, 1]}, {"55061111": [255, 21, 225]}, {"55061115": [2]}, {"55061120": [52, 15]}, {"55061123": [44, 3, 224]}, {"55061127": [8, 167, 175]}, {"55061131": [154, 141, 9]}, {"55061135": [4, 17, 32]}, {"55061139": [7]}, {"55061144": [145, 9]}, {"55061147": [104, 52, 1]}, {"55061151": [59, 17, 33]}, {"55061155": [2]}, {"55061160": [52, 9]}, {"55061163": [255, 161, 9]}, {"55061167": [64, 3, 224]}, {"55061171": [8, 161, 14]}, {"55061175": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 8, 146]}, {"11325064": [12, 16, 8, 138, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 175]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 154, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 161, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 168, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 147, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 8, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 8, 4]}, {"12427480": [12, 16, 8, 33]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 8, 37]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 116, 0, 0, 0, 0]}, {"12491456": [12, 16, 8, 66]}, {"12491480": [12, 16, 8, 76]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 8, 104]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55058432": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55058448": [48, 132]}, {"55058451": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55058463": [140, 16, 129]}, {"55058467": [22, 145, 2]}, {"55058471": [117, 52, 1]}, {"55058475": [141, 16, 129]}, {"55058479": [19, 145, 2]}, {"55058483": [117, 16, 128]}, {"55058487": [17, 145, 2]}, {"55058491": [116, 52, 1]}, {"55058495": [138, 16, 129]}, {"55058499": [14, 145, 2]}, {"55058503": [116, 52, 1]}, {"55058507": [139, 16, 129]}, {"55058511": [11, 145, 2]}, {"55058515": [116, 52, 1]}, {"55058519": [88, 16, 129]}, {"55058523": [8, 52, 2]}, {"55058528": [52, 1]}, {"55058531": [120, 16, 129]}, {"55058535": [5, 52, 2]}, {"55058540": [52, 1]}, {"55058543": [121, 16, 129]}, {"55058547": [2, 52, 2]}, {"55058552": [52, 2]}, {"55058555": [255, 3, 224]}, {"55058559": [8]}, {"55058564": [143, 166]}, {"55058567": [48, 132, 197]}, {"55058571": [4, 8, 16, 8, 41]}, {"55058580": [143, 185]}, {"55058583": [44, 135, 37]}, {"55058587": [4, 8, 16, 8, 41]}, {"55058596": [60, 10, 128, 64, 37, 74, 32]}, {"55058604": [149, 75]}, {"55058607": [4, 52, 1, 255, 255, 17, 97]}, {"55058615": [2]}, {"55058620": [53, 101]}, {"55058624": [60, 11, 128, 64, 37, 107, 32, 12, 161, 96]}, {"55058636": [3, 224]}, {"55058639": [8]}, {"55058644": [60, 8, 128, 64, 37, 8, 32]}, {"55058652": [129, 9]}, {"55058655": [2, 36, 1, 255, 255, 17, 33]}, {"55058663": [2]}, {"55058668": [53, 35]}, {"55058673": [3, 15, 195]}, {"55058677": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55058691": [8]}, {"55058696": [144, 69]}, {"55058699": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55058708": [145, 9]}, {"55058711": [3, 52, 1]}, {"55058715": [255, 17, 33]}, {"55058719": [2]}, {"55058724": [53, 37]}, {"55058728": [3, 224]}, {"55058731": [8]}, {"55058736": [143, 162]}, {"55058739": [36, 144, 69]}, {"55058744": [60, 8, 128, 64, 37, 8, 32]}, {"55058752": [149, 9]}, {"55058756": [52, 1, 255, 255, 17, 33]}, {"55058763": [19]}, {"55058768": [53, 37]}, {"55058772": [175, 164]}, {"55058776": [175, 165]}, {"55058779": [4, 175, 166]}, {"55058783": [8, 39, 189, 255, 232, 175, 191]}, {"55058791": [16, 141, 9]}, {"55058795": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55058807": [6, 145, 6]}, {"55058811": [7, 1, 32, 248, 9]}, {"55058820": [143, 191]}, {"55058823": [16, 39, 189]}, {"55058827": [24, 143, 164]}, {"55058832": [143, 165]}, {"55058835": [4, 143, 166]}, {"55058839": [8, 3, 224]}, {"55058843": [8]}, {"55058848": [140, 136, 29, 44, 52, 9]}, {"55058855": [1]}, {"55058857": [9, 78]}, {"55058860": [1, 9, 16, 36, 16, 64]}, {"55058867": [27]}, {"55058872": [148, 138]}, {"55058875": [164, 52, 1]}, {"55058879": [61, 21, 65]}, {"55058883": [23]}, {"55058888": [148, 202, 2, 220, 52, 11]}, {"55058895": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55058919": [14]}, {"55058924": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55058952": [1, 10, 64, 33, 129, 8]}, {"55058960": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55058972": [52, 2]}, {"55058976": [3, 224]}, {"55058979": [8]}, {"55058984": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55058996": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55059008": [3, 224]}, {"55059011": [8]}, {"55059016": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55059027": [16, 175, 191]}, {"55059031": [20, 12, 16, 8, 157]}, {"55059040": [143, 162]}, {"55059043": [16, 143, 191]}, {"55059047": [20, 39, 189]}, {"55059051": [24, 3, 224]}, {"55059055": [8]}, {"55059060": [39, 189, 255, 216, 175, 176]}, {"55059067": [16, 175, 177]}, {"55059071": [20, 175, 178]}, {"55059075": [24, 175, 191]}, {"55059079": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55059095": [74]}, {"55059097": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 32]}, {"55059120": [173, 40]}, {"55059124": [173, 40]}, {"55059127": [4, 173, 40]}, {"55059131": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55059143": [164, 52, 1]}, {"55059147": [62, 21, 1]}, {"55059151": [6]}, {"55059156": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55059171": [31, 37, 8]}, {"55059175": [112, 52, 9]}, {"55059180": [54, 10]}, {"55059184": [142, 43, 4, 40, 149, 108]}, {"55059192": [52, 1]}, {"55059195": [21, 21, 129]}, {"55059199": [3]}, {"55059204": [52, 9]}, {"55059207": [1, 145, 106, 1, 65]}, {"55059213": [8, 66]}, {"55059216": [1, 10, 64, 37]}, {"55059221": [8, 66]}, {"55059224": [1, 9, 64, 37, 60, 9, 128, 64, 37, 41, 15, 252, 37, 41]}, {"55059239": [4, 141, 42]}, {"55059245": [10, 82, 2, 17, 64]}, {"55059251": [30]}, {"55059256": [21, 72, 255, 250]}, {"55059264": [145, 48]}, {"55059267": [3, 54, 2]}, {"55059272": [52, 80]}, {"55059276": [38, 8, 255, 128, 5]}, {"55059283": [22]}, {"55059288": [60, 18, 128, 64, 38, 82, 37, 224]}, {"55059297": [8, 65]}, {"55059300": [2, 72, 144, 33, 142, 72]}, {"55059307": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55059318": [248, 9]}, {"55059324": [20, 80, 255, 242]}, {"55059332": [60, 10, 128, 64, 37, 74, 32]}, {"55059340": [142, 75]}, {"55059344": [173, 75]}, {"55059348": [142, 75]}, {"55059351": [4, 173, 75]}, {"55059355": [4, 142, 75]}, {"55059359": [8, 173, 75]}, {"55059363": [8, 16]}, {"55059367": [6]}, {"55059372": [130, 40, 4, 36, 5, 1]}, {"55059379": [2]}, {"55059385": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55059395": [16, 143, 177]}, {"55059399": [20, 143, 178]}, {"55059403": [24, 143, 191]}, {"55059407": [32, 39, 189]}, {"55059411": [40, 3, 224]}, {"55059415": [8]}, {"55059420": [3, 224]}, {"55059423": [8, 54, 2]}, {"55059428": [144, 136]}, {"55059431": [125, 52, 1]}, {"55059435": [255, 17, 1]}, {"55059439": [2, 52, 2]}, {"55059443": [8, 52, 2]}, {"55059447": [9, 3, 224]}, {"55059451": [8]}, {"55059456": [144, 136]}, {"55059459": [163, 49, 8]}, {"55059463": [192, 17]}, {"55059467": [5, 52, 2]}, {"55059471": [84, 52, 1]}, {"55059475": [64, 17, 1]}, {"55059479": [2, 52, 2]}, {"55059483": [53, 52, 2]}, {"55059487": [54, 3, 224]}, {"55059491": [8]}, {"55059496": [144, 136]}, {"55059499": [163, 49, 8]}, {"55059503": [24, 17]}, {"55059507": [5, 52, 2]}, {"55059511": [50, 52, 1]}, {"55059515": [8, 17, 1]}, {"55059519": [2, 52, 2]}, {"55059523": [51, 52, 2]}, {"55059527": [52, 3, 224]}, {"55059531": [8]}, {"55059536": [144, 136]}, {"55059539": [163, 49, 8]}, {"55059543": [3, 17]}, {"55059547": [5, 52, 2]}, {"55059551": [4, 52, 1]}, {"55059555": [1, 17, 1]}, {"55059559": [2, 52, 2]}, {"55059563": [48, 52, 2]}, {"55059567": [49, 3, 224]}, {"55059571": [8]}, {"55059576": [144, 136]}, {"55059579": [162, 49, 8]}, {"55059583": [192, 17]}, {"55059587": [5, 52, 2]}, {"55059591": [5, 52, 1]}, {"55059595": [64, 17, 1]}, {"55059599": [2, 52, 2]}, {"55059603": [96, 52, 2]}, {"55059607": [123, 3, 224]}, {"55059611": [8]}, {"55059616": [144, 136]}, {"55059619": [162, 49, 8]}, {"55059623": [48, 17]}, {"55059627": [2, 52, 2]}, {"55059631": [69, 52, 2]}, {"55059635": [70, 3, 224]}, {"55059639": [8]}, {"55059644": [144, 136]}, {"55059647": [162, 49, 8]}, {"55059651": [6, 17]}, {"55059655": [2, 52, 2]}, {"55059659": [55, 52, 2]}, {"55059663": [56, 3, 224]}, {"55059667": [8]}, {"55059672": [144, 136]}, {"55059675": [161, 49, 8]}, {"55059679": [48, 17]}, {"55059683": [2, 52, 2]}, {"55059687": [121, 52, 2]}, {"55059691": [122, 3, 224]}, {"55059695": [8]}, {"55059700": [144, 136]}, {"55059703": [161, 49, 8]}, {"55059707": [6, 17]}, {"55059711": [2, 52, 2]}, {"55059715": [119, 52, 2]}, {"55059719": [120, 3, 224]}, {"55059723": [8]}, {"55059728": [144, 136]}, {"55059731": [163, 49, 8]}, {"55059735": [3, 17]}, {"55059739": [2, 52, 2]}, {"55059743": [77, 54, 2]}, {"55059748": [3, 224]}, {"55059751": [8]}, {"55059756": [144, 136]}, {"55059759": [163, 49, 8]}, {"55059763": [24, 17]}, {"55059767": [2, 52, 2]}, {"55059771": [77, 54, 2]}, {"55059776": [3, 224]}, {"55059779": [8]}, {"55059784": [3, 224]}, {"55059787": [8]}, {"55059792": [52, 8]}, {"55059795": [1, 160, 136]}, {"55059799": [62, 3, 224]}, {"55059803": [8]}, {"55059808": [36, 136]}, {"55059811": [134, 36, 9, 255, 255, 37, 41]}, {"55059819": [1, 52, 1]}, {"55059823": [3]}, {"55059825": [41, 8, 42, 20, 32]}, {"55059831": [7]}, {"55059836": [1, 9, 80, 33, 145, 75]}, {"55059844": [52, 1]}, {"55059847": [255, 21, 97, 255, 247]}, {"55059856": [161, 69]}, {"55059860": [3, 224]}, {"55059863": [8]}, {"55059868": [36, 136]}, {"55059871": [168, 1, 6, 64, 33, 145, 9]}, {"55059880": [1, 37, 72, 37, 161, 9]}, {"55059888": [3, 224]}, {"55059891": [8]}, {"55059896": [36, 136]}, {"55059899": [188, 1, 5, 64, 33, 129, 9]}, {"55059908": [5, 33]}, {"55059911": [2]}, {"55059916": [52, 9]}, {"55059920": [37, 41]}, {"55059923": [1, 161, 9]}, {"55059928": [3, 224]}, {"55059931": [8]}, {"55059936": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 35, 228, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36]}, {"55059968": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 40, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 80, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 120, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 160, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 188, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 216, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 244]}, {"55060081": [255, 1, 67]}, {"55060085": [198, 21, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060097": [255, 1, 68]}, {"55060101": [198, 22, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060113": [255, 1, 69]}, {"55060117": [198, 23, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060129": [255, 1, 70]}, {"55060133": [198, 24, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060145": [255, 1, 71]}, {"55060149": [198, 25, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060161": [255, 1, 93]}, {"55060165": [198, 28, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060177": [255, 1, 122]}, {"55060181": [198, 29, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060193": [255, 1, 249]}, {"55060197": [198, 30, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060209": [255, 1, 151]}, {"55060213": [198, 32, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060225": [255, 10, 199]}, {"55060229": [185, 1, 3, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060241": [255, 10, 199]}, {"55060245": [185, 1, 4, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060257": [255, 10, 199]}, {"55060261": [185, 1, 5, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060273": [255, 10, 199]}, {"55060277": [185, 1, 6, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060289": [255, 10, 199]}, {"55060293": [185, 1, 7, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060305": [255, 10, 199]}, {"55060309": [185, 1, 13, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060321": [255, 11, 103]}, {"55060325": [184, 2]}, {"55060328": [128, 64, 37, 156, 128, 64, 35, 220]}, {"55060337": [255, 11, 103]}, {"55060341": [184, 2, 1, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060353": [255, 11, 103]}, {"55060357": [184, 2, 2, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060369": [255, 11, 103]}, {"55060373": [184, 2, 3, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060385": [255, 11, 103]}, {"55060389": [184, 2, 4, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060401": [255, 11, 103]}, {"55060405": [184, 2, 5, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060417": [255, 11, 103]}, {"55060421": [184, 2, 6, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060433": [255, 11, 103]}, {"55060437": [184, 2, 7, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060449": [255, 11, 103]}, {"55060453": [184, 2, 8, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060465": [255, 11, 103]}, {"55060469": [184, 2, 9, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060481": [255, 28, 102]}, {"55060485": [200, 4]}, {"55060488": [128, 64, 37, 156, 128, 64, 35, 220]}, {"55060497": [255, 28, 102]}, {"55060501": [200, 4, 1, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060513": [255, 28, 102]}, {"55060517": [200, 4, 2, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060529": [255, 28, 102]}, {"55060533": [200, 4, 3, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060545": [255, 28, 102]}, {"55060549": [200, 4, 4, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060561": [255, 28, 102]}, {"55060565": [200, 4, 5, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060577": [255, 28, 102]}, {"55060581": [200, 4, 6, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060593": [255, 28, 102]}, {"55060597": [200, 4, 7, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060609": [255, 28, 102]}, {"55060613": [200, 4, 8, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060625": [255, 28, 102]}, {"55060629": [200, 4, 9, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060641": [255, 254, 96]}, {"55060645": [170, 3, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060657": [255, 254, 96]}, {"55060661": [170, 4, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060673": [255, 254, 96]}, {"55060677": [170, 5, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060689": [255, 254, 96]}, {"55060693": [170, 6, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060705": [255, 254, 96]}, {"55060709": [170, 7, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060721": [255, 254, 96]}, {"55060725": [170, 8, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060737": [255, 254, 96]}, {"55060741": [170, 11, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060753": [255, 254, 96]}, {"55060757": [170, 12, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060769": [255, 254, 96]}, {"55060773": [170, 13, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060785": [61, 67, 12]}, {"55060789": [248, 255, 255, 128, 64, 37, 80, 128, 64, 35, 220]}, {"55060801": [131, 9, 85]}, {"55060805": [183, 255, 255, 128, 64, 37, 72, 128, 64, 35, 220]}, {"55060817": [146, 219, 230]}, {"55060821": [216, 255, 255, 128, 64, 37, 72, 128, 64, 37, 16]}, {"55060833": [147, 218, 230]}, {"55060837": [216, 255, 255, 128, 64, 37, 72, 128, 64, 37, 16]}, {"55060849": [148, 217, 230]}, {"55060853": [216, 255, 255, 128, 64, 37, 72, 128, 64, 37, 16]}, {"55060865": [142, 224, 50]}, {"55060869": [206, 255, 255, 128, 64, 37, 72, 128, 64, 37, 44]}, {"55060881": [143, 224, 50]}, {"55060885": [206, 255, 255, 128, 64, 37, 72, 128, 64, 37, 44]}, {"55060897": [144, 224, 50]}, {"55060901": [206, 255, 255, 128, 64, 37, 72, 128, 64, 37, 44]}, {"55060913": [140, 238, 52]}, {"55060917": [187, 255, 255, 128, 64, 37, 72, 128, 64, 35, 220]}, {"55060929": [141, 238, 52]}, {"55060933": [187, 255, 255, 128, 64, 37, 72, 128, 64, 35, 220, 175, 164]}, {"55060947": [104, 175, 165]}, {"55060951": [108, 175, 166]}, {"55060955": [112, 175, 167]}, {"55060959": [116, 39, 189, 255, 232, 175, 163]}, {"55060967": [16, 175, 191]}, {"55060971": [20, 60, 8, 128, 64, 37, 8, 32, 12, 129, 8]}, {"55060984": [17]}, {"55060987": [10]}, {"55060992": [60, 9, 128, 65, 52, 10]}, {"55060999": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 8, 157]}, {"55061028": [143, 163]}, {"55061031": [16, 143, 191]}, {"55061035": [20, 39, 189]}, {"55061039": [24, 143, 164]}, {"55061043": [104, 143, 165]}, {"55061047": [108, 143, 166]}, {"55061051": [112, 143, 167]}, {"55061055": [116, 132, 110, 19, 196, 3, 224]}, {"55061063": [8]}, {"55061068": [147, 25]}, {"55061071": [116, 52, 1]}, {"55061075": [255, 23, 33]}, {"55061079": [2]}, {"55061084": [52, 25]}, {"55061087": [44, 3, 224]}, {"55061091": [8, 167, 185]}, {"55061095": [154, 147, 44]}, {"55061099": [116, 52, 1]}, {"55061103": [255, 21, 129]}, {"55061107": [2]}, {"55061112": [52, 12]}, {"55061115": [44, 3, 224]}, {"55061119": [8]}, {"55061124": [145, 174]}, {"55061127": [116, 52, 1]}, {"55061131": [255, 21, 193]}, {"55061135": [2]}, {"55061140": [52, 14]}, {"55061143": [44, 3, 224]}, {"55061147": [8, 167, 174]}, {"55061151": [154, 145, 207]}, {"55061155": [116, 52, 1]}, {"55061159": [255, 21, 225]}, {"55061163": [2]}, {"55061168": [52, 15]}, {"55061171": [44, 3, 224]}, {"55061175": [8, 167, 175]}, {"55061179": [154, 141, 9]}, {"55061183": [4, 17, 32]}, {"55061187": [7]}, {"55061192": [145, 9]}, {"55061195": [104, 52, 1]}, {"55061199": [59, 17, 33]}, {"55061203": [2]}, {"55061208": [52, 9]}, {"55061211": [255, 161, 9]}, {"55061215": [64, 3, 224]}, {"55061219": [8, 161, 14]}, {"55061223": [104]}] \ No newline at end of file From 01e95e0c8c615d4ff0ed8ae9e8fad211387da938 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Wed, 30 May 2018 03:55:19 -0500 Subject: [PATCH 052/151] Freestanding PoH region definitions This won't work well without changes to other files. --- Regions.py | 87 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 28 deletions(-) diff --git a/Regions.py b/Regions.py index 4b6772c24..c62c72cb6 100644 --- a/Regions.py +++ b/Regions.py @@ -14,7 +14,7 @@ def create_regions(world): create_interior_region('Kokiri Shop', None, ['Kokiri Shop Exit']), create_dungeon_region('Deku Tree Lobby', ['Deku Tree Lobby Chest', 'Deku Tree Compass Chest', 'Deku Tree Compass Room Side Chest', 'Deku Tree Basement Chest', 'GS8', 'GS9', 'GS10'], ['Deku Tree Exit', 'Deku Tree Slingshot Passage', 'Deku Tree Basement Path']), create_dungeon_region('Deku Tree Slingshot Room', ['Deku Tree Slingshot Chest', 'Deku Tree Slingshot Room Side Chest'], ['Deku Tree Slingshot Exit']), - create_dungeon_region('Deku Tree Boss Room', ['GS11', 'Queen Gohma'], ['Deku Tree Basement Vines']), + create_dungeon_region('Deku Tree Boss Room', ['GS11', 'Queen Gohma Heart', 'Queen Gohma'], ['Deku Tree Basement Vines']), create_ow_region('Lost Woods', ['Skull Kid', 'Ocarina Memory Game', 'Target in Woods', 'Deku Salesman Woods', 'GS4', 'GS5'], ['Lost Woods Front', 'Meadow Entrance', 'Woods to Goron City', 'Lost Woods Dive Warp', 'Adult Meadow Access', 'Lost Woods Generic Grotto', 'Deku Theater', 'Lost Woods Sales Grotto']), create_ow_region('Sacred Forest Meadow Entryway', None, ['Meadow Exit', 'Meadow Gate', 'Front of Meadow Grotto']), create_ow_region('Sacred Forest Meadow', ['Song from Saria'], ['Meadow Gate Exit', 'Meadow Fairy Grotto']), @@ -22,21 +22,21 @@ def create_regions(world): create_ow_region('Hyrule Field', ['Ocarina of Time', 'Song from Ocarina of Time'], ['Field to Forest', 'Field to Lake', 'Field to Valley', 'Field to Castle Town', 'Field to Kakariko', 'Field to Zora River', 'Lon Lon Rance Entrance', 'Remote Southern Grotto', 'Field Near Lake Outside Fence Grotto', 'Field Near Lake Inside Fence Grotto', 'Field Valley Grotto', 'Field West Castle Town Grotto', 'Field Far West Castle Town Grotto', 'Field Kakariko Grotto', 'Field North Lon Lon Grotto']), - create_ow_region('Lake Hylia', ['Underwater Bottle', 'Lake Hylia Sun', 'GS55', 'GS56', 'GS57', 'GS58'], ['Lake Exit', 'Lake Hylia Dive Warp', 'Lake Hylia Lab', 'Fishing Hole', 'Water Temple Entrance', 'Lake Hylia Grotto']), + create_ow_region('Lake Hylia', ['Underwater Bottle', 'Lake Hylia Sun', 'Lake Hylia Freestanding PoH', 'GS55', 'GS56', 'GS57', 'GS58'], ['Lake Exit', 'Lake Hylia Dive Warp', 'Lake Hylia Lab', 'Fishing Hole', 'Water Temple Entrance', 'Lake Hylia Grotto']), create_interior_region('Lake Hylia Lab', ['Diving in the Lab', 'GS59']), create_interior_region('Fishing Hole', ['Child Fishing', 'Adult Fishing']), - create_dungeon_region('Water Temple Lobby', ['Water Temple Map Chest', 'Water Temple Compass Chest', 'Water Temple Torches Chest', 'Water Temple Dragon Chest', 'Water Temple Central Bow Target Chest', 'Water Temple Boss Key Chest', 'Morpha', 'GS73', 'GS77'], ['Water Temple Exit', 'Water Temple Central Pillar', 'Water Temple Upper Locked Door']), + create_dungeon_region('Water Temple Lobby', ['Water Temple Map Chest', 'Water Temple Compass Chest', 'Water Temple Torches Chest', 'Water Temple Dragon Chest', 'Water Temple Central Bow Target Chest', 'Water Temple Boss Key Chest', 'Morpha Heart', 'Morpha', 'GS73', 'GS77'], ['Water Temple Exit', 'Water Temple Central Pillar', 'Water Temple Upper Locked Door']), create_dungeon_region('Water Temple Middle Water Level', ['Water Temple Central Pillar Chest', 'Water Temple Cracked Wall Chest', 'GS75']), create_dungeon_region('Water Temple Dark Link Region', ['Water Temple Dark Link Chest', 'Water Temple River Chest', 'GS74', 'GS76']), - create_ow_region('Gerudo Valley', ['GS86', 'GS87'], ['Valley Exit', 'Valley River', 'Bridge Crossing']), + create_ow_region('Gerudo Valley', ['Gerudo Valley Waterfall Freestanding PoH', 'Gerudo Valley Crate Freestanding PoH', 'GS86', 'GS87'], ['Valley Exit', 'Valley River', 'Bridge Crossing']), create_ow_region('Gerudo Valley Far Side', ['Gerudo Valley Hammer Rocks Chest', 'GS88', 'GS89'], ['Fortress Entrance']), create_ow_region('Gerudo Fortress', ['Gerudo Fortress Rooftop Chest', 'Horseback Archery 1000 Points', 'Horseback Archery 1500 Points', 'Gerudo Fortress Carpenter Rescue', 'GS90', 'GS91'], ['Haunted Wasteland Entrance', 'Gerudo Training Grounds Entrance']), create_ow_region('Haunted Wasteland', ['Haunted Wasteland Structure Chest', 'GS92'], ['Haunted Wasteland Crossing']), - create_ow_region('Desert Colossus', ['Sheik at Colossus', 'GS93', 'GS94', 'GS95'], ['Colossus Fairy', 'Spirit Temple Entrance']), + create_ow_region('Desert Colossus', ['Colossus Freestanding PoH', 'Sheik at Colossus', 'GS93', 'GS94', 'GS95'], ['Colossus Fairy', 'Spirit Temple Entrance']), create_interior_region('Colossus Fairy', ['Desert Colossus Fairy Reward']), create_dungeon_region('Gerudo Training Grounds Lobby', ['Gerudo Training Grounds Lobby Left Chest', 'Gerudo Training Grounds Lobby Right Chest', 'Gerudo Training Grounds Stalfos Chest', 'Gerudo Training Grounds Beamos Chest'], ['Gerudo Training Grounds Exit', 'Gerudo Training Ground Left Silver Rupees', 'Gerudo Training Ground Beamos', 'Gerudo Training Ground Central Door']), create_dungeon_region('Gerudo Training Grounds Central Maze', ['Gerudo Training Grounds Hidden Ceiling Chest', 'Gerudo Training Grounds Maze Path First Chest', 'Gerudo Training Grounds Maze Path Second Chest', 'Gerudo Training Grounds Maze Path Third Chest', 'Gerudo Training Grounds Maze Path Final Chest'], ['Gerudo Training Grounds Right Locked Doors']), - create_dungeon_region('Gerudo Training Grounds Central Maze Right', ['Gerudo Training Grounds Maze Right Central Chest', 'Gerudo Training Grounds Maze Right Side Chest'], ['Gerudo Training Grounds Maze Exit']), + create_dungeon_region('Gerudo Training Grounds Central Maze Right', ['Gerudo Training Grounds Maze Right Central Chest', 'Gerudo Training Grounds Maze Right Side Chest', 'Gerudo Training Grounds Freestanding Key'], ['Gerudo Training Grounds Maze Exit']), create_dungeon_region('Gerudo Training Grounds Lava Room', ['Gerudo Training Grounds Underwater Silver Rupee Chest'], ['Gerudo Training Grounds Maze Ledge', 'Gerudo Training Grounds Right Hookshot Target']), create_dungeon_region('Gerudo Training Grounds Hammer Room', ['Gerudo Training Grounds Hammer Room Clear Chest', 'Gerudo Training Grounds Hammer Room Switch Chest'], ['Gerudo Training Grounds Hammer Target', 'Gerudo Training Grounds Hammer Room Clear']), create_dungeon_region('Gerudo Training Grounds Eye Statue Lower', ['Gerudo Training Grounds Eye Statue Chest'], ['Gerudo Training Grounds Eye Statue Exit']), @@ -48,7 +48,7 @@ def create_regions(world): create_dungeon_region('Spirit Temple Central Chamber', ['Spirit Temple Map Chest', 'Spirit Temple Child Climb East Chest', 'Spirit Temple Child Climb North Chest', 'Spirit Temple Sun Block Room Chest', 'Spirit Temple Statue Hand Chest', 'Spirit Temple NE Main Room Chest', 'GS97', 'GS98', 'GS100'], ['Spirit Temple to Hands', 'Spirit Temple Central Locked Door']), create_dungeon_region('Spirit Temple Outdoor Hands', ['Silver Gauntlets Chest', 'Mirror Shield Chest']), create_dungeon_region('Spirit Temple Beyond Central Locked Door', ['Spirit Temple Near Four Armos Chest', 'Spirit Temple Hallway Left Invisible Chest', 'Spirit Temple Hallway Right Invisible Chest'], ['Spirit Temple Final Locked Door']), - create_dungeon_region('Spirit Temple Beyond Final Locked Door', ['Spirit Temple Boss Key Chest', 'Spirit Temple Topmost Chest', 'Twinrova']), + create_dungeon_region('Spirit Temple Beyond Final Locked Door', ['Spirit Temple Boss Key Chest', 'Spirit Temple Topmost Chest', 'Twinrova Heart', 'Twinrova']), create_ow_region('Castle Town', None, ['Castle Town Exit', 'Temple of Time', 'Hyrule Castle Grounds', 'Castle Town Rupee Room', 'Castle Town Bazaar', 'Castle Town Mask Shop', 'Castle Town Shooting Gallery', 'Ganons Castle Grounds', 'Castle Town Bombchu Bowling', 'Castle Town Potion Shop', 'Castle Town Treasure Chest Game', 'Castle Town Bombchu Shop', 'Castle Town Dog Lady', 'Castle Town Man in Green House']), create_interior_region('Temple of Time', ['Zelda'], ['Temple of Time Exit', 'Door of Time']), @@ -73,60 +73,60 @@ def create_regions(world): create_interior_region('Carpenter Boss House'), create_interior_region('House of Skulltulla', ['10 Gold Skulltulla Reward', '20 Gold Skulltulla Reward', '30 Gold Skulltulla Reward', '40 Gold Skulltulla Reward', '50 Gold Skulltulla Reward']), create_interior_region('Impas House'), - create_interior_region('Impas House Back'), - create_interior_region('Windmill', ['Song at Windmill']), + create_interior_region('Impas House Back', ['Impa House Freestanding PoH']), + create_interior_region('Windmill', ['Windmill Freestanding PoH', 'Song at Windmill']), create_interior_region('Kakariko Bazaar'), create_interior_region('Kakariko Shooting Gallery', ['Adult Shooting Gallery']), create_interior_region('Kakariko Potion Shop Front'), create_interior_region('Kakariko Potion Shop Back'), create_interior_region('Odd Medicine Building'), - create_dungeon_region('Bottom of the Well', ['Bottom of the Well Front Left Hidden Wall', 'Bottom of the Well Front Center Bombable', 'Bottom of the Well Right Bottom Hidden Wall', 'Bottom of the Well Center Large Chest', 'Bottom of the Well Center Small Chest', 'Bottom of the Well Back Left Bombable', + create_dungeon_region('Bottom of the Well', ['Bottom of the Well Front Left Hidden Wall', 'Bottom of the Well Front Center Bombable', 'Bottom of the Well Right Bottom Hidden Wall', 'Bottom of the Well Center Large Chest', 'Bottom of the Well Center Small Chest', 'Bottom of the Well Back Left Bombable', 'Bottom of the Well Freestanding Key', 'Bottom of the Well Defeat Boss', 'Bottom of the Well Invisible Chest', 'Bottom of the Well Underwater Front Chest', 'Bottom of the Well Underwater Left Chest', 'Bottom of the Well Basement Chest', 'Bottom of the Well Locked Pits', 'Bottom of the Well Behind Right Grate', 'GS78', 'GS79', 'GS80'], ['Bottom of the Well Exit']), - create_ow_region('Graveyard', ['GS28', 'GS29'], ['Shield Grave', 'Composer Grave', 'Heart Piece Grave', 'Dampes Grave', 'Dampes House', 'Graveyard Exit']), + create_ow_region('Graveyard', ['Graveyard Freestanding PoH', 'GS28', 'GS29'], ['Shield Grave', 'Composer Grave', 'Heart Piece Grave', 'Dampes Grave', 'Dampes House', 'Graveyard Exit']), create_interior_region('Shield Grave', ['Shield Grave Chest']), create_interior_region('Heart Piece Grave', ['Heart Piece Grave Chest']), create_interior_region('Composer Grave', ['Composer Grave Chest', 'Song from Composer Grave']), - create_interior_region('Dampes Grave', ['Hookshot Chest']), + create_interior_region('Dampes Grave', ['Hookshot Chest', 'Dampe Race Freestanding PoH']), create_interior_region('Dampes House'), create_ow_region('Shadow Temple Warp Region', None, ['Drop to Graveyard', 'Shadow Temple Entrance']), create_dungeon_region('Shadow Temple Beginning', ['Shadow Temple Map Chest', 'Shadow Temple Hover Boots Chest'], ['Shadow Temple Exit', 'Shadow Temple First Pit']), create_dungeon_region('Shadow Temple First Beamos', ['Shadow Temple Compass Chest', 'Shadow Temple Early Silver Rupee Chest'], ['Shadow Temple Bomb Wall']), - create_dungeon_region('Shadow Temple Huge Pit', ['Shadow Temple Invisible Blades Visible Chest', 'Shadow Temple Invisible Blades Invisible Chest', 'Shadow Temple Falling Spikes Lower Chest', 'Shadow Temple Falling Spikes Upper Chest', 'Shadow Temple Falling Spikes Switch Chest', 'Shadow Temple Invisible Spikes Chest', 'GS81', 'GS82'], ['Shadow Temple Hookshot Target']), + create_dungeon_region('Shadow Temple Huge Pit', ['Shadow Temple Invisible Blades Visible Chest', 'Shadow Temple Invisible Blades Invisible Chest', 'Shadow Temple Falling Spikes Lower Chest', 'Shadow Temple Falling Spikes Upper Chest', 'Shadow Temple Falling Spikes Switch Chest', 'Shadow Temple Invisible Spikes Chest', 'Shadow Temple Freestanding Key', 'GS81', 'GS82'], ['Shadow Temple Hookshot Target']), create_dungeon_region('Shadow Temple Wind Tunnel', ['Shadow Temple Wind Hint Chest', 'Shadow Temple After Wind Enemy Chest', 'Shadow Temple After Wind Hidden Chest', 'GS83', 'GS84'], ['Shadow Temple Boat']), - create_dungeon_region('Shadow Temple Beyond Boat', ['Shadow Temple Spike Walls Left Chest', 'Shadow Temple Boss Key Chest', 'Shadow Temple Hidden Floormaster Chest', 'Bongo Bongo', 'GS85']), - create_ow_region('Death Mountain', ['Death Mountain Bombable Chest', 'Biggoron', 'GS30', 'GS31', 'GS32', 'GS33'], ['Death Mountain Exit', 'Goron City Entrance', 'Mountain Crater Entrance', 'Mountain Summit Fairy', 'Dodongos Cavern Rocks', 'Mountain Bombable Grotto', 'Mountain Storms Grotto']), + create_dungeon_region('Shadow Temple Beyond Boat', ['Shadow Temple Spike Walls Left Chest', 'Shadow Temple Boss Key Chest', 'Shadow Temple Hidden Floormaster Chest', 'Bongo Bongo Heart', 'Bongo Bongo', 'GS85']), + create_ow_region('Death Mountain', ['Death Mountain Bombable Chest', 'Biggoron', 'DM Trail Freestanding PoH', 'GS30', 'GS31', 'GS32', 'GS33'], ['Death Mountain Exit', 'Goron City Entrance', 'Mountain Crater Entrance', 'Mountain Summit Fairy', 'Dodongos Cavern Rocks', 'Mountain Bombable Grotto', 'Mountain Storms Grotto']), create_ow_region('Dodongos Cavern Entryway', None, ['Dodongos Cavern', 'Mountain Access from Behind Rock']), create_ow_region('Goron City', ['Goron City Leftmost Maze Chest', 'Goron City Left Maze Chest', 'Goron City Right Maze Chest', 'Rolling Goron as Child', 'Link the Goron', 'GS34', 'GS35'], ['Goron City Exit', 'Goron City Bomb Wall', 'Darunias Chamber', 'Crater Access']), create_ow_region('Goron City Woods Warp', None, ['Goron City from Woods', 'Goron City to Woods']), create_ow_region('Darunias Chamber', ['Darunias Joy'], ['Darunias Chamber Exit']), - create_ow_region('Death Mountain Crater Upper', ['GS36'], ['Crater Exit', 'Crater Hover Boots', 'Crater Scarecrow', 'Top of Crater Grotto']), + create_ow_region('Death Mountain Crater Upper', ['DM Crater Wall Freestanding PoH', 'GS36'], ['Crater Exit', 'Crater Hover Boots', 'Crater Scarecrow', 'Top of Crater Grotto']), create_ow_region('Death Mountain Crater Lower', None, ['Crater to City', 'Crater Fairy', 'Crater Bridge', 'Crater Ascent']), - create_ow_region('Death Mountain Crater Central', ['Sheik in Crater', 'GS37'], ['Crater Bridge Reverse', 'Fire Temple Entrance']), + create_ow_region('Death Mountain Crater Central', ['DM Crater Volcano Freestanding PoH', 'Sheik in Crater', 'GS37'], ['Crater Bridge Reverse', 'Fire Temple Entrance']), create_interior_region('Crater Fairy', ['Crater Fairy Reward']), create_interior_region('Mountain Summit Fairy', ['Mountain Summit Fairy Reward']), create_dungeon_region('Dodongos Cavern Beginning', None, ['Dodongos Cavern Exit', 'Dodongos Cavern Lobby']), create_dungeon_region('Dodongos Cavern Lobby', ['Dodongos Cavern Map Chest', 'GS38', 'GS42'], ['Dodongos Cavern Retreat', 'Dodongos Cavern Left Door']), create_dungeon_region('Dodongos Cavern Climb', ['Dodongos Cavern Compass Chest', 'Dodongos Cavern Bomb Flower Platform', 'GS39'], ['Dodongos Cavern Bridge Fall', 'Dodongos Cavern Slingshot Target']), create_dungeon_region('Dodongos Cavern Far Bridge', ['Dodongos Cavern Bomb Bag Chest', 'Dodongos Cavern End of Bridge Chest', 'GS41'], ['Dodongos Cavern Bomb Drop', 'Dodongos Cavern Bridge Fall 2']), - create_dungeon_region('Dodongos Cavern Boss Area', ['Chest Above King Dodongo', 'King Dodongo', 'GS40'], ['Dodongos Cavern Exit Skull']), - create_ow_region('Zora River Bottom', ['GS43'], ['Zora River Exit', 'Zora River Rocks', 'Zora River Adult', 'Zora River Plateau Open Grotto', 'Zora River Plateau Bombable Grotto']), + create_dungeon_region('Dodongos Cavern Boss Area', ['Chest Above King Dodongo', 'King Dodongo Heart', 'King Dodongo', 'GS40'], ['Dodongos Cavern Exit Skull']), + create_ow_region('Zora River Bottom', ['Zora River Lower Freestanding PoH', 'Zora River Upper Freestanding PoH', 'GS43'], ['Zora River Exit', 'Zora River Rocks', 'Zora River Adult', 'Zora River Plateau Open Grotto', 'Zora River Plateau Bombable Grotto']), create_ow_region('Zora River Top', ['Magic Bean Salesman', 'Frog Ocarina Game', 'Frogs in the Rain', 'GS44'], ['Zora River Downstream', 'Zora River Dive Warp', 'Zora River Waterfall']), create_ow_region('Zora River Adult', ['GS45', 'GS46'], ['Zoras Domain Adult Access']), create_ow_region('Zoras Domain', ['Diving Minigame', 'Zoras Domain Torch Run', 'King Zora Moves'], ['Zoras Domain Exit', 'Zoras Domain Dive Warp', 'Behind King Zora', 'Zora Shop']), create_ow_region('Zoras Fountain', ['GS48', 'GS49'], ['Zoras Fountain Exit', 'Jabu Jabus Belly', 'Zoras Fountain Fairy']), create_ow_region('Zoras Domain Frozen', ['King Zora Thawed', 'GS47'], ['Zoras Fountain Adult Access']), - create_ow_region('Outside Ice Cavern', ['GS50'], ['Ice Cavern Entrance']), - create_dungeon_region('Ice Cavern', ['Ice Cavern Map Chest', 'Ice Cavern Compass Chest', 'Ice Cavern Iron Boots Chest', 'Sheik in Ice Cavern', 'GS70', 'GS71', 'GS72'], ['Ice Cavern Exit']), + create_ow_region('Outside Ice Cavern', ['Zoras Fountain Iceberg Freestanding PoH', 'Zoras Fountain Bottom Freestanding PoH', 'GS50'], ['Ice Cavern Entrance']), + create_dungeon_region('Ice Cavern', ['Ice Cavern Map Chest', 'Ice Cavern Compass Chest', 'Ice Cavern Iron Boots Chest', 'Ice Cavern Freestanding PoH', 'Sheik in Ice Cavern', 'GS70', 'GS71', 'GS72'], ['Ice Cavern Exit']), create_interior_region('Zora Shop'), create_interior_region('Zoras Fountain Fairy', ['Zoras Fountain Fairy Reward']), create_dungeon_region('Jabu Jabus Belly Beginning', None, ['Jabu Jabus Belly Exit', 'Jabu Jabus Belly Ceiling Switch']), create_dungeon_region('Jabu Jabus Belly Main', ['Boomerang Chest', 'GS51'], ['Jabu Jabus Belly Retreat', 'Jabu Jabus Belly Tentacles']), create_dungeon_region('Jabu Jabus Belly Depths', ['Jabu Jabus Belly Map Chest', 'Jabu Jabus Belly Compass Chest', 'GS52', 'GS53'], ['Jabu Jabus Belly Elevator', 'Jabu Jabus Belly Octopus']), - create_dungeon_region('Jabu Jabus Belly Boss Area', ['Barinade', 'GS54'], ['Jabu Jabus Belly Final Backtrack']), - create_ow_region('Lon Lon Ranch', ['Talons Chickens', 'Epona', 'Song from Malon', 'GS18', 'GS19', 'GS20', 'GS21'], ['Lon Lon Exit', 'Talon House', 'Ingo Barn', 'Lon Lon Corner Tower', 'Lon Lon Grotto']), - create_interior_region('Talon House'), + create_dungeon_region('Jabu Jabus Belly Boss Area', ['Barinade Heart', 'Barinade', 'GS54'], ['Jabu Jabus Belly Final Backtrack']), + create_ow_region('Lon Lon Ranch', ['Epona', 'Song from Malon', 'GS18', 'GS19', 'GS20', 'GS21'], ['Lon Lon Exit', 'Talon House', 'Ingo Barn', 'Lon Lon Corner Tower', 'Lon Lon Grotto']), + create_interior_region('Talon House', ['Talons Chickens']), create_interior_region('Ingo Barn'), - create_interior_region('Lon Lon Corner Tower'), + create_interior_region('Lon Lon Corner Tower', ['Lon Lon Tower Freestanding PoH']), create_interior_region('Forest Temple Entry Area', ['Sheik Forest Song', 'GS6', 'GS7'], ['Adult Meadow Exit', 'Forest Temple Entrance']), create_dungeon_region('Forest Temple Lobby', ['Forest Temple First Chest', 'Forest Temple Chest Behind Lobby', 'GS60', 'GS61'], ['Forest Temple Exit', 'Forest Temple Song of Time Block', 'Forest Temple Lobby Eyeball Switch', 'Forest Temple Lobby Locked Door']), create_dungeon_region('Forest Temple NW Outdoors', ['Forest Temple Well Chest', 'Forest Temple Map Chest', 'GS63'], ['Forest Temple Through Map Room']), @@ -136,8 +136,8 @@ def create_regions(world): create_dungeon_region('Forest Temple Straightened Hall', ['Forest Temple Boss Key Chest'], ['Forest Temple Boss Key Chest Drop']), create_dungeon_region('Forest Temple Outside Upper Ledge', ['Forest Temple Floormaster Chest'], ['Forest Temple Outside Ledge Drop']), create_dungeon_region('Forest Temple Bow Region', ['Forest Temple Bow Chest', 'Forest Temple Red Poe Chest', 'Forest Temple Blue Poe Chest'], ['Forest Temple Drop to Falling Room']), - create_dungeon_region('Forest Temple Boss Region', ['Forest Temple Near Boss Chest', 'Phantom Ganon', 'GS64']), - create_dungeon_region('Fire Temple Lower', ['Fire Temple Chest Near Boss', 'Fire Temple Fire Dancer Chest', 'Fire Temple Boss Key Chest', 'Fire Temple Big Lava Room Bombable Chest', 'Fire Temple Big Lava Room Open Chest', 'Volvagia', 'GS65', 'GS69'], ['Fire Temple Exit', 'Fire Temple Early Climb']), + create_dungeon_region('Forest Temple Boss Region', ['Forest Temple Near Boss Chest', 'Phantom Ganon Heart', 'Phantom Ganon', 'GS64']), + create_dungeon_region('Fire Temple Lower', ['Fire Temple Chest Near Boss', 'Fire Temple Fire Dancer Chest', 'Fire Temple Boss Key Chest', 'Fire Temple Big Lava Room Bombable Chest', 'Fire Temple Big Lava Room Open Chest', 'Volvagia Heart', 'Volvagia', 'GS65', 'GS69'], ['Fire Temple Exit', 'Fire Temple Early Climb']), create_dungeon_region('Fire Temple Middle', ['Fire Temple Boulder Maze Lower Chest', 'Fire Temple Boulder Maze Upper Chest', 'Fire Temple Boulder Maze Side Room', 'Fire Temple Boulder Maze Bombable Pit', 'Fire Temple Scarecrow Chest', 'Fire Temple Map Chest', 'Fire Temple Compass Chest', 'GS66', 'GS67', 'GS68'], ['Fire Temple Fire Maze Escape']), create_dungeon_region('Fire Temple Upper', ['Fire Temple Highest Goron Chest', 'Fire Temple Megaton Hammer Chest']), create_dungeon_region('Ganons Castle Lobby', None, ['Ganons Castle Exit', 'Ganons Castle Forest Trial', 'Ganons Castle Fire Trial', 'Ganons Castle Water Trial', 'Ganons Castle Shadow Trial', 'Ganons Castle Spirit Trial', 'Ganons Castle Light Trial', 'Ganons Castle Tower']), @@ -162,7 +162,7 @@ def create_regions(world): create_grotto_region('Field West Castle Town Grotto', ['Field West Castle Town Grotto Chest']), create_grotto_region('Field Far West Castle Town Grotto'), create_grotto_region('Field Kakariko Grotto', ['GS12']), - create_grotto_region('Field North Lon Lon Grotto'), + create_grotto_region('Field North Lon Lon Grotto', ['Tektite Grotto Freestanding PoH']), create_grotto_region('Castle Storms Grotto', ['GS16']), create_grotto_region('Kakariko Bombable Grotto', ['Redead Grotto Chest']), create_grotto_region('Kakariko Back Grotto', ['Kakariko Back Grotto Chest']), @@ -429,6 +429,37 @@ def _create_region(name, type, locations=None, exits=None): 'Lost Woods Generic Grotto Chest': (None, None, None, 'Grotto', 0x84), 'Mountain Storms Grotto Chest': (None, None, None, 'Grotto', 0x87), 'Top of Crater Grotto Chest': (None, None, None, 'Grotto', 0x8A), + 'Shadow Temple Freestanding Key': (None, None, 0x01, 'Collectable', 0x07), + 'Bottom of the Well Freestanding Key': (None, None, 0x01, 'Collectable', 0x08), + 'Gerudo Training Grounds Freestanding Key': (None, None, 0x01, 'Collectable', 0x0B), + 'Ice Cavern Freestanding PoH': (None, None, 0x01, 'Collectable', 0x09), + 'Impa House Freestanding PoH': (None, None, 0x01, 'Collectable', 0x37), + 'Tektite Grotto Freestanding PoH': (None, None, 0x01, 'Collectable', 0x3E), + 'Windmill Freestanding PoH': (None, None, 0x01, 'Collectable', 0x48), + 'Dampe Race Freestanding PoH': (None, None, 0x07, 'Collectable', 0x48), + 'Lon Lon Tower Freestanding PoH': (None, None, 0x01, 'Collectable', 0x4C), + 'Graveyard Freestanding PoH': (None, None, 0x04, 'Collectable', 0x53), + 'Gravedigging Tour': (None, None, 0x00, 'Collectable', 0x53), + 'Zora River Lower Freestanding PoH': (None, None, 0x04, 'Collectable', 0x54), + 'Zora River Upper Freestanding PoH': (None, None, 0x0B, 'Collectable', 0x54), + 'Lake Hylia Freestanding PoH': (None, None, 0x1E, 'Collectable', 0x57), + 'Zoras Fountain Iceberg Freestanding PoH': (None, None, 0x01, 'Collectable', 0x59), + 'Zoras Fountain Bottom Freestanding PoH': (None, None, 0x14, 'Collectable', 0x59), + 'Gerudo Valley Waterfall Freestanding PoH': (None, None, 0x01, 'Collectable', 0x5A), + 'Gerudo Valley Crate Freestanding PoH': (None, None, 0x02, 'Collectable', 0x5A), + 'Colossus Freestanding PoH': (None, None, 0x0D, 'Collectable', 0x5C), + 'DM Trail Freestanding PoH': (None, None, 0x1E, 'Collectable', 0x60), + 'DM Crater Wall Freestanding PoH': (None, None, 0x02, 'Collectable', 0x61), + 'DM Crater Volcano Freestanding PoH': (None, None, 0x08, 'Collectable', 0x61), + 'Goron City Pot Freestanding PoH': (None, None, 0x1F, 'Collectable', 0x62), + 'Queen Gohma Heart': (None, None, None, 'BossHeart', 0x11), + 'King Dodongo Heart': (None, None, None, 'BossHeart', 0x12), + 'Barinade Heart': (None, None, None, 'BossHeart', 0x13), + 'Phantom Ganon Heart': (None, None, None, 'BossHeart', 0x14), + 'Volvagia Heart': (None, None, None, 'BossHeart', 0x15), + 'Morpha Heart': (None, None, None, 'BossHeart', 0x16), + 'Twinrova Heart': (None, None, None, 'BossHeart', 0x17), + 'Bongo Bongo Heart': (None, None, None, 'BossHeart', 0x18), 'Magic Bean Salesman': (None, None, None, 'Event', None), 'King Zora Moves': (None, None, None, 'Event', None), 'Ocarina of Time': (None, None, None, 'Event', None), From 4e61fa5f461fe1f8c60c396885eeb37dd625c519 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Wed, 30 May 2018 04:06:10 -0500 Subject: [PATCH 053/151] More prep for freestanding shuffle Not all necessary files updated but this should help. --- BaseClasses.py | 2 +- Dungeons.py | 6 +++--- ItemList.py | 2 +- Items.py | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index c266c3ef5..7d7f22108 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -82,7 +82,7 @@ def soft_collect(item): soft_collect(item) from Items import ItemFactory if keys: - for item in ItemFactory(['Small Key (Forest Temple)'] * 5 + ['Boss Key (Forest Temple)', 'Boss Key (Fire Temple)', 'Boss Key (Water Temple)', 'Boss Key (Shadow Temple)', 'Boss Key (Spirit Temple)', 'Boss Key (Ganons Castle)'] + ['Small Key (Bottom of the Well)'] * 2 + ['Small Key (Fire Temple)'] * 8 + ['Small Key (Water Temple)'] * 6 + ['Small Key (Shadow Temple)'] * 4 + ['Small Key (Gerudo Training Grounds)'] * 8 + ['Small Key (Spirit Temple)'] * 5 + ['Small Key (Ganons Castle)'] * 2): + for item in ItemFactory(['Small Key (Forest Temple)'] * 5 + ['Boss Key (Forest Temple)', 'Boss Key (Fire Temple)', 'Boss Key (Water Temple)', 'Boss Key (Shadow Temple)', 'Boss Key (Spirit Temple)', 'Boss Key (Ganons Castle)'] + ['Small Key (Bottom of the Well)'] * 3 + ['Small Key (Fire Temple)'] * 8 + ['Small Key (Water Temple)'] * 6 + ['Small Key (Shadow Temple)'] * 5 + ['Small Key (Gerudo Training Grounds)'] * 9 + ['Small Key (Spirit Temple)'] * 5 + ['Small Key (Ganons Castle)'] * 2): soft_collect(item) ret.sweep_for_events() ret.clear_cached_unreachable() diff --git a/Dungeons.py b/Dungeons.py index 42e9c51b7..81917e15a 100644 --- a/Dungeons.py +++ b/Dungeons.py @@ -16,12 +16,12 @@ def make_dungeon(name, dungeon_regions, boss_key, small_keys, dungeon_items): DC = make_dungeon('Dodongos Cavern', ['Dodongos Cavern Beginning', 'Dodongos Cavern Lobby', 'Dodongos Cavern Climb', 'Dodongos Cavern Far Bridge', 'Dodongos Cavern Boss Area'], None, [], ItemFactory(['Map (Dodongos Cavern)', 'Compass (Dodongos Cavern)'])) JB = make_dungeon('Jabu Jabus Belly', ['Jabu Jabus Belly Beginning', 'Jabu Jabus Belly Main', 'Jabu Jabus Belly Depths', 'Jabu Jabus Belly Boss Area'], None, [], ItemFactory(['Map (Jabu Jabus Belly)', 'Compass (Jabu Jabus Belly)'])) FoT = make_dungeon('Forest Temple', ['Forest Temple Lobby', 'Forest Temple NW Outdoors', 'Forest Temple NE Outdoors', 'Forest Temple Falling Room', 'Forest Temple Block Push Room', 'Forest Temple Straightened Hall', 'Forest Temple Outside Upper Ledge', 'Forest Temple Bow Region', 'Forest Temple Boss Region'], ItemFactory('Boss Key (Forest Temple)'), ItemFactory(['Small Key (Forest Temple)'] * 5), ItemFactory(['Map (Forest Temple)', 'Compass (Forest Temple)'])) - BW = make_dungeon('Bottom of the Well', ['Bottom of the Well'], None, ItemFactory(['Small Key (Bottom of the Well)'] * 2), ItemFactory(['Map (Bottom of the Well)', 'Compass (Bottom of the Well)'])) + BW = make_dungeon('Bottom of the Well', ['Bottom of the Well'], None, ItemFactory(['Small Key (Bottom of the Well)'] * 3), ItemFactory(['Map (Bottom of the Well)', 'Compass (Bottom of the Well)'])) FiT = make_dungeon('Fire Temple', ['Fire Temple Lower', 'Fire Temple Middle', 'Fire Temple Upper'], ItemFactory('Boss Key (Fire Temple)'), ItemFactory(['Small Key (Fire Temple)'] * 8), ItemFactory(['Map (Fire Temple)', 'Compass (Fire Temple)'])) IC = make_dungeon('Ice Cavern', ['Ice Cavern'], None, [], ItemFactory(['Map (Ice Cavern)', 'Compass (Ice Cavern)'])) WT = make_dungeon('Water Temple', ['Water Temple Lobby', 'Water Temple Middle Water Level', 'Water Temple Dark Link Region'], ItemFactory('Boss Key (Water Temple)'), ItemFactory(['Small Key (Water Temple)'] * 6), ItemFactory(['Map (Water Temple)', 'Compass (Water Temple)'])) - ShT = make_dungeon('Shadow Temple', ['Shadow Temple Beginning', 'Shadow Temple First Beamos', 'Shadow Temple Huge Pit', 'Shadow Temple Wind Tunnel', 'Shadow Temple Beyond Boat'], ItemFactory('Boss Key (Shadow Temple)'), ItemFactory(['Small Key (Shadow Temple)'] * 4), ItemFactory(['Map (Shadow Temple)', 'Compass (Shadow Temple)'])) - GTG = make_dungeon('Gerudo Training Grounds', ['Gerudo Training Grounds Lobby', 'Gerudo Training Grounds Central Maze', 'Gerudo Training Grounds Central Maze Right', 'Gerudo Training Grounds Lava Room', 'Gerudo Training Grounds Hammer Room', 'Gerudo Training Grounds Eye Statue Lower', 'Gerudo Training Grounds Eye Statue Upper', 'Gerudo Training Grounds Heavy Block Room'], None, ItemFactory(['Small Key (Gerudo Training Grounds)'] * 8), []) + ShT = make_dungeon('Shadow Temple', ['Shadow Temple Beginning', 'Shadow Temple First Beamos', 'Shadow Temple Huge Pit', 'Shadow Temple Wind Tunnel', 'Shadow Temple Beyond Boat'], ItemFactory('Boss Key (Shadow Temple)'), ItemFactory(['Small Key (Shadow Temple)'] * 5), ItemFactory(['Map (Shadow Temple)', 'Compass (Shadow Temple)'])) + GTG = make_dungeon('Gerudo Training Grounds', ['Gerudo Training Grounds Lobby', 'Gerudo Training Grounds Central Maze', 'Gerudo Training Grounds Central Maze Right', 'Gerudo Training Grounds Lava Room', 'Gerudo Training Grounds Hammer Room', 'Gerudo Training Grounds Eye Statue Lower', 'Gerudo Training Grounds Eye Statue Upper', 'Gerudo Training Grounds Heavy Block Room'], None, ItemFactory(['Small Key (Gerudo Training Grounds)'] * 9), []) SpT = make_dungeon('Spirit Temple', ['Spirit Temple Lobby', 'Child Spirit Temple', 'Early Adult Spirit Temple', 'Spirit Temple Central Chamber', 'Spirit Temple Beyond Central Locked Door', 'Spirit Temple Beyond Final Locked Door'], ItemFactory('Boss Key (Spirit Temple)'), ItemFactory(['Small Key (Spirit Temple)'] * 5), ItemFactory(['Map (Spirit Temple)', 'Compass (Spirit Temple)'])) GC = make_dungeon('Ganons Castle', ['Ganons Castle Lobby', 'Ganons Castle Forest Trial', 'Ganons Castle Fire Trial', 'Ganons Castle Water Trial', 'Ganons Castle Shadow Trial', 'Ganons Castle Spirit Trial', 'Ganons Castle Light Trial', 'Ganons Castle Tower'], ItemFactory('Boss Key (Ganons Castle)'), ItemFactory(['Small Key (Ganons Castle)'] * 2), []) diff --git a/ItemList.py b/ItemList.py index 5bfbeeae7..ecf2bd633 100644 --- a/ItemList.py +++ b/ItemList.py @@ -9,7 +9,7 @@ #Some basic items that various modes require are placed here, including pendants and crystals. Medallion requirements for the two relevant entrances are also decided. alwaysitems = (['Kokiri Sword', 'Biggoron Sword', 'Boomerang', 'Lens of Truth', 'Hammer', 'Iron Boots', 'Goron Tunic', 'Zora Tunic', 'Hover Boots', 'Mirror Shield', 'Stone of Agony', 'Fire Arrows', 'Ice Arrows', 'Light Arrows', 'Dins Fire', 'Farores Wind', 'Nayrus Love', 'Rupee (1)'] + ['Progressive Hookshot'] * 2 + ['Deku Shield'] * 4 + ['Hylian Shield'] * 2 + ['Ice Trap'] * 6 + - ['Progressive Strength Upgrade'] * 3 + ['Progressive Scale'] * 2 + ['Piece of Heart'] * 16 + ['Recovery Heart'] * 11 + ['Rupees (5)'] * 17 + ['Rupees (20)'] * 5 + ['Rupees (50)'] * 7 + ['Rupees (200)'] * 6 + ['Bow'] * 3 + ['Slingshot'] * 3 + ['Bomb Bag'] * 3 + ['Bottle with Letter'] + + ['Progressive Strength Upgrade'] * 3 + ['Progressive Scale'] * 2 + ['Piece of Heart'] * 35 + ['Recovery Heart'] * 11 + ['Rupees (5)'] * 17 + ['Rupees (20)'] * 5 + ['Rupees (50)'] * 7 + ['Rupees (200)'] * 6 + ['Bow'] * 3 + ['Slingshot'] * 3 + ['Bomb Bag'] * 3 + ['Bottle with Letter'] + ['Heart Container'] * 8 + ['Bombs (5)'] * 2 + ['Bombs (10)'] * 2 + ['Bombs (20)'] * 2 + ['Bombchus (5)'] + ['Bombchus (10)'] * 3 + ['Bombchus (20)'] + ['Arrows (5)'] + ['Arrows (10)'] * 6 + ['Arrows (30)'] * 6 + ['Deku Nuts (5)'] + ['Deku Nuts (10)'] + ['Progressive Wallet'] * 2 + ['Deku Stick Capacity'] * 2 + ['Deku Nut Capacity'] * 2) normal_bottles = ['Bottle', 'Bottle with Milk', 'Bottle with Red Potion', 'Bottle with Green Potion', 'Bottle with Blue Potion', 'Bottle with Fairy', 'Bottle with Fish', 'Bottle with Blue Fire', 'Bottle with Bugs', 'Bottle with Poe'] normal_bottle_count = 3 diff --git a/Items.py b/Items.py index 028a66124..4a32ed6ea 100644 --- a/Items.py +++ b/Items.py @@ -77,6 +77,7 @@ def ItemFactory(items): 'Deku Nut Capacity': (False, False, None, None, 0x87), 'Stone of Agony': (True, False, None, 0x0720, 0x39), 'Piece of Heart': (False, False, None, 0x07C0, 0x3E), + 'Heart Container': (False, False, None, 0x07A0, 0x3D), 'Piece of Heart (Treasure Chest Game)': (False, False, None, None, 0x76), 'Recovery Heart': (False, False, None, None, 0xB6), 'Arrows (5)': (False, False, None, None, 0xB7), From 0ae12ed961db5caf736763d6d0d3a3fddc4c2fbd Mon Sep 17 00:00:00 2001 From: Wulfy Date: Wed, 30 May 2018 05:08:42 -0400 Subject: [PATCH 054/151] Update ItemOverrides to handle free standing items --- BaseClasses.py | 1 + ItemOverrides.py | 22 ++++++++++++++++++---- Items.py | 1 + 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index c266c3ef5..ffb7a3ecd 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -498,6 +498,7 @@ def __init__(self, name='', address=None, address2=None, default=None, type='Che self.parent_region = parent self.item = None self.base_item = None + self.override_bytes = None self.address = address self.address2 = address2 self.default = default diff --git a/ItemOverrides.py b/ItemOverrides.py index df4a9a1ec..0e831f7bf 100755 --- a/ItemOverrides.py +++ b/ItemOverrides.py @@ -20,10 +20,17 @@ def set_overrides(world): if loc.item.index is None: continue - if loc.type == 'Grotto': + base_item = None + collectable_flag = None + + if loc.type == 'Collectable': + collectable_flag = loc.default + elif loc.type == 'Grotto': base_item = 'Boomerang' elif loc.name == 'Treasure Chest Game': base_item = 'Piece of Heart (Treasure Chest Game)' + elif loc.type == 'BossHeart': + base_item = 'Heart Container (Boss)' elif loc.item.index >= 0x80: base_item = available_base_items.pop(0) if not base_item: @@ -31,12 +38,19 @@ def set_overrides(world): else: continue - loc.base_item = ItemFactory(base_item) - logging.getLogger('').debug('Override %s -> %s in scene %s', loc.base_item, loc.item, '0x{0:0{1}X}'.format(scene, 2)) + if base_item: + loc.base_item = ItemFactory(base_item) + logging.getLogger('').debug('Override %s -> %s in scene %s', loc.base_item, loc.item, '0x{0:0{1}X}'.format(scene, 2)) + + byte1 = loc.scene + byte2 = collectable_flag or loc.base_item.index + byte3 = 0x01 if collectable_flag else 0x00 + byte4 = loc.item.index + loc.override_bytes = (byte1, byte2, byte3, byte4) def get_overrides(world): filled = world.get_locations() - result = [(loc.scene, loc.base_item.index, loc.item.index) for loc in filled if loc.base_item] + result = [loc.override_bytes for loc in filled if loc.override_bytes] result.sort() return result diff --git a/Items.py b/Items.py index 028a66124..e064c20fa 100644 --- a/Items.py +++ b/Items.py @@ -78,6 +78,7 @@ def ItemFactory(items): 'Stone of Agony': (True, False, None, 0x0720, 0x39), 'Piece of Heart': (False, False, None, 0x07C0, 0x3E), 'Piece of Heart (Treasure Chest Game)': (False, False, None, None, 0x76), + 'Heart Container (Boss)': (False, False, None, None, 0x4F), 'Recovery Heart': (False, False, None, None, 0xB6), 'Arrows (5)': (False, False, None, None, 0xB7), 'Arrows (10)': (False, False, None, None, 0xB8), From fd202b0397a4ec5a304d7c7b406d73fceb0900ff Mon Sep 17 00:00:00 2001 From: Wulfy Date: Wed, 30 May 2018 05:17:18 -0400 Subject: [PATCH 055/151] Fix Rom.py for free-standing item overrides --- ItemOverrides.py | 2 +- Rom.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ItemOverrides.py b/ItemOverrides.py index 0e831f7bf..2e75f0ff7 100755 --- a/ItemOverrides.py +++ b/ItemOverrides.py @@ -46,7 +46,7 @@ def set_overrides(world): byte2 = collectable_flag or loc.base_item.index byte3 = 0x01 if collectable_flag else 0x00 byte4 = loc.item.index - loc.override_bytes = (byte1, byte2, byte3, byte4) + loc.override_bytes = [byte1, byte2, byte3, byte4] def get_overrides(world): filled = world.get_locations() diff --git a/Rom.py b/Rom.py index fae93bd18..d8cc54a15 100644 --- a/Rom.py +++ b/Rom.py @@ -986,8 +986,8 @@ def patch_rom(world, rom): # write item overrides override_table = [] - for (scene, base_id, override_id) in get_overrides(world): - override_table += [scene, base_id, 0x00, override_id] + for byte_list in get_overrides(world): + override_table += byte_list rom.write_bytes(0x3481000, override_table) # patch fairy entrances From 5ce33edcfc5473bff3a0991cb4e20f6fa34c6351 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Wed, 30 May 2018 04:41:26 -0500 Subject: [PATCH 056/151] Logic rules for freestanding items --- Rules.py | 78 +++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 63 insertions(+), 15 deletions(-) diff --git a/Rules.py b/Rules.py index abe629c5b..5d76a756b 100644 --- a/Rules.py +++ b/Rules.py @@ -67,6 +67,7 @@ def global_rules(world): set_rule(world.get_location('Deku Theater Mask of Truth'), lambda state: state.has('Zeldas Letter') and state.has('Sarias Song') and state.has('Kokiri Emerald') and state.has('Goron Ruby') and state.has('Zora Sapphire') and state.guarantee_hint()) #Must befriend Skull Kid to sell Skull Mask, all stones to spawn running man. set_rule(world.get_location('Anju as Adult'), lambda state: state.is_adult()) set_rule(world.get_location('Man on Roof'), lambda state: state.has('Progressive Hookshot') and state.is_adult()) + set_rule(world.get_location('Impa House Freestanding PoH'), lambda state: (state.has('Progressive Hookshot') and state.is_adult()) or state.has('Bomb Bag')) set_rule(world.get_location('10 Gold Skulltulla Reward'), lambda state: state.has('Gold Skulltulla Token', 10)) set_rule(world.get_location('20 Gold Skulltulla Reward'), lambda state: state.has('Gold Skulltulla Token', 20)) set_rule(world.get_location('30 Gold Skulltulla Reward'), lambda state: state.has('Gold Skulltulla Token', 30) and state.guarantee_hint()) @@ -87,8 +88,8 @@ def global_rules(world): set_rule(world.get_location('Bottom of the Well Underwater Front Chest'), lambda state: state.has('Zeldas Lullaby')) set_rule(world.get_location('Bottom of the Well Underwater Left Chest'), lambda state: state.has('Zeldas Lullaby')) set_rule(world.get_location('Bottom of the Well Basement Chest'), lambda state: state.has('Bomb Bag')) - set_rule(world.get_location('Bottom of the Well Locked Pits'), lambda state: state.has('Small Key (Bottom of the Well)', 2) and state.has('Lens of Truth') and state.has('Magic Meter')) #These pits are really unfair. - set_rule(world.get_location('Bottom of the Well Behind Right Grate'), lambda state: state.has('Small Key (Bottom of the Well)', 2) and state.has('Lens of Truth') and state.has('Magic Meter')) + set_rule(world.get_location('Bottom of the Well Locked Pits'), lambda state: state.has('Small Key (Bottom of the Well)', 3) and state.has('Lens of Truth') and state.has('Magic Meter')) #These pits are really unfair. + set_rule(world.get_location('Bottom of the Well Behind Right Grate'), lambda state: state.has('Small Key (Bottom of the Well)', 3) and state.has('Lens of Truth') and state.has('Magic Meter')) set_rule(world.get_entrance('Death Mountain Entrance'), lambda state: state.has('Zeldas Letter') or state.is_adult()) set_rule(world.get_location('Death Mountain Bombable Chest'), lambda state: state.can_blast()) set_rule(world.get_location('Biggoron'), lambda state: state.can_blast() and state.is_adult() and state.can_finish_adult_trades() and state.guarantee_hint()) @@ -96,6 +97,7 @@ def global_rules(world): set_rule(world.get_location('Goron City Left Maze Chest'), lambda state: state.can_blast() or (state.has('Progressive Strength Upgrade', 2) and state.is_adult())) set_rule(world.get_location('Goron City Right Maze Chest'), lambda state: state.can_blast() or (state.has('Progressive Strength Upgrade', 2) and state.is_adult())) set_rule(world.get_location('Rolling Goron as Child'), lambda state: state.has('Bomb Bag')) + set_rule(world.get_location('Goron City Pot Freestanding PoH'), lambda state: (state.has('Bomb Bag') or state.has('Progressive Strength Upgrade')) and (state.has('Zeldas Lullaby') or (state.has('Dins Fire') and state.has('Magic Meter')))) set_rule(world.get_entrance('Darunias Chamber'), lambda state: state.has('Zeldas Lullaby')) set_rule(world.get_location('Darunias Joy'), lambda state: state.has('Sarias Song')) set_rule(world.get_entrance('Goron City from Woods'), lambda state: state.can_blast() and (world.open_forest or (state.has('Slingshot') and state.has('Kokiri Sword')))) @@ -124,6 +126,8 @@ def global_rules(world): set_rule(world.get_entrance('Zoras Domain Dive Warp'), lambda state: state.can_dive()) set_rule(world.get_entrance('Zora River Waterfall'), lambda state: state.has('Zeldas Lullaby')) set_rule(world.get_entrance('Zora River Rocks'), lambda state: state.has('Bomb Bag')) + set_rule(world.get_location('Zora River Lower Freestanding PoH'), lambda state: state.has('Bomb Bag') or state.has('Progressive Scale') or (state.has('Hover Boots') and state.is_adult())) + set_rule(world.get_location('Zora River Upper Freestanding PoH'), lambda state: state.has('Bomb Bag') or state.has('Progressive Scale') or (state.has('Hover Boots') and state.is_adult())) set_rule(world.get_location('Frog Ocarina Game'), lambda state: state.has('Zeldas Lullaby') and state.has('Sarias Song') and state.has('Suns Song') and state.has('Eponas Song') and state.has('Song of Time') and state.has('Song of Storms')) set_rule(world.get_location('Frogs in the Rain'), lambda state: state.has('Song of Storms')) set_rule(world.get_location('Underwater Bottle'), lambda state: state.can_dive()) @@ -139,6 +143,7 @@ def global_rules(world): set_rule(world.get_entrance('Jabu Jabus Belly Tentacles'), lambda state: state.has('Boomerang')) set_rule(world.get_location('Ice Cavern Map Chest'), lambda state: state.has_bottle()) set_rule(world.get_location('Ice Cavern Compass Chest'), lambda state: state.has_bottle()) + set_rule(world.get_location('Ice Cavern Freestanding PoH'), lambda state: state.has_bottle()) set_rule(world.get_location('Ice Cavern Iron Boots Chest'), lambda state: state.has_bottle()) set_rule(world.get_location('Sheik in Ice Cavern'), lambda state: state.has_bottle() and state.is_adult()) set_rule(world.get_location('Ocarina of Time'), lambda state: state.has('Kokiri Emerald') and state.has('Goron Ruby') and state.has('Zora Sapphire') and state.guarantee_hint()) @@ -164,13 +169,17 @@ def global_rules(world): set_rule(world.get_location('Forest Temple Red Poe Chest'), lambda state: state.has('Bow') and state.is_adult()) set_rule(world.get_location('Forest Temple Blue Poe Chest'), lambda state: state.has('Bow') and state.is_adult()) set_rule(world.get_location('Phantom Ganon'), lambda state: state.has('Boss Key (Forest Temple)')) + set_rule(world.get_location('Phantom Ganon Heart'), lambda state: state.has('Boss Key (Forest Temple)')) set_rule(world.get_entrance('Dampes Grave'), lambda state: state.is_adult()) + set_rule(world.get_location('Graveyard Freestanding PoH'), lambda state: state.is_adult() and state.has('Magic Bean')) set_rule(world.get_location('Song at Windmill'), lambda state: state.is_adult()) + set_rule(world.get_location('Windmill Freestanding PoH'), lambda state: (state.is_adult() and state.has('Song of Time')) or state.has('Boomerang')) set_rule(world.get_entrance('Temple Warp Pad'), lambda state: state.has('Prelude of Light')) set_rule(world.get_location('Sheik at Temple'), lambda state: state.has('Forest Medallion') and state.is_adult()) set_rule(world.get_location('Diving in the Lab'), lambda state: state.has('Progressive Scale', 2)) set_rule(world.get_location('Child Fishing'), lambda state: state.has('Kokiri Sword')) set_rule(world.get_location('Adult Fishing'), lambda state: state.is_adult() and (state.has('Progressive Hookshot') or state.has('Magic Bean'))) + set_rule(world.get_location('Lake Hylia Freestanding PoH'), lambda state: state.is_adult() and (state.has('Progressive Hookshot') or state.has('Magic Bean'))) set_rule(world.get_location('Lake Hylia Sun'), lambda state: state.has('Progressive Hookshot', 2) and state.has('Bow') and state.is_adult()) set_rule(world.get_entrance('Crater Hover Boots'), lambda state: state.is_adult() and state.has('Hover Boots')) set_rule(world.get_entrance('Crater Ascent'), lambda state: state.is_adult() and (state.has('Goron Tunic') or (state.has('Progressive Wallet') and state.has('Bomb Bag'))) and (state.has('Hover Boots') or state.has('Hammer'))) @@ -179,6 +188,7 @@ def global_rules(world): set_rule(world.get_entrance('Crater Bridge Reverse'), lambda state: state.is_adult() and (state.has('Hover Boots') or state.has('Progressive Hookshot'))) set_rule(world.get_entrance('Crater Warp Pad'), lambda state: state.has('Bolero of Fire')) set_rule(world.get_entrance('Crater Fairy'), lambda state: state.is_adult() and state.has('Hammer')) + set_rule(world.get_location('DM Crater Volcano Freestanding PoH'), lambda state: state.is_adult() and state.has('Magic Bean') and state.has('Bolero of Fire')) set_rule(world.get_entrance('Fire Temple Entrance'), lambda state: state.is_adult() and (state.has('Goron Tunic') or (state.has('Progressive Wallet') and state.has('Bomb Bag')))) set_rule(world.get_entrance('Fire Temple Early Climb'), lambda state: state.has('Small Key (Fire Temple)', 3) and state.has('Progressive Strength Upgrade') and (state.has('Bomb Bag') or ((state.has('Bow') or state.has('Progressive Hookshot')) and state.is_adult()))) set_rule(world.get_entrance('Fire Temple Fire Maze Escape'), lambda state: state.has('Small Key (Fire Temple)', 7) or (state.has('Small Key (Fire Temple)', 6) and state.has('Hover Boots') and state.has('Hammer') and state.is_adult())) @@ -194,11 +204,13 @@ def global_rules(world): set_rule(world.get_location('Fire Temple Highest Goron Chest'), lambda state: state.has('Song of Time') and state.has('Hammer') and state.is_adult()) set_rule(world.get_location('Fire Temple Megaton Hammer Chest'), lambda state: state.has('Bomb Bag')) set_rule(world.get_location('Volvagia'), lambda state: state.has('Hammer') and state.is_adult() and state.has('Boss Key (Fire Temple)') and (state.has('Hover Boots') or (state.can_reach('Fire Temple Upper') and (state.has('Song of Time') or state.has('Bomb Bag'))))) + set_rule(world.get_location('Volvagia Heart'), lambda state: state.has('Hammer') and state.is_adult() and state.has('Boss Key (Fire Temple)') and (state.has('Hover Boots') or (state.can_reach('Fire Temple Upper') and (state.has('Song of Time') or state.has('Bomb Bag'))))) set_rule(world.get_location('Sheik in Crater'), lambda state: state.is_adult()) set_rule(world.get_location('Link the Goron'), lambda state: state.is_adult() and (state.has('Progressive Strength Upgrade') or state.has('Bomb Bag'))) set_rule(world.get_entrance('Crater Access'), lambda state: state.is_adult() and (state.has('Progressive Strength Upgrade') or state.has('Bomb Bag'))) set_rule(world.get_entrance('Lake Warp Pad'), lambda state: state.has('Serenade of Water')) set_rule(world.get_location('King Zora Thawed'), lambda state: state.has_bottle() and (state.can_reach('Ice Cavern') or state.can_reach('Ganons Castle Water Trial') or state.has('Progressive Wallet', 2))) + set_rule(world.get_location('Zoras Fountain Bottom Freestanding PoH'), lambda state: state.has('Iron Boots')) set_rule(world.get_entrance('Water Temple Entrance'), lambda state: state.is_adult() and (state.has('Zora Tunic') or (state.has('Progressive Wallet', 2) and state.has_bottle() and state.has('Zeldas Lullaby'))) and state.has('Iron Boots') and state.has('Progressive Hookshot')) set_rule(world.get_entrance('Water Temple Central Pillar'), lambda state: (state.has('Bow') or (state.has('Dins Fire') and state.has('Magic Meter')) or state.has('Small Key (Water Temple)', 5)) and state.has('Zeldas Lullaby')) set_rule(world.get_entrance('Water Temple Upper Locked Door'), lambda state: state.has('Small Key (Water Temple)', 5) and (state.has('Zeldas Lullaby') or world.keysanity)) @@ -208,6 +220,7 @@ def global_rules(world): set_always_allow(world.get_location('Water Temple Boss Key Chest'), lambda state, item: item.name == 'Small Key (Water Temple)') set_rule(world.get_location('Water Temple Boss Key Chest'), lambda state: (state.has('Small Key (Water Temple)', 6) and (state.has('Zeldas Lullaby') or world.keysanity) and ((state.has('Bomb Bag') and state.has('Progressive Strength Upgrade')) or state.has('Hover Boots')) and state.has('Progressive Hookshot', 2)) or item_name(state, 'Water Temple Boss Key Chest') == 'Small Key (Water Temple)') #If key for key, this lets the logic reduce the small key reqs for every other locked door. set_rule(world.get_location('Morpha'), lambda state: state.has('Boss Key (Water Temple)') and state.has('Progressive Hookshot', 2)) + set_rule(world.get_location('Morpha Heart'), lambda state: state.has('Boss Key (Water Temple)') and state.has('Progressive Hookshot', 2)) set_rule(world.get_location('Water Temple Cracked Wall Chest'), lambda state: state.has('Bomb Bag')) set_rule(world.get_location('Water Temple Dark Link Chest'), lambda state: state.has('Small Key (Water Temple)', 6) and (state.has('Zeldas Lullaby') or world.keysanity)) set_rule(world.get_location('Water Temple River Chest'), lambda state: state.has('Small Key (Water Temple)', 6) and state.has('Song of Time') and state.has('Bow') and (state.has('Zeldas Lullaby') or world.keysanity)) @@ -216,12 +229,14 @@ def global_rules(world): set_rule(world.get_entrance('Shadow Temple Entrance'), lambda state: state.has('Dins Fire') and state.has('Magic Meter') and state.has('Lens of Truth') and state.is_adult() and (state.has('Hover Boots') or state.has('Progressive Hookshot'))) set_rule(world.get_entrance('Shadow Temple First Pit'), lambda state: state.has('Hover Boots')) set_rule(world.get_entrance('Shadow Temple Bomb Wall'), lambda state: state.has('Bomb Bag') and state.has('Small Key (Shadow Temple)', 1)) - set_rule(world.get_entrance('Shadow Temple Hookshot Target'), lambda state: state.has('Progressive Hookshot') and state.has('Small Key (Shadow Temple)', 2)) - set_rule(world.get_entrance('Shadow Temple Boat'), lambda state: state.has('Progressive Strength Upgrade') and state.has('Zeldas Lullaby') and state.has('Small Key (Shadow Temple)', 3)) + set_rule(world.get_entrance('Shadow Temple Hookshot Target'), lambda state: state.has('Progressive Hookshot') and state.has('Small Key (Shadow Temple)', 3)) + set_rule(world.get_entrance('Shadow Temple Boat'), lambda state: state.has('Progressive Strength Upgrade') and state.has('Zeldas Lullaby') and state.has('Small Key (Shadow Temple)', 4)) set_rule(world.get_location('Shadow Temple Falling Spikes Upper Chest'), lambda state: state.has('Progressive Strength Upgrade')) set_rule(world.get_location('Shadow Temple Falling Spikes Switch Chest'), lambda state: state.has('Progressive Strength Upgrade')) set_rule(world.get_location('Shadow Temple Invisible Spikes Chest'), lambda state: state.has('Small Key (Shadow Temple)', 2)) - set_rule(world.get_location('Bongo Bongo'), lambda state: state.has('Small Key (Shadow Temple)', 4) and state.has('Bow') and state.has('Boss Key (Shadow Temple)')) + set_rule(world.get_location('Shadow Temple Freestanding Key'), lambda state: state.has('Small Key (Shadow Temple)', 2) and state.has('Progressive Hookshot')) + set_rule(world.get_location('Bongo Bongo'), lambda state: state.has('Small Key (Shadow Temple)', 5) and state.has('Bow') and state.has('Boss Key (Shadow Temple)')) + set_rule(world.get_location('Bongo Bongo Heart'), lambda state: state.has('Small Key (Shadow Temple)', 5) and state.has('Bow') and state.has('Boss Key (Shadow Temple)')) set_rule(world.get_entrance('Bridge Crossing'), lambda state: (state.has('Epona') or state.has('Progressive Hookshot', 2)) and state.is_adult()) set_rule(world.get_location('Gerudo Valley Hammer Rocks Chest'), lambda state: state.has('Hammer') and state.is_adult()) set_rule(world.get_entrance('Fortress Entrance'), lambda state: (state.has('Bow') or state.has('Progressive Hookshot') or state.has('Hover Boots')) and state.is_adult()) @@ -230,6 +245,7 @@ def global_rules(world): set_rule(world.get_entrance('Haunted Wasteland Crossing'), lambda state: state.has('Lens of Truth') and state.has('Magic Meter')) set_rule(world.get_entrance('Colossus Warp Pad'), lambda state: state.has('Requiem of Spirit')) set_rule(world.get_entrance('Colossus Fairy'), lambda state: state.has('Bomb Bag')) + set_rule(world.get_location('Colossus Freestanding PoH'), lambda state: state.has('Requiem of Spirit') and state.has('Magic Bean') and state.is_adult()) set_rule(world.get_location('Desert Colossus Fairy Reward'), lambda state: state.has('Zeldas Lullaby')) set_rule(world.get_location('Gerudo Fortress Rooftop Chest'), lambda state: (state.has('Hover Boots') or state.has('Progressive Hookshot', 2)) and state.is_adult()) set_rule(world.get_location('Horseback Archery 1000 Points'), lambda state: state.has('Gerudo Membership Card') and state.has('Epona') and state.has('Bow') and state.is_adult()) @@ -237,7 +253,7 @@ def global_rules(world): set_rule(world.get_location('Haunted Wasteland Structure Chest'), lambda state: state.has_fire_source()) set_rule(world.get_entrance('Gerudo Training Ground Left Silver Rupees'), lambda state: state.has('Progressive Hookshot') and state.is_adult()) set_rule(world.get_entrance('Gerudo Training Ground Beamos'), lambda state: state.has('Bomb Bag')) - set_rule(world.get_entrance('Gerudo Training Grounds Right Locked Doors'), lambda state: False) # The nature of the logic in here makes this path only open if you can also get to the destination otherwise. + set_rule(world.get_entrance('Gerudo Training Grounds Right Locked Doors'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 9)) set_rule(world.get_entrance('Gerudo Training Grounds Maze Ledge'), lambda state: state.has('Song of Time')) set_rule(world.get_entrance('Gerudo Training Grounds Right Hookshot Target'), lambda state: state.has('Progressive Hookshot') and state.is_adult()) set_rule(world.get_entrance('Gerudo Training Grounds Hammer Target'), lambda state: state.has('Hammer') and state.has('Bow') and state.is_adult()) @@ -245,12 +261,12 @@ def global_rules(world): set_rule(world.get_location('Gerudo Training Grounds Lobby Left Chest'), lambda state: state.has('Bow') and state.is_adult()) set_rule(world.get_location('Gerudo Training Grounds Lobby Right Chest'), lambda state: state.has('Bow') and state.is_adult()) set_rule(world.get_location('Gerudo Training Grounds Beamos Chest'), lambda state: state.has('Bomb Bag')) - set_rule(world.get_location('Gerudo Training Grounds Hidden Ceiling Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 2) and state.has('Lens of Truth') and state.has('Magic Meter')) - set_rule(world.get_location('Gerudo Training Grounds Maze Path First Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 3)) - set_rule(world.get_location('Gerudo Training Grounds Maze Path Second Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 5)) - set_rule(world.get_location('Gerudo Training Grounds Maze Path Third Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 6)) + set_rule(world.get_location('Gerudo Training Grounds Hidden Ceiling Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 3) and state.has('Lens of Truth') and state.has('Magic Meter')) + set_rule(world.get_location('Gerudo Training Grounds Maze Path First Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 4)) + set_rule(world.get_location('Gerudo Training Grounds Maze Path Second Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 6)) + set_rule(world.get_location('Gerudo Training Grounds Maze Path Third Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 7)) set_always_allow(world.get_location('Gerudo Training Grounds Maze Path Final Chest'), lambda state, item: item.name == 'Small Key (Gerudo Training Grounds)') - set_rule(world.get_location('Gerudo Training Grounds Maze Path Final Chest'), lambda state: (state.has('Small Key (Gerudo Training Grounds)', 8)) or (item_name(state, 'Gerudo Training Grounds Maze Path Final Chest') == 'Small Key (Gerudo Training Grounds)' and state.has('Small Key (Gerudo Training Grounds)', 7))) #Allow key for key + set_rule(world.get_location('Gerudo Training Grounds Maze Path Final Chest'), lambda state: (state.has('Small Key (Gerudo Training Grounds)', 9)) or (item_name(state, 'Gerudo Training Grounds Maze Path Final Chest') == 'Small Key (Gerudo Training Grounds)' and state.has('Small Key (Gerudo Training Grounds)', 8))) #Allow key for key set_rule(world.get_location('Gerudo Training Grounds Underwater Silver Rupee Chest'), lambda state: state.has('Progressive Hookshot') and state.has('Song of Time') and state.has('Iron Boots') and state.is_adult()) set_rule(world.get_location('Gerudo Training Grounds Hammer Room Switch Chest'), lambda state: state.has('Hammer') and state.is_adult()) set_rule(world.get_location('Gerudo Training Grounds Eye Statue Chest'), lambda state: state.has('Bow') and state.is_adult()) @@ -285,6 +301,7 @@ def global_rules(world): set_rule(world.get_location('Spirit Temple Boss Key Chest'), lambda state: state.has('Zeldas Lullaby') and state.has('Bow') and state.has('Progressive Hookshot') and state.can_blast()) set_rule(world.get_location('Spirit Temple Topmost Chest'), lambda state: state.has('Mirror Shield')) set_rule(world.get_location('Twinrova'), lambda state: state.has('Mirror Shield') and state.has('Bomb Bag') and state.has('Progressive Hookshot') and state.has('Boss Key (Spirit Temple)')) + set_rule(world.get_location('Twinrova Heart'), lambda state: state.has('Mirror Shield') and state.has('Bomb Bag') and state.has('Progressive Hookshot') and state.has('Boss Key (Spirit Temple)')) set_rule(world.get_location('Zelda'), lambda state: state.has('Shadow Medallion') and state.has('Spirit Medallion')) set_rule(world.get_entrance('Ganons Castle Light Trial'), lambda state: state.has('Progressive Strength Upgrade', 3)) set_rule(world.get_entrance('Ganons Castle Tower'), lambda state: state.has('Forest Trial Clear') and state.has('Fire Trial Clear') and state.has('Water Trial Clear') and state.has('Shadow Trial Clear') and state.has('Spirit Trial Clear') and state.has('Light Trial Clear')) @@ -319,6 +336,7 @@ def global_rules(world): set_rule(world.get_entrance('Top of Crater Grotto'), lambda state: state.can_blast()) set_rule(world.get_entrance('Zora River Plateau Open Grotto'), lambda state: state.has('Bomb Bag') or state.has('Progressive Scale') or state.is_adult()) set_rule(world.get_entrance('Zora River Plateau Bombable Grotto'), lambda state: state.can_blast()) + set_rule(world.get_location('Tektite Grotto Freestanding PoH'), lambda state: state.has('Progressive Scale', 2) or (state.has('Iron Boots') and state.is_adult())) set_rule(world.get_location('GS2'), lambda state: state.has_bottle()) set_rule(world.get_location('GS3'), lambda state: state.has('Progressive Hookshot') and state.is_adult()) set_rule(world.get_location('GS4'), lambda state: state.has_bottle()) @@ -374,12 +392,12 @@ def global_rules(world): set_rule(world.get_location('GS75'), lambda state: state.has('Progressive Hookshot', 2)) set_rule(world.get_location('GS76'), lambda state: state.has('Progressive Hookshot', 2)) set_rule(world.get_location('GS77'), lambda state: state.has('Progressive Hookshot', 2) and ((state.has('Bomb Bag') and state.has('Progressive Strength Upgrade')) or state.has('Hover Boots')) and state.has('Small Key (Water Temple)', 6)) #5 keys would be better but it wouldn't be compatible with the key for key scenarios, 6 will be identical pre-keysanity. - set_rule(world.get_location('GS78'), lambda state: state.has('Small Key (Bottom of the Well)', 2) and state.has('Boomerang') and (state.has('Progressive Strength Upgrade') or state.has('Bomb Bag') or (state.has('Lens of Truth') and state.has('Magic Meter')))) - set_rule(world.get_location('GS79'), lambda state: state.has('Small Key (Bottom of the Well)', 2) and state.has('Boomerang')) - set_rule(world.get_location('GS80'), lambda state: state.has('Small Key (Bottom of the Well)', 2) and state.has('Boomerang')) + set_rule(world.get_location('GS78'), lambda state: state.has('Small Key (Bottom of the Well)', 3) and state.has('Boomerang') and (state.has('Progressive Strength Upgrade') or state.has('Bomb Bag') or (state.has('Lens of Truth') and state.has('Magic Meter')))) + set_rule(world.get_location('GS79'), lambda state: state.has('Small Key (Bottom of the Well)', 3) and state.has('Boomerang')) + set_rule(world.get_location('GS80'), lambda state: state.has('Small Key (Bottom of the Well)', 3) and state.has('Boomerang')) set_rule(world.get_location('GS81'), lambda state: state.has('Progressive Hookshot')) set_rule(world.get_location('GS82'), lambda state: state.has('Progressive Hookshot')) - set_rule(world.get_location('GS84'), lambda state: state.has('Progressive Hookshot', 2) and state.has('Progressive Strength Upgrade') and state.has('Small Key (Shadow Temple)', 3)) + set_rule(world.get_location('GS84'), lambda state: state.has('Progressive Hookshot', 2) and state.has('Progressive Strength Upgrade') and state.has('Small Key (Shadow Temple)', 4)) set_rule(world.get_location('GS86'), lambda state: state.has('Boomerang')) set_rule(world.get_location('GS87'), lambda state: state.has_bottle()) set_rule(world.get_location('GS88'), lambda state: state.has('Progressive Hookshot') and state.is_adult()) @@ -436,6 +454,36 @@ def global_rules(world): 'Deku Salesman Lost Woods Grotto', 'Deku Salesman Hyrule Field Grotto', 'Underwater Bottle', + 'Shadow Temple Freestanding Key', + 'Bottom of the Well Freestanding Key', + 'Gerudo Training Grounds Freestanding Key', + 'Ice Cavern Freestanding PoH', + 'Impa House Freestanding PoH', + 'Tektite Grotto Freestanding PoH', + 'Windmill Freestanding PoH', + 'Dampe Race Freestanding PoH', + 'Lon Lon Tower Freestanding PoH', + 'Graveyard Freestanding PoH', + 'Zora River Lower Freestanding PoH', + 'Zora River Upper Freestanding PoH', + 'Lake Hylia Freestanding PoH', + 'Zoras Fountain Iceberg Freestanding PoH', + 'Zoras Fountain Bottom Freestanding PoH', + 'Gerudo Valley Waterfall Freestanding PoH', + 'Gerudo Valley Crate Freestanding PoH', + 'Colossus Freestanding PoH', + 'DM Trail Freestanding PoH', + 'DM Crater Wall Freestanding PoH', + 'DM Crater Volcano Freestanding PoH', + 'Goron City Pot Freestanding PoH', + 'Queen Gohma Heart', + 'King Dodongo Heart', + 'Barinade Heart', + 'Phantom Ganon Heart', + 'Volvagia Heart', + 'Morpha Heart', + 'Twinrova Heart', + 'Bongo Bongo Heart' ] for location in no_ice_traps: forbid_item(world.get_location(location), 'Ice Trap') From 6be60f1e30c1e789b13e48dfa5f1325f97c30f04 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Wed, 30 May 2018 04:44:34 -0500 Subject: [PATCH 057/151] Owl always goes down mountain In theory this is everything. This all is about 0% tested. --- Rom.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Rom.py b/Rom.py index d8cc54a15..5124789ef 100644 --- a/Rom.py +++ b/Rom.py @@ -647,6 +647,9 @@ def patch_rom(world, rom): rom.write_bytes(0xDCBF32, [0x42, 0x30]) #set child fish size requirement rom.write_bytes(0xDCBF9E, [0x42, 0x30]) #set child fish size requirement + # Allow owl to always carry the kid down Death Mountain + rom.write_bytes(0xE304F0, [0x24, 0x0E, 0x00, 0x01]) + # Forbid Sun's Song from a bunch of cutscenes Suns_scenes = [0x2016FC9, 0x2017219, 0x20173D9, 0x20174C9, 0x2017679, 0x20C1539, 0x20C15D9, 0x21A0719, 0x21A07F9, 0x2E90129, 0x2E901B9, 0x2E90249, 0x225E829, 0x225E939, 0x306D009] for address in Suns_scenes: From f82e9ae04290e85d228467cbd5b855463c5462aa Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Wed, 30 May 2018 04:54:09 -0500 Subject: [PATCH 058/151] Restore proper files and minor logic tweak --- Compress/Compress | Bin 50688 -> 22584 bytes Decompress/Decompress.exe | Bin 0 -> 23552 bytes Rules.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 Decompress/Decompress.exe diff --git a/Compress/Compress b/Compress/Compress index 5698756fe02838d606db2d10376b5098f8903bd2..1386ef9776b14f16380a349be5d4eb32cc90ddc6 100755 GIT binary patch literal 22584 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 literal 50688 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 Qt|i;rn-`{K={gVm2MVy)xBvhE diff --git a/Decompress/Decompress.exe b/Decompress/Decompress.exe new file mode 100644 index 0000000000000000000000000000000000000000..b6a57b3028ec93bc6c665d150e4128f1ba681284 GIT binary patch literal 23552 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 literal 0 HcmV?d00001 diff --git a/Rules.py b/Rules.py index 5d76a756b..65b6aff24 100644 --- a/Rules.py +++ b/Rules.py @@ -171,7 +171,7 @@ def global_rules(world): set_rule(world.get_location('Phantom Ganon'), lambda state: state.has('Boss Key (Forest Temple)')) set_rule(world.get_location('Phantom Ganon Heart'), lambda state: state.has('Boss Key (Forest Temple)')) set_rule(world.get_entrance('Dampes Grave'), lambda state: state.is_adult()) - set_rule(world.get_location('Graveyard Freestanding PoH'), lambda state: state.is_adult() and state.has('Magic Bean')) + set_rule(world.get_location('Graveyard Freestanding PoH'), lambda state: state.is_adult() and (state.has('Magic Bean') or state.has('Progressive Hookshot', 2))) set_rule(world.get_location('Song at Windmill'), lambda state: state.is_adult()) set_rule(world.get_location('Windmill Freestanding PoH'), lambda state: (state.is_adult() and state.has('Song of Time')) or state.has('Boomerang')) set_rule(world.get_entrance('Temple Warp Pad'), lambda state: state.has('Prelude of Light')) From d91b58d11e3c661f446d8c6b18ab9f80adbdd430 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Wed, 30 May 2018 21:48:06 -0500 Subject: [PATCH 059/151] Dampe Grave Digging Tour RNG removed --- Rom.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Rom.py b/Rom.py index 5124789ef..425f52826 100644 --- a/Rom.py +++ b/Rom.py @@ -647,6 +647,10 @@ def patch_rom(world, rom): rom.write_bytes(0xDCBF32, [0x42, 0x30]) #set child fish size requirement rom.write_bytes(0xDCBF9E, [0x42, 0x30]) #set child fish size requirement + # Dampe always digs something up and first dig is always the Piece of Heart + rom.write_bytes(0xCC3FA8, [0xA2, 0x01, 0x01, 0xF8]) + rom.write_bytes(0xCC4024, [0x00, 0x00, 0x00, 0x00]) + # Allow owl to always carry the kid down Death Mountain rom.write_bytes(0xE304F0, [0x24, 0x0E, 0x00, 0x01]) From b0319f294fe5ae33751c4f6cac84bb1dfd5afab1 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 31 May 2018 00:23:40 -0400 Subject: [PATCH 060/151] Refactor override system, use flag for chest overrides --- ASM/src/config.asm | 33 ++---- ASM/src/hacks.asm | 12 +- ASM/src/item_data.asm | 3 +- ASM/src/items.asm | 243 +++++++++++++++++++++++++++-------------- BaseClasses.py | 2 - ItemOverrides.py | 82 -------------- Main.py | 2 - Regions.py | 48 ++++---- Rom.py | 58 +++++----- Rules.py | 78 +------------ data/base2current.json | 2 +- 11 files changed, 236 insertions(+), 327 deletions(-) delete mode 100755 ItemOverrides.py diff --git a/ASM/src/config.asm b/ASM/src/config.asm index 3eb3de8db..52a9d8f3a 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -8,30 +8,11 @@ ; four 0x00 bytes (which will happen by default as long as you don't fill the allotted space). ; ; Row format (4 bytes): -; SSOOCCNN +; SSTTIINN ; SS = Scene -; OO = Old item ID or Collectible Flag (depending on value of CC) -; CC = 0x01 for collectible overrides, 0x00 otherwise +; TT = Override Type (0x00 = base item, 0x01 = chest, 0x02 = collectable) +; II = Override ID (base item or flag) ; NN = New item ID -; -; Generic grotto virtual scene numbers: -; 0x70: Hyrule Field: under boulder west of drawbridge -; 0x72: Hyrule Field: under boulder in remote southern trees -; 0x73: Hyrule Field: open hole outside Lake Hylia fences -; 0x78: Kakariko: open hole behind fence -; 0x79: Zora River: open hole on plateau -; 0x7C: Kokiri Forest: SoS hole by the gossip stone -; 0x84: Lost Woods: under boulder next to Goron City warp -; 0x87: Death Mountain: SoS hole outside Goron City -; 0x8A: Death Mountain Crater: under boulder in circle of rocks near top entrance -; -; Other grotto virtual scene numbers: -; 0x71: Hyrule Field: Underwater heart piece -; 0x76: Hyrule Field: Salesman grotto -; 0x77: Redead grotto -; 0x7D: Wolfos grotto -; 0x83: Deku Theater -; 0x85: Lost Woods: Salesman grotto .area 0x400, 0 ITEM_OVERRIDES: @@ -40,9 +21,9 @@ ITEM_OVERRIDES: ; 0x03481400: Special items FAIRY_ITEMS: -.byte 0x00 ; Farore's Wind Fairy -.byte 0x00 ; Din's Fire Fairy -.byte 0x00 ; Nayru's Love Fairy +.byte 0x5D ; Farore's Wind Fairy +.byte 0x5C ; Din's Fire Fairy +.byte 0x5E ; Nayru's Love Fairy LIGHT_ARROW_ITEM: -.byte 0x00 +.byte 0x5A .align 4 diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 86a404228..8b08d116e 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -35,9 +35,15 @@ nop ;================================================================================================== -; Extended items +; Item Overrides ;================================================================================================== +; Patch NPCs to give override-compatible items +.org 0xDB13D3 :: .byte 0x76 ; Frog Ocarina Game +.org 0xDF264F :: .byte 0x76 ; Ocarina memory game +.org 0xE2F093 :: .byte 0x34 ; Bombchu Bowling Bomb Bag +.org 0xEC9CE7 :: .byte 0x7A ; Deku Theater Mask of Truth + ; Runs when storing the pending item to the player instance ; Replaces: ; sb a2, 0x0424 (a3) @@ -121,10 +127,6 @@ .org 0xBE9BDC ; In memory: 0x803A4BCC addiu at, r0, 0x8383 ; Make branch impossible -; Replace all generic grotto prizes with boomerangs -.org 0xE9A550 -.fill 8, 0x06 - ;================================================================================================== ; Special item sources ;================================================================================================== diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index 06267bf17..f5632e462 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -18,7 +18,8 @@ .definelabel FORT, 12 .definelabel CASTLE, 13 -; Item rows are 16 bytes long +.definelabel ITEM_TABLE_ROW_SIZE, 0x10 + .macro Item_Row, action_id, graphic_id, text_id, object_id, upgrade_fn, effect_fn, effect_arg1, effect_arg2 .halfword action_id ; 0x00 .byte graphic_id ; 0x02 diff --git a/ASM/src/items.asm b/ASM/src/items.asm index e48b0b7ef..5852bcd51 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -203,136 +203,212 @@ override_light_arrow_cutscene: store_item_data_hook: sb a2, 0x0424 (a3) ; Displaced code - addiu sp, sp, -0x18 + addiu sp, sp, -0x20 sw v0, 0x10 (sp) - sw ra, 0x14 (sp) + sw v1, 0x14 (sp) + sw ra, 0x18 (sp) jal store_item_data nop lw v0, 0x10 (sp) - lw ra, 0x14 (sp) - addiu sp, sp, 0x18 + lw v1, 0x14 (sp) + lw ra, 0x18 (sp) + addiu sp, sp, 0x20 jr ra nop ;================================================================================================== store_item_data: - addiu sp, sp, -0x28 - sw s0, 0x10 (sp) - sw s1, 0x14 (sp) - sw s2, 0x18 (sp) - sw ra, 0x20 (sp) + addiu sp, sp, -0x18 + sw ra, 0x10 (sp) - li s1, PLAYER_ACTOR - lb t0, 0x0424 (s1) - beqz t0, @@return + ; Clear current item data + li t0, CURRENT_ITEM_DATA + li t1, -1 + sw t1, 0x00 (t0) + sw t1, 0x04 (t0) + sw t1, 0x08 (t0) - abs s0, t0 ; s0 = item ID being received + li t0, PLAYER_ACTOR + lb t1, 0x0424 (t0) + beqz t1, @@return + nop - ; Clear current item data - li t0, -1 - li t1, CURRENT_ITEM_DATA - sw t0, 0x00 (t1) - sw t0, 0x04 (t1) - sw t0, 0x08 (t1) + abs a0, t1 + lw a1, 0x0428 (t0) + jal lookup_override ; v0 = new item ID from override + nop + bltz v0, @@return + nop + + ori a0, v0, 0 + jal resolve_extended_item ; v0 = resolved item ID, v1 = ITEM_TABLE entry + nop + beqz v1, @@not_extended + nop + + ; Store extended item data + li t0, CURRENT_ITEM_DATA + lw t1, 0x00 (v1) + sw t1, 0x00 (t0) + lw t1, 0x04 (v1) + sw t1, 0x04 (t0) + lw t1, 0x08 (v1) + sw t1, 0x08 (t0) + b @@return + nop + +@@not_extended: + ; For non-extended item IDs, put it back in the player instance and let the game handle it + li t0, PLAYER_ACTOR + lb t1, 0x0424 (t0) + bgez t1, @@not_negative + nop + ; The input was negative (item is coming from a chest), so make the result negative + subu v0, r0, v0 +@@not_negative: + sb v0, 0x0424 (t0) + +@@return: + lw ra, 0x10 (sp) + addiu sp, sp, 0x18 + jr ra + nop + +;================================================================================================== + +lookup_override: + ; a0 = item ID being received + ; a1 = actor giving the item + + addiu sp, sp, -0x18 + sw ra, 0x10 (sp) + + jal get_override_search_key + nop + ori a0, v0, 0 + jal scan_override_table + nop + + lw ra, 0x10 (sp) + addiu sp, sp, 0x18 + jr ra + nop + +;================================================================================================== + +get_override_search_key: + ; a0 = item ID being received + ; a1 = actor giving the item ; Load the current scene number - li t0, GLOBAL_CONTEXT - lhu t0, 0xA4 (t0) + li v0, GLOBAL_CONTEXT + lhu v0, 0xA4 (v0) - ; If this is a generic grotto, construct a virtual scene number - bne t0, 0x3E, @@not_grotto + li t0, 0x00 ; t0 = override type + ori t1, a0, 0 ; t1 = override ID + lhu t2, 0x00 (a1) ; t2 = actor ID + + bne t2, 0x000A, @@not_chest nop - li t0, SAVE_CONTEXT - lw t0, 0x1394 (t0) ; Grotto chest contents + flags - andi t0, t0, 0x1F ; Isolate chest flags - addiu t0, t0, 0x70 ; Grotto virtual scene numbers will range from 0x70 to 0x8F -@@not_grotto: - - ; For free-standing collectibles, use their flag variable to look up an override - ; instead of a base item ID. - li t1, 0x00 ; t1 will be 1 for collectibles, 0 otherwise - ori t2, s0, 0 ; t2 will be collectible flag or the base item - lw t3, 0x428 (s1) ; t3 = actor instance giving the item - lhu t4, 0x00 (t3) ; t4 = actor ID - bne t4, 0x0015, @@not_collectible - nop - li t1, 0x01 - lbu t2, 0x0141 (t3) ; t2 = collectible flag + beq v0, 0x10, @@not_chest ; Scene 0x10 = treasure chest game, use item-based override here + nop + li t0, 0x01 + lhu t1, 0x1C (a1) + andi t1, t1, 0x1F ; t1 = chest flag +@@not_chest: + + bne t2, 0x0015, @@not_collectible + nop + li t0, 0x02 + lbu t1, 0x0141 (a1) ; t1 = collectible flag @@not_collectible: ; Construct ID used to search the override table - ; t0 = (scene << 16) | (item_or_flag << 8) | is_collectible - sll t0, t0, 8 - or t0, t0, t2 - sll t0, t0, 8 - or t0, t0, t1 + ; v0 = (scene << 16) | (override_type << 8) | override_id + sll v0, v0, 8 + or v0, v0, t0 + sll v0, v0, 8 + or v0, v0, t1 + + jr ra + nop + +;================================================================================================== + +scan_override_table: + ; a0 = override search key + + li v0, -1 ; Look up override - li t1, (ITEM_OVERRIDES - 0x04) + li t0, (ITEM_OVERRIDES - 0x04) @@lookup_loop: - addiu t1, t1, 0x04 - lw t2, 0x00 (t1) ; t2 = override entry - srl t2, t2, 8 ; t2 = ID part of entry (first 3 bytes) - beqz t2, @@not_extended ; Reached end of override table + addiu t0, t0, 0x04 + lw t1, 0x00 (t0) ; t1 = override entry + beqz t1, @@return ; Reached end of override table + nop + srl t2, t1, 8 ; t2 = override key + bne t2, a0, @@lookup_loop nop - bne t2, t0, @@lookup_loop + + andi v0, t1, 0xFF ; v0 = found item ID + +@@return: + jr ra nop - lbu s0, 0x03 (t1) ; s0 = item ID found in ITEM_OVERRIDES +;================================================================================================== + +resolve_extended_item: + ; a0 = input item ID + + addiu sp, sp, -0x20 + sw s0, 0x10 (sp) + sw s1, 0x14 (sp) + sw ra, 0x18 (sp) + + ori v0, a0, 0 ; Return resolved item ID in v0 - ori v0, s0, 0 -@@resolve_item: +@@loop: ori s0, v0, 0 addiu t0, s0, -0x80 ; t0 = index into extended ITEM_TABLE bltz t0, @@not_extended ; Item IDs in range 0x00 - 0x7F are not extended nop - ; Load ITEM_TABLE row - li s2, ITEM_TABLE - sll t0, t0, 4 ; t0 = offset into table = index * 16 - addu s2, s2, t0 ; s2 = pointer to ITEM_TABLE row + ; Load table entry + li s1, ITEM_TABLE + li t1, ITEM_TABLE_ROW_SIZE + mult t0, t1 + mflo t0 + addu s1, s1, t0 ; s1 = pointer to table entry ; Check whether this item will upgrade into another item ; Conventions for upgrade functions: ; - They receive a pointer to the save context in a0 - ; - They receive their item ID in s0 + ; - They receive their item ID in a1 ; - They store their result in v0 - lw t0, 0x0C (s2) ; t0 = upgrade function li a0, SAVE_CONTEXT - jalr t0 + ori a1, s0, 0 + lw t0, 0x0C (s1) + jalr t0 ; v0 = upgraded item ID nop ; If the upgrade function returned a new item ID, start resolution over again - bne v0, s0, @@resolve_item + bne v0, s0, @@loop nop - ; Store extended item data - li t2, CURRENT_ITEM_DATA - lw t3, 0x00 (s2) - sw t3, 0x00 (t2) - lw t3, 0x04 (s2) - sw t3, 0x04 (t2) - lw t3, 0x08 (s2) - sw t3, 0x08 (t2) + ori v1, s1, 0 ; Return pointer to ITEM_TABLE entry in v1 b @@return nop @@not_extended: - ; For non-extended item IDs, put it back in the player instance and let the game handle it - lb t0, 0x0424 (s1) - bgez t0, @@not_negative - nop - ; The input was negative (item is coming from a chest), so make the result negative - subu s0, r0, s0 -@@not_negative: - sb s0, 0x0424 (s1) + li v1, 0 @@return: lw s0, 0x10 (sp) lw s1, 0x14 (sp) - lw s2, 0x18 (sp) - lw ra, 0x20 (sp) - addiu sp, sp, 0x28 + lw ra, 0x18 (sp) + addiu sp, sp, 0x20 jr ra nop @@ -342,7 +418,7 @@ store_item_data: no_upgrade: jr ra - ori v0, s0, 0 + ori v0, a1, 0 ;================================================================================================== @@ -499,7 +575,7 @@ arrows_to_rupee: beqz t0, @@return li v0, 0x4D ; Blue Rupee - ori v0, s0, 0 + ori v0, a1, 0 @@return: jr ra @@ -514,7 +590,7 @@ bombs_to_rupee: beqz t0, @@return li v0, 0x4D ; Blue Rupee - ori v0, s0, 0 + ori v0, a1, 0 @@return: jr ra @@ -531,6 +607,7 @@ no_effect: ;================================================================================================== give_biggoron_sword: + ; a0 = save context li t0, 0x01 sb t0, 0x3E (a0) ; Set flag to make the sword durable jr ra diff --git a/BaseClasses.py b/BaseClasses.py index d2d9a54cd..d381372fc 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -497,8 +497,6 @@ def __init__(self, name='', address=None, address2=None, default=None, type='Che self.name = name self.parent_region = parent self.item = None - self.base_item = None - self.override_bytes = None self.address = address self.address2 = address2 self.default = default diff --git a/ItemOverrides.py b/ItemOverrides.py deleted file mode 100755 index 2e75f0ff7..000000000 --- a/ItemOverrides.py +++ /dev/null @@ -1,82 +0,0 @@ -import logging - -from Items import ItemFactory - - -def set_overrides(world): - filled = world.get_filled_locations() - by_scene = {} - for loc in filled: - if loc.scene is None: - continue - locations = by_scene.get(loc.scene, []) - locations.append(loc) - by_scene[loc.scene] = locations - - for scene, locations in sorted(by_scene.items()): - used_items = [loc.item.name for loc in locations] - available_base_items = [item for item in valid_base_items if item not in used_items] - for loc in locations: - if loc.item.index is None: - continue - - base_item = None - collectable_flag = None - - if loc.type == 'Collectable': - collectable_flag = loc.default - elif loc.type == 'Grotto': - base_item = 'Boomerang' - elif loc.name == 'Treasure Chest Game': - base_item = 'Piece of Heart (Treasure Chest Game)' - elif loc.type == 'BossHeart': - base_item = 'Heart Container (Boss)' - elif loc.item.index >= 0x80: - base_item = available_base_items.pop(0) - if not base_item: - raise RuntimeError('Ran out of base items to override') - else: - continue - - if base_item: - loc.base_item = ItemFactory(base_item) - logging.getLogger('').debug('Override %s -> %s in scene %s', loc.base_item, loc.item, '0x{0:0{1}X}'.format(scene, 2)) - - byte1 = loc.scene - byte2 = collectable_flag or loc.base_item.index - byte3 = 0x01 if collectable_flag else 0x00 - byte4 = loc.item.index - loc.override_bytes = [byte1, byte2, byte3, byte4] - -def get_overrides(world): - filled = world.get_locations() - result = [loc.override_bytes for loc in filled if loc.override_bytes] - result.sort() - return result - -valid_base_items = [ - 'Boomerang', - 'Lens of Truth', - 'Hammer', - 'Bottle', - 'Bottle with Milk', - 'Bottle with Letter', - 'Skull Mask', - 'Spooky Mask', - 'Keaton Mask', - 'Bunny Hood', - 'Mask of Truth', - 'Mirror Shield', - 'Iron Boots', - 'Hover Boots', - 'Stone of Agony', - 'Goron Mask', - 'Zora Mask', - 'Gerudo Mask', - 'Fire Arrows', - 'Ice Arrows', - 'Light Arrows', - 'Dins Fire', - 'Farores Wind', - 'Nayrus Love', -] diff --git a/Main.py b/Main.py index 067efda8d..811d07a70 100644 --- a/Main.py +++ b/Main.py @@ -15,7 +15,6 @@ from Dungeons import create_dungeons, fill_dungeons_restrictive from Fill import distribute_items_restrictive from ItemList import generate_itempool -from ItemOverrides import set_overrides from Utils import output_path __version__ = '1.0.0' @@ -71,7 +70,6 @@ def main(args, seed=None): outfilebase = 'OoT_%s%s%s%s_%s' % (world.bridge, "-openforest" if world.open_forest else "", "-opendoor" if world.open_door_of_time else "", "-beatableonly" if world.check_beatable_only else "", world.seed) if not args.suppress_rom: - set_overrides(world) rom = LocalRom(args.rom) patch_rom(world, rom) rom.write_to_file(output_path('%s.z64' % outfilebase)) diff --git a/Regions.py b/Regions.py index c62c72cb6..33bc04c98 100644 --- a/Regions.py +++ b/Regions.py @@ -96,7 +96,7 @@ def create_regions(world): create_dungeon_region('Shadow Temple Beyond Boat', ['Shadow Temple Spike Walls Left Chest', 'Shadow Temple Boss Key Chest', 'Shadow Temple Hidden Floormaster Chest', 'Bongo Bongo Heart', 'Bongo Bongo', 'GS85']), create_ow_region('Death Mountain', ['Death Mountain Bombable Chest', 'Biggoron', 'DM Trail Freestanding PoH', 'GS30', 'GS31', 'GS32', 'GS33'], ['Death Mountain Exit', 'Goron City Entrance', 'Mountain Crater Entrance', 'Mountain Summit Fairy', 'Dodongos Cavern Rocks', 'Mountain Bombable Grotto', 'Mountain Storms Grotto']), create_ow_region('Dodongos Cavern Entryway', None, ['Dodongos Cavern', 'Mountain Access from Behind Rock']), - create_ow_region('Goron City', ['Goron City Leftmost Maze Chest', 'Goron City Left Maze Chest', 'Goron City Right Maze Chest', 'Rolling Goron as Child', 'Link the Goron', 'GS34', 'GS35'], ['Goron City Exit', 'Goron City Bomb Wall', 'Darunias Chamber', 'Crater Access']), + create_ow_region('Goron City', ['Goron City Leftmost Maze Chest', 'Goron City Left Maze Chest', 'Goron City Right Maze Chest', 'Goron City Pot Freestanding PoH', 'Rolling Goron as Child', 'Link the Goron', 'GS34', 'GS35'], ['Goron City Exit', 'Goron City Bomb Wall', 'Darunias Chamber', 'Crater Access']), create_ow_region('Goron City Woods Warp', None, ['Goron City from Woods', 'Goron City to Woods']), create_ow_region('Darunias Chamber', ['Darunias Joy'], ['Darunias Chamber Exit']), create_ow_region('Death Mountain Crater Upper', ['DM Crater Wall Freestanding PoH', 'GS36'], ['Crater Exit', 'Crater Hover Boots', 'Crater Scarecrow', 'Top of Crater Grotto']), @@ -219,8 +219,8 @@ def _create_region(name, type, locations=None, exits=None): 'Gerudo Valley Hammer Rocks Chest': (0x213D676, None, 0x5AA0, 'Chest', 0x5A), 'Gerudo Fortress Rooftop Chest': (0x21BD4AA, 0x21BD6EA, 0x07C0, 'Chest', 0x5D), 'Haunted Wasteland Structure Chest': (0x21E20DE, None, 0x8AA0, 'Chest', 0x5E), - 'Redead Grotto Chest': (0x26CF076, None, 0x7ACA, 'Chest', 0x77), - 'Wolfos Grotto Chest': (0x26EB076, None, 0x7AB1, 'Chest', 0x7D), + 'Redead Grotto Chest': (0x26CF076, None, 0x7ACA, 'Chest', 0x3E), + 'Wolfos Grotto Chest': (0x26EB076, None, 0x7AB1, 'Chest', 0x3E), 'Deku Tree Lobby Chest': (0x24A7146, None, 0x0823, 'Chest', 0x00), 'Deku Tree Slingshot Chest': (0x24C20C6, None, 0x00A1, 'Chest', 0x00), 'Deku Tree Slingshot Room Side Chest': (0x24C20D6, None, 0x5905, 'Chest', 0x00), @@ -361,6 +361,15 @@ def _create_region(name, type, locations=None, exits=None): 'Ganons Castle Light Trail Invisible Enemies Chest': (0x321B15E, None, 0x7850, 'Chest', 0x0D), 'Ganons Castle Light Trial Lullaby Chest': (0x321B17E, None, 0x8851, 'Chest', 0x0D), 'Ganons Tower Boss Key Chest': (0x2F040EE, None, 0x27EB, 'Chest', 0x0A), + 'Field West Castle Town Grotto Chest': (None, None, 0x00, 'Chest', 0x3E), + 'Remote Southern Grotto Chest': (None, None, 0x02, 'Chest', 0x3E), + 'Field Near Lake Outside Fence Grotto Chest': (None, None, 0x03, 'Chest', 0x3E), + 'Kakariko Back Grotto Chest': (None, None, 0x08, 'Chest', 0x3E), + 'Zora River Plateau Open Grotto Chest': (None, None, 0x09, 'Chest', 0x3E), + 'Kokiri Forest Storms Grotto Chest': (None, None, 0x0C, 'Chest', 0x3E), + 'Lost Woods Generic Grotto Chest': (None, None, 0x14, 'Chest', 0x3E), + 'Mountain Storms Grotto Chest': (None, None, 0x17, 'Chest', 0x3E), + 'Top of Crater Grotto Chest': (None, None, 0x1A, 'Chest', 0x3E), 'Impa at Castle': (0x2E8E925, 0x2E8E925, 0x0A, 'Song', None), 'Song from Malon': (0xD7EB53, 0xD7EBCF, 0x09, 'Song', None), 'Song from Composer Grave': (0x332A871, 0x332A871, 0x0B, 'Song', None), @@ -377,11 +386,11 @@ def _create_region(name, type, locations=None, exits=None): 'Zeldas Letter': (None, None, None, 'NPC', None), 'Crater Fairy Reward': (None, None, None, 'Fairy', None), 'Mountain Summit Fairy Reward': (None, None, None, 'Fairy', None), - 'Hyrule Castle Fairy Reward': (0x3481401, None, None, 'NPC', 0x3D), - 'Zoras Fountain Fairy Reward': (0x3481400, None, None, 'NPC', 0x3D), - 'Desert Colossus Fairy Reward': (0x3481402, None, None, 'NPC', 0x3D), - 'Zelda': (0x3481403, None, None, 'NPC', 0x43), - 'Treasure Chest Game': (None, None, None, 'Special', 0x10), + 'Hyrule Castle Fairy Reward': (0x3481401, None, 0x5C, 'NPC', 0x3D), + 'Zoras Fountain Fairy Reward': (0x3481400, None, 0x5D, 'NPC', 0x3D), + 'Desert Colossus Fairy Reward': (0x3481402, None, 0x5E, 'NPC', 0x3D), + 'Zelda': (0x3481403, None, 0x5A, 'NPC', 0x43), + 'Treasure Chest Game': (None, None, 0x76, 'Special', 0x10), 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC', 0x49), @@ -389,29 +398,29 @@ def _create_region(name, type, locations=None, exits=None): 'Diving in the Lab': (0xE2CB97, None, 0x3E, 'NPC', 0x38), 'Link the Goron': (0xED30EB, 0xED64F3, 0x2C, 'NPC', 0x62), 'King Zora Thawed': (0xE56AD7, None, 0x2D, 'NPC', 0x58), - 'Bombchu Bowling Bomb Bag': (0xE2F093, None, 0x33, 'NPC', 0x4B), + 'Bombchu Bowling Bomb Bag': (0xE2F093, None, 0x32, 'NPC', 0x4B), 'Bombchu Bowling Piece of Heart': (0xE2F097, None, 0x3E, 'NPC', 0x4B), 'Dog Lady': (0xE65163, 0xE661BB, 0x3E, 'NPC', 0x35), 'Skull Kid': (0xDF0F33, 0xDF0E9B, 0x3E, 'NPC', 0x5B), - 'Ocarina Memory Game': (0xDF264F, None, 0x3E, 'NPC', 0x5B), + 'Ocarina Memory Game': (0xDF264F, None, 0x76, 'NPC', 0x5B), '10 Gold Skulltulla Reward': (0xEA7173, None, 0x45, 'NPC', 0x50), '20 Gold Skulltulla Reward': (0xEA7175, None, 0x39, 'NPC', 0x50), '30 Gold Skulltulla Reward': (0xEA7177, None, 0x46, 'NPC', 0x50), '40 Gold Skulltulla Reward': (0xEA7179, None, 0x03, 'NPC', 0x50), '50 Gold Skulltulla Reward': (0xEA717B, None, 0x3E, 'NPC', 0x50), 'Man on Roof': (0xE587E3, None, 0x3E, 'NPC', 0x52), - 'Frog Ocarina Game': (0xDB13D3, None, 0x3E, 'NPC', 0x54), + 'Frog Ocarina Game': (0xDB13D3, None, 0x76, 'NPC', 0x54), 'Frogs in the Rain': (0xDB1387, None, 0x3E, 'NPC', 0x54), 'Horseback Archery 1000 Points': (0xE12B6F, 0xE12AA3, 0x3E, 'NPC', 0x5D), 'Horseback Archery 1500 Points': (0xE12BC3, 0xE12AFB, 0x30, 'NPC', 0x5D), 'Child Shooting Gallery': (0xD35EF3, None, 0x60, 'NPC', 0x42), 'Adult Shooting Gallery': (0xD35F5B, None, 0x30, 'NPC', 0x42), 'Target in Woods': (0xE59CDF, None, 0x60, 'NPC', 0x5B), - 'Deku Theater Skull Mask': (0xEC9A87, None, 0x77, 'NPC', 0x83), - 'Deku Theater Mask of Truth': (0xEC9CE7, None, 0x79, 'NPC', 0x83), + 'Deku Theater Skull Mask': (0xEC9A87, None, 0x77, 'NPC', 0x3E), + 'Deku Theater Mask of Truth': (0xEC9CE7, None, 0x7A, 'NPC', 0x3E), 'Deku Salesman Woods': (0xDF8073, None, 0x77, 'NPC', 0x5B), - 'Deku Salesman Lost Woods Grotto': (0xDF80E7, None, 0x79, 'NPC', 0x85), - 'Deku Salesman Hyrule Field Grotto': (0xDF86AB, None, 0x3E, 'NPC', 0x76), + 'Deku Salesman Lost Woods Grotto': (0xDF80E7, None, 0x79, 'NPC', 0x3E), + 'Deku Salesman Hyrule Field Grotto': (0xDF86AB, None, 0x3E, 'NPC', 0x3E), 'Anju as Adult': (0xE1EABB, None, 0x1D, 'NPC', 0x52), 'Biggoron': (0xED338F, 0xED650F, 0x57, 'NPC', 0x60), 'Anjus Chickens': (0xE1E7A7, None, 0x0F, 'NPC', 0x52), @@ -420,15 +429,6 @@ def _create_region(name, type, locations=None, exits=None): 'Rolling Goron as Child': (0xED296F, 0xED6503, 0x34, 'NPC', 0x62), 'Lake Hylia Sun': (0xE9E1F2, None, 0x5B08, 'Chest', 0x57), 'Underwater Bottle': (0xDE10FB, None, 0x15, 'NPC', 0x57), - 'Field West Castle Town Grotto Chest': (None, None, None, 'Grotto', 0x70), - 'Remote Southern Grotto Chest': (None, None, None, 'Grotto', 0x72), - 'Field Near Lake Outside Fence Grotto Chest': (None, None, None, 'Grotto', 0x73), - 'Kakariko Back Grotto Chest': (None, None, None, 'Grotto', 0x78), - 'Zora River Plateau Open Grotto Chest': (None, None, None, 'Grotto', 0x79), - 'Kokiri Forest Storms Grotto Chest': (None, None, None, 'Grotto', 0x7C), - 'Lost Woods Generic Grotto Chest': (None, None, None, 'Grotto', 0x84), - 'Mountain Storms Grotto Chest': (None, None, None, 'Grotto', 0x87), - 'Top of Crater Grotto Chest': (None, None, None, 'Grotto', 0x8A), 'Shadow Temple Freestanding Key': (None, None, 0x01, 'Collectable', 0x07), 'Bottom of the Well Freestanding Key': (None, None, 0x01, 'Collectable', 0x08), 'Gerudo Training Grounds Freestanding Key': (None, None, 0x01, 'Collectable', 0x0B), diff --git a/Rom.py b/Rom.py index 5124789ef..f5f266a44 100644 --- a/Rom.py +++ b/Rom.py @@ -10,7 +10,6 @@ from Hints import buildGossipHints, buildBossRewardHints from Utils import local_path, output_path from Items import ItemFactory, item_data -from ItemOverrides import get_overrides from TextArray import text_array class LocalRom(object): @@ -884,19 +883,21 @@ def patch_rom(world, rom): rom.write_byte(0xB8811E, 0x20) rom.write_byte(0xB88236, 0x20) buildBossRewardHints(world, rom) - - # patch items + + # Write item overrides + rom.write_bytes(0x3481000, get_override_table(world)) + + # Patch songs and boss rewards for location in world.get_locations(): - item = location.base_item or location.item + item = location.item itemid = item.code locationaddress = location.address secondaryaddress = location.address2 if itemid is None or location.address is None: continue - if location.type == 'Special' or location.type == 'Grotto': - pass # These must be handled with overrides - elif location.type == 'Song': + + if location.type == 'Song': rom.write_byte(locationaddress, itemid) itemid = itemid + 0x0D rom.write_byte(secondaryaddress, itemid) @@ -960,10 +961,6 @@ def patch_rom(world, rom): rom.write_byte(0x2000FED, item_data[item.name]) #Fix text box elif location.name == 'Sheik at Colossus': rom.write_byte(0x218C589, item_data[item.name]) #Fix text box - elif location.type == 'NPC': - rom.write_byte(locationaddress, item.index) - if secondaryaddress is not None: - rom.write_byte(secondaryaddress, item.index) elif location.type == 'Boss': if location.name == 'Links Pocket': rom.write_byte(locationaddress, item_data[item.name][0]) @@ -977,21 +974,6 @@ def patch_rom(world, rom): elif location.name == 'Twinrova': rom.write_bytes(0xCA3EA2, [item_data[item.name][3][0], item_data[item.name][3][1]]) rom.write_bytes(0xCA3EA6, [item_data[item.name][3][2], item_data[item.name][3][3]]) - else: - locationdefault = location.default & 0xF01F - itemid = itemid | locationdefault - itemidhigh = itemid >> 8 - itemidlow = itemid & 0x00FF - - rom.write_bytes(locationaddress, [itemidhigh, itemidlow]) - if secondaryaddress is not None: - rom.write_bytes(secondaryaddress, [itemidhigh, itemidlow]) - - # write item overrides - override_table = [] - for byte_list in get_overrides(world): - override_table += byte_list - rom.write_bytes(0x3481000, override_table) # patch fairy entrances for region in world.regions: @@ -1006,3 +988,27 @@ def patch_rom(world, rom): rom.write_bytes(exit.addresses[2], [target1high, target1low]) rom.write_bytes(exit.target[1], [target2high, target2low]) return rom + +def get_override_table(world): + override_entries = [] + for location in world.get_locations(): + override_entries.append(get_override_entry(location)) + override_entries.sort() + return sum(override_entries, []) + +def get_override_entry(location): + scene = location.scene + default = location.default + item_id = location.item.index + if None in [scene, default, item_id]: + return [] + + if location.type in ['NPC', 'BossHeart', 'Special']: + return [scene, 0x00, default, item_id] + elif location.type == 'Chest': + flag = default & 0x1F + return [scene, 0x01, flag, item_id] + elif location.type == 'Collectable': + return [scene, 0x02, default, item_id] + else: + return [] diff --git a/Rules.py b/Rules.py index 65b6aff24..49ab23b55 100644 --- a/Rules.py +++ b/Rules.py @@ -412,78 +412,6 @@ def global_rules(world): set_rule(world.get_location('GS99'), lambda state: state.has('Song of Time') and (state.has('Bow') or state.has('Progressive Hookshot') or state.has('Bomb Bag'))) set_rule(world.get_location('GS100'), lambda state: state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Hover Boots'))) - no_ice_traps = [ - 'Darunias Joy', - 'Diving Minigame', - 'Child Fishing', - 'Adult Fishing', - 'Diving in the Lab', - 'Link the Goron', - 'King Zora Thawed', - 'Dog Lady', - 'Skull Kid', - 'Ocarina Memory Game', - '10 Gold Skulltulla Reward', - '20 Gold Skulltulla Reward', - '30 Gold Skulltulla Reward', - '40 Gold Skulltulla Reward', - '50 Gold Skulltulla Reward', - 'Man on Roof', - 'Frog Ocarina Game', - 'Frogs in the Rain', - 'Horseback Archery 1000 Points', - 'Horseback Archery 1500 Points', - 'Child Shooting Gallery', - 'Adult Shooting Gallery', - 'Target in Woods', - 'Deku Theater Skull Mask', - 'Deku Theater Mask of Truth', - 'Anju as Adult', - 'Biggoron', - 'Anjus Chickens', - 'Talons Chickens', - '10 Big Poes', - 'Rolling Goron as Child', - 'Hyrule Castle Fairy Reward', - 'Zoras Fountain Fairy Reward', - 'Desert Colossus Fairy Reward', - 'Zelda', - 'Bombchu Bowling Bomb Bag', - 'Bombchu Bowling Piece of Heart', - 'Deku Salesman Woods', - 'Deku Salesman Lost Woods Grotto', - 'Deku Salesman Hyrule Field Grotto', - 'Underwater Bottle', - 'Shadow Temple Freestanding Key', - 'Bottom of the Well Freestanding Key', - 'Gerudo Training Grounds Freestanding Key', - 'Ice Cavern Freestanding PoH', - 'Impa House Freestanding PoH', - 'Tektite Grotto Freestanding PoH', - 'Windmill Freestanding PoH', - 'Dampe Race Freestanding PoH', - 'Lon Lon Tower Freestanding PoH', - 'Graveyard Freestanding PoH', - 'Zora River Lower Freestanding PoH', - 'Zora River Upper Freestanding PoH', - 'Lake Hylia Freestanding PoH', - 'Zoras Fountain Iceberg Freestanding PoH', - 'Zoras Fountain Bottom Freestanding PoH', - 'Gerudo Valley Waterfall Freestanding PoH', - 'Gerudo Valley Crate Freestanding PoH', - 'Colossus Freestanding PoH', - 'DM Trail Freestanding PoH', - 'DM Crater Wall Freestanding PoH', - 'DM Crater Volcano Freestanding PoH', - 'Goron City Pot Freestanding PoH', - 'Queen Gohma Heart', - 'King Dodongo Heart', - 'Barinade Heart', - 'Phantom Ganon Heart', - 'Volvagia Heart', - 'Morpha Heart', - 'Twinrova Heart', - 'Bongo Bongo Heart' - ] - for location in no_ice_traps: - forbid_item(world.get_location(location), 'Ice Trap') + for location in world.get_locations(): + if location.type != 'Chest': + forbid_item(location, 'Ice Trap') diff --git a/data/base2current.json b/data/base2current.json index 43e25cbe5..35cdf2d09 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 8, 146]}, {"11325064": [12, 16, 8, 138, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 175]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 154, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 161, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 168, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 147, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 8, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 8, 4]}, {"12427480": [12, 16, 8, 33]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 8, 37]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 116, 0, 0, 0, 0]}, {"12491456": [12, 16, 8, 66]}, {"12491480": [12, 16, 8, 76]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 8, 104]}, {"15312208": [6, 6, 6, 6, 6, 6, 6, 6]}, {"55058432": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55058448": [48, 132]}, {"55058451": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55058463": [140, 16, 129]}, {"55058467": [22, 145, 2]}, {"55058471": [117, 52, 1]}, {"55058475": [141, 16, 129]}, {"55058479": [19, 145, 2]}, {"55058483": [117, 16, 128]}, {"55058487": [17, 145, 2]}, {"55058491": [116, 52, 1]}, {"55058495": [138, 16, 129]}, {"55058499": [14, 145, 2]}, {"55058503": [116, 52, 1]}, {"55058507": [139, 16, 129]}, {"55058511": [11, 145, 2]}, {"55058515": [116, 52, 1]}, {"55058519": [88, 16, 129]}, {"55058523": [8, 52, 2]}, {"55058528": [52, 1]}, {"55058531": [120, 16, 129]}, {"55058535": [5, 52, 2]}, {"55058540": [52, 1]}, {"55058543": [121, 16, 129]}, {"55058547": [2, 52, 2]}, {"55058552": [52, 2]}, {"55058555": [255, 3, 224]}, {"55058559": [8]}, {"55058564": [143, 166]}, {"55058567": [48, 132, 197]}, {"55058571": [4, 8, 16, 8, 41]}, {"55058580": [143, 185]}, {"55058583": [44, 135, 37]}, {"55058587": [4, 8, 16, 8, 41]}, {"55058596": [60, 10, 128, 64, 37, 74, 32]}, {"55058604": [149, 75]}, {"55058607": [4, 52, 1, 255, 255, 17, 97]}, {"55058615": [2]}, {"55058620": [53, 101]}, {"55058624": [60, 11, 128, 64, 37, 107, 32, 12, 161, 96]}, {"55058636": [3, 224]}, {"55058639": [8]}, {"55058644": [60, 8, 128, 64, 37, 8, 32]}, {"55058652": [129, 9]}, {"55058655": [2, 36, 1, 255, 255, 17, 33]}, {"55058663": [2]}, {"55058668": [53, 35]}, {"55058673": [3, 15, 195]}, {"55058677": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55058691": [8]}, {"55058696": [144, 69]}, {"55058699": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55058708": [145, 9]}, {"55058711": [3, 52, 1]}, {"55058715": [255, 17, 33]}, {"55058719": [2]}, {"55058724": [53, 37]}, {"55058728": [3, 224]}, {"55058731": [8]}, {"55058736": [143, 162]}, {"55058739": [36, 144, 69]}, {"55058744": [60, 8, 128, 64, 37, 8, 32]}, {"55058752": [149, 9]}, {"55058756": [52, 1, 255, 255, 17, 33]}, {"55058763": [19]}, {"55058768": [53, 37]}, {"55058772": [175, 164]}, {"55058776": [175, 165]}, {"55058779": [4, 175, 166]}, {"55058783": [8, 39, 189, 255, 232, 175, 191]}, {"55058791": [16, 141, 9]}, {"55058795": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55058807": [6, 145, 6]}, {"55058811": [7, 1, 32, 248, 9]}, {"55058820": [143, 191]}, {"55058823": [16, 39, 189]}, {"55058827": [24, 143, 164]}, {"55058832": [143, 165]}, {"55058835": [4, 143, 166]}, {"55058839": [8, 3, 224]}, {"55058843": [8]}, {"55058848": [140, 136, 29, 44, 52, 9]}, {"55058855": [1]}, {"55058857": [9, 78]}, {"55058860": [1, 9, 16, 36, 16, 64]}, {"55058867": [27]}, {"55058872": [148, 138]}, {"55058875": [164, 52, 1]}, {"55058879": [61, 21, 65]}, {"55058883": [23]}, {"55058888": [148, 202, 2, 220, 52, 11]}, {"55058895": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55058919": [14]}, {"55058924": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55058952": [1, 10, 64, 33, 129, 8]}, {"55058960": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55058972": [52, 2]}, {"55058976": [3, 224]}, {"55058979": [8]}, {"55058984": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55058996": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55059008": [3, 224]}, {"55059011": [8]}, {"55059016": [160, 230, 4, 36, 39, 189, 255, 232, 175, 162]}, {"55059027": [16, 175, 191]}, {"55059031": [20, 12, 16, 8, 157]}, {"55059040": [143, 162]}, {"55059043": [16, 143, 191]}, {"55059047": [20, 39, 189]}, {"55059051": [24, 3, 224]}, {"55059055": [8]}, {"55059060": [39, 189, 255, 216, 175, 176]}, {"55059067": [16, 175, 177]}, {"55059071": [20, 175, 178]}, {"55059075": [24, 175, 191]}, {"55059079": [32, 60, 17, 128, 30, 38, 49, 170, 48, 130, 40, 4, 36, 17]}, {"55059095": [74]}, {"55059097": [8, 15, 195, 1, 1, 128, 38, 2, 1, 128, 35, 36, 8, 255, 255, 60, 9, 128, 64, 37, 41, 32]}, {"55059120": [173, 40]}, {"55059124": [173, 40]}, {"55059127": [4, 173, 40]}, {"55059131": [8, 60, 8, 128, 29, 37, 8, 132, 160, 149, 8]}, {"55059143": [164, 52, 1]}, {"55059147": [62, 21, 1]}, {"55059151": [6]}, {"55059156": [60, 8, 128, 18, 37, 8, 165, 208, 141, 8, 19, 148, 49, 8]}, {"55059171": [31, 37, 8]}, {"55059175": [112, 52, 9]}, {"55059180": [54, 10]}, {"55059184": [142, 43, 4, 40, 149, 108]}, {"55059192": [52, 1]}, {"55059195": [21, 21, 129]}, {"55059199": [3]}, {"55059204": [52, 9]}, {"55059207": [1, 145, 106, 1, 65]}, {"55059213": [8, 66]}, {"55059216": [1, 10, 64, 37]}, {"55059221": [8, 66]}, {"55059224": [1, 9, 64, 37, 60, 9, 128, 64, 37, 41, 15, 252, 37, 41]}, {"55059239": [4, 141, 42]}, {"55059245": [10, 82, 2, 17, 64]}, {"55059251": [30]}, {"55059256": [21, 72, 255, 250]}, {"55059264": [145, 48]}, {"55059267": [3, 54, 2]}, {"55059272": [52, 80]}, {"55059276": [38, 8, 255, 128, 5]}, {"55059283": [22]}, {"55059288": [60, 18, 128, 64, 38, 82, 37, 224]}, {"55059297": [8, 65]}, {"55059300": [2, 72, 144, 33, 142, 72]}, {"55059307": [12, 60, 4, 128, 18, 36, 132, 165, 208, 1]}, {"55059318": [248, 9]}, {"55059324": [20, 80, 255, 242]}, {"55059332": [60, 10, 128, 64, 37, 74, 32]}, {"55059340": [142, 75]}, {"55059344": [173, 75]}, {"55059348": [142, 75]}, {"55059351": [4, 173, 75]}, {"55059355": [4, 142, 75]}, {"55059359": [8, 173, 75]}, {"55059363": [8, 16]}, {"55059367": [6]}, {"55059372": [130, 40, 4, 36, 5, 1]}, {"55059379": [2]}, {"55059385": [16, 128, 35, 162, 48, 4, 36, 143, 176]}, {"55059395": [16, 143, 177]}, {"55059399": [20, 143, 178]}, {"55059403": [24, 143, 191]}, {"55059407": [32, 39, 189]}, {"55059411": [40, 3, 224]}, {"55059415": [8]}, {"55059420": [3, 224]}, {"55059423": [8, 54, 2]}, {"55059428": [144, 136]}, {"55059431": [125, 52, 1]}, {"55059435": [255, 17, 1]}, {"55059439": [2, 52, 2]}, {"55059443": [8, 52, 2]}, {"55059447": [9, 3, 224]}, {"55059451": [8]}, {"55059456": [144, 136]}, {"55059459": [163, 49, 8]}, {"55059463": [192, 17]}, {"55059467": [5, 52, 2]}, {"55059471": [84, 52, 1]}, {"55059475": [64, 17, 1]}, {"55059479": [2, 52, 2]}, {"55059483": [53, 52, 2]}, {"55059487": [54, 3, 224]}, {"55059491": [8]}, {"55059496": [144, 136]}, {"55059499": [163, 49, 8]}, {"55059503": [24, 17]}, {"55059507": [5, 52, 2]}, {"55059511": [50, 52, 1]}, {"55059515": [8, 17, 1]}, {"55059519": [2, 52, 2]}, {"55059523": [51, 52, 2]}, {"55059527": [52, 3, 224]}, {"55059531": [8]}, {"55059536": [144, 136]}, {"55059539": [163, 49, 8]}, {"55059543": [3, 17]}, {"55059547": [5, 52, 2]}, {"55059551": [4, 52, 1]}, {"55059555": [1, 17, 1]}, {"55059559": [2, 52, 2]}, {"55059563": [48, 52, 2]}, {"55059567": [49, 3, 224]}, {"55059571": [8]}, {"55059576": [144, 136]}, {"55059579": [162, 49, 8]}, {"55059583": [192, 17]}, {"55059587": [5, 52, 2]}, {"55059591": [5, 52, 1]}, {"55059595": [64, 17, 1]}, {"55059599": [2, 52, 2]}, {"55059603": [96, 52, 2]}, {"55059607": [123, 3, 224]}, {"55059611": [8]}, {"55059616": [144, 136]}, {"55059619": [162, 49, 8]}, {"55059623": [48, 17]}, {"55059627": [2, 52, 2]}, {"55059631": [69, 52, 2]}, {"55059635": [70, 3, 224]}, {"55059639": [8]}, {"55059644": [144, 136]}, {"55059647": [162, 49, 8]}, {"55059651": [6, 17]}, {"55059655": [2, 52, 2]}, {"55059659": [55, 52, 2]}, {"55059663": [56, 3, 224]}, {"55059667": [8]}, {"55059672": [144, 136]}, {"55059675": [161, 49, 8]}, {"55059679": [48, 17]}, {"55059683": [2, 52, 2]}, {"55059687": [121, 52, 2]}, {"55059691": [122, 3, 224]}, {"55059695": [8]}, {"55059700": [144, 136]}, {"55059703": [161, 49, 8]}, {"55059707": [6, 17]}, {"55059711": [2, 52, 2]}, {"55059715": [119, 52, 2]}, {"55059719": [120, 3, 224]}, {"55059723": [8]}, {"55059728": [144, 136]}, {"55059731": [163, 49, 8]}, {"55059735": [3, 17]}, {"55059739": [2, 52, 2]}, {"55059743": [77, 54, 2]}, {"55059748": [3, 224]}, {"55059751": [8]}, {"55059756": [144, 136]}, {"55059759": [163, 49, 8]}, {"55059763": [24, 17]}, {"55059767": [2, 52, 2]}, {"55059771": [77, 54, 2]}, {"55059776": [3, 224]}, {"55059779": [8]}, {"55059784": [3, 224]}, {"55059787": [8]}, {"55059792": [52, 8]}, {"55059795": [1, 160, 136]}, {"55059799": [62, 3, 224]}, {"55059803": [8]}, {"55059808": [36, 136]}, {"55059811": [134, 36, 9, 255, 255, 37, 41]}, {"55059819": [1, 52, 1]}, {"55059823": [3]}, {"55059825": [41, 8, 42, 20, 32]}, {"55059831": [7]}, {"55059836": [1, 9, 80, 33, 145, 75]}, {"55059844": [52, 1]}, {"55059847": [255, 21, 97, 255, 247]}, {"55059856": [161, 69]}, {"55059860": [3, 224]}, {"55059863": [8]}, {"55059868": [36, 136]}, {"55059871": [168, 1, 6, 64, 33, 145, 9]}, {"55059880": [1, 37, 72, 37, 161, 9]}, {"55059888": [3, 224]}, {"55059891": [8]}, {"55059896": [36, 136]}, {"55059899": [188, 1, 5, 64, 33, 129, 9]}, {"55059908": [5, 33]}, {"55059911": [2]}, {"55059916": [52, 9]}, {"55059920": [37, 41]}, {"55059923": [1, 161, 9]}, {"55059928": [3, 224]}, {"55059931": [8]}, {"55059936": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 35, 228, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36]}, {"55059968": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 40, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 80, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 120, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 160, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 188, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 216, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 72, 128, 64, 36, 244]}, {"55060081": [255, 1, 67]}, {"55060085": [198, 21, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060097": [255, 1, 68]}, {"55060101": [198, 22, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060113": [255, 1, 69]}, {"55060117": [198, 23, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060129": [255, 1, 70]}, {"55060133": [198, 24, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060145": [255, 1, 71]}, {"55060149": [198, 25, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060161": [255, 1, 93]}, {"55060165": [198, 28, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060177": [255, 1, 122]}, {"55060181": [198, 29, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060193": [255, 1, 249]}, {"55060197": [198, 30, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060209": [255, 1, 151]}, {"55060213": [198, 32, 255, 128, 64, 37, 96, 128, 64, 35, 220]}, {"55060225": [255, 10, 199]}, {"55060229": [185, 1, 3, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060241": [255, 10, 199]}, {"55060245": [185, 1, 4, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060257": [255, 10, 199]}, {"55060261": [185, 1, 5, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060273": [255, 10, 199]}, {"55060277": [185, 1, 6, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060289": [255, 10, 199]}, {"55060293": [185, 1, 7, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060305": [255, 10, 199]}, {"55060309": [185, 1, 13, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060321": [255, 11, 103]}, {"55060325": [184, 2]}, {"55060328": [128, 64, 37, 156, 128, 64, 35, 220]}, {"55060337": [255, 11, 103]}, {"55060341": [184, 2, 1, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060353": [255, 11, 103]}, {"55060357": [184, 2, 2, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060369": [255, 11, 103]}, {"55060373": [184, 2, 3, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060385": [255, 11, 103]}, {"55060389": [184, 2, 4, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060401": [255, 11, 103]}, {"55060405": [184, 2, 5, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060417": [255, 11, 103]}, {"55060421": [184, 2, 6, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060433": [255, 11, 103]}, {"55060437": [184, 2, 7, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060449": [255, 11, 103]}, {"55060453": [184, 2, 8, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060465": [255, 11, 103]}, {"55060469": [184, 2, 9, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060481": [255, 28, 102]}, {"55060485": [200, 4]}, {"55060488": [128, 64, 37, 156, 128, 64, 35, 220]}, {"55060497": [255, 28, 102]}, {"55060501": [200, 4, 1, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060513": [255, 28, 102]}, {"55060517": [200, 4, 2, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060529": [255, 28, 102]}, {"55060533": [200, 4, 3, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060545": [255, 28, 102]}, {"55060549": [200, 4, 4, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060561": [255, 28, 102]}, {"55060565": [200, 4, 5, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060577": [255, 28, 102]}, {"55060581": [200, 4, 6, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060593": [255, 28, 102]}, {"55060597": [200, 4, 7, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060609": [255, 28, 102]}, {"55060613": [200, 4, 8, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060625": [255, 28, 102]}, {"55060629": [200, 4, 9, 128, 64, 37, 156, 128, 64, 35, 220]}, {"55060641": [255, 254, 96]}, {"55060645": [170, 3, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060657": [255, 254, 96]}, {"55060661": [170, 4, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060673": [255, 254, 96]}, {"55060677": [170, 5, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060689": [255, 254, 96]}, {"55060693": [170, 6, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060705": [255, 254, 96]}, {"55060709": [170, 7, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060721": [255, 254, 96]}, {"55060725": [170, 8, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060737": [255, 254, 96]}, {"55060741": [170, 11, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060753": [255, 254, 96]}, {"55060757": [170, 12, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060769": [255, 254, 96]}, {"55060773": [170, 13, 255, 128, 64, 37, 184, 128, 64, 35, 220]}, {"55060785": [61, 67, 12]}, {"55060789": [248, 255, 255, 128, 64, 37, 80, 128, 64, 35, 220]}, {"55060801": [131, 9, 85]}, {"55060805": [183, 255, 255, 128, 64, 37, 72, 128, 64, 35, 220]}, {"55060817": [146, 219, 230]}, {"55060821": [216, 255, 255, 128, 64, 37, 72, 128, 64, 37, 16]}, {"55060833": [147, 218, 230]}, {"55060837": [216, 255, 255, 128, 64, 37, 72, 128, 64, 37, 16]}, {"55060849": [148, 217, 230]}, {"55060853": [216, 255, 255, 128, 64, 37, 72, 128, 64, 37, 16]}, {"55060865": [142, 224, 50]}, {"55060869": [206, 255, 255, 128, 64, 37, 72, 128, 64, 37, 44]}, {"55060881": [143, 224, 50]}, {"55060885": [206, 255, 255, 128, 64, 37, 72, 128, 64, 37, 44]}, {"55060897": [144, 224, 50]}, {"55060901": [206, 255, 255, 128, 64, 37, 72, 128, 64, 37, 44]}, {"55060913": [140, 238, 52]}, {"55060917": [187, 255, 255, 128, 64, 37, 72, 128, 64, 35, 220]}, {"55060929": [141, 238, 52]}, {"55060933": [187, 255, 255, 128, 64, 37, 72, 128, 64, 35, 220, 175, 164]}, {"55060947": [104, 175, 165]}, {"55060951": [108, 175, 166]}, {"55060955": [112, 175, 167]}, {"55060959": [116, 39, 189, 255, 232, 175, 163]}, {"55060967": [16, 175, 191]}, {"55060971": [20, 60, 8, 128, 64, 37, 8, 32, 12, 129, 8]}, {"55060984": [17]}, {"55060987": [10]}, {"55060992": [60, 9, 128, 65, 52, 10]}, {"55060999": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 8, 157]}, {"55061028": [143, 163]}, {"55061031": [16, 143, 191]}, {"55061035": [20, 39, 189]}, {"55061039": [24, 143, 164]}, {"55061043": [104, 143, 165]}, {"55061047": [108, 143, 166]}, {"55061051": [112, 143, 167]}, {"55061055": [116, 132, 110, 19, 196, 3, 224]}, {"55061063": [8]}, {"55061068": [147, 25]}, {"55061071": [116, 52, 1]}, {"55061075": [255, 23, 33]}, {"55061079": [2]}, {"55061084": [52, 25]}, {"55061087": [44, 3, 224]}, {"55061091": [8, 167, 185]}, {"55061095": [154, 147, 44]}, {"55061099": [116, 52, 1]}, {"55061103": [255, 21, 129]}, {"55061107": [2]}, {"55061112": [52, 12]}, {"55061115": [44, 3, 224]}, {"55061119": [8]}, {"55061124": [145, 174]}, {"55061127": [116, 52, 1]}, {"55061131": [255, 21, 193]}, {"55061135": [2]}, {"55061140": [52, 14]}, {"55061143": [44, 3, 224]}, {"55061147": [8, 167, 174]}, {"55061151": [154, 145, 207]}, {"55061155": [116, 52, 1]}, {"55061159": [255, 21, 225]}, {"55061163": [2]}, {"55061168": [52, 15]}, {"55061171": [44, 3, 224]}, {"55061175": [8, 167, 175]}, {"55061179": [154, 141, 9]}, {"55061183": [4, 17, 32]}, {"55061187": [7]}, {"55061192": [145, 9]}, {"55061195": [104, 52, 1]}, {"55061199": [59, 17, 33]}, {"55061203": [2]}, {"55061208": [52, 9]}, {"55061211": [255, 161, 9]}, {"55061215": [64, 3, 224]}, {"55061219": [8, 161, 14]}, {"55061223": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 8, 146]}, {"11325064": [12, 16, 8, 138, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 217]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 196, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 203, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 210, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 189, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 8, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 8, 4]}, {"12427480": [12, 16, 8, 33]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 8, 37]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 158, 0, 0, 0, 0]}, {"12491456": [12, 16, 8, 66]}, {"12491480": [12, 16, 8, 76]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 8, 104]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058432": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55058448": [48, 132]}, {"55058451": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55058463": [140, 16, 129]}, {"55058467": [22, 145, 2]}, {"55058471": [117, 52, 1]}, {"55058475": [141, 16, 129]}, {"55058479": [19, 145, 2]}, {"55058483": [117, 16, 128]}, {"55058487": [17, 145, 2]}, {"55058491": [116, 52, 1]}, {"55058495": [138, 16, 129]}, {"55058499": [14, 145, 2]}, {"55058503": [116, 52, 1]}, {"55058507": [139, 16, 129]}, {"55058511": [11, 145, 2]}, {"55058515": [116, 52, 1]}, {"55058519": [88, 16, 129]}, {"55058523": [8, 52, 2]}, {"55058528": [52, 1]}, {"55058531": [120, 16, 129]}, {"55058535": [5, 52, 2]}, {"55058540": [52, 1]}, {"55058543": [121, 16, 129]}, {"55058547": [2, 52, 2]}, {"55058552": [52, 2]}, {"55058555": [255, 3, 224]}, {"55058559": [8]}, {"55058564": [143, 166]}, {"55058567": [48, 132, 197]}, {"55058571": [4, 8, 16, 8, 41]}, {"55058580": [143, 185]}, {"55058583": [44, 135, 37]}, {"55058587": [4, 8, 16, 8, 41]}, {"55058596": [60, 10, 128, 64, 37, 74, 32]}, {"55058604": [149, 75]}, {"55058607": [4, 52, 1, 255, 255, 17, 97]}, {"55058615": [2]}, {"55058620": [53, 101]}, {"55058624": [60, 11, 128, 64, 37, 107, 32, 12, 161, 96]}, {"55058636": [3, 224]}, {"55058639": [8]}, {"55058644": [60, 8, 128, 64, 37, 8, 32]}, {"55058652": [129, 9]}, {"55058655": [2, 36, 1, 255, 255, 17, 33]}, {"55058663": [2]}, {"55058668": [53, 35]}, {"55058673": [3, 15, 195]}, {"55058677": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55058691": [8]}, {"55058696": [144, 69]}, {"55058699": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55058708": [145, 9]}, {"55058711": [3, 52, 1]}, {"55058715": [255, 17, 33]}, {"55058719": [2]}, {"55058724": [53, 37]}, {"55058728": [3, 224]}, {"55058731": [8]}, {"55058736": [143, 162]}, {"55058739": [36, 144, 69]}, {"55058744": [60, 8, 128, 64, 37, 8, 32]}, {"55058752": [149, 9]}, {"55058756": [52, 1, 255, 255, 17, 33]}, {"55058763": [19]}, {"55058768": [53, 37]}, {"55058772": [175, 164]}, {"55058776": [175, 165]}, {"55058779": [4, 175, 166]}, {"55058783": [8, 39, 189, 255, 232, 175, 191]}, {"55058791": [16, 141, 9]}, {"55058795": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55058807": [6, 145, 6]}, {"55058811": [7, 1, 32, 248, 9]}, {"55058820": [143, 191]}, {"55058823": [16, 39, 189]}, {"55058827": [24, 143, 164]}, {"55058832": [143, 165]}, {"55058835": [4, 143, 166]}, {"55058839": [8, 3, 224]}, {"55058843": [8]}, {"55058848": [140, 136, 29, 44, 52, 9]}, {"55058855": [1]}, {"55058857": [9, 78]}, {"55058860": [1, 9, 16, 36, 16, 64]}, {"55058867": [27]}, {"55058872": [148, 138]}, {"55058875": [164, 52, 1]}, {"55058879": [61, 21, 65]}, {"55058883": [23]}, {"55058888": [148, 202, 2, 220, 52, 11]}, {"55058895": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55058919": [14]}, {"55058924": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55058952": [1, 10, 64, 33, 129, 8]}, {"55058960": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55058972": [52, 2]}, {"55058976": [3, 224]}, {"55058979": [8]}, {"55058984": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55058996": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55059008": [3, 224]}, {"55059011": [8]}, {"55059016": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55059027": [16, 175, 163]}, {"55059031": [20, 175, 191]}, {"55059035": [24, 12, 16, 8, 159]}, {"55059044": [143, 162]}, {"55059047": [16, 143, 163]}, {"55059051": [20, 143, 191]}, {"55059055": [24, 39, 189]}, {"55059059": [32, 3, 224]}, {"55059063": [8]}, {"55059068": [39, 189, 255, 232, 175, 191]}, {"55059075": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55059084": [36, 9, 255, 255, 173, 9]}, {"55059092": [173, 9]}, {"55059095": [4, 173, 9]}, {"55059099": [8, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55059115": [31]}, {"55059121": [9, 15, 195, 1, 33, 32, 38]}, {"55059129": [129, 32, 35, 141, 5, 4, 40, 12, 16, 8, 206]}, {"55059144": [4, 64]}, {"55059147": [23]}, {"55059152": [52, 68]}, {"55059156": [12, 16, 9]}, {"55059164": [16, 96]}, {"55059167": [11]}, {"55059172": [60, 8, 128, 64, 37, 8, 32]}, {"55059180": [140, 105]}, {"55059184": [173, 9]}, {"55059188": [140, 105]}, {"55059191": [4, 173, 9]}, {"55059195": [4, 140, 105]}, {"55059199": [8, 173, 9]}, {"55059203": [8, 16]}, {"55059207": [8]}, {"55059212": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55059227": [2]}, {"55059233": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55059243": [16, 39, 189]}, {"55059247": [24, 3, 224]}, {"55059251": [8]}, {"55059256": [39, 189, 255, 232, 175, 191]}, {"55059263": [16, 12, 16, 8, 217]}, {"55059272": [52, 68]}, {"55059276": [12, 16, 8, 243]}, {"55059284": [143, 191]}, {"55059287": [16, 39, 189]}, {"55059291": [24, 3, 224]}, {"55059295": [8]}, {"55059300": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55059311": [164, 52, 8]}, {"55059316": [52, 137]}, {"55059320": [148, 170]}, {"55059324": [52, 1]}, {"55059327": [10, 21, 65]}, {"55059331": [7]}, {"55059336": [52, 1]}, {"55059339": [16, 16, 65]}, {"55059343": [4]}, {"55059348": [52, 8]}, {"55059351": [1, 148, 169]}, {"55059355": [28, 49, 41]}, {"55059359": [31, 52, 1]}, {"55059363": [21, 21, 65]}, {"55059367": [3]}, {"55059372": [52, 8]}, {"55059375": [2, 144, 169, 1, 65]}, {"55059381": [2, 18]}, {"55059385": [72, 16, 37]}, {"55059389": [2, 18]}, {"55059393": [73, 16, 37, 3, 224]}, {"55059399": [8]}, {"55059404": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55059419": [4, 141, 9]}, {"55059424": [17, 32]}, {"55059427": [5]}, {"55059433": [9, 82, 2, 21, 68, 255, 250]}, {"55059444": [49, 34]}, {"55059447": [255, 3, 224]}, {"55059451": [8]}, {"55059456": [39, 189, 255, 224, 175, 176]}, {"55059463": [16, 175, 177]}, {"55059467": [20, 175, 191]}, {"55059471": [24, 52, 130]}, {"55059476": [52, 80]}, {"55059480": [38, 8, 255, 128, 5]}, {"55059487": [18]}, {"55059492": [60, 17, 128, 64, 38, 49, 38, 136, 52, 9]}, {"55059503": [16, 1, 9]}, {"55059507": [24]}, {"55059510": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55059528": [142, 40]}, {"55059531": [12, 1]}, {"55059534": [248, 9]}, {"55059540": [20, 80, 255, 239]}, {"55059548": [54, 35]}, {"55059552": [16]}, {"55059555": [2]}, {"55059560": [52, 3]}, {"55059564": [143, 176]}, {"55059567": [16, 143, 177]}, {"55059571": [20, 143, 191]}, {"55059575": [24, 39, 189]}, {"55059579": [32, 3, 224]}, {"55059583": [8]}, {"55059588": [3, 224]}, {"55059591": [8, 52, 162]}, {"55059596": [144, 136]}, {"55059599": [125, 52, 1]}, {"55059603": [255, 17, 1]}, {"55059607": [2, 52, 2]}, {"55059611": [8, 52, 2]}, {"55059615": [9, 3, 224]}, {"55059619": [8]}, {"55059624": [144, 136]}, {"55059627": [163, 49, 8]}, {"55059631": [192, 17]}, {"55059635": [5, 52, 2]}, {"55059639": [84, 52, 1]}, {"55059643": [64, 17, 1]}, {"55059647": [2, 52, 2]}, {"55059651": [53, 52, 2]}, {"55059655": [54, 3, 224]}, {"55059659": [8]}, {"55059664": [144, 136]}, {"55059667": [163, 49, 8]}, {"55059671": [24, 17]}, {"55059675": [5, 52, 2]}, {"55059679": [50, 52, 1]}, {"55059683": [8, 17, 1]}, {"55059687": [2, 52, 2]}, {"55059691": [51, 52, 2]}, {"55059695": [52, 3, 224]}, {"55059699": [8]}, {"55059704": [144, 136]}, {"55059707": [163, 49, 8]}, {"55059711": [3, 17]}, {"55059715": [5, 52, 2]}, {"55059719": [4, 52, 1]}, {"55059723": [1, 17, 1]}, {"55059727": [2, 52, 2]}, {"55059731": [48, 52, 2]}, {"55059735": [49, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [192, 17]}, {"55059755": [5, 52, 2]}, {"55059759": [5, 52, 1]}, {"55059763": [64, 17, 1]}, {"55059767": [2, 52, 2]}, {"55059771": [96, 52, 2]}, {"55059775": [123, 3, 224]}, {"55059779": [8]}, {"55059784": [144, 136]}, {"55059787": [162, 49, 8]}, {"55059791": [48, 17]}, {"55059795": [2, 52, 2]}, {"55059799": [69, 52, 2]}, {"55059803": [70, 3, 224]}, {"55059807": [8]}, {"55059812": [144, 136]}, {"55059815": [162, 49, 8]}, {"55059819": [6, 17]}, {"55059823": [2, 52, 2]}, {"55059827": [55, 52, 2]}, {"55059831": [56, 3, 224]}, {"55059835": [8]}, {"55059840": [144, 136]}, {"55059843": [161, 49, 8]}, {"55059847": [48, 17]}, {"55059851": [2, 52, 2]}, {"55059855": [121, 52, 2]}, {"55059859": [122, 3, 224]}, {"55059863": [8]}, {"55059868": [144, 136]}, {"55059871": [161, 49, 8]}, {"55059875": [6, 17]}, {"55059879": [2, 52, 2]}, {"55059883": [119, 52, 2]}, {"55059887": [120, 3, 224]}, {"55059891": [8]}, {"55059896": [144, 136]}, {"55059899": [163, 49, 8]}, {"55059903": [3, 17]}, {"55059907": [2, 52, 2]}, {"55059911": [77, 52, 162]}, {"55059916": [3, 224]}, {"55059919": [8]}, {"55059924": [144, 136]}, {"55059927": [163, 49, 8]}, {"55059931": [24, 17]}, {"55059935": [2, 52, 2]}, {"55059939": [77, 52, 162]}, {"55059944": [3, 224]}, {"55059947": [8]}, {"55059952": [3, 224]}, {"55059955": [8]}, {"55059960": [52, 8]}, {"55059963": [1, 160, 136]}, {"55059967": [62, 3, 224]}, {"55059971": [8]}, {"55059976": [36, 136]}, {"55059979": [134, 36, 9, 255, 255, 37, 41]}, {"55059987": [1, 52, 1]}, {"55059991": [3]}, {"55059993": [41, 8, 42, 20, 32]}, {"55059999": [7]}, {"55060004": [1, 9, 80, 33, 145, 75]}, {"55060012": [52, 1]}, {"55060015": [255, 21, 97, 255, 247]}, {"55060024": [161, 69]}, {"55060028": [3, 224]}, {"55060031": [8]}, {"55060036": [36, 136]}, {"55060039": [168, 1, 6, 64, 33, 145, 9]}, {"55060048": [1, 37, 72, 37, 161, 9]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [36, 136]}, {"55060067": [188, 1, 5, 64, 33, 129, 9]}, {"55060076": [5, 33]}, {"55060079": [2]}, {"55060084": [52, 9]}, {"55060088": [37, 41]}, {"55060091": [1, 161, 9]}, {"55060096": [3, 224]}, {"55060099": [8]}, {"55060104": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 36, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 36, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 36, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 156]}, {"55060249": [255, 1, 67]}, {"55060253": [198, 21, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060265": [255, 1, 68]}, {"55060269": [198, 22, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060281": [255, 1, 69]}, {"55060285": [198, 23, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060297": [255, 1, 70]}, {"55060301": [198, 24, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060313": [255, 1, 71]}, {"55060317": [198, 25, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060329": [255, 1, 93]}, {"55060333": [198, 28, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060345": [255, 1, 122]}, {"55060349": [198, 29, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060361": [255, 1, 249]}, {"55060365": [198, 30, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060377": [255, 1, 151]}, {"55060381": [198, 32, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060393": [255, 10, 199]}, {"55060397": [185, 1, 3, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060409": [255, 10, 199]}, {"55060413": [185, 1, 4, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060425": [255, 10, 199]}, {"55060429": [185, 1, 5, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060441": [255, 10, 199]}, {"55060445": [185, 1, 6, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060457": [255, 10, 199]}, {"55060461": [185, 1, 7, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060473": [255, 10, 199]}, {"55060477": [185, 1, 13, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060489": [255, 11, 103]}, {"55060493": [184, 2]}, {"55060496": [128, 64, 38, 68, 128, 64, 36, 132]}, {"55060505": [255, 11, 103]}, {"55060509": [184, 2, 1, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060521": [255, 11, 103]}, {"55060525": [184, 2, 2, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060537": [255, 11, 103]}, {"55060541": [184, 2, 3, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060553": [255, 11, 103]}, {"55060557": [184, 2, 4, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060569": [255, 11, 103]}, {"55060573": [184, 2, 5, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060585": [255, 11, 103]}, {"55060589": [184, 2, 6, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060601": [255, 11, 103]}, {"55060605": [184, 2, 7, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060617": [255, 11, 103]}, {"55060621": [184, 2, 8, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060633": [255, 11, 103]}, {"55060637": [184, 2, 9, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060649": [255, 28, 102]}, {"55060653": [200, 4]}, {"55060656": [128, 64, 38, 68, 128, 64, 36, 132]}, {"55060665": [255, 28, 102]}, {"55060669": [200, 4, 1, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060681": [255, 28, 102]}, {"55060685": [200, 4, 2, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060697": [255, 28, 102]}, {"55060701": [200, 4, 3, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060713": [255, 28, 102]}, {"55060717": [200, 4, 4, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060729": [255, 28, 102]}, {"55060733": [200, 4, 5, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060745": [255, 28, 102]}, {"55060749": [200, 4, 6, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060761": [255, 28, 102]}, {"55060765": [200, 4, 7, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060777": [255, 28, 102]}, {"55060781": [200, 4, 8, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060793": [255, 28, 102]}, {"55060797": [200, 4, 9, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060809": [255, 254, 96]}, {"55060813": [170, 3, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060825": [255, 254, 96]}, {"55060829": [170, 4, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060841": [255, 254, 96]}, {"55060845": [170, 5, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060857": [255, 254, 96]}, {"55060861": [170, 6, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060873": [255, 254, 96]}, {"55060877": [170, 7, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060889": [255, 254, 96]}, {"55060893": [170, 8, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060905": [255, 254, 96]}, {"55060909": [170, 11, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060921": [255, 254, 96]}, {"55060925": [170, 12, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060937": [255, 254, 96]}, {"55060941": [170, 13, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060953": [61, 67, 12]}, {"55060957": [248, 255, 255, 128, 64, 37, 248, 128, 64, 36, 132]}, {"55060969": [131, 9, 85]}, {"55060973": [183, 255, 255, 128, 64, 37, 240, 128, 64, 36, 132]}, {"55060985": [146, 219, 230]}, {"55060989": [216, 255, 255, 128, 64, 37, 240, 128, 64, 37, 184]}, {"55061001": [147, 218, 230]}, {"55061005": [216, 255, 255, 128, 64, 37, 240, 128, 64, 37, 184]}, {"55061017": [148, 217, 230]}, {"55061021": [216, 255, 255, 128, 64, 37, 240, 128, 64, 37, 184]}, {"55061033": [142, 224, 50]}, {"55061037": [206, 255, 255, 128, 64, 37, 240, 128, 64, 37, 212]}, {"55061049": [143, 224, 50]}, {"55061053": [206, 255, 255, 128, 64, 37, 240, 128, 64, 37, 212]}, {"55061065": [144, 224, 50]}, {"55061069": [206, 255, 255, 128, 64, 37, 240, 128, 64, 37, 212]}, {"55061081": [140, 238, 52]}, {"55061085": [187, 255, 255, 128, 64, 37, 240, 128, 64, 36, 132]}, {"55061097": [141, 238, 52]}, {"55061101": [187, 255, 255, 128, 64, 37, 240, 128, 64, 36, 132, 175, 164]}, {"55061115": [104, 175, 165]}, {"55061119": [108, 175, 166]}, {"55061123": [112, 175, 167]}, {"55061127": [116, 39, 189, 255, 232, 175, 163]}, {"55061135": [16, 175, 191]}, {"55061139": [20, 60, 8, 128, 64, 37, 8, 32, 12, 129, 8]}, {"55061152": [17]}, {"55061155": [10]}, {"55061160": [60, 9, 128, 65, 52, 10]}, {"55061167": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 8, 159]}, {"55061196": [143, 163]}, {"55061199": [16, 143, 191]}, {"55061203": [20, 39, 189]}, {"55061207": [24, 143, 164]}, {"55061211": [104, 143, 165]}, {"55061215": [108, 143, 166]}, {"55061219": [112, 143, 167]}, {"55061223": [116, 132, 110, 19, 196, 3, 224]}, {"55061231": [8]}, {"55061236": [147, 25]}, {"55061239": [116, 52, 1]}, {"55061243": [255, 23, 33]}, {"55061247": [2]}, {"55061252": [52, 25]}, {"55061255": [44, 3, 224]}, {"55061259": [8, 167, 185]}, {"55061263": [154, 147, 44]}, {"55061267": [116, 52, 1]}, {"55061271": [255, 21, 129]}, {"55061275": [2]}, {"55061280": [52, 12]}, {"55061283": [44, 3, 224]}, {"55061287": [8]}, {"55061292": [145, 174]}, {"55061295": [116, 52, 1]}, {"55061299": [255, 21, 193]}, {"55061303": [2]}, {"55061308": [52, 14]}, {"55061311": [44, 3, 224]}, {"55061315": [8, 167, 174]}, {"55061319": [154, 145, 207]}, {"55061323": [116, 52, 1]}, {"55061327": [255, 21, 225]}, {"55061331": [2]}, {"55061336": [52, 15]}, {"55061339": [44, 3, 224]}, {"55061343": [8, 167, 175]}, {"55061347": [154, 141, 9]}, {"55061351": [4, 17, 32]}, {"55061355": [7]}, {"55061360": [145, 9]}, {"55061363": [104, 52, 1]}, {"55061367": [59, 17, 33]}, {"55061371": [2]}, {"55061376": [52, 9]}, {"55061379": [255, 161, 9]}, {"55061383": [64, 3, 224]}, {"55061387": [8, 161, 14]}, {"55061391": [104]}] \ No newline at end of file From 50c25705a8bfd1768538b6a9684fc174c2dfb1b4 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 31 May 2018 00:39:55 -0400 Subject: [PATCH 061/151] Fix default value for Bombchu Bowling Bomb Bag --- Regions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Regions.py b/Regions.py index 33bc04c98..9ceb7ff8d 100644 --- a/Regions.py +++ b/Regions.py @@ -398,7 +398,7 @@ def _create_region(name, type, locations=None, exits=None): 'Diving in the Lab': (0xE2CB97, None, 0x3E, 'NPC', 0x38), 'Link the Goron': (0xED30EB, 0xED64F3, 0x2C, 'NPC', 0x62), 'King Zora Thawed': (0xE56AD7, None, 0x2D, 'NPC', 0x58), - 'Bombchu Bowling Bomb Bag': (0xE2F093, None, 0x32, 'NPC', 0x4B), + 'Bombchu Bowling Bomb Bag': (0xE2F093, None, 0x34, 'NPC', 0x4B), 'Bombchu Bowling Piece of Heart': (0xE2F097, None, 0x3E, 'NPC', 0x4B), 'Dog Lady': (0xE65163, 0xE661BB, 0x3E, 'NPC', 0x35), 'Skull Kid': (0xDF0F33, 0xDF0E9B, 0x3E, 'NPC', 0x5B), From 0228755a1d7e02d93f2ac2b5129ed6a8a2c16258 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 31 May 2018 00:42:40 -0400 Subject: [PATCH 062/151] Allow ice trap at treasure chest game --- Rules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rules.py b/Rules.py index 49ab23b55..d1819eca4 100644 --- a/Rules.py +++ b/Rules.py @@ -413,5 +413,5 @@ def global_rules(world): set_rule(world.get_location('GS100'), lambda state: state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Hover Boots'))) for location in world.get_locations(): - if location.type != 'Chest': + if location.type != 'Chest' and location.name != 'Treasure Chest Game': forbid_item(location, 'Ice Trap') From 12e5ac97a31c79bad5fe18dd41f201220ce6fab3 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 31 May 2018 00:54:26 -0400 Subject: [PATCH 063/151] Add default values for BossHeart items --- Regions.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Regions.py b/Regions.py index 9ceb7ff8d..3a08261db 100644 --- a/Regions.py +++ b/Regions.py @@ -452,14 +452,14 @@ def _create_region(name, type, locations=None, exits=None): 'DM Crater Wall Freestanding PoH': (None, None, 0x02, 'Collectable', 0x61), 'DM Crater Volcano Freestanding PoH': (None, None, 0x08, 'Collectable', 0x61), 'Goron City Pot Freestanding PoH': (None, None, 0x1F, 'Collectable', 0x62), - 'Queen Gohma Heart': (None, None, None, 'BossHeart', 0x11), - 'King Dodongo Heart': (None, None, None, 'BossHeart', 0x12), - 'Barinade Heart': (None, None, None, 'BossHeart', 0x13), - 'Phantom Ganon Heart': (None, None, None, 'BossHeart', 0x14), - 'Volvagia Heart': (None, None, None, 'BossHeart', 0x15), - 'Morpha Heart': (None, None, None, 'BossHeart', 0x16), - 'Twinrova Heart': (None, None, None, 'BossHeart', 0x17), - 'Bongo Bongo Heart': (None, None, None, 'BossHeart', 0x18), + 'Queen Gohma Heart': (None, None, 0x4F, 'BossHeart', 0x11), + 'King Dodongo Heart': (None, None, 0x4F, 'BossHeart', 0x12), + 'Barinade Heart': (None, None, 0x4F, 'BossHeart', 0x13), + 'Phantom Ganon Heart': (None, None, 0x4F, 'BossHeart', 0x14), + 'Volvagia Heart': (None, None, 0x4F, 'BossHeart', 0x15), + 'Morpha Heart': (None, None, 0x4F, 'BossHeart', 0x16), + 'Twinrova Heart': (None, None, 0x4F, 'BossHeart', 0x17), + 'Bongo Bongo Heart': (None, None, 0x4F, 'BossHeart', 0x18), 'Magic Bean Salesman': (None, None, None, 'Event', None), 'King Zora Moves': (None, None, None, 'Event', None), 'Ocarina of Time': (None, None, None, 'Event', None), From 718b9b99939a0fa967279e8f4b9a7788cee36ef1 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Thu, 31 May 2018 03:17:10 -0400 Subject: [PATCH 064/151] Use extended versions of all dungeon items --- Items.py | 67 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/Items.py b/Items.py index 9f9de25d8..70a31bd44 100644 --- a/Items.py +++ b/Items.py @@ -111,40 +111,41 @@ def ItemFactory(items): 'Compass': (False, False, 'Compass', 0x0800, 0x40), 'Boss Key': (False, False, 'BossKey', 0x07E0, 0x3F), 'Small Key': (False, False, 'SmallKey', 0x0840, 0x42), - 'Map (Deku Tree)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Deku Tree)': (False, False, 'Compass', 0x0800, 0x40), - 'Map (Dodongos Cavern)': (False, False, 'Map', None, 0xA3), + 'Boss Key (Forest Temple)': (False, False, 'BossKey', None, 0x92), + 'Boss Key (Fire Temple)': (False, False, 'BossKey', None, 0x93), + 'Boss Key (Water Temple)': (False, False, 'BossKey', None, 0x94), + 'Boss Key (Spirit Temple)': (False, False, 'BossKey', None, 0x95), + 'Boss Key (Shadow Temple)': (False, False, 'BossKey', None, 0x96), + 'Boss Key (Ganons Castle)': (False, False, 'BossKey', None, 0x97), + 'Compass (Deku Tree)': (False, False, 'Compass', None, 0x98), 'Compass (Dodongos Cavern)': (False, False, 'Compass', None, 0x99), - 'Map (Jabu Jabus Belly)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Jabu Jabus Belly)': (False, False, 'Compass', 0x0800, 0x40), - 'Map (Forest Temple)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Forest Temple)': (False, False, 'Compass', 0x0800, 0x40), - 'Boss Key (Forest Temple)': (False, False, 'BossKey', 0x07E0, 0x3F), - 'Small Key (Forest Temple)': (False, False, 'SmallKey', 0x0840, 0x42), - 'Map (Bottom of the Well)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Bottom of the Well)': (False, False, 'Compass', 0x0800, 0x40), - 'Small Key (Bottom of the Well)': (False, False, 'SmallKey', 0x0840, 0x42), - 'Map (Fire Temple)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Fire Temple)': (False, False, 'Compass', 0x0800, 0x40), - 'Boss Key (Fire Temple)': (False, False, 'BossKey', 0x07E0, 0x3F), - 'Small Key (Fire Temple)': (False, False, 'SmallKey', 0x0840, 0x42), - 'Map (Ice Cavern)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Ice Cavern)': (False, False, 'Compass', 0x0800, 0x40), - 'Map (Water Temple)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Water Temple)': (False, False, 'Compass', 0x0800, 0x40), - 'Boss Key (Water Temple)': (False, False, 'BossKey', 0x07E0, 0x3F), - 'Small Key (Water Temple)': (False, False, 'SmallKey', 0x0840, 0x42), - 'Map (Shadow Temple)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Shadow Temple)': (False, False, 'Compass', 0x0800, 0x40), - 'Boss Key (Shadow Temple)': (False, False, 'BossKey', 0x07E0, 0x3F), - 'Small Key (Shadow Temple)': (False, False, 'SmallKey', 0x0840, 0x42), - 'Small Key (Gerudo Training Grounds)': (False, False, 'SmallKey', 0x0840, 0x42), - 'Map (Spirit Temple)': (False, False, 'Map', 0x0820, 0x41), - 'Compass (Spirit Temple)': (False, False, 'Compass', 0x0800, 0x40), - 'Boss Key (Spirit Temple)': (False, False, 'BossKey', 0x07E0, 0x3F), - 'Small Key (Spirit Temple)': (False, False, 'SmallKey', 0x0840, 0x42), - 'Boss Key (Ganons Castle)': (False, False, 'BossKey', 0x07E0, 0x3F), - 'Small Key (Ganons Castle)': (False, False, 'SmallKey', 0x0840, 0x42), + 'Compass (Jabu Jabus Belly)': (False, False, 'Compass', None, 0x9A), + 'Compass (Forest Temple)': (False, False, 'Compass', None, 0x9B), + 'Compass (Fire Temple)': (False, False, 'Compass', None, 0x9C), + 'Compass (Water Temple)': (False, False, 'Compass', None, 0x9D), + 'Compass (Spirit Temple)': (False, False, 'Compass', None, 0x9E), + 'Compass (Shadow Temple)': (False, False, 'Compass', None, 0x9F), + 'Compass (Bottom of the Well)': (False, False, 'Compass', None, 0xA0), + 'Compass (Ice Cavern)': (False, False, 'Compass', None, 0xA1), + 'Map (Deku Tree)': (False, False, 'Map', None, 0xA2), + 'Map (Dodongos Cavern)': (False, False, 'Map', None, 0xA3), + 'Map (Jabu Jabus Belly)': (False, False, 'Map', None, 0xA4), + 'Map (Forest Temple)': (False, False, 'Map', None, 0xA5), + 'Map (Fire Temple)': (False, False, 'Map', None, 0xA6), + 'Map (Water Temple)': (False, False, 'Map', None, 0xA7), + 'Map (Spirit Temple)': (False, False, 'Map', None, 0xA8), + 'Map (Shadow Temple)': (False, False, 'Map', None, 0xA9), + 'Map (Bottom of the Well)': (False, False, 'Map', None, 0xAA), + 'Map (Ice Cavern)': (False, False, 'Map', None, 0xAB), + 'Small Key (Forest Temple)': (False, False, 'SmallKey', None, 0xAC), + 'Small Key (Fire Temple)': (False, False, 'SmallKey', None, 0xAD), + 'Small Key (Water Temple)': (False, False, 'SmallKey', None, 0xAE), + 'Small Key (Spirit Temple)': (False, False, 'SmallKey', None, 0xAF), + 'Small Key (Shadow Temple)': (False, False, 'SmallKey', None, 0xB0), + 'Small Key (Bottom of the Well)': (False, False, 'SmallKey', None, 0xB1), + 'Small Key (Gerudo Training Grounds)': (False, False, 'SmallKey', None, 0xB2), + 'Small Key (Gerudo Fortress)': (False, False, 'SmallKey', None, 0xB3), + 'Small Key (Ganons Castle)': (False, False, 'SmallKey', None, 0xB4), 'Zeldas Letter': (True, False, None, None, None), 'Zeldas Lullaby': (True, False, 'Song', 0x0A, 0x5), 'Eponas Song': (True, False, 'Song', 0x09, 0x4), From cce9f8621d4c8abfe5d40ac72bed29ae73903631 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 1 Jun 2018 00:01:45 -0500 Subject: [PATCH 065/151] Tunic colors and gravedigging tour Add Dampe's Gravedigging Tour to existent item locations. Put Winner PoH into the item pool. Comprehensive tunic color editing now available as well. --- BaseClasses.py | 3 ++- Gui.py | 36 +++++++++++++++++++++++++++--- ItemList.py | 2 +- Main.py | 4 ++-- OoTRandomizer.py | 7 ++++++ Regions.py | 2 +- Rom.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 104 insertions(+), 8 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index d381372fc..2d9d125f0 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -6,7 +6,7 @@ class World(object): - def __init__(self, bridge, open_forest, open_door_of_time, place_dungeon_items, check_beatable_only, hints): + def __init__(self, bridge, open_forest, open_door_of_time, place_dungeon_items, check_beatable_only, hints, colors): self.shuffle = 'vanilla' self.bridge = bridge self.dungeons = [] @@ -25,6 +25,7 @@ def __init__(self, bridge, open_forest, open_door_of_time, place_dungeon_items, self.open_forest = open_forest self.open_door_of_time = open_door_of_time self.hints = hints + self.colors = colors self.keysanity = False self.can_take_damage = True self.spoiler = Spoiler(self) diff --git a/Gui.py b/Gui.py index c64e538db..4e393ae7f 100644 --- a/Gui.py +++ b/Gui.py @@ -97,10 +97,10 @@ def RomSelect(): checkBoxFrame.pack() fileDialogFrame.pack() - drowDownFrame = Frame(topFrame) + dropDownFrame = Frame(topFrame) - bridgeFrame = Frame(drowDownFrame) + bridgeFrame = Frame(dropDownFrame) bridgeVar = StringVar() bridgeVar.set('medallions') bridgeOptionMenu = OptionMenu(bridgeFrame, bridgeVar, 'medallions', 'vanilla', 'dungeons', 'open') @@ -108,7 +108,36 @@ def RomSelect(): bridgeLabel = Label(bridgeFrame, text='Rainbow Bridge Requirement') bridgeLabel.pack(side=LEFT) + colorVars = [] + colorVars.append(StringVar()) + colorVars.append(StringVar()) + colorVars.append(StringVar()) + colorVars[0].set('Kokiri Green') + colorVars[1].set('Goron Red') + colorVars[2].set('Zora Blue') + + kokiriFrame = Frame(dropDownFrame) + kokiriOptionMenu = OptionMenu(kokiriFrame, colorVars[0], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') + kokiriOptionMenu.pack(side=RIGHT) + kokiriLabel = Label(kokiriFrame, text='Kokiri Tunic Color') + kokiriLabel.pack(side=LEFT) + + goronFrame = Frame(dropDownFrame) + goronOptionMenu = OptionMenu(goronFrame, colorVars[1], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') + goronOptionMenu.pack(side=RIGHT) + goronLabel = Label(goronFrame, text='Goron Tunic Color') + goronLabel.pack(side=LEFT) + + zoraFrame = Frame(dropDownFrame) + zoraOptionMenu = OptionMenu(zoraFrame, colorVars[2], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') + zoraOptionMenu.pack(side=RIGHT) + zoraLabel = Label(zoraFrame, text='Zora Tunic Color') + zoraLabel.pack(side=LEFT) + bridgeFrame.pack(expand=True, anchor=E) + kokiriFrame.pack(expand=True, anchor=E) + goronFrame.pack(expand=True, anchor=E) + zoraFrame.pack(expand=True, anchor=E) bottomFrame = Frame(randomizerWindow) @@ -124,6 +153,7 @@ def generateRom(): guiargs.seed = int(seedVar.get()) if seedVar.get() else None guiargs.count = int(countVar.get()) if countVar.get() != '1' else None guiargs.bridge = bridgeVar.get() + guiargs.colors = colorVars guiargs.create_spoiler = bool(createSpoilerVar.get()) guiargs.suppress_rom = bool(suppressRomVar.get()) guiargs.compress_rom = bool(compressRomVar.get()) @@ -156,7 +186,7 @@ def generateRom(): openOutputButton.pack(side=RIGHT) - drowDownFrame.pack(side=LEFT) + dropDownFrame.pack(side=LEFT) rightHalfFrame.pack(side=RIGHT) topFrame.pack(side=TOP) bottomFrame.pack(side=BOTTOM) diff --git a/ItemList.py b/ItemList.py index ecf2bd633..865aef85b 100644 --- a/ItemList.py +++ b/ItemList.py @@ -9,7 +9,7 @@ #Some basic items that various modes require are placed here, including pendants and crystals. Medallion requirements for the two relevant entrances are also decided. alwaysitems = (['Kokiri Sword', 'Biggoron Sword', 'Boomerang', 'Lens of Truth', 'Hammer', 'Iron Boots', 'Goron Tunic', 'Zora Tunic', 'Hover Boots', 'Mirror Shield', 'Stone of Agony', 'Fire Arrows', 'Ice Arrows', 'Light Arrows', 'Dins Fire', 'Farores Wind', 'Nayrus Love', 'Rupee (1)'] + ['Progressive Hookshot'] * 2 + ['Deku Shield'] * 4 + ['Hylian Shield'] * 2 + ['Ice Trap'] * 6 + - ['Progressive Strength Upgrade'] * 3 + ['Progressive Scale'] * 2 + ['Piece of Heart'] * 35 + ['Recovery Heart'] * 11 + ['Rupees (5)'] * 17 + ['Rupees (20)'] * 5 + ['Rupees (50)'] * 7 + ['Rupees (200)'] * 6 + ['Bow'] * 3 + ['Slingshot'] * 3 + ['Bomb Bag'] * 3 + ['Bottle with Letter'] + ['Heart Container'] * 8 + + ['Progressive Strength Upgrade'] * 3 + ['Progressive Scale'] * 2 + ['Piece of Heart'] * 35 + ['Recovery Heart'] * 11 + ['Rupees (5)'] * 17 + ['Rupees (20)'] * 5 + ['Rupees (50)'] * 7 + ['Rupees (200)'] * 6 + ['Bow'] * 3 + ['Slingshot'] * 3 + ['Bomb Bag'] * 3 + ['Bottle with Letter'] + ['Heart Container'] * 8 + ['Piece of Heart (Treasure Chest Game)'] + ['Bombs (5)'] * 2 + ['Bombs (10)'] * 2 + ['Bombs (20)'] * 2 + ['Bombchus (5)'] + ['Bombchus (10)'] * 3 + ['Bombchus (20)'] + ['Arrows (5)'] + ['Arrows (10)'] * 6 + ['Arrows (30)'] * 6 + ['Deku Nuts (5)'] + ['Deku Nuts (10)'] + ['Progressive Wallet'] * 2 + ['Deku Stick Capacity'] * 2 + ['Deku Nut Capacity'] * 2) normal_bottles = ['Bottle', 'Bottle with Milk', 'Bottle with Red Potion', 'Bottle with Green Potion', 'Bottle with Blue Potion', 'Bottle with Fairy', 'Bottle with Fish', 'Bottle with Blue Fire', 'Bottle with Bugs', 'Bottle with Poe'] normal_bottle_count = 3 diff --git a/Main.py b/Main.py index 811d07a70..c3672f0ab 100644 --- a/Main.py +++ b/Main.py @@ -23,7 +23,7 @@ def main(args, seed=None): start = time.clock() # initialize the world - world = World(args.bridge, args.open_forest, args.open_door_of_time, not args.nodungeonitems, args.beatableonly, args.hints) + world = World(args.bridge, args.open_forest, args.open_door_of_time, not args.nodungeonitems, args.beatableonly, args.hints, args.colors) logger = logging.getLogger('') if seed is None: random.seed(None) @@ -94,7 +94,7 @@ def main(args, seed=None): def copy_world(world): # ToDo: Not good yet - ret = World(world.bridge, world.open_forest, world.open_door_of_time, world.place_dungeon_items, world.check_beatable_only, world.hints) + ret = World(world.bridge, world.open_forest, world.open_door_of_time, world.place_dungeon_items, world.check_beatable_only, world.hints, world.colors) ret.seed = world.seed ret.can_take_damage = world.can_take_damage create_regions(ret) diff --git a/OoTRandomizer.py b/OoTRandomizer.py index 6f8589a9e..4f4a02b5a 100644 --- a/OoTRandomizer.py +++ b/OoTRandomizer.py @@ -59,6 +59,13 @@ def start(): in inconvenient locations if the Stone of Agony is in the player's inventory. ''', action='store_true') + parser.add_argument('--colors', default=['Kokiri Green', 'Goron Red', 'Zora Blue'], const='medallions', nargs='3', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], + help='''\ + Choose the color for each of Link's tunics. Please provide three colors. (default: %(default)s) + Color: Make the appropriate tunic this color. + Random: Choose a random color from this list of colors. + True Random: Choose a random color from any color the N64 can draw. + ''') parser.add_argument('--suppress_rom', help='Do not create an output rom file.', action='store_true') parser.add_argument('--compress_rom', help='Create a compressed version of the output rom file.', action='store_true') parser.add_argument('--gui', help='Launch the GUI', action='store_true') diff --git a/Regions.py b/Regions.py index 3a08261db..2bd2689cb 100644 --- a/Regions.py +++ b/Regions.py @@ -82,7 +82,7 @@ def create_regions(world): create_interior_region('Odd Medicine Building'), create_dungeon_region('Bottom of the Well', ['Bottom of the Well Front Left Hidden Wall', 'Bottom of the Well Front Center Bombable', 'Bottom of the Well Right Bottom Hidden Wall', 'Bottom of the Well Center Large Chest', 'Bottom of the Well Center Small Chest', 'Bottom of the Well Back Left Bombable', 'Bottom of the Well Freestanding Key', 'Bottom of the Well Defeat Boss', 'Bottom of the Well Invisible Chest', 'Bottom of the Well Underwater Front Chest', 'Bottom of the Well Underwater Left Chest', 'Bottom of the Well Basement Chest', 'Bottom of the Well Locked Pits', 'Bottom of the Well Behind Right Grate', 'GS78', 'GS79', 'GS80'], ['Bottom of the Well Exit']), - create_ow_region('Graveyard', ['Graveyard Freestanding PoH', 'GS28', 'GS29'], ['Shield Grave', 'Composer Grave', 'Heart Piece Grave', 'Dampes Grave', 'Dampes House', 'Graveyard Exit']), + create_ow_region('Graveyard', ['Graveyard Freestanding PoH', 'Gravedigging Tour', 'GS28', 'GS29'], ['Shield Grave', 'Composer Grave', 'Heart Piece Grave', 'Dampes Grave', 'Dampes House', 'Graveyard Exit']), create_interior_region('Shield Grave', ['Shield Grave Chest']), create_interior_region('Heart Piece Grave', ['Heart Piece Grave Chest']), create_interior_region('Composer Grave', ['Composer Grave Chest', 'Song from Composer Grave']), diff --git a/Rom.py b/Rom.py index 9d72f96fa..9fceb4ea0 100644 --- a/Rom.py +++ b/Rom.py @@ -991,6 +991,64 @@ def patch_rom(world, rom): rom.write_bytes(exit.addresses[1], [target1high, target1low]) rom.write_bytes(exit.addresses[2], [target1high, target1low]) rom.write_bytes(exit.target[1], [target2high, target2low]) + # patch tunic colors + # Custom color tunic stuff + Tunics = [] + Tunics.append(0x00B6DA38) # Kokiri Tunic + Tunics.append(0x00B6DA3B) # Goron Tunic + Tunics.append(0x00B6DA3E) # Zora Tunic + colorList = ['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green'] + randomColors = random.choices(colorList, k=3) + + for i in range(len(Tunics)): + if world.colors[i].get() == 'Random': + thisColor = randomColors[i] + else: + thisColor = world.colors[i].get() + randColor = [random.getrandbits(8), random.getrandbits(8), random.getrandbits(8)] + if thisColor == 'Kokiri Green': + color = [0x1E, 0x69, 0x1B] + elif thisColor == 'Goron Red': + color = [0x64, 0x14, 0x00] + elif thisColor == 'Zora Blue': + color = [0x00, 0x3C, 0x64] + elif thisColor == 'Black': + color = [0x30, 0x30, 0x30] + elif thisColor == 'White': + color = [0xE0, 0xE8, 0xF0] + elif thisColor == 'Purple': + color = [0x95, 0x30, 0x80] + elif thisColor == 'Yellow': + color = [0xF0, 0xF0, 0x60] + elif thisColor == 'Orange': + color = [0xFD, 0x79, 0x40] + elif thisColor == 'Pink': + color = [0xFD, 0x90, 0xB3] + elif thisColor == 'Gray': + color = [0xA0, 0xA0, 0xA0] + elif thisColor == 'Brown': + color = [0x95, 0x59, 0x0A] + elif thisColor == 'Gold': + color = [0xC0, 0xB0, 0x60] + elif thisColor == 'Silver': + color = [0xD0, 0xF0, 0xFF] + elif thisColor == 'Beige': + color = [0xF5, 0xC0, 0xC0] + elif thisColor == 'Teal': + color = [0x30, 0xF0, 0xD0] + elif thisColor == 'Royal Blue': + color = [0x40, 0x00, 0x90] + elif thisColor == 'Sonic Blue': + color = [0x50, 0x90, 0xE0] + elif thisColor == 'Blood Red': + color = [0x30, 0x10, 0x10] + elif thisColor == 'Blood Orange': + color = [0xF0, 0x30, 0x30] + elif thisColor == 'NES Green': + color = [0x00, 0xD0, 0x00] + elif thisColor == 'True Random': + color = randColor + rom.write_bytes(Tunics[i], color) return rom def get_override_table(world): From e61a214b058bbd1fef3628ca68c0df15a5024a29 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 1 Jun 2018 03:35:35 -0500 Subject: [PATCH 066/151] Fix color feature It didn't work on the command line before. --- Gui.py | 5 ++++- Main.py | 2 +- OoTRandomizer.py | 16 +++++++++++++++- Rom.py | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Gui.py b/Gui.py index 4e393ae7f..3eb9794a8 100644 --- a/Gui.py +++ b/Gui.py @@ -153,7 +153,9 @@ def generateRom(): guiargs.seed = int(seedVar.get()) if seedVar.get() else None guiargs.count = int(countVar.get()) if countVar.get() != '1' else None guiargs.bridge = bridgeVar.get() - guiargs.colors = colorVars + guiargs.kokiricolor = colorVars[0].get() + guiargs.goroncolor = colorVars[1].get() + guiargs.zoracolor = colorVars[2].get() guiargs.create_spoiler = bool(createSpoilerVar.get()) guiargs.suppress_rom = bool(suppressRomVar.get()) guiargs.compress_rom = bool(compressRomVar.get()) @@ -207,6 +209,7 @@ def generateRom(): if args.seed: seedVar.set(str(args.seed)) bridgeVar.set(args.bridge) + colorVars.set([args.kokiricolor, args.goroncolor, args.zoracolor]) romVar.set(args.rom) mainWindow.mainloop() diff --git a/Main.py b/Main.py index c3672f0ab..89e138edb 100644 --- a/Main.py +++ b/Main.py @@ -23,7 +23,7 @@ def main(args, seed=None): start = time.clock() # initialize the world - world = World(args.bridge, args.open_forest, args.open_door_of_time, not args.nodungeonitems, args.beatableonly, args.hints, args.colors) + world = World(args.bridge, args.open_forest, args.open_door_of_time, not args.nodungeonitems, args.beatableonly, args.hints, [args.kokiricolor, args.goroncolor, args.zoracolor]) logger = logging.getLogger('') if seed is None: random.seed(None) diff --git a/OoTRandomizer.py b/OoTRandomizer.py index 4f4a02b5a..f33d89256 100644 --- a/OoTRandomizer.py +++ b/OoTRandomizer.py @@ -59,7 +59,21 @@ def start(): in inconvenient locations if the Stone of Agony is in the player's inventory. ''', action='store_true') - parser.add_argument('--colors', default=['Kokiri Green', 'Goron Red', 'Zora Blue'], const='medallions', nargs='3', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], + parser.add_argument('--kokiricolor', default='Kokiri Green', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], + help='''\ + Choose the color for each of Link's tunics. Please provide three colors. (default: %(default)s) + Color: Make the appropriate tunic this color. + Random: Choose a random color from this list of colors. + True Random: Choose a random color from any color the N64 can draw. + ''') + parser.add_argument('--goroncolor', default='Goron Red', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], + help='''\ + Choose the color for each of Link's tunics. Please provide three colors. (default: %(default)s) + Color: Make the appropriate tunic this color. + Random: Choose a random color from this list of colors. + True Random: Choose a random color from any color the N64 can draw. + ''') + parser.add_argument('--zoracolor', default='Zora Blue', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], help='''\ Choose the color for each of Link's tunics. Please provide three colors. (default: %(default)s) Color: Make the appropriate tunic this color. diff --git a/Rom.py b/Rom.py index 9fceb4ea0..125764e14 100644 --- a/Rom.py +++ b/Rom.py @@ -1001,10 +1001,10 @@ def patch_rom(world, rom): randomColors = random.choices(colorList, k=3) for i in range(len(Tunics)): - if world.colors[i].get() == 'Random': + if world.colors[i] == 'Random': thisColor = randomColors[i] else: - thisColor = world.colors[i].get() + thisColor = world.colors[i] randColor = [random.getrandbits(8), random.getrandbits(8), random.getrandbits(8)] if thisColor == 'Kokiri Green': color = [0x1E, 0x69, 0x1B] From 917eb8d88381cd108a746ec08e59ab33524acc52 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 1 Jun 2018 14:44:49 -0500 Subject: [PATCH 067/151] More accurate instructions for command line --- OoTRandomizer.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OoTRandomizer.py b/OoTRandomizer.py index f33d89256..4f859aec9 100644 --- a/OoTRandomizer.py +++ b/OoTRandomizer.py @@ -61,22 +61,22 @@ def start(): ''', action='store_true') parser.add_argument('--kokiricolor', default='Kokiri Green', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], help='''\ - Choose the color for each of Link's tunics. Please provide three colors. (default: %(default)s) - Color: Make the appropriate tunic this color. + Choose the color for Link's Kokiri Tunic. (default: %(default)s) + Color: Make the Kokiri Tunic this color. Random: Choose a random color from this list of colors. True Random: Choose a random color from any color the N64 can draw. ''') parser.add_argument('--goroncolor', default='Goron Red', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], help='''\ - Choose the color for each of Link's tunics. Please provide three colors. (default: %(default)s) - Color: Make the appropriate tunic this color. + Choose the color for Link's Goron Tunic. (default: %(default)s) + Color: Make the Goron Tunic this color. Random: Choose a random color from this list of colors. True Random: Choose a random color from any color the N64 can draw. ''') parser.add_argument('--zoracolor', default='Zora Blue', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], help='''\ - Choose the color for each of Link's tunics. Please provide three colors. (default: %(default)s) - Color: Make the appropriate tunic this color. + Choose the color for Link's Zora Tunic. (default: %(default)s) + Color: Make the Zora Tunic this color. Random: Choose a random color from this list of colors. True Random: Choose a random color from any color the N64 can draw. ''') From 0c83aa4c0fca764ffa5b5294c4f775036d0353d5 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Fri, 1 Jun 2018 19:27:26 -0500 Subject: [PATCH 068/151] Heart SFX --- BaseClasses.py | 3 ++- Gui.py | 60 +++++++++++++++++++++++++++++------------------- Main.py | 4 ++-- OoTRandomizer.py | 8 +++++++ Rom.py | 42 +++++++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 27 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 2d9d125f0..f8ab18805 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -6,7 +6,7 @@ class World(object): - def __init__(self, bridge, open_forest, open_door_of_time, place_dungeon_items, check_beatable_only, hints, colors): + def __init__(self, bridge, open_forest, open_door_of_time, place_dungeon_items, check_beatable_only, hints, colors, healthSFX): self.shuffle = 'vanilla' self.bridge = bridge self.dungeons = [] @@ -26,6 +26,7 @@ def __init__(self, bridge, open_forest, open_door_of_time, place_dungeon_items, self.open_door_of_time = open_door_of_time self.hints = hints self.colors = colors + self.healthSFX = healthSFX self.keysanity = False self.can_take_damage = True self.spoiler = Spoiler(self) diff --git a/Gui.py b/Gui.py index 3eb9794a8..c57bbc4a2 100644 --- a/Gui.py +++ b/Gui.py @@ -108,36 +108,46 @@ def RomSelect(): bridgeLabel = Label(bridgeFrame, text='Rainbow Bridge Requirement') bridgeLabel.pack(side=LEFT) - colorVars = [] - colorVars.append(StringVar()) - colorVars.append(StringVar()) - colorVars.append(StringVar()) - colorVars[0].set('Kokiri Green') - colorVars[1].set('Goron Red') - colorVars[2].set('Zora Blue') - - kokiriFrame = Frame(dropDownFrame) - kokiriOptionMenu = OptionMenu(kokiriFrame, colorVars[0], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') - kokiriOptionMenu.pack(side=RIGHT) - kokiriLabel = Label(kokiriFrame, text='Kokiri Tunic Color') - kokiriLabel.pack(side=LEFT) - - goronFrame = Frame(dropDownFrame) - goronOptionMenu = OptionMenu(goronFrame, colorVars[1], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') - goronOptionMenu.pack(side=RIGHT) - goronLabel = Label(goronFrame, text='Goron Tunic Color') - goronLabel.pack(side=LEFT) - - zoraFrame = Frame(dropDownFrame) - zoraOptionMenu = OptionMenu(zoraFrame, colorVars[2], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') - zoraOptionMenu.pack(side=RIGHT) - zoraLabel = Label(zoraFrame, text='Zora Tunic Color') + colorVars = [] + colorVars.append(StringVar()) + colorVars.append(StringVar()) + colorVars.append(StringVar()) + colorVars[0].set('Kokiri Green') + colorVars[1].set('Goron Red') + colorVars[2].set('Zora Blue') + + kokiriFrame = Frame(dropDownFrame) + kokiriOptionMenu = OptionMenu(kokiriFrame, colorVars[0], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') + kokiriOptionMenu.pack(side=RIGHT) + kokiriLabel = Label(kokiriFrame, text='Kokiri Tunic Color') + kokiriLabel.pack(side=LEFT) + + goronFrame = Frame(dropDownFrame) + goronOptionMenu = OptionMenu(goronFrame, colorVars[1], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') + goronOptionMenu.pack(side=RIGHT) + goronLabel = Label(goronFrame, text='Goron Tunic Color') + goronLabel.pack(side=LEFT) + + zoraFrame = Frame(dropDownFrame) + zoraOptionMenu = OptionMenu(zoraFrame, colorVars[2], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') + zoraOptionMenu.pack(side=RIGHT) + zoraLabel = Label(zoraFrame, text='Zora Tunic Color') zoraLabel.pack(side=LEFT) + lowHealthSFXVar = StringVar() + lowHealthSFXVar.set('Default') + + lowHealthSFXFrame = Frame(dropDownFrame) + lowHealthSFXOptionMenu = OptionMenu(lowHealthSFXFrame, lowHealthSFXVar, 'Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recorvery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None') + lowHealthSFXOptionMenu.pack(side=RIGHT) + lowHealthSFXLabel = Label(lowHealthSFXFrame, text='Low Health SFX') + lowHealthSFXLabel.pack(side=LEFT) + bridgeFrame.pack(expand=True, anchor=E) kokiriFrame.pack(expand=True, anchor=E) goronFrame.pack(expand=True, anchor=E) zoraFrame.pack(expand=True, anchor=E) + lowHealthSFXFrame.pack(expand=True, anchor=E) bottomFrame = Frame(randomizerWindow) @@ -156,6 +166,7 @@ def generateRom(): guiargs.kokiricolor = colorVars[0].get() guiargs.goroncolor = colorVars[1].get() guiargs.zoracolor = colorVars[2].get() + guiargs.healthSFX = lowHealthSFXVar.get() guiargs.create_spoiler = bool(createSpoilerVar.get()) guiargs.suppress_rom = bool(suppressRomVar.get()) guiargs.compress_rom = bool(compressRomVar.get()) @@ -210,6 +221,7 @@ def generateRom(): seedVar.set(str(args.seed)) bridgeVar.set(args.bridge) colorVars.set([args.kokiricolor, args.goroncolor, args.zoracolor]) + lowHealthSFXVar.set(args.healthSFX) romVar.set(args.rom) mainWindow.mainloop() diff --git a/Main.py b/Main.py index 89e138edb..7960a009c 100644 --- a/Main.py +++ b/Main.py @@ -23,7 +23,7 @@ def main(args, seed=None): start = time.clock() # initialize the world - world = World(args.bridge, args.open_forest, args.open_door_of_time, not args.nodungeonitems, args.beatableonly, args.hints, [args.kokiricolor, args.goroncolor, args.zoracolor]) + world = World(args.bridge, args.open_forest, args.open_door_of_time, not args.nodungeonitems, args.beatableonly, args.hints, [args.kokiricolor, args.goroncolor, args.zoracolor], args.healthSFX) logger = logging.getLogger('') if seed is None: random.seed(None) @@ -94,7 +94,7 @@ def main(args, seed=None): def copy_world(world): # ToDo: Not good yet - ret = World(world.bridge, world.open_forest, world.open_door_of_time, world.place_dungeon_items, world.check_beatable_only, world.hints, world.colors) + ret = World(world.bridge, world.open_forest, world.open_door_of_time, world.place_dungeon_items, world.check_beatable_only, world.hints, world.colors, world.healthSFX) ret.seed = world.seed ret.can_take_damage = world.can_take_damage create_regions(ret) diff --git a/OoTRandomizer.py b/OoTRandomizer.py index 4f859aec9..6ceeafc69 100644 --- a/OoTRandomizer.py +++ b/OoTRandomizer.py @@ -80,6 +80,14 @@ def start(): Random: Choose a random color from this list of colors. True Random: Choose a random color from any color the N64 can draw. ''') + parser.add_argument('--healthSFX', default='Default', const='medallions', nargs='?', choices=['medallions', 'vanilla', 'dungeons', 'open'], + help='''\ + Select requirement to spawn the Rainbow Bridge to reach Ganon's Castle. (default: %(default)s) + Medallions: Collect all six medallions to create the bridge. + Vanilla: Collect only the Shadow and Spirit Medallions and then view the Light Arrow cutscene. + All Dungeons: Collect all spiritual stones and all medallions to create the bridge. + Open: The bridge will spawn without an item requirement. + ''') parser.add_argument('--suppress_rom', help='Do not create an output rom file.', action='store_true') parser.add_argument('--compress_rom', help='Create a compressed version of the output rom file.', action='store_true') parser.add_argument('--gui', help='Launch the GUI', action='store_true') diff --git a/Rom.py b/Rom.py index 125764e14..54b8c0182 100644 --- a/Rom.py +++ b/Rom.py @@ -649,6 +649,13 @@ def patch_rom(world, rom): # Dampe always digs something up and first dig is always the Piece of Heart rom.write_bytes(0xCC3FA8, [0xA2, 0x01, 0x01, 0xF8]) rom.write_bytes(0xCC4024, [0x00, 0x00, 0x00, 0x00]) + + # Ganon gets the last laugh sometimes + Block_code = [0x3C, 0x01, 0x80, 0x12, 0x80, 0x21, 0xA6, 0x09, 0x30, 0x21, 0x00, 0x03, + 0x14, 0x01, 0x00, 0x02, 0x24, 0x05, 0x68, 0x0B, 0x24, 0x05, 0x39, 0xC7, + 0x08, 0x0E, 0x24, 0x04] + rom.write_bytes(0x3480C40, Block_code) + # Allow owl to always carry the kid down Death Mountain rom.write_bytes(0xE304F0, [0x24, 0x0E, 0x00, 0x01]) @@ -795,6 +802,7 @@ def patch_rom(world, rom): rom.write_bytes(0xC89A34, [0x0C, 0x10, 0x02, 0x54, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at death mountain trail rom.write_bytes(0xC89A78, [0x0C, 0x10, 0x02, 0x60, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at crater rom.write_bytes(0xDBF428, [0x0C, 0x10, 0x03, 0x00]) #Set Fishing Hook + rom.write_bytes(0xBD1F68, [0x0C, 0x10, 0x03, 0x10]) #Set hook for Ganondorf laugh # Sticks on B fix rom.write_bytes(0xAE4B14, [0x0C, 0x10, 0x02, 0x74]) @@ -991,6 +999,7 @@ def patch_rom(world, rom): rom.write_bytes(exit.addresses[1], [target1high, target1low]) rom.write_bytes(exit.addresses[2], [target1high, target1low]) rom.write_bytes(exit.target[1], [target2high, target2low]) + # patch tunic colors # Custom color tunic stuff Tunics = [] @@ -1049,6 +1058,39 @@ def patch_rom(world, rom): elif thisColor == 'True Random': color = randColor rom.write_bytes(Tunics[i], color) + + #Low health beep + healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recorvery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'] + randomSFX = random.choice(healthSFXList) + + if world.healthSFX == 'Random': + thisHealthSFX = randomSFX + else: + thisHealthSFX = world.healthSFX + if thisHealthSFX == 'Default': + healthSFX = [0x48, 0x1B] + elif thisHealthSFX == 'Softer Beep': + healthSFX = [0x48, 0x04] + elif thisHealthSFX == 'Rupee': + healthSFX = [0x48, 0x03] + elif thisHealthSFX == 'Timer': + healthSFX = [0x48, 0x1A] + elif thisHealthSFX == 'Tamborine': + healthSFX = [0x48, 0x42] + elif thisHealthSFX == 'Recorvery Heart': + healthSFX = [0x48, 0x0B] + elif thisHealthSFX == 'Carrot Refill': + healthSFX = [0x48, 0x45] + elif thisHealthSFX == 'Navi - Hey!': + healthSFX = [0x68, 0x5F] + elif thisHealthSFX == 'Zelda - Gasp': + healthSFX = [0x68, 0x79] + elif thisHealthSFX == 'Mweep!': + healthSFX = [0x68, 0x7A] + elif thisHealthSFX == 'None': + healthSFX = [0x08, 0xE0] + rom.write_bytes(0xADBA1A, healthSFX) + return rom def get_override_table(world): From e97584484235efd4613e01a43967556baba67093 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 1 Jun 2018 20:29:24 -0500 Subject: [PATCH 069/151] Fix command line for SFX change --- OoTRandomizer.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/OoTRandomizer.py b/OoTRandomizer.py index 6ceeafc69..2fbc72ec5 100644 --- a/OoTRandomizer.py +++ b/OoTRandomizer.py @@ -80,13 +80,12 @@ def start(): Random: Choose a random color from this list of colors. True Random: Choose a random color from any color the N64 can draw. ''') - parser.add_argument('--healthSFX', default='Default', const='medallions', nargs='?', choices=['medallions', 'vanilla', 'dungeons', 'open'], + parser.add_argument('--healthSFX', default='Default', const='Default', nargs='?', choices=['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recorvery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'], help='''\ - Select requirement to spawn the Rainbow Bridge to reach Ganon's Castle. (default: %(default)s) - Medallions: Collect all six medallions to create the bridge. - Vanilla: Collect only the Shadow and Spirit Medallions and then view the Light Arrow cutscene. - All Dungeons: Collect all spiritual stones and all medallions to create the bridge. - Open: The bridge will spawn without an item requirement. + Select the sound effect that loops at low health. (default: %(default)s) + Sound: Replace the sound effect with the chosen sound. + Random: Replace the sound effect with a random sound from this list. + None: Eliminate heart beeps. ''') parser.add_argument('--suppress_rom', help='Do not create an output rom file.', action='store_true') parser.add_argument('--compress_rom', help='Create a compressed version of the output rom file.', action='store_true') From 20dcb26c56a1dd041f760fd9d1e783f13436ba3a Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Fri, 1 Jun 2018 20:30:21 -0500 Subject: [PATCH 070/151] Hints for freestanding locations and bottle items From b5697dad6f2c054939e775d95aca3c69907d5d2a Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 1 Jun 2018 21:57:57 -0400 Subject: [PATCH 071/151] Fix indentation --- Regions.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Regions.py b/Regions.py index 3a08261db..e0e7241b4 100644 --- a/Regions.py +++ b/Regions.py @@ -16,9 +16,9 @@ def create_regions(world): create_dungeon_region('Deku Tree Slingshot Room', ['Deku Tree Slingshot Chest', 'Deku Tree Slingshot Room Side Chest'], ['Deku Tree Slingshot Exit']), create_dungeon_region('Deku Tree Boss Room', ['GS11', 'Queen Gohma Heart', 'Queen Gohma'], ['Deku Tree Basement Vines']), create_ow_region('Lost Woods', ['Skull Kid', 'Ocarina Memory Game', 'Target in Woods', 'Deku Salesman Woods', 'GS4', 'GS5'], ['Lost Woods Front', 'Meadow Entrance', 'Woods to Goron City', 'Lost Woods Dive Warp', 'Adult Meadow Access', 'Lost Woods Generic Grotto', 'Deku Theater', 'Lost Woods Sales Grotto']), - create_ow_region('Sacred Forest Meadow Entryway', None, ['Meadow Exit', 'Meadow Gate', 'Front of Meadow Grotto']), - create_ow_region('Sacred Forest Meadow', ['Song from Saria'], ['Meadow Gate Exit', 'Meadow Fairy Grotto']), - create_ow_region('Lost Woods Bridge', ['Gift from Saria'], ['Kokiri Forest Entrance', 'Forest Exit']), + create_ow_region('Sacred Forest Meadow Entryway', None, ['Meadow Exit', 'Meadow Gate', 'Front of Meadow Grotto']), + create_ow_region('Sacred Forest Meadow', ['Song from Saria'], ['Meadow Gate Exit', 'Meadow Fairy Grotto']), + create_ow_region('Lost Woods Bridge', ['Gift from Saria'], ['Kokiri Forest Entrance', 'Forest Exit']), create_ow_region('Hyrule Field', ['Ocarina of Time', 'Song from Ocarina of Time'], ['Field to Forest', 'Field to Lake', 'Field to Valley', 'Field to Castle Town', 'Field to Kakariko', 'Field to Zora River', 'Lon Lon Rance Entrance', 'Remote Southern Grotto', 'Field Near Lake Outside Fence Grotto', 'Field Near Lake Inside Fence Grotto', 'Field Valley Grotto', 'Field West Castle Town Grotto', 'Field Far West Castle Town Grotto', 'Field Kakariko Grotto', 'Field North Lon Lon Grotto']), From d3e6556fa01a11c5e8aec0c69fac0417dc6b8a43 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 1 Jun 2018 22:03:14 -0400 Subject: [PATCH 072/151] Add 'base item' to ITEM_TABLE, fix extended item issues --- ASM/src/build.asm | 2 +- ASM/src/item_data.asm | 190 ++++++++++++++++++++++------------------- ASM/src/items.asm | 93 ++++++++++---------- ASM/src/state.asm | 7 +- data/base2current.json | 2 +- 5 files changed, 159 insertions(+), 135 deletions(-) diff --git a/ASM/src/build.asm b/ASM/src/build.asm index e62ac817c..b3193d2fd 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -25,8 +25,8 @@ .area 0x1000, 0 .include "constants.asm" .include "state.asm" -.include "items.asm" .include "item_data.asm" +.include "items.asm" .include "every_frame.asm" .include "menu.asm" .include "fixes.asm" diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index f5632e462..b42429a40 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -3,103 +3,119 @@ ;================================================================================================== ; Dungeon indexes, used with the dungeon item / small key tables in the save context -.definelabel DEKU, 0 -.definelabel DODONGO, 1 -.definelabel JABU, 2 -.definelabel FOREST, 3 -.definelabel FIRE, 4 -.definelabel WATER, 5 -.definelabel SPIRIT, 6 -.definelabel SHADOW, 7 -.definelabel BOTW, 8 -.definelabel ICE, 9 -.definelabel TOWER, 10 -.definelabel GTG, 11 -.definelabel FORT, 12 -.definelabel CASTLE, 13 +DEKU_ID equ 0 +DODONGO_ID equ 1 +JABU_ID equ 2 +FOREST_ID equ 3 +FIRE_ID equ 4 +WATER_ID equ 5 +SPIRIT_ID equ 6 +SHADOW_ID equ 7 +BOTW_ID equ 8 +ICE_ID equ 9 +TOWER_ID equ 10 +GTG_ID equ 11 +FORT_ID equ 12 +CASTLE_ID equ 13 .definelabel ITEM_TABLE_ROW_SIZE, 0x10 -.macro Item_Row, action_id, graphic_id, text_id, object_id, upgrade_fn, effect_fn, effect_arg1, effect_arg2 - .halfword action_id ; 0x00 - .byte graphic_id ; 0x02 - .byte text_id ; 0x03 - .halfword object_id ; 0x04 - .byte effect_arg1 ; 0x06 - .byte effect_arg2 ; 0x07 - .word effect_fn ; 0x08 - .word upgrade_fn ; 0x0C +.macro Item_Row, base_item, action_id, graphic_id, text_id, object_id, upgrade_fn, effect_fn, effect_arg1, effect_arg2 + .byte base_item ; 0x00 + .byte action_id ; 0x01 + .byte graphic_id ; 0x02 + .byte text_id ; 0x03 + .halfword object_id ; 0x04 + .byte effect_arg1 ; 0x06 + .byte effect_arg2 ; 0x07 + .word effect_fn ; 0x08 + .word upgrade_fn ; 0x0C .endmacro +ITEM_ROW_BASE_ITEM equ 0x00 +ITEM_ROW_ACTION_ID equ 0x01 +ITEM_ROW_GRAPHIC_ID equ 0x02 +ITEM_ROW_TEXT_ID equ 0x03 +ITEM_ROW_OBJECT_ID equ 0x04 +ITEM_ROW_EFFECT_ARG1 equ 0x06 +ITEM_ROW_EFFECT_ARG2 equ 0x07 +ITEM_ROW_EFFECT_FN equ 0x08 +ITEM_ROW_UPGRADE_FN equ 0x0C +ITEM_ROW_IS_EXTENDED equ 0x0C ; This offset is repurposed after the upgrades are resolved + +; The "base item" mostly controls the sound effect made when you receive the item. It should be +; set to something that doesn't break NPCs. + ITEM_TABLE: -; AAAA GG TT OOOO -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, hookshot_upgrade, no_effect, 0xFF, 0xFF ; 0x80 = Progressive Hookshot -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, strength_upgrade, no_effect, 0xFF, 0xFF ; 0x81 = Progressive Strength -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, bomb_bag_upgrade, no_effect, 0xFF, 0xFF ; 0x82 = Progressive Bomb Bag -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, bow_upgrade, no_effect, 0xFF, 0xFF ; 0x83 = Progressive Bow -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, slingshot_upgrade, no_effect, 0xFF, 0xFF ; 0x84 = Progressive Slingshot -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, wallet_upgrade, no_effect, 0xFF, 0xFF ; 0x85 = Progressive Wallet -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, scale_upgrade, no_effect, 0xFF, 0xFF ; 0x86 = Progressive Scale -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, nut_upgrade, no_effect, 0xFF, 0xFF ; 0x87 = Progressive Nut Capacity -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, stick_upgrade, no_effect, 0xFF, 0xFF ; 0x88 = Progressive Stick Capacity +Item_Row -1, -1, -1, -1, -1, hookshot_upgrade, no_effect, -1, -1 ; 0x80 = Progressive Hookshot +Item_Row -1, -1, -1, -1, -1, strength_upgrade, no_effect, -1, -1 ; 0x81 = Progressive Strength +Item_Row -1, -1, -1, -1, -1, bomb_bag_upgrade, no_effect, -1, -1 ; 0x82 = Progressive Bomb Bag +Item_Row -1, -1, -1, -1, -1, bow_upgrade, no_effect, -1, -1 ; 0x83 = Progressive Bow +Item_Row -1, -1, -1, -1, -1, slingshot_upgrade, no_effect, -1, -1 ; 0x84 = Progressive Slingshot +Item_Row -1, -1, -1, -1, -1, wallet_upgrade, no_effect, -1, -1 ; 0x85 = Progressive Wallet +Item_Row -1, -1, -1, -1, -1, scale_upgrade, no_effect, -1, -1 ; 0x86 = Progressive Scale +Item_Row -1, -1, -1, -1, -1, nut_upgrade, no_effect, -1, -1 ; 0x87 = Progressive Nut Capacity +Item_Row -1, -1, -1, -1, -1, stick_upgrade, no_effect, -1, -1 ; 0x88 = Progressive Stick Capacity + +Item_Row 0x53, 0xFF, 0x01, 0x43, 0x00C6, no_upgrade, give_bottle, 0x15, -1 ; 0x89 = Bottle with Red Potion +Item_Row 0x53, 0xFF, 0x01, 0x44, 0x00C6, no_upgrade, give_bottle, 0x16, -1 ; 0x8A = Bottle with Green Potion +Item_Row 0x53, 0xFF, 0x01, 0x45, 0x00C6, no_upgrade, give_bottle, 0x17, -1 ; 0x8B = Bottle with Blue Potion +Item_Row 0x53, 0xFF, 0x01, 0x46, 0x00C6, no_upgrade, give_bottle, 0x18, -1 ; 0x8C = Bottle with Fairy +Item_Row 0x53, 0xFF, 0x01, 0x47, 0x00C6, no_upgrade, give_bottle, 0x19, -1 ; 0x8D = Bottle with Fish +Item_Row 0x53, 0xFF, 0x01, 0x5D, 0x00C6, no_upgrade, give_bottle, 0x1C, -1 ; 0x8E = Bottle with Blue Fire +Item_Row 0x53, 0xFF, 0x01, 0x7A, 0x00C6, no_upgrade, give_bottle, 0x1D, -1 ; 0x8F = Bottle with Bugs +Item_Row 0x53, 0xFF, 0x01, 0xF9, 0x00C6, no_upgrade, give_bottle, 0x1E, -1 ; 0x90 = Bottle with Big Poe +Item_Row 0x53, 0xFF, 0x01, 0x97, 0x00C6, no_upgrade, give_bottle, 0x20, -1 ; 0x91 = Bottle with Poe -Item_Row 0x00FF, 0x01, 0x43, 0x00C6, no_upgrade, give_bottle, 0x15, 0xFF ; 0x89 = Bottle with Red Potion -Item_Row 0x00FF, 0x01, 0x44, 0x00C6, no_upgrade, give_bottle, 0x16, 0xFF ; 0x8A = Bottle with Green Potion -Item_Row 0x00FF, 0x01, 0x45, 0x00C6, no_upgrade, give_bottle, 0x17, 0xFF ; 0x8B = Bottle with Blue Potion -Item_Row 0x00FF, 0x01, 0x46, 0x00C6, no_upgrade, give_bottle, 0x18, 0xFF ; 0x8C = Bottle with Fairy -Item_Row 0x00FF, 0x01, 0x47, 0x00C6, no_upgrade, give_bottle, 0x19, 0xFF ; 0x8D = Bottle with Fish -Item_Row 0x00FF, 0x01, 0x5D, 0x00C6, no_upgrade, give_bottle, 0x1C, 0xFF ; 0x8E = Bottle with Blue Fire -Item_Row 0x00FF, 0x01, 0x7A, 0x00C6, no_upgrade, give_bottle, 0x1D, 0xFF ; 0x8F = Bottle with Bugs -Item_Row 0x00FF, 0x01, 0xF9, 0x00C6, no_upgrade, give_bottle, 0x1E, 0xFF ; 0x90 = Bottle with Big Poe -Item_Row 0x00FF, 0x01, 0x97, 0x00C6, no_upgrade, give_bottle, 0x20, 0xFF ; 0x91 = Bottle with Poe +Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FOREST_ID ; 0x92 = Forest Temple Boss Key +Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FIRE_ID ; 0x93 = Fire Temple Boss Key +Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, WATER_ID ; 0x94 = Water Temple Boss Key +Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SPIRIT_ID ; 0x95 = Spirit Temple Boss Key +Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SHADOW_ID ; 0x96 = Shadow Temple Boss Key +Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, CASTLE_ID ; 0x97 = Ganon's Castle Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FOREST ; 0x92 = Forest Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FIRE ; 0x93 = Fire Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, WATER ; 0x94 = Water Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SPIRIT ; 0x95 = Spirit Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SHADOW ; 0x96 = Shadow Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, CASTLE ; 0x97 = Ganon's Castle Boss Key +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DEKU_ID ; 0x98 = Deku Tree Compass +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DODONGO_ID ; 0x99 = Dodongo's Cavern Compass +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, JABU_ID ; 0x9A = Jabu Jabu Compass +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FOREST_ID ; 0x9B = Forest Temple Compass +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FIRE_ID ; 0x9C = Fire Temple Compass +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, WATER_ID ; 0x9D = Water Temple Compass +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SPIRIT_ID ; 0x9E = Spirit Temple Compass +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SHADOW_ID ; 0x9F = Shadow Temple Compass +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, BOTW_ID ; 0xA0 = Bottom of the Well Compass +Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, ICE_ID ; 0xA1 = Ice Cavern Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DEKU ; 0x98 = Deku Tree Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DODONGO ; 0x99 = Dodongo's Cavern Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, JABU ; 0x9A = Jabu Jabu Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FOREST ; 0x9B = Forest Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FIRE ; 0x9C = Fire Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, WATER ; 0x9D = Water Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SPIRIT ; 0x9E = Spirit Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SHADOW ; 0x9F = Shadow Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, BOTW ; 0xA0 = Bottom of the Well Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, ICE ; 0xA1 = Ice Cavern Compass +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DEKU_ID ; 0xA2 = Deku Tree Map +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DODONGO_ID ; 0xA3 = Dodongo's Cavern Map +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, JABU_ID ; 0xA4 = Jabu Jabu Map +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FOREST_ID ; 0xA5 = Forest Temple Map +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FIRE_ID ; 0xA6 = Fire Temple Map +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, WATER_ID ; 0xA7 = Water Temple Map +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SPIRIT_ID ; 0xA8 = Spirit Temple Map +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SHADOW_ID ; 0xA9 = Shadow Temple Map +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, BOTW_ID ; 0xAA = Bottom of the Well Map +Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, ICE_ID ; 0xAB = Ice Cavern Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DEKU ; 0xA2 = Deku Tree Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DODONGO ; 0xA3 = Dodongo's Cavern Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, JABU ; 0xA4 = Jabu Jabu Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FOREST ; 0xA5 = Forest Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FIRE ; 0xA6 = Fire Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, WATER ; 0xA7 = Water Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SPIRIT ; 0xA8 = Spirit Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SHADOW ; 0xA9 = Shadow Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, BOTW ; 0xAA = Bottom of the Well Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, ICE ; 0xAB = Ice Cavern Map +Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FOREST_ID, -1 ; 0xAC = Forest Temple Small Key +Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FIRE_ID, -1 ; 0xAD = Fire Temple Small Key +Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, WATER_ID, -1 ; 0xAE = Water Temple Small Key +Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SPIRIT_ID, -1 ; 0xAF = Spirit Temple Small Key +Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SHADOW_ID, -1 ; 0xB0 = Shadow Temple Small Key +Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, BOTW_ID, -1 ; 0xB1 = Bottom of the Well Small Key +Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, GTG_ID, -1 ; 0xB2 = Gerudo Training Small Key +Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FORT_ID, -1 ; 0xB3 = Gerudo Fortress Small Key +Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, CASTLE_ID, -1 ; 0xB4 = Ganon's Castle Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FOREST, 0xFF ; 0xAC = Forest Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FIRE, 0xFF ; 0xAD = Fire Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, WATER, 0xFF ; 0xAE = Water Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SPIRIT, 0xFF ; 0xAF = Spirit Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SHADOW, 0xFF ; 0xB0 = Shadow Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, BOTW, 0xFF ; 0xB1 = Bottom of the Well Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, GTG, 0xFF ; 0xB2 = Gerudo Training Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FORT, 0xFF ; 0xB3 = Gerudo Fortress Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, CASTLE, 0xFF ; 0xB4 = Ganon's Castle Small Key +Item_Row 0x53, 0x3D, 0x43, 0x0C, 0x00F8, no_upgrade, give_biggoron_sword, -1, -1 ; 0xB5 = Biggoron Sword -Item_Row 0x003D, 0x43, 0x0C, 0x00F8, no_upgrade, give_biggoron_sword, 0xFF, 0xFF ; 0xB5 = Biggoron Sword +Item_Row 0x4D, 0x83, 0x09, 0x55, 0x00B7, no_upgrade, no_effect, -1, -1 ; 0xB6 = Recovery Heart +Item_Row 0x53, 0x92, 0xDB, 0xE6, 0x00D8, arrows_to_rupee, no_effect, -1, -1 ; 0xB7 = Arrows (5) +Item_Row 0x53, 0x93, 0xDA, 0xE6, 0x00D8, arrows_to_rupee, no_effect, -1, -1 ; 0xB8 = Arrows (10) +Item_Row 0x53, 0x94, 0xD9, 0xE6, 0x00D8, arrows_to_rupee, no_effect, -1, -1 ; 0xB9 = Arrows (30) +Item_Row 0x53, 0x8E, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, -1, -1 ; 0xBA = Bombs (5) +Item_Row 0x53, 0x8F, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, -1, -1 ; 0xBB = Bombs (10) +Item_Row 0x53, 0x90, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, -1, -1 ; 0xBC = Bombs (20) +Item_Row 0x53, 0x8C, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, -1, -1 ; 0xBD = Deku Nuts (5) +Item_Row 0x53, 0x8D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, -1, -1 ; 0xBE = Deku Nuts (10) -Item_Row 0x0083, 0x09, 0x55, 0x00B7, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB6 = Recovery Heart -Item_Row 0x0092, 0xDB, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB7 = Arrows (5) -Item_Row 0x0093, 0xDA, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB8 = Arrows (10) -Item_Row 0x0094, 0xD9, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB9 = Arrows (30) -Item_Row 0x008E, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBA = Bombs (5) -Item_Row 0x008F, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBB = Bombs (10) -Item_Row 0x0090, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBC = Bombs (20) -Item_Row 0x008C, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBD = Deku Nuts (5) -Item_Row 0x008D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBE = Deku Nuts (10) +Item_Row 0x4F, 0xFF, 0x13, 0xE9, 0x00BD, no_upgrade, give_defense, -1, -1 ; 0xBF = Double Defense diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 5852bcd51..4e3f3254f 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -47,19 +47,18 @@ override_object_chest: nop override_object: - ; Load extended Object ID - li t2, CURRENT_ITEM_DATA - lhu t3, 0x04 (t2) - beq t3, 0xFFFF, @@return + li t2, EXTENDED_ITEM_DATA + lw t3, ITEM_ROW_IS_EXTENDED (t2) + beqz t3, @@return nop - ; Override object ID - ori a1, t3, 0 + ; Override Object ID + lhu a1, ITEM_ROW_OBJECT_ID (t2) @@return: ; Clear any pending special item, now that it's being received - li t3, PENDING_SPECIAL_ITEM - sb r0, 0x00 (t3) + li t2, PENDING_SPECIAL_ITEM + sb r0, 0x00 (t2) jr ra nop @@ -67,14 +66,13 @@ override_object: ;================================================================================================== override_graphic: - ; Load extended Graphic ID - li t0, CURRENT_ITEM_DATA - lb t1, 0x02 (t0) - beq t1, -1, @@return + li t0, EXTENDED_ITEM_DATA + lw t1, ITEM_ROW_IS_EXTENDED (t0) + beqz t1, @@return nop ; Override Graphic ID - ori v1, t1, 0 + lb v1, ITEM_ROW_GRAPHIC_ID (t0) @@return: ; Displaced code @@ -88,14 +86,13 @@ override_graphic: override_text: lbu a1, 0x03 (v0) ; Displaced code - ; Load extended Text ID - li t0, CURRENT_ITEM_DATA - lbu t1, 0x03 (t0) - beq t1, 0xFF, @@return + li t0, EXTENDED_ITEM_DATA + lw t1, ITEM_ROW_IS_EXTENDED (t0) + beqz t1, @@return nop ; Override Text ID - ori a1, t1, 0 + lbu a1, ITEM_ROW_TEXT_ID (t0) @@return: jr ra @@ -108,14 +105,13 @@ override_action: lw v0, 0x24 (sp) lbu a1, 0x0000 (v0) - ; Load extended Action ID - li t0, CURRENT_ITEM_DATA - lhu t1, 0x00 (t0) - beq t1, 0xFFFF, @@return + li t0, EXTENDED_ITEM_DATA + lw t1, ITEM_ROW_IS_EXTENDED (t0) + beqz t1, @@return nop ; Override Action ID - ori a1, t1, 0 + lbu a1, ITEM_ROW_ACTION_ID (t0) sw a0, 0x00 (sp) sw a1, 0x04 (sp) @@ -124,13 +120,10 @@ override_action: sw ra, 0x10 (sp) ; Run effect function - ; Conventions for effect functions: - ; - They receive a pointer to the save context in a0 - ; - They receive their arguments in a1 and a2 - lw t1, 0x08 (t0) ; t1 = effect function li a0, SAVE_CONTEXT - lbu a1, 0x06 (t0) - lbu a2, 0x07 (t0) + lbu a1, ITEM_ROW_EFFECT_ARG1 (t0) + lbu a2, ITEM_ROW_EFFECT_ARG2 (t0) + lw t1, ITEM_ROW_EFFECT_FN (t0) jalr t1 nop @@ -225,19 +218,19 @@ store_item_data: sw ra, 0x10 (sp) ; Clear current item data - li t0, CURRENT_ITEM_DATA - li t1, -1 - sw t1, 0x00 (t0) - sw t1, 0x04 (t0) - sw t1, 0x08 (t0) + li t0, EXTENDED_ITEM_DATA + sw r0, 0x00 (t0) + sw r0, 0x04 (t0) + sw r0, 0x08 (t0) + sw r0, 0x0C (t0) li t0, PLAYER_ACTOR - lb t1, 0x0424 (t0) + lb t1, 0x0424 (t0) ; t1 = item ID being received beqz t1, @@return nop abs a0, t1 - lw a1, 0x0428 (t0) + lw a1, 0x0428 (t0) ; a1 = actor giving the item jal lookup_override ; v0 = new item ID from override nop bltz v0, @@return @@ -246,22 +239,24 @@ store_item_data: ori a0, v0, 0 jal resolve_extended_item ; v0 = resolved item ID, v1 = ITEM_TABLE entry nop - beqz v1, @@not_extended + beqz v1, @@update_player_actor nop ; Store extended item data - li t0, CURRENT_ITEM_DATA + li t0, EXTENDED_ITEM_DATA lw t1, 0x00 (v1) sw t1, 0x00 (t0) lw t1, 0x04 (v1) sw t1, 0x04 (t0) lw t1, 0x08 (v1) sw t1, 0x08 (t0) - b @@return - nop + ; Mark the extended item data as active + li t1, 1 + sw t1, ITEM_ROW_IS_EXTENDED (t0) + ; Load the base item to be stored back in the player actor + lbu v0, ITEM_ROW_BASE_ITEM (v1) -@@not_extended: - ; For non-extended item IDs, put it back in the player instance and let the game handle it +@@update_player_actor: li t0, PLAYER_ACTOR lb t1, 0x0424 (t0) bgez t1, @@not_negative @@ -390,7 +385,7 @@ resolve_extended_item: ; - They store their result in v0 li a0, SAVE_CONTEXT ori a1, s0, 0 - lw t0, 0x0C (s1) + lw t0, ITEM_ROW_UPGRADE_FN (s1) jalr t0 ; v0 = upgraded item ID nop ; If the upgrade function returned a new item ID, start resolution over again @@ -669,3 +664,15 @@ give_small_key: sb t1, 0x00 (t0) jr ra nop + +;================================================================================================== + +give_defense: + ; a0 = save context + li t0, 0x01 + sb t0, 0x3D (a0) ; Set double defense flag + lhu t0, 0x2E (a0) ; Load health capacity (0x10 per heart container) + srl t0, t0, 4 + sb t0, 0xCF (a0) ; Set number of hearts to display as double defense + jr ra + nop diff --git a/ASM/src/state.asm b/ASM/src/state.asm index ddffd2ae1..390769f4d 100755 --- a/ASM/src/state.asm +++ b/ASM/src/state.asm @@ -2,9 +2,10 @@ ; Global variable storage for new code ;================================================================================================== -CURRENT_ITEM_DATA: -.word 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF +; Stores the ITEM_DATA row of the current extended item. +EXTENDED_ITEM_DATA: +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 PENDING_SPECIAL_ITEM: .byte 0x00 -.align 4 \ No newline at end of file +.align 4 diff --git a/data/base2current.json b/data/base2current.json index 35cdf2d09..afa3772ee 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 8, 146]}, {"11325064": [12, 16, 8, 138, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 217]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 196, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 203, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 210, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 189, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 8, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 8, 4]}, {"12427480": [12, 16, 8, 33]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 8, 37]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 158, 0, 0, 0, 0]}, {"12491456": [12, 16, 8, 66]}, {"12491480": [12, 16, 8, 76]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 8, 104]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058432": [255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255]}, {"55058448": [48, 132]}, {"55058451": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55058463": [140, 16, 129]}, {"55058467": [22, 145, 2]}, {"55058471": [117, 52, 1]}, {"55058475": [141, 16, 129]}, {"55058479": [19, 145, 2]}, {"55058483": [117, 16, 128]}, {"55058487": [17, 145, 2]}, {"55058491": [116, 52, 1]}, {"55058495": [138, 16, 129]}, {"55058499": [14, 145, 2]}, {"55058503": [116, 52, 1]}, {"55058507": [139, 16, 129]}, {"55058511": [11, 145, 2]}, {"55058515": [116, 52, 1]}, {"55058519": [88, 16, 129]}, {"55058523": [8, 52, 2]}, {"55058528": [52, 1]}, {"55058531": [120, 16, 129]}, {"55058535": [5, 52, 2]}, {"55058540": [52, 1]}, {"55058543": [121, 16, 129]}, {"55058547": [2, 52, 2]}, {"55058552": [52, 2]}, {"55058555": [255, 3, 224]}, {"55058559": [8]}, {"55058564": [143, 166]}, {"55058567": [48, 132, 197]}, {"55058571": [4, 8, 16, 8, 41]}, {"55058580": [143, 185]}, {"55058583": [44, 135, 37]}, {"55058587": [4, 8, 16, 8, 41]}, {"55058596": [60, 10, 128, 64, 37, 74, 32]}, {"55058604": [149, 75]}, {"55058607": [4, 52, 1, 255, 255, 17, 97]}, {"55058615": [2]}, {"55058620": [53, 101]}, {"55058624": [60, 11, 128, 64, 37, 107, 32, 12, 161, 96]}, {"55058636": [3, 224]}, {"55058639": [8]}, {"55058644": [60, 8, 128, 64, 37, 8, 32]}, {"55058652": [129, 9]}, {"55058655": [2, 36, 1, 255, 255, 17, 33]}, {"55058663": [2]}, {"55058668": [53, 35]}, {"55058673": [3, 15, 195]}, {"55058677": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55058691": [8]}, {"55058696": [144, 69]}, {"55058699": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55058708": [145, 9]}, {"55058711": [3, 52, 1]}, {"55058715": [255, 17, 33]}, {"55058719": [2]}, {"55058724": [53, 37]}, {"55058728": [3, 224]}, {"55058731": [8]}, {"55058736": [143, 162]}, {"55058739": [36, 144, 69]}, {"55058744": [60, 8, 128, 64, 37, 8, 32]}, {"55058752": [149, 9]}, {"55058756": [52, 1, 255, 255, 17, 33]}, {"55058763": [19]}, {"55058768": [53, 37]}, {"55058772": [175, 164]}, {"55058776": [175, 165]}, {"55058779": [4, 175, 166]}, {"55058783": [8, 39, 189, 255, 232, 175, 191]}, {"55058791": [16, 141, 9]}, {"55058795": [8, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55058807": [6, 145, 6]}, {"55058811": [7, 1, 32, 248, 9]}, {"55058820": [143, 191]}, {"55058823": [16, 39, 189]}, {"55058827": [24, 143, 164]}, {"55058832": [143, 165]}, {"55058835": [4, 143, 166]}, {"55058839": [8, 3, 224]}, {"55058843": [8]}, {"55058848": [140, 136, 29, 44, 52, 9]}, {"55058855": [1]}, {"55058857": [9, 78]}, {"55058860": [1, 9, 16, 36, 16, 64]}, {"55058867": [27]}, {"55058872": [148, 138]}, {"55058875": [164, 52, 1]}, {"55058879": [61, 21, 65]}, {"55058883": [23]}, {"55058888": [148, 202, 2, 220, 52, 11]}, {"55058895": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55058919": [14]}, {"55058924": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55058952": [1, 10, 64, 33, 129, 8]}, {"55058960": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55058972": [52, 2]}, {"55058976": [3, 224]}, {"55058979": [8]}, {"55058984": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55058996": [60, 9, 128, 64, 37, 41, 32, 12, 161, 40]}, {"55059008": [3, 224]}, {"55059011": [8]}, {"55059016": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55059027": [16, 175, 163]}, {"55059031": [20, 175, 191]}, {"55059035": [24, 12, 16, 8, 159]}, {"55059044": [143, 162]}, {"55059047": [16, 143, 163]}, {"55059051": [20, 143, 191]}, {"55059055": [24, 39, 189]}, {"55059059": [32, 3, 224]}, {"55059063": [8]}, {"55059068": [39, 189, 255, 232, 175, 191]}, {"55059075": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55059084": [36, 9, 255, 255, 173, 9]}, {"55059092": [173, 9]}, {"55059095": [4, 173, 9]}, {"55059099": [8, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55059115": [31]}, {"55059121": [9, 15, 195, 1, 33, 32, 38]}, {"55059129": [129, 32, 35, 141, 5, 4, 40, 12, 16, 8, 206]}, {"55059144": [4, 64]}, {"55059147": [23]}, {"55059152": [52, 68]}, {"55059156": [12, 16, 9]}, {"55059164": [16, 96]}, {"55059167": [11]}, {"55059172": [60, 8, 128, 64, 37, 8, 32]}, {"55059180": [140, 105]}, {"55059184": [173, 9]}, {"55059188": [140, 105]}, {"55059191": [4, 173, 9]}, {"55059195": [4, 140, 105]}, {"55059199": [8, 173, 9]}, {"55059203": [8, 16]}, {"55059207": [8]}, {"55059212": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55059227": [2]}, {"55059233": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55059243": [16, 39, 189]}, {"55059247": [24, 3, 224]}, {"55059251": [8]}, {"55059256": [39, 189, 255, 232, 175, 191]}, {"55059263": [16, 12, 16, 8, 217]}, {"55059272": [52, 68]}, {"55059276": [12, 16, 8, 243]}, {"55059284": [143, 191]}, {"55059287": [16, 39, 189]}, {"55059291": [24, 3, 224]}, {"55059295": [8]}, {"55059300": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55059311": [164, 52, 8]}, {"55059316": [52, 137]}, {"55059320": [148, 170]}, {"55059324": [52, 1]}, {"55059327": [10, 21, 65]}, {"55059331": [7]}, {"55059336": [52, 1]}, {"55059339": [16, 16, 65]}, {"55059343": [4]}, {"55059348": [52, 8]}, {"55059351": [1, 148, 169]}, {"55059355": [28, 49, 41]}, {"55059359": [31, 52, 1]}, {"55059363": [21, 21, 65]}, {"55059367": [3]}, {"55059372": [52, 8]}, {"55059375": [2, 144, 169, 1, 65]}, {"55059381": [2, 18]}, {"55059385": [72, 16, 37]}, {"55059389": [2, 18]}, {"55059393": [73, 16, 37, 3, 224]}, {"55059399": [8]}, {"55059404": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55059419": [4, 141, 9]}, {"55059424": [17, 32]}, {"55059427": [5]}, {"55059433": [9, 82, 2, 21, 68, 255, 250]}, {"55059444": [49, 34]}, {"55059447": [255, 3, 224]}, {"55059451": [8]}, {"55059456": [39, 189, 255, 224, 175, 176]}, {"55059463": [16, 175, 177]}, {"55059467": [20, 175, 191]}, {"55059471": [24, 52, 130]}, {"55059476": [52, 80]}, {"55059480": [38, 8, 255, 128, 5]}, {"55059487": [18]}, {"55059492": [60, 17, 128, 64, 38, 49, 38, 136, 52, 9]}, {"55059503": [16, 1, 9]}, {"55059507": [24]}, {"55059510": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55059528": [142, 40]}, {"55059531": [12, 1]}, {"55059534": [248, 9]}, {"55059540": [20, 80, 255, 239]}, {"55059548": [54, 35]}, {"55059552": [16]}, {"55059555": [2]}, {"55059560": [52, 3]}, {"55059564": [143, 176]}, {"55059567": [16, 143, 177]}, {"55059571": [20, 143, 191]}, {"55059575": [24, 39, 189]}, {"55059579": [32, 3, 224]}, {"55059583": [8]}, {"55059588": [3, 224]}, {"55059591": [8, 52, 162]}, {"55059596": [144, 136]}, {"55059599": [125, 52, 1]}, {"55059603": [255, 17, 1]}, {"55059607": [2, 52, 2]}, {"55059611": [8, 52, 2]}, {"55059615": [9, 3, 224]}, {"55059619": [8]}, {"55059624": [144, 136]}, {"55059627": [163, 49, 8]}, {"55059631": [192, 17]}, {"55059635": [5, 52, 2]}, {"55059639": [84, 52, 1]}, {"55059643": [64, 17, 1]}, {"55059647": [2, 52, 2]}, {"55059651": [53, 52, 2]}, {"55059655": [54, 3, 224]}, {"55059659": [8]}, {"55059664": [144, 136]}, {"55059667": [163, 49, 8]}, {"55059671": [24, 17]}, {"55059675": [5, 52, 2]}, {"55059679": [50, 52, 1]}, {"55059683": [8, 17, 1]}, {"55059687": [2, 52, 2]}, {"55059691": [51, 52, 2]}, {"55059695": [52, 3, 224]}, {"55059699": [8]}, {"55059704": [144, 136]}, {"55059707": [163, 49, 8]}, {"55059711": [3, 17]}, {"55059715": [5, 52, 2]}, {"55059719": [4, 52, 1]}, {"55059723": [1, 17, 1]}, {"55059727": [2, 52, 2]}, {"55059731": [48, 52, 2]}, {"55059735": [49, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [192, 17]}, {"55059755": [5, 52, 2]}, {"55059759": [5, 52, 1]}, {"55059763": [64, 17, 1]}, {"55059767": [2, 52, 2]}, {"55059771": [96, 52, 2]}, {"55059775": [123, 3, 224]}, {"55059779": [8]}, {"55059784": [144, 136]}, {"55059787": [162, 49, 8]}, {"55059791": [48, 17]}, {"55059795": [2, 52, 2]}, {"55059799": [69, 52, 2]}, {"55059803": [70, 3, 224]}, {"55059807": [8]}, {"55059812": [144, 136]}, {"55059815": [162, 49, 8]}, {"55059819": [6, 17]}, {"55059823": [2, 52, 2]}, {"55059827": [55, 52, 2]}, {"55059831": [56, 3, 224]}, {"55059835": [8]}, {"55059840": [144, 136]}, {"55059843": [161, 49, 8]}, {"55059847": [48, 17]}, {"55059851": [2, 52, 2]}, {"55059855": [121, 52, 2]}, {"55059859": [122, 3, 224]}, {"55059863": [8]}, {"55059868": [144, 136]}, {"55059871": [161, 49, 8]}, {"55059875": [6, 17]}, {"55059879": [2, 52, 2]}, {"55059883": [119, 52, 2]}, {"55059887": [120, 3, 224]}, {"55059891": [8]}, {"55059896": [144, 136]}, {"55059899": [163, 49, 8]}, {"55059903": [3, 17]}, {"55059907": [2, 52, 2]}, {"55059911": [77, 52, 162]}, {"55059916": [3, 224]}, {"55059919": [8]}, {"55059924": [144, 136]}, {"55059927": [163, 49, 8]}, {"55059931": [24, 17]}, {"55059935": [2, 52, 2]}, {"55059939": [77, 52, 162]}, {"55059944": [3, 224]}, {"55059947": [8]}, {"55059952": [3, 224]}, {"55059955": [8]}, {"55059960": [52, 8]}, {"55059963": [1, 160, 136]}, {"55059967": [62, 3, 224]}, {"55059971": [8]}, {"55059976": [36, 136]}, {"55059979": [134, 36, 9, 255, 255, 37, 41]}, {"55059987": [1, 52, 1]}, {"55059991": [3]}, {"55059993": [41, 8, 42, 20, 32]}, {"55059999": [7]}, {"55060004": [1, 9, 80, 33, 145, 75]}, {"55060012": [52, 1]}, {"55060015": [255, 21, 97, 255, 247]}, {"55060024": [161, 69]}, {"55060028": [3, 224]}, {"55060031": [8]}, {"55060036": [36, 136]}, {"55060039": [168, 1, 6, 64, 33, 145, 9]}, {"55060048": [1, 37, 72, 37, 161, 9]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [36, 136]}, {"55060067": [188, 1, 5, 64, 33, 129, 9]}, {"55060076": [5, 33]}, {"55060079": [2]}, {"55060084": [52, 9]}, {"55060088": [37, 41]}, {"55060091": [1, 161, 9]}, {"55060096": [3, 224]}, {"55060099": [8]}, {"55060104": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 36, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 36, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 36, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 240, 128, 64, 37, 156]}, {"55060249": [255, 1, 67]}, {"55060253": [198, 21, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060265": [255, 1, 68]}, {"55060269": [198, 22, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060281": [255, 1, 69]}, {"55060285": [198, 23, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060297": [255, 1, 70]}, {"55060301": [198, 24, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060313": [255, 1, 71]}, {"55060317": [198, 25, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060329": [255, 1, 93]}, {"55060333": [198, 28, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060345": [255, 1, 122]}, {"55060349": [198, 29, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060361": [255, 1, 249]}, {"55060365": [198, 30, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060377": [255, 1, 151]}, {"55060381": [198, 32, 255, 128, 64, 38, 8, 128, 64, 36, 132]}, {"55060393": [255, 10, 199]}, {"55060397": [185, 1, 3, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060409": [255, 10, 199]}, {"55060413": [185, 1, 4, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060425": [255, 10, 199]}, {"55060429": [185, 1, 5, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060441": [255, 10, 199]}, {"55060445": [185, 1, 6, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060457": [255, 10, 199]}, {"55060461": [185, 1, 7, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060473": [255, 10, 199]}, {"55060477": [185, 1, 13, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060489": [255, 11, 103]}, {"55060493": [184, 2]}, {"55060496": [128, 64, 38, 68, 128, 64, 36, 132]}, {"55060505": [255, 11, 103]}, {"55060509": [184, 2, 1, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060521": [255, 11, 103]}, {"55060525": [184, 2, 2, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060537": [255, 11, 103]}, {"55060541": [184, 2, 3, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060553": [255, 11, 103]}, {"55060557": [184, 2, 4, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060569": [255, 11, 103]}, {"55060573": [184, 2, 5, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060585": [255, 11, 103]}, {"55060589": [184, 2, 6, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060601": [255, 11, 103]}, {"55060605": [184, 2, 7, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060617": [255, 11, 103]}, {"55060621": [184, 2, 8, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060633": [255, 11, 103]}, {"55060637": [184, 2, 9, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060649": [255, 28, 102]}, {"55060653": [200, 4]}, {"55060656": [128, 64, 38, 68, 128, 64, 36, 132]}, {"55060665": [255, 28, 102]}, {"55060669": [200, 4, 1, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060681": [255, 28, 102]}, {"55060685": [200, 4, 2, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060697": [255, 28, 102]}, {"55060701": [200, 4, 3, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060713": [255, 28, 102]}, {"55060717": [200, 4, 4, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060729": [255, 28, 102]}, {"55060733": [200, 4, 5, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060745": [255, 28, 102]}, {"55060749": [200, 4, 6, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060761": [255, 28, 102]}, {"55060765": [200, 4, 7, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060777": [255, 28, 102]}, {"55060781": [200, 4, 8, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060793": [255, 28, 102]}, {"55060797": [200, 4, 9, 128, 64, 38, 68, 128, 64, 36, 132]}, {"55060809": [255, 254, 96]}, {"55060813": [170, 3, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060825": [255, 254, 96]}, {"55060829": [170, 4, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060841": [255, 254, 96]}, {"55060845": [170, 5, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060857": [255, 254, 96]}, {"55060861": [170, 6, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060873": [255, 254, 96]}, {"55060877": [170, 7, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060889": [255, 254, 96]}, {"55060893": [170, 8, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060905": [255, 254, 96]}, {"55060909": [170, 11, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060921": [255, 254, 96]}, {"55060925": [170, 12, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060937": [255, 254, 96]}, {"55060941": [170, 13, 255, 128, 64, 38, 96, 128, 64, 36, 132]}, {"55060953": [61, 67, 12]}, {"55060957": [248, 255, 255, 128, 64, 37, 248, 128, 64, 36, 132]}, {"55060969": [131, 9, 85]}, {"55060973": [183, 255, 255, 128, 64, 37, 240, 128, 64, 36, 132]}, {"55060985": [146, 219, 230]}, {"55060989": [216, 255, 255, 128, 64, 37, 240, 128, 64, 37, 184]}, {"55061001": [147, 218, 230]}, {"55061005": [216, 255, 255, 128, 64, 37, 240, 128, 64, 37, 184]}, {"55061017": [148, 217, 230]}, {"55061021": [216, 255, 255, 128, 64, 37, 240, 128, 64, 37, 184]}, {"55061033": [142, 224, 50]}, {"55061037": [206, 255, 255, 128, 64, 37, 240, 128, 64, 37, 212]}, {"55061049": [143, 224, 50]}, {"55061053": [206, 255, 255, 128, 64, 37, 240, 128, 64, 37, 212]}, {"55061065": [144, 224, 50]}, {"55061069": [206, 255, 255, 128, 64, 37, 240, 128, 64, 37, 212]}, {"55061081": [140, 238, 52]}, {"55061085": [187, 255, 255, 128, 64, 37, 240, 128, 64, 36, 132]}, {"55061097": [141, 238, 52]}, {"55061101": [187, 255, 255, 128, 64, 37, 240, 128, 64, 36, 132, 175, 164]}, {"55061115": [104, 175, 165]}, {"55061119": [108, 175, 166]}, {"55061123": [112, 175, 167]}, {"55061127": [116, 39, 189, 255, 232, 175, 163]}, {"55061135": [16, 175, 191]}, {"55061139": [20, 60, 8, 128, 64, 37, 8, 32, 12, 129, 8]}, {"55061152": [17]}, {"55061155": [10]}, {"55061160": [60, 9, 128, 65, 52, 10]}, {"55061167": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 8, 159]}, {"55061196": [143, 163]}, {"55061199": [16, 143, 191]}, {"55061203": [20, 39, 189]}, {"55061207": [24, 143, 164]}, {"55061211": [104, 143, 165]}, {"55061215": [108, 143, 166]}, {"55061219": [112, 143, 167]}, {"55061223": [116, 132, 110, 19, 196, 3, 224]}, {"55061231": [8]}, {"55061236": [147, 25]}, {"55061239": [116, 52, 1]}, {"55061243": [255, 23, 33]}, {"55061247": [2]}, {"55061252": [52, 25]}, {"55061255": [44, 3, 224]}, {"55061259": [8, 167, 185]}, {"55061263": [154, 147, 44]}, {"55061267": [116, 52, 1]}, {"55061271": [255, 21, 129]}, {"55061275": [2]}, {"55061280": [52, 12]}, {"55061283": [44, 3, 224]}, {"55061287": [8]}, {"55061292": [145, 174]}, {"55061295": [116, 52, 1]}, {"55061299": [255, 21, 193]}, {"55061303": [2]}, {"55061308": [52, 14]}, {"55061311": [44, 3, 224]}, {"55061315": [8, 167, 174]}, {"55061319": [154, 145, 207]}, {"55061323": [116, 52, 1]}, {"55061327": [255, 21, 225]}, {"55061331": [2]}, {"55061336": [52, 15]}, {"55061339": [44, 3, 224]}, {"55061343": [8, 167, 175]}, {"55061347": [154, 141, 9]}, {"55061351": [4, 17, 32]}, {"55061355": [7]}, {"55061360": [145, 9]}, {"55061363": [104, 52, 1]}, {"55061367": [59, 17, 33]}, {"55061371": [2]}, {"55061376": [52, 9]}, {"55061379": [255, 161, 9]}, {"55061383": [64, 3, 224]}, {"55061387": [8, 161, 14]}, {"55061391": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 143]}, {"11325064": [12, 16, 9, 135, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 226]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 205, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 212, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 219, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 198, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 5]}, {"12427480": [12, 16, 9, 34]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 38]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 167, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 65]}, {"12491480": [12, 16, 9, 74]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 101]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 132, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 160, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 92, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 120, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 148, 83, 255, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42]}, {"55058608": [128, 64, 40, 124, 83, 255, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42]}, {"55058624": [128, 64, 40, 124, 83, 255, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42]}, {"55058640": [128, 64, 40, 124, 83, 255, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42]}, {"55058656": [128, 64, 40, 124, 83, 255, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42]}, {"55058672": [128, 64, 40, 124, 83, 255, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42]}, {"55058688": [128, 64, 40, 124, 83, 255, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42]}, {"55058704": [128, 64, 40, 124, 83, 255, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42]}, {"55058720": [128, 64, 40, 124, 83, 255, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42]}, {"55058736": [128, 64, 40, 124, 83, 255, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 41, 240, 128, 64, 40, 124, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 79, 255, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 128, 128, 64, 40, 124, 48, 132]}, {"55059479": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059491": [140, 16, 129]}, {"55059495": [22, 145, 2]}, {"55059499": [117, 52, 1]}, {"55059503": [141, 16, 129]}, {"55059507": [19, 145, 2]}, {"55059511": [117, 16, 128]}, {"55059515": [17, 145, 2]}, {"55059519": [116, 52, 1]}, {"55059523": [138, 16, 129]}, {"55059527": [14, 145, 2]}, {"55059531": [116, 52, 1]}, {"55059535": [139, 16, 129]}, {"55059539": [11, 145, 2]}, {"55059543": [116, 52, 1]}, {"55059547": [88, 16, 129]}, {"55059551": [8, 52, 2]}, {"55059556": [52, 1]}, {"55059559": [120, 16, 129]}, {"55059563": [5, 52, 2]}, {"55059568": [52, 1]}, {"55059571": [121, 16, 129]}, {"55059575": [2, 52, 2]}, {"55059580": [52, 2]}, {"55059583": [255, 3, 224]}, {"55059587": [8]}, {"55059592": [143, 166]}, {"55059595": [48, 132, 197]}, {"55059599": [4, 8, 16, 9, 42]}, {"55059608": [143, 185]}, {"55059611": [44, 135, 37]}, {"55059615": [4, 8, 16, 9, 42]}, {"55059624": [60, 10, 128, 64, 37, 74, 32]}, {"55059632": [141, 75]}, {"55059635": [12, 17, 96]}, {"55059639": [2]}, {"55059644": [149, 69]}, {"55059647": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059660": [3, 224]}, {"55059663": [8]}, {"55059668": [60, 8, 128, 64, 37, 8, 32]}, {"55059676": [141, 9]}, {"55059679": [12, 17, 32]}, {"55059683": [2]}, {"55059688": [129, 3]}, {"55059691": [2]}, {"55059693": [3, 15, 195]}, {"55059697": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 69]}, {"55059719": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059728": [141, 9]}, {"55059731": [12, 17, 32]}, {"55059735": [2]}, {"55059740": [145, 5]}, {"55059743": [3, 3, 224]}, {"55059747": [8]}, {"55059752": [143, 162]}, {"55059755": [36, 144, 69]}, {"55059760": [60, 8, 128, 64, 37, 8, 32]}, {"55059768": [141, 9]}, {"55059771": [12, 17, 32]}, {"55059775": [19]}, {"55059780": [145, 5]}, {"55059783": [1, 175, 164]}, {"55059788": [175, 165]}, {"55059791": [4, 175, 166]}, {"55059795": [8, 39, 189, 255, 232, 175, 191]}, {"55059803": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059815": [6, 145, 6]}, {"55059819": [7, 141, 9]}, {"55059823": [8, 1, 32, 248, 9]}, {"55059832": [143, 191]}, {"55059835": [16, 39, 189]}, {"55059839": [24, 143, 164]}, {"55059844": [143, 165]}, {"55059847": [4, 143, 166]}, {"55059851": [8, 3, 224]}, {"55059855": [8]}, {"55059860": [140, 136, 29, 44, 52, 9]}, {"55059867": [1]}, {"55059869": [9, 78]}, {"55059872": [1, 9, 16, 36, 16, 64]}, {"55059879": [27]}, {"55059884": [148, 138]}, {"55059887": [164, 52, 1]}, {"55059891": [61, 21, 65]}, {"55059895": [23]}, {"55059900": [148, 202, 2, 220, 52, 11]}, {"55059907": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059931": [14]}, {"55059936": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059964": [1, 10, 64, 33, 129, 8]}, {"55059972": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55059984": [52, 2]}, {"55059988": [3, 224]}, {"55059991": [8]}, {"55059996": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060008": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060039": [16, 175, 163]}, {"55060043": [20, 175, 191]}, {"55060047": [24, 12, 16, 9, 156]}, {"55060056": [143, 162]}, {"55060059": [16, 143, 163]}, {"55060063": [20, 143, 191]}, {"55060067": [24, 39, 189]}, {"55060071": [32, 3, 224]}, {"55060075": [8]}, {"55060080": [39, 189, 255, 232, 175, 191]}, {"55060087": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060096": [173]}, {"55060100": [173]}, {"55060103": [4, 173]}, {"55060107": [8, 173]}, {"55060111": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060127": [32]}, {"55060133": [9, 15, 195, 1, 33, 32, 38]}, {"55060141": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 204]}, {"55060156": [4, 64]}, {"55060159": [24]}, {"55060164": [52, 68]}, {"55060168": [12, 16, 9, 254]}, {"55060176": [16, 96]}, {"55060179": [12]}, {"55060184": [60, 8, 128, 64, 37, 8, 32]}, {"55060192": [140, 105]}, {"55060196": [173, 9]}, {"55060200": [140, 105]}, {"55060203": [4, 173, 9]}, {"55060207": [4, 140, 105]}, {"55060211": [8, 173, 9]}, {"55060215": [8, 52, 9]}, {"55060219": [1, 173, 9]}, {"55060223": [12, 144, 98]}, {"55060228": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060243": [2]}, {"55060249": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060259": [16, 39, 189]}, {"55060263": [24, 3, 224]}, {"55060267": [8]}, {"55060272": [39, 189, 255, 232, 175, 191]}, {"55060279": [16, 12, 16, 9, 215]}, {"55060288": [52, 68]}, {"55060292": [12, 16, 9, 241]}, {"55060300": [143, 191]}, {"55060303": [16, 39, 189]}, {"55060307": [24, 3, 224]}, {"55060311": [8]}, {"55060316": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060327": [164, 52, 8]}, {"55060332": [52, 137]}, {"55060336": [148, 170]}, {"55060340": [52, 1]}, {"55060343": [10, 21, 65]}, {"55060347": [7]}, {"55060352": [52, 1]}, {"55060355": [16, 16, 65]}, {"55060359": [4]}, {"55060364": [52, 8]}, {"55060367": [1, 148, 169]}, {"55060371": [28, 49, 41]}, {"55060375": [31, 52, 1]}, {"55060379": [21, 21, 65]}, {"55060383": [3]}, {"55060388": [52, 8]}, {"55060391": [2, 144, 169, 1, 65]}, {"55060397": [2, 18]}, {"55060401": [72, 16, 37]}, {"55060405": [2, 18]}, {"55060409": [73, 16, 37, 3, 224]}, {"55060415": [8]}, {"55060420": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060435": [4, 141, 9]}, {"55060440": [17, 32]}, {"55060443": [5]}, {"55060449": [9, 82, 2, 21, 68, 255, 250]}, {"55060460": [49, 34]}, {"55060463": [255, 3, 224]}, {"55060467": [8]}, {"55060472": [39, 189, 255, 224, 175, 176]}, {"55060479": [16, 175, 177]}, {"55060483": [20, 175, 191]}, {"55060487": [24, 52, 130]}, {"55060492": [52, 80]}, {"55060496": [38, 8, 255, 128, 5]}, {"55060503": [18]}, {"55060508": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060519": [16, 1, 9]}, {"55060523": [24]}, {"55060526": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060544": [142, 40]}, {"55060547": [12, 1]}, {"55060550": [248, 9]}, {"55060556": [20, 80, 255, 239]}, {"55060564": [54, 35]}, {"55060568": [16]}, {"55060571": [2]}, {"55060576": [52, 3]}, {"55060580": [143, 176]}, {"55060583": [16, 143, 177]}, {"55060587": [20, 143, 191]}, {"55060591": [24, 39, 189]}, {"55060595": [32, 3, 224]}, {"55060599": [8]}, {"55060604": [3, 224]}, {"55060607": [8, 52, 162]}, {"55060612": [144, 136]}, {"55060615": [125, 52, 1]}, {"55060619": [255, 17, 1]}, {"55060623": [2, 52, 2]}, {"55060627": [8, 52, 2]}, {"55060631": [9, 3, 224]}, {"55060635": [8]}, {"55060640": [144, 136]}, {"55060643": [163, 49, 8]}, {"55060647": [192, 17]}, {"55060651": [5, 52, 2]}, {"55060655": [84, 52, 1]}, {"55060659": [64, 17, 1]}, {"55060663": [2, 52, 2]}, {"55060667": [53, 52, 2]}, {"55060671": [54, 3, 224]}, {"55060675": [8]}, {"55060680": [144, 136]}, {"55060683": [163, 49, 8]}, {"55060687": [24, 17]}, {"55060691": [5, 52, 2]}, {"55060695": [50, 52, 1]}, {"55060699": [8, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [51, 52, 2]}, {"55060711": [52, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [3, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [4, 52, 1]}, {"55060739": [1, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [48, 52, 2]}, {"55060751": [49, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [162, 49, 8]}, {"55060767": [192, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [5, 52, 1]}, {"55060779": [64, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [96, 52, 2]}, {"55060791": [123, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [162, 49, 8]}, {"55060807": [48, 17]}, {"55060811": [2, 52, 2]}, {"55060815": [69, 52, 2]}, {"55060819": [70, 3, 224]}, {"55060823": [8]}, {"55060828": [144, 136]}, {"55060831": [162, 49, 8]}, {"55060835": [6, 17]}, {"55060839": [2, 52, 2]}, {"55060843": [55, 52, 2]}, {"55060847": [56, 3, 224]}, {"55060851": [8]}, {"55060856": [144, 136]}, {"55060859": [161, 49, 8]}, {"55060863": [48, 17]}, {"55060867": [2, 52, 2]}, {"55060871": [121, 52, 2]}, {"55060875": [122, 3, 224]}, {"55060879": [8]}, {"55060884": [144, 136]}, {"55060887": [161, 49, 8]}, {"55060891": [6, 17]}, {"55060895": [2, 52, 2]}, {"55060899": [119, 52, 2]}, {"55060903": [120, 3, 224]}, {"55060907": [8]}, {"55060912": [144, 136]}, {"55060915": [163, 49, 8]}, {"55060919": [3, 17]}, {"55060923": [2, 52, 2]}, {"55060927": [77, 52, 162]}, {"55060932": [3, 224]}, {"55060935": [8]}, {"55060940": [144, 136]}, {"55060943": [163, 49, 8]}, {"55060947": [24, 17]}, {"55060951": [2, 52, 2]}, {"55060955": [77, 52, 162]}, {"55060960": [3, 224]}, {"55060963": [8]}, {"55060968": [3, 224]}, {"55060971": [8]}, {"55060976": [52, 8]}, {"55060979": [1, 160, 136]}, {"55060983": [62, 3, 224]}, {"55060987": [8]}, {"55060992": [36, 136]}, {"55060995": [134, 36, 9, 255, 255, 37, 41]}, {"55061003": [1, 52, 1]}, {"55061007": [3]}, {"55061009": [41, 8, 42, 20, 32]}, {"55061015": [7]}, {"55061020": [1, 9, 80, 33, 145, 75]}, {"55061028": [52, 1]}, {"55061031": [255, 21, 97, 255, 247]}, {"55061040": [161, 69]}, {"55061044": [3, 224]}, {"55061047": [8]}, {"55061052": [36, 136]}, {"55061055": [168, 1, 6, 64, 33, 145, 9]}, {"55061064": [1, 37, 72, 37, 161, 9]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [36, 136]}, {"55061083": [188, 1, 5, 64, 33, 129, 9]}, {"55061092": [5, 33]}, {"55061095": [2]}, {"55061100": [52, 9]}, {"55061104": [37, 41]}, {"55061107": [1, 161, 9]}, {"55061112": [3, 224]}, {"55061115": [8]}, {"55061120": [52, 8]}, {"55061123": [1, 160, 136]}, {"55061127": [61, 148, 136]}, {"55061131": [46]}, {"55061133": [8, 65, 2, 160, 136]}, {"55061139": [207, 3, 224]}, {"55061143": [8]}, {"55061148": [175, 164]}, {"55061151": [104, 175, 165]}, {"55061155": [108, 175, 166]}, {"55061159": [112, 175, 167]}, {"55061163": [116, 39, 189, 255, 232, 175, 163]}, {"55061171": [16, 175, 191]}, {"55061175": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061188": [17]}, {"55061191": [10]}, {"55061196": [60, 9, 128, 65, 52, 10]}, {"55061203": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 156]}, {"55061232": [143, 163]}, {"55061235": [16, 143, 191]}, {"55061239": [20, 39, 189]}, {"55061243": [24, 143, 164]}, {"55061247": [104, 143, 165]}, {"55061251": [108, 143, 166]}, {"55061255": [112, 143, 167]}, {"55061259": [116, 132, 110, 19, 196, 3, 224]}, {"55061267": [8]}, {"55061272": [147, 25]}, {"55061275": [116, 52, 1]}, {"55061279": [255, 23, 33]}, {"55061283": [2]}, {"55061288": [52, 25]}, {"55061291": [44, 3, 224]}, {"55061295": [8, 167, 185]}, {"55061299": [154, 147, 44]}, {"55061303": [116, 52, 1]}, {"55061307": [255, 21, 129]}, {"55061311": [2]}, {"55061316": [52, 12]}, {"55061319": [44, 3, 224]}, {"55061323": [8]}, {"55061328": [145, 174]}, {"55061331": [116, 52, 1]}, {"55061335": [255, 21, 193]}, {"55061339": [2]}, {"55061344": [52, 14]}, {"55061347": [44, 3, 224]}, {"55061351": [8, 167, 174]}, {"55061355": [154, 145, 207]}, {"55061359": [116, 52, 1]}, {"55061363": [255, 21, 225]}, {"55061367": [2]}, {"55061372": [52, 15]}, {"55061375": [44, 3, 224]}, {"55061379": [8, 167, 175]}, {"55061383": [154, 141, 9]}, {"55061387": [4, 17, 32]}, {"55061391": [7]}, {"55061396": [145, 9]}, {"55061399": [104, 52, 1]}, {"55061403": [59, 17, 33]}, {"55061407": [2]}, {"55061412": [52, 9]}, {"55061415": [255, 161, 9]}, {"55061419": [64, 3, 224]}, {"55061423": [8, 161, 14]}, {"55061427": [104]}] \ No newline at end of file From 035323be372b21756f347b5aae096e7164e5c223 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 1 Jun 2018 22:22:31 -0400 Subject: [PATCH 073/151] Fix nut and stick upgrades --- ASM/src/items.asm | 4 ++-- data/base2current.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 4e3f3254f..2c935c4df 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -535,7 +535,7 @@ scale_upgrade: nut_upgrade: lbu t0, 0xA1 (a0) ; Load nut limit from inventory - andi t0, t0, 0x30 ; Mask bits to isolate nut limit + andi t0, t0, 0x20 ; Mask bits to isolate nut limit, upper bit only beqz t0, @@return li v0, 0x79 ; 30 Nuts @@ -550,7 +550,7 @@ nut_upgrade: stick_upgrade: lbu t0, 0xA1 (a0) ; Load stick limit from inventory - andi t0, t0, 0x06 ; Mask bits to isolate stick limit + andi t0, t0, 0x04 ; Mask bits to isolate stick limit, upper bit only beqz t0, @@return li v0, 0x77 ; 20 Sticks diff --git a/data/base2current.json b/data/base2current.json index afa3772ee..ffeeaca95 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 143]}, {"11325064": [12, 16, 9, 135, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 226]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 205, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 212, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 219, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 198, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 5]}, {"12427480": [12, 16, 9, 34]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 38]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 167, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 65]}, {"12491480": [12, 16, 9, 74]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 101]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 132, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 160, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 92, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 120, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 148, 83, 255, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42]}, {"55058608": [128, 64, 40, 124, 83, 255, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42]}, {"55058624": [128, 64, 40, 124, 83, 255, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42]}, {"55058640": [128, 64, 40, 124, 83, 255, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42]}, {"55058656": [128, 64, 40, 124, 83, 255, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42]}, {"55058672": [128, 64, 40, 124, 83, 255, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42]}, {"55058688": [128, 64, 40, 124, 83, 255, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42]}, {"55058704": [128, 64, 40, 124, 83, 255, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42]}, {"55058720": [128, 64, 40, 124, 83, 255, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42]}, {"55058736": [128, 64, 40, 124, 83, 255, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 41, 240, 128, 64, 40, 124, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 79, 255, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 128, 128, 64, 40, 124, 48, 132]}, {"55059479": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059491": [140, 16, 129]}, {"55059495": [22, 145, 2]}, {"55059499": [117, 52, 1]}, {"55059503": [141, 16, 129]}, {"55059507": [19, 145, 2]}, {"55059511": [117, 16, 128]}, {"55059515": [17, 145, 2]}, {"55059519": [116, 52, 1]}, {"55059523": [138, 16, 129]}, {"55059527": [14, 145, 2]}, {"55059531": [116, 52, 1]}, {"55059535": [139, 16, 129]}, {"55059539": [11, 145, 2]}, {"55059543": [116, 52, 1]}, {"55059547": [88, 16, 129]}, {"55059551": [8, 52, 2]}, {"55059556": [52, 1]}, {"55059559": [120, 16, 129]}, {"55059563": [5, 52, 2]}, {"55059568": [52, 1]}, {"55059571": [121, 16, 129]}, {"55059575": [2, 52, 2]}, {"55059580": [52, 2]}, {"55059583": [255, 3, 224]}, {"55059587": [8]}, {"55059592": [143, 166]}, {"55059595": [48, 132, 197]}, {"55059599": [4, 8, 16, 9, 42]}, {"55059608": [143, 185]}, {"55059611": [44, 135, 37]}, {"55059615": [4, 8, 16, 9, 42]}, {"55059624": [60, 10, 128, 64, 37, 74, 32]}, {"55059632": [141, 75]}, {"55059635": [12, 17, 96]}, {"55059639": [2]}, {"55059644": [149, 69]}, {"55059647": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059660": [3, 224]}, {"55059663": [8]}, {"55059668": [60, 8, 128, 64, 37, 8, 32]}, {"55059676": [141, 9]}, {"55059679": [12, 17, 32]}, {"55059683": [2]}, {"55059688": [129, 3]}, {"55059691": [2]}, {"55059693": [3, 15, 195]}, {"55059697": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 69]}, {"55059719": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059728": [141, 9]}, {"55059731": [12, 17, 32]}, {"55059735": [2]}, {"55059740": [145, 5]}, {"55059743": [3, 3, 224]}, {"55059747": [8]}, {"55059752": [143, 162]}, {"55059755": [36, 144, 69]}, {"55059760": [60, 8, 128, 64, 37, 8, 32]}, {"55059768": [141, 9]}, {"55059771": [12, 17, 32]}, {"55059775": [19]}, {"55059780": [145, 5]}, {"55059783": [1, 175, 164]}, {"55059788": [175, 165]}, {"55059791": [4, 175, 166]}, {"55059795": [8, 39, 189, 255, 232, 175, 191]}, {"55059803": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059815": [6, 145, 6]}, {"55059819": [7, 141, 9]}, {"55059823": [8, 1, 32, 248, 9]}, {"55059832": [143, 191]}, {"55059835": [16, 39, 189]}, {"55059839": [24, 143, 164]}, {"55059844": [143, 165]}, {"55059847": [4, 143, 166]}, {"55059851": [8, 3, 224]}, {"55059855": [8]}, {"55059860": [140, 136, 29, 44, 52, 9]}, {"55059867": [1]}, {"55059869": [9, 78]}, {"55059872": [1, 9, 16, 36, 16, 64]}, {"55059879": [27]}, {"55059884": [148, 138]}, {"55059887": [164, 52, 1]}, {"55059891": [61, 21, 65]}, {"55059895": [23]}, {"55059900": [148, 202, 2, 220, 52, 11]}, {"55059907": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059931": [14]}, {"55059936": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059964": [1, 10, 64, 33, 129, 8]}, {"55059972": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55059984": [52, 2]}, {"55059988": [3, 224]}, {"55059991": [8]}, {"55059996": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060008": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060039": [16, 175, 163]}, {"55060043": [20, 175, 191]}, {"55060047": [24, 12, 16, 9, 156]}, {"55060056": [143, 162]}, {"55060059": [16, 143, 163]}, {"55060063": [20, 143, 191]}, {"55060067": [24, 39, 189]}, {"55060071": [32, 3, 224]}, {"55060075": [8]}, {"55060080": [39, 189, 255, 232, 175, 191]}, {"55060087": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060096": [173]}, {"55060100": [173]}, {"55060103": [4, 173]}, {"55060107": [8, 173]}, {"55060111": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060127": [32]}, {"55060133": [9, 15, 195, 1, 33, 32, 38]}, {"55060141": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 204]}, {"55060156": [4, 64]}, {"55060159": [24]}, {"55060164": [52, 68]}, {"55060168": [12, 16, 9, 254]}, {"55060176": [16, 96]}, {"55060179": [12]}, {"55060184": [60, 8, 128, 64, 37, 8, 32]}, {"55060192": [140, 105]}, {"55060196": [173, 9]}, {"55060200": [140, 105]}, {"55060203": [4, 173, 9]}, {"55060207": [4, 140, 105]}, {"55060211": [8, 173, 9]}, {"55060215": [8, 52, 9]}, {"55060219": [1, 173, 9]}, {"55060223": [12, 144, 98]}, {"55060228": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060243": [2]}, {"55060249": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060259": [16, 39, 189]}, {"55060263": [24, 3, 224]}, {"55060267": [8]}, {"55060272": [39, 189, 255, 232, 175, 191]}, {"55060279": [16, 12, 16, 9, 215]}, {"55060288": [52, 68]}, {"55060292": [12, 16, 9, 241]}, {"55060300": [143, 191]}, {"55060303": [16, 39, 189]}, {"55060307": [24, 3, 224]}, {"55060311": [8]}, {"55060316": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060327": [164, 52, 8]}, {"55060332": [52, 137]}, {"55060336": [148, 170]}, {"55060340": [52, 1]}, {"55060343": [10, 21, 65]}, {"55060347": [7]}, {"55060352": [52, 1]}, {"55060355": [16, 16, 65]}, {"55060359": [4]}, {"55060364": [52, 8]}, {"55060367": [1, 148, 169]}, {"55060371": [28, 49, 41]}, {"55060375": [31, 52, 1]}, {"55060379": [21, 21, 65]}, {"55060383": [3]}, {"55060388": [52, 8]}, {"55060391": [2, 144, 169, 1, 65]}, {"55060397": [2, 18]}, {"55060401": [72, 16, 37]}, {"55060405": [2, 18]}, {"55060409": [73, 16, 37, 3, 224]}, {"55060415": [8]}, {"55060420": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060435": [4, 141, 9]}, {"55060440": [17, 32]}, {"55060443": [5]}, {"55060449": [9, 82, 2, 21, 68, 255, 250]}, {"55060460": [49, 34]}, {"55060463": [255, 3, 224]}, {"55060467": [8]}, {"55060472": [39, 189, 255, 224, 175, 176]}, {"55060479": [16, 175, 177]}, {"55060483": [20, 175, 191]}, {"55060487": [24, 52, 130]}, {"55060492": [52, 80]}, {"55060496": [38, 8, 255, 128, 5]}, {"55060503": [18]}, {"55060508": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060519": [16, 1, 9]}, {"55060523": [24]}, {"55060526": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060544": [142, 40]}, {"55060547": [12, 1]}, {"55060550": [248, 9]}, {"55060556": [20, 80, 255, 239]}, {"55060564": [54, 35]}, {"55060568": [16]}, {"55060571": [2]}, {"55060576": [52, 3]}, {"55060580": [143, 176]}, {"55060583": [16, 143, 177]}, {"55060587": [20, 143, 191]}, {"55060591": [24, 39, 189]}, {"55060595": [32, 3, 224]}, {"55060599": [8]}, {"55060604": [3, 224]}, {"55060607": [8, 52, 162]}, {"55060612": [144, 136]}, {"55060615": [125, 52, 1]}, {"55060619": [255, 17, 1]}, {"55060623": [2, 52, 2]}, {"55060627": [8, 52, 2]}, {"55060631": [9, 3, 224]}, {"55060635": [8]}, {"55060640": [144, 136]}, {"55060643": [163, 49, 8]}, {"55060647": [192, 17]}, {"55060651": [5, 52, 2]}, {"55060655": [84, 52, 1]}, {"55060659": [64, 17, 1]}, {"55060663": [2, 52, 2]}, {"55060667": [53, 52, 2]}, {"55060671": [54, 3, 224]}, {"55060675": [8]}, {"55060680": [144, 136]}, {"55060683": [163, 49, 8]}, {"55060687": [24, 17]}, {"55060691": [5, 52, 2]}, {"55060695": [50, 52, 1]}, {"55060699": [8, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [51, 52, 2]}, {"55060711": [52, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [3, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [4, 52, 1]}, {"55060739": [1, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [48, 52, 2]}, {"55060751": [49, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [162, 49, 8]}, {"55060767": [192, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [5, 52, 1]}, {"55060779": [64, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [96, 52, 2]}, {"55060791": [123, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [162, 49, 8]}, {"55060807": [48, 17]}, {"55060811": [2, 52, 2]}, {"55060815": [69, 52, 2]}, {"55060819": [70, 3, 224]}, {"55060823": [8]}, {"55060828": [144, 136]}, {"55060831": [162, 49, 8]}, {"55060835": [6, 17]}, {"55060839": [2, 52, 2]}, {"55060843": [55, 52, 2]}, {"55060847": [56, 3, 224]}, {"55060851": [8]}, {"55060856": [144, 136]}, {"55060859": [161, 49, 8]}, {"55060863": [48, 17]}, {"55060867": [2, 52, 2]}, {"55060871": [121, 52, 2]}, {"55060875": [122, 3, 224]}, {"55060879": [8]}, {"55060884": [144, 136]}, {"55060887": [161, 49, 8]}, {"55060891": [6, 17]}, {"55060895": [2, 52, 2]}, {"55060899": [119, 52, 2]}, {"55060903": [120, 3, 224]}, {"55060907": [8]}, {"55060912": [144, 136]}, {"55060915": [163, 49, 8]}, {"55060919": [3, 17]}, {"55060923": [2, 52, 2]}, {"55060927": [77, 52, 162]}, {"55060932": [3, 224]}, {"55060935": [8]}, {"55060940": [144, 136]}, {"55060943": [163, 49, 8]}, {"55060947": [24, 17]}, {"55060951": [2, 52, 2]}, {"55060955": [77, 52, 162]}, {"55060960": [3, 224]}, {"55060963": [8]}, {"55060968": [3, 224]}, {"55060971": [8]}, {"55060976": [52, 8]}, {"55060979": [1, 160, 136]}, {"55060983": [62, 3, 224]}, {"55060987": [8]}, {"55060992": [36, 136]}, {"55060995": [134, 36, 9, 255, 255, 37, 41]}, {"55061003": [1, 52, 1]}, {"55061007": [3]}, {"55061009": [41, 8, 42, 20, 32]}, {"55061015": [7]}, {"55061020": [1, 9, 80, 33, 145, 75]}, {"55061028": [52, 1]}, {"55061031": [255, 21, 97, 255, 247]}, {"55061040": [161, 69]}, {"55061044": [3, 224]}, {"55061047": [8]}, {"55061052": [36, 136]}, {"55061055": [168, 1, 6, 64, 33, 145, 9]}, {"55061064": [1, 37, 72, 37, 161, 9]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [36, 136]}, {"55061083": [188, 1, 5, 64, 33, 129, 9]}, {"55061092": [5, 33]}, {"55061095": [2]}, {"55061100": [52, 9]}, {"55061104": [37, 41]}, {"55061107": [1, 161, 9]}, {"55061112": [3, 224]}, {"55061115": [8]}, {"55061120": [52, 8]}, {"55061123": [1, 160, 136]}, {"55061127": [61, 148, 136]}, {"55061131": [46]}, {"55061133": [8, 65, 2, 160, 136]}, {"55061139": [207, 3, 224]}, {"55061143": [8]}, {"55061148": [175, 164]}, {"55061151": [104, 175, 165]}, {"55061155": [108, 175, 166]}, {"55061159": [112, 175, 167]}, {"55061163": [116, 39, 189, 255, 232, 175, 163]}, {"55061171": [16, 175, 191]}, {"55061175": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061188": [17]}, {"55061191": [10]}, {"55061196": [60, 9, 128, 65, 52, 10]}, {"55061203": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 156]}, {"55061232": [143, 163]}, {"55061235": [16, 143, 191]}, {"55061239": [20, 39, 189]}, {"55061243": [24, 143, 164]}, {"55061247": [104, 143, 165]}, {"55061251": [108, 143, 166]}, {"55061255": [112, 143, 167]}, {"55061259": [116, 132, 110, 19, 196, 3, 224]}, {"55061267": [8]}, {"55061272": [147, 25]}, {"55061275": [116, 52, 1]}, {"55061279": [255, 23, 33]}, {"55061283": [2]}, {"55061288": [52, 25]}, {"55061291": [44, 3, 224]}, {"55061295": [8, 167, 185]}, {"55061299": [154, 147, 44]}, {"55061303": [116, 52, 1]}, {"55061307": [255, 21, 129]}, {"55061311": [2]}, {"55061316": [52, 12]}, {"55061319": [44, 3, 224]}, {"55061323": [8]}, {"55061328": [145, 174]}, {"55061331": [116, 52, 1]}, {"55061335": [255, 21, 193]}, {"55061339": [2]}, {"55061344": [52, 14]}, {"55061347": [44, 3, 224]}, {"55061351": [8, 167, 174]}, {"55061355": [154, 145, 207]}, {"55061359": [116, 52, 1]}, {"55061363": [255, 21, 225]}, {"55061367": [2]}, {"55061372": [52, 15]}, {"55061375": [44, 3, 224]}, {"55061379": [8, 167, 175]}, {"55061383": [154, 141, 9]}, {"55061387": [4, 17, 32]}, {"55061391": [7]}, {"55061396": [145, 9]}, {"55061399": [104, 52, 1]}, {"55061403": [59, 17, 33]}, {"55061407": [2]}, {"55061412": [52, 9]}, {"55061415": [255, 161, 9]}, {"55061419": [64, 3, 224]}, {"55061423": [8, 161, 14]}, {"55061427": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 143]}, {"11325064": [12, 16, 9, 135, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 226]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 205, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 212, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 219, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 198, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 5]}, {"12427480": [12, 16, 9, 34]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 38]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 167, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 65]}, {"12491480": [12, 16, 9, 74]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 101]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 132, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 160, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 92, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 120, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 148, 83, 255, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42]}, {"55058608": [128, 64, 40, 124, 83, 255, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42]}, {"55058624": [128, 64, 40, 124, 83, 255, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42]}, {"55058640": [128, 64, 40, 124, 83, 255, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42]}, {"55058656": [128, 64, 40, 124, 83, 255, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42]}, {"55058672": [128, 64, 40, 124, 83, 255, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42]}, {"55058688": [128, 64, 40, 124, 83, 255, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42]}, {"55058704": [128, 64, 40, 124, 83, 255, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42]}, {"55058720": [128, 64, 40, 124, 83, 255, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42]}, {"55058736": [128, 64, 40, 124, 83, 255, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 41, 240, 128, 64, 40, 124, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 79, 255, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 128, 128, 64, 40, 124, 48, 132]}, {"55059479": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059491": [140, 16, 129]}, {"55059495": [22, 145, 2]}, {"55059499": [117, 52, 1]}, {"55059503": [141, 16, 129]}, {"55059507": [19, 145, 2]}, {"55059511": [117, 16, 128]}, {"55059515": [17, 145, 2]}, {"55059519": [116, 52, 1]}, {"55059523": [138, 16, 129]}, {"55059527": [14, 145, 2]}, {"55059531": [116, 52, 1]}, {"55059535": [139, 16, 129]}, {"55059539": [11, 145, 2]}, {"55059543": [116, 52, 1]}, {"55059547": [88, 16, 129]}, {"55059551": [8, 52, 2]}, {"55059556": [52, 1]}, {"55059559": [120, 16, 129]}, {"55059563": [5, 52, 2]}, {"55059568": [52, 1]}, {"55059571": [121, 16, 129]}, {"55059575": [2, 52, 2]}, {"55059580": [52, 2]}, {"55059583": [255, 3, 224]}, {"55059587": [8]}, {"55059592": [143, 166]}, {"55059595": [48, 132, 197]}, {"55059599": [4, 8, 16, 9, 42]}, {"55059608": [143, 185]}, {"55059611": [44, 135, 37]}, {"55059615": [4, 8, 16, 9, 42]}, {"55059624": [60, 10, 128, 64, 37, 74, 32]}, {"55059632": [141, 75]}, {"55059635": [12, 17, 96]}, {"55059639": [2]}, {"55059644": [149, 69]}, {"55059647": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059660": [3, 224]}, {"55059663": [8]}, {"55059668": [60, 8, 128, 64, 37, 8, 32]}, {"55059676": [141, 9]}, {"55059679": [12, 17, 32]}, {"55059683": [2]}, {"55059688": [129, 3]}, {"55059691": [2]}, {"55059693": [3, 15, 195]}, {"55059697": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 69]}, {"55059719": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059728": [141, 9]}, {"55059731": [12, 17, 32]}, {"55059735": [2]}, {"55059740": [145, 5]}, {"55059743": [3, 3, 224]}, {"55059747": [8]}, {"55059752": [143, 162]}, {"55059755": [36, 144, 69]}, {"55059760": [60, 8, 128, 64, 37, 8, 32]}, {"55059768": [141, 9]}, {"55059771": [12, 17, 32]}, {"55059775": [19]}, {"55059780": [145, 5]}, {"55059783": [1, 175, 164]}, {"55059788": [175, 165]}, {"55059791": [4, 175, 166]}, {"55059795": [8, 39, 189, 255, 232, 175, 191]}, {"55059803": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059815": [6, 145, 6]}, {"55059819": [7, 141, 9]}, {"55059823": [8, 1, 32, 248, 9]}, {"55059832": [143, 191]}, {"55059835": [16, 39, 189]}, {"55059839": [24, 143, 164]}, {"55059844": [143, 165]}, {"55059847": [4, 143, 166]}, {"55059851": [8, 3, 224]}, {"55059855": [8]}, {"55059860": [140, 136, 29, 44, 52, 9]}, {"55059867": [1]}, {"55059869": [9, 78]}, {"55059872": [1, 9, 16, 36, 16, 64]}, {"55059879": [27]}, {"55059884": [148, 138]}, {"55059887": [164, 52, 1]}, {"55059891": [61, 21, 65]}, {"55059895": [23]}, {"55059900": [148, 202, 2, 220, 52, 11]}, {"55059907": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059931": [14]}, {"55059936": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059964": [1, 10, 64, 33, 129, 8]}, {"55059972": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55059984": [52, 2]}, {"55059988": [3, 224]}, {"55059991": [8]}, {"55059996": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060008": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060039": [16, 175, 163]}, {"55060043": [20, 175, 191]}, {"55060047": [24, 12, 16, 9, 156]}, {"55060056": [143, 162]}, {"55060059": [16, 143, 163]}, {"55060063": [20, 143, 191]}, {"55060067": [24, 39, 189]}, {"55060071": [32, 3, 224]}, {"55060075": [8]}, {"55060080": [39, 189, 255, 232, 175, 191]}, {"55060087": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060096": [173]}, {"55060100": [173]}, {"55060103": [4, 173]}, {"55060107": [8, 173]}, {"55060111": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060127": [32]}, {"55060133": [9, 15, 195, 1, 33, 32, 38]}, {"55060141": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 204]}, {"55060156": [4, 64]}, {"55060159": [24]}, {"55060164": [52, 68]}, {"55060168": [12, 16, 9, 254]}, {"55060176": [16, 96]}, {"55060179": [12]}, {"55060184": [60, 8, 128, 64, 37, 8, 32]}, {"55060192": [140, 105]}, {"55060196": [173, 9]}, {"55060200": [140, 105]}, {"55060203": [4, 173, 9]}, {"55060207": [4, 140, 105]}, {"55060211": [8, 173, 9]}, {"55060215": [8, 52, 9]}, {"55060219": [1, 173, 9]}, {"55060223": [12, 144, 98]}, {"55060228": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060243": [2]}, {"55060249": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060259": [16, 39, 189]}, {"55060263": [24, 3, 224]}, {"55060267": [8]}, {"55060272": [39, 189, 255, 232, 175, 191]}, {"55060279": [16, 12, 16, 9, 215]}, {"55060288": [52, 68]}, {"55060292": [12, 16, 9, 241]}, {"55060300": [143, 191]}, {"55060303": [16, 39, 189]}, {"55060307": [24, 3, 224]}, {"55060311": [8]}, {"55060316": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060327": [164, 52, 8]}, {"55060332": [52, 137]}, {"55060336": [148, 170]}, {"55060340": [52, 1]}, {"55060343": [10, 21, 65]}, {"55060347": [7]}, {"55060352": [52, 1]}, {"55060355": [16, 16, 65]}, {"55060359": [4]}, {"55060364": [52, 8]}, {"55060367": [1, 148, 169]}, {"55060371": [28, 49, 41]}, {"55060375": [31, 52, 1]}, {"55060379": [21, 21, 65]}, {"55060383": [3]}, {"55060388": [52, 8]}, {"55060391": [2, 144, 169, 1, 65]}, {"55060397": [2, 18]}, {"55060401": [72, 16, 37]}, {"55060405": [2, 18]}, {"55060409": [73, 16, 37, 3, 224]}, {"55060415": [8]}, {"55060420": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060435": [4, 141, 9]}, {"55060440": [17, 32]}, {"55060443": [5]}, {"55060449": [9, 82, 2, 21, 68, 255, 250]}, {"55060460": [49, 34]}, {"55060463": [255, 3, 224]}, {"55060467": [8]}, {"55060472": [39, 189, 255, 224, 175, 176]}, {"55060479": [16, 175, 177]}, {"55060483": [20, 175, 191]}, {"55060487": [24, 52, 130]}, {"55060492": [52, 80]}, {"55060496": [38, 8, 255, 128, 5]}, {"55060503": [18]}, {"55060508": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060519": [16, 1, 9]}, {"55060523": [24]}, {"55060526": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060544": [142, 40]}, {"55060547": [12, 1]}, {"55060550": [248, 9]}, {"55060556": [20, 80, 255, 239]}, {"55060564": [54, 35]}, {"55060568": [16]}, {"55060571": [2]}, {"55060576": [52, 3]}, {"55060580": [143, 176]}, {"55060583": [16, 143, 177]}, {"55060587": [20, 143, 191]}, {"55060591": [24, 39, 189]}, {"55060595": [32, 3, 224]}, {"55060599": [8]}, {"55060604": [3, 224]}, {"55060607": [8, 52, 162]}, {"55060612": [144, 136]}, {"55060615": [125, 52, 1]}, {"55060619": [255, 17, 1]}, {"55060623": [2, 52, 2]}, {"55060627": [8, 52, 2]}, {"55060631": [9, 3, 224]}, {"55060635": [8]}, {"55060640": [144, 136]}, {"55060643": [163, 49, 8]}, {"55060647": [192, 17]}, {"55060651": [5, 52, 2]}, {"55060655": [84, 52, 1]}, {"55060659": [64, 17, 1]}, {"55060663": [2, 52, 2]}, {"55060667": [53, 52, 2]}, {"55060671": [54, 3, 224]}, {"55060675": [8]}, {"55060680": [144, 136]}, {"55060683": [163, 49, 8]}, {"55060687": [24, 17]}, {"55060691": [5, 52, 2]}, {"55060695": [50, 52, 1]}, {"55060699": [8, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [51, 52, 2]}, {"55060711": [52, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [3, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [4, 52, 1]}, {"55060739": [1, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [48, 52, 2]}, {"55060751": [49, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [162, 49, 8]}, {"55060767": [192, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [5, 52, 1]}, {"55060779": [64, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [96, 52, 2]}, {"55060791": [123, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [162, 49, 8]}, {"55060807": [48, 17]}, {"55060811": [2, 52, 2]}, {"55060815": [69, 52, 2]}, {"55060819": [70, 3, 224]}, {"55060823": [8]}, {"55060828": [144, 136]}, {"55060831": [162, 49, 8]}, {"55060835": [6, 17]}, {"55060839": [2, 52, 2]}, {"55060843": [55, 52, 2]}, {"55060847": [56, 3, 224]}, {"55060851": [8]}, {"55060856": [144, 136]}, {"55060859": [161, 49, 8]}, {"55060863": [32, 17]}, {"55060867": [2, 52, 2]}, {"55060871": [121, 52, 2]}, {"55060875": [122, 3, 224]}, {"55060879": [8]}, {"55060884": [144, 136]}, {"55060887": [161, 49, 8]}, {"55060891": [4, 17]}, {"55060895": [2, 52, 2]}, {"55060899": [119, 52, 2]}, {"55060903": [120, 3, 224]}, {"55060907": [8]}, {"55060912": [144, 136]}, {"55060915": [163, 49, 8]}, {"55060919": [3, 17]}, {"55060923": [2, 52, 2]}, {"55060927": [77, 52, 162]}, {"55060932": [3, 224]}, {"55060935": [8]}, {"55060940": [144, 136]}, {"55060943": [163, 49, 8]}, {"55060947": [24, 17]}, {"55060951": [2, 52, 2]}, {"55060955": [77, 52, 162]}, {"55060960": [3, 224]}, {"55060963": [8]}, {"55060968": [3, 224]}, {"55060971": [8]}, {"55060976": [52, 8]}, {"55060979": [1, 160, 136]}, {"55060983": [62, 3, 224]}, {"55060987": [8]}, {"55060992": [36, 136]}, {"55060995": [134, 36, 9, 255, 255, 37, 41]}, {"55061003": [1, 52, 1]}, {"55061007": [3]}, {"55061009": [41, 8, 42, 20, 32]}, {"55061015": [7]}, {"55061020": [1, 9, 80, 33, 145, 75]}, {"55061028": [52, 1]}, {"55061031": [255, 21, 97, 255, 247]}, {"55061040": [161, 69]}, {"55061044": [3, 224]}, {"55061047": [8]}, {"55061052": [36, 136]}, {"55061055": [168, 1, 6, 64, 33, 145, 9]}, {"55061064": [1, 37, 72, 37, 161, 9]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [36, 136]}, {"55061083": [188, 1, 5, 64, 33, 129, 9]}, {"55061092": [5, 33]}, {"55061095": [2]}, {"55061100": [52, 9]}, {"55061104": [37, 41]}, {"55061107": [1, 161, 9]}, {"55061112": [3, 224]}, {"55061115": [8]}, {"55061120": [52, 8]}, {"55061123": [1, 160, 136]}, {"55061127": [61, 148, 136]}, {"55061131": [46]}, {"55061133": [8, 65, 2, 160, 136]}, {"55061139": [207, 3, 224]}, {"55061143": [8]}, {"55061148": [175, 164]}, {"55061151": [104, 175, 165]}, {"55061155": [108, 175, 166]}, {"55061159": [112, 175, 167]}, {"55061163": [116, 39, 189, 255, 232, 175, 163]}, {"55061171": [16, 175, 191]}, {"55061175": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061188": [17]}, {"55061191": [10]}, {"55061196": [60, 9, 128, 65, 52, 10]}, {"55061203": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 156]}, {"55061232": [143, 163]}, {"55061235": [16, 143, 191]}, {"55061239": [20, 39, 189]}, {"55061243": [24, 143, 164]}, {"55061247": [104, 143, 165]}, {"55061251": [108, 143, 166]}, {"55061255": [112, 143, 167]}, {"55061259": [116, 132, 110, 19, 196, 3, 224]}, {"55061267": [8]}, {"55061272": [147, 25]}, {"55061275": [116, 52, 1]}, {"55061279": [255, 23, 33]}, {"55061283": [2]}, {"55061288": [52, 25]}, {"55061291": [44, 3, 224]}, {"55061295": [8, 167, 185]}, {"55061299": [154, 147, 44]}, {"55061303": [116, 52, 1]}, {"55061307": [255, 21, 129]}, {"55061311": [2]}, {"55061316": [52, 12]}, {"55061319": [44, 3, 224]}, {"55061323": [8]}, {"55061328": [145, 174]}, {"55061331": [116, 52, 1]}, {"55061335": [255, 21, 193]}, {"55061339": [2]}, {"55061344": [52, 14]}, {"55061347": [44, 3, 224]}, {"55061351": [8, 167, 174]}, {"55061355": [154, 145, 207]}, {"55061359": [116, 52, 1]}, {"55061363": [255, 21, 225]}, {"55061367": [2]}, {"55061372": [52, 15]}, {"55061375": [44, 3, 224]}, {"55061379": [8, 167, 175]}, {"55061383": [154, 141, 9]}, {"55061387": [4, 17, 32]}, {"55061391": [7]}, {"55061396": [145, 9]}, {"55061399": [104, 52, 1]}, {"55061403": [59, 17, 33]}, {"55061407": [2]}, {"55061412": [52, 9]}, {"55061415": [255, 161, 9]}, {"55061419": [64, 3, 224]}, {"55061423": [8, 161, 14]}, {"55061427": [104]}] \ No newline at end of file From c7efc9c04c3db4270b6a637eefdb714577041698 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 1 Jun 2018 22:22:51 -0400 Subject: [PATCH 074/151] Remove fairy-specific progressive text --- Rom.py | 80 ---------------------------------------------------------- 1 file changed, 80 deletions(-) diff --git a/Rom.py b/Rom.py index 9d72f96fa..da719b5fa 100644 --- a/Rom.py +++ b/Rom.py @@ -695,86 +695,6 @@ def patch_rom(world, rom): 0x70, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x02] rom.write_bytes(0x92D41C, Block_code) - # Add text for progressive items from faires - # Text ID D7: You got a Progressive Hookshot, allowing you to hook into farther surfaces! - Block_code = [0x13, 0x0A, 0x08, 0x59, 0x6F, 0x75, 0x20, 0x67, 0x6F, 0x74, 0x20, 0x61, - 0x20, 0x05, 0x41, 0x50, 0x72, 0x6F, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x76, 0x65, 0x20, 0x48, 0x6F, 0x6F, 0x6B, 0x73, 0x68, 0x6F, 0x74, 0x05, - 0x40, 0x2C, 0x01, 0x61, 0x6C, 0x6C, 0x6F, 0x77, 0x69, 0x6E, 0x67, 0x20, - 0x79, 0x6F, 0x75, 0x20, 0x74, 0x6F, 0x20, 0x68, 0x6F, 0x6F, 0x6B, 0x20, - 0x69, 0x6E, 0x74, 0x6F, 0x20, 0x66, 0x61, 0x72, 0x74, 0x68, 0x65, 0x72, - 0x01, 0x73, 0x75, 0x72, 0x66, 0x61, 0x63, 0x65, 0x73, 0x21, 0x02] - rom.write_bytes(0x932E31, Block_code) - # Text ID D8: You got a Progressive Bomb Bag! You can carry more explosives! - Block_code = [0x13, 0x4D, 0x08, 0x59, 0x6F, 0x75, 0x20, 0x67, 0x6F, 0x74, 0x20, 0x61, - 0x20, 0x05, 0x41, 0x50, 0x72, 0x6F, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x76, 0x65, 0x20, 0x42, 0x6F, 0x6D, 0x62, 0x20, 0x42, 0x61, 0x67, 0x05, - 0x40, 0x21, 0x01, 0x59, 0x6F, 0x75, 0x20, 0x63, 0x61, 0x6E, 0x20, 0x63, - 0x61, 0x72, 0x72, 0x79, 0x20, 0x6D, 0x6F, 0x72, 0x65, 0x20, 0x65, 0x78, - 0x70, 0x6C, 0x6F, 0x73, 0x69, 0x76, 0x65, 0x73, 0x21, 0x02] - rom.write_bytes(0x932E9D, Block_code) - # Text ID D9: You got a Progressive Strength Upgrade! You can lift heavier objects! - Block_code = [0x13, 0x50, 0x08, 0x59, 0x6F, 0x75, 0x20, 0x67, 0x6F, 0x74, 0x20, 0x61, - 0x20, 0x05, 0x41, 0x50, 0x72, 0x6F, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x76, 0x65, 0x20, 0x53, 0x74, 0x72, 0x65, 0x6E, 0x67, 0x74, 0x68, 0x01, - 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x05, 0x40, 0x21, 0x20, 0x59, - 0x6F, 0x75, 0x20, 0x63, 0x61, 0x6E, 0x20, 0x6C, 0x69, 0x66, 0x74, 0x20, - 0x68, 0x65, 0x61, 0x76, 0x69, 0x65, 0x72, 0x01, 0x6F, 0x62, 0x6A, 0x65, - 0x63, 0x74, 0x73, 0x21, 0x02] - rom.write_bytes(0x932F09, Block_code) - # Text ID E8: You got a Progressive Scale! Use it to reach deeper areas while swimming! - Block_code = [0x13, 0x53, 0x08, 0x59, 0x6F, 0x75, 0x20, 0x67, 0x6F, 0x74, 0x20, 0x61, - 0x20, 0x05, 0x41, 0x50, 0x72, 0x6F, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x76, 0x65, 0x20, 0x53, 0x63, 0x61, 0x6C, 0x65, 0x05, 0x40, 0x21, 0x01, - 0x55, 0x73, 0x65, 0x20, 0x69, 0x74, 0x20, 0x74, 0x6F, 0x20, 0x72, 0x65, - 0x61, 0x63, 0x68, 0x20, 0x64, 0x65, 0x65, 0x70, 0x65, 0x72, 0x20, 0x61, - 0x72, 0x65, 0x61, 0x73, 0x01, 0x77, 0x68, 0x69, 0x6C, 0x65, 0x20, 0x73, - 0x77, 0x69, 0x6D, 0x6D, 0x69, 0x6E, 0x67, 0x21, 0x02] - rom.write_bytes(0x9334D9, Block_code) - # Text ID E9: You got a Progressive Wallet! Your rupee capacity increases! - Block_code = [0x13, 0x56, 0x08, 0x59, 0x6F, 0x75, 0x20, 0x67, 0x6F, 0x74, 0x20, 0x61, - 0x20, 0x05, 0x41, 0x50, 0x72, 0x6F, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x76, 0x65, 0x20, 0x57, 0x61, 0x6C, 0x6C, 0x65, 0x74, 0x05, 0x40, 0x21, - 0x01, 0x59, 0x6F, 0x75, 0x72, 0x20, 0x72, 0x75, 0x70, 0x65, 0x65, 0x20, - 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x20, 0x69, 0x6E, 0x63, - 0x72, 0x65, 0x61, 0x73, 0x65, 0x73, 0x21, 0x02] - rom.write_bytes(0x93352D, Block_code) - # Text ID EA: You can now pick up even more Deku Sticks! - Block_code = [0x13, 0x00, 0x08, 0x59, 0x6F, 0x75, 0x20, 0x63, 0x61, 0x6E, 0x20, 0x6E, - 0x6F, 0x77, 0x20, 0x70, 0x69, 0x63, 0x6B, 0x20, 0x75, 0x70, 0x20, 0x01, - 0x65, 0x76, 0x65, 0x6E, 0x20, 0x6D, 0x6F, 0x72, 0x65, 0x20, 0x05, 0x41, - 0x44, 0x65, 0x6B, 0x75, 0x20, 0x53, 0x74, 0x69, 0x63, 0x6B, 0x73, 0x05, - 0x40, 0x21, 0x02] - rom.write_bytes(0x933591, Block_code) - # Text ID EC: You can now carry even more Deku Nuts! - Block_code = [0x13, 0x01, 0x08, 0x59, 0x6F, 0x75, 0x20, 0x63, 0x61, 0x6E, 0x20, 0x6E, - 0x6F, 0x77, 0x20, 0x63, 0x61, 0x72, 0x72, 0x79, 0x20, 0x65, 0x76, 0x65, - 0x6E, 0x01, 0x6D, 0x6F, 0x72, 0x65, 0x20, 0x05, 0x41, 0x44, 0x65, 0x6B, - 0x75, 0x20, 0x4E, 0x75, 0x74, 0x73, 0x05, 0x40, 0x21, 0x20, 0x02] - rom.write_bytes(0x933625, Block_code) - # Text ID ED: You got a Progressive Slingshot! You can now carry more Deku Seeds! - Block_code = [0x13, 0x06, 0x08, 0x59, 0x6F, 0x75, 0x20, 0x67, 0x6F, 0x74, 0x20, 0x61, - 0x20, 0x05, 0x41, 0x50, 0x72, 0x6F, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x76, 0x65, 0x20, 0x53, 0x6C, 0x69, 0x6E, 0x67, 0x73, 0x68, 0x6F, 0x74, - 0x05, 0x40, 0x21, 0x01, 0x59, 0x6F, 0x75, 0x20, 0x63, 0x61, 0x6E, 0x20, - 0x6E, 0x6F, 0x77, 0x20, 0x63, 0x61, 0x72, 0x72, 0x79, 0x20, 0x6D, 0x6F, - 0x72, 0x65, 0x01, 0x44, 0x65, 0x6B, 0x75, 0x20, 0x53, 0x65, 0x65, 0x64, - 0x73, 0x21, 0x02] - rom.write_bytes(0x93366D, Block_code) - # Text ID EE: You got a Progressive Bow. Your quiver capacity increased. - Block_code = [0x13, 0x03, 0x08, 0x59, 0x6F, 0x75, 0x20, 0x67, 0x6F, 0x74, 0x20, 0x61, - 0x20, 0x05, 0x41, 0x50, 0x72, 0x6F, 0x67, 0x72, 0x65, 0x73, 0x73, 0x69, - 0x76, 0x65, 0x20, 0x42, 0x6F, 0x77, 0x05, 0x40, 0x21, 0x01, 0x59, 0x6F, - 0x75, 0x72, 0x20, 0x71, 0x75, 0x69, 0x76, 0x65, 0x72, 0x20, 0x63, 0x61, - 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x20, 0x68, 0x61, 0x73, 0x01, 0x69, - 0x6E, 0x63, 0x72, 0x65, 0x61, 0x73, 0x65, 0x64, 0x21, 0x02] - rom.write_bytes(0x9336D5, Block_code) - - # change progessive items from fairy text box types - textBoxType = [0xB8509E, 0xB850A6, 0xB850AE, 0xB85126, 0xB8512E, 0xB85136, 0xB85146, 0xB8514E, 0xB85156] - for address in textBoxType: - rom.write_byte(address, 0x23) - # DMA in extra code Block_code = [0xAF, 0xBF, 0x00, 0x1C, 0xAF, 0xA4, 0x01, 0x40, 0x3C, 0x05, 0x03, 0x48, 0x3C, 0x04, 0x80, 0x40, 0x0C, 0x00, 0x03, 0x7C, 0x24, 0x06, 0x50, 0x00, From b0a3bb1e3b7fac2d0f73ff53a8ec4858d3ac68b9 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Sat, 2 Jun 2018 00:29:30 -0500 Subject: [PATCH 075/151] Sped up all shop text --- Rom.py | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 102 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index 54b8c0182..562ff4ecf 100644 --- a/Rom.py +++ b/Rom.py @@ -121,8 +121,8 @@ def patch_rom(world, rom): rom.write_byte(0x22D82B7, 0x3F) # Change Bombchu Shop check to Bomb Bag - rom.write_byte(0x00C6CEDB, 0xA2) - rom.write_byte(0x00C6CEDF, 0x18) + rom.write_bytes(0xC6CEDA, [0x00, 0xA2]) + rom.write_byte(0xC6CEDF, 0x18) # Change Bowling Alley check to Bomb Bag (Part 1) rom.write_bytes(0x00E2D716, [0xA6, 0x72]) @@ -670,6 +670,7 @@ def patch_rom(world, rom): rom.write_byte(address, 0x08) # Speed Happy Mask shop text + rom.write_bytes(0x9602E4, [0x08, 0x48, 0x69, 0x79, 0x65, 0x65, 0x21, 0x01]) rom.write_bytes(0x960344, [0x08, 0x08, 0x08, 0x08, 0x57]) Block_code = [0x6D, 0x6F, 0x6E, 0x65, 0x79, 0x20, 0x05, 0x40, 0x62, 0x61, 0x63, 0x6B, 0x20, 0x68, 0x65, 0x72, 0x65, 0x2E, 0x04, 0x08, 0x08] @@ -681,12 +682,110 @@ def patch_rom(world, rom): rom.write_bytes(0x961160, [0x08, 0x08, 0x08, 0x08]) rom.write_bytes(0x9611AF, [0x08, 0x08, 0x08, 0x08, 0x44]) rom.write_bytes(0x9609F0, [0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x54]) + rom.write_bytes(0x960459, [0x08, 0x08]) + rom.write_bytes(0x9604C4, [0x08, 0x08, 0x41, 0x20, 0x6D, 0x61, 0x73, 0x6B, 0x20, 0x08, 0x08]) + rom.write_bytes(0x960513, [0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x54]) + Block_code = [0x08, 0x53, 0x6F, 0x6D, 0x65, 0x6F, 0x6E, 0x65, 0x20, 0x6D, 0x61, 0x79, + 0x20, 0x77, 0x61, 0x6E, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x01, 0x6D, + 0x61, 0x73, 0x6B, 0x2E, 0x04, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08] + rom.write_bytes(0x960555, Block_code) + rom.write_bytes(0x9605F5, [0x08, 0x08]) + Block_code = [0x08, 0x50, 0x61, 0x79, 0x6D, 0x65, 0x6E, 0x74, 0x20, 0x72, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x64, 0x21, 0x0B, 0x02] + rom.write_bytes(0x960718, Block_code) + Block_code = [0x08, 0x56, 0x65, 0x72, 0x79, 0x20, 0x77, 0x65, 0x6C, 0x6C, 0x20, 0x64, + 0x6F, 0x6E, 0x65, 0x21, 0x01, 0x41, 0x6C, 0x6C, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x6D, 0x61, 0x73, 0x6B, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, 0x73, + 0x6F, 0x6C, 0x64, 0x20, 0x6F, 0x75, 0x74, 0x2E, 0x01, 0x08, 0x08, 0x08, + 0x08, 0x08, 0x08, 0x08, 0x08] + rom.write_bytes(0x96078C, Block_code) + rom.write_bytes(0x960913, [0x04, 0x08, 0x08]) + Block_code = [0x08, 0x46, 0x72, 0x6F, 0x6D, 0x20, 0x6E, 0x6F, 0x77, 0x20, 0x6F, 0x6E, + 0x20, 0x79, 0x6F, 0x75, 0x20, 0x63, 0x61, 0x6E, 0x20, 0x62, 0x6F, 0x72, + 0x72, 0x6F, 0x77, 0x20, 0x61, 0x6E, 0x79, 0x01, 0x6D, 0x61, 0x73, 0x6B, + 0x20, 0x79, 0x6F, 0x75, 0x20, 0x77, 0x61, 0x6E, 0x74, 0x2E, 0x01, 0x4A, + 0x75, 0x73, 0x74, 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x66, 0x61, 0x69, + 0x74, 0x68, 0x2E, 0x2E, 0x2E, 0x0B, 0x02] + rom.write_bytes(0x960924, Block_code) + Block_code = [0x08, 0x08, 0x08, 0x57, 0x65, 0x6C, 0x63, 0x6F, 0x6D, 0x65, 0x21, 0x01, + 0x57, 0x68, 0x69, 0x63, 0x68, 0x20, 0x6D, 0x61, 0x73, 0x6B, 0x20, 0x63, + 0x61, 0x6E, 0x20, 0x49, 0x20, 0x6C, 0x65, 0x6E, 0x64, 0x20, 0x79, 0x6F, + 0x75, 0x3F, 0x0B, 0x02] + rom.write_bytes(0x960968, Block_code) + Block_code = [0x08, 0x57, 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6D, + 0x61, 0x73, 0x6B, 0x20, 0x79, 0x6F, 0x75, 0x20, 0x63, 0x61, 0x6E, 0x20, + 0x73, 0x65, 0x65, 0x20, 0x69, 0x6E, 0x74, 0x6F, 0x20, 0x01, 0x08, 0x08, + 0x08, 0x20, 0x70, 0x65, 0x6F, 0x70, 0x6C, 0x65, 0x27, 0x73, 0x20, 0x6D, + 0x69, 0x6E, 0x64, 0x73, 0x2E, 0x20, 0x49, 0x74, 0x27, 0x73, 0x20, 0x75, + 0x73, 0x65, 0x66, 0x75, 0x6C, 0x2C, 0x01, 0x62, 0x75, 0x74, 0x20, 0x73, + 0x63, 0x61, 0x72, 0x79, 0x21, 0x04, 0x08] + rom.write_bytes(0x960A44, Block_code) + rom.write_byte(0x960AA3, 0x01) + rom.write_byte(0x960AC6, 0x01) Happy_mask_turn_ins = [0x96066C, 0x961064, 0x9610B8, 0x96110C] #addresses with the same fix for lines upon returning profits from a sold mask for address in Happy_mask_turn_ins: rom.write_bytes(address, [0x08, 0x08, 0x08, 0x08, 0x47]) + + # Speed up various shops + rom.write_bytes(0x9550D0, [0x08, 0x48, 0x65, 0x79, 0x21, 0x08, 0x08, 0x08, 0x08]) + rom.write_bytes(0x93189C, [0x08, 0x4D, 0x79, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08]) + rom.write_bytes(0x95EC04, [0x08, 0x49, 0x74, 0x27, 0x73, 0x08, 0x08]) + Block_code = [0x08, 0x08, 0x08, 0x08, 0x57, 0x65, 0x20, 0x73, 0x65, 0x6C, 0x6C, 0x20, + 0x73, 0x68, 0x69, 0x65, 0x6C, 0x64, 0x73, 0x2C] + rom.write_bytes(0x941734, Block_code) + rom.write_bytes(0x949A94, [0x08, 0x59, 0x6F, 0x75, 0x27, 0x72, 0x65]) + rom.write_bytes(0x949B04, [0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x4F]) + rom.write_bytes(0x949B6A, [0x08, 0x08, 0x08, 0x08, 0x08, 0x4C]) + rom.write_bytes(0x949BC0, [0x08, 0x08, 0x08, 0x57]) + Block_code = [0x08, 0x08, 0x08, 0x08, 0x08, 0x57, 0x61, 0x6E, 0x74, 0x20, 0x74, 0x6F, + 0x20, 0x62, 0x79, 0x20, 0x66, 0x69, 0x73, 0x68, 0x3F, 0x20, 0x59, 0x6F, + 0x75, 0x27, 0x6C, 0x6C] + rom.write_bytes(0x94E57C, Block_code) + Block_code = [0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x54, 0x68, 0x61, 0x6E, 0x6B, 0x73, + 0x20, 0x74, 0x6F, 0x20, 0x79, 0x6F, 0x75, 0x2C, 0x20, 0x49, 0x27, 0x6D, + 0x20, 0x4F, 0x4B, 0x21] + rom.write_bytes(0x9498C8, Block_code) + rom.write_bytes(0x927E38, Block_code) + Block_code = [0x59, 0x6F, 0x75, 0x20, 0x68, 0x65, 0x61, 0x72, 0x64, 0x20, 0x61, 0x62, + 0x6F, 0x75, 0x74, 0x20, 0x75, 0x73, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, + 0x74, 0x68, 0x65, 0x01, 0x67, 0x75, 0x61, 0x72, 0x64, 0x20, 0x61, 0x74, + 0x20, 0x44, 0x65, 0x61, 0x74, 0x68, 0x20, 0x4D, 0x6F, 0x75, 0x6E, 0x74, + 0x61, 0x69, 0x6E, 0x20, 0x67, 0x61, 0x74, 0x65, 0x3F, 0x01, 0x08, 0x08, + 0x08, 0x08, 0x08] + rom.write_bytes(0x9650BC, Block_code) + Block_code = [0x08, 0x08, 0x08, 0x08, 0x57, 0x65, 0x20, 0x6D, 0x6F, 0x76, 0x65, 0x64, + 0x20, 0x68, 0x65, 0x72, 0x65, 0x20, 0x66, 0x72, 0x6F, 0x6D, 0x20, 0x43, + 0x61, 0x73, 0x74, 0x6C, 0x65, 0x20, 0x01, 0x54] + rom.write_bytes(0x9318F8, Block_code) + Block_code = [0x08, 0x41, 0x6E, 0x20, 0x6F, 0x6C, 0x64, 0x20, 0x77, 0x69, 0x74, 0x63, + 0x68, 0x20, 0x72, 0x75, 0x6E, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x50, + 0x6F, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x53, 0x68, 0x6F, 0x70, 0x01, 0x62, + 0x65, 0x68, 0x69, 0x6E, 0x64, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x6F, + 0x6E, 0x65, 0x2E, 0x20, 0x59, 0x6F, 0x75, 0x20, 0x63, 0x61, 0x6E, 0x20, + 0x67, 0x65, 0x74, 0x20, 0x74, 0x6F, 0x01] + rom.write_bytes(0x954DA0, Block_code) + Block_code = [0x08, 0x45, 0x76, 0x65, 0x72, 0x79, 0x62, 0x6F, 0x64, 0x79, 0x20, 0x68, + 0x61, 0x73, 0x20, 0x63, 0x6F, 0x6D, 0x65, 0x20, 0x62, 0x61, 0x63, 0x6B, + 0x21, 0x01, 0x49, 0x74, 0x27, 0x73, 0x20, 0x62, 0x75, 0x73, 0x69, 0x6E, + 0x65, 0x73, 0x73, 0x20, 0x61, 0x73, 0x20, 0x75, 0x73, 0x75, 0x61, 0x6C, + 0x21, 0x0B, 0x02] + rom.write_bytes(0x94B57C, Block_code) + rom.write_bytes(0x94B3AC, [0x08, 0x4F, 0x68, 0x20, 0x6E, 0x6F, 0x21, 0x20]) + Block_code = [0x08, 0x08, 0x08, 0x08, 0x08, 0x44, 0x6F] + rom.write_bytes(0x94E5BC, Block_code) + rom.write_bytes(0x92CB2C, Block_code) + Block_code = [0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08] + rom.write_bytes(0x94E639, Block_code) + rom.write_bytes(0x92CBA9, Block_code) # Make item descriptions into a single box - Short_item_descriptions = [0x92EC84, 0x92F9E3, 0x92F2B4, 0x92F37A] + Short_item_descriptions = [0x92EC84, 0x92F9E3, 0x92F2B4, 0x92F37A, 0x92F513, 0x92F5C6, 0x92E93B, 0x92EA12] for address in Short_item_descriptions: rom.write_byte(address,0x02) From 5acd9614249cc75f5b419f25862df905989b78c5 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Sat, 2 Jun 2018 00:55:01 -0500 Subject: [PATCH 076/151] Remove first Spirit Temple boss cutscene --- Rom.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 562ff4ecf..d49c1006b 100644 --- a/Rom.py +++ b/Rom.py @@ -783,6 +783,9 @@ def patch_rom(world, rom): Block_code = [0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08] rom.write_bytes(0x94E639, Block_code) rom.write_bytes(0x92CBA9, Block_code) + + # Speed dig text for Dampe + rom.write_bytes(0x9532F8, [0x08, 0x08, 0x08, 0x59]) # Make item descriptions into a single box Short_item_descriptions = [0x92EC84, 0x92F9E3, 0x92F2B4, 0x92F37A, 0x92F513, 0x92F5C6, 0x92E93B, 0x92EA12] @@ -927,7 +930,7 @@ def patch_rom(world, rom): 0xA2, 0x39, 0x09, 0xB6, 0xA2, 0x28, 0x0A, 0x24, 0xA2, 0x38, 0x0A, 0xCE, 0xA2, 0x28, 0x0A, 0xCF, 0xA2, 0x28, 0x0A, 0xE8, 0x24, 0x05, 0x00, 0x20, 0xA2, 0x25, 0x0B, 0x3F, 0xA2, 0x28, 0x0E, 0xDC, 0xA2, 0x25, 0x0E, 0xDD, - 0xA2, 0x25, 0x0E, 0xED, 0xA2, 0x38, 0x0E, 0xF9, 0x00, 0x00, 0x00, 0x00, + 0xA2, 0x25, 0x0E, 0xED, 0xA2, 0x38, 0x0E, 0xF9, 0xA2, 0x39, 0x0E, 0xDA, 0xA2, 0x28, 0x0E, 0xE0, 0xA2, 0x38, 0x02, 0x0E, 0xA2, 0x39, 0x01, 0x49, 0xA2, 0x39, 0x0E, 0xD6, 0x24, 0x05, 0x01, 0xFF, 0x24, 0x0F, 0x01, 0xFB, 0x24, 0x18, 0x07, 0xFF, 0x24, 0x19, 0x00, 0x04, 0x24, 0x08, 0x00, 0x30, @@ -942,7 +945,8 @@ def patch_rom(world, rom): 0x24, 0x18, 0x00, 0x03, 0x24, 0x0F, 0x00, 0x04, 0x24, 0x05, 0x00, 0x06, 0xA6, 0x28, 0x01, 0x10, 0xA2, 0x39, 0x01, 0x2C, 0xA2, 0x38, 0x01, 0x2E, 0xA2, 0x2F, 0x0F, 0x0A, 0xA2, 0x25, 0x0F, 0x21, 0x24, 0x05, 0x00, 0x00, - 0xA2, 0x25, 0x00, 0xA7, 0x03, 0xE0, 0x00, 0x08] + 0xA2, 0x25, 0x00, 0xA7, 0x24, 0x0F, 0x00, 0x21, 0xA2, 0x2F, 0x0E, 0xED, + 0x03, 0xE0, 0x00, 0x08] rom.write_bytes(0x3480600, Block_code) # Set up for Rainbow Bridge dungeons condition From 99c4faf6e6cf44bb9328b366e753011b9692f233 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Sat, 2 Jun 2018 01:21:32 -0500 Subject: [PATCH 077/151] correct health sfx none --- Rom.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index d49c1006b..21a3d4e8b 100644 --- a/Rom.py +++ b/Rom.py @@ -1165,7 +1165,8 @@ def patch_rom(world, rom): #Low health beep healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recorvery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'] randomSFX = random.choice(healthSFXList) - + address = 0xADBA1A + if world.healthSFX == 'Random': thisHealthSFX = randomSFX else: @@ -1191,8 +1192,9 @@ def patch_rom(world, rom): elif thisHealthSFX == 'Mweep!': healthSFX = [0x68, 0x7A] elif thisHealthSFX == 'None': - healthSFX = [0x08, 0xE0] - rom.write_bytes(0xADBA1A, healthSFX) + healthSFX = [0x00, 0x00, 0x00, 0x00] + address = 0xADBA14 + rom.write_bytes(address, healthSFX) return rom From 4197af256eb2eeca4360b5659f72ba714d9260e2 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sat, 2 Jun 2018 04:03:27 -0400 Subject: [PATCH 078/151] Add progressive magic meter item --- ASM/src/item_data.asm | 4 +++- ASM/src/items.asm | 38 ++++++++++++++++++++++++++++++++++++++ data/base2current.json | 2 +- 3 files changed, 42 insertions(+), 2 deletions(-) diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index b42429a40..98a5219cf 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -118,4 +118,6 @@ Item_Row 0x53, 0x90, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, -1, -1 ; 0x Item_Row 0x53, 0x8C, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, -1, -1 ; 0xBD = Deku Nuts (5) Item_Row 0x53, 0x8D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, -1, -1 ; 0xBE = Deku Nuts (10) -Item_Row 0x4F, 0xFF, 0x13, 0xE9, 0x00BD, no_upgrade, give_defense, -1, -1 ; 0xBF = Double Defense +Item_Row 0x4F, 0xFF, 0x13, 0xE9, 0x00BD, no_upgrade, give_defense, -1, -1 ; 0xBF = Double Defense +Item_Row 0x4F, 0xFF, 0xE2, 0xE4, 0x00CD, magic_upgrade, give_magic, -1, -1 ; 0xC0 = Progressive Magic Meter +Item_Row 0x4F, 0xFF, 0xE1, 0xE8, 0x00CD, no_upgrade, double_magic, -1, -1 ; 0xC1 = Double Magic diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 2c935c4df..9c62306f5 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -563,6 +563,20 @@ stick_upgrade: ;================================================================================================== +magic_upgrade: + lbu t0, 0x32 (a0) ; Load magic level from inventory + + beqz t0, @@return + li v0, 0xC0 ; Single Magic + + li v0, 0xC1 ; Double Magic + +@@return: + jr ra + nop + +;================================================================================================== + arrows_to_rupee: lbu t0, 0xA3 (a0) ; Load quiver from inventory andi t0, t0, 0x03 ; Mask bits to isolate quiver @@ -676,3 +690,27 @@ give_defense: sb t0, 0xCF (a0) ; Set number of hearts to display as double defense jr ra nop + +give_magic: + ; a0 = save context + li t0, 1 + sb t0, 0x32 (a0) ; Set meter level + sb t0, 0x3A (a0) ; Required for meter to persist on save load + li t0, 0x30 + sh t0, 0x13F4 (a0) ; Set meter size + sb t0, 0x33 (a0) ; Fill meter + jr ra + nop + +double_magic: + ; a0 = save context + li t0, 2 + sb t0, 0x32 (a0) ; Set meter level + li t0, 1 + sb t0, 0x3A (a0) ; Required for meter to persist on save load + sb t0, 0x3C (a0) ; Required for meter to persist on save load + li t0, 0x60 + sh t0, 0x13F4 (a0) ; Set meter size + sb t0, 0x33 (a0) ; Fill meter + jr ra + nop diff --git a/data/base2current.json b/data/base2current.json index ffeeaca95..5d06a9bc1 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 143]}, {"11325064": [12, 16, 9, 135, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 10, 226]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 205, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 212, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 219, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 198, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 53]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 5]}, {"12427480": [12, 16, 9, 34]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 38]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 167, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 65]}, {"12491480": [12, 16, 9, 74]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 101]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 132, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 160, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 92, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 120, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 41, 232, 128, 64, 41, 148, 83, 255, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42]}, {"55058608": [128, 64, 40, 124, 83, 255, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42]}, {"55058624": [128, 64, 40, 124, 83, 255, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42]}, {"55058640": [128, 64, 40, 124, 83, 255, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42]}, {"55058656": [128, 64, 40, 124, 83, 255, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42]}, {"55058672": [128, 64, 40, 124, 83, 255, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42]}, {"55058688": [128, 64, 40, 124, 83, 255, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42]}, {"55058704": [128, 64, 40, 124, 83, 255, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42]}, {"55058720": [128, 64, 40, 124, 83, 255, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42]}, {"55058736": [128, 64, 40, 124, 83, 255, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 60, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 255, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 88, 128, 64, 40, 124, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 41, 240, 128, 64, 40, 124, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 41, 232, 128, 64, 41, 176, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 41, 232, 128, 64, 41, 204, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 41, 232, 128, 64, 40, 124, 79, 255, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 128, 128, 64, 40, 124, 48, 132]}, {"55059479": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059491": [140, 16, 129]}, {"55059495": [22, 145, 2]}, {"55059499": [117, 52, 1]}, {"55059503": [141, 16, 129]}, {"55059507": [19, 145, 2]}, {"55059511": [117, 16, 128]}, {"55059515": [17, 145, 2]}, {"55059519": [116, 52, 1]}, {"55059523": [138, 16, 129]}, {"55059527": [14, 145, 2]}, {"55059531": [116, 52, 1]}, {"55059535": [139, 16, 129]}, {"55059539": [11, 145, 2]}, {"55059543": [116, 52, 1]}, {"55059547": [88, 16, 129]}, {"55059551": [8, 52, 2]}, {"55059556": [52, 1]}, {"55059559": [120, 16, 129]}, {"55059563": [5, 52, 2]}, {"55059568": [52, 1]}, {"55059571": [121, 16, 129]}, {"55059575": [2, 52, 2]}, {"55059580": [52, 2]}, {"55059583": [255, 3, 224]}, {"55059587": [8]}, {"55059592": [143, 166]}, {"55059595": [48, 132, 197]}, {"55059599": [4, 8, 16, 9, 42]}, {"55059608": [143, 185]}, {"55059611": [44, 135, 37]}, {"55059615": [4, 8, 16, 9, 42]}, {"55059624": [60, 10, 128, 64, 37, 74, 32]}, {"55059632": [141, 75]}, {"55059635": [12, 17, 96]}, {"55059639": [2]}, {"55059644": [149, 69]}, {"55059647": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059660": [3, 224]}, {"55059663": [8]}, {"55059668": [60, 8, 128, 64, 37, 8, 32]}, {"55059676": [141, 9]}, {"55059679": [12, 17, 32]}, {"55059683": [2]}, {"55059688": [129, 3]}, {"55059691": [2]}, {"55059693": [3, 15, 195]}, {"55059697": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 69]}, {"55059719": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059728": [141, 9]}, {"55059731": [12, 17, 32]}, {"55059735": [2]}, {"55059740": [145, 5]}, {"55059743": [3, 3, 224]}, {"55059747": [8]}, {"55059752": [143, 162]}, {"55059755": [36, 144, 69]}, {"55059760": [60, 8, 128, 64, 37, 8, 32]}, {"55059768": [141, 9]}, {"55059771": [12, 17, 32]}, {"55059775": [19]}, {"55059780": [145, 5]}, {"55059783": [1, 175, 164]}, {"55059788": [175, 165]}, {"55059791": [4, 175, 166]}, {"55059795": [8, 39, 189, 255, 232, 175, 191]}, {"55059803": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059815": [6, 145, 6]}, {"55059819": [7, 141, 9]}, {"55059823": [8, 1, 32, 248, 9]}, {"55059832": [143, 191]}, {"55059835": [16, 39, 189]}, {"55059839": [24, 143, 164]}, {"55059844": [143, 165]}, {"55059847": [4, 143, 166]}, {"55059851": [8, 3, 224]}, {"55059855": [8]}, {"55059860": [140, 136, 29, 44, 52, 9]}, {"55059867": [1]}, {"55059869": [9, 78]}, {"55059872": [1, 9, 16, 36, 16, 64]}, {"55059879": [27]}, {"55059884": [148, 138]}, {"55059887": [164, 52, 1]}, {"55059891": [61, 21, 65]}, {"55059895": [23]}, {"55059900": [148, 202, 2, 220, 52, 11]}, {"55059907": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059931": [14]}, {"55059936": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059964": [1, 10, 64, 33, 129, 8]}, {"55059972": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55059984": [52, 2]}, {"55059988": [3, 224]}, {"55059991": [8]}, {"55059996": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060008": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060039": [16, 175, 163]}, {"55060043": [20, 175, 191]}, {"55060047": [24, 12, 16, 9, 156]}, {"55060056": [143, 162]}, {"55060059": [16, 143, 163]}, {"55060063": [20, 143, 191]}, {"55060067": [24, 39, 189]}, {"55060071": [32, 3, 224]}, {"55060075": [8]}, {"55060080": [39, 189, 255, 232, 175, 191]}, {"55060087": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060096": [173]}, {"55060100": [173]}, {"55060103": [4, 173]}, {"55060107": [8, 173]}, {"55060111": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060127": [32]}, {"55060133": [9, 15, 195, 1, 33, 32, 38]}, {"55060141": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 204]}, {"55060156": [4, 64]}, {"55060159": [24]}, {"55060164": [52, 68]}, {"55060168": [12, 16, 9, 254]}, {"55060176": [16, 96]}, {"55060179": [12]}, {"55060184": [60, 8, 128, 64, 37, 8, 32]}, {"55060192": [140, 105]}, {"55060196": [173, 9]}, {"55060200": [140, 105]}, {"55060203": [4, 173, 9]}, {"55060207": [4, 140, 105]}, {"55060211": [8, 173, 9]}, {"55060215": [8, 52, 9]}, {"55060219": [1, 173, 9]}, {"55060223": [12, 144, 98]}, {"55060228": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060243": [2]}, {"55060249": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060259": [16, 39, 189]}, {"55060263": [24, 3, 224]}, {"55060267": [8]}, {"55060272": [39, 189, 255, 232, 175, 191]}, {"55060279": [16, 12, 16, 9, 215]}, {"55060288": [52, 68]}, {"55060292": [12, 16, 9, 241]}, {"55060300": [143, 191]}, {"55060303": [16, 39, 189]}, {"55060307": [24, 3, 224]}, {"55060311": [8]}, {"55060316": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060327": [164, 52, 8]}, {"55060332": [52, 137]}, {"55060336": [148, 170]}, {"55060340": [52, 1]}, {"55060343": [10, 21, 65]}, {"55060347": [7]}, {"55060352": [52, 1]}, {"55060355": [16, 16, 65]}, {"55060359": [4]}, {"55060364": [52, 8]}, {"55060367": [1, 148, 169]}, {"55060371": [28, 49, 41]}, {"55060375": [31, 52, 1]}, {"55060379": [21, 21, 65]}, {"55060383": [3]}, {"55060388": [52, 8]}, {"55060391": [2, 144, 169, 1, 65]}, {"55060397": [2, 18]}, {"55060401": [72, 16, 37]}, {"55060405": [2, 18]}, {"55060409": [73, 16, 37, 3, 224]}, {"55060415": [8]}, {"55060420": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060435": [4, 141, 9]}, {"55060440": [17, 32]}, {"55060443": [5]}, {"55060449": [9, 82, 2, 21, 68, 255, 250]}, {"55060460": [49, 34]}, {"55060463": [255, 3, 224]}, {"55060467": [8]}, {"55060472": [39, 189, 255, 224, 175, 176]}, {"55060479": [16, 175, 177]}, {"55060483": [20, 175, 191]}, {"55060487": [24, 52, 130]}, {"55060492": [52, 80]}, {"55060496": [38, 8, 255, 128, 5]}, {"55060503": [18]}, {"55060508": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060519": [16, 1, 9]}, {"55060523": [24]}, {"55060526": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060544": [142, 40]}, {"55060547": [12, 1]}, {"55060550": [248, 9]}, {"55060556": [20, 80, 255, 239]}, {"55060564": [54, 35]}, {"55060568": [16]}, {"55060571": [2]}, {"55060576": [52, 3]}, {"55060580": [143, 176]}, {"55060583": [16, 143, 177]}, {"55060587": [20, 143, 191]}, {"55060591": [24, 39, 189]}, {"55060595": [32, 3, 224]}, {"55060599": [8]}, {"55060604": [3, 224]}, {"55060607": [8, 52, 162]}, {"55060612": [144, 136]}, {"55060615": [125, 52, 1]}, {"55060619": [255, 17, 1]}, {"55060623": [2, 52, 2]}, {"55060627": [8, 52, 2]}, {"55060631": [9, 3, 224]}, {"55060635": [8]}, {"55060640": [144, 136]}, {"55060643": [163, 49, 8]}, {"55060647": [192, 17]}, {"55060651": [5, 52, 2]}, {"55060655": [84, 52, 1]}, {"55060659": [64, 17, 1]}, {"55060663": [2, 52, 2]}, {"55060667": [53, 52, 2]}, {"55060671": [54, 3, 224]}, {"55060675": [8]}, {"55060680": [144, 136]}, {"55060683": [163, 49, 8]}, {"55060687": [24, 17]}, {"55060691": [5, 52, 2]}, {"55060695": [50, 52, 1]}, {"55060699": [8, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [51, 52, 2]}, {"55060711": [52, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [3, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [4, 52, 1]}, {"55060739": [1, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [48, 52, 2]}, {"55060751": [49, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [162, 49, 8]}, {"55060767": [192, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [5, 52, 1]}, {"55060779": [64, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [96, 52, 2]}, {"55060791": [123, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [162, 49, 8]}, {"55060807": [48, 17]}, {"55060811": [2, 52, 2]}, {"55060815": [69, 52, 2]}, {"55060819": [70, 3, 224]}, {"55060823": [8]}, {"55060828": [144, 136]}, {"55060831": [162, 49, 8]}, {"55060835": [6, 17]}, {"55060839": [2, 52, 2]}, {"55060843": [55, 52, 2]}, {"55060847": [56, 3, 224]}, {"55060851": [8]}, {"55060856": [144, 136]}, {"55060859": [161, 49, 8]}, {"55060863": [32, 17]}, {"55060867": [2, 52, 2]}, {"55060871": [121, 52, 2]}, {"55060875": [122, 3, 224]}, {"55060879": [8]}, {"55060884": [144, 136]}, {"55060887": [161, 49, 8]}, {"55060891": [4, 17]}, {"55060895": [2, 52, 2]}, {"55060899": [119, 52, 2]}, {"55060903": [120, 3, 224]}, {"55060907": [8]}, {"55060912": [144, 136]}, {"55060915": [163, 49, 8]}, {"55060919": [3, 17]}, {"55060923": [2, 52, 2]}, {"55060927": [77, 52, 162]}, {"55060932": [3, 224]}, {"55060935": [8]}, {"55060940": [144, 136]}, {"55060943": [163, 49, 8]}, {"55060947": [24, 17]}, {"55060951": [2, 52, 2]}, {"55060955": [77, 52, 162]}, {"55060960": [3, 224]}, {"55060963": [8]}, {"55060968": [3, 224]}, {"55060971": [8]}, {"55060976": [52, 8]}, {"55060979": [1, 160, 136]}, {"55060983": [62, 3, 224]}, {"55060987": [8]}, {"55060992": [36, 136]}, {"55060995": [134, 36, 9, 255, 255, 37, 41]}, {"55061003": [1, 52, 1]}, {"55061007": [3]}, {"55061009": [41, 8, 42, 20, 32]}, {"55061015": [7]}, {"55061020": [1, 9, 80, 33, 145, 75]}, {"55061028": [52, 1]}, {"55061031": [255, 21, 97, 255, 247]}, {"55061040": [161, 69]}, {"55061044": [3, 224]}, {"55061047": [8]}, {"55061052": [36, 136]}, {"55061055": [168, 1, 6, 64, 33, 145, 9]}, {"55061064": [1, 37, 72, 37, 161, 9]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [36, 136]}, {"55061083": [188, 1, 5, 64, 33, 129, 9]}, {"55061092": [5, 33]}, {"55061095": [2]}, {"55061100": [52, 9]}, {"55061104": [37, 41]}, {"55061107": [1, 161, 9]}, {"55061112": [3, 224]}, {"55061115": [8]}, {"55061120": [52, 8]}, {"55061123": [1, 160, 136]}, {"55061127": [61, 148, 136]}, {"55061131": [46]}, {"55061133": [8, 65, 2, 160, 136]}, {"55061139": [207, 3, 224]}, {"55061143": [8]}, {"55061148": [175, 164]}, {"55061151": [104, 175, 165]}, {"55061155": [108, 175, 166]}, {"55061159": [112, 175, 167]}, {"55061163": [116, 39, 189, 255, 232, 175, 163]}, {"55061171": [16, 175, 191]}, {"55061175": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061188": [17]}, {"55061191": [10]}, {"55061196": [60, 9, 128, 65, 52, 10]}, {"55061203": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 156]}, {"55061232": [143, 163]}, {"55061235": [16, 143, 191]}, {"55061239": [20, 39, 189]}, {"55061243": [24, 143, 164]}, {"55061247": [104, 143, 165]}, {"55061251": [108, 143, 166]}, {"55061255": [112, 143, 167]}, {"55061259": [116, 132, 110, 19, 196, 3, 224]}, {"55061267": [8]}, {"55061272": [147, 25]}, {"55061275": [116, 52, 1]}, {"55061279": [255, 23, 33]}, {"55061283": [2]}, {"55061288": [52, 25]}, {"55061291": [44, 3, 224]}, {"55061295": [8, 167, 185]}, {"55061299": [154, 147, 44]}, {"55061303": [116, 52, 1]}, {"55061307": [255, 21, 129]}, {"55061311": [2]}, {"55061316": [52, 12]}, {"55061319": [44, 3, 224]}, {"55061323": [8]}, {"55061328": [145, 174]}, {"55061331": [116, 52, 1]}, {"55061335": [255, 21, 193]}, {"55061339": [2]}, {"55061344": [52, 14]}, {"55061347": [44, 3, 224]}, {"55061351": [8, 167, 174]}, {"55061355": [154, 145, 207]}, {"55061359": [116, 52, 1]}, {"55061363": [255, 21, 225]}, {"55061367": [2]}, {"55061372": [52, 15]}, {"55061375": [44, 3, 224]}, {"55061379": [8, 167, 175]}, {"55061383": [154, 141, 9]}, {"55061387": [4, 17, 32]}, {"55061391": [7]}, {"55061396": [145, 9]}, {"55061399": [104, 52, 1]}, {"55061403": [59, 17, 33]}, {"55061407": [2]}, {"55061412": [52, 9]}, {"55061415": [255, 161, 9]}, {"55061419": [64, 3, 224]}, {"55061423": [8, 161, 14]}, {"55061427": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 2]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 237, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 244, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 251, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 230, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 199, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 40, 164, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 40, 192, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 40, 232, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 16, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 56, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 96, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 124, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 152, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 180, 83, 255, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 40, 128, 64, 40, 156, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 32, 128, 64, 40, 156, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 32, 128, 64, 41, 232, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 32, 128, 64, 41, 232, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 32, 128, 64, 41, 232, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 32, 128, 64, 42, 4, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 32, 128, 64, 42, 4, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 32, 128, 64, 42, 4, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 32, 128, 64, 40, 156, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 32, 128, 64, 40, 156, 79, 255, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 184, 128, 64, 40, 156, 79, 255, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 42, 212, 128, 64, 41, 208, 79, 255, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 42, 244, 128, 64, 40, 156, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 6]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 223]}, {"55060320": [52, 68]}, {"55060324": [12, 16, 9, 249]}, {"55060332": [143, 191]}, {"55060335": [16, 39, 189]}, {"55060339": [24, 3, 224]}, {"55060343": [8]}, {"55060348": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060359": [164, 52, 8]}, {"55060364": [52, 137]}, {"55060368": [148, 170]}, {"55060372": [52, 1]}, {"55060375": [10, 21, 65]}, {"55060379": [7]}, {"55060384": [52, 1]}, {"55060387": [16, 16, 65]}, {"55060391": [4]}, {"55060396": [52, 8]}, {"55060399": [1, 148, 169]}, {"55060403": [28, 49, 41]}, {"55060407": [31, 52, 1]}, {"55060411": [21, 21, 65]}, {"55060415": [3]}, {"55060420": [52, 8]}, {"55060423": [2, 144, 169, 1, 65]}, {"55060429": [2, 18]}, {"55060433": [72, 16, 37]}, {"55060437": [2, 18]}, {"55060441": [73, 16, 37, 3, 224]}, {"55060447": [8]}, {"55060452": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060467": [4, 141, 9]}, {"55060472": [17, 32]}, {"55060475": [5]}, {"55060481": [9, 82, 2, 21, 68, 255, 250]}, {"55060492": [49, 34]}, {"55060495": [255, 3, 224]}, {"55060499": [8]}, {"55060504": [39, 189, 255, 224, 175, 176]}, {"55060511": [16, 175, 177]}, {"55060515": [20, 175, 191]}, {"55060519": [24, 52, 130]}, {"55060524": [52, 80]}, {"55060528": [38, 8, 255, 128, 5]}, {"55060535": [18]}, {"55060540": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060551": [16, 1, 9]}, {"55060555": [24]}, {"55060558": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060576": [142, 40]}, {"55060579": [12, 1]}, {"55060582": [248, 9]}, {"55060588": [20, 80, 255, 239]}, {"55060596": [54, 35]}, {"55060600": [16]}, {"55060603": [2]}, {"55060608": [52, 3]}, {"55060612": [143, 176]}, {"55060615": [16, 143, 177]}, {"55060619": [20, 143, 191]}, {"55060623": [24, 39, 189]}, {"55060627": [32, 3, 224]}, {"55060631": [8]}, {"55060636": [3, 224]}, {"55060639": [8, 52, 162]}, {"55060644": [144, 136]}, {"55060647": [125, 52, 1]}, {"55060651": [255, 17, 1]}, {"55060655": [2, 52, 2]}, {"55060659": [8, 52, 2]}, {"55060663": [9, 3, 224]}, {"55060667": [8]}, {"55060672": [144, 136]}, {"55060675": [163, 49, 8]}, {"55060679": [192, 17]}, {"55060683": [5, 52, 2]}, {"55060687": [84, 52, 1]}, {"55060691": [64, 17, 1]}, {"55060695": [2, 52, 2]}, {"55060699": [53, 52, 2]}, {"55060703": [54, 3, 224]}, {"55060707": [8]}, {"55060712": [144, 136]}, {"55060715": [163, 49, 8]}, {"55060719": [24, 17]}, {"55060723": [5, 52, 2]}, {"55060727": [50, 52, 1]}, {"55060731": [8, 17, 1]}, {"55060735": [2, 52, 2]}, {"55060739": [51, 52, 2]}, {"55060743": [52, 3, 224]}, {"55060747": [8]}, {"55060752": [144, 136]}, {"55060755": [163, 49, 8]}, {"55060759": [3, 17]}, {"55060763": [5, 52, 2]}, {"55060767": [4, 52, 1]}, {"55060771": [1, 17, 1]}, {"55060775": [2, 52, 2]}, {"55060779": [48, 52, 2]}, {"55060783": [49, 3, 224]}, {"55060787": [8]}, {"55060792": [144, 136]}, {"55060795": [162, 49, 8]}, {"55060799": [192, 17]}, {"55060803": [5, 52, 2]}, {"55060807": [5, 52, 1]}, {"55060811": [64, 17, 1]}, {"55060815": [2, 52, 2]}, {"55060819": [96, 52, 2]}, {"55060823": [123, 3, 224]}, {"55060827": [8]}, {"55060832": [144, 136]}, {"55060835": [162, 49, 8]}, {"55060839": [48, 17]}, {"55060843": [2, 52, 2]}, {"55060847": [69, 52, 2]}, {"55060851": [70, 3, 224]}, {"55060855": [8]}, {"55060860": [144, 136]}, {"55060863": [162, 49, 8]}, {"55060867": [6, 17]}, {"55060871": [2, 52, 2]}, {"55060875": [55, 52, 2]}, {"55060879": [56, 3, 224]}, {"55060883": [8]}, {"55060888": [144, 136]}, {"55060891": [161, 49, 8]}, {"55060895": [32, 17]}, {"55060899": [2, 52, 2]}, {"55060903": [121, 52, 2]}, {"55060907": [122, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [161, 49, 8]}, {"55060923": [4, 17]}, {"55060927": [2, 52, 2]}, {"55060931": [119, 52, 2]}, {"55060935": [120, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [50, 17]}, {"55060951": [2, 52, 2]}, {"55060955": [192, 52, 2]}, {"55060959": [193, 3, 224]}, {"55060963": [8]}, {"55060968": [144, 136]}, {"55060971": [163, 49, 8]}, {"55060975": [3, 17]}, {"55060979": [2, 52, 2]}, {"55060983": [77, 52, 162]}, {"55060988": [3, 224]}, {"55060991": [8]}, {"55060996": [144, 136]}, {"55060999": [163, 49, 8]}, {"55061003": [24, 17]}, {"55061007": [2, 52, 2]}, {"55061011": [77, 52, 162]}, {"55061016": [3, 224]}, {"55061019": [8]}, {"55061024": [3, 224]}, {"55061027": [8]}, {"55061032": [52, 8]}, {"55061035": [1, 160, 136]}, {"55061039": [62, 3, 224]}, {"55061043": [8]}, {"55061048": [36, 136]}, {"55061051": [134, 36, 9, 255, 255, 37, 41]}, {"55061059": [1, 52, 1]}, {"55061063": [3]}, {"55061065": [41, 8, 42, 20, 32]}, {"55061071": [7]}, {"55061076": [1, 9, 80, 33, 145, 75]}, {"55061084": [52, 1]}, {"55061087": [255, 21, 97, 255, 247]}, {"55061096": [161, 69]}, {"55061100": [3, 224]}, {"55061103": [8]}, {"55061108": [36, 136]}, {"55061111": [168, 1, 6, 64, 33, 145, 9]}, {"55061120": [1, 37, 72, 37, 161, 9]}, {"55061128": [3, 224]}, {"55061131": [8]}, {"55061136": [36, 136]}, {"55061139": [188, 1, 5, 64, 33, 129, 9]}, {"55061148": [5, 33]}, {"55061151": [2]}, {"55061156": [52, 9]}, {"55061160": [37, 41]}, {"55061163": [1, 161, 9]}, {"55061168": [3, 224]}, {"55061171": [8]}, {"55061176": [52, 8]}, {"55061179": [1, 160, 136]}, {"55061183": [61, 148, 136]}, {"55061187": [46]}, {"55061189": [8, 65, 2, 160, 136]}, {"55061195": [207, 3, 224]}, {"55061199": [8]}, {"55061204": [52, 8]}, {"55061207": [1, 160, 136]}, {"55061211": [50, 160, 136]}, {"55061215": [58, 52, 8]}, {"55061219": [48, 164, 136, 19, 244, 160, 136]}, {"55061227": [51, 3, 224]}, {"55061231": [8]}, {"55061236": [52, 8]}, {"55061239": [2, 160, 136]}, {"55061243": [50, 52, 8]}, {"55061247": [1, 160, 136]}, {"55061251": [58, 160, 136]}, {"55061255": [60, 52, 8]}, {"55061259": [96, 164, 136, 19, 244, 160, 136]}, {"55061267": [51, 3, 224]}, {"55061271": [8]}, {"55061276": [175, 164]}, {"55061279": [104, 175, 165]}, {"55061283": [108, 175, 166]}, {"55061287": [112, 175, 167]}, {"55061291": [116, 39, 189, 255, 232, 175, 163]}, {"55061299": [16, 175, 191]}, {"55061303": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061316": [17]}, {"55061319": [10]}, {"55061324": [60, 9, 128, 65, 52, 10]}, {"55061331": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061360": [143, 163]}, {"55061363": [16, 143, 191]}, {"55061367": [20, 39, 189]}, {"55061371": [24, 143, 164]}, {"55061375": [104, 143, 165]}, {"55061379": [108, 143, 166]}, {"55061383": [112, 143, 167]}, {"55061387": [116, 132, 110, 19, 196, 3, 224]}, {"55061395": [8]}, {"55061400": [147, 25]}, {"55061403": [116, 52, 1]}, {"55061407": [255, 23, 33]}, {"55061411": [2]}, {"55061416": [52, 25]}, {"55061419": [44, 3, 224]}, {"55061423": [8, 167, 185]}, {"55061427": [154, 147, 44]}, {"55061431": [116, 52, 1]}, {"55061435": [255, 21, 129]}, {"55061439": [2]}, {"55061444": [52, 12]}, {"55061447": [44, 3, 224]}, {"55061451": [8]}, {"55061456": [145, 174]}, {"55061459": [116, 52, 1]}, {"55061463": [255, 21, 193]}, {"55061467": [2]}, {"55061472": [52, 14]}, {"55061475": [44, 3, 224]}, {"55061479": [8, 167, 174]}, {"55061483": [154, 145, 207]}, {"55061487": [116, 52, 1]}, {"55061491": [255, 21, 225]}, {"55061495": [2]}, {"55061500": [52, 15]}, {"55061503": [44, 3, 224]}, {"55061507": [8, 167, 175]}, {"55061511": [154, 141, 9]}, {"55061515": [4, 17, 32]}, {"55061519": [7]}, {"55061524": [145, 9]}, {"55061527": [104, 52, 1]}, {"55061531": [59, 17, 33]}, {"55061535": [2]}, {"55061540": [52, 9]}, {"55061543": [255, 161, 9]}, {"55061547": [64, 3, 224]}, {"55061551": [8, 161, 14]}, {"55061555": [104]}] \ No newline at end of file From 14ce37b19f1f4e9c7d2d71844f815647428f41b3 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sat, 2 Jun 2018 05:00:04 -0400 Subject: [PATCH 079/151] Fix overrides on Dampe heart piece --- ASM/src/items.asm | 19 ++++++++++++++++--- data/base2current.json | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 9c62306f5..7fd982126 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -283,10 +283,14 @@ lookup_override: jal get_override_search_key nop + beq v0, -1, @@return + nop + ori a0, v0, 0 jal scan_override_table nop +@@return: lw ra, 0x10 (sp) addiu sp, sp, 0x18 jr ra @@ -315,11 +319,19 @@ get_override_search_key: andi t1, t1, 0x1F ; t1 = chest flag @@not_chest: - bne t2, 0x0015, @@not_collectible + bne t2, 0x0015, @@not_collectable + nop + beq a0, 0x3E, @@valid_collectable + nop + beq a0, 0x42, @@valid_collectable nop + li v0, -1 + b @@return + nop +@@valid_collectable: li t0, 0x02 - lbu t1, 0x0141 (a1) ; t1 = collectible flag -@@not_collectible: + lbu t1, 0x0141 (a1) ; t1 = collectable flag +@@not_collectable: ; Construct ID used to search the override table ; v0 = (scene << 16) | (override_type << 8) | override_id @@ -328,6 +340,7 @@ get_override_search_key: sll v0, v0, 8 or v0, v0, t1 +@@return: jr ra nop diff --git a/data/base2current.json b/data/base2current.json index 5d06a9bc1..07976b167 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 2]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 237, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 10, 244, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 10, 251, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 230, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 199, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 40, 164, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 40, 192, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 40, 232, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 16, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 56, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 96, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 124, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 152, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 32, 128, 64, 41, 180, 83, 255, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 56, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 116, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 255, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 144, 128, 64, 40, 156, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 40, 128, 64, 40, 156, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 32, 128, 64, 40, 156, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 32, 128, 64, 41, 232, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 32, 128, 64, 41, 232, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 32, 128, 64, 41, 232, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 32, 128, 64, 42, 4, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 32, 128, 64, 42, 4, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 32, 128, 64, 42, 4, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 32, 128, 64, 40, 156, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 32, 128, 64, 40, 156, 79, 255, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 184, 128, 64, 40, 156, 79, 255, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 42, 212, 128, 64, 41, 208, 79, 255, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 42, 244, 128, 64, 40, 156, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 6]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 223]}, {"55060320": [52, 68]}, {"55060324": [12, 16, 9, 249]}, {"55060332": [143, 191]}, {"55060335": [16, 39, 189]}, {"55060339": [24, 3, 224]}, {"55060343": [8]}, {"55060348": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060359": [164, 52, 8]}, {"55060364": [52, 137]}, {"55060368": [148, 170]}, {"55060372": [52, 1]}, {"55060375": [10, 21, 65]}, {"55060379": [7]}, {"55060384": [52, 1]}, {"55060387": [16, 16, 65]}, {"55060391": [4]}, {"55060396": [52, 8]}, {"55060399": [1, 148, 169]}, {"55060403": [28, 49, 41]}, {"55060407": [31, 52, 1]}, {"55060411": [21, 21, 65]}, {"55060415": [3]}, {"55060420": [52, 8]}, {"55060423": [2, 144, 169, 1, 65]}, {"55060429": [2, 18]}, {"55060433": [72, 16, 37]}, {"55060437": [2, 18]}, {"55060441": [73, 16, 37, 3, 224]}, {"55060447": [8]}, {"55060452": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060467": [4, 141, 9]}, {"55060472": [17, 32]}, {"55060475": [5]}, {"55060481": [9, 82, 2, 21, 68, 255, 250]}, {"55060492": [49, 34]}, {"55060495": [255, 3, 224]}, {"55060499": [8]}, {"55060504": [39, 189, 255, 224, 175, 176]}, {"55060511": [16, 175, 177]}, {"55060515": [20, 175, 191]}, {"55060519": [24, 52, 130]}, {"55060524": [52, 80]}, {"55060528": [38, 8, 255, 128, 5]}, {"55060535": [18]}, {"55060540": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060551": [16, 1, 9]}, {"55060555": [24]}, {"55060558": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060576": [142, 40]}, {"55060579": [12, 1]}, {"55060582": [248, 9]}, {"55060588": [20, 80, 255, 239]}, {"55060596": [54, 35]}, {"55060600": [16]}, {"55060603": [2]}, {"55060608": [52, 3]}, {"55060612": [143, 176]}, {"55060615": [16, 143, 177]}, {"55060619": [20, 143, 191]}, {"55060623": [24, 39, 189]}, {"55060627": [32, 3, 224]}, {"55060631": [8]}, {"55060636": [3, 224]}, {"55060639": [8, 52, 162]}, {"55060644": [144, 136]}, {"55060647": [125, 52, 1]}, {"55060651": [255, 17, 1]}, {"55060655": [2, 52, 2]}, {"55060659": [8, 52, 2]}, {"55060663": [9, 3, 224]}, {"55060667": [8]}, {"55060672": [144, 136]}, {"55060675": [163, 49, 8]}, {"55060679": [192, 17]}, {"55060683": [5, 52, 2]}, {"55060687": [84, 52, 1]}, {"55060691": [64, 17, 1]}, {"55060695": [2, 52, 2]}, {"55060699": [53, 52, 2]}, {"55060703": [54, 3, 224]}, {"55060707": [8]}, {"55060712": [144, 136]}, {"55060715": [163, 49, 8]}, {"55060719": [24, 17]}, {"55060723": [5, 52, 2]}, {"55060727": [50, 52, 1]}, {"55060731": [8, 17, 1]}, {"55060735": [2, 52, 2]}, {"55060739": [51, 52, 2]}, {"55060743": [52, 3, 224]}, {"55060747": [8]}, {"55060752": [144, 136]}, {"55060755": [163, 49, 8]}, {"55060759": [3, 17]}, {"55060763": [5, 52, 2]}, {"55060767": [4, 52, 1]}, {"55060771": [1, 17, 1]}, {"55060775": [2, 52, 2]}, {"55060779": [48, 52, 2]}, {"55060783": [49, 3, 224]}, {"55060787": [8]}, {"55060792": [144, 136]}, {"55060795": [162, 49, 8]}, {"55060799": [192, 17]}, {"55060803": [5, 52, 2]}, {"55060807": [5, 52, 1]}, {"55060811": [64, 17, 1]}, {"55060815": [2, 52, 2]}, {"55060819": [96, 52, 2]}, {"55060823": [123, 3, 224]}, {"55060827": [8]}, {"55060832": [144, 136]}, {"55060835": [162, 49, 8]}, {"55060839": [48, 17]}, {"55060843": [2, 52, 2]}, {"55060847": [69, 52, 2]}, {"55060851": [70, 3, 224]}, {"55060855": [8]}, {"55060860": [144, 136]}, {"55060863": [162, 49, 8]}, {"55060867": [6, 17]}, {"55060871": [2, 52, 2]}, {"55060875": [55, 52, 2]}, {"55060879": [56, 3, 224]}, {"55060883": [8]}, {"55060888": [144, 136]}, {"55060891": [161, 49, 8]}, {"55060895": [32, 17]}, {"55060899": [2, 52, 2]}, {"55060903": [121, 52, 2]}, {"55060907": [122, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [161, 49, 8]}, {"55060923": [4, 17]}, {"55060927": [2, 52, 2]}, {"55060931": [119, 52, 2]}, {"55060935": [120, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [50, 17]}, {"55060951": [2, 52, 2]}, {"55060955": [192, 52, 2]}, {"55060959": [193, 3, 224]}, {"55060963": [8]}, {"55060968": [144, 136]}, {"55060971": [163, 49, 8]}, {"55060975": [3, 17]}, {"55060979": [2, 52, 2]}, {"55060983": [77, 52, 162]}, {"55060988": [3, 224]}, {"55060991": [8]}, {"55060996": [144, 136]}, {"55060999": [163, 49, 8]}, {"55061003": [24, 17]}, {"55061007": [2, 52, 2]}, {"55061011": [77, 52, 162]}, {"55061016": [3, 224]}, {"55061019": [8]}, {"55061024": [3, 224]}, {"55061027": [8]}, {"55061032": [52, 8]}, {"55061035": [1, 160, 136]}, {"55061039": [62, 3, 224]}, {"55061043": [8]}, {"55061048": [36, 136]}, {"55061051": [134, 36, 9, 255, 255, 37, 41]}, {"55061059": [1, 52, 1]}, {"55061063": [3]}, {"55061065": [41, 8, 42, 20, 32]}, {"55061071": [7]}, {"55061076": [1, 9, 80, 33, 145, 75]}, {"55061084": [52, 1]}, {"55061087": [255, 21, 97, 255, 247]}, {"55061096": [161, 69]}, {"55061100": [3, 224]}, {"55061103": [8]}, {"55061108": [36, 136]}, {"55061111": [168, 1, 6, 64, 33, 145, 9]}, {"55061120": [1, 37, 72, 37, 161, 9]}, {"55061128": [3, 224]}, {"55061131": [8]}, {"55061136": [36, 136]}, {"55061139": [188, 1, 5, 64, 33, 129, 9]}, {"55061148": [5, 33]}, {"55061151": [2]}, {"55061156": [52, 9]}, {"55061160": [37, 41]}, {"55061163": [1, 161, 9]}, {"55061168": [3, 224]}, {"55061171": [8]}, {"55061176": [52, 8]}, {"55061179": [1, 160, 136]}, {"55061183": [61, 148, 136]}, {"55061187": [46]}, {"55061189": [8, 65, 2, 160, 136]}, {"55061195": [207, 3, 224]}, {"55061199": [8]}, {"55061204": [52, 8]}, {"55061207": [1, 160, 136]}, {"55061211": [50, 160, 136]}, {"55061215": [58, 52, 8]}, {"55061219": [48, 164, 136, 19, 244, 160, 136]}, {"55061227": [51, 3, 224]}, {"55061231": [8]}, {"55061236": [52, 8]}, {"55061239": [2, 160, 136]}, {"55061243": [50, 52, 8]}, {"55061247": [1, 160, 136]}, {"55061251": [58, 160, 136]}, {"55061255": [60, 52, 8]}, {"55061259": [96, 164, 136, 19, 244, 160, 136]}, {"55061267": [51, 3, 224]}, {"55061271": [8]}, {"55061276": [175, 164]}, {"55061279": [104, 175, 165]}, {"55061283": [108, 175, 166]}, {"55061287": [112, 175, 167]}, {"55061291": [116, 39, 189, 255, 232, 175, 163]}, {"55061299": [16, 175, 191]}, {"55061303": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061316": [17]}, {"55061319": [10]}, {"55061324": [60, 9, 128, 65, 52, 10]}, {"55061331": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061360": [143, 163]}, {"55061363": [16, 143, 191]}, {"55061367": [20, 39, 189]}, {"55061371": [24, 143, 164]}, {"55061375": [104, 143, 165]}, {"55061379": [108, 143, 166]}, {"55061383": [112, 143, 167]}, {"55061387": [116, 132, 110, 19, 196, 3, 224]}, {"55061395": [8]}, {"55061400": [147, 25]}, {"55061403": [116, 52, 1]}, {"55061407": [255, 23, 33]}, {"55061411": [2]}, {"55061416": [52, 25]}, {"55061419": [44, 3, 224]}, {"55061423": [8, 167, 185]}, {"55061427": [154, 147, 44]}, {"55061431": [116, 52, 1]}, {"55061435": [255, 21, 129]}, {"55061439": [2]}, {"55061444": [52, 12]}, {"55061447": [44, 3, 224]}, {"55061451": [8]}, {"55061456": [145, 174]}, {"55061459": [116, 52, 1]}, {"55061463": [255, 21, 193]}, {"55061467": [2]}, {"55061472": [52, 14]}, {"55061475": [44, 3, 224]}, {"55061479": [8, 167, 174]}, {"55061483": [154, 145, 207]}, {"55061487": [116, 52, 1]}, {"55061491": [255, 21, 225]}, {"55061495": [2]}, {"55061500": [52, 15]}, {"55061503": [44, 3, 224]}, {"55061507": [8, 167, 175]}, {"55061511": [154, 141, 9]}, {"55061515": [4, 17, 32]}, {"55061519": [7]}, {"55061524": [145, 9]}, {"55061527": [104, 52, 1]}, {"55061531": [59, 17, 33]}, {"55061535": [2]}, {"55061540": [52, 9]}, {"55061543": [255, 161, 9]}, {"55061547": [64, 3, 224]}, {"55061551": [8, 161, 14]}, {"55061555": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 14]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 249, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 0, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 7, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 242, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 211, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 212, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 228, 83, 255, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 88, 128, 64, 40, 204, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 79, 255, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 232, 128, 64, 40, 204, 79, 255, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 4, 128, 64, 42]}, {"55059492": [79, 255, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 36, 128, 64, 40, 204, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 18]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 226]}, {"55060320": [36, 1, 255, 255, 16, 65]}, {"55060327": [4]}, {"55060332": [52, 68]}, {"55060336": [12, 16, 10, 5]}, {"55060344": [143, 191]}, {"55060347": [16, 39, 189]}, {"55060351": [24, 3, 224]}, {"55060355": [8]}, {"55060360": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060371": [164, 52, 8]}, {"55060376": [52, 137]}, {"55060380": [148, 170]}, {"55060384": [52, 1]}, {"55060387": [10, 21, 65]}, {"55060391": [7]}, {"55060396": [52, 1]}, {"55060399": [16, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 8]}, {"55060411": [1, 148, 169]}, {"55060415": [28, 49, 41]}, {"55060419": [31, 52, 1]}, {"55060423": [21, 21, 65]}, {"55060427": [12]}, {"55060432": [52, 1]}, {"55060435": [62, 16, 129]}, {"55060439": [7]}, {"55060444": [52, 1]}, {"55060447": [66, 16, 129]}, {"55060451": [4]}, {"55060456": [36, 2, 255, 255, 16]}, {"55060463": [7]}, {"55060468": [52, 8]}, {"55060471": [2, 144, 169, 1, 65]}, {"55060477": [2, 18]}, {"55060481": [72, 16, 37]}, {"55060485": [2, 18]}, {"55060489": [73, 16, 37, 3, 224]}, {"55060495": [8]}, {"55060500": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060515": [4, 141, 9]}, {"55060520": [17, 32]}, {"55060523": [5]}, {"55060529": [9, 82, 2, 21, 68, 255, 250]}, {"55060540": [49, 34]}, {"55060543": [255, 3, 224]}, {"55060547": [8]}, {"55060552": [39, 189, 255, 224, 175, 176]}, {"55060559": [16, 175, 177]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 52, 130]}, {"55060572": [52, 80]}, {"55060576": [38, 8, 255, 128, 5]}, {"55060583": [18]}, {"55060588": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060599": [16, 1, 9]}, {"55060603": [24]}, {"55060606": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060624": [142, 40]}, {"55060627": [12, 1]}, {"55060630": [248, 9]}, {"55060636": [20, 80, 255, 239]}, {"55060644": [54, 35]}, {"55060648": [16]}, {"55060651": [2]}, {"55060656": [52, 3]}, {"55060660": [143, 176]}, {"55060663": [16, 143, 177]}, {"55060667": [20, 143, 191]}, {"55060671": [24, 39, 189]}, {"55060675": [32, 3, 224]}, {"55060679": [8]}, {"55060684": [3, 224]}, {"55060687": [8, 52, 162]}, {"55060692": [144, 136]}, {"55060695": [125, 52, 1]}, {"55060699": [255, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [8, 52, 2]}, {"55060711": [9, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [192, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [84, 52, 1]}, {"55060739": [64, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [53, 52, 2]}, {"55060751": [54, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [163, 49, 8]}, {"55060767": [24, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [50, 52, 1]}, {"55060779": [8, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [51, 52, 2]}, {"55060791": [52, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [163, 49, 8]}, {"55060807": [3, 17]}, {"55060811": [5, 52, 2]}, {"55060815": [4, 52, 1]}, {"55060819": [1, 17, 1]}, {"55060823": [2, 52, 2]}, {"55060827": [48, 52, 2]}, {"55060831": [49, 3, 224]}, {"55060835": [8]}, {"55060840": [144, 136]}, {"55060843": [162, 49, 8]}, {"55060847": [192, 17]}, {"55060851": [5, 52, 2]}, {"55060855": [5, 52, 1]}, {"55060859": [64, 17, 1]}, {"55060863": [2, 52, 2]}, {"55060867": [96, 52, 2]}, {"55060871": [123, 3, 224]}, {"55060875": [8]}, {"55060880": [144, 136]}, {"55060883": [162, 49, 8]}, {"55060887": [48, 17]}, {"55060891": [2, 52, 2]}, {"55060895": [69, 52, 2]}, {"55060899": [70, 3, 224]}, {"55060903": [8]}, {"55060908": [144, 136]}, {"55060911": [162, 49, 8]}, {"55060915": [6, 17]}, {"55060919": [2, 52, 2]}, {"55060923": [55, 52, 2]}, {"55060927": [56, 3, 224]}, {"55060931": [8]}, {"55060936": [144, 136]}, {"55060939": [161, 49, 8]}, {"55060943": [32, 17]}, {"55060947": [2, 52, 2]}, {"55060951": [121, 52, 2]}, {"55060955": [122, 3, 224]}, {"55060959": [8]}, {"55060964": [144, 136]}, {"55060967": [161, 49, 8]}, {"55060971": [4, 17]}, {"55060975": [2, 52, 2]}, {"55060979": [119, 52, 2]}, {"55060983": [120, 3, 224]}, {"55060987": [8]}, {"55060992": [144, 136]}, {"55060995": [50, 17]}, {"55060999": [2, 52, 2]}, {"55061003": [192, 52, 2]}, {"55061007": [193, 3, 224]}, {"55061011": [8]}, {"55061016": [144, 136]}, {"55061019": [163, 49, 8]}, {"55061023": [3, 17]}, {"55061027": [2, 52, 2]}, {"55061031": [77, 52, 162]}, {"55061036": [3, 224]}, {"55061039": [8]}, {"55061044": [144, 136]}, {"55061047": [163, 49, 8]}, {"55061051": [24, 17]}, {"55061055": [2, 52, 2]}, {"55061059": [77, 52, 162]}, {"55061064": [3, 224]}, {"55061067": [8]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [52, 8]}, {"55061083": [1, 160, 136]}, {"55061087": [62, 3, 224]}, {"55061091": [8]}, {"55061096": [36, 136]}, {"55061099": [134, 36, 9, 255, 255, 37, 41]}, {"55061107": [1, 52, 1]}, {"55061111": [3]}, {"55061113": [41, 8, 42, 20, 32]}, {"55061119": [7]}, {"55061124": [1, 9, 80, 33, 145, 75]}, {"55061132": [52, 1]}, {"55061135": [255, 21, 97, 255, 247]}, {"55061144": [161, 69]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [36, 136]}, {"55061159": [168, 1, 6, 64, 33, 145, 9]}, {"55061168": [1, 37, 72, 37, 161, 9]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [36, 136]}, {"55061187": [188, 1, 5, 64, 33, 129, 9]}, {"55061196": [5, 33]}, {"55061199": [2]}, {"55061204": [52, 9]}, {"55061208": [37, 41]}, {"55061211": [1, 161, 9]}, {"55061216": [3, 224]}, {"55061219": [8]}, {"55061224": [52, 8]}, {"55061227": [1, 160, 136]}, {"55061231": [61, 148, 136]}, {"55061235": [46]}, {"55061237": [8, 65, 2, 160, 136]}, {"55061243": [207, 3, 224]}, {"55061247": [8]}, {"55061252": [52, 8]}, {"55061255": [1, 160, 136]}, {"55061259": [50, 160, 136]}, {"55061263": [58, 52, 8]}, {"55061267": [48, 164, 136, 19, 244, 160, 136]}, {"55061275": [51, 3, 224]}, {"55061279": [8]}, {"55061284": [52, 8]}, {"55061287": [2, 160, 136]}, {"55061291": [50, 52, 8]}, {"55061295": [1, 160, 136]}, {"55061299": [58, 160, 136]}, {"55061303": [60, 52, 8]}, {"55061307": [96, 164, 136, 19, 244, 160, 136]}, {"55061315": [51, 3, 224]}, {"55061319": [8]}, {"55061324": [175, 164]}, {"55061327": [104, 175, 165]}, {"55061331": [108, 175, 166]}, {"55061335": [112, 175, 167]}, {"55061339": [116, 39, 189, 255, 232, 175, 163]}, {"55061347": [16, 175, 191]}, {"55061351": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061364": [17]}, {"55061367": [10]}, {"55061372": [60, 9, 128, 65, 52, 10]}, {"55061379": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061408": [143, 163]}, {"55061411": [16, 143, 191]}, {"55061415": [20, 39, 189]}, {"55061419": [24, 143, 164]}, {"55061423": [104, 143, 165]}, {"55061427": [108, 143, 166]}, {"55061431": [112, 143, 167]}, {"55061435": [116, 132, 110, 19, 196, 3, 224]}, {"55061443": [8]}, {"55061448": [147, 25]}, {"55061451": [116, 52, 1]}, {"55061455": [255, 23, 33]}, {"55061459": [2]}, {"55061464": [52, 25]}, {"55061467": [44, 3, 224]}, {"55061471": [8, 167, 185]}, {"55061475": [154, 147, 44]}, {"55061479": [116, 52, 1]}, {"55061483": [255, 21, 129]}, {"55061487": [2]}, {"55061492": [52, 12]}, {"55061495": [44, 3, 224]}, {"55061499": [8]}, {"55061504": [145, 174]}, {"55061507": [116, 52, 1]}, {"55061511": [255, 21, 193]}, {"55061515": [2]}, {"55061520": [52, 14]}, {"55061523": [44, 3, 224]}, {"55061527": [8, 167, 174]}, {"55061531": [154, 145, 207]}, {"55061535": [116, 52, 1]}, {"55061539": [255, 21, 225]}, {"55061543": [2]}, {"55061548": [52, 15]}, {"55061551": [44, 3, 224]}, {"55061555": [8, 167, 175]}, {"55061559": [154, 141, 9]}, {"55061563": [4, 17, 32]}, {"55061567": [7]}, {"55061572": [145, 9]}, {"55061575": [104, 52, 1]}, {"55061579": [59, 17, 33]}, {"55061583": [2]}, {"55061588": [52, 9]}, {"55061591": [255, 161, 9]}, {"55061595": [64, 3, 224]}, {"55061599": [8, 161, 14]}, {"55061603": [104]}] \ No newline at end of file From 402b153462b54763f57e2513d686811c159d6a39 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sat, 2 Jun 2018 13:55:29 -0400 Subject: [PATCH 080/151] Fix extended items with action ID 0xFF erasing items --- ASM/src/item_data.asm | 96 +++++++++++++++++++++--------------------- data/base2current.json | 2 +- 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index 98a5219cf..eec18b6f3 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -46,6 +46,8 @@ ITEM_ROW_IS_EXTENDED equ 0x0C ; This offset is repurposed after the upgrades are ; The "base item" mostly controls the sound effect made when you receive the item. It should be ; set to something that doesn't break NPCs. +; Action ID 0x41 (give kokiri tunic) is used to indicate no action. + ITEM_TABLE: Item_Row -1, -1, -1, -1, -1, hookshot_upgrade, no_effect, -1, -1 ; 0x80 = Progressive Hookshot Item_Row -1, -1, -1, -1, -1, strength_upgrade, no_effect, -1, -1 ; 0x81 = Progressive Strength @@ -57,54 +59,54 @@ Item_Row -1, -1, -1, -1, -1, scale_upgrade, no_effect, -1, -1 ; 0x86 = Progr Item_Row -1, -1, -1, -1, -1, nut_upgrade, no_effect, -1, -1 ; 0x87 = Progressive Nut Capacity Item_Row -1, -1, -1, -1, -1, stick_upgrade, no_effect, -1, -1 ; 0x88 = Progressive Stick Capacity -Item_Row 0x53, 0xFF, 0x01, 0x43, 0x00C6, no_upgrade, give_bottle, 0x15, -1 ; 0x89 = Bottle with Red Potion -Item_Row 0x53, 0xFF, 0x01, 0x44, 0x00C6, no_upgrade, give_bottle, 0x16, -1 ; 0x8A = Bottle with Green Potion -Item_Row 0x53, 0xFF, 0x01, 0x45, 0x00C6, no_upgrade, give_bottle, 0x17, -1 ; 0x8B = Bottle with Blue Potion -Item_Row 0x53, 0xFF, 0x01, 0x46, 0x00C6, no_upgrade, give_bottle, 0x18, -1 ; 0x8C = Bottle with Fairy -Item_Row 0x53, 0xFF, 0x01, 0x47, 0x00C6, no_upgrade, give_bottle, 0x19, -1 ; 0x8D = Bottle with Fish -Item_Row 0x53, 0xFF, 0x01, 0x5D, 0x00C6, no_upgrade, give_bottle, 0x1C, -1 ; 0x8E = Bottle with Blue Fire -Item_Row 0x53, 0xFF, 0x01, 0x7A, 0x00C6, no_upgrade, give_bottle, 0x1D, -1 ; 0x8F = Bottle with Bugs -Item_Row 0x53, 0xFF, 0x01, 0xF9, 0x00C6, no_upgrade, give_bottle, 0x1E, -1 ; 0x90 = Bottle with Big Poe -Item_Row 0x53, 0xFF, 0x01, 0x97, 0x00C6, no_upgrade, give_bottle, 0x20, -1 ; 0x91 = Bottle with Poe +Item_Row 0x53, 0x41, 0x01, 0x43, 0x00C6, no_upgrade, give_bottle, 0x15, -1 ; 0x89 = Bottle with Red Potion +Item_Row 0x53, 0x41, 0x01, 0x44, 0x00C6, no_upgrade, give_bottle, 0x16, -1 ; 0x8A = Bottle with Green Potion +Item_Row 0x53, 0x41, 0x01, 0x45, 0x00C6, no_upgrade, give_bottle, 0x17, -1 ; 0x8B = Bottle with Blue Potion +Item_Row 0x53, 0x41, 0x01, 0x46, 0x00C6, no_upgrade, give_bottle, 0x18, -1 ; 0x8C = Bottle with Fairy +Item_Row 0x53, 0x41, 0x01, 0x47, 0x00C6, no_upgrade, give_bottle, 0x19, -1 ; 0x8D = Bottle with Fish +Item_Row 0x53, 0x41, 0x01, 0x5D, 0x00C6, no_upgrade, give_bottle, 0x1C, -1 ; 0x8E = Bottle with Blue Fire +Item_Row 0x53, 0x41, 0x01, 0x7A, 0x00C6, no_upgrade, give_bottle, 0x1D, -1 ; 0x8F = Bottle with Bugs +Item_Row 0x53, 0x41, 0x01, 0xF9, 0x00C6, no_upgrade, give_bottle, 0x1E, -1 ; 0x90 = Bottle with Big Poe +Item_Row 0x53, 0x41, 0x01, 0x97, 0x00C6, no_upgrade, give_bottle, 0x20, -1 ; 0x91 = Bottle with Poe -Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FOREST_ID ; 0x92 = Forest Temple Boss Key -Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FIRE_ID ; 0x93 = Fire Temple Boss Key -Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, WATER_ID ; 0x94 = Water Temple Boss Key -Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SPIRIT_ID ; 0x95 = Spirit Temple Boss Key -Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SHADOW_ID ; 0x96 = Shadow Temple Boss Key -Item_Row 0x53, 0xFF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, CASTLE_ID ; 0x97 = Ganon's Castle Boss Key +Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FOREST_ID ; 0x92 = Forest Temple Boss Key +Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FIRE_ID ; 0x93 = Fire Temple Boss Key +Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, WATER_ID ; 0x94 = Water Temple Boss Key +Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SPIRIT_ID ; 0x95 = Spirit Temple Boss Key +Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SHADOW_ID ; 0x96 = Shadow Temple Boss Key +Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, CASTLE_ID ; 0x97 = Ganon's Castle Boss Key -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DEKU_ID ; 0x98 = Deku Tree Compass -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DODONGO_ID ; 0x99 = Dodongo's Cavern Compass -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, JABU_ID ; 0x9A = Jabu Jabu Compass -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FOREST_ID ; 0x9B = Forest Temple Compass -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FIRE_ID ; 0x9C = Fire Temple Compass -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, WATER_ID ; 0x9D = Water Temple Compass -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SPIRIT_ID ; 0x9E = Spirit Temple Compass -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SHADOW_ID ; 0x9F = Shadow Temple Compass -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, BOTW_ID ; 0xA0 = Bottom of the Well Compass -Item_Row 0x53, 0xFF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, ICE_ID ; 0xA1 = Ice Cavern Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DEKU_ID ; 0x98 = Deku Tree Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DODONGO_ID ; 0x99 = Dodongo's Cavern Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, JABU_ID ; 0x9A = Jabu Jabu Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FOREST_ID ; 0x9B = Forest Temple Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FIRE_ID ; 0x9C = Fire Temple Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, WATER_ID ; 0x9D = Water Temple Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SPIRIT_ID ; 0x9E = Spirit Temple Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SHADOW_ID ; 0x9F = Shadow Temple Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, BOTW_ID ; 0xA0 = Bottom of the Well Compass +Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, ICE_ID ; 0xA1 = Ice Cavern Compass -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DEKU_ID ; 0xA2 = Deku Tree Map -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DODONGO_ID ; 0xA3 = Dodongo's Cavern Map -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, JABU_ID ; 0xA4 = Jabu Jabu Map -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FOREST_ID ; 0xA5 = Forest Temple Map -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FIRE_ID ; 0xA6 = Fire Temple Map -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, WATER_ID ; 0xA7 = Water Temple Map -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SPIRIT_ID ; 0xA8 = Spirit Temple Map -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SHADOW_ID ; 0xA9 = Shadow Temple Map -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, BOTW_ID ; 0xAA = Bottom of the Well Map -Item_Row 0x53, 0xFF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, ICE_ID ; 0xAB = Ice Cavern Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DEKU_ID ; 0xA2 = Deku Tree Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DODONGO_ID ; 0xA3 = Dodongo's Cavern Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, JABU_ID ; 0xA4 = Jabu Jabu Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FOREST_ID ; 0xA5 = Forest Temple Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FIRE_ID ; 0xA6 = Fire Temple Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, WATER_ID ; 0xA7 = Water Temple Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SPIRIT_ID ; 0xA8 = Spirit Temple Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SHADOW_ID ; 0xA9 = Shadow Temple Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, BOTW_ID ; 0xAA = Bottom of the Well Map +Item_Row 0x53, 0x41, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, ICE_ID ; 0xAB = Ice Cavern Map -Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FOREST_ID, -1 ; 0xAC = Forest Temple Small Key -Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FIRE_ID, -1 ; 0xAD = Fire Temple Small Key -Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, WATER_ID, -1 ; 0xAE = Water Temple Small Key -Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SPIRIT_ID, -1 ; 0xAF = Spirit Temple Small Key -Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SHADOW_ID, -1 ; 0xB0 = Shadow Temple Small Key -Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, BOTW_ID, -1 ; 0xB1 = Bottom of the Well Small Key -Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, GTG_ID, -1 ; 0xB2 = Gerudo Training Small Key -Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FORT_ID, -1 ; 0xB3 = Gerudo Fortress Small Key -Item_Row 0x53, 0xFF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, CASTLE_ID, -1 ; 0xB4 = Ganon's Castle Small Key +Item_Row 0x53, 0x41, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FOREST_ID, -1 ; 0xAC = Forest Temple Small Key +Item_Row 0x53, 0x41, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FIRE_ID, -1 ; 0xAD = Fire Temple Small Key +Item_Row 0x53, 0x41, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, WATER_ID, -1 ; 0xAE = Water Temple Small Key +Item_Row 0x53, 0x41, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SPIRIT_ID, -1 ; 0xAF = Spirit Temple Small Key +Item_Row 0x53, 0x41, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SHADOW_ID, -1 ; 0xB0 = Shadow Temple Small Key +Item_Row 0x53, 0x41, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, BOTW_ID, -1 ; 0xB1 = Bottom of the Well Small Key +Item_Row 0x53, 0x41, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, GTG_ID, -1 ; 0xB2 = Gerudo Training Small Key +Item_Row 0x53, 0x41, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FORT_ID, -1 ; 0xB3 = Gerudo Fortress Small Key +Item_Row 0x53, 0x41, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, CASTLE_ID, -1 ; 0xB4 = Ganon's Castle Small Key Item_Row 0x53, 0x3D, 0x43, 0x0C, 0x00F8, no_upgrade, give_biggoron_sword, -1, -1 ; 0xB5 = Biggoron Sword @@ -118,6 +120,6 @@ Item_Row 0x53, 0x90, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, -1, -1 ; 0x Item_Row 0x53, 0x8C, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, -1, -1 ; 0xBD = Deku Nuts (5) Item_Row 0x53, 0x8D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, -1, -1 ; 0xBE = Deku Nuts (10) -Item_Row 0x4F, 0xFF, 0x13, 0xE9, 0x00BD, no_upgrade, give_defense, -1, -1 ; 0xBF = Double Defense -Item_Row 0x4F, 0xFF, 0xE2, 0xE4, 0x00CD, magic_upgrade, give_magic, -1, -1 ; 0xC0 = Progressive Magic Meter -Item_Row 0x4F, 0xFF, 0xE1, 0xE8, 0x00CD, no_upgrade, double_magic, -1, -1 ; 0xC1 = Double Magic +Item_Row 0x4F, 0x41, 0x13, 0xE9, 0x00BD, no_upgrade, give_defense, -1, -1 ; 0xBF = Double Defense +Item_Row 0x4F, 0x41, 0xE2, 0xE4, 0x00CD, magic_upgrade, give_magic, -1, -1 ; 0xC0 = Progressive Magic Meter +Item_Row 0x4F, 0x41, 0xE1, 0xE8, 0x00CD, no_upgrade, double_magic, -1, -1 ; 0xC1 = Double Magic diff --git a/data/base2current.json b/data/base2current.json index 07976b167..07b0a0bc0 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 14]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 249, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 0, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 7, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 242, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 211, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 212, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 228, 83, 255, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 255, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 88, 128, 64, 40, 204, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 79, 255, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 232, 128, 64, 40, 204, 79, 255, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 4, 128, 64, 42]}, {"55059492": [79, 255, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 36, 128, 64, 40, 204, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 18]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 226]}, {"55060320": [36, 1, 255, 255, 16, 65]}, {"55060327": [4]}, {"55060332": [52, 68]}, {"55060336": [12, 16, 10, 5]}, {"55060344": [143, 191]}, {"55060347": [16, 39, 189]}, {"55060351": [24, 3, 224]}, {"55060355": [8]}, {"55060360": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060371": [164, 52, 8]}, {"55060376": [52, 137]}, {"55060380": [148, 170]}, {"55060384": [52, 1]}, {"55060387": [10, 21, 65]}, {"55060391": [7]}, {"55060396": [52, 1]}, {"55060399": [16, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 8]}, {"55060411": [1, 148, 169]}, {"55060415": [28, 49, 41]}, {"55060419": [31, 52, 1]}, {"55060423": [21, 21, 65]}, {"55060427": [12]}, {"55060432": [52, 1]}, {"55060435": [62, 16, 129]}, {"55060439": [7]}, {"55060444": [52, 1]}, {"55060447": [66, 16, 129]}, {"55060451": [4]}, {"55060456": [36, 2, 255, 255, 16]}, {"55060463": [7]}, {"55060468": [52, 8]}, {"55060471": [2, 144, 169, 1, 65]}, {"55060477": [2, 18]}, {"55060481": [72, 16, 37]}, {"55060485": [2, 18]}, {"55060489": [73, 16, 37, 3, 224]}, {"55060495": [8]}, {"55060500": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060515": [4, 141, 9]}, {"55060520": [17, 32]}, {"55060523": [5]}, {"55060529": [9, 82, 2, 21, 68, 255, 250]}, {"55060540": [49, 34]}, {"55060543": [255, 3, 224]}, {"55060547": [8]}, {"55060552": [39, 189, 255, 224, 175, 176]}, {"55060559": [16, 175, 177]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 52, 130]}, {"55060572": [52, 80]}, {"55060576": [38, 8, 255, 128, 5]}, {"55060583": [18]}, {"55060588": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060599": [16, 1, 9]}, {"55060603": [24]}, {"55060606": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060624": [142, 40]}, {"55060627": [12, 1]}, {"55060630": [248, 9]}, {"55060636": [20, 80, 255, 239]}, {"55060644": [54, 35]}, {"55060648": [16]}, {"55060651": [2]}, {"55060656": [52, 3]}, {"55060660": [143, 176]}, {"55060663": [16, 143, 177]}, {"55060667": [20, 143, 191]}, {"55060671": [24, 39, 189]}, {"55060675": [32, 3, 224]}, {"55060679": [8]}, {"55060684": [3, 224]}, {"55060687": [8, 52, 162]}, {"55060692": [144, 136]}, {"55060695": [125, 52, 1]}, {"55060699": [255, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [8, 52, 2]}, {"55060711": [9, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [192, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [84, 52, 1]}, {"55060739": [64, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [53, 52, 2]}, {"55060751": [54, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [163, 49, 8]}, {"55060767": [24, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [50, 52, 1]}, {"55060779": [8, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [51, 52, 2]}, {"55060791": [52, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [163, 49, 8]}, {"55060807": [3, 17]}, {"55060811": [5, 52, 2]}, {"55060815": [4, 52, 1]}, {"55060819": [1, 17, 1]}, {"55060823": [2, 52, 2]}, {"55060827": [48, 52, 2]}, {"55060831": [49, 3, 224]}, {"55060835": [8]}, {"55060840": [144, 136]}, {"55060843": [162, 49, 8]}, {"55060847": [192, 17]}, {"55060851": [5, 52, 2]}, {"55060855": [5, 52, 1]}, {"55060859": [64, 17, 1]}, {"55060863": [2, 52, 2]}, {"55060867": [96, 52, 2]}, {"55060871": [123, 3, 224]}, {"55060875": [8]}, {"55060880": [144, 136]}, {"55060883": [162, 49, 8]}, {"55060887": [48, 17]}, {"55060891": [2, 52, 2]}, {"55060895": [69, 52, 2]}, {"55060899": [70, 3, 224]}, {"55060903": [8]}, {"55060908": [144, 136]}, {"55060911": [162, 49, 8]}, {"55060915": [6, 17]}, {"55060919": [2, 52, 2]}, {"55060923": [55, 52, 2]}, {"55060927": [56, 3, 224]}, {"55060931": [8]}, {"55060936": [144, 136]}, {"55060939": [161, 49, 8]}, {"55060943": [32, 17]}, {"55060947": [2, 52, 2]}, {"55060951": [121, 52, 2]}, {"55060955": [122, 3, 224]}, {"55060959": [8]}, {"55060964": [144, 136]}, {"55060967": [161, 49, 8]}, {"55060971": [4, 17]}, {"55060975": [2, 52, 2]}, {"55060979": [119, 52, 2]}, {"55060983": [120, 3, 224]}, {"55060987": [8]}, {"55060992": [144, 136]}, {"55060995": [50, 17]}, {"55060999": [2, 52, 2]}, {"55061003": [192, 52, 2]}, {"55061007": [193, 3, 224]}, {"55061011": [8]}, {"55061016": [144, 136]}, {"55061019": [163, 49, 8]}, {"55061023": [3, 17]}, {"55061027": [2, 52, 2]}, {"55061031": [77, 52, 162]}, {"55061036": [3, 224]}, {"55061039": [8]}, {"55061044": [144, 136]}, {"55061047": [163, 49, 8]}, {"55061051": [24, 17]}, {"55061055": [2, 52, 2]}, {"55061059": [77, 52, 162]}, {"55061064": [3, 224]}, {"55061067": [8]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [52, 8]}, {"55061083": [1, 160, 136]}, {"55061087": [62, 3, 224]}, {"55061091": [8]}, {"55061096": [36, 136]}, {"55061099": [134, 36, 9, 255, 255, 37, 41]}, {"55061107": [1, 52, 1]}, {"55061111": [3]}, {"55061113": [41, 8, 42, 20, 32]}, {"55061119": [7]}, {"55061124": [1, 9, 80, 33, 145, 75]}, {"55061132": [52, 1]}, {"55061135": [255, 21, 97, 255, 247]}, {"55061144": [161, 69]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [36, 136]}, {"55061159": [168, 1, 6, 64, 33, 145, 9]}, {"55061168": [1, 37, 72, 37, 161, 9]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [36, 136]}, {"55061187": [188, 1, 5, 64, 33, 129, 9]}, {"55061196": [5, 33]}, {"55061199": [2]}, {"55061204": [52, 9]}, {"55061208": [37, 41]}, {"55061211": [1, 161, 9]}, {"55061216": [3, 224]}, {"55061219": [8]}, {"55061224": [52, 8]}, {"55061227": [1, 160, 136]}, {"55061231": [61, 148, 136]}, {"55061235": [46]}, {"55061237": [8, 65, 2, 160, 136]}, {"55061243": [207, 3, 224]}, {"55061247": [8]}, {"55061252": [52, 8]}, {"55061255": [1, 160, 136]}, {"55061259": [50, 160, 136]}, {"55061263": [58, 52, 8]}, {"55061267": [48, 164, 136, 19, 244, 160, 136]}, {"55061275": [51, 3, 224]}, {"55061279": [8]}, {"55061284": [52, 8]}, {"55061287": [2, 160, 136]}, {"55061291": [50, 52, 8]}, {"55061295": [1, 160, 136]}, {"55061299": [58, 160, 136]}, {"55061303": [60, 52, 8]}, {"55061307": [96, 164, 136, 19, 244, 160, 136]}, {"55061315": [51, 3, 224]}, {"55061319": [8]}, {"55061324": [175, 164]}, {"55061327": [104, 175, 165]}, {"55061331": [108, 175, 166]}, {"55061335": [112, 175, 167]}, {"55061339": [116, 39, 189, 255, 232, 175, 163]}, {"55061347": [16, 175, 191]}, {"55061351": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061364": [17]}, {"55061367": [10]}, {"55061372": [60, 9, 128, 65, 52, 10]}, {"55061379": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061408": [143, 163]}, {"55061411": [16, 143, 191]}, {"55061415": [20, 39, 189]}, {"55061419": [24, 143, 164]}, {"55061423": [104, 143, 165]}, {"55061427": [108, 143, 166]}, {"55061431": [112, 143, 167]}, {"55061435": [116, 132, 110, 19, 196, 3, 224]}, {"55061443": [8]}, {"55061448": [147, 25]}, {"55061451": [116, 52, 1]}, {"55061455": [255, 23, 33]}, {"55061459": [2]}, {"55061464": [52, 25]}, {"55061467": [44, 3, 224]}, {"55061471": [8, 167, 185]}, {"55061475": [154, 147, 44]}, {"55061479": [116, 52, 1]}, {"55061483": [255, 21, 129]}, {"55061487": [2]}, {"55061492": [52, 12]}, {"55061495": [44, 3, 224]}, {"55061499": [8]}, {"55061504": [145, 174]}, {"55061507": [116, 52, 1]}, {"55061511": [255, 21, 193]}, {"55061515": [2]}, {"55061520": [52, 14]}, {"55061523": [44, 3, 224]}, {"55061527": [8, 167, 174]}, {"55061531": [154, 145, 207]}, {"55061535": [116, 52, 1]}, {"55061539": [255, 21, 225]}, {"55061543": [2]}, {"55061548": [52, 15]}, {"55061551": [44, 3, 224]}, {"55061555": [8, 167, 175]}, {"55061559": [154, 141, 9]}, {"55061563": [4, 17, 32]}, {"55061567": [7]}, {"55061572": [145, 9]}, {"55061575": [104, 52, 1]}, {"55061579": [59, 17, 33]}, {"55061583": [2]}, {"55061588": [52, 9]}, {"55061591": [255, 161, 9]}, {"55061595": [64, 3, 224]}, {"55061599": [8, 161, 14]}, {"55061603": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 14]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 249, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 0, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 7, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 242, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 211, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 212, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 228, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 88, 128, 64, 40, 204, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 232, 128, 64, 40, 204, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 4, 128, 64, 42]}, {"55059492": [79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 36, 128, 64, 40, 204, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 18]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 226]}, {"55060320": [36, 1, 255, 255, 16, 65]}, {"55060327": [4]}, {"55060332": [52, 68]}, {"55060336": [12, 16, 10, 5]}, {"55060344": [143, 191]}, {"55060347": [16, 39, 189]}, {"55060351": [24, 3, 224]}, {"55060355": [8]}, {"55060360": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060371": [164, 52, 8]}, {"55060376": [52, 137]}, {"55060380": [148, 170]}, {"55060384": [52, 1]}, {"55060387": [10, 21, 65]}, {"55060391": [7]}, {"55060396": [52, 1]}, {"55060399": [16, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 8]}, {"55060411": [1, 148, 169]}, {"55060415": [28, 49, 41]}, {"55060419": [31, 52, 1]}, {"55060423": [21, 21, 65]}, {"55060427": [12]}, {"55060432": [52, 1]}, {"55060435": [62, 16, 129]}, {"55060439": [7]}, {"55060444": [52, 1]}, {"55060447": [66, 16, 129]}, {"55060451": [4]}, {"55060456": [36, 2, 255, 255, 16]}, {"55060463": [7]}, {"55060468": [52, 8]}, {"55060471": [2, 144, 169, 1, 65]}, {"55060477": [2, 18]}, {"55060481": [72, 16, 37]}, {"55060485": [2, 18]}, {"55060489": [73, 16, 37, 3, 224]}, {"55060495": [8]}, {"55060500": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060515": [4, 141, 9]}, {"55060520": [17, 32]}, {"55060523": [5]}, {"55060529": [9, 82, 2, 21, 68, 255, 250]}, {"55060540": [49, 34]}, {"55060543": [255, 3, 224]}, {"55060547": [8]}, {"55060552": [39, 189, 255, 224, 175, 176]}, {"55060559": [16, 175, 177]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 52, 130]}, {"55060572": [52, 80]}, {"55060576": [38, 8, 255, 128, 5]}, {"55060583": [18]}, {"55060588": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060599": [16, 1, 9]}, {"55060603": [24]}, {"55060606": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060624": [142, 40]}, {"55060627": [12, 1]}, {"55060630": [248, 9]}, {"55060636": [20, 80, 255, 239]}, {"55060644": [54, 35]}, {"55060648": [16]}, {"55060651": [2]}, {"55060656": [52, 3]}, {"55060660": [143, 176]}, {"55060663": [16, 143, 177]}, {"55060667": [20, 143, 191]}, {"55060671": [24, 39, 189]}, {"55060675": [32, 3, 224]}, {"55060679": [8]}, {"55060684": [3, 224]}, {"55060687": [8, 52, 162]}, {"55060692": [144, 136]}, {"55060695": [125, 52, 1]}, {"55060699": [255, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [8, 52, 2]}, {"55060711": [9, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [192, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [84, 52, 1]}, {"55060739": [64, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [53, 52, 2]}, {"55060751": [54, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [163, 49, 8]}, {"55060767": [24, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [50, 52, 1]}, {"55060779": [8, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [51, 52, 2]}, {"55060791": [52, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [163, 49, 8]}, {"55060807": [3, 17]}, {"55060811": [5, 52, 2]}, {"55060815": [4, 52, 1]}, {"55060819": [1, 17, 1]}, {"55060823": [2, 52, 2]}, {"55060827": [48, 52, 2]}, {"55060831": [49, 3, 224]}, {"55060835": [8]}, {"55060840": [144, 136]}, {"55060843": [162, 49, 8]}, {"55060847": [192, 17]}, {"55060851": [5, 52, 2]}, {"55060855": [5, 52, 1]}, {"55060859": [64, 17, 1]}, {"55060863": [2, 52, 2]}, {"55060867": [96, 52, 2]}, {"55060871": [123, 3, 224]}, {"55060875": [8]}, {"55060880": [144, 136]}, {"55060883": [162, 49, 8]}, {"55060887": [48, 17]}, {"55060891": [2, 52, 2]}, {"55060895": [69, 52, 2]}, {"55060899": [70, 3, 224]}, {"55060903": [8]}, {"55060908": [144, 136]}, {"55060911": [162, 49, 8]}, {"55060915": [6, 17]}, {"55060919": [2, 52, 2]}, {"55060923": [55, 52, 2]}, {"55060927": [56, 3, 224]}, {"55060931": [8]}, {"55060936": [144, 136]}, {"55060939": [161, 49, 8]}, {"55060943": [32, 17]}, {"55060947": [2, 52, 2]}, {"55060951": [121, 52, 2]}, {"55060955": [122, 3, 224]}, {"55060959": [8]}, {"55060964": [144, 136]}, {"55060967": [161, 49, 8]}, {"55060971": [4, 17]}, {"55060975": [2, 52, 2]}, {"55060979": [119, 52, 2]}, {"55060983": [120, 3, 224]}, {"55060987": [8]}, {"55060992": [144, 136]}, {"55060995": [50, 17]}, {"55060999": [2, 52, 2]}, {"55061003": [192, 52, 2]}, {"55061007": [193, 3, 224]}, {"55061011": [8]}, {"55061016": [144, 136]}, {"55061019": [163, 49, 8]}, {"55061023": [3, 17]}, {"55061027": [2, 52, 2]}, {"55061031": [77, 52, 162]}, {"55061036": [3, 224]}, {"55061039": [8]}, {"55061044": [144, 136]}, {"55061047": [163, 49, 8]}, {"55061051": [24, 17]}, {"55061055": [2, 52, 2]}, {"55061059": [77, 52, 162]}, {"55061064": [3, 224]}, {"55061067": [8]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [52, 8]}, {"55061083": [1, 160, 136]}, {"55061087": [62, 3, 224]}, {"55061091": [8]}, {"55061096": [36, 136]}, {"55061099": [134, 36, 9, 255, 255, 37, 41]}, {"55061107": [1, 52, 1]}, {"55061111": [3]}, {"55061113": [41, 8, 42, 20, 32]}, {"55061119": [7]}, {"55061124": [1, 9, 80, 33, 145, 75]}, {"55061132": [52, 1]}, {"55061135": [255, 21, 97, 255, 247]}, {"55061144": [161, 69]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [36, 136]}, {"55061159": [168, 1, 6, 64, 33, 145, 9]}, {"55061168": [1, 37, 72, 37, 161, 9]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [36, 136]}, {"55061187": [188, 1, 5, 64, 33, 129, 9]}, {"55061196": [5, 33]}, {"55061199": [2]}, {"55061204": [52, 9]}, {"55061208": [37, 41]}, {"55061211": [1, 161, 9]}, {"55061216": [3, 224]}, {"55061219": [8]}, {"55061224": [52, 8]}, {"55061227": [1, 160, 136]}, {"55061231": [61, 148, 136]}, {"55061235": [46]}, {"55061237": [8, 65, 2, 160, 136]}, {"55061243": [207, 3, 224]}, {"55061247": [8]}, {"55061252": [52, 8]}, {"55061255": [1, 160, 136]}, {"55061259": [50, 160, 136]}, {"55061263": [58, 52, 8]}, {"55061267": [48, 164, 136, 19, 244, 160, 136]}, {"55061275": [51, 3, 224]}, {"55061279": [8]}, {"55061284": [52, 8]}, {"55061287": [2, 160, 136]}, {"55061291": [50, 52, 8]}, {"55061295": [1, 160, 136]}, {"55061299": [58, 160, 136]}, {"55061303": [60, 52, 8]}, {"55061307": [96, 164, 136, 19, 244, 160, 136]}, {"55061315": [51, 3, 224]}, {"55061319": [8]}, {"55061324": [175, 164]}, {"55061327": [104, 175, 165]}, {"55061331": [108, 175, 166]}, {"55061335": [112, 175, 167]}, {"55061339": [116, 39, 189, 255, 232, 175, 163]}, {"55061347": [16, 175, 191]}, {"55061351": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061364": [17]}, {"55061367": [10]}, {"55061372": [60, 9, 128, 65, 52, 10]}, {"55061379": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061408": [143, 163]}, {"55061411": [16, 143, 191]}, {"55061415": [20, 39, 189]}, {"55061419": [24, 143, 164]}, {"55061423": [104, 143, 165]}, {"55061427": [108, 143, 166]}, {"55061431": [112, 143, 167]}, {"55061435": [116, 132, 110, 19, 196, 3, 224]}, {"55061443": [8]}, {"55061448": [147, 25]}, {"55061451": [116, 52, 1]}, {"55061455": [255, 23, 33]}, {"55061459": [2]}, {"55061464": [52, 25]}, {"55061467": [44, 3, 224]}, {"55061471": [8, 167, 185]}, {"55061475": [154, 147, 44]}, {"55061479": [116, 52, 1]}, {"55061483": [255, 21, 129]}, {"55061487": [2]}, {"55061492": [52, 12]}, {"55061495": [44, 3, 224]}, {"55061499": [8]}, {"55061504": [145, 174]}, {"55061507": [116, 52, 1]}, {"55061511": [255, 21, 193]}, {"55061515": [2]}, {"55061520": [52, 14]}, {"55061523": [44, 3, 224]}, {"55061527": [8, 167, 174]}, {"55061531": [154, 145, 207]}, {"55061535": [116, 52, 1]}, {"55061539": [255, 21, 225]}, {"55061543": [2]}, {"55061548": [52, 15]}, {"55061551": [44, 3, 224]}, {"55061555": [8, 167, 175]}, {"55061559": [154, 141, 9]}, {"55061563": [4, 17, 32]}, {"55061567": [7]}, {"55061572": [145, 9]}, {"55061575": [104, 52, 1]}, {"55061579": [59, 17, 33]}, {"55061583": [2]}, {"55061588": [52, 9]}, {"55061591": [255, 161, 9]}, {"55061595": [64, 3, 224]}, {"55061599": [8, 161, 14]}, {"55061603": [104]}] \ No newline at end of file From b44102a059cd0e87bcdf565ae837a829f09aeb7a Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sun, 3 Jun 2018 02:35:23 -0400 Subject: [PATCH 081/151] Add health refill to double defense --- ASM/src/items.asm | 2 ++ data/base2current.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 7fd982126..933153107 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -701,6 +701,8 @@ give_defense: lhu t0, 0x2E (a0) ; Load health capacity (0x10 per heart container) srl t0, t0, 4 sb t0, 0xCF (a0) ; Set number of hearts to display as double defense + li t0, 0x0140 + sh t0, 0x1424 (a0) ; Give health refill jr ra nop diff --git a/data/base2current.json b/data/base2current.json index 07b0a0bc0..d37862d54 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 14]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 249, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 0, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 7, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 242, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 211, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 212, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 228, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 88, 128, 64, 40, 204, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 232, 128, 64, 40, 204, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 4, 128, 64, 42]}, {"55059492": [79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 36, 128, 64, 40, 204, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 18]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 226]}, {"55060320": [36, 1, 255, 255, 16, 65]}, {"55060327": [4]}, {"55060332": [52, 68]}, {"55060336": [12, 16, 10, 5]}, {"55060344": [143, 191]}, {"55060347": [16, 39, 189]}, {"55060351": [24, 3, 224]}, {"55060355": [8]}, {"55060360": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060371": [164, 52, 8]}, {"55060376": [52, 137]}, {"55060380": [148, 170]}, {"55060384": [52, 1]}, {"55060387": [10, 21, 65]}, {"55060391": [7]}, {"55060396": [52, 1]}, {"55060399": [16, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 8]}, {"55060411": [1, 148, 169]}, {"55060415": [28, 49, 41]}, {"55060419": [31, 52, 1]}, {"55060423": [21, 21, 65]}, {"55060427": [12]}, {"55060432": [52, 1]}, {"55060435": [62, 16, 129]}, {"55060439": [7]}, {"55060444": [52, 1]}, {"55060447": [66, 16, 129]}, {"55060451": [4]}, {"55060456": [36, 2, 255, 255, 16]}, {"55060463": [7]}, {"55060468": [52, 8]}, {"55060471": [2, 144, 169, 1, 65]}, {"55060477": [2, 18]}, {"55060481": [72, 16, 37]}, {"55060485": [2, 18]}, {"55060489": [73, 16, 37, 3, 224]}, {"55060495": [8]}, {"55060500": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060515": [4, 141, 9]}, {"55060520": [17, 32]}, {"55060523": [5]}, {"55060529": [9, 82, 2, 21, 68, 255, 250]}, {"55060540": [49, 34]}, {"55060543": [255, 3, 224]}, {"55060547": [8]}, {"55060552": [39, 189, 255, 224, 175, 176]}, {"55060559": [16, 175, 177]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 52, 130]}, {"55060572": [52, 80]}, {"55060576": [38, 8, 255, 128, 5]}, {"55060583": [18]}, {"55060588": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060599": [16, 1, 9]}, {"55060603": [24]}, {"55060606": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060624": [142, 40]}, {"55060627": [12, 1]}, {"55060630": [248, 9]}, {"55060636": [20, 80, 255, 239]}, {"55060644": [54, 35]}, {"55060648": [16]}, {"55060651": [2]}, {"55060656": [52, 3]}, {"55060660": [143, 176]}, {"55060663": [16, 143, 177]}, {"55060667": [20, 143, 191]}, {"55060671": [24, 39, 189]}, {"55060675": [32, 3, 224]}, {"55060679": [8]}, {"55060684": [3, 224]}, {"55060687": [8, 52, 162]}, {"55060692": [144, 136]}, {"55060695": [125, 52, 1]}, {"55060699": [255, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [8, 52, 2]}, {"55060711": [9, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [192, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [84, 52, 1]}, {"55060739": [64, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [53, 52, 2]}, {"55060751": [54, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [163, 49, 8]}, {"55060767": [24, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [50, 52, 1]}, {"55060779": [8, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [51, 52, 2]}, {"55060791": [52, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [163, 49, 8]}, {"55060807": [3, 17]}, {"55060811": [5, 52, 2]}, {"55060815": [4, 52, 1]}, {"55060819": [1, 17, 1]}, {"55060823": [2, 52, 2]}, {"55060827": [48, 52, 2]}, {"55060831": [49, 3, 224]}, {"55060835": [8]}, {"55060840": [144, 136]}, {"55060843": [162, 49, 8]}, {"55060847": [192, 17]}, {"55060851": [5, 52, 2]}, {"55060855": [5, 52, 1]}, {"55060859": [64, 17, 1]}, {"55060863": [2, 52, 2]}, {"55060867": [96, 52, 2]}, {"55060871": [123, 3, 224]}, {"55060875": [8]}, {"55060880": [144, 136]}, {"55060883": [162, 49, 8]}, {"55060887": [48, 17]}, {"55060891": [2, 52, 2]}, {"55060895": [69, 52, 2]}, {"55060899": [70, 3, 224]}, {"55060903": [8]}, {"55060908": [144, 136]}, {"55060911": [162, 49, 8]}, {"55060915": [6, 17]}, {"55060919": [2, 52, 2]}, {"55060923": [55, 52, 2]}, {"55060927": [56, 3, 224]}, {"55060931": [8]}, {"55060936": [144, 136]}, {"55060939": [161, 49, 8]}, {"55060943": [32, 17]}, {"55060947": [2, 52, 2]}, {"55060951": [121, 52, 2]}, {"55060955": [122, 3, 224]}, {"55060959": [8]}, {"55060964": [144, 136]}, {"55060967": [161, 49, 8]}, {"55060971": [4, 17]}, {"55060975": [2, 52, 2]}, {"55060979": [119, 52, 2]}, {"55060983": [120, 3, 224]}, {"55060987": [8]}, {"55060992": [144, 136]}, {"55060995": [50, 17]}, {"55060999": [2, 52, 2]}, {"55061003": [192, 52, 2]}, {"55061007": [193, 3, 224]}, {"55061011": [8]}, {"55061016": [144, 136]}, {"55061019": [163, 49, 8]}, {"55061023": [3, 17]}, {"55061027": [2, 52, 2]}, {"55061031": [77, 52, 162]}, {"55061036": [3, 224]}, {"55061039": [8]}, {"55061044": [144, 136]}, {"55061047": [163, 49, 8]}, {"55061051": [24, 17]}, {"55061055": [2, 52, 2]}, {"55061059": [77, 52, 162]}, {"55061064": [3, 224]}, {"55061067": [8]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [52, 8]}, {"55061083": [1, 160, 136]}, {"55061087": [62, 3, 224]}, {"55061091": [8]}, {"55061096": [36, 136]}, {"55061099": [134, 36, 9, 255, 255, 37, 41]}, {"55061107": [1, 52, 1]}, {"55061111": [3]}, {"55061113": [41, 8, 42, 20, 32]}, {"55061119": [7]}, {"55061124": [1, 9, 80, 33, 145, 75]}, {"55061132": [52, 1]}, {"55061135": [255, 21, 97, 255, 247]}, {"55061144": [161, 69]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [36, 136]}, {"55061159": [168, 1, 6, 64, 33, 145, 9]}, {"55061168": [1, 37, 72, 37, 161, 9]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [36, 136]}, {"55061187": [188, 1, 5, 64, 33, 129, 9]}, {"55061196": [5, 33]}, {"55061199": [2]}, {"55061204": [52, 9]}, {"55061208": [37, 41]}, {"55061211": [1, 161, 9]}, {"55061216": [3, 224]}, {"55061219": [8]}, {"55061224": [52, 8]}, {"55061227": [1, 160, 136]}, {"55061231": [61, 148, 136]}, {"55061235": [46]}, {"55061237": [8, 65, 2, 160, 136]}, {"55061243": [207, 3, 224]}, {"55061247": [8]}, {"55061252": [52, 8]}, {"55061255": [1, 160, 136]}, {"55061259": [50, 160, 136]}, {"55061263": [58, 52, 8]}, {"55061267": [48, 164, 136, 19, 244, 160, 136]}, {"55061275": [51, 3, 224]}, {"55061279": [8]}, {"55061284": [52, 8]}, {"55061287": [2, 160, 136]}, {"55061291": [50, 52, 8]}, {"55061295": [1, 160, 136]}, {"55061299": [58, 160, 136]}, {"55061303": [60, 52, 8]}, {"55061307": [96, 164, 136, 19, 244, 160, 136]}, {"55061315": [51, 3, 224]}, {"55061319": [8]}, {"55061324": [175, 164]}, {"55061327": [104, 175, 165]}, {"55061331": [108, 175, 166]}, {"55061335": [112, 175, 167]}, {"55061339": [116, 39, 189, 255, 232, 175, 163]}, {"55061347": [16, 175, 191]}, {"55061351": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061364": [17]}, {"55061367": [10]}, {"55061372": [60, 9, 128, 65, 52, 10]}, {"55061379": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061408": [143, 163]}, {"55061411": [16, 143, 191]}, {"55061415": [20, 39, 189]}, {"55061419": [24, 143, 164]}, {"55061423": [104, 143, 165]}, {"55061427": [108, 143, 166]}, {"55061431": [112, 143, 167]}, {"55061435": [116, 132, 110, 19, 196, 3, 224]}, {"55061443": [8]}, {"55061448": [147, 25]}, {"55061451": [116, 52, 1]}, {"55061455": [255, 23, 33]}, {"55061459": [2]}, {"55061464": [52, 25]}, {"55061467": [44, 3, 224]}, {"55061471": [8, 167, 185]}, {"55061475": [154, 147, 44]}, {"55061479": [116, 52, 1]}, {"55061483": [255, 21, 129]}, {"55061487": [2]}, {"55061492": [52, 12]}, {"55061495": [44, 3, 224]}, {"55061499": [8]}, {"55061504": [145, 174]}, {"55061507": [116, 52, 1]}, {"55061511": [255, 21, 193]}, {"55061515": [2]}, {"55061520": [52, 14]}, {"55061523": [44, 3, 224]}, {"55061527": [8, 167, 174]}, {"55061531": [154, 145, 207]}, {"55061535": [116, 52, 1]}, {"55061539": [255, 21, 225]}, {"55061543": [2]}, {"55061548": [52, 15]}, {"55061551": [44, 3, 224]}, {"55061555": [8, 167, 175]}, {"55061559": [154, 141, 9]}, {"55061563": [4, 17, 32]}, {"55061567": [7]}, {"55061572": [145, 9]}, {"55061575": [104, 52, 1]}, {"55061579": [59, 17, 33]}, {"55061583": [2]}, {"55061588": [52, 9]}, {"55061591": [255, 161, 9]}, {"55061595": [64, 3, 224]}, {"55061599": [8, 161, 14]}, {"55061603": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 16]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 251, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 2, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 9, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 244, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 213, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 212, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 228, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 88, 128, 64, 40, 204, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 232, 128, 64, 40, 204, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 12, 128, 64, 42]}, {"55059492": [79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 44, 128, 64, 40, 204, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 18]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 226]}, {"55060320": [36, 1, 255, 255, 16, 65]}, {"55060327": [4]}, {"55060332": [52, 68]}, {"55060336": [12, 16, 10, 5]}, {"55060344": [143, 191]}, {"55060347": [16, 39, 189]}, {"55060351": [24, 3, 224]}, {"55060355": [8]}, {"55060360": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060371": [164, 52, 8]}, {"55060376": [52, 137]}, {"55060380": [148, 170]}, {"55060384": [52, 1]}, {"55060387": [10, 21, 65]}, {"55060391": [7]}, {"55060396": [52, 1]}, {"55060399": [16, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 8]}, {"55060411": [1, 148, 169]}, {"55060415": [28, 49, 41]}, {"55060419": [31, 52, 1]}, {"55060423": [21, 21, 65]}, {"55060427": [12]}, {"55060432": [52, 1]}, {"55060435": [62, 16, 129]}, {"55060439": [7]}, {"55060444": [52, 1]}, {"55060447": [66, 16, 129]}, {"55060451": [4]}, {"55060456": [36, 2, 255, 255, 16]}, {"55060463": [7]}, {"55060468": [52, 8]}, {"55060471": [2, 144, 169, 1, 65]}, {"55060477": [2, 18]}, {"55060481": [72, 16, 37]}, {"55060485": [2, 18]}, {"55060489": [73, 16, 37, 3, 224]}, {"55060495": [8]}, {"55060500": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060515": [4, 141, 9]}, {"55060520": [17, 32]}, {"55060523": [5]}, {"55060529": [9, 82, 2, 21, 68, 255, 250]}, {"55060540": [49, 34]}, {"55060543": [255, 3, 224]}, {"55060547": [8]}, {"55060552": [39, 189, 255, 224, 175, 176]}, {"55060559": [16, 175, 177]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 52, 130]}, {"55060572": [52, 80]}, {"55060576": [38, 8, 255, 128, 5]}, {"55060583": [18]}, {"55060588": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060599": [16, 1, 9]}, {"55060603": [24]}, {"55060606": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060624": [142, 40]}, {"55060627": [12, 1]}, {"55060630": [248, 9]}, {"55060636": [20, 80, 255, 239]}, {"55060644": [54, 35]}, {"55060648": [16]}, {"55060651": [2]}, {"55060656": [52, 3]}, {"55060660": [143, 176]}, {"55060663": [16, 143, 177]}, {"55060667": [20, 143, 191]}, {"55060671": [24, 39, 189]}, {"55060675": [32, 3, 224]}, {"55060679": [8]}, {"55060684": [3, 224]}, {"55060687": [8, 52, 162]}, {"55060692": [144, 136]}, {"55060695": [125, 52, 1]}, {"55060699": [255, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [8, 52, 2]}, {"55060711": [9, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [192, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [84, 52, 1]}, {"55060739": [64, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [53, 52, 2]}, {"55060751": [54, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [163, 49, 8]}, {"55060767": [24, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [50, 52, 1]}, {"55060779": [8, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [51, 52, 2]}, {"55060791": [52, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [163, 49, 8]}, {"55060807": [3, 17]}, {"55060811": [5, 52, 2]}, {"55060815": [4, 52, 1]}, {"55060819": [1, 17, 1]}, {"55060823": [2, 52, 2]}, {"55060827": [48, 52, 2]}, {"55060831": [49, 3, 224]}, {"55060835": [8]}, {"55060840": [144, 136]}, {"55060843": [162, 49, 8]}, {"55060847": [192, 17]}, {"55060851": [5, 52, 2]}, {"55060855": [5, 52, 1]}, {"55060859": [64, 17, 1]}, {"55060863": [2, 52, 2]}, {"55060867": [96, 52, 2]}, {"55060871": [123, 3, 224]}, {"55060875": [8]}, {"55060880": [144, 136]}, {"55060883": [162, 49, 8]}, {"55060887": [48, 17]}, {"55060891": [2, 52, 2]}, {"55060895": [69, 52, 2]}, {"55060899": [70, 3, 224]}, {"55060903": [8]}, {"55060908": [144, 136]}, {"55060911": [162, 49, 8]}, {"55060915": [6, 17]}, {"55060919": [2, 52, 2]}, {"55060923": [55, 52, 2]}, {"55060927": [56, 3, 224]}, {"55060931": [8]}, {"55060936": [144, 136]}, {"55060939": [161, 49, 8]}, {"55060943": [32, 17]}, {"55060947": [2, 52, 2]}, {"55060951": [121, 52, 2]}, {"55060955": [122, 3, 224]}, {"55060959": [8]}, {"55060964": [144, 136]}, {"55060967": [161, 49, 8]}, {"55060971": [4, 17]}, {"55060975": [2, 52, 2]}, {"55060979": [119, 52, 2]}, {"55060983": [120, 3, 224]}, {"55060987": [8]}, {"55060992": [144, 136]}, {"55060995": [50, 17]}, {"55060999": [2, 52, 2]}, {"55061003": [192, 52, 2]}, {"55061007": [193, 3, 224]}, {"55061011": [8]}, {"55061016": [144, 136]}, {"55061019": [163, 49, 8]}, {"55061023": [3, 17]}, {"55061027": [2, 52, 2]}, {"55061031": [77, 52, 162]}, {"55061036": [3, 224]}, {"55061039": [8]}, {"55061044": [144, 136]}, {"55061047": [163, 49, 8]}, {"55061051": [24, 17]}, {"55061055": [2, 52, 2]}, {"55061059": [77, 52, 162]}, {"55061064": [3, 224]}, {"55061067": [8]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [52, 8]}, {"55061083": [1, 160, 136]}, {"55061087": [62, 3, 224]}, {"55061091": [8]}, {"55061096": [36, 136]}, {"55061099": [134, 36, 9, 255, 255, 37, 41]}, {"55061107": [1, 52, 1]}, {"55061111": [3]}, {"55061113": [41, 8, 42, 20, 32]}, {"55061119": [7]}, {"55061124": [1, 9, 80, 33, 145, 75]}, {"55061132": [52, 1]}, {"55061135": [255, 21, 97, 255, 247]}, {"55061144": [161, 69]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [36, 136]}, {"55061159": [168, 1, 6, 64, 33, 145, 9]}, {"55061168": [1, 37, 72, 37, 161, 9]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [36, 136]}, {"55061187": [188, 1, 5, 64, 33, 129, 9]}, {"55061196": [5, 33]}, {"55061199": [2]}, {"55061204": [52, 9]}, {"55061208": [37, 41]}, {"55061211": [1, 161, 9]}, {"55061216": [3, 224]}, {"55061219": [8]}, {"55061224": [52, 8]}, {"55061227": [1, 160, 136]}, {"55061231": [61, 148, 136]}, {"55061235": [46]}, {"55061237": [8, 65, 2, 160, 136]}, {"55061243": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061255": [8]}, {"55061260": [52, 8]}, {"55061263": [1, 160, 136]}, {"55061267": [50, 160, 136]}, {"55061271": [58, 52, 8]}, {"55061275": [48, 164, 136, 19, 244, 160, 136]}, {"55061283": [51, 3, 224]}, {"55061287": [8]}, {"55061292": [52, 8]}, {"55061295": [2, 160, 136]}, {"55061299": [50, 52, 8]}, {"55061303": [1, 160, 136]}, {"55061307": [58, 160, 136]}, {"55061311": [60, 52, 8]}, {"55061315": [96, 164, 136, 19, 244, 160, 136]}, {"55061323": [51, 3, 224]}, {"55061327": [8]}, {"55061332": [175, 164]}, {"55061335": [104, 175, 165]}, {"55061339": [108, 175, 166]}, {"55061343": [112, 175, 167]}, {"55061347": [116, 39, 189, 255, 232, 175, 163]}, {"55061355": [16, 175, 191]}, {"55061359": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061372": [17]}, {"55061375": [10]}, {"55061380": [60, 9, 128, 65, 52, 10]}, {"55061387": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061416": [143, 163]}, {"55061419": [16, 143, 191]}, {"55061423": [20, 39, 189]}, {"55061427": [24, 143, 164]}, {"55061431": [104, 143, 165]}, {"55061435": [108, 143, 166]}, {"55061439": [112, 143, 167]}, {"55061443": [116, 132, 110, 19, 196, 3, 224]}, {"55061451": [8]}, {"55061456": [147, 25]}, {"55061459": [116, 52, 1]}, {"55061463": [255, 23, 33]}, {"55061467": [2]}, {"55061472": [52, 25]}, {"55061475": [44, 3, 224]}, {"55061479": [8, 167, 185]}, {"55061483": [154, 147, 44]}, {"55061487": [116, 52, 1]}, {"55061491": [255, 21, 129]}, {"55061495": [2]}, {"55061500": [52, 12]}, {"55061503": [44, 3, 224]}, {"55061507": [8]}, {"55061512": [145, 174]}, {"55061515": [116, 52, 1]}, {"55061519": [255, 21, 193]}, {"55061523": [2]}, {"55061528": [52, 14]}, {"55061531": [44, 3, 224]}, {"55061535": [8, 167, 174]}, {"55061539": [154, 145, 207]}, {"55061543": [116, 52, 1]}, {"55061547": [255, 21, 225]}, {"55061551": [2]}, {"55061556": [52, 15]}, {"55061559": [44, 3, 224]}, {"55061563": [8, 167, 175]}, {"55061567": [154, 141, 9]}, {"55061571": [4, 17, 32]}, {"55061575": [7]}, {"55061580": [145, 9]}, {"55061583": [104, 52, 1]}, {"55061587": [59, 17, 33]}, {"55061591": [2]}, {"55061596": [52, 9]}, {"55061599": [255, 161, 9]}, {"55061603": [64, 3, 224]}, {"55061607": [8, 161, 14]}, {"55061611": [104]}] \ No newline at end of file From 819651bb4d1c5d13bd422fc60f384b0c74c6c1ba Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sun, 3 Jun 2018 04:56:30 -0400 Subject: [PATCH 082/151] Fix child getting adult swords on B --- ASM/src/fixes.asm | 12 ++++++++++++ ASM/src/hacks.asm | 11 ++++++++--- Rom.py | 6 ------ data/base2current.json | 2 +- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ASM/src/fixes.asm b/ASM/src/fixes.asm index 88af94d2c..6501a7077 100755 --- a/ASM/src/fixes.asm +++ b/ASM/src/fixes.asm @@ -1,3 +1,15 @@ +restore_swordless_flag: + li v1, 0xFF + bne t6, v1, @@return + nop + li v1, 1 + sb v1, 0x0F33 (a1) ; If restoring 0xFF to B equip, set the swordless flag +@@return: + jr ra + lw ra, -0x04 (sp) + +;================================================================================================== + save_child_b_equip: ; t0 = save context lw t1, 0x04 (t0) diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 8b08d116e..d6513fb6b 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -14,11 +14,16 @@ .org 0xAE57A8 ; In memory: 0x8006F848 nop -; Adult -> Child: Don't skip restoring child's B equip if 0xFF is the saved value +; Adult -> Child: Don't skip restoring child's B equip if 0xFF is the saved value, and set the +; swordless flag if needed ; Replaces: +; addiu v1, r0, 0x00FF ; beq v1, t6, 0x8006FA28 -.org 0xAE58F8 ; In memory: 0x8006F998 - nop +; sh v0, 0x0052 (a1) +.org 0xAE58F4 ; In memory: 0x8006F994 + sw ra, -0x04 (sp) + jal restore_swordless_flag + sh v0, 0x0052 (a1) ; Child -> Adult: Save the child's B equip before it gets overwritten ; Replaces: diff --git a/Rom.py b/Rom.py index 89f638411..ca6dceb55 100644 --- a/Rom.py +++ b/Rom.py @@ -826,12 +826,6 @@ def patch_rom(world, rom): rom.write_bytes(0xDBF428, [0x0C, 0x10, 0x03, 0x00]) #Set Fishing Hook rom.write_bytes(0xBD1F68, [0x0C, 0x10, 0x03, 0x10]) #Set hook for Ganondorf laugh - # Sticks on B fix - rom.write_bytes(0xAE4B14, [0x0C, 0x10, 0x02, 0x74]) - Block_code = [0x90, 0xCE, 0x13, 0xE2, 0x15, 0xC0, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, - 0x25, 0xCE, 0x00, 0xFF, 0xA0, 0xC8, 0x0F, 0x33, 0x03, 0xE0, 0x00, 0x08] - rom.write_bytes(0x34809D0, Block_code) - # Progressive Fairies (changes magic meter fairy cutscenes based on current magic level) Block_code = [0x3C, 0x0A, 0x80, 0x12, 0x21, 0x4A, 0xA5, 0xD0, 0x81, 0x4A, 0x00, 0x32, 0x3C, 0x0F, 0x80, 0x1D, 0x21, 0xEF, 0xA1, 0xC8, 0x24, 0x0B, 0x00, 0x01, diff --git a/data/base2current.json b/data/base2current.json index d37862d54..d1872f81a 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426040": [0, 0]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 16]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 251, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 2, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 9, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 244, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 213, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 212, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 228, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 88, 128, 64, 40, 204, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 232, 128, 64, 40, 204, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 12, 128, 64, 42]}, {"55059492": [79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 44, 128, 64, 40, 204, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 18]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 226]}, {"55060320": [36, 1, 255, 255, 16, 65]}, {"55060327": [4]}, {"55060332": [52, 68]}, {"55060336": [12, 16, 10, 5]}, {"55060344": [143, 191]}, {"55060347": [16, 39, 189]}, {"55060351": [24, 3, 224]}, {"55060355": [8]}, {"55060360": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060371": [164, 52, 8]}, {"55060376": [52, 137]}, {"55060380": [148, 170]}, {"55060384": [52, 1]}, {"55060387": [10, 21, 65]}, {"55060391": [7]}, {"55060396": [52, 1]}, {"55060399": [16, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 8]}, {"55060411": [1, 148, 169]}, {"55060415": [28, 49, 41]}, {"55060419": [31, 52, 1]}, {"55060423": [21, 21, 65]}, {"55060427": [12]}, {"55060432": [52, 1]}, {"55060435": [62, 16, 129]}, {"55060439": [7]}, {"55060444": [52, 1]}, {"55060447": [66, 16, 129]}, {"55060451": [4]}, {"55060456": [36, 2, 255, 255, 16]}, {"55060463": [7]}, {"55060468": [52, 8]}, {"55060471": [2, 144, 169, 1, 65]}, {"55060477": [2, 18]}, {"55060481": [72, 16, 37]}, {"55060485": [2, 18]}, {"55060489": [73, 16, 37, 3, 224]}, {"55060495": [8]}, {"55060500": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060515": [4, 141, 9]}, {"55060520": [17, 32]}, {"55060523": [5]}, {"55060529": [9, 82, 2, 21, 68, 255, 250]}, {"55060540": [49, 34]}, {"55060543": [255, 3, 224]}, {"55060547": [8]}, {"55060552": [39, 189, 255, 224, 175, 176]}, {"55060559": [16, 175, 177]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 52, 130]}, {"55060572": [52, 80]}, {"55060576": [38, 8, 255, 128, 5]}, {"55060583": [18]}, {"55060588": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060599": [16, 1, 9]}, {"55060603": [24]}, {"55060606": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060624": [142, 40]}, {"55060627": [12, 1]}, {"55060630": [248, 9]}, {"55060636": [20, 80, 255, 239]}, {"55060644": [54, 35]}, {"55060648": [16]}, {"55060651": [2]}, {"55060656": [52, 3]}, {"55060660": [143, 176]}, {"55060663": [16, 143, 177]}, {"55060667": [20, 143, 191]}, {"55060671": [24, 39, 189]}, {"55060675": [32, 3, 224]}, {"55060679": [8]}, {"55060684": [3, 224]}, {"55060687": [8, 52, 162]}, {"55060692": [144, 136]}, {"55060695": [125, 52, 1]}, {"55060699": [255, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [8, 52, 2]}, {"55060711": [9, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [192, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [84, 52, 1]}, {"55060739": [64, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [53, 52, 2]}, {"55060751": [54, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [163, 49, 8]}, {"55060767": [24, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [50, 52, 1]}, {"55060779": [8, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [51, 52, 2]}, {"55060791": [52, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [163, 49, 8]}, {"55060807": [3, 17]}, {"55060811": [5, 52, 2]}, {"55060815": [4, 52, 1]}, {"55060819": [1, 17, 1]}, {"55060823": [2, 52, 2]}, {"55060827": [48, 52, 2]}, {"55060831": [49, 3, 224]}, {"55060835": [8]}, {"55060840": [144, 136]}, {"55060843": [162, 49, 8]}, {"55060847": [192, 17]}, {"55060851": [5, 52, 2]}, {"55060855": [5, 52, 1]}, {"55060859": [64, 17, 1]}, {"55060863": [2, 52, 2]}, {"55060867": [96, 52, 2]}, {"55060871": [123, 3, 224]}, {"55060875": [8]}, {"55060880": [144, 136]}, {"55060883": [162, 49, 8]}, {"55060887": [48, 17]}, {"55060891": [2, 52, 2]}, {"55060895": [69, 52, 2]}, {"55060899": [70, 3, 224]}, {"55060903": [8]}, {"55060908": [144, 136]}, {"55060911": [162, 49, 8]}, {"55060915": [6, 17]}, {"55060919": [2, 52, 2]}, {"55060923": [55, 52, 2]}, {"55060927": [56, 3, 224]}, {"55060931": [8]}, {"55060936": [144, 136]}, {"55060939": [161, 49, 8]}, {"55060943": [32, 17]}, {"55060947": [2, 52, 2]}, {"55060951": [121, 52, 2]}, {"55060955": [122, 3, 224]}, {"55060959": [8]}, {"55060964": [144, 136]}, {"55060967": [161, 49, 8]}, {"55060971": [4, 17]}, {"55060975": [2, 52, 2]}, {"55060979": [119, 52, 2]}, {"55060983": [120, 3, 224]}, {"55060987": [8]}, {"55060992": [144, 136]}, {"55060995": [50, 17]}, {"55060999": [2, 52, 2]}, {"55061003": [192, 52, 2]}, {"55061007": [193, 3, 224]}, {"55061011": [8]}, {"55061016": [144, 136]}, {"55061019": [163, 49, 8]}, {"55061023": [3, 17]}, {"55061027": [2, 52, 2]}, {"55061031": [77, 52, 162]}, {"55061036": [3, 224]}, {"55061039": [8]}, {"55061044": [144, 136]}, {"55061047": [163, 49, 8]}, {"55061051": [24, 17]}, {"55061055": [2, 52, 2]}, {"55061059": [77, 52, 162]}, {"55061064": [3, 224]}, {"55061067": [8]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [52, 8]}, {"55061083": [1, 160, 136]}, {"55061087": [62, 3, 224]}, {"55061091": [8]}, {"55061096": [36, 136]}, {"55061099": [134, 36, 9, 255, 255, 37, 41]}, {"55061107": [1, 52, 1]}, {"55061111": [3]}, {"55061113": [41, 8, 42, 20, 32]}, {"55061119": [7]}, {"55061124": [1, 9, 80, 33, 145, 75]}, {"55061132": [52, 1]}, {"55061135": [255, 21, 97, 255, 247]}, {"55061144": [161, 69]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [36, 136]}, {"55061159": [168, 1, 6, 64, 33, 145, 9]}, {"55061168": [1, 37, 72, 37, 161, 9]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [36, 136]}, {"55061187": [188, 1, 5, 64, 33, 129, 9]}, {"55061196": [5, 33]}, {"55061199": [2]}, {"55061204": [52, 9]}, {"55061208": [37, 41]}, {"55061211": [1, 161, 9]}, {"55061216": [3, 224]}, {"55061219": [8]}, {"55061224": [52, 8]}, {"55061227": [1, 160, 136]}, {"55061231": [61, 148, 136]}, {"55061235": [46]}, {"55061237": [8, 65, 2, 160, 136]}, {"55061243": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061255": [8]}, {"55061260": [52, 8]}, {"55061263": [1, 160, 136]}, {"55061267": [50, 160, 136]}, {"55061271": [58, 52, 8]}, {"55061275": [48, 164, 136, 19, 244, 160, 136]}, {"55061283": [51, 3, 224]}, {"55061287": [8]}, {"55061292": [52, 8]}, {"55061295": [2, 160, 136]}, {"55061299": [50, 52, 8]}, {"55061303": [1, 160, 136]}, {"55061307": [58, 160, 136]}, {"55061311": [60, 52, 8]}, {"55061315": [96, 164, 136, 19, 244, 160, 136]}, {"55061323": [51, 3, 224]}, {"55061327": [8]}, {"55061332": [175, 164]}, {"55061335": [104, 175, 165]}, {"55061339": [108, 175, 166]}, {"55061343": [112, 175, 167]}, {"55061347": [116, 39, 189, 255, 232, 175, 163]}, {"55061355": [16, 175, 191]}, {"55061359": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061372": [17]}, {"55061375": [10]}, {"55061380": [60, 9, 128, 65, 52, 10]}, {"55061387": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061416": [143, 163]}, {"55061419": [16, 143, 191]}, {"55061423": [20, 39, 189]}, {"55061427": [24, 143, 164]}, {"55061431": [104, 143, 165]}, {"55061435": [108, 143, 166]}, {"55061439": [112, 143, 167]}, {"55061443": [116, 132, 110, 19, 196, 3, 224]}, {"55061451": [8]}, {"55061456": [147, 25]}, {"55061459": [116, 52, 1]}, {"55061463": [255, 23, 33]}, {"55061467": [2]}, {"55061472": [52, 25]}, {"55061475": [44, 3, 224]}, {"55061479": [8, 167, 185]}, {"55061483": [154, 147, 44]}, {"55061487": [116, 52, 1]}, {"55061491": [255, 21, 129]}, {"55061495": [2]}, {"55061500": [52, 12]}, {"55061503": [44, 3, 224]}, {"55061507": [8]}, {"55061512": [145, 174]}, {"55061515": [116, 52, 1]}, {"55061519": [255, 21, 193]}, {"55061523": [2]}, {"55061528": [52, 14]}, {"55061531": [44, 3, 224]}, {"55061535": [8, 167, 174]}, {"55061539": [154, 145, 207]}, {"55061543": [116, 52, 1]}, {"55061547": [255, 21, 225]}, {"55061551": [2]}, {"55061556": [52, 15]}, {"55061559": [44, 3, 224]}, {"55061563": [8, 167, 175]}, {"55061567": [154, 141, 9]}, {"55061571": [4, 17, 32]}, {"55061575": [7]}, {"55061580": [145, 9]}, {"55061583": [104, 52, 1]}, {"55061587": [59, 17, 33]}, {"55061591": [2]}, {"55061596": [52, 9]}, {"55061599": [255, 161, 9]}, {"55061603": [64, 3, 224]}, {"55061607": [8, 161, 14]}, {"55061611": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [175, 191, 255, 252, 12, 16, 11, 16]}, {"11427700": [12, 16, 11, 23]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 251, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 2, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 9, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 244, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 213, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 212, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 228, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 88, 128, 64, 40, 204, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 232, 128, 64, 40, 204, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 12, 128, 64, 42]}, {"55059492": [79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 44, 128, 64, 40, 204, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 18]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 226]}, {"55060320": [36, 1, 255, 255, 16, 65]}, {"55060327": [4]}, {"55060332": [52, 68]}, {"55060336": [12, 16, 10, 5]}, {"55060344": [143, 191]}, {"55060347": [16, 39, 189]}, {"55060351": [24, 3, 224]}, {"55060355": [8]}, {"55060360": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060371": [164, 52, 8]}, {"55060376": [52, 137]}, {"55060380": [148, 170]}, {"55060384": [52, 1]}, {"55060387": [10, 21, 65]}, {"55060391": [7]}, {"55060396": [52, 1]}, {"55060399": [16, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 8]}, {"55060411": [1, 148, 169]}, {"55060415": [28, 49, 41]}, {"55060419": [31, 52, 1]}, {"55060423": [21, 21, 65]}, {"55060427": [12]}, {"55060432": [52, 1]}, {"55060435": [62, 16, 129]}, {"55060439": [7]}, {"55060444": [52, 1]}, {"55060447": [66, 16, 129]}, {"55060451": [4]}, {"55060456": [36, 2, 255, 255, 16]}, {"55060463": [7]}, {"55060468": [52, 8]}, {"55060471": [2, 144, 169, 1, 65]}, {"55060477": [2, 18]}, {"55060481": [72, 16, 37]}, {"55060485": [2, 18]}, {"55060489": [73, 16, 37, 3, 224]}, {"55060495": [8]}, {"55060500": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060515": [4, 141, 9]}, {"55060520": [17, 32]}, {"55060523": [5]}, {"55060529": [9, 82, 2, 21, 68, 255, 250]}, {"55060540": [49, 34]}, {"55060543": [255, 3, 224]}, {"55060547": [8]}, {"55060552": [39, 189, 255, 224, 175, 176]}, {"55060559": [16, 175, 177]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 52, 130]}, {"55060572": [52, 80]}, {"55060576": [38, 8, 255, 128, 5]}, {"55060583": [18]}, {"55060588": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060599": [16, 1, 9]}, {"55060603": [24]}, {"55060606": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060624": [142, 40]}, {"55060627": [12, 1]}, {"55060630": [248, 9]}, {"55060636": [20, 80, 255, 239]}, {"55060644": [54, 35]}, {"55060648": [16]}, {"55060651": [2]}, {"55060656": [52, 3]}, {"55060660": [143, 176]}, {"55060663": [16, 143, 177]}, {"55060667": [20, 143, 191]}, {"55060671": [24, 39, 189]}, {"55060675": [32, 3, 224]}, {"55060679": [8]}, {"55060684": [3, 224]}, {"55060687": [8, 52, 162]}, {"55060692": [144, 136]}, {"55060695": [125, 52, 1]}, {"55060699": [255, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [8, 52, 2]}, {"55060711": [9, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [192, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [84, 52, 1]}, {"55060739": [64, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [53, 52, 2]}, {"55060751": [54, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [163, 49, 8]}, {"55060767": [24, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [50, 52, 1]}, {"55060779": [8, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [51, 52, 2]}, {"55060791": [52, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [163, 49, 8]}, {"55060807": [3, 17]}, {"55060811": [5, 52, 2]}, {"55060815": [4, 52, 1]}, {"55060819": [1, 17, 1]}, {"55060823": [2, 52, 2]}, {"55060827": [48, 52, 2]}, {"55060831": [49, 3, 224]}, {"55060835": [8]}, {"55060840": [144, 136]}, {"55060843": [162, 49, 8]}, {"55060847": [192, 17]}, {"55060851": [5, 52, 2]}, {"55060855": [5, 52, 1]}, {"55060859": [64, 17, 1]}, {"55060863": [2, 52, 2]}, {"55060867": [96, 52, 2]}, {"55060871": [123, 3, 224]}, {"55060875": [8]}, {"55060880": [144, 136]}, {"55060883": [162, 49, 8]}, {"55060887": [48, 17]}, {"55060891": [2, 52, 2]}, {"55060895": [69, 52, 2]}, {"55060899": [70, 3, 224]}, {"55060903": [8]}, {"55060908": [144, 136]}, {"55060911": [162, 49, 8]}, {"55060915": [6, 17]}, {"55060919": [2, 52, 2]}, {"55060923": [55, 52, 2]}, {"55060927": [56, 3, 224]}, {"55060931": [8]}, {"55060936": [144, 136]}, {"55060939": [161, 49, 8]}, {"55060943": [32, 17]}, {"55060947": [2, 52, 2]}, {"55060951": [121, 52, 2]}, {"55060955": [122, 3, 224]}, {"55060959": [8]}, {"55060964": [144, 136]}, {"55060967": [161, 49, 8]}, {"55060971": [4, 17]}, {"55060975": [2, 52, 2]}, {"55060979": [119, 52, 2]}, {"55060983": [120, 3, 224]}, {"55060987": [8]}, {"55060992": [144, 136]}, {"55060995": [50, 17]}, {"55060999": [2, 52, 2]}, {"55061003": [192, 52, 2]}, {"55061007": [193, 3, 224]}, {"55061011": [8]}, {"55061016": [144, 136]}, {"55061019": [163, 49, 8]}, {"55061023": [3, 17]}, {"55061027": [2, 52, 2]}, {"55061031": [77, 52, 162]}, {"55061036": [3, 224]}, {"55061039": [8]}, {"55061044": [144, 136]}, {"55061047": [163, 49, 8]}, {"55061051": [24, 17]}, {"55061055": [2, 52, 2]}, {"55061059": [77, 52, 162]}, {"55061064": [3, 224]}, {"55061067": [8]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [52, 8]}, {"55061083": [1, 160, 136]}, {"55061087": [62, 3, 224]}, {"55061091": [8]}, {"55061096": [36, 136]}, {"55061099": [134, 36, 9, 255, 255, 37, 41]}, {"55061107": [1, 52, 1]}, {"55061111": [3]}, {"55061113": [41, 8, 42, 20, 32]}, {"55061119": [7]}, {"55061124": [1, 9, 80, 33, 145, 75]}, {"55061132": [52, 1]}, {"55061135": [255, 21, 97, 255, 247]}, {"55061144": [161, 69]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [36, 136]}, {"55061159": [168, 1, 6, 64, 33, 145, 9]}, {"55061168": [1, 37, 72, 37, 161, 9]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [36, 136]}, {"55061187": [188, 1, 5, 64, 33, 129, 9]}, {"55061196": [5, 33]}, {"55061199": [2]}, {"55061204": [52, 9]}, {"55061208": [37, 41]}, {"55061211": [1, 161, 9]}, {"55061216": [3, 224]}, {"55061219": [8]}, {"55061224": [52, 8]}, {"55061227": [1, 160, 136]}, {"55061231": [61, 148, 136]}, {"55061235": [46]}, {"55061237": [8, 65, 2, 160, 136]}, {"55061243": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061255": [8]}, {"55061260": [52, 8]}, {"55061263": [1, 160, 136]}, {"55061267": [50, 160, 136]}, {"55061271": [58, 52, 8]}, {"55061275": [48, 164, 136, 19, 244, 160, 136]}, {"55061283": [51, 3, 224]}, {"55061287": [8]}, {"55061292": [52, 8]}, {"55061295": [2, 160, 136]}, {"55061299": [50, 52, 8]}, {"55061303": [1, 160, 136]}, {"55061307": [58, 160, 136]}, {"55061311": [60, 52, 8]}, {"55061315": [96, 164, 136, 19, 244, 160, 136]}, {"55061323": [51, 3, 224]}, {"55061327": [8]}, {"55061332": [175, 164]}, {"55061335": [104, 175, 165]}, {"55061339": [108, 175, 166]}, {"55061343": [112, 175, 167]}, {"55061347": [116, 39, 189, 255, 232, 175, 163]}, {"55061355": [16, 175, 191]}, {"55061359": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061372": [17]}, {"55061375": [10]}, {"55061380": [60, 9, 128, 65, 52, 10]}, {"55061387": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061416": [143, 163]}, {"55061419": [16, 143, 191]}, {"55061423": [20, 39, 189]}, {"55061427": [24, 143, 164]}, {"55061431": [104, 143, 165]}, {"55061435": [108, 143, 166]}, {"55061439": [112, 143, 167]}, {"55061443": [116, 132, 110, 19, 196, 3, 224]}, {"55061451": [8]}, {"55061456": [147, 25]}, {"55061459": [116, 52, 1]}, {"55061463": [255, 23, 33]}, {"55061467": [2]}, {"55061472": [52, 25]}, {"55061475": [44, 3, 224]}, {"55061479": [8, 167, 185]}, {"55061483": [154, 147, 44]}, {"55061487": [116, 52, 1]}, {"55061491": [255, 21, 129]}, {"55061495": [2]}, {"55061500": [52, 12]}, {"55061503": [44, 3, 224]}, {"55061507": [8]}, {"55061512": [145, 174]}, {"55061515": [116, 52, 1]}, {"55061519": [255, 21, 193]}, {"55061523": [2]}, {"55061528": [52, 14]}, {"55061531": [44, 3, 224]}, {"55061535": [8, 167, 174]}, {"55061539": [154, 145, 207]}, {"55061543": [116, 52, 1]}, {"55061547": [255, 21, 225]}, {"55061551": [2]}, {"55061556": [52, 15]}, {"55061559": [44, 3, 224]}, {"55061563": [8, 167, 175]}, {"55061567": [154, 52, 3]}, {"55061571": [255, 21, 195]}, {"55061575": [3]}, {"55061580": [52, 3]}, {"55061583": [1, 160, 163, 15, 51, 3, 224]}, {"55061591": [8, 143, 191, 255, 252, 141, 9]}, {"55061599": [4, 17, 32]}, {"55061603": [7]}, {"55061608": [145, 9]}, {"55061611": [104, 52, 1]}, {"55061615": [59, 17, 33]}, {"55061619": [2]}, {"55061624": [52, 9]}, {"55061627": [255, 161, 9]}, {"55061631": [64, 3, 224]}, {"55061635": [8, 161, 14]}, {"55061639": [104]}] \ No newline at end of file From c6a801597eb851281ccd7626f2c886912c8a1104 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Sun, 3 Jun 2018 22:10:59 -0500 Subject: [PATCH 083/151] Death fix --- Rom.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Rom.py b/Rom.py index 89f638411..1492b27a4 100644 --- a/Rom.py +++ b/Rom.py @@ -651,9 +651,10 @@ def patch_rom(world, rom): rom.write_bytes(0xCC4024, [0x00, 0x00, 0x00, 0x00]) # Ganon gets the last laugh sometimes - Block_code = [0x3C, 0x01, 0x80, 0x12, 0x80, 0x21, 0xA6, 0x09, 0x30, 0x21, 0x00, 0x03, - 0x14, 0x01, 0x00, 0x02, 0x24, 0x05, 0x68, 0x0B, 0x24, 0x05, 0x39, 0xC7, - 0x08, 0x0E, 0x24, 0x04] + Block_code = [0x3C, 0x01, 0x80, 0x10, 0x80, 0x21, 0x54, 0x40, 0x30, 0x21, 0x00, 0x03, + 0x14, 0x01, 0x00, 0x06, 0x24, 0x05, 0x68, 0x0B, 0x3C, 0x01, 0x80, 0x12, + 0x80, 0x21, 0xA5, 0xD7, 0x00, 0x01, 0x09, 0x40, 0x24, 0x05, 0x39, 0xC7, + 0x00, 0xA1, 0x28, 0x23, 0x08, 0x0E, 0x24, 0x04] rom.write_bytes(0x3480C40, Block_code) @@ -824,7 +825,7 @@ def patch_rom(world, rom): rom.write_bytes(0xC89A34, [0x0C, 0x10, 0x02, 0x54, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at death mountain trail rom.write_bytes(0xC89A78, [0x0C, 0x10, 0x02, 0x60, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at crater rom.write_bytes(0xDBF428, [0x0C, 0x10, 0x03, 0x00]) #Set Fishing Hook - rom.write_bytes(0xBD1F68, [0x0C, 0x10, 0x03, 0x10]) #Set hook for Ganondorf laugh + rom.write_bytes(0xBD1F68, [0x0C, 0x22, 0xA0, 0xA8]) #Set hook for Ganondorf laugh # Sticks on B fix rom.write_bytes(0xAE4B14, [0x0C, 0x10, 0x02, 0x74]) From cd2405405ec90d269b2212ee21016788e64063d2 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 4 Jun 2018 04:40:20 -0400 Subject: [PATCH 084/151] Make all fairies give items, remove fairy entrance shuffle --- ASM/src/config.asm | 11 ++-- ASM/src/hacks.asm | 45 ++++++++++++--- ASM/src/items.asm | 47 +++++++++------ EntranceShuffle.py | 50 ++-------------- ItemList.py | 8 +-- Items.py | 3 +- Regions.py | 15 ++--- Rom.py | 127 ----------------------------------------- Rules.py | 1 + data/base2current.json | 2 +- 10 files changed, 95 insertions(+), 214 deletions(-) diff --git a/ASM/src/config.asm b/ASM/src/config.asm index 52a9d8f3a..58342eb94 100755 --- a/ASM/src/config.asm +++ b/ASM/src/config.asm @@ -20,10 +20,13 @@ ITEM_OVERRIDES: ; 0x03481400: Special items -FAIRY_ITEMS: -.byte 0x5D ; Farore's Wind Fairy -.byte 0x5C ; Din's Fire Fairy -.byte 0x5E ; Nayru's Love Fairy LIGHT_ARROW_ITEM: .byte 0x5A +FAIRY_ITEMS: +.byte 0x5D ; Zora's Domain +.byte 0x5C ; Hyrule Castle +.byte 0x5E ; Desert Colossus +.byte 0x51 ; Mountain Summit +.byte 0x52 ; Crater +.byte 0x53 ; Ganon's Castle .align 4 diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index d6513fb6b..85be9bf2c 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -144,14 +144,6 @@ jal every_frame nop -; Override cutscene for Great Fairy items -; Replaces: -; jal 0x8002049C -; addiu a1, r0, 0x0038 -.org 0xC89744 ; In memory: 0x801E3884 - jal override_item_fairy_cutscene - addiu a1, r0, 0x0038 - ; Override Light Arrow cutscene ; Replaces: ; addiu t8, r0, 0x0053 @@ -166,6 +158,43 @@ nop nop +; Make all Great Fairies give an item +; Replaces: +; jal 0x8002049C +; addiu a1, r0, 0x0038 +.org 0xC89744 ; In memory: 0x801E3884 + jal override_great_fairy_cutscene + addiu a1, r0, 0x0038 + +; Upgrade fairies check scene chest flags instead of magic/defense +; Mountain Summit Fairy +; Replaces: +; lbu t6, 0x3A (a1) +.org 0xC89868 ; In memory: 0x801E39A8 + lbu t6, 0x1D28 (s0) +; Crater Fairy +; Replaces: +; lbu t9, 0x3C (a1) +.org 0xC898A4 ; In memory: 0x801E39E4 + lbu t9, 0x1D29 (s0) +; Ganon's Castle Fairy +; Replaces: +; lbu t2, 0x3D (a1) +.org 0xC898C8 ; In memory: 0x801E3A08 + lbu t2, 0x1D2A (s0) + +; Upgrade fairies never check for magic meter +; Replaces: +; lbu t6, 0xA60A (t6) +.org 0xC892DC ; In memory: 0x801E341C + li t6, 1 + +; Item fairies never check for magic meter +; Replaces: +; lbu t2, 0xA60A (t2) +.org 0xC8931C ; In memory: 0x801E345C + li t2, 1 + ;================================================================================================== ; Menu hacks ;================================================================================================== diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 933153107..9e96fddcf 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -139,33 +139,48 @@ override_action: ;================================================================================================== -override_item_fairy_cutscene: +override_great_fairy_cutscene: ; a0 = global context ; a2 = fairy actor - lw t0, 0x1D2C (a0) ; Load switch flags + lw t0, 0x1D2C (a0) ; t0 = switch flags li t1, 1 - sll t1, t1, 0x18 - and v0, t0, t1 ; Isolate ZL switch - beqz v0, @@return + sll t1, t1, 0x18 ; t1 = ZL switch flag + and v0, t0, t1 + beqz v0, @@return ; Do nothing until ZL is played nop - lhu t2, 0xA4 (a0) ; Load scene number - bne t2, 0x3D, @@return ; Use default behavior unless this is an item fairy + lhu t2, 0x02DC (a2) ; Load fairy index + li t3, SAVE_CONTEXT + + lhu t4, 0xA4 (a0) ; Load scene number + beq t4, 0x3D, @@item_fairy + nop + + ; Handle upgrade fairies + addu t4, a0, t2 + lbu t5, 0x1D28 (t4) ; t5 = chest flag for this fairy + bnez t5, @@return ; Use default behavior if the item is already obtained + nop + li t5, 1 + sb t5, 0x1D28 (t4) ; Mark item as obtained + addiu t2, t2, 3 ; t2 = index of the item in FAIRY_ITEMS + b @@give_item nop - lhu t2, 0x02DC (a2) ; Load item fairy index - li t3, 1 - sllv t3, t3, t2 ; t3 = fairy item mask - li t4, SAVE_CONTEXT - lbu t5, 0x0EF2 (t4) ; Load fairy item flags - and t6, t5, t3 +@@item_fairy: + li t4, 1 + sllv t4, t4, t2 ; t4 = fairy item mask + lbu t5, 0x0EF2 (t3) ; t5 = fairy item flags + and t6, t5, t4 bnez t6, @@return ; Use default behavior if the item is already obtained nop - or t5, t5, t3 - sb t5, 0x0EF2 (t4) ; Mark fairy item as obtained + or t6, t5, t4 + sb t6, 0x0EF2 (t3) ; Mark item as obtained +@@give_item: + ; Unset ZL switch nor t1, t1, t1 - and t0, t0, t1 ; Unset ZL switch + and t0, t0, t1 sw t0, 0x1D2C (a0) ; Load fairy item and mark it as pending diff --git a/EntranceShuffle.py b/EntranceShuffle.py index bb49f1f6b..b1f86c8e6 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -12,15 +12,6 @@ def link_entrances(world): connect_simple(world, exitname, regionname) for exitname, regionname in default_dungeon_connections: connect_simple(world, exitname, regionname) - targets = list(Fairy_List) - destinations = list(Fairy_List) - random.shuffle(targets) - random.shuffle(destinations) - Fairy_Pairs = [] - for i in range (0, 6): - Fairy_Pairs.append((targets[i], destinations[i])) - for i in range (0, 6): - connect_fairy(world, Fairy_Pairs[i][0], Fairy_Pairs[i][1]) else: raise NotImplementedError('Shuffling not supported yet') @@ -81,14 +72,6 @@ def connect_doors(world, doors, targets): target = targets.pop() connect_entrance(world, door, target) - -def connect_fairy(world, entrancename, exitname): - entrance = world.get_entrance(entrancename) - exit = world.get_region(exitname) - - entrance.connect(exit, Fairy_addresses[entrance.name], Fairy_IDs[exit.name]) - world.spoiler.set_entrance(entrance.name, exit.name, 'both') - # these are connections that cannot be shuffled and always exist. They link together separate parts of the world we need to divide into regions mandatory_connections = [('Adult Forest Warp Pad', 'Forest Temple Entry Area'), ('Child Forest Warp Pad', 'Sacred Forest Meadow'), @@ -253,10 +236,13 @@ def connect_fairy(world, entrancename, exitname): ('Kokiri Shop', 'Kokiri Shop'), ('Lake Hylia Lab', 'Lake Hylia Lab'), ('Fishing Hole', 'Fishing Hole'), + ('Colossus Fairy', 'Colossus Fairy'), ('Temple of Time', 'Temple of Time'), ('Temple of Time Exit', 'Castle Town'), ('Door of Time', 'Beyond Door of Time'), ('Emerge as Adult', 'Temple of Time'), + ('Hyrule Castle Fairy', 'Hyrule Castle Fairy'), + ('Ganons Castle Fairy', 'Ganons Castle Fairy'), ('Castle Town Rupee Room', 'Castle Town Rupee Room'), ('Castle Town Bazaar', 'Castle Town Bazaar'), ('Castle Town Mask Shop', 'Castle Town Mask Shop'), @@ -281,11 +267,14 @@ def connect_fairy(world, entrancename, exitname): ('Heart Piece Grave', 'Heart Piece Grave'), ('Composer Grave', 'Composer Grave'), ('Dampes Grave', 'Dampes Grave'), + ('Crater Fairy', 'Crater Fairy'), + ('Mountain Summit Fairy', 'Mountain Summit Fairy'), ('Dampes House', 'Dampes House'), ('Talon House', 'Talon House'), ('Ingo Barn', 'Ingo Barn'), ('Lon Lon Corner Tower', 'Lon Lon Corner Tower'), ('Zora Shop', 'Zora Shop'), + ('Zoras Fountain Fairy', 'Zoras Fountain Fairy'), ('Kokiri Forest Storms Grotto', 'Kokiri Forest Storms Grotto'), ('Lost Woods Generic Grotto', 'Lost Woods Generic Grotto'), ('Deku Theater', 'Deku Theater'), @@ -338,30 +327,3 @@ def connect_fairy(world, entrancename, exitname): ('Rainbow Bridge', 'Ganons Castle Lobby'), ('Ganons Castle Exit', 'Ganons Castle Grounds') ] - -# Fairy Fountain exit IDs -# (entrance, exit) - -Fairy_List = ['Colossus Fairy', - 'Hyrule Castle Fairy', - 'Ganons Castle Fairy', - 'Crater Fairy', - 'Mountain Summit Fairy', - 'Zoras Fountain Fairy'] - -Fairy_IDs = {'Colossus Fairy': (0x0588, 0xBEFD82), - 'Hyrule Castle Fairy': (0x0578, 0xBEFD80), - 'Ganons Castle Fairy': (0x04C2, 0xBEFD6C), - 'Crater Fairy': (0x04BE, 0xBEFD6A), - 'Mountain Summit Fairy': (0x0315, 0xBEFD68), - 'Zoras Fountain Fairy': (0x0371, 0xBEFD7E)} - -# Fairy Fountain exit addresses -# (entrance, exit) - -Fairy_addresses = {'Colossus Fairy': (0x2186114, 0x218D644, 0x218D644, 0x057C), - 'Hyrule Castle Fairy': (0x21F60E0, 0x21F60E0, 0x21F60E0, 0x0340), - 'Ganons Castle Fairy': (0x292B0B4, 0x292B0B4, 0x292B0B4, 0x0340), - 'Crater Fairy': (0x22470FE, 0x224E31A, 0x224E31A, 0x0482), - 'Mountain Summit Fairy': (0x221D104, 0x222467C, 0x222467C, 0x045B), - 'Zoras Fountain Fairy': (0x21100F4, 0x2114624, 0x2114444, 0x0394)} \ No newline at end of file diff --git a/ItemList.py b/ItemList.py index 865aef85b..f75ccb1c7 100644 --- a/ItemList.py +++ b/ItemList.py @@ -10,7 +10,7 @@ alwaysitems = (['Kokiri Sword', 'Biggoron Sword', 'Boomerang', 'Lens of Truth', 'Hammer', 'Iron Boots', 'Goron Tunic', 'Zora Tunic', 'Hover Boots', 'Mirror Shield', 'Stone of Agony', 'Fire Arrows', 'Ice Arrows', 'Light Arrows', 'Dins Fire', 'Farores Wind', 'Nayrus Love', 'Rupee (1)'] + ['Progressive Hookshot'] * 2 + ['Deku Shield'] * 4 + ['Hylian Shield'] * 2 + ['Ice Trap'] * 6 + ['Progressive Strength Upgrade'] * 3 + ['Progressive Scale'] * 2 + ['Piece of Heart'] * 35 + ['Recovery Heart'] * 11 + ['Rupees (5)'] * 17 + ['Rupees (20)'] * 5 + ['Rupees (50)'] * 7 + ['Rupees (200)'] * 6 + ['Bow'] * 3 + ['Slingshot'] * 3 + ['Bomb Bag'] * 3 + ['Bottle with Letter'] + ['Heart Container'] * 8 + ['Piece of Heart (Treasure Chest Game)'] + - ['Bombs (5)'] * 2 + ['Bombs (10)'] * 2 + ['Bombs (20)'] * 2 + ['Bombchus (5)'] + ['Bombchus (10)'] * 3 + ['Bombchus (20)'] + ['Arrows (5)'] + ['Arrows (10)'] * 6 + ['Arrows (30)'] * 6 + ['Deku Nuts (5)'] + ['Deku Nuts (10)'] + ['Progressive Wallet'] * 2 + ['Deku Stick Capacity'] * 2 + ['Deku Nut Capacity'] * 2) + ['Bombs (5)'] * 2 + ['Bombs (10)'] * 2 + ['Bombs (20)'] * 2 + ['Bombchus (5)'] + ['Bombchus (10)'] * 3 + ['Bombchus (20)'] + ['Arrows (5)'] + ['Arrows (10)'] * 6 + ['Arrows (30)'] * 6 + ['Deku Nuts (5)'] + ['Deku Nuts (10)'] + ['Progressive Wallet'] * 2 + ['Deku Stick Capacity'] * 2 + ['Deku Nut Capacity'] * 2 + ['Magic Meter'] * 2 + ['Double Defense']) normal_bottles = ['Bottle', 'Bottle with Milk', 'Bottle with Red Potion', 'Bottle with Green Potion', 'Bottle with Blue Potion', 'Bottle with Fairy', 'Bottle with Fish', 'Bottle with Blue Fire', 'Bottle with Bugs', 'Bottle with Poe'] normal_bottle_count = 3 notmapcompass = ['Rupees (5)'] * 20 @@ -37,10 +37,6 @@ def generate_itempool(world): world.get_location('Gift from Saria').event = True world.push_item('Zeldas Letter', ItemFactory('Zeldas Letter'), False) world.get_location('Zeldas Letter').event = True - world.push_item('Mountain Summit Fairy Reward', ItemFactory('Magic Meter'), False) - world.get_location('Mountain Summit Fairy Reward').event = True - world.push_item('Crater Fairy Reward', ItemFactory('Magic Meter'), False) - world.get_location('Crater Fairy Reward').event = True world.push_item('Magic Bean Salesman', ItemFactory('Magic Bean'), False) world.get_location('Magic Bean Salesman').event = True world.push_item('King Zora Moves', ItemFactory('Bottle'), False) @@ -132,4 +128,4 @@ def fill_songs(world, attempts=15): continue break else: - raise FillError('Unable to place songs') \ No newline at end of file + raise FillError('Unable to place songs') diff --git a/Items.py b/Items.py index 70a31bd44..2eaca68f4 100644 --- a/Items.py +++ b/Items.py @@ -75,6 +75,8 @@ def ItemFactory(items): 'Progressive Wallet': (True, False, None, None, 0x85), 'Deku Stick Capacity': (False, False, None, None, 0x88), 'Deku Nut Capacity': (False, False, None, None, 0x87), + 'Magic Meter': (True, False, None, None, 0xC0), + 'Double Defense': (False, False, None, None, 0xC1), 'Stone of Agony': (True, False, None, 0x0720, 0x39), 'Piece of Heart': (False, False, None, 0x07C0, 0x3E), 'Heart Container': (False, False, None, 0x07A0, 0x3D), @@ -159,7 +161,6 @@ def ItemFactory(items): 'Serenade of Water': (True, False, 'Song', 0x04, 0x9), 'Nocturne of Shadow': (True, False, 'Song', 0x06, 0x7), 'Requiem of Spirit': (True, False, 'Song', 0x05, 0x8), - 'Magic Meter': (True, False, 'Event', None, None), 'Epona': (True, False, 'Event', None, None), 'Gerudo Membership Card': (True, False, 'Event', 0x0740, 0x3A), 'Gold Skulltulla Token': (True, False, 'Event', None, None), diff --git a/Regions.py b/Regions.py index f174039c2..a6777db83 100644 --- a/Regions.py +++ b/Regions.py @@ -57,7 +57,7 @@ def create_regions(world): create_ow_region('Hyrule Castle Garden', ['Zeldas Letter', 'Impa at Castle'], ['Hyrule Castle Garden Exit']), create_interior_region('Hyrule Castle Fairy', ['Hyrule Castle Fairy Reward']), create_ow_region('Ganons Castle Grounds', ['GS17'], ['Ganons Castle Grounds Exit', 'Ganons Castle Fairy', 'Rainbow Bridge']), - create_interior_region('Ganons Castle Fairy'), + create_interior_region('Ganons Castle Fairy', ['Ganons Castle Fairy Reward']), create_interior_region('Castle Town Rupee Room', ['10 Big Poes', 'GS14']), create_interior_region('Castle Town Bazaar'), create_interior_region('Castle Town Mask Shop'), @@ -384,12 +384,13 @@ def _create_region(name, type, locations=None, exits=None): 'Sheik at Colossus': (0x218C57D, 0x218C57D, 0x05, 'Song', None), 'Gift from Saria': (None, None, None, 'NPC', None), 'Zeldas Letter': (None, None, None, 'NPC', None), - 'Crater Fairy Reward': (None, None, None, 'Fairy', None), - 'Mountain Summit Fairy Reward': (None, None, None, 'Fairy', None), - 'Hyrule Castle Fairy Reward': (0x3481401, None, 0x5C, 'NPC', 0x3D), - 'Zoras Fountain Fairy Reward': (0x3481400, None, 0x5D, 'NPC', 0x3D), - 'Desert Colossus Fairy Reward': (0x3481402, None, 0x5E, 'NPC', 0x3D), - 'Zelda': (0x3481403, None, 0x5A, 'NPC', 0x43), + 'Zelda': (0x3481400, None, 0x5A, 'NPC', 0x43), + 'Zoras Fountain Fairy Reward': (0x3481401, None, 0x5D, 'NPC', 0x3D), + 'Hyrule Castle Fairy Reward': (0x3481402, None, 0x5C, 'NPC', 0x3D), + 'Desert Colossus Fairy Reward': (0x3481403, None, 0x5E, 'NPC', 0x3D), + 'Mountain Summit Fairy Reward': (0x3481404, None, 0x51, 'NPC', 0x3B), + 'Crater Fairy Reward': (0x3481405, None, 0x52, 'NPC', 0x3B), + 'Ganons Castle Fairy Reward': (0x3481406, None, 0x53, 'NPC', 0x3B), 'Treasure Chest Game': (None, None, 0x76, 'Special', 0x10), 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), diff --git a/Rom.py b/Rom.py index ca6dceb55..d1c10b164 100644 --- a/Rom.py +++ b/Rom.py @@ -164,19 +164,6 @@ def patch_rom(world, rom): rom.write_bytes(0xCD5E76, [0x0E, 0xDC]) rom.write_bytes(0xCD5E12, [0x0E, 0xDC]) - # Upgrade fairies never check for magic meter - rom.write_bytes(0xC892DC, [0x24,0x0E,0x00,0x01]) - - # Item fairies never check for magic meter - rom.write_bytes(0xC8931C, [0x24,0x0A,0x00,0x01]) - - # Magic meter fairies check for scene flags - rom.write_bytes(0xC8986A, [0x07, 0x4C]) - rom.write_bytes(0xC898A6, [0x07, 0x4D]) - - # Link no longer gets free magic meter from item fairies - rom.write_bytes(0xC8AFE8, [0x00, 0x00, 0x00, 0x00]) - # Cutscene for all medallions never triggers when leaving shadow or spirit temples(hopefully stops warp to colossus on shadow completion with boss reward shuffle) rom.write_byte(0xACA409, 0xAD) rom.write_byte(0xACA49D, 0xCE) @@ -401,94 +388,6 @@ def patch_rom(world, rom): rom.write_bytes(0x292D810, [0x00, 0x02, 0x00, 0x3C]) rom.write_bytes(0x292D924, [0xFF, 0xFF, 0x00, 0x14, 0x00, 0x96, 0xFF, 0xFF]) - # Speed Magic Meter Great Fairy - rom.write_bytes(0x2CF7136, [0x00, 0x70]) - rom.write_bytes(0x2CF7144, [0x00, 0x56]) - rom.write_bytes(0x2CF7171, [0x13, 0x00, 0x57]) - rom.write_bytes(0x2CF7299, [0x02, 0x00, 0x00, 0x00, 0x50]) - rom.write_bytes(0x2CF72C9, [0x03, 0x00, 0x51, 0x00, 0x52]) - rom.write_bytes(0x2CF72F9, [0x04, 0x00, 0x53, 0x00, 0x54]) - rom.write_bytes(0x2CF7329, [0x13, 0x00, 0x55, 0x00, 0x56]) - rom.write_bytes(0x2CF7359, [0x0A, 0x00, 0x57, 0x00, 0x59]) - rom.write_bytes(0x2CF7389, [0x07, 0x00, 0x5A, 0x00, 0x5B]) - rom.write_bytes(0x2CF73B9, [0x0D, 0x00, 0x5C, 0x00, 0x5D]) - rom.write_bytes(0x2CF8344, [0x00, 0x56]) - rom.write_bytes(0x2CF834C, [0x00, 0xDD, 0x00, 0x57, 0x00, 0x59]) - rom.write_bytes(0x2CF83AA, [0x00, 0x56, 0x00, 0x57]) - - # Speed Double Magic Meter Great Fairy - rom.write_bytes(0x2CF83E6, [0x00, 0x70]) - rom.write_bytes(0x2CF83F4, [0x00, 0x56]) - rom.write_bytes(0x2CF8421, [0x13, 0x00, 0x57]) - rom.write_bytes(0x2CF8549, [0x02, 0x00, 0x00, 0x00, 0x50]) - rom.write_bytes(0x2CF8579, [0x03, 0x00, 0x51, 0x00, 0x52]) - rom.write_bytes(0x2CF85A9, [0x05, 0x00, 0x53, 0x00, 0x54]) - rom.write_bytes(0x2CF85D9, [0x14, 0x00, 0x55, 0x00, 0x56]) - rom.write_bytes(0x2CF8609, [0x0B, 0x00, 0x57, 0x00, 0x59]) - rom.write_bytes(0x2CF8639, [0x07, 0x00, 0x5A, 0x00, 0x5B]) - rom.write_bytes(0x2CF8669, [0x0D, 0x00, 0x5C, 0x00, 0x5D]) - rom.write_bytes(0x2CF877C, [0x00, 0x56]) - rom.write_bytes(0x2CF8784, [0x00, 0xE4, 0x00, 0x57, 0x00, 0x59]) - rom.write_bytes(0x2CF87E2, [0x00, 0x56, 0x00, 0x57]) - - # Speed Double Defense Great Fairy - rom.write_bytes(0x2CF95D6, [0x00, 0x60]) - rom.write_bytes(0x2CF95E4, [0x00, 0x4A]) - rom.write_bytes(0x2CF9611, [0x13, 0x00, 0x4B]) - rom.write_bytes(0x2CF9739, [0x02, 0x00, 0x00, 0x00, 0x40]) - rom.write_bytes(0x2CF9769, [0x03, 0x00, 0x41, 0x00, 0x42]) - rom.write_bytes(0x2CF9799, [0x06, 0x00, 0x43, 0x00, 0x44]) - rom.write_bytes(0x2CF97C9, [0x15, 0x00, 0x45, 0x00, 0x46]) - rom.write_bytes(0x2CF97F9, [0x0C, 0x00, 0x47, 0x00, 0x49]) - rom.write_bytes(0x2CF9829, [0x12, 0x00, 0x4A, 0x00, 0x54]) - rom.write_bytes(0x2CF9859, [0x07, 0x00, 0x55, 0x00, 0x56]) - rom.write_bytes(0x2CF9889, [0x0D, 0x00, 0x57, 0x00, 0x58]) - rom.write_bytes(0x2CF999C, [0x00, 0x4A]) - rom.write_bytes(0x2CF99A4, [0x00, 0xE5, 0x00, 0x4B, 0x00, 0x53]) - rom.write_bytes(0x2CF9A02, [0x00, 0x4A, 0x00, 0x4B]) - - # Speed Zora Fountain Great Fairy - rom.write_bytes(0x2D20166, [0x00, 0x50]) - rom.write_bytes(0x2D20174, [0x00, 0x45]) - rom.write_bytes(0x2D201A1, [0x13, 0x00, 0x46]) - rom.write_bytes(0x2D20299, [0x02, 0x00, 0x00, 0x00, 0x40]) - rom.write_bytes(0x2D202C9, [0x03, 0x00, 0x41, 0x00, 0x42]) - rom.write_bytes(0x2D202F9, [0x04, 0x00, 0x43, 0x00, 0x44]) - rom.write_bytes(0x2D20329, [0x0E, 0x00, 0x45, 0x00, 0x46]) - rom.write_bytes(0x2D20359, [0x11, 0x00, 0x47, 0x00, 0x4A]) - rom.write_bytes(0x2D20389, [0x0D, 0x00, 0x4B, 0x00, 0x4C]) - rom.write_bytes(0x2D20552, [0x00, 0x45, 0x00, 0x46]) - rom.write_bytes(0x2D2058C, [0x00, 0x45]) - rom.write_bytes(0x2D20595, [0xAE, 0x00, 0x46, 0x00, 0x48]) - - # Speed Castle Great Fairy - rom.write_bytes(0x2D21026, [0x00, 0x50]) - rom.write_bytes(0x2D21034, [0x00, 0x45]) - rom.write_bytes(0x2D21061, [0x13, 0x00, 0x46]) - rom.write_bytes(0x2D21159, [0x02, 0x00, 0x00, 0x00, 0x40]) - rom.write_bytes(0x2D21189, [0x03, 0x00, 0x41, 0x00, 0x42]) - rom.write_bytes(0x2D211B9, [0x05, 0x00, 0x43, 0x00, 0x44]) - rom.write_bytes(0x2D211E9, [0x0F, 0x00, 0x45, 0x00, 0x46]) - rom.write_bytes(0x2D21219, [0x11, 0x00, 0x47, 0x00, 0x4A]) - rom.write_bytes(0x2D21249, [0x0D, 0x00, 0x4B, 0x00, 0x4C]) - rom.write_bytes(0x2D21E3A, [0x00, 0x45, 0x00, 0x46]) - rom.write_bytes(0x2D21E74, [0x00, 0x45]) - rom.write_bytes(0x2D21E7D, [0xAD, 0x00, 0x46, 0x00, 0x48]) - - # Speed Colossus Great Fairy - rom.write_bytes(0x2D21F46, [0x00, 0x50]) - rom.write_bytes(0x2D21F54, [0x00, 0x45]) - rom.write_bytes(0x2D21F81, [0x13, 0x00, 0x46]) - rom.write_bytes(0x2D22079, [0x02, 0x00, 0x00, 0x00, 0x40]) - rom.write_bytes(0x2D220A9, [0x03, 0x00, 0x41, 0x00, 0x42]) - rom.write_bytes(0x2D220D9, [0x06, 0x00, 0x43, 0x00, 0x44]) - rom.write_bytes(0x2D22109, [0x10, 0x00, 0x45, 0x00, 0x46]) - rom.write_bytes(0x2D22139, [0x11, 0x00, 0x47, 0x00, 0x4A]) - rom.write_bytes(0x2D22169, [0x0D, 0x00, 0x4B, 0x00, 0x4C]) - rom.write_bytes(0x2D22332, [0x00, 0x45, 0x00, 0x46]) - rom.write_bytes(0x2D2236C, [0x00, 0x45]) - rom.write_bytes(0x2D22375, [0xAF, 0x00, 0x46, 0x00, 0x48]) - # Remove remaining owls rom.write_bytes(0x1FE30CE, [0x01, 0x4B]) rom.write_bytes(0x1FE30DE, [0x01, 0x4B]) @@ -821,22 +720,9 @@ def patch_rom(world, rom): # Set hooks for various code # rom.write_bytes(0xBD6C94, ...) #Progressive Items Object Hook, unsure where this case is called rom.write_bytes(0xB06C2C, [0x0C, 0x10, 0x01, 0x80]) #Save Writing Hook - rom.write_bytes(0xC89A34, [0x0C, 0x10, 0x02, 0x54, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at death mountain trail - rom.write_bytes(0xC89A78, [0x0C, 0x10, 0x02, 0x60, 0x00, 0x00, 0x00, 0x00]) #Progessive magic meter from fairy at crater rom.write_bytes(0xDBF428, [0x0C, 0x10, 0x03, 0x00]) #Set Fishing Hook rom.write_bytes(0xBD1F68, [0x0C, 0x10, 0x03, 0x10]) #Set hook for Ganondorf laugh - # Progressive Fairies (changes magic meter fairy cutscenes based on current magic level) - Block_code = [0x3C, 0x0A, 0x80, 0x12, 0x21, 0x4A, 0xA5, 0xD0, 0x81, 0x4A, 0x00, 0x32, - 0x3C, 0x0F, 0x80, 0x1D, 0x21, 0xEF, 0xA1, 0xC8, 0x24, 0x0B, 0x00, 0x01, - 0x3C, 0x19, 0x80, 0x37, 0x11, 0x40, 0x00, 0x02, 0x23, 0x39, 0x6A, 0xB0, - 0x23, 0x39, 0x12, 0xB0, 0x03, 0xE0, 0x00, 0x08, 0xA1, 0xEB, 0x00, 0x00, - 0x3C, 0x0A, 0x80, 0x12, 0x21, 0x4A, 0xA5, 0xD0, 0x81, 0x4A, 0x00, 0x32, - 0x3C, 0x0F, 0x80, 0x1D, 0x21, 0xEF, 0xA1, 0xC8, 0x24, 0x0B, 0x00, 0x01, - 0x3C, 0x19, 0x80, 0x37, 0x11, 0x40, 0x00, 0x02, 0x23, 0x39, 0x6A, 0xB0, - 0x23, 0x39, 0x12, 0xB0, 0x03, 0xE0, 0x00, 0x08, 0xA1, 0xEB, 0x00, 0x01] - rom.write_bytes(0x3480950, Block_code) - # Write Initial Save File Block_code = [0xA2, 0x28, 0x80, 0x20, 0x24, 0x05, 0x80, 0x02, 0x24, 0x0F, 0x00, 0x84, 0x24, 0x18, 0x00, 0x01, 0x24, 0x19, 0x00, 0x08, 0x24, 0x08, 0x00, 0x80, @@ -1004,19 +890,6 @@ def patch_rom(world, rom): rom.write_bytes(0xCA3EA2, [item_data[item.name][3][0], item_data[item.name][3][1]]) rom.write_bytes(0xCA3EA6, [item_data[item.name][3][2], item_data[item.name][3][3]]) - # patch fairy entrances - for region in world.regions: - for exit in region.exits: - if exit.target is not None: - target1high = exit.target[0] >> 8 - target1low = exit.target[0] & 0x00FF - target2high = exit.addresses[3] >> 8 - target2low = exit.addresses[3] & 0x00FF - rom.write_bytes(exit.addresses[0], [target1high, target1low]) - rom.write_bytes(exit.addresses[1], [target1high, target1low]) - rom.write_bytes(exit.addresses[2], [target1high, target1low]) - rom.write_bytes(exit.target[1], [target2high, target2low]) - # patch tunic colors # Custom color tunic stuff Tunics = [] diff --git a/Rules.py b/Rules.py index d1819eca4..03c35a56c 100644 --- a/Rules.py +++ b/Rules.py @@ -115,6 +115,7 @@ def global_rules(world): set_rule(world.get_location('Hyrule Castle Fairy Reward'), lambda state: state.has('Zeldas Lullaby')) set_rule(world.get_entrance('Ganons Castle Grounds'), lambda state: state.is_adult()) set_rule(world.get_entrance('Ganons Castle Fairy'), lambda state: state.has('Progressive Strength Upgrade', 3)) + set_rule(world.get_location('Ganons Castle Fairy Reward'), lambda state: state.has('Zeldas Lullaby')) set_rule(world.get_location('Bombchu Bowling Bomb Bag'), lambda state: state.has('Bomb Bag')) set_rule(world.get_location('Bombchu Bowling Piece of Heart'), lambda state: state.has('Bomb Bag')) set_rule(world.get_location('Adult Shooting Gallery'), lambda state: state.has('Bow') and state.is_adult()) diff --git a/data/base2current.json b/data/base2current.json index d1872f81a..fe57381bd 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 151]}, {"11325064": [12, 16, 9, 143, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [175, 191, 255, 252, 12, 16, 11, 16]}, {"11427700": [12, 16, 11, 23]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 10, 251, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 2, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 9, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 244, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 213, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13145925": [16, 9, 109]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [93, 92, 94, 90]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 212, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 40, 240, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 24, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 64, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 104, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 144, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 172, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 200, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 80, 128, 64, 41, 228, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 104, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 164, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 192, 128, 64, 40, 204, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 88, 128, 64, 40, 204, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 80, 128, 64, 42, 24, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 80, 128, 64, 42, 52, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 80, 128, 64, 40, 204, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 42, 232, 128, 64, 40, 204, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 12, 128, 64, 42]}, {"55059492": [79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 44, 128, 64, 40, 204, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [27]}, {"55059916": [148, 138]}, {"55059919": [164, 52, 1]}, {"55059923": [61, 21, 65]}, {"55059927": [23]}, {"55059932": [148, 202, 2, 220, 52, 11]}, {"55059939": [1, 1, 75, 88, 4, 60, 12, 128, 18, 37, 140, 165, 208, 145, 141, 14, 242, 1, 171, 112, 36, 21, 192]}, {"55059963": [14]}, {"55059968": [1, 171, 104, 37, 161, 141, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20]}, {"55059996": [1, 10, 64, 33, 129, 8]}, {"55060004": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060016": [52, 2]}, {"55060020": [3, 224]}, {"55060023": [8]}, {"55060028": [60, 8, 128, 64, 37, 8, 20, 3, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060071": [16, 175, 163]}, {"55060075": [20, 175, 191]}, {"55060079": [24, 12, 16, 9, 164]}, {"55060088": [143, 162]}, {"55060091": [16, 143, 163]}, {"55060095": [20, 143, 191]}, {"55060099": [24, 39, 189]}, {"55060103": [32, 3, 224]}, {"55060107": [8]}, {"55060112": [39, 189, 255, 232, 175, 191]}, {"55060119": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060128": [173]}, {"55060132": [173]}, {"55060135": [4, 173]}, {"55060139": [8, 173]}, {"55060143": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060159": [32]}, {"55060165": [9, 15, 195, 1, 33, 32, 38]}, {"55060173": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 212]}, {"55060188": [4, 64]}, {"55060191": [24]}, {"55060196": [52, 68]}, {"55060200": [12, 16, 10, 18]}, {"55060208": [16, 96]}, {"55060211": [12]}, {"55060216": [60, 8, 128, 64, 37, 8, 32]}, {"55060224": [140, 105]}, {"55060228": [173, 9]}, {"55060232": [140, 105]}, {"55060235": [4, 173, 9]}, {"55060239": [4, 140, 105]}, {"55060243": [8, 173, 9]}, {"55060247": [8, 52, 9]}, {"55060251": [1, 173, 9]}, {"55060255": [12, 144, 98]}, {"55060260": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060275": [2]}, {"55060281": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060291": [16, 39, 189]}, {"55060295": [24, 3, 224]}, {"55060299": [8]}, {"55060304": [39, 189, 255, 232, 175, 191]}, {"55060311": [16, 12, 16, 9, 226]}, {"55060320": [36, 1, 255, 255, 16, 65]}, {"55060327": [4]}, {"55060332": [52, 68]}, {"55060336": [12, 16, 10, 5]}, {"55060344": [143, 191]}, {"55060347": [16, 39, 189]}, {"55060351": [24, 3, 224]}, {"55060355": [8]}, {"55060360": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060371": [164, 52, 8]}, {"55060376": [52, 137]}, {"55060380": [148, 170]}, {"55060384": [52, 1]}, {"55060387": [10, 21, 65]}, {"55060391": [7]}, {"55060396": [52, 1]}, {"55060399": [16, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 8]}, {"55060411": [1, 148, 169]}, {"55060415": [28, 49, 41]}, {"55060419": [31, 52, 1]}, {"55060423": [21, 21, 65]}, {"55060427": [12]}, {"55060432": [52, 1]}, {"55060435": [62, 16, 129]}, {"55060439": [7]}, {"55060444": [52, 1]}, {"55060447": [66, 16, 129]}, {"55060451": [4]}, {"55060456": [36, 2, 255, 255, 16]}, {"55060463": [7]}, {"55060468": [52, 8]}, {"55060471": [2, 144, 169, 1, 65]}, {"55060477": [2, 18]}, {"55060481": [72, 16, 37]}, {"55060485": [2, 18]}, {"55060489": [73, 16, 37, 3, 224]}, {"55060495": [8]}, {"55060500": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060515": [4, 141, 9]}, {"55060520": [17, 32]}, {"55060523": [5]}, {"55060529": [9, 82, 2, 21, 68, 255, 250]}, {"55060540": [49, 34]}, {"55060543": [255, 3, 224]}, {"55060547": [8]}, {"55060552": [39, 189, 255, 224, 175, 176]}, {"55060559": [16, 175, 177]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 52, 130]}, {"55060572": [52, 80]}, {"55060576": [38, 8, 255, 128, 5]}, {"55060583": [18]}, {"55060588": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060599": [16, 1, 9]}, {"55060603": [24]}, {"55060606": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060624": [142, 40]}, {"55060627": [12, 1]}, {"55060630": [248, 9]}, {"55060636": [20, 80, 255, 239]}, {"55060644": [54, 35]}, {"55060648": [16]}, {"55060651": [2]}, {"55060656": [52, 3]}, {"55060660": [143, 176]}, {"55060663": [16, 143, 177]}, {"55060667": [20, 143, 191]}, {"55060671": [24, 39, 189]}, {"55060675": [32, 3, 224]}, {"55060679": [8]}, {"55060684": [3, 224]}, {"55060687": [8, 52, 162]}, {"55060692": [144, 136]}, {"55060695": [125, 52, 1]}, {"55060699": [255, 17, 1]}, {"55060703": [2, 52, 2]}, {"55060707": [8, 52, 2]}, {"55060711": [9, 3, 224]}, {"55060715": [8]}, {"55060720": [144, 136]}, {"55060723": [163, 49, 8]}, {"55060727": [192, 17]}, {"55060731": [5, 52, 2]}, {"55060735": [84, 52, 1]}, {"55060739": [64, 17, 1]}, {"55060743": [2, 52, 2]}, {"55060747": [53, 52, 2]}, {"55060751": [54, 3, 224]}, {"55060755": [8]}, {"55060760": [144, 136]}, {"55060763": [163, 49, 8]}, {"55060767": [24, 17]}, {"55060771": [5, 52, 2]}, {"55060775": [50, 52, 1]}, {"55060779": [8, 17, 1]}, {"55060783": [2, 52, 2]}, {"55060787": [51, 52, 2]}, {"55060791": [52, 3, 224]}, {"55060795": [8]}, {"55060800": [144, 136]}, {"55060803": [163, 49, 8]}, {"55060807": [3, 17]}, {"55060811": [5, 52, 2]}, {"55060815": [4, 52, 1]}, {"55060819": [1, 17, 1]}, {"55060823": [2, 52, 2]}, {"55060827": [48, 52, 2]}, {"55060831": [49, 3, 224]}, {"55060835": [8]}, {"55060840": [144, 136]}, {"55060843": [162, 49, 8]}, {"55060847": [192, 17]}, {"55060851": [5, 52, 2]}, {"55060855": [5, 52, 1]}, {"55060859": [64, 17, 1]}, {"55060863": [2, 52, 2]}, {"55060867": [96, 52, 2]}, {"55060871": [123, 3, 224]}, {"55060875": [8]}, {"55060880": [144, 136]}, {"55060883": [162, 49, 8]}, {"55060887": [48, 17]}, {"55060891": [2, 52, 2]}, {"55060895": [69, 52, 2]}, {"55060899": [70, 3, 224]}, {"55060903": [8]}, {"55060908": [144, 136]}, {"55060911": [162, 49, 8]}, {"55060915": [6, 17]}, {"55060919": [2, 52, 2]}, {"55060923": [55, 52, 2]}, {"55060927": [56, 3, 224]}, {"55060931": [8]}, {"55060936": [144, 136]}, {"55060939": [161, 49, 8]}, {"55060943": [32, 17]}, {"55060947": [2, 52, 2]}, {"55060951": [121, 52, 2]}, {"55060955": [122, 3, 224]}, {"55060959": [8]}, {"55060964": [144, 136]}, {"55060967": [161, 49, 8]}, {"55060971": [4, 17]}, {"55060975": [2, 52, 2]}, {"55060979": [119, 52, 2]}, {"55060983": [120, 3, 224]}, {"55060987": [8]}, {"55060992": [144, 136]}, {"55060995": [50, 17]}, {"55060999": [2, 52, 2]}, {"55061003": [192, 52, 2]}, {"55061007": [193, 3, 224]}, {"55061011": [8]}, {"55061016": [144, 136]}, {"55061019": [163, 49, 8]}, {"55061023": [3, 17]}, {"55061027": [2, 52, 2]}, {"55061031": [77, 52, 162]}, {"55061036": [3, 224]}, {"55061039": [8]}, {"55061044": [144, 136]}, {"55061047": [163, 49, 8]}, {"55061051": [24, 17]}, {"55061055": [2, 52, 2]}, {"55061059": [77, 52, 162]}, {"55061064": [3, 224]}, {"55061067": [8]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [52, 8]}, {"55061083": [1, 160, 136]}, {"55061087": [62, 3, 224]}, {"55061091": [8]}, {"55061096": [36, 136]}, {"55061099": [134, 36, 9, 255, 255, 37, 41]}, {"55061107": [1, 52, 1]}, {"55061111": [3]}, {"55061113": [41, 8, 42, 20, 32]}, {"55061119": [7]}, {"55061124": [1, 9, 80, 33, 145, 75]}, {"55061132": [52, 1]}, {"55061135": [255, 21, 97, 255, 247]}, {"55061144": [161, 69]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [36, 136]}, {"55061159": [168, 1, 6, 64, 33, 145, 9]}, {"55061168": [1, 37, 72, 37, 161, 9]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [36, 136]}, {"55061187": [188, 1, 5, 64, 33, 129, 9]}, {"55061196": [5, 33]}, {"55061199": [2]}, {"55061204": [52, 9]}, {"55061208": [37, 41]}, {"55061211": [1, 161, 9]}, {"55061216": [3, 224]}, {"55061219": [8]}, {"55061224": [52, 8]}, {"55061227": [1, 160, 136]}, {"55061231": [61, 148, 136]}, {"55061235": [46]}, {"55061237": [8, 65, 2, 160, 136]}, {"55061243": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061255": [8]}, {"55061260": [52, 8]}, {"55061263": [1, 160, 136]}, {"55061267": [50, 160, 136]}, {"55061271": [58, 52, 8]}, {"55061275": [48, 164, 136, 19, 244, 160, 136]}, {"55061283": [51, 3, 224]}, {"55061287": [8]}, {"55061292": [52, 8]}, {"55061295": [2, 160, 136]}, {"55061299": [50, 52, 8]}, {"55061303": [1, 160, 136]}, {"55061307": [58, 160, 136]}, {"55061311": [60, 52, 8]}, {"55061315": [96, 164, 136, 19, 244, 160, 136]}, {"55061323": [51, 3, 224]}, {"55061327": [8]}, {"55061332": [175, 164]}, {"55061335": [104, 175, 165]}, {"55061339": [108, 175, 166]}, {"55061343": [112, 175, 167]}, {"55061347": [116, 39, 189, 255, 232, 175, 163]}, {"55061355": [16, 175, 191]}, {"55061359": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061372": [17]}, {"55061375": [10]}, {"55061380": [60, 9, 128, 65, 52, 10]}, {"55061387": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 164]}, {"55061416": [143, 163]}, {"55061419": [16, 143, 191]}, {"55061423": [20, 39, 189]}, {"55061427": [24, 143, 164]}, {"55061431": [104, 143, 165]}, {"55061435": [108, 143, 166]}, {"55061439": [112, 143, 167]}, {"55061443": [116, 132, 110, 19, 196, 3, 224]}, {"55061451": [8]}, {"55061456": [147, 25]}, {"55061459": [116, 52, 1]}, {"55061463": [255, 23, 33]}, {"55061467": [2]}, {"55061472": [52, 25]}, {"55061475": [44, 3, 224]}, {"55061479": [8, 167, 185]}, {"55061483": [154, 147, 44]}, {"55061487": [116, 52, 1]}, {"55061491": [255, 21, 129]}, {"55061495": [2]}, {"55061500": [52, 12]}, {"55061503": [44, 3, 224]}, {"55061507": [8]}, {"55061512": [145, 174]}, {"55061515": [116, 52, 1]}, {"55061519": [255, 21, 193]}, {"55061523": [2]}, {"55061528": [52, 14]}, {"55061531": [44, 3, 224]}, {"55061535": [8, 167, 174]}, {"55061539": [154, 145, 207]}, {"55061543": [116, 52, 1]}, {"55061547": [255, 21, 225]}, {"55061551": [2]}, {"55061556": [52, 15]}, {"55061559": [44, 3, 224]}, {"55061563": [8, 167, 175]}, {"55061567": [154, 52, 3]}, {"55061571": [255, 21, 195]}, {"55061575": [3]}, {"55061580": [52, 3]}, {"55061583": [1, 160, 163, 15, 51, 3, 224]}, {"55061591": [8, 143, 191, 255, 252, 141, 9]}, {"55061599": [4, 17, 32]}, {"55061603": [7]}, {"55061608": [145, 9]}, {"55061611": [104, 52, 1]}, {"55061615": [59, 17, 33]}, {"55061619": [2]}, {"55061624": [52, 9]}, {"55061627": [255, 161, 9]}, {"55061631": [64, 3, 224]}, {"55061635": [8, 161, 14]}, {"55061639": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [175, 191, 255, 252, 12, 16, 11, 25]}, {"11427700": [12, 16, 11, 32]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 4, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 11, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 18, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 253, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 222, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 40, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 236, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 42, 8, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 124, 128, 64, 40, 240, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 12, 128, 64, 40, 240, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 48, 128, 64, 42, 36, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 80, 128, 64, 40, 240, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [32]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 221]}, {"55060224": [4, 64]}, {"55060227": [24]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 27]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060311": [2]}, {"55060317": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060327": [16, 39, 189]}, {"55060331": [24, 3, 224]}, {"55060335": [8]}, {"55060340": [39, 189, 255, 232, 175, 191]}, {"55060347": [16, 12, 16, 9, 235]}, {"55060356": [36, 1, 255, 255, 16, 65]}, {"55060363": [4]}, {"55060368": [52, 68]}, {"55060372": [12, 16, 10, 14]}, {"55060380": [143, 191]}, {"55060383": [16, 39, 189]}, {"55060387": [24, 3, 224]}, {"55060391": [8]}, {"55060396": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060407": [164, 52, 8]}, {"55060412": [52, 137]}, {"55060416": [148, 170]}, {"55060420": [52, 1]}, {"55060423": [10, 21, 65]}, {"55060427": [7]}, {"55060432": [52, 1]}, {"55060435": [16, 16, 65]}, {"55060439": [4]}, {"55060444": [52, 8]}, {"55060447": [1, 148, 169]}, {"55060451": [28, 49, 41]}, {"55060455": [31, 52, 1]}, {"55060459": [21, 21, 65]}, {"55060463": [12]}, {"55060468": [52, 1]}, {"55060471": [62, 16, 129]}, {"55060475": [7]}, {"55060480": [52, 1]}, {"55060483": [66, 16, 129]}, {"55060487": [4]}, {"55060492": [36, 2, 255, 255, 16]}, {"55060499": [7]}, {"55060504": [52, 8]}, {"55060507": [2, 144, 169, 1, 65]}, {"55060513": [2, 18]}, {"55060517": [72, 16, 37]}, {"55060521": [2, 18]}, {"55060525": [73, 16, 37, 3, 224]}, {"55060531": [8]}, {"55060536": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060551": [4, 141, 9]}, {"55060556": [17, 32]}, {"55060559": [5]}, {"55060565": [9, 82, 2, 21, 68, 255, 250]}, {"55060576": [49, 34]}, {"55060579": [255, 3, 224]}, {"55060583": [8]}, {"55060588": [39, 189, 255, 224, 175, 176]}, {"55060595": [16, 175, 177]}, {"55060599": [20, 175, 191]}, {"55060603": [24, 52, 130]}, {"55060608": [52, 80]}, {"55060612": [38, 8, 255, 128, 5]}, {"55060619": [18]}, {"55060624": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060635": [16, 1, 9]}, {"55060639": [24]}, {"55060642": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060660": [142, 40]}, {"55060663": [12, 1]}, {"55060666": [248, 9]}, {"55060672": [20, 80, 255, 239]}, {"55060680": [54, 35]}, {"55060684": [16]}, {"55060687": [2]}, {"55060692": [52, 3]}, {"55060696": [143, 176]}, {"55060699": [16, 143, 177]}, {"55060703": [20, 143, 191]}, {"55060707": [24, 39, 189]}, {"55060711": [32, 3, 224]}, {"55060715": [8]}, {"55060720": [3, 224]}, {"55060723": [8, 52, 162]}, {"55060728": [144, 136]}, {"55060731": [125, 52, 1]}, {"55060735": [255, 17, 1]}, {"55060739": [2, 52, 2]}, {"55060743": [8, 52, 2]}, {"55060747": [9, 3, 224]}, {"55060751": [8]}, {"55060756": [144, 136]}, {"55060759": [163, 49, 8]}, {"55060763": [192, 17]}, {"55060767": [5, 52, 2]}, {"55060771": [84, 52, 1]}, {"55060775": [64, 17, 1]}, {"55060779": [2, 52, 2]}, {"55060783": [53, 52, 2]}, {"55060787": [54, 3, 224]}, {"55060791": [8]}, {"55060796": [144, 136]}, {"55060799": [163, 49, 8]}, {"55060803": [24, 17]}, {"55060807": [5, 52, 2]}, {"55060811": [50, 52, 1]}, {"55060815": [8, 17, 1]}, {"55060819": [2, 52, 2]}, {"55060823": [51, 52, 2]}, {"55060827": [52, 3, 224]}, {"55060831": [8]}, {"55060836": [144, 136]}, {"55060839": [163, 49, 8]}, {"55060843": [3, 17]}, {"55060847": [5, 52, 2]}, {"55060851": [4, 52, 1]}, {"55060855": [1, 17, 1]}, {"55060859": [2, 52, 2]}, {"55060863": [48, 52, 2]}, {"55060867": [49, 3, 224]}, {"55060871": [8]}, {"55060876": [144, 136]}, {"55060879": [162, 49, 8]}, {"55060883": [192, 17]}, {"55060887": [5, 52, 2]}, {"55060891": [5, 52, 1]}, {"55060895": [64, 17, 1]}, {"55060899": [2, 52, 2]}, {"55060903": [96, 52, 2]}, {"55060907": [123, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [162, 49, 8]}, {"55060923": [48, 17]}, {"55060927": [2, 52, 2]}, {"55060931": [69, 52, 2]}, {"55060935": [70, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [162, 49, 8]}, {"55060951": [6, 17]}, {"55060955": [2, 52, 2]}, {"55060959": [55, 52, 2]}, {"55060963": [56, 3, 224]}, {"55060967": [8]}, {"55060972": [144, 136]}, {"55060975": [161, 49, 8]}, {"55060979": [32, 17]}, {"55060983": [2, 52, 2]}, {"55060987": [121, 52, 2]}, {"55060991": [122, 3, 224]}, {"55060995": [8]}, {"55061000": [144, 136]}, {"55061003": [161, 49, 8]}, {"55061007": [4, 17]}, {"55061011": [2, 52, 2]}, {"55061015": [119, 52, 2]}, {"55061019": [120, 3, 224]}, {"55061023": [8]}, {"55061028": [144, 136]}, {"55061031": [50, 17]}, {"55061035": [2, 52, 2]}, {"55061039": [192, 52, 2]}, {"55061043": [193, 3, 224]}, {"55061047": [8]}, {"55061052": [144, 136]}, {"55061055": [163, 49, 8]}, {"55061059": [3, 17]}, {"55061063": [2, 52, 2]}, {"55061067": [77, 52, 162]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [144, 136]}, {"55061083": [163, 49, 8]}, {"55061087": [24, 17]}, {"55061091": [2, 52, 2]}, {"55061095": [77, 52, 162]}, {"55061100": [3, 224]}, {"55061103": [8]}, {"55061108": [3, 224]}, {"55061111": [8]}, {"55061116": [52, 8]}, {"55061119": [1, 160, 136]}, {"55061123": [62, 3, 224]}, {"55061127": [8]}, {"55061132": [36, 136]}, {"55061135": [134, 36, 9, 255, 255, 37, 41]}, {"55061143": [1, 52, 1]}, {"55061147": [3]}, {"55061149": [41, 8, 42, 20, 32]}, {"55061155": [7]}, {"55061160": [1, 9, 80, 33, 145, 75]}, {"55061168": [52, 1]}, {"55061171": [255, 21, 97, 255, 247]}, {"55061180": [161, 69]}, {"55061184": [3, 224]}, {"55061187": [8]}, {"55061192": [36, 136]}, {"55061195": [168, 1, 6, 64, 33, 145, 9]}, {"55061204": [1, 37, 72, 37, 161, 9]}, {"55061212": [3, 224]}, {"55061215": [8]}, {"55061220": [36, 136]}, {"55061223": [188, 1, 5, 64, 33, 129, 9]}, {"55061232": [5, 33]}, {"55061235": [2]}, {"55061240": [52, 9]}, {"55061244": [37, 41]}, {"55061247": [1, 161, 9]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [52, 8]}, {"55061263": [1, 160, 136]}, {"55061267": [61, 148, 136]}, {"55061271": [46]}, {"55061273": [8, 65, 2, 160, 136]}, {"55061279": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061291": [8]}, {"55061296": [52, 8]}, {"55061299": [1, 160, 136]}, {"55061303": [50, 160, 136]}, {"55061307": [58, 52, 8]}, {"55061311": [48, 164, 136, 19, 244, 160, 136]}, {"55061319": [51, 3, 224]}, {"55061323": [8]}, {"55061328": [52, 8]}, {"55061331": [2, 160, 136]}, {"55061335": [50, 52, 8]}, {"55061339": [1, 160, 136]}, {"55061343": [58, 160, 136]}, {"55061347": [60, 52, 8]}, {"55061351": [96, 164, 136, 19, 244, 160, 136]}, {"55061359": [51, 3, 224]}, {"55061363": [8]}, {"55061368": [175, 164]}, {"55061371": [104, 175, 165]}, {"55061375": [108, 175, 166]}, {"55061379": [112, 175, 167]}, {"55061383": [116, 39, 189, 255, 232, 175, 163]}, {"55061391": [16, 175, 191]}, {"55061395": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061408": [17]}, {"55061411": [10]}, {"55061416": [60, 9, 128, 65, 52, 10]}, {"55061423": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061452": [143, 163]}, {"55061455": [16, 143, 191]}, {"55061459": [20, 39, 189]}, {"55061463": [24, 143, 164]}, {"55061467": [104, 143, 165]}, {"55061471": [108, 143, 166]}, {"55061475": [112, 143, 167]}, {"55061479": [116, 132, 110, 19, 196, 3, 224]}, {"55061487": [8]}, {"55061492": [147, 25]}, {"55061495": [116, 52, 1]}, {"55061499": [255, 23, 33]}, {"55061503": [2]}, {"55061508": [52, 25]}, {"55061511": [44, 3, 224]}, {"55061515": [8, 167, 185]}, {"55061519": [154, 147, 44]}, {"55061523": [116, 52, 1]}, {"55061527": [255, 21, 129]}, {"55061531": [2]}, {"55061536": [52, 12]}, {"55061539": [44, 3, 224]}, {"55061543": [8]}, {"55061548": [145, 174]}, {"55061551": [116, 52, 1]}, {"55061555": [255, 21, 193]}, {"55061559": [2]}, {"55061564": [52, 14]}, {"55061567": [44, 3, 224]}, {"55061571": [8, 167, 174]}, {"55061575": [154, 145, 207]}, {"55061579": [116, 52, 1]}, {"55061583": [255, 21, 225]}, {"55061587": [2]}, {"55061592": [52, 15]}, {"55061595": [44, 3, 224]}, {"55061599": [8, 167, 175]}, {"55061603": [154, 52, 3]}, {"55061607": [255, 21, 195]}, {"55061611": [3]}, {"55061616": [52, 3]}, {"55061619": [1, 160, 163, 15, 51, 3, 224]}, {"55061627": [8, 143, 191, 255, 252, 141, 9]}, {"55061635": [4, 17, 32]}, {"55061639": [7]}, {"55061644": [145, 9]}, {"55061647": [104, 52, 1]}, {"55061651": [59, 17, 33]}, {"55061655": [2]}, {"55061660": [52, 9]}, {"55061663": [255, 161, 9]}, {"55061667": [64, 3, 224]}, {"55061671": [8, 161, 14]}, {"55061675": [104]}] \ No newline at end of file From e9aa9c5d97b8084f1e3a6d6fb4b09a60ad785152 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 4 Jun 2018 06:46:26 -0400 Subject: [PATCH 085/151] Fix ganon's castle boss key --- ASM/src/item_data.asm | 2 +- Rom.py | 8 -------- data/base2current.json | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index eec18b6f3..0577a8b7a 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -74,7 +74,7 @@ Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FI Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, WATER_ID ; 0x94 = Water Temple Boss Key Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SPIRIT_ID ; 0x95 = Spirit Temple Boss Key Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SHADOW_ID ; 0x96 = Shadow Temple Boss Key -Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, CASTLE_ID ; 0x97 = Ganon's Castle Boss Key +Item_Row 0x53, 0x41, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, TOWER_ID ; 0x97 = Ganon's Castle Boss Key Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DEKU_ID ; 0x98 = Deku Tree Compass Item_Row 0x53, 0x41, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DODONGO_ID ; 0x99 = Dodongo's Cavern Compass diff --git a/Rom.py b/Rom.py index bea4c4535..ada950d35 100644 --- a/Rom.py +++ b/Rom.py @@ -517,14 +517,6 @@ def patch_rom(world, rom): rom.write_bytes(0xED4470, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xED4498, [0x00, 0x00, 0x00, 0x00]) - # Allow Ganon's Tower Boss Key to Shuffle - rom.write_bytes(0xAE603C, [0x25, 0x08, 0xA5, 0xD0]) - rom.write_bytes(0xAE6058, [0x00, 0x00, 0x00, 0x00]) - Block_code = [0x95, 0x19, 0x14, 0x02, 0x30, 0xEF, 0x00, 0x03, 0x24, 0x0D, 0x00, 0x01, - 0x24, 0x0E, 0x00, 0x0D, 0x17, 0x2E, 0x00, 0x02, 0x01, 0xED, 0x68, 0x04, - 0x27, 0x39, 0xFF, 0xFD, 0x01, 0x19, 0x18, 0x21, 0x90, 0x6E, 0x00, 0xA8] - rom.write_bytes(0xAE608C, Block_code) - # Fixed reward order for Bombchu Bowling rom.write_bytes(0xE2E698, [0x80, 0xAA, 0xE2, 0x64]) rom.write_bytes(0xE2E6A0, [0x80, 0xAA, 0xE2, 0x4C]) diff --git a/data/base2current.json b/data/base2current.json index fe57381bd..bb02eaf98 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [175, 191, 255, 252, 12, 16, 11, 25]}, {"11427700": [12, 16, 11, 32]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 4, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 11, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 18, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 253, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 222, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 40, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 236, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 42, 8, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058825": [185, 1, 13, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 124, 128, 64, 40, 240, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 12, 128, 64, 40, 240, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 48, 128, 64, 42, 36, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 80, 128, 64, 40, 240, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [32]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 221]}, {"55060224": [4, 64]}, {"55060227": [24]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 27]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060311": [2]}, {"55060317": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060327": [16, 39, 189]}, {"55060331": [24, 3, 224]}, {"55060335": [8]}, {"55060340": [39, 189, 255, 232, 175, 191]}, {"55060347": [16, 12, 16, 9, 235]}, {"55060356": [36, 1, 255, 255, 16, 65]}, {"55060363": [4]}, {"55060368": [52, 68]}, {"55060372": [12, 16, 10, 14]}, {"55060380": [143, 191]}, {"55060383": [16, 39, 189]}, {"55060387": [24, 3, 224]}, {"55060391": [8]}, {"55060396": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060407": [164, 52, 8]}, {"55060412": [52, 137]}, {"55060416": [148, 170]}, {"55060420": [52, 1]}, {"55060423": [10, 21, 65]}, {"55060427": [7]}, {"55060432": [52, 1]}, {"55060435": [16, 16, 65]}, {"55060439": [4]}, {"55060444": [52, 8]}, {"55060447": [1, 148, 169]}, {"55060451": [28, 49, 41]}, {"55060455": [31, 52, 1]}, {"55060459": [21, 21, 65]}, {"55060463": [12]}, {"55060468": [52, 1]}, {"55060471": [62, 16, 129]}, {"55060475": [7]}, {"55060480": [52, 1]}, {"55060483": [66, 16, 129]}, {"55060487": [4]}, {"55060492": [36, 2, 255, 255, 16]}, {"55060499": [7]}, {"55060504": [52, 8]}, {"55060507": [2, 144, 169, 1, 65]}, {"55060513": [2, 18]}, {"55060517": [72, 16, 37]}, {"55060521": [2, 18]}, {"55060525": [73, 16, 37, 3, 224]}, {"55060531": [8]}, {"55060536": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060551": [4, 141, 9]}, {"55060556": [17, 32]}, {"55060559": [5]}, {"55060565": [9, 82, 2, 21, 68, 255, 250]}, {"55060576": [49, 34]}, {"55060579": [255, 3, 224]}, {"55060583": [8]}, {"55060588": [39, 189, 255, 224, 175, 176]}, {"55060595": [16, 175, 177]}, {"55060599": [20, 175, 191]}, {"55060603": [24, 52, 130]}, {"55060608": [52, 80]}, {"55060612": [38, 8, 255, 128, 5]}, {"55060619": [18]}, {"55060624": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060635": [16, 1, 9]}, {"55060639": [24]}, {"55060642": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060660": [142, 40]}, {"55060663": [12, 1]}, {"55060666": [248, 9]}, {"55060672": [20, 80, 255, 239]}, {"55060680": [54, 35]}, {"55060684": [16]}, {"55060687": [2]}, {"55060692": [52, 3]}, {"55060696": [143, 176]}, {"55060699": [16, 143, 177]}, {"55060703": [20, 143, 191]}, {"55060707": [24, 39, 189]}, {"55060711": [32, 3, 224]}, {"55060715": [8]}, {"55060720": [3, 224]}, {"55060723": [8, 52, 162]}, {"55060728": [144, 136]}, {"55060731": [125, 52, 1]}, {"55060735": [255, 17, 1]}, {"55060739": [2, 52, 2]}, {"55060743": [8, 52, 2]}, {"55060747": [9, 3, 224]}, {"55060751": [8]}, {"55060756": [144, 136]}, {"55060759": [163, 49, 8]}, {"55060763": [192, 17]}, {"55060767": [5, 52, 2]}, {"55060771": [84, 52, 1]}, {"55060775": [64, 17, 1]}, {"55060779": [2, 52, 2]}, {"55060783": [53, 52, 2]}, {"55060787": [54, 3, 224]}, {"55060791": [8]}, {"55060796": [144, 136]}, {"55060799": [163, 49, 8]}, {"55060803": [24, 17]}, {"55060807": [5, 52, 2]}, {"55060811": [50, 52, 1]}, {"55060815": [8, 17, 1]}, {"55060819": [2, 52, 2]}, {"55060823": [51, 52, 2]}, {"55060827": [52, 3, 224]}, {"55060831": [8]}, {"55060836": [144, 136]}, {"55060839": [163, 49, 8]}, {"55060843": [3, 17]}, {"55060847": [5, 52, 2]}, {"55060851": [4, 52, 1]}, {"55060855": [1, 17, 1]}, {"55060859": [2, 52, 2]}, {"55060863": [48, 52, 2]}, {"55060867": [49, 3, 224]}, {"55060871": [8]}, {"55060876": [144, 136]}, {"55060879": [162, 49, 8]}, {"55060883": [192, 17]}, {"55060887": [5, 52, 2]}, {"55060891": [5, 52, 1]}, {"55060895": [64, 17, 1]}, {"55060899": [2, 52, 2]}, {"55060903": [96, 52, 2]}, {"55060907": [123, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [162, 49, 8]}, {"55060923": [48, 17]}, {"55060927": [2, 52, 2]}, {"55060931": [69, 52, 2]}, {"55060935": [70, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [162, 49, 8]}, {"55060951": [6, 17]}, {"55060955": [2, 52, 2]}, {"55060959": [55, 52, 2]}, {"55060963": [56, 3, 224]}, {"55060967": [8]}, {"55060972": [144, 136]}, {"55060975": [161, 49, 8]}, {"55060979": [32, 17]}, {"55060983": [2, 52, 2]}, {"55060987": [121, 52, 2]}, {"55060991": [122, 3, 224]}, {"55060995": [8]}, {"55061000": [144, 136]}, {"55061003": [161, 49, 8]}, {"55061007": [4, 17]}, {"55061011": [2, 52, 2]}, {"55061015": [119, 52, 2]}, {"55061019": [120, 3, 224]}, {"55061023": [8]}, {"55061028": [144, 136]}, {"55061031": [50, 17]}, {"55061035": [2, 52, 2]}, {"55061039": [192, 52, 2]}, {"55061043": [193, 3, 224]}, {"55061047": [8]}, {"55061052": [144, 136]}, {"55061055": [163, 49, 8]}, {"55061059": [3, 17]}, {"55061063": [2, 52, 2]}, {"55061067": [77, 52, 162]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [144, 136]}, {"55061083": [163, 49, 8]}, {"55061087": [24, 17]}, {"55061091": [2, 52, 2]}, {"55061095": [77, 52, 162]}, {"55061100": [3, 224]}, {"55061103": [8]}, {"55061108": [3, 224]}, {"55061111": [8]}, {"55061116": [52, 8]}, {"55061119": [1, 160, 136]}, {"55061123": [62, 3, 224]}, {"55061127": [8]}, {"55061132": [36, 136]}, {"55061135": [134, 36, 9, 255, 255, 37, 41]}, {"55061143": [1, 52, 1]}, {"55061147": [3]}, {"55061149": [41, 8, 42, 20, 32]}, {"55061155": [7]}, {"55061160": [1, 9, 80, 33, 145, 75]}, {"55061168": [52, 1]}, {"55061171": [255, 21, 97, 255, 247]}, {"55061180": [161, 69]}, {"55061184": [3, 224]}, {"55061187": [8]}, {"55061192": [36, 136]}, {"55061195": [168, 1, 6, 64, 33, 145, 9]}, {"55061204": [1, 37, 72, 37, 161, 9]}, {"55061212": [3, 224]}, {"55061215": [8]}, {"55061220": [36, 136]}, {"55061223": [188, 1, 5, 64, 33, 129, 9]}, {"55061232": [5, 33]}, {"55061235": [2]}, {"55061240": [52, 9]}, {"55061244": [37, 41]}, {"55061247": [1, 161, 9]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [52, 8]}, {"55061263": [1, 160, 136]}, {"55061267": [61, 148, 136]}, {"55061271": [46]}, {"55061273": [8, 65, 2, 160, 136]}, {"55061279": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061291": [8]}, {"55061296": [52, 8]}, {"55061299": [1, 160, 136]}, {"55061303": [50, 160, 136]}, {"55061307": [58, 52, 8]}, {"55061311": [48, 164, 136, 19, 244, 160, 136]}, {"55061319": [51, 3, 224]}, {"55061323": [8]}, {"55061328": [52, 8]}, {"55061331": [2, 160, 136]}, {"55061335": [50, 52, 8]}, {"55061339": [1, 160, 136]}, {"55061343": [58, 160, 136]}, {"55061347": [60, 52, 8]}, {"55061351": [96, 164, 136, 19, 244, 160, 136]}, {"55061359": [51, 3, 224]}, {"55061363": [8]}, {"55061368": [175, 164]}, {"55061371": [104, 175, 165]}, {"55061375": [108, 175, 166]}, {"55061379": [112, 175, 167]}, {"55061383": [116, 39, 189, 255, 232, 175, 163]}, {"55061391": [16, 175, 191]}, {"55061395": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061408": [17]}, {"55061411": [10]}, {"55061416": [60, 9, 128, 65, 52, 10]}, {"55061423": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061452": [143, 163]}, {"55061455": [16, 143, 191]}, {"55061459": [20, 39, 189]}, {"55061463": [24, 143, 164]}, {"55061467": [104, 143, 165]}, {"55061471": [108, 143, 166]}, {"55061475": [112, 143, 167]}, {"55061479": [116, 132, 110, 19, 196, 3, 224]}, {"55061487": [8]}, {"55061492": [147, 25]}, {"55061495": [116, 52, 1]}, {"55061499": [255, 23, 33]}, {"55061503": [2]}, {"55061508": [52, 25]}, {"55061511": [44, 3, 224]}, {"55061515": [8, 167, 185]}, {"55061519": [154, 147, 44]}, {"55061523": [116, 52, 1]}, {"55061527": [255, 21, 129]}, {"55061531": [2]}, {"55061536": [52, 12]}, {"55061539": [44, 3, 224]}, {"55061543": [8]}, {"55061548": [145, 174]}, {"55061551": [116, 52, 1]}, {"55061555": [255, 21, 193]}, {"55061559": [2]}, {"55061564": [52, 14]}, {"55061567": [44, 3, 224]}, {"55061571": [8, 167, 174]}, {"55061575": [154, 145, 207]}, {"55061579": [116, 52, 1]}, {"55061583": [255, 21, 225]}, {"55061587": [2]}, {"55061592": [52, 15]}, {"55061595": [44, 3, 224]}, {"55061599": [8, 167, 175]}, {"55061603": [154, 52, 3]}, {"55061607": [255, 21, 195]}, {"55061611": [3]}, {"55061616": [52, 3]}, {"55061619": [1, 160, 163, 15, 51, 3, 224]}, {"55061627": [8, 143, 191, 255, 252, 141, 9]}, {"55061635": [4, 17, 32]}, {"55061639": [7]}, {"55061644": [145, 9]}, {"55061647": [104, 52, 1]}, {"55061651": [59, 17, 33]}, {"55061655": [2]}, {"55061660": [52, 9]}, {"55061663": [255, 161, 9]}, {"55061667": [64, 3, 224]}, {"55061671": [8, 161, 14]}, {"55061675": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [175, 191, 255, 252, 12, 16, 11, 25]}, {"11427700": [12, 16, 11, 32]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 4, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 11, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 18, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 253, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 222, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 40, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 236, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 42, 8, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 124, 128, 64, 40, 240, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 12, 128, 64, 40, 240, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 48, 128, 64, 42, 36, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 80, 128, 64, 40, 240, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [32]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 221]}, {"55060224": [4, 64]}, {"55060227": [24]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 27]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060311": [2]}, {"55060317": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060327": [16, 39, 189]}, {"55060331": [24, 3, 224]}, {"55060335": [8]}, {"55060340": [39, 189, 255, 232, 175, 191]}, {"55060347": [16, 12, 16, 9, 235]}, {"55060356": [36, 1, 255, 255, 16, 65]}, {"55060363": [4]}, {"55060368": [52, 68]}, {"55060372": [12, 16, 10, 14]}, {"55060380": [143, 191]}, {"55060383": [16, 39, 189]}, {"55060387": [24, 3, 224]}, {"55060391": [8]}, {"55060396": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060407": [164, 52, 8]}, {"55060412": [52, 137]}, {"55060416": [148, 170]}, {"55060420": [52, 1]}, {"55060423": [10, 21, 65]}, {"55060427": [7]}, {"55060432": [52, 1]}, {"55060435": [16, 16, 65]}, {"55060439": [4]}, {"55060444": [52, 8]}, {"55060447": [1, 148, 169]}, {"55060451": [28, 49, 41]}, {"55060455": [31, 52, 1]}, {"55060459": [21, 21, 65]}, {"55060463": [12]}, {"55060468": [52, 1]}, {"55060471": [62, 16, 129]}, {"55060475": [7]}, {"55060480": [52, 1]}, {"55060483": [66, 16, 129]}, {"55060487": [4]}, {"55060492": [36, 2, 255, 255, 16]}, {"55060499": [7]}, {"55060504": [52, 8]}, {"55060507": [2, 144, 169, 1, 65]}, {"55060513": [2, 18]}, {"55060517": [72, 16, 37]}, {"55060521": [2, 18]}, {"55060525": [73, 16, 37, 3, 224]}, {"55060531": [8]}, {"55060536": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060551": [4, 141, 9]}, {"55060556": [17, 32]}, {"55060559": [5]}, {"55060565": [9, 82, 2, 21, 68, 255, 250]}, {"55060576": [49, 34]}, {"55060579": [255, 3, 224]}, {"55060583": [8]}, {"55060588": [39, 189, 255, 224, 175, 176]}, {"55060595": [16, 175, 177]}, {"55060599": [20, 175, 191]}, {"55060603": [24, 52, 130]}, {"55060608": [52, 80]}, {"55060612": [38, 8, 255, 128, 5]}, {"55060619": [18]}, {"55060624": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060635": [16, 1, 9]}, {"55060639": [24]}, {"55060642": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060660": [142, 40]}, {"55060663": [12, 1]}, {"55060666": [248, 9]}, {"55060672": [20, 80, 255, 239]}, {"55060680": [54, 35]}, {"55060684": [16]}, {"55060687": [2]}, {"55060692": [52, 3]}, {"55060696": [143, 176]}, {"55060699": [16, 143, 177]}, {"55060703": [20, 143, 191]}, {"55060707": [24, 39, 189]}, {"55060711": [32, 3, 224]}, {"55060715": [8]}, {"55060720": [3, 224]}, {"55060723": [8, 52, 162]}, {"55060728": [144, 136]}, {"55060731": [125, 52, 1]}, {"55060735": [255, 17, 1]}, {"55060739": [2, 52, 2]}, {"55060743": [8, 52, 2]}, {"55060747": [9, 3, 224]}, {"55060751": [8]}, {"55060756": [144, 136]}, {"55060759": [163, 49, 8]}, {"55060763": [192, 17]}, {"55060767": [5, 52, 2]}, {"55060771": [84, 52, 1]}, {"55060775": [64, 17, 1]}, {"55060779": [2, 52, 2]}, {"55060783": [53, 52, 2]}, {"55060787": [54, 3, 224]}, {"55060791": [8]}, {"55060796": [144, 136]}, {"55060799": [163, 49, 8]}, {"55060803": [24, 17]}, {"55060807": [5, 52, 2]}, {"55060811": [50, 52, 1]}, {"55060815": [8, 17, 1]}, {"55060819": [2, 52, 2]}, {"55060823": [51, 52, 2]}, {"55060827": [52, 3, 224]}, {"55060831": [8]}, {"55060836": [144, 136]}, {"55060839": [163, 49, 8]}, {"55060843": [3, 17]}, {"55060847": [5, 52, 2]}, {"55060851": [4, 52, 1]}, {"55060855": [1, 17, 1]}, {"55060859": [2, 52, 2]}, {"55060863": [48, 52, 2]}, {"55060867": [49, 3, 224]}, {"55060871": [8]}, {"55060876": [144, 136]}, {"55060879": [162, 49, 8]}, {"55060883": [192, 17]}, {"55060887": [5, 52, 2]}, {"55060891": [5, 52, 1]}, {"55060895": [64, 17, 1]}, {"55060899": [2, 52, 2]}, {"55060903": [96, 52, 2]}, {"55060907": [123, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [162, 49, 8]}, {"55060923": [48, 17]}, {"55060927": [2, 52, 2]}, {"55060931": [69, 52, 2]}, {"55060935": [70, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [162, 49, 8]}, {"55060951": [6, 17]}, {"55060955": [2, 52, 2]}, {"55060959": [55, 52, 2]}, {"55060963": [56, 3, 224]}, {"55060967": [8]}, {"55060972": [144, 136]}, {"55060975": [161, 49, 8]}, {"55060979": [32, 17]}, {"55060983": [2, 52, 2]}, {"55060987": [121, 52, 2]}, {"55060991": [122, 3, 224]}, {"55060995": [8]}, {"55061000": [144, 136]}, {"55061003": [161, 49, 8]}, {"55061007": [4, 17]}, {"55061011": [2, 52, 2]}, {"55061015": [119, 52, 2]}, {"55061019": [120, 3, 224]}, {"55061023": [8]}, {"55061028": [144, 136]}, {"55061031": [50, 17]}, {"55061035": [2, 52, 2]}, {"55061039": [192, 52, 2]}, {"55061043": [193, 3, 224]}, {"55061047": [8]}, {"55061052": [144, 136]}, {"55061055": [163, 49, 8]}, {"55061059": [3, 17]}, {"55061063": [2, 52, 2]}, {"55061067": [77, 52, 162]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [144, 136]}, {"55061083": [163, 49, 8]}, {"55061087": [24, 17]}, {"55061091": [2, 52, 2]}, {"55061095": [77, 52, 162]}, {"55061100": [3, 224]}, {"55061103": [8]}, {"55061108": [3, 224]}, {"55061111": [8]}, {"55061116": [52, 8]}, {"55061119": [1, 160, 136]}, {"55061123": [62, 3, 224]}, {"55061127": [8]}, {"55061132": [36, 136]}, {"55061135": [134, 36, 9, 255, 255, 37, 41]}, {"55061143": [1, 52, 1]}, {"55061147": [3]}, {"55061149": [41, 8, 42, 20, 32]}, {"55061155": [7]}, {"55061160": [1, 9, 80, 33, 145, 75]}, {"55061168": [52, 1]}, {"55061171": [255, 21, 97, 255, 247]}, {"55061180": [161, 69]}, {"55061184": [3, 224]}, {"55061187": [8]}, {"55061192": [36, 136]}, {"55061195": [168, 1, 6, 64, 33, 145, 9]}, {"55061204": [1, 37, 72, 37, 161, 9]}, {"55061212": [3, 224]}, {"55061215": [8]}, {"55061220": [36, 136]}, {"55061223": [188, 1, 5, 64, 33, 129, 9]}, {"55061232": [5, 33]}, {"55061235": [2]}, {"55061240": [52, 9]}, {"55061244": [37, 41]}, {"55061247": [1, 161, 9]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [52, 8]}, {"55061263": [1, 160, 136]}, {"55061267": [61, 148, 136]}, {"55061271": [46]}, {"55061273": [8, 65, 2, 160, 136]}, {"55061279": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061291": [8]}, {"55061296": [52, 8]}, {"55061299": [1, 160, 136]}, {"55061303": [50, 160, 136]}, {"55061307": [58, 52, 8]}, {"55061311": [48, 164, 136, 19, 244, 160, 136]}, {"55061319": [51, 3, 224]}, {"55061323": [8]}, {"55061328": [52, 8]}, {"55061331": [2, 160, 136]}, {"55061335": [50, 52, 8]}, {"55061339": [1, 160, 136]}, {"55061343": [58, 160, 136]}, {"55061347": [60, 52, 8]}, {"55061351": [96, 164, 136, 19, 244, 160, 136]}, {"55061359": [51, 3, 224]}, {"55061363": [8]}, {"55061368": [175, 164]}, {"55061371": [104, 175, 165]}, {"55061375": [108, 175, 166]}, {"55061379": [112, 175, 167]}, {"55061383": [116, 39, 189, 255, 232, 175, 163]}, {"55061391": [16, 175, 191]}, {"55061395": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061408": [17]}, {"55061411": [10]}, {"55061416": [60, 9, 128, 65, 52, 10]}, {"55061423": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061452": [143, 163]}, {"55061455": [16, 143, 191]}, {"55061459": [20, 39, 189]}, {"55061463": [24, 143, 164]}, {"55061467": [104, 143, 165]}, {"55061471": [108, 143, 166]}, {"55061475": [112, 143, 167]}, {"55061479": [116, 132, 110, 19, 196, 3, 224]}, {"55061487": [8]}, {"55061492": [147, 25]}, {"55061495": [116, 52, 1]}, {"55061499": [255, 23, 33]}, {"55061503": [2]}, {"55061508": [52, 25]}, {"55061511": [44, 3, 224]}, {"55061515": [8, 167, 185]}, {"55061519": [154, 147, 44]}, {"55061523": [116, 52, 1]}, {"55061527": [255, 21, 129]}, {"55061531": [2]}, {"55061536": [52, 12]}, {"55061539": [44, 3, 224]}, {"55061543": [8]}, {"55061548": [145, 174]}, {"55061551": [116, 52, 1]}, {"55061555": [255, 21, 193]}, {"55061559": [2]}, {"55061564": [52, 14]}, {"55061567": [44, 3, 224]}, {"55061571": [8, 167, 174]}, {"55061575": [154, 145, 207]}, {"55061579": [116, 52, 1]}, {"55061583": [255, 21, 225]}, {"55061587": [2]}, {"55061592": [52, 15]}, {"55061595": [44, 3, 224]}, {"55061599": [8, 167, 175]}, {"55061603": [154, 52, 3]}, {"55061607": [255, 21, 195]}, {"55061611": [3]}, {"55061616": [52, 3]}, {"55061619": [1, 160, 163, 15, 51, 3, 224]}, {"55061627": [8, 143, 191, 255, 252, 141, 9]}, {"55061635": [4, 17, 32]}, {"55061639": [7]}, {"55061644": [145, 9]}, {"55061647": [104, 52, 1]}, {"55061651": [59, 17, 33]}, {"55061655": [2]}, {"55061660": [52, 9]}, {"55061663": [255, 161, 9]}, {"55061667": [64, 3, 224]}, {"55061671": [8, 161, 14]}, {"55061675": [104]}] \ No newline at end of file From 659c76053b2210cbf2e5d382cb3b86e70c29fe8c Mon Sep 17 00:00:00 2001 From: Chris Muncey Date: Mon, 4 Jun 2018 11:58:50 -0400 Subject: [PATCH 086/151] Added valid ROM check --- Rom.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Rom.py b/Rom.py index bea4c4535..1cec7ef32 100644 --- a/Rom.py +++ b/Rom.py @@ -15,11 +15,20 @@ class LocalRom(object): def __init__(self, file, patch=True): + + validCRC = [] + validCRC.append(bytearray([0xEC, 0x70, 0x11, 0xB7, 0x76, 0x16, 0xD7, 0x2B])) # Compressed + validCRC.append(bytearray([0x70, 0xEC, 0xB7, 0x11, 0x16, 0x76, 0x2B, 0xD7])) # Byteswap compressed + validCRC.append(bytearray([0x93, 0x52, 0x2E, 0x7B, 0xE5, 0x06, 0xD4, 0x27])) # Decompressed + os.chdir(os.path.dirname(os.path.realpath(__file__))) #os.chdir(output_path(os.path.dirname(os.path.realpath(__file__)))) with open(file, 'rb') as stream: self.buffer = read_rom(stream) file_name = os.path.splitext(file) + romCRC = self.buffer[0x10:0x18] + if romCRC not in validCRC: + raise RuntimeError('ROM is not a valid OoT 1.0 US ROM.') if len(self.buffer) < 33554432 or len(self.buffer) > 67108864 or file_name[1] not in ['.z64', '.n64']: raise RuntimeError('ROM is not a valid OoT 1.0 ROM.') if len(self.buffer) == 33554432: From b1d17e8097fdc62744ec8fcd21d1269564ece628 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 4 Jun 2018 19:30:07 -0400 Subject: [PATCH 087/151] Fix ice trap animations --- ASM/src/items.asm | 20 ++++++++++++++++---- data/base2current.json | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 9e96fddcf..8cf16b52a 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -254,7 +254,7 @@ store_item_data: ori a0, v0, 0 jal resolve_extended_item ; v0 = resolved item ID, v1 = ITEM_TABLE entry nop - beqz v1, @@update_player_actor + beqz v1, @@update_base_game nop ; Store extended item data @@ -268,15 +268,27 @@ store_item_data: ; Mark the extended item data as active li t1, 1 sw t1, ITEM_ROW_IS_EXTENDED (t0) - ; Load the base item to be stored back in the player actor + ; Load the base item to be stored back in the player actor / chest lbu v0, ITEM_ROW_BASE_ITEM (v1) -@@update_player_actor: +@@update_base_game: li t0, PLAYER_ACTOR + ; If the giving actor is a chest, update it with new contents + lw t1, 0x0428 (t0) + lhu t2, 0x00 (t1) + bne t2, 0x000A, @@not_chest + nop + lhu t2, 0x1C (t1) + andi t2, t2, 0xF01F + sll t3, v0, 5 + or t2, t2, t3 + sh t2, 0x1C (t1) +@@not_chest: + ; Update player actor lb t1, 0x0424 (t0) bgez t1, @@not_negative nop - ; The input was negative (item is coming from a chest), so make the result negative + ; The input was negative (item is in a nearby chest), so make the result negative subu v0, r0, v0 @@not_negative: sb v0, 0x0424 (t0) diff --git a/data/base2current.json b/data/base2current.json index bb02eaf98..1074d5bf4 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [175, 191, 255, 252, 12, 16, 11, 25]}, {"11427700": [12, 16, 11, 32]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 4, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 11, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 18, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 10, 253, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 222, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 40, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 41, 236, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 116, 128, 64, 42, 8, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 140, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 200, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 42, 228, 128, 64, 40, 240, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 124, 128, 64, 40, 240, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 116, 128, 64, 42, 60, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 116, 128, 64, 42, 88, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 116, 128, 64, 40, 240, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 12, 128, 64, 40, 240, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 48, 128, 64, 42, 36, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 80, 128, 64, 40, 240, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [32]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 221]}, {"55060224": [4, 64]}, {"55060227": [24]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 27]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 5, 33]}, {"55060311": [2]}, {"55060317": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060327": [16, 39, 189]}, {"55060331": [24, 3, 224]}, {"55060335": [8]}, {"55060340": [39, 189, 255, 232, 175, 191]}, {"55060347": [16, 12, 16, 9, 235]}, {"55060356": [36, 1, 255, 255, 16, 65]}, {"55060363": [4]}, {"55060368": [52, 68]}, {"55060372": [12, 16, 10, 14]}, {"55060380": [143, 191]}, {"55060383": [16, 39, 189]}, {"55060387": [24, 3, 224]}, {"55060391": [8]}, {"55060396": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060407": [164, 52, 8]}, {"55060412": [52, 137]}, {"55060416": [148, 170]}, {"55060420": [52, 1]}, {"55060423": [10, 21, 65]}, {"55060427": [7]}, {"55060432": [52, 1]}, {"55060435": [16, 16, 65]}, {"55060439": [4]}, {"55060444": [52, 8]}, {"55060447": [1, 148, 169]}, {"55060451": [28, 49, 41]}, {"55060455": [31, 52, 1]}, {"55060459": [21, 21, 65]}, {"55060463": [12]}, {"55060468": [52, 1]}, {"55060471": [62, 16, 129]}, {"55060475": [7]}, {"55060480": [52, 1]}, {"55060483": [66, 16, 129]}, {"55060487": [4]}, {"55060492": [36, 2, 255, 255, 16]}, {"55060499": [7]}, {"55060504": [52, 8]}, {"55060507": [2, 144, 169, 1, 65]}, {"55060513": [2, 18]}, {"55060517": [72, 16, 37]}, {"55060521": [2, 18]}, {"55060525": [73, 16, 37, 3, 224]}, {"55060531": [8]}, {"55060536": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060551": [4, 141, 9]}, {"55060556": [17, 32]}, {"55060559": [5]}, {"55060565": [9, 82, 2, 21, 68, 255, 250]}, {"55060576": [49, 34]}, {"55060579": [255, 3, 224]}, {"55060583": [8]}, {"55060588": [39, 189, 255, 224, 175, 176]}, {"55060595": [16, 175, 177]}, {"55060599": [20, 175, 191]}, {"55060603": [24, 52, 130]}, {"55060608": [52, 80]}, {"55060612": [38, 8, 255, 128, 5]}, {"55060619": [18]}, {"55060624": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060635": [16, 1, 9]}, {"55060639": [24]}, {"55060642": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060660": [142, 40]}, {"55060663": [12, 1]}, {"55060666": [248, 9]}, {"55060672": [20, 80, 255, 239]}, {"55060680": [54, 35]}, {"55060684": [16]}, {"55060687": [2]}, {"55060692": [52, 3]}, {"55060696": [143, 176]}, {"55060699": [16, 143, 177]}, {"55060703": [20, 143, 191]}, {"55060707": [24, 39, 189]}, {"55060711": [32, 3, 224]}, {"55060715": [8]}, {"55060720": [3, 224]}, {"55060723": [8, 52, 162]}, {"55060728": [144, 136]}, {"55060731": [125, 52, 1]}, {"55060735": [255, 17, 1]}, {"55060739": [2, 52, 2]}, {"55060743": [8, 52, 2]}, {"55060747": [9, 3, 224]}, {"55060751": [8]}, {"55060756": [144, 136]}, {"55060759": [163, 49, 8]}, {"55060763": [192, 17]}, {"55060767": [5, 52, 2]}, {"55060771": [84, 52, 1]}, {"55060775": [64, 17, 1]}, {"55060779": [2, 52, 2]}, {"55060783": [53, 52, 2]}, {"55060787": [54, 3, 224]}, {"55060791": [8]}, {"55060796": [144, 136]}, {"55060799": [163, 49, 8]}, {"55060803": [24, 17]}, {"55060807": [5, 52, 2]}, {"55060811": [50, 52, 1]}, {"55060815": [8, 17, 1]}, {"55060819": [2, 52, 2]}, {"55060823": [51, 52, 2]}, {"55060827": [52, 3, 224]}, {"55060831": [8]}, {"55060836": [144, 136]}, {"55060839": [163, 49, 8]}, {"55060843": [3, 17]}, {"55060847": [5, 52, 2]}, {"55060851": [4, 52, 1]}, {"55060855": [1, 17, 1]}, {"55060859": [2, 52, 2]}, {"55060863": [48, 52, 2]}, {"55060867": [49, 3, 224]}, {"55060871": [8]}, {"55060876": [144, 136]}, {"55060879": [162, 49, 8]}, {"55060883": [192, 17]}, {"55060887": [5, 52, 2]}, {"55060891": [5, 52, 1]}, {"55060895": [64, 17, 1]}, {"55060899": [2, 52, 2]}, {"55060903": [96, 52, 2]}, {"55060907": [123, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [162, 49, 8]}, {"55060923": [48, 17]}, {"55060927": [2, 52, 2]}, {"55060931": [69, 52, 2]}, {"55060935": [70, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [162, 49, 8]}, {"55060951": [6, 17]}, {"55060955": [2, 52, 2]}, {"55060959": [55, 52, 2]}, {"55060963": [56, 3, 224]}, {"55060967": [8]}, {"55060972": [144, 136]}, {"55060975": [161, 49, 8]}, {"55060979": [32, 17]}, {"55060983": [2, 52, 2]}, {"55060987": [121, 52, 2]}, {"55060991": [122, 3, 224]}, {"55060995": [8]}, {"55061000": [144, 136]}, {"55061003": [161, 49, 8]}, {"55061007": [4, 17]}, {"55061011": [2, 52, 2]}, {"55061015": [119, 52, 2]}, {"55061019": [120, 3, 224]}, {"55061023": [8]}, {"55061028": [144, 136]}, {"55061031": [50, 17]}, {"55061035": [2, 52, 2]}, {"55061039": [192, 52, 2]}, {"55061043": [193, 3, 224]}, {"55061047": [8]}, {"55061052": [144, 136]}, {"55061055": [163, 49, 8]}, {"55061059": [3, 17]}, {"55061063": [2, 52, 2]}, {"55061067": [77, 52, 162]}, {"55061072": [3, 224]}, {"55061075": [8]}, {"55061080": [144, 136]}, {"55061083": [163, 49, 8]}, {"55061087": [24, 17]}, {"55061091": [2, 52, 2]}, {"55061095": [77, 52, 162]}, {"55061100": [3, 224]}, {"55061103": [8]}, {"55061108": [3, 224]}, {"55061111": [8]}, {"55061116": [52, 8]}, {"55061119": [1, 160, 136]}, {"55061123": [62, 3, 224]}, {"55061127": [8]}, {"55061132": [36, 136]}, {"55061135": [134, 36, 9, 255, 255, 37, 41]}, {"55061143": [1, 52, 1]}, {"55061147": [3]}, {"55061149": [41, 8, 42, 20, 32]}, {"55061155": [7]}, {"55061160": [1, 9, 80, 33, 145, 75]}, {"55061168": [52, 1]}, {"55061171": [255, 21, 97, 255, 247]}, {"55061180": [161, 69]}, {"55061184": [3, 224]}, {"55061187": [8]}, {"55061192": [36, 136]}, {"55061195": [168, 1, 6, 64, 33, 145, 9]}, {"55061204": [1, 37, 72, 37, 161, 9]}, {"55061212": [3, 224]}, {"55061215": [8]}, {"55061220": [36, 136]}, {"55061223": [188, 1, 5, 64, 33, 129, 9]}, {"55061232": [5, 33]}, {"55061235": [2]}, {"55061240": [52, 9]}, {"55061244": [37, 41]}, {"55061247": [1, 161, 9]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [52, 8]}, {"55061263": [1, 160, 136]}, {"55061267": [61, 148, 136]}, {"55061271": [46]}, {"55061273": [8, 65, 2, 160, 136]}, {"55061279": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061291": [8]}, {"55061296": [52, 8]}, {"55061299": [1, 160, 136]}, {"55061303": [50, 160, 136]}, {"55061307": [58, 52, 8]}, {"55061311": [48, 164, 136, 19, 244, 160, 136]}, {"55061319": [51, 3, 224]}, {"55061323": [8]}, {"55061328": [52, 8]}, {"55061331": [2, 160, 136]}, {"55061335": [50, 52, 8]}, {"55061339": [1, 160, 136]}, {"55061343": [58, 160, 136]}, {"55061347": [60, 52, 8]}, {"55061351": [96, 164, 136, 19, 244, 160, 136]}, {"55061359": [51, 3, 224]}, {"55061363": [8]}, {"55061368": [175, 164]}, {"55061371": [104, 175, 165]}, {"55061375": [108, 175, 166]}, {"55061379": [112, 175, 167]}, {"55061383": [116, 39, 189, 255, 232, 175, 163]}, {"55061391": [16, 175, 191]}, {"55061395": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061408": [17]}, {"55061411": [10]}, {"55061416": [60, 9, 128, 65, 52, 10]}, {"55061423": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061452": [143, 163]}, {"55061455": [16, 143, 191]}, {"55061459": [20, 39, 189]}, {"55061463": [24, 143, 164]}, {"55061467": [104, 143, 165]}, {"55061471": [108, 143, 166]}, {"55061475": [112, 143, 167]}, {"55061479": [116, 132, 110, 19, 196, 3, 224]}, {"55061487": [8]}, {"55061492": [147, 25]}, {"55061495": [116, 52, 1]}, {"55061499": [255, 23, 33]}, {"55061503": [2]}, {"55061508": [52, 25]}, {"55061511": [44, 3, 224]}, {"55061515": [8, 167, 185]}, {"55061519": [154, 147, 44]}, {"55061523": [116, 52, 1]}, {"55061527": [255, 21, 129]}, {"55061531": [2]}, {"55061536": [52, 12]}, {"55061539": [44, 3, 224]}, {"55061543": [8]}, {"55061548": [145, 174]}, {"55061551": [116, 52, 1]}, {"55061555": [255, 21, 193]}, {"55061559": [2]}, {"55061564": [52, 14]}, {"55061567": [44, 3, 224]}, {"55061571": [8, 167, 174]}, {"55061575": [154, 145, 207]}, {"55061579": [116, 52, 1]}, {"55061583": [255, 21, 225]}, {"55061587": [2]}, {"55061592": [52, 15]}, {"55061595": [44, 3, 224]}, {"55061599": [8, 167, 175]}, {"55061603": [154, 52, 3]}, {"55061607": [255, 21, 195]}, {"55061611": [3]}, {"55061616": [52, 3]}, {"55061619": [1, 160, 163, 15, 51, 3, 224]}, {"55061627": [8, 143, 191, 255, 252, 141, 9]}, {"55061635": [4, 17, 32]}, {"55061639": [7]}, {"55061644": [145, 9]}, {"55061647": [104, 52, 1]}, {"55061651": [59, 17, 33]}, {"55061655": [2]}, {"55061660": [52, 9]}, {"55061663": [255, 161, 9]}, {"55061667": [64, 3, 224]}, {"55061671": [8, 161, 14]}, {"55061675": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [175, 191, 255, 252, 12, 16, 11]}, {"11427700": [12, 16, 11, 42]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 14, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 21, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 28, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 7, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 232, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 42, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 42, 48, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 164, 128, 64, 41, 24, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 52, 128, 64, 41, 24, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 88, 128, 64, 42, 76, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 120, 128, 64, 41, 24, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [42]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 231]}, {"55060224": [4, 64]}, {"55060227": [34]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 37]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060312": [52, 1]}, {"55060315": [10, 21, 65]}, {"55060319": [6]}, {"55060324": [149, 42]}, {"55060327": [28, 49, 74, 240, 31]}, {"55060333": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060343": [28, 129, 9, 4, 36, 5, 33]}, {"55060351": [2]}, {"55060357": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060367": [16, 39, 189]}, {"55060371": [24, 3, 224]}, {"55060375": [8]}, {"55060380": [39, 189, 255, 232, 175, 191]}, {"55060387": [16, 12, 16, 9, 245]}, {"55060396": [36, 1, 255, 255, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 68]}, {"55060412": [12, 16, 10, 24]}, {"55060420": [143, 191]}, {"55060423": [16, 39, 189]}, {"55060427": [24, 3, 224]}, {"55060431": [8]}, {"55060436": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060447": [164, 52, 8]}, {"55060452": [52, 137]}, {"55060456": [148, 170]}, {"55060460": [52, 1]}, {"55060463": [10, 21, 65]}, {"55060467": [7]}, {"55060472": [52, 1]}, {"55060475": [16, 16, 65]}, {"55060479": [4]}, {"55060484": [52, 8]}, {"55060487": [1, 148, 169]}, {"55060491": [28, 49, 41]}, {"55060495": [31, 52, 1]}, {"55060499": [21, 21, 65]}, {"55060503": [12]}, {"55060508": [52, 1]}, {"55060511": [62, 16, 129]}, {"55060515": [7]}, {"55060520": [52, 1]}, {"55060523": [66, 16, 129]}, {"55060527": [4]}, {"55060532": [36, 2, 255, 255, 16]}, {"55060539": [7]}, {"55060544": [52, 8]}, {"55060547": [2, 144, 169, 1, 65]}, {"55060553": [2, 18]}, {"55060557": [72, 16, 37]}, {"55060561": [2, 18]}, {"55060565": [73, 16, 37, 3, 224]}, {"55060571": [8]}, {"55060576": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060591": [4, 141, 9]}, {"55060596": [17, 32]}, {"55060599": [5]}, {"55060605": [9, 82, 2, 21, 68, 255, 250]}, {"55060616": [49, 34]}, {"55060619": [255, 3, 224]}, {"55060623": [8]}, {"55060628": [39, 189, 255, 224, 175, 176]}, {"55060635": [16, 175, 177]}, {"55060639": [20, 175, 191]}, {"55060643": [24, 52, 130]}, {"55060648": [52, 80]}, {"55060652": [38, 8, 255, 128, 5]}, {"55060659": [18]}, {"55060664": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060675": [16, 1, 9]}, {"55060679": [24]}, {"55060682": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060700": [142, 40]}, {"55060703": [12, 1]}, {"55060706": [248, 9]}, {"55060712": [20, 80, 255, 239]}, {"55060720": [54, 35]}, {"55060724": [16]}, {"55060727": [2]}, {"55060732": [52, 3]}, {"55060736": [143, 176]}, {"55060739": [16, 143, 177]}, {"55060743": [20, 143, 191]}, {"55060747": [24, 39, 189]}, {"55060751": [32, 3, 224]}, {"55060755": [8]}, {"55060760": [3, 224]}, {"55060763": [8, 52, 162]}, {"55060768": [144, 136]}, {"55060771": [125, 52, 1]}, {"55060775": [255, 17, 1]}, {"55060779": [2, 52, 2]}, {"55060783": [8, 52, 2]}, {"55060787": [9, 3, 224]}, {"55060791": [8]}, {"55060796": [144, 136]}, {"55060799": [163, 49, 8]}, {"55060803": [192, 17]}, {"55060807": [5, 52, 2]}, {"55060811": [84, 52, 1]}, {"55060815": [64, 17, 1]}, {"55060819": [2, 52, 2]}, {"55060823": [53, 52, 2]}, {"55060827": [54, 3, 224]}, {"55060831": [8]}, {"55060836": [144, 136]}, {"55060839": [163, 49, 8]}, {"55060843": [24, 17]}, {"55060847": [5, 52, 2]}, {"55060851": [50, 52, 1]}, {"55060855": [8, 17, 1]}, {"55060859": [2, 52, 2]}, {"55060863": [51, 52, 2]}, {"55060867": [52, 3, 224]}, {"55060871": [8]}, {"55060876": [144, 136]}, {"55060879": [163, 49, 8]}, {"55060883": [3, 17]}, {"55060887": [5, 52, 2]}, {"55060891": [4, 52, 1]}, {"55060895": [1, 17, 1]}, {"55060899": [2, 52, 2]}, {"55060903": [48, 52, 2]}, {"55060907": [49, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [162, 49, 8]}, {"55060923": [192, 17]}, {"55060927": [5, 52, 2]}, {"55060931": [5, 52, 1]}, {"55060935": [64, 17, 1]}, {"55060939": [2, 52, 2]}, {"55060943": [96, 52, 2]}, {"55060947": [123, 3, 224]}, {"55060951": [8]}, {"55060956": [144, 136]}, {"55060959": [162, 49, 8]}, {"55060963": [48, 17]}, {"55060967": [2, 52, 2]}, {"55060971": [69, 52, 2]}, {"55060975": [70, 3, 224]}, {"55060979": [8]}, {"55060984": [144, 136]}, {"55060987": [162, 49, 8]}, {"55060991": [6, 17]}, {"55060995": [2, 52, 2]}, {"55060999": [55, 52, 2]}, {"55061003": [56, 3, 224]}, {"55061007": [8]}, {"55061012": [144, 136]}, {"55061015": [161, 49, 8]}, {"55061019": [32, 17]}, {"55061023": [2, 52, 2]}, {"55061027": [121, 52, 2]}, {"55061031": [122, 3, 224]}, {"55061035": [8]}, {"55061040": [144, 136]}, {"55061043": [161, 49, 8]}, {"55061047": [4, 17]}, {"55061051": [2, 52, 2]}, {"55061055": [119, 52, 2]}, {"55061059": [120, 3, 224]}, {"55061063": [8]}, {"55061068": [144, 136]}, {"55061071": [50, 17]}, {"55061075": [2, 52, 2]}, {"55061079": [192, 52, 2]}, {"55061083": [193, 3, 224]}, {"55061087": [8]}, {"55061092": [144, 136]}, {"55061095": [163, 49, 8]}, {"55061099": [3, 17]}, {"55061103": [2, 52, 2]}, {"55061107": [77, 52, 162]}, {"55061112": [3, 224]}, {"55061115": [8]}, {"55061120": [144, 136]}, {"55061123": [163, 49, 8]}, {"55061127": [24, 17]}, {"55061131": [2, 52, 2]}, {"55061135": [77, 52, 162]}, {"55061140": [3, 224]}, {"55061143": [8]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [52, 8]}, {"55061159": [1, 160, 136]}, {"55061163": [62, 3, 224]}, {"55061167": [8]}, {"55061172": [36, 136]}, {"55061175": [134, 36, 9, 255, 255, 37, 41]}, {"55061183": [1, 52, 1]}, {"55061187": [3]}, {"55061189": [41, 8, 42, 20, 32]}, {"55061195": [7]}, {"55061200": [1, 9, 80, 33, 145, 75]}, {"55061208": [52, 1]}, {"55061211": [255, 21, 97, 255, 247]}, {"55061220": [161, 69]}, {"55061224": [3, 224]}, {"55061227": [8]}, {"55061232": [36, 136]}, {"55061235": [168, 1, 6, 64, 33, 145, 9]}, {"55061244": [1, 37, 72, 37, 161, 9]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [36, 136]}, {"55061263": [188, 1, 5, 64, 33, 129, 9]}, {"55061272": [5, 33]}, {"55061275": [2]}, {"55061280": [52, 9]}, {"55061284": [37, 41]}, {"55061287": [1, 161, 9]}, {"55061292": [3, 224]}, {"55061295": [8]}, {"55061300": [52, 8]}, {"55061303": [1, 160, 136]}, {"55061307": [61, 148, 136]}, {"55061311": [46]}, {"55061313": [8, 65, 2, 160, 136]}, {"55061319": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061331": [8]}, {"55061336": [52, 8]}, {"55061339": [1, 160, 136]}, {"55061343": [50, 160, 136]}, {"55061347": [58, 52, 8]}, {"55061351": [48, 164, 136, 19, 244, 160, 136]}, {"55061359": [51, 3, 224]}, {"55061363": [8]}, {"55061368": [52, 8]}, {"55061371": [2, 160, 136]}, {"55061375": [50, 52, 8]}, {"55061379": [1, 160, 136]}, {"55061383": [58, 160, 136]}, {"55061387": [60, 52, 8]}, {"55061391": [96, 164, 136, 19, 244, 160, 136]}, {"55061399": [51, 3, 224]}, {"55061403": [8]}, {"55061408": [175, 164]}, {"55061411": [104, 175, 165]}, {"55061415": [108, 175, 166]}, {"55061419": [112, 175, 167]}, {"55061423": [116, 39, 189, 255, 232, 175, 163]}, {"55061431": [16, 175, 191]}, {"55061435": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061448": [17]}, {"55061451": [10]}, {"55061456": [60, 9, 128, 65, 52, 10]}, {"55061463": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061492": [143, 163]}, {"55061495": [16, 143, 191]}, {"55061499": [20, 39, 189]}, {"55061503": [24, 143, 164]}, {"55061507": [104, 143, 165]}, {"55061511": [108, 143, 166]}, {"55061515": [112, 143, 167]}, {"55061519": [116, 132, 110, 19, 196, 3, 224]}, {"55061527": [8]}, {"55061532": [147, 25]}, {"55061535": [116, 52, 1]}, {"55061539": [255, 23, 33]}, {"55061543": [2]}, {"55061548": [52, 25]}, {"55061551": [44, 3, 224]}, {"55061555": [8, 167, 185]}, {"55061559": [154, 147, 44]}, {"55061563": [116, 52, 1]}, {"55061567": [255, 21, 129]}, {"55061571": [2]}, {"55061576": [52, 12]}, {"55061579": [44, 3, 224]}, {"55061583": [8]}, {"55061588": [145, 174]}, {"55061591": [116, 52, 1]}, {"55061595": [255, 21, 193]}, {"55061599": [2]}, {"55061604": [52, 14]}, {"55061607": [44, 3, 224]}, {"55061611": [8, 167, 174]}, {"55061615": [154, 145, 207]}, {"55061619": [116, 52, 1]}, {"55061623": [255, 21, 225]}, {"55061627": [2]}, {"55061632": [52, 15]}, {"55061635": [44, 3, 224]}, {"55061639": [8, 167, 175]}, {"55061643": [154, 52, 3]}, {"55061647": [255, 21, 195]}, {"55061651": [3]}, {"55061656": [52, 3]}, {"55061659": [1, 160, 163, 15, 51, 3, 224]}, {"55061667": [8, 143, 191, 255, 252, 141, 9]}, {"55061675": [4, 17, 32]}, {"55061679": [7]}, {"55061684": [145, 9]}, {"55061687": [104, 52, 1]}, {"55061691": [59, 17, 33]}, {"55061695": [2]}, {"55061700": [52, 9]}, {"55061703": [255, 161, 9]}, {"55061707": [64, 3, 224]}, {"55061711": [8, 161, 14]}, {"55061715": [104]}] \ No newline at end of file From 02c04e351428a9ed3364b561f7210428e0ce03b7 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 4 Jun 2018 19:41:44 -0400 Subject: [PATCH 088/151] Fix item ID for double defense --- Items.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Items.py b/Items.py index 2eaca68f4..e23b46470 100644 --- a/Items.py +++ b/Items.py @@ -76,7 +76,7 @@ def ItemFactory(items): 'Deku Stick Capacity': (False, False, None, None, 0x88), 'Deku Nut Capacity': (False, False, None, None, 0x87), 'Magic Meter': (True, False, None, None, 0xC0), - 'Double Defense': (False, False, None, None, 0xC1), + 'Double Defense': (False, False, None, None, 0xBF), 'Stone of Agony': (True, False, None, 0x0720, 0x39), 'Piece of Heart': (False, False, None, 0x07C0, 0x3E), 'Heart Container': (False, False, None, 0x07A0, 0x3D), From 9623cc270168d53cd83a679ce7594111a111ac6c Mon Sep 17 00:00:00 2001 From: Wulfy Date: Mon, 4 Jun 2018 20:41:16 -0400 Subject: [PATCH 089/151] Fix restoring child equipment on VC --- ASM/src/fixes.asm | 6 +++++- ASM/src/hacks.asm | 10 ++++++---- data/base2current.json | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ASM/src/fixes.asm b/ASM/src/fixes.asm index 6501a7077..87e146801 100755 --- a/ASM/src/fixes.asm +++ b/ASM/src/fixes.asm @@ -1,4 +1,8 @@ restore_swordless_flag: + ; Displaced code + lbu t6, 0x0040 (a1) + lbu v0, 0x0070 (a1) + li v1, 0xFF bne t6, v1, @@return nop @@ -6,7 +10,7 @@ restore_swordless_flag: sb v1, 0x0F33 (a1) ; If restoring 0xFF to B equip, set the swordless flag @@return: jr ra - lw ra, -0x04 (sp) + nop ;================================================================================================== diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 85be9bf2c..6720ddc3a 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -17,13 +17,15 @@ ; Adult -> Child: Don't skip restoring child's B equip if 0xFF is the saved value, and set the ; swordless flag if needed ; Replaces: +; lbu t6, 0x0040 (a1) +; lbu v0, 0x0070 (a1) ; addiu v1, r0, 0x00FF ; beq v1, t6, 0x8006FA28 -; sh v0, 0x0052 (a1) -.org 0xAE58F4 ; In memory: 0x8006F994 - sw ra, -0x04 (sp) +.org 0xAE58EC ; In memory: 0x8006F98C + ori t7, ra, 0 jal restore_swordless_flag - sh v0, 0x0052 (a1) + nop + ori ra, t7, 0 ; Child -> Adult: Save the child's B equip before it gets overwritten ; Replaces: diff --git a/data/base2current.json b/data/base2current.json index 1074d5bf4..074a5f764 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426036": [175, 191, 255, 252, 12, 16, 11]}, {"11427700": [12, 16, 11, 42]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 14, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 21, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 28, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 7, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 232, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 42, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 42, 48, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 164, 128, 64, 41, 24, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 52, 128, 64, 41, 24, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 88, 128, 64, 42, 76, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 120, 128, 64, 41, 24, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [42]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 231]}, {"55060224": [4, 64]}, {"55060227": [34]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 37]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060312": [52, 1]}, {"55060315": [10, 21, 65]}, {"55060319": [6]}, {"55060324": [149, 42]}, {"55060327": [28, 49, 74, 240, 31]}, {"55060333": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060343": [28, 129, 9, 4, 36, 5, 33]}, {"55060351": [2]}, {"55060357": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060367": [16, 39, 189]}, {"55060371": [24, 3, 224]}, {"55060375": [8]}, {"55060380": [39, 189, 255, 232, 175, 191]}, {"55060387": [16, 12, 16, 9, 245]}, {"55060396": [36, 1, 255, 255, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 68]}, {"55060412": [12, 16, 10, 24]}, {"55060420": [143, 191]}, {"55060423": [16, 39, 189]}, {"55060427": [24, 3, 224]}, {"55060431": [8]}, {"55060436": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060447": [164, 52, 8]}, {"55060452": [52, 137]}, {"55060456": [148, 170]}, {"55060460": [52, 1]}, {"55060463": [10, 21, 65]}, {"55060467": [7]}, {"55060472": [52, 1]}, {"55060475": [16, 16, 65]}, {"55060479": [4]}, {"55060484": [52, 8]}, {"55060487": [1, 148, 169]}, {"55060491": [28, 49, 41]}, {"55060495": [31, 52, 1]}, {"55060499": [21, 21, 65]}, {"55060503": [12]}, {"55060508": [52, 1]}, {"55060511": [62, 16, 129]}, {"55060515": [7]}, {"55060520": [52, 1]}, {"55060523": [66, 16, 129]}, {"55060527": [4]}, {"55060532": [36, 2, 255, 255, 16]}, {"55060539": [7]}, {"55060544": [52, 8]}, {"55060547": [2, 144, 169, 1, 65]}, {"55060553": [2, 18]}, {"55060557": [72, 16, 37]}, {"55060561": [2, 18]}, {"55060565": [73, 16, 37, 3, 224]}, {"55060571": [8]}, {"55060576": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060591": [4, 141, 9]}, {"55060596": [17, 32]}, {"55060599": [5]}, {"55060605": [9, 82, 2, 21, 68, 255, 250]}, {"55060616": [49, 34]}, {"55060619": [255, 3, 224]}, {"55060623": [8]}, {"55060628": [39, 189, 255, 224, 175, 176]}, {"55060635": [16, 175, 177]}, {"55060639": [20, 175, 191]}, {"55060643": [24, 52, 130]}, {"55060648": [52, 80]}, {"55060652": [38, 8, 255, 128, 5]}, {"55060659": [18]}, {"55060664": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060675": [16, 1, 9]}, {"55060679": [24]}, {"55060682": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060700": [142, 40]}, {"55060703": [12, 1]}, {"55060706": [248, 9]}, {"55060712": [20, 80, 255, 239]}, {"55060720": [54, 35]}, {"55060724": [16]}, {"55060727": [2]}, {"55060732": [52, 3]}, {"55060736": [143, 176]}, {"55060739": [16, 143, 177]}, {"55060743": [20, 143, 191]}, {"55060747": [24, 39, 189]}, {"55060751": [32, 3, 224]}, {"55060755": [8]}, {"55060760": [3, 224]}, {"55060763": [8, 52, 162]}, {"55060768": [144, 136]}, {"55060771": [125, 52, 1]}, {"55060775": [255, 17, 1]}, {"55060779": [2, 52, 2]}, {"55060783": [8, 52, 2]}, {"55060787": [9, 3, 224]}, {"55060791": [8]}, {"55060796": [144, 136]}, {"55060799": [163, 49, 8]}, {"55060803": [192, 17]}, {"55060807": [5, 52, 2]}, {"55060811": [84, 52, 1]}, {"55060815": [64, 17, 1]}, {"55060819": [2, 52, 2]}, {"55060823": [53, 52, 2]}, {"55060827": [54, 3, 224]}, {"55060831": [8]}, {"55060836": [144, 136]}, {"55060839": [163, 49, 8]}, {"55060843": [24, 17]}, {"55060847": [5, 52, 2]}, {"55060851": [50, 52, 1]}, {"55060855": [8, 17, 1]}, {"55060859": [2, 52, 2]}, {"55060863": [51, 52, 2]}, {"55060867": [52, 3, 224]}, {"55060871": [8]}, {"55060876": [144, 136]}, {"55060879": [163, 49, 8]}, {"55060883": [3, 17]}, {"55060887": [5, 52, 2]}, {"55060891": [4, 52, 1]}, {"55060895": [1, 17, 1]}, {"55060899": [2, 52, 2]}, {"55060903": [48, 52, 2]}, {"55060907": [49, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [162, 49, 8]}, {"55060923": [192, 17]}, {"55060927": [5, 52, 2]}, {"55060931": [5, 52, 1]}, {"55060935": [64, 17, 1]}, {"55060939": [2, 52, 2]}, {"55060943": [96, 52, 2]}, {"55060947": [123, 3, 224]}, {"55060951": [8]}, {"55060956": [144, 136]}, {"55060959": [162, 49, 8]}, {"55060963": [48, 17]}, {"55060967": [2, 52, 2]}, {"55060971": [69, 52, 2]}, {"55060975": [70, 3, 224]}, {"55060979": [8]}, {"55060984": [144, 136]}, {"55060987": [162, 49, 8]}, {"55060991": [6, 17]}, {"55060995": [2, 52, 2]}, {"55060999": [55, 52, 2]}, {"55061003": [56, 3, 224]}, {"55061007": [8]}, {"55061012": [144, 136]}, {"55061015": [161, 49, 8]}, {"55061019": [32, 17]}, {"55061023": [2, 52, 2]}, {"55061027": [121, 52, 2]}, {"55061031": [122, 3, 224]}, {"55061035": [8]}, {"55061040": [144, 136]}, {"55061043": [161, 49, 8]}, {"55061047": [4, 17]}, {"55061051": [2, 52, 2]}, {"55061055": [119, 52, 2]}, {"55061059": [120, 3, 224]}, {"55061063": [8]}, {"55061068": [144, 136]}, {"55061071": [50, 17]}, {"55061075": [2, 52, 2]}, {"55061079": [192, 52, 2]}, {"55061083": [193, 3, 224]}, {"55061087": [8]}, {"55061092": [144, 136]}, {"55061095": [163, 49, 8]}, {"55061099": [3, 17]}, {"55061103": [2, 52, 2]}, {"55061107": [77, 52, 162]}, {"55061112": [3, 224]}, {"55061115": [8]}, {"55061120": [144, 136]}, {"55061123": [163, 49, 8]}, {"55061127": [24, 17]}, {"55061131": [2, 52, 2]}, {"55061135": [77, 52, 162]}, {"55061140": [3, 224]}, {"55061143": [8]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [52, 8]}, {"55061159": [1, 160, 136]}, {"55061163": [62, 3, 224]}, {"55061167": [8]}, {"55061172": [36, 136]}, {"55061175": [134, 36, 9, 255, 255, 37, 41]}, {"55061183": [1, 52, 1]}, {"55061187": [3]}, {"55061189": [41, 8, 42, 20, 32]}, {"55061195": [7]}, {"55061200": [1, 9, 80, 33, 145, 75]}, {"55061208": [52, 1]}, {"55061211": [255, 21, 97, 255, 247]}, {"55061220": [161, 69]}, {"55061224": [3, 224]}, {"55061227": [8]}, {"55061232": [36, 136]}, {"55061235": [168, 1, 6, 64, 33, 145, 9]}, {"55061244": [1, 37, 72, 37, 161, 9]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [36, 136]}, {"55061263": [188, 1, 5, 64, 33, 129, 9]}, {"55061272": [5, 33]}, {"55061275": [2]}, {"55061280": [52, 9]}, {"55061284": [37, 41]}, {"55061287": [1, 161, 9]}, {"55061292": [3, 224]}, {"55061295": [8]}, {"55061300": [52, 8]}, {"55061303": [1, 160, 136]}, {"55061307": [61, 148, 136]}, {"55061311": [46]}, {"55061313": [8, 65, 2, 160, 136]}, {"55061319": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061331": [8]}, {"55061336": [52, 8]}, {"55061339": [1, 160, 136]}, {"55061343": [50, 160, 136]}, {"55061347": [58, 52, 8]}, {"55061351": [48, 164, 136, 19, 244, 160, 136]}, {"55061359": [51, 3, 224]}, {"55061363": [8]}, {"55061368": [52, 8]}, {"55061371": [2, 160, 136]}, {"55061375": [50, 52, 8]}, {"55061379": [1, 160, 136]}, {"55061383": [58, 160, 136]}, {"55061387": [60, 52, 8]}, {"55061391": [96, 164, 136, 19, 244, 160, 136]}, {"55061399": [51, 3, 224]}, {"55061403": [8]}, {"55061408": [175, 164]}, {"55061411": [104, 175, 165]}, {"55061415": [108, 175, 166]}, {"55061419": [112, 175, 167]}, {"55061423": [116, 39, 189, 255, 232, 175, 163]}, {"55061431": [16, 175, 191]}, {"55061435": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061448": [17]}, {"55061451": [10]}, {"55061456": [60, 9, 128, 65, 52, 10]}, {"55061463": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061492": [143, 163]}, {"55061495": [16, 143, 191]}, {"55061499": [20, 39, 189]}, {"55061503": [24, 143, 164]}, {"55061507": [104, 143, 165]}, {"55061511": [108, 143, 166]}, {"55061515": [112, 143, 167]}, {"55061519": [116, 132, 110, 19, 196, 3, 224]}, {"55061527": [8]}, {"55061532": [147, 25]}, {"55061535": [116, 52, 1]}, {"55061539": [255, 23, 33]}, {"55061543": [2]}, {"55061548": [52, 25]}, {"55061551": [44, 3, 224]}, {"55061555": [8, 167, 185]}, {"55061559": [154, 147, 44]}, {"55061563": [116, 52, 1]}, {"55061567": [255, 21, 129]}, {"55061571": [2]}, {"55061576": [52, 12]}, {"55061579": [44, 3, 224]}, {"55061583": [8]}, {"55061588": [145, 174]}, {"55061591": [116, 52, 1]}, {"55061595": [255, 21, 193]}, {"55061599": [2]}, {"55061604": [52, 14]}, {"55061607": [44, 3, 224]}, {"55061611": [8, 167, 174]}, {"55061615": [154, 145, 207]}, {"55061619": [116, 52, 1]}, {"55061623": [255, 21, 225]}, {"55061627": [2]}, {"55061632": [52, 15]}, {"55061635": [44, 3, 224]}, {"55061639": [8, 167, 175]}, {"55061643": [154, 52, 3]}, {"55061647": [255, 21, 195]}, {"55061651": [3]}, {"55061656": [52, 3]}, {"55061659": [1, 160, 163, 15, 51, 3, 224]}, {"55061667": [8, 143, 191, 255, 252, 141, 9]}, {"55061675": [4, 17, 32]}, {"55061679": [7]}, {"55061684": [145, 9]}, {"55061687": [104, 52, 1]}, {"55061691": [59, 17, 33]}, {"55061695": [2]}, {"55061700": [52, 9]}, {"55061703": [255, 161, 9]}, {"55061707": [64, 3, 224]}, {"55061711": [8, 161, 14]}, {"55061715": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426028": [55, 239]}, {"11426031": [0, 12, 16, 11, 35, 0, 0]}, {"11426039": [0, 53, 255]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 44]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 14, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 21, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 28, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 7, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 232, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 42, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 42, 48, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 164, 128, 64, 41, 24, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 52, 128, 64, 41, 24, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 88, 128, 64, 42, 76, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 120, 128, 64, 41, 24, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [42]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 231]}, {"55060224": [4, 64]}, {"55060227": [34]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 37]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060312": [52, 1]}, {"55060315": [10, 21, 65]}, {"55060319": [6]}, {"55060324": [149, 42]}, {"55060327": [28, 49, 74, 240, 31]}, {"55060333": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060343": [28, 129, 9, 4, 36, 5, 33]}, {"55060351": [2]}, {"55060357": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060367": [16, 39, 189]}, {"55060371": [24, 3, 224]}, {"55060375": [8]}, {"55060380": [39, 189, 255, 232, 175, 191]}, {"55060387": [16, 12, 16, 9, 245]}, {"55060396": [36, 1, 255, 255, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 68]}, {"55060412": [12, 16, 10, 24]}, {"55060420": [143, 191]}, {"55060423": [16, 39, 189]}, {"55060427": [24, 3, 224]}, {"55060431": [8]}, {"55060436": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060447": [164, 52, 8]}, {"55060452": [52, 137]}, {"55060456": [148, 170]}, {"55060460": [52, 1]}, {"55060463": [10, 21, 65]}, {"55060467": [7]}, {"55060472": [52, 1]}, {"55060475": [16, 16, 65]}, {"55060479": [4]}, {"55060484": [52, 8]}, {"55060487": [1, 148, 169]}, {"55060491": [28, 49, 41]}, {"55060495": [31, 52, 1]}, {"55060499": [21, 21, 65]}, {"55060503": [12]}, {"55060508": [52, 1]}, {"55060511": [62, 16, 129]}, {"55060515": [7]}, {"55060520": [52, 1]}, {"55060523": [66, 16, 129]}, {"55060527": [4]}, {"55060532": [36, 2, 255, 255, 16]}, {"55060539": [7]}, {"55060544": [52, 8]}, {"55060547": [2, 144, 169, 1, 65]}, {"55060553": [2, 18]}, {"55060557": [72, 16, 37]}, {"55060561": [2, 18]}, {"55060565": [73, 16, 37, 3, 224]}, {"55060571": [8]}, {"55060576": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060591": [4, 141, 9]}, {"55060596": [17, 32]}, {"55060599": [5]}, {"55060605": [9, 82, 2, 21, 68, 255, 250]}, {"55060616": [49, 34]}, {"55060619": [255, 3, 224]}, {"55060623": [8]}, {"55060628": [39, 189, 255, 224, 175, 176]}, {"55060635": [16, 175, 177]}, {"55060639": [20, 175, 191]}, {"55060643": [24, 52, 130]}, {"55060648": [52, 80]}, {"55060652": [38, 8, 255, 128, 5]}, {"55060659": [18]}, {"55060664": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060675": [16, 1, 9]}, {"55060679": [24]}, {"55060682": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060700": [142, 40]}, {"55060703": [12, 1]}, {"55060706": [248, 9]}, {"55060712": [20, 80, 255, 239]}, {"55060720": [54, 35]}, {"55060724": [16]}, {"55060727": [2]}, {"55060732": [52, 3]}, {"55060736": [143, 176]}, {"55060739": [16, 143, 177]}, {"55060743": [20, 143, 191]}, {"55060747": [24, 39, 189]}, {"55060751": [32, 3, 224]}, {"55060755": [8]}, {"55060760": [3, 224]}, {"55060763": [8, 52, 162]}, {"55060768": [144, 136]}, {"55060771": [125, 52, 1]}, {"55060775": [255, 17, 1]}, {"55060779": [2, 52, 2]}, {"55060783": [8, 52, 2]}, {"55060787": [9, 3, 224]}, {"55060791": [8]}, {"55060796": [144, 136]}, {"55060799": [163, 49, 8]}, {"55060803": [192, 17]}, {"55060807": [5, 52, 2]}, {"55060811": [84, 52, 1]}, {"55060815": [64, 17, 1]}, {"55060819": [2, 52, 2]}, {"55060823": [53, 52, 2]}, {"55060827": [54, 3, 224]}, {"55060831": [8]}, {"55060836": [144, 136]}, {"55060839": [163, 49, 8]}, {"55060843": [24, 17]}, {"55060847": [5, 52, 2]}, {"55060851": [50, 52, 1]}, {"55060855": [8, 17, 1]}, {"55060859": [2, 52, 2]}, {"55060863": [51, 52, 2]}, {"55060867": [52, 3, 224]}, {"55060871": [8]}, {"55060876": [144, 136]}, {"55060879": [163, 49, 8]}, {"55060883": [3, 17]}, {"55060887": [5, 52, 2]}, {"55060891": [4, 52, 1]}, {"55060895": [1, 17, 1]}, {"55060899": [2, 52, 2]}, {"55060903": [48, 52, 2]}, {"55060907": [49, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [162, 49, 8]}, {"55060923": [192, 17]}, {"55060927": [5, 52, 2]}, {"55060931": [5, 52, 1]}, {"55060935": [64, 17, 1]}, {"55060939": [2, 52, 2]}, {"55060943": [96, 52, 2]}, {"55060947": [123, 3, 224]}, {"55060951": [8]}, {"55060956": [144, 136]}, {"55060959": [162, 49, 8]}, {"55060963": [48, 17]}, {"55060967": [2, 52, 2]}, {"55060971": [69, 52, 2]}, {"55060975": [70, 3, 224]}, {"55060979": [8]}, {"55060984": [144, 136]}, {"55060987": [162, 49, 8]}, {"55060991": [6, 17]}, {"55060995": [2, 52, 2]}, {"55060999": [55, 52, 2]}, {"55061003": [56, 3, 224]}, {"55061007": [8]}, {"55061012": [144, 136]}, {"55061015": [161, 49, 8]}, {"55061019": [32, 17]}, {"55061023": [2, 52, 2]}, {"55061027": [121, 52, 2]}, {"55061031": [122, 3, 224]}, {"55061035": [8]}, {"55061040": [144, 136]}, {"55061043": [161, 49, 8]}, {"55061047": [4, 17]}, {"55061051": [2, 52, 2]}, {"55061055": [119, 52, 2]}, {"55061059": [120, 3, 224]}, {"55061063": [8]}, {"55061068": [144, 136]}, {"55061071": [50, 17]}, {"55061075": [2, 52, 2]}, {"55061079": [192, 52, 2]}, {"55061083": [193, 3, 224]}, {"55061087": [8]}, {"55061092": [144, 136]}, {"55061095": [163, 49, 8]}, {"55061099": [3, 17]}, {"55061103": [2, 52, 2]}, {"55061107": [77, 52, 162]}, {"55061112": [3, 224]}, {"55061115": [8]}, {"55061120": [144, 136]}, {"55061123": [163, 49, 8]}, {"55061127": [24, 17]}, {"55061131": [2, 52, 2]}, {"55061135": [77, 52, 162]}, {"55061140": [3, 224]}, {"55061143": [8]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [52, 8]}, {"55061159": [1, 160, 136]}, {"55061163": [62, 3, 224]}, {"55061167": [8]}, {"55061172": [36, 136]}, {"55061175": [134, 36, 9, 255, 255, 37, 41]}, {"55061183": [1, 52, 1]}, {"55061187": [3]}, {"55061189": [41, 8, 42, 20, 32]}, {"55061195": [7]}, {"55061200": [1, 9, 80, 33, 145, 75]}, {"55061208": [52, 1]}, {"55061211": [255, 21, 97, 255, 247]}, {"55061220": [161, 69]}, {"55061224": [3, 224]}, {"55061227": [8]}, {"55061232": [36, 136]}, {"55061235": [168, 1, 6, 64, 33, 145, 9]}, {"55061244": [1, 37, 72, 37, 161, 9]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [36, 136]}, {"55061263": [188, 1, 5, 64, 33, 129, 9]}, {"55061272": [5, 33]}, {"55061275": [2]}, {"55061280": [52, 9]}, {"55061284": [37, 41]}, {"55061287": [1, 161, 9]}, {"55061292": [3, 224]}, {"55061295": [8]}, {"55061300": [52, 8]}, {"55061303": [1, 160, 136]}, {"55061307": [61, 148, 136]}, {"55061311": [46]}, {"55061313": [8, 65, 2, 160, 136]}, {"55061319": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061331": [8]}, {"55061336": [52, 8]}, {"55061339": [1, 160, 136]}, {"55061343": [50, 160, 136]}, {"55061347": [58, 52, 8]}, {"55061351": [48, 164, 136, 19, 244, 160, 136]}, {"55061359": [51, 3, 224]}, {"55061363": [8]}, {"55061368": [52, 8]}, {"55061371": [2, 160, 136]}, {"55061375": [50, 52, 8]}, {"55061379": [1, 160, 136]}, {"55061383": [58, 160, 136]}, {"55061387": [60, 52, 8]}, {"55061391": [96, 164, 136, 19, 244, 160, 136]}, {"55061399": [51, 3, 224]}, {"55061403": [8]}, {"55061408": [175, 164]}, {"55061411": [104, 175, 165]}, {"55061415": [108, 175, 166]}, {"55061419": [112, 175, 167]}, {"55061423": [116, 39, 189, 255, 232, 175, 163]}, {"55061431": [16, 175, 191]}, {"55061435": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061448": [17]}, {"55061451": [10]}, {"55061456": [60, 9, 128, 65, 52, 10]}, {"55061463": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061492": [143, 163]}, {"55061495": [16, 143, 191]}, {"55061499": [20, 39, 189]}, {"55061503": [24, 143, 164]}, {"55061507": [104, 143, 165]}, {"55061511": [108, 143, 166]}, {"55061515": [112, 143, 167]}, {"55061519": [116, 132, 110, 19, 196, 3, 224]}, {"55061527": [8]}, {"55061532": [147, 25]}, {"55061535": [116, 52, 1]}, {"55061539": [255, 23, 33]}, {"55061543": [2]}, {"55061548": [52, 25]}, {"55061551": [44, 3, 224]}, {"55061555": [8, 167, 185]}, {"55061559": [154, 147, 44]}, {"55061563": [116, 52, 1]}, {"55061567": [255, 21, 129]}, {"55061571": [2]}, {"55061576": [52, 12]}, {"55061579": [44, 3, 224]}, {"55061583": [8]}, {"55061588": [145, 174]}, {"55061591": [116, 52, 1]}, {"55061595": [255, 21, 193]}, {"55061599": [2]}, {"55061604": [52, 14]}, {"55061607": [44, 3, 224]}, {"55061611": [8, 167, 174]}, {"55061615": [154, 145, 207]}, {"55061619": [116, 52, 1]}, {"55061623": [255, 21, 225]}, {"55061627": [2]}, {"55061632": [52, 15]}, {"55061635": [44, 3, 224]}, {"55061639": [8, 167, 175]}, {"55061643": [154, 144, 174]}, {"55061647": [64, 144, 162]}, {"55061651": [112, 52, 3]}, {"55061655": [255, 21, 195]}, {"55061659": [3]}, {"55061664": [52, 3]}, {"55061667": [1, 160, 163, 15, 51, 3, 224]}, {"55061675": [8]}, {"55061680": [141, 9]}, {"55061683": [4, 17, 32]}, {"55061687": [7]}, {"55061692": [145, 9]}, {"55061695": [104, 52, 1]}, {"55061699": [59, 17, 33]}, {"55061703": [2]}, {"55061708": [52, 9]}, {"55061711": [255, 161, 9]}, {"55061715": [64, 3, 224]}, {"55061719": [8, 161, 14]}, {"55061723": [104]}] \ No newline at end of file From d50ad6e48b97c824fcf07adc4bbd301f880248e2 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 4 Jun 2018 21:24:26 -0500 Subject: [PATCH 090/151] Goofy Ganon lines --- HintList.py | 16 ++++++++++++++-- Hints.py | 29 +++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/HintList.py b/HintList.py index a080e9927..4e0e208ab 100644 --- a/HintList.py +++ b/HintList.py @@ -35,6 +35,7 @@ def getHintGroup(string): # # sets color to white (currently only used for dungeon reward hints). hintTable = {'Hammer': (" the dragon smasher.", 'item'), 'Magic Meter': (" pixie dust.", 'item'), + 'Double Defense': (" a white outline", 'item'), 'Progressive Hookshot': (" Dampe's Keepsake.", 'item'), 'Progressive Strength Upgrade': (" power gloves.", 'item'), 'Hover Boots': (" butter boots.", 'item'), @@ -65,7 +66,7 @@ def getHintGroup(string): 'Ocarina of Time': (" blue flute.", 'item'), 'Bottle': (" a fairy prison.", 'item'), 'Bottle with Letter': (" a call for help.", 'item'), - 'Bottle with Milk': (" vitamin D.", 'item'), + 'Bottle with Milk': (" cow juice.", 'item'), 'Progressive Scale': (" Zora Flippers.", 'item'), 'Stone of Agony': (" an empty chest.", 'item'), 'Eponas Song': (" an equestrian etude.", 'item'), @@ -214,4 +215,15 @@ def getHintGroup(string): 'Links Pocket': ("One in #@'s pocket#...^", 'boss'), 'Spiritual Stone Text Start': ("Ye who owns 3 Spiritual Stones...^", 'boss'), 'Spiritual Stone Text End': ("Stand with the Ocarina of Time&and play the Song of Time.", 'boss'), - 'Medallion Text End': ("Together with the Hero of Time,&the awakened ones will bind the&evil and return the light of peace&to the world.", 'boss')} + 'Medallion Text End': ("Together with the Hero of Time,&the awakened ones will bind the&evil and return the light of peace&to the world.", 'boss'), + #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx handy marker for how long one line should be in a text box + 'Validation Line': ("Hmph... Since you made it this far&I'll let you know what glorious&prize of Ganon's you likely&missed out on in my tower.^Behold...^", 'validation line'), + '2001': ("Oh! It's @.&I was expecting someone called&Sheik. Do you know what&happened to them?", 'ganonLine'), + '2002': ("I knew I shouldn't have put the key&on the otherside of my door.", 'ganonLine'), + '2003': ("Looks like it's time for a&round of tennis.", 'ganonLine'), + '2004': ("You'll never deflect my bolts of&energy with your sword,&then shot me with those Light&Arrows you happen to have.", 'ganonLine'), + '2005': ("Why did I leave my trident&back in the desert?", 'ganonLine'), + '2006': ("Zelda is probably going to do&something stupid, like send you&back to your own timeline.^So this is quite meaningless.&Do you really want&to save this moron?", 'ganonLine'), + '2007': ("What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the hungary,&and my castle floats.", 'ganonLine'), + '2008': ("I've learned this spell,&it's really neat,&I'll keep it later&for your treat!", 'ganonLine'), + '2009': ("Many tricks are up my sleeve,&to save yourself&you'd better leave!", 'ganonLine')} diff --git a/Hints.py b/Hints.py index 1cf6d2a88..815c39c59 100644 --- a/Hints.py +++ b/Hints.py @@ -122,6 +122,35 @@ def setRewardColor(Block_code): return Block_code +# fun new lines for Ganon during the final battle +def buildGanonText(world, rom): + # reorganize text header files to make space for text + rom.write_bytes(0xB884B1, [0x03, 0x41, 0xED]) + rom.write_bytes(0xB884B9, [0x03, 0x41, 0xEE]) + rom.write_bytes(0xB884C1, [0x03, 0x41, 0xEF]) + rom.write_bytes(0xB884C9, [0x03, 0x42, 0x99]) + + # clear space for new text + for address in range(0x9611EC, 0x961349): + rom.write_byte(address, 0x08) + + Block_code = [] + # lines before battle, 160 characters max + ganonLines = getHintGroup('ganonLine') + random.shuffle(ganonLines) + Block_code = getBytes(ganonLines.pop().text) + endText(Block_code) + rom.write_bytes(0x9611F1, Block_code) + + Block_code = getBytes(getHint('Validation Line').text) + for location in world.get_locations(): + if location.name == 'Ganons Tower Boss Key Chest': + Block_code.extend(getBytes((getHint(location.item.name).text))) + endText(Block_code) + rom.write_bytes(0x96129D, Block_code) + + return rom + #sets the end of text byte in the text box. def endText(byteArray): return byteArray.extend([0x02]) From 52b611d8b4f3fb4f43e0b4e6059ee7c674d813df Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 4 Jun 2018 21:29:14 -0500 Subject: [PATCH 091/151] ganon text added to rom.py --- Rom.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 87f76687f..aeb26d71a 100644 --- a/Rom.py +++ b/Rom.py @@ -7,7 +7,7 @@ import subprocess import random -from Hints import buildGossipHints, buildBossRewardHints +from Hints import buildGossipHints, buildBossRewardHints, buildGanonText from Utils import local_path, output_path from Items import ItemFactory, item_data from TextArray import text_array @@ -801,6 +801,9 @@ def patch_rom(world, rom): rom.write_byte(0xB88236, 0x20) buildBossRewardHints(world, rom) + # build silly ganon lines + buildGanonText(world, rom) + # Write item overrides rom.write_bytes(0x3481000, get_override_table(world)) From a16bd59f21ab440768dc5d22dc5092cac73c82aa Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Mon, 4 Jun 2018 22:01:29 -0500 Subject: [PATCH 092/151] Restore missing hint data --- HintList.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/HintList.py b/HintList.py index 4e0e208ab..b76660c30 100644 --- a/HintList.py +++ b/HintList.py @@ -67,6 +67,14 @@ def getHintGroup(string): 'Bottle': (" a fairy prison.", 'item'), 'Bottle with Letter': (" a call for help.", 'item'), 'Bottle with Milk': (" cow juice.", 'item'), + 'Bottle with Red Potion': (" a vitality vial.", 'item') + 'Bottle with Green Potion': (" a magic mixture.", 'item'), + 'Bottle with Blue Potion': (" an all-cure antidote.", 'item'), + 'Bottle with Fairy': (" an imprisoned fairy.", 'item'), + 'Bottle with Fish': (" an aquarium.", 'item'), + 'Bottle with Blue Fire': (" a conflagration canteen.", 'item'), + 'Bottle with Bugs': (" a terrarium.", 'item'), + 'Bottle with Poe': (" a spooky ghost.", 'item'), 'Progressive Scale': (" Zora Flippers.", 'item'), 'Stone of Agony': (" an empty chest.", 'item'), 'Eponas Song': (" an equestrian etude.", 'item'), @@ -161,6 +169,10 @@ def getHintGroup(string): 'Sheik in Ice Cavern': ("They say that the&frozen cavern echoes&with", 'location'), 'Sheik in Kakariko': ("They say that a&ravaged village mourns&with", 'location'), 'Sheik at Colossus': ("They say that a hero ventures&beyond the Wasteland to&learn", 'location'), + 'Zoras Fountain Bottom Freestanding PoH': ("They say under the icy waters&lies", 'location'), + 'Colossus Freestanding PoH': ("They say that riding a&beanstalk in the desert&leads to", 'location'), + 'DM Crater Volcano Freestanding PoH': ("They say that riding a&beanstalk in the crater&leads to", 'location'), + 'Goron City Pot Freestanding PoH': ("They say that spinning&Goron pottery&contains", 'location'), #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx handy marker for how long one line should be in a text box '1001': ("Ganondorf 2020!", 'junkHint'), '1002': ("They say that monarchy is a&terrible system of governance.", 'junkHint'), From 0e5b634db05201d3db4b127cb7b205311bebb9d0 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Mon, 4 Jun 2018 22:02:58 -0500 Subject: [PATCH 093/151] Oops, typo --- HintList.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HintList.py b/HintList.py index b76660c30..b3b083144 100644 --- a/HintList.py +++ b/HintList.py @@ -67,7 +67,7 @@ def getHintGroup(string): 'Bottle': (" a fairy prison.", 'item'), 'Bottle with Letter': (" a call for help.", 'item'), 'Bottle with Milk': (" cow juice.", 'item'), - 'Bottle with Red Potion': (" a vitality vial.", 'item') + 'Bottle with Red Potion': (" a vitality vial.", 'item'), 'Bottle with Green Potion': (" a magic mixture.", 'item'), 'Bottle with Blue Potion': (" an all-cure antidote.", 'item'), 'Bottle with Fairy': (" an imprisoned fairy.", 'item'), From 4326e76958fa4dfedf3b017548e88ef42e50fe8f Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 4 Jun 2018 23:55:16 -0500 Subject: [PATCH 094/151] missed shop line sped up --- Rom.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Rom.py b/Rom.py index aeb26d71a..0cf373bc8 100644 --- a/Rom.py +++ b/Rom.py @@ -684,6 +684,7 @@ def patch_rom(world, rom): Block_code = [0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08] rom.write_bytes(0x94E639, Block_code) rom.write_bytes(0x92CBA9, Block_code) + rom.write_bytes(0x9650BC, [0x08, 0x08, 0x08, 0x08, 0x48]) # Speed dig text for Dampe rom.write_bytes(0x9532F8, [0x08, 0x08, 0x08, 0x59]) From 4182875091cf0c2c75f87d8a37b8436cd6cc7c2a Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 5 Jun 2018 03:38:55 -0400 Subject: [PATCH 095/151] Fix treasure chest game to work with chest write-back --- ASM/src/items.asm | 15 ++++++++++++--- Regions.py | 2 +- Rom.py | 2 +- Rules.py | 2 +- data/base2current.json | 2 +- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index 8cf16b52a..fd0a06662 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -339,11 +339,20 @@ get_override_search_key: bne t2, 0x000A, @@not_chest nop - beq v0, 0x10, @@not_chest ; Scene 0x10 = treasure chest game, use item-based override here + lhu t3, 0x1C (a1) + bne v0, 0x10, @@valid_chest nop + ; Current scene is the treasure chest game. + ; Don't apply the override if the chest contains 0x75 (Winner! purple rupee) + andi t4, t3, (0x7F << 5) + bne t4, (0x75 << 5), @@valid_chest + nop + li v0, -1 + b @@return + nop +@@valid_chest: li t0, 0x01 - lhu t1, 0x1C (a1) - andi t1, t1, 0x1F ; t1 = chest flag + andi t1, t3, 0x1F ; t1 = chest flag @@not_chest: bne t2, 0x0015, @@not_collectable diff --git a/Regions.py b/Regions.py index a6777db83..432fb99f2 100644 --- a/Regions.py +++ b/Regions.py @@ -370,6 +370,7 @@ def _create_region(name, type, locations=None, exits=None): 'Lost Woods Generic Grotto Chest': (None, None, 0x14, 'Chest', 0x3E), 'Mountain Storms Grotto Chest': (None, None, 0x17, 'Chest', 0x3E), 'Top of Crater Grotto Chest': (None, None, 0x1A, 'Chest', 0x3E), + 'Treasure Chest Game': (None, None, 0x0A, 'Chest', 0x10), 'Impa at Castle': (0x2E8E925, 0x2E8E925, 0x0A, 'Song', None), 'Song from Malon': (0xD7EB53, 0xD7EBCF, 0x09, 'Song', None), 'Song from Composer Grave': (0x332A871, 0x332A871, 0x0B, 'Song', None), @@ -391,7 +392,6 @@ def _create_region(name, type, locations=None, exits=None): 'Mountain Summit Fairy Reward': (0x3481404, None, 0x51, 'NPC', 0x3B), 'Crater Fairy Reward': (0x3481405, None, 0x52, 'NPC', 0x3B), 'Ganons Castle Fairy Reward': (0x3481406, None, 0x53, 'NPC', 0x3B), - 'Treasure Chest Game': (None, None, 0x76, 'Special', 0x10), 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC', 0x49), diff --git a/Rom.py b/Rom.py index ada950d35..6ce4c7193 100644 --- a/Rom.py +++ b/Rom.py @@ -992,7 +992,7 @@ def get_override_entry(location): if None in [scene, default, item_id]: return [] - if location.type in ['NPC', 'BossHeart', 'Special']: + if location.type in ['NPC', 'BossHeart']: return [scene, 0x00, default, item_id] elif location.type == 'Chest': flag = default & 0x1F diff --git a/Rules.py b/Rules.py index 03c35a56c..b54f636d5 100644 --- a/Rules.py +++ b/Rules.py @@ -414,5 +414,5 @@ def global_rules(world): set_rule(world.get_location('GS100'), lambda state: state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Hover Boots'))) for location in world.get_locations(): - if location.type != 'Chest' and location.name != 'Treasure Chest Game': + if location.type != 'Chest': forbid_item(location, 'Ice Trap') diff --git a/data/base2current.json b/data/base2current.json index 074a5f764..9b15b2c55 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426028": [55, 239]}, {"11426031": [0, 12, 16, 11, 35, 0, 0]}, {"11426039": [0, 53, 255]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 44]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 14, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 21, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 28, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 7, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 232, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 41, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 42, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 156, 128, 64, 42, 48, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 180, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 42, 240, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 43, 12, 128, 64, 41, 24, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 164, 128, 64, 41, 24, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 156, 128, 64, 42, 100, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 156, 128, 64, 42, 128, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 156, 128, 64, 41, 24, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 52, 128, 64, 41, 24, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 88, 128, 64, 42, 76, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 120, 128, 64, 41, 24, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [42]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 231]}, {"55060224": [4, 64]}, {"55060227": [34]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 37]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060312": [52, 1]}, {"55060315": [10, 21, 65]}, {"55060319": [6]}, {"55060324": [149, 42]}, {"55060327": [28, 49, 74, 240, 31]}, {"55060333": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060343": [28, 129, 9, 4, 36, 5, 33]}, {"55060351": [2]}, {"55060357": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060367": [16, 39, 189]}, {"55060371": [24, 3, 224]}, {"55060375": [8]}, {"55060380": [39, 189, 255, 232, 175, 191]}, {"55060387": [16, 12, 16, 9, 245]}, {"55060396": [36, 1, 255, 255, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 68]}, {"55060412": [12, 16, 10, 24]}, {"55060420": [143, 191]}, {"55060423": [16, 39, 189]}, {"55060427": [24, 3, 224]}, {"55060431": [8]}, {"55060436": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060447": [164, 52, 8]}, {"55060452": [52, 137]}, {"55060456": [148, 170]}, {"55060460": [52, 1]}, {"55060463": [10, 21, 65]}, {"55060467": [7]}, {"55060472": [52, 1]}, {"55060475": [16, 16, 65]}, {"55060479": [4]}, {"55060484": [52, 8]}, {"55060487": [1, 148, 169]}, {"55060491": [28, 49, 41]}, {"55060495": [31, 52, 1]}, {"55060499": [21, 21, 65]}, {"55060503": [12]}, {"55060508": [52, 1]}, {"55060511": [62, 16, 129]}, {"55060515": [7]}, {"55060520": [52, 1]}, {"55060523": [66, 16, 129]}, {"55060527": [4]}, {"55060532": [36, 2, 255, 255, 16]}, {"55060539": [7]}, {"55060544": [52, 8]}, {"55060547": [2, 144, 169, 1, 65]}, {"55060553": [2, 18]}, {"55060557": [72, 16, 37]}, {"55060561": [2, 18]}, {"55060565": [73, 16, 37, 3, 224]}, {"55060571": [8]}, {"55060576": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060591": [4, 141, 9]}, {"55060596": [17, 32]}, {"55060599": [5]}, {"55060605": [9, 82, 2, 21, 68, 255, 250]}, {"55060616": [49, 34]}, {"55060619": [255, 3, 224]}, {"55060623": [8]}, {"55060628": [39, 189, 255, 224, 175, 176]}, {"55060635": [16, 175, 177]}, {"55060639": [20, 175, 191]}, {"55060643": [24, 52, 130]}, {"55060648": [52, 80]}, {"55060652": [38, 8, 255, 128, 5]}, {"55060659": [18]}, {"55060664": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060675": [16, 1, 9]}, {"55060679": [24]}, {"55060682": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060700": [142, 40]}, {"55060703": [12, 1]}, {"55060706": [248, 9]}, {"55060712": [20, 80, 255, 239]}, {"55060720": [54, 35]}, {"55060724": [16]}, {"55060727": [2]}, {"55060732": [52, 3]}, {"55060736": [143, 176]}, {"55060739": [16, 143, 177]}, {"55060743": [20, 143, 191]}, {"55060747": [24, 39, 189]}, {"55060751": [32, 3, 224]}, {"55060755": [8]}, {"55060760": [3, 224]}, {"55060763": [8, 52, 162]}, {"55060768": [144, 136]}, {"55060771": [125, 52, 1]}, {"55060775": [255, 17, 1]}, {"55060779": [2, 52, 2]}, {"55060783": [8, 52, 2]}, {"55060787": [9, 3, 224]}, {"55060791": [8]}, {"55060796": [144, 136]}, {"55060799": [163, 49, 8]}, {"55060803": [192, 17]}, {"55060807": [5, 52, 2]}, {"55060811": [84, 52, 1]}, {"55060815": [64, 17, 1]}, {"55060819": [2, 52, 2]}, {"55060823": [53, 52, 2]}, {"55060827": [54, 3, 224]}, {"55060831": [8]}, {"55060836": [144, 136]}, {"55060839": [163, 49, 8]}, {"55060843": [24, 17]}, {"55060847": [5, 52, 2]}, {"55060851": [50, 52, 1]}, {"55060855": [8, 17, 1]}, {"55060859": [2, 52, 2]}, {"55060863": [51, 52, 2]}, {"55060867": [52, 3, 224]}, {"55060871": [8]}, {"55060876": [144, 136]}, {"55060879": [163, 49, 8]}, {"55060883": [3, 17]}, {"55060887": [5, 52, 2]}, {"55060891": [4, 52, 1]}, {"55060895": [1, 17, 1]}, {"55060899": [2, 52, 2]}, {"55060903": [48, 52, 2]}, {"55060907": [49, 3, 224]}, {"55060911": [8]}, {"55060916": [144, 136]}, {"55060919": [162, 49, 8]}, {"55060923": [192, 17]}, {"55060927": [5, 52, 2]}, {"55060931": [5, 52, 1]}, {"55060935": [64, 17, 1]}, {"55060939": [2, 52, 2]}, {"55060943": [96, 52, 2]}, {"55060947": [123, 3, 224]}, {"55060951": [8]}, {"55060956": [144, 136]}, {"55060959": [162, 49, 8]}, {"55060963": [48, 17]}, {"55060967": [2, 52, 2]}, {"55060971": [69, 52, 2]}, {"55060975": [70, 3, 224]}, {"55060979": [8]}, {"55060984": [144, 136]}, {"55060987": [162, 49, 8]}, {"55060991": [6, 17]}, {"55060995": [2, 52, 2]}, {"55060999": [55, 52, 2]}, {"55061003": [56, 3, 224]}, {"55061007": [8]}, {"55061012": [144, 136]}, {"55061015": [161, 49, 8]}, {"55061019": [32, 17]}, {"55061023": [2, 52, 2]}, {"55061027": [121, 52, 2]}, {"55061031": [122, 3, 224]}, {"55061035": [8]}, {"55061040": [144, 136]}, {"55061043": [161, 49, 8]}, {"55061047": [4, 17]}, {"55061051": [2, 52, 2]}, {"55061055": [119, 52, 2]}, {"55061059": [120, 3, 224]}, {"55061063": [8]}, {"55061068": [144, 136]}, {"55061071": [50, 17]}, {"55061075": [2, 52, 2]}, {"55061079": [192, 52, 2]}, {"55061083": [193, 3, 224]}, {"55061087": [8]}, {"55061092": [144, 136]}, {"55061095": [163, 49, 8]}, {"55061099": [3, 17]}, {"55061103": [2, 52, 2]}, {"55061107": [77, 52, 162]}, {"55061112": [3, 224]}, {"55061115": [8]}, {"55061120": [144, 136]}, {"55061123": [163, 49, 8]}, {"55061127": [24, 17]}, {"55061131": [2, 52, 2]}, {"55061135": [77, 52, 162]}, {"55061140": [3, 224]}, {"55061143": [8]}, {"55061148": [3, 224]}, {"55061151": [8]}, {"55061156": [52, 8]}, {"55061159": [1, 160, 136]}, {"55061163": [62, 3, 224]}, {"55061167": [8]}, {"55061172": [36, 136]}, {"55061175": [134, 36, 9, 255, 255, 37, 41]}, {"55061183": [1, 52, 1]}, {"55061187": [3]}, {"55061189": [41, 8, 42, 20, 32]}, {"55061195": [7]}, {"55061200": [1, 9, 80, 33, 145, 75]}, {"55061208": [52, 1]}, {"55061211": [255, 21, 97, 255, 247]}, {"55061220": [161, 69]}, {"55061224": [3, 224]}, {"55061227": [8]}, {"55061232": [36, 136]}, {"55061235": [168, 1, 6, 64, 33, 145, 9]}, {"55061244": [1, 37, 72, 37, 161, 9]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [36, 136]}, {"55061263": [188, 1, 5, 64, 33, 129, 9]}, {"55061272": [5, 33]}, {"55061275": [2]}, {"55061280": [52, 9]}, {"55061284": [37, 41]}, {"55061287": [1, 161, 9]}, {"55061292": [3, 224]}, {"55061295": [8]}, {"55061300": [52, 8]}, {"55061303": [1, 160, 136]}, {"55061307": [61, 148, 136]}, {"55061311": [46]}, {"55061313": [8, 65, 2, 160, 136]}, {"55061319": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061331": [8]}, {"55061336": [52, 8]}, {"55061339": [1, 160, 136]}, {"55061343": [50, 160, 136]}, {"55061347": [58, 52, 8]}, {"55061351": [48, 164, 136, 19, 244, 160, 136]}, {"55061359": [51, 3, 224]}, {"55061363": [8]}, {"55061368": [52, 8]}, {"55061371": [2, 160, 136]}, {"55061375": [50, 52, 8]}, {"55061379": [1, 160, 136]}, {"55061383": [58, 160, 136]}, {"55061387": [60, 52, 8]}, {"55061391": [96, 164, 136, 19, 244, 160, 136]}, {"55061399": [51, 3, 224]}, {"55061403": [8]}, {"55061408": [175, 164]}, {"55061411": [104, 175, 165]}, {"55061415": [108, 175, 166]}, {"55061419": [112, 175, 167]}, {"55061423": [116, 39, 189, 255, 232, 175, 163]}, {"55061431": [16, 175, 191]}, {"55061435": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061448": [17]}, {"55061451": [10]}, {"55061456": [60, 9, 128, 65, 52, 10]}, {"55061463": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061492": [143, 163]}, {"55061495": [16, 143, 191]}, {"55061499": [20, 39, 189]}, {"55061503": [24, 143, 164]}, {"55061507": [104, 143, 165]}, {"55061511": [108, 143, 166]}, {"55061515": [112, 143, 167]}, {"55061519": [116, 132, 110, 19, 196, 3, 224]}, {"55061527": [8]}, {"55061532": [147, 25]}, {"55061535": [116, 52, 1]}, {"55061539": [255, 23, 33]}, {"55061543": [2]}, {"55061548": [52, 25]}, {"55061551": [44, 3, 224]}, {"55061555": [8, 167, 185]}, {"55061559": [154, 147, 44]}, {"55061563": [116, 52, 1]}, {"55061567": [255, 21, 129]}, {"55061571": [2]}, {"55061576": [52, 12]}, {"55061579": [44, 3, 224]}, {"55061583": [8]}, {"55061588": [145, 174]}, {"55061591": [116, 52, 1]}, {"55061595": [255, 21, 193]}, {"55061599": [2]}, {"55061604": [52, 14]}, {"55061607": [44, 3, 224]}, {"55061611": [8, 167, 174]}, {"55061615": [154, 145, 207]}, {"55061619": [116, 52, 1]}, {"55061623": [255, 21, 225]}, {"55061627": [2]}, {"55061632": [52, 15]}, {"55061635": [44, 3, 224]}, {"55061639": [8, 167, 175]}, {"55061643": [154, 144, 174]}, {"55061647": [64, 144, 162]}, {"55061651": [112, 52, 3]}, {"55061655": [255, 21, 195]}, {"55061659": [3]}, {"55061664": [52, 3]}, {"55061667": [1, 160, 163, 15, 51, 3, 224]}, {"55061675": [8]}, {"55061680": [141, 9]}, {"55061683": [4, 17, 32]}, {"55061687": [7]}, {"55061692": [145, 9]}, {"55061695": [104, 52, 1]}, {"55061699": [59, 17, 33]}, {"55061703": [2]}, {"55061708": [52, 9]}, {"55061711": [255, 161, 9]}, {"55061715": [64, 3, 224]}, {"55061719": [8, 161, 14]}, {"55061723": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426028": [55, 239]}, {"11426031": [0, 12, 16, 11, 42, 0, 0]}, {"11426039": [0, 53, 255]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 51]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 21, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 28, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 35, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 14, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 239, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 88, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 48, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 76, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 192, 128, 64, 41, 52, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 80, 128, 64, 41, 52, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 116, 128, 64, 42, 104, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 148, 128, 64, 41, 52, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [42]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 231]}, {"55060224": [4, 64]}, {"55060227": [34]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 44]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060312": [52, 1]}, {"55060315": [10, 21, 65]}, {"55060319": [6]}, {"55060324": [149, 42]}, {"55060327": [28, 49, 74, 240, 31]}, {"55060333": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060343": [28, 129, 9, 4, 36, 5, 33]}, {"55060351": [2]}, {"55060357": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060367": [16, 39, 189]}, {"55060371": [24, 3, 224]}, {"55060375": [8]}, {"55060380": [39, 189, 255, 232, 175, 191]}, {"55060387": [16, 12, 16, 9, 245]}, {"55060396": [36, 1, 255, 255, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 68]}, {"55060412": [12, 16, 10, 31]}, {"55060420": [143, 191]}, {"55060423": [16, 39, 189]}, {"55060427": [24, 3, 224]}, {"55060431": [8]}, {"55060436": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060447": [164, 52, 8]}, {"55060452": [52, 137]}, {"55060456": [148, 170]}, {"55060460": [52, 1]}, {"55060463": [10, 21, 65]}, {"55060467": [14]}, {"55060472": [148, 171]}, {"55060475": [28, 52, 1]}, {"55060479": [16, 20, 65]}, {"55060483": [8]}, {"55060488": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060499": [4]}, {"55060504": [36, 2, 255, 255, 16]}, {"55060511": [21]}, {"55060516": [52, 8]}, {"55060519": [1, 49, 105]}, {"55060523": [31, 52, 1]}, {"55060527": [21, 21, 65]}, {"55060531": [12]}, {"55060536": [52, 1]}, {"55060539": [62, 16, 129]}, {"55060543": [7]}, {"55060548": [52, 1]}, {"55060551": [66, 16, 129]}, {"55060555": [4]}, {"55060560": [36, 2, 255, 255, 16]}, {"55060567": [7]}, {"55060572": [52, 8]}, {"55060575": [2, 144, 169, 1, 65]}, {"55060581": [2, 18]}, {"55060585": [72, 16, 37]}, {"55060589": [2, 18]}, {"55060593": [73, 16, 37, 3, 224]}, {"55060599": [8]}, {"55060604": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060619": [4, 141, 9]}, {"55060624": [17, 32]}, {"55060627": [5]}, {"55060633": [9, 82, 2, 21, 68, 255, 250]}, {"55060644": [49, 34]}, {"55060647": [255, 3, 224]}, {"55060651": [8]}, {"55060656": [39, 189, 255, 224, 175, 176]}, {"55060663": [16, 175, 177]}, {"55060667": [20, 175, 191]}, {"55060671": [24, 52, 130]}, {"55060676": [52, 80]}, {"55060680": [38, 8, 255, 128, 5]}, {"55060687": [18]}, {"55060692": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060703": [16, 1, 9]}, {"55060707": [24]}, {"55060710": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060728": [142, 40]}, {"55060731": [12, 1]}, {"55060734": [248, 9]}, {"55060740": [20, 80, 255, 239]}, {"55060748": [54, 35]}, {"55060752": [16]}, {"55060755": [2]}, {"55060760": [52, 3]}, {"55060764": [143, 176]}, {"55060767": [16, 143, 177]}, {"55060771": [20, 143, 191]}, {"55060775": [24, 39, 189]}, {"55060779": [32, 3, 224]}, {"55060783": [8]}, {"55060788": [3, 224]}, {"55060791": [8, 52, 162]}, {"55060796": [144, 136]}, {"55060799": [125, 52, 1]}, {"55060803": [255, 17, 1]}, {"55060807": [2, 52, 2]}, {"55060811": [8, 52, 2]}, {"55060815": [9, 3, 224]}, {"55060819": [8]}, {"55060824": [144, 136]}, {"55060827": [163, 49, 8]}, {"55060831": [192, 17]}, {"55060835": [5, 52, 2]}, {"55060839": [84, 52, 1]}, {"55060843": [64, 17, 1]}, {"55060847": [2, 52, 2]}, {"55060851": [53, 52, 2]}, {"55060855": [54, 3, 224]}, {"55060859": [8]}, {"55060864": [144, 136]}, {"55060867": [163, 49, 8]}, {"55060871": [24, 17]}, {"55060875": [5, 52, 2]}, {"55060879": [50, 52, 1]}, {"55060883": [8, 17, 1]}, {"55060887": [2, 52, 2]}, {"55060891": [51, 52, 2]}, {"55060895": [52, 3, 224]}, {"55060899": [8]}, {"55060904": [144, 136]}, {"55060907": [163, 49, 8]}, {"55060911": [3, 17]}, {"55060915": [5, 52, 2]}, {"55060919": [4, 52, 1]}, {"55060923": [1, 17, 1]}, {"55060927": [2, 52, 2]}, {"55060931": [48, 52, 2]}, {"55060935": [49, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [162, 49, 8]}, {"55060951": [192, 17]}, {"55060955": [5, 52, 2]}, {"55060959": [5, 52, 1]}, {"55060963": [64, 17, 1]}, {"55060967": [2, 52, 2]}, {"55060971": [96, 52, 2]}, {"55060975": [123, 3, 224]}, {"55060979": [8]}, {"55060984": [144, 136]}, {"55060987": [162, 49, 8]}, {"55060991": [48, 17]}, {"55060995": [2, 52, 2]}, {"55060999": [69, 52, 2]}, {"55061003": [70, 3, 224]}, {"55061007": [8]}, {"55061012": [144, 136]}, {"55061015": [162, 49, 8]}, {"55061019": [6, 17]}, {"55061023": [2, 52, 2]}, {"55061027": [55, 52, 2]}, {"55061031": [56, 3, 224]}, {"55061035": [8]}, {"55061040": [144, 136]}, {"55061043": [161, 49, 8]}, {"55061047": [32, 17]}, {"55061051": [2, 52, 2]}, {"55061055": [121, 52, 2]}, {"55061059": [122, 3, 224]}, {"55061063": [8]}, {"55061068": [144, 136]}, {"55061071": [161, 49, 8]}, {"55061075": [4, 17]}, {"55061079": [2, 52, 2]}, {"55061083": [119, 52, 2]}, {"55061087": [120, 3, 224]}, {"55061091": [8]}, {"55061096": [144, 136]}, {"55061099": [50, 17]}, {"55061103": [2, 52, 2]}, {"55061107": [192, 52, 2]}, {"55061111": [193, 3, 224]}, {"55061115": [8]}, {"55061120": [144, 136]}, {"55061123": [163, 49, 8]}, {"55061127": [3, 17]}, {"55061131": [2, 52, 2]}, {"55061135": [77, 52, 162]}, {"55061140": [3, 224]}, {"55061143": [8]}, {"55061148": [144, 136]}, {"55061151": [163, 49, 8]}, {"55061155": [24, 17]}, {"55061159": [2, 52, 2]}, {"55061163": [77, 52, 162]}, {"55061168": [3, 224]}, {"55061171": [8]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [52, 8]}, {"55061187": [1, 160, 136]}, {"55061191": [62, 3, 224]}, {"55061195": [8]}, {"55061200": [36, 136]}, {"55061203": [134, 36, 9, 255, 255, 37, 41]}, {"55061211": [1, 52, 1]}, {"55061215": [3]}, {"55061217": [41, 8, 42, 20, 32]}, {"55061223": [7]}, {"55061228": [1, 9, 80, 33, 145, 75]}, {"55061236": [52, 1]}, {"55061239": [255, 21, 97, 255, 247]}, {"55061248": [161, 69]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [36, 136]}, {"55061263": [168, 1, 6, 64, 33, 145, 9]}, {"55061272": [1, 37, 72, 37, 161, 9]}, {"55061280": [3, 224]}, {"55061283": [8]}, {"55061288": [36, 136]}, {"55061291": [188, 1, 5, 64, 33, 129, 9]}, {"55061300": [5, 33]}, {"55061303": [2]}, {"55061308": [52, 9]}, {"55061312": [37, 41]}, {"55061315": [1, 161, 9]}, {"55061320": [3, 224]}, {"55061323": [8]}, {"55061328": [52, 8]}, {"55061331": [1, 160, 136]}, {"55061335": [61, 148, 136]}, {"55061339": [46]}, {"55061341": [8, 65, 2, 160, 136]}, {"55061347": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061359": [8]}, {"55061364": [52, 8]}, {"55061367": [1, 160, 136]}, {"55061371": [50, 160, 136]}, {"55061375": [58, 52, 8]}, {"55061379": [48, 164, 136, 19, 244, 160, 136]}, {"55061387": [51, 3, 224]}, {"55061391": [8]}, {"55061396": [52, 8]}, {"55061399": [2, 160, 136]}, {"55061403": [50, 52, 8]}, {"55061407": [1, 160, 136]}, {"55061411": [58, 160, 136]}, {"55061415": [60, 52, 8]}, {"55061419": [96, 164, 136, 19, 244, 160, 136]}, {"55061427": [51, 3, 224]}, {"55061431": [8]}, {"55061436": [175, 164]}, {"55061439": [104, 175, 165]}, {"55061443": [108, 175, 166]}, {"55061447": [112, 175, 167]}, {"55061451": [116, 39, 189, 255, 232, 175, 163]}, {"55061459": [16, 175, 191]}, {"55061463": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061476": [17]}, {"55061479": [10]}, {"55061484": [60, 9, 128, 65, 52, 10]}, {"55061491": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061520": [143, 163]}, {"55061523": [16, 143, 191]}, {"55061527": [20, 39, 189]}, {"55061531": [24, 143, 164]}, {"55061535": [104, 143, 165]}, {"55061539": [108, 143, 166]}, {"55061543": [112, 143, 167]}, {"55061547": [116, 132, 110, 19, 196, 3, 224]}, {"55061555": [8]}, {"55061560": [147, 25]}, {"55061563": [116, 52, 1]}, {"55061567": [255, 23, 33]}, {"55061571": [2]}, {"55061576": [52, 25]}, {"55061579": [44, 3, 224]}, {"55061583": [8, 167, 185]}, {"55061587": [154, 147, 44]}, {"55061591": [116, 52, 1]}, {"55061595": [255, 21, 129]}, {"55061599": [2]}, {"55061604": [52, 12]}, {"55061607": [44, 3, 224]}, {"55061611": [8]}, {"55061616": [145, 174]}, {"55061619": [116, 52, 1]}, {"55061623": [255, 21, 193]}, {"55061627": [2]}, {"55061632": [52, 14]}, {"55061635": [44, 3, 224]}, {"55061639": [8, 167, 174]}, {"55061643": [154, 145, 207]}, {"55061647": [116, 52, 1]}, {"55061651": [255, 21, 225]}, {"55061655": [2]}, {"55061660": [52, 15]}, {"55061663": [44, 3, 224]}, {"55061667": [8, 167, 175]}, {"55061671": [154, 144, 174]}, {"55061675": [64, 144, 162]}, {"55061679": [112, 52, 3]}, {"55061683": [255, 21, 195]}, {"55061687": [3]}, {"55061692": [52, 3]}, {"55061695": [1, 160, 163, 15, 51, 3, 224]}, {"55061703": [8]}, {"55061708": [141, 9]}, {"55061711": [4, 17, 32]}, {"55061715": [7]}, {"55061720": [145, 9]}, {"55061723": [104, 52, 1]}, {"55061727": [59, 17, 33]}, {"55061731": [2]}, {"55061736": [52, 9]}, {"55061739": [255, 161, 9]}, {"55061743": [64, 3, 224]}, {"55061747": [8, 161, 14]}, {"55061751": [104]}] \ No newline at end of file From be6e95e0530633dbed94ca07c457126d9e3ed403 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 5 Jun 2018 04:27:30 -0400 Subject: [PATCH 096/151] Fix double defense display --- ASM/src/items.asm | 3 +-- data/base2current.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ASM/src/items.asm b/ASM/src/items.asm index fd0a06662..d4517854d 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -734,8 +734,7 @@ give_defense: ; a0 = save context li t0, 0x01 sb t0, 0x3D (a0) ; Set double defense flag - lhu t0, 0x2E (a0) ; Load health capacity (0x10 per heart container) - srl t0, t0, 4 + li t0, 0x14 sb t0, 0xCF (a0) ; Set number of hearts to display as double defense li t0, 0x0140 sh t0, 0x1424 (a0) ; Give health refill diff --git a/data/base2current.json b/data/base2current.json index 9b15b2c55..afec49ef9 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426028": [55, 239]}, {"11426031": [0, 12, 16, 11, 42, 0, 0]}, {"11426039": [0, 53, 255]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 51]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 21, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 28, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 35, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 14, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 239, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 88, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 48, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 76, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 192, 128, 64, 41, 52, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 80, 128, 64, 41, 52, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 116, 128, 64, 42, 104, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 148, 128, 64, 41, 52, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [42]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 231]}, {"55060224": [4, 64]}, {"55060227": [34]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 44]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060312": [52, 1]}, {"55060315": [10, 21, 65]}, {"55060319": [6]}, {"55060324": [149, 42]}, {"55060327": [28, 49, 74, 240, 31]}, {"55060333": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060343": [28, 129, 9, 4, 36, 5, 33]}, {"55060351": [2]}, {"55060357": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060367": [16, 39, 189]}, {"55060371": [24, 3, 224]}, {"55060375": [8]}, {"55060380": [39, 189, 255, 232, 175, 191]}, {"55060387": [16, 12, 16, 9, 245]}, {"55060396": [36, 1, 255, 255, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 68]}, {"55060412": [12, 16, 10, 31]}, {"55060420": [143, 191]}, {"55060423": [16, 39, 189]}, {"55060427": [24, 3, 224]}, {"55060431": [8]}, {"55060436": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060447": [164, 52, 8]}, {"55060452": [52, 137]}, {"55060456": [148, 170]}, {"55060460": [52, 1]}, {"55060463": [10, 21, 65]}, {"55060467": [14]}, {"55060472": [148, 171]}, {"55060475": [28, 52, 1]}, {"55060479": [16, 20, 65]}, {"55060483": [8]}, {"55060488": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060499": [4]}, {"55060504": [36, 2, 255, 255, 16]}, {"55060511": [21]}, {"55060516": [52, 8]}, {"55060519": [1, 49, 105]}, {"55060523": [31, 52, 1]}, {"55060527": [21, 21, 65]}, {"55060531": [12]}, {"55060536": [52, 1]}, {"55060539": [62, 16, 129]}, {"55060543": [7]}, {"55060548": [52, 1]}, {"55060551": [66, 16, 129]}, {"55060555": [4]}, {"55060560": [36, 2, 255, 255, 16]}, {"55060567": [7]}, {"55060572": [52, 8]}, {"55060575": [2, 144, 169, 1, 65]}, {"55060581": [2, 18]}, {"55060585": [72, 16, 37]}, {"55060589": [2, 18]}, {"55060593": [73, 16, 37, 3, 224]}, {"55060599": [8]}, {"55060604": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060619": [4, 141, 9]}, {"55060624": [17, 32]}, {"55060627": [5]}, {"55060633": [9, 82, 2, 21, 68, 255, 250]}, {"55060644": [49, 34]}, {"55060647": [255, 3, 224]}, {"55060651": [8]}, {"55060656": [39, 189, 255, 224, 175, 176]}, {"55060663": [16, 175, 177]}, {"55060667": [20, 175, 191]}, {"55060671": [24, 52, 130]}, {"55060676": [52, 80]}, {"55060680": [38, 8, 255, 128, 5]}, {"55060687": [18]}, {"55060692": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060703": [16, 1, 9]}, {"55060707": [24]}, {"55060710": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060728": [142, 40]}, {"55060731": [12, 1]}, {"55060734": [248, 9]}, {"55060740": [20, 80, 255, 239]}, {"55060748": [54, 35]}, {"55060752": [16]}, {"55060755": [2]}, {"55060760": [52, 3]}, {"55060764": [143, 176]}, {"55060767": [16, 143, 177]}, {"55060771": [20, 143, 191]}, {"55060775": [24, 39, 189]}, {"55060779": [32, 3, 224]}, {"55060783": [8]}, {"55060788": [3, 224]}, {"55060791": [8, 52, 162]}, {"55060796": [144, 136]}, {"55060799": [125, 52, 1]}, {"55060803": [255, 17, 1]}, {"55060807": [2, 52, 2]}, {"55060811": [8, 52, 2]}, {"55060815": [9, 3, 224]}, {"55060819": [8]}, {"55060824": [144, 136]}, {"55060827": [163, 49, 8]}, {"55060831": [192, 17]}, {"55060835": [5, 52, 2]}, {"55060839": [84, 52, 1]}, {"55060843": [64, 17, 1]}, {"55060847": [2, 52, 2]}, {"55060851": [53, 52, 2]}, {"55060855": [54, 3, 224]}, {"55060859": [8]}, {"55060864": [144, 136]}, {"55060867": [163, 49, 8]}, {"55060871": [24, 17]}, {"55060875": [5, 52, 2]}, {"55060879": [50, 52, 1]}, {"55060883": [8, 17, 1]}, {"55060887": [2, 52, 2]}, {"55060891": [51, 52, 2]}, {"55060895": [52, 3, 224]}, {"55060899": [8]}, {"55060904": [144, 136]}, {"55060907": [163, 49, 8]}, {"55060911": [3, 17]}, {"55060915": [5, 52, 2]}, {"55060919": [4, 52, 1]}, {"55060923": [1, 17, 1]}, {"55060927": [2, 52, 2]}, {"55060931": [48, 52, 2]}, {"55060935": [49, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [162, 49, 8]}, {"55060951": [192, 17]}, {"55060955": [5, 52, 2]}, {"55060959": [5, 52, 1]}, {"55060963": [64, 17, 1]}, {"55060967": [2, 52, 2]}, {"55060971": [96, 52, 2]}, {"55060975": [123, 3, 224]}, {"55060979": [8]}, {"55060984": [144, 136]}, {"55060987": [162, 49, 8]}, {"55060991": [48, 17]}, {"55060995": [2, 52, 2]}, {"55060999": [69, 52, 2]}, {"55061003": [70, 3, 224]}, {"55061007": [8]}, {"55061012": [144, 136]}, {"55061015": [162, 49, 8]}, {"55061019": [6, 17]}, {"55061023": [2, 52, 2]}, {"55061027": [55, 52, 2]}, {"55061031": [56, 3, 224]}, {"55061035": [8]}, {"55061040": [144, 136]}, {"55061043": [161, 49, 8]}, {"55061047": [32, 17]}, {"55061051": [2, 52, 2]}, {"55061055": [121, 52, 2]}, {"55061059": [122, 3, 224]}, {"55061063": [8]}, {"55061068": [144, 136]}, {"55061071": [161, 49, 8]}, {"55061075": [4, 17]}, {"55061079": [2, 52, 2]}, {"55061083": [119, 52, 2]}, {"55061087": [120, 3, 224]}, {"55061091": [8]}, {"55061096": [144, 136]}, {"55061099": [50, 17]}, {"55061103": [2, 52, 2]}, {"55061107": [192, 52, 2]}, {"55061111": [193, 3, 224]}, {"55061115": [8]}, {"55061120": [144, 136]}, {"55061123": [163, 49, 8]}, {"55061127": [3, 17]}, {"55061131": [2, 52, 2]}, {"55061135": [77, 52, 162]}, {"55061140": [3, 224]}, {"55061143": [8]}, {"55061148": [144, 136]}, {"55061151": [163, 49, 8]}, {"55061155": [24, 17]}, {"55061159": [2, 52, 2]}, {"55061163": [77, 52, 162]}, {"55061168": [3, 224]}, {"55061171": [8]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [52, 8]}, {"55061187": [1, 160, 136]}, {"55061191": [62, 3, 224]}, {"55061195": [8]}, {"55061200": [36, 136]}, {"55061203": [134, 36, 9, 255, 255, 37, 41]}, {"55061211": [1, 52, 1]}, {"55061215": [3]}, {"55061217": [41, 8, 42, 20, 32]}, {"55061223": [7]}, {"55061228": [1, 9, 80, 33, 145, 75]}, {"55061236": [52, 1]}, {"55061239": [255, 21, 97, 255, 247]}, {"55061248": [161, 69]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [36, 136]}, {"55061263": [168, 1, 6, 64, 33, 145, 9]}, {"55061272": [1, 37, 72, 37, 161, 9]}, {"55061280": [3, 224]}, {"55061283": [8]}, {"55061288": [36, 136]}, {"55061291": [188, 1, 5, 64, 33, 129, 9]}, {"55061300": [5, 33]}, {"55061303": [2]}, {"55061308": [52, 9]}, {"55061312": [37, 41]}, {"55061315": [1, 161, 9]}, {"55061320": [3, 224]}, {"55061323": [8]}, {"55061328": [52, 8]}, {"55061331": [1, 160, 136]}, {"55061335": [61, 148, 136]}, {"55061339": [46]}, {"55061341": [8, 65, 2, 160, 136]}, {"55061347": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061359": [8]}, {"55061364": [52, 8]}, {"55061367": [1, 160, 136]}, {"55061371": [50, 160, 136]}, {"55061375": [58, 52, 8]}, {"55061379": [48, 164, 136, 19, 244, 160, 136]}, {"55061387": [51, 3, 224]}, {"55061391": [8]}, {"55061396": [52, 8]}, {"55061399": [2, 160, 136]}, {"55061403": [50, 52, 8]}, {"55061407": [1, 160, 136]}, {"55061411": [58, 160, 136]}, {"55061415": [60, 52, 8]}, {"55061419": [96, 164, 136, 19, 244, 160, 136]}, {"55061427": [51, 3, 224]}, {"55061431": [8]}, {"55061436": [175, 164]}, {"55061439": [104, 175, 165]}, {"55061443": [108, 175, 166]}, {"55061447": [112, 175, 167]}, {"55061451": [116, 39, 189, 255, 232, 175, 163]}, {"55061459": [16, 175, 191]}, {"55061463": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061476": [17]}, {"55061479": [10]}, {"55061484": [60, 9, 128, 65, 52, 10]}, {"55061491": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061520": [143, 163]}, {"55061523": [16, 143, 191]}, {"55061527": [20, 39, 189]}, {"55061531": [24, 143, 164]}, {"55061535": [104, 143, 165]}, {"55061539": [108, 143, 166]}, {"55061543": [112, 143, 167]}, {"55061547": [116, 132, 110, 19, 196, 3, 224]}, {"55061555": [8]}, {"55061560": [147, 25]}, {"55061563": [116, 52, 1]}, {"55061567": [255, 23, 33]}, {"55061571": [2]}, {"55061576": [52, 25]}, {"55061579": [44, 3, 224]}, {"55061583": [8, 167, 185]}, {"55061587": [154, 147, 44]}, {"55061591": [116, 52, 1]}, {"55061595": [255, 21, 129]}, {"55061599": [2]}, {"55061604": [52, 12]}, {"55061607": [44, 3, 224]}, {"55061611": [8]}, {"55061616": [145, 174]}, {"55061619": [116, 52, 1]}, {"55061623": [255, 21, 193]}, {"55061627": [2]}, {"55061632": [52, 14]}, {"55061635": [44, 3, 224]}, {"55061639": [8, 167, 174]}, {"55061643": [154, 145, 207]}, {"55061647": [116, 52, 1]}, {"55061651": [255, 21, 225]}, {"55061655": [2]}, {"55061660": [52, 15]}, {"55061663": [44, 3, 224]}, {"55061667": [8, 167, 175]}, {"55061671": [154, 144, 174]}, {"55061675": [64, 144, 162]}, {"55061679": [112, 52, 3]}, {"55061683": [255, 21, 195]}, {"55061687": [3]}, {"55061692": [52, 3]}, {"55061695": [1, 160, 163, 15, 51, 3, 224]}, {"55061703": [8]}, {"55061708": [141, 9]}, {"55061711": [4, 17, 32]}, {"55061715": [7]}, {"55061720": [145, 9]}, {"55061723": [104, 52, 1]}, {"55061727": [59, 17, 33]}, {"55061731": [2]}, {"55061736": [52, 9]}, {"55061739": [255, 161, 9]}, {"55061743": [64, 3, 224]}, {"55061747": [8, 161, 14]}, {"55061751": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426028": [55, 239]}, {"11426031": [0, 12, 16, 11, 41, 0, 0]}, {"11426039": [0, 53, 255]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 50]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 20, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 27, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 34, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 13, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 238, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 88, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 48, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 76, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 192, 128, 64, 41, 52, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 80, 128, 64, 41, 52, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 112, 128, 64, 42, 104, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 144, 128, 64, 41, 52, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [42]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 231]}, {"55060224": [4, 64]}, {"55060227": [34]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 44]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060312": [52, 1]}, {"55060315": [10, 21, 65]}, {"55060319": [6]}, {"55060324": [149, 42]}, {"55060327": [28, 49, 74, 240, 31]}, {"55060333": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060343": [28, 129, 9, 4, 36, 5, 33]}, {"55060351": [2]}, {"55060357": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060367": [16, 39, 189]}, {"55060371": [24, 3, 224]}, {"55060375": [8]}, {"55060380": [39, 189, 255, 232, 175, 191]}, {"55060387": [16, 12, 16, 9, 245]}, {"55060396": [36, 1, 255, 255, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 68]}, {"55060412": [12, 16, 10, 31]}, {"55060420": [143, 191]}, {"55060423": [16, 39, 189]}, {"55060427": [24, 3, 224]}, {"55060431": [8]}, {"55060436": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060447": [164, 52, 8]}, {"55060452": [52, 137]}, {"55060456": [148, 170]}, {"55060460": [52, 1]}, {"55060463": [10, 21, 65]}, {"55060467": [14]}, {"55060472": [148, 171]}, {"55060475": [28, 52, 1]}, {"55060479": [16, 20, 65]}, {"55060483": [8]}, {"55060488": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060499": [4]}, {"55060504": [36, 2, 255, 255, 16]}, {"55060511": [21]}, {"55060516": [52, 8]}, {"55060519": [1, 49, 105]}, {"55060523": [31, 52, 1]}, {"55060527": [21, 21, 65]}, {"55060531": [12]}, {"55060536": [52, 1]}, {"55060539": [62, 16, 129]}, {"55060543": [7]}, {"55060548": [52, 1]}, {"55060551": [66, 16, 129]}, {"55060555": [4]}, {"55060560": [36, 2, 255, 255, 16]}, {"55060567": [7]}, {"55060572": [52, 8]}, {"55060575": [2, 144, 169, 1, 65]}, {"55060581": [2, 18]}, {"55060585": [72, 16, 37]}, {"55060589": [2, 18]}, {"55060593": [73, 16, 37, 3, 224]}, {"55060599": [8]}, {"55060604": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060619": [4, 141, 9]}, {"55060624": [17, 32]}, {"55060627": [5]}, {"55060633": [9, 82, 2, 21, 68, 255, 250]}, {"55060644": [49, 34]}, {"55060647": [255, 3, 224]}, {"55060651": [8]}, {"55060656": [39, 189, 255, 224, 175, 176]}, {"55060663": [16, 175, 177]}, {"55060667": [20, 175, 191]}, {"55060671": [24, 52, 130]}, {"55060676": [52, 80]}, {"55060680": [38, 8, 255, 128, 5]}, {"55060687": [18]}, {"55060692": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060703": [16, 1, 9]}, {"55060707": [24]}, {"55060710": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060728": [142, 40]}, {"55060731": [12, 1]}, {"55060734": [248, 9]}, {"55060740": [20, 80, 255, 239]}, {"55060748": [54, 35]}, {"55060752": [16]}, {"55060755": [2]}, {"55060760": [52, 3]}, {"55060764": [143, 176]}, {"55060767": [16, 143, 177]}, {"55060771": [20, 143, 191]}, {"55060775": [24, 39, 189]}, {"55060779": [32, 3, 224]}, {"55060783": [8]}, {"55060788": [3, 224]}, {"55060791": [8, 52, 162]}, {"55060796": [144, 136]}, {"55060799": [125, 52, 1]}, {"55060803": [255, 17, 1]}, {"55060807": [2, 52, 2]}, {"55060811": [8, 52, 2]}, {"55060815": [9, 3, 224]}, {"55060819": [8]}, {"55060824": [144, 136]}, {"55060827": [163, 49, 8]}, {"55060831": [192, 17]}, {"55060835": [5, 52, 2]}, {"55060839": [84, 52, 1]}, {"55060843": [64, 17, 1]}, {"55060847": [2, 52, 2]}, {"55060851": [53, 52, 2]}, {"55060855": [54, 3, 224]}, {"55060859": [8]}, {"55060864": [144, 136]}, {"55060867": [163, 49, 8]}, {"55060871": [24, 17]}, {"55060875": [5, 52, 2]}, {"55060879": [50, 52, 1]}, {"55060883": [8, 17, 1]}, {"55060887": [2, 52, 2]}, {"55060891": [51, 52, 2]}, {"55060895": [52, 3, 224]}, {"55060899": [8]}, {"55060904": [144, 136]}, {"55060907": [163, 49, 8]}, {"55060911": [3, 17]}, {"55060915": [5, 52, 2]}, {"55060919": [4, 52, 1]}, {"55060923": [1, 17, 1]}, {"55060927": [2, 52, 2]}, {"55060931": [48, 52, 2]}, {"55060935": [49, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [162, 49, 8]}, {"55060951": [192, 17]}, {"55060955": [5, 52, 2]}, {"55060959": [5, 52, 1]}, {"55060963": [64, 17, 1]}, {"55060967": [2, 52, 2]}, {"55060971": [96, 52, 2]}, {"55060975": [123, 3, 224]}, {"55060979": [8]}, {"55060984": [144, 136]}, {"55060987": [162, 49, 8]}, {"55060991": [48, 17]}, {"55060995": [2, 52, 2]}, {"55060999": [69, 52, 2]}, {"55061003": [70, 3, 224]}, {"55061007": [8]}, {"55061012": [144, 136]}, {"55061015": [162, 49, 8]}, {"55061019": [6, 17]}, {"55061023": [2, 52, 2]}, {"55061027": [55, 52, 2]}, {"55061031": [56, 3, 224]}, {"55061035": [8]}, {"55061040": [144, 136]}, {"55061043": [161, 49, 8]}, {"55061047": [32, 17]}, {"55061051": [2, 52, 2]}, {"55061055": [121, 52, 2]}, {"55061059": [122, 3, 224]}, {"55061063": [8]}, {"55061068": [144, 136]}, {"55061071": [161, 49, 8]}, {"55061075": [4, 17]}, {"55061079": [2, 52, 2]}, {"55061083": [119, 52, 2]}, {"55061087": [120, 3, 224]}, {"55061091": [8]}, {"55061096": [144, 136]}, {"55061099": [50, 17]}, {"55061103": [2, 52, 2]}, {"55061107": [192, 52, 2]}, {"55061111": [193, 3, 224]}, {"55061115": [8]}, {"55061120": [144, 136]}, {"55061123": [163, 49, 8]}, {"55061127": [3, 17]}, {"55061131": [2, 52, 2]}, {"55061135": [77, 52, 162]}, {"55061140": [3, 224]}, {"55061143": [8]}, {"55061148": [144, 136]}, {"55061151": [163, 49, 8]}, {"55061155": [24, 17]}, {"55061159": [2, 52, 2]}, {"55061163": [77, 52, 162]}, {"55061168": [3, 224]}, {"55061171": [8]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [52, 8]}, {"55061187": [1, 160, 136]}, {"55061191": [62, 3, 224]}, {"55061195": [8]}, {"55061200": [36, 136]}, {"55061203": [134, 36, 9, 255, 255, 37, 41]}, {"55061211": [1, 52, 1]}, {"55061215": [3]}, {"55061217": [41, 8, 42, 20, 32]}, {"55061223": [7]}, {"55061228": [1, 9, 80, 33, 145, 75]}, {"55061236": [52, 1]}, {"55061239": [255, 21, 97, 255, 247]}, {"55061248": [161, 69]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [36, 136]}, {"55061263": [168, 1, 6, 64, 33, 145, 9]}, {"55061272": [1, 37, 72, 37, 161, 9]}, {"55061280": [3, 224]}, {"55061283": [8]}, {"55061288": [36, 136]}, {"55061291": [188, 1, 5, 64, 33, 129, 9]}, {"55061300": [5, 33]}, {"55061303": [2]}, {"55061308": [52, 9]}, {"55061312": [37, 41]}, {"55061315": [1, 161, 9]}, {"55061320": [3, 224]}, {"55061323": [8]}, {"55061328": [52, 8]}, {"55061331": [1, 160, 136]}, {"55061335": [61, 52, 8]}, {"55061339": [20, 160, 136]}, {"55061343": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061355": [8]}, {"55061360": [52, 8]}, {"55061363": [1, 160, 136]}, {"55061367": [50, 160, 136]}, {"55061371": [58, 52, 8]}, {"55061375": [48, 164, 136, 19, 244, 160, 136]}, {"55061383": [51, 3, 224]}, {"55061387": [8]}, {"55061392": [52, 8]}, {"55061395": [2, 160, 136]}, {"55061399": [50, 52, 8]}, {"55061403": [1, 160, 136]}, {"55061407": [58, 160, 136]}, {"55061411": [60, 52, 8]}, {"55061415": [96, 164, 136, 19, 244, 160, 136]}, {"55061423": [51, 3, 224]}, {"55061427": [8]}, {"55061432": [175, 164]}, {"55061435": [104, 175, 165]}, {"55061439": [108, 175, 166]}, {"55061443": [112, 175, 167]}, {"55061447": [116, 39, 189, 255, 232, 175, 163]}, {"55061455": [16, 175, 191]}, {"55061459": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061472": [17]}, {"55061475": [10]}, {"55061480": [60, 9, 128, 65, 52, 10]}, {"55061487": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061516": [143, 163]}, {"55061519": [16, 143, 191]}, {"55061523": [20, 39, 189]}, {"55061527": [24, 143, 164]}, {"55061531": [104, 143, 165]}, {"55061535": [108, 143, 166]}, {"55061539": [112, 143, 167]}, {"55061543": [116, 132, 110, 19, 196, 3, 224]}, {"55061551": [8]}, {"55061556": [147, 25]}, {"55061559": [116, 52, 1]}, {"55061563": [255, 23, 33]}, {"55061567": [2]}, {"55061572": [52, 25]}, {"55061575": [44, 3, 224]}, {"55061579": [8, 167, 185]}, {"55061583": [154, 147, 44]}, {"55061587": [116, 52, 1]}, {"55061591": [255, 21, 129]}, {"55061595": [2]}, {"55061600": [52, 12]}, {"55061603": [44, 3, 224]}, {"55061607": [8]}, {"55061612": [145, 174]}, {"55061615": [116, 52, 1]}, {"55061619": [255, 21, 193]}, {"55061623": [2]}, {"55061628": [52, 14]}, {"55061631": [44, 3, 224]}, {"55061635": [8, 167, 174]}, {"55061639": [154, 145, 207]}, {"55061643": [116, 52, 1]}, {"55061647": [255, 21, 225]}, {"55061651": [2]}, {"55061656": [52, 15]}, {"55061659": [44, 3, 224]}, {"55061663": [8, 167, 175]}, {"55061667": [154, 144, 174]}, {"55061671": [64, 144, 162]}, {"55061675": [112, 52, 3]}, {"55061679": [255, 21, 195]}, {"55061683": [3]}, {"55061688": [52, 3]}, {"55061691": [1, 160, 163, 15, 51, 3, 224]}, {"55061699": [8]}, {"55061704": [141, 9]}, {"55061707": [4, 17, 32]}, {"55061711": [7]}, {"55061716": [145, 9]}, {"55061719": [104, 52, 1]}, {"55061723": [59, 17, 33]}, {"55061727": [2]}, {"55061732": [52, 9]}, {"55061735": [255, 161, 9]}, {"55061739": [64, 3, 224]}, {"55061743": [8, 161, 14]}, {"55061747": [104]}] \ No newline at end of file From 1858978a81890d2f6aa54611d1ed3330a9034dc6 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 5 Jun 2018 15:49:16 -0400 Subject: [PATCH 097/151] Re-arrange some code --- ASM/src/build.asm | 1 + ASM/src/cutscenes.asm | 66 ++++++++ ASM/src/item_data.asm | 309 ++++++++++++++++++++++++++++++++++ ASM/src/items.asm | 378 ------------------------------------------ 4 files changed, 376 insertions(+), 378 deletions(-) create mode 100644 ASM/src/cutscenes.asm diff --git a/ASM/src/build.asm b/ASM/src/build.asm index b3193d2fd..914ecdf5f 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -27,6 +27,7 @@ .include "state.asm" .include "item_data.asm" .include "items.asm" +.include "cutscenes.asm" .include "every_frame.asm" .include "menu.asm" .include "fixes.asm" diff --git a/ASM/src/cutscenes.asm b/ASM/src/cutscenes.asm new file mode 100644 index 000000000..6813ccd4f --- /dev/null +++ b/ASM/src/cutscenes.asm @@ -0,0 +1,66 @@ +override_great_fairy_cutscene: + ; a0 = global context + ; a2 = fairy actor + lw t0, 0x1D2C (a0) ; t0 = switch flags + li t1, 1 + sll t1, t1, 0x18 ; t1 = ZL switch flag + and v0, t0, t1 + beqz v0, @@return ; Do nothing until ZL is played + nop + + lhu t2, 0x02DC (a2) ; Load fairy index + li t3, SAVE_CONTEXT + + lhu t4, 0xA4 (a0) ; Load scene number + beq t4, 0x3D, @@item_fairy + nop + + ; Handle upgrade fairies + addu t4, a0, t2 + lbu t5, 0x1D28 (t4) ; t5 = chest flag for this fairy + bnez t5, @@return ; Use default behavior if the item is already obtained + nop + li t5, 1 + sb t5, 0x1D28 (t4) ; Mark item as obtained + addiu t2, t2, 3 ; t2 = index of the item in FAIRY_ITEMS + b @@give_item + nop + +@@item_fairy: + li t4, 1 + sllv t4, t4, t2 ; t4 = fairy item mask + lbu t5, 0x0EF2 (t3) ; t5 = fairy item flags + and t6, t5, t4 + bnez t6, @@return ; Use default behavior if the item is already obtained + nop + or t6, t5, t4 + sb t6, 0x0EF2 (t3) ; Mark item as obtained + +@@give_item: + ; Unset ZL switch + nor t1, t1, t1 + and t0, t0, t1 + sw t0, 0x1D2C (a0) + + ; Load fairy item and mark it as pending + li t0, FAIRY_ITEMS + addu t0, t0, t2 + lb t0, 0x00 (t0) + li t1, PENDING_SPECIAL_ITEM + sb t0, 0x00 (t1) + + li v0, 0 ; Prevent fairy animation + +@@return: + jr ra + nop + +;================================================================================================== + +override_light_arrow_cutscene: + li t0, LIGHT_ARROW_ITEM + lb t0, 0x00 (t0) + li t1, PENDING_SPECIAL_ITEM + sb t0, 0x00 (t1) + jr ra + nop diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm index 0577a8b7a..18b4279b7 100755 --- a/ASM/src/item_data.asm +++ b/ASM/src/item_data.asm @@ -123,3 +123,312 @@ Item_Row 0x53, 0x8D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, -1, -1 ; 0x Item_Row 0x4F, 0x41, 0x13, 0xE9, 0x00BD, no_upgrade, give_defense, -1, -1 ; 0xBF = Double Defense Item_Row 0x4F, 0x41, 0xE2, 0xE4, 0x00CD, magic_upgrade, give_magic, -1, -1 ; 0xC0 = Progressive Magic Meter Item_Row 0x4F, 0x41, 0xE1, 0xE8, 0x00CD, no_upgrade, double_magic, -1, -1 ; 0xC1 = Double Magic + +;================================================================================================== +; Item upgrade functions +;================================================================================================== + +no_upgrade: + jr ra + ori v0, a1, 0 + +;================================================================================================== + +hookshot_upgrade: + lbu t0, 0x7D (a0) ; Load hookshot from inventory + + beq t0, 0xFF, @@return + li v0, 0x08 ; Hookshot + + li v0, 0x09 ; Longshot + +@@return: + jr ra + nop + +;================================================================================================== + +strength_upgrade: + lbu t0, 0xA3 (a0) ; Load strength from inventory + andi t0, t0, 0xC0 ; Mask bits to isolate strength + + beqz t0, @@return + li v0, 0x54 ; Goron Bracelet + + beq t0, 0x40, @@return + li v0, 0x35 ; Silver Gauntlets + + li v0, 0x36 ; Gold Gauntlets + +@@return: + jr ra + nop + +;================================================================================================== + +bomb_bag_upgrade: + lbu t0, 0xA3 (a0) ; Load bomb bag from inventory + andi t0, t0, 0x18 ; Mask bits to isolate bomb bag + + beqz t0, @@return + li v0, 0x32 ; Bomb Bag + + beq t0, 0x08, @@return + li v0, 0x33 ; Bigger Bomb Bag + + li v0, 0x34 ; Biggest Bomb Bag + +@@return: + jr ra + nop + +;================================================================================================== + +bow_upgrade: + lbu t0, 0xA3 (a0) ; Load quiver from inventory + andi t0, t0, 0x03 ; Mask bits to isolate quiver + + beqz t0, @@return + li v0, 0x04 ; Bow + + beq t0, 0x01, @@return + li v0, 0x30 ; Big Quiver + + li v0, 0x31 ; Biggest Quiver + +@@return: + jr ra + nop + +;================================================================================================== + +slingshot_upgrade: + lbu t0, 0xA2 (a0) ; Load bullet bag from inventory + andi t0, t0, 0xC0 ; Mask bits to isolate bullet bag + + beqz t0, @@return + li v0, 0x05 ; Slingshot + + beq t0, 0x40, @@return + li v0, 0x60 ; Bullet Bag (40) + + li v0, 0x7B ; Bullet Bag (50) + +@@return: + jr ra + nop + +;================================================================================================== + +wallet_upgrade: + lbu t0, 0xA2 (a0) ; Load wallet from inventory + andi t0, t0, 0x30 ; Mask bits to isolate wallet + + beqz t0, @@return + li v0, 0x45 ; Adult's Wallet + + li v0, 0x46 ; Giant's Wallet + +@@return: + jr ra + nop + +;================================================================================================== + +scale_upgrade: + lbu t0, 0xA2 (a0) ; Load scale from inventory + andi t0, t0, 0x06 ; # Mask bits to isolate scale + + beqz t0, @@return + li v0, 0x37 ; Silver Scale + + li v0, 0x38 ; Gold Scale + +@@return: + jr ra + nop + +;================================================================================================== + +nut_upgrade: + lbu t0, 0xA1 (a0) ; Load nut limit from inventory + andi t0, t0, 0x20 ; Mask bits to isolate nut limit, upper bit only + + beqz t0, @@return + li v0, 0x79 ; 30 Nuts + + li v0, 0x7A ; 40 Nuts + +@@return: + jr ra + nop + +;================================================================================================== + +stick_upgrade: + lbu t0, 0xA1 (a0) ; Load stick limit from inventory + andi t0, t0, 0x04 ; Mask bits to isolate stick limit, upper bit only + + beqz t0, @@return + li v0, 0x77 ; 20 Sticks + + li v0, 0x78 ; 30 Sticks + +@@return: + jr ra + nop + +;================================================================================================== + +magic_upgrade: + lbu t0, 0x32 (a0) ; Load magic level from inventory + + beqz t0, @@return + li v0, 0xC0 ; Single Magic + + li v0, 0xC1 ; Double Magic + +@@return: + jr ra + nop + +;================================================================================================== + +arrows_to_rupee: + lbu t0, 0xA3 (a0) ; Load quiver from inventory + andi t0, t0, 0x03 ; Mask bits to isolate quiver + + beqz t0, @@return + li v0, 0x4D ; Blue Rupee + + ori v0, a1, 0 + +@@return: + jr ra + nop + +;================================================================================================== + +bombs_to_rupee: + lbu t0, 0xA3 (a0) ; Load bomb bag from inventory + andi t0, t0, 0x18 ; Mask bits to isolate bomb bag + + beqz t0, @@return + li v0, 0x4D ; Blue Rupee + + ori v0, a1, 0 + +@@return: + jr ra + nop + +;================================================================================================== +; Item effect functions +;================================================================================================== + +no_effect: + jr ra + nop + +;================================================================================================== + +give_biggoron_sword: + ; a0 = save context + li t0, 0x01 + sb t0, 0x3E (a0) ; Set flag to make the sword durable + jr ra + nop + +;================================================================================================== + +give_bottle: + ; a0 = save context + ; a1 = item code to store + addiu t0, a0, 0x86 ; t0 = First bottle slot + li t1, -1 ; t1 = Bottle slot offset + +@@loop: + addiu t1, t1, 1 + bgt t1, 3, @@return ; No free bottle slots + nop + + ; Check whether slot is full + addu t2, t0, t1 + lbu t3, 0x00 (t2) + bne t3, 0xFF, @@loop + nop + + ; Found an open slot + sb a1, 0x00 (t2) + +@@return: + jr ra + nop + +;================================================================================================== + +give_dungeon_item: + ; a0 = save context + ; a1 = mask (0x01 = boss key, 0x02 = compass, 0x04 = map) + ; a2 = dungeon index + addiu t0, a0, 0xA8 + addu t0, t0, a2 ; t0 = address of this dungeon's items + lbu t1, 0x00 (t0) + or t1, t1, a1 + sb t1, 0x00 (t0) + jr ra + nop + +;================================================================================================== + +give_small_key: + ; a0 = save context + ; a1 = dungeon index + addiu t0, a0, 0xBC + addu t0, t0, a1 ; t0 = address of this dungeon's key count + lb t1, 0x00 (t0) + bgez t1, @not_negative + nop + li t1, 0x00 +@not_negative: + addiu t1, t1, 1 + sb t1, 0x00 (t0) + jr ra + nop + +;================================================================================================== + +give_defense: + ; a0 = save context + li t0, 0x01 + sb t0, 0x3D (a0) ; Set double defense flag + li t0, 0x14 + sb t0, 0xCF (a0) ; Set number of hearts to display as double defense + li t0, 0x0140 + sh t0, 0x1424 (a0) ; Give health refill + jr ra + nop + +give_magic: + ; a0 = save context + li t0, 1 + sb t0, 0x32 (a0) ; Set meter level + sb t0, 0x3A (a0) ; Required for meter to persist on save load + li t0, 0x30 + sh t0, 0x13F4 (a0) ; Set meter size + sb t0, 0x33 (a0) ; Fill meter + jr ra + nop + +double_magic: + ; a0 = save context + li t0, 2 + sb t0, 0x32 (a0) ; Set meter level + li t0, 1 + sb t0, 0x3A (a0) ; Required for meter to persist on save load + sb t0, 0x3C (a0) ; Required for meter to persist on save load + li t0, 0x60 + sh t0, 0x13F4 (a0) ; Set meter size + sb t0, 0x33 (a0) ; Fill meter + jr ra + nop diff --git a/ASM/src/items.asm b/ASM/src/items.asm index d4517854d..9f17a0bbe 100755 --- a/ASM/src/items.asm +++ b/ASM/src/items.asm @@ -139,75 +139,6 @@ override_action: ;================================================================================================== -override_great_fairy_cutscene: - ; a0 = global context - ; a2 = fairy actor - lw t0, 0x1D2C (a0) ; t0 = switch flags - li t1, 1 - sll t1, t1, 0x18 ; t1 = ZL switch flag - and v0, t0, t1 - beqz v0, @@return ; Do nothing until ZL is played - nop - - lhu t2, 0x02DC (a2) ; Load fairy index - li t3, SAVE_CONTEXT - - lhu t4, 0xA4 (a0) ; Load scene number - beq t4, 0x3D, @@item_fairy - nop - - ; Handle upgrade fairies - addu t4, a0, t2 - lbu t5, 0x1D28 (t4) ; t5 = chest flag for this fairy - bnez t5, @@return ; Use default behavior if the item is already obtained - nop - li t5, 1 - sb t5, 0x1D28 (t4) ; Mark item as obtained - addiu t2, t2, 3 ; t2 = index of the item in FAIRY_ITEMS - b @@give_item - nop - -@@item_fairy: - li t4, 1 - sllv t4, t4, t2 ; t4 = fairy item mask - lbu t5, 0x0EF2 (t3) ; t5 = fairy item flags - and t6, t5, t4 - bnez t6, @@return ; Use default behavior if the item is already obtained - nop - or t6, t5, t4 - sb t6, 0x0EF2 (t3) ; Mark item as obtained - -@@give_item: - ; Unset ZL switch - nor t1, t1, t1 - and t0, t0, t1 - sw t0, 0x1D2C (a0) - - ; Load fairy item and mark it as pending - li t0, FAIRY_ITEMS - addu t0, t0, t2 - lb t0, 0x00 (t0) - li t1, PENDING_SPECIAL_ITEM - sb t0, 0x00 (t1) - - li v0, 0 ; Prevent fairy animation - -@@return: - jr ra - nop - -;================================================================================================== - -override_light_arrow_cutscene: - li t0, LIGHT_ARROW_ITEM - lb t0, 0x00 (t0) - li t1, PENDING_SPECIAL_ITEM - sb t0, 0x00 (t1) - jr ra - nop - -;================================================================================================== - store_item_data_hook: sb a2, 0x0424 (a3) ; Displaced code @@ -455,312 +386,3 @@ resolve_extended_item: addiu sp, sp, 0x20 jr ra nop - -;================================================================================================== -; Item upgrade functions -;================================================================================================== - -no_upgrade: - jr ra - ori v0, a1, 0 - -;================================================================================================== - -hookshot_upgrade: - lbu t0, 0x7D (a0) ; Load hookshot from inventory - - beq t0, 0xFF, @@return - li v0, 0x08 ; Hookshot - - li v0, 0x09 ; Longshot - -@@return: - jr ra - nop - -;================================================================================================== - -strength_upgrade: - lbu t0, 0xA3 (a0) ; Load strength from inventory - andi t0, t0, 0xC0 ; Mask bits to isolate strength - - beqz t0, @@return - li v0, 0x54 ; Goron Bracelet - - beq t0, 0x40, @@return - li v0, 0x35 ; Silver Gauntlets - - li v0, 0x36 ; Gold Gauntlets - -@@return: - jr ra - nop - -;================================================================================================== - -bomb_bag_upgrade: - lbu t0, 0xA3 (a0) ; Load bomb bag from inventory - andi t0, t0, 0x18 ; Mask bits to isolate bomb bag - - beqz t0, @@return - li v0, 0x32 ; Bomb Bag - - beq t0, 0x08, @@return - li v0, 0x33 ; Bigger Bomb Bag - - li v0, 0x34 ; Biggest Bomb Bag - -@@return: - jr ra - nop - -;================================================================================================== - -bow_upgrade: - lbu t0, 0xA3 (a0) ; Load quiver from inventory - andi t0, t0, 0x03 ; Mask bits to isolate quiver - - beqz t0, @@return - li v0, 0x04 ; Bow - - beq t0, 0x01, @@return - li v0, 0x30 ; Big Quiver - - li v0, 0x31 ; Biggest Quiver - -@@return: - jr ra - nop - -;================================================================================================== - -slingshot_upgrade: - lbu t0, 0xA2 (a0) ; Load bullet bag from inventory - andi t0, t0, 0xC0 ; Mask bits to isolate bullet bag - - beqz t0, @@return - li v0, 0x05 ; Slingshot - - beq t0, 0x40, @@return - li v0, 0x60 ; Bullet Bag (40) - - li v0, 0x7B ; Bullet Bag (50) - -@@return: - jr ra - nop - -;================================================================================================== - -wallet_upgrade: - lbu t0, 0xA2 (a0) ; Load wallet from inventory - andi t0, t0, 0x30 ; Mask bits to isolate wallet - - beqz t0, @@return - li v0, 0x45 ; Adult's Wallet - - li v0, 0x46 ; Giant's Wallet - -@@return: - jr ra - nop - -;================================================================================================== - -scale_upgrade: - lbu t0, 0xA2 (a0) ; Load scale from inventory - andi t0, t0, 0x06 ; # Mask bits to isolate scale - - beqz t0, @@return - li v0, 0x37 ; Silver Scale - - li v0, 0x38 ; Gold Scale - -@@return: - jr ra - nop - -;================================================================================================== - -nut_upgrade: - lbu t0, 0xA1 (a0) ; Load nut limit from inventory - andi t0, t0, 0x20 ; Mask bits to isolate nut limit, upper bit only - - beqz t0, @@return - li v0, 0x79 ; 30 Nuts - - li v0, 0x7A ; 40 Nuts - -@@return: - jr ra - nop - -;================================================================================================== - -stick_upgrade: - lbu t0, 0xA1 (a0) ; Load stick limit from inventory - andi t0, t0, 0x04 ; Mask bits to isolate stick limit, upper bit only - - beqz t0, @@return - li v0, 0x77 ; 20 Sticks - - li v0, 0x78 ; 30 Sticks - -@@return: - jr ra - nop - -;================================================================================================== - -magic_upgrade: - lbu t0, 0x32 (a0) ; Load magic level from inventory - - beqz t0, @@return - li v0, 0xC0 ; Single Magic - - li v0, 0xC1 ; Double Magic - -@@return: - jr ra - nop - -;================================================================================================== - -arrows_to_rupee: - lbu t0, 0xA3 (a0) ; Load quiver from inventory - andi t0, t0, 0x03 ; Mask bits to isolate quiver - - beqz t0, @@return - li v0, 0x4D ; Blue Rupee - - ori v0, a1, 0 - -@@return: - jr ra - nop - -;================================================================================================== - -bombs_to_rupee: - lbu t0, 0xA3 (a0) ; Load bomb bag from inventory - andi t0, t0, 0x18 ; Mask bits to isolate bomb bag - - beqz t0, @@return - li v0, 0x4D ; Blue Rupee - - ori v0, a1, 0 - -@@return: - jr ra - nop - -;================================================================================================== -; Item effect functions -;================================================================================================== - -no_effect: - jr ra - nop - -;================================================================================================== - -give_biggoron_sword: - ; a0 = save context - li t0, 0x01 - sb t0, 0x3E (a0) ; Set flag to make the sword durable - jr ra - nop - -;================================================================================================== - -give_bottle: - ; a0 = save context - ; a1 = item code to store - addiu t0, a0, 0x86 ; t0 = First bottle slot - li t1, -1 ; t1 = Bottle slot offset - -@@loop: - addiu t1, t1, 1 - bgt t1, 3, @@return ; No free bottle slots - nop - - ; Check whether slot is full - addu t2, t0, t1 - lbu t3, 0x00 (t2) - bne t3, 0xFF, @@loop - nop - - ; Found an open slot - sb a1, 0x00 (t2) - -@@return: - jr ra - nop - -;================================================================================================== - -give_dungeon_item: - ; a0 = save context - ; a1 = mask (0x01 = boss key, 0x02 = compass, 0x04 = map) - ; a2 = dungeon index - addiu t0, a0, 0xA8 - addu t0, t0, a2 ; t0 = address of this dungeon's items - lbu t1, 0x00 (t0) - or t1, t1, a1 - sb t1, 0x00 (t0) - jr ra - nop - -;================================================================================================== - -give_small_key: - ; a0 = save context - ; a1 = dungeon index - addiu t0, a0, 0xBC - addu t0, t0, a1 ; t0 = address of this dungeon's key count - lb t1, 0x00 (t0) - bgez t1, @not_negative - nop - li t1, 0x00 -@not_negative: - addiu t1, t1, 1 - sb t1, 0x00 (t0) - jr ra - nop - -;================================================================================================== - -give_defense: - ; a0 = save context - li t0, 0x01 - sb t0, 0x3D (a0) ; Set double defense flag - li t0, 0x14 - sb t0, 0xCF (a0) ; Set number of hearts to display as double defense - li t0, 0x0140 - sh t0, 0x1424 (a0) ; Give health refill - jr ra - nop - -give_magic: - ; a0 = save context - li t0, 1 - sb t0, 0x32 (a0) ; Set meter level - sb t0, 0x3A (a0) ; Required for meter to persist on save load - li t0, 0x30 - sh t0, 0x13F4 (a0) ; Set meter size - sb t0, 0x33 (a0) ; Fill meter - jr ra - nop - -double_magic: - ; a0 = save context - li t0, 2 - sb t0, 0x32 (a0) ; Set meter level - li t0, 1 - sb t0, 0x3A (a0) ; Required for meter to persist on save load - sb t0, 0x3C (a0) ; Required for meter to persist on save load - li t0, 0x60 - sh t0, 0x13F4 (a0) ; Set meter size - sb t0, 0x33 (a0) ; Fill meter - jr ra - nop From a57f9cfc673012640f2c9ca2e7372dbb6d29224e Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 5 Jun 2018 15:50:11 -0400 Subject: [PATCH 098/151] More accurate ASM filenames --- ASM/src/{item_data.asm => extended_items.asm} | 0 ASM/src/{items.asm => item_overrides.asm} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename ASM/src/{item_data.asm => extended_items.asm} (100%) rename ASM/src/{items.asm => item_overrides.asm} (100%) diff --git a/ASM/src/item_data.asm b/ASM/src/extended_items.asm similarity index 100% rename from ASM/src/item_data.asm rename to ASM/src/extended_items.asm diff --git a/ASM/src/items.asm b/ASM/src/item_overrides.asm similarity index 100% rename from ASM/src/items.asm rename to ASM/src/item_overrides.asm From 03bab10c930caef395cacafab6211fdefaf454cc Mon Sep 17 00:00:00 2001 From: Wulfy Date: Tue, 5 Jun 2018 15:51:38 -0400 Subject: [PATCH 099/151] Update ASM build --- ASM/src/build.asm | 4 ++-- data/base2current.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ASM/src/build.asm b/ASM/src/build.asm index 914ecdf5f..3908fe182 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -25,8 +25,8 @@ .area 0x1000, 0 .include "constants.asm" .include "state.asm" -.include "item_data.asm" -.include "items.asm" +.include "extended_items.asm" +.include "item_overrides.asm" .include "cutscenes.asm" .include "every_frame.asm" .include "menu.asm" diff --git a/data/base2current.json b/data/base2current.json index afec49ef9..f7e4cb661 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 9, 160]}, {"11325064": [12, 16, 9, 152, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426028": [55, 239]}, {"11426031": [0, 12, 16, 11, 41, 0, 0]}, {"11426039": [0, 53, 255]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 50]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 20, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 27, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 34, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 13, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 61]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 13]}, {"12427480": [12, 16, 9, 42]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 46]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 238, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 73]}, {"12491480": [12, 16, 9, 82]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 9, 109]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 88, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 41, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 48, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 42, 184, 128, 64, 42, 76, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 42, 208, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 43, 12, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 43, 40, 128, 64, 41, 52, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 42, 192, 128, 64, 41, 52, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 42, 184, 128, 64, 42, 128, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 42, 184, 128, 64, 42, 156, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 42, 184, 128, 64, 41, 52, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 43, 80, 128, 64, 41, 52, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 43, 112, 128, 64, 42, 104, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 43, 144, 128, 64, 41, 52, 48, 132]}, {"55059511": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55059523": [140, 16, 129]}, {"55059527": [22, 145, 2]}, {"55059531": [117, 52, 1]}, {"55059535": [141, 16, 129]}, {"55059539": [19, 145, 2]}, {"55059543": [117, 16, 128]}, {"55059547": [17, 145, 2]}, {"55059551": [116, 52, 1]}, {"55059555": [138, 16, 129]}, {"55059559": [14, 145, 2]}, {"55059563": [116, 52, 1]}, {"55059567": [139, 16, 129]}, {"55059571": [11, 145, 2]}, {"55059575": [116, 52, 1]}, {"55059579": [88, 16, 129]}, {"55059583": [8, 52, 2]}, {"55059588": [52, 1]}, {"55059591": [120, 16, 129]}, {"55059595": [5, 52, 2]}, {"55059600": [52, 1]}, {"55059603": [121, 16, 129]}, {"55059607": [2, 52, 2]}, {"55059612": [52, 2]}, {"55059615": [255, 3, 224]}, {"55059619": [8]}, {"55059624": [143, 166]}, {"55059627": [48, 132, 197]}, {"55059631": [4, 8, 16, 9, 50]}, {"55059640": [143, 185]}, {"55059643": [44, 135, 37]}, {"55059647": [4, 8, 16, 9, 50]}, {"55059656": [60, 10, 128, 64, 37, 74, 32]}, {"55059664": [141, 75]}, {"55059667": [12, 17, 96]}, {"55059671": [2]}, {"55059676": [149, 69]}, {"55059679": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55059692": [3, 224]}, {"55059695": [8]}, {"55059700": [60, 8, 128, 64, 37, 8, 32]}, {"55059708": [141, 9]}, {"55059711": [12, 17, 32]}, {"55059715": [2]}, {"55059720": [129, 3]}, {"55059723": [2]}, {"55059725": [3, 15, 195]}, {"55059729": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55059743": [8]}, {"55059748": [144, 69]}, {"55059751": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55059760": [141, 9]}, {"55059763": [12, 17, 32]}, {"55059767": [2]}, {"55059772": [145, 5]}, {"55059775": [3, 3, 224]}, {"55059779": [8]}, {"55059784": [143, 162]}, {"55059787": [36, 144, 69]}, {"55059792": [60, 8, 128, 64, 37, 8, 32]}, {"55059800": [141, 9]}, {"55059803": [12, 17, 32]}, {"55059807": [19]}, {"55059812": [145, 5]}, {"55059815": [1, 175, 164]}, {"55059820": [175, 165]}, {"55059823": [4, 175, 166]}, {"55059827": [8, 39, 189, 255, 232, 175, 191]}, {"55059835": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55059847": [6, 145, 6]}, {"55059851": [7, 141, 9]}, {"55059855": [8, 1, 32, 248, 9]}, {"55059864": [143, 191]}, {"55059867": [16, 39, 189]}, {"55059871": [24, 143, 164]}, {"55059876": [143, 165]}, {"55059879": [4, 143, 166]}, {"55059883": [8, 3, 224]}, {"55059887": [8]}, {"55059892": [140, 136, 29, 44, 52, 9]}, {"55059899": [1]}, {"55059901": [9, 78]}, {"55059904": [1, 9, 16, 36, 16, 64]}, {"55059911": [36]}, {"55059916": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55059931": [164, 52, 1]}, {"55059935": [61, 17, 129]}, {"55059939": [10]}, {"55059945": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55059955": [25]}, {"55059960": [52, 13]}, {"55059963": [1, 161, 141, 29, 40, 37, 74]}, {"55059971": [3, 16]}, {"55059975": [9]}, {"55059980": [52, 12]}, {"55059983": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55059999": [14]}, {"55060004": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55060040": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060052": [52, 2]}, {"55060056": [3, 224]}, {"55060059": [8]}, {"55060064": [60, 8, 128, 64, 37, 8, 20]}, {"55060072": [129, 8]}, {"55060076": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55060088": [3, 224]}, {"55060091": [8]}, {"55060096": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060107": [16, 175, 163]}, {"55060111": [20, 175, 191]}, {"55060115": [24, 12, 16, 9, 173]}, {"55060124": [143, 162]}, {"55060127": [16, 143, 163]}, {"55060131": [20, 143, 191]}, {"55060135": [24, 39, 189]}, {"55060139": [32, 3, 224]}, {"55060143": [8]}, {"55060148": [39, 189, 255, 232, 175, 191]}, {"55060155": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060164": [173]}, {"55060168": [173]}, {"55060171": [4, 173]}, {"55060175": [8, 173]}, {"55060179": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060195": [42]}, {"55060201": [9, 15, 195, 1, 33, 32, 38]}, {"55060209": [129, 32, 35, 141, 5, 4, 40, 12, 16, 9, 231]}, {"55060224": [4, 64]}, {"55060227": [34]}, {"55060232": [52, 68]}, {"55060236": [12, 16, 10, 44]}, {"55060244": [16, 96]}, {"55060247": [12]}, {"55060252": [60, 8, 128, 64, 37, 8, 32]}, {"55060260": [140, 105]}, {"55060264": [173, 9]}, {"55060268": [140, 105]}, {"55060271": [4, 173, 9]}, {"55060275": [4, 140, 105]}, {"55060279": [8, 173, 9]}, {"55060283": [8, 52, 9]}, {"55060287": [1, 173, 9]}, {"55060291": [12, 144, 98]}, {"55060296": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060312": [52, 1]}, {"55060315": [10, 21, 65]}, {"55060319": [6]}, {"55060324": [149, 42]}, {"55060327": [28, 49, 74, 240, 31]}, {"55060333": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060343": [28, 129, 9, 4, 36, 5, 33]}, {"55060351": [2]}, {"55060357": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060367": [16, 39, 189]}, {"55060371": [24, 3, 224]}, {"55060375": [8]}, {"55060380": [39, 189, 255, 232, 175, 191]}, {"55060387": [16, 12, 16, 9, 245]}, {"55060396": [36, 1, 255, 255, 16, 65]}, {"55060403": [4]}, {"55060408": [52, 68]}, {"55060412": [12, 16, 10, 31]}, {"55060420": [143, 191]}, {"55060423": [16, 39, 189]}, {"55060427": [24, 3, 224]}, {"55060431": [8]}, {"55060436": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060447": [164, 52, 8]}, {"55060452": [52, 137]}, {"55060456": [148, 170]}, {"55060460": [52, 1]}, {"55060463": [10, 21, 65]}, {"55060467": [14]}, {"55060472": [148, 171]}, {"55060475": [28, 52, 1]}, {"55060479": [16, 20, 65]}, {"55060483": [8]}, {"55060488": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060499": [4]}, {"55060504": [36, 2, 255, 255, 16]}, {"55060511": [21]}, {"55060516": [52, 8]}, {"55060519": [1, 49, 105]}, {"55060523": [31, 52, 1]}, {"55060527": [21, 21, 65]}, {"55060531": [12]}, {"55060536": [52, 1]}, {"55060539": [62, 16, 129]}, {"55060543": [7]}, {"55060548": [52, 1]}, {"55060551": [66, 16, 129]}, {"55060555": [4]}, {"55060560": [36, 2, 255, 255, 16]}, {"55060567": [7]}, {"55060572": [52, 8]}, {"55060575": [2, 144, 169, 1, 65]}, {"55060581": [2, 18]}, {"55060585": [72, 16, 37]}, {"55060589": [2, 18]}, {"55060593": [73, 16, 37, 3, 224]}, {"55060599": [8]}, {"55060604": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55060619": [4, 141, 9]}, {"55060624": [17, 32]}, {"55060627": [5]}, {"55060633": [9, 82, 2, 21, 68, 255, 250]}, {"55060644": [49, 34]}, {"55060647": [255, 3, 224]}, {"55060651": [8]}, {"55060656": [39, 189, 255, 224, 175, 176]}, {"55060663": [16, 175, 177]}, {"55060667": [20, 175, 191]}, {"55060671": [24, 52, 130]}, {"55060676": [52, 80]}, {"55060680": [38, 8, 255, 128, 5]}, {"55060687": [18]}, {"55060692": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55060703": [16, 1, 9]}, {"55060707": [24]}, {"55060710": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55060728": [142, 40]}, {"55060731": [12, 1]}, {"55060734": [248, 9]}, {"55060740": [20, 80, 255, 239]}, {"55060748": [54, 35]}, {"55060752": [16]}, {"55060755": [2]}, {"55060760": [52, 3]}, {"55060764": [143, 176]}, {"55060767": [16, 143, 177]}, {"55060771": [20, 143, 191]}, {"55060775": [24, 39, 189]}, {"55060779": [32, 3, 224]}, {"55060783": [8]}, {"55060788": [3, 224]}, {"55060791": [8, 52, 162]}, {"55060796": [144, 136]}, {"55060799": [125, 52, 1]}, {"55060803": [255, 17, 1]}, {"55060807": [2, 52, 2]}, {"55060811": [8, 52, 2]}, {"55060815": [9, 3, 224]}, {"55060819": [8]}, {"55060824": [144, 136]}, {"55060827": [163, 49, 8]}, {"55060831": [192, 17]}, {"55060835": [5, 52, 2]}, {"55060839": [84, 52, 1]}, {"55060843": [64, 17, 1]}, {"55060847": [2, 52, 2]}, {"55060851": [53, 52, 2]}, {"55060855": [54, 3, 224]}, {"55060859": [8]}, {"55060864": [144, 136]}, {"55060867": [163, 49, 8]}, {"55060871": [24, 17]}, {"55060875": [5, 52, 2]}, {"55060879": [50, 52, 1]}, {"55060883": [8, 17, 1]}, {"55060887": [2, 52, 2]}, {"55060891": [51, 52, 2]}, {"55060895": [52, 3, 224]}, {"55060899": [8]}, {"55060904": [144, 136]}, {"55060907": [163, 49, 8]}, {"55060911": [3, 17]}, {"55060915": [5, 52, 2]}, {"55060919": [4, 52, 1]}, {"55060923": [1, 17, 1]}, {"55060927": [2, 52, 2]}, {"55060931": [48, 52, 2]}, {"55060935": [49, 3, 224]}, {"55060939": [8]}, {"55060944": [144, 136]}, {"55060947": [162, 49, 8]}, {"55060951": [192, 17]}, {"55060955": [5, 52, 2]}, {"55060959": [5, 52, 1]}, {"55060963": [64, 17, 1]}, {"55060967": [2, 52, 2]}, {"55060971": [96, 52, 2]}, {"55060975": [123, 3, 224]}, {"55060979": [8]}, {"55060984": [144, 136]}, {"55060987": [162, 49, 8]}, {"55060991": [48, 17]}, {"55060995": [2, 52, 2]}, {"55060999": [69, 52, 2]}, {"55061003": [70, 3, 224]}, {"55061007": [8]}, {"55061012": [144, 136]}, {"55061015": [162, 49, 8]}, {"55061019": [6, 17]}, {"55061023": [2, 52, 2]}, {"55061027": [55, 52, 2]}, {"55061031": [56, 3, 224]}, {"55061035": [8]}, {"55061040": [144, 136]}, {"55061043": [161, 49, 8]}, {"55061047": [32, 17]}, {"55061051": [2, 52, 2]}, {"55061055": [121, 52, 2]}, {"55061059": [122, 3, 224]}, {"55061063": [8]}, {"55061068": [144, 136]}, {"55061071": [161, 49, 8]}, {"55061075": [4, 17]}, {"55061079": [2, 52, 2]}, {"55061083": [119, 52, 2]}, {"55061087": [120, 3, 224]}, {"55061091": [8]}, {"55061096": [144, 136]}, {"55061099": [50, 17]}, {"55061103": [2, 52, 2]}, {"55061107": [192, 52, 2]}, {"55061111": [193, 3, 224]}, {"55061115": [8]}, {"55061120": [144, 136]}, {"55061123": [163, 49, 8]}, {"55061127": [3, 17]}, {"55061131": [2, 52, 2]}, {"55061135": [77, 52, 162]}, {"55061140": [3, 224]}, {"55061143": [8]}, {"55061148": [144, 136]}, {"55061151": [163, 49, 8]}, {"55061155": [24, 17]}, {"55061159": [2, 52, 2]}, {"55061163": [77, 52, 162]}, {"55061168": [3, 224]}, {"55061171": [8]}, {"55061176": [3, 224]}, {"55061179": [8]}, {"55061184": [52, 8]}, {"55061187": [1, 160, 136]}, {"55061191": [62, 3, 224]}, {"55061195": [8]}, {"55061200": [36, 136]}, {"55061203": [134, 36, 9, 255, 255, 37, 41]}, {"55061211": [1, 52, 1]}, {"55061215": [3]}, {"55061217": [41, 8, 42, 20, 32]}, {"55061223": [7]}, {"55061228": [1, 9, 80, 33, 145, 75]}, {"55061236": [52, 1]}, {"55061239": [255, 21, 97, 255, 247]}, {"55061248": [161, 69]}, {"55061252": [3, 224]}, {"55061255": [8]}, {"55061260": [36, 136]}, {"55061263": [168, 1, 6, 64, 33, 145, 9]}, {"55061272": [1, 37, 72, 37, 161, 9]}, {"55061280": [3, 224]}, {"55061283": [8]}, {"55061288": [36, 136]}, {"55061291": [188, 1, 5, 64, 33, 129, 9]}, {"55061300": [5, 33]}, {"55061303": [2]}, {"55061308": [52, 9]}, {"55061312": [37, 41]}, {"55061315": [1, 161, 9]}, {"55061320": [3, 224]}, {"55061323": [8]}, {"55061328": [52, 8]}, {"55061331": [1, 160, 136]}, {"55061335": [61, 52, 8]}, {"55061339": [20, 160, 136]}, {"55061343": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55061355": [8]}, {"55061360": [52, 8]}, {"55061363": [1, 160, 136]}, {"55061367": [50, 160, 136]}, {"55061371": [58, 52, 8]}, {"55061375": [48, 164, 136, 19, 244, 160, 136]}, {"55061383": [51, 3, 224]}, {"55061387": [8]}, {"55061392": [52, 8]}, {"55061395": [2, 160, 136]}, {"55061399": [50, 52, 8]}, {"55061403": [1, 160, 136]}, {"55061407": [58, 160, 136]}, {"55061411": [60, 52, 8]}, {"55061415": [96, 164, 136, 19, 244, 160, 136]}, {"55061423": [51, 3, 224]}, {"55061427": [8]}, {"55061432": [175, 164]}, {"55061435": [104, 175, 165]}, {"55061439": [108, 175, 166]}, {"55061443": [112, 175, 167]}, {"55061447": [116, 39, 189, 255, 232, 175, 163]}, {"55061455": [16, 175, 191]}, {"55061459": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061472": [17]}, {"55061475": [10]}, {"55061480": [60, 9, 128, 65, 52, 10]}, {"55061487": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 9, 173]}, {"55061516": [143, 163]}, {"55061519": [16, 143, 191]}, {"55061523": [20, 39, 189]}, {"55061527": [24, 143, 164]}, {"55061531": [104, 143, 165]}, {"55061535": [108, 143, 166]}, {"55061539": [112, 143, 167]}, {"55061543": [116, 132, 110, 19, 196, 3, 224]}, {"55061551": [8]}, {"55061556": [147, 25]}, {"55061559": [116, 52, 1]}, {"55061563": [255, 23, 33]}, {"55061567": [2]}, {"55061572": [52, 25]}, {"55061575": [44, 3, 224]}, {"55061579": [8, 167, 185]}, {"55061583": [154, 147, 44]}, {"55061587": [116, 52, 1]}, {"55061591": [255, 21, 129]}, {"55061595": [2]}, {"55061600": [52, 12]}, {"55061603": [44, 3, 224]}, {"55061607": [8]}, {"55061612": [145, 174]}, {"55061615": [116, 52, 1]}, {"55061619": [255, 21, 193]}, {"55061623": [2]}, {"55061628": [52, 14]}, {"55061631": [44, 3, 224]}, {"55061635": [8, 167, 174]}, {"55061639": [154, 145, 207]}, {"55061643": [116, 52, 1]}, {"55061647": [255, 21, 225]}, {"55061651": [2]}, {"55061656": [52, 15]}, {"55061659": [44, 3, 224]}, {"55061663": [8, 167, 175]}, {"55061667": [154, 144, 174]}, {"55061671": [64, 144, 162]}, {"55061675": [112, 52, 3]}, {"55061679": [255, 21, 195]}, {"55061683": [3]}, {"55061688": [52, 3]}, {"55061691": [1, 160, 163, 15, 51, 3, 224]}, {"55061699": [8]}, {"55061704": [141, 9]}, {"55061707": [4, 17, 32]}, {"55061711": [7]}, {"55061716": [145, 9]}, {"55061719": [104, 52, 1]}, {"55061723": [59, 17, 33]}, {"55061727": [2]}, {"55061732": [52, 9]}, {"55061735": [255, 161, 9]}, {"55061739": [64, 3, 224]}, {"55061743": [8, 161, 14]}, {"55061747": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 14]}, {"11325064": [12, 16, 10, 230, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426028": [55, 239]}, {"11426031": [0, 12, 16, 11, 41, 0, 0]}, {"11426039": [0, 53, 255]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 50]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 20, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 27, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 34, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 13, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 222]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 174]}, {"12427480": [12, 16, 9, 203]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 207]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 238, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 234]}, {"12491480": [12, 16, 9, 243]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 187]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 88, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 37, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 37, 48, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 37, 76, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 37, 192, 128, 64, 36, 52, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 37, 184, 128, 64, 36, 52, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 37, 184, 128, 64, 37, 128, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 37, 184, 128, 64, 37, 128, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 37, 184, 128, 64, 37, 128, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 37, 184, 128, 64, 37, 156, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 37, 184, 128, 64, 37, 156, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 37, 184, 128, 64, 37, 156, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 37, 184, 128, 64, 36, 52, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 37, 184, 128, 64, 36, 52, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 38, 80, 128, 64, 36, 52, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 38, 112, 128, 64, 37, 104, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 38, 144, 128, 64, 36, 52, 3, 224]}, {"55059511": [8, 52, 162]}, {"55059516": [144, 136]}, {"55059519": [125, 52, 1]}, {"55059523": [255, 17, 1]}, {"55059527": [2, 52, 2]}, {"55059531": [8, 52, 2]}, {"55059535": [9, 3, 224]}, {"55059539": [8]}, {"55059544": [144, 136]}, {"55059547": [163, 49, 8]}, {"55059551": [192, 17]}, {"55059555": [5, 52, 2]}, {"55059559": [84, 52, 1]}, {"55059563": [64, 17, 1]}, {"55059567": [2, 52, 2]}, {"55059571": [53, 52, 2]}, {"55059575": [54, 3, 224]}, {"55059579": [8]}, {"55059584": [144, 136]}, {"55059587": [163, 49, 8]}, {"55059591": [24, 17]}, {"55059595": [5, 52, 2]}, {"55059599": [50, 52, 1]}, {"55059603": [8, 17, 1]}, {"55059607": [2, 52, 2]}, {"55059611": [51, 52, 2]}, {"55059615": [52, 3, 224]}, {"55059619": [8]}, {"55059624": [144, 136]}, {"55059627": [163, 49, 8]}, {"55059631": [3, 17]}, {"55059635": [5, 52, 2]}, {"55059639": [4, 52, 1]}, {"55059643": [1, 17, 1]}, {"55059647": [2, 52, 2]}, {"55059651": [48, 52, 2]}, {"55059655": [49, 3, 224]}, {"55059659": [8]}, {"55059664": [144, 136]}, {"55059667": [162, 49, 8]}, {"55059671": [192, 17]}, {"55059675": [5, 52, 2]}, {"55059679": [5, 52, 1]}, {"55059683": [64, 17, 1]}, {"55059687": [2, 52, 2]}, {"55059691": [96, 52, 2]}, {"55059695": [123, 3, 224]}, {"55059699": [8]}, {"55059704": [144, 136]}, {"55059707": [162, 49, 8]}, {"55059711": [48, 17]}, {"55059715": [2, 52, 2]}, {"55059719": [69, 52, 2]}, {"55059723": [70, 3, 224]}, {"55059727": [8]}, {"55059732": [144, 136]}, {"55059735": [162, 49, 8]}, {"55059739": [6, 17]}, {"55059743": [2, 52, 2]}, {"55059747": [55, 52, 2]}, {"55059751": [56, 3, 224]}, {"55059755": [8]}, {"55059760": [144, 136]}, {"55059763": [161, 49, 8]}, {"55059767": [32, 17]}, {"55059771": [2, 52, 2]}, {"55059775": [121, 52, 2]}, {"55059779": [122, 3, 224]}, {"55059783": [8]}, {"55059788": [144, 136]}, {"55059791": [161, 49, 8]}, {"55059795": [4, 17]}, {"55059799": [2, 52, 2]}, {"55059803": [119, 52, 2]}, {"55059807": [120, 3, 224]}, {"55059811": [8]}, {"55059816": [144, 136]}, {"55059819": [50, 17]}, {"55059823": [2, 52, 2]}, {"55059827": [192, 52, 2]}, {"55059831": [193, 3, 224]}, {"55059835": [8]}, {"55059840": [144, 136]}, {"55059843": [163, 49, 8]}, {"55059847": [3, 17]}, {"55059851": [2, 52, 2]}, {"55059855": [77, 52, 162]}, {"55059860": [3, 224]}, {"55059863": [8]}, {"55059868": [144, 136]}, {"55059871": [163, 49, 8]}, {"55059875": [24, 17]}, {"55059879": [2, 52, 2]}, {"55059883": [77, 52, 162]}, {"55059888": [3, 224]}, {"55059891": [8]}, {"55059896": [3, 224]}, {"55059899": [8]}, {"55059904": [52, 8]}, {"55059907": [1, 160, 136]}, {"55059911": [62, 3, 224]}, {"55059915": [8]}, {"55059920": [36, 136]}, {"55059923": [134, 36, 9, 255, 255, 37, 41]}, {"55059931": [1, 52, 1]}, {"55059935": [3]}, {"55059937": [41, 8, 42, 20, 32]}, {"55059943": [7]}, {"55059948": [1, 9, 80, 33, 145, 75]}, {"55059956": [52, 1]}, {"55059959": [255, 21, 97, 255, 247]}, {"55059968": [161, 69]}, {"55059972": [3, 224]}, {"55059975": [8]}, {"55059980": [36, 136]}, {"55059983": [168, 1, 6, 64, 33, 145, 9]}, {"55059992": [1, 37, 72, 37, 161, 9]}, {"55060000": [3, 224]}, {"55060003": [8]}, {"55060008": [36, 136]}, {"55060011": [188, 1, 5, 64, 33, 129, 9]}, {"55060020": [5, 33]}, {"55060023": [2]}, {"55060028": [52, 9]}, {"55060032": [37, 41]}, {"55060035": [1, 161, 9]}, {"55060040": [3, 224]}, {"55060043": [8]}, {"55060048": [52, 8]}, {"55060051": [1, 160, 136]}, {"55060055": [61, 52, 8]}, {"55060059": [20, 160, 136]}, {"55060063": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060075": [8]}, {"55060080": [52, 8]}, {"55060083": [1, 160, 136]}, {"55060087": [50, 160, 136]}, {"55060091": [58, 52, 8]}, {"55060095": [48, 164, 136, 19, 244, 160, 136]}, {"55060103": [51, 3, 224]}, {"55060107": [8]}, {"55060112": [52, 8]}, {"55060115": [2, 160, 136]}, {"55060119": [50, 52, 8]}, {"55060123": [1, 160, 136]}, {"55060127": [58, 160, 136]}, {"55060131": [60, 52, 8]}, {"55060135": [96, 164, 136, 19, 244, 160, 136]}, {"55060143": [51, 3, 224]}, {"55060147": [8]}, {"55060152": [48, 132]}, {"55060155": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060167": [140, 16, 129]}, {"55060171": [22, 145, 2]}, {"55060175": [117, 52, 1]}, {"55060179": [141, 16, 129]}, {"55060183": [19, 145, 2]}, {"55060187": [117, 16, 128]}, {"55060191": [17, 145, 2]}, {"55060195": [116, 52, 1]}, {"55060199": [138, 16, 129]}, {"55060203": [14, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [139, 16, 129]}, {"55060215": [11, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [88, 16, 129]}, {"55060227": [8, 52, 2]}, {"55060232": [52, 1]}, {"55060235": [120, 16, 129]}, {"55060239": [5, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [121, 16, 129]}, {"55060251": [2, 52, 2]}, {"55060256": [52, 2]}, {"55060259": [255, 3, 224]}, {"55060263": [8]}, {"55060268": [143, 166]}, {"55060271": [48, 132, 197]}, {"55060275": [4, 8, 16, 9, 211]}, {"55060284": [143, 185]}, {"55060287": [44, 135, 37]}, {"55060291": [4, 8, 16, 9, 211]}, {"55060300": [60, 10, 128, 64, 37, 74, 32]}, {"55060308": [141, 75]}, {"55060311": [12, 17, 96]}, {"55060315": [2]}, {"55060320": [149, 69]}, {"55060323": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060336": [3, 224]}, {"55060339": [8]}, {"55060344": [60, 8, 128, 64, 37, 8, 32]}, {"55060352": [141, 9]}, {"55060355": [12, 17, 32]}, {"55060359": [2]}, {"55060364": [129, 3]}, {"55060367": [2]}, {"55060369": [3, 15, 195]}, {"55060373": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060387": [8]}, {"55060392": [144, 69]}, {"55060395": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060404": [141, 9]}, {"55060407": [12, 17, 32]}, {"55060411": [2]}, {"55060416": [145, 5]}, {"55060419": [3, 3, 224]}, {"55060423": [8]}, {"55060428": [143, 162]}, {"55060431": [36, 144, 69]}, {"55060436": [60, 8, 128, 64, 37, 8, 32]}, {"55060444": [141, 9]}, {"55060447": [12, 17, 32]}, {"55060451": [19]}, {"55060456": [145, 5]}, {"55060459": [1, 175, 164]}, {"55060464": [175, 165]}, {"55060467": [4, 175, 166]}, {"55060471": [8, 39, 189, 255, 232, 175, 191]}, {"55060479": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060491": [6, 145, 6]}, {"55060495": [7, 141, 9]}, {"55060499": [8, 1, 32, 248, 9]}, {"55060508": [143, 191]}, {"55060511": [16, 39, 189]}, {"55060515": [24, 143, 164]}, {"55060520": [143, 165]}, {"55060523": [4, 143, 166]}, {"55060527": [8, 3, 224]}, {"55060531": [8]}, {"55060536": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060547": [16, 175, 163]}, {"55060551": [20, 175, 191]}, {"55060555": [24, 12, 16, 10, 27]}, {"55060564": [143, 162]}, {"55060567": [16, 143, 163]}, {"55060571": [20, 143, 191]}, {"55060575": [24, 39, 189]}, {"55060579": [32, 3, 224]}, {"55060583": [8]}, {"55060588": [39, 189, 255, 232, 175, 191]}, {"55060595": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060604": [173]}, {"55060608": [173]}, {"55060611": [4, 173]}, {"55060615": [8, 173]}, {"55060619": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060635": [42]}, {"55060641": [9, 15, 195, 1, 33, 32, 38]}, {"55060649": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 85]}, {"55060664": [4, 64]}, {"55060667": [34]}, {"55060672": [52, 68]}, {"55060676": [12, 16, 10, 154]}, {"55060684": [16, 96]}, {"55060687": [12]}, {"55060692": [60, 8, 128, 64, 37, 8, 32]}, {"55060700": [140, 105]}, {"55060704": [173, 9]}, {"55060708": [140, 105]}, {"55060711": [4, 173, 9]}, {"55060715": [4, 140, 105]}, {"55060719": [8, 173, 9]}, {"55060723": [8, 52, 9]}, {"55060727": [1, 173, 9]}, {"55060731": [12, 144, 98]}, {"55060736": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060752": [52, 1]}, {"55060755": [10, 21, 65]}, {"55060759": [6]}, {"55060764": [149, 42]}, {"55060767": [28, 49, 74, 240, 31]}, {"55060773": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060783": [28, 129, 9, 4, 36, 5, 33]}, {"55060791": [2]}, {"55060797": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060807": [16, 39, 189]}, {"55060811": [24, 3, 224]}, {"55060815": [8]}, {"55060820": [39, 189, 255, 232, 175, 191]}, {"55060827": [16, 12, 16, 10, 99]}, {"55060836": [36, 1, 255, 255, 16, 65]}, {"55060843": [4]}, {"55060848": [52, 68]}, {"55060852": [12, 16, 10, 141]}, {"55060860": [143, 191]}, {"55060863": [16, 39, 189]}, {"55060867": [24, 3, 224]}, {"55060871": [8]}, {"55060876": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060887": [164, 52, 8]}, {"55060892": [52, 137]}, {"55060896": [148, 170]}, {"55060900": [52, 1]}, {"55060903": [10, 21, 65]}, {"55060907": [14]}, {"55060912": [148, 171]}, {"55060915": [28, 52, 1]}, {"55060919": [16, 20, 65]}, {"55060923": [8]}, {"55060928": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060939": [4]}, {"55060944": [36, 2, 255, 255, 16]}, {"55060951": [21]}, {"55060956": [52, 8]}, {"55060959": [1, 49, 105]}, {"55060963": [31, 52, 1]}, {"55060967": [21, 21, 65]}, {"55060971": [12]}, {"55060976": [52, 1]}, {"55060979": [62, 16, 129]}, {"55060983": [7]}, {"55060988": [52, 1]}, {"55060991": [66, 16, 129]}, {"55060995": [4]}, {"55061000": [36, 2, 255, 255, 16]}, {"55061007": [7]}, {"55061012": [52, 8]}, {"55061015": [2, 144, 169, 1, 65]}, {"55061021": [2, 18]}, {"55061025": [72, 16, 37]}, {"55061029": [2, 18]}, {"55061033": [73, 16, 37, 3, 224]}, {"55061039": [8]}, {"55061044": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061059": [4, 141, 9]}, {"55061064": [17, 32]}, {"55061067": [5]}, {"55061073": [9, 82, 2, 21, 68, 255, 250]}, {"55061084": [49, 34]}, {"55061087": [255, 3, 224]}, {"55061091": [8]}, {"55061096": [39, 189, 255, 224, 175, 176]}, {"55061103": [16, 175, 177]}, {"55061107": [20, 175, 191]}, {"55061111": [24, 52, 130]}, {"55061116": [52, 80]}, {"55061120": [38, 8, 255, 128, 5]}, {"55061127": [18]}, {"55061132": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55061143": [16, 1, 9]}, {"55061147": [24]}, {"55061150": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061168": [142, 40]}, {"55061171": [12, 1]}, {"55061174": [248, 9]}, {"55061180": [20, 80, 255, 239]}, {"55061188": [54, 35]}, {"55061192": [16]}, {"55061195": [2]}, {"55061200": [52, 3]}, {"55061204": [143, 176]}, {"55061207": [16, 143, 177]}, {"55061211": [20, 143, 191]}, {"55061215": [24, 39, 189]}, {"55061219": [32, 3, 224]}, {"55061223": [8]}, {"55061228": [140, 136, 29, 44, 52, 9]}, {"55061235": [1]}, {"55061237": [9, 78]}, {"55061240": [1, 9, 16, 36, 16, 64]}, {"55061247": [36]}, {"55061252": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061267": [164, 52, 1]}, {"55061271": [61, 17, 129]}, {"55061275": [10]}, {"55061281": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061291": [25]}, {"55061296": [52, 13]}, {"55061299": [1, 161, 141, 29, 40, 37, 74]}, {"55061307": [3, 16]}, {"55061311": [9]}, {"55061316": [52, 12]}, {"55061319": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061335": [14]}, {"55061340": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061376": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061388": [52, 2]}, {"55061392": [3, 224]}, {"55061395": [8]}, {"55061400": [60, 8, 128, 64, 37, 8, 20]}, {"55061408": [129, 8]}, {"55061412": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061424": [3, 224]}, {"55061427": [8]}, {"55061432": [175, 164]}, {"55061435": [104, 175, 165]}, {"55061439": [108, 175, 166]}, {"55061443": [112, 175, 167]}, {"55061447": [116, 39, 189, 255, 232, 175, 163]}, {"55061455": [16, 175, 191]}, {"55061459": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061472": [17]}, {"55061475": [10]}, {"55061480": [60, 9, 128, 65, 52, 10]}, {"55061487": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 27]}, {"55061516": [143, 163]}, {"55061519": [16, 143, 191]}, {"55061523": [20, 39, 189]}, {"55061527": [24, 143, 164]}, {"55061531": [104, 143, 165]}, {"55061535": [108, 143, 166]}, {"55061539": [112, 143, 167]}, {"55061543": [116, 132, 110, 19, 196, 3, 224]}, {"55061551": [8]}, {"55061556": [147, 25]}, {"55061559": [116, 52, 1]}, {"55061563": [255, 23, 33]}, {"55061567": [2]}, {"55061572": [52, 25]}, {"55061575": [44, 3, 224]}, {"55061579": [8, 167, 185]}, {"55061583": [154, 147, 44]}, {"55061587": [116, 52, 1]}, {"55061591": [255, 21, 129]}, {"55061595": [2]}, {"55061600": [52, 12]}, {"55061603": [44, 3, 224]}, {"55061607": [8]}, {"55061612": [145, 174]}, {"55061615": [116, 52, 1]}, {"55061619": [255, 21, 193]}, {"55061623": [2]}, {"55061628": [52, 14]}, {"55061631": [44, 3, 224]}, {"55061635": [8, 167, 174]}, {"55061639": [154, 145, 207]}, {"55061643": [116, 52, 1]}, {"55061647": [255, 21, 225]}, {"55061651": [2]}, {"55061656": [52, 15]}, {"55061659": [44, 3, 224]}, {"55061663": [8, 167, 175]}, {"55061667": [154, 144, 174]}, {"55061671": [64, 144, 162]}, {"55061675": [112, 52, 3]}, {"55061679": [255, 21, 195]}, {"55061683": [3]}, {"55061688": [52, 3]}, {"55061691": [1, 160, 163, 15, 51, 3, 224]}, {"55061699": [8]}, {"55061704": [141, 9]}, {"55061707": [4, 17, 32]}, {"55061711": [7]}, {"55061716": [145, 9]}, {"55061719": [104, 52, 1]}, {"55061723": [59, 17, 33]}, {"55061727": [2]}, {"55061732": [52, 9]}, {"55061735": [255, 161, 9]}, {"55061739": [64, 3, 224]}, {"55061743": [8, 161, 14]}, {"55061747": [104]}] \ No newline at end of file From 7281f77dc8786678323dbbf8919b167f47ce9252 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Tue, 5 Jun 2018 17:48:25 -0500 Subject: [PATCH 100/151] DC logic fix and death gimmick removal -Fix a logic bug where the Hammer could be expected to ascend the stairs in Dodongo's Cavern. -Remove the gimmick feature where Ganondorf sometimes laughed when Link died. It caused VC crashes. --- Regions.py | 6 +++--- Rom.py | 12 +----------- Rules.py | 3 ++- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Regions.py b/Regions.py index 432fb99f2..7314418d6 100644 --- a/Regions.py +++ b/Regions.py @@ -105,8 +105,8 @@ def create_regions(world): create_interior_region('Crater Fairy', ['Crater Fairy Reward']), create_interior_region('Mountain Summit Fairy', ['Mountain Summit Fairy Reward']), create_dungeon_region('Dodongos Cavern Beginning', None, ['Dodongos Cavern Exit', 'Dodongos Cavern Lobby']), - create_dungeon_region('Dodongos Cavern Lobby', ['Dodongos Cavern Map Chest', 'GS38', 'GS42'], ['Dodongos Cavern Retreat', 'Dodongos Cavern Left Door']), - create_dungeon_region('Dodongos Cavern Climb', ['Dodongos Cavern Compass Chest', 'Dodongos Cavern Bomb Flower Platform', 'GS39'], ['Dodongos Cavern Bridge Fall', 'Dodongos Cavern Slingshot Target']), + create_dungeon_region('Dodongos Cavern Lobby', ['Dodongos Cavern Map Chest', 'Dodongos Cavern Compass Chest', 'GS38', 'GS42'], ['Dodongos Cavern Retreat', 'Dodongos Cavern Left Door']), + create_dungeon_region('Dodongos Cavern Climb', ['Dodongos Cavern Bomb Flower Platform', 'GS39'], ['Dodongos Cavern Bridge Fall', 'Dodongos Cavern Slingshot Target']), create_dungeon_region('Dodongos Cavern Far Bridge', ['Dodongos Cavern Bomb Bag Chest', 'Dodongos Cavern End of Bridge Chest', 'GS41'], ['Dodongos Cavern Bomb Drop', 'Dodongos Cavern Bridge Fall 2']), create_dungeon_region('Dodongos Cavern Boss Area', ['Chest Above King Dodongo', 'King Dodongo Heart', 'King Dodongo', 'GS40'], ['Dodongos Cavern Exit Skull']), create_ow_region('Zora River Bottom', ['Zora River Lower Freestanding PoH', 'Zora River Upper Freestanding PoH', 'GS43'], ['Zora River Exit', 'Zora River Rocks', 'Zora River Adult', 'Zora River Plateau Open Grotto', 'Zora River Plateau Bombable Grotto']), @@ -370,7 +370,6 @@ def _create_region(name, type, locations=None, exits=None): 'Lost Woods Generic Grotto Chest': (None, None, 0x14, 'Chest', 0x3E), 'Mountain Storms Grotto Chest': (None, None, 0x17, 'Chest', 0x3E), 'Top of Crater Grotto Chest': (None, None, 0x1A, 'Chest', 0x3E), - 'Treasure Chest Game': (None, None, 0x0A, 'Chest', 0x10), 'Impa at Castle': (0x2E8E925, 0x2E8E925, 0x0A, 'Song', None), 'Song from Malon': (0xD7EB53, 0xD7EBCF, 0x09, 'Song', None), 'Song from Composer Grave': (0x332A871, 0x332A871, 0x0B, 'Song', None), @@ -392,6 +391,7 @@ def _create_region(name, type, locations=None, exits=None): 'Mountain Summit Fairy Reward': (0x3481404, None, 0x51, 'NPC', 0x3B), 'Crater Fairy Reward': (0x3481405, None, 0x52, 'NPC', 0x3B), 'Ganons Castle Fairy Reward': (0x3481406, None, 0x53, 'NPC', 0x3B), + 'Treasure Chest Game': (None, None, 0x76, 'Special', 0x10), 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC', 0x49), diff --git a/Rom.py b/Rom.py index 0bc55f7a6..e06342db5 100644 --- a/Rom.py +++ b/Rom.py @@ -549,14 +549,6 @@ def patch_rom(world, rom): # Dampe always digs something up and first dig is always the Piece of Heart rom.write_bytes(0xCC3FA8, [0xA2, 0x01, 0x01, 0xF8]) rom.write_bytes(0xCC4024, [0x00, 0x00, 0x00, 0x00]) - - # Ganon gets the last laugh sometimes - Block_code = [0x3C, 0x01, 0x80, 0x10, 0x80, 0x21, 0x54, 0x40, 0x30, 0x21, 0x00, 0x03, - 0x14, 0x01, 0x00, 0x06, 0x24, 0x05, 0x68, 0x0B, 0x3C, 0x01, 0x80, 0x12, - 0x80, 0x21, 0xA5, 0xD7, 0x00, 0x01, 0x09, 0x40, 0x24, 0x05, 0x39, 0xC7, - 0x00, 0xA1, 0x28, 0x23, 0x08, 0x0E, 0x24, 0x04] - rom.write_bytes(0x3480C40, Block_code) - # Allow owl to always carry the kid down Death Mountain rom.write_bytes(0xE304F0, [0x24, 0x0E, 0x00, 0x01]) @@ -684,7 +676,6 @@ def patch_rom(world, rom): Block_code = [0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08] rom.write_bytes(0x94E639, Block_code) rom.write_bytes(0x92CBA9, Block_code) - rom.write_bytes(0x9650BC, [0x08, 0x08, 0x08, 0x08, 0x48]) # Speed dig text for Dampe rom.write_bytes(0x9532F8, [0x08, 0x08, 0x08, 0x59]) @@ -724,7 +715,6 @@ def patch_rom(world, rom): # rom.write_bytes(0xBD6C94, ...) #Progressive Items Object Hook, unsure where this case is called rom.write_bytes(0xB06C2C, [0x0C, 0x10, 0x01, 0x80]) #Save Writing Hook rom.write_bytes(0xDBF428, [0x0C, 0x10, 0x03, 0x00]) #Set Fishing Hook - rom.write_bytes(0xBD1F68, [0x0C, 0x22, 0xA0, 0xA8]) #Set hook for Ganondorf laugh # Write Initial Save File Block_code = [0xA2, 0x28, 0x80, 0x20, 0x24, 0x05, 0x80, 0x02, 0x24, 0x0F, 0x00, 0x84, @@ -1005,7 +995,7 @@ def get_override_entry(location): if None in [scene, default, item_id]: return [] - if location.type in ['NPC', 'BossHeart']: + if location.type in ['NPC', 'BossHeart', 'Special']: return [scene, 0x00, default, item_id] elif location.type == 'Chest': flag = default & 0x1F diff --git a/Rules.py b/Rules.py index b54f636d5..9fede6e76 100644 --- a/Rules.py +++ b/Rules.py @@ -103,6 +103,7 @@ def global_rules(world): set_rule(world.get_entrance('Goron City from Woods'), lambda state: state.can_blast() and (world.open_forest or (state.has('Slingshot') and state.has('Kokiri Sword')))) set_rule(world.get_entrance('Dodongos Cavern Rocks'), lambda state: state.can_blast() or state.has('Progressive Strength Upgrade') or state.is_adult()) set_rule(world.get_entrance('Dodongos Cavern Lobby'), lambda state: state.can_blast() or state.has('Progressive Strength Upgrade')) + set_rule(world.get_entrance('Dodongos Cavern Left Door'), lambda state: state.has('Bomb Bag') or state.has('Progressive Strength Upgrade')) set_rule(world.get_entrance('Dodongos Cavern Slingshot Target'), lambda state: state.has('Slingshot') or ((state.has('Bow') or state.has('Hover Boots')) and state.is_adult())) set_rule(world.get_location('Dodongos Cavern End of Bridge Chest'), lambda state: state.has('Bomb Bag') or ((state.has('Bow') or state.has('Hover Boots')) and state.is_adult() and state.has('Hammer'))) set_rule(world.get_entrance('Dodongos Cavern Bomb Drop'), lambda state: state.has('Bomb Bag')) @@ -414,5 +415,5 @@ def global_rules(world): set_rule(world.get_location('GS100'), lambda state: state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Hover Boots'))) for location in world.get_locations(): - if location.type != 'Chest': + if location.type != 'Chest' and location.name != 'Treasure Chest Game': forbid_item(location, 'Ice Trap') From 03ddc4a1ff28c2f479381372f4aeba83162eb4a3 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Tue, 5 Jun 2018 17:53:33 -0500 Subject: [PATCH 101/151] Fix accidental reversions --- Regions.py | 2 +- Rom.py | 3 ++- Rules.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Regions.py b/Regions.py index 7314418d6..70c7efcbd 100644 --- a/Regions.py +++ b/Regions.py @@ -391,7 +391,7 @@ def _create_region(name, type, locations=None, exits=None): 'Mountain Summit Fairy Reward': (0x3481404, None, 0x51, 'NPC', 0x3B), 'Crater Fairy Reward': (0x3481405, None, 0x52, 'NPC', 0x3B), 'Ganons Castle Fairy Reward': (0x3481406, None, 0x53, 'NPC', 0x3B), - 'Treasure Chest Game': (None, None, 0x76, 'Special', 0x10), + 'Treasure Chest Game': (None, None, 0x76, 'Chest', 0x10), 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC', 0x49), diff --git a/Rom.py b/Rom.py index e06342db5..60d914b94 100644 --- a/Rom.py +++ b/Rom.py @@ -676,6 +676,7 @@ def patch_rom(world, rom): Block_code = [0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08] rom.write_bytes(0x94E639, Block_code) rom.write_bytes(0x92CBA9, Block_code) + rom.write_bytes(0x9650BC, [0x08, 0x08, 0x08, 0x08, 0x48]) # Speed dig text for Dampe rom.write_bytes(0x9532F8, [0x08, 0x08, 0x08, 0x59]) @@ -995,7 +996,7 @@ def get_override_entry(location): if None in [scene, default, item_id]: return [] - if location.type in ['NPC', 'BossHeart', 'Special']: + if location.type in ['NPC', 'BossHeart']: return [scene, 0x00, default, item_id] elif location.type == 'Chest': flag = default & 0x1F diff --git a/Rules.py b/Rules.py index 9fede6e76..60747977c 100644 --- a/Rules.py +++ b/Rules.py @@ -415,5 +415,5 @@ def global_rules(world): set_rule(world.get_location('GS100'), lambda state: state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Hover Boots'))) for location in world.get_locations(): - if location.type != 'Chest' and location.name != 'Treasure Chest Game': + if location.type != 'Chest': forbid_item(location, 'Ice Trap') From d81217316585d244b3d11a5e5ab51c3d97df4b75 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Tue, 5 Jun 2018 22:16:57 -0500 Subject: [PATCH 102/151] speed getting zelda's letter --- Rom.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index 60d914b94..f47ea44ee 100644 --- a/Rom.py +++ b/Rom.py @@ -178,9 +178,11 @@ def patch_rom(world, rom): rom.write_byte(0xACA49D, 0xCE) # Speed Zelda's Letter scene - rom.write_bytes(0x290E08E, [0x05, 0xF0]) - rom.write_bytes(0x2E8C108, [0xFF, 0xFF, 0xFF, 0xFF]) - rom.write_bytes(0xD12F76, [0x0E, 0xDC]) + rom.write_byte(0xEFEAF7, 0x08) + rom.write_byte(0xEFE7C7, 0x05) + rom.write_bytes(0xEFE938, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xEFE948, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xEFE950, [0x00, 0x00, 0x00, 0x00]) # Speed Zelda escaping from Hyrule Castle Block_code = [0x00, 0x00, 0x00, 0x01, 0x00, 0x21, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02] From aa1f1f61eadc6bc80116c213008797e13ed5f927 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Wed, 6 Jun 2018 02:26:11 -0500 Subject: [PATCH 103/151] Shadow logic -Allow Hookshot to the ladder in Shadow Temple to avoid strength check. -Allow Longshot to Scarecrow to avoid having Bow in Shadow Temple. -Fix some typos in the Ganon flavor text. -Add two more Ganon lines. --- HintList.py | 8 +++++--- Rules.py | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/HintList.py b/HintList.py index b3b083144..ae2ebc19c 100644 --- a/HintList.py +++ b/HintList.py @@ -231,11 +231,13 @@ def getHintGroup(string): #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx handy marker for how long one line should be in a text box 'Validation Line': ("Hmph... Since you made it this far&I'll let you know what glorious&prize of Ganon's you likely&missed out on in my tower.^Behold...^", 'validation line'), '2001': ("Oh! It's @.&I was expecting someone called&Sheik. Do you know what&happened to them?", 'ganonLine'), - '2002': ("I knew I shouldn't have put the key&on the otherside of my door.", 'ganonLine'), + '2002': ("I knew I shouldn't have put the key&on the other side of my door.", 'ganonLine'), '2003': ("Looks like it's time for a&round of tennis.", 'ganonLine'), '2004': ("You'll never deflect my bolts of&energy with your sword,&then shot me with those Light&Arrows you happen to have.", 'ganonLine'), '2005': ("Why did I leave my trident&back in the desert?", 'ganonLine'), '2006': ("Zelda is probably going to do&something stupid, like send you&back to your own timeline.^So this is quite meaningless.&Do you really want&to save this moron?", 'ganonLine'), - '2007': ("What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the hungary,&and my castle floats.", 'ganonLine'), + '2007': ("What about Zelda makes you think&she'd be a better ruler than I?^I saved Lon Lon Ranch,&fed the hungry,&and my castle floats.", 'ganonLine'), '2008': ("I've learned this spell,&it's really neat,&I'll keep it later&for your treat!", 'ganonLine'), - '2009': ("Many tricks are up my sleeve,&to save yourself&you'd better leave!", 'ganonLine')} + '2009': ("Many tricks are up my sleeve,&to save yourself&you'd better leave!", 'ganonLine'), + '2010': ("After what you did to&Koholint Island how can&you call me the bad guy?", 'ganonLine'), + '2011': ("Today let's begin down&'The Hero is Defeated' timeline.", 'ganonLine'),} diff --git a/Rules.py b/Rules.py index 60747977c..9470a1db0 100644 --- a/Rules.py +++ b/Rules.py @@ -232,13 +232,13 @@ def global_rules(world): set_rule(world.get_entrance('Shadow Temple First Pit'), lambda state: state.has('Hover Boots')) set_rule(world.get_entrance('Shadow Temple Bomb Wall'), lambda state: state.has('Bomb Bag') and state.has('Small Key (Shadow Temple)', 1)) set_rule(world.get_entrance('Shadow Temple Hookshot Target'), lambda state: state.has('Progressive Hookshot') and state.has('Small Key (Shadow Temple)', 3)) - set_rule(world.get_entrance('Shadow Temple Boat'), lambda state: state.has('Progressive Strength Upgrade') and state.has('Zeldas Lullaby') and state.has('Small Key (Shadow Temple)', 4)) + set_rule(world.get_entrance('Shadow Temple Boat'), lambda state: state.has('Zeldas Lullaby') and state.has('Small Key (Shadow Temple)', 4)) set_rule(world.get_location('Shadow Temple Falling Spikes Upper Chest'), lambda state: state.has('Progressive Strength Upgrade')) set_rule(world.get_location('Shadow Temple Falling Spikes Switch Chest'), lambda state: state.has('Progressive Strength Upgrade')) set_rule(world.get_location('Shadow Temple Invisible Spikes Chest'), lambda state: state.has('Small Key (Shadow Temple)', 2)) set_rule(world.get_location('Shadow Temple Freestanding Key'), lambda state: state.has('Small Key (Shadow Temple)', 2) and state.has('Progressive Hookshot')) - set_rule(world.get_location('Bongo Bongo'), lambda state: state.has('Small Key (Shadow Temple)', 5) and state.has('Bow') and state.has('Boss Key (Shadow Temple)')) - set_rule(world.get_location('Bongo Bongo Heart'), lambda state: state.has('Small Key (Shadow Temple)', 5) and state.has('Bow') and state.has('Boss Key (Shadow Temple)')) + set_rule(world.get_location('Bongo Bongo'), lambda state: state.has('Small Key (Shadow Temple)', 5) and (state.has('Bow') or state.has('Progressive Hookshot', 2)) and state.has('Boss Key (Shadow Temple)')) + set_rule(world.get_location('Bongo Bongo Heart'), lambda state: state.has('Small Key (Shadow Temple)', 5) and (state.has('Bow') or state.has('Progressive Hookshot', 2)) and state.has('Boss Key (Shadow Temple)')) set_rule(world.get_entrance('Bridge Crossing'), lambda state: (state.has('Epona') or state.has('Progressive Hookshot', 2)) and state.is_adult()) set_rule(world.get_location('Gerudo Valley Hammer Rocks Chest'), lambda state: state.has('Hammer') and state.is_adult()) set_rule(world.get_entrance('Fortress Entrance'), lambda state: (state.has('Bow') or state.has('Progressive Hookshot') or state.has('Hover Boots')) and state.is_adult()) From c0d5d7a0e19a1d03efc0171dac17cdfcfebba241 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Wed, 6 Jun 2018 02:27:14 -0500 Subject: [PATCH 104/151] Minor typo --- HintList.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HintList.py b/HintList.py index ae2ebc19c..cbd65c7f1 100644 --- a/HintList.py +++ b/HintList.py @@ -240,4 +240,4 @@ def getHintGroup(string): '2008': ("I've learned this spell,&it's really neat,&I'll keep it later&for your treat!", 'ganonLine'), '2009': ("Many tricks are up my sleeve,&to save yourself&you'd better leave!", 'ganonLine'), '2010': ("After what you did to&Koholint Island how can&you call me the bad guy?", 'ganonLine'), - '2011': ("Today let's begin down&'The Hero is Defeated' timeline.", 'ganonLine'),} + '2011': ("Today let's begin down&'The Hero is Defeated' timeline.", 'ganonLine')} From b05343afc2305932b9bc050a24c390de9a81f2e9 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Wed, 6 Jun 2018 19:04:11 -0500 Subject: [PATCH 105/151] faster final battle scenes --- Rom.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Rom.py b/Rom.py index f47ea44ee..f5a042a3d 100644 --- a/Rom.py +++ b/Rom.py @@ -123,6 +123,9 @@ def patch_rom(world, rom): # Fix rolling goron as child reward to be static rom.write_bytes(0xED2960, [0x00, 0x00, 0x00, 0x00]) + # Fix proximity text boxes (Navi) (Part 1) + rom.write_bytes(0x00DF8B84, [0x00, 0x00, 0x00, 0x00]) + # Remove intro cutscene rom.write_bytes(0xB06BBA, [0x00, 0x00]) @@ -360,6 +363,25 @@ def patch_rom(world, rom): # Speed collapse of Ganon's Tower rom.write_bytes(0x33FB328, [0x00, 0x76, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02]) + # Speed scenes during final battle + # Ganondorf battle end + rom.write_byte(0xD81F2F, 0x06) + rom.write_byte(0xD82047, 0x09) + # Zelda descends + rom.write_byte(0xD82AB3, 0x66) + rom.write_byte(0xD82FAF, 0x65) + rom.write_bytes(0xD82D2E, [0x04, 0x1F]) + rom.write_bytes(0xD83142, [0x00, 0x6B]) + rom.write_bytes(0xD82DD8, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xD82ED4, [0x00, 0x00, 0x00, 0x00]) + rom.write_byte(0xD82FDF, 0x33) + # After tower collapse + rom.write_byte(0xE82E0F, 0x04) + # Ganon intro + rom.write_bytes(0xE83D28, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xE83B5C, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xE84C80, [0x10, 0x00]) + # Speed completion of the trials in Ganon's Castle rom.write_bytes(0x31A8090, [0x00, 0x6B, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02]) #Forest rom.write_bytes(0x31A9E00, [0x00, 0x6E, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02]) #Fire From bc0665881ce400c78a2cd019ccc1abdcfce0eac5 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Wed, 6 Jun 2018 23:12:03 -0500 Subject: [PATCH 106/151] Faster defeats scenes for PG and TR and more text removal --- Rom.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index f5a042a3d..4bae06454 100644 --- a/Rom.py +++ b/Rom.py @@ -124,7 +124,10 @@ def patch_rom(world, rom): rom.write_bytes(0xED2960, [0x00, 0x00, 0x00, 0x00]) # Fix proximity text boxes (Navi) (Part 1) - rom.write_bytes(0x00DF8B84, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xDF8B84, [0x00, 0x00, 0x00, 0x00]) + + # Fix proximity text boxes (Wonder Text) + rom.write_bytes(0xE9EBEC, [0x00, 0x00, 0x00, 0x00]) # Remove intro cutscene rom.write_bytes(0xB06BBA, [0x00, 0x00]) @@ -363,6 +366,16 @@ def patch_rom(world, rom): # Speed collapse of Ganon's Tower rom.write_bytes(0x33FB328, [0x00, 0x76, 0x00, 0x01, 0x00, 0x02, 0x00, 0x02]) + # Speed Phantom Ganon defeat scene + rom.write_bytes(0xC944D8, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xC94548, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xC94730, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xC945A8, [0x00, 0x00, 0x00, 0x00]) + + # Speed Twinrova defeat scene + rom.write_bytes(0xD678CC, [0x24, 0x01, 0x03, 0xA2, 0xA6, 0x01, 0x01, 0x42]) + rom.write_bytes(0xD67BA4, [0x10, 0x00]) + # Speed scenes during final battle # Ganondorf battle end rom.write_byte(0xD81F2F, 0x06) From 78d09ca9ebd5bbebf502195cedb8a1b0dcd2b063 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 8 Jun 2018 04:13:00 -0500 Subject: [PATCH 107/151] Logic update and typo fix --- BaseClasses.py | 3 +++ Gui.py | 2 +- OoTRandomizer.py | 2 +- Rom.py | 4 ++-- Rules.py | 16 ++++++++-------- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index f8ab18805..1b3b54c20 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -308,6 +308,9 @@ def can_dive(self): def can_lift_rocks(self): return (self.has('Silver Gauntlets') or self.has('Gold Gauntlets')) and self.is_adult() + def has_GoronTunic(self): + return (self.has('Goron Tunic') or (self.has('Progressive Wallet') and (self.has('Bomb Bag') or self.has('Progressive Strength Upgrade') or self.has('Bow')))) + def can_finish_adult_trades(self): zora_thawed = self.has_bottle() and self.has('Zeldas Lullaby') and (self.can_reach('Ice Cavern') or self.can_reach('Ganons Castle Water Trial') or self.has('Progressive Wallet', 2)) carpenter_access = self.has('Epona') or self.has('Progressive Hookshot', 2) diff --git a/Gui.py b/Gui.py index c57bbc4a2..a6f877f50 100644 --- a/Gui.py +++ b/Gui.py @@ -138,7 +138,7 @@ def RomSelect(): lowHealthSFXVar.set('Default') lowHealthSFXFrame = Frame(dropDownFrame) - lowHealthSFXOptionMenu = OptionMenu(lowHealthSFXFrame, lowHealthSFXVar, 'Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recorvery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None') + lowHealthSFXOptionMenu = OptionMenu(lowHealthSFXFrame, lowHealthSFXVar, 'Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None') lowHealthSFXOptionMenu.pack(side=RIGHT) lowHealthSFXLabel = Label(lowHealthSFXFrame, text='Low Health SFX') lowHealthSFXLabel.pack(side=LEFT) diff --git a/OoTRandomizer.py b/OoTRandomizer.py index 2fbc72ec5..9c3cbe1b9 100644 --- a/OoTRandomizer.py +++ b/OoTRandomizer.py @@ -80,7 +80,7 @@ def start(): Random: Choose a random color from this list of colors. True Random: Choose a random color from any color the N64 can draw. ''') - parser.add_argument('--healthSFX', default='Default', const='Default', nargs='?', choices=['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recorvery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'], + parser.add_argument('--healthSFX', default='Default', const='Default', nargs='?', choices=['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'], help='''\ Select the sound effect that loops at low health. (default: %(default)s) Sound: Replace the sound effect with the chosen sound. diff --git a/Rom.py b/Rom.py index 4bae06454..089d50e2f 100644 --- a/Rom.py +++ b/Rom.py @@ -984,7 +984,7 @@ def patch_rom(world, rom): rom.write_bytes(Tunics[i], color) #Low health beep - healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recorvery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'] + healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'] randomSFX = random.choice(healthSFXList) address = 0xADBA1A @@ -1002,7 +1002,7 @@ def patch_rom(world, rom): healthSFX = [0x48, 0x1A] elif thisHealthSFX == 'Tamborine': healthSFX = [0x48, 0x42] - elif thisHealthSFX == 'Recorvery Heart': + elif thisHealthSFX == 'Recovery Heart': healthSFX = [0x48, 0x0B] elif thisHealthSFX == 'Carrot Refill': healthSFX = [0x48, 0x45] diff --git a/Rules.py b/Rules.py index 9470a1db0..abcda4ac7 100644 --- a/Rules.py +++ b/Rules.py @@ -103,7 +103,7 @@ def global_rules(world): set_rule(world.get_entrance('Goron City from Woods'), lambda state: state.can_blast() and (world.open_forest or (state.has('Slingshot') and state.has('Kokiri Sword')))) set_rule(world.get_entrance('Dodongos Cavern Rocks'), lambda state: state.can_blast() or state.has('Progressive Strength Upgrade') or state.is_adult()) set_rule(world.get_entrance('Dodongos Cavern Lobby'), lambda state: state.can_blast() or state.has('Progressive Strength Upgrade')) - set_rule(world.get_entrance('Dodongos Cavern Left Door'), lambda state: state.has('Bomb Bag') or state.has('Progressive Strength Upgrade')) + set_rule(world.get_entrance('Dodongos Cavern Left Door'), lambda state: state.has('Bomb Bag') or state.has('Progressive Strength Upgrade') or (state.has('Dins Fire') and state.has('Magic Meter'))) set_rule(world.get_entrance('Dodongos Cavern Slingshot Target'), lambda state: state.has('Slingshot') or ((state.has('Bow') or state.has('Hover Boots')) and state.is_adult())) set_rule(world.get_location('Dodongos Cavern End of Bridge Chest'), lambda state: state.has('Bomb Bag') or ((state.has('Bow') or state.has('Hover Boots')) and state.is_adult() and state.has('Hammer'))) set_rule(world.get_entrance('Dodongos Cavern Bomb Drop'), lambda state: state.has('Bomb Bag')) @@ -184,14 +184,14 @@ def global_rules(world): set_rule(world.get_location('Lake Hylia Freestanding PoH'), lambda state: state.is_adult() and (state.has('Progressive Hookshot') or state.has('Magic Bean'))) set_rule(world.get_location('Lake Hylia Sun'), lambda state: state.has('Progressive Hookshot', 2) and state.has('Bow') and state.is_adult()) set_rule(world.get_entrance('Crater Hover Boots'), lambda state: state.is_adult() and state.has('Hover Boots')) - set_rule(world.get_entrance('Crater Ascent'), lambda state: state.is_adult() and (state.has('Goron Tunic') or (state.has('Progressive Wallet') and state.has('Bomb Bag'))) and (state.has('Hover Boots') or state.has('Hammer'))) - set_rule(world.get_entrance('Crater Scarecrow'), lambda state: state.is_adult() and state.has('Progressive Hookshot', 2) and (state.has('Goron Tunic') or (state.has('Progressive Wallet') and state.has('Bomb Bag')))) + set_rule(world.get_entrance('Crater Ascent'), lambda state: state.is_adult() and state.has_GoronTunic()) + set_rule(world.get_entrance('Crater Scarecrow'), lambda state: state.is_adult() and state.has('Progressive Hookshot', 2) and state.has_GoronTunic()) set_rule(world.get_entrance('Crater Bridge'), lambda state: state.is_adult() and (state.has('Hover Boots') or state.has('Progressive Hookshot'))) set_rule(world.get_entrance('Crater Bridge Reverse'), lambda state: state.is_adult() and (state.has('Hover Boots') or state.has('Progressive Hookshot'))) set_rule(world.get_entrance('Crater Warp Pad'), lambda state: state.has('Bolero of Fire')) set_rule(world.get_entrance('Crater Fairy'), lambda state: state.is_adult() and state.has('Hammer')) set_rule(world.get_location('DM Crater Volcano Freestanding PoH'), lambda state: state.is_adult() and state.has('Magic Bean') and state.has('Bolero of Fire')) - set_rule(world.get_entrance('Fire Temple Entrance'), lambda state: state.is_adult() and (state.has('Goron Tunic') or (state.has('Progressive Wallet') and state.has('Bomb Bag')))) + set_rule(world.get_entrance('Fire Temple Entrance'), lambda state: state.is_adult() and state.has_GoronTunic()) set_rule(world.get_entrance('Fire Temple Early Climb'), lambda state: state.has('Small Key (Fire Temple)', 3) and state.has('Progressive Strength Upgrade') and (state.has('Bomb Bag') or ((state.has('Bow') or state.has('Progressive Hookshot')) and state.is_adult()))) set_rule(world.get_entrance('Fire Temple Fire Maze Escape'), lambda state: state.has('Small Key (Fire Temple)', 7) or (state.has('Small Key (Fire Temple)', 6) and state.has('Hover Boots') and state.has('Hammer') and state.is_adult())) set_rule(world.get_location('Fire Temple Fire Dancer Chest'), lambda state: state.is_adult() and state.has('Hammer')) @@ -208,7 +208,7 @@ def global_rules(world): set_rule(world.get_location('Volvagia'), lambda state: state.has('Hammer') and state.is_adult() and state.has('Boss Key (Fire Temple)') and (state.has('Hover Boots') or (state.can_reach('Fire Temple Upper') and (state.has('Song of Time') or state.has('Bomb Bag'))))) set_rule(world.get_location('Volvagia Heart'), lambda state: state.has('Hammer') and state.is_adult() and state.has('Boss Key (Fire Temple)') and (state.has('Hover Boots') or (state.can_reach('Fire Temple Upper') and (state.has('Song of Time') or state.has('Bomb Bag'))))) set_rule(world.get_location('Sheik in Crater'), lambda state: state.is_adult()) - set_rule(world.get_location('Link the Goron'), lambda state: state.is_adult() and (state.has('Progressive Strength Upgrade') or state.has('Bomb Bag'))) + set_rule(world.get_location('Link the Goron'), lambda state: state.is_adult() and (state.has('Progressive Strength Upgrade') or state.has('Bomb Bag') or state.has('Bow'))) set_rule(world.get_entrance('Crater Access'), lambda state: state.is_adult() and (state.has('Progressive Strength Upgrade') or state.has('Bomb Bag'))) set_rule(world.get_entrance('Lake Warp Pad'), lambda state: state.has('Serenade of Water')) set_rule(world.get_location('King Zora Thawed'), lambda state: state.has_bottle() and (state.can_reach('Ice Cavern') or state.can_reach('Ganons Castle Water Trial') or state.has('Progressive Wallet', 2))) @@ -249,7 +249,7 @@ def global_rules(world): set_rule(world.get_entrance('Colossus Fairy'), lambda state: state.has('Bomb Bag')) set_rule(world.get_location('Colossus Freestanding PoH'), lambda state: state.has('Requiem of Spirit') and state.has('Magic Bean') and state.is_adult()) set_rule(world.get_location('Desert Colossus Fairy Reward'), lambda state: state.has('Zeldas Lullaby')) - set_rule(world.get_location('Gerudo Fortress Rooftop Chest'), lambda state: (state.has('Hover Boots') or state.has('Progressive Hookshot', 2)) and state.is_adult()) + set_rule(world.get_location('Gerudo Fortress Rooftop Chest'), lambda state: (state.has('Hover Boots') or state.has('Progressive Hookshot')) and state.is_adult()) set_rule(world.get_location('Horseback Archery 1000 Points'), lambda state: state.has('Gerudo Membership Card') and state.has('Epona') and state.has('Bow') and state.is_adult()) set_rule(world.get_location('Horseback Archery 1500 Points'), lambda state: state.has('Gerudo Membership Card') and state.has('Epona') and state.has('Bow') and state.is_adult()) set_rule(world.get_location('Haunted Wasteland Structure Chest'), lambda state: state.has_fire_source()) @@ -289,7 +289,7 @@ def global_rules(world): set_rule(world.get_location('Spirit Temple Early Adult Right Chest'), lambda state: state.has('Bow') or state.has('Progressive Hookshot') or state.has('Bomb Bag')) #Bomb Bag option requires a very specific Bombchu use, Hover Boots can be skipped by jumping on top of the rolling rock. set_rule(world.get_location('Spirit Temple First Mirror Right Chest'), lambda state: state.has('Small Key (Spirit Temple)', 3)) set_rule(world.get_location('Spirit Temple First Mirror Left Chest'), lambda state: state.has('Small Key (Spirit Temple)', 3)) - set_rule(world.get_location('Spirit Temple Map Chest'), lambda state: state.has('Magic Meter') and (state.has('Dins Fire') or (state.has('Fire Arrows') and state.has('Bow') and state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult()))) + set_rule(world.get_location('Spirit Temple Map Chest'), lambda state: (state.has('Small Key (Spirit Temple)', 5) and state.has('Requiem of Spirit')) or (state.has('Magic Meter') and (state.has('Dins Fire') or (state.has('Fire Arrows') and state.has('Bow') and state.has('Progressive Strength Upgrade', 2) and state.has('Small Key (Spirit Temple)', 3) and state.is_adult())))) set_rule(world.get_location('Spirit Temple Child Climb East Chest'), lambda state: state.has('Bomb Bag') or ((state.has('Boomerang') or state.has('Slingshot')) and (state.has('Progressive Hookshot') or state.has('Bow'))) or (state.has('Small Key (Spirit Temple)', 3) and state.has('Progressive Strength Upgrade', 2) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Bow'))) or (state.has('Small Key (Spirit Temple)', 5) and state.has('Requiem of Spirit') and (state.has('Boomerang') or state.has('Slingshot')))) set_rule(world.get_location('Spirit Temple Child Climb North Chest'), lambda state: state.has('Bomb Bag') or ((state.has('Boomerang') or state.has('Slingshot')) and (state.has('Progressive Hookshot') or state.has('Bow'))) or (state.has('Small Key (Spirit Temple)', 3) and state.has('Progressive Strength Upgrade', 2) and state.is_adult() and (state.has('Progressive Hookshot') or state.has('Bow'))) or (state.has('Small Key (Spirit Temple)', 5) and state.has('Requiem of Spirit') and (state.has('Boomerang') or state.has('Slingshot')))) set_rule(world.get_location('Spirit Temple Sun Block Room Chest'), lambda state: (state.has('Small Key (Spirit Temple)', 5) and state.has('Bomb Bag') and state.has('Requiem of Spirit')) or (state.has_fire_source() and (state.has('Bomb Bag') or state.has('Small Key (Spirit Temple)', 2)))) @@ -308,7 +308,7 @@ def global_rules(world): set_rule(world.get_entrance('Ganons Castle Light Trial'), lambda state: state.has('Progressive Strength Upgrade', 3)) set_rule(world.get_entrance('Ganons Castle Tower'), lambda state: state.has('Forest Trial Clear') and state.has('Fire Trial Clear') and state.has('Water Trial Clear') and state.has('Shadow Trial Clear') and state.has('Spirit Trial Clear') and state.has('Light Trial Clear')) set_rule(world.get_location('Ganons Castle Forest Trial Clear'), lambda state: state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and (state.has('Fire Arrows') or (state.has('Progressive Hookshot') and state.has('Dins Fire')))) - set_rule(world.get_location('Ganons Castle Fire Trial Clear'), lambda state: (state.has('Goron Tunic') or (state.has('Progressive Wallet') and state.has('Bomb Bag'))) and state.has('Progressive Strength Upgrade', 3) and state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and state.has('Progressive Hookshot', 2)) + set_rule(world.get_location('Ganons Castle Fire Trial Clear'), lambda state: state.has_GoronTunic() and state.has('Progressive Strength Upgrade', 3) and state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and state.has('Progressive Hookshot', 2)) set_rule(world.get_location('Ganons Castle Water Trial Clear'), lambda state: state.has_bottle() and state.has('Hammer') and state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows')) set_rule(world.get_location('Ganons Castle Shadow Trial Clear'), lambda state: state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and state.has('Hammer') and (state.has('Fire Arrows') or state.has('Progressive Hookshot', 2)) and (state.has('Lens of Truth') or (state.has('Hover Boots') and state.has('Progressive Hookshot', 2)))) set_rule(world.get_location('Ganons Castle Shadow Trial First Chest'), lambda state: (state.has('Magic Meter') and state.has('Bow') and state.has('Fire Arrows')) or state.has('Progressive Hookshot', 2)) From 0aacb5e7cf99c18217544d99e3ba582719c9ca31 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 8 Jun 2018 07:27:55 -0400 Subject: [PATCH 108/151] Add hooks before and after time travel, new adult C-button initialization --- ASM/src/build.asm | 2 +- ASM/src/fixes.asm | 34 ------ ASM/src/hacks.asm | 43 +++----- ASM/src/state.asm | 7 ++ ASM/src/time_travel.asm | 228 ++++++++++++++++++++++++++++++++++++++++ data/base2current.json | 2 +- 6 files changed, 251 insertions(+), 65 deletions(-) delete mode 100755 ASM/src/fixes.asm create mode 100644 ASM/src/time_travel.asm diff --git a/ASM/src/build.asm b/ASM/src/build.asm index 3908fe182..b92cc6d7b 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -30,7 +30,7 @@ .include "cutscenes.asm" .include "every_frame.asm" .include "menu.asm" -.include "fixes.asm" +.include "time_travel.asm" .endarea .close diff --git a/ASM/src/fixes.asm b/ASM/src/fixes.asm deleted file mode 100755 index 87e146801..000000000 --- a/ASM/src/fixes.asm +++ /dev/null @@ -1,34 +0,0 @@ -restore_swordless_flag: - ; Displaced code - lbu t6, 0x0040 (a1) - lbu v0, 0x0070 (a1) - - li v1, 0xFF - bne t6, v1, @@return - nop - li v1, 1 - sb v1, 0x0F33 (a1) ; If restoring 0xFF to B equip, set the swordless flag -@@return: - jr ra - nop - -;================================================================================================== - -save_child_b_equip: - ; t0 = save context - lw t1, 0x04 (t0) - beqz t1, @@return ; Only do this as child - nop - - lbu t1, 0x68 (t0) ; Load current B equip - beq t1, 0x3B, @@save - nop - - li t1, 0xFF - -@@save: - sb t1, 0x40 (t0) ; Save B equip, will be loaded on next adult -> child transition - -@@return: - jr ra - sb t6, 0x68 (t0) ; Displaced code diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 6720ddc3a..acd04000a 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -4,42 +4,27 @@ .org 0xBDA2E8 ; In memory: 0x803952D8 addiu t2, r0, -1 -;================================================================================================== -; Remove free Kokiri Sword -;================================================================================================== - -; Child -> Adult: Don't save hard-coded 0x3B (Kokiri Sword) as child's B equip +; Prevent Kokiri Sword from being added to inventory on game load ; Replaces: -; sb a0, 0x0040 (v1) -.org 0xAE57A8 ; In memory: 0x8006F848 +; sh t9, 0x009C (v0) +.org 0xBAED6C ; In memory: 0x803B2B6C nop -; Adult -> Child: Don't skip restoring child's B equip if 0xFF is the saved value, and set the -; swordless flag if needed -; Replaces: -; lbu t6, 0x0040 (a1) -; lbu v0, 0x0070 (a1) -; addiu v1, r0, 0x00FF -; beq v1, t6, 0x8006FA28 -.org 0xAE58EC ; In memory: 0x8006F98C - ori t7, ra, 0 - jal restore_swordless_flag - nop - ori ra, t7, 0 +;================================================================================================== +; Time Travel +;================================================================================================== -; Child -> Adult: Save the child's B equip before it gets overwritten +; Before time travel ; Replaces: -; sb t6, 0x0068 (t0) -; lw a0, 0x0030 (sp) -.org 0xAE5F74 ; In memory: 0x80070014 - jal save_child_b_equip - lw a0, 0x0030 (sp) +; lw t6, 0x04 (s0) +.org 0xCB6860 ; Bg_Toki_Swd in func_8091902C + jal before_time_travel -; Prevent Kokiri Sword from being added to inventory on game load +; After time travel ; Replaces: -; sh t9, 0x009C (v0) -.org 0xBAED6C ; In memory: 0x803B2B6C - nop +; jr ra +.org 0xAE59E0 ; In memory: 0x8006FA80 + j after_time_travel ;================================================================================================== ; Item Overrides diff --git a/ASM/src/state.asm b/ASM/src/state.asm index 390769f4d..f94088a7a 100755 --- a/ASM/src/state.asm +++ b/ASM/src/state.asm @@ -9,3 +9,10 @@ EXTENDED_ITEM_DATA: PENDING_SPECIAL_ITEM: .byte 0x00 .align 4 + +TIME_TRAVEL_SAVED_EQUIPS: +.word 0x00000000 ; B and C buttons +.word 0x00000000 ; C button indexes +.halfword 0x0000 ; Equipment +.halfword 0x0000 ; Owned equipment +.align 4 diff --git a/ASM/src/time_travel.asm b/ASM/src/time_travel.asm new file mode 100644 index 000000000..d3e2e1a6b --- /dev/null +++ b/ASM/src/time_travel.asm @@ -0,0 +1,228 @@ +before_time_travel: + ; s0 = save context + li t0, TIME_TRAVEL_SAVED_EQUIPS + + ; B and C buttons + lw t1, 0x68 (s0) + sw t1, 0x00 (t0) + ; C button indexes + lw t1, 0x6C (s0) + sw t1, 0x04 (t0) + ; Equipment + lhu t1, 0x70 (s0) + sh t1, 0x08 (t0) + ; Owned equipment + lhu t1, 0x9C (s0) + sh t1, 0x0A (t0) + + jr ra + lw t6, 0x04 (s0) ; Displaced code + +;================================================================================================== + +after_time_travel: + li a0, TIME_TRAVEL_SAVED_EQUIPS + li a1, SAVE_CONTEXT + lw t0, 0x04 (a1) ; t2 = 1 if going forward in time, 0 if going back + beqz t0, @@going_back + nop + j after_going_forward + nop +@@going_back: + j after_going_back + nop + +;================================================================================================== + +after_going_forward: + addiu sp, sp, -0x18 + sw ra, 0x10 (sp) + + ; Save child buttons + lw t0, 0x00 (a0) + sw t0, 0x40 (a1) + lw t0, 0x04 (a0) + sw t0, 0x44 (a1) + ; Save child equipment + lhu t0, 0x08 (a0) + sh t0, 0x48 (a1) + + ; Unset swordless flag + sb r0, 0x0F33 (a1) + + ; Initialize adult equips, if going forward for the first time + lbu t0, 0x4A (a1) ; t0 = saved adult B + bne t0, 0xFF, @@no_init + nop + jal initialize_adult + nop +@@no_init: + + lw ra, 0x10 (sp) + addiu sp, sp, 0x18 + jr ra + nop + +;================================================================================================== + +after_going_back: + addiu sp, sp, -0x18 + sw ra, 0x10 (sp) + + ; Restore child buttons + lw t0, 0x40 (a1) + sw t0, 0x68 (a1) + lw t0, 0x44 (a1) + sw t0, 0x6C (a1) + ; Restore child equipment + lhu t0, 0x48 (a1) + sh t0, 0x70 (a1) + ; Set swordless flag if needed + lbu t0, 0x68 (a1) + bne t0, 0xFF, @@not_swordless + nop + li t0, 1 + sb t0, 0x0F33 (a1) +@@not_swordless: + + lw ra, 0x10 (sp) + addiu sp, sp, 0x18 + jr ra + nop + +;================================================================================================== + +initialize_adult: + addiu sp, sp, -0x18 + sw ra, 0x10 (sp) + + ; a0 = TIME_TRAVEL_SAVED_EQUIPS + ; a1 = save context + + ; If we have mirror shield, equip it + lhu t0, 0x9C (a1) + andi t0, t0, 0x0040 + beqz t0, @@no_mirror_shield + nop + lhu t0, 0x70 (a1) + andi t0, t0, 0xFF0F + ori t0, t0, 0x0030 + sh t0, 0x70 (a1) +@@no_mirror_shield: + + ; Try to preserve child C-button equips + lbu t0, 0x01 (a0) + sb t0, 0x69 (a1) + lhu t0, 0x02 (a0) + sh t0, 0x6A (a1) + lw t0, 0x04 (a0) + sw t0, 0x6C (a1) + + jal init_adult_button + li a0, 0 + + jal init_adult_button + li a0, 1 + + jal init_adult_button + li a0, 2 + + lw ra, 0x10 (sp) + addiu sp, sp, 0x18 + jr ra + nop + +;================================================================================================== + +init_adult_button: + ; a0 = C-button index + ; a1 = save context + addu t0, a0, a1 ; t0 = save context (offset by button index) + + li t1, ADULT_VALID_ITEMS + lbu t2, 0x6C (t0) ; t2 = inventory index of item on this button + beq t2, 0xFF, @@empty ; If the button is empty, try to initialize it + nop + addu t1, t1, t2 + lbu t1, 0x00 (t1) + bnez t1, @@return ; If the existing item is valid for adult, do nothing + nop +@@empty: + + li t1, (ADULT_INIT_ITEMS - 1) +@@loop: + addiu t1, t1, 1 + lbu t2, 0x00 (t1) ; t2 = inventory index + beqz t2, @@set_empty ; Ran out out of eligible items + nop + addu t3, a1, t2 + lbu t3, 0x74 (t3) ; t3 = inventory contents + beq t3, 0xFF, @@loop ; Item not in inventory + nop + lbu t4, 0x6C (a1) + beq t4, t2, @@loop ; Item already on C-left + nop + lbu t4, 0x6D (a1) + beq t4, t2, @@loop ; Item already on C-down + nop + lbu t4, 0x6E (a1) + beq t4, t2, @@loop ; Item already on C-right + nop + ; Valid item found, update the button + sb t3, 0x69 (t0) + sb t2, 0x6C (t0) + b @@return + nop + +@@set_empty: + ; Ran out out of eligible items, leave the button empty + li t1, 0xFF + sb t1, 0x69 (t0) + sb t1, 0x6C (t0) + +@@return: + jr ra + nop + +; Items that can populate empty adult C-buttons, by inventory index +ADULT_INIT_ITEMS: +.byte 0x07 ; Ocarina +.byte 0x09 ; Hookshot +.byte 0x0F ; Hammer +.byte 0x02 ; Bombs +.byte 0x03 ; Bow +.byte 0x01 ; Deku Nuts +.byte 0x0D ; Lens of Truth +.byte 0x0B ; Farore's Wind +.byte 0x00 ; null terminate +.align 4 + +ADULT_VALID_ITEMS: +.byte 0 ; Deku Sticks +.byte 1 ; Deku Nuts +.byte 1 ; Deku Bombs +.byte 1 ; Bow +.byte 1 ; Fire Arrows +.byte 1 ; Din's Fire + +.byte 0 ; Slingshot +.byte 1 ; Ocarina +.byte 1 ; Bombchus +.byte 1 ; Hookshot +.byte 1 ; Ice Arrows +.byte 1 ; Farore's Wind + +.byte 0 ; Boomerang +.byte 1 ; Lens of Truth +.byte 0 ; Magic Beans +.byte 1 ; Hammer +.byte 1 ; Light Arrows +.byte 1 ; Nayru's Love + +.byte 1 ; Bottle 1 +.byte 1 ; Bottle 2 +.byte 1 ; Bottle 3 +.byte 1 ; Bottle 4 +.byte 1 ; Adult Trade Item +.byte 0 ; Child Trade Item +.align 4 diff --git a/data/base2current.json b/data/base2current.json index f7e4cb661..c06730971 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 14]}, {"11325064": [12, 16, 10, 230, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11425704": [0, 0]}, {"11425707": [0]}, {"11426028": [55, 239]}, {"11426031": [0, 12, 16, 11, 41, 0, 0]}, {"11426039": [0, 53, 255]}, {"11426043": [0]}, {"11427700": [12, 16, 11, 50]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 20, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 27, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 34, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 13, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 222]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 174]}, {"12427480": [12, 16, 9, 203]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 207]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 238, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 234]}, {"12491480": [12, 16, 9, 243]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 187]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058452": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 88, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 128, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 168, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 208, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 36, 248, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 37, 20, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 37, 48, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 184, 128, 64, 37, 76, 83, 65, 1, 67]}, {"55058601": [198, 21, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 68]}, {"55058617": [198, 22, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 69]}, {"55058633": [198, 23, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 70]}, {"55058649": [198, 24, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 71]}, {"55058665": [198, 25, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 93]}, {"55058681": [198, 28, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 122]}, {"55058697": [198, 29, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 249]}, {"55058713": [198, 30, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 1, 151]}, {"55058729": [198, 32, 255, 128, 64, 37, 208, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058745": [185, 1, 3, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058761": [185, 1, 4, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058777": [185, 1, 5, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058793": [185, 1, 6, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058809": [185, 1, 7, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 10, 199]}, {"55058825": [185, 1, 10, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058841": [184, 2]}, {"55058844": [128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058857": [184, 2, 1, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058873": [184, 2, 2, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058889": [184, 2, 3, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058905": [184, 2, 4, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058921": [184, 2, 5, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058937": [184, 2, 6, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058953": [184, 2, 7, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058969": [184, 2, 8, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 11, 103]}, {"55058985": [184, 2, 9, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059001": [200, 4]}, {"55059004": [128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059017": [200, 4, 1, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059033": [200, 4, 2, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059049": [200, 4, 3, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059065": [200, 4, 4, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059081": [200, 4, 5, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059097": [200, 4, 6, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059113": [200, 4, 7, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059129": [200, 4, 8, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 28, 102]}, {"55059145": [200, 4, 9, 128, 64, 38, 12, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059161": [170, 3, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059177": [170, 4, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059193": [170, 5, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059209": [170, 6, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059225": [170, 7, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059241": [170, 8, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059257": [170, 11, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059273": [170, 12, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 65, 254, 96]}, {"55059289": [170, 13, 255, 128, 64, 38, 40, 128, 64, 36, 52, 83, 61, 67, 12]}, {"55059305": [248, 255, 255, 128, 64, 37, 192, 128, 64, 36, 52, 77, 131, 9, 85]}, {"55059321": [183, 255, 255, 128, 64, 37, 184, 128, 64, 36, 52, 83, 146, 219, 230]}, {"55059337": [216, 255, 255, 128, 64, 37, 184, 128, 64, 37, 128, 83, 147, 218, 230]}, {"55059353": [216, 255, 255, 128, 64, 37, 184, 128, 64, 37, 128, 83, 148, 217, 230]}, {"55059369": [216, 255, 255, 128, 64, 37, 184, 128, 64, 37, 128, 83, 142, 224, 50]}, {"55059385": [206, 255, 255, 128, 64, 37, 184, 128, 64, 37, 156, 83, 143, 224, 50]}, {"55059401": [206, 255, 255, 128, 64, 37, 184, 128, 64, 37, 156, 83, 144, 224, 50]}, {"55059417": [206, 255, 255, 128, 64, 37, 184, 128, 64, 37, 156, 83, 140, 238, 52]}, {"55059433": [187, 255, 255, 128, 64, 37, 184, 128, 64, 36, 52, 83, 141, 238, 52]}, {"55059449": [187, 255, 255, 128, 64, 37, 184, 128, 64, 36, 52, 79, 65, 19, 233]}, {"55059465": [189, 255, 255, 128, 64, 38, 80, 128, 64, 36, 52, 79, 65, 226, 228]}, {"55059481": [205, 255, 255, 128, 64, 38, 112, 128, 64, 37, 104, 79, 65, 225, 232]}, {"55059497": [205, 255, 255, 128, 64, 38, 144, 128, 64, 36, 52, 3, 224]}, {"55059511": [8, 52, 162]}, {"55059516": [144, 136]}, {"55059519": [125, 52, 1]}, {"55059523": [255, 17, 1]}, {"55059527": [2, 52, 2]}, {"55059531": [8, 52, 2]}, {"55059535": [9, 3, 224]}, {"55059539": [8]}, {"55059544": [144, 136]}, {"55059547": [163, 49, 8]}, {"55059551": [192, 17]}, {"55059555": [5, 52, 2]}, {"55059559": [84, 52, 1]}, {"55059563": [64, 17, 1]}, {"55059567": [2, 52, 2]}, {"55059571": [53, 52, 2]}, {"55059575": [54, 3, 224]}, {"55059579": [8]}, {"55059584": [144, 136]}, {"55059587": [163, 49, 8]}, {"55059591": [24, 17]}, {"55059595": [5, 52, 2]}, {"55059599": [50, 52, 1]}, {"55059603": [8, 17, 1]}, {"55059607": [2, 52, 2]}, {"55059611": [51, 52, 2]}, {"55059615": [52, 3, 224]}, {"55059619": [8]}, {"55059624": [144, 136]}, {"55059627": [163, 49, 8]}, {"55059631": [3, 17]}, {"55059635": [5, 52, 2]}, {"55059639": [4, 52, 1]}, {"55059643": [1, 17, 1]}, {"55059647": [2, 52, 2]}, {"55059651": [48, 52, 2]}, {"55059655": [49, 3, 224]}, {"55059659": [8]}, {"55059664": [144, 136]}, {"55059667": [162, 49, 8]}, {"55059671": [192, 17]}, {"55059675": [5, 52, 2]}, {"55059679": [5, 52, 1]}, {"55059683": [64, 17, 1]}, {"55059687": [2, 52, 2]}, {"55059691": [96, 52, 2]}, {"55059695": [123, 3, 224]}, {"55059699": [8]}, {"55059704": [144, 136]}, {"55059707": [162, 49, 8]}, {"55059711": [48, 17]}, {"55059715": [2, 52, 2]}, {"55059719": [69, 52, 2]}, {"55059723": [70, 3, 224]}, {"55059727": [8]}, {"55059732": [144, 136]}, {"55059735": [162, 49, 8]}, {"55059739": [6, 17]}, {"55059743": [2, 52, 2]}, {"55059747": [55, 52, 2]}, {"55059751": [56, 3, 224]}, {"55059755": [8]}, {"55059760": [144, 136]}, {"55059763": [161, 49, 8]}, {"55059767": [32, 17]}, {"55059771": [2, 52, 2]}, {"55059775": [121, 52, 2]}, {"55059779": [122, 3, 224]}, {"55059783": [8]}, {"55059788": [144, 136]}, {"55059791": [161, 49, 8]}, {"55059795": [4, 17]}, {"55059799": [2, 52, 2]}, {"55059803": [119, 52, 2]}, {"55059807": [120, 3, 224]}, {"55059811": [8]}, {"55059816": [144, 136]}, {"55059819": [50, 17]}, {"55059823": [2, 52, 2]}, {"55059827": [192, 52, 2]}, {"55059831": [193, 3, 224]}, {"55059835": [8]}, {"55059840": [144, 136]}, {"55059843": [163, 49, 8]}, {"55059847": [3, 17]}, {"55059851": [2, 52, 2]}, {"55059855": [77, 52, 162]}, {"55059860": [3, 224]}, {"55059863": [8]}, {"55059868": [144, 136]}, {"55059871": [163, 49, 8]}, {"55059875": [24, 17]}, {"55059879": [2, 52, 2]}, {"55059883": [77, 52, 162]}, {"55059888": [3, 224]}, {"55059891": [8]}, {"55059896": [3, 224]}, {"55059899": [8]}, {"55059904": [52, 8]}, {"55059907": [1, 160, 136]}, {"55059911": [62, 3, 224]}, {"55059915": [8]}, {"55059920": [36, 136]}, {"55059923": [134, 36, 9, 255, 255, 37, 41]}, {"55059931": [1, 52, 1]}, {"55059935": [3]}, {"55059937": [41, 8, 42, 20, 32]}, {"55059943": [7]}, {"55059948": [1, 9, 80, 33, 145, 75]}, {"55059956": [52, 1]}, {"55059959": [255, 21, 97, 255, 247]}, {"55059968": [161, 69]}, {"55059972": [3, 224]}, {"55059975": [8]}, {"55059980": [36, 136]}, {"55059983": [168, 1, 6, 64, 33, 145, 9]}, {"55059992": [1, 37, 72, 37, 161, 9]}, {"55060000": [3, 224]}, {"55060003": [8]}, {"55060008": [36, 136]}, {"55060011": [188, 1, 5, 64, 33, 129, 9]}, {"55060020": [5, 33]}, {"55060023": [2]}, {"55060028": [52, 9]}, {"55060032": [37, 41]}, {"55060035": [1, 161, 9]}, {"55060040": [3, 224]}, {"55060043": [8]}, {"55060048": [52, 8]}, {"55060051": [1, 160, 136]}, {"55060055": [61, 52, 8]}, {"55060059": [20, 160, 136]}, {"55060063": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060075": [8]}, {"55060080": [52, 8]}, {"55060083": [1, 160, 136]}, {"55060087": [50, 160, 136]}, {"55060091": [58, 52, 8]}, {"55060095": [48, 164, 136, 19, 244, 160, 136]}, {"55060103": [51, 3, 224]}, {"55060107": [8]}, {"55060112": [52, 8]}, {"55060115": [2, 160, 136]}, {"55060119": [50, 52, 8]}, {"55060123": [1, 160, 136]}, {"55060127": [58, 160, 136]}, {"55060131": [60, 52, 8]}, {"55060135": [96, 164, 136, 19, 244, 160, 136]}, {"55060143": [51, 3, 224]}, {"55060147": [8]}, {"55060152": [48, 132]}, {"55060155": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060167": [140, 16, 129]}, {"55060171": [22, 145, 2]}, {"55060175": [117, 52, 1]}, {"55060179": [141, 16, 129]}, {"55060183": [19, 145, 2]}, {"55060187": [117, 16, 128]}, {"55060191": [17, 145, 2]}, {"55060195": [116, 52, 1]}, {"55060199": [138, 16, 129]}, {"55060203": [14, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [139, 16, 129]}, {"55060215": [11, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [88, 16, 129]}, {"55060227": [8, 52, 2]}, {"55060232": [52, 1]}, {"55060235": [120, 16, 129]}, {"55060239": [5, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [121, 16, 129]}, {"55060251": [2, 52, 2]}, {"55060256": [52, 2]}, {"55060259": [255, 3, 224]}, {"55060263": [8]}, {"55060268": [143, 166]}, {"55060271": [48, 132, 197]}, {"55060275": [4, 8, 16, 9, 211]}, {"55060284": [143, 185]}, {"55060287": [44, 135, 37]}, {"55060291": [4, 8, 16, 9, 211]}, {"55060300": [60, 10, 128, 64, 37, 74, 32]}, {"55060308": [141, 75]}, {"55060311": [12, 17, 96]}, {"55060315": [2]}, {"55060320": [149, 69]}, {"55060323": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060336": [3, 224]}, {"55060339": [8]}, {"55060344": [60, 8, 128, 64, 37, 8, 32]}, {"55060352": [141, 9]}, {"55060355": [12, 17, 32]}, {"55060359": [2]}, {"55060364": [129, 3]}, {"55060367": [2]}, {"55060369": [3, 15, 195]}, {"55060373": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060387": [8]}, {"55060392": [144, 69]}, {"55060395": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060404": [141, 9]}, {"55060407": [12, 17, 32]}, {"55060411": [2]}, {"55060416": [145, 5]}, {"55060419": [3, 3, 224]}, {"55060423": [8]}, {"55060428": [143, 162]}, {"55060431": [36, 144, 69]}, {"55060436": [60, 8, 128, 64, 37, 8, 32]}, {"55060444": [141, 9]}, {"55060447": [12, 17, 32]}, {"55060451": [19]}, {"55060456": [145, 5]}, {"55060459": [1, 175, 164]}, {"55060464": [175, 165]}, {"55060467": [4, 175, 166]}, {"55060471": [8, 39, 189, 255, 232, 175, 191]}, {"55060479": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060491": [6, 145, 6]}, {"55060495": [7, 141, 9]}, {"55060499": [8, 1, 32, 248, 9]}, {"55060508": [143, 191]}, {"55060511": [16, 39, 189]}, {"55060515": [24, 143, 164]}, {"55060520": [143, 165]}, {"55060523": [4, 143, 166]}, {"55060527": [8, 3, 224]}, {"55060531": [8]}, {"55060536": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060547": [16, 175, 163]}, {"55060551": [20, 175, 191]}, {"55060555": [24, 12, 16, 10, 27]}, {"55060564": [143, 162]}, {"55060567": [16, 143, 163]}, {"55060571": [20, 143, 191]}, {"55060575": [24, 39, 189]}, {"55060579": [32, 3, 224]}, {"55060583": [8]}, {"55060588": [39, 189, 255, 232, 175, 191]}, {"55060595": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060604": [173]}, {"55060608": [173]}, {"55060611": [4, 173]}, {"55060615": [8, 173]}, {"55060619": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060635": [42]}, {"55060641": [9, 15, 195, 1, 33, 32, 38]}, {"55060649": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 85]}, {"55060664": [4, 64]}, {"55060667": [34]}, {"55060672": [52, 68]}, {"55060676": [12, 16, 10, 154]}, {"55060684": [16, 96]}, {"55060687": [12]}, {"55060692": [60, 8, 128, 64, 37, 8, 32]}, {"55060700": [140, 105]}, {"55060704": [173, 9]}, {"55060708": [140, 105]}, {"55060711": [4, 173, 9]}, {"55060715": [4, 140, 105]}, {"55060719": [8, 173, 9]}, {"55060723": [8, 52, 9]}, {"55060727": [1, 173, 9]}, {"55060731": [12, 144, 98]}, {"55060736": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060752": [52, 1]}, {"55060755": [10, 21, 65]}, {"55060759": [6]}, {"55060764": [149, 42]}, {"55060767": [28, 49, 74, 240, 31]}, {"55060773": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060783": [28, 129, 9, 4, 36, 5, 33]}, {"55060791": [2]}, {"55060797": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060807": [16, 39, 189]}, {"55060811": [24, 3, 224]}, {"55060815": [8]}, {"55060820": [39, 189, 255, 232, 175, 191]}, {"55060827": [16, 12, 16, 10, 99]}, {"55060836": [36, 1, 255, 255, 16, 65]}, {"55060843": [4]}, {"55060848": [52, 68]}, {"55060852": [12, 16, 10, 141]}, {"55060860": [143, 191]}, {"55060863": [16, 39, 189]}, {"55060867": [24, 3, 224]}, {"55060871": [8]}, {"55060876": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060887": [164, 52, 8]}, {"55060892": [52, 137]}, {"55060896": [148, 170]}, {"55060900": [52, 1]}, {"55060903": [10, 21, 65]}, {"55060907": [14]}, {"55060912": [148, 171]}, {"55060915": [28, 52, 1]}, {"55060919": [16, 20, 65]}, {"55060923": [8]}, {"55060928": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060939": [4]}, {"55060944": [36, 2, 255, 255, 16]}, {"55060951": [21]}, {"55060956": [52, 8]}, {"55060959": [1, 49, 105]}, {"55060963": [31, 52, 1]}, {"55060967": [21, 21, 65]}, {"55060971": [12]}, {"55060976": [52, 1]}, {"55060979": [62, 16, 129]}, {"55060983": [7]}, {"55060988": [52, 1]}, {"55060991": [66, 16, 129]}, {"55060995": [4]}, {"55061000": [36, 2, 255, 255, 16]}, {"55061007": [7]}, {"55061012": [52, 8]}, {"55061015": [2, 144, 169, 1, 65]}, {"55061021": [2, 18]}, {"55061025": [72, 16, 37]}, {"55061029": [2, 18]}, {"55061033": [73, 16, 37, 3, 224]}, {"55061039": [8]}, {"55061044": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061059": [4, 141, 9]}, {"55061064": [17, 32]}, {"55061067": [5]}, {"55061073": [9, 82, 2, 21, 68, 255, 250]}, {"55061084": [49, 34]}, {"55061087": [255, 3, 224]}, {"55061091": [8]}, {"55061096": [39, 189, 255, 224, 175, 176]}, {"55061103": [16, 175, 177]}, {"55061107": [20, 175, 191]}, {"55061111": [24, 52, 130]}, {"55061116": [52, 80]}, {"55061120": [38, 8, 255, 128, 5]}, {"55061127": [18]}, {"55061132": [60, 17, 128, 64, 38, 49, 32, 20, 52, 9]}, {"55061143": [16, 1, 9]}, {"55061147": [24]}, {"55061150": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061168": [142, 40]}, {"55061171": [12, 1]}, {"55061174": [248, 9]}, {"55061180": [20, 80, 255, 239]}, {"55061188": [54, 35]}, {"55061192": [16]}, {"55061195": [2]}, {"55061200": [52, 3]}, {"55061204": [143, 176]}, {"55061207": [16, 143, 177]}, {"55061211": [20, 143, 191]}, {"55061215": [24, 39, 189]}, {"55061219": [32, 3, 224]}, {"55061223": [8]}, {"55061228": [140, 136, 29, 44, 52, 9]}, {"55061235": [1]}, {"55061237": [9, 78]}, {"55061240": [1, 9, 16, 36, 16, 64]}, {"55061247": [36]}, {"55061252": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061267": [164, 52, 1]}, {"55061271": [61, 17, 129]}, {"55061275": [10]}, {"55061281": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061291": [25]}, {"55061296": [52, 13]}, {"55061299": [1, 161, 141, 29, 40, 37, 74]}, {"55061307": [3, 16]}, {"55061311": [9]}, {"55061316": [52, 12]}, {"55061319": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061335": [14]}, {"55061340": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061376": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061388": [52, 2]}, {"55061392": [3, 224]}, {"55061395": [8]}, {"55061400": [60, 8, 128, 64, 37, 8, 20]}, {"55061408": [129, 8]}, {"55061412": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061424": [3, 224]}, {"55061427": [8]}, {"55061432": [175, 164]}, {"55061435": [104, 175, 165]}, {"55061439": [108, 175, 166]}, {"55061443": [112, 175, 167]}, {"55061447": [116, 39, 189, 255, 232, 175, 163]}, {"55061455": [16, 175, 191]}, {"55061459": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061472": [17]}, {"55061475": [10]}, {"55061480": [60, 9, 128, 65, 52, 10]}, {"55061487": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 27]}, {"55061516": [143, 163]}, {"55061519": [16, 143, 191]}, {"55061523": [20, 39, 189]}, {"55061527": [24, 143, 164]}, {"55061531": [104, 143, 165]}, {"55061535": [108, 143, 166]}, {"55061539": [112, 143, 167]}, {"55061543": [116, 132, 110, 19, 196, 3, 224]}, {"55061551": [8]}, {"55061556": [147, 25]}, {"55061559": [116, 52, 1]}, {"55061563": [255, 23, 33]}, {"55061567": [2]}, {"55061572": [52, 25]}, {"55061575": [44, 3, 224]}, {"55061579": [8, 167, 185]}, {"55061583": [154, 147, 44]}, {"55061587": [116, 52, 1]}, {"55061591": [255, 21, 129]}, {"55061595": [2]}, {"55061600": [52, 12]}, {"55061603": [44, 3, 224]}, {"55061607": [8]}, {"55061612": [145, 174]}, {"55061615": [116, 52, 1]}, {"55061619": [255, 21, 193]}, {"55061623": [2]}, {"55061628": [52, 14]}, {"55061631": [44, 3, 224]}, {"55061635": [8, 167, 174]}, {"55061639": [154, 145, 207]}, {"55061643": [116, 52, 1]}, {"55061647": [255, 21, 225]}, {"55061651": [2]}, {"55061656": [52, 15]}, {"55061659": [44, 3, 224]}, {"55061663": [8, 167, 175]}, {"55061667": [154, 144, 174]}, {"55061671": [64, 144, 162]}, {"55061675": [112, 52, 3]}, {"55061679": [255, 21, 195]}, {"55061683": [3]}, {"55061688": [52, 3]}, {"55061691": [1, 160, 163, 15, 51, 3, 224]}, {"55061699": [8]}, {"55061704": [141, 9]}, {"55061707": [4, 17, 32]}, {"55061711": [7]}, {"55061716": [145, 9]}, {"55061719": [104, 52, 1]}, {"55061723": [59, 17, 33]}, {"55061727": [2]}, {"55061732": [52, 9]}, {"55061735": [255, 161, 9]}, {"55061739": [64, 3, 224]}, {"55061743": [8, 161, 14]}, {"55061747": [104]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 60, 4, 128, 64, 36, 132, 32, 20, 60, 5, 128, 18, 36, 165, 165, 208, 140, 168]}, {"55061747": [4, 17]}, {"55061751": [3]}, {"55061756": [8, 16, 11, 67]}, {"55061764": [8, 16, 11, 86]}, {"55061772": [39, 189, 255, 232, 175, 191]}, {"55061779": [16, 140, 136]}, {"55061784": [172, 168]}, {"55061787": [64, 140, 136]}, {"55061791": [4, 172, 168]}, {"55061795": [68, 148, 136]}, {"55061799": [8, 164, 168]}, {"55061803": [72, 160, 160, 15, 51, 144, 168]}, {"55061811": [74, 52, 1]}, {"55061815": [255, 21, 1]}, {"55061819": [3]}, {"55061824": [12, 16, 11, 104]}, {"55061832": [143, 191]}, {"55061835": [16, 39, 189]}, {"55061839": [24, 3, 224]}, {"55061843": [8]}, {"55061848": [39, 189, 255, 232, 175, 191]}, {"55061855": [16, 140, 168]}, {"55061859": [64, 172, 168]}, {"55061863": [104, 140, 168]}, {"55061867": [68, 172, 168]}, {"55061871": [108, 148, 168]}, {"55061875": [72, 164, 168]}, {"55061879": [112, 144, 168]}, {"55061883": [104, 52, 1]}, {"55061887": [255, 21, 1]}, {"55061891": [3]}, {"55061896": [52, 8]}, {"55061899": [1, 160, 168, 15, 51, 143, 191]}, {"55061907": [16, 39, 189]}, {"55061911": [24, 3, 224]}, {"55061915": [8]}, {"55061920": [39, 189, 255, 232, 175, 191]}, {"55061927": [16, 148, 168]}, {"55061931": [156, 49, 8]}, {"55061935": [64, 17]}, {"55061939": [5]}, {"55061944": [148, 168]}, {"55061947": [112, 49, 8, 255, 15, 53, 8]}, {"55061955": [48, 164, 168]}, {"55061959": [112, 144, 136]}, {"55061963": [1, 160, 168]}, {"55061967": [105, 148, 136]}, {"55061971": [2, 164, 168]}, {"55061975": [106, 140, 136]}, {"55061979": [4, 172, 168]}, {"55061983": [108, 12, 16, 11, 130, 52, 4]}, {"55061992": [12, 16, 11, 130, 52, 4]}, {"55061999": [1, 12, 16, 11, 130, 52, 4]}, {"55062007": [2, 143, 191]}, {"55062011": [16, 39, 189]}, {"55062015": [24, 3, 224]}, {"55062019": [8]}, {"55062025": [133, 64, 33, 60, 9, 128, 64, 37, 41, 46, 180, 145, 10]}, {"55062039": [108, 52, 1]}, {"55062043": [255, 17, 65]}, {"55062047": [5]}, {"55062052": [1, 42, 72, 33, 145, 41]}, {"55062060": [21, 32]}, {"55062063": [28]}, {"55062068": [60, 9, 128, 64, 37, 41, 46, 167, 37, 41]}, {"55062079": [1, 145, 42]}, {"55062084": [17, 64]}, {"55062087": [19]}, {"55062093": [170, 88, 33, 145, 107]}, {"55062099": [116, 52, 1]}, {"55062103": [255, 17, 97, 255, 248]}, {"55062112": [144, 172]}, {"55062115": [108, 17, 138, 255, 245]}, {"55062124": [144, 172]}, {"55062127": [109, 17, 138, 255, 242]}, {"55062136": [144, 172]}, {"55062139": [110, 17, 138, 255, 239]}, {"55062148": [161, 11]}, {"55062151": [105, 161, 10]}, {"55062155": [108, 16]}, {"55062159": [4]}, {"55062164": [52, 9]}, {"55062167": [255, 161, 9]}, {"55062171": [105, 161, 9]}, {"55062175": [108, 3, 224]}, {"55062179": [8]}, {"55062184": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062197": [1, 1, 1, 1, 1]}, {"55062203": [1, 1, 1, 1, 1]}, {"55062209": [1]}, {"55062211": [1, 1, 1, 1, 1, 1, 1, 1]}] \ No newline at end of file From bc9956fdd7103625b678f35cb8072b14f2b07ce8 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Fri, 8 Jun 2018 07:37:35 -0400 Subject: [PATCH 109/151] Fix Treasure Chest Game chest flag --- Regions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Regions.py b/Regions.py index 70c7efcbd..b08cf99e3 100644 --- a/Regions.py +++ b/Regions.py @@ -391,7 +391,7 @@ def _create_region(name, type, locations=None, exits=None): 'Mountain Summit Fairy Reward': (0x3481404, None, 0x51, 'NPC', 0x3B), 'Crater Fairy Reward': (0x3481405, None, 0x52, 'NPC', 0x3B), 'Ganons Castle Fairy Reward': (0x3481406, None, 0x53, 'NPC', 0x3B), - 'Treasure Chest Game': (None, None, 0x76, 'Chest', 0x10), + 'Treasure Chest Game': (None, None, 0x0A, 'Chest', 0x10), 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC', 0x49), From 7eceabd28a8c725093234b7656172f28d62106c7 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Fri, 8 Jun 2018 13:29:03 -0500 Subject: [PATCH 110/151] color tweaks and an extra sound --- Gui.py | 8 ++++---- OoTRandomizer.py | 8 ++++---- Rom.py | 24 +++++++++++++----------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Gui.py b/Gui.py index a6f877f50..705fcaef6 100644 --- a/Gui.py +++ b/Gui.py @@ -117,19 +117,19 @@ def RomSelect(): colorVars[2].set('Zora Blue') kokiriFrame = Frame(dropDownFrame) - kokiriOptionMenu = OptionMenu(kokiriFrame, colorVars[0], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') + kokiriOptionMenu = OptionMenu(kokiriFrame, colorVars[0], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green', 'Random', 'True Random') kokiriOptionMenu.pack(side=RIGHT) kokiriLabel = Label(kokiriFrame, text='Kokiri Tunic Color') kokiriLabel.pack(side=LEFT) goronFrame = Frame(dropDownFrame) - goronOptionMenu = OptionMenu(goronFrame, colorVars[1], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') + goronOptionMenu = OptionMenu(goronFrame, colorVars[1], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green', 'Random', 'True Random') goronOptionMenu.pack(side=RIGHT) goronLabel = Label(goronFrame, text='Goron Tunic Color') goronLabel.pack(side=LEFT) zoraFrame = Frame(dropDownFrame) - zoraOptionMenu = OptionMenu(zoraFrame, colorVars[2], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random') + zoraOptionMenu = OptionMenu(zoraFrame, colorVars[2], 'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green', 'Random', 'True Random') zoraOptionMenu.pack(side=RIGHT) zoraLabel = Label(zoraFrame, text='Zora Tunic Color') zoraLabel.pack(side=LEFT) @@ -138,7 +138,7 @@ def RomSelect(): lowHealthSFXVar.set('Default') lowHealthSFXFrame = Frame(dropDownFrame) - lowHealthSFXOptionMenu = OptionMenu(lowHealthSFXFrame, lowHealthSFXVar, 'Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None') + lowHealthSFXOptionMenu = OptionMenu(lowHealthSFXFrame, lowHealthSFXVar, 'Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Cluck', 'Mweep!', 'Random', 'None') lowHealthSFXOptionMenu.pack(side=RIGHT) lowHealthSFXLabel = Label(lowHealthSFXFrame, text='Low Health SFX') lowHealthSFXLabel.pack(side=LEFT) diff --git a/OoTRandomizer.py b/OoTRandomizer.py index 9c3cbe1b9..21e5da2ce 100644 --- a/OoTRandomizer.py +++ b/OoTRandomizer.py @@ -59,28 +59,28 @@ def start(): in inconvenient locations if the Stone of Agony is in the player's inventory. ''', action='store_true') - parser.add_argument('--kokiricolor', default='Kokiri Green', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], + parser.add_argument('--kokiricolor', default='Kokiri Green', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green', 'Random', 'True Random'], help='''\ Choose the color for Link's Kokiri Tunic. (default: %(default)s) Color: Make the Kokiri Tunic this color. Random: Choose a random color from this list of colors. True Random: Choose a random color from any color the N64 can draw. ''') - parser.add_argument('--goroncolor', default='Goron Red', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], + parser.add_argument('--goroncolor', default='Goron Red', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green', 'Random', 'True Random'], help='''\ Choose the color for Link's Goron Tunic. (default: %(default)s) Color: Make the Goron Tunic this color. Random: Choose a random color from this list of colors. True Random: Choose a random color from any color the N64 can draw. ''') - parser.add_argument('--zoracolor', default='Zora Blue', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Random', 'True Random'], + parser.add_argument('--zoracolor', default='Zora Blue', const='medallions', nargs='?', choices=['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green', 'Random', 'True Random'], help='''\ Choose the color for Link's Zora Tunic. (default: %(default)s) Color: Make the Zora Tunic this color. Random: Choose a random color from this list of colors. True Random: Choose a random color from any color the N64 can draw. ''') - parser.add_argument('--healthSFX', default='Default', const='Default', nargs='?', choices=['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'], + parser.add_argument('--healthSFX', default='Default', const='Default', nargs='?', choices=['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Cluck', 'Mweep!', 'Random', 'None'], help='''\ Select the sound effect that loops at low health. (default: %(default)s) Sound: Replace the sound effect with the chosen sound. diff --git a/Rom.py b/Rom.py index 089d50e2f..c9faf1d57 100644 --- a/Rom.py +++ b/Rom.py @@ -930,7 +930,7 @@ def patch_rom(world, rom): Tunics.append(0x00B6DA38) # Kokiri Tunic Tunics.append(0x00B6DA3B) # Goron Tunic Tunics.append(0x00B6DA3E) # Zora Tunic - colorList = ['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green'] + colorList = ['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green'] randomColors = random.choices(colorList, k=3) for i in range(len(Tunics)): @@ -948,27 +948,27 @@ def patch_rom(world, rom): elif thisColor == 'Black': color = [0x30, 0x30, 0x30] elif thisColor == 'White': - color = [0xE0, 0xE8, 0xF0] + color = [0xF0, 0xF0, 0xFF] elif thisColor == 'Purple': color = [0x95, 0x30, 0x80] elif thisColor == 'Yellow': - color = [0xF0, 0xF0, 0x60] + color = [0xE0, 0xD8, 0x60] elif thisColor == 'Orange': - color = [0xFD, 0x79, 0x40] + color = [0xE0, 0x79, 0x40] elif thisColor == 'Pink': - color = [0xFD, 0x90, 0xB3] + color = [0xFF, 0x90, 0xB3] elif thisColor == 'Gray': - color = [0xA0, 0xA0, 0xA0] + color = [0xA0, 0xA0, 0xB0] elif thisColor == 'Brown': color = [0x95, 0x59, 0x0A] elif thisColor == 'Gold': - color = [0xC0, 0xB0, 0x60] + color = [0xD8, 0xB0, 0x60] elif thisColor == 'Silver': color = [0xD0, 0xF0, 0xFF] elif thisColor == 'Beige': - color = [0xF5, 0xC0, 0xC0] + color = [0xC0, 0xA0, 0xA0] elif thisColor == 'Teal': - color = [0x30, 0xF0, 0xD0] + color = [0x30, 0xD0, 0xB0] elif thisColor == 'Royal Blue': color = [0x40, 0x00, 0x90] elif thisColor == 'Sonic Blue': @@ -979,12 +979,14 @@ def patch_rom(world, rom): color = [0xF0, 0x30, 0x30] elif thisColor == 'NES Green': color = [0x00, 0xD0, 0x00] + elif thisColor == 'Dark Green': + color = [0x00, 0x25, 0x18] elif thisColor == 'True Random': color = randColor rom.write_bytes(Tunics[i], color) #Low health beep - healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'] + healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recorvery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'] randomSFX = random.choice(healthSFXList) address = 0xADBA1A @@ -1002,7 +1004,7 @@ def patch_rom(world, rom): healthSFX = [0x48, 0x1A] elif thisHealthSFX == 'Tamborine': healthSFX = [0x48, 0x42] - elif thisHealthSFX == 'Recovery Heart': + elif thisHealthSFX == 'Recorvery Heart': healthSFX = [0x48, 0x0B] elif thisHealthSFX == 'Carrot Refill': healthSFX = [0x48, 0x45] From 40fb40024ef5013fa4aeb83b03b985bf4f38545b Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Fri, 8 Jun 2018 13:31:16 -0500 Subject: [PATCH 111/151] fix reverted typo --- Rom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index c9faf1d57..97e7fa317 100644 --- a/Rom.py +++ b/Rom.py @@ -986,7 +986,7 @@ def patch_rom(world, rom): rom.write_bytes(Tunics[i], color) #Low health beep - healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recorvery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'] + healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'] randomSFX = random.choice(healthSFXList) address = 0xADBA1A @@ -1004,7 +1004,7 @@ def patch_rom(world, rom): healthSFX = [0x48, 0x1A] elif thisHealthSFX == 'Tamborine': healthSFX = [0x48, 0x42] - elif thisHealthSFX == 'Recorvery Heart': + elif thisHealthSFX == 'Recovery Heart': healthSFX = [0x48, 0x0B] elif thisHealthSFX == 'Carrot Refill': healthSFX = [0x48, 0x45] From 43eca2f3e97d0b05fde4b5c3582f4848939427b3 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Fri, 8 Jun 2018 13:57:59 -0500 Subject: [PATCH 112/151] minor tweaks to a few scenes --- Rom.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rom.py b/Rom.py index 97e7fa317..41bdaa42b 100644 --- a/Rom.py +++ b/Rom.py @@ -323,6 +323,7 @@ def patch_rom(world, rom): rom.write_bytes(0x2223308, [0x00, 0x81, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00]) # Speed scene after Jabu Jabu's Belly + rom.write_bytes(0x2113340, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0x2113340, [0x00, 0x0D, 0x00, 0x3B, 0x00, 0x3C, 0x00, 0x3C]) rom.write_bytes(0x2113C18, [0x00, 0x82, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00]) rom.write_bytes(0x21131D0, [0x00, 0x01, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x3C]) @@ -371,6 +372,7 @@ def patch_rom(world, rom): rom.write_bytes(0xC94548, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xC94730, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xC945A8, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xC94594, [0x00, 0x00, 0x00, 0x00]) # Speed Twinrova defeat scene rom.write_bytes(0xD678CC, [0x24, 0x01, 0x03, 0xA2, 0xA6, 0x01, 0x01, 0x42]) From 9b715f5a042204170872ccf52c352cd5dd4dbdf7 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Fri, 8 Jun 2018 22:17:29 -0500 Subject: [PATCH 113/151] a couple hint tweaks --- HintList.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/HintList.py b/HintList.py index cbd65c7f1..c5681d979 100644 --- a/HintList.py +++ b/HintList.py @@ -132,14 +132,14 @@ def getHintGroup(string): #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx handy marker for how long one line should be in a text box '10 Big Poes': ("They say that 10 Big Poes leads&to", 'alwaysLocation'), 'Deku Theater Mask of Truth': ("They say that the Mask of Truth&yields", 'alwaysLocation'), - '30 Gold Skulltulla Reward': ("They say that slaying 30 Gold&Skulltullas reveals", 'alwaysLocation'), - '40 Gold Skulltulla Reward': ("They say that slaying 40 Gold&Skulltullas reveals", 'alwaysLocation'), - '50 Gold Skulltulla Reward': ("They say that slaying 50 Gold&Skulltullas reveals", 'alwaysLocation'), + '30 Gold Skulltulla Reward': ("They say that slaying&30 Gold Skulltullas&reveals", 'alwaysLocation'), + '40 Gold Skulltulla Reward': ("They say that slaying&40 Gold Skulltullas&reveals", 'alwaysLocation'), + '50 Gold Skulltulla Reward': ("They say that slaying&50 Gold Skulltullas&reveals", 'alwaysLocation'), 'Song from Ocarina of Time': ("They say the Ocarina of Time&teaches", 'alwaysLocation'), 'Biggoron': ("They say that Biggoron&crafts", 'alwaysLocation'), 'Child Fishing': ("They say that fishing in youth&bestows", 'location'), 'Adult Fishing': ("They say that fishing in maturity&bestows", 'location'), - '20 Gold Skulltulla Reward': ("They say that slaying 20 Gold&Skulltullas reveals", 'location'), + '20 Gold Skulltulla Reward': ("They say that slaying&20 Gold Skulltullas&reveals", 'location'), 'Treasure Chest Game': ("They say that gambling&grants", 'location'), 'Darunias Joy': ("They say that Darunia's dance leads&to", 'location'), 'Frog Ocarina Game': ("They say The Frogs of Zora River&hold", 'location'), From 774061e8636ccb10ca9bc669766d502e57857ad0 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 8 Jun 2018 22:52:35 -0500 Subject: [PATCH 114/151] Hopeful fix for wonder text --- Rom.py | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/Rom.py b/Rom.py index 41bdaa42b..cd803c625 100644 --- a/Rom.py +++ b/Rom.py @@ -126,9 +126,6 @@ def patch_rom(world, rom): # Fix proximity text boxes (Navi) (Part 1) rom.write_bytes(0xDF8B84, [0x00, 0x00, 0x00, 0x00]) - # Fix proximity text boxes (Wonder Text) - rom.write_bytes(0xE9EBEC, [0x00, 0x00, 0x00, 0x00]) - # Remove intro cutscene rom.write_bytes(0xB06BBA, [0x00, 0x00]) @@ -323,7 +320,6 @@ def patch_rom(world, rom): rom.write_bytes(0x2223308, [0x00, 0x81, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00]) # Speed scene after Jabu Jabu's Belly - rom.write_bytes(0x2113340, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0x2113340, [0x00, 0x0D, 0x00, 0x3B, 0x00, 0x3C, 0x00, 0x3C]) rom.write_bytes(0x2113C18, [0x00, 0x82, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00]) rom.write_bytes(0x21131D0, [0x00, 0x01, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x3C]) @@ -372,7 +368,6 @@ def patch_rom(world, rom): rom.write_bytes(0xC94548, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xC94730, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xC945A8, [0x00, 0x00, 0x00, 0x00]) - rom.write_bytes(0xC94594, [0x00, 0x00, 0x00, 0x00]) # Speed Twinrova defeat scene rom.write_bytes(0xD678CC, [0x24, 0x01, 0x03, 0xA2, 0xA6, 0x01, 0x01, 0x42]) @@ -595,7 +590,20 @@ def patch_rom(world, rom): # Forbid Sun's Song from a bunch of cutscenes Suns_scenes = [0x2016FC9, 0x2017219, 0x20173D9, 0x20174C9, 0x2017679, 0x20C1539, 0x20C15D9, 0x21A0719, 0x21A07F9, 0x2E90129, 0x2E901B9, 0x2E90249, 0x225E829, 0x225E939, 0x306D009] for address in Suns_scenes: - rom.write_byte(address,0x01) + rom.write_byte(address, 0x01) + + # Remove forcible text triggers + Wonder_text = [0x27C00C6, 0x27C00D6, 0x27C00E6, 0x27C00F6, 0x27C0106, 0x27C0116, 0x27C0126, 0x27C0136] + for address in Wonder_text: + rom.write_byte(address, 0x02) + rom.write_byte(0x27CE08A, 0x09) + rom.write_byte(0x27CE09A, 0x0F) + Wonder_text = [0x288707A, 0x288708A, 0x288709A, 0x289707A, 0x28C713E, 0x28D91C6] + rom.write_byte(address, 0x0C) + Wonder_text = [0x28A60FE, 0x28AE08E, 0x28B917E, 0x28BF172, 0x28BF182, 0x28BF192] + rom.write_byte(address, 0x0D) + rom.write_byte(0x28A114E, 0x0E) + rom.write_byte(0x28A610E, 0x0E) # Speed text for address in text_array: @@ -932,7 +940,7 @@ def patch_rom(world, rom): Tunics.append(0x00B6DA38) # Kokiri Tunic Tunics.append(0x00B6DA3B) # Goron Tunic Tunics.append(0x00B6DA3E) # Zora Tunic - colorList = ['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green'] + colorList = ['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green'] randomColors = random.choices(colorList, k=3) for i in range(len(Tunics)): @@ -950,27 +958,27 @@ def patch_rom(world, rom): elif thisColor == 'Black': color = [0x30, 0x30, 0x30] elif thisColor == 'White': - color = [0xF0, 0xF0, 0xFF] + color = [0xE0, 0xE8, 0xF0] elif thisColor == 'Purple': color = [0x95, 0x30, 0x80] elif thisColor == 'Yellow': - color = [0xE0, 0xD8, 0x60] + color = [0xF0, 0xF0, 0x60] elif thisColor == 'Orange': - color = [0xE0, 0x79, 0x40] + color = [0xFD, 0x79, 0x40] elif thisColor == 'Pink': - color = [0xFF, 0x90, 0xB3] + color = [0xFD, 0x90, 0xB3] elif thisColor == 'Gray': - color = [0xA0, 0xA0, 0xB0] + color = [0xA0, 0xA0, 0xA0] elif thisColor == 'Brown': color = [0x95, 0x59, 0x0A] elif thisColor == 'Gold': - color = [0xD8, 0xB0, 0x60] + color = [0xC0, 0xB0, 0x60] elif thisColor == 'Silver': color = [0xD0, 0xF0, 0xFF] elif thisColor == 'Beige': - color = [0xC0, 0xA0, 0xA0] + color = [0xF5, 0xC0, 0xC0] elif thisColor == 'Teal': - color = [0x30, 0xD0, 0xB0] + color = [0x30, 0xF0, 0xD0] elif thisColor == 'Royal Blue': color = [0x40, 0x00, 0x90] elif thisColor == 'Sonic Blue': @@ -981,8 +989,6 @@ def patch_rom(world, rom): color = [0xF0, 0x30, 0x30] elif thisColor == 'NES Green': color = [0x00, 0xD0, 0x00] - elif thisColor == 'Dark Green': - color = [0x00, 0x25, 0x18] elif thisColor == 'True Random': color = randColor rom.write_bytes(Tunics[i], color) From 3f64a282e884b81aa72db664af34814c6a60fefb Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Fri, 8 Jun 2018 22:53:41 -0500 Subject: [PATCH 115/151] Add files via upload --- Rom.py | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/Rom.py b/Rom.py index cd803c625..41bdaa42b 100644 --- a/Rom.py +++ b/Rom.py @@ -126,6 +126,9 @@ def patch_rom(world, rom): # Fix proximity text boxes (Navi) (Part 1) rom.write_bytes(0xDF8B84, [0x00, 0x00, 0x00, 0x00]) + # Fix proximity text boxes (Wonder Text) + rom.write_bytes(0xE9EBEC, [0x00, 0x00, 0x00, 0x00]) + # Remove intro cutscene rom.write_bytes(0xB06BBA, [0x00, 0x00]) @@ -320,6 +323,7 @@ def patch_rom(world, rom): rom.write_bytes(0x2223308, [0x00, 0x81, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00]) # Speed scene after Jabu Jabu's Belly + rom.write_bytes(0x2113340, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0x2113340, [0x00, 0x0D, 0x00, 0x3B, 0x00, 0x3C, 0x00, 0x3C]) rom.write_bytes(0x2113C18, [0x00, 0x82, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00]) rom.write_bytes(0x21131D0, [0x00, 0x01, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x3C]) @@ -368,6 +372,7 @@ def patch_rom(world, rom): rom.write_bytes(0xC94548, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xC94730, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xC945A8, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xC94594, [0x00, 0x00, 0x00, 0x00]) # Speed Twinrova defeat scene rom.write_bytes(0xD678CC, [0x24, 0x01, 0x03, 0xA2, 0xA6, 0x01, 0x01, 0x42]) @@ -590,20 +595,7 @@ def patch_rom(world, rom): # Forbid Sun's Song from a bunch of cutscenes Suns_scenes = [0x2016FC9, 0x2017219, 0x20173D9, 0x20174C9, 0x2017679, 0x20C1539, 0x20C15D9, 0x21A0719, 0x21A07F9, 0x2E90129, 0x2E901B9, 0x2E90249, 0x225E829, 0x225E939, 0x306D009] for address in Suns_scenes: - rom.write_byte(address, 0x01) - - # Remove forcible text triggers - Wonder_text = [0x27C00C6, 0x27C00D6, 0x27C00E6, 0x27C00F6, 0x27C0106, 0x27C0116, 0x27C0126, 0x27C0136] - for address in Wonder_text: - rom.write_byte(address, 0x02) - rom.write_byte(0x27CE08A, 0x09) - rom.write_byte(0x27CE09A, 0x0F) - Wonder_text = [0x288707A, 0x288708A, 0x288709A, 0x289707A, 0x28C713E, 0x28D91C6] - rom.write_byte(address, 0x0C) - Wonder_text = [0x28A60FE, 0x28AE08E, 0x28B917E, 0x28BF172, 0x28BF182, 0x28BF192] - rom.write_byte(address, 0x0D) - rom.write_byte(0x28A114E, 0x0E) - rom.write_byte(0x28A610E, 0x0E) + rom.write_byte(address,0x01) # Speed text for address in text_array: @@ -940,7 +932,7 @@ def patch_rom(world, rom): Tunics.append(0x00B6DA38) # Kokiri Tunic Tunics.append(0x00B6DA3B) # Goron Tunic Tunics.append(0x00B6DA3E) # Zora Tunic - colorList = ['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green'] + colorList = ['Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green'] randomColors = random.choices(colorList, k=3) for i in range(len(Tunics)): @@ -958,27 +950,27 @@ def patch_rom(world, rom): elif thisColor == 'Black': color = [0x30, 0x30, 0x30] elif thisColor == 'White': - color = [0xE0, 0xE8, 0xF0] + color = [0xF0, 0xF0, 0xFF] elif thisColor == 'Purple': color = [0x95, 0x30, 0x80] elif thisColor == 'Yellow': - color = [0xF0, 0xF0, 0x60] + color = [0xE0, 0xD8, 0x60] elif thisColor == 'Orange': - color = [0xFD, 0x79, 0x40] + color = [0xE0, 0x79, 0x40] elif thisColor == 'Pink': - color = [0xFD, 0x90, 0xB3] + color = [0xFF, 0x90, 0xB3] elif thisColor == 'Gray': - color = [0xA0, 0xA0, 0xA0] + color = [0xA0, 0xA0, 0xB0] elif thisColor == 'Brown': color = [0x95, 0x59, 0x0A] elif thisColor == 'Gold': - color = [0xC0, 0xB0, 0x60] + color = [0xD8, 0xB0, 0x60] elif thisColor == 'Silver': color = [0xD0, 0xF0, 0xFF] elif thisColor == 'Beige': - color = [0xF5, 0xC0, 0xC0] + color = [0xC0, 0xA0, 0xA0] elif thisColor == 'Teal': - color = [0x30, 0xF0, 0xD0] + color = [0x30, 0xD0, 0xB0] elif thisColor == 'Royal Blue': color = [0x40, 0x00, 0x90] elif thisColor == 'Sonic Blue': @@ -989,6 +981,8 @@ def patch_rom(world, rom): color = [0xF0, 0x30, 0x30] elif thisColor == 'NES Green': color = [0x00, 0xD0, 0x00] + elif thisColor == 'Dark Green': + color = [0x00, 0x25, 0x18] elif thisColor == 'True Random': color = randColor rom.write_bytes(Tunics[i], color) From f9d7d8bae5b011bc17faad6ccd1ea7ac8537f0e9 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 8 Jun 2018 22:56:18 -0500 Subject: [PATCH 116/151] Fix for wonder text, with feeling --- Rom.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index 41bdaa42b..41cc724fb 100644 --- a/Rom.py +++ b/Rom.py @@ -126,9 +126,6 @@ def patch_rom(world, rom): # Fix proximity text boxes (Navi) (Part 1) rom.write_bytes(0xDF8B84, [0x00, 0x00, 0x00, 0x00]) - # Fix proximity text boxes (Wonder Text) - rom.write_bytes(0xE9EBEC, [0x00, 0x00, 0x00, 0x00]) - # Remove intro cutscene rom.write_bytes(0xB06BBA, [0x00, 0x00]) @@ -597,6 +594,19 @@ def patch_rom(world, rom): for address in Suns_scenes: rom.write_byte(address,0x01) + # Remove forcible text triggers + Wonder_text = [0x27C00C6, 0x27C00D6, 0x27C00E6, 0x27C00F6, 0x27C0106, 0x27C0116, 0x27C0126, 0x27C0136] + for address in Wonder_text: + rom.write_byte(address, 0x02) + rom.write_byte(0x27CE08A, 0x09) + rom.write_byte(0x27CE09A, 0x0F) + Wonder_text = [0x288707A, 0x288708A, 0x288709A, 0x289707A, 0x28C713E, 0x28D91C6] + rom.write_byte(address, 0x0C) + Wonder_text = [0x28A60FE, 0x28AE08E, 0x28B917E, 0x28BF172, 0x28BF182, 0x28BF192] + rom.write_byte(address, 0x0D) + rom.write_byte(0x28A114E, 0x0E) + rom.write_byte(0x28A610E, 0x0E) + # Speed text for address in text_array: rom.write_byte(address, 0x08) From c32b29190e0f6a9f059e40b3be407cf40cbcc382 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 8 Jun 2018 23:05:09 -0500 Subject: [PATCH 117/151] Finally correct I think --- Rom.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Rom.py b/Rom.py index 41cc724fb..70b527186 100644 --- a/Rom.py +++ b/Rom.py @@ -601,8 +601,10 @@ def patch_rom(world, rom): rom.write_byte(0x27CE08A, 0x09) rom.write_byte(0x27CE09A, 0x0F) Wonder_text = [0x288707A, 0x288708A, 0x288709A, 0x289707A, 0x28C713E, 0x28D91C6] + for address in Wonder_text: rom.write_byte(address, 0x0C) Wonder_text = [0x28A60FE, 0x28AE08E, 0x28B917E, 0x28BF172, 0x28BF182, 0x28BF192] + for address in Wonder_text: rom.write_byte(address, 0x0D) rom.write_byte(0x28A114E, 0x0E) rom.write_byte(0x28A610E, 0x0E) From cd045cbca8f3a70e48ad8ffe3e1a8af349f445e1 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Sat, 9 Jun 2018 00:07:04 -0500 Subject: [PATCH 118/151] Better Wonder Text fixes Still being tested --- Rom.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Rom.py b/Rom.py index 70b527186..7680b81f0 100644 --- a/Rom.py +++ b/Rom.py @@ -608,6 +608,26 @@ def patch_rom(world, rom): rom.write_byte(address, 0x0D) rom.write_byte(0x28A114E, 0x0E) rom.write_byte(0x28A610E, 0x0E) + Wonder_text = [0x9367F6, 0x93673D, 0x93679D] + for address in Wonder_text: + rom.write_byte(address, 0x08) + Wonder_text = [0x289707B, 0x28AE08F, 0x28C713F] + for address in Wonder_text: + rom.write_byte(address, 0xAF) + rom.write_byte(0x28A114F, 0x6F) + rom.write_byte(0x28B917F, 0x6F) + rom.write_byte(0x28A60FF, 0xEF) + rom.write_byte(0x28D91C7, 0xEF) + Wonder_text = [0x28A610F, 0x28BF173, 0x28BF183, 0x28BF193] + for address in Wonder_text: + rom.write_byte(address, 0x2F) + Wonder_text = [0x27CE08B, 0x27C00C7, 0x27C00D7, 0x27C0117, 0x27C0127] + for address in Wonder_text: + rom.write_byte(address, 0x3D) + rom.write_byte(0x27C00E7, 0x7D) + rom.write_byte(0x27C00F7, 0x7D) + rom.write_byte(0x27C0107, 0xBD) + rom.write_byte(0x27C0137, 0xBD) # Speed text for address in text_array: From 4ddd77e9ec55f160c00195b2f9bc586747a4bfe6 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Sat, 9 Jun 2018 00:36:22 -0500 Subject: [PATCH 119/151] Fix the clucking problem --- Rom.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 7680b81f0..8495b767d 100644 --- a/Rom.py +++ b/Rom.py @@ -1020,7 +1020,7 @@ def patch_rom(world, rom): rom.write_bytes(Tunics[i], color) #Low health beep - healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Mweep!', 'Random', 'None'] + healthSFXList = ['Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Cluck', 'Mweep!', 'None'] randomSFX = random.choice(healthSFXList) address = 0xADBA1A @@ -1046,6 +1046,8 @@ def patch_rom(world, rom): healthSFX = [0x68, 0x5F] elif thisHealthSFX == 'Zelda - Gasp': healthSFX = [0x68, 0x79] + elif thisHealthSFX == 'Cluck': + healthSFX = [0x28, 0x12] elif thisHealthSFX == 'Mweep!': healthSFX = [0x68, 0x7A] elif thisHealthSFX == 'None': From 13035e5e08b8f20b3dad52de22d7b4e569cd28e4 Mon Sep 17 00:00:00 2001 From: Wulfy Date: Sat, 9 Jun 2018 08:45:24 -0400 Subject: [PATCH 120/151] Update C-buttons on time travel if items have changed in inventory --- ASM/src/time_travel.asm | 123 ++++++++++++++++++++++++++-------------- data/base2current.json | 2 +- 2 files changed, 80 insertions(+), 45 deletions(-) diff --git a/ASM/src/time_travel.asm b/ASM/src/time_travel.asm index d3e2e1a6b..e67128c0d 100644 --- a/ASM/src/time_travel.asm +++ b/ASM/src/time_travel.asm @@ -21,15 +21,58 @@ before_time_travel: ;================================================================================================== after_time_travel: - li a0, TIME_TRAVEL_SAVED_EQUIPS - li a1, SAVE_CONTEXT - lw t0, 0x04 (a1) ; t2 = 1 if going forward in time, 0 if going back + addiu sp, sp, -0x20 + sw s0, 0x10 (sp) + sw s1, 0x14 (sp) + sw ra, 0x18 (sp) + + li s0, SAVE_CONTEXT + li s1, TIME_TRAVEL_SAVED_EQUIPS + + lw t0, 0x04 (s0) ; t0 = 1 if going forward in time, 0 if going back beqz t0, @@going_back nop - j after_going_forward + jal after_going_forward + nop + b @@done nop @@going_back: - j after_going_back + jal after_going_back + nop +@@done: + + jal update_c_button + li a0, 0 + + jal update_c_button + li a0, 1 + + jal update_c_button + li a0, 2 + + lw s0, 0x10 (sp) + lw s1, 0x14 (sp) + lw ra, 0x18 (sp) + addiu sp, sp, 0x20 + jr ra + nop + +;================================================================================================== + +update_c_button: + ; a0 = button index + ; s0 = save context + + addu t0, s0, a0 ; t0 = save context, offset by button index + lbu t1, 0x6C (t0) ; t1 = inventory index on this button + beq t1, 0xFF, @@return + nop + addu t1, s0, t1 ; t1 = save context, offset by inventory index + lbu t1, 0x74 (t1) ; t1 = inventory contents + sb t1, 0x69 (t0) ; update button item + +@@return: + jr ra nop ;================================================================================================== @@ -39,19 +82,19 @@ after_going_forward: sw ra, 0x10 (sp) ; Save child buttons - lw t0, 0x00 (a0) - sw t0, 0x40 (a1) - lw t0, 0x04 (a0) - sw t0, 0x44 (a1) + lw t0, 0x00 (s1) + sw t0, 0x40 (s0) + lw t0, 0x04 (s1) + sw t0, 0x44 (s0) ; Save child equipment - lhu t0, 0x08 (a0) - sh t0, 0x48 (a1) + lhu t0, 0x08 (s1) + sh t0, 0x48 (s0) ; Unset swordless flag - sb r0, 0x0F33 (a1) + sb r0, 0x0F33 (s0) ; Initialize adult equips, if going forward for the first time - lbu t0, 0x4A (a1) ; t0 = saved adult B + lbu t0, 0x4A (s0) ; t0 = saved adult B bne t0, 0xFF, @@no_init nop jal initialize_adult @@ -66,27 +109,23 @@ after_going_forward: ;================================================================================================== after_going_back: - addiu sp, sp, -0x18 - sw ra, 0x10 (sp) - ; Restore child buttons - lw t0, 0x40 (a1) - sw t0, 0x68 (a1) - lw t0, 0x44 (a1) - sw t0, 0x6C (a1) + lw t0, 0x40 (s0) + sw t0, 0x68 (s0) + lw t0, 0x44 (s0) + sw t0, 0x6C (s0) ; Restore child equipment - lhu t0, 0x48 (a1) - sh t0, 0x70 (a1) + lhu t0, 0x48 (s0) + sh t0, 0x70 (s0) + ; Set swordless flag if needed - lbu t0, 0x68 (a1) + lbu t0, 0x68 (s0) bne t0, 0xFF, @@not_swordless nop li t0, 1 - sb t0, 0x0F33 (a1) + sb t0, 0x0F33 (s0) @@not_swordless: - lw ra, 0x10 (sp) - addiu sp, sp, 0x18 jr ra nop @@ -96,27 +135,24 @@ initialize_adult: addiu sp, sp, -0x18 sw ra, 0x10 (sp) - ; a0 = TIME_TRAVEL_SAVED_EQUIPS - ; a1 = save context - ; If we have mirror shield, equip it - lhu t0, 0x9C (a1) + lhu t0, 0x9C (s0) andi t0, t0, 0x0040 beqz t0, @@no_mirror_shield nop - lhu t0, 0x70 (a1) + lhu t0, 0x70 (s0) andi t0, t0, 0xFF0F ori t0, t0, 0x0030 - sh t0, 0x70 (a1) + sh t0, 0x70 (s0) @@no_mirror_shield: ; Try to preserve child C-button equips - lbu t0, 0x01 (a0) - sb t0, 0x69 (a1) - lhu t0, 0x02 (a0) - sh t0, 0x6A (a1) - lw t0, 0x04 (a0) - sw t0, 0x6C (a1) + lbu t0, 0x01 (s1) + sb t0, 0x69 (s0) + lhu t0, 0x02 (s1) + sh t0, 0x6A (s0) + lw t0, 0x04 (s1) + sw t0, 0x6C (s0) jal init_adult_button li a0, 0 @@ -136,8 +172,7 @@ initialize_adult: init_adult_button: ; a0 = C-button index - ; a1 = save context - addu t0, a0, a1 ; t0 = save context (offset by button index) + addu t0, s0, a0 ; t0 = save context (offset by button index) li t1, ADULT_VALID_ITEMS lbu t2, 0x6C (t0) ; t2 = inventory index of item on this button @@ -155,17 +190,17 @@ init_adult_button: lbu t2, 0x00 (t1) ; t2 = inventory index beqz t2, @@set_empty ; Ran out out of eligible items nop - addu t3, a1, t2 + addu t3, s0, t2 ; t3 = save context, offset by inventory index lbu t3, 0x74 (t3) ; t3 = inventory contents beq t3, 0xFF, @@loop ; Item not in inventory nop - lbu t4, 0x6C (a1) + lbu t4, 0x6C (s0) beq t4, t2, @@loop ; Item already on C-left nop - lbu t4, 0x6D (a1) + lbu t4, 0x6D (s0) beq t4, t2, @@loop ; Item already on C-down nop - lbu t4, 0x6E (a1) + lbu t4, 0x6E (s0) beq t4, t2, @@loop ; Item already on C-right nop ; Valid item found, update the button diff --git a/data/base2current.json b/data/base2current.json index c06730971..fb5aecd67 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 60, 4, 128, 64, 36, 132, 32, 20, 60, 5, 128, 18, 36, 165, 165, 208, 140, 168]}, {"55061747": [4, 17]}, {"55061751": [3]}, {"55061756": [8, 16, 11, 67]}, {"55061764": [8, 16, 11, 86]}, {"55061772": [39, 189, 255, 232, 175, 191]}, {"55061779": [16, 140, 136]}, {"55061784": [172, 168]}, {"55061787": [64, 140, 136]}, {"55061791": [4, 172, 168]}, {"55061795": [68, 148, 136]}, {"55061799": [8, 164, 168]}, {"55061803": [72, 160, 160, 15, 51, 144, 168]}, {"55061811": [74, 52, 1]}, {"55061815": [255, 21, 1]}, {"55061819": [3]}, {"55061824": [12, 16, 11, 104]}, {"55061832": [143, 191]}, {"55061835": [16, 39, 189]}, {"55061839": [24, 3, 224]}, {"55061843": [8]}, {"55061848": [39, 189, 255, 232, 175, 191]}, {"55061855": [16, 140, 168]}, {"55061859": [64, 172, 168]}, {"55061863": [104, 140, 168]}, {"55061867": [68, 172, 168]}, {"55061871": [108, 148, 168]}, {"55061875": [72, 164, 168]}, {"55061879": [112, 144, 168]}, {"55061883": [104, 52, 1]}, {"55061887": [255, 21, 1]}, {"55061891": [3]}, {"55061896": [52, 8]}, {"55061899": [1, 160, 168, 15, 51, 143, 191]}, {"55061907": [16, 39, 189]}, {"55061911": [24, 3, 224]}, {"55061915": [8]}, {"55061920": [39, 189, 255, 232, 175, 191]}, {"55061927": [16, 148, 168]}, {"55061931": [156, 49, 8]}, {"55061935": [64, 17]}, {"55061939": [5]}, {"55061944": [148, 168]}, {"55061947": [112, 49, 8, 255, 15, 53, 8]}, {"55061955": [48, 164, 168]}, {"55061959": [112, 144, 136]}, {"55061963": [1, 160, 168]}, {"55061967": [105, 148, 136]}, {"55061971": [2, 164, 168]}, {"55061975": [106, 140, 136]}, {"55061979": [4, 172, 168]}, {"55061983": [108, 12, 16, 11, 130, 52, 4]}, {"55061992": [12, 16, 11, 130, 52, 4]}, {"55061999": [1, 12, 16, 11, 130, 52, 4]}, {"55062007": [2, 143, 191]}, {"55062011": [16, 39, 189]}, {"55062015": [24, 3, 224]}, {"55062019": [8]}, {"55062025": [133, 64, 33, 60, 9, 128, 64, 37, 41, 46, 180, 145, 10]}, {"55062039": [108, 52, 1]}, {"55062043": [255, 17, 65]}, {"55062047": [5]}, {"55062052": [1, 42, 72, 33, 145, 41]}, {"55062060": [21, 32]}, {"55062063": [28]}, {"55062068": [60, 9, 128, 64, 37, 41, 46, 167, 37, 41]}, {"55062079": [1, 145, 42]}, {"55062084": [17, 64]}, {"55062087": [19]}, {"55062093": [170, 88, 33, 145, 107]}, {"55062099": [116, 52, 1]}, {"55062103": [255, 17, 97, 255, 248]}, {"55062112": [144, 172]}, {"55062115": [108, 17, 138, 255, 245]}, {"55062124": [144, 172]}, {"55062127": [109, 17, 138, 255, 242]}, {"55062136": [144, 172]}, {"55062139": [110, 17, 138, 255, 239]}, {"55062148": [161, 11]}, {"55062151": [105, 161, 10]}, {"55062155": [108, 16]}, {"55062159": [4]}, {"55062164": [52, 9]}, {"55062167": [255, 161, 9]}, {"55062171": [105, 161, 9]}, {"55062175": [108, 3, 224]}, {"55062179": [8]}, {"55062184": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062197": [1, 1, 1, 1, 1]}, {"55062203": [1, 1, 1, 1, 1]}, {"55062209": [1]}, {"55062211": [1, 1, 1, 1, 1, 1, 1, 1]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 95]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 114]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [4]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 161, 9]}, {"55061875": [105, 3, 224]}, {"55061879": [8]}, {"55061884": [39, 189, 255, 232, 175, 191]}, {"55061891": [16, 142, 40]}, {"55061896": [174, 8]}, {"55061899": [64, 142, 40]}, {"55061903": [4, 174, 8]}, {"55061907": [68, 150, 40]}, {"55061911": [8, 166, 8]}, {"55061915": [72, 162]}, {"55061918": [15, 51, 146, 8]}, {"55061923": [74, 52, 1]}, {"55061927": [255, 21, 1]}, {"55061931": [3]}, {"55061936": [12, 16, 11, 128]}, {"55061944": [143, 191]}, {"55061947": [16, 39, 189]}, {"55061951": [24, 3, 224]}, {"55061955": [8]}, {"55061960": [142, 8]}, {"55061963": [64, 174, 8]}, {"55061967": [104, 142, 8]}, {"55061971": [68, 174, 8]}, {"55061975": [108, 150, 8]}, {"55061979": [72, 166, 8]}, {"55061983": [112, 146, 8]}, {"55061987": [104, 52, 1]}, {"55061991": [255, 21, 1]}, {"55061995": [3]}, {"55062000": [52, 8]}, {"55062003": [1, 162, 8, 15, 51, 3, 224]}, {"55062011": [8]}, {"55062016": [39, 189, 255, 232, 175, 191]}, {"55062023": [16, 150, 8]}, {"55062027": [156, 49, 8]}, {"55062031": [64, 17]}, {"55062035": [5]}, {"55062040": [150, 8]}, {"55062043": [112, 49, 8, 255, 15, 53, 8]}, {"55062051": [48, 166, 8]}, {"55062055": [112, 146, 40]}, {"55062059": [1, 162, 8]}, {"55062063": [105, 150, 40]}, {"55062067": [2, 166, 8]}, {"55062071": [106, 142, 40]}, {"55062075": [4, 174, 8]}, {"55062079": [108, 12, 16, 11, 154, 52, 4]}, {"55062088": [12, 16, 11, 154, 52, 4]}, {"55062095": [1, 12, 16, 11, 154, 52, 4]}, {"55062103": [2, 143, 191]}, {"55062107": [16, 39, 189]}, {"55062111": [24, 3, 224]}, {"55062115": [8]}, {"55062120": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 20, 145, 10]}, {"55062135": [108, 52, 1]}, {"55062139": [255, 17, 65]}, {"55062143": [5]}, {"55062148": [1, 42, 72, 33, 145, 41]}, {"55062156": [21, 32]}, {"55062159": [28]}, {"55062164": [60, 9, 128, 64, 37, 41, 47, 7, 37, 41]}, {"55062175": [1, 145, 42]}, {"55062180": [17, 64]}, {"55062183": [19]}, {"55062188": [2, 10, 88, 33, 145, 107]}, {"55062195": [116, 52, 1]}, {"55062199": [255, 17, 97, 255, 248]}, {"55062208": [146, 12]}, {"55062211": [108, 17, 138, 255, 245]}, {"55062220": [146, 12]}, {"55062223": [109, 17, 138, 255, 242]}, {"55062232": [146, 12]}, {"55062235": [110, 17, 138, 255, 239]}, {"55062244": [161, 11]}, {"55062247": [105, 161, 10]}, {"55062251": [108, 16]}, {"55062255": [4]}, {"55062260": [52, 9]}, {"55062263": [255, 161, 9]}, {"55062267": [105, 161, 9]}, {"55062271": [108, 3, 224]}, {"55062275": [8]}, {"55062280": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062293": [1, 1, 1, 1, 1]}, {"55062299": [1, 1, 1, 1, 1]}, {"55062305": [1]}, {"55062307": [1, 1, 1, 1, 1, 1, 1, 1]}] \ No newline at end of file From 810694f1b1840eb547f8ce6ad13dff0541d3b885 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Sat, 9 Jun 2018 23:49:59 -0500 Subject: [PATCH 121/151] Fix softlock in ganon scenes --- Rom.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Rom.py b/Rom.py index 8495b767d..994b85172 100644 --- a/Rom.py +++ b/Rom.py @@ -377,7 +377,6 @@ def patch_rom(world, rom): # Speed scenes during final battle # Ganondorf battle end - rom.write_byte(0xD81F2F, 0x06) rom.write_byte(0xD82047, 0x09) # Zelda descends rom.write_byte(0xD82AB3, 0x66) From 785cbb396290b140733ccded14fd976e10c565e6 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Sun, 10 Jun 2018 04:28:36 -0500 Subject: [PATCH 122/151] Logic fix for adult woods If you need Hammer to open these two grottos, you need access as adult which I previously, erroneously, did not check for. --- Rules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rules.py b/Rules.py index abcda4ac7..42968a74f 100644 --- a/Rules.py +++ b/Rules.py @@ -322,8 +322,8 @@ def global_rules(world): set_rule(world.get_location('Ganon'), lambda state: state.has('Boss Key (Ganons Castle)')) set_rule(world.get_entrance('Kokiri Forest Storms Grotto'), lambda state: state.has('Song of Storms')) set_rule(world.get_entrance('Lost Woods Generic Grotto'), lambda state: state.can_blast()) - set_rule(world.get_entrance('Lost Woods Sales Grotto'), lambda state: state.can_blast()) - set_rule(world.get_entrance('Front of Meadow Grotto'), lambda state: state.can_blast()) + set_rule(world.get_entrance('Lost Woods Sales Grotto'), lambda state: state.has('Bomb Bag') or (state.has('Hammer') and state.is_adult() and (state.has('Minuet of Forest') or state.has('Sarias Song')))) + set_rule(world.get_entrance('Front of Meadow Grotto'), lambda state: state.has('Bomb Bag') or (state.has('Hammer') and state.is_adult() and (state.has('Minuet of Forest') or state.has('Sarias Song')))) set_rule(world.get_entrance('Remote Southern Grotto'), lambda state: state.can_blast()) set_rule(world.get_entrance('Field Near Lake Inside Fence Grotto'), lambda state: state.can_blast()) set_rule(world.get_entrance('Field Valley Grotto'), lambda state: state.can_blast()) From fe90c9d50f86f70dd7a6d91a2fc990739d68e6ec Mon Sep 17 00:00:00 2001 From: Nick Langille Date: Sun, 10 Jun 2018 21:18:20 -0400 Subject: [PATCH 123/151] Fix equipping SOLD OUT to c-buttons on time travel --- ASM/src/time_travel.asm | 2 ++ data/base2current.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ASM/src/time_travel.asm b/ASM/src/time_travel.asm index e67128c0d..425e65176 100644 --- a/ASM/src/time_travel.asm +++ b/ASM/src/time_travel.asm @@ -69,6 +69,8 @@ update_c_button: nop addu t1, s0, t1 ; t1 = save context, offset by inventory index lbu t1, 0x74 (t1) ; t1 = inventory contents + beq t1, 0x2C, @@return ; Don't equip SOLD OUT + nop sb t1, 0x69 (t0) ; update button item @@return: diff --git a/data/base2current.json b/data/base2current.json index fb5aecd67..953ca8807 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 95]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 114]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [4]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 161, 9]}, {"55061875": [105, 3, 224]}, {"55061879": [8]}, {"55061884": [39, 189, 255, 232, 175, 191]}, {"55061891": [16, 142, 40]}, {"55061896": [174, 8]}, {"55061899": [64, 142, 40]}, {"55061903": [4, 174, 8]}, {"55061907": [68, 150, 40]}, {"55061911": [8, 166, 8]}, {"55061915": [72, 162]}, {"55061918": [15, 51, 146, 8]}, {"55061923": [74, 52, 1]}, {"55061927": [255, 21, 1]}, {"55061931": [3]}, {"55061936": [12, 16, 11, 128]}, {"55061944": [143, 191]}, {"55061947": [16, 39, 189]}, {"55061951": [24, 3, 224]}, {"55061955": [8]}, {"55061960": [142, 8]}, {"55061963": [64, 174, 8]}, {"55061967": [104, 142, 8]}, {"55061971": [68, 174, 8]}, {"55061975": [108, 150, 8]}, {"55061979": [72, 166, 8]}, {"55061983": [112, 146, 8]}, {"55061987": [104, 52, 1]}, {"55061991": [255, 21, 1]}, {"55061995": [3]}, {"55062000": [52, 8]}, {"55062003": [1, 162, 8, 15, 51, 3, 224]}, {"55062011": [8]}, {"55062016": [39, 189, 255, 232, 175, 191]}, {"55062023": [16, 150, 8]}, {"55062027": [156, 49, 8]}, {"55062031": [64, 17]}, {"55062035": [5]}, {"55062040": [150, 8]}, {"55062043": [112, 49, 8, 255, 15, 53, 8]}, {"55062051": [48, 166, 8]}, {"55062055": [112, 146, 40]}, {"55062059": [1, 162, 8]}, {"55062063": [105, 150, 40]}, {"55062067": [2, 166, 8]}, {"55062071": [106, 142, 40]}, {"55062075": [4, 174, 8]}, {"55062079": [108, 12, 16, 11, 154, 52, 4]}, {"55062088": [12, 16, 11, 154, 52, 4]}, {"55062095": [1, 12, 16, 11, 154, 52, 4]}, {"55062103": [2, 143, 191]}, {"55062107": [16, 39, 189]}, {"55062111": [24, 3, 224]}, {"55062115": [8]}, {"55062120": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 20, 145, 10]}, {"55062135": [108, 52, 1]}, {"55062139": [255, 17, 65]}, {"55062143": [5]}, {"55062148": [1, 42, 72, 33, 145, 41]}, {"55062156": [21, 32]}, {"55062159": [28]}, {"55062164": [60, 9, 128, 64, 37, 41, 47, 7, 37, 41]}, {"55062175": [1, 145, 42]}, {"55062180": [17, 64]}, {"55062183": [19]}, {"55062188": [2, 10, 88, 33, 145, 107]}, {"55062195": [116, 52, 1]}, {"55062199": [255, 17, 97, 255, 248]}, {"55062208": [146, 12]}, {"55062211": [108, 17, 138, 255, 245]}, {"55062220": [146, 12]}, {"55062223": [109, 17, 138, 255, 242]}, {"55062232": [146, 12]}, {"55062235": [110, 17, 138, 255, 239]}, {"55062244": [161, 11]}, {"55062247": [105, 161, 10]}, {"55062251": [108, 16]}, {"55062255": [4]}, {"55062260": [52, 9]}, {"55062263": [255, 161, 9]}, {"55062267": [105, 161, 9]}, {"55062271": [108, 3, 224]}, {"55062275": [8]}, {"55062280": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062293": [1, 1, 1, 1, 1]}, {"55062299": [1, 1, 1, 1, 1]}, {"55062305": [1]}, {"55062307": [1, 1, 1, 1, 1, 1, 1, 1]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}] \ No newline at end of file From 2c42cd8eed5b3b8fcaaea78a72045d14c382d733 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Mon, 11 Jun 2018 04:25:28 -0500 Subject: [PATCH 124/151] Wonder text to void and logic update -The Wonder text polluting GTG and the early parts of Shadow Temple should now be banished to the void, relatively shallow in the void but still impossible to z-target. This needs thorough stability testing, especially on VC. -Shadow Trial's first chest now has more precise logic rules. Hookshot is sufficient (not Longshot) and Hover Boots are also an option. --- Rom.py | 5 ++++- Rules.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 994b85172..e71c5d720 100644 --- a/Rom.py +++ b/Rom.py @@ -626,7 +626,10 @@ def patch_rom(world, rom): rom.write_byte(0x27C00E7, 0x7D) rom.write_byte(0x27C00F7, 0x7D) rom.write_byte(0x27C0107, 0xBD) - rom.write_byte(0x27C0137, 0xBD) + rom.write_byte(0x27C0137, 0xBD) + Wonder_text = [0x27C00BC, 0x27C00CC, 0x27C00DC, 0x27C00EC, 0x27C00FC, 0x27C010C, 0x27C011C, 0x27C012C, 0x27CE080, 0x27CE090, 0x2887070, 0x2887080, 0x2887090, 0x2897070, 0x28C7134, 0x28D91BC, 0x28A60F4, 0x28AE084, 0x28B9174, 0x28BF168, 0x28BF178, 0x28BF188, 0x28A1144, 0x28A6104] + for address in Wonder_text: + rom.write_byte(address, 0xFE) # Speed text for address in text_array: diff --git a/Rules.py b/Rules.py index 42968a74f..4f54309c1 100644 --- a/Rules.py +++ b/Rules.py @@ -311,7 +311,7 @@ def global_rules(world): set_rule(world.get_location('Ganons Castle Fire Trial Clear'), lambda state: state.has_GoronTunic() and state.has('Progressive Strength Upgrade', 3) and state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and state.has('Progressive Hookshot', 2)) set_rule(world.get_location('Ganons Castle Water Trial Clear'), lambda state: state.has_bottle() and state.has('Hammer') and state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows')) set_rule(world.get_location('Ganons Castle Shadow Trial Clear'), lambda state: state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and state.has('Hammer') and (state.has('Fire Arrows') or state.has('Progressive Hookshot', 2)) and (state.has('Lens of Truth') or (state.has('Hover Boots') and state.has('Progressive Hookshot', 2)))) - set_rule(world.get_location('Ganons Castle Shadow Trial First Chest'), lambda state: (state.has('Magic Meter') and state.has('Bow') and state.has('Fire Arrows')) or state.has('Progressive Hookshot', 2)) + set_rule(world.get_location('Ganons Castle Shadow Trial First Chest'), lambda state: (state.has('Magic Meter') and state.has('Bow') and state.has('Fire Arrows')) or state.has('Progressive Hookshot') or state.has('Hover Boots')) set_rule(world.get_location('Ganons Castle Shadow Trial Second Chest'), lambda state: (state.has('Magic Meter') and state.has('Bow') and state.has('Fire Arrows')) or (state.has('Progressive Hookshot', 2) and state.has('Hover Boots'))) set_rule(world.get_location('Ganons Castle Spirit Trial Clear'), lambda state: state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and state.has('Mirror Shield') and state.has('Bomb Bag') and state.has('Progressive Hookshot')) set_rule(world.get_location('Ganons Castle Spirit Trial First Chest'), lambda state: state.has('Progressive Hookshot') and (state.has('Magic Meter') or state.has('Bomb Bag'))) From 740638534616d5fa8eee8418b9dbbcebd13fc5cf Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Mon, 11 Jun 2018 04:29:06 -0500 Subject: [PATCH 125/151] Make Gorons return properly -Change the check for the Gorons returning to Goron City to having beaten Fire Temple, not possession of the Fire Medallion. Purely cosmetic as none of these Gorons are useful but still. --- Rom.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index e71c5d720..12922e2d2 100644 --- a/Rom.py +++ b/Rom.py @@ -529,10 +529,13 @@ def patch_rom(world, rom): # Remove extra Shadow Temple medallions rom.write_bytes(0x00D116E0, [0x00, 0x00, 0x00, 0x00]) - # Change Adult Kokiri Forest to check FT complete flag + # Change adult Kokiri Forest to check for Forest Temple complete flag rom.write_bytes(0x00E5369E, [0xB4, 0xAC]) rom.write_bytes(0x00D5A83C, [0x80, 0x49, 0x0E, 0xDC]) + # Change adult Goron City to check for Fire Temple complete flag + rom.write_bytes(0x00ED59DC, [0x80, 0xC9, 0x0E, 0xDC]) + # Change Pokey to check DT complete flag rom.write_bytes(0xE5400A, [0x8C, 0x4C]) rom.write_bytes(0xE5400E, [0xB4, 0xA4]) From da8c89bcfcd114a33d2a1c7aba53d26cd7a2f7e5 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Mon, 11 Jun 2018 06:06:57 -0500 Subject: [PATCH 126/151] Updates to README and last logic tweak What insanely placed Song of Time blocks those are. --- README.md | 123 ++++++++++++++++++++++++++++++++++++++++-------------- Rules.py | 2 +- 2 files changed, 93 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 6344b2e22..b46cbc74b 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ This is a randomizer for _The Legend of Zelda: Ocarina of Time_ for the Nintendo # Installation -Clone this repository and then run ```OoTRandomizer.py``` (requires Python 3). +It is strongly suggested users get the latest release from here: https://github.com/AmazingAmpharos/OoT-Randomizer/releases . +Simply download the .msi installer and run it if you have a Windows machine. -Alternatively, run ```Gui.py``` for a simple graphical user interface. - -For releases, a Windows standalone executable is available for users without Python 3. +If you do not have Windows or you simply wish to run the script raw, clone this repository and either run '''Gui.py''' for a +graphical interface or '''OoTRandomizer.py''' for the command line version. Both require Python 3.5+. This randomizer requires The Legend of Zelda: Ocarina of Time version 1.0 NTSC-US version. Upon first being run, the randomizer will automatically create a decompressed version of this ROM that can be used for input for slightly faster seed generation times. Please be sure your input ROM filename @@ -26,12 +26,11 @@ This program takes _The Legend of Zelda: Ocarina of Time_ and randomizes the loc Proper logic is used to ensure every seed is possible to complete without the use of glitches and will be safe from the possibility of softlocks with any possible usage of keys in dungeons. -The items that randomize currently are all items within chests, items given as rewards by NPCs including from minigames and Deku Scrub salesmen, and -the items obtained when getting the Bottle and the Fire Arrows at Lake Hylia. Due to technical limitations, chests in "generic" grottos are not randomized, -but chests in unique grottos are (one in Kakariko, one in the Sacred Forest Meadow). All dungeons will always have the same number of Maps, Compasses, -Small Keys, and Boss Keys they had in the original game, but which chests within those dungeons have those things is random. The item pool will contain a -Biggoron Sword that will not interfere with Medigoron's sale of the Giant's Knife (which is always vanilla), and a randomly selected adult trading quest item -other than the Odd Potion will be somewhere in the item pool. +The items that randomize currently are all items within chests including those in grottos, items given as rewards by NPCs including from minigames and +Deku Scrub salesmen, the items given by freestanding Pieces of Heart, Heart Containers, and Keys, and the items obtained when getting the Bottle and the +Fire Arrows at Lake Hylia. All dungeons will always have the same number of Maps, Compasses, Small Keys, and Boss Keys they had in the original game, but +which chests within those dungeons have those things is random. The item pool will contain a Biggoron Sword that will not interfere with Medigoron's sale +of the Giant's Knife (which is always vanilla), and a randomly selected adult trading quest item other than the Odd Potion will be somewhere in the item pool. Certain types of items are now "progressive", meaning that no matter what order the player encounters these items they will function as a series of upgrades. The following item types will be progressive chains: @@ -47,17 +46,17 @@ The following item types will be progressive chains: -Deku Nut Capacity Upgrades -Magic Meter to Double Magic -To be more clear about which NPC items are shuffled, it's NPCs who directly give you the item (so not the freestanding Pieces of Heart you can get from Dampe), -and it's only the one time permanent item rewards for the most part like NPCs who originally gave Pieces of Heart or inventory items. The only exception is that -even though in vanilla the reward for 40 Gold Skulltulla Tokens was just 10 Bombchus that is still a randomized reward in randomizer (but the 200 rupees for all -100 Gold Skulltulla Tokens is not randomized so the most tokens that could be required to complete a seed is 50). As a mercy to the player, the Ocarina Memory Game -in the Lost Woods will start on the final round as that minigame was very long originally, the three day wait on the Claim Check is removed, and Bombchu Bowling will -have a fixed sequence of prizes that is of maximum convenience to the player. Additionally, any NPC who gives a trading quest item either for the child or for the -adult other than Anju's initial gift as an adult does not have a randomized reward, and as a design decision, the Fairy Ocarina and Ocarina of Time are not randomized. +To be more clear about which NPC items are shuffled, it's only the one time permanent item rewards for the most part like NPCs who originally gave Pieces of Heart +or inventory items. The only exception is that even though in vanilla the reward for 40 Gold Skulltulla Tokens was just 10 Bombchus that is still a randomized reward +in randomizer (but the 200 rupees for all 100 Gold Skulltulla Tokens is not randomized so the most tokens that could be required to complete a seed is 50). As a mercy +to the player, the Ocarina Memory Game in the Lost Woods will start on the final round as that minigame was very long originally, the three day wait on the Claim Check +is removed, Bombchu Bowling will have a fixed sequence of prizes that is of maximum convenience to the player, Dampe's Gravedigging Tour will always be won on the first +dig, and the fishing minigame is made much simpler (8 lb fish for child now, 10 lb for adult). Additionally, any NPC who gives a trading quest item either for the child +or for the adult other than Anju's initial gift as an adult does not have a randomized reward, and as a design decision, the Fairy Ocarina and Ocarina of Time are not +randomized. -A special note is needed for the six Great Fairy Fountains scattered across Hyrule. These six fountains are randomized amongst themselves, and while they all still -require Zelda's Lullaby to utilize, none of them require a Magic Meter to obtain the reward. The two that give variations on the Magic Meter in vanilla are modeled -as progressives; the first the player uses will give a Magic Meter and the magic spin attack while the second will give the Double Magic upgrade. +A special note is needed for the six Great Fairy Fountains scattered across Hyrule. All six of these fountains now give random item rewards, and the magic and life +upgrades can now be found as normal items scattered around the world. Happy hunting! The Ocarina songs are shuffled in a pool amongst themselves, and each learn spot will still have the original conditions it has always had. These conditions may not have all been obvious, but here are some high points. Saria will teach her song after completing the events in the Castle Courtyard. The warp songs can mostly only @@ -69,8 +68,7 @@ now removed "becoming an adult" cutscene, the player will start every seed with rest in the Temple of Time has hint text pointing to the locations of the Spiritual Stones and Medallions. A child will be able to read hints for the Spiritual Stones while an adult will be able to read hints for the Medallions. -To be very clear on this point, freestanding Pieces of Heart (those not in chests or given directly by NPCs) are not randomized, and while the rewards for up to 50 -Gold Skulltulla Tokens are randomized, the tokens themselves are not. +To be very clear on this point, while the rewards for up to 50 Gold Skulltulla Tokens are randomized, the tokens themselves are not. As a service to the player in this very long game, many cutscenes have been greatly shortened or removed and text is as often as possible either omitted or sped up. We have been as thorough as our exploration of the game and various technical limitations will allow to make the parts of the game where you're watching and reading @@ -117,6 +115,8 @@ and using a combination of the Longshot and Scarecrow's Song. This allows access -Grottos can be opened with either Bombs or the Hammer. -The boulder maze in Goron City can be solved with the Hammer or partially with Bombs as is obvious, but less obvious is that it can be fully solved with Silver Gauntlets. -The large colored blocks only encountered by the adult require Goron Bracelet to push. +-In a few places, out of sight Song of Time blocks can be summoned. The lava room in Gerudo Training Grounds, the beginning of Ganon's Castle Shadow Trial, and the last +hallway with a caged Goron in Fire Temple are the main cases. -Adult Link can fully clear Dodongo's Cavern. He can even skip the first section by virtue of being tall. -In the Forest Temple, you can reach the room with the Floormaster early by using Hover Boots in the block push room. -In the Fire Temple, you can reach the Boss Key door from the beginning with Hover Boots. @@ -126,34 +126,30 @@ make poor key choices in Water Temple, this may be what you need to do to untang -In the Water Temple, Hover Boots can be used to reach the vanilla Boss Key chest without going through the room that requires Bombs and block pushing. Hover Boots can also be used in this temple to avoid the Longshot requirement for the middle level chest that requires the Bow. -In the Shadow Temple, you can avoid the need for the Longshot in the room with the invisible spikes by backflipping onto the chest for extra height. +-In the Shadow Temple, you can Hookshot the ladder to avoid pushing the block to get on the boat. +-In the Shadow Temple, a combination of the scarecrow and the Longshot can be used to reach Bongo Bongo without needing the Bow. +-In the Spirit Temple, the child can obtain the vanilla Map chest with Deku Sticks. No fire magic is needed. -In the Spirit Temple, you can collect the silver rupees without Hover Boots by jumping directly onto the rolling boulder or with a jump slash. -In the Spirit Temple, you can use the Longshot to cross from the hand with the Mirror Shield in vanilla to the other hand. +-In Ganon's Castle Spirit Trial, the web can be burned with a precise shot through the torch by a normal arrow. Fire Arrows are not required. -While we guarantee tunics for Fire Temple and Water Temple, you can possibly force yourself to do without if you seriously let a Like Like eat the tunic and then do not recover the tunic. It is almost always possible to do without, but it can make things really difficult on you. -Several Gold Skulltulla Tokens can be reached by clever/precise uses of jump slashes and spin attacks (possibly magic spin attacks). # Known issues -Sadly for this 1.0 release a few known issues exist. These will hopefully be addressed in future versions. +Sadly for this 2.0 release a few known issues exist. These will hopefully be addressed in future versions. -The fishing minigame sometimes refuses to allow you to catch fish when playing specifically on Bizhawk. Save and quit (NOT savestate) and return to fix the issue. -Draining the Bottom of the Well with Song of Storms sometimes crashes on specific versions of Project 64. We aren't sure of the exact story, but this bug is easily avoided by playing on a different emulator. --If the large rolling Goron in Goron City as a child has the same item as Link the Goron and the larger Goron's item is obtained first, Link the Goron will not give -his item. This mostly results in items like Piece of Heart being rendered unobtainable, but if a progressive lands in both of these spots, it could make an impossible -seed. The fix will simply be too complex to put in the 1.0 version, but this will be fixed soon. --Buying the Giant's Knife may be risky in 1.0. This needs more investigation. -Learning a warp song from Malon will break her script and cause Link to be unable to use the Ocarina until he leaves the current screen. Trying to switch which button the Ocarina is on and use it in this situation can softlock the game. This will probably be very, very hard to fix; just don't try to get cute and live with the limitation for now please. -Learning a warp song from Guru-Guru in the Windmill also breaks his script, but there are no known significant consequences. -Learning Sun's Song can warp Link out of the current cutscene in somewhat inconvenient ways. None of this should prevent completion of the seed, but it can be annoying. -There's a funny bug where sometimes obtaining Biggoron Sword displays a second erroneous text box. This has no gameplay consequence. --There's a reported but currently unconfirmed on modern code issue where somehow the child becomes erroneously equipped with Biggoron Sword. This should not be a disadvantage. -Executing the collection delay glitch on various NPCs may have unpredictable and undesirable consequences. --The text for the Happy Mask Salesman is kinda wonky. Some of it is still slow, and one line flows out of the box. This should not impede your ability to play the game. --The Gorons return to Goron City based on possessing the Fire Medallion and not based on clearing Fire Temple currently. They don't really do anything, but it may weird you -out a bit. -Mido blocks you and complains about the Deku Tree being dead based on possession of the Kokiri Emerald and not on whether you've cleared Deku Tree currently. Just talk to him to make him go away. @@ -179,6 +175,47 @@ The rainbow bridge spawn requires all medallions and spiritual stones to be in t The rainbow bridge is always present. +## Kokiri Tunic Color + +This determines the color of Link's default Kokiri Tunic. This only affects the color when he's wearing it, not the color of the icon in the menu. + +### Most Colors + +Simply get the particular color selected. Available colors are Kokiri Green, Goron Red, Zora Blue, Black, White, Purple, Yellow, Orange, Pink, Gray, +Brown, Gold, Silver, Beige, Teal, Royal Blue, Sonic Blue, Blood Red, Blood Orange, NES Green, and Dark Green. + +### Random + +Choose a random color from the set of pre-made colors. + +### True Random + +Generate a random color with numerically random RGB values. + +## Goron Tunic Color + +This determines the color of Link's Goron Tunic. This only affects the color when he's wearing it, not the color of the icon in the menu or when +holding it up after acquiring it. The options are identical to those for the Kokiri Tunic. + +## Zora Tunic Color + +This determines the color of Link's Zora Tunic. This only affects the color when he's wearing it, not the color of the icon in the menu or when +holding it up after acquiring it. The options are identical to those for the Kokiri Tunic. + +## Low Health SFX + +This determines which sound effect to play repeatedly when Link is very low on health. Several of these options are designed to be potentially +more pleasant to listen to while a few are designed to be more amusing. + +### Particular Sounds + +Set this particular sound for the heart beep. Available choices are Default, Softer Beep, Rupee, Timer, Tamborine, Recovery Heart, Carrot Refill, +Navi - Hey!, Zelda - Gasp, Cluck, and Mweep!. The last of these is indeed the sound a king might make when moving... very slowly. + +### None + +Disable low health heart beeps altogether. + ## Create Spoiler Log Output a Spoiler File. @@ -252,6 +289,30 @@ Output a Spoiler File (default: False) Select the condition to spawn the Rainbow Bridge to Ganon's Castle. (default: medallions) +``` +--kokiricolor [{'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green', 'Random', 'True Random'}] +``` + +Select the color of Link's Kokiri Tunic. (default: Kokiri Green) + +``` +--goroncolor [{'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green', 'Random', 'True Random'}] +``` + +Select the color of Link's Goron Tunic. (default: Goron Red) + +``` +--zoracolor [{'Kokiri Green', 'Goron Red', 'Zora Blue', 'Black', 'White', 'Purple', 'Yellow', 'Orange', 'Pink', 'Gray', 'Brown', 'Gold', 'Silver', 'Beige', 'Teal', 'Royal Blue', 'Sonic Blue', 'Blood Red', 'Blood Orange', 'NES Green', 'Dark Green', 'Random', 'True Random'}] +``` + +Select the color of Link's Zora Tunic. (default: Zora Blue) + +``` +--healthSFX [{'Default', 'Softer Beep', 'Rupee', 'Timer', 'Tamborine', 'Recovery Heart', 'Carrot Refill', 'Navi - Hey!', 'Zelda - Gasp', 'Cluck', 'Mweep!', 'Random', 'None'}] +``` + +Select the sound effect that loops at low health. (default: Default) + ``` --rom ROM ``` diff --git a/Rules.py b/Rules.py index 4f54309c1..6dce69c1a 100644 --- a/Rules.py +++ b/Rules.py @@ -311,7 +311,7 @@ def global_rules(world): set_rule(world.get_location('Ganons Castle Fire Trial Clear'), lambda state: state.has_GoronTunic() and state.has('Progressive Strength Upgrade', 3) and state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and state.has('Progressive Hookshot', 2)) set_rule(world.get_location('Ganons Castle Water Trial Clear'), lambda state: state.has_bottle() and state.has('Hammer') and state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows')) set_rule(world.get_location('Ganons Castle Shadow Trial Clear'), lambda state: state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and state.has('Hammer') and (state.has('Fire Arrows') or state.has('Progressive Hookshot', 2)) and (state.has('Lens of Truth') or (state.has('Hover Boots') and state.has('Progressive Hookshot', 2)))) - set_rule(world.get_location('Ganons Castle Shadow Trial First Chest'), lambda state: (state.has('Magic Meter') and state.has('Bow') and state.has('Fire Arrows')) or state.has('Progressive Hookshot') or state.has('Hover Boots')) + set_rule(world.get_location('Ganons Castle Shadow Trial First Chest'), lambda state: (state.has('Magic Meter') and state.has('Bow') and state.has('Fire Arrows')) or state.has('Progressive Hookshot') or state.has('Hover Boots') or state.has('Song of Time')) set_rule(world.get_location('Ganons Castle Shadow Trial Second Chest'), lambda state: (state.has('Magic Meter') and state.has('Bow') and state.has('Fire Arrows')) or (state.has('Progressive Hookshot', 2) and state.has('Hover Boots'))) set_rule(world.get_location('Ganons Castle Spirit Trial Clear'), lambda state: state.has('Magic Meter') and state.has('Bow') and state.has('Light Arrows') and state.has('Mirror Shield') and state.has('Bomb Bag') and state.has('Progressive Hookshot')) set_rule(world.get_location('Ganons Castle Spirit Trial First Chest'), lambda state: state.has('Progressive Hookshot') and (state.has('Magic Meter') or state.has('Bomb Bag'))) From 2a4a705edb012eee69ddc395a087b2152af06f87 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 11 Jun 2018 13:22:16 -0500 Subject: [PATCH 127/151] Kokiri, Saria, and Mido react to deku completion not emerald just a cosmetic change but we changed the others so I figured I'd fix this one as well --- Rom.py | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/Rom.py b/Rom.py index 12922e2d2..57c890d20 100644 --- a/Rom.py +++ b/Rom.py @@ -529,12 +529,36 @@ def patch_rom(world, rom): # Remove extra Shadow Temple medallions rom.write_bytes(0x00D116E0, [0x00, 0x00, 0x00, 0x00]) + # Change Mido, Saria, and Kokiri to check for Deku Tree complete flag + # bitwise pointer for 0x80 + kokiriAddresses = [0xE52836, 0xE53A56, 0xE51D4E, 0xE51F3E, 0xE51D96, 0xE51E1E, 0xE51E7E, 0xE51EDE, 0xE51FC6, 0xE51F96, 0xE293B6, 0xE29B8E, 0xE62EDA, 0xE630D6, 0xE62642] + for kokiri in kokiriAddresses: + rom.write_bytes(kokiri, [0x8C, 0x0C]) + # Kokiri + rom.write_bytes(0xE52838, [0x94, 0x48, 0x0E, 0xD4]) + rom.write_bytes(0xE53A58, [0x94, 0x49, 0x0E, 0xD4]) + rom.write_bytes(0xE51D50, [0x94, 0x58, 0x0E, 0xD4]) + rom.write_bytes(0xE51F40, [0x94, 0x4B, 0x0E, 0xD4]) + rom.write_bytes(0xE51D98, [0x94, 0x4B, 0x0E, 0xD4]) + rom.write_bytes(0xE51E20, [0x94, 0x4A, 0x0E, 0xD4]) + rom.write_bytes(0xE51E80, [0x94, 0x59, 0x0E, 0xD4]) + rom.write_bytes(0xE51EE0, [0x94, 0x4E, 0x0E, 0xD4]) + rom.write_bytes(0xE51FC8, [0x94, 0x49, 0x0E, 0xD4]) + rom.write_bytes(0xE51F98, [0x94, 0x58, 0x0E, 0xD4]) + # Saria + rom.write_bytes(0xE293B8, [0x94, 0x78, 0x0E, 0xD4]) + rom.write_bytes(0xE29B90, [0x94, 0x68, 0x0E, 0xD4]) + # Mido + rom.write_bytes(0xE62EDC, [0x94, 0x6F, 0x0E, 0xD4]) + rom.write_bytes(0xE630D8, [0x94, 0x4F, 0x0E, 0xD4]) + rom.write_bytes(0xE62644, [0x94, 0x6F, 0x0E, 0xD4]) + # Change adult Kokiri Forest to check for Forest Temple complete flag - rom.write_bytes(0x00E5369E, [0xB4, 0xAC]) - rom.write_bytes(0x00D5A83C, [0x80, 0x49, 0x0E, 0xDC]) + rom.write_bytes(0xE5369E, [0xB4, 0xAC]) + rom.write_bytes(0xD5A83C, [0x80, 0x49, 0x0E, 0xDC]) # Change adult Goron City to check for Fire Temple complete flag - rom.write_bytes(0x00ED59DC, [0x80, 0xC9, 0x0E, 0xDC]) + rom.write_bytes(0xED59DC, [0x80, 0xC9, 0x0E, 0xDC]) # Change Pokey to check DT complete flag rom.write_bytes(0xE5400A, [0x8C, 0x4C]) From d7d4de89cd026197f7a43886bac00b9312e48082 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 11 Jun 2018 18:45:29 -0500 Subject: [PATCH 128/151] warp song fix fixes warp songs at non-cutscene learning spots (i.e. windmill and malon) --- Rom.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Rom.py b/Rom.py index 57c890d20..5ce8fa83a 100644 --- a/Rom.py +++ b/Rom.py @@ -615,6 +615,9 @@ def patch_rom(world, rom): # Allow owl to always carry the kid down Death Mountain rom.write_bytes(0xE304F0, [0x24, 0x0E, 0x00, 0x01]) + # Fix warp song learning to work outside of cutscenes + rom.write_byte(0xB54B3F, 0x03) + # Forbid Sun's Song from a bunch of cutscenes Suns_scenes = [0x2016FC9, 0x2017219, 0x20173D9, 0x20174C9, 0x2017679, 0x20C1539, 0x20C15D9, 0x21A0719, 0x21A07F9, 0x2E90129, 0x2E901B9, 0x2E90249, 0x225E829, 0x225E939, 0x306D009] for address in Suns_scenes: From 82b5c6de9b0c83c8699d86e80286dd20c8b2a6d6 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 11 Jun 2018 19:58:32 -0500 Subject: [PATCH 129/151] fix sun's song learning to work in all scenes --- Rom.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Rom.py b/Rom.py index 5ce8fa83a..2b6dc098f 100644 --- a/Rom.py +++ b/Rom.py @@ -617,6 +617,9 @@ def patch_rom(world, rom): # Fix warp song learning to work outside of cutscenes rom.write_byte(0xB54B3F, 0x03) + + # Fix sun's song learning in all scenes + rom.write_byte(0xB54E63, 0x03) # Forbid Sun's Song from a bunch of cutscenes Suns_scenes = [0x2016FC9, 0x2017219, 0x20173D9, 0x20174C9, 0x2017679, 0x20C1539, 0x20C15D9, 0x21A0719, 0x21A07F9, 0x2E90129, 0x2E901B9, 0x2E90249, 0x225E829, 0x225E939, 0x306D009] From ca7434f4cd05e732963b27a383fe61077da6f902 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 11 Jun 2018 22:44:42 -0500 Subject: [PATCH 130/151] fix soft lock with mido --- Rom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 2b6dc098f..633002a48 100644 --- a/Rom.py +++ b/Rom.py @@ -531,7 +531,7 @@ def patch_rom(world, rom): # Change Mido, Saria, and Kokiri to check for Deku Tree complete flag # bitwise pointer for 0x80 - kokiriAddresses = [0xE52836, 0xE53A56, 0xE51D4E, 0xE51F3E, 0xE51D96, 0xE51E1E, 0xE51E7E, 0xE51EDE, 0xE51FC6, 0xE51F96, 0xE293B6, 0xE29B8E, 0xE62EDA, 0xE630D6, 0xE62642] + kokiriAddresses = [0xE52836, 0xE53A56, 0xE51D4E, 0xE51F3E, 0xE51D96, 0xE51E1E, 0xE51E7E, 0xE51EDE, 0xE51FC6, 0xE51F96, 0xE293B6, 0xE29B8E, 0xE62EDA, 0xE630D6, 0xE62642, 0xE633AA] for kokiri in kokiriAddresses: rom.write_bytes(kokiri, [0x8C, 0x0C]) # Kokiri @@ -552,6 +552,7 @@ def patch_rom(world, rom): rom.write_bytes(0xE62EDC, [0x94, 0x6F, 0x0E, 0xD4]) rom.write_bytes(0xE630D8, [0x94, 0x4F, 0x0E, 0xD4]) rom.write_bytes(0xE62644, [0x94, 0x6F, 0x0E, 0xD4]) + rom.write_bytes(0xE633AC, [0x94, 0x68, 0x0E, 0xD4]) # Change adult Kokiri Forest to check for Forest Temple complete flag rom.write_bytes(0xE5369E, [0xB4, 0xAC]) From 142de310961706148fca579ff6f992785a37726e Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 11 Jun 2018 22:46:56 -0500 Subject: [PATCH 131/151] forgot to save rom.py missed some changes mido fix was missing a line, realized I forgot to save my local version before upload. --- Rom.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Rom.py b/Rom.py index 633002a48..dc9ff7fc7 100644 --- a/Rom.py +++ b/Rom.py @@ -531,7 +531,7 @@ def patch_rom(world, rom): # Change Mido, Saria, and Kokiri to check for Deku Tree complete flag # bitwise pointer for 0x80 - kokiriAddresses = [0xE52836, 0xE53A56, 0xE51D4E, 0xE51F3E, 0xE51D96, 0xE51E1E, 0xE51E7E, 0xE51EDE, 0xE51FC6, 0xE51F96, 0xE293B6, 0xE29B8E, 0xE62EDA, 0xE630D6, 0xE62642, 0xE633AA] + kokiriAddresses = [0xE52836, 0xE53A56, 0xE51D4E, 0xE51F3E, 0xE51D96, 0xE51E1E, 0xE51E7E, 0xE51EDE, 0xE51FC6, 0xE51F96, 0xE293B6, 0xE29B8E, 0xE62EDA, 0xE630D6, 0xE62642, 0xE633AA, 0xE6369E] for kokiri in kokiriAddresses: rom.write_bytes(kokiri, [0x8C, 0x0C]) # Kokiri @@ -553,6 +553,7 @@ def patch_rom(world, rom): rom.write_bytes(0xE630D8, [0x94, 0x4F, 0x0E, 0xD4]) rom.write_bytes(0xE62644, [0x94, 0x6F, 0x0E, 0xD4]) rom.write_bytes(0xE633AC, [0x94, 0x68, 0x0E, 0xD4]) + rom.write_bytes(0xE636A0, [0x94, 0x48, 0x0E, 0xD4]) # Change adult Kokiri Forest to check for Forest Temple complete flag rom.write_bytes(0xE5369E, [0xB4, 0xAC]) From 4c32922e715774d7b97b01439f56996d50591c49 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Wed, 13 Jun 2018 20:11:12 -0500 Subject: [PATCH 132/151] better fix for sun's and warp songs situational changes to links state based on age and scene to allow cutscenes and actor scripts to terminate properly --- ASM/src/build.asm | 3 +- ASM/src/fixes.asm | 18 + ASM/src/hacks.asm | 10 + ASM/src/item_data.asm | 105 ++++++ ASM/src/items.asm | 671 +++++++++++++++++++++++++++++++++++ ASM/src/song_fix.asm | 82 +++++ ASM/temp/symbols | 778 +++++++++++++++++++++++++++++++++++++++++ Rom.py | 6 - data/base2current.json | 2 +- 9 files changed, 1667 insertions(+), 8 deletions(-) create mode 100644 ASM/src/fixes.asm create mode 100644 ASM/src/item_data.asm create mode 100644 ASM/src/items.asm create mode 100644 ASM/src/song_fix.asm create mode 100644 ASM/temp/symbols diff --git a/ASM/src/build.asm b/ASM/src/build.asm index b92cc6d7b..d636834ad 100755 --- a/ASM/src/build.asm +++ b/ASM/src/build.asm @@ -22,7 +22,7 @@ .endarea .org 0x80402000 -.area 0x1000, 0 +.area 0x2000, 0 .include "constants.asm" .include "state.asm" .include "extended_items.asm" @@ -31,6 +31,7 @@ .include "every_frame.asm" .include "menu.asm" .include "time_travel.asm" +.include "song_fix.asm" .endarea .close diff --git a/ASM/src/fixes.asm b/ASM/src/fixes.asm new file mode 100644 index 000000000..88af94d2c --- /dev/null +++ b/ASM/src/fixes.asm @@ -0,0 +1,18 @@ +save_child_b_equip: + ; t0 = save context + lw t1, 0x04 (t0) + beqz t1, @@return ; Only do this as child + nop + + lbu t1, 0x68 (t0) ; Load current B equip + beq t1, 0x3B, @@save + nop + + li t1, 0xFF + +@@save: + sb t1, 0x40 (t0) ; Save B equip, will be loaded on next adult -> child transition + +@@return: + jr ra + sb t6, 0x68 (t0) ; Displaced code diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index acd04000a..2dc2c687b 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -256,3 +256,13 @@ .org 0xBB7C58 ; In memory: 0x8038F5D8 jal item_menu_description_id_periodic nop + +; Replaces: +; addu at, at, s3 +.org 0xB54E5C ; In memory: 800DEEFC + jal suns_song_fix + +; Replaces: +; addu at, at, s3 +.org 0xB54B38 ; In memory: 800DEBD8 + jal warp_song_fix \ No newline at end of file diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm new file mode 100644 index 000000000..f5632e462 --- /dev/null +++ b/ASM/src/item_data.asm @@ -0,0 +1,105 @@ +;================================================================================================== +; Item data +;================================================================================================== + +; Dungeon indexes, used with the dungeon item / small key tables in the save context +.definelabel DEKU, 0 +.definelabel DODONGO, 1 +.definelabel JABU, 2 +.definelabel FOREST, 3 +.definelabel FIRE, 4 +.definelabel WATER, 5 +.definelabel SPIRIT, 6 +.definelabel SHADOW, 7 +.definelabel BOTW, 8 +.definelabel ICE, 9 +.definelabel TOWER, 10 +.definelabel GTG, 11 +.definelabel FORT, 12 +.definelabel CASTLE, 13 + +.definelabel ITEM_TABLE_ROW_SIZE, 0x10 + +.macro Item_Row, action_id, graphic_id, text_id, object_id, upgrade_fn, effect_fn, effect_arg1, effect_arg2 + .halfword action_id ; 0x00 + .byte graphic_id ; 0x02 + .byte text_id ; 0x03 + .halfword object_id ; 0x04 + .byte effect_arg1 ; 0x06 + .byte effect_arg2 ; 0x07 + .word effect_fn ; 0x08 + .word upgrade_fn ; 0x0C +.endmacro + +ITEM_TABLE: +; AAAA GG TT OOOO +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, hookshot_upgrade, no_effect, 0xFF, 0xFF ; 0x80 = Progressive Hookshot +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, strength_upgrade, no_effect, 0xFF, 0xFF ; 0x81 = Progressive Strength +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, bomb_bag_upgrade, no_effect, 0xFF, 0xFF ; 0x82 = Progressive Bomb Bag +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, bow_upgrade, no_effect, 0xFF, 0xFF ; 0x83 = Progressive Bow +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, slingshot_upgrade, no_effect, 0xFF, 0xFF ; 0x84 = Progressive Slingshot +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, wallet_upgrade, no_effect, 0xFF, 0xFF ; 0x85 = Progressive Wallet +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, scale_upgrade, no_effect, 0xFF, 0xFF ; 0x86 = Progressive Scale +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, nut_upgrade, no_effect, 0xFF, 0xFF ; 0x87 = Progressive Nut Capacity +Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, stick_upgrade, no_effect, 0xFF, 0xFF ; 0x88 = Progressive Stick Capacity + +Item_Row 0x00FF, 0x01, 0x43, 0x00C6, no_upgrade, give_bottle, 0x15, 0xFF ; 0x89 = Bottle with Red Potion +Item_Row 0x00FF, 0x01, 0x44, 0x00C6, no_upgrade, give_bottle, 0x16, 0xFF ; 0x8A = Bottle with Green Potion +Item_Row 0x00FF, 0x01, 0x45, 0x00C6, no_upgrade, give_bottle, 0x17, 0xFF ; 0x8B = Bottle with Blue Potion +Item_Row 0x00FF, 0x01, 0x46, 0x00C6, no_upgrade, give_bottle, 0x18, 0xFF ; 0x8C = Bottle with Fairy +Item_Row 0x00FF, 0x01, 0x47, 0x00C6, no_upgrade, give_bottle, 0x19, 0xFF ; 0x8D = Bottle with Fish +Item_Row 0x00FF, 0x01, 0x5D, 0x00C6, no_upgrade, give_bottle, 0x1C, 0xFF ; 0x8E = Bottle with Blue Fire +Item_Row 0x00FF, 0x01, 0x7A, 0x00C6, no_upgrade, give_bottle, 0x1D, 0xFF ; 0x8F = Bottle with Bugs +Item_Row 0x00FF, 0x01, 0xF9, 0x00C6, no_upgrade, give_bottle, 0x1E, 0xFF ; 0x90 = Bottle with Big Poe +Item_Row 0x00FF, 0x01, 0x97, 0x00C6, no_upgrade, give_bottle, 0x20, 0xFF ; 0x91 = Bottle with Poe + +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FOREST ; 0x92 = Forest Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FIRE ; 0x93 = Fire Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, WATER ; 0x94 = Water Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SPIRIT ; 0x95 = Spirit Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SHADOW ; 0x96 = Shadow Temple Boss Key +Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, CASTLE ; 0x97 = Ganon's Castle Boss Key + +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DEKU ; 0x98 = Deku Tree Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DODONGO ; 0x99 = Dodongo's Cavern Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, JABU ; 0x9A = Jabu Jabu Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FOREST ; 0x9B = Forest Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FIRE ; 0x9C = Fire Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, WATER ; 0x9D = Water Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SPIRIT ; 0x9E = Spirit Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SHADOW ; 0x9F = Shadow Temple Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, BOTW ; 0xA0 = Bottom of the Well Compass +Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, ICE ; 0xA1 = Ice Cavern Compass + +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DEKU ; 0xA2 = Deku Tree Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DODONGO ; 0xA3 = Dodongo's Cavern Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, JABU ; 0xA4 = Jabu Jabu Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FOREST ; 0xA5 = Forest Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FIRE ; 0xA6 = Fire Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, WATER ; 0xA7 = Water Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SPIRIT ; 0xA8 = Spirit Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SHADOW ; 0xA9 = Shadow Temple Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, BOTW ; 0xAA = Bottom of the Well Map +Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, ICE ; 0xAB = Ice Cavern Map + +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FOREST, 0xFF ; 0xAC = Forest Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FIRE, 0xFF ; 0xAD = Fire Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, WATER, 0xFF ; 0xAE = Water Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SPIRIT, 0xFF ; 0xAF = Spirit Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SHADOW, 0xFF ; 0xB0 = Shadow Temple Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, BOTW, 0xFF ; 0xB1 = Bottom of the Well Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, GTG, 0xFF ; 0xB2 = Gerudo Training Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FORT, 0xFF ; 0xB3 = Gerudo Fortress Small Key +Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, CASTLE, 0xFF ; 0xB4 = Ganon's Castle Small Key + +Item_Row 0x003D, 0x43, 0x0C, 0x00F8, no_upgrade, give_biggoron_sword, 0xFF, 0xFF ; 0xB5 = Biggoron Sword + +Item_Row 0x0083, 0x09, 0x55, 0x00B7, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB6 = Recovery Heart +Item_Row 0x0092, 0xDB, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB7 = Arrows (5) +Item_Row 0x0093, 0xDA, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB8 = Arrows (10) +Item_Row 0x0094, 0xD9, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB9 = Arrows (30) +Item_Row 0x008E, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBA = Bombs (5) +Item_Row 0x008F, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBB = Bombs (10) +Item_Row 0x0090, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBC = Bombs (20) +Item_Row 0x008C, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBD = Deku Nuts (5) +Item_Row 0x008D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBE = Deku Nuts (10) diff --git a/ASM/src/items.asm b/ASM/src/items.asm new file mode 100644 index 000000000..5852bcd51 --- /dev/null +++ b/ASM/src/items.asm @@ -0,0 +1,671 @@ +inventory_check: + andi a0, a0, 0xFF + li t0, SAVE_CONTEXT + + beq a0, 0x8C, @@return ; Deku Nuts (5) + lbu v0, 0x75 (t0) + + beq a0, 0x8D, @@return ; Deku Nuts (10) + lbu v0, 0x75 (t0) + + beq a0, 0x00, @@return ; Deku Stick + lbu v0, 0x74 (t0) + + beq a0, 0x8A, @@return ; Deku Sticks (5) + lbu v0, 0x74 (t0) + + beq a0, 0x8B, @@return ; Deku Sticks (10) + lbu v0, 0x74 (t0) + + beq a0, 0x58, @@return ; Deku Seeds (5) + li v0, 0x00 + + beq a0, 0x78, @@return ; Small Magic Jar + li v0, 0x00 + + beq a0, 0x79, @@return ; Large Magic Jar + li v0, 0x00 + + li v0, 0xFF + +@@return: + jr ra + nop + +;================================================================================================== + +override_object_npc: + lw a2, 0x0030 (sp) + lh a1, 0x0004 (a2) + j override_object + nop + +override_object_chest: + lw t9, 0x002C (sp) + lh a1, 0x0004 (t9) + j override_object + nop + +override_object: + ; Load extended Object ID + li t2, CURRENT_ITEM_DATA + lhu t3, 0x04 (t2) + beq t3, 0xFFFF, @@return + nop + + ; Override object ID + ori a1, t3, 0 + +@@return: + ; Clear any pending special item, now that it's being received + li t3, PENDING_SPECIAL_ITEM + sb r0, 0x00 (t3) + + jr ra + nop + +;================================================================================================== + +override_graphic: + ; Load extended Graphic ID + li t0, CURRENT_ITEM_DATA + lb t1, 0x02 (t0) + beq t1, -1, @@return + nop + + ; Override Graphic ID + ori v1, t1, 0 + +@@return: + ; Displaced code + abs t0, v1 + sb t0, 0x0852 (a0) + jr ra + nop + +;================================================================================================== + +override_text: + lbu a1, 0x03 (v0) ; Displaced code + + ; Load extended Text ID + li t0, CURRENT_ITEM_DATA + lbu t1, 0x03 (t0) + beq t1, 0xFF, @@return + nop + + ; Override Text ID + ori a1, t1, 0 + +@@return: + jr ra + nop + +;================================================================================================== + +override_action: + ; Displaced code + lw v0, 0x24 (sp) + lbu a1, 0x0000 (v0) + + ; Load extended Action ID + li t0, CURRENT_ITEM_DATA + lhu t1, 0x00 (t0) + beq t1, 0xFFFF, @@return + nop + + ; Override Action ID + ori a1, t1, 0 + + sw a0, 0x00 (sp) + sw a1, 0x04 (sp) + sw a2, 0x08 (sp) + addiu sp, sp, -0x18 + sw ra, 0x10 (sp) + + ; Run effect function + ; Conventions for effect functions: + ; - They receive a pointer to the save context in a0 + ; - They receive their arguments in a1 and a2 + lw t1, 0x08 (t0) ; t1 = effect function + li a0, SAVE_CONTEXT + lbu a1, 0x06 (t0) + lbu a2, 0x07 (t0) + jalr t1 + nop + + lw ra, 0x10 (sp) + addiu sp, sp, 0x18 + lw a0, 0x00 (sp) + lw a1, 0x04 (sp) + lw a2, 0x08 (sp) + +@@return: + jr ra + nop + +;================================================================================================== + +override_item_fairy_cutscene: + ; a0 = global context + ; a2 = fairy actor + lw t0, 0x1D2C (a0) ; Load switch flags + li t1, 1 + sll t1, t1, 0x18 + and v0, t0, t1 ; Isolate ZL switch + beqz v0, @@return + nop + + lhu t2, 0xA4 (a0) ; Load scene number + bne t2, 0x3D, @@return ; Use default behavior unless this is an item fairy + nop + + lhu t2, 0x02DC (a2) ; Load item fairy index + li t3, 1 + sllv t3, t3, t2 ; t3 = fairy item mask + li t4, SAVE_CONTEXT + lbu t5, 0x0EF2 (t4) ; Load fairy item flags + and t6, t5, t3 + bnez t6, @@return ; Use default behavior if the item is already obtained + nop + or t5, t5, t3 + sb t5, 0x0EF2 (t4) ; Mark fairy item as obtained + + nor t1, t1, t1 + and t0, t0, t1 ; Unset ZL switch + sw t0, 0x1D2C (a0) + + ; Load fairy item and mark it as pending + li t0, FAIRY_ITEMS + addu t0, t0, t2 + lb t0, 0x00 (t0) + li t1, PENDING_SPECIAL_ITEM + sb t0, 0x00 (t1) + + li v0, 0 ; Prevent fairy animation + +@@return: + jr ra + nop + +;================================================================================================== + +override_light_arrow_cutscene: + li t0, LIGHT_ARROW_ITEM + lb t0, 0x00 (t0) + li t1, PENDING_SPECIAL_ITEM + sb t0, 0x00 (t1) + jr ra + nop + +;================================================================================================== + +store_item_data_hook: + sb a2, 0x0424 (a3) ; Displaced code + + addiu sp, sp, -0x20 + sw v0, 0x10 (sp) + sw v1, 0x14 (sp) + sw ra, 0x18 (sp) + + jal store_item_data + nop + + lw v0, 0x10 (sp) + lw v1, 0x14 (sp) + lw ra, 0x18 (sp) + addiu sp, sp, 0x20 + jr ra + nop + +;================================================================================================== + +store_item_data: + addiu sp, sp, -0x18 + sw ra, 0x10 (sp) + + ; Clear current item data + li t0, CURRENT_ITEM_DATA + li t1, -1 + sw t1, 0x00 (t0) + sw t1, 0x04 (t0) + sw t1, 0x08 (t0) + + li t0, PLAYER_ACTOR + lb t1, 0x0424 (t0) + beqz t1, @@return + nop + + abs a0, t1 + lw a1, 0x0428 (t0) + jal lookup_override ; v0 = new item ID from override + nop + bltz v0, @@return + nop + + ori a0, v0, 0 + jal resolve_extended_item ; v0 = resolved item ID, v1 = ITEM_TABLE entry + nop + beqz v1, @@not_extended + nop + + ; Store extended item data + li t0, CURRENT_ITEM_DATA + lw t1, 0x00 (v1) + sw t1, 0x00 (t0) + lw t1, 0x04 (v1) + sw t1, 0x04 (t0) + lw t1, 0x08 (v1) + sw t1, 0x08 (t0) + b @@return + nop + +@@not_extended: + ; For non-extended item IDs, put it back in the player instance and let the game handle it + li t0, PLAYER_ACTOR + lb t1, 0x0424 (t0) + bgez t1, @@not_negative + nop + ; The input was negative (item is coming from a chest), so make the result negative + subu v0, r0, v0 +@@not_negative: + sb v0, 0x0424 (t0) + +@@return: + lw ra, 0x10 (sp) + addiu sp, sp, 0x18 + jr ra + nop + +;================================================================================================== + +lookup_override: + ; a0 = item ID being received + ; a1 = actor giving the item + + addiu sp, sp, -0x18 + sw ra, 0x10 (sp) + + jal get_override_search_key + nop + ori a0, v0, 0 + jal scan_override_table + nop + + lw ra, 0x10 (sp) + addiu sp, sp, 0x18 + jr ra + nop + +;================================================================================================== + +get_override_search_key: + ; a0 = item ID being received + ; a1 = actor giving the item + + ; Load the current scene number + li v0, GLOBAL_CONTEXT + lhu v0, 0xA4 (v0) + + li t0, 0x00 ; t0 = override type + ori t1, a0, 0 ; t1 = override ID + lhu t2, 0x00 (a1) ; t2 = actor ID + + bne t2, 0x000A, @@not_chest + nop + beq v0, 0x10, @@not_chest ; Scene 0x10 = treasure chest game, use item-based override here + nop + li t0, 0x01 + lhu t1, 0x1C (a1) + andi t1, t1, 0x1F ; t1 = chest flag +@@not_chest: + + bne t2, 0x0015, @@not_collectible + nop + li t0, 0x02 + lbu t1, 0x0141 (a1) ; t1 = collectible flag +@@not_collectible: + + ; Construct ID used to search the override table + ; v0 = (scene << 16) | (override_type << 8) | override_id + sll v0, v0, 8 + or v0, v0, t0 + sll v0, v0, 8 + or v0, v0, t1 + + jr ra + nop + +;================================================================================================== + +scan_override_table: + ; a0 = override search key + + li v0, -1 + + ; Look up override + li t0, (ITEM_OVERRIDES - 0x04) +@@lookup_loop: + addiu t0, t0, 0x04 + lw t1, 0x00 (t0) ; t1 = override entry + beqz t1, @@return ; Reached end of override table + nop + srl t2, t1, 8 ; t2 = override key + bne t2, a0, @@lookup_loop + nop + + andi v0, t1, 0xFF ; v0 = found item ID + +@@return: + jr ra + nop + +;================================================================================================== + +resolve_extended_item: + ; a0 = input item ID + + addiu sp, sp, -0x20 + sw s0, 0x10 (sp) + sw s1, 0x14 (sp) + sw ra, 0x18 (sp) + + ori v0, a0, 0 ; Return resolved item ID in v0 + +@@loop: + ori s0, v0, 0 + addiu t0, s0, -0x80 ; t0 = index into extended ITEM_TABLE + bltz t0, @@not_extended ; Item IDs in range 0x00 - 0x7F are not extended + nop + ; Load table entry + li s1, ITEM_TABLE + li t1, ITEM_TABLE_ROW_SIZE + mult t0, t1 + mflo t0 + addu s1, s1, t0 ; s1 = pointer to table entry + ; Check whether this item will upgrade into another item + ; Conventions for upgrade functions: + ; - They receive a pointer to the save context in a0 + ; - They receive their item ID in a1 + ; - They store their result in v0 + li a0, SAVE_CONTEXT + ori a1, s0, 0 + lw t0, 0x0C (s1) + jalr t0 ; v0 = upgraded item ID + nop + ; If the upgrade function returned a new item ID, start resolution over again + bne v0, s0, @@loop + nop + + ori v1, s1, 0 ; Return pointer to ITEM_TABLE entry in v1 + b @@return + nop + +@@not_extended: + li v1, 0 + +@@return: + lw s0, 0x10 (sp) + lw s1, 0x14 (sp) + lw ra, 0x18 (sp) + addiu sp, sp, 0x20 + jr ra + nop + +;================================================================================================== +; Item upgrade functions +;================================================================================================== + +no_upgrade: + jr ra + ori v0, a1, 0 + +;================================================================================================== + +hookshot_upgrade: + lbu t0, 0x7D (a0) ; Load hookshot from inventory + + beq t0, 0xFF, @@return + li v0, 0x08 ; Hookshot + + li v0, 0x09 ; Longshot + +@@return: + jr ra + nop + +;================================================================================================== + +strength_upgrade: + lbu t0, 0xA3 (a0) ; Load strength from inventory + andi t0, t0, 0xC0 ; Mask bits to isolate strength + + beqz t0, @@return + li v0, 0x54 ; Goron Bracelet + + beq t0, 0x40, @@return + li v0, 0x35 ; Silver Gauntlets + + li v0, 0x36 ; Gold Gauntlets + +@@return: + jr ra + nop + +;================================================================================================== + +bomb_bag_upgrade: + lbu t0, 0xA3 (a0) ; Load bomb bag from inventory + andi t0, t0, 0x18 ; Mask bits to isolate bomb bag + + beqz t0, @@return + li v0, 0x32 ; Bomb Bag + + beq t0, 0x08, @@return + li v0, 0x33 ; Bigger Bomb Bag + + li v0, 0x34 ; Biggest Bomb Bag + +@@return: + jr ra + nop + +;================================================================================================== + +bow_upgrade: + lbu t0, 0xA3 (a0) ; Load quiver from inventory + andi t0, t0, 0x03 ; Mask bits to isolate quiver + + beqz t0, @@return + li v0, 0x04 ; Bow + + beq t0, 0x01, @@return + li v0, 0x30 ; Big Quiver + + li v0, 0x31 ; Biggest Quiver + +@@return: + jr ra + nop + +;================================================================================================== + +slingshot_upgrade: + lbu t0, 0xA2 (a0) ; Load bullet bag from inventory + andi t0, t0, 0xC0 ; Mask bits to isolate bullet bag + + beqz t0, @@return + li v0, 0x05 ; Slingshot + + beq t0, 0x40, @@return + li v0, 0x60 ; Bullet Bag (40) + + li v0, 0x7B ; Bullet Bag (50) + +@@return: + jr ra + nop + +;================================================================================================== + +wallet_upgrade: + lbu t0, 0xA2 (a0) ; Load wallet from inventory + andi t0, t0, 0x30 ; Mask bits to isolate wallet + + beqz t0, @@return + li v0, 0x45 ; Adult's Wallet + + li v0, 0x46 ; Giant's Wallet + +@@return: + jr ra + nop + +;================================================================================================== + +scale_upgrade: + lbu t0, 0xA2 (a0) ; Load scale from inventory + andi t0, t0, 0x06 ; # Mask bits to isolate scale + + beqz t0, @@return + li v0, 0x37 ; Silver Scale + + li v0, 0x38 ; Gold Scale + +@@return: + jr ra + nop + +;================================================================================================== + +nut_upgrade: + lbu t0, 0xA1 (a0) ; Load nut limit from inventory + andi t0, t0, 0x30 ; Mask bits to isolate nut limit + + beqz t0, @@return + li v0, 0x79 ; 30 Nuts + + li v0, 0x7A ; 40 Nuts + +@@return: + jr ra + nop + +;================================================================================================== + +stick_upgrade: + lbu t0, 0xA1 (a0) ; Load stick limit from inventory + andi t0, t0, 0x06 ; Mask bits to isolate stick limit + + beqz t0, @@return + li v0, 0x77 ; 20 Sticks + + li v0, 0x78 ; 30 Sticks + +@@return: + jr ra + nop + +;================================================================================================== + +arrows_to_rupee: + lbu t0, 0xA3 (a0) ; Load quiver from inventory + andi t0, t0, 0x03 ; Mask bits to isolate quiver + + beqz t0, @@return + li v0, 0x4D ; Blue Rupee + + ori v0, a1, 0 + +@@return: + jr ra + nop + +;================================================================================================== + +bombs_to_rupee: + lbu t0, 0xA3 (a0) ; Load bomb bag from inventory + andi t0, t0, 0x18 ; Mask bits to isolate bomb bag + + beqz t0, @@return + li v0, 0x4D ; Blue Rupee + + ori v0, a1, 0 + +@@return: + jr ra + nop + +;================================================================================================== +; Item effect functions +;================================================================================================== + +no_effect: + jr ra + nop + +;================================================================================================== + +give_biggoron_sword: + ; a0 = save context + li t0, 0x01 + sb t0, 0x3E (a0) ; Set flag to make the sword durable + jr ra + nop + +;================================================================================================== + +give_bottle: + ; a0 = save context + ; a1 = item code to store + addiu t0, a0, 0x86 ; t0 = First bottle slot + li t1, -1 ; t1 = Bottle slot offset + +@@loop: + addiu t1, t1, 1 + bgt t1, 3, @@return ; No free bottle slots + nop + + ; Check whether slot is full + addu t2, t0, t1 + lbu t3, 0x00 (t2) + bne t3, 0xFF, @@loop + nop + + ; Found an open slot + sb a1, 0x00 (t2) + +@@return: + jr ra + nop + +;================================================================================================== + +give_dungeon_item: + ; a0 = save context + ; a1 = mask (0x01 = boss key, 0x02 = compass, 0x04 = map) + ; a2 = dungeon index + addiu t0, a0, 0xA8 + addu t0, t0, a2 ; t0 = address of this dungeon's items + lbu t1, 0x00 (t0) + or t1, t1, a1 + sb t1, 0x00 (t0) + jr ra + nop + +;================================================================================================== + +give_small_key: + ; a0 = save context + ; a1 = dungeon index + addiu t0, a0, 0xBC + addu t0, t0, a1 ; t0 = address of this dungeon's key count + lb t1, 0x00 (t0) + bgez t1, @not_negative + nop + li t1, 0x00 +@not_negative: + addiu t1, t1, 1 + sb t1, 0x00 (t0) + jr ra + nop diff --git a/ASM/src/song_fix.asm b/ASM/src/song_fix.asm new file mode 100644 index 000000000..fa13180f1 --- /dev/null +++ b/ASM/src/song_fix.asm @@ -0,0 +1,82 @@ +;================================================================================================== +; Fixes songs in certain scenes to allow for various song learning function to properly play +; through their scripts. +;================================================================================================== +suns_song_fix: + addu at, at, s3 + addi t7, r0, 0x0047 + bne t7, t2, @@return + +@@sacred_forest_meadow: + lui v0, 0x0056 + addi v0, v0, 0x2FE8 + lw t7, 0x00A4(s3) + bne t7, v0, @@crater + lui v0, 0x0061 + addiu t9, r0, 0x0003 + +@@crater: + addi v0, v0, 0x0FE8 + bne t7, v0, @@courtyard + lui v0, 0x004A + addiu t9, r0, 0x0003 + +@@courtyard: + addi v0, v0, 0x2FE8 + bne t7, v0, @@age_check + lui v0, 0x8012 + addiu t9, r0, 0x0003 + +@@age_check: + lw v0, 0xa5d4(v0) + bnez v0, @@child + +@@windmill: + lui v0, 0x0048 + addi v0, v0, 0x30E8 + bne t7, v0, @@temple_of_time + lui v0, 0x0043 + addiu t9, r0, 0x0003 + +@@temple_of_time: + addi v0, v0, 0x1EE8 + bne t7, v0, @@return + nop + addiu t9, r0, 0x0003 + b @@return + +@@child: + lui v0, 0x0063 + addi v0, v0, 0x11E8 + bne t7, v0, @@return + nop + addiu t9, r0, 0x0003 + +@@return: + jr ra + nop + +;================================================================================================== +warp_song_fix: + addu at, at, s3 + lui v0, 0x8012 + lw v0, 0xa5d4(v0) + bnez v0, @@child + lw t7, 0x00a4(s3) + lui v0, 0x0048 + addi v0, v0, 0x30e8 + bne t7, v0, @@return + nop + addiu t9, r0, 0x0003 + b @@return + +@@child: + lui v0, 0x0063 + addi v0, v0, 0x11e8 + bne t7, v0, @@return + nop + addiu t9, r0, 0x0003 + +@@return: + jr ra + nop \ No newline at end of file diff --git a/ASM/temp/symbols b/ASM/temp/symbols new file mode 100644 index 000000000..872c81d69 --- /dev/null +++ b/ASM/temp/symbols @@ -0,0 +1,778 @@ +00000000 0 +00000000 .byt:4000000 +00000010 ITEM_TABLE_ROW_SIZE +008A9C00 .byt:0400 +00DB13D3 .byt:0001 +00DF264F .byt:0001 +00E2F093 .byt:0001 +00EC9CE7 .byt:0001 +8011A5D0 SAVE_CONTEXT +801C84A0 GLOBAL_CONTEXT +801DAA30 PLAYER_ACTOR +80401000 .byt:0400 +80401000 ITEM_OVERRIDES +80401400 .byt:0001 +80401400 LIGHT_ARROW_ITEM +80401401 .byt:0001 +80401401 FAIRY_ITEMS +80401402 .byt:0001 +80401403 .byt:0001 +80401404 .byt:0001 +80401405 .byt:0001 +80401406 .byt:0001 +80401408 .byt:0BF8 +80402000 .dbl:0010 +80402000 EXTENDED_ITEM_DATA +80402010 .byt:0001 +80402010 PENDING_SPECIAL_ITEM +80402014 .dbl:0004 +80402014 TIME_TRAVEL_SAVED_EQUIPS +80402018 .dbl:0004 +8040201C .wrd:0002 +8040201E .wrd:0002 +80402020 .byt:0001 +80402020 ITEM_TABLE +80402021 .byt:0001 +80402022 .byt:0001 +80402023 .byt:0001 +80402024 .wrd:0002 +80402026 .byt:0001 +80402027 .byt:0001 +80402028 .dbl:0004 +8040202C .dbl:0004 +80402030 .byt:0001 +80402031 .byt:0001 +80402032 .byt:0001 +80402033 .byt:0001 +80402034 .wrd:0002 +80402036 .byt:0001 +80402037 .byt:0001 +80402038 .dbl:0004 +8040203C .dbl:0004 +80402040 .byt:0001 +80402041 .byt:0001 +80402042 .byt:0001 +80402043 .byt:0001 +80402044 .wrd:0002 +80402046 .byt:0001 +80402047 .byt:0001 +80402048 .dbl:0004 +8040204C .dbl:0004 +80402050 .byt:0001 +80402051 .byt:0001 +80402052 .byt:0001 +80402053 .byt:0001 +80402054 .wrd:0002 +80402056 .byt:0001 +80402057 .byt:0001 +80402058 .dbl:0004 +8040205C .dbl:0004 +80402060 .byt:0001 +80402061 .byt:0001 +80402062 .byt:0001 +80402063 .byt:0001 +80402064 .wrd:0002 +80402066 .byt:0001 +80402067 .byt:0001 +80402068 .dbl:0004 +8040206C .dbl:0004 +80402070 .byt:0001 +80402071 .byt:0001 +80402072 .byt:0001 +80402073 .byt:0001 +80402074 .wrd:0002 +80402076 .byt:0001 +80402077 .byt:0001 +80402078 .dbl:0004 +8040207C .dbl:0004 +80402080 .byt:0001 +80402081 .byt:0001 +80402082 .byt:0001 +80402083 .byt:0001 +80402084 .wrd:0002 +80402086 .byt:0001 +80402087 .byt:0001 +80402088 .dbl:0004 +8040208C .dbl:0004 +80402090 .byt:0001 +80402091 .byt:0001 +80402092 .byt:0001 +80402093 .byt:0001 +80402094 .wrd:0002 +80402096 .byt:0001 +80402097 .byt:0001 +80402098 .dbl:0004 +8040209C .dbl:0004 +804020A0 .byt:0001 +804020A1 .byt:0001 +804020A2 .byt:0001 +804020A3 .byt:0001 +804020A4 .wrd:0002 +804020A6 .byt:0001 +804020A7 .byt:0001 +804020A8 .dbl:0004 +804020AC .dbl:0004 +804020B0 .byt:0001 +804020B1 .byt:0001 +804020B2 .byt:0001 +804020B3 .byt:0001 +804020B4 .wrd:0002 +804020B6 .byt:0001 +804020B7 .byt:0001 +804020B8 .dbl:0004 +804020BC .dbl:0004 +804020C0 .byt:0001 +804020C1 .byt:0001 +804020C2 .byt:0001 +804020C3 .byt:0001 +804020C4 .wrd:0002 +804020C6 .byt:0001 +804020C7 .byt:0001 +804020C8 .dbl:0004 +804020CC .dbl:0004 +804020D0 .byt:0001 +804020D1 .byt:0001 +804020D2 .byt:0001 +804020D3 .byt:0001 +804020D4 .wrd:0002 +804020D6 .byt:0001 +804020D7 .byt:0001 +804020D8 .dbl:0004 +804020DC .dbl:0004 +804020E0 .byt:0001 +804020E1 .byt:0001 +804020E2 .byt:0001 +804020E3 .byt:0001 +804020E4 .wrd:0002 +804020E6 .byt:0001 +804020E7 .byt:0001 +804020E8 .dbl:0004 +804020EC .dbl:0004 +804020F0 .byt:0001 +804020F1 .byt:0001 +804020F2 .byt:0001 +804020F3 .byt:0001 +804020F4 .wrd:0002 +804020F6 .byt:0001 +804020F7 .byt:0001 +804020F8 .dbl:0004 +804020FC .dbl:0004 +80402100 .byt:0001 +80402101 .byt:0001 +80402102 .byt:0001 +80402103 .byt:0001 +80402104 .wrd:0002 +80402106 .byt:0001 +80402107 .byt:0001 +80402108 .dbl:0004 +8040210C .dbl:0004 +80402110 .byt:0001 +80402111 .byt:0001 +80402112 .byt:0001 +80402113 .byt:0001 +80402114 .wrd:0002 +80402116 .byt:0001 +80402117 .byt:0001 +80402118 .dbl:0004 +8040211C .dbl:0004 +80402120 .byt:0001 +80402121 .byt:0001 +80402122 .byt:0001 +80402123 .byt:0001 +80402124 .wrd:0002 +80402126 .byt:0001 +80402127 .byt:0001 +80402128 .dbl:0004 +8040212C .dbl:0004 +80402130 .byt:0001 +80402131 .byt:0001 +80402132 .byt:0001 +80402133 .byt:0001 +80402134 .wrd:0002 +80402136 .byt:0001 +80402137 .byt:0001 +80402138 .dbl:0004 +8040213C .dbl:0004 +80402140 .byt:0001 +80402141 .byt:0001 +80402142 .byt:0001 +80402143 .byt:0001 +80402144 .wrd:0002 +80402146 .byt:0001 +80402147 .byt:0001 +80402148 .dbl:0004 +8040214C .dbl:0004 +80402150 .byt:0001 +80402151 .byt:0001 +80402152 .byt:0001 +80402153 .byt:0001 +80402154 .wrd:0002 +80402156 .byt:0001 +80402157 .byt:0001 +80402158 .dbl:0004 +8040215C .dbl:0004 +80402160 .byt:0001 +80402161 .byt:0001 +80402162 .byt:0001 +80402163 .byt:0001 +80402164 .wrd:0002 +80402166 .byt:0001 +80402167 .byt:0001 +80402168 .dbl:0004 +8040216C .dbl:0004 +80402170 .byt:0001 +80402171 .byt:0001 +80402172 .byt:0001 +80402173 .byt:0001 +80402174 .wrd:0002 +80402176 .byt:0001 +80402177 .byt:0001 +80402178 .dbl:0004 +8040217C .dbl:0004 +80402180 .byt:0001 +80402181 .byt:0001 +80402182 .byt:0001 +80402183 .byt:0001 +80402184 .wrd:0002 +80402186 .byt:0001 +80402187 .byt:0001 +80402188 .dbl:0004 +8040218C .dbl:0004 +80402190 .byt:0001 +80402191 .byt:0001 +80402192 .byt:0001 +80402193 .byt:0001 +80402194 .wrd:0002 +80402196 .byt:0001 +80402197 .byt:0001 +80402198 .dbl:0004 +8040219C .dbl:0004 +804021A0 .byt:0001 +804021A1 .byt:0001 +804021A2 .byt:0001 +804021A3 .byt:0001 +804021A4 .wrd:0002 +804021A6 .byt:0001 +804021A7 .byt:0001 +804021A8 .dbl:0004 +804021AC .dbl:0004 +804021B0 .byt:0001 +804021B1 .byt:0001 +804021B2 .byt:0001 +804021B3 .byt:0001 +804021B4 .wrd:0002 +804021B6 .byt:0001 +804021B7 .byt:0001 +804021B8 .dbl:0004 +804021BC .dbl:0004 +804021C0 .byt:0001 +804021C1 .byt:0001 +804021C2 .byt:0001 +804021C3 .byt:0001 +804021C4 .wrd:0002 +804021C6 .byt:0001 +804021C7 .byt:0001 +804021C8 .dbl:0004 +804021CC .dbl:0004 +804021D0 .byt:0001 +804021D1 .byt:0001 +804021D2 .byt:0001 +804021D3 .byt:0001 +804021D4 .wrd:0002 +804021D6 .byt:0001 +804021D7 .byt:0001 +804021D8 .dbl:0004 +804021DC .dbl:0004 +804021E0 .byt:0001 +804021E1 .byt:0001 +804021E2 .byt:0001 +804021E3 .byt:0001 +804021E4 .wrd:0002 +804021E6 .byt:0001 +804021E7 .byt:0001 +804021E8 .dbl:0004 +804021EC .dbl:0004 +804021F0 .byt:0001 +804021F1 .byt:0001 +804021F2 .byt:0001 +804021F3 .byt:0001 +804021F4 .wrd:0002 +804021F6 .byt:0001 +804021F7 .byt:0001 +804021F8 .dbl:0004 +804021FC .dbl:0004 +80402200 .byt:0001 +80402201 .byt:0001 +80402202 .byt:0001 +80402203 .byt:0001 +80402204 .wrd:0002 +80402206 .byt:0001 +80402207 .byt:0001 +80402208 .dbl:0004 +8040220C .dbl:0004 +80402210 .byt:0001 +80402211 .byt:0001 +80402212 .byt:0001 +80402213 .byt:0001 +80402214 .wrd:0002 +80402216 .byt:0001 +80402217 .byt:0001 +80402218 .dbl:0004 +8040221C .dbl:0004 +80402220 .byt:0001 +80402221 .byt:0001 +80402222 .byt:0001 +80402223 .byt:0001 +80402224 .wrd:0002 +80402226 .byt:0001 +80402227 .byt:0001 +80402228 .dbl:0004 +8040222C .dbl:0004 +80402230 .byt:0001 +80402231 .byt:0001 +80402232 .byt:0001 +80402233 .byt:0001 +80402234 .wrd:0002 +80402236 .byt:0001 +80402237 .byt:0001 +80402238 .dbl:0004 +8040223C .dbl:0004 +80402240 .byt:0001 +80402241 .byt:0001 +80402242 .byt:0001 +80402243 .byt:0001 +80402244 .wrd:0002 +80402246 .byt:0001 +80402247 .byt:0001 +80402248 .dbl:0004 +8040224C .dbl:0004 +80402250 .byt:0001 +80402251 .byt:0001 +80402252 .byt:0001 +80402253 .byt:0001 +80402254 .wrd:0002 +80402256 .byt:0001 +80402257 .byt:0001 +80402258 .dbl:0004 +8040225C .dbl:0004 +80402260 .byt:0001 +80402261 .byt:0001 +80402262 .byt:0001 +80402263 .byt:0001 +80402264 .wrd:0002 +80402266 .byt:0001 +80402267 .byt:0001 +80402268 .dbl:0004 +8040226C .dbl:0004 +80402270 .byt:0001 +80402271 .byt:0001 +80402272 .byt:0001 +80402273 .byt:0001 +80402274 .wrd:0002 +80402276 .byt:0001 +80402277 .byt:0001 +80402278 .dbl:0004 +8040227C .dbl:0004 +80402280 .byt:0001 +80402281 .byt:0001 +80402282 .byt:0001 +80402283 .byt:0001 +80402284 .wrd:0002 +80402286 .byt:0001 +80402287 .byt:0001 +80402288 .dbl:0004 +8040228C .dbl:0004 +80402290 .byt:0001 +80402291 .byt:0001 +80402292 .byt:0001 +80402293 .byt:0001 +80402294 .wrd:0002 +80402296 .byt:0001 +80402297 .byt:0001 +80402298 .dbl:0004 +8040229C .dbl:0004 +804022A0 .byt:0001 +804022A1 .byt:0001 +804022A2 .byt:0001 +804022A3 .byt:0001 +804022A4 .wrd:0002 +804022A6 .byt:0001 +804022A7 .byt:0001 +804022A8 .dbl:0004 +804022AC .dbl:0004 +804022B0 .byt:0001 +804022B1 .byt:0001 +804022B2 .byt:0001 +804022B3 .byt:0001 +804022B4 .wrd:0002 +804022B6 .byt:0001 +804022B7 .byt:0001 +804022B8 .dbl:0004 +804022BC .dbl:0004 +804022C0 .byt:0001 +804022C1 .byt:0001 +804022C2 .byt:0001 +804022C3 .byt:0001 +804022C4 .wrd:0002 +804022C6 .byt:0001 +804022C7 .byt:0001 +804022C8 .dbl:0004 +804022CC .dbl:0004 +804022D0 .byt:0001 +804022D1 .byt:0001 +804022D2 .byt:0001 +804022D3 .byt:0001 +804022D4 .wrd:0002 +804022D6 .byt:0001 +804022D7 .byt:0001 +804022D8 .dbl:0004 +804022DC .dbl:0004 +804022E0 .byt:0001 +804022E1 .byt:0001 +804022E2 .byt:0001 +804022E3 .byt:0001 +804022E4 .wrd:0002 +804022E6 .byt:0001 +804022E7 .byt:0001 +804022E8 .dbl:0004 +804022EC .dbl:0004 +804022F0 .byt:0001 +804022F1 .byt:0001 +804022F2 .byt:0001 +804022F3 .byt:0001 +804022F4 .wrd:0002 +804022F6 .byt:0001 +804022F7 .byt:0001 +804022F8 .dbl:0004 +804022FC .dbl:0004 +80402300 .byt:0001 +80402301 .byt:0001 +80402302 .byt:0001 +80402303 .byt:0001 +80402304 .wrd:0002 +80402306 .byt:0001 +80402307 .byt:0001 +80402308 .dbl:0004 +8040230C .dbl:0004 +80402310 .byt:0001 +80402311 .byt:0001 +80402312 .byt:0001 +80402313 .byt:0001 +80402314 .wrd:0002 +80402316 .byt:0001 +80402317 .byt:0001 +80402318 .dbl:0004 +8040231C .dbl:0004 +80402320 .byt:0001 +80402321 .byt:0001 +80402322 .byt:0001 +80402323 .byt:0001 +80402324 .wrd:0002 +80402326 .byt:0001 +80402327 .byt:0001 +80402328 .dbl:0004 +8040232C .dbl:0004 +80402330 .byt:0001 +80402331 .byt:0001 +80402332 .byt:0001 +80402333 .byt:0001 +80402334 .wrd:0002 +80402336 .byt:0001 +80402337 .byt:0001 +80402338 .dbl:0004 +8040233C .dbl:0004 +80402340 .byt:0001 +80402341 .byt:0001 +80402342 .byt:0001 +80402343 .byt:0001 +80402344 .wrd:0002 +80402346 .byt:0001 +80402347 .byt:0001 +80402348 .dbl:0004 +8040234C .dbl:0004 +80402350 .byt:0001 +80402351 .byt:0001 +80402352 .byt:0001 +80402353 .byt:0001 +80402354 .wrd:0002 +80402356 .byt:0001 +80402357 .byt:0001 +80402358 .dbl:0004 +8040235C .dbl:0004 +80402360 .byt:0001 +80402361 .byt:0001 +80402362 .byt:0001 +80402363 .byt:0001 +80402364 .wrd:0002 +80402366 .byt:0001 +80402367 .byt:0001 +80402368 .dbl:0004 +8040236C .dbl:0004 +80402370 .byt:0001 +80402371 .byt:0001 +80402372 .byt:0001 +80402373 .byt:0001 +80402374 .wrd:0002 +80402376 .byt:0001 +80402377 .byt:0001 +80402378 .dbl:0004 +8040237C .dbl:0004 +80402380 .byt:0001 +80402381 .byt:0001 +80402382 .byt:0001 +80402383 .byt:0001 +80402384 .wrd:0002 +80402386 .byt:0001 +80402387 .byt:0001 +80402388 .dbl:0004 +8040238C .dbl:0004 +80402390 .byt:0001 +80402391 .byt:0001 +80402392 .byt:0001 +80402393 .byt:0001 +80402394 .wrd:0002 +80402396 .byt:0001 +80402397 .byt:0001 +80402398 .dbl:0004 +8040239C .dbl:0004 +804023A0 .byt:0001 +804023A1 .byt:0001 +804023A2 .byt:0001 +804023A3 .byt:0001 +804023A4 .wrd:0002 +804023A6 .byt:0001 +804023A7 .byt:0001 +804023A8 .dbl:0004 +804023AC .dbl:0004 +804023B0 .byt:0001 +804023B1 .byt:0001 +804023B2 .byt:0001 +804023B3 .byt:0001 +804023B4 .wrd:0002 +804023B6 .byt:0001 +804023B7 .byt:0001 +804023B8 .dbl:0004 +804023BC .dbl:0004 +804023C0 .byt:0001 +804023C1 .byt:0001 +804023C2 .byt:0001 +804023C3 .byt:0001 +804023C4 .wrd:0002 +804023C6 .byt:0001 +804023C7 .byt:0001 +804023C8 .dbl:0004 +804023CC .dbl:0004 +804023D0 .byt:0001 +804023D1 .byt:0001 +804023D2 .byt:0001 +804023D3 .byt:0001 +804023D4 .wrd:0002 +804023D6 .byt:0001 +804023D7 .byt:0001 +804023D8 .dbl:0004 +804023DC .dbl:0004 +804023E0 .byt:0001 +804023E1 .byt:0001 +804023E2 .byt:0001 +804023E3 .byt:0001 +804023E4 .wrd:0002 +804023E6 .byt:0001 +804023E7 .byt:0001 +804023E8 .dbl:0004 +804023EC .dbl:0004 +804023F0 .byt:0001 +804023F1 .byt:0001 +804023F2 .byt:0001 +804023F3 .byt:0001 +804023F4 .wrd:0002 +804023F6 .byt:0001 +804023F7 .byt:0001 +804023F8 .dbl:0004 +804023FC .dbl:0004 +80402400 .byt:0001 +80402401 .byt:0001 +80402402 .byt:0001 +80402403 .byt:0001 +80402404 .wrd:0002 +80402406 .byt:0001 +80402407 .byt:0001 +80402408 .dbl:0004 +8040240C .dbl:0004 +80402410 .byt:0001 +80402411 .byt:0001 +80402412 .byt:0001 +80402413 .byt:0001 +80402414 .wrd:0002 +80402416 .byt:0001 +80402417 .byt:0001 +80402418 .dbl:0004 +8040241C .dbl:0004 +80402420 .byt:0001 +80402421 .byt:0001 +80402422 .byt:0001 +80402423 .byt:0001 +80402424 .wrd:0002 +80402426 .byt:0001 +80402427 .byt:0001 +80402428 .dbl:0004 +8040242C .dbl:0004 +80402430 .byt:0001 +80402431 .byt:0001 +80402432 .byt:0001 +80402433 .byt:0001 +80402434 .wrd:0002 +80402436 .byt:0001 +80402437 .byt:0001 +80402438 .dbl:0004 +8040243C .dbl:0004 +80402440 no_upgrade +80402448 hookshot_upgrade +8040245C @@return +80402464 strength_upgrade +80402484 @@return +8040248C bomb_bag_upgrade +804024AC @@return +804024B4 bow_upgrade +804024D4 @@return +804024DC slingshot_upgrade +804024FC @@return +80402504 wallet_upgrade +80402518 @@return +80402520 scale_upgrade +80402534 @@return +8040253C nut_upgrade +80402550 @@return +80402558 stick_upgrade +8040256C @@return +80402574 magic_upgrade +80402584 @@return +8040258C arrows_to_rupee +804025A0 @@return +804025A8 bombs_to_rupee +804025BC @@return +804025C4 no_effect +804025CC give_biggoron_sword +804025DC give_bottle +804025E4 @@loop +80402610 @@return +80402618 give_dungeon_item +80402634 give_small_key +8040264C @not_negative +8040265C give_defense +8040267C give_magic +8040269C double_magic +804026C4 inventory_check +80402730 @@return +80402738 override_object_npc +80402748 override_object_chest +80402758 override_object +80402770 @@return +80402784 override_graphic +8040279C @@return +804027B4 override_text +804027D0 @@return +804027D8 override_action +8040283C @@return +80402844 store_item_data_hook +80402878 store_item_data +8040290C @@update_base_game +8040293C @@not_chest +8040294C @@not_negative +80402950 @@return +80402960 lookup_override +80402988 @@return +80402998 get_override_search_key +804029E8 @@valid_chest +804029F0 @@not_chest +80402A20 @@valid_collectable +80402A28 @@not_collectable +80402A38 @@return +80402A40 scan_override_table +80402A4C @@lookup_loop +80402A6C @@return +80402A74 resolve_extended_item +80402A88 @@loop +80402ADC @@not_extended +80402AE0 @@return +80402AF8 override_great_fairy_cutscene +80402B50 @@item_fairy +80402B70 @@give_item +80402B9C @@return +80402BA4 override_light_arrow_cutscene +80402BC4 every_frame +80402C18 @@no_pending_item +80402C40 item_menu_description_id_periodic +80402C54 @@item_menu_description_id_return_00000000 +80402C5C item_menu_description_id_immediate_1 +80402C70 @@item_menu_description_id_return_00000001 +80402C78 item_menu_description_id_immediate_2 +80402C8C @@item_menu_description_id_return_00000002 +80402C94 item_menu_description_id_immediate_3 +80402CA8 @@item_menu_description_id_return_00000003 +80402CB0 before_time_travel +80402CE0 after_time_travel +80402D1C @@going_back +80402D24 @@done +80402D54 update_c_button +80402D80 @@return +80402D88 after_going_forward +80402DC4 @@no_init +80402DD4 after_going_back +80402E04 @@not_swordless +80402E0C initialize_adult +80402E34 @@no_mirror_shield +80402E74 init_adult_button +80402EA0 @@empty +80402EA8 @@loop +80402F00 @@set_empty +80402F0C @@return +80402F14 .byt:0001 +80402F14 ADULT_INIT_ITEMS +80402F15 .byt:0001 +80402F16 .byt:0001 +80402F17 .byt:0001 +80402F18 .byt:0001 +80402F19 .byt:0001 +80402F1A .byt:0001 +80402F1B .byt:0001 +80402F1C .byt:0001 +80402F20 .byt:0001 +80402F20 ADULT_VALID_ITEMS +80402F21 .byt:0001 +80402F22 .byt:0001 +80402F23 .byt:0001 +80402F24 .byt:0001 +80402F25 .byt:0001 +80402F26 .byt:0001 +80402F27 .byt:0001 +80402F28 .byt:0001 +80402F29 .byt:0001 +80402F2A .byt:0001 +80402F2B .byt:0001 +80402F2C .byt:0001 +80402F2D .byt:0001 +80402F2E .byt:0001 +80402F2F .byt:0001 +80402F30 .byt:0001 +80402F31 .byt:0001 +80402F32 .byt:0001 +80402F33 .byt:0001 +80402F34 .byt:0001 +80402F35 .byt:0001 +80402F36 .byt:0001 +80402F37 .byt:0001 +80402F38 suns_song_fix +80402F44 @@sacred_forest_meadow +80402F5C @@crater +80402F6C @@courtyard +80402F7C @@age_check +80402F84 @@windmill +80402F98 @@temple_of_time +80402FAC @@child +80402FC0 @@return +80402FC4 warp_song_fix +80402FF0 @@child +80403004 @@return +80403008 .byt:0FF8 +80410000 DUMMY_ACTOR + \ No newline at end of file diff --git a/Rom.py b/Rom.py index dc9ff7fc7..8b90eb80d 100644 --- a/Rom.py +++ b/Rom.py @@ -617,12 +617,6 @@ def patch_rom(world, rom): # Allow owl to always carry the kid down Death Mountain rom.write_bytes(0xE304F0, [0x24, 0x0E, 0x00, 0x01]) - # Fix warp song learning to work outside of cutscenes - rom.write_byte(0xB54B3F, 0x03) - - # Fix sun's song learning in all scenes - rom.write_byte(0xB54E63, 0x03) - # Forbid Sun's Song from a bunch of cutscenes Suns_scenes = [0x2016FC9, 0x2017219, 0x20173D9, 0x20174C9, 0x2017679, 0x20C1539, 0x20C15D9, 0x21A0719, 0x21A07F9, 0x2E90129, 0x2E901B9, 0x2E90249, 0x225E829, 0x225E939, 0x306D009] for address in Suns_scenes: diff --git a/data/base2current.json b/data/base2current.json index 953ca8807..2aae1427e 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"11881272": [12, 16, 11, 237]}, {"11882076": [12, 16, 11, 206]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}, {"55062329": [51, 8, 33, 32, 15]}, {"55062335": [71, 21, 234]}, {"55062339": [26, 52, 2, 86, 47, 142, 111]}, {"55062347": [164]}, {"55062349": [15, 122, 3, 21, 226]}, {"55062355": [2, 52, 2, 97, 15, 36, 25]}, {"55062363": [3, 21, 226]}, {"55062367": [2, 52, 2, 74, 47, 36, 25]}, {"55062375": [3, 21, 226]}, {"55062379": [2, 60, 2, 128, 18, 36, 25]}, {"55062387": [3, 140, 66, 165, 212, 20, 64]}, {"55062395": [8, 52, 2, 72, 48, 21, 226]}, {"55062403": [2, 52, 2, 67, 30, 36, 25]}, {"55062411": [3, 21, 226]}, {"55062415": [7]}, {"55062420": [36, 25]}, {"55062423": [3, 16]}, {"55062427": [4, 52, 2, 99, 17, 21, 226]}, {"55062435": [2]}, {"55062440": [36, 25]}, {"55062443": [3, 3, 224]}, {"55062447": [8]}, {"55062453": [51, 8, 33, 60, 2, 128, 18, 140, 66, 165, 212, 20, 64]}, {"55062467": [7, 142, 111]}, {"55062471": [164]}, {"55062473": [15, 122, 3, 52, 2, 72, 48, 21, 226]}, {"55062483": [7]}, {"55062488": [36, 25]}, {"55062491": [3, 16]}, {"55062495": [4, 52, 2, 99, 17, 21, 226]}, {"55062503": [2]}, {"55062508": [36, 25]}, {"55062511": [3, 3, 224]}, {"55062515": [8]}] \ No newline at end of file From ba96822fa1d0cdf9a3a432d9e18ce9f5052b2f8d Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Wed, 13 Jun 2018 20:25:44 -0500 Subject: [PATCH 133/151] Delete symbols --- ASM/temp/symbols | 778 ----------------------------------------------- 1 file changed, 778 deletions(-) delete mode 100644 ASM/temp/symbols diff --git a/ASM/temp/symbols b/ASM/temp/symbols deleted file mode 100644 index 872c81d69..000000000 --- a/ASM/temp/symbols +++ /dev/null @@ -1,778 +0,0 @@ -00000000 0 -00000000 .byt:4000000 -00000010 ITEM_TABLE_ROW_SIZE -008A9C00 .byt:0400 -00DB13D3 .byt:0001 -00DF264F .byt:0001 -00E2F093 .byt:0001 -00EC9CE7 .byt:0001 -8011A5D0 SAVE_CONTEXT -801C84A0 GLOBAL_CONTEXT -801DAA30 PLAYER_ACTOR -80401000 .byt:0400 -80401000 ITEM_OVERRIDES -80401400 .byt:0001 -80401400 LIGHT_ARROW_ITEM -80401401 .byt:0001 -80401401 FAIRY_ITEMS -80401402 .byt:0001 -80401403 .byt:0001 -80401404 .byt:0001 -80401405 .byt:0001 -80401406 .byt:0001 -80401408 .byt:0BF8 -80402000 .dbl:0010 -80402000 EXTENDED_ITEM_DATA -80402010 .byt:0001 -80402010 PENDING_SPECIAL_ITEM -80402014 .dbl:0004 -80402014 TIME_TRAVEL_SAVED_EQUIPS -80402018 .dbl:0004 -8040201C .wrd:0002 -8040201E .wrd:0002 -80402020 .byt:0001 -80402020 ITEM_TABLE -80402021 .byt:0001 -80402022 .byt:0001 -80402023 .byt:0001 -80402024 .wrd:0002 -80402026 .byt:0001 -80402027 .byt:0001 -80402028 .dbl:0004 -8040202C .dbl:0004 -80402030 .byt:0001 -80402031 .byt:0001 -80402032 .byt:0001 -80402033 .byt:0001 -80402034 .wrd:0002 -80402036 .byt:0001 -80402037 .byt:0001 -80402038 .dbl:0004 -8040203C .dbl:0004 -80402040 .byt:0001 -80402041 .byt:0001 -80402042 .byt:0001 -80402043 .byt:0001 -80402044 .wrd:0002 -80402046 .byt:0001 -80402047 .byt:0001 -80402048 .dbl:0004 -8040204C .dbl:0004 -80402050 .byt:0001 -80402051 .byt:0001 -80402052 .byt:0001 -80402053 .byt:0001 -80402054 .wrd:0002 -80402056 .byt:0001 -80402057 .byt:0001 -80402058 .dbl:0004 -8040205C .dbl:0004 -80402060 .byt:0001 -80402061 .byt:0001 -80402062 .byt:0001 -80402063 .byt:0001 -80402064 .wrd:0002 -80402066 .byt:0001 -80402067 .byt:0001 -80402068 .dbl:0004 -8040206C .dbl:0004 -80402070 .byt:0001 -80402071 .byt:0001 -80402072 .byt:0001 -80402073 .byt:0001 -80402074 .wrd:0002 -80402076 .byt:0001 -80402077 .byt:0001 -80402078 .dbl:0004 -8040207C .dbl:0004 -80402080 .byt:0001 -80402081 .byt:0001 -80402082 .byt:0001 -80402083 .byt:0001 -80402084 .wrd:0002 -80402086 .byt:0001 -80402087 .byt:0001 -80402088 .dbl:0004 -8040208C .dbl:0004 -80402090 .byt:0001 -80402091 .byt:0001 -80402092 .byt:0001 -80402093 .byt:0001 -80402094 .wrd:0002 -80402096 .byt:0001 -80402097 .byt:0001 -80402098 .dbl:0004 -8040209C .dbl:0004 -804020A0 .byt:0001 -804020A1 .byt:0001 -804020A2 .byt:0001 -804020A3 .byt:0001 -804020A4 .wrd:0002 -804020A6 .byt:0001 -804020A7 .byt:0001 -804020A8 .dbl:0004 -804020AC .dbl:0004 -804020B0 .byt:0001 -804020B1 .byt:0001 -804020B2 .byt:0001 -804020B3 .byt:0001 -804020B4 .wrd:0002 -804020B6 .byt:0001 -804020B7 .byt:0001 -804020B8 .dbl:0004 -804020BC .dbl:0004 -804020C0 .byt:0001 -804020C1 .byt:0001 -804020C2 .byt:0001 -804020C3 .byt:0001 -804020C4 .wrd:0002 -804020C6 .byt:0001 -804020C7 .byt:0001 -804020C8 .dbl:0004 -804020CC .dbl:0004 -804020D0 .byt:0001 -804020D1 .byt:0001 -804020D2 .byt:0001 -804020D3 .byt:0001 -804020D4 .wrd:0002 -804020D6 .byt:0001 -804020D7 .byt:0001 -804020D8 .dbl:0004 -804020DC .dbl:0004 -804020E0 .byt:0001 -804020E1 .byt:0001 -804020E2 .byt:0001 -804020E3 .byt:0001 -804020E4 .wrd:0002 -804020E6 .byt:0001 -804020E7 .byt:0001 -804020E8 .dbl:0004 -804020EC .dbl:0004 -804020F0 .byt:0001 -804020F1 .byt:0001 -804020F2 .byt:0001 -804020F3 .byt:0001 -804020F4 .wrd:0002 -804020F6 .byt:0001 -804020F7 .byt:0001 -804020F8 .dbl:0004 -804020FC .dbl:0004 -80402100 .byt:0001 -80402101 .byt:0001 -80402102 .byt:0001 -80402103 .byt:0001 -80402104 .wrd:0002 -80402106 .byt:0001 -80402107 .byt:0001 -80402108 .dbl:0004 -8040210C .dbl:0004 -80402110 .byt:0001 -80402111 .byt:0001 -80402112 .byt:0001 -80402113 .byt:0001 -80402114 .wrd:0002 -80402116 .byt:0001 -80402117 .byt:0001 -80402118 .dbl:0004 -8040211C .dbl:0004 -80402120 .byt:0001 -80402121 .byt:0001 -80402122 .byt:0001 -80402123 .byt:0001 -80402124 .wrd:0002 -80402126 .byt:0001 -80402127 .byt:0001 -80402128 .dbl:0004 -8040212C .dbl:0004 -80402130 .byt:0001 -80402131 .byt:0001 -80402132 .byt:0001 -80402133 .byt:0001 -80402134 .wrd:0002 -80402136 .byt:0001 -80402137 .byt:0001 -80402138 .dbl:0004 -8040213C .dbl:0004 -80402140 .byt:0001 -80402141 .byt:0001 -80402142 .byt:0001 -80402143 .byt:0001 -80402144 .wrd:0002 -80402146 .byt:0001 -80402147 .byt:0001 -80402148 .dbl:0004 -8040214C .dbl:0004 -80402150 .byt:0001 -80402151 .byt:0001 -80402152 .byt:0001 -80402153 .byt:0001 -80402154 .wrd:0002 -80402156 .byt:0001 -80402157 .byt:0001 -80402158 .dbl:0004 -8040215C .dbl:0004 -80402160 .byt:0001 -80402161 .byt:0001 -80402162 .byt:0001 -80402163 .byt:0001 -80402164 .wrd:0002 -80402166 .byt:0001 -80402167 .byt:0001 -80402168 .dbl:0004 -8040216C .dbl:0004 -80402170 .byt:0001 -80402171 .byt:0001 -80402172 .byt:0001 -80402173 .byt:0001 -80402174 .wrd:0002 -80402176 .byt:0001 -80402177 .byt:0001 -80402178 .dbl:0004 -8040217C .dbl:0004 -80402180 .byt:0001 -80402181 .byt:0001 -80402182 .byt:0001 -80402183 .byt:0001 -80402184 .wrd:0002 -80402186 .byt:0001 -80402187 .byt:0001 -80402188 .dbl:0004 -8040218C .dbl:0004 -80402190 .byt:0001 -80402191 .byt:0001 -80402192 .byt:0001 -80402193 .byt:0001 -80402194 .wrd:0002 -80402196 .byt:0001 -80402197 .byt:0001 -80402198 .dbl:0004 -8040219C .dbl:0004 -804021A0 .byt:0001 -804021A1 .byt:0001 -804021A2 .byt:0001 -804021A3 .byt:0001 -804021A4 .wrd:0002 -804021A6 .byt:0001 -804021A7 .byt:0001 -804021A8 .dbl:0004 -804021AC .dbl:0004 -804021B0 .byt:0001 -804021B1 .byt:0001 -804021B2 .byt:0001 -804021B3 .byt:0001 -804021B4 .wrd:0002 -804021B6 .byt:0001 -804021B7 .byt:0001 -804021B8 .dbl:0004 -804021BC .dbl:0004 -804021C0 .byt:0001 -804021C1 .byt:0001 -804021C2 .byt:0001 -804021C3 .byt:0001 -804021C4 .wrd:0002 -804021C6 .byt:0001 -804021C7 .byt:0001 -804021C8 .dbl:0004 -804021CC .dbl:0004 -804021D0 .byt:0001 -804021D1 .byt:0001 -804021D2 .byt:0001 -804021D3 .byt:0001 -804021D4 .wrd:0002 -804021D6 .byt:0001 -804021D7 .byt:0001 -804021D8 .dbl:0004 -804021DC .dbl:0004 -804021E0 .byt:0001 -804021E1 .byt:0001 -804021E2 .byt:0001 -804021E3 .byt:0001 -804021E4 .wrd:0002 -804021E6 .byt:0001 -804021E7 .byt:0001 -804021E8 .dbl:0004 -804021EC .dbl:0004 -804021F0 .byt:0001 -804021F1 .byt:0001 -804021F2 .byt:0001 -804021F3 .byt:0001 -804021F4 .wrd:0002 -804021F6 .byt:0001 -804021F7 .byt:0001 -804021F8 .dbl:0004 -804021FC .dbl:0004 -80402200 .byt:0001 -80402201 .byt:0001 -80402202 .byt:0001 -80402203 .byt:0001 -80402204 .wrd:0002 -80402206 .byt:0001 -80402207 .byt:0001 -80402208 .dbl:0004 -8040220C .dbl:0004 -80402210 .byt:0001 -80402211 .byt:0001 -80402212 .byt:0001 -80402213 .byt:0001 -80402214 .wrd:0002 -80402216 .byt:0001 -80402217 .byt:0001 -80402218 .dbl:0004 -8040221C .dbl:0004 -80402220 .byt:0001 -80402221 .byt:0001 -80402222 .byt:0001 -80402223 .byt:0001 -80402224 .wrd:0002 -80402226 .byt:0001 -80402227 .byt:0001 -80402228 .dbl:0004 -8040222C .dbl:0004 -80402230 .byt:0001 -80402231 .byt:0001 -80402232 .byt:0001 -80402233 .byt:0001 -80402234 .wrd:0002 -80402236 .byt:0001 -80402237 .byt:0001 -80402238 .dbl:0004 -8040223C .dbl:0004 -80402240 .byt:0001 -80402241 .byt:0001 -80402242 .byt:0001 -80402243 .byt:0001 -80402244 .wrd:0002 -80402246 .byt:0001 -80402247 .byt:0001 -80402248 .dbl:0004 -8040224C .dbl:0004 -80402250 .byt:0001 -80402251 .byt:0001 -80402252 .byt:0001 -80402253 .byt:0001 -80402254 .wrd:0002 -80402256 .byt:0001 -80402257 .byt:0001 -80402258 .dbl:0004 -8040225C .dbl:0004 -80402260 .byt:0001 -80402261 .byt:0001 -80402262 .byt:0001 -80402263 .byt:0001 -80402264 .wrd:0002 -80402266 .byt:0001 -80402267 .byt:0001 -80402268 .dbl:0004 -8040226C .dbl:0004 -80402270 .byt:0001 -80402271 .byt:0001 -80402272 .byt:0001 -80402273 .byt:0001 -80402274 .wrd:0002 -80402276 .byt:0001 -80402277 .byt:0001 -80402278 .dbl:0004 -8040227C .dbl:0004 -80402280 .byt:0001 -80402281 .byt:0001 -80402282 .byt:0001 -80402283 .byt:0001 -80402284 .wrd:0002 -80402286 .byt:0001 -80402287 .byt:0001 -80402288 .dbl:0004 -8040228C .dbl:0004 -80402290 .byt:0001 -80402291 .byt:0001 -80402292 .byt:0001 -80402293 .byt:0001 -80402294 .wrd:0002 -80402296 .byt:0001 -80402297 .byt:0001 -80402298 .dbl:0004 -8040229C .dbl:0004 -804022A0 .byt:0001 -804022A1 .byt:0001 -804022A2 .byt:0001 -804022A3 .byt:0001 -804022A4 .wrd:0002 -804022A6 .byt:0001 -804022A7 .byt:0001 -804022A8 .dbl:0004 -804022AC .dbl:0004 -804022B0 .byt:0001 -804022B1 .byt:0001 -804022B2 .byt:0001 -804022B3 .byt:0001 -804022B4 .wrd:0002 -804022B6 .byt:0001 -804022B7 .byt:0001 -804022B8 .dbl:0004 -804022BC .dbl:0004 -804022C0 .byt:0001 -804022C1 .byt:0001 -804022C2 .byt:0001 -804022C3 .byt:0001 -804022C4 .wrd:0002 -804022C6 .byt:0001 -804022C7 .byt:0001 -804022C8 .dbl:0004 -804022CC .dbl:0004 -804022D0 .byt:0001 -804022D1 .byt:0001 -804022D2 .byt:0001 -804022D3 .byt:0001 -804022D4 .wrd:0002 -804022D6 .byt:0001 -804022D7 .byt:0001 -804022D8 .dbl:0004 -804022DC .dbl:0004 -804022E0 .byt:0001 -804022E1 .byt:0001 -804022E2 .byt:0001 -804022E3 .byt:0001 -804022E4 .wrd:0002 -804022E6 .byt:0001 -804022E7 .byt:0001 -804022E8 .dbl:0004 -804022EC .dbl:0004 -804022F0 .byt:0001 -804022F1 .byt:0001 -804022F2 .byt:0001 -804022F3 .byt:0001 -804022F4 .wrd:0002 -804022F6 .byt:0001 -804022F7 .byt:0001 -804022F8 .dbl:0004 -804022FC .dbl:0004 -80402300 .byt:0001 -80402301 .byt:0001 -80402302 .byt:0001 -80402303 .byt:0001 -80402304 .wrd:0002 -80402306 .byt:0001 -80402307 .byt:0001 -80402308 .dbl:0004 -8040230C .dbl:0004 -80402310 .byt:0001 -80402311 .byt:0001 -80402312 .byt:0001 -80402313 .byt:0001 -80402314 .wrd:0002 -80402316 .byt:0001 -80402317 .byt:0001 -80402318 .dbl:0004 -8040231C .dbl:0004 -80402320 .byt:0001 -80402321 .byt:0001 -80402322 .byt:0001 -80402323 .byt:0001 -80402324 .wrd:0002 -80402326 .byt:0001 -80402327 .byt:0001 -80402328 .dbl:0004 -8040232C .dbl:0004 -80402330 .byt:0001 -80402331 .byt:0001 -80402332 .byt:0001 -80402333 .byt:0001 -80402334 .wrd:0002 -80402336 .byt:0001 -80402337 .byt:0001 -80402338 .dbl:0004 -8040233C .dbl:0004 -80402340 .byt:0001 -80402341 .byt:0001 -80402342 .byt:0001 -80402343 .byt:0001 -80402344 .wrd:0002 -80402346 .byt:0001 -80402347 .byt:0001 -80402348 .dbl:0004 -8040234C .dbl:0004 -80402350 .byt:0001 -80402351 .byt:0001 -80402352 .byt:0001 -80402353 .byt:0001 -80402354 .wrd:0002 -80402356 .byt:0001 -80402357 .byt:0001 -80402358 .dbl:0004 -8040235C .dbl:0004 -80402360 .byt:0001 -80402361 .byt:0001 -80402362 .byt:0001 -80402363 .byt:0001 -80402364 .wrd:0002 -80402366 .byt:0001 -80402367 .byt:0001 -80402368 .dbl:0004 -8040236C .dbl:0004 -80402370 .byt:0001 -80402371 .byt:0001 -80402372 .byt:0001 -80402373 .byt:0001 -80402374 .wrd:0002 -80402376 .byt:0001 -80402377 .byt:0001 -80402378 .dbl:0004 -8040237C .dbl:0004 -80402380 .byt:0001 -80402381 .byt:0001 -80402382 .byt:0001 -80402383 .byt:0001 -80402384 .wrd:0002 -80402386 .byt:0001 -80402387 .byt:0001 -80402388 .dbl:0004 -8040238C .dbl:0004 -80402390 .byt:0001 -80402391 .byt:0001 -80402392 .byt:0001 -80402393 .byt:0001 -80402394 .wrd:0002 -80402396 .byt:0001 -80402397 .byt:0001 -80402398 .dbl:0004 -8040239C .dbl:0004 -804023A0 .byt:0001 -804023A1 .byt:0001 -804023A2 .byt:0001 -804023A3 .byt:0001 -804023A4 .wrd:0002 -804023A6 .byt:0001 -804023A7 .byt:0001 -804023A8 .dbl:0004 -804023AC .dbl:0004 -804023B0 .byt:0001 -804023B1 .byt:0001 -804023B2 .byt:0001 -804023B3 .byt:0001 -804023B4 .wrd:0002 -804023B6 .byt:0001 -804023B7 .byt:0001 -804023B8 .dbl:0004 -804023BC .dbl:0004 -804023C0 .byt:0001 -804023C1 .byt:0001 -804023C2 .byt:0001 -804023C3 .byt:0001 -804023C4 .wrd:0002 -804023C6 .byt:0001 -804023C7 .byt:0001 -804023C8 .dbl:0004 -804023CC .dbl:0004 -804023D0 .byt:0001 -804023D1 .byt:0001 -804023D2 .byt:0001 -804023D3 .byt:0001 -804023D4 .wrd:0002 -804023D6 .byt:0001 -804023D7 .byt:0001 -804023D8 .dbl:0004 -804023DC .dbl:0004 -804023E0 .byt:0001 -804023E1 .byt:0001 -804023E2 .byt:0001 -804023E3 .byt:0001 -804023E4 .wrd:0002 -804023E6 .byt:0001 -804023E7 .byt:0001 -804023E8 .dbl:0004 -804023EC .dbl:0004 -804023F0 .byt:0001 -804023F1 .byt:0001 -804023F2 .byt:0001 -804023F3 .byt:0001 -804023F4 .wrd:0002 -804023F6 .byt:0001 -804023F7 .byt:0001 -804023F8 .dbl:0004 -804023FC .dbl:0004 -80402400 .byt:0001 -80402401 .byt:0001 -80402402 .byt:0001 -80402403 .byt:0001 -80402404 .wrd:0002 -80402406 .byt:0001 -80402407 .byt:0001 -80402408 .dbl:0004 -8040240C .dbl:0004 -80402410 .byt:0001 -80402411 .byt:0001 -80402412 .byt:0001 -80402413 .byt:0001 -80402414 .wrd:0002 -80402416 .byt:0001 -80402417 .byt:0001 -80402418 .dbl:0004 -8040241C .dbl:0004 -80402420 .byt:0001 -80402421 .byt:0001 -80402422 .byt:0001 -80402423 .byt:0001 -80402424 .wrd:0002 -80402426 .byt:0001 -80402427 .byt:0001 -80402428 .dbl:0004 -8040242C .dbl:0004 -80402430 .byt:0001 -80402431 .byt:0001 -80402432 .byt:0001 -80402433 .byt:0001 -80402434 .wrd:0002 -80402436 .byt:0001 -80402437 .byt:0001 -80402438 .dbl:0004 -8040243C .dbl:0004 -80402440 no_upgrade -80402448 hookshot_upgrade -8040245C @@return -80402464 strength_upgrade -80402484 @@return -8040248C bomb_bag_upgrade -804024AC @@return -804024B4 bow_upgrade -804024D4 @@return -804024DC slingshot_upgrade -804024FC @@return -80402504 wallet_upgrade -80402518 @@return -80402520 scale_upgrade -80402534 @@return -8040253C nut_upgrade -80402550 @@return -80402558 stick_upgrade -8040256C @@return -80402574 magic_upgrade -80402584 @@return -8040258C arrows_to_rupee -804025A0 @@return -804025A8 bombs_to_rupee -804025BC @@return -804025C4 no_effect -804025CC give_biggoron_sword -804025DC give_bottle -804025E4 @@loop -80402610 @@return -80402618 give_dungeon_item -80402634 give_small_key -8040264C @not_negative -8040265C give_defense -8040267C give_magic -8040269C double_magic -804026C4 inventory_check -80402730 @@return -80402738 override_object_npc -80402748 override_object_chest -80402758 override_object -80402770 @@return -80402784 override_graphic -8040279C @@return -804027B4 override_text -804027D0 @@return -804027D8 override_action -8040283C @@return -80402844 store_item_data_hook -80402878 store_item_data -8040290C @@update_base_game -8040293C @@not_chest -8040294C @@not_negative -80402950 @@return -80402960 lookup_override -80402988 @@return -80402998 get_override_search_key -804029E8 @@valid_chest -804029F0 @@not_chest -80402A20 @@valid_collectable -80402A28 @@not_collectable -80402A38 @@return -80402A40 scan_override_table -80402A4C @@lookup_loop -80402A6C @@return -80402A74 resolve_extended_item -80402A88 @@loop -80402ADC @@not_extended -80402AE0 @@return -80402AF8 override_great_fairy_cutscene -80402B50 @@item_fairy -80402B70 @@give_item -80402B9C @@return -80402BA4 override_light_arrow_cutscene -80402BC4 every_frame -80402C18 @@no_pending_item -80402C40 item_menu_description_id_periodic -80402C54 @@item_menu_description_id_return_00000000 -80402C5C item_menu_description_id_immediate_1 -80402C70 @@item_menu_description_id_return_00000001 -80402C78 item_menu_description_id_immediate_2 -80402C8C @@item_menu_description_id_return_00000002 -80402C94 item_menu_description_id_immediate_3 -80402CA8 @@item_menu_description_id_return_00000003 -80402CB0 before_time_travel -80402CE0 after_time_travel -80402D1C @@going_back -80402D24 @@done -80402D54 update_c_button -80402D80 @@return -80402D88 after_going_forward -80402DC4 @@no_init -80402DD4 after_going_back -80402E04 @@not_swordless -80402E0C initialize_adult -80402E34 @@no_mirror_shield -80402E74 init_adult_button -80402EA0 @@empty -80402EA8 @@loop -80402F00 @@set_empty -80402F0C @@return -80402F14 .byt:0001 -80402F14 ADULT_INIT_ITEMS -80402F15 .byt:0001 -80402F16 .byt:0001 -80402F17 .byt:0001 -80402F18 .byt:0001 -80402F19 .byt:0001 -80402F1A .byt:0001 -80402F1B .byt:0001 -80402F1C .byt:0001 -80402F20 .byt:0001 -80402F20 ADULT_VALID_ITEMS -80402F21 .byt:0001 -80402F22 .byt:0001 -80402F23 .byt:0001 -80402F24 .byt:0001 -80402F25 .byt:0001 -80402F26 .byt:0001 -80402F27 .byt:0001 -80402F28 .byt:0001 -80402F29 .byt:0001 -80402F2A .byt:0001 -80402F2B .byt:0001 -80402F2C .byt:0001 -80402F2D .byt:0001 -80402F2E .byt:0001 -80402F2F .byt:0001 -80402F30 .byt:0001 -80402F31 .byt:0001 -80402F32 .byt:0001 -80402F33 .byt:0001 -80402F34 .byt:0001 -80402F35 .byt:0001 -80402F36 .byt:0001 -80402F37 .byt:0001 -80402F38 suns_song_fix -80402F44 @@sacred_forest_meadow -80402F5C @@crater -80402F6C @@courtyard -80402F7C @@age_check -80402F84 @@windmill -80402F98 @@temple_of_time -80402FAC @@child -80402FC0 @@return -80402FC4 warp_song_fix -80402FF0 @@child -80403004 @@return -80403008 .byt:0FF8 -80410000 DUMMY_ACTOR - \ No newline at end of file From b707a994028c107fef53ae86bca7e8433fc5c988 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Wed, 13 Jun 2018 20:26:14 -0500 Subject: [PATCH 134/151] Delete fixes.asm --- ASM/src/fixes.asm | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 ASM/src/fixes.asm diff --git a/ASM/src/fixes.asm b/ASM/src/fixes.asm deleted file mode 100644 index 88af94d2c..000000000 --- a/ASM/src/fixes.asm +++ /dev/null @@ -1,18 +0,0 @@ -save_child_b_equip: - ; t0 = save context - lw t1, 0x04 (t0) - beqz t1, @@return ; Only do this as child - nop - - lbu t1, 0x68 (t0) ; Load current B equip - beq t1, 0x3B, @@save - nop - - li t1, 0xFF - -@@save: - sb t1, 0x40 (t0) ; Save B equip, will be loaded on next adult -> child transition - -@@return: - jr ra - sb t6, 0x68 (t0) ; Displaced code From 6ee9c1450c67f32eef1caf4203b4e1b9416fad7f Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Wed, 13 Jun 2018 20:26:27 -0500 Subject: [PATCH 135/151] Delete items.asm --- ASM/src/items.asm | 671 ---------------------------------------------- 1 file changed, 671 deletions(-) delete mode 100644 ASM/src/items.asm diff --git a/ASM/src/items.asm b/ASM/src/items.asm deleted file mode 100644 index 5852bcd51..000000000 --- a/ASM/src/items.asm +++ /dev/null @@ -1,671 +0,0 @@ -inventory_check: - andi a0, a0, 0xFF - li t0, SAVE_CONTEXT - - beq a0, 0x8C, @@return ; Deku Nuts (5) - lbu v0, 0x75 (t0) - - beq a0, 0x8D, @@return ; Deku Nuts (10) - lbu v0, 0x75 (t0) - - beq a0, 0x00, @@return ; Deku Stick - lbu v0, 0x74 (t0) - - beq a0, 0x8A, @@return ; Deku Sticks (5) - lbu v0, 0x74 (t0) - - beq a0, 0x8B, @@return ; Deku Sticks (10) - lbu v0, 0x74 (t0) - - beq a0, 0x58, @@return ; Deku Seeds (5) - li v0, 0x00 - - beq a0, 0x78, @@return ; Small Magic Jar - li v0, 0x00 - - beq a0, 0x79, @@return ; Large Magic Jar - li v0, 0x00 - - li v0, 0xFF - -@@return: - jr ra - nop - -;================================================================================================== - -override_object_npc: - lw a2, 0x0030 (sp) - lh a1, 0x0004 (a2) - j override_object - nop - -override_object_chest: - lw t9, 0x002C (sp) - lh a1, 0x0004 (t9) - j override_object - nop - -override_object: - ; Load extended Object ID - li t2, CURRENT_ITEM_DATA - lhu t3, 0x04 (t2) - beq t3, 0xFFFF, @@return - nop - - ; Override object ID - ori a1, t3, 0 - -@@return: - ; Clear any pending special item, now that it's being received - li t3, PENDING_SPECIAL_ITEM - sb r0, 0x00 (t3) - - jr ra - nop - -;================================================================================================== - -override_graphic: - ; Load extended Graphic ID - li t0, CURRENT_ITEM_DATA - lb t1, 0x02 (t0) - beq t1, -1, @@return - nop - - ; Override Graphic ID - ori v1, t1, 0 - -@@return: - ; Displaced code - abs t0, v1 - sb t0, 0x0852 (a0) - jr ra - nop - -;================================================================================================== - -override_text: - lbu a1, 0x03 (v0) ; Displaced code - - ; Load extended Text ID - li t0, CURRENT_ITEM_DATA - lbu t1, 0x03 (t0) - beq t1, 0xFF, @@return - nop - - ; Override Text ID - ori a1, t1, 0 - -@@return: - jr ra - nop - -;================================================================================================== - -override_action: - ; Displaced code - lw v0, 0x24 (sp) - lbu a1, 0x0000 (v0) - - ; Load extended Action ID - li t0, CURRENT_ITEM_DATA - lhu t1, 0x00 (t0) - beq t1, 0xFFFF, @@return - nop - - ; Override Action ID - ori a1, t1, 0 - - sw a0, 0x00 (sp) - sw a1, 0x04 (sp) - sw a2, 0x08 (sp) - addiu sp, sp, -0x18 - sw ra, 0x10 (sp) - - ; Run effect function - ; Conventions for effect functions: - ; - They receive a pointer to the save context in a0 - ; - They receive their arguments in a1 and a2 - lw t1, 0x08 (t0) ; t1 = effect function - li a0, SAVE_CONTEXT - lbu a1, 0x06 (t0) - lbu a2, 0x07 (t0) - jalr t1 - nop - - lw ra, 0x10 (sp) - addiu sp, sp, 0x18 - lw a0, 0x00 (sp) - lw a1, 0x04 (sp) - lw a2, 0x08 (sp) - -@@return: - jr ra - nop - -;================================================================================================== - -override_item_fairy_cutscene: - ; a0 = global context - ; a2 = fairy actor - lw t0, 0x1D2C (a0) ; Load switch flags - li t1, 1 - sll t1, t1, 0x18 - and v0, t0, t1 ; Isolate ZL switch - beqz v0, @@return - nop - - lhu t2, 0xA4 (a0) ; Load scene number - bne t2, 0x3D, @@return ; Use default behavior unless this is an item fairy - nop - - lhu t2, 0x02DC (a2) ; Load item fairy index - li t3, 1 - sllv t3, t3, t2 ; t3 = fairy item mask - li t4, SAVE_CONTEXT - lbu t5, 0x0EF2 (t4) ; Load fairy item flags - and t6, t5, t3 - bnez t6, @@return ; Use default behavior if the item is already obtained - nop - or t5, t5, t3 - sb t5, 0x0EF2 (t4) ; Mark fairy item as obtained - - nor t1, t1, t1 - and t0, t0, t1 ; Unset ZL switch - sw t0, 0x1D2C (a0) - - ; Load fairy item and mark it as pending - li t0, FAIRY_ITEMS - addu t0, t0, t2 - lb t0, 0x00 (t0) - li t1, PENDING_SPECIAL_ITEM - sb t0, 0x00 (t1) - - li v0, 0 ; Prevent fairy animation - -@@return: - jr ra - nop - -;================================================================================================== - -override_light_arrow_cutscene: - li t0, LIGHT_ARROW_ITEM - lb t0, 0x00 (t0) - li t1, PENDING_SPECIAL_ITEM - sb t0, 0x00 (t1) - jr ra - nop - -;================================================================================================== - -store_item_data_hook: - sb a2, 0x0424 (a3) ; Displaced code - - addiu sp, sp, -0x20 - sw v0, 0x10 (sp) - sw v1, 0x14 (sp) - sw ra, 0x18 (sp) - - jal store_item_data - nop - - lw v0, 0x10 (sp) - lw v1, 0x14 (sp) - lw ra, 0x18 (sp) - addiu sp, sp, 0x20 - jr ra - nop - -;================================================================================================== - -store_item_data: - addiu sp, sp, -0x18 - sw ra, 0x10 (sp) - - ; Clear current item data - li t0, CURRENT_ITEM_DATA - li t1, -1 - sw t1, 0x00 (t0) - sw t1, 0x04 (t0) - sw t1, 0x08 (t0) - - li t0, PLAYER_ACTOR - lb t1, 0x0424 (t0) - beqz t1, @@return - nop - - abs a0, t1 - lw a1, 0x0428 (t0) - jal lookup_override ; v0 = new item ID from override - nop - bltz v0, @@return - nop - - ori a0, v0, 0 - jal resolve_extended_item ; v0 = resolved item ID, v1 = ITEM_TABLE entry - nop - beqz v1, @@not_extended - nop - - ; Store extended item data - li t0, CURRENT_ITEM_DATA - lw t1, 0x00 (v1) - sw t1, 0x00 (t0) - lw t1, 0x04 (v1) - sw t1, 0x04 (t0) - lw t1, 0x08 (v1) - sw t1, 0x08 (t0) - b @@return - nop - -@@not_extended: - ; For non-extended item IDs, put it back in the player instance and let the game handle it - li t0, PLAYER_ACTOR - lb t1, 0x0424 (t0) - bgez t1, @@not_negative - nop - ; The input was negative (item is coming from a chest), so make the result negative - subu v0, r0, v0 -@@not_negative: - sb v0, 0x0424 (t0) - -@@return: - lw ra, 0x10 (sp) - addiu sp, sp, 0x18 - jr ra - nop - -;================================================================================================== - -lookup_override: - ; a0 = item ID being received - ; a1 = actor giving the item - - addiu sp, sp, -0x18 - sw ra, 0x10 (sp) - - jal get_override_search_key - nop - ori a0, v0, 0 - jal scan_override_table - nop - - lw ra, 0x10 (sp) - addiu sp, sp, 0x18 - jr ra - nop - -;================================================================================================== - -get_override_search_key: - ; a0 = item ID being received - ; a1 = actor giving the item - - ; Load the current scene number - li v0, GLOBAL_CONTEXT - lhu v0, 0xA4 (v0) - - li t0, 0x00 ; t0 = override type - ori t1, a0, 0 ; t1 = override ID - lhu t2, 0x00 (a1) ; t2 = actor ID - - bne t2, 0x000A, @@not_chest - nop - beq v0, 0x10, @@not_chest ; Scene 0x10 = treasure chest game, use item-based override here - nop - li t0, 0x01 - lhu t1, 0x1C (a1) - andi t1, t1, 0x1F ; t1 = chest flag -@@not_chest: - - bne t2, 0x0015, @@not_collectible - nop - li t0, 0x02 - lbu t1, 0x0141 (a1) ; t1 = collectible flag -@@not_collectible: - - ; Construct ID used to search the override table - ; v0 = (scene << 16) | (override_type << 8) | override_id - sll v0, v0, 8 - or v0, v0, t0 - sll v0, v0, 8 - or v0, v0, t1 - - jr ra - nop - -;================================================================================================== - -scan_override_table: - ; a0 = override search key - - li v0, -1 - - ; Look up override - li t0, (ITEM_OVERRIDES - 0x04) -@@lookup_loop: - addiu t0, t0, 0x04 - lw t1, 0x00 (t0) ; t1 = override entry - beqz t1, @@return ; Reached end of override table - nop - srl t2, t1, 8 ; t2 = override key - bne t2, a0, @@lookup_loop - nop - - andi v0, t1, 0xFF ; v0 = found item ID - -@@return: - jr ra - nop - -;================================================================================================== - -resolve_extended_item: - ; a0 = input item ID - - addiu sp, sp, -0x20 - sw s0, 0x10 (sp) - sw s1, 0x14 (sp) - sw ra, 0x18 (sp) - - ori v0, a0, 0 ; Return resolved item ID in v0 - -@@loop: - ori s0, v0, 0 - addiu t0, s0, -0x80 ; t0 = index into extended ITEM_TABLE - bltz t0, @@not_extended ; Item IDs in range 0x00 - 0x7F are not extended - nop - ; Load table entry - li s1, ITEM_TABLE - li t1, ITEM_TABLE_ROW_SIZE - mult t0, t1 - mflo t0 - addu s1, s1, t0 ; s1 = pointer to table entry - ; Check whether this item will upgrade into another item - ; Conventions for upgrade functions: - ; - They receive a pointer to the save context in a0 - ; - They receive their item ID in a1 - ; - They store their result in v0 - li a0, SAVE_CONTEXT - ori a1, s0, 0 - lw t0, 0x0C (s1) - jalr t0 ; v0 = upgraded item ID - nop - ; If the upgrade function returned a new item ID, start resolution over again - bne v0, s0, @@loop - nop - - ori v1, s1, 0 ; Return pointer to ITEM_TABLE entry in v1 - b @@return - nop - -@@not_extended: - li v1, 0 - -@@return: - lw s0, 0x10 (sp) - lw s1, 0x14 (sp) - lw ra, 0x18 (sp) - addiu sp, sp, 0x20 - jr ra - nop - -;================================================================================================== -; Item upgrade functions -;================================================================================================== - -no_upgrade: - jr ra - ori v0, a1, 0 - -;================================================================================================== - -hookshot_upgrade: - lbu t0, 0x7D (a0) ; Load hookshot from inventory - - beq t0, 0xFF, @@return - li v0, 0x08 ; Hookshot - - li v0, 0x09 ; Longshot - -@@return: - jr ra - nop - -;================================================================================================== - -strength_upgrade: - lbu t0, 0xA3 (a0) ; Load strength from inventory - andi t0, t0, 0xC0 ; Mask bits to isolate strength - - beqz t0, @@return - li v0, 0x54 ; Goron Bracelet - - beq t0, 0x40, @@return - li v0, 0x35 ; Silver Gauntlets - - li v0, 0x36 ; Gold Gauntlets - -@@return: - jr ra - nop - -;================================================================================================== - -bomb_bag_upgrade: - lbu t0, 0xA3 (a0) ; Load bomb bag from inventory - andi t0, t0, 0x18 ; Mask bits to isolate bomb bag - - beqz t0, @@return - li v0, 0x32 ; Bomb Bag - - beq t0, 0x08, @@return - li v0, 0x33 ; Bigger Bomb Bag - - li v0, 0x34 ; Biggest Bomb Bag - -@@return: - jr ra - nop - -;================================================================================================== - -bow_upgrade: - lbu t0, 0xA3 (a0) ; Load quiver from inventory - andi t0, t0, 0x03 ; Mask bits to isolate quiver - - beqz t0, @@return - li v0, 0x04 ; Bow - - beq t0, 0x01, @@return - li v0, 0x30 ; Big Quiver - - li v0, 0x31 ; Biggest Quiver - -@@return: - jr ra - nop - -;================================================================================================== - -slingshot_upgrade: - lbu t0, 0xA2 (a0) ; Load bullet bag from inventory - andi t0, t0, 0xC0 ; Mask bits to isolate bullet bag - - beqz t0, @@return - li v0, 0x05 ; Slingshot - - beq t0, 0x40, @@return - li v0, 0x60 ; Bullet Bag (40) - - li v0, 0x7B ; Bullet Bag (50) - -@@return: - jr ra - nop - -;================================================================================================== - -wallet_upgrade: - lbu t0, 0xA2 (a0) ; Load wallet from inventory - andi t0, t0, 0x30 ; Mask bits to isolate wallet - - beqz t0, @@return - li v0, 0x45 ; Adult's Wallet - - li v0, 0x46 ; Giant's Wallet - -@@return: - jr ra - nop - -;================================================================================================== - -scale_upgrade: - lbu t0, 0xA2 (a0) ; Load scale from inventory - andi t0, t0, 0x06 ; # Mask bits to isolate scale - - beqz t0, @@return - li v0, 0x37 ; Silver Scale - - li v0, 0x38 ; Gold Scale - -@@return: - jr ra - nop - -;================================================================================================== - -nut_upgrade: - lbu t0, 0xA1 (a0) ; Load nut limit from inventory - andi t0, t0, 0x30 ; Mask bits to isolate nut limit - - beqz t0, @@return - li v0, 0x79 ; 30 Nuts - - li v0, 0x7A ; 40 Nuts - -@@return: - jr ra - nop - -;================================================================================================== - -stick_upgrade: - lbu t0, 0xA1 (a0) ; Load stick limit from inventory - andi t0, t0, 0x06 ; Mask bits to isolate stick limit - - beqz t0, @@return - li v0, 0x77 ; 20 Sticks - - li v0, 0x78 ; 30 Sticks - -@@return: - jr ra - nop - -;================================================================================================== - -arrows_to_rupee: - lbu t0, 0xA3 (a0) ; Load quiver from inventory - andi t0, t0, 0x03 ; Mask bits to isolate quiver - - beqz t0, @@return - li v0, 0x4D ; Blue Rupee - - ori v0, a1, 0 - -@@return: - jr ra - nop - -;================================================================================================== - -bombs_to_rupee: - lbu t0, 0xA3 (a0) ; Load bomb bag from inventory - andi t0, t0, 0x18 ; Mask bits to isolate bomb bag - - beqz t0, @@return - li v0, 0x4D ; Blue Rupee - - ori v0, a1, 0 - -@@return: - jr ra - nop - -;================================================================================================== -; Item effect functions -;================================================================================================== - -no_effect: - jr ra - nop - -;================================================================================================== - -give_biggoron_sword: - ; a0 = save context - li t0, 0x01 - sb t0, 0x3E (a0) ; Set flag to make the sword durable - jr ra - nop - -;================================================================================================== - -give_bottle: - ; a0 = save context - ; a1 = item code to store - addiu t0, a0, 0x86 ; t0 = First bottle slot - li t1, -1 ; t1 = Bottle slot offset - -@@loop: - addiu t1, t1, 1 - bgt t1, 3, @@return ; No free bottle slots - nop - - ; Check whether slot is full - addu t2, t0, t1 - lbu t3, 0x00 (t2) - bne t3, 0xFF, @@loop - nop - - ; Found an open slot - sb a1, 0x00 (t2) - -@@return: - jr ra - nop - -;================================================================================================== - -give_dungeon_item: - ; a0 = save context - ; a1 = mask (0x01 = boss key, 0x02 = compass, 0x04 = map) - ; a2 = dungeon index - addiu t0, a0, 0xA8 - addu t0, t0, a2 ; t0 = address of this dungeon's items - lbu t1, 0x00 (t0) - or t1, t1, a1 - sb t1, 0x00 (t0) - jr ra - nop - -;================================================================================================== - -give_small_key: - ; a0 = save context - ; a1 = dungeon index - addiu t0, a0, 0xBC - addu t0, t0, a1 ; t0 = address of this dungeon's key count - lb t1, 0x00 (t0) - bgez t1, @not_negative - nop - li t1, 0x00 -@not_negative: - addiu t1, t1, 1 - sb t1, 0x00 (t0) - jr ra - nop From d24c7f1dd7698ddf6e8ffa1cac8763bff4dd9206 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Wed, 13 Jun 2018 20:27:17 -0500 Subject: [PATCH 136/151] Delete item_data.asm --- ASM/src/item_data.asm | 105 ------------------------------------------ 1 file changed, 105 deletions(-) delete mode 100644 ASM/src/item_data.asm diff --git a/ASM/src/item_data.asm b/ASM/src/item_data.asm deleted file mode 100644 index f5632e462..000000000 --- a/ASM/src/item_data.asm +++ /dev/null @@ -1,105 +0,0 @@ -;================================================================================================== -; Item data -;================================================================================================== - -; Dungeon indexes, used with the dungeon item / small key tables in the save context -.definelabel DEKU, 0 -.definelabel DODONGO, 1 -.definelabel JABU, 2 -.definelabel FOREST, 3 -.definelabel FIRE, 4 -.definelabel WATER, 5 -.definelabel SPIRIT, 6 -.definelabel SHADOW, 7 -.definelabel BOTW, 8 -.definelabel ICE, 9 -.definelabel TOWER, 10 -.definelabel GTG, 11 -.definelabel FORT, 12 -.definelabel CASTLE, 13 - -.definelabel ITEM_TABLE_ROW_SIZE, 0x10 - -.macro Item_Row, action_id, graphic_id, text_id, object_id, upgrade_fn, effect_fn, effect_arg1, effect_arg2 - .halfword action_id ; 0x00 - .byte graphic_id ; 0x02 - .byte text_id ; 0x03 - .halfword object_id ; 0x04 - .byte effect_arg1 ; 0x06 - .byte effect_arg2 ; 0x07 - .word effect_fn ; 0x08 - .word upgrade_fn ; 0x0C -.endmacro - -ITEM_TABLE: -; AAAA GG TT OOOO -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, hookshot_upgrade, no_effect, 0xFF, 0xFF ; 0x80 = Progressive Hookshot -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, strength_upgrade, no_effect, 0xFF, 0xFF ; 0x81 = Progressive Strength -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, bomb_bag_upgrade, no_effect, 0xFF, 0xFF ; 0x82 = Progressive Bomb Bag -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, bow_upgrade, no_effect, 0xFF, 0xFF ; 0x83 = Progressive Bow -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, slingshot_upgrade, no_effect, 0xFF, 0xFF ; 0x84 = Progressive Slingshot -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, wallet_upgrade, no_effect, 0xFF, 0xFF ; 0x85 = Progressive Wallet -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, scale_upgrade, no_effect, 0xFF, 0xFF ; 0x86 = Progressive Scale -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, nut_upgrade, no_effect, 0xFF, 0xFF ; 0x87 = Progressive Nut Capacity -Item_Row 0xFFFF, 0xFF, 0xFF, 0xFFFF, stick_upgrade, no_effect, 0xFF, 0xFF ; 0x88 = Progressive Stick Capacity - -Item_Row 0x00FF, 0x01, 0x43, 0x00C6, no_upgrade, give_bottle, 0x15, 0xFF ; 0x89 = Bottle with Red Potion -Item_Row 0x00FF, 0x01, 0x44, 0x00C6, no_upgrade, give_bottle, 0x16, 0xFF ; 0x8A = Bottle with Green Potion -Item_Row 0x00FF, 0x01, 0x45, 0x00C6, no_upgrade, give_bottle, 0x17, 0xFF ; 0x8B = Bottle with Blue Potion -Item_Row 0x00FF, 0x01, 0x46, 0x00C6, no_upgrade, give_bottle, 0x18, 0xFF ; 0x8C = Bottle with Fairy -Item_Row 0x00FF, 0x01, 0x47, 0x00C6, no_upgrade, give_bottle, 0x19, 0xFF ; 0x8D = Bottle with Fish -Item_Row 0x00FF, 0x01, 0x5D, 0x00C6, no_upgrade, give_bottle, 0x1C, 0xFF ; 0x8E = Bottle with Blue Fire -Item_Row 0x00FF, 0x01, 0x7A, 0x00C6, no_upgrade, give_bottle, 0x1D, 0xFF ; 0x8F = Bottle with Bugs -Item_Row 0x00FF, 0x01, 0xF9, 0x00C6, no_upgrade, give_bottle, 0x1E, 0xFF ; 0x90 = Bottle with Big Poe -Item_Row 0x00FF, 0x01, 0x97, 0x00C6, no_upgrade, give_bottle, 0x20, 0xFF ; 0x91 = Bottle with Poe - -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FOREST ; 0x92 = Forest Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, FIRE ; 0x93 = Fire Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, WATER ; 0x94 = Water Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SPIRIT ; 0x95 = Spirit Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, SHADOW ; 0x96 = Shadow Temple Boss Key -Item_Row 0x00FF, 0x0A, 0xC7, 0x00B9, no_upgrade, give_dungeon_item, 0x01, CASTLE ; 0x97 = Ganon's Castle Boss Key - -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DEKU ; 0x98 = Deku Tree Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, DODONGO ; 0x99 = Dodongo's Cavern Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, JABU ; 0x9A = Jabu Jabu Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FOREST ; 0x9B = Forest Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, FIRE ; 0x9C = Fire Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, WATER ; 0x9D = Water Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SPIRIT ; 0x9E = Spirit Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, SHADOW ; 0x9F = Shadow Temple Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, BOTW ; 0xA0 = Bottom of the Well Compass -Item_Row 0x00FF, 0x0B, 0x67, 0x00B8, no_upgrade, give_dungeon_item, 0x02, ICE ; 0xA1 = Ice Cavern Compass - -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DEKU ; 0xA2 = Deku Tree Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, DODONGO ; 0xA3 = Dodongo's Cavern Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, JABU ; 0xA4 = Jabu Jabu Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FOREST ; 0xA5 = Forest Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, FIRE ; 0xA6 = Fire Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, WATER ; 0xA7 = Water Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SPIRIT ; 0xA8 = Spirit Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, SHADOW ; 0xA9 = Shadow Temple Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, BOTW ; 0xAA = Bottom of the Well Map -Item_Row 0x00FF, 0x1C, 0x66, 0x00C8, no_upgrade, give_dungeon_item, 0x04, ICE ; 0xAB = Ice Cavern Map - -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FOREST, 0xFF ; 0xAC = Forest Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FIRE, 0xFF ; 0xAD = Fire Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, WATER, 0xFF ; 0xAE = Water Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SPIRIT, 0xFF ; 0xAF = Spirit Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, SHADOW, 0xFF ; 0xB0 = Shadow Temple Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, BOTW, 0xFF ; 0xB1 = Bottom of the Well Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, GTG, 0xFF ; 0xB2 = Gerudo Training Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, FORT, 0xFF ; 0xB3 = Gerudo Fortress Small Key -Item_Row 0x00FF, 0xFE, 0x60, 0x00AA, no_upgrade, give_small_key, CASTLE, 0xFF ; 0xB4 = Ganon's Castle Small Key - -Item_Row 0x003D, 0x43, 0x0C, 0x00F8, no_upgrade, give_biggoron_sword, 0xFF, 0xFF ; 0xB5 = Biggoron Sword - -Item_Row 0x0083, 0x09, 0x55, 0x00B7, no_upgrade, no_effect, 0xFF, 0xFF ; 0xB6 = Recovery Heart -Item_Row 0x0092, 0xDB, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB7 = Arrows (5) -Item_Row 0x0093, 0xDA, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB8 = Arrows (10) -Item_Row 0x0094, 0xD9, 0xE6, 0x00D8, arrows_to_rupee, no_effect, 0xFF, 0xFF ; 0xB9 = Arrows (30) -Item_Row 0x008E, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBA = Bombs (5) -Item_Row 0x008F, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBB = Bombs (10) -Item_Row 0x0090, 0xE0, 0x32, 0x00CE, bombs_to_rupee, no_effect, 0xFF, 0xFF ; 0xBC = Bombs (20) -Item_Row 0x008C, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBD = Deku Nuts (5) -Item_Row 0x008D, 0xEE, 0x34, 0x00BB, no_upgrade, no_effect, 0xFF, 0xFF ; 0xBE = Deku Nuts (10) From 8db2762322837feb1163fd238d30a51d7d35f49f Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Wed, 13 Jun 2018 21:44:43 -0500 Subject: [PATCH 137/151] various fixes removed some text from the end of jabu juab, changed zelda to hopefully fix rare softlock, changed final magic bean price to 99 to fix potential future softlock --- Rom.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Rom.py b/Rom.py index 8b90eb80d..ef1716ec2 100644 --- a/Rom.py +++ b/Rom.py @@ -126,6 +126,10 @@ def patch_rom(world, rom): # Fix proximity text boxes (Navi) (Part 1) rom.write_bytes(0xDF8B84, [0x00, 0x00, 0x00, 0x00]) + # Fix final magic bean to cost 99 + rom.write_byte(0xE20A0F, 0x63) + rom.write_bytes(0x94FCDD, [0x08, 0x39, 0x39]) + # Remove intro cutscene rom.write_bytes(0xB06BBA, [0x00, 0x00]) @@ -181,8 +185,11 @@ def patch_rom(world, rom): rom.write_byte(0xACA49D, 0xCE) # Speed Zelda's Letter scene - rom.write_byte(0xEFEAF7, 0x08) + rom.write_bytes(0x290E08E, [0x05, 0xF0]) + rom.write_byte(0xEFCBA7, 0x08) rom.write_byte(0xEFE7C7, 0x05) + #rom.write_byte(0xEFEAF7, 0x08) + #rom.write_byte(0xEFE7C7, 0x05) rom.write_bytes(0xEFE938, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xEFE948, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0xEFE950, [0x00, 0x00, 0x00, 0x00]) @@ -320,7 +327,7 @@ def patch_rom(world, rom): rom.write_bytes(0x2223308, [0x00, 0x81, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00]) # Speed scene after Jabu Jabu's Belly - rom.write_bytes(0x2113340, [0x00, 0x00, 0x00, 0x00]) + rom.write_bytes(0xCA3530, [0x00, 0x00, 0x00, 0x00]) rom.write_bytes(0x2113340, [0x00, 0x0D, 0x00, 0x3B, 0x00, 0x3C, 0x00, 0x3C]) rom.write_bytes(0x2113C18, [0x00, 0x82, 0x00, 0x00, 0x00, 0x3A, 0x00, 0x00]) rom.write_bytes(0x21131D0, [0x00, 0x01, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x3C]) From 724e1c04f497b1816153479deb00dd60f7d39ae9 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 15 Jun 2018 03:59:17 -0500 Subject: [PATCH 138/151] Half of fast GC flag The actual hints themselves need put in but the regions to hint at are now defined in the locations. The removal of the barrier and the Boss Key door should work. The skip of the collapsing tower isn't programmed yet. I also fixed the logic reqs on two Skulls to be more accurate (super low% chance they would have made impossible seeds), cleaned up the spoiler log just a bit (and added the new flag to the log), and made it so making a seed with a spoiler log puts the items in different places than making a seed without. Lastly I updated the program's version number to 2.0 which will be accurate shortly. --- BaseClasses.py | 10 +- Gui.py | 5 + Main.py | 11 +- OoTRandomizer.py | 6 + Regions.py | 762 +++++++++++++++++++++++------------------------ Rom.py | 8 +- Rules.py | 4 +- 7 files changed, 414 insertions(+), 392 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 1b3b54c20..8fc895f22 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -6,7 +6,7 @@ class World(object): - def __init__(self, bridge, open_forest, open_door_of_time, place_dungeon_items, check_beatable_only, hints, colors, healthSFX): + def __init__(self, bridge, open_forest, open_door_of_time, place_dungeon_items, check_beatable_only, hints, fast_ganon, colors, healthSFX): self.shuffle = 'vanilla' self.bridge = bridge self.dungeons = [] @@ -28,6 +28,7 @@ def __init__(self, bridge, open_forest, open_door_of_time, place_dungeon_items, self.colors = colors self.healthSFX = healthSFX self.keysanity = False + self.fast_ganon = fast_ganon self.can_take_damage = True self.spoiler = Spoiler(self) @@ -498,7 +499,7 @@ def __unicode__(self): class Location(object): - def __init__(self, name='', address=None, address2=None, default=None, type='Chest', scene=None, parent=None): + def __init__(self, name='', address=None, address2=None, default=None, type='Chest', scene=None, hint='Termina', parent=None): self.name = name self.parent_region = parent self.item = None @@ -507,6 +508,7 @@ def __init__(self, name='', address=None, address2=None, default=None, type='Che self.default = default self.type = type self.scene = scene + self.hint = hint self.spot_type = 'Location' self.recursion_count = 0 self.staleness_count = 0 @@ -595,6 +597,7 @@ def parse_data(self): 'bridge': self.world.bridge, 'forest': self.world.open_forest, 'door': self.world.open_door_of_time, + 'ganon': self.world.fast_ganon, 'completeable': not self.world.check_beatable_only, 'dungeonitems': self.world.place_dungeon_items} @@ -605,10 +608,9 @@ def to_file(self, filename): outfile.write('Rainbow Bridge Requirement: %s\n' % self.metadata['bridge']) outfile.write('Open Forest: %s\n' % ('Yes' if self.metadata['forest'] else 'No')) outfile.write('Open Door of Time: %s\n' % ('Yes' if self.metadata['door'] else 'No')) + outfile.write('Fast Ganon\'s Castle: %s\n' % ('Yes' if self.metadata['ganon'] else 'No')) outfile.write('All Locations Accessible: %s\n' % ('Yes' if self.metadata['completeable'] else 'No, some locations may be unreachable')) outfile.write('Maps and Compasses in Dungeons: %s\n' % ('Yes' if self.metadata['dungeonitems'] else 'No')) - outfile.write('\n\nEntrances:\n\n') - outfile.write('\n'.join(['%s %s %s' % (entry['entrance'], '<=>' if entry['direction'] == 'both' else '<=' if entry['direction'] == 'exit' else '=>', entry['exit']) for entry in self.entrances])) outfile.write('\n\nLocations:\n\n') outfile.write('\n'.join(['%s: %s' % (location, item) for (location, item) in self.locations['other locations'].items()])) outfile.write('\n\nPlaythrough:\n\n') diff --git a/Gui.py b/Gui.py index 705fcaef6..61e41f0e1 100644 --- a/Gui.py +++ b/Gui.py @@ -60,6 +60,8 @@ def open_readme(): openForestCheckbutton = Checkbutton(checkBoxFrame, text="Open Forest", variable=openForestVar) openDoorVar = IntVar() openDoorCheckbutton = Checkbutton(checkBoxFrame, text="Open Door of Time", variable=openDoorVar) + fastGanonVar = IntVar() + fastGanonCheckbutton = Checkbutton(checkBoxFrame, text="Skip most of Ganon's Castle", variable=fastGanonVar) dungeonItemsVar = IntVar() dungeonItemsCheckbutton = Checkbutton(checkBoxFrame, text="Place Dungeon Items (Compasses/Maps)", onvalue=0, offvalue=1, variable=dungeonItemsVar) beatableOnlyVar = IntVar() @@ -72,6 +74,7 @@ def open_readme(): compressRomCheckbutton.pack(expand=True, anchor=W) openForestCheckbutton.pack(expand=True, anchor=W) openDoorCheckbutton.pack(expand=True, anchor=W) + fastGanonCheckbutton.pack(expand=True, anchor=W) dungeonItemsCheckbutton.pack(expand=True, anchor=W) beatableOnlyCheckbutton.pack(expand=True, anchor=W) hintsCheckbutton.pack(expand=True, anchor=W) @@ -172,6 +175,7 @@ def generateRom(): guiargs.compress_rom = bool(compressRomVar.get()) guiargs.open_forest = bool(openForestVar.get()) guiargs.open_door_of_time = bool(openDoorVar.get()) + guiargs.fast_ganon = bool(fastGanonVar.get()) guiargs.nodungeonitems = bool(dungeonItemsVar.get()) guiargs.beatableonly = bool(beatableOnlyVar.get()) guiargs.hints = bool(hintsVar.get()) @@ -213,6 +217,7 @@ def generateRom(): dungeonItemsVar.set(int(not args.nodungeonitems)) openForestVar.set(int(args.open_forest)) openDoorVar.set(int(args.open_door_of_time)) + fastGanonVar.set(int(args.fast_ganon)) beatableOnlyVar.set(int(args.beatableonly)) hintsVar.set(int(args.hints)) if args.count: diff --git a/Main.py b/Main.py index 7960a009c..61da9d043 100644 --- a/Main.py +++ b/Main.py @@ -17,13 +17,13 @@ from ItemList import generate_itempool from Utils import output_path -__version__ = '1.0.0' +__version__ = '2.0.0' def main(args, seed=None): start = time.clock() # initialize the world - world = World(args.bridge, args.open_forest, args.open_door_of_time, not args.nodungeonitems, args.beatableonly, args.hints, [args.kokiricolor, args.goroncolor, args.zoracolor], args.healthSFX) + world = World(args.bridge, args.open_forest, args.open_door_of_time, not args.nodungeonitems, args.beatableonly, args.hints, args.fast_ganon, [args.kokiricolor, args.goroncolor, args.zoracolor], args.healthSFX) logger = logging.getLogger('') if seed is None: random.seed(None) @@ -31,6 +31,9 @@ def main(args, seed=None): else: world.seed = int(seed) random.seed(world.seed) + if args.create_spoiler: # Make game different if spoiler log is generated. + new_base_seed = random.randint(0, 999999999) + random.seed(new_base_seed) logger.info('OoT Randomizer Version %s - Seed: %s\n\n', __version__, world.seed) @@ -67,7 +70,7 @@ def main(args, seed=None): logger.info('Patching ROM.') - outfilebase = 'OoT_%s%s%s%s_%s' % (world.bridge, "-openforest" if world.open_forest else "", "-opendoor" if world.open_door_of_time else "", "-beatableonly" if world.check_beatable_only else "", world.seed) + outfilebase = 'OoT_%s%s%s%s%s_%s' % (world.bridge, "-openforest" if world.open_forest else "", "-opendoor" if world.open_door_of_time else "", "-fastganon" if world.fast_ganon else "", "-beatableonly" if world.check_beatable_only else "", world.seed) if not args.suppress_rom: rom = LocalRom(args.rom) @@ -94,7 +97,7 @@ def main(args, seed=None): def copy_world(world): # ToDo: Not good yet - ret = World(world.bridge, world.open_forest, world.open_door_of_time, world.place_dungeon_items, world.check_beatable_only, world.hints, world.colors, world.healthSFX) + ret = World(world.bridge, world.open_forest, world.open_door_of_time, world.place_dungeon_items, world.check_beatable_only, world.hints, world.fast_ganon, world.colors, world.healthSFX) ret.seed = world.seed ret.can_take_damage = world.can_take_damage create_regions(ret) diff --git a/OoTRandomizer.py b/OoTRandomizer.py index 21e5da2ce..44f0e8d93 100644 --- a/OoTRandomizer.py +++ b/OoTRandomizer.py @@ -45,6 +45,12 @@ def start(): parser.add_argument('--open_door_of_time', help='''\ The Door of Time is open from the beginning of the game. ''', action='store_true') + parser.add_argument('--fast_ganon', help='''\ + The barrier within Ganon's Castle leading to Ganon's Tower is dispelled from the + beginning of the game, the Boss Key is not required in Ganon's Tower, Ganondorf + gives a hint for the location of Light Arrows, and the tower collapse sequence + is removed. + ''', action='store_true') parser.add_argument('--nodungeonitems', help='''\ Remove Maps and Compasses from Itempool, replacing them by empty slots. diff --git a/Regions.py b/Regions.py index b08cf99e3..f0bb79511 100644 --- a/Regions.py +++ b/Regions.py @@ -202,384 +202,384 @@ def _create_region(name, type, locations=None, exits=None): ret.locations.append(Location(location, address, address2, default, type, scene, ret)) return ret -location_table = {'Kokiri Sword Chest': (0x20A6142, None, 0x04E0, 'Chest', 0x55), - 'Mido Chest Top Left': (0x2F7B08A, None, 0x59A0, 'Chest', 0x28), - 'Mido Chest Top Right': (0x2F7B09A, None, 0x59A1, 'Chest', 0x28), - 'Mido Chest Bottom Left': (0x2F7B0AA, None, 0x5982, 'Chest', 0x28), - 'Mido Chest Bottom Right': (0x2F7B0BA, None, 0x5903, 'Chest', 0x28), - 'Shield Grave Chest': (0x328B096, None, 0x5540, 'Chest', 0x40), - 'Heart Piece Grave Chest': (0x2D0A056, None, 0xA7C0, 'Chest', 0x3F), - 'Composer Grave Chest': (0x332D0EA, None, 0x8020, 'Chest', 0x41), - 'Death Mountain Bombable Chest': (0x223C3CA, 0x223C7B2, 0x5AA1, 'Chest', 0x60), - 'Goron City Leftmost Maze Chest': (0x227C23A, 0x227C70A, 0x5AC0, 'Chest', 0x62), - 'Goron City Left Maze Chest': (0x227C24A, 0x227C71A, 0x5AA1, 'Chest', 0x62), - 'Goron City Right Maze Chest': (0x227C25A, 0x227C72A, 0x5AA2, 'Chest', 0x62), - 'Zoras Domain Torch Run': (0x2103166, None, 0xB7C0, 'Chest', 0x58), - 'Hookshot Chest': (0x3063092, None, 0x1100, 'Chest', 0x48), - 'Gerudo Valley Hammer Rocks Chest': (0x213D676, None, 0x5AA0, 'Chest', 0x5A), - 'Gerudo Fortress Rooftop Chest': (0x21BD4AA, 0x21BD6EA, 0x07C0, 'Chest', 0x5D), - 'Haunted Wasteland Structure Chest': (0x21E20DE, None, 0x8AA0, 'Chest', 0x5E), - 'Redead Grotto Chest': (0x26CF076, None, 0x7ACA, 'Chest', 0x3E), - 'Wolfos Grotto Chest': (0x26EB076, None, 0x7AB1, 'Chest', 0x3E), - 'Deku Tree Lobby Chest': (0x24A7146, None, 0x0823, 'Chest', 0x00), - 'Deku Tree Slingshot Chest': (0x24C20C6, None, 0x00A1, 'Chest', 0x00), - 'Deku Tree Slingshot Room Side Chest': (0x24C20D6, None, 0x5905, 'Chest', 0x00), - 'Deku Tree Compass Chest': (0x25040D6, None, 0x0802, 'Chest', 0x00), - 'Deku Tree Compass Room Side Chest': (0x25040E6, None, 0x5906, 'Chest', 0x00), - 'Deku Tree Basement Chest': (0x24C8166, None, 0x5904, 'Chest', 0x00), - 'Dodongos Cavern Map Chest': (0x1F2819E, None, 0x0828, 'Chest', 0x01), - 'Dodongos Cavern Compass Chest': (0x1FAF0AA, None, 0x0805, 'Chest', 0x01), - 'Dodongos Cavern Bomb Flower Platform': (0x1F890DE, None, 0x59C6, 'Chest', 0x01), - 'Dodongos Cavern Bomb Bag Chest': (0x1F890CE, None, 0x0644, 'Chest', 0x01), - 'Dodongos Cavern End of Bridge Chest': (0x1F281CE, None, 0x552A, 'Chest', 0x01), - 'Chest Above King Dodongo': (0x2EB00BA, None, 0x5020, 'Chest', 0x12), - 'Boomerang Chest': (0x278A0BA, None, 0x10C1, 'Chest', 0x02), - 'Jabu Jabus Belly Map Chest': (0x278E08A, None, 0x1822, 'Chest', 0x02), - 'Jabu Jabus Belly Compass Chest': (0x279608A, None, 0xB804, 'Chest', 0x02), - 'Forest Temple First Chest': (0x23E5092, None, 0x5843, 'Chest', 0x03), - 'Forest Temple Chest Behind Lobby': (0x2415082, None, 0x7840, 'Chest', 0x03), - 'Forest Temple Well Chest': (0x244A062, None, 0x5849, 'Chest', 0x03), - 'Forest Temple Map Chest': (0x2455076, None, 0x1821, 'Chest', 0x03), - 'Forest Temple Outside Hookshot Chest': (0x241F0D6, None, 0x5905, 'Chest', 0x03), - 'Forest Temple Falling Room Chest': (0x247E09E, None, 0x5947, 'Chest', 0x03), - 'Forest Temple Block Push Chest': (0x245B096, None, 0x8964, 'Chest', 0x03), - 'Forest Temple Boss Key Chest': (0xCB0DC2, None, 0x27EE, 'Chest', 0x03), - 'Forest Temple Floormaster Chest': (0x2490072, None, 0x7842, 'Chest', 0x03), - 'Forest Temple Bow Chest': (0x2415092, None, 0xB08C, 'Chest', 0x03), - 'Forest Temple Red Poe Chest': (0x246607E, None, 0x784D, 'Chest', 0x03), - 'Forest Temple Blue Poe Chest': (0x246F07E, None, 0x180F, 'Chest', 0x03), - 'Forest Temple Near Boss Chest': (0x2486082, None, 0x592B, 'Chest', 0x03), - 'Bottom of the Well Front Left Hidden Wall': (0x32D317E, None, 0x5848, 'Chest', 0x08), - 'Bottom of the Well Front Center Bombable': (0x32D30FE, None, 0x5062, 'Chest', 0x08), - 'Bottom of the Well Right Bottom Hidden Wall': (0x32D314E, None, 0x5845, 'Chest', 0x08), - 'Bottom of the Well Center Large Chest': (0x32D30EE, None, 0x0801, 'Chest', 0x08), - 'Bottom of the Well Center Small Chest': (0x32D31AE, None, 0x504E, 'Chest', 0x08), - 'Bottom of the Well Back Left Bombable': (0x32D313E, None, 0x5C84, 'Chest', 0x08), - 'Bottom of the Well Defeat Boss': (0x32FB0AA, None, 0x1143, 'Chest', 0x08), - 'Bottom of the Well Invisible Chest': (0x32FB0BA, None, 0x6AD4, 'Chest', 0x08), - 'Bottom of the Well Underwater Front Chest': (0x32D31BE, None, 0x5CD0, 'Chest', 0x08), - 'Bottom of the Well Underwater Left Chest': (0x32D318E, None, 0x5909, 'Chest', 0x08), - 'Bottom of the Well Basement Chest': (0x32E9252, None, 0x0827, 'Chest', 0x08), - 'Bottom of the Well Locked Pits': (0x32F90AA, None, 0x552A, 'Chest', 0x08), - 'Bottom of the Well Behind Right Grate': (0x32D319E, None, 0x554C, 'Chest', 0x08), - 'Fire Temple Chest Near Boss': (0x230808A, None, 0x5841, 'Chest', 0x04), - 'Fire Temple Fire Dancer Chest': (0x2318082, None, 0x7CC0, 'Chest', 0x04), - 'Fire Temple Boss Key Chest': (0x238A0D6, None, 0x27EC, 'Chest', 0x04), - 'Fire Temple Big Lava Room Bombable Chest': (0x23AD076, None, 0x5842, 'Chest', 0x04), - 'Fire Temple Big Lava Room Open Chest': (0x239D0A6, None, 0x5844, 'Chest', 0x04), - 'Fire Temple Boulder Maze Lower Chest': (0x2323152, None, 0x5843, 'Chest', 0x04), - 'Fire Temple Boulder Maze Upper Chest': (0x2323182, None, 0x5846, 'Chest', 0x04), - 'Fire Temple Boulder Maze Side Room': (0x23B40B2, None, 0x5848, 'Chest', 0x04), - 'Fire Temple Boulder Maze Bombable Pit': (0x231B0E2, None, 0x584B, 'Chest', 0x04), - 'Fire Temple Scarecrow Chest': (0x2339082, None, 0x5ACD, 'Chest', 0x04), - 'Fire Temple Map Chest': (0x237E0C2, None, 0x082A, 'Chest', 0x04), - 'Fire Temple Compass Chest': (0x23C1082, None, 0x0807, 'Chest', 0x04), - 'Fire Temple Highest Goron Chest': (0x2365066, None, 0x5849, 'Chest', 0x04), - 'Fire Temple Megaton Hammer Chest': (0x236C102, None, 0x01A5, 'Chest', 0x04), - 'Ice Cavern Map Chest': (0x2C4016A, None, 0x0820, 'Chest', 0x09), - 'Ice Cavern Compass Chest': (0x2C4E236, None, 0x0801, 'Chest', 0x09), - 'Ice Cavern Iron Boots Chest': (0x2C380A2, None, 0x15C2, 'Chest', 0x09), - 'Water Temple Map Chest': (0x26690A6, None, 0x1822, 'Chest', 0x05), - 'Water Temple Compass Chest': (0x25FC0D2, None, 0x0809, 'Chest', 0x05), - 'Water Temple Torches Chest': (0x26640A6, None, 0x7841, 'Chest', 0x05), - 'Water Temple Dragon Chest': (0x261F0BA, None, 0x584A, 'Chest', 0x05), - 'Water Temple Central Bow Target Chest': (0x266D072, None, 0x5848, 'Chest', 0x05), - 'Water Temple Central Pillar Chest': (0x25EF0D6, None, 0x5846, 'Chest', 0x05), - 'Water Temple Cracked Wall Chest': (0x265B0A6, None, 0x5840, 'Chest', 0x05), - 'Water Temple Boss Key Chest': (0x2657066, None, 0x27E5, 'Chest', 0x05), - 'Water Temple Dark Link Chest': (0x261907A, None, 0x0127, 'Chest', 0x05), - 'Water Temple River Chest': (0x26740DE, None, 0x5843, 'Chest', 0x05), - 'Shadow Temple Map Chest': (0x27CC0AA, None, 0x1821, 'Chest', 0x07), - 'Shadow Temple Hover Boots Chest': (0x27DC0CA, None, 0x15E7, 'Chest', 0x07), - 'Shadow Temple Compass Chest': (0x27EC09E, None, 0x1803, 'Chest', 0x07), - 'Shadow Temple Early Silver Rupee Chest': (0x27E40F6, None, 0x5842, 'Chest', 0x07), - 'Shadow Temple Invisible Blades Visible Chest': (0x282212A, None, 0x588C, 'Chest', 0x07), - 'Shadow Temple Invisible Blades Invisible Chest': (0x282211A, None, 0x6976, 'Chest', 0x07), - 'Shadow Temple Falling Spikes Lower Chest': (0x2801132, None, 0x5945, 'Chest', 0x07), - 'Shadow Temple Falling Spikes Upper Chest': (0x2801142, None, 0x5886, 'Chest', 0x07), - 'Shadow Temple Falling Spikes Switch Chest': (0x2801122, None, 0x8844, 'Chest', 0x07), - 'Shadow Temple Invisible Spikes Chest': (0x28090EE, None, 0x7889, 'Chest', 0x07), - 'Shadow Temple Wind Hint Chest': (0x283609A, None, 0x6955, 'Chest', 0x07), - 'Shadow Temple After Wind Enemy Chest': (0x28390FE, None, 0x7888, 'Chest', 0x07), - 'Shadow Temple After Wind Hidden Chest': (0x28390EE, None, 0x6854, 'Chest', 0x07), - 'Shadow Temple Spike Walls Left Chest': (0x28130B6, None, 0x588A, 'Chest', 0x07), - 'Shadow Temple Boss Key Chest': (0x28130A6, None, 0x27EB, 'Chest', 0x07), - 'Shadow Temple Hidden Floormaster Chest': (0x282508A, None, 0x784D, 'Chest', 0x07), - 'Gerudo Training Grounds Lobby Left Chest': (0x28870CA, None, 0x8893, 'Chest', 0x0B), - 'Gerudo Training Grounds Lobby Right Chest': (0x28870BA, None, 0x8947, 'Chest', 0x0B), - 'Gerudo Training Grounds Stalfos Chest': (0x28970AA, None, 0x8840, 'Chest', 0x0B), - 'Gerudo Training Grounds Beamos Chest': (0x28C715E, None, 0x8841, 'Chest', 0x0B), - 'Gerudo Training Grounds Hidden Ceiling Chest': (0x28D010E, None, 0x584B, 'Chest', 0x0B), - 'Gerudo Training Grounds Maze Path First Chest': (0x28D00CE, None, 0x5AA6, 'Chest', 0x0B), - 'Gerudo Training Grounds Maze Path Second Chest': (0x28D00FE, None, 0x59CA, 'Chest', 0x0B), - 'Gerudo Training Grounds Maze Path Third Chest': (0x28D00EE, None, 0x5969, 'Chest', 0x0B), - 'Gerudo Training Grounds Maze Path Final Chest': (0x28D011E, None, 0x0B2C, 'Chest', 0x0B), - 'Gerudo Training Grounds Maze Right Central Chest': (0x28D00BE, None, 0x5D45, 'Chest', 0x0B), - 'Gerudo Training Grounds Maze Right Side Chest': (0x28D00DE, None, 0x5968, 'Chest', 0x0B), - 'Gerudo Training Grounds Underwater Silver Rupee Chest': (0x28D91D6, None, 0x884D, 'Chest', 0x0B), - 'Gerudo Training Grounds Hammer Room Clear Chest': (0x28B91AE, None, 0x7952, 'Chest', 0x0B), - 'Gerudo Training Grounds Hammer Room Switch Chest': (0x28B919E, None, 0x5850, 'Chest', 0x0B), - 'Gerudo Training Grounds Eye Statue Chest': (0x28AE09E, None, 0x8843, 'Chest', 0x0B), - 'Gerudo Training Grounds Near Scarecrow Chest': (0x28D00AE, None, 0x5844, 'Chest', 0x0B), - 'Gerudo Training Grounds Before Heavy Block Chest': (0x28A611E, None, 0x7971, 'Chest', 0x0B), - 'Gerudo Training Grounds Heavy Block First Chest': (0x28DD0BE, None, 0x7ACF, 'Chest', 0x0B), - 'Gerudo Training Grounds Heavy Block Second Chest': (0x28DD0AE, None, 0x788E, 'Chest', 0x0B), - 'Gerudo Training Grounds Heavy Block Third Chest': (0x28DD08E, None, 0x6854, 'Chest', 0x0B), - 'Gerudo Training Grounds Heavy Block Fourth Chest': (0x28DD09E, None, 0x5F82, 'Chest', 0x0B), - 'Spirit Temple Child Left Chest': (0x2B190BA, None, 0x5528, 'Chest', 0x06), - 'Spirit Temple Child Right Chest': (0x2B13182, None, 0x8840, 'Chest', 0x06), - 'Spirit Temple Compass Chest': (0x2B6B08A, None, 0x3804, 'Chest', 0x06), - 'Spirit Temple Early Adult Right Chest': (0x2B6207A, None, 0x5847, 'Chest', 0x06), - 'Spirit Temple First Mirror Right Chest': (0x2B700C6, None, 0x890D, 'Chest', 0x06), - 'Spirit Temple First Mirror Left Chest': (0x2B700D6, None, 0x8F8E, 'Chest', 0x06), - 'Spirit Temple Map Chest': (0x2B25126, None, 0xB823, 'Chest', 0x06), - 'Spirit Temple Child Climb East Chest': (0x2B1D122, None, 0x8066, 'Chest', 0x06), - 'Spirit Temple Child Climb North Chest': (0x2B1D132, None, 0x852C, 'Chest', 0x06), - 'Spirit Temple Sun Block Room Chest': (0x2B481B2, None, 0x8841, 'Chest', 0x06), - 'Spirit Temple Statue Hand Chest': (0x2B25136, None, 0x8842, 'Chest', 0x06), - 'Spirit Temple NE Main Room Chest': (0x2B25146, None, 0x888F, 'Chest', 0x06), - 'Silver Gauntlets Chest': (0x21A02DE, 0x21A06F2, 0x06AB, 'Chest', 0x5C), - 'Mirror Shield Chest': (0x21A02CE, 0x21A06E2, 0x3569, 'Chest', 0x5C), - 'Spirit Temple Near Four Armos Chest': (0x2B9F076, None, 0x5845, 'Chest', 0x06), - 'Spirit Temple Hallway Left Invisible Chest': (0x2B900B6, None, 0x6914, 'Chest', 0x06), - 'Spirit Temple Hallway Right Invisible Chest': (0x2B900C6, None, 0x6915, 'Chest', 0x06), - 'Spirit Temple Boss Key Chest': (0x2BA4162, None, 0x27EA, 'Chest', 0x06), - 'Spirit Temple Topmost Chest': (0x2BCF0FE, None, 0x8CF2, 'Chest', 0x06), - 'Ganons Castle Forest Trial Chest': (0x31F106E, None, 0x7889, 'Chest', 0x0D), - 'Ganons Castle Water Trial Left Chest': (0x31D7236, None, 0x5F87, 'Chest', 0x0D), - 'Ganons Castle Water Trial Right Chest': (0x31D7226, None, 0x5906, 'Chest', 0x0D), - 'Ganons Castle Shadow Trial First Chest': (0x32350CA, None, 0x5888, 'Chest', 0x0D), - 'Ganons Castle Shadow Trial Second Chest': (0x32350BA, None, 0x36C5, 'Chest', 0x0D), - 'Ganons Castle Spirit Trial First Chest': (0x3268132, None, 0x8D72, 'Chest', 0x0D), - 'Ganons Castle Spirit Trial Second Chest': (0x3268142, None, 0x6954, 'Chest', 0x0D), - 'Ganons Castle Light Trial First Left Chest': (0x321B11E, None, 0x588C, 'Chest', 0x0D), - 'Ganons Castle Light Trial Second Left Chest': (0x321B10E, None, 0x5F8B, 'Chest', 0x0D), - 'Ganons Castle Light Trial Third Left Chest': (0x321B12E, None, 0x590D, 'Chest', 0x0D), - 'Ganons Castle Light Trial First Right Chest': (0x321B13E, None, 0x5F8E, 'Chest', 0x0D), - 'Ganons Castle Light Trial Second Right Chest': (0x321B0FE, None, 0x596A, 'Chest', 0x0D), - 'Ganons Castle Light Trial Third Right Chest': (0x321B14E, None, 0x5F8F, 'Chest', 0x0D), - 'Ganons Castle Light Trail Invisible Enemies Chest': (0x321B15E, None, 0x7850, 'Chest', 0x0D), - 'Ganons Castle Light Trial Lullaby Chest': (0x321B17E, None, 0x8851, 'Chest', 0x0D), - 'Ganons Tower Boss Key Chest': (0x2F040EE, None, 0x27EB, 'Chest', 0x0A), - 'Field West Castle Town Grotto Chest': (None, None, 0x00, 'Chest', 0x3E), - 'Remote Southern Grotto Chest': (None, None, 0x02, 'Chest', 0x3E), - 'Field Near Lake Outside Fence Grotto Chest': (None, None, 0x03, 'Chest', 0x3E), - 'Kakariko Back Grotto Chest': (None, None, 0x08, 'Chest', 0x3E), - 'Zora River Plateau Open Grotto Chest': (None, None, 0x09, 'Chest', 0x3E), - 'Kokiri Forest Storms Grotto Chest': (None, None, 0x0C, 'Chest', 0x3E), - 'Lost Woods Generic Grotto Chest': (None, None, 0x14, 'Chest', 0x3E), - 'Mountain Storms Grotto Chest': (None, None, 0x17, 'Chest', 0x3E), - 'Top of Crater Grotto Chest': (None, None, 0x1A, 'Chest', 0x3E), - 'Impa at Castle': (0x2E8E925, 0x2E8E925, 0x0A, 'Song', None), - 'Song from Malon': (0xD7EB53, 0xD7EBCF, 0x09, 'Song', None), - 'Song from Composer Grave': (0x332A871, 0x332A871, 0x0B, 'Song', None), - 'Song from Saria': (0x20B1DB1, 0x20B1DB1, 0x08, 'Song', None), - 'Song from Ocarina of Time': (0x252FC89, 0x252FC89, 0x0C, 'Song', None), - 'Song at Windmill': (0xE42C07, 0xE42B8B, 0x0D, 'Song', None), - 'Sheik Forest Song': (0x20B0809, 0x20B0809, 0x02, 'Song', None), - 'Sheik at Temple': (0x2531329, 0x2531329, 0x07, 'Song', None), - 'Sheik in Crater': (0x224D7F1, 0x224D7F1, 0x03, 'Song', None), - 'Sheik in Ice Cavern': (0x2BEC889, 0x2BEC889, 0x04, 'Song', None), - 'Sheik in Kakariko': (0x2000FE1, 0x2000FE1, 0x06, 'Song', None), - 'Sheik at Colossus': (0x218C57D, 0x218C57D, 0x05, 'Song', None), - 'Gift from Saria': (None, None, None, 'NPC', None), - 'Zeldas Letter': (None, None, None, 'NPC', None), - 'Zelda': (0x3481400, None, 0x5A, 'NPC', 0x43), - 'Zoras Fountain Fairy Reward': (0x3481401, None, 0x5D, 'NPC', 0x3D), - 'Hyrule Castle Fairy Reward': (0x3481402, None, 0x5C, 'NPC', 0x3D), - 'Desert Colossus Fairy Reward': (0x3481403, None, 0x5E, 'NPC', 0x3D), - 'Mountain Summit Fairy Reward': (0x3481404, None, 0x51, 'NPC', 0x3B), - 'Crater Fairy Reward': (0x3481405, None, 0x52, 'NPC', 0x3B), - 'Ganons Castle Fairy Reward': (0x3481406, None, 0x53, 'NPC', 0x3B), - 'Treasure Chest Game': (None, None, 0x0A, 'Chest', 0x10), - 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62), - 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58), - 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC', 0x49), - 'Adult Fishing': (0xDCC087, None, 0x38, 'NPC', 0x49), - 'Diving in the Lab': (0xE2CB97, None, 0x3E, 'NPC', 0x38), - 'Link the Goron': (0xED30EB, 0xED64F3, 0x2C, 'NPC', 0x62), - 'King Zora Thawed': (0xE56AD7, None, 0x2D, 'NPC', 0x58), - 'Bombchu Bowling Bomb Bag': (0xE2F093, None, 0x34, 'NPC', 0x4B), - 'Bombchu Bowling Piece of Heart': (0xE2F097, None, 0x3E, 'NPC', 0x4B), - 'Dog Lady': (0xE65163, 0xE661BB, 0x3E, 'NPC', 0x35), - 'Skull Kid': (0xDF0F33, 0xDF0E9B, 0x3E, 'NPC', 0x5B), - 'Ocarina Memory Game': (0xDF264F, None, 0x76, 'NPC', 0x5B), - '10 Gold Skulltulla Reward': (0xEA7173, None, 0x45, 'NPC', 0x50), - '20 Gold Skulltulla Reward': (0xEA7175, None, 0x39, 'NPC', 0x50), - '30 Gold Skulltulla Reward': (0xEA7177, None, 0x46, 'NPC', 0x50), - '40 Gold Skulltulla Reward': (0xEA7179, None, 0x03, 'NPC', 0x50), - '50 Gold Skulltulla Reward': (0xEA717B, None, 0x3E, 'NPC', 0x50), - 'Man on Roof': (0xE587E3, None, 0x3E, 'NPC', 0x52), - 'Frog Ocarina Game': (0xDB13D3, None, 0x76, 'NPC', 0x54), - 'Frogs in the Rain': (0xDB1387, None, 0x3E, 'NPC', 0x54), - 'Horseback Archery 1000 Points': (0xE12B6F, 0xE12AA3, 0x3E, 'NPC', 0x5D), - 'Horseback Archery 1500 Points': (0xE12BC3, 0xE12AFB, 0x30, 'NPC', 0x5D), - 'Child Shooting Gallery': (0xD35EF3, None, 0x60, 'NPC', 0x42), - 'Adult Shooting Gallery': (0xD35F5B, None, 0x30, 'NPC', 0x42), - 'Target in Woods': (0xE59CDF, None, 0x60, 'NPC', 0x5B), - 'Deku Theater Skull Mask': (0xEC9A87, None, 0x77, 'NPC', 0x3E), - 'Deku Theater Mask of Truth': (0xEC9CE7, None, 0x7A, 'NPC', 0x3E), - 'Deku Salesman Woods': (0xDF8073, None, 0x77, 'NPC', 0x5B), - 'Deku Salesman Lost Woods Grotto': (0xDF80E7, None, 0x79, 'NPC', 0x3E), - 'Deku Salesman Hyrule Field Grotto': (0xDF86AB, None, 0x3E, 'NPC', 0x3E), - 'Anju as Adult': (0xE1EABB, None, 0x1D, 'NPC', 0x52), - 'Biggoron': (0xED338F, 0xED650F, 0x57, 'NPC', 0x60), - 'Anjus Chickens': (0xE1E7A7, None, 0x0F, 'NPC', 0x52), - 'Talons Chickens': (0xCC14EB, None, 0x14, 'NPC', 0x4C), - '10 Big Poes': (0xEE6AEF, None, 0x0F, 'NPC', 0x4D), - 'Rolling Goron as Child': (0xED296F, 0xED6503, 0x34, 'NPC', 0x62), - 'Lake Hylia Sun': (0xE9E1F2, None, 0x5B08, 'Chest', 0x57), - 'Underwater Bottle': (0xDE10FB, None, 0x15, 'NPC', 0x57), - 'Shadow Temple Freestanding Key': (None, None, 0x01, 'Collectable', 0x07), - 'Bottom of the Well Freestanding Key': (None, None, 0x01, 'Collectable', 0x08), - 'Gerudo Training Grounds Freestanding Key': (None, None, 0x01, 'Collectable', 0x0B), - 'Ice Cavern Freestanding PoH': (None, None, 0x01, 'Collectable', 0x09), - 'Impa House Freestanding PoH': (None, None, 0x01, 'Collectable', 0x37), - 'Tektite Grotto Freestanding PoH': (None, None, 0x01, 'Collectable', 0x3E), - 'Windmill Freestanding PoH': (None, None, 0x01, 'Collectable', 0x48), - 'Dampe Race Freestanding PoH': (None, None, 0x07, 'Collectable', 0x48), - 'Lon Lon Tower Freestanding PoH': (None, None, 0x01, 'Collectable', 0x4C), - 'Graveyard Freestanding PoH': (None, None, 0x04, 'Collectable', 0x53), - 'Gravedigging Tour': (None, None, 0x00, 'Collectable', 0x53), - 'Zora River Lower Freestanding PoH': (None, None, 0x04, 'Collectable', 0x54), - 'Zora River Upper Freestanding PoH': (None, None, 0x0B, 'Collectable', 0x54), - 'Lake Hylia Freestanding PoH': (None, None, 0x1E, 'Collectable', 0x57), - 'Zoras Fountain Iceberg Freestanding PoH': (None, None, 0x01, 'Collectable', 0x59), - 'Zoras Fountain Bottom Freestanding PoH': (None, None, 0x14, 'Collectable', 0x59), - 'Gerudo Valley Waterfall Freestanding PoH': (None, None, 0x01, 'Collectable', 0x5A), - 'Gerudo Valley Crate Freestanding PoH': (None, None, 0x02, 'Collectable', 0x5A), - 'Colossus Freestanding PoH': (None, None, 0x0D, 'Collectable', 0x5C), - 'DM Trail Freestanding PoH': (None, None, 0x1E, 'Collectable', 0x60), - 'DM Crater Wall Freestanding PoH': (None, None, 0x02, 'Collectable', 0x61), - 'DM Crater Volcano Freestanding PoH': (None, None, 0x08, 'Collectable', 0x61), - 'Goron City Pot Freestanding PoH': (None, None, 0x1F, 'Collectable', 0x62), - 'Queen Gohma Heart': (None, None, 0x4F, 'BossHeart', 0x11), - 'King Dodongo Heart': (None, None, 0x4F, 'BossHeart', 0x12), - 'Barinade Heart': (None, None, 0x4F, 'BossHeart', 0x13), - 'Phantom Ganon Heart': (None, None, 0x4F, 'BossHeart', 0x14), - 'Volvagia Heart': (None, None, 0x4F, 'BossHeart', 0x15), - 'Morpha Heart': (None, None, 0x4F, 'BossHeart', 0x16), - 'Twinrova Heart': (None, None, 0x4F, 'BossHeart', 0x17), - 'Bongo Bongo Heart': (None, None, 0x4F, 'BossHeart', 0x18), - 'Magic Bean Salesman': (None, None, None, 'Event', None), - 'King Zora Moves': (None, None, None, 'Event', None), - 'Ocarina of Time': (None, None, None, 'Event', None), - 'Master Sword Pedestal': (None, None, None, 'Event', None), - 'Epona': (None, None, None, 'Event', None), - 'Gerudo Fortress Carpenter Rescue': (None, None, None, 'Event', None), - 'Ganons Castle Forest Trial Clear': (None, None, None, 'Event', None), - 'Ganons Castle Fire Trial Clear': (None, None, None, 'Event', None), - 'Ganons Castle Water Trial Clear': (None, None, None, 'Event', None), - 'Ganons Castle Shadow Trial Clear': (None, None, None, 'Event', None), - 'Ganons Castle Spirit Trial Clear': (None, None, None, 'Event', None), - 'Ganons Castle Light Trial Clear': (None, None, None, 'Event', None), - 'Links Pocket': (0x34806FB, 0x34806FF, None, 'Boss', None), - 'Queen Gohma': (0xCA315F, 0x2079571, 0x6C, 'Boss', None), - 'King Dodongo': (0xCA30DF, 0x2223309, 0x6D, 'Boss', None), - 'Barinade': (0xCA36EB, 0x2113C19, 0x6E, 'Boss', None), - 'Phantom Ganon': (0xCA3D07, 0xD4ED79, 0x66, 'Boss', None), - 'Volvagia': (0xCA3D93, 0xD10135, 0x67, 'Boss', None), - 'Morpha': (0xCA3E1F, 0xD5A3A9, 0x68, 'Boss', None), - 'Twinrova': (0xCA3EB3, 0xD39FF1, 0x69, 'Boss', None), - 'Bongo Bongo': (0xCA3F43, 0xD13E19, 0x6A, 'Boss', None), - 'Ganon': (None, None, None, 'Boss', None), - 'GS1': (None, None, None, 'GS Token', None), - 'GS2': (None, None, None, 'GS Token', None), - 'GS3': (None, None, None, 'GS Token', None), - 'GS4': (None, None, None, 'GS Token', None), - 'GS5': (None, None, None, 'GS Token', None), - 'GS6': (None, None, None, 'GS Token', None), - 'GS7': (None, None, None, 'GS Token', None), - 'GS8': (None, None, None, 'GS Token', None), - 'GS9': (None, None, None, 'GS Token', None), - 'GS10': (None, None, None, 'GS Token', None), - 'GS11': (None, None, None, 'GS Token', None), - 'GS12': (None, None, None, 'GS Token', None), - 'GS13': (None, None, None, 'GS Token', None), - 'GS14': (None, None, None, 'GS Token', None), - 'GS15': (None, None, None, 'GS Token', None), - 'GS16': (None, None, None, 'GS Token', None), - 'GS17': (None, None, None, 'GS Token', None), - 'GS18': (None, None, None, 'GS Token', None), - 'GS19': (None, None, None, 'GS Token', None), - 'GS20': (None, None, None, 'GS Token', None), - 'GS21': (None, None, None, 'GS Token', None), - 'GS22': (None, None, None, 'GS Token', None), - 'GS23': (None, None, None, 'GS Token', None), - 'GS24': (None, None, None, 'GS Token', None), - 'GS25': (None, None, None, 'GS Token', None), - 'GS26': (None, None, None, 'GS Token', None), - 'GS27': (None, None, None, 'GS Token', None), - 'GS28': (None, None, None, 'GS Token', None), - 'GS29': (None, None, None, 'GS Token', None), - 'GS30': (None, None, None, 'GS Token', None), - 'GS31': (None, None, None, 'GS Token', None), - 'GS32': (None, None, None, 'GS Token', None), - 'GS33': (None, None, None, 'GS Token', None), - 'GS34': (None, None, None, 'GS Token', None), - 'GS35': (None, None, None, 'GS Token', None), - 'GS36': (None, None, None, 'GS Token', None), - 'GS37': (None, None, None, 'GS Token', None), - 'GS38': (None, None, None, 'GS Token', None), - 'GS39': (None, None, None, 'GS Token', None), - 'GS40': (None, None, None, 'GS Token', None), - 'GS41': (None, None, None, 'GS Token', None), - 'GS42': (None, None, None, 'GS Token', None), - 'GS43': (None, None, None, 'GS Token', None), - 'GS44': (None, None, None, 'GS Token', None), - 'GS45': (None, None, None, 'GS Token', None), - 'GS46': (None, None, None, 'GS Token', None), - 'GS47': (None, None, None, 'GS Token', None), - 'GS48': (None, None, None, 'GS Token', None), - 'GS49': (None, None, None, 'GS Token', None), - 'GS50': (None, None, None, 'GS Token', None), - 'GS51': (None, None, None, 'GS Token', None), - 'GS52': (None, None, None, 'GS Token', None), - 'GS53': (None, None, None, 'GS Token', None), - 'GS54': (None, None, None, 'GS Token', None), - 'GS55': (None, None, None, 'GS Token', None), - 'GS56': (None, None, None, 'GS Token', None), - 'GS57': (None, None, None, 'GS Token', None), - 'GS58': (None, None, None, 'GS Token', None), - 'GS59': (None, None, None, 'GS Token', None), - 'GS60': (None, None, None, 'GS Token', None), - 'GS61': (None, None, None, 'GS Token', None), - 'GS62': (None, None, None, 'GS Token', None), - 'GS63': (None, None, None, 'GS Token', None), - 'GS64': (None, None, None, 'GS Token', None), - 'GS65': (None, None, None, 'GS Token', None), - 'GS66': (None, None, None, 'GS Token', None), - 'GS67': (None, None, None, 'GS Token', None), - 'GS68': (None, None, None, 'GS Token', None), - 'GS69': (None, None, None, 'GS Token', None), - 'GS70': (None, None, None, 'GS Token', None), - 'GS71': (None, None, None, 'GS Token', None), - 'GS72': (None, None, None, 'GS Token', None), - 'GS73': (None, None, None, 'GS Token', None), - 'GS74': (None, None, None, 'GS Token', None), - 'GS75': (None, None, None, 'GS Token', None), - 'GS76': (None, None, None, 'GS Token', None), - 'GS77': (None, None, None, 'GS Token', None), - 'GS78': (None, None, None, 'GS Token', None), - 'GS79': (None, None, None, 'GS Token', None), - 'GS80': (None, None, None, 'GS Token', None), - 'GS81': (None, None, None, 'GS Token', None), - 'GS82': (None, None, None, 'GS Token', None), - 'GS83': (None, None, None, 'GS Token', None), - 'GS84': (None, None, None, 'GS Token', None), - 'GS85': (None, None, None, 'GS Token', None), - 'GS86': (None, None, None, 'GS Token', None), - 'GS87': (None, None, None, 'GS Token', None), - 'GS88': (None, None, None, 'GS Token', None), - 'GS89': (None, None, None, 'GS Token', None), - 'GS90': (None, None, None, 'GS Token', None), - 'GS91': (None, None, None, 'GS Token', None), - 'GS92': (None, None, None, 'GS Token', None), - 'GS93': (None, None, None, 'GS Token', None), - 'GS94': (None, None, None, 'GS Token', None), - 'GS95': (None, None, None, 'GS Token', None), - 'GS96': (None, None, None, 'GS Token', None), - 'GS97': (None, None, None, 'GS Token', None), - 'GS98': (None, None, None, 'GS Token', None), - 'GS99': (None, None, None, 'GS Token', None), - 'GS100': (None, None, None, 'GS Token', None)} +location_table = {'Kokiri Sword Chest': (0x20A6142, None, 0x04E0, 'Chest', 0x55, 'Kokiri Forest'), + 'Mido Chest Top Left': (0x2F7B08A, None, 0x59A0, 'Chest', 0x28, 'Kokiri Forest'), + 'Mido Chest Top Right': (0x2F7B09A, None, 0x59A1, 'Chest', 0x28, 'Kokiri Forest'), + 'Mido Chest Bottom Left': (0x2F7B0AA, None, 0x5982, 'Chest', 0x28, 'Kokiri Forest'), + 'Mido Chest Bottom Right': (0x2F7B0BA, None, 0x5903, 'Chest', 0x28, 'Kokiri Forest'), + 'Shield Grave Chest': (0x328B096, None, 0x5540, 'Chest', 0x40, 'the Graveyard'), + 'Heart Piece Grave Chest': (0x2D0A056, None, 0xA7C0, 'Chest', 0x3F, 'the Graveyard'), + 'Composer Grave Chest': (0x332D0EA, None, 0x8020, 'Chest', 0x41, 'the Graveyard'), + 'Death Mountain Bombable Chest': (0x223C3CA, 0x223C7B2, 0x5AA1, 'Chest', 0x60, 'Death Mountain Trail'), + 'Goron City Leftmost Maze Chest': (0x227C23A, 0x227C70A, 0x5AC0, 'Chest', 0x62, 'Goron City'), + 'Goron City Left Maze Chest': (0x227C24A, 0x227C71A, 0x5AA1, 'Chest', 0x62, 'Goron City'), + 'Goron City Right Maze Chest': (0x227C25A, 0x227C72A, 0x5AA2, 'Chest', 0x62, 'Goron City'), + 'Zoras Domain Torch Run': (0x2103166, None, 0xB7C0, 'Chest', 0x58, 'Zora\'s Domain'), + 'Hookshot Chest': (0x3063092, None, 0x1100, 'Chest', 0x48, 'the Graveyard'), + 'Gerudo Valley Hammer Rocks Chest': (0x213D676, None, 0x5AA0, 'Chest', 0x5A, 'Gerudo Valley'), + 'Gerudo Fortress Rooftop Chest': (0x21BD4AA, 0x21BD6EA, 0x07C0, 'Chest', 0x5D, 'Gerudo Fortress'), + 'Haunted Wasteland Structure Chest': (0x21E20DE, None, 0x8AA0, 'Chest', 0x5E, 'Haunted Wasteland'), + 'Redead Grotto Chest': (0x26CF076, None, 0x7ACA, 'Chest', 0x3E, 'Kakariko Village'), + 'Wolfos Grotto Chest': (0x26EB076, None, 0x7AB1, 'Chest', 0x3E, 'Sacred Forest Meadow'), + 'Deku Tree Lobby Chest': (0x24A7146, None, 0x0823, 'Chest', 0x00, 'Deku Tree'), + 'Deku Tree Slingshot Chest': (0x24C20C6, None, 0x00A1, 'Chest', 0x00, 'Deku Tree'), + 'Deku Tree Slingshot Room Side Chest': (0x24C20D6, None, 0x5905, 'Chest', 0x00, 'Deku Tree'), + 'Deku Tree Compass Chest': (0x25040D6, None, 0x0802, 'Chest', 0x00, 'Deku Tree'), + 'Deku Tree Compass Room Side Chest': (0x25040E6, None, 0x5906, 'Chest', 0x00, 'Deku Tree'), + 'Deku Tree Basement Chest': (0x24C8166, None, 0x5904, 'Chest', 0x00, 'Deku Tree'), + 'Dodongos Cavern Map Chest': (0x1F2819E, None, 0x0828, 'Chest', 0x01, 'Dodongo\'s Cavern'), + 'Dodongos Cavern Compass Chest': (0x1FAF0AA, None, 0x0805, 'Chest', 0x01, 'Dodongo\'s Cavern'), + 'Dodongos Cavern Bomb Flower Platform': (0x1F890DE, None, 0x59C6, 'Chest', 0x01, 'Dodongo\'s Cavern'), + 'Dodongos Cavern Bomb Bag Chest': (0x1F890CE, None, 0x0644, 'Chest', 0x01, 'Dodongo\'s Cavern'), + 'Dodongos Cavern End of Bridge Chest': (0x1F281CE, None, 0x552A, 'Chest', 0x01, 'Dodongo\'s Cavern'), + 'Chest Above King Dodongo': (0x2EB00BA, None, 0x5020, 'Chest', 0x12, 'Dodongo\'s Cavern'), + 'Boomerang Chest': (0x278A0BA, None, 0x10C1, 'Chest', 0x02, 'Jabu Jabu\'s Belly'), + 'Jabu Jabus Belly Map Chest': (0x278E08A, None, 0x1822, 'Chest', 0x02, 'Jabu Jabu\'s Belly'), + 'Jabu Jabus Belly Compass Chest': (0x279608A, None, 0xB804, 'Chest', 0x02, 'Jabu Jabu\'s Belly'), + 'Forest Temple First Chest': (0x23E5092, None, 0x5843, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Chest Behind Lobby': (0x2415082, None, 0x7840, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Well Chest': (0x244A062, None, 0x5849, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Map Chest': (0x2455076, None, 0x1821, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Outside Hookshot Chest': (0x241F0D6, None, 0x5905, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Falling Room Chest': (0x247E09E, None, 0x5947, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Block Push Chest': (0x245B096, None, 0x8964, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Boss Key Chest': (0xCB0DC2, None, 0x27EE, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Floormaster Chest': (0x2490072, None, 0x7842, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Bow Chest': (0x2415092, None, 0xB08C, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Red Poe Chest': (0x246607E, None, 0x784D, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Blue Poe Chest': (0x246F07E, None, 0x180F, 'Chest', 0x03, 'Forest Temple'), + 'Forest Temple Near Boss Chest': (0x2486082, None, 0x592B, 'Chest', 0x03, 'Forest Temple'), + 'Bottom of the Well Front Left Hidden Wall': (0x32D317E, None, 0x5848, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Front Center Bombable': (0x32D30FE, None, 0x5062, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Right Bottom Hidden Wall': (0x32D314E, None, 0x5845, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Center Large Chest': (0x32D30EE, None, 0x0801, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Center Small Chest': (0x32D31AE, None, 0x504E, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Back Left Bombable': (0x32D313E, None, 0x5C84, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Defeat Boss': (0x32FB0AA, None, 0x1143, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Invisible Chest': (0x32FB0BA, None, 0x6AD4, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Underwater Front Chest': (0x32D31BE, None, 0x5CD0, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Underwater Left Chest': (0x32D318E, None, 0x5909, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Basement Chest': (0x32E9252, None, 0x0827, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Locked Pits': (0x32F90AA, None, 0x552A, 'Chest', 0x08, 'Bottom of the Well'), + 'Bottom of the Well Behind Right Grate': (0x32D319E, None, 0x554C, 'Chest', 0x08, 'Bottom of the Well'), + 'Fire Temple Chest Near Boss': (0x230808A, None, 0x5841, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Fire Dancer Chest': (0x2318082, None, 0x7CC0, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Boss Key Chest': (0x238A0D6, None, 0x27EC, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Big Lava Room Bombable Chest': (0x23AD076, None, 0x5842, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Big Lava Room Open Chest': (0x239D0A6, None, 0x5844, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Boulder Maze Lower Chest': (0x2323152, None, 0x5843, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Boulder Maze Upper Chest': (0x2323182, None, 0x5846, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Boulder Maze Side Room': (0x23B40B2, None, 0x5848, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Boulder Maze Bombable Pit': (0x231B0E2, None, 0x584B, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Scarecrow Chest': (0x2339082, None, 0x5ACD, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Map Chest': (0x237E0C2, None, 0x082A, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Compass Chest': (0x23C1082, None, 0x0807, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Highest Goron Chest': (0x2365066, None, 0x5849, 'Chest', 0x04, 'Fire Temple'), + 'Fire Temple Megaton Hammer Chest': (0x236C102, None, 0x01A5, 'Chest', 0x04, 'Fire Temple'), + 'Ice Cavern Map Chest': (0x2C4016A, None, 0x0820, 'Chest', 0x09, 'Ice Cavern'), + 'Ice Cavern Compass Chest': (0x2C4E236, None, 0x0801, 'Chest', 0x09, 'Ice Cavern'), + 'Ice Cavern Iron Boots Chest': (0x2C380A2, None, 0x15C2, 'Chest', 0x09, 'Ice Cavern'), + 'Water Temple Map Chest': (0x26690A6, None, 0x1822, 'Chest', 0x05, 'Water Temple'), + 'Water Temple Compass Chest': (0x25FC0D2, None, 0x0809, 'Chest', 0x05, 'Water Temple'), + 'Water Temple Torches Chest': (0x26640A6, None, 0x7841, 'Chest', 0x05, 'Water Temple'), + 'Water Temple Dragon Chest': (0x261F0BA, None, 0x584A, 'Chest', 0x05, 'Water Temple'), + 'Water Temple Central Bow Target Chest': (0x266D072, None, 0x5848, 'Chest', 0x05, 'Water Temple'), + 'Water Temple Central Pillar Chest': (0x25EF0D6, None, 0x5846, 'Chest', 0x05, 'Water Temple'), + 'Water Temple Cracked Wall Chest': (0x265B0A6, None, 0x5840, 'Chest', 0x05, 'Water Temple'), + 'Water Temple Boss Key Chest': (0x2657066, None, 0x27E5, 'Chest', 0x05, 'Water Temple'), + 'Water Temple Dark Link Chest': (0x261907A, None, 0x0127, 'Chest', 0x05, 'Water Temple'), + 'Water Temple River Chest': (0x26740DE, None, 0x5843, 'Chest', 0x05, 'Water Temple'), + 'Shadow Temple Map Chest': (0x27CC0AA, None, 0x1821, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Hover Boots Chest': (0x27DC0CA, None, 0x15E7, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Compass Chest': (0x27EC09E, None, 0x1803, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Early Silver Rupee Chest': (0x27E40F6, None, 0x5842, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Invisible Blades Visible Chest': (0x282212A, None, 0x588C, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Invisible Blades Invisible Chest': (0x282211A, None, 0x6976, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Falling Spikes Lower Chest': (0x2801132, None, 0x5945, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Falling Spikes Upper Chest': (0x2801142, None, 0x5886, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Falling Spikes Switch Chest': (0x2801122, None, 0x8844, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Invisible Spikes Chest': (0x28090EE, None, 0x7889, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Wind Hint Chest': (0x283609A, None, 0x6955, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple After Wind Enemy Chest': (0x28390FE, None, 0x7888, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple After Wind Hidden Chest': (0x28390EE, None, 0x6854, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Spike Walls Left Chest': (0x28130B6, None, 0x588A, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Boss Key Chest': (0x28130A6, None, 0x27EB, 'Chest', 0x07, 'Shadow Temple'), + 'Shadow Temple Hidden Floormaster Chest': (0x282508A, None, 0x784D, 'Chest', 0x07, 'Shadow Temple'), + 'Gerudo Training Grounds Lobby Left Chest': (0x28870CA, None, 0x8893, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Lobby Right Chest': (0x28870BA, None, 0x8947, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Stalfos Chest': (0x28970AA, None, 0x8840, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Beamos Chest': (0x28C715E, None, 0x8841, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Hidden Ceiling Chest': (0x28D010E, None, 0x584B, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Maze Path First Chest': (0x28D00CE, None, 0x5AA6, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Maze Path Second Chest': (0x28D00FE, None, 0x59CA, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Maze Path Third Chest': (0x28D00EE, None, 0x5969, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Maze Path Final Chest': (0x28D011E, None, 0x0B2C, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Maze Right Central Chest': (0x28D00BE, None, 0x5D45, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Maze Right Side Chest': (0x28D00DE, None, 0x5968, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Underwater Silver Rupee Chest': (0x28D91D6, None, 0x884D, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Hammer Room Clear Chest': (0x28B91AE, None, 0x7952, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Hammer Room Switch Chest': (0x28B919E, None, 0x5850, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Eye Statue Chest': (0x28AE09E, None, 0x8843, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Near Scarecrow Chest': (0x28D00AE, None, 0x5844, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Before Heavy Block Chest': (0x28A611E, None, 0x7971, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Heavy Block First Chest': (0x28DD0BE, None, 0x7ACF, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Heavy Block Second Chest': (0x28DD0AE, None, 0x788E, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Heavy Block Third Chest': (0x28DD08E, None, 0x6854, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Gerudo Training Grounds Heavy Block Fourth Chest': (0x28DD09E, None, 0x5F82, 'Chest', 0x0B, 'Gerudo Training Grounds'), + 'Spirit Temple Child Left Chest': (0x2B190BA, None, 0x5528, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Child Right Chest': (0x2B13182, None, 0x8840, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Compass Chest': (0x2B6B08A, None, 0x3804, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Early Adult Right Chest': (0x2B6207A, None, 0x5847, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple First Mirror Right Chest': (0x2B700C6, None, 0x890D, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple First Mirror Left Chest': (0x2B700D6, None, 0x8F8E, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Map Chest': (0x2B25126, None, 0xB823, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Child Climb East Chest': (0x2B1D122, None, 0x8066, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Child Climb North Chest': (0x2B1D132, None, 0x852C, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Sun Block Room Chest': (0x2B481B2, None, 0x8841, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Statue Hand Chest': (0x2B25136, None, 0x8842, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple NE Main Room Chest': (0x2B25146, None, 0x888F, 'Chest', 0x06, 'Spirit Temple'), + 'Silver Gauntlets Chest': (0x21A02DE, 0x21A06F2, 0x06AB, 'Chest', 0x5C, 'Desert Colossus'), + 'Mirror Shield Chest': (0x21A02CE, 0x21A06E2, 0x3569, 'Chest', 0x5C, 'Desert Colossus'), + 'Spirit Temple Near Four Armos Chest': (0x2B9F076, None, 0x5845, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Hallway Left Invisible Chest': (0x2B900B6, None, 0x6914, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Hallway Right Invisible Chest': (0x2B900C6, None, 0x6915, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Boss Key Chest': (0x2BA4162, None, 0x27EA, 'Chest', 0x06, 'Spirit Temple'), + 'Spirit Temple Topmost Chest': (0x2BCF0FE, None, 0x8CF2, 'Chest', 0x06, 'Spirit Temple'), + 'Ganons Castle Forest Trial Chest': (0x31F106E, None, 0x7889, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Water Trial Left Chest': (0x31D7236, None, 0x5F87, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Water Trial Right Chest': (0x31D7226, None, 0x5906, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Shadow Trial First Chest': (0x32350CA, None, 0x5888, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Shadow Trial Second Chest': (0x32350BA, None, 0x36C5, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Spirit Trial First Chest': (0x3268132, None, 0x8D72, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Spirit Trial Second Chest': (0x3268142, None, 0x6954, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Light Trial First Left Chest': (0x321B11E, None, 0x588C, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Light Trial Second Left Chest': (0x321B10E, None, 0x5F8B, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Light Trial Third Left Chest': (0x321B12E, None, 0x590D, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Light Trial First Right Chest': (0x321B13E, None, 0x5F8E, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Light Trial Second Right Chest': (0x321B0FE, None, 0x596A, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Light Trial Third Right Chest': (0x321B14E, None, 0x5F8F, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Light Trail Invisible Enemies Chest': (0x321B15E, None, 0x7850, 'Chest', 0x0D, 'my castle'), + 'Ganons Castle Light Trial Lullaby Chest': (0x321B17E, None, 0x8851, 'Chest', 0x0D, 'my castle'), + 'Ganons Tower Boss Key Chest': (0x2F040EE, None, 0x27EB, 'Chest', 0x0A, 'my tower'), + 'Field West Castle Town Grotto Chest': (None, None, 0x00, 'Chest', 0x3E, 'Hyrule Field'), + 'Remote Southern Grotto Chest': (None, None, 0x02, 'Chest', 0x3E, 'Hyrule Field'), + 'Field Near Lake Outside Fence Grotto Chest': (None, None, 0x03, 'Chest', 0x3E, 'Hyrule Field'), + 'Kakariko Back Grotto Chest': (None, None, 0x08, 'Chest', 0x3E, 'Kakariko Village'), + 'Zora River Plateau Open Grotto Chest': (None, None, 0x09, 'Chest', 0x3E, 'Zora River'), + 'Kokiri Forest Storms Grotto Chest': (None, None, 0x0C, 'Chest', 0x3E, 'Kokiri Forest'), + 'Lost Woods Generic Grotto Chest': (None, None, 0x14, 'Chest', 0x3E, 'the Lost Woods'), + 'Mountain Storms Grotto Chest': (None, None, 0x17, 'Chest', 0x3E, 'Death Mountain Trail'), + 'Top of Crater Grotto Chest': (None, None, 0x1A, 'Chest', 0x3E, 'Death Mountain Crater'), + 'Impa at Castle': (0x2E8E925, 0x2E8E925, 0x0A, 'Song', None, None), + 'Song from Malon': (0xD7EB53, 0xD7EBCF, 0x09, 'Song', None, None), + 'Song from Composer Grave': (0x332A871, 0x332A871, 0x0B, 'Song', None, None), + 'Song from Saria': (0x20B1DB1, 0x20B1DB1, 0x08, 'Song', None, None), + 'Song from Ocarina of Time': (0x252FC89, 0x252FC89, 0x0C, 'Song', None, None), + 'Song at Windmill': (0xE42C07, 0xE42B8B, 0x0D, 'Song', None, None), + 'Sheik Forest Song': (0x20B0809, 0x20B0809, 0x02, 'Song', None, None), + 'Sheik at Temple': (0x2531329, 0x2531329, 0x07, 'Song', None, None), + 'Sheik in Crater': (0x224D7F1, 0x224D7F1, 0x03, 'Song', None, None), + 'Sheik in Ice Cavern': (0x2BEC889, 0x2BEC889, 0x04, 'Song', None, None), + 'Sheik in Kakariko': (0x2000FE1, 0x2000FE1, 0x06, 'Song', None, None), + 'Sheik at Colossus': (0x218C57D, 0x218C57D, 0x05, 'Song', None, None), + 'Gift from Saria': (None, None, None, 'NPC', None, 'the Lost Woods'), + 'Zeldas Letter': (None, None, None, 'NPC', None, 'Hyrule Castle'), + 'Zelda': (0x3481400, None, 0x5A, 'NPC', 0x43, 'the Temple of Time'), + 'Zoras Fountain Fairy Reward': (0x3481401, None, 0x5D, 'NPC', 0x3D, 'Zora\'s Fountain'), + 'Hyrule Castle Fairy Reward': (0x3481402, None, 0x5C, 'NPC', 0x3D, 'Hyrule Castle'), + 'Desert Colossus Fairy Reward': (0x3481403, None, 0x5E, 'NPC', 0x3D, 'Desert Colossus'), + 'Mountain Summit Fairy Reward': (0x3481404, None, 0x51, 'NPC', 0x3B, 'Death Mountain Trail'), + 'Crater Fairy Reward': (0x3481405, None, 0x52, 'NPC', 0x3B, 'Death Mountain Crater'), + 'Ganons Castle Fairy Reward': (0x3481406, None, 0x53, 'NPC', 0x3B, 'outside my castle'), + 'Treasure Chest Game': (None, None, 0x0A, 'Chest', 0x10, 'the market'), + 'Darunias Joy': (0xCF1BFF, None, 0x54, 'NPC', 0x62, 'Goron City'), + 'Diving Minigame': (0xE01A2B, 0xE01AA7, 0x37, 'NPC', 0x58, 'Zora\'s Domain'), + 'Child Fishing': (0xDCBFBF, None, 0x3E, 'NPC', 0x49, 'Lake Hylia'), + 'Adult Fishing': (0xDCC087, None, 0x38, 'NPC', 0x49, 'Lake Hylia'), + 'Diving in the Lab': (0xE2CB97, None, 0x3E, 'NPC', 0x38, 'Lake Hylia'), + 'Link the Goron': (0xED30EB, 0xED64F3, 0x2C, 'NPC', 0x62, 'Goron City'), + 'King Zora Thawed': (0xE56AD7, None, 0x2D, 'NPC', 0x58, 'Zora\'s Domain'), + 'Bombchu Bowling Bomb Bag': (0xE2F093, None, 0x34, 'NPC', 0x4B, 'the market'), + 'Bombchu Bowling Piece of Heart': (0xE2F097, None, 0x3E, 'NPC', 0x4B, 'the market'), + 'Dog Lady': (0xE65163, 0xE661BB, 0x3E, 'NPC', 0x35, 'the market'), + 'Skull Kid': (0xDF0F33, 0xDF0E9B, 0x3E, 'NPC', 0x5B, 'the Lost Woods'), + 'Ocarina Memory Game': (0xDF264F, None, 0x76, 'NPC', 0x5B, 'the Lost Woods'), + '10 Gold Skulltulla Reward': (0xEA7173, None, 0x45, 'NPC', 0x50, 'Kakariko Village'), + '20 Gold Skulltulla Reward': (0xEA7175, None, 0x39, 'NPC', 0x50, 'Kakariko Village'), + '30 Gold Skulltulla Reward': (0xEA7177, None, 0x46, 'NPC', 0x50, 'Kakariko Village'), + '40 Gold Skulltulla Reward': (0xEA7179, None, 0x03, 'NPC', 0x50, 'Kakariko Village'), + '50 Gold Skulltulla Reward': (0xEA717B, None, 0x3E, 'NPC', 0x50, 'Kakariko Village'), + 'Man on Roof': (0xE587E3, None, 0x3E, 'NPC', 0x52, 'Kakariko Village'), + 'Frog Ocarina Game': (0xDB13D3, None, 0x76, 'NPC', 0x54, 'Zora River'), + 'Frogs in the Rain': (0xDB1387, None, 0x3E, 'NPC', 0x54, 'Zora River'), + 'Horseback Archery 1000 Points': (0xE12B6F, 0xE12AA3, 0x3E, 'NPC', 0x5D, 'Gerudo Fortress'), + 'Horseback Archery 1500 Points': (0xE12BC3, 0xE12AFB, 0x30, 'NPC', 0x5D, 'Gerudo Fortress'), + 'Child Shooting Gallery': (0xD35EF3, None, 0x60, 'NPC', 0x42, 'the market'), + 'Adult Shooting Gallery': (0xD35F5B, None, 0x30, 'NPC', 0x42, 'Kakariko Village'), + 'Target in Woods': (0xE59CDF, None, 0x60, 'NPC', 0x5B, 'the Lost Woods'), + 'Deku Theater Skull Mask': (0xEC9A87, None, 0x77, 'NPC', 0x3E, 'the Lost Woods'), + 'Deku Theater Mask of Truth': (0xEC9CE7, None, 0x7A, 'NPC', 0x3E, 'the Lost Woods'), + 'Deku Salesman Woods': (0xDF8073, None, 0x77, 'NPC', 0x5B, 'the Lost Woods'), + 'Deku Salesman Lost Woods Grotto': (0xDF80E7, None, 0x79, 'NPC', 0x3E, 'the Lost Woods'), + 'Deku Salesman Hyrule Field Grotto': (0xDF86AB, None, 0x3E, 'NPC', 0x3E, 'Hyrule Field'), + 'Anju as Adult': (0xE1EABB, None, 0x1D, 'NPC', 0x52, 'Kakariko Village'), + 'Biggoron': (0xED338F, 0xED650F, 0x57, 'NPC', 0x60, 'Death Mountain Trail'), + 'Anjus Chickens': (0xE1E7A7, None, 0x0F, 'NPC', 0x52, 'Kakariko Village'), + 'Talons Chickens': (0xCC14EB, None, 0x14, 'NPC', 0x4C, 'Lon Lon Ranch'), + '10 Big Poes': (0xEE6AEF, None, 0x0F, 'NPC', 0x4D, 'the market'), + 'Rolling Goron as Child': (0xED296F, 0xED6503, 0x34, 'NPC', 0x62, 'Goron City'), + 'Lake Hylia Sun': (0xE9E1F2, None, 0x5B08, 'Chest', 0x57, 'Lake Hylia'), + 'Underwater Bottle': (0xDE10FB, None, 0x15, 'NPC', 0x57, 'Lake Hylia'), + 'Shadow Temple Freestanding Key': (None, None, 0x01, 'Collectable', 0x07, 'Shadow Temple'), + 'Bottom of the Well Freestanding Key': (None, None, 0x01, 'Collectable', 0x08, 'Bottom of the Well'), + 'Gerudo Training Grounds Freestanding Key': (None, None, 0x01, 'Collectable', 0x0B, 'Gerudo Training Grounds'), + 'Ice Cavern Freestanding PoH': (None, None, 0x01, 'Collectable', 0x09, 'Ice Cavern'), + 'Impa House Freestanding PoH': (None, None, 0x01, 'Collectable', 0x37, 'Kakariko Village'), + 'Tektite Grotto Freestanding PoH': (None, None, 0x01, 'Collectable', 0x3E, 'Hyrule Field'), + 'Windmill Freestanding PoH': (None, None, 0x01, 'Collectable', 0x48, 'Kakariko Village'), + 'Dampe Race Freestanding PoH': (None, None, 0x07, 'Collectable', 0x48, 'the Graveyard'), + 'Lon Lon Tower Freestanding PoH': (None, None, 0x01, 'Collectable', 0x4C, 'Lon Lon Ranch'), + 'Graveyard Freestanding PoH': (None, None, 0x04, 'Collectable', 0x53, 'the Graveyard'), + 'Gravedigging Tour': (None, None, 0x00, 'Collectable', 0x53, 'the Graveyard'), + 'Zora River Lower Freestanding PoH': (None, None, 0x04, 'Collectable', 0x54, 'Zora River'), + 'Zora River Upper Freestanding PoH': (None, None, 0x0B, 'Collectable', 0x54, 'Zora River'), + 'Lake Hylia Freestanding PoH': (None, None, 0x1E, 'Collectable', 0x57, 'Lake Hylia'), + 'Zoras Fountain Iceberg Freestanding PoH': (None, None, 0x01, 'Collectable', 0x59, 'Zora\'s Fountain'), + 'Zoras Fountain Bottom Freestanding PoH': (None, None, 0x14, 'Collectable', 0x59, 'Zora\'s Fountain'), + 'Gerudo Valley Waterfall Freestanding PoH': (None, None, 0x01, 'Collectable', 0x5A, 'Gerudo Valley'), + 'Gerudo Valley Crate Freestanding PoH': (None, None, 0x02, 'Collectable', 0x5A, 'Gerudo Valley'), + 'Colossus Freestanding PoH': (None, None, 0x0D, 'Collectable', 0x5C, 'Desert Colossus'), + 'DM Trail Freestanding PoH': (None, None, 0x1E, 'Collectable', 0x60, 'Death Mountain Trail'), + 'DM Crater Wall Freestanding PoH': (None, None, 0x02, 'Collectable', 0x61, 'Death Mountain Crater'), + 'DM Crater Volcano Freestanding PoH': (None, None, 0x08, 'Collectable', 0x61, 'Death Mountain Crater'), + 'Goron City Pot Freestanding PoH': (None, None, 0x1F, 'Collectable', 0x62, 'Goron City'), + 'Queen Gohma Heart': (None, None, 0x4F, 'BossHeart', 0x11, 'Deku Tree'), + 'King Dodongo Heart': (None, None, 0x4F, 'BossHeart', 0x12, 'Dodongo\'s Cavern'), + 'Barinade Heart': (None, None, 0x4F, 'BossHeart', 0x13, 'Jabu Jabu\'s Belly'), + 'Phantom Ganon Heart': (None, None, 0x4F, 'BossHeart', 0x14, 'Forest Temple'), + 'Volvagia Heart': (None, None, 0x4F, 'BossHeart', 0x15, 'Fire Temple'), + 'Morpha Heart': (None, None, 0x4F, 'BossHeart', 0x16, 'Water Temple'), + 'Twinrova Heart': (None, None, 0x4F, 'BossHeart', 0x17, 'Spirit Temple'), + 'Bongo Bongo Heart': (None, None, 0x4F, 'BossHeart', 0x18, 'Shadow Temple'), + 'Magic Bean Salesman': (None, None, None, 'Event', None, None), + 'King Zora Moves': (None, None, None, 'Event', None, None), + 'Ocarina of Time': (None, None, None, 'Event', None, 'Hyrule Field'), + 'Master Sword Pedestal': (None, None, None, 'Event', None, 'the Temple of Time'), + 'Epona': (None, None, None, 'Event', None, None), + 'Gerudo Fortress Carpenter Rescue': (None, None, None, 'Event', None, 'Gerudo Fortress'), + 'Ganons Castle Forest Trial Clear': (None, None, None, 'Event', None, None), + 'Ganons Castle Fire Trial Clear': (None, None, None, 'Event', None, None), + 'Ganons Castle Water Trial Clear': (None, None, None, 'Event', None, None), + 'Ganons Castle Shadow Trial Clear': (None, None, None, 'Event', None, None), + 'Ganons Castle Spirit Trial Clear': (None, None, None, 'Event', None, None), + 'Ganons Castle Light Trial Clear': (None, None, None, 'Event', None, None), + 'Links Pocket': (0x34806FB, 0x34806FF, None, 'Boss', None, None), + 'Queen Gohma': (0xCA315F, 0x2079571, 0x6C, 'Boss', None, None), + 'King Dodongo': (0xCA30DF, 0x2223309, 0x6D, 'Boss', None, None), + 'Barinade': (0xCA36EB, 0x2113C19, 0x6E, 'Boss', None, None), + 'Phantom Ganon': (0xCA3D07, 0xD4ED79, 0x66, 'Boss', None, None), + 'Volvagia': (0xCA3D93, 0xD10135, 0x67, 'Boss', None, None), + 'Morpha': (0xCA3E1F, 0xD5A3A9, 0x68, 'Boss', None, None), + 'Twinrova': (0xCA3EB3, 0xD39FF1, 0x69, 'Boss', None, None), + 'Bongo Bongo': (0xCA3F43, 0xD13E19, 0x6A, 'Boss', None, None), + 'Ganon': (None, None, None, 'Boss', None, None), + 'GS1': (None, None, None, 'GS Token', None, 'Kokiri Forest'), + 'GS2': (None, None, None, 'GS Token', None, 'Kokiri Forest'), + 'GS3': (None, None, None, 'GS Token', None, 'Kokiri Forest'), + 'GS4': (None, None, None, 'GS Token', None, 'the Lost Woods'), + 'GS5': (None, None, None, 'GS Token', None, 'the Lost Woods'), + 'GS6': (None, None, None, 'GS Token', None, 'the Lost Woods'), + 'GS7': (None, None, None, 'GS Token', None, 'Sacred Forest Meadow'), + 'GS8': (None, None, None, 'GS Token', None, 'Deku Tree'), + 'GS9': (None, None, None, 'GS Token', None, 'Deku Tree'), + 'GS10': (None, None, None, 'GS Token', None, 'Deku Tree'), + 'GS11': (None, None, None, 'GS Token', None, 'Deku Tree'), + 'GS12': (None, None, None, 'GS Token', None, 'Hyrule Field'), + 'GS13': (None, None, None, 'GS Token', None, 'Hyrule Field'), + 'GS14': (None, None, None, 'GS Token', None, 'the market'), + 'GS15': (None, None, None, 'GS Token', None, 'Hyrule Castle'), + 'GS16': (None, None, None, 'GS Token', None, 'Hyrule Castle'), + 'GS17': (None, None, None, 'GS Token', None, 'outside my castle'), + 'GS18': (None, None, None, 'GS Token', None, 'Lon Lon Ranch'), + 'GS19': (None, None, None, 'GS Token', None, 'Lon Lon Ranch'), + 'GS20': (None, None, None, 'GS Token', None, 'Lon Lon Ranch'), + 'GS21': (None, None, None, 'GS Token', None, 'Lon Lon Ranch'), + 'GS22': (None, None, None, 'GS Token', None, 'Kakariko Village'), + 'GS23': (None, None, None, 'GS Token', None, 'Kakariko Village'), + 'GS24': (None, None, None, 'GS Token', None, 'Kakariko Village'), + 'GS25': (None, None, None, 'GS Token', None, 'Kakariko Village'), + 'GS26': (None, None, None, 'GS Token', None, 'Kakariko Village'), + 'GS27': (None, None, None, 'GS Token', None, 'Kakariko Village'), + 'GS28': (None, None, None, 'GS Token', None, 'the Graveyard'), + 'GS29': (None, None, None, 'GS Token', None, 'the Graveyard'), + 'GS30': (None, None, None, 'GS Token', None, 'Death Mountain Trail'), + 'GS31': (None, None, None, 'GS Token', None, 'Death Mountain Trail'), + 'GS32': (None, None, None, 'GS Token', None, 'Death Mountain Trail'), + 'GS33': (None, None, None, 'GS Token', None, 'Death Mountain Trail'), + 'GS34': (None, None, None, 'GS Token', None, 'Goron City'), + 'GS35': (None, None, None, 'GS Token', None, 'Goron City'), + 'GS36': (None, None, None, 'GS Token', None, 'Death Mountain Crater'), + 'GS37': (None, None, None, 'GS Token', None, 'Death Mountain Crater'), + 'GS38': (None, None, None, 'GS Token', None, 'Dodongo\'s Cavern'), + 'GS39': (None, None, None, 'GS Token', None, 'Dodongo\'s Cavern'), + 'GS40': (None, None, None, 'GS Token', None, 'Dodongo\'s Cavern'), + 'GS41': (None, None, None, 'GS Token', None, 'Dodongo\'s Cavern'), + 'GS42': (None, None, None, 'GS Token', None, 'Dodongo\'s Cavern'), + 'GS43': (None, None, None, 'GS Token', None, 'Zora River'), + 'GS44': (None, None, None, 'GS Token', None, 'Zora River'), + 'GS45': (None, None, None, 'GS Token', None, 'Zora River'), + 'GS46': (None, None, None, 'GS Token', None, 'Zora River'), + 'GS47': (None, None, None, 'GS Token', None, 'Zora\'s Domain'), + 'GS48': (None, None, None, 'GS Token', None, 'Zora\'s Fountain'), + 'GS49': (None, None, None, 'GS Token', None, 'Zora\'s Fountain'), + 'GS50': (None, None, None, 'GS Token', None, 'Zora\'s Fountain'), + 'GS51': (None, None, None, 'GS Token', None, 'Jabu Jabu\'s Belly'), + 'GS52': (None, None, None, 'GS Token', None, 'Jabu Jabu\'s Belly'), + 'GS53': (None, None, None, 'GS Token', None, 'Jabu Jabu\'s Belly'), + 'GS54': (None, None, None, 'GS Token', None, 'Jabu Jabu\'s Belly'), + 'GS55': (None, None, None, 'GS Token', None, 'Lake Hylia'), + 'GS56': (None, None, None, 'GS Token', None, 'Lake Hylia'), + 'GS57': (None, None, None, 'GS Token', None, 'Lake Hylia'), + 'GS58': (None, None, None, 'GS Token', None, 'Lake Hylia'), + 'GS59': (None, None, None, 'GS Token', None, 'Lake Hylia'), + 'GS60': (None, None, None, 'GS Token', None, 'Forest Temple'), + 'GS61': (None, None, None, 'GS Token', None, 'Forest Temple'), + 'GS62': (None, None, None, 'GS Token', None, 'Forest Temple'), + 'GS63': (None, None, None, 'GS Token', None, 'Forest Temple'), + 'GS64': (None, None, None, 'GS Token', None, 'Forest Temple'), + 'GS65': (None, None, None, 'GS Token', None, 'Fire Temple'), + 'GS66': (None, None, None, 'GS Token', None, 'Fire Temple'), + 'GS67': (None, None, None, 'GS Token', None, 'Fire Temple'), + 'GS68': (None, None, None, 'GS Token', None, 'Fire Temple'), + 'GS69': (None, None, None, 'GS Token', None, 'Fire Temple'), + 'GS70': (None, None, None, 'GS Token', None, 'Ice Cavern'), + 'GS71': (None, None, None, 'GS Token', None, 'Ice Cavern'), + 'GS72': (None, None, None, 'GS Token', None, 'Ice Cavern'), + 'GS73': (None, None, None, 'GS Token', None, 'Water Temple'), + 'GS74': (None, None, None, 'GS Token', None, 'Water Temple'), + 'GS75': (None, None, None, 'GS Token', None, 'Water Temple'), + 'GS76': (None, None, None, 'GS Token', None, 'Water Temple'), + 'GS77': (None, None, None, 'GS Token', None, 'Water Temple'), + 'GS78': (None, None, None, 'GS Token', None, 'Bottom of the Well'), + 'GS79': (None, None, None, 'GS Token', None, 'Bottom of the Well'), + 'GS80': (None, None, None, 'GS Token', None, 'Bottom of the Well'), + 'GS81': (None, None, None, 'GS Token', None, 'Shadow Temple'), + 'GS82': (None, None, None, 'GS Token', None, 'Shadow Temple'), + 'GS83': (None, None, None, 'GS Token', None, 'Shadow Temple'), + 'GS84': (None, None, None, 'GS Token', None, 'Shadow Temple'), + 'GS85': (None, None, None, 'GS Token', None, 'Shadow Temple'), + 'GS86': (None, None, None, 'GS Token', None, 'Gerudo Valley'), + 'GS87': (None, None, None, 'GS Token', None, 'Gerudo Valley'), + 'GS88': (None, None, None, 'GS Token', None, 'Gerudo Valley'), + 'GS89': (None, None, None, 'GS Token', None, 'Gerudo Valley'), + 'GS90': (None, None, None, 'GS Token', None, 'Gerudo Fortress'), + 'GS91': (None, None, None, 'GS Token', None, 'Gerudo Fortress'), + 'GS92': (None, None, None, 'GS Token', None, 'Haunted Wasteland'), + 'GS93': (None, None, None, 'GS Token', None, 'Desert Colossus'), + 'GS94': (None, None, None, 'GS Token', None, 'Desert Colossus'), + 'GS95': (None, None, None, 'GS Token', None, 'Desert Colossus'), + 'GS96': (None, None, None, 'GS Token', None, 'Spirit Temple'), + 'GS97': (None, None, None, 'GS Token', None, 'Spirit Temple'), + 'GS98': (None, None, None, 'GS Token', None, 'Spirit Temple'), + 'GS99': (None, None, None, 'GS Token', None, 'Spirit Temple'), + 'GS100': (None, None, None, 'GS Token', None, 'Spirit Temple')} diff --git a/Rom.py b/Rom.py index ef1716ec2..cd4be07c3 100644 --- a/Rom.py +++ b/Rom.py @@ -849,7 +849,7 @@ def patch_rom(world, rom): 0xA6, 0x28, 0x01, 0x10, 0xA2, 0x39, 0x01, 0x2C, 0xA2, 0x38, 0x01, 0x2E, 0xA2, 0x2F, 0x0F, 0x0A, 0xA2, 0x25, 0x0F, 0x21, 0x24, 0x05, 0x00, 0x00, 0xA2, 0x25, 0x00, 0xA7, 0x24, 0x0F, 0x00, 0x21, 0xA2, 0x2F, 0x0E, 0xED, - 0x03, 0xE0, 0x00, 0x08] + 0x24, 0x0F, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x03, 0xE0, 0x00, 0x08] rom.write_bytes(0x3480600, Block_code) # Set up for Rainbow Bridge dungeons condition @@ -881,6 +881,12 @@ def patch_rom(world, rom): if world.open_door_of_time: rom.write_bytes(0x34806BC, [0x34, 0xA5, 0x00, 0x08]) + if world.fast_ganon: + rom.write_byte(0x348066A, 0x21) # Flag Spirit Trial as clear + rom.write_byte(0x348066E, 0xFF) # Flag the other five trials as clear + rom.write_byte(0x3480703, 0x29) # The barrier is dispelled. + rom.write_bytes(0x348070C, [0xA2, 0x2F, 0x01, 0xF1]) # Remove Ganon's Castle Boss Key door + # Sets hooks for gossip stone changes if world.hints: rom.write_bytes(0xEE7B84, [0x0C, 0x10, 0x02, 0x10]) diff --git a/Rules.py b/Rules.py index 6dce69c1a..cc3ae846a 100644 --- a/Rules.py +++ b/Rules.py @@ -347,9 +347,9 @@ def global_rules(world): set_rule(world.get_location('GS7'), lambda state: state.has('Progressive Hookshot') and state.is_adult()) set_rule(world.get_location('GS9'), lambda state: state.has('Slingshot') or state.has('Bomb Bag') or state.has('Boomerang') or (state.has('Dins Fire') and state.has('Magic Meter'))) set_rule(world.get_location('GS11'), lambda state: state.has('Boomerang') and state.has('Bomb Bag')) - set_rule(world.get_location('GS12'), lambda state: state.has('Boomerang') or (state.has('Progressive Hookshot') and state.is_adult())) + set_rule(world.get_location('GS12'), lambda state: (state.has('Boomerang') and state.has('Bomb Bag')) or (state.has('Progressive Hookshot') and state.is_adult())) set_rule(world.get_location('GS13'), lambda state: (state.has('Hammer') and state.has_fire_source() and state.has('Progressive Hookshot') and state.is_adult()) or (state.has('Boomerang') and state.has('Bomb Bag') and state.has('Dins Fire') and state.has('Magic Meter'))) - set_rule(world.get_location('GS16'), lambda state: state.has('Boomerang')) + set_rule(world.get_location('GS16'), lambda state: state.has('Boomerang') and state.has('Bomb Bag')) set_rule(world.get_location('GS20'), lambda state: state.has('Boomerang')) set_rule(world.get_location('GS21'), lambda state: state.has('Boomerang')) set_rule(world.get_location('GS26'), lambda state: state.has('Slingshot') or state.has('Bomb Bag')) From e99ef6a38997d92056bc3fad362df262201d3d80 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 15 Jun 2018 04:09:20 -0500 Subject: [PATCH 139/151] Updated readme I need to update again before final release to talk about Retroarch so people know about better emulation options. --- README.md | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b46cbc74b..4301759ed 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ encouraged as uncompressed ROMs are impossible to inject for the Virtual Console For general use, the recommended emulators are Bizhawk and Mupen64plus. If you want to play on Project 64 for whatever reason, you can but you will need to set the rando to use 8 MB of RAM and will want to play with the cheat code 8109C58A 0000 to partially fix Project 64's tragically -poor handling of OoT's pause menu. As of this 1.0 release, there are suspected crashing issues specifically with Project 64. I cannot emphasize enough +poor handling of OoT's pause menu. As of this 2.0 release, there are suspected crashing issues specifically with Project 64. I cannot emphasize enough that it is a discouraged emulator to use. # General Description @@ -143,15 +143,8 @@ Sadly for this 2.0 release a few known issues exist. These will hopefully be add -The fishing minigame sometimes refuses to allow you to catch fish when playing specifically on Bizhawk. Save and quit (NOT savestate) and return to fix the issue. -Draining the Bottom of the Well with Song of Storms sometimes crashes on specific versions of Project 64. We aren't sure of the exact story, but this bug is easily avoided by playing on a different emulator. --Learning a warp song from Malon will break her script and cause Link to be unable to use the Ocarina until he leaves the current screen. Trying to switch which button -the Ocarina is on and use it in this situation can softlock the game. This will probably be very, very hard to fix; just don't try to get cute and live with the limitation -for now please. --Learning a warp song from Guru-Guru in the Windmill also breaks his script, but there are no known significant consequences. --Learning Sun's Song can warp Link out of the current cutscene in somewhat inconvenient ways. None of this should prevent completion of the seed, but it can be annoying. -There's a funny bug where sometimes obtaining Biggoron Sword displays a second erroneous text box. This has no gameplay consequence. -Executing the collection delay glitch on various NPCs may have unpredictable and undesirable consequences. --Mido blocks you and complains about the Deku Tree being dead based on possession of the Kokiri Emerald and not on whether you've cleared Deku Tree currently. Just talk to him -to make him go away. # Settings @@ -240,6 +233,11 @@ If this flag is not set, it is guaranteed that the Deku Tree can be completed wi The Door of Time is open from the beginning of the game. The Song of Time is only useful to move Song of Time blocks. +## Skip most of Ganon's Castle + +The barrier protecting Ganon's Tower within Ganon's Castle is dispelled from the start, the Boss Key doors within Ganon's Tower are unlocked by +default, Ganondorf will provide a hint for the location of Light Arrows, and the collapsing tower sequence is skipped. + ## Place Dungeon Items If not set, Compasses and Maps are removed from the dungeon item pools and replaced by five rupee chests that may end up anywhere in the world. @@ -349,6 +347,12 @@ Set whether Kokiri children obstruct your path at the beginning of the game. (de Set whether the Door of Time is open from the beginning of the game. (default: False) +``` +--fast_ganon +``` + +Set whether most of Ganon's Castle can be skipped. (default: False) + ``` --nodungeonitems ``` From 1da117e9d86c07c551b75f2285e0c68e21365e3b Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 15 Jun 2018 05:50:07 -0500 Subject: [PATCH 140/151] Missed a few lines for new parameter --- Regions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Regions.py b/Regions.py index f0bb79511..c7db3c8cd 100644 --- a/Regions.py +++ b/Regions.py @@ -198,8 +198,8 @@ def _create_region(name, type, locations=None, exits=None): for exit in exits: ret.exits.append(Entrance(exit, ret)) for location in locations: - address, address2, default, type, scene = location_table[location] - ret.locations.append(Location(location, address, address2, default, type, scene, ret)) + address, address2, default, type, scene, hint = location_table[location] + ret.locations.append(Location(location, address, address2, default, type, scene, hint, ret)) return ret location_table = {'Kokiri Sword Chest': (0x20A6142, None, 0x04E0, 'Chest', 0x55, 'Kokiri Forest'), From 6579b9ff46df0f78555c0ce052f1e42c62f16ba5 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Fri, 15 Jun 2018 19:54:15 -0500 Subject: [PATCH 141/151] Last additions for sped up ganon added text for light arrow hint from ganondorf and removed check for LACS when spawning light bridge for medallions and all dungeons modes. --- HintList.py | 3 ++- Hints.py | 20 +++++++++++++++----- Rom.py | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/HintList.py b/HintList.py index c5681d979..131207f8e 100644 --- a/HintList.py +++ b/HintList.py @@ -230,7 +230,8 @@ def getHintGroup(string): 'Medallion Text End': ("Together with the Hero of Time,&the awakened ones will bind the&evil and return the light of peace&to the world.", 'boss'), #xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx handy marker for how long one line should be in a text box 'Validation Line': ("Hmph... Since you made it this far&I'll let you know what glorious&prize of Ganon's you likely&missed out on in my tower.^Behold...^", 'validation line'), - '2001': ("Oh! It's @.&I was expecting someone called&Sheik. Do you know what&happened to them?", 'ganonLine'), + 'Light Arrow Location': ("Ha ha ha... You'll never beat me by&reflecting my lightning bolts&and unleashing the arrows from&", 'Light Arrow Location'), + '2001': ("Oh! It's @.&I was expecting someone called&Sheik. Do you know what&happened to them?", 'ganonLine'), '2002': ("I knew I shouldn't have put the key&on the other side of my door.", 'ganonLine'), '2003': ("Looks like it's time for a&round of tennis.", 'ganonLine'), '2004': ("You'll never deflect my bolts of&energy with your sword,&then shot me with those Light&Arrows you happen to have.", 'ganonLine'), diff --git a/Hints.py b/Hints.py index 815c39c59..fb8dc8b4b 100644 --- a/Hints.py +++ b/Hints.py @@ -141,12 +141,22 @@ def buildGanonText(world, rom): Block_code = getBytes(ganonLines.pop().text) endText(Block_code) rom.write_bytes(0x9611F1, Block_code) + + if world.fast_ganon: + for location in world.get_locations(): + if location.item.name == 'Light Arrows': + Block_code = getBytes(getHint('Light Arrow Location').text) + Block_code.extend(getBytes(location.hint)) + Block_code.extend(getBytes('!')) + break + endText(Block_code) + else: + Block_code = getBytes(getHint('Validation Line').text) + for location in world.get_locations(): + if location.name == 'Ganons Tower Boss Key Chest': + Block_code.extend(getBytes((getHint(location.item.name).text))) + endText(Block_code) - Block_code = getBytes(getHint('Validation Line').text) - for location in world.get_locations(): - if location.name == 'Ganons Tower Boss Key Chest': - Block_code.extend(getBytes((getHint(location.item.name).text))) - endText(Block_code) rom.write_bytes(0x96129D, Block_code) return rom diff --git a/Rom.py b/Rom.py index cd4be07c3..e24fd4d24 100644 --- a/Rom.py +++ b/Rom.py @@ -867,12 +867,14 @@ def patch_rom(world, rom): Block_code = [0x80, 0xEA, 0x00, 0xA7, 0x24, 0x01, 0x00, 0x3F, 0x31, 0x4A, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00] rom.write_bytes(0xE2B454, Block_code) + rom.write_bytes(0xACCE58, [0x10, 0x00, 0x00, 0x10]) elif world.bridge == 'open': rom.write_bytes(0x34806B8, [0x34, 0xA5, 0x00, 0x20]) elif world.bridge == 'dungeons': Block_code = [0x80, 0xEA, 0x00, 0xA7, 0x24, 0x01, 0x00, 0x3F, 0x08, 0x10, 0x02, 0x08, 0x31, 0x4A, 0x00, 0x3F] rom.write_bytes(0xE2B454, Block_code) + rom.write_bytes(0xACCE58, [0x10, 0x00, 0x00, 0x10]) if world.open_forest: #rom.write_byte(0x2081148, 0x80) @@ -882,6 +884,7 @@ def patch_rom(world, rom): rom.write_bytes(0x34806BC, [0x34, 0xA5, 0x00, 0x08]) if world.fast_ganon: + rom.write_bytes(0xD82A12, [0x05, 0x17]) # Sets exit from Ganondorf fight to entrance to Ganon fight rom.write_byte(0x348066A, 0x21) # Flag Spirit Trial as clear rom.write_byte(0x348066E, 0xFF) # Flag the other five trials as clear rom.write_byte(0x3480703, 0x29) # The barrier is dispelled. From 5ec697949d8f3f6ad9179a3e064821a5e3d2eda6 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Sat, 16 Jun 2018 18:14:32 -0500 Subject: [PATCH 142/151] better suns song fix --- ASM/src/hacks.asm | 6 ++--- ASM/src/song_fix.asm | 61 +++++++++++------------------------------- ASM/src/state.asm | 2 +- data/base2current.json | 2 +- 4 files changed, 20 insertions(+), 51 deletions(-) diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 2dc2c687b..926b37319 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -258,10 +258,10 @@ nop ; Replaces: -; addu at, at, s3 -.org 0xB54E5C ; In memory: 800DEEFC +; lw t5, 0x8AA0(t5) +.org 0xAE5DF0 ; In memory: 8006FE90 jal suns_song_fix - + ; Replaces: ; addu at, at, s3 .org 0xB54B38 ; In memory: 800DEBD8 diff --git a/ASM/src/song_fix.asm b/ASM/src/song_fix.asm index fa13180f1..57aa168e2 100644 --- a/ASM/src/song_fix.asm +++ b/ASM/src/song_fix.asm @@ -3,59 +3,28 @@ ; through their scripts. ;================================================================================================== suns_song_fix: - addu at, at, s3 - addi t7, r0, 0x0047 - bne t7, t2, @@return - -@@sacred_forest_meadow: - lui v0, 0x0056 - addi v0, v0, 0x2FE8 - lw t7, 0x00A4(s3) - bne t7, v0, @@crater - lui v0, 0x0061 - addiu t9, r0, 0x0003 - -@@crater: - addi v0, v0, 0x0FE8 - bne t7, v0, @@courtyard - lui v0, 0x004A - addiu t9, r0, 0x0003 - -@@courtyard: - addi v0, v0, 0x2FE8 - bne t7, v0, @@age_check - lui v0, 0x8012 - addiu t9, r0, 0x0003 - -@@age_check: - lw v0, 0xa5d4(v0) - bnez v0, @@child - -@@windmill: - lui v0, 0x0048 - addi v0, v0, 0x30E8 - bne t7, v0, @@temple_of_time - lui v0, 0x0043 - addiu t9, r0, 0x0003 - -@@temple_of_time: - addi v0, v0, 0x1EE8 - bne t7, v0, @@return + lw t5, 0x8AA0(t5) + li v0, 0x8000 + beq v0, t5, @@check_suns_status nop - addiu t9, r0, 0x0003 - b @@return + b @@return -@@child: - lui v0, 0x0063 - addi v0, v0, 0x11E8 - bne t7, v0, @@return +@@check_suns_status: + li t7, 0x801D84A0 + lb v0, 0x1CBF(t7) + andi v0, 0x0001 + beqz v0, @@disable_suns nop - addiu t9, r0, 0x0003 + b @@return +@@disable_suns: + li v0, 0x0001 + sb v0, 0x1CBF(t7) + @@return: jr ra nop - + ;================================================================================================== warp_song_fix: addu at, at, s3 diff --git a/ASM/src/state.asm b/ASM/src/state.asm index f94088a7a..5aa1d314a 100755 --- a/ASM/src/state.asm +++ b/ASM/src/state.asm @@ -15,4 +15,4 @@ TIME_TRAVEL_SAVED_EQUIPS: .word 0x00000000 ; C button indexes .halfword 0x0000 ; Equipment .halfword 0x0000 ; Owned equipment -.align 4 +.align 4 \ No newline at end of file diff --git a/data/base2current.json b/data/base2current.json index 2aae1427e..84e46d0c8 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"11881272": [12, 16, 11, 237]}, {"11882076": [12, 16, 11, 206]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}, {"55062329": [51, 8, 33, 32, 15]}, {"55062335": [71, 21, 234]}, {"55062339": [26, 52, 2, 86, 47, 142, 111]}, {"55062347": [164]}, {"55062349": [15, 122, 3, 21, 226]}, {"55062355": [2, 52, 2, 97, 15, 36, 25]}, {"55062363": [3, 21, 226]}, {"55062367": [2, 52, 2, 74, 47, 36, 25]}, {"55062375": [3, 21, 226]}, {"55062379": [2, 60, 2, 128, 18, 36, 25]}, {"55062387": [3, 140, 66, 165, 212, 20, 64]}, {"55062395": [8, 52, 2, 72, 48, 21, 226]}, {"55062403": [2, 52, 2, 67, 30, 36, 25]}, {"55062411": [3, 21, 226]}, {"55062415": [7]}, {"55062420": [36, 25]}, {"55062423": [3, 16]}, {"55062427": [4, 52, 2, 99, 17, 21, 226]}, {"55062435": [2]}, {"55062440": [36, 25]}, {"55062443": [3, 3, 224]}, {"55062447": [8]}, {"55062453": [51, 8, 33, 60, 2, 128, 18, 140, 66, 165, 212, 20, 64]}, {"55062467": [7, 142, 111]}, {"55062471": [164]}, {"55062473": [15, 122, 3, 52, 2, 72, 48, 21, 226]}, {"55062483": [7]}, {"55062488": [36, 25]}, {"55062491": [3, 16]}, {"55062495": [4, 52, 2, 99, 17, 21, 226]}, {"55062503": [2]}, {"55062508": [36, 25]}, {"55062511": [3, 3, 224]}, {"55062515": [8]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"11427312": [12, 16, 11, 206]}, {"11881272": [12, 16, 11, 222]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}, {"55062328": [141, 173, 138, 160, 52, 2, 128]}, {"55062336": [16, 77]}, {"55062339": [2]}, {"55062344": [16]}, {"55062347": [9, 60, 15, 128, 30, 37, 239, 132, 160, 129, 226, 28, 191, 48, 66]}, {"55062363": [1, 16, 64]}, {"55062367": [2]}, {"55062372": [16]}, {"55062375": [2, 52, 2]}, {"55062379": [1, 161, 226, 28, 191, 3, 224]}, {"55062387": [8]}, {"55062393": [51, 8, 33, 60, 2, 128, 18, 140, 66, 165, 212, 20, 64]}, {"55062407": [7, 142, 111]}, {"55062411": [164, 60, 2]}, {"55062415": [72, 32, 66, 48, 232, 21, 226]}, {"55062423": [8]}, {"55062428": [36, 25]}, {"55062431": [3, 16]}, {"55062435": [5, 60, 2]}, {"55062439": [99, 32, 66, 17, 232, 21, 226]}, {"55062447": [2]}, {"55062452": [36, 25]}, {"55062455": [3, 3, 224]}, {"55062459": [8]}] \ No newline at end of file From 50cdd92311b3f4455e5be3688f76ffaae639772c Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Sat, 16 Jun 2018 23:18:29 -0500 Subject: [PATCH 143/151] more sun's song changes this should fix an issue with my previous upload. Malon and windmill events wouldn't full play out. This fixes that. --- ASM/src/hacks.asm | 5 +++++ ASM/src/song_fix.asm | 36 ++++++++++++++++++++++++++++++------ data/base2current.json | 2 +- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 926b37319..152ce8584 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -261,6 +261,11 @@ ; lw t5, 0x8AA0(t5) .org 0xAE5DF0 ; In memory: 8006FE90 jal suns_song_fix + +; Replaces: +; addu at, at, s3 +.org 0xB54E5C ; In memory: 800DEEFC + jal suns_song_fix_event ; Replaces: ; addu at, at, s3 diff --git a/ASM/src/song_fix.asm b/ASM/src/song_fix.asm index 57aa168e2..a2045f4e1 100644 --- a/ASM/src/song_fix.asm +++ b/ASM/src/song_fix.asm @@ -2,6 +2,31 @@ ; Fixes songs in certain scenes to allow for various song learning function to properly play ; through their scripts. ;================================================================================================== +suns_song_fix_event: + addu at, at, s3 + addi t7, r0, 0x0047 + bne t7, t2, @@return + lui v0, 0x8012 + lw v0, 0xA5D4(v0) + lw t7, 0x00A4(s3) + sra t7, t7, 8 + bnez v0, @@child + li v0, 0x4830 + bne t7, v0, @@return + nop + addiu t9, r0, 0x0003 + b @@return + +@@child: + lui v0, 0x6311 + bne t7, v0, @@return + nop + addiu t9, r0, 0x0003 + +@@return: + jr ra + nop + suns_song_fix: lw t5, 0x8AA0(t5) li v0, 0x8000 @@ -29,19 +54,18 @@ suns_song_fix: warp_song_fix: addu at, at, s3 lui v0, 0x8012 - lw v0, 0xa5d4(v0) + lw v0, 0xA5D4(v0) + lw t7, 0x00A4(s3) + sra t7, t7, 8 bnez v0, @@child - lw t7, 0x00a4(s3) - lui v0, 0x0048 - addi v0, v0, 0x30e8 + li v0, 0x4830 bne t7, v0, @@return nop addiu t9, r0, 0x0003 b @@return @@child: - lui v0, 0x0063 - addi v0, v0, 0x11e8 + lui v0, 0x6311 bne t7, v0, @@return nop addiu t9, r0, 0x0003 diff --git a/data/base2current.json b/data/base2current.json index 84e46d0c8..1c3f81c62 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"11427312": [12, 16, 11, 206]}, {"11881272": [12, 16, 11, 222]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}, {"55062328": [141, 173, 138, 160, 52, 2, 128]}, {"55062336": [16, 77]}, {"55062339": [2]}, {"55062344": [16]}, {"55062347": [9, 60, 15, 128, 30, 37, 239, 132, 160, 129, 226, 28, 191, 48, 66]}, {"55062363": [1, 16, 64]}, {"55062367": [2]}, {"55062372": [16]}, {"55062375": [2, 52, 2]}, {"55062379": [1, 161, 226, 28, 191, 3, 224]}, {"55062387": [8]}, {"55062393": [51, 8, 33, 60, 2, 128, 18, 140, 66, 165, 212, 20, 64]}, {"55062407": [7, 142, 111]}, {"55062411": [164, 60, 2]}, {"55062415": [72, 32, 66, 48, 232, 21, 226]}, {"55062423": [8]}, {"55062428": [36, 25]}, {"55062431": [3, 16]}, {"55062435": [5, 60, 2]}, {"55062439": [99, 32, 66, 17, 232, 21, 226]}, {"55062447": [2]}, {"55062452": [36, 25]}, {"55062455": [3, 3, 224]}, {"55062459": [8]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"11427312": [12, 16, 11, 225]}, {"11881272": [12, 16, 11, 241]}, {"11882076": [12, 16, 11, 206]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}, {"55062329": [51, 8, 33, 32, 15]}, {"55062335": [71, 21, 234]}, {"55062339": [14, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062351": [164]}, {"55062353": [15, 122, 3, 20, 64]}, {"55062359": [5, 52, 2, 72, 48, 21, 226]}, {"55062367": [7]}, {"55062372": [36, 25]}, {"55062375": [3, 16]}, {"55062379": [4, 60, 2, 99, 17, 21, 226]}, {"55062387": [2]}, {"55062392": [36, 25]}, {"55062395": [3, 3, 224]}, {"55062399": [8]}, {"55062404": [141, 173, 138, 160, 52, 2, 128]}, {"55062412": [16, 77]}, {"55062415": [2]}, {"55062420": [16]}, {"55062423": [9, 60, 15, 128, 30, 37, 239, 132, 160, 129, 226, 28, 191, 48, 66]}, {"55062439": [1, 16, 64]}, {"55062443": [2]}, {"55062448": [16]}, {"55062451": [2, 52, 2]}, {"55062455": [1, 161, 226, 28, 191, 3, 224]}, {"55062463": [8]}, {"55062469": [51, 8, 33, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062483": [164]}, {"55062485": [15, 122, 3, 20, 64]}, {"55062491": [5, 52, 2, 72, 48, 21, 226]}, {"55062499": [7]}, {"55062504": [36, 25]}, {"55062507": [3, 16]}, {"55062511": [4, 60, 2, 99, 17, 21, 226]}, {"55062519": [2]}, {"55062524": [36, 25]}, {"55062527": [3, 3, 224]}, {"55062531": [8]}] \ No newline at end of file From 525e1854ea18e1cd4cfcbbdcd9572069496c71d4 Mon Sep 17 00:00:00 2001 From: Martakia Date: Sun, 17 Jun 2018 23:13:52 -0400 Subject: [PATCH 144/151] Fix for Gui launch error. --- Gui.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gui.py b/Gui.py index 61e41f0e1..3dcddfd60 100644 --- a/Gui.py +++ b/Gui.py @@ -225,7 +225,9 @@ def generateRom(): if args.seed: seedVar.set(str(args.seed)) bridgeVar.set(args.bridge) - colorVars.set([args.kokiricolor, args.goroncolor, args.zoracolor]) + colorVars[0].set(args.kokiricolor) + colorVars[1].set(args.goroncolor) + colorVars[2].set(args.zoracolor) lowHealthSFXVar.set(args.healthSFX) romVar.set(args.rom) From d7ea4744b8c3f120c134bf550d3b7bc8df3ba087 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Sun, 17 Jun 2018 22:38:16 -0500 Subject: [PATCH 145/151] fixed a typo in warp song fix code had an lui where I needed an li --- ASM/src/song_fix.asm | 4 ++-- data/base2current.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ASM/src/song_fix.asm b/ASM/src/song_fix.asm index a2045f4e1..0f283b140 100644 --- a/ASM/src/song_fix.asm +++ b/ASM/src/song_fix.asm @@ -18,7 +18,7 @@ suns_song_fix_event: b @@return @@child: - lui v0, 0x6311 + li v0, 0x6311 bne t7, v0, @@return nop addiu t9, r0, 0x0003 @@ -65,7 +65,7 @@ warp_song_fix: b @@return @@child: - lui v0, 0x6311 + li v0, 0x6311 bne t7, v0, @@return nop addiu t9, r0, 0x0003 diff --git a/data/base2current.json b/data/base2current.json index 1c3f81c62..6656cb3ae 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"11427312": [12, 16, 11, 225]}, {"11881272": [12, 16, 11, 241]}, {"11882076": [12, 16, 11, 206]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}, {"55062329": [51, 8, 33, 32, 15]}, {"55062335": [71, 21, 234]}, {"55062339": [14, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062351": [164]}, {"55062353": [15, 122, 3, 20, 64]}, {"55062359": [5, 52, 2, 72, 48, 21, 226]}, {"55062367": [7]}, {"55062372": [36, 25]}, {"55062375": [3, 16]}, {"55062379": [4, 60, 2, 99, 17, 21, 226]}, {"55062387": [2]}, {"55062392": [36, 25]}, {"55062395": [3, 3, 224]}, {"55062399": [8]}, {"55062404": [141, 173, 138, 160, 52, 2, 128]}, {"55062412": [16, 77]}, {"55062415": [2]}, {"55062420": [16]}, {"55062423": [9, 60, 15, 128, 30, 37, 239, 132, 160, 129, 226, 28, 191, 48, 66]}, {"55062439": [1, 16, 64]}, {"55062443": [2]}, {"55062448": [16]}, {"55062451": [2, 52, 2]}, {"55062455": [1, 161, 226, 28, 191, 3, 224]}, {"55062463": [8]}, {"55062469": [51, 8, 33, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062483": [164]}, {"55062485": [15, 122, 3, 20, 64]}, {"55062491": [5, 52, 2, 72, 48, 21, 226]}, {"55062499": [7]}, {"55062504": [36, 25]}, {"55062507": [3, 16]}, {"55062511": [4, 60, 2, 99, 17, 21, 226]}, {"55062519": [2]}, {"55062524": [36, 25]}, {"55062527": [3, 3, 224]}, {"55062531": [8]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"11427312": [12, 16, 11, 225]}, {"11881272": [12, 16, 11, 241]}, {"11882076": [12, 16, 11, 206]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}, {"55062329": [51, 8, 33, 32, 15]}, {"55062335": [71, 21, 234]}, {"55062339": [14, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062351": [164]}, {"55062353": [15, 122, 3, 20, 64]}, {"55062359": [5, 52, 2, 72, 48, 21, 226]}, {"55062367": [7]}, {"55062372": [36, 25]}, {"55062375": [3, 16]}, {"55062379": [4, 52, 2, 99, 17, 21, 226]}, {"55062387": [2]}, {"55062392": [36, 25]}, {"55062395": [3, 3, 224]}, {"55062399": [8]}, {"55062404": [141, 173, 138, 160, 52, 2, 128]}, {"55062412": [16, 77]}, {"55062415": [2]}, {"55062420": [16]}, {"55062423": [9, 60, 15, 128, 30, 37, 239, 132, 160, 129, 226, 28, 191, 48, 66]}, {"55062439": [1, 16, 64]}, {"55062443": [2]}, {"55062448": [16]}, {"55062451": [2, 52, 2]}, {"55062455": [1, 161, 226, 28, 191, 3, 224]}, {"55062463": [8]}, {"55062469": [51, 8, 33, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062483": [164]}, {"55062485": [15, 122, 3, 20, 64]}, {"55062491": [5, 52, 2, 72, 48, 21, 226]}, {"55062499": [7]}, {"55062504": [36, 25]}, {"55062507": [3, 16]}, {"55062511": [4, 52, 2, 99, 17, 21, 226]}, {"55062519": [2]}, {"55062524": [36, 25]}, {"55062527": [3, 3, 224]}, {"55062531": [8]}] \ No newline at end of file From c9cadae39f8e9b17ca3173419d87a704649ef407 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Sun, 17 Jun 2018 22:51:30 -0500 Subject: [PATCH 146/151] removed problematic piece of code --- Rom.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Rom.py b/Rom.py index e24fd4d24..7f1c4ccdc 100644 --- a/Rom.py +++ b/Rom.py @@ -867,14 +867,12 @@ def patch_rom(world, rom): Block_code = [0x80, 0xEA, 0x00, 0xA7, 0x24, 0x01, 0x00, 0x3F, 0x31, 0x4A, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00] rom.write_bytes(0xE2B454, Block_code) - rom.write_bytes(0xACCE58, [0x10, 0x00, 0x00, 0x10]) elif world.bridge == 'open': rom.write_bytes(0x34806B8, [0x34, 0xA5, 0x00, 0x20]) elif world.bridge == 'dungeons': Block_code = [0x80, 0xEA, 0x00, 0xA7, 0x24, 0x01, 0x00, 0x3F, 0x08, 0x10, 0x02, 0x08, 0x31, 0x4A, 0x00, 0x3F] rom.write_bytes(0xE2B454, Block_code) - rom.write_bytes(0xACCE58, [0x10, 0x00, 0x00, 0x10]) if world.open_forest: #rom.write_byte(0x2081148, 0x80) From 6aee297b7062aa942194d8b30dc7e669d058cc05 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Mon, 18 Jun 2018 03:31:38 -0500 Subject: [PATCH 147/151] Fix always_allow This properly enables key for key in GTG and Water Temple. This push also adds rigor and clarity to the spoiler log making the seed different. --- Gui.py | 2 +- Main.py | 3 ++- Rules.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gui.py b/Gui.py index 61e41f0e1..2c4f719af 100644 --- a/Gui.py +++ b/Gui.py @@ -51,7 +51,7 @@ def open_readme(): checkBoxFrame = Frame(rightHalfFrame) createSpoilerVar = IntVar() - createSpoilerCheckbutton = Checkbutton(checkBoxFrame, text="Create Spoiler Log", variable=createSpoilerVar) + createSpoilerCheckbutton = Checkbutton(checkBoxFrame, text="Create Spoiler Log (affects item layout)", variable=createSpoilerVar) suppressRomVar = IntVar() suppressRomCheckbutton = Checkbutton(checkBoxFrame, text="Do not create patched Rom", variable=suppressRomVar) compressRomVar = IntVar() diff --git a/Main.py b/Main.py index 61da9d043..f21de0011 100644 --- a/Main.py +++ b/Main.py @@ -32,7 +32,8 @@ def main(args, seed=None): world.seed = int(seed) random.seed(world.seed) if args.create_spoiler: # Make game different if spoiler log is generated. - new_base_seed = random.randint(0, 999999999) + for i in range (0, 10): # Generate many random numbers to increase volatility. + new_base_seed = random.randint(0, 999999999) random.seed(new_base_seed) logger.info('OoT Randomizer Version %s - Seed: %s\n\n', __version__, world.seed) diff --git a/Rules.py b/Rules.py index cc3ae846a..9228b468f 100644 --- a/Rules.py +++ b/Rules.py @@ -219,7 +219,7 @@ def global_rules(world): set_rule(world.get_location('Water Temple Torches Chest'), lambda state: (state.has('Bow') or (state.has('Dins Fire') and state.has('Magic Meter'))) and state.has('Zeldas Lullaby')) set_rule(world.get_location('Water Temple Dragon Chest'), lambda state: (state.has('Progressive Strength Upgrade') and state.has('Zeldas Lullaby')) or (state.has('Small Key (Water Temple)', 6) and (state.has('Zeldas Lullaby') or world.keysanity) and state.has('Song of Time') and state.has('Bow'))) set_rule(world.get_location('Water Temple Central Bow Target Chest'), lambda state: state.has('Bow') and state.has('Progressive Strength Upgrade') and state.has('Zeldas Lullaby') and (state.has('Hover Boots') or state.has('Progressive Hookshot', 2))) - set_always_allow(world.get_location('Water Temple Boss Key Chest'), lambda state, item: item.name == 'Small Key (Water Temple)') + set_always_allow(world.get_location('Water Temple Boss Key Chest'), lambda item, state: item.name == 'Small Key (Water Temple)') set_rule(world.get_location('Water Temple Boss Key Chest'), lambda state: (state.has('Small Key (Water Temple)', 6) and (state.has('Zeldas Lullaby') or world.keysanity) and ((state.has('Bomb Bag') and state.has('Progressive Strength Upgrade')) or state.has('Hover Boots')) and state.has('Progressive Hookshot', 2)) or item_name(state, 'Water Temple Boss Key Chest') == 'Small Key (Water Temple)') #If key for key, this lets the logic reduce the small key reqs for every other locked door. set_rule(world.get_location('Morpha'), lambda state: state.has('Boss Key (Water Temple)') and state.has('Progressive Hookshot', 2)) set_rule(world.get_location('Morpha Heart'), lambda state: state.has('Boss Key (Water Temple)') and state.has('Progressive Hookshot', 2)) @@ -267,8 +267,8 @@ def global_rules(world): set_rule(world.get_location('Gerudo Training Grounds Maze Path First Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 4)) set_rule(world.get_location('Gerudo Training Grounds Maze Path Second Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 6)) set_rule(world.get_location('Gerudo Training Grounds Maze Path Third Chest'), lambda state: state.has('Small Key (Gerudo Training Grounds)', 7)) - set_always_allow(world.get_location('Gerudo Training Grounds Maze Path Final Chest'), lambda state, item: item.name == 'Small Key (Gerudo Training Grounds)') set_rule(world.get_location('Gerudo Training Grounds Maze Path Final Chest'), lambda state: (state.has('Small Key (Gerudo Training Grounds)', 9)) or (item_name(state, 'Gerudo Training Grounds Maze Path Final Chest') == 'Small Key (Gerudo Training Grounds)' and state.has('Small Key (Gerudo Training Grounds)', 8))) #Allow key for key + set_always_allow(world.get_location('Gerudo Training Grounds Maze Path Final Chest'), lambda item, state: item.name == 'Small Key (Gerudo Training Grounds)') set_rule(world.get_location('Gerudo Training Grounds Underwater Silver Rupee Chest'), lambda state: state.has('Progressive Hookshot') and state.has('Song of Time') and state.has('Iron Boots') and state.is_adult()) set_rule(world.get_location('Gerudo Training Grounds Hammer Room Switch Chest'), lambda state: state.has('Hammer') and state.is_adult()) set_rule(world.get_location('Gerudo Training Grounds Eye Statue Chest'), lambda state: state.has('Bow') and state.is_adult()) From 6c342b09aa81add7a04d5a4a83be7a9a05f44be9 Mon Sep 17 00:00:00 2001 From: junglechief87 Date: Mon, 18 Jun 2018 22:22:00 -0500 Subject: [PATCH 148/151] added missing hint for winner PoH --- HintList.py | 1 + 1 file changed, 1 insertion(+) diff --git a/HintList.py b/HintList.py index 131207f8e..0da6c6ca8 100644 --- a/HintList.py +++ b/HintList.py @@ -91,6 +91,7 @@ def getHintGroup(string): 'Serenade of Water': (" a song of a damp ditch.", 'item'), 'Heart Container': (" a lot of love.", 'item'), 'Piece of Heart': (" love.", 'item'), + 'Piece of Heart (Treasure Chest Game)': (" WINNER!", 'item'), 'Recovery Heart': (" a free heal.", 'item'), 'Rupee (1)': (" rare riches.", 'item'), 'Rupees (5)': (" a common coin.", 'item'), From 198db24f3cf8175e9be446a8066ce3886acd210d Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Tue, 19 Jun 2018 19:45:56 -0500 Subject: [PATCH 149/151] Properly consider Beamos in adult Spirit --- Rules.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Rules.py b/Rules.py index 9228b468f..76d9d4438 100644 --- a/Rules.py +++ b/Rules.py @@ -295,11 +295,11 @@ def global_rules(world): set_rule(world.get_location('Spirit Temple Sun Block Room Chest'), lambda state: (state.has('Small Key (Spirit Temple)', 5) and state.has('Bomb Bag') and state.has('Requiem of Spirit')) or (state.has_fire_source() and (state.has('Bomb Bag') or state.has('Small Key (Spirit Temple)', 2)))) set_rule(world.get_location('Spirit Temple Statue Hand Chest'), lambda state: state.has('Small Key (Spirit Temple)', 3) and state.has('Progressive Strength Upgrade', 2) and state.is_adult() and state.has('Zeldas Lullaby')) set_rule(world.get_location('Spirit Temple NE Main Room Chest'), lambda state: state.has('Small Key (Spirit Temple)', 3) and state.has('Progressive Strength Upgrade', 2) and state.is_adult() and state.has('Zeldas Lullaby') and state.has('Progressive Hookshot')) - set_rule(world.get_location('Mirror Shield Chest'), lambda state: state.has('Small Key (Spirit Temple)', 4) and state.has('Progressive Strength Upgrade', 2) and state.is_adult()) - set_rule(world.get_location('Silver Gauntlets Chest'), lambda state: (state.has('Small Key (Spirit Temple)', 3) and state.has('Progressive Hookshot', 2)) or state.has('Small Key (Spirit Temple)', 5)) - set_rule(world.get_location('Spirit Temple Near Four Armos Chest'), lambda state: state.has('Mirror Shield')) - set_rule(world.get_location('Spirit Temple Hallway Left Invisible Chest'), lambda state: state.has('Magic Meter') and state.has('Lens of Truth')) - set_rule(world.get_location('Spirit Temple Hallway Right Invisible Chest'), lambda state: state.has('Magic Meter') and state.has('Lens of Truth')) + set_rule(world.get_location('Mirror Shield Chest'), lambda state: state.has('Small Key (Spirit Temple)', 4) and state.has('Progressive Strength Upgrade', 2) and state.is_adult() and state.has('Bomb Bag')) + set_rule(world.get_location('Silver Gauntlets Chest'), lambda state: (state.has('Small Key (Spirit Temple)', 3) and state.has('Progressive Hookshot', 2) and state.has('Bomb Bag')) or state.has('Small Key (Spirit Temple)', 5)) + set_rule(world.get_location('Spirit Temple Near Four Armos Chest'), lambda state: state.has('Mirror Shield') and state.has('Bomb Bag')) + set_rule(world.get_location('Spirit Temple Hallway Left Invisible Chest'), lambda state: state.has('Magic Meter') and state.has('Lens of Truth') and state.has('Bomb Bag')) + set_rule(world.get_location('Spirit Temple Hallway Right Invisible Chest'), lambda state: state.has('Magic Meter') and state.has('Lens of Truth') and state.has('Bomb Bag')) set_rule(world.get_location('Spirit Temple Boss Key Chest'), lambda state: state.has('Zeldas Lullaby') and state.has('Bow') and state.has('Progressive Hookshot') and state.can_blast()) set_rule(world.get_location('Spirit Temple Topmost Chest'), lambda state: state.has('Mirror Shield')) set_rule(world.get_location('Twinrova'), lambda state: state.has('Mirror Shield') and state.has('Bomb Bag') and state.has('Progressive Hookshot') and state.has('Boss Key (Spirit Temple)')) From 15bdb01772576705efdaab53dbbb38d853a4f3ff Mon Sep 17 00:00:00 2001 From: Nick Langille Date: Wed, 20 Jun 2018 08:36:29 -0400 Subject: [PATCH 150/151] Disable warping when there is a pending item --- ASM/src/every_frame.asm | 5 +++++ ASM/src/hacks.asm | 6 +++++- ASM/src/item_overrides.asm | 3 +++ data/base2current.json | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ASM/src/every_frame.asm b/ASM/src/every_frame.asm index 15759e769..195c5d929 100644 --- a/ASM/src/every_frame.asm +++ b/ASM/src/every_frame.asm @@ -14,6 +14,11 @@ every_frame: lb t0, 0x00 (t0) beqz t0, @@no_pending_item nop + ; Disable warping when there is a pending item. Currently this code is only used in places + ; where warping is allowed, so warping can always be re-enabled after the item is received. + li t1, GLOBAL_CONTEXT + 0x104E4 + li t2, 1 + sh t2, 0x00 (t1) ; PLAYER_ACTOR+0x0424 holds the item to be received. +0x0428 holds a pointer to the actor ; giving the item. The game is not picky about this actor, it just needs to read a non-zero ; value at actor+0x0130, and it overwrites actor+0x0118. Construct a dummy actor in an usused diff --git a/ASM/src/hacks.asm b/ASM/src/hacks.asm index 152ce8584..27e31948d 100755 --- a/ASM/src/hacks.asm +++ b/ASM/src/hacks.asm @@ -257,6 +257,10 @@ jal item_menu_description_id_periodic nop +;================================================================================================== +; Song Fixes +;================================================================================================== + ; Replaces: ; lw t5, 0x8AA0(t5) .org 0xAE5DF0 ; In memory: 8006FE90 @@ -270,4 +274,4 @@ ; Replaces: ; addu at, at, s3 .org 0xB54B38 ; In memory: 800DEBD8 - jal warp_song_fix \ No newline at end of file + jal warp_song_fix diff --git a/ASM/src/item_overrides.asm b/ASM/src/item_overrides.asm index 9f17a0bbe..1d9628a49 100755 --- a/ASM/src/item_overrides.asm +++ b/ASM/src/item_overrides.asm @@ -59,6 +59,9 @@ override_object: ; Clear any pending special item, now that it's being received li t2, PENDING_SPECIAL_ITEM sb r0, 0x00 (t2) + ; Re-enable warping (disabled by pending item) + li t2, GLOBAL_CONTEXT + 0x104E4 + sh r0, 0x00 (t2) jr ra nop diff --git a/data/base2current.json b/data/base2current.json index 6656cb3ae..2a621add8 100644 --- a/data/base2current.json +++ b/data/base2current.json @@ -1 +1 @@ -[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 17]}, {"11325064": [12, 16, 10, 233, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 56]}, {"11427312": [12, 16, 11, 225]}, {"11881272": [12, 16, 11, 241]}, {"11882076": [12, 16, 11, 206]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 23, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 30, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 37, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 16, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 225]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 241, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 237]}, {"12491480": [12, 16, 9, 246]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 190]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 44]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [3, 224]}, {"55060351": [8]}, {"55060356": [60, 8, 128, 64, 37, 8, 32]}, {"55060364": [141, 9]}, {"55060367": [12, 17, 32]}, {"55060371": [2]}, {"55060376": [129, 3]}, {"55060379": [2]}, {"55060381": [3, 15, 195]}, {"55060385": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060399": [8]}, {"55060404": [144, 69]}, {"55060407": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060416": [141, 9]}, {"55060419": [12, 17, 32]}, {"55060423": [2]}, {"55060428": [145, 5]}, {"55060431": [3, 3, 224]}, {"55060435": [8]}, {"55060440": [143, 162]}, {"55060443": [36, 144, 69]}, {"55060448": [60, 8, 128, 64, 37, 8, 32]}, {"55060456": [141, 9]}, {"55060459": [12, 17, 32]}, {"55060463": [19]}, {"55060468": [145, 5]}, {"55060471": [1, 175, 164]}, {"55060476": [175, 165]}, {"55060479": [4, 175, 166]}, {"55060483": [8, 39, 189, 255, 232, 175, 191]}, {"55060491": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060503": [6, 145, 6]}, {"55060507": [7, 141, 9]}, {"55060511": [8, 1, 32, 248, 9]}, {"55060520": [143, 191]}, {"55060523": [16, 39, 189]}, {"55060527": [24, 143, 164]}, {"55060532": [143, 165]}, {"55060535": [4, 143, 166]}, {"55060539": [8, 3, 224]}, {"55060543": [8]}, {"55060548": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060559": [16, 175, 163]}, {"55060563": [20, 175, 191]}, {"55060567": [24, 12, 16, 10, 30]}, {"55060576": [143, 162]}, {"55060579": [16, 143, 163]}, {"55060583": [20, 143, 191]}, {"55060587": [24, 39, 189]}, {"55060591": [32, 3, 224]}, {"55060595": [8]}, {"55060600": [39, 189, 255, 232, 175, 191]}, {"55060607": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060616": [173]}, {"55060620": [173]}, {"55060623": [4, 173]}, {"55060627": [8, 173]}, {"55060631": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060647": [42]}, {"55060653": [9, 15, 195, 1, 33, 32, 38]}, {"55060661": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 88]}, {"55060676": [4, 64]}, {"55060679": [34]}, {"55060684": [52, 68]}, {"55060688": [12, 16, 10, 157]}, {"55060696": [16, 96]}, {"55060699": [12]}, {"55060704": [60, 8, 128, 64, 37, 8, 32]}, {"55060712": [140, 105]}, {"55060716": [173, 9]}, {"55060720": [140, 105]}, {"55060723": [4, 173, 9]}, {"55060727": [4, 140, 105]}, {"55060731": [8, 173, 9]}, {"55060735": [8, 52, 9]}, {"55060739": [1, 173, 9]}, {"55060743": [12, 144, 98]}, {"55060748": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060764": [52, 1]}, {"55060767": [10, 21, 65]}, {"55060771": [6]}, {"55060776": [149, 42]}, {"55060779": [28, 49, 74, 240, 31]}, {"55060785": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060795": [28, 129, 9, 4, 36, 5, 33]}, {"55060803": [2]}, {"55060809": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060819": [16, 39, 189]}, {"55060823": [24, 3, 224]}, {"55060827": [8]}, {"55060832": [39, 189, 255, 232, 175, 191]}, {"55060839": [16, 12, 16, 10, 102]}, {"55060848": [36, 1, 255, 255, 16, 65]}, {"55060855": [4]}, {"55060860": [52, 68]}, {"55060864": [12, 16, 10, 144]}, {"55060872": [143, 191]}, {"55060875": [16, 39, 189]}, {"55060879": [24, 3, 224]}, {"55060883": [8]}, {"55060888": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060899": [164, 52, 8]}, {"55060904": [52, 137]}, {"55060908": [148, 170]}, {"55060912": [52, 1]}, {"55060915": [10, 21, 65]}, {"55060919": [14]}, {"55060924": [148, 171]}, {"55060927": [28, 52, 1]}, {"55060931": [16, 20, 65]}, {"55060935": [8]}, {"55060940": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060951": [4]}, {"55060956": [36, 2, 255, 255, 16]}, {"55060963": [21]}, {"55060968": [52, 8]}, {"55060971": [1, 49, 105]}, {"55060975": [31, 52, 1]}, {"55060979": [21, 21, 65]}, {"55060983": [12]}, {"55060988": [52, 1]}, {"55060991": [62, 16, 129]}, {"55060995": [7]}, {"55061000": [52, 1]}, {"55061003": [66, 16, 129]}, {"55061007": [4]}, {"55061012": [36, 2, 255, 255, 16]}, {"55061019": [7]}, {"55061024": [52, 8]}, {"55061027": [2, 144, 169, 1, 65]}, {"55061033": [2, 18]}, {"55061037": [72, 16, 37]}, {"55061041": [2, 18]}, {"55061045": [73, 16, 37, 3, 224]}, {"55061051": [8]}, {"55061056": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061071": [4, 141, 9]}, {"55061076": [17, 32]}, {"55061079": [5]}, {"55061085": [9, 82, 2, 21, 68, 255, 250]}, {"55061096": [49, 34]}, {"55061099": [255, 3, 224]}, {"55061103": [8]}, {"55061108": [39, 189, 255, 224, 175, 176]}, {"55061115": [16, 175, 177]}, {"55061119": [20, 175, 191]}, {"55061123": [24, 52, 130]}, {"55061128": [52, 80]}, {"55061132": [38, 8, 255, 128, 5]}, {"55061139": [18]}, {"55061144": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061155": [16, 1, 9]}, {"55061159": [24]}, {"55061162": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061180": [142, 40]}, {"55061183": [12, 1]}, {"55061186": [248, 9]}, {"55061192": [20, 80, 255, 239]}, {"55061200": [54, 35]}, {"55061204": [16]}, {"55061207": [2]}, {"55061212": [52, 3]}, {"55061216": [143, 176]}, {"55061219": [16, 143, 177]}, {"55061223": [20, 143, 191]}, {"55061227": [24, 39, 189]}, {"55061231": [32, 3, 224]}, {"55061235": [8]}, {"55061240": [140, 136, 29, 44, 52, 9]}, {"55061247": [1]}, {"55061249": [9, 78]}, {"55061252": [1, 9, 16, 36, 16, 64]}, {"55061259": [36]}, {"55061264": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061279": [164, 52, 1]}, {"55061283": [61, 17, 129]}, {"55061287": [10]}, {"55061293": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061303": [25]}, {"55061308": [52, 13]}, {"55061311": [1, 161, 141, 29, 40, 37, 74]}, {"55061319": [3, 16]}, {"55061323": [9]}, {"55061328": [52, 12]}, {"55061331": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061347": [14]}, {"55061352": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061388": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061400": [52, 2]}, {"55061404": [3, 224]}, {"55061407": [8]}, {"55061412": [60, 8, 128, 64, 37, 8, 20]}, {"55061420": [129, 8]}, {"55061424": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061436": [3, 224]}, {"55061439": [8]}, {"55061444": [175, 164]}, {"55061447": [104, 175, 165]}, {"55061451": [108, 175, 166]}, {"55061455": [112, 175, 167]}, {"55061459": [116, 39, 189, 255, 232, 175, 163]}, {"55061467": [16, 175, 191]}, {"55061471": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061484": [17]}, {"55061487": [10]}, {"55061492": [60, 9, 128, 65, 52, 10]}, {"55061499": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 30]}, {"55061528": [143, 163]}, {"55061531": [16, 143, 191]}, {"55061535": [20, 39, 189]}, {"55061539": [24, 143, 164]}, {"55061543": [104, 143, 165]}, {"55061547": [108, 143, 166]}, {"55061551": [112, 143, 167]}, {"55061555": [116, 132, 110, 19, 196, 3, 224]}, {"55061563": [8]}, {"55061568": [147, 25]}, {"55061571": [116, 52, 1]}, {"55061575": [255, 23, 33]}, {"55061579": [2]}, {"55061584": [52, 25]}, {"55061587": [44, 3, 224]}, {"55061591": [8, 167, 185]}, {"55061595": [154, 147, 44]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 21, 129]}, {"55061607": [2]}, {"55061612": [52, 12]}, {"55061615": [44, 3, 224]}, {"55061619": [8]}, {"55061624": [145, 174]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 193]}, {"55061635": [2]}, {"55061640": [52, 14]}, {"55061643": [44, 3, 224]}, {"55061647": [8, 167, 174]}, {"55061651": [154, 145, 207]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 225]}, {"55061663": [2]}, {"55061668": [52, 15]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 175]}, {"55061679": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061691": [104, 173, 9]}, {"55061696": [142, 9]}, {"55061699": [108, 173, 9]}, {"55061703": [4, 150, 9]}, {"55061707": [112, 165, 9]}, {"55061711": [8, 150, 9]}, {"55061715": [156, 165, 9]}, {"55061719": [10, 3, 224]}, {"55061723": [8, 142, 14]}, {"55061727": [4, 39, 189, 255, 224, 175, 176]}, {"55061735": [16, 175, 177]}, {"55061739": [20, 175, 191]}, {"55061743": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061763": [4, 17]}, {"55061767": [5]}, {"55061772": [12, 16, 11, 98]}, {"55061780": [16]}, {"55061783": [3]}, {"55061788": [12, 16, 11, 117]}, {"55061796": [12, 16, 11, 85, 52, 4]}, {"55061804": [12, 16, 11, 85, 52, 4]}, {"55061811": [1, 12, 16, 11, 85, 52, 4]}, {"55061819": [2, 143, 176]}, {"55061823": [16, 143, 177]}, {"55061827": [20, 143, 191]}, {"55061831": [24, 39, 189]}, {"55061835": [32, 3, 224]}, {"55061839": [8]}, {"55061844": [2, 4, 64, 33, 145, 9]}, {"55061851": [108, 52, 1]}, {"55061855": [255, 17, 33]}, {"55061859": [7]}, {"55061864": [2, 9, 72, 33, 145, 41]}, {"55061871": [116, 52, 1]}, {"55061875": [44, 17, 33]}, {"55061879": [2]}, {"55061884": [161, 9]}, {"55061887": [105, 3, 224]}, {"55061891": [8]}, {"55061896": [39, 189, 255, 232, 175, 191]}, {"55061903": [16, 142, 40]}, {"55061908": [174, 8]}, {"55061911": [64, 142, 40]}, {"55061915": [4, 174, 8]}, {"55061919": [68, 150, 40]}, {"55061923": [8, 166, 8]}, {"55061927": [72, 162]}, {"55061930": [15, 51, 146, 8]}, {"55061935": [74, 52, 1]}, {"55061939": [255, 21, 1]}, {"55061943": [3]}, {"55061948": [12, 16, 11, 131]}, {"55061956": [143, 191]}, {"55061959": [16, 39, 189]}, {"55061963": [24, 3, 224]}, {"55061967": [8]}, {"55061972": [142, 8]}, {"55061975": [64, 174, 8]}, {"55061979": [104, 142, 8]}, {"55061983": [68, 174, 8]}, {"55061987": [108, 150, 8]}, {"55061991": [72, 166, 8]}, {"55061995": [112, 146, 8]}, {"55061999": [104, 52, 1]}, {"55062003": [255, 21, 1]}, {"55062007": [3]}, {"55062012": [52, 8]}, {"55062015": [1, 162, 8, 15, 51, 3, 224]}, {"55062023": [8]}, {"55062028": [39, 189, 255, 232, 175, 191]}, {"55062035": [16, 150, 8]}, {"55062039": [156, 49, 8]}, {"55062043": [64, 17]}, {"55062047": [5]}, {"55062052": [150, 8]}, {"55062055": [112, 49, 8, 255, 15, 53, 8]}, {"55062063": [48, 166, 8]}, {"55062067": [112, 146, 40]}, {"55062071": [1, 162, 8]}, {"55062075": [105, 150, 40]}, {"55062079": [2, 166, 8]}, {"55062083": [106, 142, 40]}, {"55062087": [4, 174, 8]}, {"55062091": [108, 12, 16, 11, 157, 52, 4]}, {"55062100": [12, 16, 11, 157, 52, 4]}, {"55062107": [1, 12, 16, 11, 157, 52, 4]}, {"55062115": [2, 143, 191]}, {"55062119": [16, 39, 189]}, {"55062123": [24, 3, 224]}, {"55062127": [8]}, {"55062132": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 32, 145, 10]}, {"55062147": [108, 52, 1]}, {"55062151": [255, 17, 65]}, {"55062155": [5]}, {"55062160": [1, 42, 72, 33, 145, 41]}, {"55062168": [21, 32]}, {"55062171": [28]}, {"55062176": [60, 9, 128, 64, 37, 41, 47, 19, 37, 41]}, {"55062187": [1, 145, 42]}, {"55062192": [17, 64]}, {"55062195": [19]}, {"55062200": [2, 10, 88, 33, 145, 107]}, {"55062207": [116, 52, 1]}, {"55062211": [255, 17, 97, 255, 248]}, {"55062220": [146, 12]}, {"55062223": [108, 17, 138, 255, 245]}, {"55062232": [146, 12]}, {"55062235": [109, 17, 138, 255, 242]}, {"55062244": [146, 12]}, {"55062247": [110, 17, 138, 255, 239]}, {"55062256": [161, 11]}, {"55062259": [105, 161, 10]}, {"55062263": [108, 16]}, {"55062267": [4]}, {"55062272": [52, 9]}, {"55062275": [255, 161, 9]}, {"55062279": [105, 161, 9]}, {"55062283": [108, 3, 224]}, {"55062287": [8]}, {"55062292": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062305": [1, 1, 1, 1, 1]}, {"55062311": [1, 1, 1, 1, 1]}, {"55062317": [1]}, {"55062319": [1, 1, 1, 1, 1, 1, 1, 1]}, {"55062329": [51, 8, 33, 32, 15]}, {"55062335": [71, 21, 234]}, {"55062339": [14, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062351": [164]}, {"55062353": [15, 122, 3, 20, 64]}, {"55062359": [5, 52, 2, 72, 48, 21, 226]}, {"55062367": [7]}, {"55062372": [36, 25]}, {"55062375": [3, 16]}, {"55062379": [4, 52, 2, 99, 17, 21, 226]}, {"55062387": [2]}, {"55062392": [36, 25]}, {"55062395": [3, 3, 224]}, {"55062399": [8]}, {"55062404": [141, 173, 138, 160, 52, 2, 128]}, {"55062412": [16, 77]}, {"55062415": [2]}, {"55062420": [16]}, {"55062423": [9, 60, 15, 128, 30, 37, 239, 132, 160, 129, 226, 28, 191, 48, 66]}, {"55062439": [1, 16, 64]}, {"55062443": [2]}, {"55062448": [16]}, {"55062451": [2, 52, 2]}, {"55062455": [1, 161, 226, 28, 191, 3, 224]}, {"55062463": [8]}, {"55062469": [51, 8, 33, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062483": [164]}, {"55062485": [15, 122, 3, 20, 64]}, {"55062491": [5, 52, 2, 72, 48, 21, 226]}, {"55062499": [7]}, {"55062504": [36, 25]}, {"55062507": [3, 16]}, {"55062511": [4, 52, 2, 99, 17, 21, 226]}, {"55062519": [2]}, {"55062524": [36, 25]}, {"55062527": [3, 3, 224]}, {"55062531": [8]}] \ No newline at end of file +[{"9083985": [0, 0, 0]}, {"9083989": [0, 0, 0, 0, 0, 0]}, {"9083996": [0, 0, 0, 0]}, {"9084004": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084048": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084060": [0, 0, 0, 0, 0]}, {"9084067": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084112": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084124": [0, 0, 0, 0, 0]}, {"9084131": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084176": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084188": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084240": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084252": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084304": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084316": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084326": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084368": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084380": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084390": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084432": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084444": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084454": [0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084496": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084560": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084624": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084643": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084688": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084707": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084752": [0, 0, 0, 0]}, {"9084757": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"9084772": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"11111472": [12, 16, 10, 20]}, {"11325064": [12, 16, 10, 236, 0, 0, 0, 0, 0, 0]}, {"11325076": [0]}, {"11325079": [0, 0, 0]}, {"11325083": [0]}, {"11426272": [8, 16, 11, 63]}, {"11427312": [12, 16, 11, 232]}, {"11881272": [12, 16, 11, 248]}, {"11882076": [12, 16, 11, 213]}, {"12250476": [0, 0]}, {"12250479": [0]}, {"12285876": [0, 0]}, {"12285879": [0]}, {"12286096": [12, 16, 11, 30, 0, 0]}, {"12286103": [0]}, {"12286288": [12, 16, 11, 37, 0, 0]}, {"12286295": [0]}, {"12286880": [0, 0]}, {"12286883": [0]}, {"12286972": [0, 0]}, {"12286975": [0]}, {"12287036": [12, 16, 11, 44, 0, 0]}, {"12287043": [0]}, {"12287064": [12, 16, 11, 23, 0, 0]}, {"12287071": [0]}, {"12381372": [8, 16, 9, 228]}, {"12381377": [0, 0, 0, 0, 0]}, {"12381383": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]}, {"12381395": [0]}, {"12427425": [16, 9, 177]}, {"12427480": [12, 16, 9, 206]}, {"12427492": [0, 0]}, {"12427495": [0]}, {"12427876": [12, 16, 9, 210]}, {"12427888": [0, 0]}, {"12427891": [0]}, {"12428008": [36, 10, 255, 255]}, {"12474768": [12, 16, 10, 244, 0, 0, 0, 0]}, {"12491456": [12, 16, 9, 240]}, {"12491480": [12, 16, 9, 249]}, {"12491492": [0, 0]}, {"12491742": [131, 131]}, {"13144796": [52, 14, 0, 1]}, {"13144860": [52, 10, 0, 1]}, {"13145925": [16, 10, 193]}, {"13146216": [146, 14, 29, 40]}, {"13146276": [146, 25, 29, 41]}, {"13146312": [146, 10, 29, 42]}, {"13330528": [12, 16, 11, 51]}, {"14357459": [118]}, {"14624335": [118]}, {"14872723": [52]}, {"15506663": [122]}, {"55055360": [90, 93, 92, 94, 81, 82, 83]}, {"55058464": [255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 72, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 100, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 140, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 180, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 36, 220, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 4, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 32, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 60, 255, 255, 255, 255, 255, 255, 255, 255, 128, 64, 37, 196, 128, 64, 37, 88, 83, 65, 1, 67]}, {"55058613": [198, 21, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 68]}, {"55058629": [198, 22, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 69]}, {"55058645": [198, 23, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 70]}, {"55058661": [198, 24, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 71]}, {"55058677": [198, 25, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 93]}, {"55058693": [198, 28, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 122]}, {"55058709": [198, 29, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 249]}, {"55058725": [198, 30, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 1, 151]}, {"55058741": [198, 32, 255, 128, 64, 37, 220, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058757": [185, 1, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058773": [185, 1, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058789": [185, 1, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058805": [185, 1, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058821": [185, 1, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 10, 199]}, {"55058837": [185, 1, 10, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058853": [184, 2]}, {"55058856": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058869": [184, 2, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058885": [184, 2, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058901": [184, 2, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058917": [184, 2, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058933": [184, 2, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058949": [184, 2, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058965": [184, 2, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058981": [184, 2, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 11, 103]}, {"55058997": [184, 2, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059013": [200, 4]}, {"55059016": [128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059029": [200, 4, 1, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059045": [200, 4, 2, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059061": [200, 4, 3, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059077": [200, 4, 4, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059093": [200, 4, 5, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059109": [200, 4, 6, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059125": [200, 4, 7, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059141": [200, 4, 8, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 28, 102]}, {"55059157": [200, 4, 9, 128, 64, 38, 24, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059173": [170, 3, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059189": [170, 4, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059205": [170, 5, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059221": [170, 6, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059237": [170, 7, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059253": [170, 8, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059269": [170, 11, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059285": [170, 12, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 65, 254, 96]}, {"55059301": [170, 13, 255, 128, 64, 38, 52, 128, 64, 36, 64, 83, 61, 67, 12]}, {"55059317": [248, 255, 255, 128, 64, 37, 204, 128, 64, 36, 64, 77, 131, 9, 85]}, {"55059333": [183, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 146, 219, 230]}, {"55059349": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 147, 218, 230]}, {"55059365": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 148, 217, 230]}, {"55059381": [216, 255, 255, 128, 64, 37, 196, 128, 64, 37, 140, 83, 142, 224, 50]}, {"55059397": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 143, 224, 50]}, {"55059413": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 144, 224, 50]}, {"55059429": [206, 255, 255, 128, 64, 37, 196, 128, 64, 37, 168, 83, 140, 238, 52]}, {"55059445": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 83, 141, 238, 52]}, {"55059461": [187, 255, 255, 128, 64, 37, 196, 128, 64, 36, 64, 79, 65, 19, 233]}, {"55059477": [189, 255, 255, 128, 64, 38, 92, 128, 64, 36, 64, 79, 65, 226, 228]}, {"55059493": [205, 255, 255, 128, 64, 38, 124, 128, 64, 37, 116, 79, 65, 225, 232]}, {"55059509": [205, 255, 255, 128, 64, 38, 156, 128, 64, 36, 64, 3, 224]}, {"55059523": [8, 52, 162]}, {"55059528": [144, 136]}, {"55059531": [125, 52, 1]}, {"55059535": [255, 17, 1]}, {"55059539": [2, 52, 2]}, {"55059543": [8, 52, 2]}, {"55059547": [9, 3, 224]}, {"55059551": [8]}, {"55059556": [144, 136]}, {"55059559": [163, 49, 8]}, {"55059563": [192, 17]}, {"55059567": [5, 52, 2]}, {"55059571": [84, 52, 1]}, {"55059575": [64, 17, 1]}, {"55059579": [2, 52, 2]}, {"55059583": [53, 52, 2]}, {"55059587": [54, 3, 224]}, {"55059591": [8]}, {"55059596": [144, 136]}, {"55059599": [163, 49, 8]}, {"55059603": [24, 17]}, {"55059607": [5, 52, 2]}, {"55059611": [50, 52, 1]}, {"55059615": [8, 17, 1]}, {"55059619": [2, 52, 2]}, {"55059623": [51, 52, 2]}, {"55059627": [52, 3, 224]}, {"55059631": [8]}, {"55059636": [144, 136]}, {"55059639": [163, 49, 8]}, {"55059643": [3, 17]}, {"55059647": [5, 52, 2]}, {"55059651": [4, 52, 1]}, {"55059655": [1, 17, 1]}, {"55059659": [2, 52, 2]}, {"55059663": [48, 52, 2]}, {"55059667": [49, 3, 224]}, {"55059671": [8]}, {"55059676": [144, 136]}, {"55059679": [162, 49, 8]}, {"55059683": [192, 17]}, {"55059687": [5, 52, 2]}, {"55059691": [5, 52, 1]}, {"55059695": [64, 17, 1]}, {"55059699": [2, 52, 2]}, {"55059703": [96, 52, 2]}, {"55059707": [123, 3, 224]}, {"55059711": [8]}, {"55059716": [144, 136]}, {"55059719": [162, 49, 8]}, {"55059723": [48, 17]}, {"55059727": [2, 52, 2]}, {"55059731": [69, 52, 2]}, {"55059735": [70, 3, 224]}, {"55059739": [8]}, {"55059744": [144, 136]}, {"55059747": [162, 49, 8]}, {"55059751": [6, 17]}, {"55059755": [2, 52, 2]}, {"55059759": [55, 52, 2]}, {"55059763": [56, 3, 224]}, {"55059767": [8]}, {"55059772": [144, 136]}, {"55059775": [161, 49, 8]}, {"55059779": [32, 17]}, {"55059783": [2, 52, 2]}, {"55059787": [121, 52, 2]}, {"55059791": [122, 3, 224]}, {"55059795": [8]}, {"55059800": [144, 136]}, {"55059803": [161, 49, 8]}, {"55059807": [4, 17]}, {"55059811": [2, 52, 2]}, {"55059815": [119, 52, 2]}, {"55059819": [120, 3, 224]}, {"55059823": [8]}, {"55059828": [144, 136]}, {"55059831": [50, 17]}, {"55059835": [2, 52, 2]}, {"55059839": [192, 52, 2]}, {"55059843": [193, 3, 224]}, {"55059847": [8]}, {"55059852": [144, 136]}, {"55059855": [163, 49, 8]}, {"55059859": [3, 17]}, {"55059863": [2, 52, 2]}, {"55059867": [77, 52, 162]}, {"55059872": [3, 224]}, {"55059875": [8]}, {"55059880": [144, 136]}, {"55059883": [163, 49, 8]}, {"55059887": [24, 17]}, {"55059891": [2, 52, 2]}, {"55059895": [77, 52, 162]}, {"55059900": [3, 224]}, {"55059903": [8]}, {"55059908": [3, 224]}, {"55059911": [8]}, {"55059916": [52, 8]}, {"55059919": [1, 160, 136]}, {"55059923": [62, 3, 224]}, {"55059927": [8]}, {"55059932": [36, 136]}, {"55059935": [134, 36, 9, 255, 255, 37, 41]}, {"55059943": [1, 52, 1]}, {"55059947": [3]}, {"55059949": [41, 8, 42, 20, 32]}, {"55059955": [7]}, {"55059960": [1, 9, 80, 33, 145, 75]}, {"55059968": [52, 1]}, {"55059971": [255, 21, 97, 255, 247]}, {"55059980": [161, 69]}, {"55059984": [3, 224]}, {"55059987": [8]}, {"55059992": [36, 136]}, {"55059995": [168, 1, 6, 64, 33, 145, 9]}, {"55060004": [1, 37, 72, 37, 161, 9]}, {"55060012": [3, 224]}, {"55060015": [8]}, {"55060020": [36, 136]}, {"55060023": [188, 1, 5, 64, 33, 129, 9]}, {"55060032": [5, 33]}, {"55060035": [2]}, {"55060040": [52, 9]}, {"55060044": [37, 41]}, {"55060047": [1, 161, 9]}, {"55060052": [3, 224]}, {"55060055": [8]}, {"55060060": [52, 8]}, {"55060063": [1, 160, 136]}, {"55060067": [61, 52, 8]}, {"55060071": [20, 160, 136]}, {"55060075": [207, 52, 8, 1, 64, 164, 136, 20, 36, 3, 224]}, {"55060087": [8]}, {"55060092": [52, 8]}, {"55060095": [1, 160, 136]}, {"55060099": [50, 160, 136]}, {"55060103": [58, 52, 8]}, {"55060107": [48, 164, 136, 19, 244, 160, 136]}, {"55060115": [51, 3, 224]}, {"55060119": [8]}, {"55060124": [52, 8]}, {"55060127": [2, 160, 136]}, {"55060131": [50, 52, 8]}, {"55060135": [1, 160, 136]}, {"55060139": [58, 160, 136]}, {"55060143": [60, 52, 8]}, {"55060147": [96, 164, 136, 19, 244, 160, 136]}, {"55060155": [51, 3, 224]}, {"55060159": [8]}, {"55060164": [48, 132]}, {"55060167": [255, 60, 8, 128, 18, 37, 8, 165, 208, 52, 1]}, {"55060179": [140, 16, 129]}, {"55060183": [22, 145, 2]}, {"55060187": [117, 52, 1]}, {"55060191": [141, 16, 129]}, {"55060195": [19, 145, 2]}, {"55060199": [117, 16, 128]}, {"55060203": [17, 145, 2]}, {"55060207": [116, 52, 1]}, {"55060211": [138, 16, 129]}, {"55060215": [14, 145, 2]}, {"55060219": [116, 52, 1]}, {"55060223": [139, 16, 129]}, {"55060227": [11, 145, 2]}, {"55060231": [116, 52, 1]}, {"55060235": [88, 16, 129]}, {"55060239": [8, 52, 2]}, {"55060244": [52, 1]}, {"55060247": [120, 16, 129]}, {"55060251": [5, 52, 2]}, {"55060256": [52, 1]}, {"55060259": [121, 16, 129]}, {"55060263": [2, 52, 2]}, {"55060268": [52, 2]}, {"55060271": [255, 3, 224]}, {"55060275": [8]}, {"55060280": [143, 166]}, {"55060283": [48, 132, 197]}, {"55060287": [4, 8, 16, 9, 214]}, {"55060296": [143, 185]}, {"55060299": [44, 135, 37]}, {"55060303": [4, 8, 16, 9, 214]}, {"55060312": [60, 10, 128, 64, 37, 74, 32]}, {"55060320": [141, 75]}, {"55060323": [12, 17, 96]}, {"55060327": [2]}, {"55060332": [149, 69]}, {"55060335": [4, 60, 10, 128, 64, 37, 74, 32, 16, 161, 64]}, {"55060348": [60, 10, 128, 30, 37, 74, 137, 132, 165, 64]}, {"55060360": [3, 224]}, {"55060363": [8]}, {"55060368": [60, 8, 128, 64, 37, 8, 32]}, {"55060376": [141, 9]}, {"55060379": [12, 17, 32]}, {"55060383": [2]}, {"55060388": [129, 3]}, {"55060391": [2]}, {"55060393": [3, 15, 195]}, {"55060397": [97, 64, 38, 1, 1, 64, 35, 160, 136, 8, 82, 3, 224]}, {"55060411": [8]}, {"55060416": [144, 69]}, {"55060419": [3, 60, 8, 128, 64, 37, 8, 32]}, {"55060428": [141, 9]}, {"55060431": [12, 17, 32]}, {"55060435": [2]}, {"55060440": [145, 5]}, {"55060443": [3, 3, 224]}, {"55060447": [8]}, {"55060452": [143, 162]}, {"55060455": [36, 144, 69]}, {"55060460": [60, 8, 128, 64, 37, 8, 32]}, {"55060468": [141, 9]}, {"55060471": [12, 17, 32]}, {"55060475": [19]}, {"55060480": [145, 5]}, {"55060483": [1, 175, 164]}, {"55060488": [175, 165]}, {"55060491": [4, 175, 166]}, {"55060495": [8, 39, 189, 255, 232, 175, 191]}, {"55060503": [16, 60, 4, 128, 18, 36, 132, 165, 208, 145, 5]}, {"55060515": [6, 145, 6]}, {"55060519": [7, 141, 9]}, {"55060523": [8, 1, 32, 248, 9]}, {"55060532": [143, 191]}, {"55060535": [16, 39, 189]}, {"55060539": [24, 143, 164]}, {"55060544": [143, 165]}, {"55060547": [4, 143, 166]}, {"55060551": [8, 3, 224]}, {"55060555": [8]}, {"55060560": [160, 230, 4, 36, 39, 189, 255, 224, 175, 162]}, {"55060571": [16, 175, 163]}, {"55060575": [20, 175, 191]}, {"55060579": [24, 12, 16, 10, 33]}, {"55060588": [143, 162]}, {"55060591": [16, 143, 163]}, {"55060595": [20, 143, 191]}, {"55060599": [24, 39, 189]}, {"55060603": [32, 3, 224]}, {"55060607": [8]}, {"55060612": [39, 189, 255, 232, 175, 191]}, {"55060619": [16, 60, 8, 128, 64, 37, 8, 32]}, {"55060628": [173]}, {"55060632": [173]}, {"55060635": [4, 173]}, {"55060639": [8, 173]}, {"55060643": [12, 60, 8, 128, 30, 37, 8, 170, 48, 129, 9, 4, 36, 17, 32]}, {"55060659": [42]}, {"55060665": [9, 15, 195, 1, 33, 32, 38]}, {"55060673": [129, 32, 35, 141, 5, 4, 40, 12, 16, 10, 91]}, {"55060688": [4, 64]}, {"55060691": [34]}, {"55060696": [52, 68]}, {"55060700": [12, 16, 10, 160]}, {"55060708": [16, 96]}, {"55060711": [12]}, {"55060716": [60, 8, 128, 64, 37, 8, 32]}, {"55060724": [140, 105]}, {"55060728": [173, 9]}, {"55060732": [140, 105]}, {"55060735": [4, 173, 9]}, {"55060739": [4, 140, 105]}, {"55060743": [8, 173, 9]}, {"55060747": [8, 52, 9]}, {"55060751": [1, 173, 9]}, {"55060755": [12, 144, 98]}, {"55060760": [60, 8, 128, 30, 37, 8, 170, 48, 141, 9, 4, 40, 149, 42]}, {"55060776": [52, 1]}, {"55060779": [10, 21, 65]}, {"55060783": [6]}, {"55060788": [149, 42]}, {"55060791": [28, 49, 74, 240, 31]}, {"55060797": [2, 89, 64, 1, 75, 80, 37, 165, 42]}, {"55060807": [28, 129, 9, 4, 36, 5, 33]}, {"55060815": [2]}, {"55060821": [2, 16, 35, 161, 2, 4, 36, 143, 191]}, {"55060831": [16, 39, 189]}, {"55060835": [24, 3, 224]}, {"55060839": [8]}, {"55060844": [39, 189, 255, 232, 175, 191]}, {"55060851": [16, 12, 16, 10, 105]}, {"55060860": [36, 1, 255, 255, 16, 65]}, {"55060867": [4]}, {"55060872": [52, 68]}, {"55060876": [12, 16, 10, 147]}, {"55060884": [143, 191]}, {"55060887": [16, 39, 189]}, {"55060891": [24, 3, 224]}, {"55060895": [8]}, {"55060900": [60, 2, 128, 29, 36, 66, 132, 160, 148, 66]}, {"55060911": [164, 52, 8]}, {"55060916": [52, 137]}, {"55060920": [148, 170]}, {"55060924": [52, 1]}, {"55060927": [10, 21, 65]}, {"55060931": [14]}, {"55060936": [148, 171]}, {"55060939": [28, 52, 1]}, {"55060943": [16, 20, 65]}, {"55060947": [8]}, {"55060952": [49, 108, 15, 224, 52, 1, 14, 160, 21, 129]}, {"55060963": [4]}, {"55060968": [36, 2, 255, 255, 16]}, {"55060975": [21]}, {"55060980": [52, 8]}, {"55060983": [1, 49, 105]}, {"55060987": [31, 52, 1]}, {"55060991": [21, 21, 65]}, {"55060995": [12]}, {"55061000": [52, 1]}, {"55061003": [62, 16, 129]}, {"55061007": [7]}, {"55061012": [52, 1]}, {"55061015": [66, 16, 129]}, {"55061019": [4]}, {"55061024": [36, 2, 255, 255, 16]}, {"55061031": [7]}, {"55061036": [52, 8]}, {"55061039": [2, 144, 169, 1, 65]}, {"55061045": [2, 18]}, {"55061049": [72, 16, 37]}, {"55061053": [2, 18]}, {"55061057": [73, 16, 37, 3, 224]}, {"55061063": [8]}, {"55061068": [36, 2, 255, 255, 60, 8, 128, 64, 37, 8, 15, 252, 37, 8]}, {"55061083": [4, 141, 9]}, {"55061088": [17, 32]}, {"55061091": [5]}, {"55061097": [9, 82, 2, 21, 68, 255, 250]}, {"55061108": [49, 34]}, {"55061111": [255, 3, 224]}, {"55061115": [8]}, {"55061120": [39, 189, 255, 224, 175, 176]}, {"55061127": [16, 175, 177]}, {"55061131": [20, 175, 191]}, {"55061135": [24, 52, 130]}, {"55061140": [52, 80]}, {"55061144": [38, 8, 255, 128, 5]}, {"55061151": [18]}, {"55061156": [60, 17, 128, 64, 38, 49, 32, 32, 52, 9]}, {"55061167": [16, 1, 9]}, {"55061171": [24]}, {"55061174": [64, 18, 2, 40, 136, 33, 60, 4, 128, 18, 36, 132, 165, 208, 54, 5]}, {"55061192": [142, 40]}, {"55061195": [12, 1]}, {"55061198": [248, 9]}, {"55061204": [20, 80, 255, 239]}, {"55061212": [54, 35]}, {"55061216": [16]}, {"55061219": [2]}, {"55061224": [52, 3]}, {"55061228": [143, 176]}, {"55061231": [16, 143, 177]}, {"55061235": [20, 143, 191]}, {"55061239": [24, 39, 189]}, {"55061243": [32, 3, 224]}, {"55061247": [8]}, {"55061252": [140, 136, 29, 44, 52, 9]}, {"55061259": [1]}, {"55061261": [9, 78]}, {"55061264": [1, 9, 16, 36, 16, 64]}, {"55061271": [36]}, {"55061276": [148, 202, 2, 220, 60, 11, 128, 18, 37, 107, 165, 208, 148, 140]}, {"55061291": [164, 52, 1]}, {"55061295": [61, 17, 129]}, {"55061299": [10]}, {"55061305": [138, 96, 33, 145, 141, 29, 40, 21, 160]}, {"55061315": [25]}, {"55061320": [52, 13]}, {"55061323": [1, 161, 141, 29, 40, 37, 74]}, {"55061331": [3, 16]}, {"55061335": [9]}, {"55061340": [52, 12]}, {"55061343": [1, 1, 76, 96, 4, 145, 109, 14, 242, 1, 172, 112, 36, 21, 192]}, {"55061359": [14]}, {"55061364": [1, 172, 112, 37, 161, 110, 14, 242, 1, 41, 72, 39, 1, 9, 64, 36, 172, 136, 29, 44, 60, 8, 128, 64, 37, 8, 20, 1, 1, 10, 64, 33, 129, 8]}, {"55061400": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061412": [52, 2]}, {"55061416": [3, 224]}, {"55061419": [8]}, {"55061424": [60, 8, 128, 64, 37, 8, 20]}, {"55061432": [129, 8]}, {"55061436": [60, 9, 128, 64, 37, 41, 32, 16, 161, 40]}, {"55061448": [3, 224]}, {"55061451": [8]}, {"55061456": [175, 164]}, {"55061459": [104, 175, 165]}, {"55061463": [108, 175, 166]}, {"55061467": [112, 175, 167]}, {"55061471": [116, 39, 189, 255, 232, 175, 163]}, {"55061479": [16, 175, 191]}, {"55061483": [20, 60, 8, 128, 64, 37, 8, 32, 16, 129, 8]}, {"55061496": [17]}, {"55061499": [14]}, {"55061504": [60, 9, 128, 30, 37, 41, 137, 132, 52, 10]}, {"55061515": [1, 165, 42]}, {"55061520": [60, 9, 128, 65, 52, 10]}, {"55061527": [1, 173, 42, 1, 48, 60, 10, 128, 30, 37, 74, 170, 48, 161, 72, 4, 36, 173, 73, 4, 40, 12, 16, 10, 33]}, {"55061556": [143, 163]}, {"55061559": [16, 143, 191]}, {"55061563": [20, 39, 189]}, {"55061567": [24, 143, 164]}, {"55061571": [104, 143, 165]}, {"55061575": [108, 143, 166]}, {"55061579": [112, 143, 167]}, {"55061583": [116, 132, 110, 19, 196, 3, 224]}, {"55061591": [8]}, {"55061596": [147, 25]}, {"55061599": [116, 52, 1]}, {"55061603": [255, 23, 33]}, {"55061607": [2]}, {"55061612": [52, 25]}, {"55061615": [44, 3, 224]}, {"55061619": [8, 167, 185]}, {"55061623": [154, 147, 44]}, {"55061627": [116, 52, 1]}, {"55061631": [255, 21, 129]}, {"55061635": [2]}, {"55061640": [52, 12]}, {"55061643": [44, 3, 224]}, {"55061647": [8]}, {"55061652": [145, 174]}, {"55061655": [116, 52, 1]}, {"55061659": [255, 21, 193]}, {"55061663": [2]}, {"55061668": [52, 14]}, {"55061671": [44, 3, 224]}, {"55061675": [8, 167, 174]}, {"55061679": [154, 145, 207]}, {"55061683": [116, 52, 1]}, {"55061687": [255, 21, 225]}, {"55061691": [2]}, {"55061696": [52, 15]}, {"55061699": [44, 3, 224]}, {"55061703": [8, 167, 175]}, {"55061707": [154, 60, 8, 128, 64, 37, 8, 32, 20, 142, 9]}, {"55061719": [104, 173, 9]}, {"55061724": [142, 9]}, {"55061727": [108, 173, 9]}, {"55061731": [4, 150, 9]}, {"55061735": [112, 165, 9]}, {"55061739": [8, 150, 9]}, {"55061743": [156, 165, 9]}, {"55061747": [10, 3, 224]}, {"55061751": [8, 142, 14]}, {"55061755": [4, 39, 189, 255, 224, 175, 176]}, {"55061763": [16, 175, 177]}, {"55061767": [20, 175, 191]}, {"55061771": [24, 60, 16, 128, 18, 38, 16, 165, 208, 60, 17, 128, 64, 38, 49, 32, 20, 142, 8]}, {"55061791": [4, 17]}, {"55061795": [5]}, {"55061800": [12, 16, 11, 105]}, {"55061808": [16]}, {"55061811": [3]}, {"55061816": [12, 16, 11, 124]}, {"55061824": [12, 16, 11, 92, 52, 4]}, {"55061832": [12, 16, 11, 92, 52, 4]}, {"55061839": [1, 12, 16, 11, 92, 52, 4]}, {"55061847": [2, 143, 176]}, {"55061851": [16, 143, 177]}, {"55061855": [20, 143, 191]}, {"55061859": [24, 39, 189]}, {"55061863": [32, 3, 224]}, {"55061867": [8]}, {"55061872": [2, 4, 64, 33, 145, 9]}, {"55061879": [108, 52, 1]}, {"55061883": [255, 17, 33]}, {"55061887": [7]}, {"55061892": [2, 9, 72, 33, 145, 41]}, {"55061899": [116, 52, 1]}, {"55061903": [44, 17, 33]}, {"55061907": [2]}, {"55061912": [161, 9]}, {"55061915": [105, 3, 224]}, {"55061919": [8]}, {"55061924": [39, 189, 255, 232, 175, 191]}, {"55061931": [16, 142, 40]}, {"55061936": [174, 8]}, {"55061939": [64, 142, 40]}, {"55061943": [4, 174, 8]}, {"55061947": [68, 150, 40]}, {"55061951": [8, 166, 8]}, {"55061955": [72, 162]}, {"55061958": [15, 51, 146, 8]}, {"55061963": [74, 52, 1]}, {"55061967": [255, 21, 1]}, {"55061971": [3]}, {"55061976": [12, 16, 11, 138]}, {"55061984": [143, 191]}, {"55061987": [16, 39, 189]}, {"55061991": [24, 3, 224]}, {"55061995": [8]}, {"55062000": [142, 8]}, {"55062003": [64, 174, 8]}, {"55062007": [104, 142, 8]}, {"55062011": [68, 174, 8]}, {"55062015": [108, 150, 8]}, {"55062019": [72, 166, 8]}, {"55062023": [112, 146, 8]}, {"55062027": [104, 52, 1]}, {"55062031": [255, 21, 1]}, {"55062035": [3]}, {"55062040": [52, 8]}, {"55062043": [1, 162, 8, 15, 51, 3, 224]}, {"55062051": [8]}, {"55062056": [39, 189, 255, 232, 175, 191]}, {"55062063": [16, 150, 8]}, {"55062067": [156, 49, 8]}, {"55062071": [64, 17]}, {"55062075": [5]}, {"55062080": [150, 8]}, {"55062083": [112, 49, 8, 255, 15, 53, 8]}, {"55062091": [48, 166, 8]}, {"55062095": [112, 146, 40]}, {"55062099": [1, 162, 8]}, {"55062103": [105, 150, 40]}, {"55062107": [2, 166, 8]}, {"55062111": [106, 142, 40]}, {"55062115": [4, 174, 8]}, {"55062119": [108, 12, 16, 11, 164, 52, 4]}, {"55062128": [12, 16, 11, 164, 52, 4]}, {"55062135": [1, 12, 16, 11, 164, 52, 4]}, {"55062143": [2, 143, 191]}, {"55062147": [16, 39, 189]}, {"55062151": [24, 3, 224]}, {"55062155": [8]}, {"55062160": [2, 4, 64, 33, 60, 9, 128, 64, 37, 41, 47, 60, 145, 10]}, {"55062175": [108, 52, 1]}, {"55062179": [255, 17, 65]}, {"55062183": [5]}, {"55062188": [1, 42, 72, 33, 145, 41]}, {"55062196": [21, 32]}, {"55062199": [28]}, {"55062204": [60, 9, 128, 64, 37, 41, 47, 47, 37, 41]}, {"55062215": [1, 145, 42]}, {"55062220": [17, 64]}, {"55062223": [19]}, {"55062228": [2, 10, 88, 33, 145, 107]}, {"55062235": [116, 52, 1]}, {"55062239": [255, 17, 97, 255, 248]}, {"55062248": [146, 12]}, {"55062251": [108, 17, 138, 255, 245]}, {"55062260": [146, 12]}, {"55062263": [109, 17, 138, 255, 242]}, {"55062272": [146, 12]}, {"55062275": [110, 17, 138, 255, 239]}, {"55062284": [161, 11]}, {"55062287": [105, 161, 10]}, {"55062291": [108, 16]}, {"55062295": [4]}, {"55062300": [52, 9]}, {"55062303": [255, 161, 9]}, {"55062307": [105, 161, 9]}, {"55062311": [108, 3, 224]}, {"55062315": [8]}, {"55062320": [7, 9, 15, 2, 3, 1, 13, 11]}, {"55062333": [1, 1, 1, 1, 1]}, {"55062339": [1, 1, 1, 1, 1]}, {"55062345": [1]}, {"55062347": [1, 1, 1, 1, 1, 1, 1, 1]}, {"55062357": [51, 8, 33, 32, 15]}, {"55062363": [71, 21, 234]}, {"55062367": [14, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062379": [164]}, {"55062381": [15, 122, 3, 20, 64]}, {"55062387": [5, 52, 2, 72, 48, 21, 226]}, {"55062395": [7]}, {"55062400": [36, 25]}, {"55062403": [3, 16]}, {"55062407": [4, 52, 2, 99, 17, 21, 226]}, {"55062415": [2]}, {"55062420": [36, 25]}, {"55062423": [3, 3, 224]}, {"55062427": [8]}, {"55062432": [141, 173, 138, 160, 52, 2, 128]}, {"55062440": [16, 77]}, {"55062443": [2]}, {"55062448": [16]}, {"55062451": [9, 60, 15, 128, 30, 37, 239, 132, 160, 129, 226, 28, 191, 48, 66]}, {"55062467": [1, 16, 64]}, {"55062471": [2]}, {"55062476": [16]}, {"55062479": [2, 52, 2]}, {"55062483": [1, 161, 226, 28, 191, 3, 224]}, {"55062491": [8]}, {"55062497": [51, 8, 33, 60, 2, 128, 18, 140, 66, 165, 212, 142, 111]}, {"55062511": [164]}, {"55062513": [15, 122, 3, 20, 64]}, {"55062519": [5, 52, 2, 72, 48, 21, 226]}, {"55062527": [7]}, {"55062532": [36, 25]}, {"55062535": [3, 16]}, {"55062539": [4, 52, 2, 99, 17, 21, 226]}, {"55062547": [2]}, {"55062552": [36, 25]}, {"55062555": [3, 3, 224]}, {"55062559": [8]}] \ No newline at end of file From ab68bc18db15a1e7a505297cc116d77861d1fde7 Mon Sep 17 00:00:00 2001 From: AmazingAmpharos Date: Fri, 22 Jun 2018 17:47:33 -0500 Subject: [PATCH 151/151] Last tweaks to readme --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4301759ed..811e493b4 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,10 @@ create a decompressed version of this ROM that can be used for input for slightl is either a .n64 or .z64 file. For users playing via any means other than on real N64 hardware, the use of the "Compress patched ROM" flag is strongly encouraged as uncompressed ROMs are impossible to inject for the Virtual Console and have random crashing problems on all emulators. -For general use, the recommended emulators are Bizhawk and Mupen64plus. If you want to play on Project 64 for whatever reason, you can but -you will need to set the rando to use 8 MB of RAM and will want to play with the cheat code 8109C58A 0000 to partially fix Project 64's tragically -poor handling of OoT's pause menu. As of this 2.0 release, there are suspected crashing issues specifically with Project 64. I cannot emphasize enough -that it is a discouraged emulator to use. +For general use, the recommended emulator is RetroArch; it has been shown to work with minimal issues. Bizhawk and Mupen64plus are generally good choices +too. If you want to play on Project 64 for whatever reason, you can but you will need to set the rando to use 8 MB of RAM and will want to play with the +cheat code 8109C58A 0000 to partially fix Project 64's tragically poor handling of OoT's pause menu. Project 64 also has one particular crash that only +happens for some unknown settings configurations; we cannot support this. I cannot emphasize enough that it is a discouraged emulator to use. # General Description @@ -141,10 +141,13 @@ then do not recover the tunic. It is almost always possible to do without, but i Sadly for this 2.0 release a few known issues exist. These will hopefully be addressed in future versions. -The fishing minigame sometimes refuses to allow you to catch fish when playing specifically on Bizhawk. Save and quit (NOT savestate) and return to fix the issue. --Draining the Bottom of the Well with Song of Storms sometimes crashes on specific versions of Project 64. We aren't sure of the exact story, but this bug is easily -avoided by playing on a different emulator. +-Draining the Bottom of the Well with Song of Storms sometimes crashes on specific configurations of Project 64. We aren't sure of the exact story, but this bug is +easily avoided by playing on a different emulator and probably also avoidable by changing your settings and maybe graphics plug-in. -There's a funny bug where sometimes obtaining Biggoron Sword displays a second erroneous text box. This has no gameplay consequence. --Executing the collection delay glitch on various NPCs may have unpredictable and undesirable consequences. +-Executing the collection delay glitch on various NPCs may have unpredictable and undesirable consequences. In particular this can be devastating with Biggoron; +it is strongly suggested the player save before turning in the Claim Check. +-Saving and quitting on the very first frame after becomming an adult when you would trigger the Light Arrow cutscene can have undesired consequences. Just don't +do that. # Settings