diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt index b7e8c1fbd..b18e9c20a 100644 --- a/ASM/build/asm_symbols.txt +++ b/ASM/build/asm_symbols.txt @@ -543,217 +543,222 @@ 80405CBC ice_trap_effect,0000001C 80405CD8 give_bean_pack,00000018 80405CF0 fill_wallet_upgrade,0000002C -80405D1C get_item_row,0000003C -80405D58 resolve_upgrades,0000005C -80405DB4 call_effect_function,0000002C -80405DE0 no_upgrade,00000008 -80405DE8 hookshot_upgrade,00000014 -80405DFC strength_upgrade,0000002C -80405E28 bomb_bag_upgrade,0000002C -80405E54 bow_upgrade,00000028 -80405E7C slingshot_upgrade,00000030 -80405EAC wallet_upgrade,00000030 -80405EDC scale_upgrade,00000018 -80405EF4 nut_upgrade,0000001C -80405F10 stick_upgrade,0000001C -80405F2C magic_upgrade,00000010 -80405F3C bombchu_upgrade,00000030 -80405F6C ocarina_upgrade,00000020 -80405F8C arrows_to_rupee,0000001C -80405FA8 bombs_to_rupee,0000001C -80405FC4 seeds_to_rupee,00000024 -80405FE8 letter_to_bottle,00000070 -80406058 c_init,0000003C -80406094 before_game_state_update,00000044 -804060D8 after_game_state_update,0000003C -80406114 after_scene_init,0000002C -80406140 c_equipment_menu_slot_filled,00000100 -80406240 load_object_file,0000006C -804062AC load_object,00000028 -804062D4 get_object,00000060 -80406334 set_object_segment,0000004C -80406380 scale_top_matrix,00000068 -804063E8 draw_model_low_level,00000080 -80406468 scale_factor,0000007C -804064E4 draw_model,00000090 -80406574 models_init,0000004C -804065C0 models_reset,0000002C -804065EC lookup_model_by_override,0000005C -80406648 lookup_model,00000040 -80406688 heart_piece_draw,00000064 -804066EC small_key_draw,00000088 -80406774 heart_container_draw,00000064 -804067D8 skull_token_draw,00000064 -8040683C ocarina_of_time_draw,00000064 -804068A0 item_etcetera_draw,000000E4 -80406984 bowling_bomb_bag_draw,000000A4 -80406A28 bowling_heart_piece_draw,00000064 -80406C7C update_color,000000AC -80406D28 health_and_magic_refill,00000028 -80406D50 store_scarecrow_fix,00000048 -80406D98 text_init,0000002C -80406DC4 text_print,000000A8 -80406E6C text_flush,00000154 -80406FC0 set_triforce_render,00000028 -80406FE8 draw_triforce_count,00000534 -8040751C heap_init,00000014 -80407530 heap_alloc,0000003C -8040756C file_init,00000044 -804075D8 .byt:0042 -804075D8 freecam_modes -80407694 .byt:000E -80407694 cfg_dungeon_rewards -804076A4 .byt:0012 -804076A4 medal_colors -804076B8 .byt:009C -804076B8 dungeons -80407754 .byt:0014 -80407754 extern_ctxt -80407768 .byt:0040 -80407768 hash_symbols -804077A8 .byt:0028 -804077A8 setup_db -804077D0 .byt:0010 -804077D0 triforce_sprite -804077E0 .byt:0010 -804077E0 dpad_sprite -804077F0 .byt:0010 -804077F0 font_sprite -80407800 .byt:0010 -80407800 quest_items_sprite -80407810 .byt:0010 -80407810 items_sprite -80407820 .byt:0010 -80407820 medals_sprite -80407830 .byt:0010 -80407830 stones_sprite -80407840 .byt:000C -80407840 rupee_colors -8040784C .byt:0FDC -8040784C item_table -80408840 .byt:0004 -80408840 cfg_dungeon_info_enable -80408844 .byt:0004 -80408844 dungeon_count -80408848 .byt:0004 -80408848 last_fog_distance -8040884C .byt:0004 -8040884C scene_fog_distance -80408850 .byt:0008 -80408850 hash_sprites -80408858 .byt:0004 -80408858 text_cursor_border_max -8040885C .byt:0004 -8040885C text_cursor_border_base -80408860 .byt:0004 -80408860 text_cursor_inner_max -80408864 .byt:0004 -80408864 text_cursor_inner_base -80408868 .byt:0004 -80408868 c_note_font_glow_max -8040886C .byt:0004 -8040886C c_note_font_glow_base -80408870 .byt:0004 -80408870 c_note_glow_max -80408874 .byt:0004 -80408874 c_note_glow_base -80408878 .byt:0004 -80408878 a_note_font_glow_max -8040887C .byt:0004 -8040887C a_note_font_glow_base -80408880 .byt:0004 -80408880 a_note_glow_max -80408884 .byt:0004 -80408884 a_note_glow_base -80408888 .byt:0004 -80408888 c_note_b -8040888C .byt:0004 -8040888C c_note_g -80408890 .byt:0004 -80408890 c_note_r -80408894 .byt:0004 -80408894 a_note_b -80408898 .byt:0004 -80408898 a_note_g -8040889C .byt:0004 -8040889C a_note_r -804088A0 .byt:0004 -804088A0 c_button -804088A4 .byt:0004 -804088A4 b_button -804088A8 .byt:0004 -804088A8 a_button -804088AC .byt:0004 -804088AC normal_dd -804088B0 .byt:0004 -804088B0 beating_dd -804088B4 .byt:0004 -804088B4 normal_no_dd +80405D1C open_mask_shop,0000007C +80405D98 get_item_row,0000003C +80405DD4 resolve_upgrades,0000005C +80405E30 call_effect_function,0000002C +80405E5C no_upgrade,00000008 +80405E64 hookshot_upgrade,00000014 +80405E78 strength_upgrade,0000002C +80405EA4 bomb_bag_upgrade,0000002C +80405ED0 bow_upgrade,00000028 +80405EF8 slingshot_upgrade,00000030 +80405F28 wallet_upgrade,00000030 +80405F58 scale_upgrade,00000018 +80405F70 nut_upgrade,0000001C +80405F8C stick_upgrade,0000001C +80405FA8 magic_upgrade,00000010 +80405FB8 bombchu_upgrade,00000030 +80405FE8 ocarina_upgrade,00000020 +80406008 arrows_to_rupee,0000001C +80406024 bombs_to_rupee,0000001C +80406040 seeds_to_rupee,00000024 +80406064 letter_to_bottle,00000070 +804060D4 c_init,0000003C +80406110 before_game_state_update,00000044 +80406154 after_game_state_update,0000003C +80406190 after_scene_init,0000002C +804061BC c_equipment_menu_slot_filled,00000100 +804062BC load_object_file,0000006C +80406328 load_object,00000028 +80406350 get_object,00000060 +804063B0 set_object_segment,0000004C +804063FC scale_top_matrix,00000068 +80406464 draw_model_low_level,00000080 +804064E4 scale_factor,0000007C +80406560 draw_model,00000090 +804065F0 models_init,0000004C +8040663C models_reset,0000002C +80406668 lookup_model_by_override,0000005C +804066C4 lookup_model,00000040 +80406704 heart_piece_draw,00000064 +80406768 small_key_draw,00000088 +804067F0 heart_container_draw,00000064 +80406854 skull_token_draw,00000064 +804068B8 ocarina_of_time_draw,00000064 +8040691C item_etcetera_draw,000000E4 +80406A00 bowling_bomb_bag_draw,000000A4 +80406AA4 bowling_heart_piece_draw,00000064 +80406CF8 update_color,000000AC +80406DA4 health_and_magic_refill,00000028 +80406DCC store_scarecrow_fix,00000048 +80406E14 text_init,0000002C +80406E40 text_print,000000A8 +80406EE8 text_flush,00000154 +8040703C set_triforce_render,00000028 +80407064 draw_triforce_count,00000534 +80407598 heap_init,00000014 +804075AC heap_alloc,0000003C +804075E8 file_init,00000044 +80407654 .byt:0042 +80407654 freecam_modes +8040770C .byt:000E +8040770C cfg_dungeon_rewards +8040771C .byt:0012 +8040771C medal_colors +80407730 .byt:009C +80407730 dungeons +804077CC .byt:0014 +804077CC extern_ctxt +804077E0 .byt:0040 +804077E0 hash_symbols +80407820 .byt:0028 +80407820 setup_db +80407848 .byt:0010 +80407848 triforce_sprite +80407858 .byt:0010 +80407858 dpad_sprite +80407868 .byt:0010 +80407868 font_sprite +80407878 .byt:0010 +80407878 quest_items_sprite +80407888 .byt:0010 +80407888 items_sprite +80407898 .byt:0010 +80407898 medals_sprite +804078A8 .byt:0010 +804078A8 stones_sprite +804078B8 .byt:000C +804078B8 rupee_colors +804078C4 .byt:0FDC +804078C4 item_table 804088B8 .byt:0004 -804088B8 beating_no_dd -804088BC .byt:0006 -804088BC defaultDDHeart -804088C4 .byt:0006 -804088C4 defaultHeart -804088CA .byt:0002 -804088CA triforce_pieces_requied -804088CC .byt:0004 -804088CC cfg_dungeon_info_reward_need_altar +804088B8 cfg_dungeon_info_enable +804088BC .byt:0004 +804088BC dungeon_count +804088C0 .byt:0004 +804088C0 last_fog_distance +804088C4 .byt:0004 +804088C4 scene_fog_distance +804088C8 .byt:0008 +804088C8 hash_sprites 804088D0 .byt:0004 -804088D0 cfg_dungeon_info_reward_need_compass +804088D0 text_cursor_border_max 804088D4 .byt:0004 -804088D4 cfg_dungeon_info_mq_need_map +804088D4 text_cursor_border_base 804088D8 .byt:0004 -804088D8 cfg_dungeon_info_mq_enable +804088D8 text_cursor_inner_max 804088DC .byt:0004 -804088DC cfg_file_select_hash -804088E0 .byt:0001 -804088E0 NO_ESCAPE_SEQUENCE -804088E4 .byt:0001 -804088E4 satisified_pending_frames +804088DC text_cursor_inner_base +804088E0 .byt:0004 +804088E0 c_note_font_glow_max +804088E4 .byt:0004 +804088E4 c_note_font_glow_base 804088E8 .byt:0004 -804088E8 active_item_fast_chest +804088E8 c_note_glow_max 804088EC .byt:0004 -804088EC active_item_graphic_id +804088EC c_note_glow_base 804088F0 .byt:0004 -804088F0 active_item_object_id +804088F0 a_note_font_glow_max 804088F4 .byt:0004 -804088F4 active_item_text_id +804088F4 a_note_font_glow_base 804088F8 .byt:0004 -804088F8 active_item_action_id +804088F8 a_note_glow_max 804088FC .byt:0004 -804088FC active_item_row +804088FC a_note_glow_base 80408900 .byt:0004 -80408900 active_override_is_outgoing -80408904 .byt:0008 -80408904 active_override +80408900 c_note_b +80408904 .byt:0004 +80408904 c_note_g +80408908 .byt:0004 +80408908 c_note_r 8040890C .byt:0004 -8040890C dummy_actor +8040890C a_note_b 80408910 .byt:0004 -80408910 item_overrides_count -80408914 .byt:0001 -80408914 pending_freezes -80408915 .byt:0001 -80408915 MAX_RUPEES -80408924 .byt:0002 -80408924 triforce_hunt_enabled +80408910 a_note_g +80408914 .byt:0004 +80408914 a_note_r +80408918 .byt:0004 +80408918 c_button +8040891C .byt:0004 +8040891C b_button +80408920 .byt:0004 +80408920 a_button +80408924 .byt:0004 +80408924 normal_dd +80408928 .byt:0004 +80408928 beating_dd +8040892C .byt:0004 +8040892C normal_no_dd 80408930 .byt:0004 -80408930 heap_next -80408934 .byt:000E -80408934 cfg_dungeon_is_mq -80408944 .byt:0018 -80408944 pending_item_queue -8040895C .byt:1000 -8040895C cfg_item_overrides -8040995C .byt:0040 -8040995C object_slots -804099A0 .byt:14C8 -804099A0 FONT_TEXTURE -8040AE68 .byt:0800 -8040AE68 DPAD_TEXTURE -8040B668 .byt:1000 -8040B668 TRIFORCE_ICON_TEXTURE -8040C670 AUDIO_THREAD_MEM_START -8040C670 PAYLOAD_END +80408930 beating_no_dd +80408934 .byt:0006 +80408934 defaultDDHeart +8040893C .byt:0006 +8040893C defaultHeart +80408942 .byt:0002 +80408942 triforce_pieces_requied +80408944 .byt:0004 +80408944 cfg_dungeon_info_reward_need_altar +80408948 .byt:0004 +80408948 cfg_dungeon_info_reward_need_compass +8040894C .byt:0004 +8040894C cfg_dungeon_info_mq_need_map +80408950 .byt:0004 +80408950 cfg_dungeon_info_mq_enable +80408954 .byt:0004 +80408954 cfg_file_select_hash +80408958 .byt:0001 +80408958 NO_ESCAPE_SEQUENCE +8040895C .byt:0001 +8040895C satisified_pending_frames +80408960 .byt:0004 +80408960 active_item_fast_chest +80408964 .byt:0004 +80408964 active_item_graphic_id +80408968 .byt:0004 +80408968 active_item_object_id +8040896C .byt:0004 +8040896C active_item_text_id +80408970 .byt:0004 +80408970 active_item_action_id +80408974 .byt:0004 +80408974 active_item_row +80408978 .byt:0004 +80408978 active_override_is_outgoing +8040897C .byt:0008 +8040897C active_override +80408984 .byt:0004 +80408984 dummy_actor +80408988 .byt:0004 +80408988 item_overrides_count +8040898C .byt:0001 +8040898C pending_freezes +8040898D .byt:0001 +8040898D COMPLETE_MASK_QUEST +8040898E .byt:0001 +8040898E OPEN_KAKARIKO +8040898F .byt:0001 +8040898F MAX_RUPEES +8040899C .byt:0002 +8040899C triforce_hunt_enabled +804089A8 .byt:0004 +804089A8 heap_next +804089AC .byt:000E +804089AC cfg_dungeon_is_mq +804089BC .byt:0018 +804089BC pending_item_queue +804089D4 .byt:1000 +804089D4 cfg_item_overrides +804099D4 .byt:0040 +804099D4 object_slots +80409A18 .byt:14C8 +80409A18 FONT_TEXTURE +8040AEE0 .byt:0800 +8040AEE0 DPAD_TEXTURE +8040B6E0 .byt:1000 +8040B6E0 TRIFORCE_ICON_TEXTURE +8040C6E0 AUDIO_THREAD_MEM_START +8040C6E0 PAYLOAD_END 804FF000 DEBUG_BUFFER 80500000 C_HEAP diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o index 42f7ad791..d2c8318b9 100644 Binary files a/ASM/build/bundle.o and b/ASM/build/bundle.o differ diff --git a/ASM/build/c_symbols.txt b/ASM/build/c_symbols.txt index 07343422f..f8ad7c001 100644 --- a/ASM/build/c_symbols.txt +++ b/ASM/build/c_symbols.txt @@ -48,7 +48,7 @@ SYMBOL TABLE: 00000018 l .rodata.cst4 00000000 $LC9 0000001c l .rodata.cst4 00000000 $LC10 00000000 l df *ABS* 00000000 rainbow_sword.c -00003dec l F .text 000001f0 get_color +00003e68 l F .text 000001f0 get_color 00001198 l O .data 00000015 colors 0000004c l O .sbss 00000004 frames 00000000 l .rodata.cst8 00000000 $LC0 @@ -67,21 +67,21 @@ SYMBOL TABLE: 00000018 l .rodata.cst8 00000000 $LC2 00000020 l .rodata.cst8 00000000 $LC3 00000000 l df *ABS* 00000000 util.c -000037c8 g F .text 0000007c scale_factor +00003844 g F .text 0000007c scale_factor 00002f9c g F .text 0000001c give_defense -00003114 g F .text 0000002c call_effect_function +00003190 g F .text 0000002c call_effect_function 00000000 *UND* 00000000 PLAYER_ID 00002d9c g F .text 00000080 give_ice_trap 00001a50 g F .text 0000007c item_overrides_init -0000323c g F .text 00000018 scale_upgrade +000032b8 g F .text 00000018 scale_upgrade 00000040 g O .sdata 00000004 a_note_glow_max 00000000 *UND* 00000000 CFG_HEART_COLOR 00002d2c g F .text 0000004c rupee_hud_color -00003148 g F .text 00000014 hookshot_upgrade +000031c4 g F .text 00000014 hookshot_upgrade 00001c84 g F .text 0000004c lookup_override -00003fdc g F .text 000000ac update_color -00003270 g F .text 0000001c stick_upgrade -000040f8 g F .text 0000002c text_init +00004058 g F .text 000000ac update_color +000032ec g F .text 0000001c stick_upgrade +00004174 g F .text 0000002c text_init 00000000 *UND* 00000000 INCOMING_PLAYER 00000078 g O .sdata 00000004 beating_no_dd 00000028 g O .sdata 00000004 c_note_font_glow_max @@ -92,9 +92,9 @@ SYMBOL TABLE: 00002fd4 g F .text 00000024 give_double_magic 0000006c g O .sdata 00000004 normal_dd 0000297c g F .text 000003b0 update_hud_colors -00003348 g F .text 00000070 letter_to_bottle +000033c4 g F .text 00000070 letter_to_bottle 00000000 *UND* 00000000 CFG_B_BUTTON_COLOR -00003b9c g F .text 00000064 ocarina_of_time_draw +00003c18 g F .text 00000064 ocarina_of_time_draw 00001a08 g F .text 00000048 check_ganon_entry 00000180 g O .data 00000010 items_sprite 00000000 *UND* 00000000 CFG_DISPLAY_DPAD @@ -103,49 +103,49 @@ SYMBOL TABLE: 00000068 g O .sdata 00000004 a_button 00000010 g O .sdata 00000008 hash_sprites 00001cd0 g F .text 000000d8 activate_override -000033f4 g F .text 00000044 before_game_state_update -000040b0 g F .text 00000048 store_scarecrow_fix -00004320 g F .text 00000028 set_triforce_render +00003470 g F .text 00000044 before_game_state_update +0000412c g F .text 00000048 store_scarecrow_fix +0000439c g F .text 00000028 set_triforce_render 0000005c g O .sdata 00000004 a_note_r 00000000 *UND* 00000000 CFG_C_NOTE_COLOR 00000000 *UND* 00000000 OUTGOING_PLAYER 00001edc g F .text 00000040 push_delayed_item -000031dc g F .text 00000030 slingshot_upgrade +00003258 g F .text 00000030 slingshot_upgrade 00000644 g F .text 000004d0 draw_dpad 00000010 g O .sbss 00000004 cfg_file_select_hash -00004088 g F .text 00000028 health_and_magic_refill +00004104 g F .text 00000028 health_and_magic_refill 00000048 g O .sbss 00000001 pending_freezes 00002e1c g F .text 00000008 no_effect -000041cc g F .text 00000154 text_flush +00004248 g F .text 00000154 text_flush 00000000 *UND* 00000000 CFG_RAINBOW_SWORD_INNER_ENABLED 0000008a g O .sdata 00000002 triforce_pieces_requied 00000190 g O .data 00000010 medals_sprite 000014bc g F .text 00000064 interpolate -000031b4 g F .text 00000028 bow_upgrade +00003230 g F .text 00000028 bow_upgrade 00000034 g F .text 00000034 agony_vibrate_setup 00002040 g F .text 0000006c after_item_received -00003140 g F .text 00000008 no_upgrade -000032ec g F .text 0000001c arrows_to_rupee +000031bc g F .text 00000008 no_upgrade +00003368 g F .text 0000001c arrows_to_rupee 00000038 g O .sdata 00000004 a_note_font_glow_max 00000038 g O .sbss 00000008 active_override 00000000 *UND* 00000000 INCOMING_ITEM 00000060 g O .sdata 00000004 c_button 00000004 g O .sdata 00000004 dungeon_count 00002f68 g F .text 00000014 give_dungeon_item -00003254 g F .text 0000001c nut_upgrade +000032d0 g F .text 0000001c nut_upgrade 00001e7c g F .text 00000060 push_coop_item 0000000c g O .sdata 00000004 scene_fog_distance 00000218 g F .text 0000009c get_chest_override_size -00003920 g F .text 0000002c models_reset +0000399c g F .text 0000002c models_reset 00000000 g F .text 00000008 agony_inside_radius_setup 00000170 g O .data 00000010 quest_items_sprite 00001f50 g F .text 00000088 after_key_received -00004890 g F .text 0000003c heap_alloc +0000490c g F .text 0000003c heap_alloc 00000030 g O .sbss 00000004 active_item_row -00003438 g F .text 0000003c after_game_state_update +000034b4 g F .text 0000003c after_game_state_update 00000000 *UND* 00000000 NO_FOG_STATE 00000b14 g F .text 000009a8 draw_dungeon_info -00003474 g F .text 0000002c after_scene_init +000034f0 g F .text 0000002c after_scene_init 00000000 *UND* 00000000 FONT_TEXTURE 00000000 *UND* 00000000 OCARINAS_SHUFFLED 00002284 g F .text 0000010c get_item @@ -163,7 +163,7 @@ SYMBOL TABLE: 00000008 g F .text 0000002c agony_outside_radius_setup 00001df4 g F .text 00000028 set_outgoing_override 00000024 g O .sbss 00000004 active_item_object_id -0000320c g F .text 00000030 wallet_upgrade +00003288 g F .text 00000030 wallet_upgrade 0000001c g O .sbss 00000004 active_item_fast_chest 0000004c g O .sdata 00000004 c_note_g 000017c8 g F .text 00000224 draw_file_select_hash @@ -172,38 +172,39 @@ SYMBOL TABLE: 00002718 g F .text 000000f8 sprite_draw 00002f24 g F .text 0000000c give_biggoron_sword 000024b0 g F .text 00000070 give_sarias_gift -00003a4c g F .text 00000088 small_key_draw +00003ac8 g F .text 00000088 small_key_draw 00000030 g O .sdata 00000004 c_note_glow_max -000039e8 g F .text 00000064 heart_piece_draw +00003a64 g F .text 00000064 heart_piece_draw 00002578 g F .text 000001a0 sprite_load 000001a0 g O .data 00000010 stones_sprite 00000000 *UND* 00000000 OUTGOING_KEY 000000c4 g O .data 00000014 extern_ctxt -00003308 g F .text 0000001c bombs_to_rupee +00003384 g F .text 0000001c bombs_to_rupee 00000020 g O .sdata 00000004 text_cursor_inner_max 00000054 g O .sdata 00000004 a_note_b 00000118 g O .data 00000028 setup_db -00003634 g F .text 00000060 get_object +000036b0 g F .text 00000060 get_object 00002e30 g F .text 000000bc give_triforce_piece 000001bc g O .data 00000fdc item_table 00000160 g O .data 00000010 font_sprite 00000018 g O .sbss 00000001 satisified_pending_frames -000036e0 g F .text 00000068 scale_top_matrix +0000375c g F .text 00000068 scale_top_matrix 00001fd8 g F .text 00000068 pop_ice_trap 00002548 g F .text 00000030 sprite_bytes 00000050 g O .sdata 00000004 c_note_r 00000000 *UND* 00000000 CFG_C_BUTTON_COLOR -00003188 g F .text 0000002c bomb_bag_upgrade -0000328c g F .text 00000010 magic_upgrade -0000315c g F .text 0000002c strength_upgrade +00003204 g F .text 0000002c bomb_bag_upgrade +00003308 g F .text 00000010 magic_upgrade +000031d8 g F .text 0000002c strength_upgrade +0000307c g F .text 0000007c open_mask_shop 00000008 g O .sbss 00000004 cfg_dungeon_info_mq_need_map -0000360c g F .text 00000028 load_object -000032cc g F .text 00000020 ocarina_upgrade -000030b8 g F .text 0000005c resolve_upgrades +00003688 g F .text 00000028 load_object +00003348 g F .text 00000020 ocarina_upgrade +00003134 g F .text 0000005c resolve_upgrades 00000000 *UND* 00000000 CFG_A_NOTE_COLOR 00000074 g O .sdata 00000004 normal_no_dd 00000064 g O .sdata 00000004 b_button -00003d88 g F .text 00000064 bowling_heart_piece_draw +00003e04 g F .text 00000064 bowling_heart_piece_draw 00002810 g F .text 0000016c gfx_init 0000007c g O .sdata 00000006 defaultDDHeart 00000028 g O .rodata 00000042 freecam_modes @@ -211,36 +212,37 @@ SYMBOL TABLE: 00000048 g O .sdata 00000004 c_note_b 00002390 g F .text 00000120 get_skulltula_token 00002d88 g F .text 00000014 push_pending_ice_trap -00003ce4 g F .text 000000a4 bowling_bomb_bag_draw +00003d60 g F .text 000000a4 bowling_bomb_bag_draw 00000070 g O .sdata 00000004 beating_dd 00000000 g O .bss 0000000e cfg_dungeon_is_mq 00000068 g F .text 0000014c draw_agony_graphic -00003324 g F .text 00000024 seeds_to_rupee +000033a0 g F .text 00000024 seeds_to_rupee 00002ff8 g F .text 0000000c give_fairy_ocarina -000039a8 g F .text 00000040 lookup_model +00003a24 g F .text 00000040 lookup_model +0000004a g O .sbss 00000001 OPEN_KAKARIKO 00000028 g O .data 0000009c dungeons 00000014 g O .data 00000012 medal_colors 00000040 g O .sbss 00000004 dummy_actor 00000024 g O .sdata 00000004 text_cursor_inner_base -00004124 g F .text 000000a8 text_print -0000394c g F .text 0000005c lookup_model_by_override +000041a0 g F .text 000000a8 text_print +000039c8 g F .text 0000005c lookup_model_by_override 00000034 g O .sdata 00000004 c_note_glow_base 00002eec g F .text 00000038 give_tycoon_wallet 0000001c g O .sdata 00000004 text_cursor_border_base 00000044 g O .sbss 00000004 item_overrides_count 0000217c g F .text 00000108 handle_pending_items -0000329c g F .text 00000030 bombchu_upgrade -00003844 g F .text 00000090 draw_model +00003318 g F .text 00000030 bombchu_upgrade +000038c0 g F .text 00000090 draw_model 00003038 g F .text 00000018 give_bean_pack 00003004 g F .text 00000018 give_song 00000008 g O .sdata 00000004 last_fog_distance 00000084 g O .sdata 00000006 defaultHeart 00000058 g O .sdata 00000004 a_note_g -000033b8 g F .text 0000003c c_init +00003434 g F .text 0000003c c_init 00000140 g O .data 00000010 triforce_sprite 00000000 *UND* 00000000 EXTERN_DAMAGE_MULTIPLYER -00000049 g O .sbss 00000001 MAX_RUPEES -00003c00 g F .text 000000e4 item_etcetera_draw +0000004b g O .sbss 00000001 MAX_RUPEES +00003c7c g F .text 000000e4 item_etcetera_draw 00000000 *UND* 00000000 SPEED_MULTIPLIER 0000002c g O .sbss 00000004 active_item_action_id 000020ac g F .text 000000d0 try_pending_item @@ -249,21 +251,22 @@ SYMBOL TABLE: 00000004 g O .data 0000000e cfg_dungeon_rewards 00000000 *UND* 00000000 TRIFORCE_ICON_TEXTURE 0000301c g F .text 0000001c ice_trap_effect -000034a0 g F .text 00000100 c_equipment_menu_slot_filled +0000351c g F .text 00000100 c_equipment_menu_slot_filled 00002f30 g F .text 00000038 give_bottle 00001be0 g F .text 000000a4 lookup_override_by_key -000035a0 g F .text 0000006c load_object_file -00003748 g F .text 00000080 draw_model_low_level +0000361c g F .text 0000006c load_object_file +000037c4 g F .text 00000080 draw_model_low_level 00000000 *UND* 00000000 OUTGOING_ITEM 00000010 g O .bss 00000018 pending_item_queue -00003b38 g F .text 00000064 skull_token_draw +00000049 g O .sbss 00000001 COMPLETE_MASK_QUEST +00003bb4 g F .text 00000064 skull_token_draw 00000000 *UND* 00000000 CFG_TEXT_CURSOR_COLOR 000000d8 g O .data 00000040 hash_symbols 00001520 g F .text 00000018 extern_scene_init -00003694 g F .text 0000004c set_object_segment +00003710 g F .text 0000004c set_object_segment 000001b4 g F .text 00000064 draw_agony -0000487c g F .text 00000014 heap_init -00003ad4 g F .text 00000064 heart_container_draw +000048f8 g F .text 00000014 heap_init +00003b50 g F .text 00000064 heart_container_draw 00001028 g O .bss 00000040 object_slots 00002f7c g F .text 00000020 give_small_key 00000004 g O .sbss 00000004 cfg_dungeon_info_reward_need_compass @@ -276,14 +279,14 @@ SYMBOL TABLE: 00001f1c g F .text 00000034 pop_pending_item 00000000 *UND* 00000000 CFG_A_BUTTON_COLOR 00002520 g F .text 00000028 sprite_bytes_per_tile -0000307c g F .text 0000003c get_item_row -000048cc g F .text 00000044 file_init +000030f8 g F .text 0000003c get_item_row +00004948 g F .text 00000044 file_init 000001b0 g O .data 0000000c rupee_colors 00000000 *UND* 00000000 EXTENDED_OBJECT_TABLE -00004348 g F .text 00000534 draw_triforce_count +000043c4 g F .text 00000534 draw_triforce_count 00000000 *UND* 00000000 PLAYER_NAME_ID 00000000 g O .sbss 00000004 cfg_dungeon_info_reward_need_altar 00000000 g O .sdata 00000004 cfg_dungeon_info_enable -000038d4 g F .text 0000004c models_init +00003950 g F .text 0000004c models_init diff --git a/ASM/c/item_effects.c b/ASM/c/item_effects.c index beca908ba..cfe5e15ec 100644 --- a/ASM/c/item_effects.c +++ b/ASM/c/item_effects.c @@ -111,3 +111,19 @@ void fill_wallet_upgrade(z64_file_t *save, int16_t arg1, int16_t arg2) { if(MAX_RUPEES) save->rupees = rupee_cap[arg1]; } + +uint8_t OPEN_KAKARIKO = 0; +uint8_t COMPLETE_MASK_QUEST = 0; +void open_mask_shop(z64_file_t *save, int16_t arg1, int16_t arg2) { + if (OPEN_KAKARIKO) { + save->inf_table[7] = save->inf_table[7] | 0x40; // "Spoke to Gate Guard About Mask Shop" + if (!COMPLETE_MASK_QUEST) { + save->item_get_inf[2] = save->item_get_inf[2] & 0xFB87; // Unset "Obtained Mask" flags just in case of savewarp before Impa. + } + } + if (COMPLETE_MASK_QUEST) { + save->inf_table[7] = save->inf_table[7] | 0x80; // "Soldier Wears Keaton Mask" + save->item_get_inf[3] = save->item_get_inf[3] | 0x8F00; // "Sold Masks & Unlocked Masks" / "Obtained Mask of Truth" + save->event_chk_inf[8] = save->event_chk_inf[8] | 0xF000; // "Paid Back Mask Fees" + } +} diff --git a/ASM/c/item_effects.h b/ASM/c/item_effects.h index 8e0e8e07a..55bcff8bf 100644 --- a/ASM/c/item_effects.h +++ b/ASM/c/item_effects.h @@ -21,5 +21,6 @@ void give_song(z64_file_t *save, int16_t quest_bit, int16_t arg2); void ice_trap_effect(z64_file_t *save, int16_t arg1, int16_t arg2); void give_bean_pack(z64_file_t *save, int16_t arg1, int16_t arg2); void fill_wallet_upgrade(z64_file_t *save, int16_t arg1, int16_t arg2); +void open_mask_shop(z64_file_t *save, int16_t arg1, int16_t arg2); #endif diff --git a/ASM/c/item_table.c b/ASM/c/item_table.c index 888db471b..199fedf02 100644 --- a/ASM/c/item_table.c +++ b/ASM/c/item_table.c @@ -48,7 +48,7 @@ item_row_t item_table[] = { [0x08] = ITEM_ROW(0x53, 0, 0x0A, 0x0036, 0x00DD, 0x2D, no_upgrade, no_effect, -1, -1), // Hookshot [0x09] = ITEM_ROW(0x53, 0, 0x0B, 0x004F, 0x00DD, 0x2E, no_upgrade, no_effect, -1, -1), // Longshot [0x0A] = ITEM_ROW(0x53, 0, 0x0F, 0x0039, 0x00EA, 0x36, no_upgrade, no_effect, -1, -1), // Lens of Truth - [0x0B] = ITEM_ROW(0x53, 0, 0x23, 0x0069, 0x00EF, 0x3B, no_upgrade, no_effect, -1, -1), // Zelda's Letter + [0x0B] = ITEM_ROW(0x53, 0, 0x23, 0x0069, 0x00EF, 0x3B, no_upgrade, open_mask_shop, -1, -1), // Zelda's Letter [0x0C] = ITEM_ROW(0x53, 0, 0x08, 0x003A, 0x00DE, 0x2F, no_upgrade, no_effect, -1, -1), // Ocarina of Time [0x0D] = ITEM_ROW(0x53, 0, 0x11, 0x0038, 0x00F6, 0x41, no_upgrade, no_effect, -1, -1), // Megaton Hammer [0x0E] = ITEM_ROW(0x53, 0, 0x2F, 0x0002, 0x0109, 0x5E, no_upgrade, no_effect, -1, -1), // Cojiro diff --git a/ASM/rom_diff.py b/ASM/rom_diff.py old mode 100644 new mode 100755 diff --git a/Cosmetics.py b/Cosmetics.py index 176bb6c04..b730d326f 100644 --- a/Cosmetics.py +++ b/Cosmetics.py @@ -855,7 +855,8 @@ def cosmetics_output(self): for key, value in self.sfx.items(): output += format_string.format(key=key+':', value=value, width=padding) - if self.settings.background_music == 'random' or self.settings.fanfares == 'random': + if self.settings.background_music == 'random' or self.settings.fanfares == 'random' or \ + self.settings.compress_rom != 'Patch' and (self.settings.background_music == 'random_custom_only' or self.settings.fanfares == 'random_custom_only'): #music_padding = 1 + len(max(self.bgm.keys(), key=len)) music_padding = 40 output += '\n\nBackground Music:\n' diff --git a/HintList.py b/HintList.py index ccbbd2504..8d8ecb3c6 100644 --- a/HintList.py +++ b/HintList.py @@ -51,11 +51,6 @@ def getHintGroup(group, world): ret = [] for name in hintTable: - # Some hints have a confusing text in the scope of grotto entrance shuffle so we exclude them - if world.shuffle_grotto_entrances: - if name == 'HC GS Storms Grotto' or name == 'HF GS Cow Grotto': - continue - hint = getHint(name, world.clearer_hints) if hint.name in world.always_hints: @@ -77,15 +72,16 @@ def getRequiredHints(world): # Hints required under certain settings conditional_always = { - 'Market 10 Big Poes': lambda world: world.big_poe_count > 3, - 'Deku Theater Skull Mask': lambda world: world.hint_dist == 'tournament', - 'Song from Ocarina of Time': lambda world: world.bridge not in ('stones', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_stones', 'lacs_dungeons'), - 'HF Ocarina of Time Item': lambda world: world.bridge not in ('stones', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_stones', 'lacs_dungeons'), - 'Sheik in Kakariko': lambda world: world.bridge not in ('medallions', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_medallions', 'lacs_dungeons'), - 'DMT Biggoron': lambda world: world.logic_earliest_adult_trade != 'claim_check' or world.logic_latest_adult_trade != 'claim_check', - 'Kak 50 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 50, - 'Kak 40 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 40, - 'Kak 30 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 30, + 'Market 10 Big Poes': lambda world: world.big_poe_count > 3, + 'Deku Theater Skull Mask': lambda world: world.hint_dist == 'tournament' and world.open_kakariko == 'closed', + 'Deku Theater Mask of Truth': lambda world: not world.complete_mask_quest, + 'Song from Ocarina of Time': lambda world: world.bridge not in ('stones', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_stones', 'lacs_dungeons'), + 'HF Ocarina of Time Item': lambda world: world.bridge not in ('stones', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_stones', 'lacs_dungeons'), + 'Sheik in Kakariko': lambda world: world.bridge not in ('medallions', 'dungeons') and world.shuffle_ganon_bosskey not in ('lacs_medallions', 'lacs_dungeons'), + 'DMT Biggoron': lambda world: world.logic_earliest_adult_trade != 'claim_check' or world.logic_latest_adult_trade != 'claim_check', + 'Kak 50 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 50, + 'Kak 40 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 40, + 'Kak 30 Gold Skulltula Reward': lambda world: world.bridge != 'tokens' or world.bridge_tokens < 30, } @@ -138,7 +134,7 @@ def getRequiredHints(world): 'Nocturne of Shadow': (["a song of spooky spirits", "a graveyard boogie", "a haunted hymn", "a purple spark trail"], "the Nocturne of Shadow", 'item'), 'Prelude of Light': (["a luminous prologue melody", "a yellow spark trail", "the temple traveler"], "the Prelude of Light", 'item'), 'Bottle': (["a glass container", "an empty jar", "encased air"], "a Bottle", 'item'), - 'Ruto\'s Letter': (["a call for help", "the note that Mweeps", "an SOS call", "a fishy stationery"], "Ruto's Letter", 'item'), + 'Rutos Letter': (["a call for help", "the note that Mweeps", "an SOS call", "a fishy stationery"], "Ruto's Letter", 'item'), 'Bottle with Milk': (["cow juice", "a white liquid", "a baby's breakfast"], "a Milk Bottle", 'item'), 'Bottle with Red Potion': (["a vitality vial", "a red liquid"], "a Red Potion Bottle", 'item'), 'Bottle with Green Potion': (["a magic mixture", "a green liquid"], "a Green Potion Bottle", 'item'), @@ -202,29 +198,20 @@ def getRequiredHints(world): 'Deku Seeds (30)': (["catapult ammo", "lots-o-seeds"], "Deku Seeds (30 pieces)", 'item'), 'Gold Skulltula Token': (["proof of destruction", "an arachnid chip", "spider remains", "one percent of a curse"], "a Gold Skulltula Token", 'item'), - 'Deku Theater Mask of Truth': ("the #Mask of Truth# yields", None, 'always'), + 'Deku Theater Mask of Truth': ("the #Mask of Truth# yields", None, ['overworld', 'sometimes']), 'ZR Frogs Ocarina Game': (["an #amphibian feast# yields", "the #croaking choir's magnum opus# awards", "the #froggy finale# yields"], "the final reward from the #Frogs of Zora's River# is", 'always'), + 'KF Links House Cow': ("the #bovine bounty of a horseback hustle# gifts", "#Malon's obstacle course# leads to", 'always'), 'Song from Ocarina of Time': ("the #Ocarina of Time# teaches", None, ['song', 'sometimes']), - 'Song from Composers Grave': (["in the #Composers' Grave#, ReDead guard", "the #Composer Brothers# wrote"], None, ['song', 'sometimes']), - 'Sheik in Forest': ("deep in #the forest# Sheik teaches", None, ['song', 'sometimes']), + 'Song from Composers Grave': (["#ReDead in the Composers' Grave# guard", "the #Composer Brothers wrote#"], None, ['song', 'sometimes']), + 'Sheik in Forest': ("#in a meadow# Sheik teaches", None, ['song', 'sometimes']), 'Sheik at Temple': ("Sheik waits at a #monument to time# to teach", None, ['song', 'sometimes']), 'Sheik in Crater': ("the #crater's melody# is", None, ['song', 'sometimes']), 'Sheik in Ice Cavern': ("the #frozen cavern# echoes with", None, ['song', 'sometimes']), 'Sheik in Kakariko': ("a #ravaged village# mourns with", None, ['song', 'sometimes']), - 'Sheik at Colossus': ("a hero ventures beyond #the Wasteland# to learn", None, ['song', 'sometimes']), - - 'LH Child Fishing': ("#fishing in youth# bestows", None, 'minigame'), - 'LH Adult Fishing': ("#fishing in maturity# bestows", None, 'minigame'), - 'Market Shooting Gallery': ("#shooting in youth# grants", None, 'minigame'), - 'Kak Shooting Gallery': ("#shooting in maturity# grants", None, ['minigame', 'sometimes']), - 'Market Bombchu Bowling First Prize': ("the #first explosive prize# is", None, 'minigame'), - 'Market Bombchu Bowling Second Prize': ("the #second explosive prize# is", None, 'minigame'), - 'Market Treasure Chest Game': (["#gambling# grants", "there is a #1/32 chance# to win"], "the #treasure chest game# grants", ['minigame', 'sometimes']), - 'GF HBA 1500 Points': ("mastery of #horseback archery# grants", "scoring 1500 in #horseback archery# grants", ['minigame', 'sometimes']), - 'KF Links House Cow': ("the #bovine bounty of a horseback hustle# gifts", None, ['minigame', 'sometimes']), - - 'Market 10 Big Poes': (["#Big Poes# leads to", "#ghost hunters# will be rewarded with"], None, ['overworld', 'sometimes']), + 'Sheik at Colossus': ("a hero ventures #beyond the wasteland# to learn", None, ['song', 'sometimes']), + + 'Market 10 Big Poes': ("#ghost hunters# will be rewarded with", "catching #Big Poes# leads to", ['overworld', 'sometimes']), 'Deku Theater Skull Mask': ("the #Skull Mask# yields", None, ['overworld', 'sometimes']), 'HF Ocarina of Time Item': ("the #treasure thrown by Princess Zelda# is", None, ['overworld', 'sometimes']), 'DMT Biggoron': ("#Biggoron# crafts", None, ['overworld', 'sometimes']), @@ -232,72 +219,78 @@ def getRequiredHints(world): 'Kak 40 Gold Skulltula Reward': ("slaying #40 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']), 'Kak 30 Gold Skulltula Reward': ("slaying #30 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']), 'Kak 20 Gold Skulltula Reward': ("slaying #20 Gold Skulltulas# reveals", None, ['overworld', 'sometimes']), - 'Kak Anju as Child': ("#collecting cuccos# rewards", None, 'sometimes'), + 'Kak Anju as Child': ("#collecting cuccos# rewards", None, ['overworld', 'sometimes']), 'GC Darunias Joy': ("#Darunia's dance# leads to", None, ['overworld', 'sometimes']), - 'LW Skull Kid': ("the #Lost Woods Skull Kid# grants", None, ['overworld', 'sometimes']), + 'LW Skull Kid': ("the #Skull Kid# grants", None, ['overworld', 'sometimes']), 'LH Sun': ("staring into #the sun# grants", "shooting #the sun# grants", ['overworld', 'sometimes']), + 'Market Treasure Chest Game Reward': (["#gambling# grants", "there is a #1/32 chance# to win"], "the #treasure chest game# grants", ['overworld', 'sometimes']), + 'GF HBA 1500 Points': ("mastery of #horseback archery# grants", "scoring 1500 in #horseback archery# grants", ['overworld', 'sometimes']), 'Graveyard Heart Piece Grave Chest': ("playing #Sun's Song# in a grave spawns", None, ['overworld', 'sometimes']), 'GC Maze Left Chest': ("in #Goron City# the hammer unlocks", None, ['overworld', 'sometimes']), 'GV Chest': ("in #Gerudo Valley# the hammer unlocks", None, ['overworld', 'sometimes']), - 'HC GS Storms Grotto': ("a #storm near the castle# reveals", None, ['overworld', 'sometimes']), - 'HF GS Cow Grotto': ("buried near #the valley# a spider holds", None, ['overworld', 'sometimes']), - 'ZF GS Hidden Cave': ("a spider high above the #icy waters# holds", None, ['overworld', 'sometimes']), - 'Wasteland Chest': (["deep in the #Wasteland# is", "beneath #the sands#, flames reveal"], None, ['overworld', 'sometimes']), - 'Wasteland GS': ("a #spider in the Wasteland# hold", None, ['overworld', 'sometimes']), - 'Graveyard Composers Grave Chest': (["in the #Composers' Grave#, darkness hides", "the #Composer Brothers# hid"], None, ['overworld', 'sometimes']), - 'ZF Bottom Freestanding PoH': ("under the #icy waters# lies", None, ['overworld', 'sometimes']), + 'GV Cow': ("a #cow in Gerudo Valley# gifts", None, ['overworld', 'sometimes']), + 'HC GS Storms Grotto': ("a #spider behind a muddy wall# in a grotto holds", None, ['overworld', 'sometimes']), + 'HF GS Cow Grotto': ("a #spider behind webs# in a grotto holds", None, ['overworld', 'sometimes']), + 'HF Cow Grotto Cow': ("a #cow behind webs# in a grotto gifts", None, ['overworld', 'sometimes']), + 'GS Zora\'s Fountain Hidden Cave': ("a spider high #above the icy waters# holds", None, ['overworld', 'sometimes']), + 'Wasteland Chest': (["#deep in the wasteland# is", "beneath #the sands#, flames reveal"], None, ['overworld', 'sometimes']), + 'Colossus GS Bean Patch': ("a #spider in the wasteland# holds", None, ['overworld', 'sometimes']), + 'Graveyard Composers Grave Chest': (["#flames in the Composers' Grave# reveal", "the #Composer Brothers hid#"], None, ['overworld', 'sometimes']), + 'ZF Bottom Freestanding PoH': ("#under the icy waters# lies", None, ['overworld', 'sometimes']), 'GC Pot Freestanding PoH': ("spinning #Goron pottery# contains", None, ['overworld', 'sometimes']), 'ZD King Zora Thawed': ("unfreezing #King Zora# grants", None, ['overworld', 'sometimes']), - 'DMC Deku Scrub': ("in the Crater a #scrub# sells", None, ['overworld', 'sometimes']), - - 'Deku Tree MQ After Spinning Log Chest': ("within #a tree#, a temporal stone contains", None, ['dungeon', 'sometimes']), - 'Deku Tree MQ GS Basement Graves Room': ("within #a tree#, a spider on the ceiling holds", None, ['dungeon', 'sometimes']), - 'Jabu Jabus Belly Boomerang Chest': ("in the #belly of a deity#, a school of stingers guard", None, 'sometimes'), - 'Jabu Jabus Belly MQ GS Invisible Enemies Room': ("in the #belly of a deity#, a spider surrounded by shadows holds", None, ['dungeon', 'sometimes']), - 'Forest Temple Floormaster Chest': ("deep in #the forest#, shadows guard a chest containing", "a Floormaster in #Forest Temple# guards", ['dungeon', 'sometimes']), - 'Fire Temple Scarecrow Chest': ("high in the #Fire Temple#, Pierre hid", None, ['dungeon', 'sometimes']), - 'Fire Temple Megaton Hammer Chest': ("high in the #Fire Temple#, Flare Dancers hid", None, ['dungeon', 'sometimes']), - 'Fire Temple MQ Chest On Fire': ("high in the #Fire Temple#, Flare Dancers hid", None, ['dungeon', 'sometimes']), - 'Fire Temple MQ GS Above Fire Wall Maze': ("high in the #Fire Temple#, a spider holds", None, ['dungeon', 'sometimes']), - 'Water Temple River Chest': ("deep under #the lake#, beyond the currents, hides", "the #Water Temple River Chest# holds", ['dungeon', 'sometimes']), - 'Water Temple Boss Key Chest': ("deep under #the lake#, the gilded chest contains", "the #Water Temple Gilded Chest# holds", ['dungeon', 'sometimes']), - 'Water Temple MQ Boss Key Chest': ("deep under #the lake#, the gilded chest contains", "the #Water Temple Gilded Chest# holds", ['dungeon', 'sometimes']), - 'Water Temple MQ Freestanding Key': ("deep under #the lake#, the apparent key is really", None, ['dungeon', 'sometimes']), - 'Water Temple MQ GS Freestanding Key Area': ("deep under #the lake#, the locked spider holds", None, ['dungeon', 'sometimes']), + 'DMC Deku Scrub': ("a single #scrub in the crater# sells", None, ['overworld', 'sometimes']), + 'GC GS Boulder Maze': ("a spider under a #crate in the crater# holds", None, ['overworld', 'sometimes']), + + 'Deku Tree MQ After Spinning Log Chest': ("a #temporal stone within a tree# contains", "a #temporal stone within the Deku Tree# contains", ['dungeon', 'sometimes']), + 'Deku Tree MQ GS Basement Graves Room': ("a #spider on a ceiling in a tree# holds", "a #spider on a ceiling in the Deku Tree# holds", ['dungeon', 'sometimes']), + 'GS Dodongo\'s Cavern MQ Song of Time Block Room': ("a spider under #temporal stones in a cavern# holds", "a spider under #temporal stones in Dodongo's Cavern# holds", ['dungeon', 'sometimes']), + 'Jabu Jabus Belly Boomerang Chest': ("a school of #stingers swallowed by a deity# guard", "a school of #stingers swallowed by Jabu Jabu# guard", ['dungeon', 'sometimes']), + 'Jabu Jabus Belly MQ GS Invisible Enemies Room': ("a spider surrounded by #shadows in the belly of a deity# holds", "a spider surrounded by #shadows in Jabu Jabu's Belly# holds", ['dungeon', 'sometimes']), + 'Jabu Jabus Belly MQ Cow': ("a #cow swallowed by a deity# gifts", "a #cow swallowed by Jabu Jabu# gifts", ['dungeon', 'sometimes']), + 'Fire Temple Scarecrow Chest': ("a #scarecrow atop the volcano# hides", "#Pierre atop the Fire Temple# hides", ['dungeon', 'sometimes']), + 'Fire Temple Megaton Hammer Chest': ("the #Flare Dancer atop the volcano# guards a chest containing", "the #Flare Dancer atop the Fire Temple# guards a chest containing", ['dungeon', 'sometimes']), + 'Fire Temple MQ Chest On Fire': ("the #Flare Dancer atop the volcano# guards a chest containing", "the #Flare Dancer atop the Fire Temple# guards a chest containing", ['dungeon', 'sometimes']), + 'Fire Temple MQ GS Skull On Fire': ("a #spider under a block in the volcano# holds", "a #spider under a block in the Fire Temple# holds", ['dungeon', 'sometimes']), + 'Water Temple River Chest': ("beyond the #river under the lake# waits", "beyond the #river in the Water Temple# waits", ['dungeon', 'sometimes']), + 'Water Temple Boss Key Chest': ("dodging #rolling boulders under the lake# leads to", "dodging #rolling boulders in the Water Temple# leads to", ['dungeon', 'sometimes']), + 'Water Temple GS Behind Gate': ("a spider behind a #gate under the lake# holds", "a spider behind a #gate in the Water Temple# holds", ['dungeon', 'sometimes']), + 'Water Temple MQ Freestanding Key': ("hidden in a #box under the lake# lies", "hidden in a #box in the Water Temple# lies", ['dungeon', 'sometimes']), + 'Water Temple MQ GS Freestanding Key Area': ("the #locked spider under the lake# holds", "the #locked spider in the Water Temple# holds", ['dungeon', 'sometimes']), + 'Water Temple MQ GS Triple Wall Torch': ("a spider behind a #gate under the lake# holds", "a spider behind a #gate in the Water Temple# holds", ['dungeon', 'sometimes']), 'Gerudo Training Grounds Underwater Silver Rupee Chest': ("those who seek #sunken silver rupees# will find", None, ['dungeon', 'sometimes']), 'Gerudo Training Grounds MQ Underwater Silver Rupee Chest': ("those who seek #sunken silver rupees# will find", None, ['dungeon', 'sometimes']), 'Gerudo Training Grounds Maze Path Final Chest': ("the final prize of #the thieves\' training# is", None, ['dungeon', 'sometimes']), 'Gerudo Training Grounds MQ Ice Arrows Chest': ("the final prize of #the thieves\' training# is", None, ['dungeon', 'sometimes']), - 'Bottom of the Well Lens of Truth Chest': ("#Dead Hand# holds", "#Dead Hand# in the well holds", ['dungeon', 'sometimes']), - 'Bottom of the Well MQ Compass Chest': ("#Dead Hand# holds", "#Dead Hand# in the well holds", ['dungeon', 'sometimes']), + 'Bottom of the Well Lens of Truth Chest': ("#Dead Hand in the well# holds", None, ['dungeon', 'sometimes']), + 'Bottom of the Well MQ Compass Chest': ("#Dead Hand in the well# holds", None, ['dungeon', 'sometimes']), 'Spirit Temple Silver Gauntlets Chest': ("upon the #Colossus's right hand# is", None, ['dungeon', 'sometimes']), 'Spirit Temple Mirror Shield Chest': ("upon the #Colossus's left hand# is", None, ['dungeon', 'sometimes']), - 'Spirit Temple MQ Child Hammer Switch Chest': ("within #the Colossus# a temporal paradox yields", None, ['dungeon', 'sometimes']), - 'Spirit Temple MQ Symphony Room Chest': ("within #the Colossus# a symphony yields", None, ['dungeon', 'sometimes']), - 'Spirit Temple MQ GS Symphony Room': ("within #the Colossus# a spider's symphony yields", None, ['dungeon', 'sometimes']), - 'Shadow Temple Invisible Floormaster Chest': (["shadows in an #invisible maze# guard", "after a free #boat ride# comes"], None, ['dungeon', 'sometimes']), - 'Shadow Temple MQ Bomb Flower Chest': (["shadows in an #invisible maze# guard", "after a free #boat ride# comes"], None, ['dungeon', 'sometimes']), - - 'Desert Colossus -> Colossus Grotto': ("lifting a rock in #the desert# reveals", None, 'entrance'), - 'Gerudo Valley -> GV Octorok Grotto': ("on #a ledge in the valley#, a silver rock hides", None, 'entrance'), + 'Spirit Temple MQ Child Hammer Switch Chest': ("a #temporal paradox in the Colossus# yields", "a #temporal paradox in the Spirit Temple# yields", ['dungeon', 'sometimes']), + 'Spirit Temple MQ Symphony Room Chest': ("a #symphony in the Colossus# yields", "a #symphony in the Spirit Temple# yields", ['dungeon', 'sometimes']), + 'Spirit Temple MQ GS Symphony Room': ("a #spider's symphony in the Colossus# yields", "a #spider's symphony in the Spirit Temple# yields", ['dungeon', 'sometimes']), + 'Shadow Temple Invisible Floormaster Chest': ("shadows in an #invisible maze# guard", None, ['dungeon', 'sometimes']), + 'Shadow Temple MQ Bomb Flower Chest': ("shadows in an #invisible maze# guard", None, ['dungeon', 'sometimes']), + + 'Desert Colossus -> Colossus Grotto': ("lifting a #rock in the desert# reveals", None, 'entrance'), + 'Gerudo Valley -> GV Octorok Grotto': ("a rock on #a ledge in the valley# hides", None, 'entrance'), 'Goron City -> GC Grotto': ("a #pool of lava# in Goron City blocks the way to", None, 'entrance'), 'Gerudo Fortress -> GF Storms Grotto': ("a #storm within Gerudo's Fortress# reveals", None, 'entrance'), 'Zoras Domain -> ZD Storms Grotto': ("a #storm within Zora's Domain# reveals", None, 'entrance'), 'Hyrule Castle Grounds -> HC Storms Grotto': ("a #storm near the castle# reveals", None, 'entrance'), - 'Desert Colossus -> Colossus Great Fairy Fountain': ("a fractured wall #in the desert# hides", None, 'entrance'), - 'Ganons Castle Grounds -> OGC Great Fairy Fountain': ("a heavy pillar #outside the castle# obstructs", None, 'entrance'), - 'DMC Lower Nearby -> DMC Great Fairy Fountain': ("using a hammer #in the Crater# opens the path to", None, 'entrance'), - 'Zoras Fountain -> ZF Great Fairy Fountain': ("a particular wall in #Zora's Fountain# hides", None, 'entrance'), + 'GV Fortress Side -> GV Storms Grotto': ("a #storm in the valley# reveals", None, 'entrance'), + 'Desert Colossus -> Colossus Great Fairy Fountain': ("a #fractured desert wall# hides", None, 'entrance'), + 'Ganons Castle Grounds -> OGC Great Fairy Fountain': ("a #heavy pillar# outside the castle obstructs", None, 'entrance'), + 'Zoras Fountain -> ZF Great Fairy Fountain': ("a #fountain wall# hides", None, 'entrance'), 'GV Fortress Side -> GV Carpenter Tent': ("a #tent in the valley# covers", None, 'entrance'), - 'Graveyard Warp Pad Region -> Shadow Temple Entryway': ("at the back of #the Graveyard#, there is", None, 'entrance'), + 'Graveyard Warp Pad Region -> Shadow Temple Entryway': ("at the #back of the Graveyard#, there is", None, 'entrance'), 'Lake Hylia -> Water Temple Lobby': ("deep #under a vast lake#, one can find", None, 'entrance'), - 'Sacred Forest Meadow -> Forest Temple Lobby': ("deep #within the Meadow#, one can find", None, 'entrance'), - 'Gerudo Fortress -> Gerudo Training Grounds Lobby': ("paying a fee #within Gerudo's Fortress# grants access to", None, 'entrance'), - 'Zoras Fountain -> Ice Cavern Beginning': ("in #a frozen fountain#, an opening leads to", None, 'entrance'), + 'Gerudo Fortress -> Gerudo Training Grounds Lobby': ("paying a #fee to the Gerudos# grants access to", None, 'entrance'), 'Zoras Fountain -> Jabu Jabus Belly Beginning': ("inside #Jabu Jabu#, one can find", None, 'entrance'), + 'Kakariko Village -> Bottom of the Well': ("a #village well# leads to", None, 'entrance'), 'KF Links House': ("Link's House", None, 'region'), - 'Temple of Time': ("Temple of Time", None, 'region'), + 'Temple of Time': ("the #Temple of Time#", None, 'region'), 'KF Midos House': ("Mido's house", None, 'region'), 'KF Sarias House': ("Saria's House", None, 'region'), 'KF House of Twins': ("the #House of Twins#", None, 'region'), @@ -305,17 +298,17 @@ def getRequiredHints(world): 'KF Kokiri Shop': ("the #Kokiri Shop#", None, 'region'), 'LH Lab': ("the #Lakeside Laboratory#", None, 'region'), 'LH Fishing Hole': ("the #Fishing Pond#", None, 'region'), - 'GV Carpenter Tent': ("Carpenters' tent", None, 'region'), + 'GV Carpenter Tent': ("the #Carpenters' tent#", None, 'region'), 'Market Guard House': ("the #Guard House#", None, 'region'), 'Market Mask Shop': ("the #Happy Mask Shop#", None, 'region'), - 'Market Bombchu Bowling': ("the #Bombchu Bowling#", None, 'region'), + 'Market Bombchu Bowling': ("the #Bombchu Bowling Alley#", None, 'region'), 'Market Potion Shop': ("the #Market Potion Shop#", None, 'region'), 'Market Treasure Chest Game': ("the #Treasure Chest Game#", None, 'region'), 'Market Bombchu Shop': ("the #Bombchu Shop#", None, 'region'), 'Market Man in Green House': ("Man in Green's House", None, 'region'), 'Kak Windmill': ("the #Windmill#", None, 'region'), 'Kak Carpenter Boss House': ("the #Carpenters' Boss House#", None, 'region'), - 'Kak House of Skulltula': ("the #Kak House of Skulltulas#", None, 'region'), + 'Kak House of Skulltula': ("the #House of Skulltula#", None, 'region'), 'Kak Impas House': ("Impa's House", None, 'region'), 'Kak Impas House Back': ("Impa's cow cage", None, 'region'), 'Kak Odd Medicine Building': ("Granny's Potion Shop", None, 'region'), @@ -380,7 +373,6 @@ def getRequiredHints(world): '1003': ("They say that Zelda is a poor leader.", None, 'junk'), '1004': ("These hints can be quite useful. This is an exception.", None, 'junk'), '1006': ("They say that all the Zora drowned in Wind Waker.", None, 'junk'), - '1007': ("They say that PJ64 is a terrible emulator.", None, 'junk'), '1008': ("'Member when Ganon was a blue pig?^I 'member.", None, 'junk'), '1009': ("One who does not have Triforce can't go in.", None, 'junk'), '1010': ("Save your future, end the Happy Mask Salesman.", None, 'junk'), @@ -506,7 +498,6 @@ def hintExclusions(world, clear_cache=False): if any(item in hint.type for item in ['always', 'sometimes', - 'minigame', 'overworld', 'dungeon', 'song']): diff --git a/Hints.py b/Hints.py index c4067311c..0d7b85311 100644 --- a/Hints.py +++ b/Hints.py @@ -399,10 +399,6 @@ def get_song_hint(spoiler, world, checked): return get_specific_hint(spoiler, world, checked, 'song') -def get_minigame_hint(spoiler, world, checked): - return get_specific_hint(spoiler, world, checked, 'minigame') - - def get_overworld_hint(spoiler, world, checked): return get_specific_hint(spoiler, world, checked, 'overworld') @@ -463,7 +459,6 @@ def get_junk_hint(spoiler, world, checked): 'item': get_good_item_hint, 'sometimes':get_sometimes_hint, 'song': get_song_hint, - 'minigame': get_minigame_hint, 'ow': get_overworld_hint, 'dungeon': get_dungeon_hint, 'entrance': get_entrance_hint, @@ -483,7 +478,6 @@ def get_junk_hint(spoiler, world, checked): 'barren': (0.0, 0), 'item': (0.0, 0), 'song': (0.0, 0), - 'minigame': (0.0, 0), 'ow': (0.0, 0), 'dungeon': (0.0, 0), 'entrance': (0.0, 0), @@ -497,7 +491,6 @@ def get_junk_hint(spoiler, world, checked): 'barren': (2.0, 1), 'item': (5.0, 1), 'song': (1.0, 1), - 'minigame': (0.5, 1), 'ow': (2.0, 1), 'dungeon': (1.5, 1), 'entrance': (3.0, 1), @@ -511,7 +504,6 @@ def get_junk_hint(spoiler, world, checked): 'barren': (3.0, 1), 'item': (1.0, 1), 'song': (0.33, 1), - 'minigame': (0.33, 1), 'ow': (0.66, 1), 'dungeon': (0.66, 1), 'entrance': (1.0, 1), @@ -525,7 +517,6 @@ def get_junk_hint(spoiler, world, checked): 'barren': (3.0, 1), 'item': (1.0, 1), 'song': (0.5, 1), - 'minigame': (0.5, 1), 'ow': (1.5, 1), 'dungeon': (1.5, 1), 'entrance': (2.0, 1), diff --git a/ItemList.py b/ItemList.py index bdc406870..85fef5ff8 100644 --- a/ItemList.py +++ b/ItemList.py @@ -13,7 +13,7 @@ 'Cojiro': ('Item', True, 0x0E, None), 'Bottle': ('Item', True, 0x0F, {'bottle': float('Inf')}), 'Bottle with Milk': ('Item', True, 0x14, {'bottle': float('Inf')}), - 'Ruto\'s Letter': ('Item', True, 0x15, None), + 'Rutos Letter': ('Item', True, 0x15, None), 'Deliver Letter': ('Item', True, None, {'bottle': float('Inf')}), 'Sell Big Poe': ('Item', True, None, {'bottle': float('Inf')}), 'Magic Bean': ('Item', True, 0x16, None), @@ -139,7 +139,7 @@ 'Double Defense': ('Item', True, 0xB8, None), 'Magic Bean Pack': ('Item', True, 0xC9, None), 'Triforce Piece': ('Item', True, 0xCA, {'progressive': float('Inf')}), - 'Zeldas Letter': ('Item', True, None, None), + 'Zeldas Letter': ('Item', True, 0x0B, None), 'Time Travel': ('Event', True, None, None), 'Scarecrow Song': ('Event', True, None, None), 'Triforce': ('Event', True, None, None), diff --git a/ItemPool.py b/ItemPool.py index 1af97d43a..0613b9c8d 100755 --- a/ItemPool.py +++ b/ItemPool.py @@ -6,6 +6,7 @@ from Item import ItemFactory from ItemList import item_table from LocationList import location_groups +from decimal import Decimal, ROUND_HALF_UP #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. @@ -121,10 +122,10 @@ } TriforceCounts = { - 'plentiful': 2.00, - 'balanced': 1.50, - 'scarce': 1.25, - 'minimal': 1.00, + 'plentiful': Decimal(2.00), + 'balanced': Decimal(1.50), + 'scarce': Decimal(1.25), + 'minimal': Decimal(1.00), } DT_vanilla = ( @@ -475,9 +476,8 @@ fixedlocations = { 'Ganon': 'Triforce', - 'HC Zeldas Letter': 'Zeldas Letter', 'Pierre': 'Scarecrow Song', - 'Deliver Ruto\'s Letter': 'Deliver Letter', + 'Deliver Rutos Letter': 'Deliver Letter', 'Master Sword Pedestal': 'Time Travel', 'Market Bombchu Bowling Bombchus': 'Bombchu Drop', 'Wasteland Bombchu Salesman': 'Bombchus', @@ -803,7 +803,9 @@ def collect_heart_container(world, pool): def get_pool_core(world): pool = [] - placed_items = {} + placed_items = { + 'HC Zeldas Letter': 'Zeldas Letter', + } if world.shuffle_kokiri_sword: pool.append('Kokiri Sword') @@ -823,6 +825,8 @@ def get_pool_core(world): if world.shuffle_ocarinas: pool.extend(['Ocarina'] * 2) + if world.item_pool_value == 'plentiful': + pending_junk_pool.append('Ocarina') else: placed_items['LW Gift from Saria'] = 'Ocarina' placed_items['HF Ocarina of Time Item'] = 'Ocarina' @@ -845,6 +849,8 @@ def get_pool_core(world): if world.shuffle_beans: if world.distribution.get_starting_item('Magic Bean') < 10: pool.append('Magic Bean Pack') + if world.item_pool_value == 'plentiful': + pending_junk_pool.append('Magic Bean Pack') else: pool.extend(get_junk_item()) else: @@ -1042,6 +1048,8 @@ def get_pool_core(world): placed_items['GF South F2 Carpenter'] = 'Recovery Heart' else: pool.extend(['Small Key (Gerudo Fortress)'] * 4) + if world.item_pool_value == 'plentiful': + pending_junk_pool.append('Small Key (Gerudo Fortress)') else: if world.gerudo_fortress == 'fast': placed_items['GF North F1 Carpenter'] = 'Small Key (Gerudo Fortress)' @@ -1061,6 +1069,28 @@ def get_pool_core(world): placed_items['GF Gerudo Membership Card'] = 'Ice Trap' else: placed_items['GF Gerudo Membership Card'] = 'Gerudo Membership Card' + if world.shuffle_gerudo_card and world.item_pool_value == 'plentiful': + pending_junk_pool.append('Gerudo Membership Card') + + if world.item_pool_value == 'plentiful' and world.shuffle_smallkeys == 'keysanity': + pending_junk_pool.append('Small Key (Bottom of the Well)') + pending_junk_pool.append('Small Key (Forest Temple)') + pending_junk_pool.append('Small Key (Fire Temple)') + pending_junk_pool.append('Small Key (Water Temple)') + pending_junk_pool.append('Small Key (Shadow Temple)') + pending_junk_pool.append('Small Key (Spirit Temple)') + pending_junk_pool.append('Small Key (Gerudo Training Grounds)') + pending_junk_pool.append('Small Key (Ganons Castle)') + + if world.item_pool_value == 'plentiful' and world.shuffle_bosskeys == 'keysanity': + pending_junk_pool.append('Boss Key (Forest Temple)') + pending_junk_pool.append('Boss Key (Fire Temple)') + pending_junk_pool.append('Boss Key (Water Temple)') + pending_junk_pool.append('Boss Key (Shadow Temple)') + pending_junk_pool.append('Boss Key (Spirit Temple)') + + if world.item_pool_value == 'plentiful' and world.shuffle_ganon_bosskey == 'keysanity': + pending_junk_pool.append('Boss Key (Ganons Castle)') if world.shopsanity == 'off': placed_items.update(vanilla_shop_items) @@ -1177,7 +1207,7 @@ def get_pool_core(world): bottle = random.choice(normal_bottles) pool.append(bottle) else: - pool.append('Ruto\'s Letter') + pool.append('Rutos Letter') earliest_trade = tradeitemoptions.index(world.logic_earliest_adult_trade) latest_trade = tradeitemoptions.index(world.logic_latest_adult_trade) @@ -1188,6 +1218,9 @@ def get_pool_core(world): pool.append(tradeitem) pool.extend(songlist) + if world.shuffle_song_items and world.item_pool_value == 'plentiful': + pending_junk_pool.extend(songlist) + if world.free_scarecrow: world.state.collect(ItemFactory('Scarecrow Song')) @@ -1251,7 +1284,7 @@ def get_pool_core(world): world.state.collect(ItemFactory('Small Key (Water Temple)')) if world.triforce_hunt: - triforce_count = int(round(world.triforce_goal_per_world * TriforceCounts[world.item_pool_value])) + triforce_count = int((TriforceCounts[world.item_pool_value] * world.triforce_goal_per_world).to_integral_value(rounding=ROUND_HALF_UP)) pending_junk_pool.extend(['Triforce Piece'] * triforce_count) if world.shuffle_ganon_bosskey in ['lacs_vanilla', 'lacs_medallions', 'lacs_stones', 'lacs_dungeons']: diff --git a/LocationList.py b/LocationList.py index c99d1222f..fac09da7e 100755 --- a/LocationList.py +++ b/LocationList.py @@ -51,7 +51,7 @@ def shop_address(shop_id, shelf_id): "LW Near Shortcuts Grotto Chest": ("Chest", 0x3E, 0x14, None, ("the Lost Woods", "Forest", "Grottos")), "DMT Storms Grotto Chest": ("Chest", 0x3E, 0x17, None, ("Death Mountain Trail", "Death Mountain", "Grottos")), "DMC Upper Grotto Chest": ("Chest", 0x3E, 0x1A, None, ("Death Mountain Crater", "Death Mountain", "Grottos")), - "Market Treasure Chest Game": ("Chest", 0x10, 0x0A, None, ("the Market", "Market", "Minigames")), + "Market Treasure Chest Game Reward": ("Chest", 0x10, 0x0A, None, ("the Market", "Market", "Minigames")), "ToT Light Arrows Cutscene": ("Cutscene", 0xFF, 0x01, None, ("Temple of Time", "Market",)), "LW Gift from Saria": ("Cutscene", 0xFF, 0x02, None, ("the Lost Woods", "Forest",)), @@ -76,7 +76,7 @@ def shop_address(shop_id, shelf_id): "Song from Windmill": ("Song", 0xFF, 0x2B, (0x0E42C07, 0x0E42B8B), ("Kakariko Village", "Kakariko", "Songs")), "HC Malon Egg": ("NPC", 0x5F, 0x47, None, ("Hyrule Castle", "Market",)), - "HC Zeldas Letter": ("NPC", None, None, None, ("Hyrule Castle", "Market",)), + "HC Zeldas Letter": ("NPC", 0x4A, 0x0B, None, ("Hyrule Castle", "Market",)), "GC Darunias Joy": ("NPC", 0x62, 0x54, None, ("Goron City",)), "ZD Diving Minigame": ("NPC", 0x58, 0x37, None, ("Zora's Domain", "Minigames",)), "LH Child Fishing": ("NPC", 0x49, 0x3E, None, ("Lake Hylia", "Minigames",)), @@ -87,7 +87,7 @@ def shop_address(shop_id, shelf_id): "Market Bombchu Bowling First Prize": ("NPC", 0x4B, 0x34, None, ("the Market", "Market", "Minigames")), "Market Bombchu Bowling Second Prize": ("NPC", 0x4B, 0x3E, None, ("the Market", "Market", "Minigames")), "Market Bombchu Bowling Bombchus": ("NPC", 0x4B, None, None, ("the Market", "Market", "Minigames")), - "Market Dog Lady": ("NPC", 0x35, 0x3E, None, ("the Market", "Market",)), + "Market Lost Dog": ("NPC", 0x35, 0x3E, None, ("the Market", "Market",)), "LW Skull Kid": ("NPC", 0x5B, 0x3E, None, ("the Lost Woods", "Forest",)), "LW Ocarina Memory Game": ("NPC", 0x5B, 0x76, None, ("the Lost Woods", "Forest", "Minigames")), "Kak 10 Gold Skulltula Reward": ("NPC", 0x50, 0x45, None, ("Kakariko Village", "Kakariko", "Skulltula House")), @@ -101,8 +101,8 @@ def shop_address(shop_id, shelf_id): "ZR Frogs in the Rain": ("NPC", 0x54, 0x3E, None, ("Zora's River", "Minigames",)), "GF HBA 1000 Points": ("NPC", 0x5D, 0x3E, None, ("Gerudo's Fortress", "Gerudo", "Minigames")), "GF HBA 1500 Points": ("NPC", 0x5D, 0x30, None, ("Gerudo's Fortress", "Gerudo", "Minigames")), - "Market Shooting Gallery": ("NPC", 0x42, 0x60, None, ("the Market", "Market", "Minigames")), - "Kak Shooting Gallery": ("NPC", 0x42, 0x30, None, ("Kakariko Village", "Kakariko", "Minigames")), + "Market Shooting Gallery Reward": ("NPC", 0x42, 0x60, None, ("the Market", "Market", "Minigames")), + "Kak Shooting Gallery Reward": ("NPC", 0x42, 0x30, None, ("Kakariko Village", "Kakariko", "Minigames")), "LW Target in Woods": ("NPC", 0x5B, 0x60, None, ("the Lost Woods", "Forest",)), "Deku Theater Skull Mask": ("NPC", 0x3E, 0x77, None, ("the Lost Woods", "Forest", "Grottos")), "Deku Theater Mask of Truth": ("NPC", 0x3E, 0x7A, None, ("the Lost Woods", "Forest", "Need Spiritual Stones", "Grottos")), @@ -143,7 +143,7 @@ def shop_address(shop_id, shelf_id): "GF South F2 Carpenter": ("Collectable", 0x0C, 0x0F, None, ("Gerudo's Fortress", "Gerudo",)), "Pierre": ("Event", None, None, None, None), - "Deliver Ruto's Letter": ("Event", None, None, None, None), + "Deliver Rutos Letter": ("Event", None, None, None, None), "Master Sword Pedestal": ("Event", None, None, None, None), "Deku Baba Sticks": ("Drop", None, None, None, None), diff --git a/Messages.py b/Messages.py index 2d70f032e..9aa8e5373 100644 --- a/Messages.py +++ b/Messages.py @@ -861,9 +861,13 @@ def is_exempt(m): GOSSIP_STONE_MESSAGES + TEMPLE_HINTS_MESSAGES + LIGHT_ARROW_HINT + list(KEYSANITY_MESSAGES.keys()) + shuffle_messages.shop_item_messages ) + shuffle_exempt = [ + 0x208D, # "One more lap!" for Cow in House race. + ] is_hint = (except_hints and m.id in hint_ids) is_error_message = (m.id == ERROR_MESSAGE) - return (is_hint or is_error_message or m.is_id_message()) + is_shuffle_exempt = (m.id in shuffle_exempt) + return (is_hint or is_error_message or m.is_id_message() or is_shuffle_exempt) have_goto = list( filter(lambda m: not is_exempt(m) and m.has_goto, messages) ) have_keep_open = list( filter(lambda m: not is_exempt(m) and m.has_keep_open, messages) ) diff --git a/Music.py b/Music.py index 288d0a11e..cf29bb70a 100644 --- a/Music.py +++ b/Music.py @@ -157,6 +157,8 @@ def process_sequences(rom, sequences, target_sequences, ids, seq_type = 'bgm'): def shuffle_music(sequences, target_sequences, log): # Shuffle the sequences + if len(sequences) < len(target_sequences): + raise Exception("Not enough custom music/fanfares to omit base Ocarina of Time sequences.") random.shuffle(sequences) for i in range(len(target_sequences)): @@ -332,12 +334,16 @@ def randomize_music(rom, settings): # If not creating patch file, shuffle audio sequences. Otherwise, shuffle pointer table if settings.compress_rom != 'Patch': - if settings.background_music == 'random': + if settings.background_music in ['random', 'random_custom_only']: sequences, target_sequences = process_sequences(rom, sequences, target_sequences, bgm_sequence_ids) + if settings.background_music == 'random_custom_only': + sequences = [seq for seq in sequences if seq.cosmetic_name not in [x[0] for x in bgm_sequence_ids]] sequences, log = shuffle_music(sequences, target_sequences, log) - if settings.fanfares == 'random': + if settings.fanfares in ['random', 'random_custom_only']: fanfare_sequences, fanfare_target_sequences = process_sequences(rom, fanfare_sequences, fanfare_target_sequences, ff_ids, 'fanfare') + if settings.fanfares == 'random_custom_only': + fanfare_sequences = [seq for seq in fanfare_sequences if seq.cosmetic_name not in [x[0] for x in fanfare_sequence_ids]] fanfare_sequences, log = shuffle_music(fanfare_sequences, fanfare_target_sequences, log) log = rebuild_sequences(rom, sequences + fanfare_sequences, log) diff --git a/Patches.py b/Patches.py index a58c88c91..4fffda6e6 100755 --- a/Patches.py +++ b/Patches.py @@ -1007,7 +1007,17 @@ def set_entrance_updates(entrances): rom.write_int16(0x00E1F3CC, 0x5036) # Make the Kakariko Gate not open with the MS - rom.write_int32(0xDD3538, 0x34190000) # li t9, 0 + if world.open_kakariko != 'open': + rom.write_int32(0xDD3538, 0x34190000) # li t9, 0 + if world.open_kakariko == 'closed': + rom.write_byte(rom.sym('OPEN_KAKARIKO'), 0) + else: + rom.write_byte(rom.sym('OPEN_KAKARIKO'), 1) + + if world.complete_mask_quest: + rom.write_byte(rom.sym('COMPLETE_MASK_QUEST'), 1) + else: + rom.write_byte(rom.sym('COMPLETE_MASK_QUEST'), 0) if world.zora_fountain == 'open': save_context.write_bits(0x0EDB, 0x08) # "Moved King Zora" @@ -1995,7 +2005,7 @@ def create_fake_name(name): # keeping the game E... new_name = ''.join(list_name) - censor = ['cum', 'cunt', 'dike', 'penis', 'puss', 'shit'] + censor = ['cum', 'cunt', 'dike', 'penis', 'puss', 'rape', 'shit'] new_name_az = re.sub(r'[^a-zA-Z]', '', new_name.lower(), re.UNICODE) for cuss in censor: if cuss in new_name_az: diff --git a/Plandomizer.py b/Plandomizer.py index e13637ed8..8c0c22446 100755 --- a/Plandomizer.py +++ b/Plandomizer.py @@ -887,9 +887,9 @@ def populate_starting_items_from_settings(self): if not item.special: data[item.itemname] += 1 else: - if item.itemname == 'Ruto\'s Letter' and self.settings.zora_fountain != 'open': - data['Ruto\'s Letter'] = 1 - elif item.itemname in ['Bottle', 'Ruto\'s Letter']: + if item.itemname == 'Rutos Letter' and self.settings.zora_fountain != 'open': + data['Rutos Letter'] = 1 + elif item.itemname in ['Bottle', 'Rutos Letter']: data['Bottle'] += 1 else: raise KeyError("invalid special item: {}".format(item.itemname)) diff --git a/README.md b/README.md index 9b2ca6d6e..52426bf90 100644 --- a/README.md +++ b/README.md @@ -97,12 +97,19 @@ player. * Shadow Temples are split into two separate areas for these tricks. * Glitchless logic now requires Lens (or an appropriate trick) for some checks, particularly in Shadow Temple. * Glitched logic may sometimes assume you can do something without lens regardless of trick settings. +* New setting `Kakariko Gate` + * Allows configuring how the Kakariko Gate and the Happy Mask Shop will open. + * Default (vanilla) behavior requires showing Zelda's Letter to the guard to open the gate and the shop. + * You can configure the gate to be always open or to open automatically upon obtaining the Letter. Both of these options will also open the Happy Mask Shop upon obtaining the Letter. +* New setting `Complete Mask Quest` + * Marks all the mask sales complete so that the shop has all masks available to borrow as soon as it opens. * New cosmetic setting `HUD Button Colors` * The buttons shown on the HUD can be colored to match the N64 or Gamecube color scheme, of OoT or MM. * Or you can completely randomize all the button colors. * New cosmetic setting `Item Model Colors Match Cosmetics` * Freestanding models like heart containers, gauntlets, and heart/magic drops will match their respective color settings. * Tunics are not affected, in order to keep freestanding tunics recognizable. +* Added options to `Background Music` and `Fanfares` for randomly selecting only from [custom music](https://wiki.ootrandomizer.com/index.php?title=Readme#Custom_Music_and_Fanfares). * Tricks can be filtered in the GUI using a new dropdown. #### Bug Fixes @@ -113,14 +120,20 @@ player. * Closed Forest implies starting as child. * Triforce Hunt won't accidentally place the Boss Key for Ganon's Castle. * Fix a rare issue in ER with using time-passing regions to gain new access. +* Fix a rare issue where settings strings weren't allocated enough bits. +* Fix some locations and regions sharing names. * The seed generator can now retry a few times in case of failure. +* Exclude a line from text shuffle so the Malon race is completable. * Minor plandomizer fixes and improvements. +* Various logic fixes. #### Other Changes * Most locations and a few items have been renamed to improve spoiler output and standardize. * This will break settings and distribution files from previous versions that reference these locations and items. +* In-game hints overhaul. * File 3 has been removed from generated ROMs to free up some space. * The Zora Sapphire in Jabu Jabu's Big Octo room is now the actual dungeon reward. +* The number of Triforces available in Triforce Hunt now rounds to the nearest whole number instead of the nearest whole **even** number. * Performance improvements to seed generation. * Updated development n64 compilation process to use latest available toolchain. * Added decompressor source and updated Decompress binaries. diff --git a/SaveContext.py b/SaveContext.py index 37c9fd7d0..efdbe8f16 100755 --- a/SaveContext.py +++ b/SaveContext.py @@ -765,7 +765,7 @@ def get_save_context_addresses(self): "Bottle with Fairy" : 'fairy', "Bottle with Fish" : 'fish', "Bottle with Milk" : 'milk', - "Ruto\'s Letter" : 'letter', + "Rutos Letter" : 'letter', "Bottle with Blue Fire" : 'blue_fire', "Bottle with Bugs" : 'bug', "Bottle with Big Poe" : 'big_poe', diff --git a/SettingsList.py b/SettingsList.py index 0bb3d3b9b..9c86a867b 100755 --- a/SettingsList.py +++ b/SettingsList.py @@ -74,6 +74,9 @@ def __init__(self, name, type, gui_text, gui_type, shared, choices, default=None def calc_bitwidth(self, choices): count = len(choices) if count > 0: + if self.type == list: + # Need two special values for terminating additive and subtractive lists + count = count + 2 return math.ceil(math.log(count, 2)) return 0 @@ -548,7 +551,7 @@ def __init__(self, name, gui_text, min, max, default, step=1, You can jump off an Armos Statue to reach the alcove with the Gold Skulltula. It takes quite a long time to pull the statue the entire way. - The jump to the alcove can be a pit picky when + The jump to the alcove can be a bit picky when done as child. '''}, 'Kakariko Tower GS with Jump Slash': { @@ -1121,33 +1124,33 @@ def __init__(self, name, gui_text, min, max, default, step=1, Removes the requirements for the Lens of Truth in Jabu MQ. '''}, - 'Shadow Temple MQ before Huge Pit without Lens of Truth': { + 'Shadow Temple MQ before Invisible Moving Platform without Lens of Truth': { 'name' : 'logic_lens_shadow_mq', 'tags' : ("Lens of Truth","Shadow Temple",), 'tooltip' : '''\ Removes the requirements for the Lens of Truth - in Shadow Temple MQ before the Huge Pit room. + in Shadow Temple MQ before the invisible moving platform. '''}, - 'Shadow Temple MQ beyond Huge Pit without Lens of Truth': { + 'Shadow Temple MQ beyond Invisible Moving Platform without Lens of Truth': { 'name' : 'logic_lens_shadow_mq_back', 'tags' : ("Lens of Truth","Shadow Temple",), 'tooltip' : '''\ Removes the requirements for the Lens of Truth - in Shadow Temple MQ beyond the Huge Pit room. + in Shadow Temple MQ beyond the invisible moving platform. '''}, - 'Shadow Temple before Huge Pit without Lens of Truth': { + 'Shadow Temple before Invisible Moving Platform without Lens of Truth': { 'name' : 'logic_lens_shadow', 'tags' : ("Lens of Truth","Shadow Temple",), 'tooltip' : '''\ Removes the requirements for the Lens of Truth - in Shadow Temple before the Huge Pit room. + in Shadow Temple before the invisible moving platform. '''}, - 'Shadow Temple beyond Huge Pit without Lens of Truth': { + 'Shadow Temple beyond Invisible Moving Platform without Lens of Truth': { 'name' : 'logic_lens_shadow_back', 'tags' : ("Lens of Truth","Shadow Temple",), 'tooltip' : '''\ Removes the requirements for the Lens of Truth - in Shadow Temple beyond the Huge Pit room. + in Shadow Temple beyond the invisible moving platform. '''}, 'Spirit Temple MQ without Lens of Truth': { 'name' : 'logic_lens_spirit_mq', @@ -1544,6 +1547,37 @@ def __init__(self, name, gui_text, min, max, default, step=1, ], }, ), + Combobox( + name = 'open_kakariko', + gui_text = 'Kakariko Gate', + default = 'closed', + choices = { + 'open': 'Open Gate', + 'zelda': "Zelda's Letter Opens Gate", + 'closed': 'Closed Gate', + }, + gui_tooltip = '''\ + This changes the behavior of the Kakariko Gate to + Death Mountain Trail as child. The gate is always + open as adult. + + "Open Gate": The gate is always open instead of + needing Zelda's Letter. The Happy Mask Shop opens + upon obtaining Zelda's Letter without needing to + show it to the guard. + + "Zelda's Letter Opens Gate": The gate is closed at + the start, but opens automatically along with the + Happy Mask Shop upon obtaining Zelda's Letter. + + "Closed": The gate and the Happy Mask Shop both remain closed + until showing Zelda's Letter to the guard in Kakariko. + ''', + shared = True, + gui_params = { + 'randomize_key': 'randomize_settings', + }, + ), Checkbutton( name = 'open_door_of_time', gui_text = 'Open Door of Time', @@ -1885,6 +1919,15 @@ def __init__(self, name, gui_text, min, max, default, step=1, ''', shared = True, ), + Checkbutton( + name = 'complete_mask_quest', + gui_text = 'Complete Mask Quest', + gui_tooltip = '''\ + Once the Happy Mask Shop is opened, + all masks will be available to be borrowed. + ''', + shared = True, + ), Checkbutton( name = 'fast_chests', gui_text = 'Fast Chest Cutscenes', @@ -2898,9 +2941,10 @@ def __init__(self, name, gui_text, min, max, default, step=1, gui_text = 'Background Music', default = 'normal', choices = { - 'normal': 'Normal', - 'off': 'No Music', - 'random': 'Random', + 'normal': 'Normal', + 'off': 'No Music', + 'random': 'Random', + 'random_custom_only': 'Random (Custom Only)', }, gui_tooltip = '''\ 'No Music': No background music is played. @@ -2920,9 +2964,10 @@ def __init__(self, name, gui_text, min, max, default, step=1, gui_text = 'Fanfares', default = 'normal', choices = { - 'normal': 'Normal', - 'off': 'No Fanfares', - 'random': 'Random', + 'normal': 'Normal', + 'off': 'No Fanfares', + 'random': 'Random', + 'random_custom_only': 'Random (Custom Only)', }, disable = { 'normal' : {'settings' : ['ocarina_fanfares']}, diff --git a/StartingItems.py b/StartingItems.py index 7c7816b63..c2894f020 100644 --- a/StartingItems.py +++ b/StartingItems.py @@ -42,7 +42,7 @@ def _entry(settingname, itemname=None, available=1, guitext=None, special=False, _entry('light_arrow', 'Light Arrows'), _entry('nayrus_love', 'Nayrus Love', guitext="Nayru's Love"), _entry('bottle', available=3, special=True), - _entry('letter', 'Ruto\'s Letter', special=True), + _entry('letter', 'Rutos Letter', guitext="Ruto's Letter", special=True), )) songs = dict(chain( diff --git a/State.py b/State.py index 04e6b6299..e1dfff817 100644 --- a/State.py +++ b/State.py @@ -66,7 +66,7 @@ def item_count(self, item): def has_bottle(self, **kwargs): # Extra Ruto's Letter are automatically emptied - return self.has_any_of(ItemInfo.bottles) or self.has('Ruto\'s Letter', 2) + return self.has_any_of(ItemInfo.bottles) or self.has('Rutos Letter', 2) def has_hearts(self, count): diff --git a/World.py b/World.py index c705bfc0c..3820858c5 100644 --- a/World.py +++ b/World.py @@ -125,7 +125,7 @@ def __init__(self, id, settings): max_tokens = t self.max_progressions['Gold Skulltula Token'] = max_tokens # Additional Ruto's Letter become Bottle, so we may have to collect two. - self.max_progressions['Ruto\'s Letter'] = 2 + self.max_progressions['Rutos Letter'] = 2 def copy(self): @@ -609,7 +609,7 @@ def update_useless_areas(self, spoiler): world_id = location.item.world.id item = location.item - if item.name == 'Ruto\'s Letter' and item.name in duplicate_item_woth[world_id]: + if item.name == 'Rutos Letter' and item.name in duplicate_item_woth[world_id]: # Only the first Letter counts as a letter, subsequent ones are Bottles. # It doesn't matter which one is considered bottle/letter, since they will # both we considered not useless. @@ -640,7 +640,7 @@ def update_useless_areas(self, spoiler): continue is_bottle = False - if item.name == 'Ruto\'s Letter' and item.name in duplicate_item_woth[world_id]: + if item.name == 'Rutos Letter' and item.name in duplicate_item_woth[world_id]: # If this is the required Letter then it is not useless dupe_locations = duplicate_item_woth[world_id][item.name] for dupe_location in dupe_locations: diff --git a/data/Glitched World/Overworld.json b/data/Glitched World/Overworld.json index 65c8ca4c7..5afdc8dc8 100644 --- a/data/Glitched World/Overworld.json +++ b/data/Glitched World/Overworld.json @@ -400,7 +400,7 @@ "Market Potion Shop": "is_child", "Market Treasure Chest Game": "is_child", "Market Bombchu Shop": "is_child", - "Market Market Dog Lady": "is_child", + "Market Dog Lady House": "is_child", "Market Man in Green House": "is_child" } }, @@ -508,17 +508,18 @@ { "region_name": "Market Mask Shop", "events": { - "Skull Mask": "at('Kakariko Village', is_child and Zeldas_Letter)", + "Skull Mask": "Zeldas_Letter and (complete_mask_quest or at('Kakariko Village', is_child))", "Mask of Truth": "'Skull Mask' and - at('Lost Woods', is_child and can_play(Sarias_Song)) and - at('Graveyard', is_child and at_day) and - at('Hyrule Field', is_child and Kokiri_Emerald and Goron_Ruby and Zora_Sapphire)" + (complete_mask_quest or + (at('Lost Woods', is_child and can_play(Sarias_Song)) and + at('Graveyard', is_child and at_day) and + at('Hyrule Field', is_child and has_all_stones)))" } }, { "region_name": "Market Shooting Gallery", "locations": { - "Market Shooting Gallery": "True" + "Market Shooting Gallery Reward": "True" } }, { @@ -545,7 +546,7 @@ { "region_name": "Market Treasure Chest Game", "locations": { - "Market Treasure Chest Game": "can_use(Lens_of_Truth)" + "Market Treasure Chest Game Reward": "can_use(Lens_of_Truth)" } }, { @@ -562,9 +563,9 @@ } }, { - "region_name": "Market Market Dog Lady", + "region_name": "Market Dog Lady House", "locations": { - "Market Dog Lady": "True" + "Market Lost Dog": "True" } }, { @@ -610,7 +611,7 @@ (Sticks or Kokiri_Sword or can_use(Dins_Fire)))", "Kak Open Grotto": "True", "Graveyard": "True", - "Death Mountain": "Zeldas_Letter or is_adult or can_hover" + "Death Mountain": "Zeldas_Letter or is_adult or open_kakariko == 'open' or can_hover" } }, { @@ -663,7 +664,7 @@ { "region_name": "Kak Shooting Gallery", "locations": { - "Kak Shooting Gallery": "can_use(Bow)" + "Kak Shooting Gallery Reward": "can_use(Bow)" } }, { @@ -1004,7 +1005,7 @@ "locations": { "ZD Diving Minigame": "is_child", "ZD Chest": "can_use(Sticks)", - "Deliver Ruto's Letter": "(is_child and Rutos_Letter) and zora_fountain != 'open'", + "Deliver Rutos Letter": "(is_child and Rutos_Letter) and zora_fountain != 'open'", "ZD King Zora Thawed": "is_adult", "ZD GS Frozen Waterfall": " is_adult and at_night and (Progressive_Hookshot or Bow or Magic_Meter or has_explosives or diff --git a/data/Glitched World/Spirit Temple.json b/data/Glitched World/Spirit Temple.json index e4be83319..6efa91eb0 100644 --- a/data/Glitched World/Spirit Temple.json +++ b/data/Glitched World/Spirit Temple.json @@ -1,5 +1,5 @@ -[ - { +[ + { "region_name": "Spirit Temple Lobby", "dungeon": "Spirit Temple", "exits": { @@ -61,7 +61,7 @@ "locations": { "Spirit Temple Compass Chest": "can_play(Zeldas_Lullaby) and (can_use(Hookshot) or can_hover) and has_projectile(either)", - "Spirit Temple Early Adult Right Chest": "has_projectile(either)", + "Spirit Temple Early Adult Right Chest": "has_projectile(either)", "Spirit Temple First Mirror Left Chest": "(Small_Key_Spirit_Temple, 2)", "Spirit Temple First Mirror Right Chest": "(Small_Key_Spirit_Temple, 2)", "Spirit Temple GS Boulder Room": "has_projectile(either) and @@ -143,7 +143,7 @@ "Spirit Temple Beyond Final Locked Door": "(Small_Key_Spirit_Temple,5) and (can_use(Hookshot) or has_explosives)", "Mirror Shield Hand": "True", - "Spirit Temple Central Chamber": "has_explosives" + "Spirit Temple Central Chamber": "has_explosives" } }, { @@ -153,7 +153,7 @@ "Spirit Temple Boss Key Chest": " can_play(Zeldas_Lullaby) and (can_live_dmg(1.0) or (Bow and Progressive_Hookshot))", - "Spirit Temple Topmost Chest": "Mirror_Shield" + "Spirit Temple Topmost Chest": "can_use(Mirror_Shield)" }, "exits": { "Spirit Temple Boss": "can_use(Mirror_Shield)", @@ -168,4 +168,4 @@ "Twinrova": "True" } } -] +] \ No newline at end of file diff --git a/data/World/Overworld.json b/data/World/Overworld.json index d2b9510e9..9c8c10d2b 100644 --- a/data/World/Overworld.json +++ b/data/World/Overworld.json @@ -580,7 +580,7 @@ "Market Potion Shop": "is_child and at_day", "Market Treasure Chest Game": "is_child and at_night", "Market Bombchu Shop": "is_child and at_night", - "Market Market Dog Lady": "is_child", + "Market Dog Lady House": "is_child", "Market Man in Green House": "is_child and at_night" } }, @@ -646,7 +646,7 @@ "Bug Rock": "has_bottle" }, "exits": { - "Market": "True", + "Castle Grounds": "True", "HC Garden": "Weird_Egg or (not shuffle_weird_egg)", "HC Great Fairy Fountain": "has_explosives", "HC Storms Grotto": "can_open_storm_grotto" @@ -729,11 +729,12 @@ { "region_name": "Market Mask Shop", "events": { - "Skull Mask": "at('Kakariko Village', is_child and Zeldas_Letter)", + "Skull Mask": "Zeldas_Letter and (complete_mask_quest or at('Kakariko Village', is_child))", "Mask of Truth": "'Skull Mask' and - at('Lost Woods', is_child and can_play(Sarias_Song)) and - at('Graveyard', is_child and at_day) and - at('Hyrule Field', is_child and has_all_stones)" + (complete_mask_quest or + (at('Lost Woods', is_child and can_play(Sarias_Song)) and + at('Graveyard', is_child and at_day) and + at('Hyrule Field', is_child and has_all_stones)))" }, "exits": { "Market": "True" @@ -742,7 +743,7 @@ { "region_name": "Market Shooting Gallery", "locations": { - "Market Shooting Gallery": "is_child" + "Market Shooting Gallery Reward": "is_child" }, "exits": { "Market": "True" @@ -778,7 +779,7 @@ { "region_name": "Market Treasure Chest Game", "locations": { - "Market Treasure Chest Game": "can_use(Lens_of_Truth)" + "Market Treasure Chest Game Reward": "can_use(Lens_of_Truth)" }, "exits": { "Market": "True" @@ -801,9 +802,9 @@ } }, { - "region_name": "Market Market Dog Lady", + "region_name": "Market Dog Lady House", "locations": { - "Market Dog Lady": "at_night" + "Market Lost Dog": "at_night" }, "exits": { "Market": "True" @@ -821,7 +822,7 @@ "hint": "Kakariko Village", "events": { "Cojiro Access": "is_adult and 'Wake Up Adult Talon'", - "Kakariko Village Gate Open": "is_child and Zeldas_Letter" + "Kakariko Village Gate Open": "is_child and (Zeldas_Letter or open_kakariko == 'open')" }, "locations": { "Sheik in Kakariko": " @@ -978,7 +979,7 @@ { "region_name": "Kak Shooting Gallery", "locations": { - "Kak Shooting Gallery": "is_adult and Bow" + "Kak Shooting Gallery Reward": "is_adult and Bow" }, "exits": { "Kakariko Village": "True" @@ -1116,7 +1117,7 @@ "scene": "Kakariko Village", "exits": { "Kakariko Village": " - is_adult or logic_visible_collisions or 'Kakariko Village Gate Open'", + is_adult or logic_visible_collisions or 'Kakariko Village Gate Open' or open_kakariko == 'open'", "Death Mountain": "True" } }, @@ -1499,7 +1500,7 @@ "locations": { "ZD Diving Minigame": "is_child", "ZD Chest": "can_use(Sticks)", - "Deliver Ruto's Letter": " + "Deliver Rutos Letter": " is_child and Rutos_Letter and zora_fountain != 'open'", "ZD King Zora Thawed": "'King Zora Thawed'", "ZD GS Frozen Waterfall": " diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt index bd006dd18..c16e02fa8 100644 --- a/data/generated/rom_patch.txt +++ b/data/generated/rom_patch.txt @@ -1,7 +1,7 @@ 10,107b72fa -14,d8ce07b2 +14,14313f2b d1b0,3480000 -d1b4,348c670 +d1b4,348c6e0 d1b8,3480000 d1c0,0 d1c4,0 @@ -186,8 +186,8 @@ d288,0 89ebe8,0 89ebec,0 89ebf0,0 -a88f78,c1019a2 -a89048,c1019bb +a88f78,c1019c1 +a89048,c1019da a98c30,c1003ba a9e838,8100683 ac7ad4,c10033a @@ -270,12 +270,12 @@ b06c2c,c1006d1 b06c30,a2280020 b12a34,c10054c b12a38,0 -b12a60,8101836 -b12e44,8101845 +b12a60,8101855 +b12e44,8101864 b17bb4,afbf001c b17bb8,afa40140 b17bbc,3c048040 -b17bc0,3406c670 +b17bc0,3406c6e0 b17bc4,c00037c b17bc8,3c050348 b17bcc,c10032d @@ -497,7 +497,7 @@ c89744,c1003c7 c89868,920e1d28 c898a4,92191d29 c898c8,920a1d2a -ca6dc0,81019dd +ca6dc0,81019fc ca6dc4,0 cb6874,c100593 cc0038,c100454 @@ -594,7 +594,7 @@ d7ec1c,0 d7ec20,34090005 db13d0,24090076 db532c,c100424 -db53e8,8101a0f +db53e8,8101a2e db53ec,0 dbf428,c10070d dbf434,44989000 @@ -611,7 +611,7 @@ dcbea8,3c014248 dcbf24,3c014248 dcbf30,3c014230 dcbf9c,3c014230 -de1018,c101a28 +de1018,c101a47 de101c,0 de1020,0 de1024,0 @@ -621,7 +621,7 @@ de1030,0 de1034,0 de1038,0 de103c,0 -de1050,8101a28 +de1050,8101a47 de1054,0 df2644,76 df7a90,340e0018 @@ -699,9 +699,9 @@ e565d4,0 e565d8,2002025 e59cd4,0 e59cd8,0 -e59e68,8101a61 +e59e68,8101a80 e59e6c,0 -e59ecc,8101a8a +e59ecc,8101aa9 e59ed0,0 e62630,a48001f8 e62634,2463a5d0 @@ -800,7 +800,7 @@ ec69c4,0 ec69c8,0 ec69cc,0 ec69d0,0 -ec6b04,81019f6 +ec6b04,8101a15 ec6b08,0 ec9ce4,2419007a ed2858,20180008 @@ -830,7 +830,7 @@ ef4f9c,0 26c10e0,38ff 3480000,80400020 3480004,80400834 -3480008,80407754 +3480008,804077cc 3480020,2 3480034,dfdfdfdf 3480038,dfdfdfdf @@ -1362,7 +1362,7 @@ ef4f9c,0 3480cac,1000000 3480cb4,27bdffe8 3480cb8,afbf0010 -3480cbc,c101816 +3480cbc,c101835 3480cc4,3c028012 3480cc8,2442d2a0 3480ccc,240e0140 @@ -1411,19 +1411,19 @@ ef4f9c,0 3480d7c,8100361 3480d80,87250004 3480d84,3c0a8041 -3480d88,254a88fc +3480d88,254a8974 3480d8c,8d4a0000 3480d90,11400004 3480d98,3c058041 -3480d9c,24a588f0 +3480d9c,24a58968 3480da0,8ca50000 3480da4,3e00008 3480dac,3c088041 -3480db0,250888fc +3480db0,25088974 3480db4,8d080000 3480db8,11000004 3480dc0,3c038041 -3480dc4,246388ec +3480dc4,24638964 3480dc8,8c630000 3480dcc,30fc3 3480dd0,614026 @@ -1436,12 +1436,12 @@ ef4f9c,0 3480df0,1500000c 3480df4,240bffff 3480df8,3c088041 -3480dfc,250888fc +3480dfc,25088974 3480e00,8d080000 3480e04,11000007 3480e08,1405821 3480e0c,3c088041 -3480e10,250888e8 +3480e10,25088960 3480e14,8d080000 3480e18,15000002 3480e1c,240bffff @@ -1457,31 +1457,31 @@ ef4f9c,0 3480e4c,3e00008 3480e54,90450003 3480e58,3c088041 -3480e5c,250888fc +3480e5c,25088974 3480e60,8d080000 3480e64,11000004 3480e6c,3c058041 -3480e70,24a588f4 +3480e70,24a5896c 3480e74,8ca50000 3480e78,3e00008 3480e80,27bdffe8 3480e84,afb00010 3480e88,afbf0014 3480e8c,3c088041 -3480e90,25088900 +3480e90,25088978 3480e94,8d080000 3480e98,31080001 3480e9c,1500000b 3480ea0,34100041 3480ea4,3c048041 -3480ea8,248488fc +3480ea8,24848974 3480eac,8c840000 3480eb0,10800006 3480eb4,90500000 3480eb8,3c088041 -3480ebc,250888f8 +3480ebc,25088970 3480ec0,8d100000 -3480ec4,c10176d +3480ec4,c10178c 3480ecc,c101338 3480ed4,2002821 3480ed8,8fb00010 @@ -1534,7 +1534,7 @@ ef4f9c,0 3480fa8,ac881d2c 3480fac,c1012df 3480fb0,1402021 -3480fb4,c101b4a +3480fb4,c101b69 3480fbc,8fbf0010 3480fc0,34020000 3480fc4,3e00008 @@ -1866,7 +1866,7 @@ ef4f9c,0 3481528,3e00008 3481530,27bdffe8 3481534,afbf0010 -3481538,c101825 +3481538,c101844 3481540,8fbf0010 3481544,27bd0018 3481548,8fae0018 @@ -1913,7 +1913,7 @@ ef4f9c,0 3481600,afbf0000 3481604,afa30004 3481608,afa40008 -348160c,c101850 +348160c,c10186f 3481614,8fbf0000 3481618,8fa30004 348161c,8fa40008 @@ -2173,7 +2173,7 @@ ef4f9c,0 3481ad4,24a50008 3481ad8,c015c0c 3481adc,24c6fff8 -3481ae0,c101b54 +3481ae0,c101b73 3481ae8,8fbf0010 3481aec,8fa70008 3481af0,8fa60004 @@ -2935,7 +2935,7 @@ ef4f9c,0 3482938,4800 3482940,7000 3482944,4800 -3482950,8040c670 +3482950,8040c6e0 3482954,42890 3482958,34191000 348295c,340a4800 @@ -3131,28 +3131,28 @@ ef4f9c,0 3482c98,3e00008 3482ca0,3e00008 3482ca8,3c028040 -3482cac,8c437690 +3482cac,8c437708 3482cb0,3c028040 -3482cb4,244275ca +3482cb4,24427646 3482cb8,14620004 3482cbc,3c038040 3482cc0,3c028040 -3482cc4,244275cc -3482cc8,ac627690 +3482cc4,24427648 +3482cc8,ac627708 3482ccc,3e00008 3482cd4,3c028040 -3482cd8,8c437690 +3482cd8,8c437708 3482cdc,3c028040 -3482ce0,244275b0 +3482ce0,2442762c 3482ce4,10620003 3482ce8,3c028040 3482cec,10000003 -3482cf0,244275d0 +3482cf0,2442764c 3482cf4,3c028040 -3482cf8,244275b2 +3482cf8,2442762e 3482cfc,3c038040 3482d00,3e00008 -3482d04,ac627690 +3482d04,ac627708 3482d08,27bdffc8 3482d0c,afbf0034 3482d10,afb30030 @@ -3177,7 +3177,7 @@ ef4f9c,0 3482d5c,3c04de00 3482d60,ac640000 3482d64,3c048040 -3482d68,248477a8 +3482d68,24847820 3482d6c,ac640004 3482d70,8e0302b0 3482d74,24640008 @@ -3210,7 +3210,7 @@ ef4f9c,0 3482de0,24070001 3482de4,24060009 3482de8,3c138040 -3482dec,26657800 +3482dec,26657878 3482df0,c101486 3482df4,2402025 3482df8,24020010 @@ -3220,7 +3220,7 @@ ef4f9c,0 3482e08,afa20010 3482e0c,2627001b 3482e10,3025 -3482e14,26657800 +3482e14,26657878 3482e18,c1014ee 3482e1c,2402025 3482e20,8e0202b0 @@ -3237,9 +3237,9 @@ ef4f9c,0 3482e4c,3e00008 3482e50,27bd0038 3482e54,3c028040 -3482e58,8c457690 +3482e58,8c457708 3482e5c,3c028040 -3482e60,244275b0 +3482e60,2442762c 3482e64,10a20012 3482e68,3c038040 3482e6c,27bdffe8 @@ -3249,10 +3249,10 @@ ef4f9c,0 3482e7c,42603 3482e80,3042003f 3482e84,21040 -3482e88,246375b0 +3482e88,2463762c 3482e8c,621021 3482e90,3c038040 -3482e94,ac627690 +3482e94,ac627708 3482e98,90a50000 3482e9c,c100b42 3482ea0,42183 @@ -3283,11 +3283,11 @@ ef4f9c,0 3482f08,16200003 3482f10,1000000b 3482f14,920201e9 -3482f18,c101747 +3482f18,c101766 3482f1c,93a40017 3482f20,54400004 3482f24,90420007 -3482f28,c101747 +3482f28,c101766 3482f2c,2202025 3482f30,90420007 3482f34,30420001 @@ -3321,11 +3321,11 @@ ef4f9c,0 3482fa4,16200003 3482fac,1000000b 3482fb0,920201e9 -3482fb4,c101747 +3482fb4,c101766 3482fb8,93a40017 3482fbc,54400004 3482fc0,90420007 -3482fc4,c101747 +3482fc4,c101766 3482fc8,2202025 3482fcc,90420007 3482fd0,30420002 @@ -3561,7 +3561,7 @@ ef4f9c,0 3483370,3c04de00 3483374,ac640000 3483378,3c048040 -348337c,248477a8 +348337c,24847820 3483380,ac640004 3483384,8e0302b0 3483388,24640008 @@ -3595,7 +3595,7 @@ ef4f9c,0 34833f8,ac430004 34833fc,3025 3483400,3c138040 -3483404,266577e0 +3483404,26657858 3483408,c101486 348340c,2202025 3483410,24020010 @@ -3605,7 +3605,7 @@ ef4f9c,0 3483420,afa20010 3483424,2407010f 3483428,3025 -348342c,266577e0 +348342c,26657858 3483430,c1014ee 3483434,2202025 3483438,240200ff @@ -3657,7 +3657,7 @@ ef4f9c,0 34834f0,24070001 34834f4,24060045 34834f8,3c058040 -34834fc,24a57810 +34834fc,24a57888 3483500,c101486 3483504,2202025 3483508,3c028011 @@ -3675,7 +3675,7 @@ ef4f9c,0 3483538,24070102 348353c,3025 3483540,3c058040 -3483544,24a57810 +3483544,24a57888 3483548,c1014ee 348354c,2202025 3483550,1000000c @@ -3687,7 +3687,7 @@ ef4f9c,0 3483568,24070104 348356c,3025 3483570,3c058040 -3483574,24a57810 +3483574,24a57888 3483578,c1014ee 348357c,2202025 3483580,3c028011 @@ -3703,7 +3703,7 @@ ef4f9c,0 34835a8,24070001 34835ac,24060046 34835b0,3c058040 -34835b4,24a57810 +34835b4,24a57888 34835b8,c101486 34835bc,2202025 34835c0,3c028011 @@ -3721,7 +3721,7 @@ ef4f9c,0 34835f0,2407011b 34835f4,3025 34835f8,3c058040 -34835fc,24a57810 +34835fc,24a57888 3483600,c1014ee 3483604,2202025 3483608,1000000c @@ -3733,7 +3733,7 @@ ef4f9c,0 3483620,2407011d 3483624,3025 3483628,3c058040 -348362c,24a57810 +348362c,24a57888 3483630,c1014ee 3483634,2202025 3483638,3c028011 @@ -3778,7 +3778,7 @@ ef4f9c,0 34836d4,3442a5d0 34836d8,8046007b 34836dc,3c128040 -34836e0,26457810 +34836e0,26457888 34836e4,c101486 34836e8,2202025 34836ec,2402000c @@ -3788,7 +3788,7 @@ ef4f9c,0 34836fc,afa20010 3483700,24070111 3483704,3025 -3483708,26457810 +3483708,26457888 348370c,c1014ee 3483710,2202025 3483714,8e0202b0 @@ -3814,7 +3814,7 @@ ef4f9c,0 3483764,ac430004 3483768,3025 348376c,3c128040 -3483770,264577e0 +3483770,26457858 3483774,c101486 3483778,2202025 348377c,24020010 @@ -3824,14 +3824,14 @@ ef4f9c,0 348378c,afa20010 3483790,2407010f 3483794,3025 -3483798,264577e0 +3483798,26457858 348379c,c1014ee 34837a0,2202025 34837a4,1000ff27 34837a8,241200ff 34837ac,3e00008 34837b4,3c028041 -34837b8,8c428840 +34837b8,8c4288b8 34837bc,10400265 34837c0,3c02801c 34837c4,27bdff90 @@ -3874,12 +3874,12 @@ ef4f9c,0 3483858,3c03de00 348385c,ac430000 3483860,3c038040 -3483864,246377a8 +3483864,24637820 3483868,ac430004 348386c,3c028011 3483870,3442a5d0 3483874,3c038041 -3483878,8c6388cc +3483878,8c638944 348387c,10600006 3483880,94420f2e 3483884,30460001 @@ -3891,17 +3891,17 @@ ef4f9c,0 348389c,24020001 34838a0,afa20038 34838a4,3c028041 -34838a8,8c5488d8 +34838a8,8c548950 34838ac,12800007 34838b0,2801825 34838b4,3c028040 -34838b8,944377f4 +34838b8,9443786c 34838bc,31040 34838c0,431021 34838c4,21040 34838c8,24430001 34838cc,3c028040 -34838d0,944277f4 +34838d0,9442786c 34838d4,210c0 34838d8,24420057 34838dc,431021 @@ -3976,28 +3976,28 @@ ef4f9c,0 34839f0,10c0004d 34839f4,ac430004 34839f8,3c058040 -34839fc,24a57820 +34839fc,24a57898 3483a00,94a70008 3483a04,3025 3483a08,c101486 3483a0c,2002025 3483a10,3c028041 -3483a14,8c428844 +3483a14,8c4288bc 3483a18,18400043 3483a1c,3c028040 3483a20,3c138040 -3483a24,267376b8 +3483a24,26737730 3483a28,9025 3483a2c,3c1e8041 3483a30,3c158040 -3483a34,26b57694 -3483a38,244276a4 +3483a34,26b5770c +3483a38,2442771c 3483a3c,afa2003c 3483a40,3c028040 -3483a44,24427820 +3483a44,24427898 3483a48,afa20040 3483a4c,3c178041 -3483a50,8fc288d0 +3483a50,8fc28948 3483a54,5040000b 3483a58,92620000 3483a5c,92630000 @@ -4047,7 +4047,7 @@ ef4f9c,0 3483b0c,c1014ee 3483b10,2002025 3483b14,26520001 -3483b18,8ee28844 +3483b18,8ee288bc 3483b1c,242102a 3483b20,1440ffcb 3483b24,2673000c @@ -4062,28 +4062,28 @@ ef4f9c,0 3483b48,10400038 3483b4c,3c028041 3483b50,3c058040 -3483b54,24a57830 +3483b54,24a578a8 3483b58,94a70008 3483b5c,3025 3483b60,c101486 3483b64,2002025 3483b68,3c028041 -3483b6c,8c428844 +3483b6c,8c4288bc 3483b70,1840016a 3483b74,3c028040 3483b78,3c138040 -3483b7c,267376b8 +3483b7c,26737730 3483b80,9025 3483b84,3c1e8041 3483b88,3c158040 -3483b8c,26b57694 -3483b90,24427830 +3483b8c,26b5770c +3483b90,244278a8 3483b94,afa2003c 3483b98,3c028011 3483b9c,3442a5d0 3483ba0,afa20038 3483ba4,3c178041 -3483ba8,8fc288d0 +3483ba8,8fc28948 3483bac,10400009 3483bb0,92620000 3483bb4,8fa30038 @@ -4111,46 +4111,46 @@ ef4f9c,0 3483c0c,c1014ee 3483c10,2002025 3483c14,26520001 -3483c18,8ee28844 +3483c18,8ee288bc 3483c1c,242102a 3483c20,1440ffe1 3483c24,2673000c 3483c28,3c028041 -3483c2c,8c428844 +3483c2c,8c4288bc 3483c30,18400010 3483c34,26310012 3483c38,3c128040 -3483c3c,265276ba +3483c3c,26527732 3483c40,2415000b 3483c44,9825 3483c48,3c168041 3483c4c,2a03025 3483c50,2202825 -3483c54,c101b71 +3483c54,c101b90 3483c58,2402025 3483c5c,26730001 3483c60,2652000c -3483c64,8ec28844 +3483c64,8ec288bc 3483c68,262102a 3483c6c,1440fff7 3483c70,26b50011 3483c74,3c028040 -3483c78,944277f4 +3483c78,9442786c 3483c7c,210c0 3483c80,24420001 3483c84,518821 3483c88,24070001 3483c8c,24060011 3483c90,3c058040 -3483c94,24a57800 +3483c94,24a57878 3483c98,c101486 3483c9c,2002025 3483ca0,3c028041 -3483ca4,8c428844 +3483ca4,8c4288bc 3483ca8,18400025 3483cac,24173000 3483cb0,3c138040 -3483cb4,267376b8 +3483cb4,26737730 3483cb8,9025 3483cbc,3c168011 3483cc0,36d6a5d0 @@ -4178,10 +4178,10 @@ ef4f9c,0 3483d18,d23021 3483d1c,24c6000b 3483d20,2202825 -3483d24,c101b71 +3483d24,c101b90 3483d28,27a40020 3483d2c,26520001 -3483d30,8ea28844 +3483d30,8ea288bc 3483d34,242102a 3483d38,1440ffe3 3483d3c,2673000c @@ -4189,19 +4189,19 @@ ef4f9c,0 3483d44,24070001 3483d48,2406000e 3483d4c,3c058040 -3483d50,24a57800 +3483d50,24a57878 3483d54,c101486 3483d58,2002025 3483d5c,3c028041 -3483d60,8c428844 +3483d60,8c4288bc 3483d64,18400027 3483d68,3c1e8040 3483d6c,3c128040 -3483d70,265276b8 +3483d70,26527730 3483d74,9825 3483d78,3c168011 3483d7c,36d6a5d0 -3483d80,27de7800 +3483d80,27de7878 3483d84,3c158041 3483d88,92430000 3483d8c,2404000d @@ -4230,26 +4230,26 @@ ef4f9c,0 3483de8,c1014ee 3483dec,2002025 3483df0,26730001 -3483df4,8ea28844 +3483df4,8ea288bc 3483df8,262102a 3483dfc,1440ffe2 3483e00,2652000c 3483e04,24070001 3483e08,2406000a 3483e0c,3c058040 -3483e10,24a57800 +3483e10,24a57878 3483e14,c101486 3483e18,2002025 3483e1c,3c028041 -3483e20,8c428844 +3483e20,8c4288bc 3483e24,18400022 3483e28,3c1e8040 3483e2c,3c138040 -3483e30,267376b9 +3483e30,26737731 3483e34,9025 3483e38,3c168011 3483e3c,36d6a5d0 -3483e40,27de7800 +3483e40,27de7878 3483e44,3c158041 3483e48,92620000 3483e4c,30420020 @@ -4273,7 +4273,7 @@ ef4f9c,0 3483e94,c1014ee 3483e98,2002025 3483e9c,26520001 -3483ea0,8ea28844 +3483ea0,8ea288bc 3483ea4,242102a 3483ea8,1440ffe7 3483eac,2673000c @@ -4281,19 +4281,19 @@ ef4f9c,0 3483eb4,24070001 3483eb8,24060010 3483ebc,3c058040 -3483ec0,24a57800 +3483ec0,24a57878 3483ec4,c101486 3483ec8,2002025 3483ecc,3c028041 -3483ed0,8c428844 +3483ed0,8c4288bc 3483ed4,18400024 3483ed8,3c128040 -3483edc,265276b8 +3483edc,26527730 3483ee0,9825 3483ee4,3c168011 3483ee8,36d6a5d0 3483eec,3c178040 -3483ef0,26f77800 +3483ef0,26f77878 3483ef4,3c158041 3483ef8,92420001 3483efc,30420010 @@ -4319,7 +4319,7 @@ ef4f9c,0 3483f4c,c1014ee 3483f50,2002025 3483f54,26730001 -3483f58,8ea28844 +3483f58,8ea288bc 3483f5c,262102a 3483f60,1440ffe5 3483f64,2652000c @@ -4327,20 +4327,20 @@ ef4f9c,0 3483f6c,24070001 3483f70,2406000f 3483f74,3c058040 -3483f78,24a57800 +3483f78,24a57878 3483f7c,c101486 3483f80,2002025 3483f84,3c028041 -3483f88,8c428844 +3483f88,8c4288bc 3483f8c,18400054 3483f90,3c158040 -3483f94,26b576b8 +3483f94,26b57730 3483f98,2a09025 3483f9c,9825 3483fa0,3c178011 3483fa4,36f7a5d0 3483fa8,3c028040 -3483fac,24427800 +3483fac,24427878 3483fb0,afa20038 3483fb4,3c168041 3483fb8,92420001 @@ -4367,7 +4367,7 @@ ef4f9c,0 348400c,c1014ee 3484010,2002025 3484014,26730001 -3484018,8ec28844 +3484018,8ec288bc 348401c,262182a 3484020,1460ffe5 3484024,2652000c @@ -4378,14 +4378,14 @@ ef4f9c,0 348403c,9025 3484040,3c1e8041 3484044,3c168041 -3484048,26d68934 +3484048,26d689ac 348404c,3c148040 -3484050,26947630 +3484050,269476ac 3484054,3c028040 -3484058,24427634 +3484058,244276b0 348405c,afa20038 3484060,3c178041 -3484064,8fc288d4 +3484064,8fc2894c 3484068,5040000f 348406c,92a20000 3484070,92a20001 @@ -4408,15 +4408,15 @@ ef4f9c,0 34840b4,2802025 34840b8,8fa40038 34840bc,2603025 -34840c0,c101b71 +34840c0,c101b90 34840c4,2202825 34840c8,26520001 34840cc,26730011 -34840d0,8ee28844 +34840d0,8ee288bc 34840d4,242102a 34840d8,1440ffe2 34840dc,26b5000c -34840e0,c101b9b +34840e0,c101bba 34840e4,2002025 34840e8,8e020008 34840ec,24430008 @@ -4468,11 +4468,11 @@ ef4f9c,0 34841c8,c44000d4 34841cc,3c028041 34841d0,3e00008 -34841d4,e440884c +34841d4,e44088c4 34841d8,27bdffe8 34841dc,afbf0014 34841e0,3c028040 -34841e4,90427760 +34841e4,904277d8 34841e8,5040001b 34841ec,3c028040 34841f0,3c038011 @@ -4494,14 +4494,14 @@ ef4f9c,0 3484230,40f809 3484234,248484a0 3484238,3c028040 -348423c,90437760 +348423c,904377d8 3484240,24020001 3484244,14620004 3484248,3c028040 348424c,3c028040 -3484250,a0407760 +3484250,a04077d8 3484254,3c028040 -3484258,c44e7758 +3484258,c44e77d0 348425c,44800000 3484264,46007032 348426c,45010010 @@ -4512,10 +4512,10 @@ ef4f9c,0 3484284,45010019 3484288,3c02801c 348428c,3c028040 -3484290,8c46763c +3484290,8c4676b8 3484294,3c028041 3484298,c101057 -348429c,c44c8848 +348429c,c44c88c0 34842a0,3c02801c 34842a4,344284a0 34842a8,1000000f @@ -4523,13 +4523,13 @@ ef4f9c,0 34842b0,344284a0 34842b4,c44c00d4 34842b8,3c028041 -34842bc,c44e884c +34842bc,c44e88c4 34842c0,460e6032 34842c8,45010008 34842cc,3c02801c 34842d0,3c028040 34842d4,c101057 -34842d8,8c467640 +34842d8,8c4676bc 34842dc,3c02801c 34842e0,344284a0 34842e4,e44000d4 @@ -4537,9 +4537,9 @@ ef4f9c,0 34842ec,344284a0 34842f0,c44000d4 34842f4,3c028041 -34842f8,e4408848 +34842f8,e44088c0 34842fc,3c028040 -3484300,90427761 +3484300,904277d9 3484304,24030001 3484308,1443000f 348430c,24030002 @@ -4547,7 +4547,7 @@ ef4f9c,0 3484314,344284a0 3484318,94420322 348431c,3c038040 -3484320,246375d8 +3484320,24637654 3484324,431021 3484328,90420000 348432c,10400018 @@ -4563,7 +4563,7 @@ ef4f9c,0 3484354,344284a0 3484358,94420322 348435c,3c038040 -3484360,246375d8 +3484360,24637654 3484364,431021 3484368,90420000 348436c,10400006 @@ -4573,9 +4573,9 @@ ef4f9c,0 348437c,2403001f 3484380,a4430322 3484384,3c028040 -3484388,a0407761 +3484388,a04077d9 348438c,3c028040 -3484390,24427754 +3484390,244277cc 3484394,c4400008 3484398,3c038040 348439c,e46020f4 @@ -4588,9 +4588,9 @@ ef4f9c,0 34843b8,2442ffff 34843bc,3c038040 34843c0,c10168a -34843c4,a0627763 +34843c4,a06277db 34843c8,3c028040 -34843cc,90427764 +34843cc,904277dc 34843d0,1040000b 34843d4,3c028040 34843d8,3c02801c @@ -4603,7 +4603,7 @@ ef4f9c,0 34843f4,651824 34843f8,a4430020 34843fc,3c028040 -3484400,90427765 +3484400,904277dd 3484404,10400016 3484408,8fbf0014 348440c,3c02801c @@ -4651,7 +4651,7 @@ ef4f9c,0 34844b4,3c03de00 34844b8,ac430000 34844bc,3c038040 -34844c0,246377a8 +34844c0,24637820 34844c4,ac430004 34844c8,8e0202c0 34844cc,24430008 @@ -4676,12 +4676,12 @@ ef4f9c,0 3484518,2403ffff 348451c,ac430004 3484520,3c028041 -3484524,8c5288dc +3484524,8c528954 3484528,24110054 348452c,3c178040 -3484530,26f77768 +3484530,26f777e0 3484534,3c168041 -3484538,26d68850 +3484538,26d688c8 348453c,24140018 3484540,241e000c 3484544,3242001f @@ -4773,7 +4773,7 @@ ef4f9c,0 348469c,a0401640 34846a0,3e00008 34846a8,3c028041 -34846ac,904288e0 +34846ac,90428958 34846b0,1040000d 34846b4,3c028011 34846b8,3442a5d0 @@ -4782,7 +4782,7 @@ ef4f9c,0 34846c4,14620008 34846cc,27bdffe8 34846d0,afbf0014 -34846d4,c101b4a +34846d4,c101b69 34846dc,8fbf0014 34846e0,3e00008 34846e4,27bd0018 @@ -4790,17 +4790,17 @@ ef4f9c,0 34846f0,27bdffe8 34846f4,afbf0014 34846f8,3c028041 -34846fc,8c428910 +34846fc,8c428988 3484700,218c0 3484704,3c048041 -3484708,2484895c +3484708,248489d4 348470c,641821 3484710,8c630000 3484714,1060000c 3484718,24420001 348471c,220c0 3484720,3c038041 -3484724,2463895c +3484724,246389d4 3484728,641821 348472c,402825 3484730,8c640000 @@ -4808,11 +4808,11 @@ ef4f9c,0 3484738,1480fffc 348473c,24630008 3484740,3c028041 -3484744,ac458910 -3484748,c101d4c +3484744,ac458988 +3484748,c101d6b 348474c,2404013c 3484750,3c038041 -3484754,ac62890c +3484754,ac628984 3484758,24030001 348475c,ac430130 3484760,8fbf0014 @@ -4888,14 +4888,14 @@ ef4f9c,0 3484878,3e00008 348487c,a0470003 3484880,3c038041 -3484884,8c688910 +3484884,8c688988 3484888,2508ffff 348488c,5000022 3484890,801025 3484894,27bdfff8 3484898,4825 348489c,3c0a8041 -34848a0,254a895c +34848a0,254a89d4 34848a4,1283021 34848a8,61fc2 34848ac,661821 @@ -4954,15 +4954,15 @@ ef4f9c,0 3484984,58202 3484988,afa50024 348498c,321000ff -3484990,c101756 +3484990,c101775 3484994,52402 3484998,408825 -348499c,c101747 +348499c,c101766 34849a0,402025 34849a4,3c038041 34849a8,8fa40020 -34849ac,ac648904 -34849b0,24638904 +34849ac,ac64897c +34849b0,2463897c 34849b4,8fa40024 34849b8,ac640004 34849bc,240300ca @@ -4974,25 +4974,25 @@ ef4f9c,0 34849d4,3182b 34849d8,24030002 34849dc,3c048041 -34849e0,ac838900 +34849e0,ac838978 34849e4,3c038041 -34849e8,ac6288fc +34849e8,ac628974 34849ec,90440001 34849f0,3c038041 -34849f4,ac6488f8 +34849f4,ac648970 34849f8,94440002 34849fc,3c038041 -3484a00,ac6488f4 +3484a00,ac64896c 3484a04,94440004 3484a08,3c038041 -3484a0c,ac6488f0 +3484a0c,ac648968 3484a10,80440006 3484a14,3c038041 -3484a18,ac6488ec +3484a18,ac648964 3484a1c,90420007 3484a20,30420001 3484a24,3c038041 -3484a28,ac6288e8 +3484a28,ac628960 3484a2c,3c028040 3484a30,a0500025 3484a34,8fbf001c @@ -5001,24 +5001,24 @@ ef4f9c,0 3484a40,3e00008 3484a44,27bd0020 3484a48,3c028041 -3484a4c,ac408904 -3484a50,24428904 +3484a4c,ac40897c +3484a50,2442897c 3484a54,ac400004 3484a58,3c028041 -3484a5c,ac408900 +3484a5c,ac408978 3484a60,3c028041 -3484a64,ac4088fc +3484a64,ac408974 3484a68,3c028041 -3484a6c,ac4088f8 +3484a6c,ac408970 3484a70,3c028041 -3484a74,ac4088f4 +3484a74,ac40896c 3484a78,3c028041 -3484a7c,ac4088f0 +3484a7c,ac408968 3484a80,3c028041 -3484a84,ac4088ec +3484a84,ac408964 3484a88,3c028041 3484a8c,3e00008 -3484a90,ac4088e8 +3484a90,ac408960 3484a94,8c830000 3484a98,3c028040 3484a9c,ac43002c @@ -5032,14 +5032,14 @@ ef4f9c,0 3484abc,afa40000 3484ac0,afa50004 3484ac4,3c028041 -3484ac8,24428944 +3484ac8,244289bc 3484acc,1825 3484ad0,24060003 3484ad4,8c450000 3484ad8,14a0000a 3484ae0,318c0 3484ae4,3c028041 -3484ae8,24428944 +3484ae8,244289bc 3484aec,621821 3484af0,8fa20000 3484af4,ac620000 @@ -5091,10 +5091,10 @@ ef4f9c,0 3484bb4,3e00008 3484bb8,27bd0020 3484bbc,3c038041 -3484bc0,24628944 +3484bc0,246289bc 3484bc4,8c450008 3484bc8,8c44000c -3484bcc,ac658944 +3484bcc,ac6589bc 3484bd0,ac440004 3484bd4,8c440010 3484bd8,8c430014 @@ -5141,8 +5141,8 @@ ef4f9c,0 3484c7c,afbf0014 3484c80,afb00010 3484c84,3c028041 -3484c88,8c508944 -3484c8c,24428944 +3484c88,8c5089bc +3484c8c,244289bc 3484c90,94430004 3484c94,2402007c 3484c98,1462000e @@ -5150,7 +5150,7 @@ ef4f9c,0 3484ca0,3c028040 3484ca4,90430024 3484ca8,3c028041 -3484cac,9042894a +3484cac,904289c2 3484cb0,54620009 3484cb4,8fb00010 3484cb8,c10168a @@ -5165,17 +5165,17 @@ ef4f9c,0 3484ce4,afbf0014 3484ce8,afb00010 3484cec,3c028041 -3484cf0,8c508904 +3484cf0,8c50897c 3484cf4,12000011 3484cf8,3c028041 -3484cfc,8c428900 +3484cfc,8c428978 3484d00,10400005 3484d04,3c028041 3484d08,3c048041 3484d0c,c1012a5 -3484d10,24848904 +3484d10,2484897c 3484d14,3c028041 -3484d18,8c428944 +3484d18,8c4289bc 3484d1c,14500003 3484d24,c1012ef 3484d2c,c1012fc @@ -5189,13 +5189,13 @@ ef4f9c,0 3484d50,afbf001c 3484d54,afb00018 3484d58,3c028041 -3484d5c,8c508944 -3484d60,24428944 +3484d5c,8c5089bc +3484d60,244289bc 3484d64,8c420004 3484d68,12000028 3484d6c,afa20014 3484d70,3c028041 -3484d74,24428944 +3484d74,244289bc 3484d78,94430004 3484d7c,240400ca 3484d80,14640013 @@ -5204,11 +5204,11 @@ ef4f9c,0 3484d8c,90840024 3484d90,50820010 3484d94,afb00010 -3484d98,c101756 +3484d98,c101775 3484d9c,240400ca -3484da0,c101747 +3484da0,c101766 3484da4,402025 -3484da8,c10176d +3484da8,c10178c 3484dac,402025 3484db0,c1012ef 3484db8,c1012fc @@ -5225,10 +5225,10 @@ ef4f9c,0 3484de8,3c02801d 3484dec,3442aa30 3484df0,3c038041 -3484df4,8c63890c +3484df4,8c638984 3484df8,ac430428 3484dfc,3c038041 -3484e00,8c6388fc +3484e00,8c638974 3484e04,80630000 3484e08,a0430424 3484e0c,8fbf001c @@ -5271,7 +5271,7 @@ ef4f9c,0 3484ea4,14400018 3484ea8,1025 3484eac,3c028041 -3484eb0,904288e4 +3484eb0,9042895c 3484eb4,24420001 3484eb8,304200ff 3484ebc,2c430002 @@ -5279,7 +5279,7 @@ ef4f9c,0 3484ec4,3c038041 3484ec8,3c028041 3484ecc,c10131e -3484ed0,a04088e4 +3484ed0,a040895c 3484ed4,c101686 3484edc,10400005 3484ee4,c10168f @@ -5291,8 +5291,8 @@ ef4f9c,0 3484f04,1025 3484f08,3c038041 3484f0c,10000002 -3484f10,a06288e4 -3484f14,a04088e4 +3484f10,a062895c +3484f14,a040895c 3484f18,8fbf0014 3484f1c,3e00008 3484f20,27bd0018 @@ -5331,7 +5331,7 @@ ef4f9c,0 3484fa8,c10125c 3484fac,8fa50014 3484fb0,3c028041 -3484fb4,8c4288fc +3484fb4,8c428974 3484fb8,86040000 3484fbc,2403000a 3484fc0,1483000d @@ -5382,9 +5382,9 @@ ef4f9c,0 3485074,10000002 3485078,2404005b 348507c,93b30016 -3485080,c101756 +3485080,c101775 3485088,408825 -348508c,c101747 +348508c,c101766 3485090,402025 3485094,408025 3485098,ae400134 @@ -5408,7 +5408,7 @@ ef4f9c,0 34850e0,3442fdcc 34850e4,40f809 34850e8,348484a0 -34850ec,c10176d +34850ec,c10178c 34850f0,2002025 34850f4,10000010 34850f8,8fbf002c @@ -5424,7 +5424,7 @@ ef4f9c,0 3485120,3442fdcc 3485124,40f809 3485128,348484a0 -348512c,c10176d +348512c,c10178c 3485130,2002025 3485134,8fbf002c 3485138,8fb30028 @@ -5658,7 +5658,7 @@ ef4f9c,0 34854d0,3c100003 34854d4,360295c0 34854d8,afa20018 -34854dc,c101d5b +34854dc,c101d7a 34854e0,27a40010 34854e4,afa0001c 34854e8,3c020084 @@ -5666,7 +5666,7 @@ ef4f9c,0 34854f0,afa20020 34854f4,3402b400 34854f8,afa20024 -34854fc,c101d5b +34854fc,c101d7a 3485500,27a4001c 3485504,afa00028 3485508,3c02007b @@ -5675,55 +5675,55 @@ ef4f9c,0 3485514,3c020008 3485518,344288a0 348551c,afa20030 -3485520,c101d5b +3485520,c101d7a 3485524,27a40028 3485528,8fa20010 348552c,2610a300 3485530,508021 3485534,3c038040 -3485538,ac707830 +3485538,ac7078a8 348553c,24422980 3485540,3c038040 -3485544,ac627820 +3485544,ac627898 3485548,3c028040 348554c,8fa30028 -3485550,ac437810 +3485550,ac437888 3485554,3c028040 3485558,8fa3001c -348555c,ac437800 +348555c,ac437878 3485560,3c038040 3485564,3c028041 -3485568,2442ae68 -348556c,ac6277e0 +3485568,2442aee0 +348556c,ac627858 3485570,3c038040 3485574,3c028041 -3485578,2442b668 -348557c,ac6277d0 +3485578,2442b6e0 +348557c,ac627848 3485580,3c118040 3485584,c10147a -3485588,262477f0 +3485588,26247868 348558c,408025 -3485590,c101d4c +3485590,c101d6b 3485594,402025 3485598,104fc2 348559c,1304821 34855a0,2a100002 34855a4,16000018 -34855a8,ae2277f0 +34855a8,ae227868 34855ac,94843 34855b0,3c038041 -34855b4,246399a0 +34855b4,24639a18 34855b8,2025 34855bc,3025 34855c0,2204025 34855c4,2407fff0 -34855c8,8d0577f0 +34855c8,8d057868 34855cc,a42821 34855d0,90620000 34855d4,21102 34855d8,471025 34855dc,a0a20000 -34855e0,8d0277f0 +34855e0,8d027868 34855e4,441021 34855e8,90650000 34855ec,a72825 @@ -5744,44 +5744,44 @@ ef4f9c,0 3485628,94640002 348562c,94630004 3485630,3c058041 -3485634,8ca588b8 +3485634,8ca58930 3485638,a4a20000 348563c,a4a40002 3485640,a4a30004 3485644,3c058041 -3485648,8ca688b4 +3485648,8ca6892c 348564c,a4c20000 -3485650,8ca588b4 +3485650,8ca5892c 3485654,a4a40004 3485658,a4a30008 348565c,3c058041 -3485660,94a588c4 +3485660,94a5893c 3485664,14a2000e 3485668,3c058041 348566c,3c058041 -3485670,94a588c6 +3485670,94a5893e 3485674,14a4000a 3485678,3c058041 348567c,3c058041 -3485680,94a588c8 +3485680,94a58940 3485684,14a30006 3485688,3c058041 348568c,3c038041 -3485690,946288bc -3485694,246388bc +3485690,94628934 +3485694,24638934 3485698,94640002 348569c,94630004 -34856a0,8ca588b0 +34856a0,8ca58928 34856a4,a4a20000 34856a8,a4a40002 34856ac,a4a30004 34856b0,3c058041 -34856b4,8ca588ac +34856b4,8ca58924 34856b8,a4a20000 34856bc,a4a40002 34856c0,a4a30004 34856c4,3c028041 -34856c8,8c4388a8 +34856c8,8c438920 34856cc,3c028040 34856d0,94450844 34856d4,24420844 @@ -5791,7 +5791,7 @@ ef4f9c,0 34856e4,a4640002 34856e8,a4620004 34856ec,3c028041 -34856f0,8c4388a4 +34856f0,8c43891c 34856f4,3c028040 34856f8,9445084a 34856fc,2442084a @@ -5801,7 +5801,7 @@ ef4f9c,0 348570c,a4640002 3485710,a4620004 3485714,3c028041 -3485718,8c4388a0 +3485718,8c438918 348571c,3c028040 3485720,94450850 3485724,24420850 @@ -5811,35 +5811,35 @@ ef4f9c,0 3485734,a4640002 3485738,a4620004 348573c,3c028041 -3485740,8c42889c +3485740,8c428914 3485744,3c068040 3485748,94c30862 348574c,a4430000 3485750,3c028041 -3485754,8c438898 +3485754,8c438910 3485758,24c20862 348575c,94440002 3485760,a4640000 3485764,3c038041 -3485768,8c638894 +3485768,8c63890c 348576c,94440004 3485770,a4640000 3485774,3c038041 -3485778,8c638890 +3485778,8c638908 348577c,3c058040 3485780,94a40868 3485784,a4640000 3485788,3c038041 -348578c,8c64888c +348578c,8c648904 3485790,24a30868 3485794,94670002 3485798,a4870000 348579c,3c048041 -34857a0,8c848888 +34857a0,8c848900 34857a4,94670004 34857a8,a4870000 34857ac,3c048041 -34857b0,8c848884 +34857b0,8c8488fc 34857b4,94c80862 34857b8,94470002 34857bc,94460004 @@ -5847,7 +5847,7 @@ ef4f9c,0 34857c4,a4870002 34857c8,a4860004 34857cc,3c048041 -34857d0,8c848874 +34857d0,8c8488ec 34857d4,94a60868 34857d8,94650002 34857dc,94630004 @@ -5893,7 +5893,7 @@ ef4f9c,0 348587c,240200cd 3485880,24420032 3485884,3c058041 -3485888,8ca88880 +3485888,8ca888f8 348588c,3c058040 3485890,94a50862 3485894,30a9ffff @@ -5906,12 +5906,12 @@ ef4f9c,0 34858b0,a5070002 34858b4,a5060004 34858b8,3c058041 -34858bc,8ca58870 +34858bc,8ca588e8 34858c0,a4a40000 34858c4,a4a30002 34858c8,a4a20004 34858cc,3c028041 -34858d0,8c438878 +34858d0,8c4388f0 34858d4,3c028040 34858d8,94450862 34858dc,24420862 @@ -5921,7 +5921,7 @@ ef4f9c,0 34858ec,a4640002 34858f0,a4620004 34858f4,3c028041 -34858f8,8c438868 +34858f8,8c4388e0 34858fc,3c028040 3485900,94450868 3485904,24420868 @@ -5931,7 +5931,7 @@ ef4f9c,0 3485914,a4640002 3485918,a4620004 348591c,3c028041 -3485920,8c438864 +3485920,8c4388dc 3485924,3c028040 3485928,94460856 348592c,24440856 @@ -5964,12 +5964,12 @@ ef4f9c,0 3485998,24420032 348599c,3042ffff 34859a0,3c058041 -34859a4,8ca58860 +34859a4,8ca588d8 34859a8,a4a40000 34859ac,a4a30002 34859b0,a4a20004 34859b4,3c058041 -34859b8,8ca58858 +34859b8,8ca588d0 34859bc,a4a40000 34859c0,a4a30002 34859c4,3e00008 @@ -5982,7 +5982,7 @@ ef4f9c,0 34859e0,21840 34859e4,621021 34859e8,3c038040 -34859ec,24637840 +34859ec,246378b8 34859f0,621821 34859f4,90640000 34859f8,42600 @@ -5994,16 +5994,16 @@ ef4f9c,0 3485a10,3e00008 3485a14,821021 3485a18,3c028041 -3485a1c,90428914 +3485a1c,9042898c 3485a20,3e00008 3485a24,2102b 3485a28,3c038041 -3485a2c,90628914 +3485a2c,9062898c 3485a30,24420001 3485a34,3e00008 -3485a38,a0628914 +3485a38,a062898c 3485a3c,3c028041 -3485a40,90428914 +3485a40,9042898c 3485a44,1040001b 3485a48,2442ffff 3485a4c,27bdffd8 @@ -6011,7 +6011,7 @@ ef4f9c,0 3485a54,afb10020 3485a58,afb0001c 3485a5c,3c038041 -3485a60,a0628914 +3485a60,a062898c 3485a64,3c108038 3485a68,3610e578 3485a6c,24050014 @@ -6044,10 +6044,10 @@ ef4f9c,0 3485ae0,808025 3485ae4,8c8208c4 3485ae8,24420001 -3485aec,c101bf0 +3485aec,c101c0f 3485af0,ac8208c4 3485af4,3c028041 -3485af8,944288ca +3485af8,94428942 3485afc,8e0308c4 3485b00,1462001e 3485b04,8fbf001c @@ -6088,7 +6088,7 @@ ef4f9c,0 3485b90,34423000 3485b94,ac8200a0 3485b98,3c028041 -3485b9c,90428915 +3485b9c,9042898f 3485ba0,304200ff 3485ba4,10400005 3485ba8,52840 @@ -6171,7 +6171,7 @@ ef4f9c,0 3485ce8,3e00008 3485cec,a082009a 3485cf0,3c028041 -3485cf4,90428915 +3485cf4,9042898f 3485cf8,304200ff 3485cfc,10400005 3485d00,52840 @@ -6180,4774 +6180,4803 @@ ef4f9c,0 3485d0c,94a28cec 3485d10,a4820034 3485d14,3e00008 -3485d1c,2c8200cb -3485d20,1040000b -3485d24,41880 -3485d28,641021 -3485d2c,21080 -3485d30,3c058040 -3485d34,24a5784c -3485d38,a21021 -3485d3c,80430000 -3485d40,3182b -3485d44,31823 -3485d48,3e00008 -3485d4c,431024 +3485d1c,3c028041 +3485d20,9042898e +3485d24,1040000c +3485d28,3c028041 +3485d2c,94820f06 +3485d30,34420040 +3485d34,a4820f06 +3485d38,3c028041 +3485d3c,9042898d +3485d40,54400009 +3485d44,94820f06 +3485d48,94820ef4 +3485d4c,3042fb87 3485d50,3e00008 -3485d54,1025 -3485d58,27bdffe0 -3485d5c,afbf001c -3485d60,afb20018 -3485d64,afb10014 -3485d68,afb00010 -3485d6c,808025 -3485d70,3c128011 -3485d74,3652a5d0 -3485d78,c101747 -3485d7c,2002025 -3485d80,2008825 -3485d84,8c420008 -3485d88,2002825 -3485d8c,40f809 -3485d90,2402025 -3485d94,1622fff8 -3485d98,408025 -3485d9c,8fbf001c -3485da0,8fb20018 -3485da4,8fb10014 -3485da8,8fb00010 -3485dac,3e00008 -3485db0,27bd0020 -3485db4,27bdffe8 -3485db8,afbf0014 -3485dbc,8c82000c -3485dc0,84860012 -3485dc4,84850010 -3485dc8,3c048011 -3485dcc,40f809 -3485dd0,3484a5d0 -3485dd4,8fbf0014 -3485dd8,3e00008 -3485ddc,27bd0018 -3485de0,3e00008 -3485de4,a01025 -3485de8,8082007d -3485dec,21027 -3485df0,2102b -3485df4,3e00008 -3485df8,24420008 -3485dfc,8c8200a0 -3485e00,21182 -3485e04,30420007 -3485e08,10400005 -3485e10,38420001 -3485e14,2102b -3485e18,3e00008 -3485e1c,24420035 -3485e20,3e00008 -3485e24,24020054 -3485e28,8c8200a0 -3485e2c,210c2 -3485e30,30420007 -3485e34,10400005 -3485e3c,38420001 -3485e40,2102b -3485e44,3e00008 -3485e48,24420033 -3485e4c,3e00008 -3485e50,24020032 -3485e54,8c8200a0 -3485e58,30420007 -3485e5c,10400005 -3485e64,38420001 -3485e68,2102b -3485e6c,3e00008 -3485e70,24420030 -3485e74,3e00008 -3485e78,24020004 -3485e7c,8c8300a0 -3485e80,31b82 -3485e84,30630007 -3485e88,10600005 -3485e8c,24040001 -3485e90,14640004 -3485e94,2402007b -3485e98,3e00008 -3485e9c,24020060 -3485ea0,24020005 -3485ea4,3e00008 -3485eac,8c8300a0 -3485eb0,31b02 -3485eb4,30630003 -3485eb8,10600005 -3485ebc,24040001 -3485ec0,14640004 -3485ec4,240200c7 +3485d54,a4820ef4 +3485d58,9042898d +3485d5c,1040000c +3485d64,94820f06 +3485d68,34420080 +3485d6c,a4820f06 +3485d70,94820ef6 +3485d74,24038f00 +3485d78,431025 +3485d7c,a4820ef6 +3485d80,94820ee4 +3485d84,2403f000 +3485d88,431025 +3485d8c,a4820ee4 +3485d90,3e00008 +3485d98,2c8200cb +3485d9c,1040000b +3485da0,41880 +3485da4,641021 +3485da8,21080 +3485dac,3c058040 +3485db0,24a578c4 +3485db4,a21021 +3485db8,80430000 +3485dbc,3182b +3485dc0,31823 +3485dc4,3e00008 +3485dc8,431024 +3485dcc,3e00008 +3485dd0,1025 +3485dd4,27bdffe0 +3485dd8,afbf001c +3485ddc,afb20018 +3485de0,afb10014 +3485de4,afb00010 +3485de8,808025 +3485dec,3c128011 +3485df0,3652a5d0 +3485df4,c101766 +3485df8,2002025 +3485dfc,2008825 +3485e00,8c420008 +3485e04,2002825 +3485e08,40f809 +3485e0c,2402025 +3485e10,1622fff8 +3485e14,408025 +3485e18,8fbf001c +3485e1c,8fb20018 +3485e20,8fb10014 +3485e24,8fb00010 +3485e28,3e00008 +3485e2c,27bd0020 +3485e30,27bdffe8 +3485e34,afbf0014 +3485e38,8c82000c +3485e3c,84860012 +3485e40,84850010 +3485e44,3c048011 +3485e48,40f809 +3485e4c,3484a5d0 +3485e50,8fbf0014 +3485e54,3e00008 +3485e58,27bd0018 +3485e5c,3e00008 +3485e60,a01025 +3485e64,8082007d +3485e68,21027 +3485e6c,2102b +3485e70,3e00008 +3485e74,24420008 +3485e78,8c8200a0 +3485e7c,21182 +3485e80,30420007 +3485e84,10400005 +3485e8c,38420001 +3485e90,2102b +3485e94,3e00008 +3485e98,24420035 +3485e9c,3e00008 +3485ea0,24020054 +3485ea4,8c8200a0 +3485ea8,210c2 +3485eac,30420007 +3485eb0,10400005 +3485eb8,38420001 +3485ebc,2102b +3485ec0,3e00008 +3485ec4,24420033 3485ec8,3e00008 -3485ecc,24020046 -3485ed0,24020045 -3485ed4,3e00008 -3485edc,8c8200a0 -3485ee0,21242 -3485ee4,30420007 -3485ee8,2102b -3485eec,3e00008 -3485ef0,24420037 -3485ef4,8c8200a0 -3485ef8,21502 -3485efc,30420007 -3485f00,2c420002 -3485f04,2c420001 -3485f08,3e00008 -3485f0c,24420079 -3485f10,8c8200a0 -3485f14,21442 -3485f18,30420007 -3485f1c,2c420002 -3485f20,2c420001 -3485f24,3e00008 -3485f28,24420077 -3485f2c,9082003a -3485f30,2102b -3485f34,3e00008 -3485f38,244200b9 -3485f3c,8083007c -3485f40,2402ffff -3485f44,50620007 -3485f48,2402006b -3485f4c,80830094 -3485f50,28630006 -3485f54,10600003 -3485f58,2402006a -3485f5c,3e00008 -3485f60,24020003 -3485f64,3e00008 -3485f6c,8083007b -3485f70,2402ffff -3485f74,10620003 -3485f7c,3e00008 -3485f80,2402000c +3485ecc,24020032 +3485ed0,8c8200a0 +3485ed4,30420007 +3485ed8,10400005 +3485ee0,38420001 +3485ee4,2102b +3485ee8,3e00008 +3485eec,24420030 +3485ef0,3e00008 +3485ef4,24020004 +3485ef8,8c8300a0 +3485efc,31b82 +3485f00,30630007 +3485f04,10600005 +3485f08,24040001 +3485f0c,14640004 +3485f10,2402007b +3485f14,3e00008 +3485f18,24020060 +3485f1c,24020005 +3485f20,3e00008 +3485f28,8c8300a0 +3485f2c,31b02 +3485f30,30630003 +3485f34,10600005 +3485f38,24040001 +3485f3c,14640004 +3485f40,240200c7 +3485f44,3e00008 +3485f48,24020046 +3485f4c,24020045 +3485f50,3e00008 +3485f58,8c8200a0 +3485f5c,21242 +3485f60,30420007 +3485f64,2102b +3485f68,3e00008 +3485f6c,24420037 +3485f70,8c8200a0 +3485f74,21502 +3485f78,30420007 +3485f7c,2c420002 +3485f80,2c420001 3485f84,3e00008 -3485f88,2402003b -3485f8c,8c8300a0 -3485f90,30630007 -3485f94,14600002 -3485f98,a01025 -3485f9c,2402004d +3485f88,24420079 +3485f8c,8c8200a0 +3485f90,21442 +3485f94,30420007 +3485f98,2c420002 +3485f9c,2c420001 3485fa0,3e00008 -3485fa8,8c8300a0 -3485fac,30630038 -3485fb0,14600002 -3485fb4,a01025 -3485fb8,2402004d -3485fbc,3e00008 -3485fc4,8c8300a0 -3485fc8,3c040001 -3485fcc,3484c000 -3485fd0,641824 -3485fd4,14600002 -3485fd8,a01025 -3485fdc,2402004d +3485fa4,24420077 +3485fa8,9082003a +3485fac,2102b +3485fb0,3e00008 +3485fb4,244200b9 +3485fb8,8083007c +3485fbc,2402ffff +3485fc0,50620007 +3485fc4,2402006b +3485fc8,80830094 +3485fcc,28630006 +3485fd0,10600003 +3485fd4,2402006a +3485fd8,3e00008 +3485fdc,24020003 3485fe0,3e00008 -3485fe8,94820eda -3485fec,30420008 -3485ff0,14400010 -3485ff8,80830086 -3485ffc,2402001b -3486000,1062000e -3486008,80830087 -348600c,1062000d -3486014,80830088 -3486018,1062000c -348601c,2403001b -3486020,80840089 -3486024,1483000a -3486028,a01025 -348602c,3e00008 -3486030,240200c8 -3486034,3e00008 -3486038,240200c8 -348603c,3e00008 -3486040,240200c8 -3486044,3e00008 -3486048,240200c8 -348604c,240200c8 -3486050,3e00008 -3486058,27bdffe8 -348605c,afbf0014 -3486060,c101d47 -3486068,c10152c -3486070,c101b66 -3486078,c1011bc -3486080,c10195d -3486088,8fbf0014 -348608c,3e00008 -3486090,27bd0018 -3486094,27bdffe8 -3486098,afbf0014 -348609c,c101387 -34860a4,c100bfc -34860ac,c101b1f -34860b4,c101587 -34860bc,c101076 -34860c4,c1011a3 -34860cc,8fbf0014 -34860d0,3e00008 -34860d4,27bd0018 -34860d8,27bdffe8 -34860dc,afbf0014 -34860e0,afb00010 -34860e4,3c10801c -34860e8,361084a0 -34860ec,8e040000 -34860f0,c100ded -34860f4,248402a8 -34860f8,8e040000 -34860fc,c101bfa -3486100,248402a8 +3485fe8,8083007b +3485fec,2402ffff +3485ff0,10620003 +3485ff8,3e00008 +3485ffc,2402000c +3486000,3e00008 +3486004,2402003b +3486008,8c8300a0 +348600c,30630007 +3486010,14600002 +3486014,a01025 +3486018,2402004d +348601c,3e00008 +3486024,8c8300a0 +3486028,30630038 +348602c,14600002 +3486030,a01025 +3486034,2402004d +3486038,3e00008 +3486040,8c8300a0 +3486044,3c040001 +3486048,3484c000 +348604c,641824 +3486050,14600002 +3486054,a01025 +3486058,2402004d +348605c,3e00008 +3486064,94820eda +3486068,30420008 +348606c,14400010 +3486074,80830086 +3486078,2402001b +348607c,1062000e +3486084,80830087 +3486088,1062000d +3486090,80830088 +3486094,1062000c +3486098,2403001b +348609c,80840089 +34860a0,1483000a +34860a4,a01025 +34860a8,3e00008 +34860ac,240200c8 +34860b0,3e00008 +34860b4,240200c8 +34860b8,3e00008 +34860bc,240200c8 +34860c0,3e00008 +34860c4,240200c8 +34860c8,240200c8 +34860cc,3e00008 +34860d4,27bdffe8 +34860d8,afbf0014 +34860dc,c101d66 +34860e4,c10152c +34860ec,c101b85 +34860f4,c1011bc +34860fc,c10197c 3486104,8fbf0014 -3486108,8fb00010 -348610c,3e00008 -3486110,27bd0018 -3486114,27bdffe8 -3486118,afbf0014 -348611c,c1011aa -3486124,c101970 -348612c,c101070 -3486134,8fbf0014 -3486138,3e00008 -348613c,27bd0018 -3486140,3c02801c -3486144,344284a0 -3486148,3c030001 -348614c,431021 -3486150,84430988 -3486154,14600022 -3486158,3c02801c -348615c,344284a0 -3486160,3c030001 -3486164,431021 -3486168,84420992 -348616c,14400014 -3486170,21840 -3486174,3c028011 -3486178,3442a5d0 -348617c,8c420004 -3486180,14400009 -3486184,3c028011 -3486188,3442a5d0 -348618c,8c4300a0 -3486190,3c020001 -3486194,3442c007 -3486198,621824 -348619c,14600026 -34861a0,24020001 -34861a4,3c028011 -34861a8,3442a5d0 -34861ac,8c4200a0 -34861b0,21382 -34861b4,30420007 -34861b8,3e00008 -34861bc,2102b -34861c0,621821 -34861c4,3c028011 -34861c8,3442a5d0 -34861cc,8c4200a0 -34861d0,621006 -34861d4,30420007 -34861d8,3e00008 -34861dc,2102b -34861e0,344284a0 -34861e4,3c040001 -34861e8,441021 -34861ec,84440992 -34861f0,1480000a -34861f4,3c028011 -34861f8,24020003 -34861fc,14620007 +3486108,3e00008 +348610c,27bd0018 +3486110,27bdffe8 +3486114,afbf0014 +3486118,c101387 +3486120,c100bfc +3486128,c101b3e +3486130,c101587 +3486138,c101076 +3486140,c1011a3 +3486148,8fbf0014 +348614c,3e00008 +3486150,27bd0018 +3486154,27bdffe8 +3486158,afbf0014 +348615c,afb00010 +3486160,3c10801c +3486164,361084a0 +3486168,8e040000 +348616c,c100ded +3486170,248402a8 +3486174,8e040000 +3486178,c101c19 +348617c,248402a8 +3486180,8fbf0014 +3486184,8fb00010 +3486188,3e00008 +348618c,27bd0018 +3486190,27bdffe8 +3486194,afbf0014 +3486198,c1011aa +34861a0,c10198f +34861a8,c101070 +34861b0,8fbf0014 +34861b4,3e00008 +34861b8,27bd0018 +34861bc,3c02801c +34861c0,344284a0 +34861c4,3c030001 +34861c8,431021 +34861cc,84430988 +34861d0,14600022 +34861d4,3c02801c +34861d8,344284a0 +34861dc,3c030001 +34861e0,431021 +34861e4,84420992 +34861e8,14400014 +34861ec,21840 +34861f0,3c028011 +34861f4,3442a5d0 +34861f8,8c420004 +34861fc,14400009 3486200,3c028011 3486204,3442a5d0 -3486208,8c42009c -348620c,3c03000c -3486210,431024 -3486214,3e00008 -3486218,2102b -348621c,3442a5d0 -3486220,9442009c -3486224,42080 -3486228,2463ffff -348622c,831821 -3486230,621007 -3486234,30420001 -3486238,3e00008 -3486240,27bdffe8 -3486244,afbf0014 -3486248,801025 -348624c,2c430193 -3486250,10600006 -3486254,a02025 -3486258,210c0 -348625c,3c03800f -3486260,34638ff8 -3486264,10000008 -3486268,431021 -348626c,2442fe6e -3486270,21080 -3486274,2403fff8 -3486278,431024 -348627c,3c038040 -3486280,24630c74 -3486284,621021 -3486288,8c450000 -348628c,8c460004 -3486290,3c028000 -3486294,24420df0 -3486298,40f809 -348629c,c53023 -34862a0,8fbf0014 -34862a4,3e00008 -34862a8,27bd0018 -34862ac,27bdffe8 -34862b0,afbf0014 -34862b4,801025 -34862b8,a02025 -34862bc,a4450000 -34862c0,c101890 -34862c4,8c450004 -34862c8,8fbf0014 -34862cc,3e00008 -34862d0,27bd0018 -34862d4,27bdffe8 -34862d8,afbf0014 -34862dc,afb00010 -34862e0,3c028041 -34862e4,2442995c -34862e8,24450040 -34862ec,94430000 -34862f0,1064000b -34862f4,408025 -34862f8,54600006 -34862fc,24420008 -3486300,802825 -3486304,c1018ab -3486308,402025 -348630c,10000005 -3486310,2001025 -3486314,5445fff6 -3486318,94430000 -348631c,8025 -3486320,2001025 -3486324,8fbf0014 -3486328,8fb00010 -348632c,3e00008 -3486330,27bd0018 -3486334,3c03801c -3486338,346384a0 -348633c,8c620000 -3486340,8c860004 -3486344,8c4502d0 -3486348,24a70008 -348634c,ac4702d0 -3486350,3c02db06 -3486354,24420018 -3486358,aca20000 -348635c,aca60004 -3486360,8c650000 -3486364,8c840004 -3486368,8ca302c0 -348636c,24660008 -3486370,aca602c0 -3486374,ac620000 -3486378,3e00008 -348637c,ac640004 -3486380,27bdffe0 -3486384,afbf0014 -3486388,f7b40018 -348638c,3c02800a -3486390,3442a78c -3486394,40f809 -3486398,46006506 -348639c,2442000c -34863a0,2025 -34863a4,1000000a -34863a8,2405000c -34863ac,c4600000 -34863b0,46140002 -34863b4,e4600000 -34863b8,24630004 -34863bc,5462fffc -34863c0,c4600000 -34863c4,24840004 -34863c8,10850003 -34863cc,24420010 -34863d0,1000fff6 -34863d4,2443fff4 -34863d8,8fbf0014 -34863dc,d7b40018 -34863e0,3e00008 -34863e4,27bd0020 -34863e8,27bdffd8 -34863ec,afbf0024 -34863f0,afb30020 -34863f4,afb2001c -34863f8,afb10018 -34863fc,afb00014 -3486400,809825 -3486404,a09025 -3486408,c08025 -348640c,3c118002 -3486410,26222438 -3486414,3025 -3486418,2002825 -348641c,40f809 -3486420,2402025 -3486424,26312554 -3486428,3025 -348642c,2002825 -3486430,220f809 -3486434,2402025 -3486438,2602825 -348643c,3c028005 -3486440,244270c0 -3486444,40f809 -3486448,2002025 -348644c,8fbf0024 -3486450,8fb30020 -3486454,8fb2001c -3486458,8fb10018 -348645c,8fb00014 -3486460,3e00008 -3486464,27bd0028 -3486468,44860000 -348646c,24020063 -3486470,54820005 -3486474,84a20000 -3486478,3c028040 -348647c,c4427648 -3486480,3e00008 -3486484,46020002 -3486488,240300f1 -348648c,54430008 -3486490,24030015 -3486494,24020046 -3486498,1082000d -348649c,2402002f -34864a0,1482000e -34864a4,3c028040 -34864a8,3e00008 -34864ac,c4407644 -34864b0,1443000a -34864b4,24020011 -34864b8,90a3001d -34864bc,14620007 -34864c0,3c028040 -34864c4,c4427648 -34864c8,3e00008 -34864cc,46020002 -34864d0,3c028040 -34864d4,3e00008 -34864d8,c4407644 +3486208,8c4300a0 +348620c,3c020001 +3486210,3442c007 +3486214,621824 +3486218,14600026 +348621c,24020001 +3486220,3c028011 +3486224,3442a5d0 +3486228,8c4200a0 +348622c,21382 +3486230,30420007 +3486234,3e00008 +3486238,2102b +348623c,621821 +3486240,3c028011 +3486244,3442a5d0 +3486248,8c4200a0 +348624c,621006 +3486250,30420007 +3486254,3e00008 +3486258,2102b +348625c,344284a0 +3486260,3c040001 +3486264,441021 +3486268,84440992 +348626c,1480000a +3486270,3c028011 +3486274,24020003 +3486278,14620007 +348627c,3c028011 +3486280,3442a5d0 +3486284,8c42009c +3486288,3c03000c +348628c,431024 +3486290,3e00008 +3486294,2102b +3486298,3442a5d0 +348629c,9442009c +34862a0,42080 +34862a4,2463ffff +34862a8,831821 +34862ac,621007 +34862b0,30420001 +34862b4,3e00008 +34862bc,27bdffe8 +34862c0,afbf0014 +34862c4,801025 +34862c8,2c430193 +34862cc,10600006 +34862d0,a02025 +34862d4,210c0 +34862d8,3c03800f +34862dc,34638ff8 +34862e0,10000008 +34862e4,431021 +34862e8,2442fe6e +34862ec,21080 +34862f0,2403fff8 +34862f4,431024 +34862f8,3c038040 +34862fc,24630c74 +3486300,621021 +3486304,8c450000 +3486308,8c460004 +348630c,3c028000 +3486310,24420df0 +3486314,40f809 +3486318,c53023 +348631c,8fbf0014 +3486320,3e00008 +3486324,27bd0018 +3486328,27bdffe8 +348632c,afbf0014 +3486330,801025 +3486334,a02025 +3486338,a4450000 +348633c,c1018af +3486340,8c450004 +3486344,8fbf0014 +3486348,3e00008 +348634c,27bd0018 +3486350,27bdffe8 +3486354,afbf0014 +3486358,afb00010 +348635c,3c028041 +3486360,244299d4 +3486364,24450040 +3486368,94430000 +348636c,1064000b +3486370,408025 +3486374,54600006 +3486378,24420008 +348637c,802825 +3486380,c1018ca +3486384,402025 +3486388,10000005 +348638c,2001025 +3486390,5445fff6 +3486394,94430000 +3486398,8025 +348639c,2001025 +34863a0,8fbf0014 +34863a4,8fb00010 +34863a8,3e00008 +34863ac,27bd0018 +34863b0,3c03801c +34863b4,346384a0 +34863b8,8c620000 +34863bc,8c860004 +34863c0,8c4502d0 +34863c4,24a70008 +34863c8,ac4702d0 +34863cc,3c02db06 +34863d0,24420018 +34863d4,aca20000 +34863d8,aca60004 +34863dc,8c650000 +34863e0,8c840004 +34863e4,8ca302c0 +34863e8,24660008 +34863ec,aca602c0 +34863f0,ac620000 +34863f4,3e00008 +34863f8,ac640004 +34863fc,27bdffe0 +3486400,afbf0014 +3486404,f7b40018 +3486408,3c02800a +348640c,3442a78c +3486410,40f809 +3486414,46006506 +3486418,2442000c +348641c,2025 +3486420,1000000a +3486424,2405000c +3486428,c4600000 +348642c,46140002 +3486430,e4600000 +3486434,24630004 +3486438,5462fffc +348643c,c4600000 +3486440,24840004 +3486444,10850003 +3486448,24420010 +348644c,1000fff6 +3486450,2443fff4 +3486454,8fbf0014 +3486458,d7b40018 +348645c,3e00008 +3486460,27bd0020 +3486464,27bdffd8 +3486468,afbf0024 +348646c,afb30020 +3486470,afb2001c +3486474,afb10018 +3486478,afb00014 +348647c,809825 +3486480,a09025 +3486484,c08025 +3486488,3c118002 +348648c,26222438 +3486490,3025 +3486494,2002825 +3486498,40f809 +348649c,2402025 +34864a0,26312554 +34864a4,3025 +34864a8,2002825 +34864ac,220f809 +34864b0,2402025 +34864b4,2602825 +34864b8,3c028005 +34864bc,244270c0 +34864c0,40f809 +34864c4,2002025 +34864c8,8fbf0024 +34864cc,8fb30020 +34864d0,8fb2001c +34864d4,8fb10018 +34864d8,8fb00014 34864dc,3e00008 -34864e4,27bdffd8 -34864e8,afbf001c -34864ec,afb20018 -34864f0,afb10014 -34864f4,afb00010 -34864f8,f7b40020 -34864fc,48202 -3486500,afa40028 -3486504,a08825 -3486508,c09025 -348650c,4487a000 -3486510,108600 -3486514,108603 -3486518,c1018b5 -348651c,42402 -3486520,c1018cd -3486524,402025 -3486528,4406a000 -348652c,2202825 -3486530,c10191a -3486534,2002025 -3486538,c1018e0 -348653c,46000306 -3486540,2604ffff -3486544,2403025 -3486548,2202825 -348654c,42600 -3486550,c1018fa -3486554,42603 -3486558,8fbf001c -348655c,8fb20018 -3486560,8fb10014 -3486564,8fb00010 -3486568,d7b40020 -348656c,3e00008 -3486570,27bd0028 -3486574,27bdffe0 -3486578,afbf001c -348657c,afb10018 -3486580,afb00014 -3486584,3c108041 -3486588,2610995c -348658c,26110040 -3486590,a6000000 -3486594,c101d4c -3486598,24041e70 -348659c,ae020004 -34865a0,26100008 -34865a4,5611fffb -34865a8,a6000000 -34865ac,8fbf001c -34865b0,8fb10018 -34865b4,8fb00014 -34865b8,3e00008 -34865bc,27bd0020 -34865c0,3c028041 -34865c4,a440995c -34865c8,2442995c -34865cc,a4400008 -34865d0,a4400010 -34865d4,a4400018 -34865d8,a4400020 -34865dc,a4400028 -34865e0,a4400030 -34865e4,3e00008 -34865e8,a4400038 -34865ec,27bdffe8 -34865f0,afbf0014 -34865f4,afb00010 -34865f8,afa5001c -34865fc,10a0000e -3486600,afa60020 -3486604,808025 -3486608,93a40023 -348660c,50800002 -3486610,97a40020 -3486614,3084ffff -3486618,c101756 -3486620,c101747 -3486624,402025 -3486628,94430004 -348662c,a6030000 -3486630,80420006 -3486634,a2020002 -3486638,8fbf0014 -348663c,8fb00010 -3486640,3e00008 -3486644,27bd0018 -3486648,27bdffe0 -348664c,afbf001c -3486650,afb00018 -3486654,808025 -3486658,30e700ff -348665c,90c600a5 -3486660,c101249 -3486664,27a40010 -3486668,8fa50010 -348666c,8fa60014 -3486670,c10197b -3486674,2002025 -3486678,8fbf001c -348667c,8fb00018 -3486680,3e00008 -3486684,27bd0020 -3486688,27bdffd8 -348668c,afbf0024 -3486690,afb10020 -3486694,afb0001c -3486698,808025 -348669c,a08825 -34866a0,3c028040 -34866a4,8c42761c -34866a8,afa20010 -34866ac,3825 -34866b0,a03025 -34866b4,802825 -34866b8,c101992 -34866bc,27a40010 -34866c0,3c028040 -34866c4,8c47764c -34866c8,2203025 -34866cc,2002825 -34866d0,c101939 -34866d4,8fa40010 -34866d8,8fbf0024 -34866dc,8fb10020 -34866e0,8fb0001c -34866e4,3e00008 -34866e8,27bd0028 -34866ec,27bdffd8 -34866f0,afbf0024 -34866f4,afb10020 -34866f8,afb0001c -34866fc,808025 -3486700,9083001d -3486704,24020011 -3486708,10620007 -348670c,a08825 -3486710,3c028001 -3486714,24423268 -3486718,40f809 -3486720,10000010 -3486724,8fbf0024 -3486728,3c028040 -348672c,8c427620 -3486730,afa20010 -3486734,3825 -3486738,a03025 -348673c,802825 -3486740,c101992 -3486744,27a40010 -3486748,3c028040 -348674c,8c47764c -3486750,2203025 -3486754,2002825 -3486758,c101939 -348675c,8fa40010 -3486760,8fbf0024 -3486764,8fb10020 -3486768,8fb0001c -348676c,3e00008 -3486770,27bd0028 -3486774,27bdffd8 -3486778,afbf0024 -348677c,afb10020 -3486780,afb0001c -3486784,808025 +34864e0,27bd0028 +34864e4,44860000 +34864e8,24020063 +34864ec,54820005 +34864f0,84a20000 +34864f4,3c028040 +34864f8,c44276c4 +34864fc,3e00008 +3486500,46020002 +3486504,240300f1 +3486508,54430008 +348650c,24030015 +3486510,24020046 +3486514,1082000d +3486518,2402002f +348651c,1482000e +3486520,3c028040 +3486524,3e00008 +3486528,c44076c0 +348652c,1443000a +3486530,24020011 +3486534,90a3001d +3486538,14620007 +348653c,3c028040 +3486540,c44276c4 +3486544,3e00008 +3486548,46020002 +348654c,3c028040 +3486550,3e00008 +3486554,c44076c0 +3486558,3e00008 +3486560,27bdffd8 +3486564,afbf001c +3486568,afb20018 +348656c,afb10014 +3486570,afb00010 +3486574,f7b40020 +3486578,48202 +348657c,afa40028 +3486580,a08825 +3486584,c09025 +3486588,4487a000 +348658c,108600 +3486590,108603 +3486594,c1018d4 +3486598,42402 +348659c,c1018ec +34865a0,402025 +34865a4,4406a000 +34865a8,2202825 +34865ac,c101939 +34865b0,2002025 +34865b4,c1018ff +34865b8,46000306 +34865bc,2604ffff +34865c0,2403025 +34865c4,2202825 +34865c8,42600 +34865cc,c101919 +34865d0,42603 +34865d4,8fbf001c +34865d8,8fb20018 +34865dc,8fb10014 +34865e0,8fb00010 +34865e4,d7b40020 +34865e8,3e00008 +34865ec,27bd0028 +34865f0,27bdffe0 +34865f4,afbf001c +34865f8,afb10018 +34865fc,afb00014 +3486600,3c108041 +3486604,261099d4 +3486608,26110040 +348660c,a6000000 +3486610,c101d6b +3486614,24041e70 +3486618,ae020004 +348661c,26100008 +3486620,5611fffb +3486624,a6000000 +3486628,8fbf001c +348662c,8fb10018 +3486630,8fb00014 +3486634,3e00008 +3486638,27bd0020 +348663c,3c028041 +3486640,a44099d4 +3486644,244299d4 +3486648,a4400008 +348664c,a4400010 +3486650,a4400018 +3486654,a4400020 +3486658,a4400028 +348665c,a4400030 +3486660,3e00008 +3486664,a4400038 +3486668,27bdffe8 +348666c,afbf0014 +3486670,afb00010 +3486674,afa5001c +3486678,10a0000e +348667c,afa60020 +3486680,808025 +3486684,93a40023 +3486688,50800002 +348668c,97a40020 +3486690,3084ffff +3486694,c101775 +348669c,c101766 +34866a0,402025 +34866a4,94430004 +34866a8,a6030000 +34866ac,80420006 +34866b0,a2020002 +34866b4,8fbf0014 +34866b8,8fb00010 +34866bc,3e00008 +34866c0,27bd0018 +34866c4,27bdffe0 +34866c8,afbf001c +34866cc,afb00018 +34866d0,808025 +34866d4,30e700ff +34866d8,90c600a5 +34866dc,c101249 +34866e0,27a40010 +34866e4,8fa50010 +34866e8,8fa60014 +34866ec,c10199a +34866f0,2002025 +34866f4,8fbf001c +34866f8,8fb00018 +34866fc,3e00008 +3486700,27bd0020 +3486704,27bdffd8 +3486708,afbf0024 +348670c,afb10020 +3486710,afb0001c +3486714,808025 +3486718,a08825 +348671c,3c028040 +3486720,8c427698 +3486724,afa20010 +3486728,3825 +348672c,a03025 +3486730,802825 +3486734,c1019b1 +3486738,27a40010 +348673c,3c028040 +3486740,8c4776c8 +3486744,2203025 +3486748,2002825 +348674c,c101958 +3486750,8fa40010 +3486754,8fbf0024 +3486758,8fb10020 +348675c,8fb0001c +3486760,3e00008 +3486764,27bd0028 +3486768,27bdffd8 +348676c,afbf0024 +3486770,afb10020 +3486774,afb0001c +3486778,808025 +348677c,9083001d +3486780,24020011 +3486784,10620007 3486788,a08825 -348678c,3c028040 -3486790,8c427624 -3486794,afa20010 -3486798,2407004f -348679c,a03025 -34867a0,802825 -34867a4,c101992 -34867a8,27a40010 -34867ac,3c028040 -34867b0,8c477650 -34867b4,2203025 -34867b8,2002825 -34867bc,c101939 -34867c0,8fa40010 -34867c4,8fbf0024 -34867c8,8fb10020 -34867cc,8fb0001c -34867d0,3e00008 -34867d4,27bd0028 -34867d8,27bdffd8 -34867dc,afbf0024 -34867e0,afb10020 -34867e4,afb0001c -34867e8,808025 -34867ec,a08825 -34867f0,3c028040 -34867f4,8c427628 -34867f8,afa20010 -34867fc,3825 -3486800,a03025 -3486804,802825 -3486808,c101992 -348680c,27a40010 -3486810,3c028040 -3486814,8c477654 -3486818,2203025 -348681c,2002825 -3486820,c101939 -3486824,8fa40010 -3486828,8fbf0024 -348682c,8fb10020 -3486830,8fb0001c -3486834,3e00008 -3486838,27bd0028 -348683c,27bdffd8 -3486840,afbf0024 -3486844,afb10020 -3486848,afb0001c -348684c,808025 -3486850,a08825 -3486854,3c028040 -3486858,8c42762c -348685c,afa20010 -3486860,2407000c -3486864,a03025 -3486868,802825 -348686c,c101992 -3486870,27a40010 -3486874,3c028040 -3486878,8c477658 -348687c,2203025 -3486880,2002825 -3486884,c101939 -3486888,8fa40010 -348688c,8fbf0024 -3486890,8fb10020 -3486894,8fb0001c -3486898,3e00008 -348689c,27bd0028 -34868a0,27bdffd0 -34868a4,afbf002c -34868a8,afb10028 -34868ac,afb00024 -34868b0,808025 -34868b4,afa00010 -34868b8,afa00014 -34868bc,9482001c -34868c0,24030001 -34868c4,14430008 -34868c8,a08825 -34868cc,24070015 -34868d0,90a600a5 -34868d4,802825 -34868d8,c101249 -34868dc,27a40010 -34868e0,10000012 -34868e4,afa00018 -34868e8,24030007 -34868ec,14430008 -34868f0,24030a0c -34868f4,24070058 -34868f8,90a600a5 -34868fc,802825 -3486900,c101249 -3486904,27a40010 -3486908,10000008 -348690c,afa00018 -3486910,54430006 -3486914,afa00018 -3486918,3c050010 -348691c,34a5010a -3486920,c101220 -3486924,27a40010 -3486928,afa00018 -348692c,8fa50010 -3486930,8fa60014 -3486934,c10197b -3486938,27a40018 -348693c,97a20018 -3486940,10400008 -3486944,2203025 -3486948,3c028040 -348694c,8c477644 -3486950,2002825 -3486954,c101939 -3486958,8fa40018 -348695c,10000005 -3486960,8fbf002c -3486964,2002825 -3486968,c1018fa -348696c,82040141 -3486970,8fbf002c -3486974,8fb10028 -3486978,8fb00024 -348697c,3e00008 -3486980,27bd0030 -3486984,27bdffd0 -3486988,afbf002c -348698c,afb10028 -3486990,afb00024 -3486994,808025 -3486998,afa00010 -348699c,afa00014 -34869a0,9482001c -34869a4,10400004 -34869a8,a08825 -34869ac,24030005 -34869b0,54430007 -34869b4,afa00018 -34869b8,24070034 -34869bc,922600a5 -34869c0,2002825 -34869c4,c101249 -34869c8,27a40010 -34869cc,afa00018 -34869d0,8fa50010 -34869d4,8fa60014 -34869d8,c10197b -34869dc,27a40018 -34869e0,97a20018 -34869e4,10400008 -34869e8,2203025 -34869ec,3c028040 -34869f0,8c477644 -34869f4,2002825 -34869f8,c101939 -34869fc,8fa40018 -3486a00,10000005 -3486a04,8fbf002c -3486a08,2002825 -3486a0c,c1018fa -3486a10,82040147 -3486a14,8fbf002c -3486a18,8fb10028 -3486a1c,8fb00024 -3486a20,3e00008 -3486a24,27bd0030 -3486a28,27bdffd8 -3486a2c,afbf0024 -3486a30,afb10020 -3486a34,afb0001c -3486a38,808025 -3486a3c,a08825 -3486a40,3c028040 -3486a44,8c42761c -3486a48,afa20010 -3486a4c,2407003e -3486a50,a03025 -3486a54,802825 -3486a58,c101992 -3486a5c,27a40010 -3486a60,3c028040 -3486a64,8c477644 -3486a68,2203025 -3486a6c,2002825 -3486a70,c101939 -3486a74,8fa40010 -3486a78,8fbf0024 -3486a7c,8fb10020 -3486a80,8fb0001c -3486a84,3e00008 -3486a88,27bd0028 -3486a8c,801025 -3486a90,14c00002 -3486a94,a6001b -3486a98,7000d -3486a9c,1810 -3486aa0,44830000 -3486aa4,4610004 -3486aa8,46800121 -3486aac,3c038040 -3486ab0,d4607668 -3486ab4,46202100 -3486ab8,46202120 -3486abc,44860000 -3486ac0,4c10004 -3486ac4,468000a1 -3486ac8,3c038040 -3486acc,d4607668 -3486ad0,46201080 -3486ad4,462010a0 -3486ad8,46022103 -3486adc,3c038040 -3486ae0,c466765c -3486ae4,46043181 -3486ae8,14c00002 -3486aec,a6001b -3486af0,7000d -3486af4,2812 -3486af8,3c03aaaa -3486afc,3463aaab -3486b00,a30019 -3486b04,1810 -3486b08,31882 -3486b0c,32040 -3486b10,831821 -3486b14,31840 -3486b18,a31823 -3486b1c,32040 -3486b20,831821 -3486b24,3c048041 -3486b28,24848828 -3486b2c,832821 -3486b30,24630003 -3486b34,832021 -3486b38,90a30001 -3486b3c,44830000 -3486b44,468000a0 -3486b48,46061082 -3486b4c,90830001 -3486b50,44830000 -3486b58,46800020 -3486b5c,46040002 -3486b60,46001080 -3486b64,3c038040 -3486b68,c4607660 -3486b6c,4602003e -3486b74,45030005 -3486b78,46001081 -3486b7c,4600100d -3486b80,44030000 -3486b84,10000006 -3486b88,306700ff -3486b8c,4600100d -3486b90,44030000 -3486b94,3c068000 -3486b98,661825 -3486b9c,306700ff -3486ba0,90a30002 -3486ba4,44830000 -3486bac,46800020 -3486bb0,46060002 -3486bb4,90830002 -3486bb8,44831000 -3486bc0,468010a0 -3486bc4,46041082 -3486bc8,46020000 -3486bcc,3c038040 -3486bd0,c4627660 -3486bd4,4600103e -3486bdc,45030005 -3486be0,46020001 -3486be4,4600000d -3486be8,44030000 -3486bec,10000006 -3486bf0,306300ff -3486bf4,4600000d -3486bf8,44030000 -3486bfc,3c068000 -3486c00,661825 -3486c04,306300ff -3486c08,90a60000 -3486c0c,44860000 -3486c14,46800020 -3486c18,46060002 -3486c1c,90850000 -3486c20,44851000 -3486c28,468010a0 -3486c2c,46041102 -3486c30,46040000 -3486c34,3c048040 -3486c38,c4827660 -3486c3c,4600103e -3486c44,45030005 -3486c48,46020001 -3486c4c,4600000d -3486c50,44050000 -3486c54,10000006 -3486c58,a0450000 -3486c5c,4600000d -3486c60,44050000 -3486c64,3c048000 -3486c68,a42825 -3486c6c,a0450000 -3486c70,a0470001 -3486c74,3e00008 -3486c78,a0430002 -3486c7c,27bdffe0 -3486c80,afbf001c -3486c84,3c028041 -3486c88,8c458918 -3486c8c,24a50001 -3486c90,ac458918 -3486c94,3c028040 -3486c98,9042086f -3486c9c,1040000e -3486ca0,3c028040 -3486ca4,2406000c -3486ca8,c101aa3 -3486cac,27a40010 -3486cb0,3c028011 -3486cb4,97a30010 -3486cb8,a4435dd2 -3486cbc,93a30012 -3486cc0,a0435dd4 -3486cc4,97a30010 -3486cc8,a4435dda -3486ccc,93a30012 -3486cd0,a0435ddc -3486cd4,3c028040 -3486cd8,90420870 -3486cdc,10400010 -3486ce0,8fbf001c -3486ce4,2406000a -3486ce8,3c028041 -3486cec,8c458918 -3486cf0,c101aa3 -3486cf4,27a40010 -3486cf8,3c028011 -3486cfc,97a30010 -3486d00,a4435dce -3486d04,93a30012 -3486d08,a0435dd0 -3486d0c,97a30010 -3486d10,a4435dd6 -3486d14,93a30012 -3486d18,a0435dd8 -3486d1c,8fbf001c -3486d20,3e00008 -3486d24,27bd0020 -3486d28,3c028011 -3486d2c,3442a5d0 -3486d30,24030140 -3486d34,a4431424 -3486d38,90440032 -3486d3c,41840 -3486d40,641821 -3486d44,31900 -3486d48,3e00008 -3486d4c,a0430033 -3486d50,24a20002 -3486d54,24a50082 -3486d58,24065700 -3486d5c,24070004 -3486d60,9443fffe -3486d64,50660008 -3486d68,24420004 -3486d6c,50600006 -3486d70,24420004 -3486d74,94430000 -3486d78,2c630004 -3486d7c,54600001 -3486d80,a4470000 -3486d84,24420004 -3486d88,5445fff6 -3486d8c,9443fffe -3486d90,3e00008 -3486d98,27bdffe8 -3486d9c,afbf0014 -3486da0,c101d4c -3486da4,24040400 -3486da8,3c038041 -3486dac,ac62891c -3486db0,3c038041 -3486db4,ac628920 -3486db8,8fbf0014 -3486dbc,3e00008 -3486dc0,27bd0018 -3486dc4,80820000 -3486dc8,10400026 -3486dcc,24870001 -3486dd0,3c038041 -3486dd4,8c68891c -3486dd8,25080400 -3486ddc,3c038041 -3486de0,8c638920 -3486de4,5825 -3486de8,3c0aff00 -3486dec,254a0fff -3486df0,30c60fff -3486df4,240df000 -3486df8,3c098040 -3486dfc,252977f0 -3486e00,240c0001 -3486e04,68202b -3486e08,54800005 -3486e0c,a0620000 -3486e10,11600014 -3486e14,3c028041 -3486e18,3e00008 -3486e1c,ac438920 -3486e20,30a20fff -3486e24,22300 -3486e28,8c620000 -3486e2c,4a1024 -3486e30,441025 -3486e34,4d1024 -3486e38,461025 -3486e3c,ac620000 -3486e40,24630004 -3486e44,95220004 -3486e48,a22821 -3486e4c,24e70001 -3486e50,80e2ffff -3486e54,1440ffeb -3486e58,1805825 -3486e5c,3c028041 -3486e60,ac438920 -3486e64,3e00008 -3486e6c,27bdffb8 -3486e70,afbf0044 -3486e74,afbe0040 -3486e78,afb7003c -3486e7c,afb60038 -3486e80,afb50034 -3486e84,afb40030 -3486e88,afb3002c -3486e8c,afb20028 -3486e90,afb10024 -3486e94,afb00020 -3486e98,80a825 -3486e9c,b025 -3486ea0,9025 -3486ea4,3c148040 -3486ea8,269477f0 -3486eac,3c1e8041 -3486eb0,3c138041 -3486eb4,280b825 -3486eb8,24070012 -3486ebc,2c03025 -3486ec0,2802825 -3486ec4,c101486 -3486ec8,2a02025 -3486ecc,8fd0891c -3486ed0,8e628920 -3486ed4,202102b -3486ed8,10400025 -3486edc,3c0238e3 -3486ee0,34518e39 -3486ee4,82020000 -3486ee8,2002825 -3486eec,2442ffe0 -3486ef0,510018 -3486ef4,1810 -3486ef8,31883 -3486efc,227c3 -3486f00,641823 -3486f04,14720016 -3486f08,26100004 -3486f0c,8ca70000 -3486f10,73b02 -3486f14,510018 -3486f18,3010 -3486f1c,63083 -3486f20,c43023 -3486f24,618c0 -3486f28,663021 -3486f2c,63040 -3486f30,96830006 -3486f34,afa30018 -3486f38,96830004 -3486f3c,afa30014 -3486f40,8ca30000 -3486f44,30630fff -3486f48,afa30010 -3486f4c,30e70fff -3486f50,463023 -3486f54,2e02825 -3486f58,c1014ee -3486f5c,2a02025 -3486f60,8e628920 -3486f64,202102b -3486f68,5440ffdf -3486f6c,82020000 -3486f70,26520001 -3486f74,24020006 -3486f78,1642ffcf -3486f7c,26d60012 -3486f80,3c028041 -3486f84,8c43891c -3486f88,3c028041 -3486f8c,ac438920 -3486f90,8fbf0044 -3486f94,8fbe0040 -3486f98,8fb7003c -3486f9c,8fb60038 -3486fa0,8fb50034 -3486fa4,8fb40030 -3486fa8,8fb3002c -3486fac,8fb20028 -3486fb0,8fb10024 -3486fb4,8fb00020 -3486fb8,3e00008 -3486fbc,27bd0048 -3486fc0,3c028041 -3486fc4,24030001 -3486fc8,ac438928 -3486fcc,3c038041 -3486fd0,8c62892c -3486fd4,2c440006 -3486fd8,50800001 -3486fdc,24020005 -3486fe0,3e00008 -3486fe4,ac62892c -3486fe8,3c028041 -3486fec,94428924 -3486ff0,10400148 -3486ff4,3c02801d -3486ff8,27bdffb8 -3486ffc,afbf0044 -3487000,afbe0040 -3487004,afb6003c -3487008,afb50038 -348700c,afb40034 -3487010,afb30030 -3487014,afb2002c -3487018,afb10028 -348701c,afb00024 -3487020,3a0f025 -3487024,3442aa30 -3487028,8c42066c -348702c,3c033000 -3487030,24630483 -3487034,431024 -3487038,1440012a -348703c,808025 -3487040,3c02801c -3487044,344284a0 -3487048,8c430008 -348704c,3c02800f -3487050,8c4213ec -3487054,14620123 -3487058,3c028011 -348705c,3442a5d0 -3487060,8c45135c -3487064,14a0011f -3487068,3c02800e -348706c,3442f1b0 -3487070,8c420000 -3487074,30420020 -3487078,1440011a -348707c,3c028041 -3487080,8c438928 -3487084,24020001 -3487088,1062000a -348708c,3c02801c -3487090,344284a0 -3487094,3c030001 -3487098,431021 -348709c,94430934 -34870a0,24020006 -34870a4,1462010f -34870a8,3c038041 -34870ac,1000000a -34870b0,8c62892c -34870b4,344284a0 -34870b8,3c030001 -34870bc,431021 -34870c0,94430934 -34870c4,24020006 -34870c8,14620007 -34870cc,3c028041 -34870d0,3c038041 -34870d4,8c62892c -34870d8,3042001f -34870dc,ac62892c -34870e0,10000022 -34870e4,241300ff -34870e8,8c42892c -34870ec,2c430006 -34870f0,1060000a -34870f4,2c43006a -34870f8,29a00 -34870fc,2629823 -3487100,3c02cccc -3487104,3442cccd -3487108,2620019 -348710c,9810 -3487110,139882 -3487114,10000015 -3487118,327300ff -348711c,14600013 -3487120,241300ff -3487124,2c4300ba -3487128,1060000b -348712c,29a00 -3487130,2629823 -3487134,26739769 -3487138,3c02cccc -348713c,3442cccd -3487140,2620019 -3487144,9810 -3487148,139982 -348714c,139827 -3487150,10000006 -3487154,327300ff -3487158,3c028041 -348715c,ac408928 -3487160,3c028041 -3487164,100000df -3487168,ac40892c -348716c,3c038041 -3487170,8c62892c -3487174,24420001 -3487178,ac62892c -348717c,3c028011 -3487180,3442a5d0 -3487184,8c4808c4 -3487188,19000011 -348718c,1001025 -3487190,a04825 -3487194,3c066666 -3487198,24c66667 -348719c,25290001 -34871a0,401825 -34871a4,460018 -34871a8,2010 -34871ac,42083 -34871b0,217c3 -34871b4,2863000a -34871b8,1060fff8 -34871bc,821023 -34871c0,15200005 -34871c4,3c028041 -34871c8,10000002 -34871cc,24090001 -34871d0,24090001 +348678c,3c028001 +3486790,24423268 +3486794,40f809 +348679c,10000010 +34867a0,8fbf0024 +34867a4,3c028040 +34867a8,8c42769c +34867ac,afa20010 +34867b0,3825 +34867b4,a03025 +34867b8,802825 +34867bc,c1019b1 +34867c0,27a40010 +34867c4,3c028040 +34867c8,8c4776c8 +34867cc,2203025 +34867d0,2002825 +34867d4,c101958 +34867d8,8fa40010 +34867dc,8fbf0024 +34867e0,8fb10020 +34867e4,8fb0001c +34867e8,3e00008 +34867ec,27bd0028 +34867f0,27bdffd8 +34867f4,afbf0024 +34867f8,afb10020 +34867fc,afb0001c +3486800,808025 +3486804,a08825 +3486808,3c028040 +348680c,8c4276a0 +3486810,afa20010 +3486814,2407004f +3486818,a03025 +348681c,802825 +3486820,c1019b1 +3486824,27a40010 +3486828,3c028040 +348682c,8c4776cc +3486830,2203025 +3486834,2002825 +3486838,c101958 +348683c,8fa40010 +3486840,8fbf0024 +3486844,8fb10020 +3486848,8fb0001c +348684c,3e00008 +3486850,27bd0028 +3486854,27bdffd8 +3486858,afbf0024 +348685c,afb10020 +3486860,afb0001c +3486864,808025 +3486868,a08825 +348686c,3c028040 +3486870,8c4276a4 +3486874,afa20010 +3486878,3825 +348687c,a03025 +3486880,802825 +3486884,c1019b1 +3486888,27a40010 +348688c,3c028040 +3486890,8c4776d0 +3486894,2203025 +3486898,2002825 +348689c,c101958 +34868a0,8fa40010 +34868a4,8fbf0024 +34868a8,8fb10020 +34868ac,8fb0001c +34868b0,3e00008 +34868b4,27bd0028 +34868b8,27bdffd8 +34868bc,afbf0024 +34868c0,afb10020 +34868c4,afb0001c +34868c8,808025 +34868cc,a08825 +34868d0,3c028040 +34868d4,8c4276a8 +34868d8,afa20010 +34868dc,2407000c +34868e0,a03025 +34868e4,802825 +34868e8,c1019b1 +34868ec,27a40010 +34868f0,3c028040 +34868f4,8c4776d4 +34868f8,2203025 +34868fc,2002825 +3486900,c101958 +3486904,8fa40010 +3486908,8fbf0024 +348690c,8fb10020 +3486910,8fb0001c +3486914,3e00008 +3486918,27bd0028 +348691c,27bdffd0 +3486920,afbf002c +3486924,afb10028 +3486928,afb00024 +348692c,808025 +3486930,afa00010 +3486934,afa00014 +3486938,9482001c +348693c,24030001 +3486940,14430008 +3486944,a08825 +3486948,24070015 +348694c,90a600a5 +3486950,802825 +3486954,c101249 +3486958,27a40010 +348695c,10000012 +3486960,afa00018 +3486964,24030007 +3486968,14430008 +348696c,24030a0c +3486970,24070058 +3486974,90a600a5 +3486978,802825 +348697c,c101249 +3486980,27a40010 +3486984,10000008 +3486988,afa00018 +348698c,54430006 +3486990,afa00018 +3486994,3c050010 +3486998,34a5010a +348699c,c101220 +34869a0,27a40010 +34869a4,afa00018 +34869a8,8fa50010 +34869ac,8fa60014 +34869b0,c10199a +34869b4,27a40018 +34869b8,97a20018 +34869bc,10400008 +34869c0,2203025 +34869c4,3c028040 +34869c8,8c4776c0 +34869cc,2002825 +34869d0,c101958 +34869d4,8fa40018 +34869d8,10000005 +34869dc,8fbf002c +34869e0,2002825 +34869e4,c101919 +34869e8,82040141 +34869ec,8fbf002c +34869f0,8fb10028 +34869f4,8fb00024 +34869f8,3e00008 +34869fc,27bd0030 +3486a00,27bdffd0 +3486a04,afbf002c +3486a08,afb10028 +3486a0c,afb00024 +3486a10,808025 +3486a14,afa00010 +3486a18,afa00014 +3486a1c,9482001c +3486a20,10400004 +3486a24,a08825 +3486a28,24030005 +3486a2c,54430007 +3486a30,afa00018 +3486a34,24070034 +3486a38,922600a5 +3486a3c,2002825 +3486a40,c101249 +3486a44,27a40010 +3486a48,afa00018 +3486a4c,8fa50010 +3486a50,8fa60014 +3486a54,c10199a +3486a58,27a40018 +3486a5c,97a20018 +3486a60,10400008 +3486a64,2203025 +3486a68,3c028040 +3486a6c,8c4776c0 +3486a70,2002825 +3486a74,c101958 +3486a78,8fa40018 +3486a7c,10000005 +3486a80,8fbf002c +3486a84,2002825 +3486a88,c101919 +3486a8c,82040147 +3486a90,8fbf002c +3486a94,8fb10028 +3486a98,8fb00024 +3486a9c,3e00008 +3486aa0,27bd0030 +3486aa4,27bdffd8 +3486aa8,afbf0024 +3486aac,afb10020 +3486ab0,afb0001c +3486ab4,808025 +3486ab8,a08825 +3486abc,3c028040 +3486ac0,8c427698 +3486ac4,afa20010 +3486ac8,2407003e +3486acc,a03025 +3486ad0,802825 +3486ad4,c1019b1 +3486ad8,27a40010 +3486adc,3c028040 +3486ae0,8c4776c0 +3486ae4,2203025 +3486ae8,2002825 +3486aec,c101958 +3486af0,8fa40010 +3486af4,8fbf0024 +3486af8,8fb10020 +3486afc,8fb0001c +3486b00,3e00008 +3486b04,27bd0028 +3486b08,801025 +3486b0c,14c00002 +3486b10,a6001b +3486b14,7000d +3486b18,1810 +3486b1c,44830000 +3486b20,4610004 +3486b24,46800121 +3486b28,3c038040 +3486b2c,d46076e0 +3486b30,46202100 +3486b34,46202120 +3486b38,44860000 +3486b3c,4c10004 +3486b40,468000a1 +3486b44,3c038040 +3486b48,d46076e0 +3486b4c,46201080 +3486b50,462010a0 +3486b54,46022103 +3486b58,3c038040 +3486b5c,c46676d8 +3486b60,46043181 +3486b64,14c00002 +3486b68,a6001b +3486b6c,7000d +3486b70,2812 +3486b74,3c03aaaa +3486b78,3463aaab +3486b7c,a30019 +3486b80,1810 +3486b84,31882 +3486b88,32040 +3486b8c,831821 +3486b90,31840 +3486b94,a31823 +3486b98,32040 +3486b9c,831821 +3486ba0,3c048041 +3486ba4,248488a0 +3486ba8,832821 +3486bac,24630003 +3486bb0,832021 +3486bb4,90a30001 +3486bb8,44830000 +3486bc0,468000a0 +3486bc4,46061082 +3486bc8,90830001 +3486bcc,44830000 +3486bd4,46800020 +3486bd8,46040002 +3486bdc,46001080 +3486be0,3c038040 +3486be4,c46076dc +3486be8,4602003e +3486bf0,45030005 +3486bf4,46001081 +3486bf8,4600100d +3486bfc,44030000 +3486c00,10000006 +3486c04,306700ff +3486c08,4600100d +3486c0c,44030000 +3486c10,3c068000 +3486c14,661825 +3486c18,306700ff +3486c1c,90a30002 +3486c20,44830000 +3486c28,46800020 +3486c2c,46060002 +3486c30,90830002 +3486c34,44831000 +3486c3c,468010a0 +3486c40,46041082 +3486c44,46020000 +3486c48,3c038040 +3486c4c,c46276dc +3486c50,4600103e +3486c58,45030005 +3486c5c,46020001 +3486c60,4600000d +3486c64,44030000 +3486c68,10000006 +3486c6c,306300ff +3486c70,4600000d +3486c74,44030000 +3486c78,3c068000 +3486c7c,661825 +3486c80,306300ff +3486c84,90a60000 +3486c88,44860000 +3486c90,46800020 +3486c94,46060002 +3486c98,90850000 +3486c9c,44851000 +3486ca4,468010a0 +3486ca8,46041102 +3486cac,46040000 +3486cb0,3c048040 +3486cb4,c48276dc +3486cb8,4600103e +3486cc0,45030005 +3486cc4,46020001 +3486cc8,4600000d +3486ccc,44050000 +3486cd0,10000006 +3486cd4,a0450000 +3486cd8,4600000d +3486cdc,44050000 +3486ce0,3c048000 +3486ce4,a42825 +3486ce8,a0450000 +3486cec,a0470001 +3486cf0,3e00008 +3486cf4,a0430002 +3486cf8,27bdffe0 +3486cfc,afbf001c +3486d00,3c028041 +3486d04,8c458990 +3486d08,24a50001 +3486d0c,ac458990 +3486d10,3c028040 +3486d14,9042086f +3486d18,1040000e +3486d1c,3c028040 +3486d20,2406000c +3486d24,c101ac2 +3486d28,27a40010 +3486d2c,3c028011 +3486d30,97a30010 +3486d34,a4435dd2 +3486d38,93a30012 +3486d3c,a0435dd4 +3486d40,97a30010 +3486d44,a4435dda +3486d48,93a30012 +3486d4c,a0435ddc +3486d50,3c028040 +3486d54,90420870 +3486d58,10400010 +3486d5c,8fbf001c +3486d60,2406000a +3486d64,3c028041 +3486d68,8c458990 +3486d6c,c101ac2 +3486d70,27a40010 +3486d74,3c028011 +3486d78,97a30010 +3486d7c,a4435dce +3486d80,93a30012 +3486d84,a0435dd0 +3486d88,97a30010 +3486d8c,a4435dd6 +3486d90,93a30012 +3486d94,a0435dd8 +3486d98,8fbf001c +3486d9c,3e00008 +3486da0,27bd0020 +3486da4,3c028011 +3486da8,3442a5d0 +3486dac,24030140 +3486db0,a4431424 +3486db4,90440032 +3486db8,41840 +3486dbc,641821 +3486dc0,31900 +3486dc4,3e00008 +3486dc8,a0430033 +3486dcc,24a20002 +3486dd0,24a50082 +3486dd4,24065700 +3486dd8,24070004 +3486ddc,9443fffe +3486de0,50660008 +3486de4,24420004 +3486de8,50600006 +3486dec,24420004 +3486df0,94430000 +3486df4,2c630004 +3486df8,54600001 +3486dfc,a4470000 +3486e00,24420004 +3486e04,5445fff6 +3486e08,9443fffe +3486e0c,3e00008 +3486e14,27bdffe8 +3486e18,afbf0014 +3486e1c,c101d6b +3486e20,24040400 +3486e24,3c038041 +3486e28,ac628994 +3486e2c,3c038041 +3486e30,ac628998 +3486e34,8fbf0014 +3486e38,3e00008 +3486e3c,27bd0018 +3486e40,80820000 +3486e44,10400026 +3486e48,24870001 +3486e4c,3c038041 +3486e50,8c688994 +3486e54,25080400 +3486e58,3c038041 +3486e5c,8c638998 +3486e60,5825 +3486e64,3c0aff00 +3486e68,254a0fff +3486e6c,30c60fff +3486e70,240df000 +3486e74,3c098040 +3486e78,25297868 +3486e7c,240c0001 +3486e80,68202b +3486e84,54800005 +3486e88,a0620000 +3486e8c,11600014 +3486e90,3c028041 +3486e94,3e00008 +3486e98,ac438998 +3486e9c,30a20fff +3486ea0,22300 +3486ea4,8c620000 +3486ea8,4a1024 +3486eac,441025 +3486eb0,4d1024 +3486eb4,461025 +3486eb8,ac620000 +3486ebc,24630004 +3486ec0,95220004 +3486ec4,a22821 +3486ec8,24e70001 +3486ecc,80e2ffff +3486ed0,1440ffeb +3486ed4,1805825 +3486ed8,3c028041 +3486edc,ac438998 +3486ee0,3e00008 +3486ee8,27bdffb8 +3486eec,afbf0044 +3486ef0,afbe0040 +3486ef4,afb7003c +3486ef8,afb60038 +3486efc,afb50034 +3486f00,afb40030 +3486f04,afb3002c +3486f08,afb20028 +3486f0c,afb10024 +3486f10,afb00020 +3486f14,80a825 +3486f18,b025 +3486f1c,9025 +3486f20,3c148040 +3486f24,26947868 +3486f28,3c1e8041 +3486f2c,3c138041 +3486f30,280b825 +3486f34,24070012 +3486f38,2c03025 +3486f3c,2802825 +3486f40,c101486 +3486f44,2a02025 +3486f48,8fd08994 +3486f4c,8e628998 +3486f50,202102b +3486f54,10400025 +3486f58,3c0238e3 +3486f5c,34518e39 +3486f60,82020000 +3486f64,2002825 +3486f68,2442ffe0 +3486f6c,510018 +3486f70,1810 +3486f74,31883 +3486f78,227c3 +3486f7c,641823 +3486f80,14720016 +3486f84,26100004 +3486f88,8ca70000 +3486f8c,73b02 +3486f90,510018 +3486f94,3010 +3486f98,63083 +3486f9c,c43023 +3486fa0,618c0 +3486fa4,663021 +3486fa8,63040 +3486fac,96830006 +3486fb0,afa30018 +3486fb4,96830004 +3486fb8,afa30014 +3486fbc,8ca30000 +3486fc0,30630fff +3486fc4,afa30010 +3486fc8,30e70fff +3486fcc,463023 +3486fd0,2e02825 +3486fd4,c1014ee +3486fd8,2a02025 +3486fdc,8e628998 +3486fe0,202102b +3486fe4,5440ffdf +3486fe8,82020000 +3486fec,26520001 +3486ff0,24020006 +3486ff4,1642ffcf +3486ff8,26d60012 +3486ffc,3c028041 +3487000,8c438994 +3487004,3c028041 +3487008,ac438998 +348700c,8fbf0044 +3487010,8fbe0040 +3487014,8fb7003c +3487018,8fb60038 +348701c,8fb50034 +3487020,8fb40030 +3487024,8fb3002c +3487028,8fb20028 +348702c,8fb10024 +3487030,8fb00020 +3487034,3e00008 +3487038,27bd0048 +348703c,3c028041 +3487040,24030001 +3487044,ac4389a0 +3487048,3c038041 +348704c,8c6289a4 +3487050,2c440006 +3487054,50800001 +3487058,24020005 +348705c,3e00008 +3487060,ac6289a4 +3487064,3c028041 +3487068,9442899c +348706c,10400148 +3487070,3c02801d +3487074,27bdffb8 +3487078,afbf0044 +348707c,afbe0040 +3487080,afb6003c +3487084,afb50038 +3487088,afb40034 +348708c,afb30030 +3487090,afb2002c +3487094,afb10028 +3487098,afb00024 +348709c,3a0f025 +34870a0,3442aa30 +34870a4,8c42066c +34870a8,3c033000 +34870ac,24630483 +34870b0,431024 +34870b4,1440012a +34870b8,808025 +34870bc,3c02801c +34870c0,344284a0 +34870c4,8c430008 +34870c8,3c02800f +34870cc,8c4213ec +34870d0,14620123 +34870d4,3c028011 +34870d8,3442a5d0 +34870dc,8c45135c +34870e0,14a0011f +34870e4,3c02800e +34870e8,3442f1b0 +34870ec,8c420000 +34870f0,30420020 +34870f4,1440011a +34870f8,3c028041 +34870fc,8c4389a0 +3487100,24020001 +3487104,1062000a +3487108,3c02801c +348710c,344284a0 +3487110,3c030001 +3487114,431021 +3487118,94430934 +348711c,24020006 +3487120,1462010f +3487124,3c038041 +3487128,1000000a +348712c,8c6289a4 +3487130,344284a0 +3487134,3c030001 +3487138,431021 +348713c,94430934 +3487140,24020006 +3487144,14620007 +3487148,3c028041 +348714c,3c038041 +3487150,8c6289a4 +3487154,3042001f +3487158,ac6289a4 +348715c,10000022 +3487160,241300ff +3487164,8c4289a4 +3487168,2c430006 +348716c,1060000a +3487170,2c43006a +3487174,29a00 +3487178,2629823 +348717c,3c02cccc +3487180,3442cccd +3487184,2620019 +3487188,9810 +348718c,139882 +3487190,10000015 +3487194,327300ff +3487198,14600013 +348719c,241300ff +34871a0,2c4300ba +34871a4,1060000b +34871a8,29a00 +34871ac,2629823 +34871b0,26739769 +34871b4,3c02cccc +34871b8,3442cccd +34871bc,2620019 +34871c0,9810 +34871c4,139982 +34871c8,139827 +34871cc,10000006 +34871d0,327300ff 34871d4,3c028041 -34871d8,944788ca -34871dc,18e00010 -34871e0,e02025 -34871e4,3c066666 -34871e8,24c66667 -34871ec,24a50001 -34871f0,801025 -34871f4,860018 -34871f8,1810 -34871fc,31883 -3487200,427c3 -3487204,2842000a -3487208,1040fff8 -348720c,642023 -3487210,14a00005 -3487214,1251021 -3487218,10000002 -348721c,24050001 -3487220,24050001 -3487224,1251021 -3487228,24540001 -348722c,3c058040 -3487230,24a577f0 -3487234,94b20004 -3487238,2540018 -348723c,9012 -3487240,3c048040 -3487244,248477d0 -3487248,94830004 -348724c,2431821 -3487250,397c2 -3487254,2439021 -3487258,129043 -348725c,129023 -3487260,265200a0 -3487264,94a30006 -3487268,44830000 -3487270,46800021 -3487274,3c038040 -3487278,d4667670 -348727c,46260002 -3487280,3c038040 -3487284,d4627678 -3487288,46201001 -348728c,3c038040 -3487290,d4647680 -3487294,46240000 -3487298,4620000d -348729c,44060000 -34872a0,94830006 -34872a4,44830000 -34872ac,46800021 -34872b0,46260002 -34872b4,46201081 -34872b8,3c038040 -34872bc,d4607688 -34872c0,46201080 -34872c4,46241080 -34872c8,4620100d -34872cc,44110000 -34872d0,3a0a825 -34872d4,24430009 -34872d8,318c2 -34872dc,318c0 -34872e0,3a3e823 -34872e4,27a40020 -34872e8,941821 -34872ec,19200015 -34872f0,a0600000 -34872f4,252affff -34872f8,8a5021 -34872fc,806025 -3487300,3c0b6666 -3487304,256b6667 -3487308,10b0018 -348730c,2810 -3487310,52883 -3487314,81fc3 -3487318,a32823 -348731c,51880 -3487320,651821 -3487324,31840 -3487328,1031823 -348732c,24630030 -3487330,a1430000 -3487334,a04025 -3487338,1401825 -348733c,146cfff2 -3487340,254affff -3487344,891821 -3487348,2405002f -348734c,a0650000 -3487350,122182a -3487354,10600012 -3487358,822821 -348735c,894821 -3487360,3c086666 -3487364,25086667 -3487368,e80018 -348736c,1810 -3487370,31883 -3487374,717c3 -3487378,621823 -348737c,31080 -3487380,431021 -3487384,21040 -3487388,e21023 -348738c,24420030 -3487390,a0a20000 -3487394,24a5ffff -3487398,1525fff3 -348739c,603825 -34873a0,8e020008 -34873a4,24430008 -34873a8,ae030008 -34873ac,3c03de00 -34873b0,ac430000 -34873b4,3c038040 -34873b8,246377a8 -34873bc,ac430004 -34873c0,8e020008 -34873c4,24430008 -34873c8,ae030008 -34873cc,3c03e700 -34873d0,ac430000 -34873d4,ac400004 -34873d8,8e020008 -34873dc,24430008 -34873e0,ae030008 -34873e4,3c03fc11 -34873e8,34639623 -34873ec,ac430000 -34873f0,3c03ff2f -34873f4,3463ffff -34873f8,ac430004 -34873fc,8e030008 -3487400,24620008 -3487404,ae020008 -3487408,3c16fa00 -348740c,ac760000 -3487410,3c02dad3 -3487414,24420b00 -3487418,2621025 -348741c,ac620004 -3487420,c101b71 -3487424,2402825 -3487428,3c028040 -348742c,944277f4 -3487430,540018 -3487434,a012 -3487438,2929021 +34871d8,ac4089a0 +34871dc,3c028041 +34871e0,100000df +34871e4,ac4089a4 +34871e8,3c038041 +34871ec,8c6289a4 +34871f0,24420001 +34871f4,ac6289a4 +34871f8,3c028011 +34871fc,3442a5d0 +3487200,8c4808c4 +3487204,19000011 +3487208,1001025 +348720c,a04825 +3487210,3c066666 +3487214,24c66667 +3487218,25290001 +348721c,401825 +3487220,460018 +3487224,2010 +3487228,42083 +348722c,217c3 +3487230,2863000a +3487234,1060fff8 +3487238,821023 +348723c,15200005 +3487240,3c028041 +3487244,10000002 +3487248,24090001 +348724c,24090001 +3487250,3c028041 +3487254,94478942 +3487258,18e00010 +348725c,e02025 +3487260,3c066666 +3487264,24c66667 +3487268,24a50001 +348726c,801025 +3487270,860018 +3487274,1810 +3487278,31883 +348727c,427c3 +3487280,2842000a +3487284,1040fff8 +3487288,642023 +348728c,14a00005 +3487290,1251021 +3487294,10000002 +3487298,24050001 +348729c,24050001 +34872a0,1251021 +34872a4,24540001 +34872a8,3c058040 +34872ac,24a57868 +34872b0,94b20004 +34872b4,2540018 +34872b8,9012 +34872bc,3c048040 +34872c0,24847848 +34872c4,94830004 +34872c8,2431821 +34872cc,397c2 +34872d0,2439021 +34872d4,129043 +34872d8,129023 +34872dc,265200a0 +34872e0,94a30006 +34872e4,44830000 +34872ec,46800021 +34872f0,3c038040 +34872f4,d46676e8 +34872f8,46260002 +34872fc,3c038040 +3487300,d46276f0 +3487304,46201001 +3487308,3c038040 +348730c,d46476f8 +3487310,46240000 +3487314,4620000d +3487318,44060000 +348731c,94830006 +3487320,44830000 +3487328,46800021 +348732c,46260002 +3487330,46201081 +3487334,3c038040 +3487338,d4607700 +348733c,46201080 +3487340,46241080 +3487344,4620100d +3487348,44110000 +348734c,3a0a825 +3487350,24430009 +3487354,318c2 +3487358,318c0 +348735c,3a3e823 +3487360,27a40020 +3487364,941821 +3487368,19200015 +348736c,a0600000 +3487370,252affff +3487374,8a5021 +3487378,806025 +348737c,3c0b6666 +3487380,256b6667 +3487384,10b0018 +3487388,2810 +348738c,52883 +3487390,81fc3 +3487394,a32823 +3487398,51880 +348739c,651821 +34873a0,31840 +34873a4,1031823 +34873a8,24630030 +34873ac,a1430000 +34873b0,a04025 +34873b4,1401825 +34873b8,146cfff2 +34873bc,254affff +34873c0,891821 +34873c4,2405002f +34873c8,a0650000 +34873cc,122182a +34873d0,10600012 +34873d4,822821 +34873d8,894821 +34873dc,3c086666 +34873e0,25086667 +34873e4,e80018 +34873e8,1810 +34873ec,31883 +34873f0,717c3 +34873f4,621823 +34873f8,31080 +34873fc,431021 +3487400,21040 +3487404,e21023 +3487408,24420030 +348740c,a0a20000 +3487410,24a5ffff +3487414,1525fff3 +3487418,603825 +348741c,8e020008 +3487420,24430008 +3487424,ae030008 +3487428,3c03de00 +348742c,ac430000 +3487430,3c038040 +3487434,24637820 +3487438,ac430004 348743c,8e020008 3487440,24430008 3487444,ae030008 -3487448,ac560000 -348744c,3c03f4ec -3487450,24633000 -3487454,2639825 -3487458,ac530004 -348745c,3c028041 -3487460,8c46892c -3487464,63042 -3487468,24070001 -348746c,30c6000f -3487470,3c138040 -3487474,266577d0 -3487478,c101486 -348747c,2002025 -3487480,266577d0 -3487484,94a20006 -3487488,afa20018 -348748c,94a20004 -3487490,afa20014 -3487494,afb10010 -3487498,2403825 -348749c,3025 -34874a0,c1014ee -34874a4,2002025 -34874a8,c101b9b -34874ac,2002025 -34874b0,8e020008 -34874b4,24430008 -34874b8,ae030008 -34874bc,3c03e900 -34874c0,ac430000 -34874c4,ac400004 -34874c8,8e020008 -34874cc,24430008 -34874d0,ae030008 -34874d4,3c03df00 -34874d8,ac430000 -34874dc,ac400004 -34874e0,2a0e825 -34874e4,3c0e825 -34874e8,8fdf0044 -34874ec,8fbe0040 -34874f0,8fb6003c -34874f4,8fb50038 -34874f8,8fb40034 -34874fc,8fb30030 -3487500,8fb2002c -3487504,8fb10028 -3487508,8fb00024 -348750c,3e00008 -3487510,27bd0048 -3487514,3e00008 -348751c,3c038041 -3487520,3c028050 -3487524,24420000 -3487528,3e00008 -348752c,ac628930 -3487530,3082000f -3487534,10400009 -3487538,3c038041 -348753c,417c3 -3487540,21702 -3487544,821821 -3487548,3063000f -348754c,431023 -3487550,24420010 -3487554,822021 -3487558,3c038041 -348755c,8c628930 -3487560,442021 -3487564,3e00008 -3487568,ac648930 -348756c,27bdffe8 -3487570,afbf0014 -3487574,afb00010 -3487578,808025 -348757c,c101d4c -3487580,8c840008 -3487584,402025 -3487588,ae020000 -348758c,8e060008 -3487590,3c028000 -3487594,24420df0 -3487598,40f809 -348759c,8e050004 -34875a0,8fbf0014 -34875a4,8fb00010 -34875a8,3e00008 -34875ac,27bd0018 -34875b0,33c2 -34875b4,664399c4 -34875b8,cc45ffc6 -34875bc,ff47ffc8 -34875c0,ff49e0ca -34875c4,c24ba3cc -34875c8,854d660d -34875cc,440f2200 -34875d0,85d1a352 -34875d4,c2d3e045 -34875d8,1010101 -34875dc,1010101 -34875e0,1010101 -34875e4,1010101 -34875e8,1010101 -3487604,1010000 -348760c,1010101 -3487610,1000101 -3487614,10101 -3487618,10000 -348761c,bd1400 -3487620,aa0200 -3487624,bd1300 -3487628,15c6300 -348762c,de2f00 -3487630,4d510000 -3487634,4e6f726d -3487638,616c0000 -348763c,bdcccccd -3487640,3dcccccd -3487644,3f800000 -3487648,3f000000 -348764c,41c80000 -3487650,3fa00000 -3487654,40000000 -3487658,40200000 -348765c,3f800000 -3487660,4f000000 -3487668,41f00000 -3487670,3ff80000 -3487678,406e0000 -3487680,3ff00000 -3487688,40080000 -3487690,804075b0 -3487694,10203 -3487698,4050607 -348769c,ffffffff -34876a0,ffff0000 -34876a4,ff00ff -34876a8,3c000064 -34876ac,ffff8200 -34876b0,c832ffc8 -34876b4,c8000000 -34876b8,104465 -34876bc,6b750000 -34876c4,110446f -34876c8,646f6e67 -34876cc,6f000000 -34876d0,2104a61 -34876d4,62750000 -34876dc,3d0466f -34876e0,72657374 -34876e8,4d04669 -34876ec,72650000 -34876f4,5d05761 -34876f8,74657200 -3487700,7d05368 -3487704,61646f77 -348770c,6d05370 -3487710,69726974 -3487718,890426f -348771c,74570000 -3487724,9104963 -3487728,65000000 -3487730,ca04765 -3487734,7275646f -348773c,b804754 -3487740,47000000 -3487748,dc04761 -348774c,6e6f6e00 -3487754,2 -348775c,3f800000 -3487768,1 -348776c,30006 -3487770,70009 -3487774,b000e -3487778,f0010 -348777c,110019 -3487780,1a002b -3487784,2c002e -3487788,300032 -348778c,35003c -3487790,400041 -3487794,460051 -3487798,540109 -348779c,10b010c -34877a0,10e010f -34877a4,1100113 -34877a8,e7000000 -34877b0,d9000000 -34877b8,ed000000 -34877bc,5003c0 -34877c0,ef002cf0 -34877c4,504244 -34877c8,df000000 -34877d4,100010 -34877d8,100301 -34877dc,1000000 -34877e4,200020 -34877e8,10302 -34877ec,2000000 -34877f4,8000e -34877f8,5f0301 -34877fc,1000000 -3487804,180018 -3487808,140003 -348780c,4000000 -3487814,200020 -3487818,5a0003 -348781c,4000000 -3487824,100010 -3487828,60301 -348782c,1000000 -3487834,100010 -3487838,30003 -348783c,4000000 -3487840,c8ff6482 -3487844,82ffff64 -3487848,64ff5aff -3487860,4d8e0032 -3487864,ce2001 -3487868,80405fa8 -348786c,80405abc -3487870,ffffffff -3487874,4d8c0034 -3487878,bb1201 -348787c,80405de0 -3487880,80405abc -3487884,ffffffff -3487888,4d090033 -348788c,d92801 -3487890,80405de0 -3487894,80405abc -3487898,ffffffff -348789c,53030031 -34878a0,e93500 -34878a4,80405de0 -34878a8,80405abc -34878ac,ffffffff -34878b0,53060030 -34878b4,e73300 -34878b8,80405de0 -34878bc,80405abc -34878c0,ffffffff -34878c4,530e0035 -34878c8,e83400 -34878cc,80405de0 -34878d0,80405abc -34878d4,ffffffff -34878d8,4d000037 -34878dc,c71b01 -34878e0,80405de0 +3487448,3c03e700 +348744c,ac430000 +3487450,ac400004 +3487454,8e020008 +3487458,24430008 +348745c,ae030008 +3487460,3c03fc11 +3487464,34639623 +3487468,ac430000 +348746c,3c03ff2f +3487470,3463ffff +3487474,ac430004 +3487478,8e030008 +348747c,24620008 +3487480,ae020008 +3487484,3c16fa00 +3487488,ac760000 +348748c,3c02dad3 +3487490,24420b00 +3487494,2621025 +3487498,ac620004 +348749c,c101b90 +34874a0,2402825 +34874a4,3c028040 +34874a8,9442786c +34874ac,540018 +34874b0,a012 +34874b4,2929021 +34874b8,8e020008 +34874bc,24430008 +34874c0,ae030008 +34874c4,ac560000 +34874c8,3c03f4ec +34874cc,24633000 +34874d0,2639825 +34874d4,ac530004 +34874d8,3c028041 +34874dc,8c4689a4 +34874e0,63042 +34874e4,24070001 +34874e8,30c6000f +34874ec,3c138040 +34874f0,26657848 +34874f4,c101486 +34874f8,2002025 +34874fc,26657848 +3487500,94a20006 +3487504,afa20018 +3487508,94a20004 +348750c,afa20014 +3487510,afb10010 +3487514,2403825 +3487518,3025 +348751c,c1014ee +3487520,2002025 +3487524,c101bba +3487528,2002025 +348752c,8e020008 +3487530,24430008 +3487534,ae030008 +3487538,3c03e900 +348753c,ac430000 +3487540,ac400004 +3487544,8e020008 +3487548,24430008 +348754c,ae030008 +3487550,3c03df00 +3487554,ac430000 +3487558,ac400004 +348755c,2a0e825 +3487560,3c0e825 +3487564,8fdf0044 +3487568,8fbe0040 +348756c,8fb6003c +3487570,8fb50038 +3487574,8fb40034 +3487578,8fb30030 +348757c,8fb2002c +3487580,8fb10028 +3487584,8fb00024 +3487588,3e00008 +348758c,27bd0048 +3487590,3e00008 +3487598,3c038041 +348759c,3c028050 +34875a0,24420000 +34875a4,3e00008 +34875a8,ac6289a8 +34875ac,3082000f +34875b0,10400009 +34875b4,3c038041 +34875b8,417c3 +34875bc,21702 +34875c0,821821 +34875c4,3063000f +34875c8,431023 +34875cc,24420010 +34875d0,822021 +34875d4,3c038041 +34875d8,8c6289a8 +34875dc,442021 +34875e0,3e00008 +34875e4,ac6489a8 +34875e8,27bdffe8 +34875ec,afbf0014 +34875f0,afb00010 +34875f4,808025 +34875f8,c101d6b +34875fc,8c840008 +3487600,402025 +3487604,ae020000 +3487608,8e060008 +348760c,3c028000 +3487610,24420df0 +3487614,40f809 +3487618,8e050004 +348761c,8fbf0014 +3487620,8fb00010 +3487624,3e00008 +3487628,27bd0018 +348762c,33c2 +3487630,664399c4 +3487634,cc45ffc6 +3487638,ff47ffc8 +348763c,ff49e0ca +3487640,c24ba3cc +3487644,854d660d +3487648,440f2200 +348764c,85d1a352 +3487650,c2d3e045 +3487654,1010101 +3487658,1010101 +348765c,1010101 +3487660,1010101 +3487664,1010101 +3487680,1010000 +3487688,1010101 +348768c,1000101 +3487690,10101 +3487694,10000 +3487698,bd1400 +348769c,aa0200 +34876a0,bd1300 +34876a4,15c6300 +34876a8,de2f00 +34876ac,4d510000 +34876b0,4e6f726d +34876b4,616c0000 +34876b8,bdcccccd +34876bc,3dcccccd +34876c0,3f800000 +34876c4,3f000000 +34876c8,41c80000 +34876cc,3fa00000 +34876d0,40000000 +34876d4,40200000 +34876d8,3f800000 +34876dc,4f000000 +34876e0,41f00000 +34876e8,3ff80000 +34876f0,406e0000 +34876f8,3ff00000 +3487700,40080000 +3487708,8040762c +348770c,10203 +3487710,4050607 +3487714,ffffffff +3487718,ffff0000 +348771c,ff00ff +3487720,3c000064 +3487724,ffff8200 +3487728,c832ffc8 +348772c,c8000000 +3487730,104465 +3487734,6b750000 +348773c,110446f +3487740,646f6e67 +3487744,6f000000 +3487748,2104a61 +348774c,62750000 +3487754,3d0466f +3487758,72657374 +3487760,4d04669 +3487764,72650000 +348776c,5d05761 +3487770,74657200 +3487778,7d05368 +348777c,61646f77 +3487784,6d05370 +3487788,69726974 +3487790,890426f +3487794,74570000 +348779c,9104963 +34877a0,65000000 +34877a8,ca04765 +34877ac,7275646f +34877b4,b804754 +34877b8,47000000 +34877c0,dc04761 +34877c4,6e6f6e00 +34877cc,2 +34877d4,3f800000 +34877e0,1 +34877e4,30006 +34877e8,70009 +34877ec,b000e +34877f0,f0010 +34877f4,110019 +34877f8,1a002b +34877fc,2c002e +3487800,300032 +3487804,35003c +3487808,400041 +348780c,460051 +3487810,540109 +3487814,10b010c +3487818,10e010f +348781c,1100113 +3487820,e7000000 +3487828,d9000000 +3487830,ed000000 +3487834,5003c0 +3487838,ef002cf0 +348783c,504244 +3487840,df000000 +348784c,100010 +3487850,100301 +3487854,1000000 +348785c,200020 +3487860,10302 +3487864,2000000 +348786c,8000e +3487870,5f0301 +3487874,1000000 +348787c,180018 +3487880,140003 +3487884,4000000 +348788c,200020 +3487890,5a0003 +3487894,4000000 +348789c,100010 +34878a0,60301 +34878a4,1000000 +34878ac,100010 +34878b0,30003 +34878b4,4000000 +34878b8,c8ff6482 +34878bc,82ffff64 +34878c0,64ff5aff +34878d8,4d8e0032 +34878dc,ce2001 +34878e0,80406024 34878e4,80405abc 34878e8,ffffffff -34878ec,530a0036 -34878f0,dd2d00 -34878f4,80405de0 +34878ec,4d8c0034 +34878f0,bb1201 +34878f4,80405e5c 34878f8,80405abc 34878fc,ffffffff -3487900,530b004f -3487904,dd2e00 -3487908,80405de0 +3487900,4d090033 +3487904,d92801 +3487908,80405e5c 348790c,80405abc 3487910,ffffffff -3487914,530f0039 -3487918,ea3600 -348791c,80405de0 +3487914,53030031 +3487918,e93500 +348791c,80405e5c 3487920,80405abc 3487924,ffffffff -3487928,53230069 -348792c,ef3b00 -3487930,80405de0 +3487928,53060030 +348792c,e73300 +3487930,80405e5c 3487934,80405abc 3487938,ffffffff -348793c,5308003a -3487940,de2f00 -3487944,80405de0 +348793c,530e0035 +3487940,e83400 +3487944,80405e5c 3487948,80405abc 348794c,ffffffff -3487950,53110038 -3487954,f64100 -3487958,80405de0 +3487950,4d000037 +3487954,c71b01 +3487958,80405e5c 348795c,80405abc 3487960,ffffffff -3487964,532f0002 -3487968,1095e00 -348796c,80405de0 +3487964,530a0036 +3487968,dd2d00 +348796c,80405e5c 3487970,80405abc 3487974,ffffffff -3487978,53140042 -348797c,c60100 -3487980,80405de0 +3487978,530b004f +348797c,dd2e00 +3487980,80405e5c 3487984,80405abc 3487988,ffffffff -348798c,53150043 -3487990,eb3800 -3487994,80405de0 +348798c,530f0039 +3487990,ea3600 +3487994,80405e5c 3487998,80405abc 348799c,ffffffff -34879a0,53160044 -34879a4,eb3700 -34879a8,80405de0 -34879ac,80405abc +34879a0,53230069 +34879a4,ef3b00 +34879a8,80405e5c +34879ac,80405d1c 34879b0,ffffffff -34879b4,53170045 -34879b8,eb3900 -34879bc,80405de0 +34879b4,5308003a +34879b8,de2f00 +34879bc,80405e5c 34879c0,80405abc 34879c4,ffffffff -34879c8,53180046 -34879cc,c60100 -34879d0,80405de0 +34879c8,53110038 +34879cc,f64100 +34879d0,80405e5c 34879d4,80405abc 34879d8,ffffffff -34879dc,531a0098 -34879e0,df3000 -34879e4,80405de0 +34879dc,532f0002 +34879e0,1095e00 +34879e4,80405e5c 34879e8,80405abc 34879ec,ffffffff -34879f0,531b0099 -34879f4,10b4500 -34879f8,80405fe8 +34879f0,53140042 +34879f4,c60100 +34879f8,80405e5c 34879fc,80405abc 3487a00,ffffffff -3487a04,53100048 -3487a08,f33e01 -3487a0c,80405de0 +3487a04,53150043 +3487a08,eb3800 +3487a0c,80405e5c 3487a10,80405abc 3487a14,ffffffff -3487a18,53250010 -3487a1c,1364f00 -3487a20,80405de0 +3487a18,53160044 +3487a1c,eb3700 +3487a20,80405e5c 3487a24,80405abc 3487a28,ffffffff -3487a2c,53260011 -3487a30,1353200 -3487a34,80405de0 +3487a2c,53170045 +3487a30,eb3900 +3487a34,80405e5c 3487a38,80405abc 3487a3c,ffffffff -3487a40,5322000b -3487a44,1094400 -3487a48,80405de0 +3487a40,53180046 +3487a44,c60100 +3487a48,80405e5c 3487a4c,80405abc 3487a50,ffffffff -3487a54,53240012 -3487a58,1343100 -3487a5c,80405de0 +3487a54,531a0098 +3487a58,df3000 +3487a5c,80405e5c 3487a60,80405abc 3487a64,ffffffff -3487a68,53270013 -3487a6c,1375000 -3487a70,80405de0 +3487a68,531b0099 +3487a6c,10b4500 +3487a70,80406064 3487a74,80405abc 3487a78,ffffffff -3487a7c,532b0017 -3487a80,1385100 -3487a84,80405de0 +3487a7c,53100048 +3487a80,f33e01 +3487a84,80405e5c 3487a88,80405abc 3487a8c,ffffffff -3487a90,532d9001 -3487a94,da2900 -3487a98,80405de0 +3487a90,53250010 +3487a94,1364f00 +3487a98,80405e5c 3487a9c,80405abc 3487aa0,ffffffff -3487aa4,532e000b -3487aa8,1094400 -3487aac,80405de0 +3487aa4,53260011 +3487aa8,1353200 +3487aac,80405e5c 3487ab0,80405abc 3487ab4,ffffffff -3487ab8,53300003 -3487abc,1415400 -3487ac0,80405de0 +3487ab8,5322000b +3487abc,1094400 +3487ac0,80405e5c 3487ac4,80405abc 3487ac8,ffffffff -3487acc,53310004 -3487ad0,1405300 -3487ad4,80405de0 +3487acc,53240012 +3487ad0,1343100 +3487ad4,80405e5c 3487ad8,80405abc 3487adc,ffffffff -3487ae0,53320005 -3487ae4,f54000 -3487ae8,80405de0 +3487ae0,53270013 +3487ae4,1375000 +3487ae8,80405e5c 3487aec,80405abc 3487af0,ffffffff -3487af4,53330008 -3487af8,1435600 -3487afc,80405de0 +3487af4,532b0017 +3487af8,1385100 +3487afc,80405e5c 3487b00,80405abc 3487b04,ffffffff -3487b08,53340009 -3487b0c,1465700 -3487b10,80405de0 +3487b08,532d9001 +3487b0c,da2900 +3487b10,80405e5c 3487b14,80405abc 3487b18,ffffffff -3487b1c,5335000d -3487b20,1495a00 -3487b24,80405de0 +3487b1c,532e000b +3487b20,1094400 +3487b24,80405e5c 3487b28,80405abc 3487b2c,ffffffff -3487b30,5336000e -3487b34,13f5200 -3487b38,80405de0 +3487b30,53300003 +3487b34,1415400 +3487b38,80405e5c 3487b3c,80405abc 3487b40,ffffffff -3487b44,5337000a -3487b48,1425500 -3487b4c,80405de0 +3487b44,53310004 +3487b48,1405300 +3487b4c,80405e5c 3487b50,80405abc 3487b54,ffffffff -3487b58,533b00a4 -3487b5c,18d7400 -3487b60,80405de0 +3487b58,53320005 +3487b5c,f54000 +3487b60,80405e5c 3487b64,80405abc 3487b68,ffffffff -3487b6c,533d004b -3487b70,f84300 -3487b74,80405de0 +3487b6c,53330008 +3487b70,1435600 +3487b74,80405e5c 3487b78,80405abc 3487b7c,ffffffff -3487b80,533e004c -3487b84,cb1d01 -3487b88,80405de0 +3487b80,53340009 +3487b84,1465700 +3487b88,80405e5c 3487b8c,80405abc 3487b90,ffffffff -3487b94,533f004d -3487b98,dc2c01 -3487b9c,80405de0 +3487b94,5335000d +3487b98,1495a00 +3487b9c,80405e5c 3487ba0,80405abc 3487ba4,ffffffff -3487ba8,5340004e -3487bac,ee3a00 -3487bb0,80405de0 +3487ba8,5336000e +3487bac,13f5200 +3487bb0,80405e5c 3487bb4,80405abc 3487bb8,ffffffff -3487bbc,53420050 -3487bc0,f23c00 -3487bc4,80405de0 +3487bbc,5337000a +3487bc0,1425500 +3487bc4,80405e5c 3487bc8,80405abc 3487bcc,ffffffff -3487bd0,53430051 -3487bd4,f23d00 -3487bd8,80405de0 +3487bd0,533b00a4 +3487bd4,18d7400 +3487bd8,80405e5c 3487bdc,80405abc 3487be0,ffffffff -3487be4,53450053 -3487be8,1184700 -3487bec,80405de0 +3487be4,533d004b +3487be8,f84300 +3487bec,80405e5c 3487bf0,80405abc 3487bf4,ffffffff -3487bf8,53460054 -3487bfc,1575f00 -3487c00,80405de0 +3487bf8,533e004c +3487bfc,cb1d01 +3487c00,80405e5c 3487c04,80405abc 3487c08,ffffffff -3487c0c,534b0056 -3487c10,be1600 -3487c14,80405de0 +3487c0c,533f004d +3487c10,dc2c01 +3487c14,80405e5c 3487c18,80405abc 3487c1c,ffffffff -3487c20,534c0057 -3487c24,be1700 -3487c28,80405de0 +3487c20,5340004e +3487c24,ee3a00 +3487c28,80405e5c 3487c2c,80405abc 3487c30,ffffffff -3487c34,534d0058 -3487c38,bf1800 -3487c3c,80405de0 +3487c34,53420050 +3487c38,f23c00 +3487c3c,80405e5c 3487c40,80405abc 3487c44,ffffffff -3487c48,534e0059 -3487c4c,bf1900 -3487c50,80405de0 +3487c48,53430051 +3487c4c,f23d00 +3487c50,80405e5c 3487c54,80405abc 3487c58,ffffffff -3487c5c,534f005a -3487c60,bf1a00 -3487c64,80405de0 +3487c5c,53450053 +3487c60,1184700 +3487c64,80405e5c 3487c68,80405abc 3487c6c,ffffffff -3487c70,5351005b -3487c74,12d4900 -3487c78,80405de0 +3487c70,53460054 +3487c74,1575f00 +3487c78,80405e5c 3487c7c,80405abc 3487c80,ffffffff -3487c84,5352005c -3487c88,12d4a00 -3487c8c,80405de0 +3487c84,534b0056 +3487c88,be1600 +3487c8c,80405e5c 3487c90,80405abc 3487c94,ffffffff -3487c98,535300cd -3487c9c,db2a00 -3487ca0,80405de0 +3487c98,534c0057 +3487c9c,be1700 +3487ca0,80405e5c 3487ca4,80405abc 3487ca8,ffffffff -3487cac,535400ce -3487cb0,db2b00 -3487cb4,80405de0 +3487cac,534d0058 +3487cb0,bf1800 +3487cb4,80405e5c 3487cb8,80405abc 3487cbc,ffffffff -3487cc0,536f0068 -3487cc4,c82100 -3487cc8,80405de0 +3487cc0,534e0059 +3487cc4,bf1900 +3487cc8,80405e5c 3487ccc,80405abc 3487cd0,ffffffff -3487cd4,5370007b -3487cd8,d72400 -3487cdc,80405de0 +3487cd4,534f005a +3487cd8,bf1a00 +3487cdc,80405e5c 3487ce0,80405abc 3487ce4,ffffffff -3487ce8,5341004a -3487cec,10e4600 -3487cf0,80405de0 -3487cf4,80405c98 +3487ce8,5351005b +3487cec,12d4900 +3487cf0,80405e5c +3487cf4,80405abc 3487cf8,ffffffff -3487cfc,4d5800dc -3487d00,1194801 -3487d04,80405fc4 +3487cfc,5352005c +3487d00,12d4a00 +3487d04,80405e5c 3487d08,80405abc 3487d0c,ffffffff -3487d10,3d7200c6 -3487d14,bd1301 -3487d18,80405de0 -3487d1c,80405ac4 +3487d10,535300cd +3487d14,db2a00 +3487d18,80405e5c +3487d1c,80405abc 3487d20,ffffffff -3487d24,3e7a00c2 -3487d28,bd1401 -3487d2c,80405de0 -3487d30,80405ac4 +3487d24,535400ce +3487d28,db2b00 +3487d2c,80405e5c +3487d30,80405abc 3487d34,ffffffff -3487d38,537400c7 -3487d3c,b90a02 -3487d40,80405de0 +3487d38,536f0068 +3487d3c,c82100 +3487d40,80405e5c 3487d44,80405abc 3487d48,ffffffff -3487d4c,53750067 -3487d50,b80b01 -3487d54,80405de0 +3487d4c,5370007b +3487d50,d72400 +3487d54,80405e5c 3487d58,80405abc 3487d5c,ffffffff -3487d60,53760066 -3487d64,c81c01 -3487d68,80405de0 -3487d6c,80405abc +3487d60,5341004a +3487d64,10e4600 +3487d68,80405e5c +3487d6c,80405c98 3487d70,ffffffff -3487d74,53770060 -3487d78,aa0203 -3487d7c,80405de0 +3487d74,4d5800dc +3487d78,1194801 +3487d7c,80406040 3487d80,80405abc 3487d84,ffffffff -3487d88,53780052 -3487d8c,cd1e01 -3487d90,80405de0 -3487d94,80405abc +3487d88,3d7200c6 +3487d8c,bd1301 +3487d90,80405e5c +3487d94,80405ac4 3487d98,ffffffff -3487d9c,53790052 -3487da0,cd1f01 -3487da4,80405de0 -3487da8,80405abc +3487d9c,3e7a00c2 +3487da0,bd1401 +3487da4,80405e5c +3487da8,80405ac4 3487dac,ffffffff -3487db0,5356005e -3487db4,d12200 -3487db8,80405de0 -3487dbc,80405cf0 -3487dc0,1ffff -3487dc4,5357005f -3487dc8,d12300 -3487dcc,80405de0 -3487dd0,80405cf0 -3487dd4,2ffff -3487dd8,5321009a -3487ddc,da2900 -3487de0,80405de0 +3487db0,537400c7 +3487db4,b90a02 +3487db8,80405e5c +3487dbc,80405abc +3487dc0,ffffffff +3487dc4,53750067 +3487dc8,b80b01 +3487dcc,80405e5c +3487dd0,80405abc +3487dd4,ffffffff +3487dd8,53760066 +3487ddc,c81c01 +3487de0,80405e5c 3487de4,80405abc 3487de8,ffffffff -3487dec,4d830055 -3487df0,b70901 -3487df4,80405de0 +3487dec,53770060 +3487df0,aa0203 +3487df4,80405e5c 3487df8,80405abc 3487dfc,ffffffff -3487e00,4d9200e6 -3487e04,d82501 -3487e08,80405f8c +3487e00,53780052 +3487e04,cd1e01 +3487e08,80405e5c 3487e0c,80405abc 3487e10,ffffffff -3487e14,4d9300e6 -3487e18,d82601 -3487e1c,80405f8c +3487e14,53790052 +3487e18,cd1f01 +3487e1c,80405e5c 3487e20,80405abc 3487e24,ffffffff -3487e28,4d9400e6 -3487e2c,d82701 -3487e30,80405f8c -3487e34,80405abc -3487e38,ffffffff -3487e3c,4d84006f -3487e40,17f6d01 -3487e44,80405de0 -3487e48,80405abc -3487e4c,ffffffff -3487e50,4d8500cc -3487e54,17f6e01 -3487e58,80405de0 +3487e28,5356005e +3487e2c,d12200 +3487e30,80405e5c +3487e34,80405cf0 +3487e38,1ffff +3487e3c,5357005f +3487e40,d12300 +3487e44,80405e5c +3487e48,80405cf0 +3487e4c,2ffff +3487e50,5321009a +3487e54,da2900 +3487e58,80405e5c 3487e5c,80405abc 3487e60,ffffffff -3487e64,4d8600f0 -3487e68,17f6f01 -3487e6c,80405de0 +3487e64,4d830055 +3487e68,b70901 +3487e6c,80405e5c 3487e70,80405abc 3487e74,ffffffff -3487e78,3d7200c6 -3487e7c,bd1301 -3487e80,80405de0 -3487e84,80405ac4 +3487e78,4d9200e6 +3487e7c,d82501 +3487e80,80406008 +3487e84,80405abc 3487e88,ffffffff -3487e8c,53820098 -3487e90,df3000 -3487e94,80405de0 +3487e8c,4d9300e6 +3487e90,d82601 +3487e94,80406008 3487e98,80405abc 3487e9c,ffffffff -3487ea0,53280014 -3487ea4,1505b00 -3487ea8,80405de0 +3487ea0,4d9400e6 +3487ea4,d82701 +3487ea8,80406008 3487eac,80405abc 3487eb0,ffffffff -3487eb4,53290015 -3487eb8,1515c00 -3487ebc,80405de0 +3487eb4,4d84006f +3487eb8,17f6d01 +3487ebc,80405e5c 3487ec0,80405abc 3487ec4,ffffffff -3487ec8,532a0016 -3487ecc,1525d00 -3487ed0,80405de0 +3487ec8,4d8500cc +3487ecc,17f6e01 +3487ed0,80405e5c 3487ed4,80405abc 3487ed8,ffffffff -3487edc,53500079 -3487ee0,1475800 -3487ee4,80405de0 +3487edc,4d8600f0 +3487ee0,17f6f01 +3487ee4,80405e5c 3487ee8,80405abc 3487eec,ffffffff -3487ef0,4d8700f1 -3487ef4,17f7101 -3487ef8,80405de0 -3487efc,80405abc +3487ef0,3d7200c6 +3487ef4,bd1301 +3487ef8,80405e5c +3487efc,80405ac4 3487f00,ffffffff -3487f04,4d8800f2 -3487f08,17f7201 -3487f0c,80405de0 +3487f04,53820098 +3487f08,df3000 +3487f0c,80405e5c 3487f10,80405abc 3487f14,ffffffff -3487f18,533d000c -3487f1c,f84300 -3487f20,80405de0 -3487f24,80405bc4 +3487f18,53280014 +3487f1c,1505b00 +3487f20,80405e5c +3487f24,80405abc 3487f28,ffffffff -3487f2c,53040070 -3487f30,1586000 -3487f34,80405de0 +3487f2c,53290015 +3487f30,1515c00 +3487f34,80405e5c 3487f38,80405abc 3487f3c,ffffffff -3487f40,530c0071 -3487f44,1586100 -3487f48,80405de0 +3487f40,532a0016 +3487f44,1525d00 +3487f48,80405e5c 3487f4c,80405abc 3487f50,ffffffff -3487f54,53120072 -3487f58,1586200 -3487f5c,80405de0 +3487f54,53500079 +3487f58,1475800 +3487f5c,80405e5c 3487f60,80405abc 3487f64,ffffffff -3487f68,5b7100b4 -3487f6c,15c6301 -3487f70,80405de0 +3487f68,4d8700f1 +3487f6c,17f7101 +3487f70,80405e5c 3487f74,80405abc 3487f78,ffffffff -3487f7c,530500ad -3487f80,15d6400 -3487f84,80405de0 +3487f7c,4d8800f2 +3487f80,17f7201 +3487f84,80405e5c 3487f88,80405abc 3487f8c,ffffffff -3487f90,530d00ae -3487f94,15d6500 -3487f98,80405de0 -3487f9c,80405abc +3487f90,533d000c +3487f94,f84300 +3487f98,80405e5c +3487f9c,80405bc4 3487fa0,ffffffff -3487fa4,531300af -3487fa8,15d6600 -3487fac,80405de0 +3487fa4,53040070 +3487fa8,1586000 +3487fac,80405e5c 3487fb0,80405abc 3487fb4,ffffffff -3487fb8,53470007 -3487fbc,17b6c00 -3487fc0,80405de0 +3487fb8,530c0071 +3487fbc,1586100 +3487fc0,80405e5c 3487fc4,80405abc 3487fc8,ffffffff -3487fcc,53480007 -3487fd0,17b6c00 -3487fd4,80405de0 +3487fcc,53120072 +3487fd0,1586200 +3487fd4,80405e5c 3487fd8,80405abc 3487fdc,ffffffff -3487fe0,4d8a0037 -3487fe4,c71b01 -3487fe8,80405de0 +3487fe0,5b7100b4 +3487fe4,15c6301 +3487fe8,80405e5c 3487fec,80405abc 3487ff0,ffffffff -3487ff4,4d8b0037 -3487ff8,c71b01 -3487ffc,80405de0 +3487ff4,530500ad +3487ff8,15d6400 +3487ffc,80405e5c 3488000,80405abc 3488004,ffffffff -3488008,4d8c0034 -348800c,bb1201 -3488010,80405de0 +3488008,530d00ae +348800c,15d6500 +3488010,80405e5c 3488014,80405abc 3488018,ffffffff -348801c,4d8d0034 -3488020,bb1201 -3488024,80405de0 +348801c,531300af +3488020,15d6600 +3488024,80405e5c 3488028,80405abc 348802c,ffffffff -3488030,4d020032 -3488034,ce2001 -3488038,80405fa8 +3488030,53470007 +3488034,17b6c00 +3488038,80405e5c 348803c,80405abc 3488040,ffffffff -3488044,4d8f0032 -3488048,ce2001 -348804c,80405fa8 +3488044,53480007 +3488048,17b6c00 +348804c,80405e5c 3488050,80405abc 3488054,ffffffff -3488058,4d900032 -348805c,ce2001 -3488060,80405fa8 +3488058,4d8a0037 +348805c,c71b01 +3488060,80405e5c 3488064,80405abc 3488068,ffffffff -348806c,4d910032 -3488070,ce2001 -3488074,80405fa8 +348806c,4d8b0037 +3488070,c71b01 +3488074,80405e5c 3488078,80405abc 348807c,ffffffff -3488080,4d9500dc -3488084,1194801 -3488088,80405fc4 +3488080,4d8c0034 +3488084,bb1201 +3488088,80405e5c 348808c,80405abc 3488090,ffffffff -3488094,4d960033 -3488098,d92801 -348809c,80405de0 +3488094,4d8d0034 +3488098,bb1201 +348809c,80405e5c 34880a0,80405abc 34880a4,ffffffff -34880a8,4d970033 -34880ac,d92801 -34880b0,80405de0 +34880a8,4d020032 +34880ac,ce2001 +34880b0,80406024 34880b4,80405abc 34880b8,ffffffff -34880bc,53190047 -34880c0,f43f00 -34880c4,80405de0 +34880bc,4d8f0032 +34880c0,ce2001 +34880c4,80406024 34880c8,80405abc 34880cc,ffffffff -34880d0,531d007a -34880d4,1746800 -34880d8,80405de0 +34880d0,4d900032 +34880d4,ce2001 +34880d8,80406024 34880dc,80405abc 34880e0,ffffffff -34880e4,531c005d -34880e8,1736700 -34880ec,80405de0 +34880e4,4d910032 +34880e8,ce2001 +34880ec,80406024 34880f0,80405abc 34880f4,ffffffff -34880f8,53200097 -34880fc,1766a00 -3488100,80405de0 +34880f8,4d9500dc +34880fc,1194801 +3488100,80406040 3488104,80405abc 3488108,ffffffff -348810c,531e00f9 -3488110,1767000 -3488114,80405de0 +348810c,4d960033 +3488110,d92801 +3488114,80405e5c 3488118,80405abc 348811c,ffffffff -3488120,537700f3 -3488124,aa0201 -3488128,80405de0 +3488120,4d970033 +3488124,d92801 +3488128,80405e5c 348812c,80405abc 3488130,ffffffff -3488134,4d8400f4 -3488138,17f6d01 -348813c,80405de0 +3488134,53190047 +3488138,f43f00 +348813c,80405e5c 3488140,80405abc 3488144,ffffffff -3488148,4d8500f5 -348814c,17f6e01 -3488150,80405de0 +3488148,531d007a +348814c,1746800 +3488150,80405e5c 3488154,80405abc 3488158,ffffffff -348815c,4d8600f6 -3488160,17f6f01 -3488164,80405de0 +348815c,531c005d +3488160,1736700 +3488164,80405e5c 3488168,80405abc 348816c,ffffffff -3488170,4d8700f7 -3488174,17f7101 -3488178,80405de0 +3488170,53200097 +3488174,1766a00 +3488178,80405e5c 348817c,80405abc 3488180,ffffffff -3488184,537a00fa -3488188,bd1401 -348818c,80405de0 -3488190,80405ac4 +3488184,531e00f9 +3488188,1767000 +348818c,80405e5c +3488190,80405abc 3488194,ffffffff -3488198,53980090 -348819c,c71b01 -34881a0,80405de0 +3488198,537700f3 +348819c,aa0201 +34881a0,80405e5c 34881a4,80405abc 34881a8,ffffffff -34881ac,53990091 -34881b0,c71b01 -34881b4,80405de0 +34881ac,4d8400f4 +34881b0,17f6d01 +34881b4,80405e5c 34881b8,80405abc 34881bc,ffffffff -34881c0,539a00a7 -34881c4,bb1201 -34881c8,80405de0 +34881c0,4d8500f5 +34881c4,17f6e01 +34881c8,80405e5c 34881cc,80405abc 34881d0,ffffffff -34881d4,539b00a8 -34881d8,bb1201 -34881dc,80405de0 +34881d4,4d8600f6 +34881d8,17f6f01 +34881dc,80405e5c 34881e0,80405abc 34881e4,ffffffff -34881e8,5349006c -34881ec,17b7300 -34881f0,80405de0 +34881e8,4d8700f7 +34881ec,17f7101 +34881f0,80405e5c 34881f4,80405abc 34881f8,ffffffff -34881fc,53419002 -3488204,80405de0 -3488208,80405cbc +34881fc,537a00fa +3488200,bd1401 +3488204,80405e5c +3488208,80405ac4 348820c,ffffffff -348824c,ffffffff -3488250,dd2d00 -3488254,80405de8 +3488210,53980090 +3488214,c71b01 +3488218,80405e5c +348821c,80405abc +3488220,ffffffff +3488224,53990091 +3488228,c71b01 +348822c,80405e5c +3488230,80405abc +3488234,ffffffff +3488238,539a00a7 +348823c,bb1201 +3488240,80405e5c +3488244,80405abc +3488248,ffffffff +348824c,539b00a8 +3488250,bb1201 +3488254,80405e5c 3488258,80405abc 348825c,ffffffff -3488260,ffffffff -3488264,1475800 -3488268,80405dfc +3488260,5349006c +3488264,17b7300 +3488268,80405e5c 348826c,80405abc 3488270,ffffffff -3488274,ffffffff -3488278,bf1800 -348827c,80405e28 -3488280,80405abc +3488274,53419002 +348827c,80405e5c +3488280,80405cbc 3488284,ffffffff -3488288,ffffffff -348828c,e93500 -3488290,80405e54 -3488294,80405abc -3488298,ffffffff -348829c,ffffffff -34882a0,e73300 -34882a4,80405e7c -34882a8,80405abc -34882ac,ffffffff -34882b0,ffffffff -34882b4,d12200 -34882b8,80405eac -34882bc,80405abc -34882c0,ffffffff 34882c4,ffffffff -34882c8,db2a00 -34882cc,80405edc +34882c8,dd2d00 +34882cc,80405e64 34882d0,80405abc 34882d4,ffffffff 34882d8,ffffffff -34882dc,bb1201 -34882e0,80405ef4 +34882dc,1475800 +34882e0,80405e78 34882e4,80405abc 34882e8,ffffffff 34882ec,ffffffff -34882f0,c71b01 -34882f4,80405f10 +34882f0,bf1800 +34882f4,80405ea4 34882f8,80405abc 34882fc,ffffffff 3488300,ffffffff -3488304,d92800 -3488308,80405f3c +3488304,e93500 +3488308,80405ed0 348830c,80405abc 3488310,ffffffff 3488314,ffffffff -3488318,cd1e00 -348831c,80405f2c +3488318,e73300 +348831c,80405ef8 3488320,80405abc 3488324,ffffffff 3488328,ffffffff -348832c,10e4600 -3488330,80405f6c +348832c,d12200 +3488330,80405f28 3488334,80405abc 3488338,ffffffff -348833c,53410043 -3488340,c60100 -3488344,80405de0 -3488348,80405bd0 -348834c,15ffff -3488350,53410044 -3488354,c60100 -3488358,80405de0 -348835c,80405bd0 -3488360,16ffff -3488364,53410045 -3488368,c60100 -348836c,80405de0 -3488370,80405bd0 -3488374,17ffff -3488378,53410046 -348837c,1776b00 -3488380,80405de0 -3488384,80405bd0 -3488388,18ffff -348838c,53410047 -3488390,f43f00 -3488394,80405de0 -3488398,80405bd0 -348839c,19ffff -34883a0,5341005d -34883a4,1736700 -34883a8,80405de0 -34883ac,80405bd0 -34883b0,1cffff -34883b4,5341007a -34883b8,1746800 -34883bc,80405de0 +348833c,ffffffff +3488340,db2a00 +3488344,80405f58 +3488348,80405abc +348834c,ffffffff +3488350,ffffffff +3488354,bb1201 +3488358,80405f70 +348835c,80405abc +3488360,ffffffff +3488364,ffffffff +3488368,c71b01 +348836c,80405f8c +3488370,80405abc +3488374,ffffffff +3488378,ffffffff +348837c,d92800 +3488380,80405fb8 +3488384,80405abc +3488388,ffffffff +348838c,ffffffff +3488390,cd1e00 +3488394,80405fa8 +3488398,80405abc +348839c,ffffffff +34883a0,ffffffff +34883a4,10e4600 +34883a8,80405fe8 +34883ac,80405abc +34883b0,ffffffff +34883b4,53410043 +34883b8,c60100 +34883bc,80405e5c 34883c0,80405bd0 -34883c4,1dffff -34883c8,534100f9 -34883cc,1767000 -34883d0,80405de0 +34883c4,15ffff +34883c8,53410044 +34883cc,c60100 +34883d0,80405e5c 34883d4,80405bd0 -34883d8,1effff -34883dc,53410097 -34883e0,1766a00 -34883e4,80405de0 +34883d8,16ffff +34883dc,53410045 +34883e0,c60100 +34883e4,80405e5c 34883e8,80405bd0 -34883ec,20ffff -34883f0,53410006 -34883f4,b90a02 -34883f8,80405de0 -34883fc,80405c08 -3488400,10003 -3488404,5341001c -3488408,b90a02 -348840c,80405de0 -3488410,80405c08 -3488414,10004 -3488418,5341001d -348841c,b90a02 -3488420,80405de0 -3488424,80405c08 -3488428,10005 -348842c,5341001e -3488430,b90a02 -3488434,80405de0 -3488438,80405c08 -348843c,10006 -3488440,5341002a -3488444,b90a02 -3488448,80405de0 -348844c,80405c08 -3488450,10007 -3488454,53410061 -3488458,b90a02 -348845c,80405de0 -3488460,80405c08 -3488464,1000a -3488468,53410062 -348846c,b80b01 -3488470,80405de0 +34883ec,17ffff +34883f0,53410046 +34883f4,1776b00 +34883f8,80405e5c +34883fc,80405bd0 +3488400,18ffff +3488404,53410047 +3488408,f43f00 +348840c,80405e5c +3488410,80405bd0 +3488414,19ffff +3488418,5341005d +348841c,1736700 +3488420,80405e5c +3488424,80405bd0 +3488428,1cffff +348842c,5341007a +3488430,1746800 +3488434,80405e5c +3488438,80405bd0 +348843c,1dffff +3488440,534100f9 +3488444,1767000 +3488448,80405e5c +348844c,80405bd0 +3488450,1effff +3488454,53410097 +3488458,1766a00 +348845c,80405e5c +3488460,80405bd0 +3488464,20ffff +3488468,53410006 +348846c,b90a02 +3488470,80405e5c 3488474,80405c08 -3488478,20000 -348847c,53410063 -3488480,b80b01 -3488484,80405de0 +3488478,10003 +348847c,5341001c +3488480,b90a02 +3488484,80405e5c 3488488,80405c08 -348848c,20001 -3488490,53410064 -3488494,b80b01 -3488498,80405de0 +348848c,10004 +3488490,5341001d +3488494,b90a02 +3488498,80405e5c 348849c,80405c08 -34884a0,20002 -34884a4,53410065 -34884a8,b80b01 -34884ac,80405de0 +34884a0,10005 +34884a4,5341001e +34884a8,b90a02 +34884ac,80405e5c 34884b0,80405c08 -34884b4,20003 -34884b8,5341007c -34884bc,b80b01 -34884c0,80405de0 +34884b4,10006 +34884b8,5341002a +34884bc,b90a02 +34884c0,80405e5c 34884c4,80405c08 -34884c8,20004 -34884cc,5341007d -34884d0,b80b01 -34884d4,80405de0 +34884c8,10007 +34884cc,53410061 +34884d0,b90a02 +34884d4,80405e5c 34884d8,80405c08 -34884dc,20005 -34884e0,5341007e +34884dc,1000a +34884e0,53410062 34884e4,b80b01 -34884e8,80405de0 +34884e8,80405e5c 34884ec,80405c08 -34884f0,20006 -34884f4,5341007f +34884f0,20000 +34884f4,53410063 34884f8,b80b01 -34884fc,80405de0 +34884fc,80405e5c 3488500,80405c08 -3488504,20007 -3488508,534100a2 +3488504,20001 +3488508,53410064 348850c,b80b01 -3488510,80405de0 +3488510,80405e5c 3488514,80405c08 -3488518,20008 -348851c,53410087 +3488518,20002 +348851c,53410065 3488520,b80b01 -3488524,80405de0 +3488524,80405e5c 3488528,80405c08 -348852c,20009 -3488530,53410088 -3488534,c81c01 -3488538,80405de0 +348852c,20003 +3488530,5341007c +3488534,b80b01 +3488538,80405e5c 348853c,80405c08 -3488540,40000 -3488544,53410089 -3488548,c81c01 -348854c,80405de0 +3488540,20004 +3488544,5341007d +3488548,b80b01 +348854c,80405e5c 3488550,80405c08 -3488554,40001 -3488558,5341008a -348855c,c81c01 -3488560,80405de0 +3488554,20005 +3488558,5341007e +348855c,b80b01 +3488560,80405e5c 3488564,80405c08 -3488568,40002 -348856c,5341008b -3488570,c81c01 -3488574,80405de0 +3488568,20006 +348856c,5341007f +3488570,b80b01 +3488574,80405e5c 3488578,80405c08 -348857c,40003 -3488580,5341008c -3488584,c81c01 -3488588,80405de0 +348857c,20007 +3488580,534100a2 +3488584,b80b01 +3488588,80405e5c 348858c,80405c08 -3488590,40004 -3488594,5341008e -3488598,c81c01 -348859c,80405de0 +3488590,20008 +3488594,53410087 +3488598,b80b01 +348859c,80405e5c 34885a0,80405c08 -34885a4,40005 -34885a8,5341008f +34885a4,20009 +34885a8,53410088 34885ac,c81c01 -34885b0,80405de0 +34885b0,80405e5c 34885b4,80405c08 -34885b8,40006 -34885bc,534100a3 +34885b8,40000 +34885bc,53410089 34885c0,c81c01 -34885c4,80405de0 +34885c4,80405e5c 34885c8,80405c08 -34885cc,40007 -34885d0,534100a5 +34885cc,40001 +34885d0,5341008a 34885d4,c81c01 -34885d8,80405de0 +34885d8,80405e5c 34885dc,80405c08 -34885e0,40008 -34885e4,53410092 +34885e0,40002 +34885e4,5341008b 34885e8,c81c01 -34885ec,80405de0 +34885ec,80405e5c 34885f0,80405c08 -34885f4,40009 -34885f8,53410093 -34885fc,aa0203 -3488600,80405de0 -3488604,80405c1c -3488608,3ffff -348860c,53410094 -3488610,aa0203 -3488614,80405de0 -3488618,80405c1c -348861c,4ffff -3488620,53410095 -3488624,aa0203 -3488628,80405de0 -348862c,80405c1c -3488630,5ffff -3488634,534100a6 -3488638,aa0203 -348863c,80405de0 -3488640,80405c1c -3488644,6ffff -3488648,534100a9 -348864c,aa0203 -3488650,80405de0 -3488654,80405c1c -3488658,7ffff -348865c,5341009b -3488660,aa0203 -3488664,80405de0 -3488668,80405c1c -348866c,8ffff -3488670,5341009f +34885f4,40003 +34885f8,5341008c +34885fc,c81c01 +3488600,80405e5c +3488604,80405c08 +3488608,40004 +348860c,5341008e +3488610,c81c01 +3488614,80405e5c +3488618,80405c08 +348861c,40005 +3488620,5341008f +3488624,c81c01 +3488628,80405e5c +348862c,80405c08 +3488630,40006 +3488634,534100a3 +3488638,c81c01 +348863c,80405e5c +3488640,80405c08 +3488644,40007 +3488648,534100a5 +348864c,c81c01 +3488650,80405e5c +3488654,80405c08 +3488658,40008 +348865c,53410092 +3488660,c81c01 +3488664,80405e5c +3488668,80405c08 +348866c,40009 +3488670,53410093 3488674,aa0203 -3488678,80405de0 +3488678,80405e5c 348867c,80405c1c -3488680,bffff -3488684,534100a0 +3488680,3ffff +3488684,53410094 3488688,aa0203 -348868c,80405de0 +348868c,80405e5c 3488690,80405c1c -3488694,cffff -3488698,534100a1 +3488694,4ffff +3488698,53410095 348869c,aa0203 -34886a0,80405de0 +34886a0,80405e5c 34886a4,80405c1c -34886a8,dffff -34886ac,534100e9 -34886b0,1941300 -34886b4,80405de0 -34886b8,80405c3c -34886bc,ffffffff -34886c0,534100e4 -34886c4,cd1e00 -34886c8,80405de0 -34886cc,80405c58 -34886d0,ffffffff -34886d4,534100e8 -34886d8,cd1f00 -34886dc,80405de0 -34886e0,80405c74 -34886e4,ffffffff -34886e8,53410073 -34886ec,b60300 -34886f0,80405de0 -34886f4,80405ca4 -34886f8,6ffff -34886fc,53410074 -3488700,b60400 -3488704,80405de0 -3488708,80405ca4 -348870c,7ffff -3488710,53410075 -3488714,b60500 -3488718,80405de0 -348871c,80405ca4 -3488720,8ffff -3488724,53410076 -3488728,b60600 -348872c,80405de0 -3488730,80405ca4 -3488734,9ffff -3488738,53410077 -348873c,b60700 -3488740,80405de0 -3488744,80405ca4 -3488748,affff -348874c,53410078 -3488750,b60800 -3488754,80405de0 -3488758,80405ca4 -348875c,bffff -3488760,534100d4 -3488764,b60400 -3488768,80405de0 +34886a8,5ffff +34886ac,534100a6 +34886b0,aa0203 +34886b4,80405e5c +34886b8,80405c1c +34886bc,6ffff +34886c0,534100a9 +34886c4,aa0203 +34886c8,80405e5c +34886cc,80405c1c +34886d0,7ffff +34886d4,5341009b +34886d8,aa0203 +34886dc,80405e5c +34886e0,80405c1c +34886e4,8ffff +34886e8,5341009f +34886ec,aa0203 +34886f0,80405e5c +34886f4,80405c1c +34886f8,bffff +34886fc,534100a0 +3488700,aa0203 +3488704,80405e5c +3488708,80405c1c +348870c,cffff +3488710,534100a1 +3488714,aa0203 +3488718,80405e5c +348871c,80405c1c +3488720,dffff +3488724,534100e9 +3488728,1941300 +348872c,80405e5c +3488730,80405c3c +3488734,ffffffff +3488738,534100e4 +348873c,cd1e00 +3488740,80405e5c +3488744,80405c58 +3488748,ffffffff +348874c,534100e8 +3488750,cd1f00 +3488754,80405e5c +3488758,80405c74 +348875c,ffffffff +3488760,53410073 +3488764,b60300 +3488768,80405e5c 348876c,80405ca4 -3488770,cffff -3488774,534100d2 -3488778,b60600 -348877c,80405de0 +3488770,6ffff +3488774,53410074 +3488778,b60400 +348877c,80405e5c 3488780,80405ca4 -3488784,dffff -3488788,534100d1 -348878c,b60300 -3488790,80405de0 +3488784,7ffff +3488788,53410075 +348878c,b60500 +3488790,80405e5c 3488794,80405ca4 -3488798,effff -348879c,534100d3 -34887a0,b60800 -34887a4,80405de0 +3488798,8ffff +348879c,53410076 +34887a0,b60600 +34887a4,80405e5c 34887a8,80405ca4 -34887ac,fffff -34887b0,534100d5 -34887b4,b60500 -34887b8,80405de0 +34887ac,9ffff +34887b0,53410077 +34887b4,b60700 +34887b8,80405e5c 34887bc,80405ca4 -34887c0,10ffff -34887c4,534100d6 -34887c8,b60700 -34887cc,80405de0 +34887c0,affff +34887c4,53410078 +34887c8,b60800 +34887cc,80405e5c 34887d0,80405ca4 -34887d4,11ffff -34887d8,534100f8 -34887dc,d12300 -34887e0,80405de0 -34887e4,80405b8c -34887e8,3ffff -34887ec,53149099 -34887f0,10b4500 -34887f4,80405de0 -34887f8,80405abc -34887fc,ffffffff -3488800,53419048 -3488804,f33e00 -3488808,80405de0 -348880c,80405cd8 -3488810,ffffffff -3488814,53419003 -3488818,1933500 -348881c,80405de0 -3488820,80405ad0 -3488824,ffffffff -3488828,e01010e0 -348882c,e01010e0 -3488830,1010e0e0 -3488834,1010e0e0 -3488838,10e0e010 -348883c,10000000 -3488840,1 -3488844,d -3488848,41200000 -348884c,41200000 -3488850,80407810 -3488854,80407800 -3488858,80112f1a -348885c,80112f14 -3488860,80112f0e -3488864,80112f08 -3488868,8011320a -348886c,80113204 -3488870,801131fe -3488874,801131f8 -3488878,801131f2 -348887c,801131ec -3488880,801131e6 -3488884,801131e0 -3488888,8012be1e -348888c,8012be20 -3488890,8012be1c -3488894,8012be12 -3488898,8012be14 -348889c,8012be10 -34888a0,801c7672 -34888a4,801c767a -34888a8,801c7950 -34888ac,8011bd50 -34888b0,8011bd38 -34888b4,801d8b9e -34888b8,801d8b92 -34888bc,c80000 -34888c4,ff0046 -34888c8,32ffff -34899e0,db000 -34899e4,db000 -34899e8,db000 -34899ec,cb000 -34899f0,cb000 -34899f4,ca000 -34899fc,db000 -3489a00,db000 -3489a18,e8ac00 -3489a1c,e8ac00 -3489a20,e8ac00 -3489a24,e8ac00 -3489a4c,d77d0 -3489a50,2e3ab0 -3489a54,7d0c90 -3489a58,8ffffffd -3489a5c,c96e00 -3489a60,2e4ac00 -3489a64,effffff4 -3489a68,ab0e500 -3489a6c,c95e000 -3489a70,e59c000 -3489a88,79000 -3489a8c,5ceeb40 -3489a90,cc8a990 -3489a94,da79000 -3489a98,8ecb400 -3489a9c,4adda0 -3489aa0,797e2 -3489aa4,c88aae0 -3489aa8,6ceed70 -3489aac,79000 -3489ab0,79000 -3489ac0,6dea0000 -3489ac4,c94d6000 -3489ac8,c94d6033 -3489acc,6deb6bc6 -3489ad0,8cb600 -3489ad4,7ca4cec4 -3489ad8,3109c3bb -3489adc,9c3bb -3489ae0,2ced4 -3489af8,4cefb00 -3489afc,ad50000 -3489b00,8e30000 -3489b04,9ec0000 -3489b08,7e4db0ab -3489b0c,bb05e8aa -3489b10,bc008ed6 -3489b14,7e936ed0 -3489b18,8ded9ea -3489b30,ca000 -3489b34,ca000 -3489b38,ca000 -3489b3c,ca000 -3489b60,c900 -3489b64,7e200 -3489b68,cb000 -3489b6c,e8000 -3489b70,6f3000 -3489b74,8e0000 -3489b78,8e0000 -3489b7c,6f4000 -3489b80,e8000 -3489b84,cb000 -3489b88,7e200 -3489b8c,c900 -3489b98,bb0000 -3489b9c,5e4000 -3489ba0,ca000 -3489ba4,ad000 -3489ba8,7e100 -3489bac,6f400 -3489bb0,6f400 -3489bb4,7e100 -3489bb8,ad000 -3489bbc,ca000 -3489bc0,5e4000 -3489bc4,bb0000 -3489bd8,a8000 -3489bdc,c8a8ab0 -3489be0,3beda10 -3489be4,3beda10 -3489be8,c8a8ab0 -3489bec,a8000 -3489c14,ca000 +34887d4,bffff +34887d8,534100d4 +34887dc,b60400 +34887e0,80405e5c +34887e4,80405ca4 +34887e8,cffff +34887ec,534100d2 +34887f0,b60600 +34887f4,80405e5c +34887f8,80405ca4 +34887fc,dffff +3488800,534100d1 +3488804,b60300 +3488808,80405e5c +348880c,80405ca4 +3488810,effff +3488814,534100d3 +3488818,b60800 +348881c,80405e5c +3488820,80405ca4 +3488824,fffff +3488828,534100d5 +348882c,b60500 +3488830,80405e5c +3488834,80405ca4 +3488838,10ffff +348883c,534100d6 +3488840,b60700 +3488844,80405e5c +3488848,80405ca4 +348884c,11ffff +3488850,534100f8 +3488854,d12300 +3488858,80405e5c +348885c,80405b8c +3488860,3ffff +3488864,53149099 +3488868,10b4500 +348886c,80405e5c +3488870,80405abc +3488874,ffffffff +3488878,53419048 +348887c,f33e00 +3488880,80405e5c +3488884,80405cd8 +3488888,ffffffff +348888c,53419003 +3488890,1933500 +3488894,80405e5c +3488898,80405ad0 +348889c,ffffffff +34888a0,e01010e0 +34888a4,e01010e0 +34888a8,1010e0e0 +34888ac,1010e0e0 +34888b0,10e0e010 +34888b4,10000000 +34888b8,1 +34888bc,d +34888c0,41200000 +34888c4,41200000 +34888c8,80407888 +34888cc,80407878 +34888d0,80112f1a +34888d4,80112f14 +34888d8,80112f0e +34888dc,80112f08 +34888e0,8011320a +34888e4,80113204 +34888e8,801131fe +34888ec,801131f8 +34888f0,801131f2 +34888f4,801131ec +34888f8,801131e6 +34888fc,801131e0 +3488900,8012be1e +3488904,8012be20 +3488908,8012be1c +348890c,8012be12 +3488910,8012be14 +3488914,8012be10 +3488918,801c7672 +348891c,801c767a +3488920,801c7950 +3488924,8011bd50 +3488928,8011bd38 +348892c,801d8b9e +3488930,801d8b92 +3488934,c80000 +348893c,ff0046 +3488940,32ffff +3489a58,db000 +3489a5c,db000 +3489a60,db000 +3489a64,cb000 +3489a68,cb000 +3489a6c,ca000 +3489a74,db000 +3489a78,db000 +3489a90,e8ac00 +3489a94,e8ac00 +3489a98,e8ac00 +3489a9c,e8ac00 +3489ac4,d77d0 +3489ac8,2e3ab0 +3489acc,7d0c90 +3489ad0,8ffffffd +3489ad4,c96e00 +3489ad8,2e4ac00 +3489adc,effffff4 +3489ae0,ab0e500 +3489ae4,c95e000 +3489ae8,e59c000 +3489b00,79000 +3489b04,5ceeb40 +3489b08,cc8a990 +3489b0c,da79000 +3489b10,8ecb400 +3489b14,4adda0 +3489b18,797e2 +3489b1c,c88aae0 +3489b20,6ceed70 +3489b24,79000 +3489b28,79000 +3489b38,6dea0000 +3489b3c,c94d6000 +3489b40,c94d6033 +3489b44,6deb6bc6 +3489b48,8cb600 +3489b4c,7ca4cec4 +3489b50,3109c3bb +3489b54,9c3bb +3489b58,2ced4 +3489b70,4cefb00 +3489b74,ad50000 +3489b78,8e30000 +3489b7c,9ec0000 +3489b80,7e4db0ab +3489b84,bb05e8aa +3489b88,bc008ed6 +3489b8c,7e936ed0 +3489b90,8ded9ea +3489ba8,ca000 +3489bac,ca000 +3489bb0,ca000 +3489bb4,ca000 +3489bd8,c900 +3489bdc,7e200 +3489be0,cb000 +3489be4,e8000 +3489be8,6f3000 +3489bec,8e0000 +3489bf0,8e0000 +3489bf4,6f4000 +3489bf8,e8000 +3489bfc,cb000 +3489c00,7e200 +3489c04,c900 +3489c10,bb0000 +3489c14,5e4000 3489c18,ca000 -3489c1c,ca000 -3489c20,affffff8 -3489c24,ca000 -3489c28,ca000 -3489c2c,ca000 -3489c64,dd000 -3489c68,ec000 -3489c6c,4f8000 -3489c70,9d0000 -3489c94,dffb00 -3489cd4,ec000 -3489cd8,ec000 -3489cf0,bc0 -3489cf4,4e60 -3489cf8,bc00 -3489cfc,3e800 -3489d00,ad000 -3489d04,1e9000 -3489d08,9e2000 -3489d0c,da0000 -3489d10,7e30000 -3489d14,cb00000 -3489d18,6e500000 -3489d28,3ceeb00 -3489d2c,bd57e90 -3489d30,e900bd0 -3489d34,5f7009e0 -3489d38,6f6cb9e0 -3489d3c,5f7009e0 -3489d40,e900bd0 -3489d44,bd57e90 -3489d48,3ceeb00 -3489d60,affe000 -3489d64,8e000 -3489d68,8e000 -3489d6c,8e000 -3489d70,8e000 -3489d74,8e000 -3489d78,8e000 -3489d7c,8e000 -3489d80,8ffffe0 -3489d98,8deea00 -3489d9c,c837e90 -3489da0,cc0 -3489da4,2ea0 -3489da8,bd20 -3489dac,bd400 -3489db0,bd4000 -3489db4,bd40000 -3489db8,2fffffd0 -3489dd0,7ceea00 -3489dd4,c837e90 -3489dd8,cb0 -3489ddc,27e90 -3489de0,bffb00 -3489de4,27da0 -3489de8,ad0 -3489dec,5c627db0 -3489df0,9deeb30 -3489e08,2de00 -3489e0c,bde00 -3489e10,7d9e00 -3489e14,2d79e00 -3489e18,bb09e00 -3489e1c,6e409e00 -3489e20,9ffffff7 -3489e24,9e00 -3489e28,9e00 -3489e40,cffff50 -3489e44,ca00000 -3489e48,ca00000 -3489e4c,ceeea00 -3489e50,38e90 -3489e54,bc0 -3489e58,bc0 -3489e5c,5c638e90 -3489e60,9deda00 -3489e78,aeec30 -3489e7c,ae83980 -3489e80,e900000 -3489e84,4faeec40 -3489e88,6fd55dc0 -3489e8c,5f9009e0 -3489e90,e9009e0 -3489e94,cd55dc0 -3489e98,3ceec40 -3489eb0,5fffffd0 -3489eb4,da0 -3489eb8,7e40 -3489ebc,cc00 -3489ec0,4e800 -3489ec4,ad000 -3489ec8,da000 -3489ecc,8e4000 -3489ed0,cc0000 -3489ee8,5ceec30 -3489eec,dc45db0 -3489ef0,e900bd0 -3489ef4,bc45d90 -3489ef8,4dffc20 -3489efc,1db45cc0 -3489f00,5f6009e0 -3489f04,2eb35cd0 -3489f08,7deec50 -3489f20,6deeb00 -3489f24,db37e90 -3489f28,5f500bd0 -3489f2c,5f500be0 -3489f30,db37ee0 -3489f34,6dedbe0 -3489f38,bc0 -3489f3c,9749e70 -3489f40,5ded800 -3489f60,ec000 -3489f64,ec000 -3489f74,ec000 -3489f78,ec000 -3489f98,ec000 -3489f9c,ec000 -3489fac,dd000 -3489fb0,ec000 -3489fb4,4f8000 -3489fb8,9d0000 -3489fd0,29c8 -3489fd4,7bed93 -3489fd8,8dda4000 -3489fdc,8dda4000 -3489fe0,7bec93 -3489fe4,29c8 -348a00c,affffff8 -348a018,affffff8 -348a040,ac810000 -348a044,4adeb600 -348a048,6add6 -348a04c,6add6 -348a050,4adeb600 -348a054,ac810000 -348a070,4beec30 -348a074,9a46ea0 -348a078,1da0 -348a07c,2cd30 -348a080,cc100 -348a084,e9000 -348a08c,e9000 -348a090,e9000 -348a0a8,1aeed70 -348a0ac,cd739e4 -348a0b0,7e2000c9 -348a0b4,ba0aeeca -348a0b8,d76e64da -348a0bc,d69c00aa -348a0c0,d76e64da -348a0c4,ba0aeeca -348a0c8,6e400000 -348a0cc,ad83000 -348a0d0,8dee90 -348a0e0,3ed000 -348a0e4,9de600 -348a0e8,cbcb00 -348a0ec,3e8ad00 -348a0f0,8e26f60 -348a0f4,cc00ea0 -348a0f8,2effffd0 -348a0fc,8e5008f5 -348a100,cd0001ea -348a118,effec40 -348a11c,e905dc0 -348a120,e900ae0 -348a124,e905dc0 -348a128,efffd50 -348a12c,e904bd2 -348a130,e9005f6 -348a134,e904be3 -348a138,effed80 -348a150,9ded80 -348a154,8e936b0 -348a158,db00000 -348a15c,3f900000 -348a160,5f700000 -348a164,1e900000 -348a168,db00000 -348a16c,8e947b0 -348a170,9ded80 -348a188,5ffed800 -348a18c,5f65ae80 -348a190,5f600cd0 -348a194,5f6009e0 -348a198,5f6009f0 -348a19c,5f6009e0 -348a1a0,5f600cd0 -348a1a4,5f65ae80 -348a1a8,5ffed800 -348a1c0,dffffe0 -348a1c4,db00000 -348a1c8,db00000 -348a1cc,db00000 -348a1d0,dffffc0 -348a1d4,db00000 -348a1d8,db00000 -348a1dc,db00000 -348a1e0,dfffff0 -348a1f8,bfffff4 -348a1fc,bd00000 -348a200,bd00000 -348a204,bd00000 -348a208,bffffc0 -348a20c,bd00000 -348a210,bd00000 -348a214,bd00000 -348a218,bd00000 -348a230,1aeed60 -348a234,be738a0 -348a238,4e900000 -348a23c,8f400000 -348a240,9f10bff2 -348a244,7f4007f2 -348a248,4e9007f2 -348a24c,be739f2 -348a250,1beed90 -348a268,5f6009e0 -348a26c,5f6009e0 -348a270,5f6009e0 -348a274,5f6009e0 -348a278,5fffffe0 -348a27c,5f6009e0 -348a280,5f6009e0 -348a284,5f6009e0 -348a288,5f6009e0 -348a2a0,dffffb0 -348a2a4,db000 -348a2a8,db000 -348a2ac,db000 -348a2b0,db000 -348a2b4,db000 -348a2b8,db000 -348a2bc,db000 -348a2c0,dffffb0 -348a2d8,cfff40 -348a2dc,7f40 -348a2e0,7f40 -348a2e4,7f40 -348a2e8,7f40 -348a2ec,7f30 -348a2f0,75009e00 -348a2f4,8d64dc00 -348a2f8,2beec500 -348a310,5f6009e7 -348a314,5f609e70 -348a318,5f69e700 -348a31c,5fbe8000 -348a320,5fedb000 -348a324,5f87e800 -348a328,5f60ae40 -348a32c,5f601dc0 -348a330,5f6006ea -348a348,cc00000 -348a34c,cc00000 -348a350,cc00000 -348a354,cc00000 -348a358,cc00000 -348a35c,cc00000 -348a360,cc00000 -348a364,cc00000 -348a368,cfffff7 -348a380,afa00cf8 -348a384,aed02ee8 -348a388,add59be8 -348a38c,adaac8e8 -348a390,ad5de1e8 -348a394,ad0db0e8 -348a398,ad0000e8 -348a39c,ad0000e8 -348a3a0,ad0000e8 -348a3b8,5fc008e0 -348a3bc,5fe608e0 -348a3c0,5fcb08e0 -348a3c4,5f7e48e0 -348a3c8,5f5ca8e0 -348a3cc,5f57e8e0 -348a3d0,5f50dce0 -348a3d4,5f509ee0 -348a3d8,5f502ee0 -348a3f0,4ceeb20 -348a3f4,cd56ea0 -348a3f8,3e800ae0 -348a3fc,7f5008f2 -348a400,7f4008f4 -348a404,7f5008f2 -348a408,3e800ae0 -348a40c,cd56eb0 -348a410,4ceeb20 -348a428,dffed60 -348a42c,db05ce2 -348a430,db006f6 -348a434,db006f6 -348a438,db05ce2 -348a43c,dffed60 -348a440,db00000 -348a444,db00000 -348a448,db00000 -348a460,4ceeb20 -348a464,cd56ea0 -348a468,3e800ae0 -348a46c,7f5008f2 -348a470,7f4008f4 -348a474,7f5008f1 -348a478,3e800ad0 -348a47c,cd56ea0 -348a480,4cefc20 -348a484,ae50 -348a488,c80 -348a498,5ffeeb20 -348a49c,5f717eb0 -348a4a0,5f700cd0 -348a4a4,5f716ea0 -348a4a8,5fffea00 -348a4ac,5f72ae40 -348a4b0,5f700db0 -348a4b4,5f7008e5 -348a4b8,5f7000db -348a4d0,6ceeb30 -348a4d4,dc45a90 -348a4d8,4f600000 -348a4dc,ec60000 -348a4e0,5ceeb40 -348a4e4,6cc0 -348a4e8,8e0 -348a4ec,c735cd0 -348a4f0,8deec50 -348a508,cffffffb -348a50c,db000 -348a510,db000 -348a514,db000 -348a518,db000 -348a51c,db000 -348a520,db000 -348a524,db000 -348a528,db000 -348a540,4f7009e0 -348a544,4f7009e0 -348a548,4f7009e0 -348a54c,4f7009e0 -348a550,4f7009e0 -348a554,3f7009e0 -348a558,2e700ad0 -348a55c,dc45dc0 -348a560,5ceec40 -348a578,ad0003e8 -348a57c,6f5008e3 -348a580,e900bc0 -348a584,bc00d90 -348a588,8e15e40 -348a58c,2e7ad00 -348a590,cbca00 -348a594,9de600 -348a598,3ed000 -348a5b0,e80000ad -348a5b4,da0000cb -348a5b8,cb0000da -348a5bc,ac0ec0e8 -348a5c0,8d6de1e5 -348a5c4,6e9bd8e0 -348a5c8,1ec8acd0 -348a5cc,de37ec0 -348a5d0,cd00ea0 -348a5e8,6e7007e7 -348a5ec,ad21db0 -348a5f0,2daad20 -348a5f4,7ee700 -348a5f8,3ee200 -348a5fc,bdda00 -348a600,7e67e60 -348a604,3ea00bd0 -348a608,bd2004e9 -348a620,ae2005e8 -348a624,2da00cc0 -348a628,7e57e50 -348a62c,ccda00 -348a630,4ed200 -348a634,db000 -348a638,db000 -348a63c,db000 -348a640,db000 -348a658,efffff8 -348a65c,bd3 -348a660,7e70 -348a664,3ea00 -348a668,bd100 -348a66c,8e5000 -348a670,4e90000 -348a674,cc00000 -348a678,1ffffffa -348a688,4ffc00 -348a68c,4f5000 -348a690,4f5000 -348a694,4f5000 -348a698,4f5000 -348a69c,4f5000 -348a6a0,4f5000 -348a6a4,4f5000 -348a6a8,4f5000 -348a6ac,4f5000 -348a6b0,4f5000 -348a6b4,4ffc00 -348a6c8,6e500000 -348a6cc,cb00000 -348a6d0,7e30000 -348a6d4,da0000 -348a6d8,9e2000 -348a6dc,1e9000 -348a6e0,ad000 -348a6e4,3e800 -348a6e8,bc00 -348a6ec,4e60 -348a6f0,bc0 -348a6f8,dfe000 -348a6fc,8e000 -348a700,8e000 -348a704,8e000 -348a708,8e000 -348a70c,8e000 -348a710,8e000 -348a714,8e000 -348a718,8e000 -348a71c,8e000 -348a720,8e000 -348a724,dfe000 -348a738,5ed200 -348a73c,dcdb00 -348a740,ad25e80 -348a744,7e5007e5 -348a79c,fffffffd -348a7a4,2ca0000 -348a7a8,2c9000 -348a7e8,5ceeb10 -348a7ec,b936da0 -348a7f0,bc0 -348a7f4,8deffc0 -348a7f8,3e930bd0 -348a7fc,4f827ed0 -348a800,aeedbd0 -348a810,d900000 -348a814,d900000 -348a818,d900000 -348a81c,d900000 -348a820,dbdec40 -348a824,de65dc0 -348a828,db008e0 -348a82c,da007f2 -348a830,db008e0 -348a834,de64db0 -348a838,dbdec40 -348a858,8ded70 -348a85c,7e936a0 -348a860,cc00000 -348a864,db00000 -348a868,cc00000 -348a86c,7e936a0 -348a870,8ded70 -348a880,bc0 -348a884,bc0 -348a888,bc0 -348a88c,bc0 -348a890,5dedcc0 -348a894,dc48ec0 -348a898,5f600cc0 -348a89c,7f300bc0 -348a8a0,5f600cc0 -348a8a4,dc48ec0 -348a8a8,5dedcc0 -348a8c8,3beec30 -348a8cc,cd54cc0 -348a8d0,4f6007e0 -348a8d4,6ffffff3 -348a8d8,4f500000 -348a8dc,cc538c0 -348a8e0,3beec60 -348a8f0,5ded0 -348a8f4,cb200 -348a8f8,d9000 -348a8fc,e8000 -348a900,dffffd0 -348a904,e8000 -348a908,e8000 -348a90c,e8000 -348a910,e8000 -348a914,e8000 -348a918,e8000 -348a938,5dedcc0 -348a93c,dc48ec0 -348a940,5f600cc0 -348a944,7f300bc0 -348a948,5f600cc0 -348a94c,dc48ec0 -348a950,5dedcb0 -348a954,ca0 -348a958,9947e60 -348a95c,4cee900 -348a960,da00000 -348a964,da00000 -348a968,da00000 -348a96c,da00000 -348a970,dbded40 -348a974,de65da0 -348a978,db00bc0 -348a97c,da00bc0 -348a980,da00bc0 -348a984,da00bc0 -348a988,da00bc0 -348a998,bc000 -348a9a8,9ffc000 -348a9ac,bc000 -348a9b0,bc000 -348a9b4,bc000 -348a9b8,bc000 -348a9bc,bc000 -348a9c0,effffe0 -348a9d0,7e000 -348a9e0,7ffe000 -348a9e4,7e000 -348a9e8,7e000 -348a9ec,7e000 -348a9f0,7e000 -348a9f4,7e000 -348a9f8,7e000 -348a9fc,7e000 -348aa00,1bd000 -348aa04,dfe7000 -348aa08,bc00000 -348aa0c,bc00000 -348aa10,bc00000 -348aa14,bc00000 -348aa18,bc03dc2 -348aa1c,bc3db00 -348aa20,bddc000 -348aa24,bfce500 -348aa28,bd0cd10 -348aa2c,bc03db0 -348aa30,bc007e8 -348aa40,eff4000 -348aa44,5f4000 -348aa48,5f4000 -348aa4c,5f4000 -348aa50,5f4000 -348aa54,5f4000 -348aa58,5f4000 -348aa5c,5f4000 -348aa60,4f5000 -348aa64,ea000 -348aa68,8efb0 -348aa88,8dddaec0 -348aa8c,8e4dc5e4 -348aa90,8d0cb0e6 -348aa94,8d0ba0e7 -348aa98,8d0ba0e7 -348aa9c,8d0ba0e7 -348aaa0,8d0ba0e7 -348aac0,dbded40 -348aac4,de65da0 -348aac8,db00bc0 -348aacc,da00bc0 -348aad0,da00bc0 -348aad4,da00bc0 -348aad8,da00bc0 -348aaf8,4ceeb20 -348aafc,cd56da0 -348ab00,1e700ad0 -348ab04,5f6008e0 -348ab08,1e700ad0 -348ab0c,cd46db0 -348ab10,4ceeb20 -348ab30,dbdec30 -348ab34,de65db0 -348ab38,db009e0 -348ab3c,da007e0 -348ab40,db008e0 -348ab44,de65db0 -348ab48,dbeec40 -348ab4c,d900000 -348ab50,d900000 -348ab54,d900000 -348ab68,4cedcc0 -348ab6c,cc47ec0 -348ab70,1e700cc0 -348ab74,5f600bc0 -348ab78,2e700cc0 -348ab7c,cc47ec0 -348ab80,5cedbc0 -348ab84,ac0 -348ab88,ac0 -348ab8c,ac0 -348aba0,ccdef9 -348aba4,ce8300 -348aba8,cb0000 -348abac,ca0000 -348abb0,ca0000 -348abb4,ca0000 -348abb8,ca0000 -348abd8,4ceea10 -348abdc,bd45b60 -348abe0,bd40000 -348abe4,3bddb20 -348abe8,4da0 -348abec,b945ea0 -348abf0,5ceeb20 -348ac08,8e0000 -348ac0c,8e0000 -348ac10,6fffffb0 -348ac14,8e0000 -348ac18,8e0000 -348ac1c,8e0000 -348ac20,8e0000 -348ac24,6e7000 -348ac28,befb0 -348ac48,da00bc0 -348ac4c,da00bc0 -348ac50,da00bc0 -348ac54,da00bc0 -348ac58,da00bc0 -348ac5c,bd47ec0 -348ac60,5dedbc0 -348ac80,6e3007e3 -348ac84,d900bc0 -348ac88,ad01e80 -348ac8c,5e48e20 -348ac90,dacb00 -348ac94,9de700 -348ac98,3ee000 -348acb8,e80000ac -348acbc,ca0000ca -348acc0,ac0db0e7 -348acc4,6e3dd5e2 -348acc8,eabcad0 -348accc,ce79eb0 -348acd0,ae15f80 -348acf0,3da00bc0 -348acf4,6e69e40 -348acf8,9ee700 -348acfc,2ed000 -348ad00,ccda00 -348ad04,9e46e70 -348ad08,6e7009e4 -348ad28,6e5005e5 -348ad2c,da00bd0 -348ad30,9e00e90 -348ad34,3e78e30 -348ad38,cccc00 -348ad3c,7ee700 -348ad40,de000 -348ad44,da000 -348ad48,8e5000 -348ad4c,dea0000 -348ad60,bffffc0 -348ad64,5e70 -348ad68,3d900 -348ad6c,cb000 -348ad70,bd2000 -348ad74,9e40000 -348ad78,dffffc0 -348ad88,6dea0 -348ad8c,bd300 -348ad90,cb000 -348ad94,cb000 -348ad98,5ea000 -348ad9c,bfd2000 -348ada0,7e9000 -348ada4,db000 -348ada8,cb000 -348adac,cb000 -348adb0,bd400 -348adb4,5dea0 -348adc0,ca000 -348adc4,ca000 -348adc8,ca000 -348adcc,ca000 -348add0,ca000 -348add4,ca000 -348add8,ca000 -348addc,ca000 -348ade0,ca000 -348ade4,ca000 -348ade8,ca000 -348adec,ca000 -348adf0,ca000 -348adf8,bed3000 -348adfc,4e9000 -348ae00,da000 -348ae04,ca000 -348ae08,bc400 -348ae0c,5efa0 -348ae10,bd500 -348ae14,cb000 -348ae18,da000 -348ae1c,da000 -348ae20,5e8000 -348ae24,bec2000 -348ae48,5ded83a7 -348ae4c,9838dec3 -348aec0,7f024429 -348aec4,3c334133 -348aec8,41334633 -348aecc,44297f02 -348aefc,5409 -348af00,4dc548ff -348af04,41ff43ff -348af08,47ff49ff -348af0c,43ff20c5 -348af10,c0000 -348af3c,3f75 -348af40,49ff33ff -348af44,28ff2dff -348af48,33ff39ff -348af4c,3cff00ff -348af50,770000 -348af7c,329d -348af80,37ff1bff -348af84,21ff28ff -348af88,2fff35ff -348af8c,3cff00ff -348af90,9d0000 -348afbc,329e -348afc0,35ff21ff -348afc4,28ff06ff -348afc8,9ff3cff -348afcc,42ff00ff -348afd0,9e0000 -348affc,359e -348b000,39ff27ff -348b004,2eff00ff -348b008,2ff42ff -348b00c,48ff00ff -348b010,9e0000 -348b03c,3a9e -348b040,3eff2eff -348b044,35ff00ff -348b048,dff48ff -348b04c,4dff00ff -348b050,9e0000 -348b07c,3e9e -348b080,42ff35ff -348b084,3bff1bff -348b088,27ff4dff -348b08c,53ff00ff -348b090,9e0000 -348b0bc,439e -348b0c0,47ff3bff -348b0c4,41ff47ff -348b0c8,4dff52ff -348b0cc,58ff00ff -348b0d0,9e0000 -348b0fc,4d9e -348b100,4dff41ff -348b104,47ff4dff -348b108,52ff57ff -348b10c,5cff00ff -348b110,9e0000 -348b12c,3f04474f -348b130,3e663e66 -348b134,43664666 -348b138,48664d66 -348b13c,57665bc5 -348b140,53ff47ff -348b144,4dff52ff -348b148,57ff5cff -348b14c,60ff0eff -348b150,19c56666 -348b154,66666466 -348b158,61665f66 -348b15c,5c665a66 -348b160,504f3f04 -348b168,6605 -348b16c,4ec34bff -348b170,41ff41ff -348b174,45ff48ff -348b178,4cff4fff -348b17c,55ff59ff -348b180,4fff4dff -348b184,52ff57ff -348b188,5cff60ff -348b18c,64ff61ff -348b190,67ff66ff -348b194,64ff62ff -348b198,60ff5dff -348b19c,5bff57ff -348b1a0,49ff0ec3 -348b1a4,50000 -348b1a8,3958 -348b1ac,44ff31ff -348b1b0,20ff25ff -348b1b4,2bff31ff -348b1b8,38ff3eff -348b1bc,44ff49ff -348b1c0,4dff52ff -348b1c4,57ff5cff -348b1c8,60ff64ff -348b1cc,68ff67ff -348b1d0,64ff60ff -348b1d4,5cff58ff -348b1d8,53ff4eff -348b1dc,48ff43ff -348b1e0,32ff00ff -348b1e4,580000 -348b1e8,2f71 -348b1ec,36ff1dff -348b1f0,1fff26ff -348b1f4,2dff34ff -348b1f8,3aff41ff -348b1fc,47ff4cff -348b200,52ff57ff -348b204,5cff60ff -348b208,64ff68ff -348b20c,67ff64ff -348b210,60ff5bff -348b214,57ff51ff -348b218,4cff46ff -348b21c,40ff3aff -348b220,27ff00ff -348b224,710000 -348b228,2f71 -348b22c,36ff21ff -348b230,16ff00ff -348b234,ff00ff -348b238,2cff47ff -348b23c,4cff52ff -348b240,57ff5cff -348b244,60ff64ff -348b248,67ff67ff -348b24c,64ff60ff -348b250,5bff57ff -348b254,52ff0dff -348b258,ff00ff -348b25c,aff33ff -348b260,21ff00ff -348b264,710000 -348b268,3371 -348b26c,3aff28ff -348b270,22ff0fff -348b274,13ff19ff -348b278,39ff4cff -348b27c,52ff57ff -348b280,5bff60ff -348b284,64ff67ff -348b288,67ff64ff -348b28c,60ff5cff -348b290,57ff52ff -348b294,4cff1dff -348b298,12ff14ff -348b29c,19ff2dff -348b2a0,1bff00ff -348b2a4,710000 -348b2a8,3871 -348b2ac,3dff2fff -348b2b0,33ff3aff -348b2b4,40ff46ff -348b2b8,4cff51ff -348b2bc,57ff5bff -348b2c0,60ff64ff -348b2c4,67ff68ff -348b2c8,64ff60ff -348b2cc,5cff57ff -348b2d0,52ff4cff -348b2d4,47ff41ff -348b2d8,3aff34ff -348b2dc,2dff26ff -348b2e0,12ff00ff -348b2e4,710000 -348b2e8,3569 -348b2ec,37ff33ff -348b2f0,3aff40ff -348b2f4,46ff4cff -348b2f8,51ff57ff -348b2fc,5bff60ff -348b300,64ff67ff -348b304,68ff64ff -348b308,60ff5cff -348b30c,57ff52ff -348b310,4dff47ff -348b314,41ff3aff -348b318,34ff2dff -348b31c,26ff1fff -348b320,6ff00ff -348b324,690000 -348b328,1e21 -348b32c,2f600ff -348b330,ff00ff -348b334,ff00ff -348b338,ff00ff -348b33c,2ff1eff -348b340,60ff68ff -348b344,64ff60ff -348b348,5cff57ff -348b34c,52ff2cff -348b350,6ff00ff -348b354,ff00ff -348b358,ff00ff -348b35c,ff00ff -348b360,ff00f6 -348b364,210000 -348b36c,3b00ae -348b370,cc00cc -348b374,cc00cc -348b378,cc00cc -348b37c,cc03ec -348b380,62ff64ff -348b384,60ff5cff -348b388,57ff52ff -348b38c,4dff00ff -348b390,ec00cc -348b394,cc00cc -348b398,cc00cc -348b39c,cc00cc -348b3a0,ae003b -348b3bc,5f9e -348b3c0,65ff60ff -348b3c4,5cff57ff -348b3c8,52ff4dff -348b3cc,47ff00ff -348b3d0,9e0000 -348b3fc,659e -348b400,63ff5cff -348b404,57ff52ff -348b408,4dff47ff -348b40c,41ff00ff -348b410,9e0000 -348b43c,649e -348b440,61ff58ff -348b444,53ff35ff -348b448,31ff41ff -348b44c,3bff00ff -348b450,9e0000 -348b47c,609e -348b480,5eff53ff -348b484,4dff00ff -348b488,ff3bff -348b48c,35ff00ff -348b490,9e0000 -348b4bc,5d9e -348b4c0,5bff4dff -348b4c4,48ff00ff -348b4c8,6ff35ff -348b4cc,2eff00ff -348b4d0,9e0000 -348b4fc,5a9e -348b500,57ff48ff -348b504,42ff03ff -348b508,cff2eff -348b50c,28ff00ff -348b510,9e0000 -348b53c,559e -348b540,53ff42ff -348b544,3cff2dff -348b548,28ff28ff -348b54c,1fff00ff -348b550,9e0000 -348b57c,4b91 -348b580,44ff33ff -348b584,35ff2fff -348b588,28ff1fff -348b58c,7ff00ff -348b590,900000 -348b5bc,1229 -348b5c0,f700ff -348b5c4,ff00ff -348b5c8,ff00ff -348b5cc,ff00f8 -348b5d0,2e0000 -348b600,30008c -348b604,990099 -348b608,990099 -348b60c,8c0030 -348b668,f0f0f0f0 -348b66c,f0f0f0f0 -348b670,f0f0f0f0 -348b674,f0f0f0f0 -348b678,f0f0f0f0 -348b67c,f0f0f0f0 -348b680,dff0f0f0 -348b684,f0f0f0f0 -348b688,f0f0f0f0 -348b68c,f0f0f0df -348b690,dff0f0f0 -348b694,f0f0f0f0 -348b698,f0f0f0f0 -348b69c,f0f0f0df -348b6a0,dfcff0f0 -348b6a4,f0f0f0f0 -348b6a8,f0f0f0f0 -348b6ac,f0f0cfcf -348b6b0,cfcff0f0 -348b6b4,f0f0f0f0 -348b6b8,f0f0f0f0 -348b6bc,f0f0cfcf -348b6c0,cfcfcff0 -348b6c4,f0f0f0f0 -348b6c8,f0f0f0f0 -348b6cc,f0cfcfcf -348b6d0,cfcfcff0 -348b6d4,f0f0f0f0 -348b6d8,f0f0f0f0 -348b6dc,f0cfcfcf -348b6e0,cfcfcfcf +3489c1c,ad000 +3489c20,7e100 +3489c24,6f400 +3489c28,6f400 +3489c2c,7e100 +3489c30,ad000 +3489c34,ca000 +3489c38,5e4000 +3489c3c,bb0000 +3489c50,a8000 +3489c54,c8a8ab0 +3489c58,3beda10 +3489c5c,3beda10 +3489c60,c8a8ab0 +3489c64,a8000 +3489c8c,ca000 +3489c90,ca000 +3489c94,ca000 +3489c98,affffff8 +3489c9c,ca000 +3489ca0,ca000 +3489ca4,ca000 +3489cdc,dd000 +3489ce0,ec000 +3489ce4,4f8000 +3489ce8,9d0000 +3489d0c,dffb00 +3489d4c,ec000 +3489d50,ec000 +3489d68,bc0 +3489d6c,4e60 +3489d70,bc00 +3489d74,3e800 +3489d78,ad000 +3489d7c,1e9000 +3489d80,9e2000 +3489d84,da0000 +3489d88,7e30000 +3489d8c,cb00000 +3489d90,6e500000 +3489da0,3ceeb00 +3489da4,bd57e90 +3489da8,e900bd0 +3489dac,5f7009e0 +3489db0,6f6cb9e0 +3489db4,5f7009e0 +3489db8,e900bd0 +3489dbc,bd57e90 +3489dc0,3ceeb00 +3489dd8,affe000 +3489ddc,8e000 +3489de0,8e000 +3489de4,8e000 +3489de8,8e000 +3489dec,8e000 +3489df0,8e000 +3489df4,8e000 +3489df8,8ffffe0 +3489e10,8deea00 +3489e14,c837e90 +3489e18,cc0 +3489e1c,2ea0 +3489e20,bd20 +3489e24,bd400 +3489e28,bd4000 +3489e2c,bd40000 +3489e30,2fffffd0 +3489e48,7ceea00 +3489e4c,c837e90 +3489e50,cb0 +3489e54,27e90 +3489e58,bffb00 +3489e5c,27da0 +3489e60,ad0 +3489e64,5c627db0 +3489e68,9deeb30 +3489e80,2de00 +3489e84,bde00 +3489e88,7d9e00 +3489e8c,2d79e00 +3489e90,bb09e00 +3489e94,6e409e00 +3489e98,9ffffff7 +3489e9c,9e00 +3489ea0,9e00 +3489eb8,cffff50 +3489ebc,ca00000 +3489ec0,ca00000 +3489ec4,ceeea00 +3489ec8,38e90 +3489ecc,bc0 +3489ed0,bc0 +3489ed4,5c638e90 +3489ed8,9deda00 +3489ef0,aeec30 +3489ef4,ae83980 +3489ef8,e900000 +3489efc,4faeec40 +3489f00,6fd55dc0 +3489f04,5f9009e0 +3489f08,e9009e0 +3489f0c,cd55dc0 +3489f10,3ceec40 +3489f28,5fffffd0 +3489f2c,da0 +3489f30,7e40 +3489f34,cc00 +3489f38,4e800 +3489f3c,ad000 +3489f40,da000 +3489f44,8e4000 +3489f48,cc0000 +3489f60,5ceec30 +3489f64,dc45db0 +3489f68,e900bd0 +3489f6c,bc45d90 +3489f70,4dffc20 +3489f74,1db45cc0 +3489f78,5f6009e0 +3489f7c,2eb35cd0 +3489f80,7deec50 +3489f98,6deeb00 +3489f9c,db37e90 +3489fa0,5f500bd0 +3489fa4,5f500be0 +3489fa8,db37ee0 +3489fac,6dedbe0 +3489fb0,bc0 +3489fb4,9749e70 +3489fb8,5ded800 +3489fd8,ec000 +3489fdc,ec000 +3489fec,ec000 +3489ff0,ec000 +348a010,ec000 +348a014,ec000 +348a024,dd000 +348a028,ec000 +348a02c,4f8000 +348a030,9d0000 +348a048,29c8 +348a04c,7bed93 +348a050,8dda4000 +348a054,8dda4000 +348a058,7bec93 +348a05c,29c8 +348a084,affffff8 +348a090,affffff8 +348a0b8,ac810000 +348a0bc,4adeb600 +348a0c0,6add6 +348a0c4,6add6 +348a0c8,4adeb600 +348a0cc,ac810000 +348a0e8,4beec30 +348a0ec,9a46ea0 +348a0f0,1da0 +348a0f4,2cd30 +348a0f8,cc100 +348a0fc,e9000 +348a104,e9000 +348a108,e9000 +348a120,1aeed70 +348a124,cd739e4 +348a128,7e2000c9 +348a12c,ba0aeeca +348a130,d76e64da +348a134,d69c00aa +348a138,d76e64da +348a13c,ba0aeeca +348a140,6e400000 +348a144,ad83000 +348a148,8dee90 +348a158,3ed000 +348a15c,9de600 +348a160,cbcb00 +348a164,3e8ad00 +348a168,8e26f60 +348a16c,cc00ea0 +348a170,2effffd0 +348a174,8e5008f5 +348a178,cd0001ea +348a190,effec40 +348a194,e905dc0 +348a198,e900ae0 +348a19c,e905dc0 +348a1a0,efffd50 +348a1a4,e904bd2 +348a1a8,e9005f6 +348a1ac,e904be3 +348a1b0,effed80 +348a1c8,9ded80 +348a1cc,8e936b0 +348a1d0,db00000 +348a1d4,3f900000 +348a1d8,5f700000 +348a1dc,1e900000 +348a1e0,db00000 +348a1e4,8e947b0 +348a1e8,9ded80 +348a200,5ffed800 +348a204,5f65ae80 +348a208,5f600cd0 +348a20c,5f6009e0 +348a210,5f6009f0 +348a214,5f6009e0 +348a218,5f600cd0 +348a21c,5f65ae80 +348a220,5ffed800 +348a238,dffffe0 +348a23c,db00000 +348a240,db00000 +348a244,db00000 +348a248,dffffc0 +348a24c,db00000 +348a250,db00000 +348a254,db00000 +348a258,dfffff0 +348a270,bfffff4 +348a274,bd00000 +348a278,bd00000 +348a27c,bd00000 +348a280,bffffc0 +348a284,bd00000 +348a288,bd00000 +348a28c,bd00000 +348a290,bd00000 +348a2a8,1aeed60 +348a2ac,be738a0 +348a2b0,4e900000 +348a2b4,8f400000 +348a2b8,9f10bff2 +348a2bc,7f4007f2 +348a2c0,4e9007f2 +348a2c4,be739f2 +348a2c8,1beed90 +348a2e0,5f6009e0 +348a2e4,5f6009e0 +348a2e8,5f6009e0 +348a2ec,5f6009e0 +348a2f0,5fffffe0 +348a2f4,5f6009e0 +348a2f8,5f6009e0 +348a2fc,5f6009e0 +348a300,5f6009e0 +348a318,dffffb0 +348a31c,db000 +348a320,db000 +348a324,db000 +348a328,db000 +348a32c,db000 +348a330,db000 +348a334,db000 +348a338,dffffb0 +348a350,cfff40 +348a354,7f40 +348a358,7f40 +348a35c,7f40 +348a360,7f40 +348a364,7f30 +348a368,75009e00 +348a36c,8d64dc00 +348a370,2beec500 +348a388,5f6009e7 +348a38c,5f609e70 +348a390,5f69e700 +348a394,5fbe8000 +348a398,5fedb000 +348a39c,5f87e800 +348a3a0,5f60ae40 +348a3a4,5f601dc0 +348a3a8,5f6006ea +348a3c0,cc00000 +348a3c4,cc00000 +348a3c8,cc00000 +348a3cc,cc00000 +348a3d0,cc00000 +348a3d4,cc00000 +348a3d8,cc00000 +348a3dc,cc00000 +348a3e0,cfffff7 +348a3f8,afa00cf8 +348a3fc,aed02ee8 +348a400,add59be8 +348a404,adaac8e8 +348a408,ad5de1e8 +348a40c,ad0db0e8 +348a410,ad0000e8 +348a414,ad0000e8 +348a418,ad0000e8 +348a430,5fc008e0 +348a434,5fe608e0 +348a438,5fcb08e0 +348a43c,5f7e48e0 +348a440,5f5ca8e0 +348a444,5f57e8e0 +348a448,5f50dce0 +348a44c,5f509ee0 +348a450,5f502ee0 +348a468,4ceeb20 +348a46c,cd56ea0 +348a470,3e800ae0 +348a474,7f5008f2 +348a478,7f4008f4 +348a47c,7f5008f2 +348a480,3e800ae0 +348a484,cd56eb0 +348a488,4ceeb20 +348a4a0,dffed60 +348a4a4,db05ce2 +348a4a8,db006f6 +348a4ac,db006f6 +348a4b0,db05ce2 +348a4b4,dffed60 +348a4b8,db00000 +348a4bc,db00000 +348a4c0,db00000 +348a4d8,4ceeb20 +348a4dc,cd56ea0 +348a4e0,3e800ae0 +348a4e4,7f5008f2 +348a4e8,7f4008f4 +348a4ec,7f5008f1 +348a4f0,3e800ad0 +348a4f4,cd56ea0 +348a4f8,4cefc20 +348a4fc,ae50 +348a500,c80 +348a510,5ffeeb20 +348a514,5f717eb0 +348a518,5f700cd0 +348a51c,5f716ea0 +348a520,5fffea00 +348a524,5f72ae40 +348a528,5f700db0 +348a52c,5f7008e5 +348a530,5f7000db +348a548,6ceeb30 +348a54c,dc45a90 +348a550,4f600000 +348a554,ec60000 +348a558,5ceeb40 +348a55c,6cc0 +348a560,8e0 +348a564,c735cd0 +348a568,8deec50 +348a580,cffffffb +348a584,db000 +348a588,db000 +348a58c,db000 +348a590,db000 +348a594,db000 +348a598,db000 +348a59c,db000 +348a5a0,db000 +348a5b8,4f7009e0 +348a5bc,4f7009e0 +348a5c0,4f7009e0 +348a5c4,4f7009e0 +348a5c8,4f7009e0 +348a5cc,3f7009e0 +348a5d0,2e700ad0 +348a5d4,dc45dc0 +348a5d8,5ceec40 +348a5f0,ad0003e8 +348a5f4,6f5008e3 +348a5f8,e900bc0 +348a5fc,bc00d90 +348a600,8e15e40 +348a604,2e7ad00 +348a608,cbca00 +348a60c,9de600 +348a610,3ed000 +348a628,e80000ad +348a62c,da0000cb +348a630,cb0000da +348a634,ac0ec0e8 +348a638,8d6de1e5 +348a63c,6e9bd8e0 +348a640,1ec8acd0 +348a644,de37ec0 +348a648,cd00ea0 +348a660,6e7007e7 +348a664,ad21db0 +348a668,2daad20 +348a66c,7ee700 +348a670,3ee200 +348a674,bdda00 +348a678,7e67e60 +348a67c,3ea00bd0 +348a680,bd2004e9 +348a698,ae2005e8 +348a69c,2da00cc0 +348a6a0,7e57e50 +348a6a4,ccda00 +348a6a8,4ed200 +348a6ac,db000 +348a6b0,db000 +348a6b4,db000 +348a6b8,db000 +348a6d0,efffff8 +348a6d4,bd3 +348a6d8,7e70 +348a6dc,3ea00 +348a6e0,bd100 +348a6e4,8e5000 +348a6e8,4e90000 +348a6ec,cc00000 +348a6f0,1ffffffa +348a700,4ffc00 +348a704,4f5000 +348a708,4f5000 +348a70c,4f5000 +348a710,4f5000 +348a714,4f5000 +348a718,4f5000 +348a71c,4f5000 +348a720,4f5000 +348a724,4f5000 +348a728,4f5000 +348a72c,4ffc00 +348a740,6e500000 +348a744,cb00000 +348a748,7e30000 +348a74c,da0000 +348a750,9e2000 +348a754,1e9000 +348a758,ad000 +348a75c,3e800 +348a760,bc00 +348a764,4e60 +348a768,bc0 +348a770,dfe000 +348a774,8e000 +348a778,8e000 +348a77c,8e000 +348a780,8e000 +348a784,8e000 +348a788,8e000 +348a78c,8e000 +348a790,8e000 +348a794,8e000 +348a798,8e000 +348a79c,dfe000 +348a7b0,5ed200 +348a7b4,dcdb00 +348a7b8,ad25e80 +348a7bc,7e5007e5 +348a814,fffffffd +348a81c,2ca0000 +348a820,2c9000 +348a860,5ceeb10 +348a864,b936da0 +348a868,bc0 +348a86c,8deffc0 +348a870,3e930bd0 +348a874,4f827ed0 +348a878,aeedbd0 +348a888,d900000 +348a88c,d900000 +348a890,d900000 +348a894,d900000 +348a898,dbdec40 +348a89c,de65dc0 +348a8a0,db008e0 +348a8a4,da007f2 +348a8a8,db008e0 +348a8ac,de64db0 +348a8b0,dbdec40 +348a8d0,8ded70 +348a8d4,7e936a0 +348a8d8,cc00000 +348a8dc,db00000 +348a8e0,cc00000 +348a8e4,7e936a0 +348a8e8,8ded70 +348a8f8,bc0 +348a8fc,bc0 +348a900,bc0 +348a904,bc0 +348a908,5dedcc0 +348a90c,dc48ec0 +348a910,5f600cc0 +348a914,7f300bc0 +348a918,5f600cc0 +348a91c,dc48ec0 +348a920,5dedcc0 +348a940,3beec30 +348a944,cd54cc0 +348a948,4f6007e0 +348a94c,6ffffff3 +348a950,4f500000 +348a954,cc538c0 +348a958,3beec60 +348a968,5ded0 +348a96c,cb200 +348a970,d9000 +348a974,e8000 +348a978,dffffd0 +348a97c,e8000 +348a980,e8000 +348a984,e8000 +348a988,e8000 +348a98c,e8000 +348a990,e8000 +348a9b0,5dedcc0 +348a9b4,dc48ec0 +348a9b8,5f600cc0 +348a9bc,7f300bc0 +348a9c0,5f600cc0 +348a9c4,dc48ec0 +348a9c8,5dedcb0 +348a9cc,ca0 +348a9d0,9947e60 +348a9d4,4cee900 +348a9d8,da00000 +348a9dc,da00000 +348a9e0,da00000 +348a9e4,da00000 +348a9e8,dbded40 +348a9ec,de65da0 +348a9f0,db00bc0 +348a9f4,da00bc0 +348a9f8,da00bc0 +348a9fc,da00bc0 +348aa00,da00bc0 +348aa10,bc000 +348aa20,9ffc000 +348aa24,bc000 +348aa28,bc000 +348aa2c,bc000 +348aa30,bc000 +348aa34,bc000 +348aa38,effffe0 +348aa48,7e000 +348aa58,7ffe000 +348aa5c,7e000 +348aa60,7e000 +348aa64,7e000 +348aa68,7e000 +348aa6c,7e000 +348aa70,7e000 +348aa74,7e000 +348aa78,1bd000 +348aa7c,dfe7000 +348aa80,bc00000 +348aa84,bc00000 +348aa88,bc00000 +348aa8c,bc00000 +348aa90,bc03dc2 +348aa94,bc3db00 +348aa98,bddc000 +348aa9c,bfce500 +348aaa0,bd0cd10 +348aaa4,bc03db0 +348aaa8,bc007e8 +348aab8,eff4000 +348aabc,5f4000 +348aac0,5f4000 +348aac4,5f4000 +348aac8,5f4000 +348aacc,5f4000 +348aad0,5f4000 +348aad4,5f4000 +348aad8,4f5000 +348aadc,ea000 +348aae0,8efb0 +348ab00,8dddaec0 +348ab04,8e4dc5e4 +348ab08,8d0cb0e6 +348ab0c,8d0ba0e7 +348ab10,8d0ba0e7 +348ab14,8d0ba0e7 +348ab18,8d0ba0e7 +348ab38,dbded40 +348ab3c,de65da0 +348ab40,db00bc0 +348ab44,da00bc0 +348ab48,da00bc0 +348ab4c,da00bc0 +348ab50,da00bc0 +348ab70,4ceeb20 +348ab74,cd56da0 +348ab78,1e700ad0 +348ab7c,5f6008e0 +348ab80,1e700ad0 +348ab84,cd46db0 +348ab88,4ceeb20 +348aba8,dbdec30 +348abac,de65db0 +348abb0,db009e0 +348abb4,da007e0 +348abb8,db008e0 +348abbc,de65db0 +348abc0,dbeec40 +348abc4,d900000 +348abc8,d900000 +348abcc,d900000 +348abe0,4cedcc0 +348abe4,cc47ec0 +348abe8,1e700cc0 +348abec,5f600bc0 +348abf0,2e700cc0 +348abf4,cc47ec0 +348abf8,5cedbc0 +348abfc,ac0 +348ac00,ac0 +348ac04,ac0 +348ac18,ccdef9 +348ac1c,ce8300 +348ac20,cb0000 +348ac24,ca0000 +348ac28,ca0000 +348ac2c,ca0000 +348ac30,ca0000 +348ac50,4ceea10 +348ac54,bd45b60 +348ac58,bd40000 +348ac5c,3bddb20 +348ac60,4da0 +348ac64,b945ea0 +348ac68,5ceeb20 +348ac80,8e0000 +348ac84,8e0000 +348ac88,6fffffb0 +348ac8c,8e0000 +348ac90,8e0000 +348ac94,8e0000 +348ac98,8e0000 +348ac9c,6e7000 +348aca0,befb0 +348acc0,da00bc0 +348acc4,da00bc0 +348acc8,da00bc0 +348accc,da00bc0 +348acd0,da00bc0 +348acd4,bd47ec0 +348acd8,5dedbc0 +348acf8,6e3007e3 +348acfc,d900bc0 +348ad00,ad01e80 +348ad04,5e48e20 +348ad08,dacb00 +348ad0c,9de700 +348ad10,3ee000 +348ad30,e80000ac +348ad34,ca0000ca +348ad38,ac0db0e7 +348ad3c,6e3dd5e2 +348ad40,eabcad0 +348ad44,ce79eb0 +348ad48,ae15f80 +348ad68,3da00bc0 +348ad6c,6e69e40 +348ad70,9ee700 +348ad74,2ed000 +348ad78,ccda00 +348ad7c,9e46e70 +348ad80,6e7009e4 +348ada0,6e5005e5 +348ada4,da00bd0 +348ada8,9e00e90 +348adac,3e78e30 +348adb0,cccc00 +348adb4,7ee700 +348adb8,de000 +348adbc,da000 +348adc0,8e5000 +348adc4,dea0000 +348add8,bffffc0 +348addc,5e70 +348ade0,3d900 +348ade4,cb000 +348ade8,bd2000 +348adec,9e40000 +348adf0,dffffc0 +348ae00,6dea0 +348ae04,bd300 +348ae08,cb000 +348ae0c,cb000 +348ae10,5ea000 +348ae14,bfd2000 +348ae18,7e9000 +348ae1c,db000 +348ae20,cb000 +348ae24,cb000 +348ae28,bd400 +348ae2c,5dea0 +348ae38,ca000 +348ae3c,ca000 +348ae40,ca000 +348ae44,ca000 +348ae48,ca000 +348ae4c,ca000 +348ae50,ca000 +348ae54,ca000 +348ae58,ca000 +348ae5c,ca000 +348ae60,ca000 +348ae64,ca000 +348ae68,ca000 +348ae70,bed3000 +348ae74,4e9000 +348ae78,da000 +348ae7c,ca000 +348ae80,bc400 +348ae84,5efa0 +348ae88,bd500 +348ae8c,cb000 +348ae90,da000 +348ae94,da000 +348ae98,5e8000 +348ae9c,bec2000 +348aec0,5ded83a7 +348aec4,9838dec3 +348af38,7f024429 +348af3c,3c334133 +348af40,41334633 +348af44,44297f02 +348af74,5409 +348af78,4dc548ff +348af7c,41ff43ff +348af80,47ff49ff +348af84,43ff20c5 +348af88,c0000 +348afb4,3f75 +348afb8,49ff33ff +348afbc,28ff2dff +348afc0,33ff39ff +348afc4,3cff00ff +348afc8,770000 +348aff4,329d +348aff8,37ff1bff +348affc,21ff28ff +348b000,2fff35ff +348b004,3cff00ff +348b008,9d0000 +348b034,329e +348b038,35ff21ff +348b03c,28ff06ff +348b040,9ff3cff +348b044,42ff00ff +348b048,9e0000 +348b074,359e +348b078,39ff27ff +348b07c,2eff00ff +348b080,2ff42ff +348b084,48ff00ff +348b088,9e0000 +348b0b4,3a9e +348b0b8,3eff2eff +348b0bc,35ff00ff +348b0c0,dff48ff +348b0c4,4dff00ff +348b0c8,9e0000 +348b0f4,3e9e +348b0f8,42ff35ff +348b0fc,3bff1bff +348b100,27ff4dff +348b104,53ff00ff +348b108,9e0000 +348b134,439e +348b138,47ff3bff +348b13c,41ff47ff +348b140,4dff52ff +348b144,58ff00ff +348b148,9e0000 +348b174,4d9e +348b178,4dff41ff +348b17c,47ff4dff +348b180,52ff57ff +348b184,5cff00ff +348b188,9e0000 +348b1a4,3f04474f +348b1a8,3e663e66 +348b1ac,43664666 +348b1b0,48664d66 +348b1b4,57665bc5 +348b1b8,53ff47ff +348b1bc,4dff52ff +348b1c0,57ff5cff +348b1c4,60ff0eff +348b1c8,19c56666 +348b1cc,66666466 +348b1d0,61665f66 +348b1d4,5c665a66 +348b1d8,504f3f04 +348b1e0,6605 +348b1e4,4ec34bff +348b1e8,41ff41ff +348b1ec,45ff48ff +348b1f0,4cff4fff +348b1f4,55ff59ff +348b1f8,4fff4dff +348b1fc,52ff57ff +348b200,5cff60ff +348b204,64ff61ff +348b208,67ff66ff +348b20c,64ff62ff +348b210,60ff5dff +348b214,5bff57ff +348b218,49ff0ec3 +348b21c,50000 +348b220,3958 +348b224,44ff31ff +348b228,20ff25ff +348b22c,2bff31ff +348b230,38ff3eff +348b234,44ff49ff +348b238,4dff52ff +348b23c,57ff5cff +348b240,60ff64ff +348b244,68ff67ff +348b248,64ff60ff +348b24c,5cff58ff +348b250,53ff4eff +348b254,48ff43ff +348b258,32ff00ff +348b25c,580000 +348b260,2f71 +348b264,36ff1dff +348b268,1fff26ff +348b26c,2dff34ff +348b270,3aff41ff +348b274,47ff4cff +348b278,52ff57ff +348b27c,5cff60ff +348b280,64ff68ff +348b284,67ff64ff +348b288,60ff5bff +348b28c,57ff51ff +348b290,4cff46ff +348b294,40ff3aff +348b298,27ff00ff +348b29c,710000 +348b2a0,2f71 +348b2a4,36ff21ff +348b2a8,16ff00ff +348b2ac,ff00ff +348b2b0,2cff47ff +348b2b4,4cff52ff +348b2b8,57ff5cff +348b2bc,60ff64ff +348b2c0,67ff67ff +348b2c4,64ff60ff +348b2c8,5bff57ff +348b2cc,52ff0dff +348b2d0,ff00ff +348b2d4,aff33ff +348b2d8,21ff00ff +348b2dc,710000 +348b2e0,3371 +348b2e4,3aff28ff +348b2e8,22ff0fff +348b2ec,13ff19ff +348b2f0,39ff4cff +348b2f4,52ff57ff +348b2f8,5bff60ff +348b2fc,64ff67ff +348b300,67ff64ff +348b304,60ff5cff +348b308,57ff52ff +348b30c,4cff1dff +348b310,12ff14ff +348b314,19ff2dff +348b318,1bff00ff +348b31c,710000 +348b320,3871 +348b324,3dff2fff +348b328,33ff3aff +348b32c,40ff46ff +348b330,4cff51ff +348b334,57ff5bff +348b338,60ff64ff +348b33c,67ff68ff +348b340,64ff60ff +348b344,5cff57ff +348b348,52ff4cff +348b34c,47ff41ff +348b350,3aff34ff +348b354,2dff26ff +348b358,12ff00ff +348b35c,710000 +348b360,3569 +348b364,37ff33ff +348b368,3aff40ff +348b36c,46ff4cff +348b370,51ff57ff +348b374,5bff60ff +348b378,64ff67ff +348b37c,68ff64ff +348b380,60ff5cff +348b384,57ff52ff +348b388,4dff47ff +348b38c,41ff3aff +348b390,34ff2dff +348b394,26ff1fff +348b398,6ff00ff +348b39c,690000 +348b3a0,1e21 +348b3a4,2f600ff +348b3a8,ff00ff +348b3ac,ff00ff +348b3b0,ff00ff +348b3b4,2ff1eff +348b3b8,60ff68ff +348b3bc,64ff60ff +348b3c0,5cff57ff +348b3c4,52ff2cff +348b3c8,6ff00ff +348b3cc,ff00ff +348b3d0,ff00ff +348b3d4,ff00ff +348b3d8,ff00f6 +348b3dc,210000 +348b3e4,3b00ae +348b3e8,cc00cc +348b3ec,cc00cc +348b3f0,cc00cc +348b3f4,cc03ec +348b3f8,62ff64ff +348b3fc,60ff5cff +348b400,57ff52ff +348b404,4dff00ff +348b408,ec00cc +348b40c,cc00cc +348b410,cc00cc +348b414,cc00cc +348b418,ae003b +348b434,5f9e +348b438,65ff60ff +348b43c,5cff57ff +348b440,52ff4dff +348b444,47ff00ff +348b448,9e0000 +348b474,659e +348b478,63ff5cff +348b47c,57ff52ff +348b480,4dff47ff +348b484,41ff00ff +348b488,9e0000 +348b4b4,649e +348b4b8,61ff58ff +348b4bc,53ff35ff +348b4c0,31ff41ff +348b4c4,3bff00ff +348b4c8,9e0000 +348b4f4,609e +348b4f8,5eff53ff +348b4fc,4dff00ff +348b500,ff3bff +348b504,35ff00ff +348b508,9e0000 +348b534,5d9e +348b538,5bff4dff +348b53c,48ff00ff +348b540,6ff35ff +348b544,2eff00ff +348b548,9e0000 +348b574,5a9e +348b578,57ff48ff +348b57c,42ff03ff +348b580,cff2eff +348b584,28ff00ff +348b588,9e0000 +348b5b4,559e +348b5b8,53ff42ff +348b5bc,3cff2dff +348b5c0,28ff28ff +348b5c4,1fff00ff +348b5c8,9e0000 +348b5f4,4b91 +348b5f8,44ff33ff +348b5fc,35ff2fff +348b600,28ff1fff +348b604,7ff00ff +348b608,900000 +348b634,1229 +348b638,f700ff +348b63c,ff00ff +348b640,ff00ff +348b644,ff00f8 +348b648,2e0000 +348b678,30008c +348b67c,990099 +348b680,990099 +348b684,8c0030 +348b6e0,f0f0f0f0 348b6e4,f0f0f0f0 348b6e8,f0f0f0f0 -348b6ec,cfcfcfcf -348b6f0,cfbfbfbf +348b6ec,f0f0f0f0 +348b6f0,f0f0f0f0 348b6f4,f0f0f0f0 -348b6f8,f0f0f0f0 -348b6fc,bfbfbfbf -348b700,bfbfbfbf -348b704,f0f0f0f0 -348b708,f0f0f0bf -348b70c,bfbfbfbf -348b710,bfbfbfbf -348b714,bff0f0f0 -348b718,f0f0f0bf -348b71c,bfbff0f0 +348b6f8,dff0f0f0 +348b6fc,f0f0f0f0 +348b700,f0f0f0f0 +348b704,f0f0f0df +348b708,dff0f0f0 +348b70c,f0f0f0f0 +348b710,f0f0f0f0 +348b714,f0f0f0df +348b718,dfcff0f0 +348b71c,f0f0f0f0 348b720,f0f0f0f0 -348b724,f0f0f0f0 -348b728,f0f0f0f0 +348b724,f0f0cfcf +348b728,cfcff0f0 348b72c,f0f0f0f0 348b730,f0f0f0f0 -348b734,f0f0f0f0 -348b738,f0f0f0f0 +348b734,f0f0cfcf +348b738,cfcfcff0 348b73c,f0f0f0f0 348b740,f0f0f0f0 -348b744,f0f0f0f0 -348b748,f0f0f0f0 +348b744,f0cfcfcf +348b748,cfcfcff0 348b74c,f0f0f0f0 348b750,f0f0f0f0 -348b754,f0f0f0f0 -348b758,f0f0f0f0 +348b754,f0cfcfcf +348b758,cfcfcfcf 348b75c,f0f0f0f0 348b760,f0f0f0f0 -348b764,f0f0f0f0 -348b768,f0f0f0f0 +348b764,cfcfcfcf +348b768,cfbfbfbf 348b76c,f0f0f0f0 348b770,f0f0f0f0 -348b774,f0f0f0f0 -348b778,f0f0f0f0 -348b77c,f0f0f0cf -348b780,cff0f0f0 -348b784,f0f0f0f0 -348b788,f0f0f0f0 -348b78c,f0f0f0cf -348b790,cfcff0f0 -348b794,f0f0f0f0 +348b774,bfbfbfbf +348b778,bfbfbfbf +348b77c,f0f0f0f0 +348b780,f0f0f0bf +348b784,bfbfbfbf +348b788,bfbfbfbf +348b78c,bff0f0f0 +348b790,f0f0f0bf +348b794,bfbff0f0 348b798,f0f0f0f0 -348b79c,f0f0bfcf -348b7a0,cfcff0f0 +348b79c,f0f0f0f0 +348b7a0,f0f0f0f0 348b7a4,f0f0f0f0 348b7a8,f0f0f0f0 -348b7ac,f0f0bfcf -348b7b0,cfcff0f0 +348b7ac,f0f0f0f0 +348b7b0,f0f0f0f0 348b7b4,f0f0f0f0 348b7b8,f0f0f0f0 -348b7bc,f0bfcfbf -348b7c0,bfbfbff0 +348b7bc,f0f0f0f0 +348b7c0,f0f0f0f0 348b7c4,f0f0f0f0 348b7c8,f0f0f0f0 -348b7cc,f0bfbfbf -348b7d0,bfbfbff0 +348b7cc,f0f0f0f0 +348b7d0,f0f0f0f0 348b7d4,f0f0f0f0 348b7d8,f0f0f0f0 -348b7dc,bfbfbfbf -348b7e0,bfbfbfbf +348b7dc,f0f0f0f0 +348b7e0,f0f0f0f0 348b7e4,f0f0f0f0 348b7e8,f0f0f0f0 -348b7ec,bfbfbfbf -348b7f0,bfbfbfbf -348b7f4,f0f0f0f0 -348b7f8,f0f0f0f0 -348b7fc,bfbfbfbf -348b800,bfbfbfaf -348b804,f0f0f0f0 -348b808,f0f0f0af -348b80c,bfbfbfbf -348b810,afafaff0 -348b814,f0f0f0f0 -348b818,f0f0f0bf -348b81c,bfbfaff0 +348b7ec,f0f0f0f0 +348b7f0,f0f0f0f0 +348b7f4,f0f0f0cf +348b7f8,cff0f0f0 +348b7fc,f0f0f0f0 +348b800,f0f0f0f0 +348b804,f0f0f0cf +348b808,cfcff0f0 +348b80c,f0f0f0f0 +348b810,f0f0f0f0 +348b814,f0f0bfcf +348b818,cfcff0f0 +348b81c,f0f0f0f0 348b820,f0f0f0f0 -348b824,f0f0f0f0 -348b828,f0f0f0f0 +348b824,f0f0bfcf +348b828,cfcff0f0 348b82c,f0f0f0f0 348b830,f0f0f0f0 -348b834,f0f0f0f0 -348b838,f0f0f0f0 +348b834,f0bfcfbf +348b838,bfbfbff0 348b83c,f0f0f0f0 348b840,f0f0f0f0 -348b844,f0f0f0f0 -348b848,f0f0f0f0 +348b844,f0bfbfbf +348b848,bfbfbff0 348b84c,f0f0f0f0 348b850,f0f0f0f0 -348b854,f0f0f0f0 -348b858,f0f0f0f0 +348b854,bfbfbfbf +348b858,bfbfbfbf 348b85c,f0f0f0f0 348b860,f0f0f0f0 -348b864,f0f0f0f0 -348b868,f0f0f0f0 +348b864,bfbfbfbf +348b868,bfbfbfbf 348b86c,f0f0f0f0 348b870,f0f0f0f0 -348b874,f0f0f0f0 -348b878,f0f0f0f0 -348b87c,f0f0f0ef -348b880,eff0f0f0 -348b884,f0f0f0f0 -348b888,f0f0f0f0 -348b88c,f0f0f0ef -348b890,bfbff0f0 -348b894,f0f0f0f0 +348b874,bfbfbfbf +348b878,bfbfbfaf +348b87c,f0f0f0f0 +348b880,f0f0f0af +348b884,bfbfbfbf +348b888,afafaff0 +348b88c,f0f0f0f0 +348b890,f0f0f0bf +348b894,bfbfaff0 348b898,f0f0f0f0 -348b89c,f0f0dfdf -348b8a0,bfbff0f0 +348b89c,f0f0f0f0 +348b8a0,f0f0f0f0 348b8a4,f0f0f0f0 348b8a8,f0f0f0f0 -348b8ac,f0f0dfbf -348b8b0,afaff0f0 +348b8ac,f0f0f0f0 +348b8b0,f0f0f0f0 348b8b4,f0f0f0f0 348b8b8,f0f0f0f0 -348b8bc,f0dfdfaf -348b8c0,afafaff0 +348b8bc,f0f0f0f0 +348b8c0,f0f0f0f0 348b8c4,f0f0f0f0 348b8c8,f0f0f0f0 -348b8cc,f0dfafaf -348b8d0,afafaff0 +348b8cc,f0f0f0f0 +348b8d0,f0f0f0f0 348b8d4,f0f0f0f0 348b8d8,f0f0f0f0 -348b8dc,dfdfafaf -348b8e0,afafaff0 +348b8dc,f0f0f0f0 +348b8e0,f0f0f0f0 348b8e4,f0f0f0f0 348b8e8,f0f0f0f0 -348b8ec,dfdfafaf -348b8f0,afafaf9f -348b8f4,f0f0f0f0 -348b8f8,f0f0f0f0 -348b8fc,cfafafaf -348b900,afaf9f9f -348b904,f0f0f0f0 -348b908,f0f0f0cf -348b90c,cfafafaf -348b910,9f9ff0f0 -348b914,f0f0f0f0 -348b918,f0f0f0cf -348b91c,afafaf9f +348b8ec,f0f0f0f0 +348b8f0,f0f0f0f0 +348b8f4,f0f0f0ef +348b8f8,eff0f0f0 +348b8fc,f0f0f0f0 +348b900,f0f0f0f0 +348b904,f0f0f0ef +348b908,bfbff0f0 +348b90c,f0f0f0f0 +348b910,f0f0f0f0 +348b914,f0f0dfdf +348b918,bfbff0f0 +348b91c,f0f0f0f0 348b920,f0f0f0f0 -348b924,f0f0f0f0 -348b928,f0f0f0cf -348b92c,aff0f0f0 +348b924,f0f0dfbf +348b928,afaff0f0 +348b92c,f0f0f0f0 348b930,f0f0f0f0 -348b934,f0f0f0f0 -348b938,f0f0f0f0 +348b934,f0dfdfaf +348b938,afafaff0 348b93c,f0f0f0f0 348b940,f0f0f0f0 -348b944,f0f0f0f0 -348b948,f0f0f0f0 +348b944,f0dfafaf +348b948,afafaff0 348b94c,f0f0f0f0 348b950,f0f0f0f0 -348b954,f0f0f0f0 -348b958,f0f0f0f0 +348b954,dfdfafaf +348b958,afafaff0 348b95c,f0f0f0f0 348b960,f0f0f0f0 -348b964,f0f0f0f0 -348b968,f0f0f0f0 +348b964,dfdfafaf +348b968,afafaf9f 348b96c,f0f0f0f0 348b970,f0f0f0f0 -348b974,f0f0f0f0 -348b978,f0f0f0f0 -348b97c,f0f0f0ff -348b980,ff9ff0f0 -348b984,f0f0f0f0 -348b988,f0f0f0f0 -348b98c,f0f0ffff -348b990,ff9ff0f0 -348b994,f0f0f0f0 +348b974,cfafafaf +348b978,afaf9f9f +348b97c,f0f0f0f0 +348b980,f0f0f0cf +348b984,cfafafaf +348b988,9f9ff0f0 +348b98c,f0f0f0f0 +348b990,f0f0f0cf +348b994,afafaf9f 348b998,f0f0f0f0 -348b99c,f0f0ffff -348b9a0,9f9ff0f0 -348b9a4,f0f0f0f0 +348b99c,f0f0f0f0 +348b9a0,f0f0f0cf +348b9a4,aff0f0f0 348b9a8,f0f0f0f0 -348b9ac,f0f0ffff -348b9b0,9f9ff0f0 +348b9ac,f0f0f0f0 +348b9b0,f0f0f0f0 348b9b4,f0f0f0f0 348b9b8,f0f0f0f0 -348b9bc,f0efef9f -348b9c0,9f9f9ff0 +348b9bc,f0f0f0f0 +348b9c0,f0f0f0f0 348b9c4,f0f0f0f0 348b9c8,f0f0f0f0 -348b9cc,f0efef9f -348b9d0,9f9f8ff0 +348b9cc,f0f0f0f0 +348b9d0,f0f0f0f0 348b9d4,f0f0f0f0 348b9d8,f0f0f0f0 -348b9dc,f0efef9f -348b9e0,9f8f8ff0 +348b9dc,f0f0f0f0 +348b9e0,f0f0f0f0 348b9e4,f0f0f0f0 348b9e8,f0f0f0f0 -348b9ec,efef9f9f -348b9f0,8f8f8ff0 -348b9f4,f0f0f0f0 -348b9f8,f0f0f0f0 -348b9fc,efef9f8f -348ba00,8f8f8ff0 -348ba04,f0f0f0f0 -348ba08,f0f0f0ef -348ba0c,efef8f8f -348ba10,8f8ff0f0 -348ba14,f0f0f0f0 -348ba18,f0f0f0ef -348ba1c,ef8f8f8f +348b9ec,f0f0f0f0 +348b9f0,f0f0f0f0 +348b9f4,f0f0f0ff +348b9f8,ff9ff0f0 +348b9fc,f0f0f0f0 +348ba00,f0f0f0f0 +348ba04,f0f0ffff +348ba08,ff9ff0f0 +348ba0c,f0f0f0f0 +348ba10,f0f0f0f0 +348ba14,f0f0ffff +348ba18,9f9ff0f0 +348ba1c,f0f0f0f0 348ba20,f0f0f0f0 -348ba24,f0f0f0f0 -348ba28,f0f0f0ef -348ba2c,ef8f8ff0 +348ba24,f0f0ffff +348ba28,9f9ff0f0 +348ba2c,f0f0f0f0 348ba30,f0f0f0f0 -348ba34,f0f0f0f0 -348ba38,f0f0f0f0 -348ba3c,8ff0f0f0 +348ba34,f0efef9f +348ba38,9f9f9ff0 +348ba3c,f0f0f0f0 348ba40,f0f0f0f0 -348ba44,f0f0f0f0 -348ba48,f0f0f0f0 +348ba44,f0efef9f +348ba48,9f9f8ff0 348ba4c,f0f0f0f0 348ba50,f0f0f0f0 -348ba54,f0f0f0f0 -348ba58,f0f0f0f0 +348ba54,f0efef9f +348ba58,9f8f8ff0 348ba5c,f0f0f0f0 348ba60,f0f0f0f0 -348ba64,f0f0f0f0 -348ba68,f0f0f0f0 +348ba64,efef9f9f +348ba68,8f8f8ff0 348ba6c,f0f0f0f0 348ba70,f0f0f0f0 -348ba74,f0f0f0f0 -348ba78,f0f0f0f0 -348ba7c,f0f0f0ff -348ba80,ff7ff0f0 -348ba84,f0f0f0f0 -348ba88,f0f0f0f0 -348ba8c,f0f0ffff -348ba90,ff7ff0f0 -348ba94,f0f0f0f0 +348ba74,efef9f8f +348ba78,8f8f8ff0 +348ba7c,f0f0f0f0 +348ba80,f0f0f0ef +348ba84,efef8f8f +348ba88,8f8ff0f0 +348ba8c,f0f0f0f0 +348ba90,f0f0f0ef +348ba94,ef8f8f8f 348ba98,f0f0f0f0 -348ba9c,f0f0ffff -348baa0,ff7ff0f0 -348baa4,f0f0f0f0 +348ba9c,f0f0f0f0 +348baa0,f0f0f0ef +348baa4,ef8f8ff0 348baa8,f0f0f0f0 -348baac,f0f0ffff -348bab0,7f7ff0f0 -348bab4,f0f0f0f0 +348baac,f0f0f0f0 +348bab0,f0f0f0f0 +348bab4,8ff0f0f0 348bab8,f0f0f0f0 -348babc,f0ffffff -348bac0,7f7ff0f0 +348babc,f0f0f0f0 +348bac0,f0f0f0f0 348bac4,f0f0f0f0 348bac8,f0f0f0f0 -348bacc,f0ffffff -348bad0,7f7ff0f0 +348bacc,f0f0f0f0 +348bad0,f0f0f0f0 348bad4,f0f0f0f0 348bad8,f0f0f0f0 -348badc,f0ffff7f -348bae0,7f7f7ff0 +348badc,f0f0f0f0 +348bae0,f0f0f0f0 348bae4,f0f0f0f0 348bae8,f0f0f0f0 -348baec,ffffff7f -348baf0,7f7f6ff0 -348baf4,f0f0f0f0 -348baf8,f0f0f0f0 -348bafc,ffffff7f -348bb00,7f6f6ff0 -348bb04,f0f0f0f0 -348bb08,f0f0f0f0 -348bb0c,ffffff7f -348bb10,7f6ff0f0 -348bb14,f0f0f0f0 -348bb18,f0f0f0f0 -348bb1c,ffff7f7f +348baec,f0f0f0f0 +348baf0,f0f0f0f0 +348baf4,f0f0f0ff +348baf8,ff7ff0f0 +348bafc,f0f0f0f0 +348bb00,f0f0f0f0 +348bb04,f0f0ffff +348bb08,ff7ff0f0 +348bb0c,f0f0f0f0 +348bb10,f0f0f0f0 +348bb14,f0f0ffff +348bb18,ff7ff0f0 +348bb1c,f0f0f0f0 348bb20,f0f0f0f0 -348bb24,f0f0f0f0 -348bb28,f0f0f0ff -348bb2c,ffff7ff0 +348bb24,f0f0ffff +348bb28,7f7ff0f0 +348bb2c,f0f0f0f0 348bb30,f0f0f0f0 -348bb34,f0f0f0f0 -348bb38,f0f0f0f0 -348bb3c,fffff0f0 +348bb34,f0ffffff +348bb38,7f7ff0f0 +348bb3c,f0f0f0f0 348bb40,f0f0f0f0 -348bb44,f0f0f0f0 -348bb48,f0f0f0f0 +348bb44,f0ffffff +348bb48,7f7ff0f0 348bb4c,f0f0f0f0 348bb50,f0f0f0f0 -348bb54,f0f0f0f0 -348bb58,f0f0f0f0 +348bb54,f0ffff7f +348bb58,7f7f7ff0 348bb5c,f0f0f0f0 348bb60,f0f0f0f0 -348bb64,f0f0f0f0 -348bb68,f0f0f0f0 +348bb64,ffffff7f +348bb68,7f7f6ff0 348bb6c,f0f0f0f0 348bb70,f0f0f0f0 -348bb74,f0f0f0f0 -348bb78,f0f0f0f0 -348bb7c,f0f0ffff -348bb80,ff5ff0f0 -348bb84,f0f0f0f0 -348bb88,f0f0f0f0 -348bb8c,f0f0ffff -348bb90,ff5ff0f0 -348bb94,f0f0f0f0 +348bb74,ffffff7f +348bb78,7f6f6ff0 +348bb7c,f0f0f0f0 +348bb80,f0f0f0f0 +348bb84,ffffff7f +348bb88,7f6ff0f0 +348bb8c,f0f0f0f0 +348bb90,f0f0f0f0 +348bb94,ffff7f7f 348bb98,f0f0f0f0 -348bb9c,f0f0ffff -348bba0,ff5ff0f0 -348bba4,f0f0f0f0 +348bb9c,f0f0f0f0 +348bba0,f0f0f0ff +348bba4,ffff7ff0 348bba8,f0f0f0f0 -348bbac,f0f0ffff -348bbb0,ff5ff0f0 -348bbb4,f0f0f0f0 +348bbac,f0f0f0f0 +348bbb0,f0f0f0f0 +348bbb4,fffff0f0 348bbb8,f0f0f0f0 -348bbbc,f0f0ffff -348bbc0,ff5ff0f0 +348bbbc,f0f0f0f0 +348bbc0,f0f0f0f0 348bbc4,f0f0f0f0 348bbc8,f0f0f0f0 -348bbcc,f0ffffff -348bbd0,5f5ff0f0 +348bbcc,f0f0f0f0 +348bbd0,f0f0f0f0 348bbd4,f0f0f0f0 348bbd8,f0f0f0f0 -348bbdc,f0ffffff -348bbe0,5f5ff0f0 +348bbdc,f0f0f0f0 +348bbe0,f0f0f0f0 348bbe4,f0f0f0f0 348bbe8,f0f0f0f0 -348bbec,f0ffffff -348bbf0,5f5ff0f0 -348bbf4,f0f0f0f0 -348bbf8,f0f0f0f0 -348bbfc,f0ffffff -348bc00,5f5ff0f0 -348bc04,f0f0f0f0 -348bc08,f0f0f0f0 -348bc0c,ffffffff -348bc10,5ff0f0f0 -348bc14,f0f0f0f0 -348bc18,f0f0f0f0 -348bc1c,ffffff5f -348bc20,5ff0f0f0 -348bc24,f0f0f0f0 -348bc28,f0f0f0f0 -348bc2c,ffffff5f +348bbec,f0f0f0f0 +348bbf0,f0f0f0f0 +348bbf4,f0f0ffff +348bbf8,ff5ff0f0 +348bbfc,f0f0f0f0 +348bc00,f0f0f0f0 +348bc04,f0f0ffff +348bc08,ff5ff0f0 +348bc0c,f0f0f0f0 +348bc10,f0f0f0f0 +348bc14,f0f0ffff +348bc18,ff5ff0f0 +348bc1c,f0f0f0f0 +348bc20,f0f0f0f0 +348bc24,f0f0ffff +348bc28,ff5ff0f0 +348bc2c,f0f0f0f0 348bc30,f0f0f0f0 -348bc34,f0f0f0f0 -348bc38,f0f0f0f0 -348bc3c,ffffff5f +348bc34,f0f0ffff +348bc38,ff5ff0f0 +348bc3c,f0f0f0f0 348bc40,f0f0f0f0 -348bc44,f0f0f0f0 -348bc48,f0f0f0f0 -348bc4c,f0f0fff0 +348bc44,f0ffffff +348bc48,5f5ff0f0 +348bc4c,f0f0f0f0 348bc50,f0f0f0f0 -348bc54,f0f0f0f0 -348bc58,f0f0f0f0 +348bc54,f0ffffff +348bc58,5f5ff0f0 348bc5c,f0f0f0f0 348bc60,f0f0f0f0 -348bc64,f0f0f0f0 -348bc68,f0f0f0f0 +348bc64,f0ffffff +348bc68,5f5ff0f0 348bc6c,f0f0f0f0 348bc70,f0f0f0f0 -348bc74,f0f0f0f0 -348bc78,f0f0f0f0 -348bc7c,f0f0ffff -348bc80,fffff0f0 -348bc84,f0f0f0f0 -348bc88,f0f0f0f0 -348bc8c,f0f0ffff -348bc90,fffff0f0 -348bc94,f0f0f0f0 -348bc98,f0f0f0f0 -348bc9c,f0f0ffff -348bca0,ff3ff0f0 -348bca4,f0f0f0f0 +348bc74,f0ffffff +348bc78,5f5ff0f0 +348bc7c,f0f0f0f0 +348bc80,f0f0f0f0 +348bc84,ffffffff +348bc88,5ff0f0f0 +348bc8c,f0f0f0f0 +348bc90,f0f0f0f0 +348bc94,ffffff5f +348bc98,5ff0f0f0 +348bc9c,f0f0f0f0 +348bca0,f0f0f0f0 +348bca4,ffffff5f 348bca8,f0f0f0f0 -348bcac,f0f0ffff -348bcb0,ff3ff0f0 -348bcb4,f0f0f0f0 +348bcac,f0f0f0f0 +348bcb0,f0f0f0f0 +348bcb4,ffffff5f 348bcb8,f0f0f0f0 -348bcbc,f0f0ffff -348bcc0,ff3ff0f0 -348bcc4,f0f0f0f0 +348bcbc,f0f0f0f0 +348bcc0,f0f0f0f0 +348bcc4,f0f0fff0 348bcc8,f0f0f0f0 -348bccc,f0f0ffff -348bcd0,ff3ff0f0 +348bccc,f0f0f0f0 +348bcd0,f0f0f0f0 348bcd4,f0f0f0f0 348bcd8,f0f0f0f0 -348bcdc,f0f0ffff -348bce0,ff3ff0f0 +348bcdc,f0f0f0f0 +348bce0,f0f0f0f0 348bce4,f0f0f0f0 348bce8,f0f0f0f0 -348bcec,f0ffffff -348bcf0,ff3ff0f0 -348bcf4,f0f0f0f0 -348bcf8,f0f0f0f0 -348bcfc,f0ffffff -348bd00,fff0f0f0 -348bd04,f0f0f0f0 -348bd08,f0f0f0f0 -348bd0c,f0ffffff -348bd10,fff0f0f0 -348bd14,f0f0f0f0 -348bd18,f0f0f0f0 -348bd1c,f0ffffff -348bd20,fff0f0f0 -348bd24,f0f0f0f0 -348bd28,f0f0f0f0 -348bd2c,f0ffffff -348bd30,fff0f0f0 -348bd34,f0f0f0f0 -348bd38,f0f0f0f0 -348bd3c,f0ffffff -348bd40,fff0f0f0 -348bd44,f0f0f0f0 -348bd48,f0f0f0f0 -348bd4c,f0f0f0ff +348bcec,f0f0f0f0 +348bcf0,f0f0f0f0 +348bcf4,f0f0ffff +348bcf8,fffff0f0 +348bcfc,f0f0f0f0 +348bd00,f0f0f0f0 +348bd04,f0f0ffff +348bd08,fffff0f0 +348bd0c,f0f0f0f0 +348bd10,f0f0f0f0 +348bd14,f0f0ffff +348bd18,ff3ff0f0 +348bd1c,f0f0f0f0 +348bd20,f0f0f0f0 +348bd24,f0f0ffff +348bd28,ff3ff0f0 +348bd2c,f0f0f0f0 +348bd30,f0f0f0f0 +348bd34,f0f0ffff +348bd38,ff3ff0f0 +348bd3c,f0f0f0f0 +348bd40,f0f0f0f0 +348bd44,f0f0ffff +348bd48,ff3ff0f0 +348bd4c,f0f0f0f0 348bd50,f0f0f0f0 -348bd54,f0f0f0f0 -348bd58,f0f0f0f0 +348bd54,f0f0ffff +348bd58,ff3ff0f0 348bd5c,f0f0f0f0 348bd60,f0f0f0f0 -348bd64,f0f0f0f0 -348bd68,f0f0f0f0 +348bd64,f0ffffff +348bd68,ff3ff0f0 348bd6c,f0f0f0f0 348bd70,f0f0f0f0 -348bd74,f0f0f0f0 -348bd78,f0f0f0f0 -348bd7c,f0f0ffff -348bd80,fffff0f0 -348bd84,f0f0f0f0 -348bd88,f0f0f0f0 -348bd8c,f0f0ffff -348bd90,fffff0f0 -348bd94,f0f0f0f0 -348bd98,f0f0f0f0 -348bd9c,f0f0ffff -348bda0,fffff0f0 -348bda4,f0f0f0f0 -348bda8,f0f0f0f0 -348bdac,f0f0ffff -348bdb0,fffff0f0 -348bdb4,f0f0f0f0 -348bdb8,f0f0f0f0 -348bdbc,f0f0ffff -348bdc0,fffff0f0 -348bdc4,f0f0f0f0 +348bd74,f0ffffff +348bd78,fff0f0f0 +348bd7c,f0f0f0f0 +348bd80,f0f0f0f0 +348bd84,f0ffffff +348bd88,fff0f0f0 +348bd8c,f0f0f0f0 +348bd90,f0f0f0f0 +348bd94,f0ffffff +348bd98,fff0f0f0 +348bd9c,f0f0f0f0 +348bda0,f0f0f0f0 +348bda4,f0ffffff +348bda8,fff0f0f0 +348bdac,f0f0f0f0 +348bdb0,f0f0f0f0 +348bdb4,f0ffffff +348bdb8,fff0f0f0 +348bdbc,f0f0f0f0 +348bdc0,f0f0f0f0 +348bdc4,f0f0f0ff 348bdc8,f0f0f0f0 -348bdcc,f0f0ffff -348bdd0,fffff0f0 +348bdcc,f0f0f0f0 +348bdd0,f0f0f0f0 348bdd4,f0f0f0f0 348bdd8,f0f0f0f0 -348bddc,f0f0ffff -348bde0,fffff0f0 +348bddc,f0f0f0f0 +348bde0,f0f0f0f0 348bde4,f0f0f0f0 348bde8,f0f0f0f0 -348bdec,f0f0ffff -348bdf0,fffff0f0 -348bdf4,f0f0f0f0 -348bdf8,f0f0f0f0 -348bdfc,f0f0ffff -348be00,fffff0f0 -348be04,f0f0f0f0 -348be08,f0f0f0f0 -348be0c,f0f0ffff -348be10,fffff0f0 -348be14,f0f0f0f0 -348be18,f0f0f0f0 -348be1c,f0f0ffff -348be20,fffff0f0 -348be24,f0f0f0f0 -348be28,f0f0f0f0 -348be2c,f0f0ffff -348be30,fffff0f0 -348be34,f0f0f0f0 -348be38,f0f0f0f0 -348be3c,f0f0ffff -348be40,fffff0f0 -348be44,f0f0f0f0 -348be48,f0f0f0f0 -348be4c,f0f0ffff -348be50,fffff0f0 -348be54,f0f0f0f0 -348be58,f0f0f0f0 +348bdec,f0f0f0f0 +348bdf0,f0f0f0f0 +348bdf4,f0f0ffff +348bdf8,fffff0f0 +348bdfc,f0f0f0f0 +348be00,f0f0f0f0 +348be04,f0f0ffff +348be08,fffff0f0 +348be0c,f0f0f0f0 +348be10,f0f0f0f0 +348be14,f0f0ffff +348be18,fffff0f0 +348be1c,f0f0f0f0 +348be20,f0f0f0f0 +348be24,f0f0ffff +348be28,fffff0f0 +348be2c,f0f0f0f0 +348be30,f0f0f0f0 +348be34,f0f0ffff +348be38,fffff0f0 +348be3c,f0f0f0f0 +348be40,f0f0f0f0 +348be44,f0f0ffff +348be48,fffff0f0 +348be4c,f0f0f0f0 +348be50,f0f0f0f0 +348be54,f0f0ffff +348be58,fffff0f0 348be5c,f0f0f0f0 348be60,f0f0f0f0 -348be64,f0f0f0f0 -348be68,f0f0f0f0 +348be64,f0f0ffff +348be68,fffff0f0 348be6c,f0f0f0f0 348be70,f0f0f0f0 -348be74,f0f0f0f0 -348be78,f0f0f0f0 -348be7c,f0f0ffff -348be80,fffff0f0 -348be84,f0f0f0f0 -348be88,f0f0f0f0 -348be8c,f0f0ffff -348be90,fffff0f0 -348be94,f0f0f0f0 -348be98,f0f0f0f0 -348be9c,f0f03fff -348bea0,fffff0f0 -348bea4,f0f0f0f0 -348bea8,f0f0f0f0 -348beac,f0f03fff -348beb0,fffff0f0 -348beb4,f0f0f0f0 -348beb8,f0f0f0f0 -348bebc,f0f03fff -348bec0,fffff0f0 -348bec4,f0f0f0f0 -348bec8,f0f0f0f0 -348becc,f0f03fff -348bed0,fffff0f0 +348be74,f0f0ffff +348be78,fffff0f0 +348be7c,f0f0f0f0 +348be80,f0f0f0f0 +348be84,f0f0ffff +348be88,fffff0f0 +348be8c,f0f0f0f0 +348be90,f0f0f0f0 +348be94,f0f0ffff +348be98,fffff0f0 +348be9c,f0f0f0f0 +348bea0,f0f0f0f0 +348bea4,f0f0ffff +348bea8,fffff0f0 +348beac,f0f0f0f0 +348beb0,f0f0f0f0 +348beb4,f0f0ffff +348beb8,fffff0f0 +348bebc,f0f0f0f0 +348bec0,f0f0f0f0 +348bec4,f0f0ffff +348bec8,fffff0f0 +348becc,f0f0f0f0 +348bed0,f0f0f0f0 348bed4,f0f0f0f0 348bed8,f0f0f0f0 -348bedc,f0f03fff -348bee0,fffff0f0 +348bedc,f0f0f0f0 +348bee0,f0f0f0f0 348bee4,f0f0f0f0 348bee8,f0f0f0f0 -348beec,f0f03fff -348bef0,fffffff0 -348bef4,f0f0f0f0 -348bef8,f0f0f0f0 -348befc,f0f0f0ff -348bf00,fffffff0 -348bf04,f0f0f0f0 -348bf08,f0f0f0f0 -348bf0c,f0f0f0ff -348bf10,fffffff0 -348bf14,f0f0f0f0 -348bf18,f0f0f0f0 -348bf1c,f0f0f0ff -348bf20,fffffff0 -348bf24,f0f0f0f0 -348bf28,f0f0f0f0 -348bf2c,f0f0f0ff -348bf30,fffffff0 -348bf34,f0f0f0f0 -348bf38,f0f0f0f0 -348bf3c,f0f0f0ff -348bf40,fffffff0 -348bf44,f0f0f0f0 -348bf48,f0f0f0f0 +348beec,f0f0f0f0 +348bef0,f0f0f0f0 +348bef4,f0f0ffff +348bef8,fffff0f0 +348befc,f0f0f0f0 +348bf00,f0f0f0f0 +348bf04,f0f0ffff +348bf08,fffff0f0 +348bf0c,f0f0f0f0 +348bf10,f0f0f0f0 +348bf14,f0f03fff +348bf18,fffff0f0 +348bf1c,f0f0f0f0 +348bf20,f0f0f0f0 +348bf24,f0f03fff +348bf28,fffff0f0 +348bf2c,f0f0f0f0 +348bf30,f0f0f0f0 +348bf34,f0f03fff +348bf38,fffff0f0 +348bf3c,f0f0f0f0 +348bf40,f0f0f0f0 +348bf44,f0f03fff +348bf48,fffff0f0 348bf4c,f0f0f0f0 -348bf50,fff0f0f0 -348bf54,f0f0f0f0 -348bf58,f0f0f0f0 +348bf50,f0f0f0f0 +348bf54,f0f03fff +348bf58,fffff0f0 348bf5c,f0f0f0f0 348bf60,f0f0f0f0 -348bf64,f0f0f0f0 -348bf68,f0f0f0f0 +348bf64,f0f03fff +348bf68,fffffff0 348bf6c,f0f0f0f0 348bf70,f0f0f0f0 -348bf74,f0f0f0f0 -348bf78,f0f0f0f0 -348bf7c,f0f05fff -348bf80,fffff0f0 -348bf84,f0f0f0f0 -348bf88,f0f0f0f0 -348bf8c,f0f05fff -348bf90,fffff0f0 -348bf94,f0f0f0f0 -348bf98,f0f0f0f0 -348bf9c,f0f05fff -348bfa0,fffff0f0 -348bfa4,f0f0f0f0 -348bfa8,f0f0f0f0 -348bfac,f0f05fff -348bfb0,fffff0f0 -348bfb4,f0f0f0f0 -348bfb8,f0f0f0f0 -348bfbc,f0f05fff -348bfc0,fffff0f0 +348bf74,f0f0f0ff +348bf78,fffffff0 +348bf7c,f0f0f0f0 +348bf80,f0f0f0f0 +348bf84,f0f0f0ff +348bf88,fffffff0 +348bf8c,f0f0f0f0 +348bf90,f0f0f0f0 +348bf94,f0f0f0ff +348bf98,fffffff0 +348bf9c,f0f0f0f0 +348bfa0,f0f0f0f0 +348bfa4,f0f0f0ff +348bfa8,fffffff0 +348bfac,f0f0f0f0 +348bfb0,f0f0f0f0 +348bfb4,f0f0f0ff +348bfb8,fffffff0 +348bfbc,f0f0f0f0 +348bfc0,f0f0f0f0 348bfc4,f0f0f0f0 -348bfc8,f0f0f0f0 -348bfcc,f0f05f5f -348bfd0,fffffff0 +348bfc8,fff0f0f0 +348bfcc,f0f0f0f0 +348bfd0,f0f0f0f0 348bfd4,f0f0f0f0 348bfd8,f0f0f0f0 -348bfdc,f0f05f5f -348bfe0,fffffff0 +348bfdc,f0f0f0f0 +348bfe0,f0f0f0f0 348bfe4,f0f0f0f0 348bfe8,f0f0f0f0 -348bfec,f0f05f5f -348bff0,fffffff0 -348bff4,f0f0f0f0 -348bff8,f0f0f0f0 -348bffc,f0f05f5f -348c000,fffffff0 -348c004,f0f0f0f0 -348c008,f0f0f0f0 -348c00c,f0f0f05f -348c010,ffffffff -348c014,f0f0f0f0 -348c018,f0f0f0f0 -348c01c,f0f0f05f -348c020,5fffffff -348c024,f0f0f0f0 -348c028,f0f0f0f0 +348bfec,f0f0f0f0 +348bff0,f0f0f0f0 +348bff4,f0f05fff +348bff8,fffff0f0 +348bffc,f0f0f0f0 +348c000,f0f0f0f0 +348c004,f0f05fff +348c008,fffff0f0 +348c00c,f0f0f0f0 +348c010,f0f0f0f0 +348c014,f0f05fff +348c018,fffff0f0 +348c01c,f0f0f0f0 +348c020,f0f0f0f0 +348c024,f0f05fff +348c028,fffff0f0 348c02c,f0f0f0f0 -348c030,5fffffff -348c034,f0f0f0f0 -348c038,f0f0f0f0 +348c030,f0f0f0f0 +348c034,f0f05fff +348c038,fffff0f0 348c03c,f0f0f0f0 -348c040,5fffffff -348c044,f0f0f0f0 -348c048,f0f0f0f0 +348c040,f0f0f0f0 +348c044,f0f05f5f +348c048,fffffff0 348c04c,f0f0f0f0 -348c050,f0fff0f0 -348c054,f0f0f0f0 -348c058,f0f0f0f0 +348c050,f0f0f0f0 +348c054,f0f05f5f +348c058,fffffff0 348c05c,f0f0f0f0 348c060,f0f0f0f0 -348c064,f0f0f0f0 -348c068,f0f0f0f0 +348c064,f0f05f5f +348c068,fffffff0 348c06c,f0f0f0f0 348c070,f0f0f0f0 -348c074,f0f0f0f0 -348c078,f0f0f0f0 -348c07c,f0f07fff -348c080,fff0f0f0 -348c084,f0f0f0f0 -348c088,f0f0f0f0 -348c08c,f0f07fff -348c090,fffff0f0 -348c094,f0f0f0f0 -348c098,f0f0f0f0 -348c09c,f0f07fff -348c0a0,fffff0f0 +348c074,f0f05f5f +348c078,fffffff0 +348c07c,f0f0f0f0 +348c080,f0f0f0f0 +348c084,f0f0f05f +348c088,ffffffff +348c08c,f0f0f0f0 +348c090,f0f0f0f0 +348c094,f0f0f05f +348c098,5fffffff +348c09c,f0f0f0f0 +348c0a0,f0f0f0f0 348c0a4,f0f0f0f0 -348c0a8,f0f0f0f0 -348c0ac,f0f07f7f -348c0b0,fffff0f0 +348c0a8,5fffffff +348c0ac,f0f0f0f0 +348c0b0,f0f0f0f0 348c0b4,f0f0f0f0 -348c0b8,f0f0f0f0 -348c0bc,f0f07f7f -348c0c0,fffffff0 +348c0b8,5fffffff +348c0bc,f0f0f0f0 +348c0c0,f0f0f0f0 348c0c4,f0f0f0f0 -348c0c8,f0f0f0f0 -348c0cc,f0f07f7f -348c0d0,fffffff0 +348c0c8,f0fff0f0 +348c0cc,f0f0f0f0 +348c0d0,f0f0f0f0 348c0d4,f0f0f0f0 348c0d8,f0f0f0f0 -348c0dc,f07f7f7f -348c0e0,7ffffff0 +348c0dc,f0f0f0f0 +348c0e0,f0f0f0f0 348c0e4,f0f0f0f0 348c0e8,f0f0f0f0 -348c0ec,f06f7f7f -348c0f0,7fffffff -348c0f4,f0f0f0f0 -348c0f8,f0f0f0f0 -348c0fc,f06f6f7f -348c100,7fffffff -348c104,f0f0f0f0 -348c108,f0f0f0f0 -348c10c,f0f06f7f -348c110,7fffffff -348c114,f0f0f0f0 -348c118,f0f0f0f0 +348c0ec,f0f0f0f0 +348c0f0,f0f0f0f0 +348c0f4,f0f07fff +348c0f8,fff0f0f0 +348c0fc,f0f0f0f0 +348c100,f0f0f0f0 +348c104,f0f07fff +348c108,fffff0f0 +348c10c,f0f0f0f0 +348c110,f0f0f0f0 +348c114,f0f07fff +348c118,fffff0f0 348c11c,f0f0f0f0 -348c120,7f7fffff -348c124,f0f0f0f0 -348c128,f0f0f0f0 +348c120,f0f0f0f0 +348c124,f0f07f7f +348c128,fffff0f0 348c12c,f0f0f0f0 -348c130,f07fffff -348c134,fff0f0f0 -348c138,f0f0f0f0 +348c130,f0f0f0f0 +348c134,f0f07f7f +348c138,fffffff0 348c13c,f0f0f0f0 -348c140,f0f0ffff -348c144,f0f0f0f0 -348c148,f0f0f0f0 +348c140,f0f0f0f0 +348c144,f0f07f7f +348c148,fffffff0 348c14c,f0f0f0f0 348c150,f0f0f0f0 -348c154,f0f0f0f0 -348c158,f0f0f0f0 +348c154,f07f7f7f +348c158,7ffffff0 348c15c,f0f0f0f0 348c160,f0f0f0f0 -348c164,f0f0f0f0 -348c168,f0f0f0f0 +348c164,f06f7f7f +348c168,7fffffff 348c16c,f0f0f0f0 348c170,f0f0f0f0 -348c174,f0f0f0f0 -348c178,f0f0f0f0 -348c17c,f0f09fff -348c180,fff0f0f0 -348c184,f0f0f0f0 -348c188,f0f0f0f0 -348c18c,f0f09fff -348c190,fffff0f0 +348c174,f06f6f7f +348c178,7fffffff +348c17c,f0f0f0f0 +348c180,f0f0f0f0 +348c184,f0f06f7f +348c188,7fffffff +348c18c,f0f0f0f0 +348c190,f0f0f0f0 348c194,f0f0f0f0 -348c198,f0f0f0f0 -348c19c,f0f09f9f -348c1a0,fffff0f0 +348c198,7f7fffff +348c19c,f0f0f0f0 +348c1a0,f0f0f0f0 348c1a4,f0f0f0f0 -348c1a8,f0f0f0f0 -348c1ac,f0f09f9f -348c1b0,fffff0f0 +348c1a8,f07fffff +348c1ac,fff0f0f0 +348c1b0,f0f0f0f0 348c1b4,f0f0f0f0 -348c1b8,f0f0f0f0 -348c1bc,f09f9f9f -348c1c0,9fffeff0 +348c1b8,f0f0ffff +348c1bc,f0f0f0f0 +348c1c0,f0f0f0f0 348c1c4,f0f0f0f0 348c1c8,f0f0f0f0 -348c1cc,f08f9f9f -348c1d0,9fefeff0 +348c1cc,f0f0f0f0 +348c1d0,f0f0f0f0 348c1d4,f0f0f0f0 348c1d8,f0f0f0f0 -348c1dc,f08f8f9f -348c1e0,9fefeff0 +348c1dc,f0f0f0f0 +348c1e0,f0f0f0f0 348c1e4,f0f0f0f0 348c1e8,f0f0f0f0 -348c1ec,f08f8f8f -348c1f0,9f9fefef -348c1f4,f0f0f0f0 -348c1f8,f0f0f0f0 -348c1fc,f08f8f8f -348c200,8f9fefef -348c204,f0f0f0f0 -348c208,f0f0f0f0 -348c20c,f0f08f8f -348c210,8f8fefef -348c214,eff0f0f0 -348c218,f0f0f0f0 +348c1ec,f0f0f0f0 +348c1f0,f0f0f0f0 +348c1f4,f0f09fff +348c1f8,fff0f0f0 +348c1fc,f0f0f0f0 +348c200,f0f0f0f0 +348c204,f0f09fff +348c208,fffff0f0 +348c20c,f0f0f0f0 +348c210,f0f0f0f0 +348c214,f0f09f9f +348c218,fffff0f0 348c21c,f0f0f0f0 -348c220,8f8f8fef -348c224,eff0f0f0 -348c228,f0f0f0f0 +348c220,f0f0f0f0 +348c224,f0f09f9f +348c228,fffff0f0 348c22c,f0f0f0f0 -348c230,f08f8fef -348c234,eff0f0f0 -348c238,f0f0f0f0 +348c230,f0f0f0f0 +348c234,f09f9f9f +348c238,9fffeff0 348c23c,f0f0f0f0 -348c240,f0f0f08f -348c244,f0f0f0f0 -348c248,f0f0f0f0 +348c240,f0f0f0f0 +348c244,f08f9f9f +348c248,9fefeff0 348c24c,f0f0f0f0 348c250,f0f0f0f0 -348c254,f0f0f0f0 -348c258,f0f0f0f0 +348c254,f08f8f9f +348c258,9fefeff0 348c25c,f0f0f0f0 348c260,f0f0f0f0 -348c264,f0f0f0f0 -348c268,f0f0f0f0 +348c264,f08f8f8f +348c268,9f9fefef 348c26c,f0f0f0f0 348c270,f0f0f0f0 -348c274,f0f0f0f0 -348c278,f0f0f0f0 -348c27c,f0f0f0ef -348c280,eff0f0f0 -348c284,f0f0f0f0 -348c288,f0f0f0f0 -348c28c,f0f0bfbf -348c290,eff0f0f0 +348c274,f08f8f8f +348c278,8f9fefef +348c27c,f0f0f0f0 +348c280,f0f0f0f0 +348c284,f0f08f8f +348c288,8f8fefef +348c28c,eff0f0f0 +348c290,f0f0f0f0 348c294,f0f0f0f0 -348c298,f0f0f0f0 -348c29c,f0f0bfbf -348c2a0,dfdff0f0 +348c298,8f8f8fef +348c29c,eff0f0f0 +348c2a0,f0f0f0f0 348c2a4,f0f0f0f0 -348c2a8,f0f0f0f0 -348c2ac,f0f0afbf -348c2b0,bfdff0f0 +348c2a8,f08f8fef +348c2ac,eff0f0f0 +348c2b0,f0f0f0f0 348c2b4,f0f0f0f0 -348c2b8,f0f0f0f0 -348c2bc,f0afafaf -348c2c0,afdfdff0 +348c2b8,f0f0f08f +348c2bc,f0f0f0f0 +348c2c0,f0f0f0f0 348c2c4,f0f0f0f0 348c2c8,f0f0f0f0 -348c2cc,f0afafaf -348c2d0,afafdff0 +348c2cc,f0f0f0f0 +348c2d0,f0f0f0f0 348c2d4,f0f0f0f0 348c2d8,f0f0f0f0 -348c2dc,f0afafaf -348c2e0,afafdfdf +348c2dc,f0f0f0f0 +348c2e0,f0f0f0f0 348c2e4,f0f0f0f0 348c2e8,f0f0f0f0 -348c2ec,9fafafaf -348c2f0,afafdfdf -348c2f4,f0f0f0f0 -348c2f8,f0f0f0f0 -348c2fc,9f9fafaf -348c300,afafafcf -348c304,f0f0f0f0 -348c308,f0f0f0f0 -348c30c,f0f09f9f -348c310,afafafcf -348c314,cff0f0f0 -348c318,f0f0f0f0 +348c2ec,f0f0f0f0 +348c2f0,f0f0f0f0 +348c2f4,f0f0f0ef +348c2f8,eff0f0f0 +348c2fc,f0f0f0f0 +348c300,f0f0f0f0 +348c304,f0f0bfbf +348c308,eff0f0f0 +348c30c,f0f0f0f0 +348c310,f0f0f0f0 +348c314,f0f0bfbf +348c318,dfdff0f0 348c31c,f0f0f0f0 -348c320,9fafafaf -348c324,cff0f0f0 -348c328,f0f0f0f0 +348c320,f0f0f0f0 +348c324,f0f0afbf +348c328,bfdff0f0 348c32c,f0f0f0f0 -348c330,f0f0f0af -348c334,cff0f0f0 -348c338,f0f0f0f0 +348c330,f0f0f0f0 +348c334,f0afafaf +348c338,afdfdff0 348c33c,f0f0f0f0 348c340,f0f0f0f0 -348c344,f0f0f0f0 -348c348,f0f0f0f0 +348c344,f0afafaf +348c348,afafdff0 348c34c,f0f0f0f0 348c350,f0f0f0f0 -348c354,f0f0f0f0 -348c358,f0f0f0f0 +348c354,f0afafaf +348c358,afafdfdf 348c35c,f0f0f0f0 348c360,f0f0f0f0 -348c364,f0f0f0f0 -348c368,f0f0f0f0 +348c364,9fafafaf +348c368,afafdfdf 348c36c,f0f0f0f0 348c370,f0f0f0f0 -348c374,f0f0f0f0 -348c378,f0f0f0f0 -348c37c,f0f0f0cf -348c380,cff0f0f0 -348c384,f0f0f0f0 -348c388,f0f0f0f0 -348c38c,f0f0cfcf -348c390,cff0f0f0 +348c374,9f9fafaf +348c378,afafafcf +348c37c,f0f0f0f0 +348c380,f0f0f0f0 +348c384,f0f09f9f +348c388,afafafcf +348c38c,cff0f0f0 +348c390,f0f0f0f0 348c394,f0f0f0f0 -348c398,f0f0f0f0 -348c39c,f0f0cfcf -348c3a0,cfbff0f0 +348c398,9fafafaf +348c39c,cff0f0f0 +348c3a0,f0f0f0f0 348c3a4,f0f0f0f0 -348c3a8,f0f0f0f0 -348c3ac,f0f0cfcf -348c3b0,cfbff0f0 +348c3a8,f0f0f0af +348c3ac,cff0f0f0 +348c3b0,f0f0f0f0 348c3b4,f0f0f0f0 348c3b8,f0f0f0f0 -348c3bc,f0bfbfbf -348c3c0,cfcfbff0 +348c3bc,f0f0f0f0 +348c3c0,f0f0f0f0 348c3c4,f0f0f0f0 348c3c8,f0f0f0f0 -348c3cc,f0bfbfbf -348c3d0,bfbfbff0 +348c3cc,f0f0f0f0 +348c3d0,f0f0f0f0 348c3d4,f0f0f0f0 348c3d8,f0f0f0f0 -348c3dc,bfbfbfbf -348c3e0,bfbfbfbf +348c3dc,f0f0f0f0 +348c3e0,f0f0f0f0 348c3e4,f0f0f0f0 348c3e8,f0f0f0f0 -348c3ec,bfbfbfbf -348c3f0,bfbfbfbf -348c3f4,f0f0f0f0 -348c3f8,f0f0f0f0 -348c3fc,afafbfbf -348c400,bfbfbfbf -348c404,f0f0f0f0 -348c408,f0f0f0f0 -348c40c,f0afafaf -348c410,bfbfbfbf -348c414,aff0f0f0 -348c418,f0f0f0f0 +348c3ec,f0f0f0f0 +348c3f0,f0f0f0f0 +348c3f4,f0f0f0cf +348c3f8,cff0f0f0 +348c3fc,f0f0f0f0 +348c400,f0f0f0f0 +348c404,f0f0cfcf +348c408,cff0f0f0 +348c40c,f0f0f0f0 +348c410,f0f0f0f0 +348c414,f0f0cfcf +348c418,cfbff0f0 348c41c,f0f0f0f0 -348c420,f0afbfbf -348c424,bff0f0f0 -348c428,f0f0f0f0 +348c420,f0f0f0f0 +348c424,f0f0cfcf +348c428,cfbff0f0 348c42c,f0f0f0f0 348c430,f0f0f0f0 -348c434,f0f0f0f0 -348c438,f0f0f0f0 +348c434,f0bfbfbf +348c438,cfcfbff0 348c43c,f0f0f0f0 348c440,f0f0f0f0 -348c444,f0f0f0f0 -348c448,f0f0f0f0 +348c444,f0bfbfbf +348c448,bfbfbff0 348c44c,f0f0f0f0 348c450,f0f0f0f0 -348c454,f0f0f0f0 -348c458,f0f0f0f0 +348c454,bfbfbfbf +348c458,bfbfbfbf 348c45c,f0f0f0f0 348c460,f0f0f0f0 -348c464,f0f0f0f0 -348c468,f0f0f0f0 +348c464,bfbfbfbf +348c468,bfbfbfbf 348c46c,f0f0f0f0 348c470,f0f0f0f0 -348c474,f0f0f0f0 -348c478,f0f0f0f0 -348c47c,f0f0f0df +348c474,afafbfbf +348c478,bfbfbfbf +348c47c,f0f0f0f0 348c480,f0f0f0f0 -348c484,f0f0f0f0 -348c488,f0f0f0f0 -348c48c,f0f0f0df -348c490,dff0f0f0 +348c484,f0afafaf +348c488,bfbfbfbf +348c48c,aff0f0f0 +348c490,f0f0f0f0 348c494,f0f0f0f0 -348c498,f0f0f0f0 -348c49c,f0f0cfdf -348c4a0,dff0f0f0 +348c498,f0afbfbf +348c49c,bff0f0f0 +348c4a0,f0f0f0f0 348c4a4,f0f0f0f0 348c4a8,f0f0f0f0 -348c4ac,f0f0cfcf -348c4b0,cfcff0f0 +348c4ac,f0f0f0f0 +348c4b0,f0f0f0f0 348c4b4,f0f0f0f0 348c4b8,f0f0f0f0 -348c4bc,f0cfcfcf -348c4c0,cfcff0f0 +348c4bc,f0f0f0f0 +348c4c0,f0f0f0f0 348c4c4,f0f0f0f0 348c4c8,f0f0f0f0 -348c4cc,f0cfcfcf -348c4d0,cfcfcff0 +348c4cc,f0f0f0f0 +348c4d0,f0f0f0f0 348c4d4,f0f0f0f0 348c4d8,f0f0f0f0 -348c4dc,cfcfcfcf -348c4e0,cfcfcff0 +348c4dc,f0f0f0f0 +348c4e0,f0f0f0f0 348c4e4,f0f0f0f0 348c4e8,f0f0f0f0 -348c4ec,bfbfcfcf -348c4f0,cfcfcfcf -348c4f4,f0f0f0f0 +348c4ec,f0f0f0f0 +348c4f0,f0f0f0f0 +348c4f4,f0f0f0df 348c4f8,f0f0f0f0 -348c4fc,bfbfbfbf -348c500,bfbfbfbf -348c504,f0f0f0f0 -348c508,f0f0f0bf -348c50c,bfbfbfbf -348c510,bfbfbfbf -348c514,bff0f0f0 -348c518,f0f0f0f0 +348c4fc,f0f0f0f0 +348c500,f0f0f0f0 +348c504,f0f0f0df +348c508,dff0f0f0 +348c50c,f0f0f0f0 +348c510,f0f0f0f0 +348c514,f0f0cfdf +348c518,dff0f0f0 348c51c,f0f0f0f0 -348c520,f0f0bfbf -348c524,bff0f0f0 -348c528,f0f0f0f0 +348c520,f0f0f0f0 +348c524,f0f0cfcf +348c528,cfcff0f0 348c52c,f0f0f0f0 348c530,f0f0f0f0 -348c534,f0f0f0f0 -348c538,f0f0f0f0 +348c534,f0cfcfcf +348c538,cfcff0f0 348c53c,f0f0f0f0 348c540,f0f0f0f0 -348c544,f0f0f0f0 -348c548,f0f0f0f0 +348c544,f0cfcfcf +348c548,cfcfcff0 348c54c,f0f0f0f0 348c550,f0f0f0f0 -348c554,f0f0f0f0 -348c558,f0f0f0f0 +348c554,cfcfcfcf +348c558,cfcfcff0 348c55c,f0f0f0f0 348c560,f0f0f0f0 -348c564,f0f0f0f0 -348c568,f0f0f0f0 +348c564,bfbfcfcf +348c568,cfcfcfcf 348c56c,f0f0f0f0 348c570,f0f0f0f0 -348c574,f0f0f0f0 -348c578,f0f0f0f0 -348c57c,f0f0f0df -348c580,dff0f0f0 -348c584,f0f0f0f0 -348c588,f0f0f0f0 -348c58c,f0f0f0df -348c590,dff0f0f0 +348c574,bfbfbfbf +348c578,bfbfbfbf +348c57c,f0f0f0f0 +348c580,f0f0f0bf +348c584,bfbfbfbf +348c588,bfbfbfbf +348c58c,bff0f0f0 +348c590,f0f0f0f0 348c594,f0f0f0f0 -348c598,f0f0f0f0 -348c59c,f0f0dfdf -348c5a0,dfdff0f0 +348c598,f0f0bfbf +348c59c,bff0f0f0 +348c5a0,f0f0f0f0 348c5a4,f0f0f0f0 348c5a8,f0f0f0f0 -348c5ac,f0f0dfdf -348c5b0,dfdff0f0 +348c5ac,f0f0f0f0 +348c5b0,f0f0f0f0 348c5b4,f0f0f0f0 348c5b8,f0f0f0f0 -348c5bc,f0f0cfcf -348c5c0,cfcff0f0 +348c5bc,f0f0f0f0 +348c5c0,f0f0f0f0 348c5c4,f0f0f0f0 348c5c8,f0f0f0f0 -348c5cc,f0cfcfcf -348c5d0,cfcfcff0 +348c5cc,f0f0f0f0 +348c5d0,f0f0f0f0 348c5d4,f0f0f0f0 348c5d8,f0f0f0f0 -348c5dc,f0cfcfcf -348c5e0,cfcfcff0 +348c5dc,f0f0f0f0 +348c5e0,f0f0f0f0 348c5e4,f0f0f0f0 348c5e8,f0f0f0f0 -348c5ec,cfcfcfcf -348c5f0,cfcfcfcf -348c5f4,f0f0f0f0 -348c5f8,f0f0f0f0 -348c5fc,cfcfcfcf -348c600,cfcfcfcf -348c604,f0f0f0f0 -348c608,f0f0f0bf -348c60c,bfbfbfbf -348c610,bfbfbfbf -348c614,bff0f0f0 -348c618,f0f0f0f0 +348c5ec,f0f0f0f0 +348c5f0,f0f0f0f0 +348c5f4,f0f0f0df +348c5f8,dff0f0f0 +348c5fc,f0f0f0f0 +348c600,f0f0f0f0 +348c604,f0f0f0df +348c608,dff0f0f0 +348c60c,f0f0f0f0 +348c610,f0f0f0f0 +348c614,f0f0dfdf +348c618,dfdff0f0 348c61c,f0f0f0f0 348c620,f0f0f0f0 -348c624,f0f0f0f0 -348c628,f0f0f0f0 +348c624,f0f0dfdf +348c628,dfdff0f0 348c62c,f0f0f0f0 348c630,f0f0f0f0 -348c634,f0f0f0f0 -348c638,f0f0f0f0 +348c634,f0f0cfcf +348c638,cfcff0f0 348c63c,f0f0f0f0 348c640,f0f0f0f0 -348c644,f0f0f0f0 -348c648,f0f0f0f0 +348c644,f0cfcfcf +348c648,cfcfcff0 348c64c,f0f0f0f0 348c650,f0f0f0f0 -348c654,f0f0f0f0 -348c658,f0f0f0f0 +348c654,f0cfcfcf +348c658,cfcfcff0 348c65c,f0f0f0f0 348c660,f0f0f0f0 -348c664,f0f0f0f0 +348c664,cfcfcfcf +348c668,cfcfcfcf +348c66c,f0f0f0f0 +348c670,f0f0f0f0 +348c674,cfcfcfcf +348c678,cfcfcfcf +348c67c,f0f0f0f0 +348c680,f0f0f0bf +348c684,bfbfbfbf +348c688,bfbfbfbf +348c68c,bff0f0f0 +348c690,f0f0f0f0 +348c694,f0f0f0f0 +348c698,f0f0f0f0 +348c69c,f0f0f0f0 +348c6a0,f0f0f0f0 +348c6a4,f0f0f0f0 +348c6a8,f0f0f0f0 +348c6ac,f0f0f0f0 +348c6b0,f0f0f0f0 +348c6b4,f0f0f0f0 +348c6b8,f0f0f0f0 +348c6bc,f0f0f0f0 +348c6c0,f0f0f0f0 +348c6c4,f0f0f0f0 +348c6c8,f0f0f0f0 +348c6cc,f0f0f0f0 +348c6d0,f0f0f0f0 +348c6d4,f0f0f0f0 +348c6d8,f0f0f0f0 +348c6dc,f0f0f0f0 diff --git a/data/generated/symbols.json b/data/generated/symbols.json index 79ee13b8e..4f5013de2 100644 --- a/data/generated/symbols.json +++ b/data/generated/symbols.json @@ -4,7 +4,7 @@ "AUDIO_THREAD_INFO": "03482934", "AUDIO_THREAD_INFO_MEM_SIZE": "03482954", "AUDIO_THREAD_INFO_MEM_START": "03482950", - "AUDIO_THREAD_MEM_START": "0348C670", + "AUDIO_THREAD_MEM_START": "0348C6E0", "BOMBCHUS_IN_LOGIC": "03480C94", "CFG_A_BUTTON_COLOR": "03480844", "CFG_A_NOTE_COLOR": "03480862", @@ -21,6 +21,7 @@ "CFG_TEXT_CURSOR_COLOR": "03480856", "CHAIN_HBA_REWARDS": "03482C38", "CHEST_SIZE_MATCH_CONTENTS": "03482084", + "COMPLETE_MASK_QUEST": "0348898D", "COOP_CONTEXT": "03480020", "COOP_VERSION": "03480020", "COSMETIC_CONTEXT": "03480834", @@ -28,12 +29,12 @@ "CURRENT_GROTTO_ID": "034827F6", "DEBUG_OFFSET": "03482218", "DISABLE_TIMERS": "03480CAF", - "DPAD_TEXTURE": "0348AE68", + "DPAD_TEXTURE": "0348AEE0", "DUNGEONS_SHUFFLED": "03480CB1", "EXTENDED_OBJECT_TABLE": "03480C74", "EXTERN_DAMAGE_MULTIPLYER": "03482629", "FAST_CHESTS": "03480CAC", - "FONT_TEXTURE": "034899A0", + "FONT_TEXTURE": "03489A18", "FREE_SCARECROW_ENABLED": "03480CA4", "GET_CHEST_OVERRIDE_COLOR_WRAPPER": "034820B4", "GET_CHEST_OVERRIDE_SIZE_WRAPPER": "03482088", @@ -45,16 +46,17 @@ "INITIAL_SAVE_DATA": "03480874", "JABU_ELEVATOR_ENABLE": "03480CAA", "LACS_CONDITION": "03480C9C", - "MAX_RUPEES": "03488915", + "MAX_RUPEES": "0348898F", "MOVED_ADULT_KING_ZORA": "03482974", - "NO_ESCAPE_SEQUENCE": "034888E0", + "NO_ESCAPE_SEQUENCE": "03488958", "NO_FOG_STATE": "03480CB0", "OCARINAS_SHUFFLED": "03480CAB", + "OPEN_KAKARIKO": "0348898E", "OUTGOING_ITEM": "03480030", "OUTGOING_KEY": "0348002C", "OUTGOING_PLAYER": "03480032", "OVERWORLD_SHUFFLED": "03480CB2", - "PAYLOAD_END": "0348C670", + "PAYLOAD_END": "0348C6E0", "PAYLOAD_START": "03480000", "PLAYER_ID": "03480024", "PLAYER_NAMES": "03480034", @@ -66,77 +68,77 @@ "SHUFFLE_COWS": "03480CAD", "SPEED_MULTIPLIER": "034820F4", "TIME_TRAVEL_SAVED_EQUIPS": "03481640", - "TRIFORCE_ICON_TEXTURE": "0348B668", - "a_button": "034888A8", - "a_note_b": "03488894", - "a_note_font_glow_base": "0348887C", - "a_note_font_glow_max": "03488878", - "a_note_g": "03488898", - "a_note_glow_base": "03488884", - "a_note_glow_max": "03488880", - "a_note_r": "0348889C", - "active_item_action_id": "034888F8", - "active_item_fast_chest": "034888E8", - "active_item_graphic_id": "034888EC", - "active_item_object_id": "034888F0", - "active_item_row": "034888FC", - "active_item_text_id": "034888F4", - "active_override": "03488904", - "active_override_is_outgoing": "03488900", - "b_button": "034888A4", - "beating_dd": "034888B0", - "beating_no_dd": "034888B8", - "c_button": "034888A0", - "c_note_b": "03488888", - "c_note_font_glow_base": "0348886C", - "c_note_font_glow_max": "03488868", - "c_note_g": "0348888C", - "c_note_glow_base": "03488874", - "c_note_glow_max": "03488870", - "c_note_r": "03488890", - "cfg_dungeon_info_enable": "03488840", - "cfg_dungeon_info_mq_enable": "034888D8", - "cfg_dungeon_info_mq_need_map": "034888D4", - "cfg_dungeon_info_reward_need_altar": "034888CC", - "cfg_dungeon_info_reward_need_compass": "034888D0", - "cfg_dungeon_is_mq": "03488934", - "cfg_dungeon_rewards": "03487694", - "cfg_file_select_hash": "034888DC", - "cfg_item_overrides": "0348895C", - "defaultDDHeart": "034888BC", - "defaultHeart": "034888C4", - "dpad_sprite": "034877E0", - "dummy_actor": "0348890C", - "dungeon_count": "03488844", - "dungeons": "034876B8", - "extern_ctxt": "03487754", - "font_sprite": "034877F0", - "freecam_modes": "034875D8", - "hash_sprites": "03488850", - "hash_symbols": "03487768", - "heap_next": "03488930", - "item_overrides_count": "03488910", - "item_table": "0348784C", - "items_sprite": "03487810", - "last_fog_distance": "03488848", - "medal_colors": "034876A4", - "medals_sprite": "03487820", - "normal_dd": "034888AC", - "normal_no_dd": "034888B4", - "object_slots": "0348995C", - "pending_freezes": "03488914", - "pending_item_queue": "03488944", - "quest_items_sprite": "03487800", - "rupee_colors": "03487840", - "satisified_pending_frames": "034888E4", - "scene_fog_distance": "0348884C", - "setup_db": "034877A8", - "stones_sprite": "03487830", - "text_cursor_border_base": "0348885C", - "text_cursor_border_max": "03488858", - "text_cursor_inner_base": "03488864", - "text_cursor_inner_max": "03488860", - "triforce_hunt_enabled": "03488924", - "triforce_pieces_requied": "034888CA", - "triforce_sprite": "034877D0" + "TRIFORCE_ICON_TEXTURE": "0348B6E0", + "a_button": "03488920", + "a_note_b": "0348890C", + "a_note_font_glow_base": "034888F4", + "a_note_font_glow_max": "034888F0", + "a_note_g": "03488910", + "a_note_glow_base": "034888FC", + "a_note_glow_max": "034888F8", + "a_note_r": "03488914", + "active_item_action_id": "03488970", + "active_item_fast_chest": "03488960", + "active_item_graphic_id": "03488964", + "active_item_object_id": "03488968", + "active_item_row": "03488974", + "active_item_text_id": "0348896C", + "active_override": "0348897C", + "active_override_is_outgoing": "03488978", + "b_button": "0348891C", + "beating_dd": "03488928", + "beating_no_dd": "03488930", + "c_button": "03488918", + "c_note_b": "03488900", + "c_note_font_glow_base": "034888E4", + "c_note_font_glow_max": "034888E0", + "c_note_g": "03488904", + "c_note_glow_base": "034888EC", + "c_note_glow_max": "034888E8", + "c_note_r": "03488908", + "cfg_dungeon_info_enable": "034888B8", + "cfg_dungeon_info_mq_enable": "03488950", + "cfg_dungeon_info_mq_need_map": "0348894C", + "cfg_dungeon_info_reward_need_altar": "03488944", + "cfg_dungeon_info_reward_need_compass": "03488948", + "cfg_dungeon_is_mq": "034889AC", + "cfg_dungeon_rewards": "0348770C", + "cfg_file_select_hash": "03488954", + "cfg_item_overrides": "034889D4", + "defaultDDHeart": "03488934", + "defaultHeart": "0348893C", + "dpad_sprite": "03487858", + "dummy_actor": "03488984", + "dungeon_count": "034888BC", + "dungeons": "03487730", + "extern_ctxt": "034877CC", + "font_sprite": "03487868", + "freecam_modes": "03487654", + "hash_sprites": "034888C8", + "hash_symbols": "034877E0", + "heap_next": "034889A8", + "item_overrides_count": "03488988", + "item_table": "034878C4", + "items_sprite": "03487888", + "last_fog_distance": "034888C0", + "medal_colors": "0348771C", + "medals_sprite": "03487898", + "normal_dd": "03488924", + "normal_no_dd": "0348892C", + "object_slots": "034899D4", + "pending_freezes": "0348898C", + "pending_item_queue": "034889BC", + "quest_items_sprite": "03487878", + "rupee_colors": "034878B8", + "satisified_pending_frames": "0348895C", + "scene_fog_distance": "034888C4", + "setup_db": "03487820", + "stones_sprite": "034878A8", + "text_cursor_border_base": "034888D4", + "text_cursor_border_max": "034888D0", + "text_cursor_inner_base": "034888DC", + "text_cursor_inner_max": "034888D8", + "triforce_hunt_enabled": "0348899C", + "triforce_pieces_requied": "03488942", + "triforce_sprite": "03487848" } \ No newline at end of file diff --git a/data/presets_default.json b/data/presets_default.json index be34d4171..705d31380 100644 --- a/data/presets_default.json +++ b/data/presets_default.json @@ -5,6 +5,7 @@ "randomize_settings": false, "logic_rules": "glitchless", "open_forest": "closed", + "open_kakariko": "closed", "open_door_of_time": true, "zora_fountain": "closed", "gerudo_fortress": "fast", @@ -67,12 +68,13 @@ "logic_earliest_adult_trade": "prescription", "logic_latest_adult_trade": "claim_check" }, - "Standard Weekly (2020-02-23)": { + "Standard Weekly (2020-03-21)": { "create_spoiler": true, "world_count": 1, "randomize_settings": false, "logic_rules": "glitchless", "open_forest": "open", + "open_kakariko": "closed", "open_door_of_time": true, "zora_fountain": "closed", "gerudo_fortress": "fast", @@ -164,6 +166,7 @@ "logic_rules": "glitchless", "open_forest": "open", "open_door_of_time": true, + "open_kakariko": "closed", "zora_fountain": "closed", "gerudo_fortress": "fast", "bridge": "medallions", @@ -249,6 +252,7 @@ "randomize_settings": false, "logic_rules": "glitchless", "open_forest": "closed_deku", + "open_kakariko": "closed", "open_door_of_time": false, "zora_fountain": "closed", "gerudo_fortress": "normal", diff --git a/data/settings_mapping.json b/data/settings_mapping.json index 709faa901..ee48df5bd 100644 --- a/data/settings_mapping.json +++ b/data/settings_mapping.json @@ -142,6 +142,7 @@ "row_span": [6,6,9], "settings": [ "open_forest", + "open_kakariko", "open_door_of_time", "zora_fountain", "gerudo_fortress", @@ -289,6 +290,7 @@ "no_guard_stealth", "no_epona_race", "skip_some_minigame_phases", + "complete_mask_quest", "useful_cutscenes", "fast_chests", "free_scarecrow", diff --git a/tests/ac-mq.sav b/tests/ac-mq.sav index 226795162..e64d958c5 100644 --- a/tests/ac-mq.sav +++ b/tests/ac-mq.sav @@ -9,6 +9,7 @@ "compress_rom": "None", "randomize_settings": false, "open_forest": "open", +"open_kakariko": "open", "open_door_of_time": true, "zora_fountain": "closed", "gerudo_fortress": "fast", diff --git a/tests/accessible.sav b/tests/accessible.sav index e855f45f9..ee90bc700 100644 --- a/tests/accessible.sav +++ b/tests/accessible.sav @@ -9,6 +9,7 @@ "compress_rom": "None", "randomize_settings": false, "open_forest": "open", +"open_kakariko": "open", "open_door_of_time": true, "zora_fountain": "closed", "gerudo_fortress": "fast", diff --git a/tests/disables.sav b/tests/disables.sav index 4e479c483..92cc092e1 100644 --- a/tests/disables.sav +++ b/tests/disables.sav @@ -9,6 +9,7 @@ "compress_rom": "None", "randomize_settings": false, "open_forest": "open", +"open_kakariko": "open", "open_door_of_time": true, "zora_fountain": "closed", "gerudo_fortress": "fast", @@ -47,7 +48,7 @@ "Deku Theater Mask of Truth", "DMC Deku Scrub", "ZR Frogs Ocarina Game", - "Market Treasure Chest Game", + "Market Treasure Chest Game Reward", "Colossus Freestanding PoH", "Graveyard Freestanding PoH", "Water Temple River Chest", diff --git a/tests/entrance.sav b/tests/entrance.sav index 2d063c95c..f9838ed52 100644 --- a/tests/entrance.sav +++ b/tests/entrance.sav @@ -4,6 +4,7 @@ "compress_rom": "None", "randomize_settings": false, "open_forest": "open", +"open_kakariko": "open", "open_door_of_time": false, "zora_fountain": "closed", "gerudo_fortress": "fast", diff --git a/tests/glitched-tokens.sav b/tests/glitched-tokens.sav index 95f335510..4dbe547dd 100644 --- a/tests/glitched-tokens.sav +++ b/tests/glitched-tokens.sav @@ -9,6 +9,7 @@ "compress_rom": "None", "randomize_settings": false, "open_forest": "open", +"open_kakariko": "open", "open_door_of_time": true, "zora_fountain": "open", "gerudo_fortress": "fast", diff --git a/tests/multiworld.sav b/tests/multiworld.sav index 4c758d1b8..dea2420af 100644 --- a/tests/multiworld.sav +++ b/tests/multiworld.sav @@ -8,6 +8,7 @@ "compress_rom": "None", "randomize_settings": false, "open_forest": "open", +"open_kakariko": "open", "open_door_of_time": true, "zora_fountain": "closed", "gerudo_fortress": "fast", diff --git a/tests/nightforest.sav b/tests/nightforest.sav index f5ebf3071..94d5a99ec 100644 --- a/tests/nightforest.sav +++ b/tests/nightforest.sav @@ -9,6 +9,7 @@ "compress_rom": "None", "randomize_settings": false, "open_forest": "open", +"open_kakariko": "closed", "open_door_of_time": false, "zora_fountain": "closed", "gerudo_fortress": "fast", diff --git a/tests/plando/plando-adult-trade-in-list.json b/tests/plando/plando-adult-trade-in-list.json index a62823b44..68fe0c626 100644 --- a/tests/plando/plando-adult-trade-in-list.json +++ b/tests/plando/plando-adult-trade-in-list.json @@ -23,11 +23,11 @@ "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Market Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Market Treasure Chest Game": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Market Dog Lady": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Market Treasure Chest Game Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Market Lost Dog": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], @@ -38,7 +38,7 @@ "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], - "Kak Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], + "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Graveyard Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Graveyard Dampe Gravedigging Tour": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "Pocket Egg"], diff --git a/tests/plando/plando-adult-trade-item-group-in-list.json b/tests/plando/plando-adult-trade-item-group-in-list.json index 529cfda22..b4782c544 100644 --- a/tests/plando/plando-adult-trade-item-group-in-list.json +++ b/tests/plando/plando-adult-trade-item-group-in-list.json @@ -23,11 +23,11 @@ "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Market Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Market Treasure Chest Game": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Market Dog Lady": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Market Treasure Chest Game Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Market Lost Dog": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], @@ -38,7 +38,7 @@ "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], - "Kak Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], + "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Graveyard Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Graveyard Dampe Gravedigging Tour": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "#AdultTrade"], diff --git a/tests/plando/plando-bottle-item-group-in-list.json b/tests/plando/plando-bottle-item-group-in-list.json index e070122b5..eb2ea201d 100644 --- a/tests/plando/plando-bottle-item-group-in-list.json +++ b/tests/plando/plando-bottle-item-group-in-list.json @@ -23,11 +23,11 @@ "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Market Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Market Treasure Chest Game": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Market Dog Lady": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Market Treasure Chest Game Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Market Lost Dog": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], @@ -38,7 +38,7 @@ "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], - "Kak Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], + "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Graveyard Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Graveyard Dampe Gravedigging Tour": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "#Bottle"], diff --git a/tests/plando/plando-bottles-in-list.json b/tests/plando/plando-bottles-in-list.json index f7831e6f7..70c811561 100644 --- a/tests/plando/plando-bottles-in-list.json +++ b/tests/plando/plando-bottles-in-list.json @@ -23,11 +23,11 @@ "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Market Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Market Treasure Chest Game": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Market Dog Lady": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Market Treasure Chest Game Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Market Lost Dog": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], @@ -38,7 +38,7 @@ "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], - "Kak Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], + "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Graveyard Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Graveyard Dampe Gravedigging Tour": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "Bottle with Milk"], diff --git a/tests/plando/plando-explicit-item-pool-2.json b/tests/plando/plando-explicit-item-pool-2.json index 36e032c57..8efd2bd6d 100644 --- a/tests/plando/plando-explicit-item-pool-2.json +++ b/tests/plando/plando-explicit-item-pool-2.json @@ -13,7 +13,7 @@ "Boomerang": 1, "Bottle with Big Poe": 1, "Bottle with Fairy": 1, - "Ruto's Letter": 1, + "Rutos Letter": 1, "Bottle with Poe": 1, "Bow": 1, "Deku Nuts (10)": 1, @@ -26,7 +26,7 @@ "Farores Wind": 1, "Fire Arrows": 1, "Goron Tunic": 1, - "Megaton Hammer": 1, + "Megaton Hammer": 1, "Hover Boots": 1, "Hylian Shield": 1, "Ice Arrows": 1, diff --git a/tests/plando/plando-explicit-item-pool-3.json b/tests/plando/plando-explicit-item-pool-3.json index 6ec4d6284..6aafae1c8 100644 --- a/tests/plando/plando-explicit-item-pool-3.json +++ b/tests/plando/plando-explicit-item-pool-3.json @@ -13,7 +13,7 @@ "Boomerang": 1, "Bottle with Big Poe": 1, "Bottle with Fairy": 1, - "Ruto's Letter": 1, + "Rutos Letter": 1, "Bottle with Poe": 1, "Bow": 1, "Deku Nuts (10)": 1, @@ -26,7 +26,7 @@ "Farores Wind": 1, "Fire Arrows": 1, "Goron Tunic": 1, - "Megaton Hammer": 1, + "Megaton Hammer": 1, "Hover Boots": 1, "Hylian Shield": 1, "Ice Arrows": 1, diff --git a/tests/plando/plando-explicit-item-pool.json b/tests/plando/plando-explicit-item-pool.json index fb68dd460..00e950d9b 100644 --- a/tests/plando/plando-explicit-item-pool.json +++ b/tests/plando/plando-explicit-item-pool.json @@ -16,7 +16,7 @@ "Boomerang": 1, "Bottle with Big Poe": 1, "Bottle with Fairy": 1, - "Ruto's Letter": 1, + "Rutos Letter": 1, "Bottle with Poe": 1, "Bow": 1, "Deku Nuts (10)": 1, @@ -29,7 +29,7 @@ "Farores Wind": 1, "Fire Arrows": 1, "Goron Tunic": 1, - "Megaton Hammer": 1, + "Megaton Hammer": 1, "Hover Boots": 1, "Hylian Shield": 1, "Ice Arrows": 1, diff --git a/tests/plando/plando-list-case-sensitivity.json b/tests/plando/plando-list-case-sensitivity.json index a758eebf6..b7c6404e7 100644 --- a/tests/plando/plando-list-case-sensitivity.json +++ b/tests/plando/plando-list-case-sensitivity.json @@ -23,11 +23,11 @@ "hc great fairy reward": ["Bow", "Magic Meter", "Light Arrows"], "ogc great fairy reward": ["Bow", "Magic Meter", "Light Arrows"], "market 10 big poes": ["Bow", "Magic Meter", "Light Arrows"], - "market shooting gallery": ["Bow", "Magic Meter", "Light Arrows"], + "market shooting gallery reward": ["Bow", "Magic Meter", "Light Arrows"], "market bombchu bowling first prize": ["Bow", "Magic Meter", "Light Arrows"], "market bombchu bowling second prize": ["Bow", "Magic Meter", "Light Arrows"], - "market treasure chest game": ["Bow", "Magic Meter", "Light Arrows"], - "market dog lady": ["Bow", "Magic Meter", "Light Arrows"], + "market treasure chest game reward": ["Bow", "Magic Meter", "Light Arrows"], + "market lost dog": ["Bow", "Magic Meter", "Light Arrows"], "kak anju as adult": ["Bow", "Magic Meter", "Light Arrows"], "kak anju as child": ["Bow", "Magic Meter", "Light Arrows"], "kak man on roof": ["Bow", "Magic Meter", "Light Arrows"], @@ -38,7 +38,7 @@ "kak 50 gold skulltula reward": ["Bow", "Magic Meter", "Light Arrows"], "kak Impas house freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "kak windmill freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], - "kak shooting gallery": ["Bow", "Magic Meter", "Light Arrows"], + "kak shooting gallery reward": ["Bow", "Magic Meter", "Light Arrows"], "graveyard freestanding poh": ["Bow", "Magic Meter", "Light Arrows"], "graveyard dampe gravedigging tour": ["Bow", "Magic Meter", "Light Arrows"], "graveyard shield grave chest": ["Bow", "Magic Meter", "Light Arrows"], diff --git a/tests/plando/plando-list.json b/tests/plando/plando-list.json index f3ed63793..878dd3054 100644 --- a/tests/plando/plando-list.json +++ b/tests/plando/plando-list.json @@ -23,11 +23,11 @@ "HC Great Fairy Reward": ["Bow", "Magic Meter", "Light Arrows"], "OGC Great Fairy Reward": ["Bow", "Magic Meter", "Light Arrows"], "Market 10 Big Poes": ["Bow", "Magic Meter", "Light Arrows"], - "Market Shooting Gallery": ["Bow", "Magic Meter", "Light Arrows"], + "Market Shooting Gallery Reward": ["Bow", "Magic Meter", "Light Arrows"], "Market Bombchu Bowling First Prize": ["Bow", "Magic Meter", "Light Arrows"], "Market Bombchu Bowling Second Prize": ["Bow", "Magic Meter", "Light Arrows"], - "Market Treasure Chest Game": ["Bow", "Magic Meter", "Light Arrows"], - "Market Dog Lady": ["Bow", "Magic Meter", "Light Arrows"], + "Market Treasure Chest Game Reward": ["Bow", "Magic Meter", "Light Arrows"], + "Market Lost Dog": ["Bow", "Magic Meter", "Light Arrows"], "Kak Anju as Adult": ["Bow", "Magic Meter", "Light Arrows"], "Kak Anju as Child": ["Bow", "Magic Meter", "Light Arrows"], "Kak Man on Roof": ["Bow", "Magic Meter", "Light Arrows"], @@ -38,7 +38,7 @@ "Kak 50 Gold Skulltula Reward": ["Bow", "Magic Meter", "Light Arrows"], "Kak Impas House Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "Kak Windmill Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], - "Kak Shooting Gallery": ["Bow", "Magic Meter", "Light Arrows"], + "Kak Shooting Gallery Reward": ["Bow", "Magic Meter", "Light Arrows"], "Graveyard Freestanding PoH": ["Bow", "Magic Meter", "Light Arrows"], "Graveyard Dampe Gravedigging Tour": ["Bow", "Magic Meter", "Light Arrows"], "Graveyard Shield Grave Chest": ["Bow", "Magic Meter", "Light Arrows"], diff --git a/tests/plando/plando-placed-and-added-ice-traps.json b/tests/plando/plando-placed-and-added-ice-traps.json index 5260236d2..24e995324 100644 --- a/tests/plando/plando-placed-and-added-ice-traps.json +++ b/tests/plando/plando-placed-and-added-ice-traps.json @@ -52,108 +52,108 @@ "Hylian Shield": 1 }, "locations": { - "GV Crate Freestanding PoH": "Ice Trap", - "GV Chest": "Ice Trap", - "GF Chest": "Ice Trap", - "GF HBA 1000 Points": "Ice Trap", - "GF HBA 1500 Points": "Ice Trap", - "Wasteland Chest": "Ice Trap", - "Colossus Freestanding PoH": "Ice Trap", - "Colossus Great Fairy Reward": "Ice Trap", - "ToT Light Arrows Cutscene": "Ice Trap", - "HC Malon Egg": "Ice Trap", - "HC Great Fairy Reward": "Ice Trap", - "OGC Great Fairy Reward": "Ice Trap", - "Market 10 Big Poes": "Ice Trap", - "Market Shooting Gallery": "Ice Trap", - "Market Bombchu Bowling First Prize": "Ice Trap", - "Market Bombchu Bowling Second Prize": "Ice Trap", - "Market Treasure Chest Game": "Ice Trap", - "Market Dog Lady": "Ice Trap", - "Kak Anju as Adult": "Ice Trap", - "Kak Anju as Child": "Ice Trap", - "Kak Man on Roof": "Ice Trap", - "Kak 10 Gold Skulltula Reward": "Ice Trap", - "Kak 20 Gold Skulltula Reward": "Ice Trap", - "Kak 30 Gold Skulltula Reward": "Ice Trap", - "Kak 40 Gold Skulltula Reward": "Ice Trap", - "Kak 50 Gold Skulltula Reward": "Ice Trap", - "Kak Impas House Freestanding PoH": "Ice Trap", - "Kak Windmill Freestanding PoH": "Ice Trap", - "Kak Shooting Gallery": "Ice Trap", - "Graveyard Freestanding PoH": "Ice Trap", - "Graveyard Dampe Gravedigging Tour": "Ice Trap", - "Graveyard Shield Grave Chest": "Ice Trap", - "Graveyard Heart Piece Grave Chest": "Ice Trap", - "Graveyard Composers Grave Chest": "Ice Trap", - "Graveyard Hookshot Chest": "Ice Trap", - "Graveyard Dampe Race Freestanding PoH": "Ice Trap", - "DMT Chest": "Ice Trap", - "DMT Freestanding PoH": "Ice Trap", - "DMT Biggoron": "Ice Trap", - "GC Maze Left Chest": "Ice Trap", - "GC Maze Center Chest": "Ice Trap", - "GC Maze Right Chest": "Ice Trap", - "GC Pot Freestanding PoH": "Ice Trap", - "GC Rolling Goron as Child": "Ice Trap", - "GC Rolling Goron as Adult": "Ice Trap", - "GC Darunias Joy": "Ice Trap", - "DMC Wall Freestanding PoH": "Ice Trap", - "DMC Volcano Freestanding PoH": "Ice Trap", - "DMC Great Fairy Reward": "Ice Trap", - "DMT Great Fairy Reward": "Ice Trap", - "ZR Frogs Ocarina Game": "Ice Trap", - "ZR Frogs in the Rain": "Ice Trap", - "ZR Near Open Grotto Freestanding PoH": "Ice Trap", - "ZR Near Domain Freestanding PoH": "Ice Trap", - "ZD Diving Minigame": "Ice Trap", - "ZD Chest": "Ice Trap", - "ZD King Zora Thawed": "Ice Trap", - "ZF Iceberg Freestanding PoH": "Ice Trap", - "ZF Bottom Freestanding PoH": "Ice Trap", - "ZF Great Fairy Reward": "Ice Trap", - "LLR Talons Chickens": "Ice Trap", - "LLR Freestanding PoH": "Ice Trap", - "Ganons Tower Boss Key Chest": "Ice Trap", - "KF Storms Grotto Chest": "Ice Trap", - "LW Near Shortcuts Grotto Chest": "Ice Trap", - "Deku Theater Skull Mask": "Ice Trap", - "Deku Theater Mask of Truth": "Ice Trap", - "LW Deku Scrub Grotto Front": "Ice Trap", - "SFM Wolfos Grotto Chest": "Ice Trap", - "HF Southeast Grotto Chest": "Ice Trap", - "HF Open Grotto Chest": "Ice Trap", - "HF Deku Scrub Grotto": "Ice Trap", - "HF Near Market Grotto Chest": "Ice Trap", - "HF Tektite Grotto Freestanding PoH": "Ice Trap", - "Kak Redead Grotto Chest": "Ice Trap", - "Kak Open Grotto Chest": "Ice Trap", - "DMT Storms Grotto Chest": "Ice Trap", - "DMC Upper Grotto Chest": "Ice Trap", - "ZR Open Grotto Chest": "Ice Trap", - "KF Shop Item 5": "Ice Trap", - "KF Shop Item 6": "Ice Trap", - "KF Shop Item 7": "Ice Trap", - "KF Shop Item 8": "Ice Trap", - "Kak Potion Shop Item 5": "Ice Trap", - "Kak Potion Shop Item 6": "Ice Trap", - "Kak Potion Shop Item 7": "Ice Trap", - "Kak Potion Shop Item 8": "Ice Trap", - "Market Bombchu Shop Item 5": "Ice Trap", - "Market Bombchu Shop Item 6": "Ice Trap", - "Market Bombchu Shop Item 7": "Ice Trap", - "Market Bombchu Shop Item 8": "Ice Trap", - "Market Potion Shop Item 5": "Ice Trap", - "Market Potion Shop Item 6": "Ice Trap", - "Market Potion Shop Item 7": "Ice Trap", - "Market Potion Shop Item 8": "Ice Trap", - "ZD Shop Item 5": "Ice Trap", - "ZD Shop Item 6": "Ice Trap", - "ZD Shop Item 7": "Ice Trap", - "ZD Shop Item 8": "Ice Trap", - "GC Shop Item 5": "Ice Trap", - "GC Shop Item 6": "Ice Trap", - "GC Shop Item 7": "Ice Trap", - "GC Shop Item 8": "Ice Trap" + "GV Crate Freestanding PoH": "Ice Trap", + "GV Chest": "Ice Trap", + "GF Chest": "Ice Trap", + "GF HBA 1000 Points": "Ice Trap", + "GF HBA 1500 Points": "Ice Trap", + "Wasteland Chest": "Ice Trap", + "Colossus Freestanding PoH": "Ice Trap", + "Colossus Great Fairy Reward": "Ice Trap", + "ToT Light Arrows Cutscene": "Ice Trap", + "HC Malon Egg": "Ice Trap", + "HC Great Fairy Reward": "Ice Trap", + "OGC Great Fairy Reward": "Ice Trap", + "Market 10 Big Poes": "Ice Trap", + "Market Shooting Gallery Reward": "Ice Trap", + "Market Bombchu Bowling First Prize": "Ice Trap", + "Market Bombchu Bowling Second Prize": "Ice Trap", + "Market Treasure Chest Game Reward": "Ice Trap", + "Market Lost Dog": "Ice Trap", + "Kak Anju as Adult": "Ice Trap", + "Kak Anju as Child": "Ice Trap", + "Kak Man on Roof": "Ice Trap", + "Kak 10 Gold Skulltula Reward": "Ice Trap", + "Kak 20 Gold Skulltula Reward": "Ice Trap", + "Kak 30 Gold Skulltula Reward": "Ice Trap", + "Kak 40 Gold Skulltula Reward": "Ice Trap", + "Kak 50 Gold Skulltula Reward": "Ice Trap", + "Kak Impas House Freestanding PoH": "Ice Trap", + "Kak Windmill Freestanding PoH": "Ice Trap", + "Kak Shooting Gallery Reward": "Ice Trap", + "Graveyard Freestanding PoH": "Ice Trap", + "Graveyard Dampe Gravedigging Tour": "Ice Trap", + "Graveyard Shield Grave Chest": "Ice Trap", + "Graveyard Heart Piece Grave Chest": "Ice Trap", + "Graveyard Composers Grave Chest": "Ice Trap", + "Graveyard Hookshot Chest": "Ice Trap", + "Graveyard Dampe Race Freestanding PoH": "Ice Trap", + "DMT Chest": "Ice Trap", + "DMT Freestanding PoH": "Ice Trap", + "DMT Biggoron": "Ice Trap", + "GC Maze Left Chest": "Ice Trap", + "GC Maze Center Chest": "Ice Trap", + "GC Maze Right Chest": "Ice Trap", + "GC Pot Freestanding PoH": "Ice Trap", + "GC Rolling Goron as Child": "Ice Trap", + "GC Rolling Goron as Adult": "Ice Trap", + "GC Darunias Joy": "Ice Trap", + "DMC Wall Freestanding PoH": "Ice Trap", + "DMC Volcano Freestanding PoH": "Ice Trap", + "DMC Great Fairy Reward": "Ice Trap", + "DMT Great Fairy Reward": "Ice Trap", + "ZR Frogs Ocarina Game": "Ice Trap", + "ZR Frogs in the Rain": "Ice Trap", + "ZR Near Open Grotto Freestanding PoH": "Ice Trap", + "ZR Near Domain Freestanding PoH": "Ice Trap", + "ZD Diving Minigame": "Ice Trap", + "ZD Chest": "Ice Trap", + "ZD King Zora Thawed": "Ice Trap", + "ZF Iceberg Freestanding PoH": "Ice Trap", + "ZF Bottom Freestanding PoH": "Ice Trap", + "ZF Great Fairy Reward": "Ice Trap", + "LLR Talons Chickens": "Ice Trap", + "LLR Freestanding PoH": "Ice Trap", + "Ganons Tower Boss Key Chest": "Ice Trap", + "KF Storms Grotto Chest": "Ice Trap", + "LW Near Shortcuts Grotto Chest": "Ice Trap", + "Deku Theater Skull Mask": "Ice Trap", + "Deku Theater Mask of Truth": "Ice Trap", + "LW Deku Scrub Grotto Front": "Ice Trap", + "SFM Wolfos Grotto Chest": "Ice Trap", + "HF Southeast Grotto Chest": "Ice Trap", + "HF Open Grotto Chest": "Ice Trap", + "HF Deku Scrub Grotto": "Ice Trap", + "HF Near Market Grotto Chest": "Ice Trap", + "HF Tektite Grotto Freestanding PoH": "Ice Trap", + "Kak Redead Grotto Chest": "Ice Trap", + "Kak Open Grotto Chest": "Ice Trap", + "DMT Storms Grotto Chest": "Ice Trap", + "DMC Upper Grotto Chest": "Ice Trap", + "ZR Open Grotto Chest": "Ice Trap", + "KF Shop Item 5": "Ice Trap", + "KF Shop Item 6": "Ice Trap", + "KF Shop Item 7": "Ice Trap", + "KF Shop Item 8": "Ice Trap", + "Kak Potion Shop Item 5": "Ice Trap", + "Kak Potion Shop Item 6": "Ice Trap", + "Kak Potion Shop Item 7": "Ice Trap", + "Kak Potion Shop Item 8": "Ice Trap", + "Market Bombchu Shop Item 5": "Ice Trap", + "Market Bombchu Shop Item 6": "Ice Trap", + "Market Bombchu Shop Item 7": "Ice Trap", + "Market Bombchu Shop Item 8": "Ice Trap", + "Market Potion Shop Item 5": "Ice Trap", + "Market Potion Shop Item 6": "Ice Trap", + "Market Potion Shop Item 7": "Ice Trap", + "Market Potion Shop Item 8": "Ice Trap", + "ZD Shop Item 5": "Ice Trap", + "ZD Shop Item 6": "Ice Trap", + "ZD Shop Item 7": "Ice Trap", + "ZD Shop Item 8": "Ice Trap", + "GC Shop Item 5": "Ice Trap", + "GC Shop Item 6": "Ice Trap", + "GC Shop Item 7": "Ice Trap", + "GC Shop Item 8": "Ice Trap" } } \ No newline at end of file diff --git a/tests/plando/plando-shop-items.json b/tests/plando/plando-shop-items.json index 0484e6780..e40372801 100644 --- a/tests/plando/plando-shop-items.json +++ b/tests/plando/plando-shop-items.json @@ -4,53 +4,53 @@ "shopsanity": "4" }, "locations": { - "KF Shop Item 1": "Buy Deku Stick (1)", - "KF Shop Item 2": "Buy Deku Nut (5)", - "KF Shop Item 3": "Buy Heart", - "KF Shop Item 4": "Buy Fairy's Spirit", - "KF Shop Item 5": "Deku Seeds (30)", - "KF Shop Item 6": "Deku Seeds (30)", - "KF Shop Item 7": "Deku Seeds (30)", - "KF Shop Item 8": "Deku Seeds (30)", - "Kak Potion Shop Item 1": "Buy Red Potion [30]", - "Kak Potion Shop Item 2": "Buy Green Potion", - "Kak Potion Shop Item 3": "Buy Blue Potion", - "Kak Potion Shop Item 4": "Buy Fish", - "Kak Potion Shop Item 5": "Rupee (1)", - "Kak Potion Shop Item 6": "Rupee (1)", - "Kak Potion Shop Item 7": "Rupee (1)", - "Kak Potion Shop Item 8": "Rupee (1)", - "Market Bombchu Shop Item 1": "Buy Bottle Bug", - "Market Bombchu Shop Item 2": "Buy Bottle Bug", - "Market Bombchu Shop Item 3": "Buy Bottle Bug", - "Market Bombchu Shop Item 4": "Buy Bottle Bug", - "Market Bombchu Shop Item 5": "Bombs (5)", - "Market Bombchu Shop Item 6": "Bombs (5)", - "Market Bombchu Shop Item 7": "Bombs (5)", - "Market Bombchu Shop Item 8": "Bombs (5)", - "Market Potion Shop Item 1": "Buy Red Potion [30]", - "Market Potion Shop Item 2": "Buy Green Potion", - "Market Potion Shop Item 3": "Buy Blue Potion", - "Market Potion Shop Item 4": "Buy Fish", - "Market Potion Shop Item 5": "Rupees (200)", - "Market Potion Shop Item 6": "Rupees (200)", - "Market Potion Shop Item 7": "Rupees (200)", - "Market Potion Shop Item 8": "Rupees (200)", - "ZD Shop Item 1": "Buy Fish", - "ZD Shop Item 2": "Buy Fish", - "ZD Shop Item 3": "Buy Fish", - "ZD Shop Item 4": "Buy Fish", - "ZD Shop Item 5": "Ice Trap", - "ZD Shop Item 6": "Ice Trap", - "ZD Shop Item 7": "Ice Trap", - "ZD Shop Item 8": "Zora Tunic", - "GC Shop Item 1": "Buy Bombs (10)", - "GC Shop Item 2": "Buy Arrows (30)", - "GC Shop Item 3": "Buy Red Potion [30]", - "GC Shop Item 4": "Buy Deku Nut (5)", - "GC Shop Item 5": "Ice Trap", - "GC Shop Item 6": "Ice Trap", - "GC Shop Item 7": "Ice Trap", - "GC Shop Item 8": "Goron Tunic" + "KF Shop Item 1": "Buy Deku Stick (1)", + "KF Shop Item 2": "Buy Deku Nut (5)", + "KF Shop Item 3": "Buy Heart", + "KF Shop Item 4": "Buy Fairy's Spirit", + "KF Shop Item 5": "Deku Seeds (30)", + "KF Shop Item 6": "Deku Seeds (30)", + "KF Shop Item 7": "Deku Seeds (30)", + "KF Shop Item 8": "Deku Seeds (30)", + "Kak Potion Shop Item 1": "Buy Red Potion [30]", + "Kak Potion Shop Item 2": "Buy Green Potion", + "Kak Potion Shop Item 3": "Buy Blue Potion", + "Kak Potion Shop Item 4": "Buy Fish", + "Kak Potion Shop Item 5": "Rupee (1)", + "Kak Potion Shop Item 6": "Rupee (1)", + "Kak Potion Shop Item 7": "Rupee (1)", + "Kak Potion Shop Item 8": "Rupee (1)", + "Market Bombchu Shop Item 1": "Buy Bottle Bug", + "Market Bombchu Shop Item 2": "Buy Bottle Bug", + "Market Bombchu Shop Item 3": "Buy Bottle Bug", + "Market Bombchu Shop Item 4": "Buy Bottle Bug", + "Market Bombchu Shop Item 5": "Bombs (5)", + "Market Bombchu Shop Item 6": "Bombs (5)", + "Market Bombchu Shop Item 7": "Bombs (5)", + "Market Bombchu Shop Item 8": "Bombs (5)", + "Market Potion Shop Item 1": "Buy Red Potion [30]", + "Market Potion Shop Item 2": "Buy Green Potion", + "Market Potion Shop Item 3": "Buy Blue Potion", + "Market Potion Shop Item 4": "Buy Fish", + "Market Potion Shop Item 5": "Rupees (200)", + "Market Potion Shop Item 6": "Rupees (200)", + "Market Potion Shop Item 7": "Rupees (200)", + "Market Potion Shop Item 8": "Rupees (200)", + "ZD Shop Item 1": "Buy Fish", + "ZD Shop Item 2": "Buy Fish", + "ZD Shop Item 3": "Buy Fish", + "ZD Shop Item 4": "Buy Fish", + "ZD Shop Item 5": "Ice Trap", + "ZD Shop Item 6": "Ice Trap", + "ZD Shop Item 7": "Ice Trap", + "ZD Shop Item 8": "Zora Tunic", + "GC Shop Item 1": "Buy Bombs (10)", + "GC Shop Item 2": "Buy Arrows (30)", + "GC Shop Item 3": "Buy Red Potion [30]", + "GC Shop Item 4": "Buy Deku Nut (5)", + "GC Shop Item 5": "Ice Trap", + "GC Shop Item 6": "Ice Trap", + "GC Shop Item 7": "Ice Trap", + "GC Shop Item 8": "Goron Tunic" } } \ No newline at end of file diff --git a/tests/plando/plando-weird-egg-in-list.json b/tests/plando/plando-weird-egg-in-list.json index 64d3e1f45..bf6948daf 100644 --- a/tests/plando/plando-weird-egg-in-list.json +++ b/tests/plando/plando-weird-egg-in-list.json @@ -23,11 +23,11 @@ "HC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "OGC Great Fairy Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Market 10 Big Poes": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Market Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Market Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Market Bombchu Bowling First Prize": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Market Bombchu Bowling Second Prize": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Market Treasure Chest Game": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Market Dog Lady": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Market Treasure Chest Game Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Market Lost Dog": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Anju as Adult": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Anju as Child": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Man on Roof": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], @@ -38,7 +38,7 @@ "Kak 50 Gold Skulltula Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Impas House Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Kak Windmill Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], - "Kak Shooting Gallery": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], + "Kak Shooting Gallery Reward": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Graveyard Freestanding PoH": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Graveyard Dampe Gravedigging Tour": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], "Graveyard Shield Grave Chest": ["Bow", "Light Arrows", "Magic Meter", "Weird Egg"], diff --git a/tests/plentiful.sav b/tests/plentiful.sav index 1694f3108..268623c10 100644 --- a/tests/plentiful.sav +++ b/tests/plentiful.sav @@ -9,6 +9,7 @@ "compress_rom": "None", "randomize_settings": false, "open_forest": "open", +"open_kakariko": "open", "open_door_of_time": true, "zora_fountain": "closed", "gerudo_fortress": "fast", diff --git a/tests/tokensanity.sav b/tests/tokensanity.sav index a630aa710..2fb26f70a 100644 --- a/tests/tokensanity.sav +++ b/tests/tokensanity.sav @@ -9,6 +9,7 @@ "compress_rom": "None", "randomize_settings": false, "open_forest": "open", +"open_kakariko": "open", "open_door_of_time": true, "zora_fountain": "closed", "gerudo_fortress": "fast", diff --git a/version.py b/version.py index a9a571ccf..8a479bd98 100644 --- a/version.py +++ b/version.py @@ -1 +1 @@ -__version__ = '5.2.31 f.LUM' +__version__ = '5.2.47 f.LUM'