From f31ab5ae0be3de6e0910b2d5942e33458be043ac Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Tue, 7 Mar 2023 18:03:46 -0700 Subject: [PATCH] Misc Changes (#306) --- Progress.md | 14 +- ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 31 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 15 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 15 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 15 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 15 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 15 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 19 - ...cFP21mesg_flow_node_branchP10fopAc_ac_ci.s | 29 - .../d_a_tag_mstop/__dt__12daTagMstop_cFv.s | 27 - .../daTagMstop_Create__FP10fopAc_ac_c.s | 9 - .../daTagMstop_Delete__FP12daTagMstop_c.s | 11 - .../daTagMstop_Execute__FP12daTagMstop_c.s | 9 - .../eventOrder__12daTagMstop_cFv.s | 14 - include/d/a/d_a_alink.h | 51 +- include/d/a/d_a_player.h | 18 + include/d/com/d_com_inf_actor.h | 6 + include/d/com/d_com_inf_game.h | 11 + include/d/d_error_msg.h | 17 +- include/d/event/d_event.h | 34 + include/d/menu/d_menu_save.h | 3 +- include/d/save/d_save.h | 9 + include/f_op/f_op_actor_mng.h | 5 + include/f_op/f_op_scene.h | 3 + include/f_pc/f_pc_base.h | 2 +- include/f_pc/f_pc_node.h | 1 + .../rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h | 9 +- rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp | 8 +- rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp | 281 +- src/d/com/d_com_inf_actor.cpp | 37 +- src/d/com/d_com_inf_game.cpp | 6 +- src/d/d_bomb.cpp | 9 +- src/d/d_error_msg.cpp | 127 +- src/d/d_item.cpp | 2 + src/d/event/d_event.cpp | 37 + src/d/event/d_event_debug_bit_table.inc | 7191 +++++++++++++++++ src/d/event/d_event_debug_bit_table_tmp.inc | 1521 ++++ src/d/event/d_event_debug_reg_table.inc | 189 + src/d/event/d_event_debug_reg_table_tmp.inc | 126 + src/d/menu/d_menu_save.cpp | 6 +- src/d/msg/d_msg_flow.cpp | 210 +- src/d/s/d_s_logo.cpp | 2 - src/d/s/d_s_menu.cpp | 47 +- src/d/s/d_s_name.cpp | 4 +- src/d/s/d_s_play.cpp | 4 +- src/d/s/d_s_room.cpp | 4 +- src/d/s/d_s_title.cpp | 65 +- src/d/save/d_save.cpp | 617 +- src/d/save/d_save_bit_labels.inc | 833 ++ src/d/save/d_save_init.cpp | 24 +- src/d/save/d_save_temp_bit_labels.inc | 196 + src/f_op/f_op_scene.cpp | 8 +- src/f_op/f_op_scene_iter.cpp | 2 +- src/f_op/f_op_scene_mng.cpp | 2 +- src/f_pc/f_pc_base.cpp | 17 +- src/f_pc/f_pc_create_iter.cpp | 14 +- src/f_pc/f_pc_create_req.cpp | 14 +- src/f_pc/f_pc_create_tag.cpp | 13 +- src/f_pc/f_pc_creator.cpp | 10 +- src/f_pc/f_pc_delete_tag.cpp | 12 +- src/f_pc/f_pc_deletor.cpp | 14 +- src/f_pc/f_pc_draw.cpp | 14 +- src/f_pc/f_pc_draw_priority.cpp | 14 +- src/f_pc/f_pc_executor.cpp | 14 +- src/f_pc/f_pc_fstcreate_req.cpp | 12 +- src/f_pc/f_pc_layer.cpp | 14 +- src/f_pc/f_pc_layer_iter.cpp | 14 +- src/f_pc/f_pc_layer_tag.cpp | 14 +- src/f_pc/f_pc_leaf.cpp | 14 +- src/f_pc/f_pc_line.cpp | 14 +- src/f_pc/f_pc_line_iter.cpp | 13 +- src/f_pc/f_pc_line_tag.cpp | 13 +- src/f_pc/f_pc_load.cpp | 12 +- src/f_pc/f_pc_manager.cpp | 85 +- src/f_pc/f_pc_method.cpp | 14 +- src/f_pc/f_pc_method_iter.cpp | 14 +- src/f_pc/f_pc_method_tag.cpp | 14 +- src/f_pc/f_pc_node.cpp | 22 +- src/f_pc/f_pc_node_req.cpp | 14 +- src/f_pc/f_pc_pause.cpp | 14 +- src/f_pc/f_pc_priority.cpp | 16 +- src/f_pc/f_pc_profile.cpp | 11 +- src/f_pc/f_pc_searcher.cpp | 14 +- src/f_pc/f_pc_stdcreate_req.cpp | 14 +- src/m_Do/m_Do_MemCardRWmng.cpp | 2 +- 89 files changed, 11095 insertions(+), 1436 deletions(-) delete mode 100644 asm/d/msg/d_msg_flow/query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/d/msg/d_msg_flow/query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/__dt__12daTagMstop_cFv.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Create__FP10fopAc_ac_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Delete__FP12daTagMstop_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Execute__FP12daTagMstop_c.s delete mode 100644 asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/eventOrder__12daTagMstop_cFv.s create mode 100644 src/d/event/d_event_debug_bit_table.inc create mode 100644 src/d/event/d_event_debug_bit_table_tmp.inc create mode 100644 src/d/event/d_event_debug_reg_table.inc create mode 100644 src/d/event/d_event_debug_reg_table_tmp.inc create mode 100644 src/d/save/d_save_bit_labels.inc create mode 100644 src/d/save/d_save_temp_bit_labels.inc diff --git a/Progress.md b/Progress.md index 5141c89194..9979470490 100644 --- a/Progress.md +++ b/Progress.md @@ -7,22 +7,22 @@ Section | Percentage | Decompiled (bytes) | Total (bytes) .init | 97.972973% | 9280 | 9472 .extab | 100.000000% | 96 | 96 .extabindex | 100.000000% | 96 | 96 -.text | 25.561317% | 919324 | 3596544 +.text | 25.584339% | 920152 | 3596544 .ctors | 100.000000% | 448 | 448 .dtors | 100.000000% | 32 | 32 .rodata | 100.000000% | 193856 | 193856 .data | 100.000000% | 197632 | 197632 .sdata | 100.000000% | 1408 | 1408 .sdata2 | 100.000000% | 20832 | 20832 -Total | 33.408843% | 1343260 | 4020672 +Total | 33.429437% | 1344088 | 4020672 ## Total Section | Percentage | Decompiled (bytes) | Total (bytes) ---|---|---|--- -main.dol | 33.408843% | 1343260 | 4020672 -RELs | 33.385425% | 3839432 | 11500324 -Total | 33.391491% | 5182692 | 15520996 +main.dol | 33.429437% | 1344088 | 4020672 +RELs | 33.387651% | 3839688 | 11500324 +Total | 33.398475% | 5183776 | 15520996 ## RELs @@ -745,7 +745,7 @@ d_a_tag_mhint | 35.576923% | 1332 | 3744 d_a_tag_mist | 43.436293% | 900 | 2072 d_a_tag_mmsg | 100.000000% | 1960 | 1960 d_a_tag_msg | 37.563971% | 1468 | 3908 -d_a_tag_mstop | 36.151961% | 1180 | 3264 +d_a_tag_mstop | 43.995098% | 1436 | 3264 d_a_tag_mwait | 35.082873% | 1016 | 2896 d_a_tag_myna2 | 47.260274% | 828 | 1752 d_a_tag_myna_light | 36.747759% | 1148 | 3124 @@ -785,4 +785,4 @@ d_a_vrbox2 | 34.977578% | 2184 | 6244 d_a_warp_bug | 54.940711% | 1112 | 2024 d_a_ykgr | 44.400631% | 2252 | 5072 f_pc_profile_lst | 100.000000% | 28156 | 28156 -Total | 33.385425% | 3839432 | 11500324 +Total | 33.387651% | 3839688 | 11500324 diff --git a/asm/d/msg/d_msg_flow/query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index c9e0193b90..0000000000 --- a/asm/d/msg/d_msg_flow/query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,31 +0,0 @@ -lbl_8024B250: -/* 8024B250 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B254 7C 08 02 A6 */ mflr r0 -/* 8024B258 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B25C A0 04 00 04 */ lhz r0, 4(r4) -/* 8024B260 28 00 00 00 */ cmplwi r0, 0 -/* 8024B264 40 82 00 30 */ bne lbl_8024B294 -/* 8024B268 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B26C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B270 4B DE 78 39 */ bl getRupeeMax__21dSv_player_status_a_cCFv -/* 8024B274 3C 80 80 40 */ lis r4, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B278 38 84 61 C0 */ addi r4, r4, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B27C A0 84 00 04 */ lhz r4, 4(r4) -/* 8024B280 54 60 04 3E */ clrlwi r0, r3, 0x10 -/* 8024B284 7C 00 20 50 */ subf r0, r0, r4 -/* 8024B288 54 00 0F FE */ srwi r0, r0, 0x1f -/* 8024B28C 7C 03 03 78 */ mr r3, r0 -/* 8024B290 48 00 00 20 */ b lbl_8024B2B0 -lbl_8024B294: -/* 8024B294 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B298 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B29C A0 63 00 04 */ lhz r3, 4(r3) -/* 8024B2A0 54 00 04 3E */ clrlwi r0, r0, 0x10 -/* 8024B2A4 7C 00 18 50 */ subf r0, r0, r3 -/* 8024B2A8 54 00 0F FE */ srwi r0, r0, 0x1f -/* 8024B2AC 7C 03 03 78 */ mr r3, r0 -lbl_8024B2B0: -/* 8024B2B0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B2B4 7C 08 03 A6 */ mtlr r0 -/* 8024B2B8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B2BC 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index fe58e59e74..0000000000 --- a/asm/d/msg/d_msg_flow/query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024B504: -/* 8024B504 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B508 7C 08 02 A6 */ mflr r0 -/* 8024B50C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B510 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B514 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B518 38 63 0D D8 */ addi r3, r3, 0xdd8 -/* 8024B51C A0 04 00 04 */ lhz r0, 4(r4) -/* 8024B520 54 00 0B FC */ rlwinm r0, r0, 1, 0xf, 0x1e -/* 8024B524 3C 80 80 38 */ lis r4, tempBitLabels__20dSv_event_tmp_flag_c@ha /* 0x803790C0@ha */ -/* 8024B528 38 84 90 C0 */ addi r4, r4, tempBitLabels__20dSv_event_tmp_flag_c@l /* 0x803790C0@l */ -/* 8024B52C 7C 84 02 2E */ lhzx r4, r4, r0 -/* 8024B530 4B DE 94 8D */ bl isEventBit__11dSv_event_cCFUs -/* 8024B534 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B538 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B53C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B540 7C 08 03 A6 */ mtlr r0 -/* 8024B544 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B548 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 9dd24626c3..0000000000 --- a/asm/d/msg/d_msg_flow/query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8024B54C: -/* 8024B54C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B550 7C 08 02 A6 */ mflr r0 -/* 8024B554 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B558 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B55C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B560 38 63 09 58 */ addi r3, r3, 0x958 -/* 8024B564 A0 84 00 04 */ lhz r4, 4(r4) -/* 8024B568 4B DE 92 81 */ bl isTbox__12dSv_memBit_cCFi -/* 8024B56C 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B570 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B574 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B578 7C 08 03 A6 */ mtlr r0 -/* 8024B57C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B580 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 071dc3eeda..0000000000 --- a/asm/d/msg/d_msg_flow/query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8024B584: -/* 8024B584 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B588 7C 08 02 A6 */ mflr r0 -/* 8024B58C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B590 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B594 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B598 38 63 09 58 */ addi r3, r3, 0x958 -/* 8024B59C A0 84 00 04 */ lhz r4, 4(r4) -/* 8024B5A0 4B DE 92 C1 */ bl isSwitch__12dSv_memBit_cCFi -/* 8024B5A4 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B5A8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B5AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B5B0 7C 08 03 A6 */ mtlr r0 -/* 8024B5B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B5B8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 2322895607..0000000000 --- a/asm/d/msg/d_msg_flow/query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8024B5BC: -/* 8024B5BC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B5C0 7C 08 02 A6 */ mflr r0 -/* 8024B5C4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B5C8 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B5CC 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B5D0 38 63 09 58 */ addi r3, r3, 0x958 -/* 8024B5D4 A0 84 00 04 */ lhz r4, 4(r4) -/* 8024B5D8 4B DE 93 15 */ bl isItem__12dSv_memBit_cCFi -/* 8024B5DC 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B5E0 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B5E4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B5E8 7C 08 03 A6 */ mtlr r0 -/* 8024B5EC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B5F0 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 0455de8b71..0000000000 --- a/asm/d/msg/d_msg_flow/query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8024B5F4: -/* 8024B5F4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B5F8 7C 08 02 A6 */ mflr r0 -/* 8024B5FC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B600 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B604 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B608 38 63 09 78 */ addi r3, r3, 0x978 -/* 8024B60C A0 84 00 04 */ lhz r4, 4(r4) -/* 8024B610 4B DE 95 D9 */ bl isSwitch__12dSv_danBit_cCFi -/* 8024B614 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B618 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B61C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B620 7C 08 03 A6 */ mtlr r0 -/* 8024B624 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B628 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 3561d75d19..0000000000 --- a/asm/d/msg/d_msg_flow/query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,15 +0,0 @@ -lbl_8024B62C: -/* 8024B62C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B630 7C 08 02 A6 */ mflr r0 -/* 8024B634 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B638 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024B63C 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024B640 38 63 09 78 */ addi r3, r3, 0x978 -/* 8024B644 A0 84 00 04 */ lhz r4, 4(r4) -/* 8024B648 4B DE 96 2D */ bl isItem__12dSv_danBit_cCFi -/* 8024B64C 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B650 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B654 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B658 7C 08 03 A6 */ mtlr r0 -/* 8024B65C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B660 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 74f95d109c..0000000000 --- a/asm/d/msg/d_msg_flow/query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024B664: -/* 8024B664 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B668 7C 08 02 A6 */ mflr r0 -/* 8024B66C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B670 A0 64 00 04 */ lhz r3, 4(r4) -/* 8024B674 38 80 FF FF */ li r4, -1 -/* 8024B678 28 05 00 00 */ cmplwi r5, 0 -/* 8024B67C 41 82 00 10 */ beq lbl_8024B68C -/* 8024B680 88 05 04 E2 */ lbz r0, 0x4e2(r5) -/* 8024B684 7C 00 07 74 */ extsb r0, r0 -/* 8024B688 7C 04 03 78 */ mr r4, r0 -lbl_8024B68C: -/* 8024B68C 4B DE 23 A5 */ bl dComIfGs_isZoneSwitch__Fii -/* 8024B690 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B694 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B698 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B69C 7C 08 03 A6 */ mtlr r0 -/* 8024B6A0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B6A4 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 70bd97859a..0000000000 --- a/asm/d/msg/d_msg_flow/query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024B6A8: -/* 8024B6A8 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B6AC 7C 08 02 A6 */ mflr r0 -/* 8024B6B0 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B6B4 A0 64 00 04 */ lhz r3, 4(r4) -/* 8024B6B8 38 80 FF FF */ li r4, -1 -/* 8024B6BC 28 05 00 00 */ cmplwi r5, 0 -/* 8024B6C0 41 82 00 10 */ beq lbl_8024B6D0 -/* 8024B6C4 88 05 04 E2 */ lbz r0, 0x4e2(r5) -/* 8024B6C8 7C 00 07 74 */ extsb r0, r0 -/* 8024B6CC 7C 04 03 78 */ mr r4, r0 -lbl_8024B6D0: -/* 8024B6D0 4B DE 25 01 */ bl dComIfGs_isZoneItem__Fii -/* 8024B6D4 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B6D8 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B6DC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B6E0 7C 08 03 A6 */ mtlr r0 -/* 8024B6E4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B6E8 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 1d9b55b59b..0000000000 --- a/asm/d/msg/d_msg_flow/query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024B6EC: -/* 8024B6EC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B6F0 7C 08 02 A6 */ mflr r0 -/* 8024B6F4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B6F8 A0 64 00 04 */ lhz r3, 4(r4) -/* 8024B6FC 38 80 FF FF */ li r4, -1 -/* 8024B700 28 05 00 00 */ cmplwi r5, 0 -/* 8024B704 41 82 00 10 */ beq lbl_8024B714 -/* 8024B708 88 05 04 E2 */ lbz r0, 0x4e2(r5) -/* 8024B70C 7C 00 07 74 */ extsb r0, r0 -/* 8024B710 7C 04 03 78 */ mr r4, r0 -lbl_8024B714: -/* 8024B714 4B DE 24 51 */ bl dComIfGs_isOneZoneSwitch__Fii -/* 8024B718 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B71C 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B720 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B724 7C 08 03 A6 */ mtlr r0 -/* 8024B728 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B72C 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 5dba25b3b2..0000000000 --- a/asm/d/msg/d_msg_flow/query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,19 +0,0 @@ -lbl_8024B730: -/* 8024B730 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8024B734 7C 08 02 A6 */ mflr r0 -/* 8024B738 90 01 00 14 */ stw r0, 0x14(r1) -/* 8024B73C A0 64 00 04 */ lhz r3, 4(r4) -/* 8024B740 38 80 FF FF */ li r4, -1 -/* 8024B744 28 05 00 00 */ cmplwi r5, 0 -/* 8024B748 41 82 00 10 */ beq lbl_8024B758 -/* 8024B74C 88 05 04 E2 */ lbz r0, 0x4e2(r5) -/* 8024B750 7C 00 07 74 */ extsb r0, r0 -/* 8024B754 7C 04 03 78 */ mr r4, r0 -lbl_8024B758: -/* 8024B758 4B DE 24 E5 */ bl dComIfGs_isOneZoneItem__Fii -/* 8024B75C 7C 60 00 34 */ cntlzw r0, r3 -/* 8024B760 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 8024B764 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8024B768 7C 08 03 A6 */ mtlr r0 -/* 8024B76C 38 21 00 10 */ addi r1, r1, 0x10 -/* 8024B770 4E 80 00 20 */ blr diff --git a/asm/d/msg/d_msg_flow/query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s b/asm/d/msg/d_msg_flow/query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s deleted file mode 100644 index 1ac5247fb3..0000000000 --- a/asm/d/msg/d_msg_flow/query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s +++ /dev/null @@ -1,29 +0,0 @@ -lbl_8024C2A0: -/* 8024C2A0 3C 60 80 40 */ lis r3, g_dComIfG_gameInfo@ha /* 0x804061C0@ha */ -/* 8024C2A4 38 63 61 C0 */ addi r3, r3, g_dComIfG_gameInfo@l /* 0x804061C0@l */ -/* 8024C2A8 88 03 01 0C */ lbz r0, 0x10c(r3) -/* 8024C2AC 28 00 00 00 */ cmplwi r0, 0 -/* 8024C2B0 40 82 00 0C */ bne lbl_8024C2BC -/* 8024C2B4 38 00 00 00 */ li r0, 0 -/* 8024C2B8 48 00 00 3C */ b lbl_8024C2F4 -lbl_8024C2BC: -/* 8024C2BC 54 00 06 3E */ clrlwi r0, r0, 0x18 -/* 8024C2C0 28 00 00 13 */ cmplwi r0, 0x13 -/* 8024C2C4 41 81 00 0C */ bgt lbl_8024C2D0 -/* 8024C2C8 38 00 00 01 */ li r0, 1 -/* 8024C2CC 48 00 00 28 */ b lbl_8024C2F4 -lbl_8024C2D0: -/* 8024C2D0 28 00 00 27 */ cmplwi r0, 0x27 -/* 8024C2D4 41 81 00 0C */ bgt lbl_8024C2E0 -/* 8024C2D8 38 00 00 02 */ li r0, 2 -/* 8024C2DC 48 00 00 18 */ b lbl_8024C2F4 -lbl_8024C2E0: -/* 8024C2E0 28 00 00 3B */ cmplwi r0, 0x3b -/* 8024C2E4 41 81 00 0C */ bgt lbl_8024C2F0 -/* 8024C2E8 38 00 00 03 */ li r0, 3 -/* 8024C2EC 48 00 00 08 */ b lbl_8024C2F4 -lbl_8024C2F0: -/* 8024C2F0 38 00 00 04 */ li r0, 4 -lbl_8024C2F4: -/* 8024C2F4 54 03 06 3E */ clrlwi r3, r0, 0x18 -/* 8024C2F8 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/__dt__12daTagMstop_cFv.s b/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/__dt__12daTagMstop_cFv.s deleted file mode 100644 index b2f154d463..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/__dt__12daTagMstop_cFv.s +++ /dev/null @@ -1,27 +0,0 @@ -lbl_805A6338: -/* 805A6338 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A633C 7C 08 02 A6 */ mflr r0 -/* 805A6340 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A6344 93 E1 00 0C */ stw r31, 0xc(r1) -/* 805A6348 93 C1 00 08 */ stw r30, 8(r1) -/* 805A634C 7C 7E 1B 79 */ or. r30, r3, r3 -/* 805A6350 7C 9F 23 78 */ mr r31, r4 -/* 805A6354 41 82 00 2C */ beq lbl_805A6380 -/* 805A6358 38 7E 05 74 */ addi r3, r30, 0x574 -/* 805A635C 38 80 FF FF */ li r4, -1 -/* 805A6360 4B CA 3B E9 */ bl __dt__10dMsgFlow_cFv -/* 805A6364 7F C3 F3 78 */ mr r3, r30 -/* 805A6368 38 80 00 00 */ li r4, 0 -/* 805A636C 4B A7 29 21 */ bl __dt__10fopAc_ac_cFv -/* 805A6370 7F E0 07 35 */ extsh. r0, r31 -/* 805A6374 40 81 00 0C */ ble lbl_805A6380 -/* 805A6378 7F C3 F3 78 */ mr r3, r30 -/* 805A637C 4B D2 89 C1 */ bl __dl__FPv -lbl_805A6380: -/* 805A6380 7F C3 F3 78 */ mr r3, r30 -/* 805A6384 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 805A6388 83 C1 00 08 */ lwz r30, 8(r1) -/* 805A638C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A6390 7C 08 03 A6 */ mtlr r0 -/* 805A6394 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A6398 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Create__FP10fopAc_ac_c.s b/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Create__FP10fopAc_ac_c.s deleted file mode 100644 index 191dc4ed4d..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Create__FP10fopAc_ac_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A6318: -/* 805A6318 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A631C 7C 08 02 A6 */ mflr r0 -/* 805A6320 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A6324 4B FF FE 15 */ bl create__12daTagMstop_cFv -/* 805A6328 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A632C 7C 08 03 A6 */ mtlr r0 -/* 805A6330 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A6334 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Delete__FP12daTagMstop_c.s b/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Delete__FP12daTagMstop_c.s deleted file mode 100644 index e698a96f0c..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Delete__FP12daTagMstop_c.s +++ /dev/null @@ -1,11 +0,0 @@ -lbl_805A639C: -/* 805A639C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A63A0 7C 08 02 A6 */ mflr r0 -/* 805A63A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A63A8 38 80 FF FF */ li r4, -1 -/* 805A63AC 4B FF FF 8D */ bl __dt__12daTagMstop_cFv -/* 805A63B0 38 60 00 01 */ li r3, 1 -/* 805A63B4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A63B8 7C 08 03 A6 */ mtlr r0 -/* 805A63BC 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A63C0 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Execute__FP12daTagMstop_c.s b/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Execute__FP12daTagMstop_c.s deleted file mode 100644 index b012d4a746..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Execute__FP12daTagMstop_c.s +++ /dev/null @@ -1,9 +0,0 @@ -lbl_805A693C: -/* 805A693C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A6940 7C 08 02 A6 */ mflr r0 -/* 805A6944 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A6948 4B FF FA B1 */ bl execute__12daTagMstop_cFv -/* 805A694C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A6950 7C 08 03 A6 */ mtlr r0 -/* 805A6954 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A6958 4E 80 00 20 */ blr diff --git a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/eventOrder__12daTagMstop_cFv.s b/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/eventOrder__12daTagMstop_cFv.s deleted file mode 100644 index d1b3761579..0000000000 --- a/asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/eventOrder__12daTagMstop_cFv.s +++ /dev/null @@ -1,14 +0,0 @@ -lbl_805A63C4: -/* 805A63C4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 805A63C8 7C 08 02 A6 */ mflr r0 -/* 805A63CC 90 01 00 14 */ stw r0, 0x14(r1) -/* 805A63D0 A0 03 00 FA */ lhz r0, 0xfa(r3) -/* 805A63D4 60 00 00 01 */ ori r0, r0, 1 -/* 805A63D8 B0 03 00 FA */ sth r0, 0xfa(r3) -/* 805A63DC 38 80 00 00 */ li r4, 0 -/* 805A63E0 38 A0 00 00 */ li r5, 0 -/* 805A63E4 4B A7 4D B9 */ bl fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs -/* 805A63E8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 805A63EC 7C 08 03 A6 */ mtlr r0 -/* 805A63F0 38 21 00 10 */ addi r1, r1, 0x10 -/* 805A63F4 4E 80 00 20 */ blr diff --git a/include/d/a/d_a_alink.h b/include/d/a/d_a_alink.h index 1199671694..778ff90eb3 100644 --- a/include/d/a/d_a_alink.h +++ b/include/d/a/d_a_alink.h @@ -6260,6 +6260,7 @@ public: enum daMidna_FLG1 { FLG1_FORCE_NORMAL_COL = 8, FLG1_FORCE_TIRED_COL = 4, + FLG1_SHADOW_MODEL_DRAW_DEMO_FORCE = 2, }; enum daMidna_ANM {}; @@ -6327,6 +6328,48 @@ public: BOOL checkNoDraw() const { return checkStateFlg0(FLG0_NO_DRAW); } BOOL checkNoInput() const { return checkStateFlg0(FLG0_NO_INPUT); } int checkMetamorphoseEnable() { return (this->*mpFunc)(); } + int checkShadowModelDrawDemoForce() const { return checkStateFlg1(FLG1_SHADOW_MODEL_DRAW_DEMO_FORCE); } + + bool checkShadowModelDrawSmode() const { + if (field_0x84e != 3 && field_0x84e != 4) { + if (field_0x84e == 2) { + return false; + } else { + return true; + } + } + } + + int checkShadowModelDraw() const { + int ret = 0; + + if (checkShadowModelDrawDemoForce() == 0) { + if (checkShadowModelDrawSmode() != 0) { + ret = 0; + } + } + + return ret; + } + + int checkShadowReturnEnd() const { + if (field_0x5e4[0].getIdx() == 0x21c && !field_0x578->isStop()) { + return 1; + } + + return 0; + } + + int checkShadowModeTalkWait() const { + if (mDemoType != 2 && mDemoType != 1) { + return 0; + } + + return 1; + } + + void setShadowReturn() { mDemoType = 4; } + bool checkPortalObjRide() const { return checkStateFlg0(FLG0_UNK_8000000) && checkStateFlg0(FLG0_UNK_200); @@ -6342,7 +6385,7 @@ private: /* 0x0570 */ J3DModel* field_0x570; /* 0x0574 */ J3DModel* field_0x574; /* 0x0578 */ mDoExt_McaMorfSO* field_0x578; - /* 0x057C */ mDoExt_McaMorfCallBack1_c* field_0x57c; + /* 0x057C */ mDoExt_McaMorfCallBack1_c* field_0x57c; // this is really daMidna_McaMorfCB1_c. fix later /* 0x0580 */ cXyz* field_0x580; /* 0x0584 */ mDoExt_bckAnm field_0x584; /* 0x05A0 */ mDoExt_bckAnm field_0x5a0; @@ -6395,7 +6438,7 @@ private: /* 0x06DC */ mDoExt_bckAnm* mpDemoHDTmpBck; /* 0x06E0 */ J3DGXColorS10 field_0x6e0; /* 0x06E8 */ J3DGXColor field_0x6e8; - /* 0x06EC */ u8 field_0x6ec; + /* 0x06EC */ u8 field_0x6ec; // this is probably J3DGXColor. fix later /* 0x06ED */ u8 field_0x6ed; /* 0x06EE */ u8 field_0x6ee; /* 0x06EF */ u8 field_0x6ef; @@ -6414,7 +6457,7 @@ private: /* 0x085A */ s16 field_0x85a; /* 0x085C */ u8 field_0x85c[0x22]; /* 0x087E */ s16 field_0x87e; - /* 0x0880 */ u8 field_0x880[0xC]; + /* 0x0880 */ u8 field_0x880[0xC]; // csXyz in here, fix later /* 0x088C */ int mStaffID; /* 0x0890 */ u32 mStateFlg0; /* 0x0894 */ u32 mStateFlg1; @@ -6426,7 +6469,7 @@ private: /* 0x08CC */ u8 field_0x8cc[0x14]; /* 0x08E0 */ cXyz field_0x8e0[5]; /* 0x091C */ cXyz field_0x91c[5]; - /* 0x0958 */ u8 field_0x958[0xC]; + /* 0x0958 */ u8 field_0x958[0xC]; // cXyz here, fix later /* 0x0964 */ cXyz field_0x964[5]; /* 0x09A0 */ u8 field_0x9a0[0x14]; /* 0x09C4 */ cXyz field_0x9c4; diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 3cafc4240c..3a19fc9d30 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -160,6 +160,10 @@ public: s16 getMoveAngle() const { return mDemoMoveAngle; } f32 getStick() { return mStick; } int getParam0() const { return mParam0; } + void setParam0(int value) { mParam0 = value;} + void setParam1(int value) { mParam1 = value;} + void setParam2(int value) { mParam2 = value;} + void setPos0(const cXyz* pos) { mDemoPos0 = *pos;} private: /* 0x00 */ u16 mDemoType; @@ -761,6 +765,20 @@ public: u32 i_checkBoarSingleBattle() const { return i_checkNoResetFlg2(FLG2_BOAR_SINGLE_BATTLE); } + void i_changeOriginalDemo() { + mDemo.setOriginalDemoType(); + mDemo.setParam0(0); + } + + void i_changeDemoMode(u32 i_demoMode,int i_param0,int i_param1,s16 i_param2) { + mDemo.setDemoMode(i_demoMode); + mDemo.setParam0(i_param0); + mDemo.setParam1(i_param1); + mDemo.setParam2(i_param2); + } + + void i_changeDemoPos0(const cXyz* i_posP) { mDemo.setPos0(i_posP); } + inline static u32 i_getLastSceneMode(); inline static u32 getLastSceneMode(); inline static bool checkWoodSwordEquip(); diff --git a/include/d/com/d_com_inf_actor.h b/include/d/com/d_com_inf_actor.h index ca9321197f..25860fd43c 100644 --- a/include/d/com/d_com_inf_actor.h +++ b/include/d/com/d_com_inf_actor.h @@ -3,12 +3,18 @@ #include "dolphin/types.h" +class dComIfGoat_info_c { +public: + /* 0x0 */ int field_0x0; +}; + class dComIfAc_info_c { public: /* 0x0 */ int field_0x0; /* 0x4 */ bool mPause; }; +extern dComIfGoat_info_c g_dComIfGoat_gameInfo; extern dComIfAc_info_c g_dComIfAc_gameInfo; inline bool dComIfA_PauseCheck() { diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h index 52f2870120..abe20294b6 100644 --- a/include/d/com/d_com_inf_game.h +++ b/include/d/com/d_com_inf_game.h @@ -815,6 +815,9 @@ const char* dComIfGs_getWarpStageName(); s16 dComIfGs_getWarpPlayerAngleY(); s8 dComIfGs_getWarpRoomNo(); BOOL dComIfGs_isOneZoneSwitch(int i_swBit, int i_roomNo); +BOOL dComIfGs_isOneZoneItem(int i_swBit, int i_roomNo); +BOOL dComIfGs_isZoneSwitch(int,int); +BOOL dComIfGs_isZoneItem(int,int); void dComIfGs_setLastWarpMarkItemData(const char* stage, cXyz pos, s16 angle, s8 roomNo, u8, u8); u16 dComIfGs_getMaxLifeGauge(); void dComIfGs_setWarpMarkFlag(u8); @@ -1129,6 +1132,10 @@ inline BOOL dComIfGs_isTbox(int i_no) { return g_dComIfG_gameInfo.info.getMemory().getBit().isTbox(i_no); } +inline BOOL dComIfGs_isSaveItem(int i_no) { + return g_dComIfG_gameInfo.info.getMemory().getBit().isItem(i_no); +} + inline BOOL dComIfGs_isSaveTbox(int i_stageNo, int i_no) { return g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().isTbox(i_no); } @@ -1137,6 +1144,10 @@ inline BOOL dComIfGs_isSaveDunSwitch(int i_no) { return g_dComIfG_gameInfo.info.getDan().isSwitch(i_no); } +inline BOOL dComIfGs_isSaveDunItem(int i_no) { + return g_dComIfG_gameInfo.info.getDan().isItem(i_no); +} + inline void dComIfGs_onSaveSwitch(int i_stageNo, int i_no) { g_dComIfG_gameInfo.info.getSavedata().getSave(i_stageNo).getBit().onSwitch(i_no); } diff --git a/include/d/d_error_msg.h b/include/d/d_error_msg.h index 5aca3c39b5..6ce99acf76 100644 --- a/include/d/d_error_msg.h +++ b/include/d/d_error_msg.h @@ -1,6 +1,21 @@ #ifndef D_D_ERROR_MSG_H #define D_D_ERROR_MSG_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" + +struct dShutdownErrorMsg_c { + /* 8009D790 */ static bool execute(); +}; + +struct dDvdErrorMsg_c { + /* 8009D194 */ void draw(s32); + /* 8009D354 */ static u8 execute(); +}; + +struct J2DOrthoGraph { + /* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32); + /* 802E97B4 */ void setPort(); + /* 802E980C */ void setOrtho(JGeometry::TBox2 const&, f32, f32); +}; #endif /* D_D_ERROR_MSG_H */ diff --git a/include/d/event/d_event.h b/include/d/event/d_event.h index b41de22e21..cc024e776b 100644 --- a/include/d/event/d_event.h +++ b/include/d/event/d_event.h @@ -8,6 +8,40 @@ #include "d/save/d_save.h" #include "dolphin/types.h" +#if DEBUG +class dEvDb_bit_c { +public: + /* 0x00 */ char* mFlagName; + /* 0x04 */ char* mFlagDescription; + /* 0x08 */ char* mFlagAuthor; + /* 0x0C */ u16 mFlagValue; + /* 0x10 */ char* mArea; // Area in the game where flag is used + /* 0x14 */ u8 field_0x14; + /* 0x15 */ u8 field_0x15; +}; + +class dEvDb_reg_c { +public: + /* 0x00 */ char* mFlagName; + /* 0x04 */ char* mFlagDescription; + /* 0x08 */ char* mFlagAuthor; + /* 0x0C */ u16 mFlagValue; + /* 0x10 */ char* mArea; // Area in the game where flag is used + /* 0x14 */ u8 field_0x14; + /* 0x15 */ u8 field_0x15; +}; + +class dEvDb_flag_base_c { +public: + /* 0x00 */ dEvDb_bit_c* mBitTable; + /* 0x04 */ dEvDb_reg_c* mRegTable; + /* 0x08 */ int mBitNum; + /* 0x0C */ int mRegNum; + /* 0x10 */ field_0x10; + /* 0x14 */ field_0x14; +} +#endif + class dEvt_order_c { public: ~dEvt_order_c() {} diff --git a/include/d/menu/d_menu_save.h b/include/d/menu/d_menu_save.h index 324e43473c..201cb0a27b 100644 --- a/include/d/menu/d_menu_save.h +++ b/include/d/menu/d_menu_save.h @@ -6,6 +6,7 @@ #include "d/d_select_cursor.h" #include "dolphin/types.h" #include "m_Do/m_Do_dvd_thread.h" +#include "d/save/d_save.h" class dMsgString_c; class dFile_warning_c; @@ -368,7 +369,7 @@ private: /* 0x01BF */ u8 field_0x1bf; /* 0x01C0 */ u8 field_0x1c0; /* 0x01CC */ void (dMenu_save_c::*mpErrFunc)(); - /* 0x01D0 */ u8 mSaveBuffer[0xA94 * 3]; + /* 0x01D0 */ u8 mSaveBuffer[QUEST_LOG_SIZE * 3]; /* 0x218C */ dMsgScrnExplain_c* mpScrnExplain; /* 0x2190 */ u8 field_0x2190; /* 0x2192 */ u16 field_0x2192; diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h index 8071645b43..b008503a7a 100644 --- a/include/d/save/d_save.h +++ b/include/d/save/d_save.h @@ -24,6 +24,7 @@ #define SWITCH_ONE_ZONE_MAX 0x10 #define ITEM_ZONE_MAX 0x20 #define ITEM_ONE_ZONE_MAX 0x10 +#define QUEST_LOG_SIZE 0xA94 enum Wallets { /* 0x0 */ WALLET, @@ -1134,11 +1135,19 @@ private: class dSv_event_flag_c { public: + enum { + #include "d/save/d_save_bit_labels.inc" + }; + static u16 saveBitLabels[822]; }; class dSv_event_tmp_flag_c { public: + enum { + #include "d/save/d_save_temp_bit_labels.inc" + }; + static u16 const tempBitLabels[185]; }; diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index e71a40de48..ccc70027ab 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -577,6 +577,11 @@ inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) i_mDoAud_seStartLevel(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo)); } +inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) { + s8 roomNo = fopAcM_GetRoomNo(actor); + i_mDoAud_seStartLevel(sfxID, &actor->current.pos, param_2, dComIfGp_getReverb(roomNo)); +} + extern "C" { void fopAcM_initManager__Fv(void); void fopAcM_CreateAppend__Fv(void); diff --git a/include/f_op/f_op_scene.h b/include/f_op/f_op_scene.h index d884b7bf84..ee1e7ae5c9 100644 --- a/include/f_op/f_op_scene.h +++ b/include/f_op/f_op_scene.h @@ -14,6 +14,7 @@ class mDoDvdThd_command_c; typedef struct scene_process_profile_definition { /* 0x00 */ node_process_profile_definition mBase; /* 0x20 */ process_method_class* mpMtd; // Subclass methods + /* 0x24 */ u32 field_0x24; // padding? } scene_process_profile_definition; class scene_class { @@ -23,4 +24,6 @@ public: /* 0x1B0 */ scene_tag_class mScnTg; }; +extern leafdraw_method_class g_fopScn_Method; + #endif diff --git a/include/f_pc/f_pc_base.h b/include/f_pc/f_pc_base.h index baed3a5d7a..e8719e83f0 100644 --- a/include/f_pc/f_pc_base.h +++ b/include/f_pc/f_pc_base.h @@ -35,7 +35,7 @@ typedef struct base_process_class { /* 0xB4 */ u32 mSubType; } base_process_class; // Size: 0xB8 -BOOL fpcBs_Is_JustOfType(int pType1, int pType2); +s32 fpcBs_Is_JustOfType(int pType1, int pType2); s32 fpcBs_MakeOfType(int* pType); s32 fpcBs_MakeOfId(void); s32 fpcBs_Execute(base_process_class* pProc); diff --git a/include/f_pc/f_pc_node.h b/include/f_pc/f_pc_node.h index 0043e7c4f7..fa92560fd6 100644 --- a/include/f_pc/f_pc_node.h +++ b/include/f_pc/f_pc_node.h @@ -34,5 +34,6 @@ s32 fpcNd_Delete(process_node_class* pProcNode); s32 fpcNd_Create(process_node_class* pProcNode); extern int g_fpcNd_type; +extern nodedraw_method_class g_fpcNd_Method; #endif diff --git a/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h b/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h index 5438f673a5..cfbec1a9ce 100644 --- a/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h +++ b/include/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h @@ -4,13 +4,14 @@ #include "dolphin/types.h" #include "f_op/f_op_actor.h" #include "d/msg/d_msg_flow.h" +#include "d/com/d_com_inf_game.h" class daTagMstop_c : public fopAc_ac_c { public: - /* 805A6138 */ void create(); + /* 805A6138 */ int create(); /* 805A6338 */ ~daTagMstop_c(); /* 805A63C4 */ void eventOrder(); - /* 805A63F8 */ void execute(); + /* 805A63F8 */ int execute(); bool checkNoAttention() const { return field_0x56b == 0xFF; } private: @@ -24,8 +25,8 @@ private: /* 0x570 */ u16 field_0x570; /* 0x572 */ u16 field_0x572; /* 0x574 */ dMsgFlow_c mMsgFlow; - /* 0x5C0 */ f32 field_0x5cc; - /* 0x5C4 */ f32 field_0x5d0; + /* 0x5C0 */ f32 field_0x5c0; + /* 0x5C4 */ f32 field_0x5c4; /* 0x5C8 */ cXyz field_0x5c8; }; diff --git a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp index b379d2c5dd..ed664aac8a 100644 --- a/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp +++ b/rel/d/a/kytag/d_a_kytag06/d_a_kytag06.cpp @@ -805,13 +805,13 @@ static void daKytag06_type_09_Execute(kytag06_class* i_this) { */ static void daKytag06_type_10_Execute(kytag06_class* i_this) { u8 tmp = 0; - if (i_dComIfGs_isEventBit(0x2008)) { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::F_0266)) { // 2008: Snowpeak Ruins completed tmp = 0; - } else if (i_dComIfGs_isEventBit(0x1420)) { + } else if (i_dComIfGs_isEventBit(dSv_event_flag_c::F_0065)) { // 1420: Talked to Yeta after giving cheese tmp = 2; - } else if (i_dComIfGs_isEventBit(0x1440)) { + } else if (i_dComIfGs_isEventBit(dSv_event_flag_c::F_0064)) { // 1440: Talked to Yeta after giving pumpkin tmp = 1; } @@ -946,7 +946,7 @@ static void daKytag06_type_03_Execute(kytag06_class* i_this) { switch (i_this->mMode) { case 0: // 0C01: Midna's Desperate Hour started 1E08: Midna's Desperate Hour Completed - if (i_dComIfGs_isEventBit(0x0C01) && !i_dComIfGs_isEventBit(0x1E08)) { + if (i_dComIfGs_isEventBit(dSv_event_flag_c::M_071) && !i_dComIfGs_isEventBit(dSv_event_flag_c::F_0250)) { i_this->mMode = 1; i_this->field_0x578 = 450; dKy_change_colpat(i_this->field_0x591); diff --git a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp index ee79c00fdc..ff99a4ca1a 100644 --- a/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp +++ b/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.cpp @@ -1,37 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: d_a_tag_mstop -// +/** + * d_a_tag_mstop.cpp + * Tag - Midna Stop + */ #include "rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h" +#include "d/a/d_a_npc.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct daPy_py_c { - static u8 m_midnaActor[4]; -}; - -struct dSv_info_c { - /* 80035360 */ void isSwitch(int, int) const; -}; - -struct dSv_event_flag_c { - static u8 saveBitLabels[1644 + 4 /* padding */]; -}; - -struct dSv_event_c { - /* 800349BC */ void isEventBit(u16) const; -}; - -struct dEvt_control_c { - /* 80042468 */ void reset(); - /* 80042518 */ void reset(void*); -}; - // // Forward References: // @@ -44,7 +20,6 @@ extern "C" void eventOrder__12daTagMstop_cFv(); extern "C" void execute__12daTagMstop_cFv(); extern "C" static void daTagMstop_Execute__FP12daTagMstop_c(); extern "C" static bool daTagMstop_Draw__FP12daTagMstop_c(); -extern "C" extern void* g_profile_Tag_Mstop[12]; // // External References: @@ -77,7 +52,6 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; extern "C" u8 m_midnaActor__9daPy_py_c[4]; extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; @@ -95,56 +69,98 @@ SECTION_RODATA static f32 const lit_3864 = 100.0f; COMPILER_STRIP_GATE(0x805A6970, &lit_3864); /* 805A6138-805A6318 000078 01E0+00 1/1 0/0 0/0 .text create__12daTagMstop_cFv */ +#ifdef NONMATCHING +// matches with literals +int daTagMstop_c::create() { + if (!fopAcM_CheckCondition(this, 8)) { + new (this) daTagMstop_c(); + fopAcM_OnCondition(this, 8); + } + + field_0x56b = fopAcM_GetParam(this) >> 16; + field_0x56a = (fopAcM_GetParam(this) >> 24) & 0xF; + + if (field_0x56a == 1 || field_0x56a == 2) { + field_0x56c = 1; + + if (field_0x56a == 2) { + field_0x56a = 0; + } + + } else { + field_0x56c = 0; + } + + if ((fopAcM_GetParam(this) >> 28) & 1) { + field_0x568 = 0xFF; + mSwitch = 0xFF; + field_0x570 = shape_angle.x; + field_0x572 = shape_angle.y; + } else { + field_0x568 = shape_angle.x; + mSwitch = (shape_angle.x >> 8) & 0xFF; // matches but may not be right + field_0x570 = 0xFFFF; + field_0x572 = 0xFFFF; + } + + f32 tmp = mScale.x; + tmp *= 10000.0f * mScale.x; + + field_0x5c0 = tmp; + field_0x5c4 = current.pos.y + mScale.y * 100.0f; + + csXyz pos_angle; + + daNpcF_getPlayerInfoFromPlayerList(fopAcM_GetParam(this) & 0xFFFF, fopAcM_GetRoomNo(this), + field_0x5c8, pos_angle); + + u8 idx = field_0x56b; + + if (!checkNoAttention()) { + s32 room = fopAcM_GetRoomNo(this); + cXyz* pos = &dComIfGp_getRoomArrow(room) + ->mEntries[dComIfGp_getRoomCamera(room)->field_0x4[idx].field_0x10] + .mPosition; + + mEyePos.set(pos->x, pos->y, pos->z); + mAttentionInfo.mPosition = mEyePos; + } + + shape_angle.y = fopAcM_searchPlayerAngleY(this); + return cPhs_COMPLEATE_e; +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daTagMstop_c::create() { +asm int daTagMstop_c::create() { nofralloc #include "asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/create__12daTagMstop_cFv.s" } #pragma pop +#endif /* 805A6318-805A6338 000258 0020+00 1/0 0/0 0/0 .text daTagMstop_Create__FP10fopAc_ac_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagMstop_Create(fopAc_ac_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Create__FP10fopAc_ac_c.s" +static int daTagMstop_Create(fopAc_ac_c* i_this) { + return static_cast(i_this)->create(); } -#pragma pop /* 805A6338-805A639C 000278 0064+00 1/1 0/0 0/0 .text __dt__12daTagMstop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm daTagMstop_c::~daTagMstop_c() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/__dt__12daTagMstop_cFv.s" -} -#pragma pop +daTagMstop_c::~daTagMstop_c() {} /* 805A639C-805A63C4 0002DC 0028+00 1/0 0/0 0/0 .text daTagMstop_Delete__FP12daTagMstop_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagMstop_Delete(daTagMstop_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Delete__FP12daTagMstop_c.s" +static int daTagMstop_Delete(daTagMstop_c* i_this) { + i_this->~daTagMstop_c(); + return 1; } -#pragma pop /* 805A63C4-805A63F8 000304 0034+00 1/1 0/0 0/0 .text eventOrder__12daTagMstop_cFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void daTagMstop_c::eventOrder() { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/eventOrder__12daTagMstop_cFv.s" +void daTagMstop_c::eventOrder() { + mEvtInfo.i_onCondition(1); + fopAcM_orderSpeakEvent(this, 0, 0); } -#pragma pop /* ############################################################################################## */ /* 805A6974-805A6978 000008 0004+00 0/1 0/0 0/0 .rodata @4056 */ @@ -181,50 +197,139 @@ COMPILER_STRIP_GATE(0x805A6980, &lit_4059); #pragma pop /* 805A63F8-805A693C 000338 0544+00 1/1 0/0 0/0 .text execute__12daTagMstop_cFv */ +#ifdef NONMATCHING +// inline function nightmare +int daTagMstop_c::execute() { + if (field_0x56c) { + fopAcM_seStartCurrentLevel(this, Z2SE_OBJ_DARK_GATE, 0); + } + + daMidna_c* midna = daPy_py_c::getMidnaActor(); + + if (!midna) { + return 1; + } else { + daAlink_c* link = (daAlink_c*)daPy_getLinkPlayerActorClass(); + + if (checkNoAttention()) { + mAttentionInfo.mPosition = midna->mAttentionInfo.mPosition; + shape_angle.y = midna->shape_angle.y; + mEyePos = midna->mAttentionInfo.mPosition; + + } else { + shape_angle.y = fopAcM_searchPlayerAngleY(this); + } + + if (field_0x56e == 4) { + if (field_0x5c8.abs2(link->current.pos) < 2500.0f) { + i_dComIfGp_event_reset(); + link->i_cancelOriginalDemo(); + field_0x56e = 0; + } + } else if (field_0x56e == 3) { + if (link->checkHorseRide()) { + link->setPlayerPosAndAngle(&field_0x5c8, link->shape_angle.y, 0); + i_dComIfGp_event_reset(); + field_0x56e = 0; + } else { + field_0x56e = 4; + link->i_changeOriginalDemo(); + + field_0x56a == 0 ? link->i_changeDemoMode(3, 0, 0, 0) : + link->i_changeDemoMode(2, 0, 0, 0); + link->i_changeDemoPos0(&field_0x5c8); + } + } else if (mEvtInfo.checkCommandTalk()) { + if (field_0x56e == 2) { + int shadowmode = midna->checkShadowModelDraw(); + if (midna->checkShadowReturnEnd()) { + i_dComIfGp_getEvent().reset(this); + fopAcM_orderPotentialEvent(this, 0x400, 0x14f, 1); + field_0x56e = 3; + } else if (shadowmode == 0) { + return 1; + } + } + } else if (mSwitch != 0xFF || i_fopAcM_isSwitch(this, mSwitch) && field_0x572 == -1 || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x572])) + { + fopAcM_delete(this); + + } else if (field_0x568 == 0xFF || + i_fopAcM_isSwitch(this, field_0x568) && field_0x570 == -1 || + dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[field_0x572]) && + current.pos.y <= link->current.pos.y && link->current.pos.y <= field_0x5c4 && + fopAcM_searchPlayerDistanceXZ2(this) < field_0x5c0) + { + eventOrder(); + + } else { + if (midna->checkShadowModeTalkWait()) { + if (field_0x56e == 0) { + mMsgFlow.init(this, shape_angle.z, 0, 0); + mDoAud_seStart(16, 0, 0, 0); + field_0x56e = 1; + } else { + if (mMsgFlow.doFlow(this, 0, 0)) { + field_0x56e = 2; + mDoAud_seStart(17, 0, 0, 0); + + if (midna->checkShadowModelDraw()) { + midna->setShadowReturn(); + } + } + } + } + } + } +} +#else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void daTagMstop_c::execute() { +asm int daTagMstop_c::execute() { nofralloc #include "asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/execute__12daTagMstop_cFv.s" } #pragma pop +#endif /* 805A693C-805A695C 00087C 0020+00 1/0 0/0 0/0 .text daTagMstop_Execute__FP12daTagMstop_c */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -static asm void daTagMstop_Execute(daTagMstop_c* param_0) { - nofralloc -#include "asm/rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop/daTagMstop_Execute__FP12daTagMstop_c.s" +static int daTagMstop_Execute(daTagMstop_c* i_this) { + return i_this->execute(); } -#pragma pop /* 805A695C-805A6964 00089C 0008+00 1/0 0/0 0/0 .text daTagMstop_Draw__FP12daTagMstop_c */ -static bool daTagMstop_Draw(daTagMstop_c* param_0) { - return true; +static int daTagMstop_Draw(daTagMstop_c* i_this) { + return 1; } /* ############################################################################################## */ /* 805A6984-805A69A4 -00001 0020+00 1/0 0/0 0/0 .data l_daTagMstop_Method */ -SECTION_DATA static void* l_daTagMstop_Method[8] = { - (void*)daTagMstop_Create__FP10fopAc_ac_c, - (void*)daTagMstop_Delete__FP12daTagMstop_c, - (void*)daTagMstop_Execute__FP12daTagMstop_c, - (void*)NULL, - (void*)daTagMstop_Draw__FP12daTagMstop_c, - (void*)NULL, - (void*)NULL, - (void*)NULL, -}; +static actor_method_class l_daTagMstop_Method = { + (process_method_func)daTagMstop_Create, (process_method_func)daTagMstop_Delete, + (process_method_func)daTagMstop_Execute, NULL, (process_method_func)daTagMstop_Draw}; /* 805A69A4-805A69D4 -00001 0030+00 0/0 0/0 1/0 .data g_profile_Tag_Mstop */ -SECTION_DATA extern void* g_profile_Tag_Mstop[12] = { - (void*)0xFFFFFFFD, (void*)0x0007FFFD, - (void*)0x02C40000, (void*)&g_fpcLf_Method, - (void*)0x000005D4, (void*)NULL, - (void*)NULL, (void*)&g_fopAc_Method, - (void*)0x01010000, (void*)&l_daTagMstop_Method, - (void*)0x00044000, (void*)0x030E0000, +extern actor_process_profile_definition g_profile_Tag_Mstop = { + -3, // mLayerID + 7, // mListID + -3, // mListPrio + PROC_Tag_Mstop, // mProcName + 0, // padding + &g_fpcLf_Method.mBase, // mSubMtd + sizeof(daTagMstop_c), // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopAc_Method.base, // mSubMtd + 0x0101, // mPriority + 0, // padding + 0, // padding + &l_daTagMstop_Method, // mSubMtd + 0x00044000, // mStatus + 3, // mActorType + 0x0E, // mCullType + 0, // padding + 0 // padding }; diff --git a/src/d/com/d_com_inf_actor.cpp b/src/d/com/d_com_inf_actor.cpp index aa1add6d11..e279f363f4 100644 --- a/src/d/com/d_com_inf_actor.cpp +++ b/src/d/com/d_com_inf_actor.cpp @@ -1,37 +1,18 @@ -// -// Generated By: dol2asm -// Translation Unit: d/com/d_com_inf_actor -// +/** + * d_com_inf_actor.cpp + * dolzel2 - Common Information For Actor + */ #include "d/com/d_com_inf_actor.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */]; - -// -// Declarations: -// /* ############################################################################################## */ /* 80450610-80450618 000090 0008+00 0/0 1/1 0/0 .sdata g_dComIfAc_gameInfo */ -SECTION_SDATA extern dComIfAc_info_c g_dComIfAc_gameInfo = { - 0, 0, +dComIfAc_info_c g_dComIfAc_gameInfo = { + 0, // field_0x0 + false, // mPause }; /* 80450618-80450620 000098 0004+04 0/0 2/2 7/7 .sdata g_dComIfGoat_gameInfo */ -SECTION_SDATA extern u8 g_dComIfGoat_gameInfo[4 + 4 /* padding */] = { - 0x00, - 0x00, - 0x00, - 0x00, - /* padding */ - 0x00, - 0x00, - 0x00, - 0x00, +dComIfGoat_info_c g_dComIfGoat_gameInfo = { + 0, // field_0x0 }; diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp index 4fe93340e5..dfe644d481 100644 --- a/src/d/com/d_com_inf_game.cpp +++ b/src/d/com/d_com_inf_game.cpp @@ -1591,7 +1591,7 @@ asm void dComIfGs_offZoneSwitch(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_isZoneSwitch(int param_0, int param_1) { +asm BOOL dComIfGs_isZoneSwitch(int param_0, int param_1) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_isZoneSwitch__Fii.s" } @@ -1631,7 +1631,7 @@ asm BOOL dComIfGs_isOneZoneSwitch(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_isZoneItem(int param_0, int param_1) { +asm BOOL dComIfGs_isZoneItem(int param_0, int param_1) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_isZoneItem__Fii.s" } @@ -1641,7 +1641,7 @@ asm void dComIfGs_isZoneItem(int param_0, int param_1) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dComIfGs_isOneZoneItem(int param_0, int param_1) { +asm BOOL dComIfGs_isOneZoneItem(int param_0, int param_1) { nofralloc #include "asm/d/com/d_com_inf_game/dComIfGs_isOneZoneItem__Fii.s" } diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp index aec8e5e907..3b34b49444 100644 --- a/src/d/d_bomb.cpp +++ b/src/d/d_bomb.cpp @@ -1,11 +1,10 @@ -// -// Generated By: dol2asm -// Translation Unit: d/d_bomb -// +/** + * d_bomb.cpp + * dolzel2 - Bomb + */ #include "d/d_bomb.h" #include "d/d_procname.h" -#include "f_op/f_op_actor_mng.h" bool dBomb_c::checkStateCarry() { return (fopAcM_checkCarryNow(&mActor) || fopAcM_checkHookCarryNow(&mActor) || diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 92ee68a33d..a007e80de6 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -7,90 +7,6 @@ #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct mDoRst { - static u8 mResetData[4 + 4 /* padding */]; -}; - -struct mDoGph_gInf_c { - /* 80007F90 */ void beginRender(); - - static u8 mFrameBufferTexObj[32]; - static u8 mFrameBufferTimg[4]; - static u8 mFrameBufferTex[4]; -}; - -struct dShutdownErrorMsg_c { - /* 8009D790 */ void execute(); -}; - -struct dDvdErrorMsg_c { - /* 8009D194 */ void draw(s32); - /* 8009D354 */ void execute(); -}; - -struct Z2AudioMgr { - /* 802CD974 */ void resetProcess(u32, bool); - - static u8 mAudioMgrPtr[4 + 4 /* padding */]; -}; - -struct ResTLUT {}; - -struct ResTIMG {}; - -struct ResFONT {}; - -struct JKRHeap {}; - -struct JUTResFont { - /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*); - /* 802DF000 */ ~JUTResFont(); -}; - -struct JGeometry { - template - struct TBox2 {}; - /* TBox2 */ - struct TBox2__template0 {}; -}; - -struct JFWDisplay { - static u8 sManager[4]; -}; - -struct J3DSys { - /* 803100BC */ void drawInit(); -}; - -struct J2DTextBoxVBinding {}; - -struct J2DTextBoxHBinding {}; - -struct J2DTextBox { - /* 802FFBC4 */ J2DTextBox(u64, JGeometry::TBox2 const&, ResFONT const*, char const*, s16, - J2DTextBoxHBinding, J2DTextBoxVBinding); - /* 802FFC58 */ void initiate(ResFONT const*, char const*, s16, J2DTextBoxHBinding, - J2DTextBoxVBinding); - /* 803001E0 */ ~J2DTextBox(); - /* 80300490 */ void draw(f32, f32, f32, J2DTextBoxHBinding); -}; - -struct J2DPicture { - /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2 const&, ResTIMG const*, ResTLUT const*); - /* 802FCFF0 */ ~J2DPicture(); - /* 802FDC70 */ void draw(f32, f32, f32, f32, bool, bool, bool); -}; - -struct J2DOrthoGraph { - /* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32); - /* 802E97B4 */ void setPort(); - /* 802E980C */ void setOrtho(JGeometry::TBox2 const&, f32, f32); -}; - // // Forward References: // @@ -106,7 +22,7 @@ extern "C" extern char const* const d_d_error_msg__stringBase0; // External References: // -extern "C" void OSReport_Error(); +// extern "C" void OSReport_Error(); extern "C" void mDoAud_resetRecover__Fv(); extern "C" void beginRender__13mDoGph_gInf_cFv(); extern "C" void mDoGph_drawFilterQuad__FScSc(); @@ -126,49 +42,12 @@ extern "C" void initiate__10J2DTextBoxFPC7ResFONTPCcs18J2DTextBoxHBinding18J2DTe extern "C" void __dt__10J2DTextBoxFv(); extern "C" void draw__10J2DTextBoxFfff18J2DTextBoxHBinding(); extern "C" void drawInit__6J3DSysFv(); -extern "C" void C_MTXOrtho(); -extern "C" void DVDGetDriveStatus(); -extern "C" void GXSetVtxDesc(); extern "C" void GXClearVtxDesc(); -extern "C" void GXSetVtxAttrFmt(); -extern "C" void GXSetTexCoordGen2(); -extern "C" void GXSetNumTexGens(); -extern "C" void GXSetCullMode(); -extern "C" void GXSetTexCopySrc(); -extern "C" void GXSetTexCopyDst(); -extern "C" void GXCopyTex(); -extern "C" void GXSetNumChans(); -extern "C" void GXInitTexObj(); -extern "C" void GXInitTexObjLOD(); -extern "C" void GXLoadTexObj(); -extern "C" void GXSetNumIndStages(); -extern "C" void GXSetTevColorIn(); -extern "C" void GXSetTevAlphaIn(); -extern "C" void GXSetTevColorOp(); -extern "C" void GXSetTevAlphaOp(); -extern "C" void GXSetTevColor(); -extern "C" void GXSetAlphaCompare(); -extern "C" void GXSetTevOrder(); -extern "C" void GXSetNumTevStages(); -extern "C" void GXSetFog(); -extern "C" void GXSetFogRangeAdj(); -extern "C" void GXSetBlendMode(); -extern "C" void GXSetAlphaUpdate(); -extern "C" void GXSetZMode(); -extern "C" void GXSetZCompLoc(); -extern "C" void GXSetDither(); -extern "C" void GXSetProjection(); -extern "C" void GXLoadPosMtxImm(); -extern "C" void GXSetCurrentMtx(); extern "C" void _savegpr_27(); extern "C" void _restgpr_27(); -extern "C" extern u8 g_mDoMtx_identity[48 + 24 /* padding */]; extern "C" extern void* __vt__14J2DGrafContext[10]; extern "C" extern void* __vt__13J2DOrthoGraph[10]; extern "C" u8 mFrameBufferTexObj__13mDoGph_gInf_c[32]; -extern "C" extern u8 g_dComIfG_gameInfo[122384]; -extern "C" extern u8 j3dSys[284]; -extern "C" extern u8 g_clearColor[4]; extern "C" extern u8 data_80450688[8]; extern "C" extern u8 mInitFlag__17mDoAud_zelAudio_c[4]; extern "C" u8 mFrameBufferTimg__13mDoGph_gInf_c[4]; @@ -4965,7 +4844,7 @@ SECTION_DEAD static char const* const pad_8038D653 = "\0\0\0\0"; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dDvdErrorMsg_c::execute() { +asm u8 dDvdErrorMsg_c::execute() { nofralloc #include "asm/d/d_error_msg/execute__14dDvdErrorMsg_cFv.s" } @@ -4989,7 +4868,7 @@ static asm void drawCapture(u8 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void dShutdownErrorMsg_c::execute() { +asm bool dShutdownErrorMsg_c::execute() { nofralloc #include "asm/d/d_error_msg/execute__19dShutdownErrorMsg_cFv.s" } diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index dba0047cfa..ee3b260042 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -989,9 +989,11 @@ inline s32 getCheckItemFunc(u8 i_no) { s32 checkItemGet(u8 item_id, int param_2) { s32 checkItem = getCheckItemFunc(item_id); + if (checkItem == -1) { checkItem = param_2; } + return checkItem; } diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp index 66fad523cc..bb05219dee 100644 --- a/src/d/event/d_event.cpp +++ b/src/d/event/d_event.cpp @@ -145,6 +145,43 @@ extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; // Declarations: // +// This probably will need to be moved once actual debug rom decomp begins +#if DEBUG +static dEvDb_bit_c dEvDb_bit_table[799] = { + #include "src/d/event/d_event_debug_bit_table.inc" +}; + +static dEvDb_reg_c dEvDb_reg_table[21] = { + #include "src/d/event/d_event_debug_reg_table.inc" +}; + +static dEvDb_bit_c dEvDb_bit_table_tmp[169] = { + #include "src/d/event/d_event_debug_bit_table_tmp.inc" +}; + +static dEvDb_reg_c dEvDb_reg_table_tmp[14] = { + #include "src/d/event/d_event_debug_reg_table_tmp.inc" +}; + +static dEvDb_flag_base_c dEvDb_flag_base_table = { + dEvDb_bit_table, // mBitTable + dEvDb_reg_table, // mRegTable + 799, // mBitNum + 21, // mRegNum + 22, // field_0x10 + 4 // field_0x1 +}; + +static dEvDb_flag_base_c dEvDb_flag_base_table_tmp = { + dEvDb_bit_table_tmp, // mBitTable + dEvDb_reg_table_tmp, // mRegTable + 169, // mBitNum + 14, // mRegNum + 43, // field_0x10 + 6 // field_0x14 +}; +#endif + /* 80041480-80041488 03BDC0 0008+00 1/1 0/0 0/0 .text event_debug_evnt__21@unnamed@d_event_cpp@Fv */ namespace { diff --git a/src/d/event/d_event_debug_bit_table.inc b/src/d/event/d_event_debug_bit_table.inc new file mode 100644 index 0000000000..69b2ba5ca9 --- /dev/null +++ b/src/d/event/d_event_debug_bit_table.inc @@ -0,0 +1,7191 @@ +{ + "KORO2_ALLCLEAR", + "821 コロコロゲーム全ステージ(8-8)クリア後", // After all stages (8-8) of roll goal game cleared + "森田", // Morita + 0x6302, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0820", + "820 @", + "京極", // Kyogoku + 0x6304, + "***", + 0x0, + 0x1, +}, +{ + "F_0819", + "819 @", + "京極", // Kyogoku + 0x6308, + "***", + 0x0, + 0x1, +}, +{ + "F_0818", + "818 @", + "京極", // Kyogoku + 0x6310, + "***", + 0x0, + 0x1, +}, +{ + "F_0817", + "817 @", + "京極", // Kyogoku + 0x6320, + "***", + 0x0, + 0x1, +}, +{ + "F_0816", + "816 @", + "京極", // Kyogoku + 0x6340, + "***", + 0x0, + 0x1, +}, +{ + "F_0815", + "815 @", + "京極", // Kyogoku + 0x6380, + "***", + 0x0, + 0x1, +}, +{ + "F_0814", + "814 @", + "京極", // Kyogoku + 0x6201, + "***", + 0x0, + 0x1, +}, +{ + "F_0813", + "813 @", + "京極", // Kyogoku + 0x6202, + "***", + 0x0, + 0x1, +}, +{ + "F_0812", + "812 @", + "京極", // Kyogoku + 0x6204, + "***", + 0x0, + 0x1, +}, +{ + "F_0811", + "811 スタアゲーム初挑戦した", // Attempted Star Game for the first time + "京極", // Kyogoku + 0x6208, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0810", + "810 ゴーストのにおいを覚えた", // Learned ghost's scent + "京極", // Kyogoku + 0x6210, + "D_MN10:LV4ダンジョン" // LV4 Dungeon + 0x9, + 0xa, +}, +{ + "F_0809", + "809 追っかけ３人娘（リンクの追っかけになる初会話）", // 3 groupie girls (first conversation where they become Link's groupies) + "京極", // Kyogoku + 0x6220, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0808", + "808 初日のと話した", // Talked to Beth on the first day + "京極", // Kyogoku + 0x6240, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0807", + "807 初日のコリンと話した", // Talked to Colin on the first day + "京極", // Kyogoku + 0x6280, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0806", + "806 初日のハンジョーと話した", // Talked to Hanch on the first day + "京極", // Kyogoku + 0x6101, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0805", + "805 マロの雑貨屋の方でハイリアの盾を買った", // Bought Hylian shield from Malo Mart + "京極", // Kyogoku + 0x6102, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0804", + "804 オルディンTW突入直後の強制ミドナ会話聞いた", // Heard Midna's forced conversation immediately after plunge into Eldin Twilight + "京極", // Kyogoku + 0x6104, + "TW環状フィールド", // Twilight Ring field + 0x1d, + 0x1e, +}, +{ + "F_0803", + "803 天空に行った後でインパル婆さんと話した", // Talked to Old Lady Impaz after going to Sky + "京極", // Kyogoku + 0x6108, + "F_SP128:隠れ里", // Hidden Village + 0x18, + 0x19, +}, +{ + "F_0802", + "802 万引きのトリル攻撃開始", // Trill attacks when stealing + "京極（坂口さん用）", // Kyogoku (used by Sakaguchi) + 0x6110, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0801", + "801 ニオイマスのにおいを（初めて）覚えた", // First learned Reek Fish scent + "京極", // Kyogoku + 0x6120, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0800", + "800 トアルの森に帰還後、影から突然ミドナが出てくるまで（８００がＯＮはミドナ呼べない）", // After returning to Ordon Woods, until Midna comes out of the shadows (If 800 is ON, Midna can't be called) + "京極", // Kyogoku + 0x6140, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0799", + "799 倒れているゴロンの嘆きを聞いた（橋開通後）", // Listened to the fallen Goron's complaints (after opening bridge) + "一角", // Ikkaku + 0x6180, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0798", + "798 トビーからゾーラの話を聞いた", // Heard about Zora from Fyer + "京極", // Kyogoku + 0x6001, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0797", + "797 トビー大砲で持込・修理を選んだことがある（用事のない時）", // Have selected "Take Cannon / Repair" at Fyer's cannon (when there's no other business) + "京極", // Kyogoku + 0x6002, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0796", + "796 天空文字6", // Sky character 6 + "京極", // Kyogoku + 0x6004, + "天空文字", // Sky character + 0x29, + 0x2a, +}, +{ + "F_0795", + "795 天空文字5", // Sky character 5 + "京極", // Kyogoku + 0x6008, + "天空文字", // Sky character + 0x29, + 0x2a, +}, +{ + "F_0794", + "794 天空文字4", // Sky character 4 + "京極", // Kyogoku + 0x6010, + "天空文字", // Sky character + 0x29, + 0x2a, +}, +{ + "F_0793", + "793 天空文字3", // Sky character 3 + "京極", // Kyogoku + 0x6020, + "天空文字", // Sky character + 0x29, + 0x2a, +}, +{ + "F_0792", + "792 天空文字2", // Sky character 2 + "京極", // Kyogoku + 0x6040, + "天空文字", // Sky character + 0x29, + 0x2a, +}, +{ + "F_0791", + "791 天空文字１", // Sky character 1 + "京極", // Kyogoku + 0x6080, + "天空文字", // Sky character + 0x29, + 0x2a, +}, +{ + "F_0790", + "790 セーラがネコの方を向くようになる(520　ONで会話範囲から外れる)", // Sera faces the cat (outside conversation area when 520 is ON) + "京極（坂口使用）", // Kyogoku (Sakaguchi's use) + 0x5f01, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0789", + "789 甘そうなリンゴを１回手に取った", // Grabbed sweet apple 1 time + "京極", // Kyogoku + 0x5f02, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0788", + "788 滝のぼりゾーラと話した", // Talked to Zora going up the waterfall + "京極", // Kyogoku + 0x5f04, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0787", + "787 天空砲をワープさせようとしてミドナに止められた「", // Stopped by Midna when trying to warp the sky cannon + "京極", // Kyogoku + 0x5f08, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0786", + "786 天空大砲を見たシャッドの強制会話", // Forced conversation with Shad when he sees the sky cannon + "京極", // Kyogoku + 0x5f10, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0785", + "785 天空砲ワープさせようとした後、シャッド立ち去る", // Shad leaves after attempting to warp sky cannon + "京極", // Kyogoku + 0x5f20, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0784", + "784 教会地下に戻ってきたシャッドと通常会話した", // Had normal conversation with Shad after he returns to church basement + "京極", // Kyogoku + 0x5f40, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0783", + "783 インパル婆さんにコピーロッドを見せた", // Showed dominion rod to Impaz + "京極", // Kyogoku + 0x5f80, + "F_SP128:隠れ里", // Hidden Village + 0x18, + 0x19, +}, +{ + "F_0782", + "782 LV3攻略後-LV6攻略前の間にレナードと話した", // Spoke to Renado after LV3 complete, before LV6 complete + "京極", // Kyogoku + 0x5e01, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0781", + "781 LV6クリアまでに教会でイリアと話した", // Spoke to Ilia in church after clearing LV6 + "京極", // Kyogoku + 0x5e02, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0780", + "780 記憶復活後のイリアから天空の使者の話を聞いた", // Heard Ilia talk about the messenger from the sky after her memories are restored + "京極", // Kyogoku + 0x5e04, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0779", + "779 橋炎上中のミドナヒント１回聞いた", // Heard one hint from Midna while bridge is burning + "京極", // Kyogoku + 0x5e08, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0778", + "778 LV1ダンクリア後の精霊の話の後の強制ミドナ会話聞いた", // Heard forced conversation with Midna after story about spirits after clearing LV1 dungeon + "京極", // Kyogoku + 0x5e10, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0777", + "777 エポナと話した", // Spoke to Epona + "京極", // Kyogoku + 0x5e20, + "その他", // Misc. + 0x20, + 0x21, +}, +{ + "F_0776", + "776 LV8ダンジョンの霧でリンクが初めて狼に変身した", // Link first turned to wolf due to fog in LV8 dungeon + "京極", // Kyogoku + 0x5e40, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0775", + "775 初トビー大砲後の強制ミドナ聞いた", // Heard forced conversation with Midna after first Fyer's cannon + "京極", // Kyogoku + 0x5e80, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0774", + "774 冷凍ゾーラを見た後のミドナの会話聞いた", // Listened to Midna's conversation after seeing frozen Zora + "京極", // Kyogoku + 0x5d01, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0773", + "773 無人販売店：最後の支払いが多かった", // Unmanned Shop : last payment too much + "京極", // Kyogoku + 0x5d02, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0772", + "772 無人販売店：最後の支払いが少なかった", // Unmanned Shop : last payment too little + "京極", // Kyogoku + 0x5d04, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0771", + "771 無人販売店：最後の支払いドロボーした", // Unmanned Shop : last payment stolen + "京極", // Kyogoku + 0x5d08, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0770", + "770 ＴＷ（氷付け）初訪問デモ後の強制会話を聞いた", // Twilight (frozen) Heard forced conversation after first visit cutscene + "京極", // Kyogoku + 0x5d10, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0769", + "769 ゾーラ川上流に初到着直後のミドナ強制会話", // Forced conversation with Midna right after first arrival at upper Zora's river + "京極", // Kyogoku + 0x5d20, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0768", + "768 ハイリア湖紹介デモ後のミドナの強制会話聞いた", // Heard forced conversation with Midna after Hylia Lake introduction cutscene + "京極", // Kyogoku + 0x5d40, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "J_BTN_GUIDE", + "767 十字ボタンガイド", // X-button guide + "坂口", // Sakaguchi + 0x5d80, + "その他", // Misc. + 0x20, + 0x21, +}, +{ + "B_BTN_GUIDE", + "766 Ｂボタンガイド", // B-button guide + "坂口", // Sakaguchi + 0x5c01, + "その他", // Misc. + 0x20, + 0x21, +}, +{ + "F_0759", + "759 序盤（３日目）のセーラと初会話", // Opening (3rd day) first conversation with Sera + "京極", // Kyogoku + 0x5c02, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0758", + "758 無人販売所で万引きした（※トリル狼会話用。話すとリセット）", // Stole from unmanned shop (For use in Trill wolf conversation. Resets after speaking) + "京極", // Kyogoku + 0x5c04, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0757", + "757 トリルと狼会話した", // Had Trill and wolf conversation + "京極", // Kyogoku + 0x5c08, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0756", + "756 おばちゃんが仲間になった", // Join with Ooccoo Sr. + "京極", // Kyogoku + 0x5c10, + "D_MN07:LV7ダンジョン", // LV7 dungeon + 0x7, + 0x8, +}, +{ + "F_0755", + "755 TWホヅ　闇蟲登場直後の台詞聞いた", // Twilight Heard Iza's line right after shadow bug appears + "京極", // Kyogoku + 0x5c20, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0754", + "754 F1001:ミドナヒント　サルのヒント2聞いた(SAVE72=ON)", // Heard Midna's hint / Monkey hint 2 times (SAVE72=ON) + "京極", // Kyogoku + 0x5c40, + "D_MN05:LV1ダンジョン", // LV1 Dungeon + 0x5, + 0x6, +}, +{ + "F_0753", + "753 キコルのまずいスープを始めてすくった", // Scooped Coro's bad soup for the first time + "京極", // Kyogoku + 0x5c80, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0752", + "752 ボンニャーズ再び成功", // Beat cat game again + "京極", // Kyogoku + 0x5b01, + "F_SP128:隠れ里", // Hidden Village + 0x18, + 0x19, +}, +{ + "F_0751", + "751 コッコ隊長から詳しい説明を初めて聞いた", // Heard detailed explaination from Captain Cucco for the first time + "京極", // Kyogoku + 0x5b02, + "F_SP128:隠れ里", // Hidden Village + 0x18, + 0x19, +}, +{ + "F_0750", + "750 ボンニャーズ活動開始後　コッコ隊長と初会話", // First conversation with Captain Cucco after beginning cat game activities + "京極", // Kyogoku + 0x5b04, + "F_SP128:隠れ里", // Hidden Village + 0x18, + 0x19, +}, +{ + "F_0749", + "749 ボンニャーズクリア済（ハートのかけらが埋められた。とるかどうかはプレイヤー次第）", // After clearing cat game (Heart piece is buried, whether it is obtained depends on the player) + "京極", // Kyogoku + 0x5b08, + "F_SP128:隠れ里", // Hidden Village + 0x18, + 0x19, +}, +{ + "F_0748", + "748 ヒント鷹、初会話", // First conversation with hint hawk + "一角", // Ikkaku + 0x5b10, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0747", + "747 F0063:コッコBと話した", // Spoke with Cucco B + "京極", // Kyogoku + 0x5b20, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0746", + "746 F0062:コッコAと話した", // Spoke with Cucco A + "京極", // Kyogoku + 0x5b40, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0745", + "745 F1604:大人ゴロン（ハイリアの盾）と話した", // Spoke with adult Goron (Hylia shield) + "京極", // Kyogoku + 0x5b80, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0744", + "744 F1603:大人ゴロン（矢３０本）と話した（ガノンウォール後）", // Spoke with adult Goron (30 arrows) (after Ganon wall) + "京極", // Kyogoku + 0x5a01, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0743", + "743 F1603:大人ゴロン（矢３０本）と話した（ガノンウォール前）", // Spoke with adult Goron (30 arrows) (before Ganon wall) + "京極", // Kyogoku + 0x5a02, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0742", + "742 F1602:子どもゴロン（赤いクスリ売り）と話した", // Spoke with child Goron (selling red potion) + "京極", // Kyogoku + 0x5a04, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0741", + "741 F1601:子どもゴロン（カンテラ油売り）と話した（ガノンウォール後）", // Spoke with child Goron (selling lantern oil) (after Ganon wall) + "京極", // Kyogoku + 0x5a08, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0740", + "740 F1601:子どもゴロン（カンテラ油売り）と話した（ガノンウォール前）", // Spoke with child Goron (selling lantern oil) (before Ganon wall) + "京極", // Kyogoku + 0x5a10, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0739", + "739 F1137:南−果物屋の客の老人と話した", // South - Spoke with old customer at fruit stand + "京極", // Kyogoku + 0x5a20, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0738", + "738 F1136:南−八百屋の客の女性と話した", // South - Spoke with female customer at vegetable stand + "京極", // Kyogoku + 0x5a40, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0737", + "737 ウド(猫)初めて会話＠ミドナ瀕死", // First conversation with Udo (cat) during Midna's desperate hour + "一角", // Ikkaku + 0x5a80, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0736", + "736 F1001:ミドナヒント　サルのヒント聞いた　", // Heard Midna's hint / monkey hint + "京極", // Kyogoku + 0x5901, + "D_MN05:LV1ダンジョン", // LV1 Dungeon + 0x5, + 0x6, +}, +{ + "F_0735", + "735 アヒルと話した", // Spoke with domestic duck + "京極", // Kyogoku + 0x5902, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0734", + "734 カモと話した", // Spoke with wild duck + "京極", // Kyogoku + 0x5904, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0733", + "733 リズ川下りご褒美のハートのかけらをもらった", // Recieved Heart piece reward from Iza for going down the river + "京極", // Kyogoku + 0x5908, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0732", + "732 コッコと話した（イリア記憶イベント攻略前）", // Spoke with Cucco (After completing Ilia's memory event) + "京極", // Kyogoku + 0x5910, + "F_SP128:隠れ里", // Hidden Village + 0x18, + 0x19, +}, +{ + "F_0730", + "730 リズのボートに初めて乗った", // Rode Iza's boat for the first time + "京極", // Kyogoku + 0x5920, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0729", + "729 ポストマン「おォ〜い！」直後", // Right after postman's "Hey!" + "一角", // Ikkaku + 0x5940, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0728", + "728 セレブショップで靴が汚くて入店拒否された", // Refused entry into Chudley's shop because of dirty shoes + "京極", // Kyogoku + 0x5980, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0727", + "727 靴磨き少年と初会話", // First conversation with shoe-shine boy + "京極", // Kyogoku + 0x5801, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0726", + "726 ホヅ狼対応　話しかけた", // Talk to Iza as wolf + "京極", // Kyogoku + 0x5802, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0725", + "725 シャッド訪問中を告げるレナードと話した", // Speak to Renado who is announcing Shad's visit + "京極", // Kyogoku + 0x5804, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0724", + "724 F1133:東−井戸端会議のおばさん２人組と話した", // East - Spoke to two ladies gossiping + "京極", // Kyogoku + 0x5808, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0723", + "723 F1132:東−路地裏のおじさんと話した", // East - Spoke to man in the alley + "京極", // Kyogoku + 0x5810, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0722", + "722 F1131:東−Ｔ字路のおじさんと話した", // East - Spoke to man at the T-shaped street + "京極", // Kyogoku + 0x5820, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0721", + "721 F:1130 - 南 - 果物屋の店主と話した（馬車護衛後）", // South - Spoke to fruit stand vendor (after guarding carriage) + "京極", // Kyogoku + 0x5840, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0720", + "720 F:1130 - 南 - 果物屋の店主と話した（馬車護衛前）", // South - Spoke to fruit stand vendor (before guarding carriage) + "京極", // Kyogoku + 0x5880, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0719", + "719 F:1129 - 南 - 八百屋の客のばあさんと話した（マロマート時）", // South - Spoke to old lady at the vegetable stand (Malo Mart) + "京極", // Kyogoku + 0x5701, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0718", + "718 F:1129 - 南 - 八百屋の客のばあさんと話した（セレブ時）", // South - Spoke to old lady at the vegetable stand (Chudley) + "京極", // Kyogoku + 0x5702, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0717", + "717 F:1125 西−犬の飼い主と話した", // Wist - Speak to the dog owner + "京極", // Kyogoku + 0x5704, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0716", + "716 F:1509-東の犬と話した", // Speak with dog to the east + "京極", // Kyogoku + 0x5708, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0715", + "715 F:1508-西の犬と話した", // Speak with dog to west + "京極", // Kyogoku + 0x5710, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0709", + "709 ミドナ瀕死、ステファニー(猫)と初会話", // Midna's desperate hour, first conversation wtih Stephanie (cat) + "一角", // Ikkaku + 0x5720, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0708", + "708 魂コンプ後、ハカセ初回会話", // First conversaton with doctor after completing spirit + "一角", // Ikkaku + 0x5740, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0707", + "707 ミドナ瀕死、ミー(猫)と初会話", // Midna's desperate hour, first conversation with Mii (cat) + "一角", // Ikkaku + 0x5780, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0706", + "706 ミドナ瀕死でトラコ(猫)と初会話", // First conversation wtih Torako (cat) during Midna's desperate hour + "一角", // Ikkaku + 0x5601, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0705", + "705 ミドナ瀕死でカヘル(蛙)と初会話", // First conversation with Kaeru (frog) during Midna's desperate hour + "一角", // Ikkaku + 0x5602, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0704", + "704 TW水ナシ時のリズの話を聞いた", // Listened to Iza in Twilight before domain is thawed + "京極", // Kyogoku + 0x5604, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0703", + "703 ウキ釣りでニオイマスを初めて釣った", // Caught Reek fish for first time while fishing + "京極", // Kyogoku + 0x5608, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0702B", + "702 F1124:南のパン屋店主-少年A2と話した", // South Baker - Spoke with Boy A2 + "京極", // Kyogoku + 0x5610, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0701B", + "701 F1123:南の八百屋店主-町人D2と話した（馬車護衛後）", // South Vegetable vendor - Spoke with Villager D2 (after guarding carriage) + "京極", // Kyogoku + 0x5620, + "***", + 0x0, + 0x1, +}, +{ + "F_0700B", + "700 F1123:南の八百屋店主-町人D2と話した（馬車護衛前）", // South Vegetable vendor - Spoke with Villager D2 (before guarding carriage) + "京極", // Kyogoku + 0x5640, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0699", + "699 F1122:南の八百屋前おばさんB1と話した（馬車護衛後）", // Spoke with woman B1 in front of south vegetable stand (after guarding carriage) + "京極", // Kyogoku + 0x5680, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0698", + "698 F1122:南の八百屋前おばさんB1と話した（馬車護衛前）", // Spoke with woman B1 in front of south vegetable stand (before guarding carriage) + "京極", // Kyogoku + 0x5501, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0697", + "697 F1121:ジョバンニ救出後に聞き込みハイラル兵と話した", // Spoke with inquiring Hyrule guard after saving Jovani + "京極", // Kyogoku + 0x5502, + "***", + 0x0, + 0x1, +}, +{ + "F_0696", + "696 F1121:ジョバンニ救出前に聞き込みハイラル兵と話した", // Spoke with inquiring Hyrule guard before saving Jovani + "京極", // Kyogoku + 0x5504, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0695", + "695 ヘナと釣り中、初めてカエルのルアーすっぽ抜けた", // First time frog lure slips out + "京極", // Kyogoku + 0x5508, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0694", + "694 ゴースト２０個集めてジョバンニと会話", // Conversation with Jovani after collecting 20 ghosts + "一角", // Ikkaku + 0x5510, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0693", + "693 人間時、スモモと初会話", // First conversation with Plumm while human + "一角", // Ikkaku + 0x5520, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0692", + "692 F1208:馬車護衛後に南路地子ども達と話した", // Spoke with south alley children after guarding carriage + "京極", // Kyogoku + 0x5540, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0691", + "691 F1208:馬車護衛前に南路地子ども達と話した", // Spoke with south alley children before guarding carriage + "京極", // Kyogoku + 0x5580, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0690", + "690 F:1120 南通り−占い屋前のおばさんA1と話した", // South Road - Spoke with woman A1 in front of fortune teller's shop + "京極", // Kyogoku + 0x5401, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0689", + "689 F:1119 南通り肉屋のオヤジ町人C1と話した", // South Road - Spoke with meat shop villager man C1 + "京極", // Kyogoku + 0x5402, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0688", + "688 F:1118 南通り温泉水屋前(OPEN)町娘D1と話した", // Spoke with town girl D1 in front of south road hot spring shop (OPEN) + "京極", // Kyogoku + 0x5404, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0687", + "687 F:1118 南通り温泉水屋前(CLOSE)町娘D1と話した", // Spoke with town girl D1 in front of south road hot spring shop (CLOSED) + "京極", // Kyogoku + 0x5408, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0686", + "686 陰呪の結晶（最後の仮面）をとった", // Get fused shadow piece (final mask) + "京極", // Kyogoku + 0x5410, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0685", + "685 【デモ32】賢者登場&１つ目の陰りの鏡のかけらをとった", // (Cutscene 32) Sage appears, get first Mirror of Twilight shard + "京極", // Kyogoku + 0x5420, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0684", + "684 R00の石像をセンスで見た", // Look at R00 statue using sense + "京極", // Kyogoku + 0x5440, + "D_MN06:LV6ダンジョン", // LV6 Dungeon + 0x6, + 0x7, +}, +{ + "F_0683", + "683 1207:中央広場グループB（老婆A1/少年A1/町娘B1）と話した", // Spoke with Group B (Old lady A1, Boy A1, Town girl B1) in central square + "京極", // Kyogoku + 0x5480, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0682", + "682 天空人ＳＨＯＰ店員と初会話", // First conversation with Oocca Shopkeeper + "京極", // Kyogoku + 0x5301, + "D_MN07:LV7ダンジョン", // LV7 dungeon + 0x7, + 0x8, +}, +{ + "F_0681", + "681 １匹目のゴーストを倒した後のミドナヒントを聞いた", // Heard Midna's hint after defeating first ghost + "京極", // Kyogoku + 0x5302, + "D_MN10:LV4ダンジョン" // LV4 Dungeon, + 0x9, + 0xa, +}, +{ + "F_0680", + "680 ゴースト逃亡デモ後のミドナヒントを聞いた", // Heard Midna's hint after cutscene of ghost escaping + "京極", // Kyogoku + 0x5304, + "D_MN10:LV4ダンジョン" // LV4 Dungeon, + 0x9, + 0xa, +}, +{ + "F_0679", + "679 コロコロゲームでズルをした", // Cheated during Roll goal game + "京極", // Kyogoku + 0x5308, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0678", + "678 F1206:噴水前グループA（町娘C2[、]少年B1[、]町娘D1）と話した", // Spoke with Group A (Town girl C2, Boy B1, Town girl D1) in front of fountain + "京極", // Kyogoku + 0x5310, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0677", + "677 F1205:光 - カフェ客B:町人D1&じいさんB1と話した", // Light - Spoke with Cafe customer B: Townsperson D1 and Man B1 + "京極", // Kyogoku + 0x5320, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0676", + "676 F1204:光 - カフェ客:町人F1（おじさん単品）と話した", // Light - Spoke with Cafe customer: Townsperson F1 (just the man) + "京極", // Kyogoku + 0x5340, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0675", + "675 F1203:光 - カフェカウンター:町娘A1（店員）と話した", // Light - cafe counter: Spoke with townsgirl A1 (shop clerk) + "京極", // Kyogoku + 0x5380, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0674", + "674 F1202:光 - カフェテーブル:町人A1と話した", // Light - Spoke with cafe table: townsperson A1 + "京極", // Kyogoku + 0x5201, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0673", + "673 火魔人の弱点のヒントを聞いた(F0215)", // Heard hint about Fyrus's weakness (F0215) + "京極", // Kyogoku + 0x5202, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0672", + "672 マグネゴロンが初めて転がるのを見た", // First time seeing magnet goron tumbling + "京極", // Kyogoku + 0x5204, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0671", + "671 マグネゴロンを一度でも溶岩に投げ入れた", // Through magnet goron into lava once + "京極", // Kyogoku + 0x5208, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0670", + "670 こけた火魔人を殴った", // Hitting knocked-down Fyrus + "京極", // Kyogoku + 0x5210, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0669", + "669 火魔人の鎖を一度でも引っ張った", // Pulled on Fyrus chains at least once + "京極", // Kyogoku + 0x5220, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0668", + "668 ゾーラ一般（汎用）に獣人のスケッチを見せた", // Showed Yeto sketch to Zora civilian (generic) + "京極", // Kyogoku + 0x5240, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0667", + "667 ゾーラ兵（汎用）に獣人のスケッチを見せた", // Showed Yeto sketch to average Zora soldier (generic) + "京極", // Kyogoku + 0x5280, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0666", + "666 雪山横のゾーラ兵に獣人のスケッチを見せた", // Showed Yeto sketch to Zora soldier next to Snowpeak Mountain + "京極", // Kyogoku + 0x5101, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0665", + "665 コロコロゲームに初ズーム", // First zoom in Roll goal game + "京極", // Kyogoku + 0x5102, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0664", + "664 コロコロゲームクリア後　初挑戦", // After clearing roll goal game / first attempt + "京極", // Kyogoku + 0x5104, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0663", + "663 ピロロちゃんの余計な一言を聞いた", // Listened to Purdy's unnecessary words + "京極", // Kyogoku + 0x5108, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0662", + "662 コロコロゲーム１回クリアしたら次からルール省略", // Omit rules after clearing roll goal game once + "京極", // Kyogoku + 0x5110, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0661", + "661 TWハイリア湖ゾーラ兵B&Cの話を聞いた", // Twilight Lake Hylia Listened to Zora soldier B&C talk + "京極", // Kyogoku + 0x5120, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0660", + "660 TWハイリア湖ゾーラ兵Aの話を聞いた", // Twilight Lake Hylia Listened to Zora soldier A talk + "京極", // Kyogoku + 0x5140, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0659", + "659 ＴＷ兵士or地図で、ハイリア湖に精霊の泉がある情報を聞いた", // Hear information about spirit spring in Lake Hylia from Twilight Soldier or map + "京極", // Kyogoku + 0x5180, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0658", + "658 アゲハに大きなサイフもらった", // Recieved large wallet from Agitha + "一角", // Ikkaku + 0x5001, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0657", + "657 ヘナの目の前でハイラルドジョウを初めて釣った", // Caught Hylian Loach in front of Hena first time + "京極", // Kyogoku + 0x5002, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0656", + "656 初めてルアー釣りでつれた（魚なんでも）", // Caught something (any fish) using lure first time + "京極", // Kyogoku + 0x5004, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0655", + "655 ウキ釣りで【トアルナマズ】を初めて釣った",　// Caught an Ordon Catfish using bobber first time + "京極", // Kyogoku + 0x5008, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0654", + "654 ウキ釣りで【ハイラルドジョウ】を初めて釣った", // Caught Hylian Loach using bobber first time + "京極", // Kyogoku + 0x5010, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0653", + "653 ウキ釣りで【ハイリアパイク】を初めて釣った", // Caught Hylian Pike with bobber first time + "京極", // Kyogoku + 0x5020, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0652", + "652 ウキ釣りで【ハイラルバス】を初めて釣った", // Caught Hylian Bass with bobber first time + "京極", // Kyogoku + 0x5040, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0651", + "651 ウキ釣りで【グリーンギル】を初めて釣った", // Caught Greengill with bobber first time + "京極", // Kyogoku + 0x5080, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0650", + "650 0863- リンク写真にズーム時２回目聞いた", // Heard second time zooming in on Link's picture + "京極", // Kyogoku + 0x4f01, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0649", + "649 0863- リンク写真にズーム時１回目聞いた", // Heard first time zooming in on Link's picture + "京極", // Kyogoku + 0x4f02, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0648", + "648 0837- ヘナ写真①②（番外編）聞いた", // Heard Hena's photo 1,2 (additional story) + "京極", // Kyogoku + 0x4f04, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0647", + "647 0836- ヘナ写真②にズーム時１回目聞いた", // Heard second time zooming in on Hena's photo + "京極", // Kyogoku + 0x4f08, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0646", + "646 0835- ヘナ写真①にズーム時１回目聞いた", // Heard first time zooming in on Hena's photo + "京極", // Kyogoku + 0x4f10, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0645", + "645 0834- ホヅ写真にズーム時１回目聞いた", // Heard First time zoomin in on Iza's photo + "京極", // Kyogoku + 0x4f20, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0644", + "644 0833- キコル写真にズーム時１回目聞いた", // Heard first time zooming in on Coro's photo + "京極", // Kyogoku + 0x4f40, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0643", + "643 0832- オッサン写真にズーム時１回目聞いた", // Heard first time zooming in on old man's photo + "京極", // Kyogoku + 0x4f80, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0642", + "642 0831- 本にズーム時１回目聞いた", // Heard first time zooming in on book + "京極", // Kyogoku + 0x4e01, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0641", + "641 0830- 絨毯にズーム時１回目聞いた", // Heard First time zooming in on rug + "京極", // Kyogoku + 0x4e02, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0640", + "640 0829 - 壷にズーム時１回目聞いた", // Heard first time zooming in on pot + "京極", // Kyogoku + 0x4e04, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0639", + "639 0828 - 帽子にズーム時１回目聞いた", // Heard first time zooming in on hat + "京極", // Kyogoku + 0x4e08, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0638", + "638 0826 - カヌーにズーム時１回目聞いた", // Heard first time zooming in on canoe + "京極", // Kyogoku + 0x4e10, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0637", + "637 コロコロゲーム全クリア（カエルのルアーGET）", // Cleard all of roll goal game (get frog lure) + "京極", // Kyogoku + 0x4e20, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0636", + "636 0825 - カエルのルアーにズーム時１回目聞いた", // Heard first time zooming in on frog lure + "京極", // Kyogoku + 0x4e40, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0635", + "635 0824 - ルアーにズーム時（カエル○）聞いた", // Heard zooming in on lure (yes frog) + "京極", // Kyogoku + 0x4e80, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0634", + "634 0823 - ルアーにズーム時（カエル×）聞いた", // Heard zooming in on lure (no frog) + "京極", // Kyogoku + 0x4d01, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0633", + "633 0820 - 水槽ズーム時②２回目聞いた", // Heard second time zooming in on fish tank (2) + "京極", // Kyogoku + 0x4d02, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0632", + "632 0820 - 水槽ズーム時②１回目聞いた", // Heard first time zooming in on fish tank (2) + "京極", // Kyogoku + 0x4d04, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0631", + "631 0819 - 水槽ズーム時①聞いた", // Heard when zooming in on fish tank (1) + "京極", // Kyogoku + 0x4a80, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x1c, + 0x1d, +}, +{ + "F_0630", + "630 【デモ4 - ?】とらわれ直後のリンク（狼）", // (Cutscene 4 - ?) Right after Link is captured (wolf) + "京極", // Kyogoku + 0x4d08, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0629", + "629 酒場のジョバンニに話してから、ゲンゴロウと初めての会話", // First conversation iwth Gengle after speaking with Jovani at the bar + "一角", // Ikkaku + 0x4d10, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0628", + "628 ゲンゴロウに200ルピーもらった", // Received 200 Rupees from Gengle + "一角", // Ikkaku + 0x4d20, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0627", + "627 酒場のジョバンニに話した", // Spoke with Jovani at the bar + "一角", // Ikkaku + 0x4d40, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0626", + "626 ジョバンニにハートのかけらもらう", // Received a heart piece from Jovani + "一角", // Ikkaku + 0x4d80, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0625", + "625 タロ＆サルを救出", // Saved Talo and a monkey + "住吉", // Sumiyoshi + 0x4c01, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0624", + "624 ３日目：ツタに登ってハンジョーに注意された", // 3rd day: Warned by Hanch when climbing vines + "京極", // Kyogoku + 0x4c02, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0623", + "623 序盤３日目：蜂に襲われる前のハンジョーと話した", // Opening 3rd day: Spoke to Hanch before being attacked by bees + "京極", // Kyogoku + 0x4c04, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0622", + "622 序盤２日目：蜂に襲われる直前のハンジョーと話した", // Opening 2nd day: Spoke to Hanch before being attacked by bees + "京極", // Kyogoku + 0x4c08, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0621", + "621 ３日目のハンジョーと初会話（２日目に蜂の巣落とした）", // Spoke to Hanch on 3rd day (knocked down beehive on 2nd day) + "京極", // Kyogoku + 0x4c10, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0620", + "620 ニオイマスを初めて釣った", // First caught a Reek Fish + "京極", // Kyogoku + 0x4c20, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0619", + "619 F0013:ハイリア湖上ゾーラ兵（大砲の近く）と話した", // Spoke to Zora soldier (near cannon) in Lake Hylia + "京極", // Kyogoku + 0x4c40, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0618", + "618 序盤２日目ではちのこをビンにすくった", // Scooped bee larva into bottle on opening 2nd Day + "京極（SET梅宮）", // Kyogoku (SET Umemiya) + 0x4c80, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0617", + "617 F0085:３日目−木刀渡した後のタロ・マロと話した（２回目）", // 3rd Day - Spoke to Talo/Malo after handing over wooden sword (2nd time) + "京極", // Kyogoku + 0x4b01, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0616", + "616 F0085:３日目−木刀渡した後のタロ・マロと話した（１回目）", // 3rd Day - Spoke to Talo/Malo after handing over wooden sword (1st time) + "京極", // Kyogoku + 0x4b02, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0615", + "615 ラネールの精霊から光を器をもらった", // Recieved vessel of light from Lanayru spirit + "京極", // Kyogoku + 0x4b04, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0614", + "614 ２日目−パチチュー直後の強制会話を聞いた", // 2nd Day - Heard forced conversation immediately after the slignshot tutorial + "京極", // Kyogoku + 0x4b08, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0613", + "613 0075B:パチンコチュートリアル−かかし頭２個未達成で話した", // Slingshot Tutorial - Spoke before getting 2 scarecrow heards + "京極", // Kyogoku + 0x4b10, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0612", + "612 0075A:パチンコチュートリアル−的に当てる前に話した", // Pachinco Tutorial - Spoke before hitting target + "京極", // Kyogoku + 0x4b20, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0611", + "611 0074:パチンコチュートリアル−注目してあてた", // Slingshot Tutorial - Hit it using focusing + "京極", // Kyogoku + 0x4b40, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0610", + "610 0073:パチンコチュートリアル−注目しないであてた", // Slingshot Tutorial - Hit it without using focus + "京極", // Kyogoku + 0x4b80, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0609", + "609 0072:パチンコチュートリアル−かかし胴体初ヒット", // Slingshot Tutorial - First time hitting scarcrow torso + "京極", // Kyogoku + 0x4a01, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0608", + "608 パチンコチュートリアル開始した", // Began Slingshot tutorial + "京極", // Kyogoku + 0x4a02, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0607", + "607 パチンコチュートリアル中断した", // Quit Slingshot tutorial + "京極", // Kyogoku + 0x4a04, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0606", + "606 巨人入れ替わった", // Giants switched places + "住吉", // Sumiyoshi + 0x4a08, + "F_SP117:聖なる森", // Sacred Grove + 0x17, + 0x18, +}, +{ + "F_0702", + "605 捕われているタロを確認した", // Confirmed kidnapped Talo + "住吉", // Sumiyoshi + 0x4a10, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0701", + "604 リンクの家前庭でタロがサルを発見", // Talo discovers monkey in Link's house garden + "木村", // Kimura + 0x4a20, + "***", + 0x0, + 0x1, +}, +{ + "F_0700", + "603 初日終了", // First day ends + "木村", // Kimura + 0x4a40, + "***", + 0x0, + 0x1, +}, +{ + "F_0601", + "601 オリに捕まっているタロと話した", // Spoke to imprisoned Talo + "京極", // Kyogoku + 0x4901, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0600", + "600 パチンコ購入", // Purchase slingshot + "京極", // Kyogoku + 0x4902, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0599", + "599 ２日目−ボウの家に入ろうとした", // 2nd Day - tried to enter Bo's house + "京極", // Kyogoku + 0x4904, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0598", + "598 ２日目−ボウと初会話（山羊倒し成功前）", // 2nd Day - First conversation with Bo + "京極", // Kyogoku + 0x4908, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0597", + "597 ２日目−ボウと初会話（山羊倒し成功後）", // 2nd Day - First time speaking with Bo (after successfully defeating mountain goat) + "京極", // Kyogoku + 0x4910, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0596", + "596 F0003:２日目−コリン剣チュー後〜馬拒絶までに会話", // 2nd Day - Conversation with Colin after sword tutorial, before horse rejection + "京極", // Kyogoku + 0x4920, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0595", + "595 F0003:２日目−コリン剣チュー後の馬拒絶後に会話", // 2nd Day - Conversation with Colin after sword tutorial and after horse rejection + "京極", // Kyogoku + 0x4940, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0594", + "594 F0003:２日目−コリン（キコルからカンテラ入手後に会話）", // 2nd Day - Colin (conversation after receiving lantern from Coro) + "京極", // Kyogoku + 0x4980, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0593", + "593 F0049:２日目−ベス−タロ失踪直後に話した", // 2nd Day - Conversation with Beth right after Talo's disappearance + "京極", // Kyogoku + 0x4801, + "F_SP104:トアル森", // Ordon Woods + 0xe, + 0xf, +}, +{ + "F_0592", + "592 F0050:２日目−ベス−タロ失踪中（カンテラゲット後）に話した", // 2nd Day - Spoke with Beth during Talo's disappearance (after getting lantern) + "京極", // Kyogoku + 0x4802, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0591", + "591 F0060:２日目−マロ−タロ失踪直後に話した", // 2nd Day - Spoke to Malo right after Talo disappears + "京極", // Kyogoku + 0x4804, + "F_SP104:トアル森", // Ordon Woods + 0xe, + 0xf, +}, +{ + "F_0590", + "590 F0061:２日目−マロ−タロ失踪中（カンテラゲット後）に話した", // 2nd Day - Spoke to Malo during Talo's disappearance (after getting lantern) + "京極", // Kyogoku + 0x4808, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0589", + "589 F0062:セーラ−１日目に話した", // Sera - spoke on first day + "京極", // Kyogoku + 0x4810, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0588", + "588 ３日目−暴走山羊を初めて逃がした", // First time letting rampaging mountain goat escape + "京極", // Kyogoku + 0x4820, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0587", + "587 ３日目−暴走山羊倒し成功", // successfully defeated rampaging mountain goat + "京極（住吉セット）", + 0x4840, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0586", + "586 ３日目−山羊倒し成功後にボウと話した", // Spoke to Bo after defeating mountain goat + "京極", // Kyogoku + 0x4880, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0585", + "585 １日目−ボウと話した", // 1st day - Spoke to Bo + "京極", // Kyogoku + 0x4701, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0584", + "584 １日目−モイと話した", // 1st Day - spoke to Rusl + "京極", // Kyogoku + 0x4702, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0583", + "583 １日目−イリアと草笛を【吹いた後】に話した", // 1st day - Spoke to Ilia after blowing the reed whistle + "京極", // Kyogoku + 0x4704, + "F_SP104:トアル森", // Ordon Woods + 0xe, + 0xf, +}, +{ + "F_0582", + "582 １日目−イリアと草笛を【吹く前】に話した", // 1st Day - spoke to Ilia before blowing the reed whistle + "京極", // Kyogoku + 0x4708, + "F_SP104:トアル森", // Ordon Woods + 0xe, + 0xf, +}, +{ + "F_0581", + "581 ２日目−初めてトビ草を吹いてタカを呼んだ", // 2nd Day - First time calling the hawk using the grass whistle + "京極", // Kyogoku + 0x4710, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0580", + "580 １日目−トアル泉でエポナの草笛を吹いた", // 1st Day - Blew on Epona's reed whistle at Ordon Spring + "京極", // Kyogoku + 0x4720, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0579", + "579 序盤（２日目）蜂に襲われる前のハンジョーと初会話", // Opening (2nd day) First time talking with Hanch before being attacked by bees + "京極", // Kyogoku + 0x4740, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0578", + "578 F0084:３日目のベスと話した", // Spoke to Beth on 3rd day + "京極", // Kyogoku + 0x4780, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0577", + "577 ２日目−サルからカゴを取り返した（鷹を当てた）", // 2nd Day - Retrieved basket from monkey (hit hawk) + "京極（森田使用）", // Kyogoku (used by Morita) + 0x4601, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0576", + "576 ２日目−ファドと話した", // 2nd Day - Spoke with Fado + "京極", // Kyogoku + 0x4602, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0575", + "575 １日目−夕方の山羊追いエンド", // 1st Day - End mountain goat chasing in evening + "京極", // Kyogoku + 0x4604, + "F_SP00:牧場", // Ranch + 0xc, + 0xd, +}, +{ + "F_0574", + "574 １日目−夕方の山羊追いスタート", // 1st Day - Start mountain goat chasing in evening + "京極", // Kyogoku + 0x4608, + "F_SP00:牧場", // Ranch + 0xc, + 0xd, +}, +{ + "F_0573", + "573 １日目−ファドが牧場に移動（リンク家前から消える）", // 1st Day - Fado moves to the farm (disappears from in front of Link's house) + "京極", // Kyogoku + 0x4610, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0572", + "572 F0027:３日目タロの願い（木刀くれ）を断った（再）", // Refuse Talo's request (for wooden sword) on 3rd day (again) + "京極", // Kyogoku + 0x4620, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0571", + "571 F0027:３日目タロの願い（木刀くれ）を断った（初）", // Refuse Talo's request (for wooden sword) on 3rd day (first time) + "京極", // Kyogoku + 0x4640, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0570", + "570 LV8ダンジョンクリア", // Cleared LV8 dungeon + "京極", // Kyogoku + 0x4680, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0569", + "569 ホヅに弁償請求され中（払ったらリセット）", // Compensation demands from Iza (resets if paid) + "京極", // Kyogoku + 0x4501, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0568", + "568 ホヅのマトを壊した（初犯）", // Broke Iza's pots (first offence) + "京極", // Kyogoku + 0x4502, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0567", + "567 おばちゃんから手紙来てＯＫ（息子○）", // Letter from Ooccoo Sr. came in OK (yes son) + "京極", // Kyogoku + 0x4504, + "おばちゃん関連", // Ooccoo Sr. stuff + 0x1f, + 0x20, +}, +{ + "F_0566", + "566 おばちゃんから手紙来てＯＫ（息子×）", // Letter from Ooccoo Sr. came in OK (no son) + "京極", // Kyogoku + 0x4508, + "おばちゃん関連", // Ooccoo Sr. stuff + 0x1f, + 0x20, +}, +{ + "F_0565", + "565 【２日目終了】", // 2nd Day Complete + "京極", // Kyogoku + 0x4510, + "***", + 0x0, + 0x1, +}, +{ + "F_0564", + "564 TWテルマの店の兵士の話を聞いた", // Heard story from solder at Telma's shop (during Twilight) + "京極", // Kyogoku + 0x4520, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0563", + "563 ゲンゴロウ復活（魂５０ゲット時にプログラムで対応）", // Brought back Gengle (after getting 50 souls, dealt with by program) + "P", + 0x4540, + "その他", // Misc. + 0x20, + 0x21, +}, +{ + "F_0562", + "562 ＬＶ８ダンジョン制御用１２", // LV8 Dungeon control use 12 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4580, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0561", + "561 ＬＶ８ダンジョン制御用１１", // LV8 Dungeon control use 11 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4401, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0560", + "560 ＬＶ８ダンジョン制御用１０", // LV8 Dungeon control use 10 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4402, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0559", + "559 ＬＶ８ダンジョン制御用９", // LV8 Dungeon control use 9 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4404, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0558", + "558 ＬＶ８ダンジョン制御用８", // LV8 Dungeon control use 8 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4408, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0557", + "557 ＬＶ８ダンジョン制御用７", // LV8 Dungeon control use 7 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4410, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0556", + "556 ＬＶ８ダンジョン制御用６", // LV8 Dungeon control use 6 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4420, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0555", + "555 ＬＶ８ダンジョン制御用５", // LV8 Dungeon control use 5 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4440, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0554", + "554 ＬＶ８ダンジョン制御用４", // LV8 Dungeon control use 4 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4480, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0553", + "553 ＬＶ８ダンジョン制御用３", // LV8 Dungeon control use 3 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4301, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0552", + "552 ＬＶ８ダンジョン制御用２", // LV8 Dungeon control use 2 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4302, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0551", + "551 ＬＶ８ダンジョン制御用１", // LV8 Dungeon control use 1 + "京極（酒井さん使用）", // Kyogoku (used by Sakai) + 0x4304, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0550", + "550 センスが使えるようになる", // Gain ability to use sense + "京極", // Kyogoku + 0x4308, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "F_0549", + "549 おばさんA[、]B[、]兵士セット（水の話）の話を聞いた（水無し時）", // Heard old lady A, B, soldier set (talking about water) (when there's no water) + "京極", // Kyogoku + 0x4310, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0548", + "548 序盤３日目−ジャガーと話した", // Opening 3rd day - spoke with Jaggle + "京極", // Kyogoku + 0x4320, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0547", + "547 ゴースト４０個集めてジョバンニと会話", // conversation with Jovani after collecting 40 ghosts + "一角", // Ikkaku + 0x4340, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0546", + "546 東・門前兵士と光（橋不通時に）話した", // East - Spoke with soldier in front of east gate about light (while bridge is broken) + "京極", // Kyogoku + 0x4380, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0545", + "545 おばちゃんと別れのデモ（ＬＶ６後）見た", // Watched cutscene of Ooccoo Sr. parting (after LV6) + "京極", // Kyogoku + 0x4201, + "F_SP117:聖なる森", // Sacred Grove + 0x17, + 0x18, +}, +{ + "F_0544", + "544 パペットに襲われて逃げてくるメスザルデモ見た", // Watched cutscene of monkey girl running away after being attacked by puppet + "京極（森田使用）", // Kyogoku (used by Morita) // Kyogoku (for Morita use) + 0x4202, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0543", + "543 レジスタンスモイと森で再会した", // Met Resistance Rusl again in the woods + "京極", // Kyogoku + 0x4204, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0542", + "542 【デモ】ガノンウォールがなくなる（ミドナ暴走）", // [Cutscene] Ganon wall disappears (Midna goes crazy) + "京極", // Kyogoku + 0x4208, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0541", + "541 @", + "京極（住吉さん使用）", // Kyogoku (for use by Mr. Sumiyoshi) + 0x4210, + "***", + 0x0, + 0x1, +}, +{ + "F_0540", + "540 初ポータルワープ直後のミドナヒント聞いた", // Heard hint from Midna right after first portal warp + "京極", // Kyogoku + 0x4220, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0539", + "539 ファドに山羊追いでハートのかけらもらった", // Receieved heart piece from Fado for mountain goat chase + "京極", // Kyogoku + 0x4240, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0538", + "538 LV7ダンクリア後に天空人のおばちゃんと話した", // Spoke with sky person Oocoo Sr. after clearing LV7 dungeon + "京極", // Kyogoku + 0x4280, + "D_MN07:LV7ダンジョン", // LV7 dungeon + 0x7, + 0x8, +}, +{ + "F_0537", + "537 キコルと狼会話した", // Had Coro and wolf conversation + "京極", // Kyogoku + 0x4101, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0536", + "536 水中ゴロンとお礼もらう前に話した", // Spoke with goron in water before recieving reward + "京極", // Kyogoku + 0x4102, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0535", + "535 水中ゴロンとお礼（ボム袋）後に話した", // Spoke with goron in water after recieving reward (bomb bag) + "京極", // Kyogoku + 0x4104, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0534", + "534 子ども発見前にファドと話した", // Spoke with Fado before finding children + "京極", // Kyogoku + 0x4108, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0533", + "533 子供発見後にファドと話した", // Spoke with Fado after finding children + "京極", // Kyogoku + 0x4110, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0532", + "532 キュリーに盾のこと突っ込まれる", // Pergie butts in about a shield + "京極", // Kyogoku + 0x4120, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0531", + "531 子どもさらわれ中にキュリーと話した", // Spoke with Pergie while children are kidnapped + "京極", // Kyogoku + 0x4140, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0530", + "530 子ども発見後にキュリーと話した", // Spoke with Pergie after finding children + "京極", // Kyogoku + 0x4180, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0529", + "529 LV6ダンクリア後のモイと話した", // Spoke with Rusl after clearing LV6 dungion + "京極", // Kyogoku + 0x4001, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0528", + "528 レジスタンスモイ、金コッコ召喚した", // Resistance Rusl summoned golden cucco + "京極", // Kyogoku + 0x4002, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0527", + "527 レジスタンスモイの頼みを断った", // Refused Resistance Rusl's request + "京極", // Kyogoku + 0x4004, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0526", + "526 【デモ : 23】正体を明かすミドナ", // [Cutscene: 23] Midna reveals her true form + "京極", // Kyogoku + 0x4008, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0525", + "525 水中爆弾売りゾーラと初会話", // First conversation with underwater Zora bomb seller + "京極", // Kyogoku + 0x4010, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0524", + "524 子ども発見後にハンジョーと話した", // Spoke with Hanch after finding children + "京極", // Kyogoku + 0x4020, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0523", + "523 子ども発見前にハンジョーと話した", // Spoke with Hanch before finding children + "京極", // Kyogoku + 0x4040, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0522", + "522 助けたメスザルに聖なる森の話聞いた", // Heard about Sacred Grove from saved monkey girl + "京極", // Kyogoku + 0x4080, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0521", + "521 子ども発見後にセーラとカウンター越しに話した（以降、台詞短縮）", // Spoke with Sera across the counter after finding children (her script is shortened after this) + "京極", // Kyogoku + 0x3f01, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0520", + "520 子ども発見後にセーラと話した", // Spoke with Sera after finding children + "京極", // Kyogoku + 0x3f02, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0519", + "519 子ども発見後にジャガーと会話した", // Spoke with Juggle after finding children + "京極", // Kyogoku + 0x3f04, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0518", + "518 コリン誘拐〜寝込み中のウーリからコリンに手紙出した話聞いた", // Colin kidnapped ~ Heard about giving letter to Colin from sleeping Uli + "京極", // Kyogoku + 0x3f08, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0517", + "517 子ども発見後（コリン誘拐前）ウーリと通常会話１した", // Had normal conversation 1 with Uli after finding kids (before Colin kidnapped) + "京極", // Kyogoku + 0x3f10, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0516", + "516 ウーリに子ども発見のこと自分で伝えた", // Told Uli directly about having found kids + "京極", // Kyogoku + 0x3f20, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0515", + "515 イリア・ラルス復活後にコリンと話した", // Spoke with Colin after Ilia and Ralis are revived + "京極", // Kyogoku + 0x3f40, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0514", + "514 イリア復活前、ラルス帰還後にコリンと話した", // Spoke with Colin after Ralis is revived but before Ilia is revived + "京極", // Kyogoku + 0x3f80, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0513", + "513 イリアもラルスも元気ナシ時にコリンと話した", // Spoke with Colin when neither Ilia nor Ralis are doing well + "京極", // Kyogoku + 0x3e01, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0510", + "510 LV7ダンスタートデモを見た", // Watched LV7 dungion start cutscene + "京極", // Kyogoku + 0x3e02, + "D_MN07:LV7ダンジョン", // LV7 dungeon + 0x7, + 0x8, +}, +{ + "F_0509", + "509 おばちゃんと２度目の対面", // Met Ooccoo Sr. second time + "京極", // Kyogoku + 0x3e04, + "おばちゃん関連", // Ooccoo Sr. stuff + 0x1f, + 0x20, +}, +{ + "F_0508", + "508 おばちゃんに会ったB※OFFにしない（LV1-LV5共通）", // Meb Ooccoo Sr. B - doesnt turn OFF (shared LV1-LV5) + "京極", // Kyogoku + 0x3e08, + "おばちゃん関連", // Ooccoo Sr. stuff + 0x1f, + 0x20, +}, +{ + "F_0507", + "507 おばちゃんと初対面のダンジョンで息子にも会った※506はOFFに(LV1-LV5共通)", // Also met the son in dungeon with first Ooccoo Sr. meeting - turns 506 OFF (shared LV1-LV5) + "京極", // Kyogoku + 0x3e10, + "***", + 0x0, + 0x1, +}, +{ + "F_0506", + "506 おばちゃんにだけ会った※息子まだ(LV1-LV5共通)", // Only met Ooccoo Sr. - not yet son (shared LV1-LV5) + "京極", // Kyogoku + 0x3e20, + "***", + 0x0, + 0x1, +}, +{ + "F_0505", + "505 試練の洞窟−B50初到着（クリア）", // Cave of Ordeals - B50 first arrival (clear) + "京極", // Kyogoku + 0x3e40, + "サブダンジョン", // sub-dungeon + 0x21, + 0x22, +}, +{ + "F_0504", + "504 試練の洞窟−B40初到着", // Cave of Ordeals - B40 first arrival + "京極", // Kyogoku + 0x3e80, + "サブダンジョン", // sub-dungeon + 0x21, + 0x22, +}, +{ + "F_0503", + "503 試練の洞窟−B30初到着", // Cave of Ordeals - B30 first arrival + "京極", // Kyogoku + 0x3d01, + "サブダンジョン", // sub-dungeon + 0x21, + 0x22, +}, +{ + "F_0502", + "502 試練の洞窟−B20初到着", // Cave of Ordeals - B20 first arrival + "京極", // Kyogoku + 0x3d02, + "サブダンジョン", // sub-dungeon + 0x21, + 0x22, +}, +{ + "F_0501", + "501 試練の洞窟−B10初到着", // Cave of Ordeals - B10 first arrival + "京極", // Kyogoku + 0x3d04, + "サブダンジョン", // sub-dungeon + 0x21, + 0x22, +}, +{ + "F_0500", + "500 子ども発見前にウーリに会ってる（寝てるモイを見てる）", // Met Uli before finding kids (look at sleeping Rusl) + "京極", // Kyogoku + 0x3d08, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0499", + "499 溶岩弾ゴロンを救出した", // Saved magma goron + "京極", // Kyogoku + 0x3d10, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0498", + "498 ラルス帰還後にベスと話した", // Spoke with Beth after Lalis is revived + "京極", // Kyogoku + 0x3d20, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0497", + "497 ゴールドウルフ消去７", // Gold wolf disappearance 7 + "京極", // Kyogoku + 0x3d40, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0496", + "496 ゴールドウルフ消去６", // Gold wolf disappearance 6 + "京極", // Kyogoku + 0x3d80, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0495", + "495 ゴールドウルフ消去５", // Gold wolf disappearance 5 + "京極", // Kyogoku + 0x3c01, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0494", + "494 ゴールドウルフ消去４", // Gold wolf disappearance 4 + "京極", // Kyogoku + 0x3c02, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0493", + "493 ゴールドウルフ消去３", // Gold wolf disappearance 3 + "京極", // Kyogoku + 0x3c04, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0492", + "492 ゴールドウルフ消去２", // Gold wolf disappearance 2 + "京極", // Kyogoku + 0x3c08, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0491", + "491 LV2ダンクリア後に中ボス（マグネゴロン）と話した", // Spoke with mini-boss (magnet goron) after LV2 dungeon clear + "京極", // Kyogoku + 0x3c10, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0490", + "490 コッコAと話した（リンク食った疑惑）", // Spoke with cucco (thinks Link will eat him) + "京極", // Kyogoku + 0x3c20, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0489", + "489 ボム屋前ゴロンと会話−爆弾全種登場", // Conversation with goron in front of bomb shop - all bomb types appear + "京極", // Kyogoku + 0x3c40, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0488", + "488 ボム屋前ゴロンと会話−水中爆弾登場", // Conversation with goron in front of bomb shop - underwater bomb appears + "京極", // Kyogoku + 0x3c80, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0487", + "487 ラルス帰った後にルダと会話", // Spoke with Luda after Ralis returns home + "京極", // Kyogoku + 0x3b01, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0486", + "486 ラルス墓参り中にルダと会話した", // Spoke with Luda while Ralis is visiting graveyard + "京極", // Kyogoku + 0x3b02, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0485", + "485 トビーから修理の話を１度聞いた", // Heard Fyer talk about repairs 1 time + "京極", // Kyogoku + 0x3b04, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0484", + "484 天空大砲修理完了！", // Completed sky canon repairs! + "京極", // Kyogoku + 0x3b08, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0483", + "483 雪女にスノボで初めて勝った（ハートのかけら）", // First beat Yeta at snowboard (heart piece) + "京極", // Kyogoku + 0x3b10, + "F_SP114:雪山", // Snowpeak mountain + 0x14, + 0x15, +}, +{ + "F_0482", + "482 雪男に勝利後、雪女と頂上で初会話（勝負を挑まれる）", // After beating Yeto, first conversation with Yeta at peack (challanged to a match) + "京極", // Kyogoku + 0x3b20, + "***", + 0x0, + 0x1, +}, +{ + "F_0481", + "481 雪男にスノボで初めて勝った", // Beat Yeta at snowboard first time + "京極", // Kyogoku + 0x3b40, + "F_SP114:雪山", // Snowpeak mountain + 0x14, + 0x15, +}, +{ + "F_0480", + "480 ラルスから珊瑚の耳飾りもらった", // Received Coral Earrings from Ralis + "京極", // Kyogoku + 0x3b80, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0479", + "479 墓前のラルスと初会話", // First conversation with Ralis in front of grave + "京極", // Kyogoku + 0x3a01, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0478", + "478 ゾーラの里に戻ったラルスと会話", // Spoke to Ralis who returned to Zora's domain + "京極", // Kyogoku + 0x3a02, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0477", + "477 遠吠え完了（奥義７用）", // Distant howling complete (for secret technique 7) + "京極", // Kyogoku + 0x3a04, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0476", + "476 遠吠え完了（奥義６用）", // Distant howling complete (for secret technique 6) + "京極", // Kyogoku + 0x3a08, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0475", + "475 遠吠え完了（奥義５用）", // Distant howling complete (for secret technique 5) + "京極", // Kyogoku + 0x3a10, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0474", + "474 遠吠え完了（奥義４用）", // Distant howling complete (for secret technique 4) + "京極", // Kyogoku + 0x3a20, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0473", + "473 遠吠え完了（奥義３用）", // Distant howling complete (for secret technique 3) + "京極", // Kyogoku + 0x3a40, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0472", + "472 遠吠え完了（奥義２用）", // Distant howling complete (for secret technique 2) + "京極", // Kyogoku + 0x3a80, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0471", + "471 ボウとの相撲２回戦終了", // Finished 2 wrestling matches against Bo + "京極", // Kyogoku + 0x3901, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0470", + "470 釣り用予約", // Reserved for fishing + "京極", // Kyogoku + 0x3902, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0469", + "469 釣り用予約", // Reserved for fishing + "京極", // Kyogoku + 0x3904, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0468", + "468 釣り用予約", // Reserved for fishing + "京極", // Kyogoku + 0x3908, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0467", + "467 釣り用予約", + "京極", // Kyogoku + 0x3910, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0466", + "466 釣り用予約", // Reserved for fishing + "京極", // Kyogoku + 0x3920, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0465", + "465 釣り用予約", // Reserved for fishing + "京極", // Kyogoku + 0x3940, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0464", + "464 釣り用予約", // Reserved for fishing + "京極", // Kyogoku + 0x3980, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0463", + "463 釣り用予約", // Reserved for fishing + "京極", // Kyogoku + 0x3801, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0462", + "462 釣り用予約", // Reserved for fishing + "京極", // Kyogoku + 0x3802, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0461", + "461 つりぼりハウスに初めて入店した", // First time entered fishing house + "京極（森田使用）", // Kyogoku (used by Morita) // Kyogoku (for Morita use) + 0x3804, + "釣り", // Fishing + 0x28, + 0x29, +}, +{ + "F_0460", + "460 ゴースト５０個集めてゲンゴロウと会話", // Coversation with Gengle after collecting 50 ghosts + "京極", // Kyogoku + 0x3808, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0459", + "459 ゴースト４０個集めてゲンゴロウと会話", // Coversation with Gengle after collecting 40 ghosts + "京極", // Kyogoku + 0x3810, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0458", + "458 ゴースト６０個集めてジョバンニと会話", // Coversation with Jovani after collecting 60 ghosts + "京極", // Kyogoku + 0x3820, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0457", + "457 猫復活", // Revived cat + "京極", // Kyogoku + 0x3840, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0456", + "456 ジョバンニと初対面", // First time meeting with Jovani + "京極", // Kyogoku + 0x3880, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0455", + "455 募金長老から３個目のカギもらった(205)", // Recieved 3rd key from fundraising elder (205) + "京極", // Kyogoku + 0x3701, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0454", + "454 募金長老から２個目のカギもらった(206)", // Recieved 3rd key from fundraising elder (206) + "京極", // Kyogoku + 0x3702, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0453", + "453 ポストマン初登場", // Postman first appears + "京極", // Kyogoku + 0x3704, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0450", + "450 Wクローショット屋最終段階初会話", // Double Clawshot shop final stage first conversation + "京極", // Kyogoku + 0x3708, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0449", + "449 ドン・レゲーヌと再会話−温泉水親ゴロンと会話後初（募金前）", // Talk with Gor Liggs again - first time after talking iwth Hot spring water parent goron (before fundraising) + "京極", // Kyogoku + 0x3710, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0448", + "448 【ビン捕獲中】カゲロウ♀", // [Captured in bottle] Dayfly (F) + "京極", // Kyogoku + 0x3720, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0447", + "447 【ビン捕獲中】カゲロウ♂", // [Captured in bottle] Dayfly (M) + "京極", // Kyogoku + 0x3740, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0446", + "446 【ビン捕獲中】アリ♀", // [Captured in bottle] Ant (F) + "京極", // Kyogoku + 0x3780, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0445", + "445 【ビン捕獲中】アリ♂", // [Captured in bottle] Ant (M) + "京極", // Kyogoku + 0x3601, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0444", + "444 【ビン捕獲中】トンボ♀", // [Captured in bottle] Dragonfly (F) + "京極", // Kyogoku + 0x3602, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0443", + "443 【ビン捕獲中】トンボ♂", // [Captured in bottle] Dragonfly (M) + "京極", // Kyogoku + 0x3604, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0442", + "442 【ビン捕獲中】カタツムリ♀", // [Captured in bottle] Snail (F) + "京極", // Kyogoku + 0x3608, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0441", + "441 【ビン捕獲中】カタツムリ♂", // [Captured in bottle] Snail (M) + "京極", // Kyogoku + 0x3610, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0440", + "440 【ビン捕獲中】テントウムシ♀", // [Captured in bottle] Ladybug (F) + "京極", // Kyogoku + 0x3620, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0439", + "439 【ビン捕獲中】テントウムシ♂", // [Captured in bottle] Ladybug (M) + "京極", // Kyogoku + 0x3640, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0438", + "438 【ビン捕獲中】カマキリ♀", // [Captured in bottle] Mantis (F) + "京極", // Kyogoku + 0x3680, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0437", + "437 【ビン捕獲中】カマキリ♂", // [Captured in bottle] Mantis (M) + "京極", // Kyogoku + 0x3501, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0436", + "436 【ビン捕獲中】ダンゴムシ♀", // [Captured in bottle] Pill bug (F) + "京極", // Kyogoku + 0x3502, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0435", + "435 【ビン捕獲中】ダンゴムシ♂", // [Captured in bottle] Pill bug (M) + "京極", // Kyogoku + 0x3504, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0434", + "434 【ビン捕獲中】ナナフシ♀", // [Captured in bottle] Phasmid (F) + "京極", // Kyogoku + 0x3508, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0433", + "433 【ビン捕獲中】ナナフシ♂", // [Captured in bottle] Phasmid (M) + "京極", // Kyogoku + 0x3510, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0432", + "432 【ビン捕獲中】バッタ♀", // [Captured in bottle] Grasshopper (F) + "京極", // Kyogoku + 0x3520, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0431", + "431 【ビン捕獲中】バッタ♂", // [Captured in bottle] Grasshopper (M) + "京極", // Kyogoku + 0x3540, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0430", + "430 【ビン捕獲中】クワガタ♀", // [Captured in bottle] Stag beetle (F) + "京極", // Kyogoku + 0x3580, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0429", + "429 【ビン捕獲中】クワガタ♂", // [Captured in bottle] Stag beetle (M) + "京極", // Kyogoku + 0x3401, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0428", + "428 【ビン捕獲中】チョウチョ♀", // [Captured in bottle] Butterfly (F) + "京極", // Kyogoku + 0x3402, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0427", + "427 【ビン捕獲中】チョウチョ♂", // [Captured in bottle] Butterfly (M) + "京極", // Kyogoku + 0x3404, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0426", + "426 【ビン捕獲中】カブトムシ♀", // [Captured in bottle] Beetle (F) + "京極", // Kyogoku + 0x3408, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0425", + "425 【ビン捕獲中】カブトムシ♂", // [Captured in bottle] Beetle (M) + "京極", // Kyogoku + 0x3410, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0424", + "424 カゲロウ♀", // Dayfly (F) + "京極", // Kyogoku + 0x3420, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0423", + "423 カゲロウ♂", // Dayfly (M) + "京極", // Kyogoku + 0x3440, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0422", + "422 アリ♀", // Ant (F) + "京極", // Kyogoku + 0x3480, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0421", + "421 アリ♂", // Ant (M) + "京極", // Kyogoku + 0x3301, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0420", + "420 トンボ♀", // Dragonfly (F) + "京極", // Kyogoku + 0x3302, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0419", + "419 トンボ♂", // Dragonfly (M) + "京極", // Kyogoku + 0x3304, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0418", + "418 カタツムリ♀", // Snail (F) + "京極", // Kyogoku + 0x3308, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0417", + "417 カタツムリ♂", // Snail (M) + "京極", // Kyogoku + 0x3310, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0416", + "416 テントウムシ♀", // Ladybug (F) + "京極", // Kyogoku + 0x3320, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0415", + "415 テントウムシ♂", // Ladybug (M) + "京極", // Kyogoku + 0x3340, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0414", + "414 カマキリ♀", // Mantis (F) + "京極", // Kyogoku + 0x3380, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0413", + "413 カマキリ♂", // Mantis (M) + "京極", // Kyogoku + 0x3201, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0412", + "412 ダンゴムシ♀", // Pill bug (F) + "京極", // Kyogoku + 0x3202, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0411", + "411 ダンゴムシ♂", // Pill bug (M) + "京極", // Kyogoku + 0x3204, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0410", + "410 ナナフシ♀", // Phasmid (F) + "京極", // Kyogoku + 0x3208, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0409", + "409 ナナフシ♂", // Phasmid (M) + "京極", // Kyogoku + 0x3210, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0408", + "408 バッタ♀", // Grasshopper (F) + "京極", // Kyogoku + 0x3220, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0407", + "407 バッタ♂", // Grasshopper (M) + "京極", // Kyogoku + 0x3240, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0406", + "406 クワガタ♀", // Stag beetle (F) + "京極", // Kyogoku + 0x3280, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0405", + "405 クワガタ♂", // Stag beetle (M) + "京極", // Kyogoku + 0x3101, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0404", + "404 チョウチョ♀", // Butterfly (F) + "京極", // Kyogoku + 0x3102, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0403", + "403 チョウチョ♂", // Butterfly (M) + "京極", // Kyogoku + 0x3104, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0402", + "402 カブトムシ♀", // Beetle (F) + "京極", // Kyogoku + 0x3108, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0401", + "401 カブトムシ♂", // Beetle (M) + "京極", // Kyogoku + 0x3110, + "黄金虫", // Golden bugs + 0x24, + 0x25, +}, +{ + "F_0400", + "400 天空砲台をハイリア湖にワープした", // Warped sky cannon to Lake Hylia + "京極", // Kyogoku + 0x3120, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0399", + "399 ドン・レゲーヌ会話-温泉ゲーム可能", // Conversation with Gor Liggs - hot spring game available + "京極", // Kyogoku + 0x3140, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0398", + "398 ドン・レゲーヌ会話シーケンスC", // Gor Liggs conversation sequence C + "京極", // Kyogoku + 0x3180, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0397", + "397 ドン・レゲーヌ会話シーケンスB", // Gor Liggs conversation sequence B + "京極", // Kyogoku + 0x3001, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0396", + "396 温泉水運び失敗した（長老と話したらリセット）", // Failed to carry hot spring water (speak with elder to reset) + "京極", // Kyogoku + 0x3002, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0395", + "395 ドン・レゲーヌとカカリコ村で初会話", // First conversation with Gor Liggs in Kakariko Village + "京極", // Kyogoku + 0x3004, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0394", + "394 チビ長老から１個目のカギもらった(204)", // Received first key from chibi elder (204) + "京極", // Kyogoku + 0x3008, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0393", + "393 ポウ屋と初めて会話（汎用ポウ登場）", // First conversation at Poe shop (generic Poe appearance) + "京極", // Kyogoku + 0x3010, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0392", + "392 城下町南開通後に穴掘りゴロンと話した", // spoke with goron digging hole after opening caslt town south road + "京極", // Kyogoku + 0x3020, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0391", + "391 城下町南ゴロンに温泉水渡した", // Gave spring water to goron south of castle town + "京極", // Kyogoku + 0x3040, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0390", + "390 ジョバンニ救出前に初会話", // First conversation after saving Jovani + "京極", // Kyogoku + 0x3080, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0389", + "389 南穴掘りゴロンと初会話", // First conversation with goron digging hole in south + "京極", // Kyogoku + 0x2f01, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0388", + "388 墓地−シーン切り替え後のラルスと話した（耳飾り入手前）", // Graveyard - Spoke with Ralis after changing scene (before obtaining earrings) + "京極", // Kyogoku + 0x2f02, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0387", + "387 薬品のにおいを覚えた", // Learned scent of medicine + "京極", // Kyogoku + 0x2f04, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0386", + "386 ポケ虫・地雷発売後にバーンズと会話", // Conversation with Barnes after he starts selling Bomblings and landmines + "京極", // Kyogoku + 0x2f08, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0385", + "385 水中爆弾入荷後にバーンズと初会話", // First conversation with Barnes after stocking water bombs + "京極", // Kyogoku + 0x2f10, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0384", + "384 温泉水屋　休業中に子ゴロンと話した", // Spring water shop - Spoke with child goron while shop closed + "京極", // Kyogoku + 0x2f20, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0383", + "383 温泉水屋オープン後に子どもゴロンと話した", // Spoke with child goron after spring water shop opens + "京極", // Kyogoku + 0x2f40, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0382", + "382 倒れているゴロンの嘆きを聞いた（橋壊れ中）", // Listened to laments of fallen goron (while bridge broken) + "京極", // Kyogoku + 0x2f80, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0381", + "381 温泉水屋オープン後、親ゴロンと初会話", // First conversation with parent goron after spring water shop opens + "京極", // Kyogoku + 0x2e01, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0380", + "380 アゲハと初対面済（虫集め依頼受けた）", // Complete first meeting with Agetha (Recieved bug collection quest) + "京極", // Kyogoku + 0x2e02, + "***", + 0x0, + 0x1, +}, +{ + "F_0379", + "379 黄金虫コンプリート完了", // Completed golden bugs + "京極", // Kyogoku + 0x2e04, + "***", + 0x0, + 0x1, +}, +{ + "F_0378", + "378 ダルボスが隠れ里の岩壊した", // Darbus destroyed hidden village boulder + "京極", // Kyogoku + 0x2e08, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0377", + "377 ゴロンの温泉水屋オープン！", // Goron spring water shop open! + "京極", // Kyogoku + 0x2e10, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0376", + "376 橋補修費用の募金達成！（プログラムで募金直後にSET）", // Gathered funds for bridge repair! (set by program after raising funds) + "京極（吉見使用）", // Kyogoku (used by Yoshimi) + 0x2e20, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0375", + "375 マロマート募金ゴロンと初会話", // First conversation with fundraising goron at Malo Mart + "京極", // Kyogoku + 0x2e40, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0374", + "374 ＬＶ２ダンクリア後の相撲部屋でダルボスと会話", // Conversation with Darbus in wrestling room after LV2 dungeon clear + "京極", // Kyogoku + 0x2e80, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0373", + "373 イリア記憶復活後、ダルボスと会話した", // Coversation with Darbus after Ilia's memories restored + "京極", // Kyogoku + 0x2d01, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0372", + "372 ネコ救出前にミルクを買おうとした", // Tried to by milk before saving cat + "京極", // Kyogoku + 0x2d02, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0371", + "371 ボム屋前ゴロンと初会話した（爆弾のみ販売時）", // First conversation wtih goron in front of bomb shop (while only selling bombs) + "京極", // Kyogoku + 0x2d04, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0370", + "370 カカリコ温泉ゴロン（大人）と初会話した", // First converstaion with Karakiko springs goron (adult) + "京極", // Kyogoku + 0x2d08, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0369", + "369 見張り小屋前ゴロンと初会話", // First conversation with goron in front of watch tower + "京極", // Kyogoku + 0x2d10, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0368", + "368 ホテル前ゴロンと初会話", // First conversation wtih goron in front of hotel + "京極", // Kyogoku + 0x2d20, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0367", + "367 LV2ダンクリア後に登山道入り口通せんぼゴロンと話した", // Spoke with goron blocking mountain path after LV2 dungeon clear + "京極", // Kyogoku + 0x2d40, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0366", + "366 イリア記憶復活後にドン・コローネと話した", // Spoke with Gor Liggs after Ilia's memories restored + "京極", // Kyogoku + 0x2d80, + "R_SP110:デスマウンテン(部屋)", // Death Mountain (room) + 0x1b, + 0x1c, +}, +{ + "F_0365", + "365 LV2ダンクリア後にドン・コローネと話した", // Spoke with Gor Liggs after LV dungeon clear + "京極", // Kyogoku + 0x2c01, + "R_SP110:デスマウンテン(部屋)", // Death Mountain (room) + 0x1b, + 0x1c, +}, +{ + "F_0364", + "364 TWメスザルの嘆きを聞いた", // Listened to monkey girl's laments (Twilight) + "京極", // Kyogoku + 0x2c02, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0363", + "363 夜のトアル村でモイから剣奪った（狼）", // Stole sword from Rusl in Ordon Village at night (wolf) + "京極", // Kyogoku + 0x2c04, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0362", + "362 レジスタンスモイとちゃんと再会の会話した（２回目）", // Properly spoke with Resistance Rusl again (2nd time) + "京極", // Kyogoku + 0x2c08, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0361", + "361 スピナー柱まわした", // Spun the spinning pillars + "京極", // Kyogoku + 0x2c10, + "D_MN10:LV4ダンジョン" // LV4 Dungeon, + 0x9, + 0xa, +}, +{ + "F_0360", + "360 占い師と狼で会話", // Conversation with fortune teller as wolf + "京極", // Kyogoku + 0x2c20, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0359", + "359 ラルス看病中のイリアと話した", // Spoke with Ilia while she's watching over Ralis + "京極", // Kyogoku + 0x2c40, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0358", + "358 イリアの記憶復活後にテルマと会話した", // Spoke with Telma after Ilia's memories restored + "京極", // Kyogoku + 0x2c80, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0357", + "357 帰ってきたテルマ用心棒ゴロンと話した", // Spoke with Telma's guardian goron after she came back + "京極", // Kyogoku + 0x2b01, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0356", + "356 イリアの記憶復活後に町医者と会話した", // Spoke with village doctor after Ilia's memories restored + "京極", // Kyogoku + 0x2b02, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0355", + "355 町医者に木彫りの像を見せた", // Showed wood carving to village doctor + "京極", // Kyogoku + 0x2b04, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0354", + "354 【デモ】鏡完成", // [cutscene] Mirror complete + "京極", // Kyogoku + 0x2b08, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0353", + "353 セレブショップの文句を言うおばさんと会話（F1094）", // Conversation with lady complaining about Chudley's shop + "京極", // Kyogoku + 0x2b10, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0352", + "352 アゲハと２回目の会話（屋外）", // Second conversation with Agetha (outside) + "京極", // Kyogoku + 0x2b20, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0351", + "351 屋外でアゲハと初対面（屋内でも会ってない）：虫イベント依頼された", // First meeting with Agether outside (haven't met inside yet) : gives bug even quest + "京極", // Kyogoku + 0x2b40, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0350", + "350 レナードに木彫りの人形を見せた", // Showed wood carving doll to Renado + "京極", // Kyogoku + 0x2b80, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0349", + "349 LV3ダン前ゾーラ兵士と会話した（入り口爆破後）", // Spoke with Zora soldier in front of LV3 dungeon (after bombing entrance) + "京極", // Kyogoku + 0x2a01, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0348", + "348 LV3ダン前ゾーラ兵士と会話した（入り口爆破前）", // Spoke with Zora soldier in front of LV3 dungeon (before bombing entrance) + "京極", // Kyogoku + 0x2a02, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0347", + "347 LV5ダンクリア後にアッシュと話した", // Spoke with Ashei after LV5 dungeon clear + "京極", // Kyogoku + 0x2a04, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0346", + "346 ラフレルの砂漠行きの頼みを断った", // Turned down Auru's request to go to the desert + "京極", // Kyogoku + 0x2a08, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0345", + "345 序盤２日目−キコルの鍋に点火した", // Opening 2nd day - lit Coro's pot + "京極", // Kyogoku + 0x2a10, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0344", + "344 奥義７習得", // Obtained 7 secret techinques + "京極", // Kyogoku + 0x2a20, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0343", + "343 奥義６習得", // Obtained 6 secret techinques + "京極", // Kyogoku + 0x2a40, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0342", + "342 奥義５習得", // Obtained 5 secret techinques + "京極", // Kyogoku + 0x2a80, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0341", + "341 奥義４習得", // Obtained 4 secret techinques + "京極", // Kyogoku + 0x2901, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0340", + "340 奥義３習得", // Obtained 3 secret techinques + "京極", // Kyogoku + 0x2902, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0339", + "339 奥義２習得", // Obtained 2 secret techinques + "京極（吉見使用）", // Kyogoku (used by Yoshimi) + 0x2904, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0338", + "338 奥義１・盾アタック習得", // Obtained 1 secret techinques - Shield attack + "京極（吉見使用）", // Kyogoku (used by Yoshimi) + 0x2908, + "奥義", // Secret techniques + 0x23, + 0x24, +}, +{ + "F_0337", + "337 おばさんＡ・Ｂの話を聞いた（狼/ラルスのヒント FLOW104）", // Listened to old ladies A/B conversation (wolf / Ralis hint FLOW104) + "京極", // Kyogoku + 0x2910, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0336", + "336 溶岩弾を爆破した", // Blew up molten rock bomb + "京極（吉見使用）", // Kyogoku (used by Yoshimi) + 0x2920, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0335", + "335 雪山でアッシュから走り書もらった", // Obtained scribble from Ashei at mountain pass + "京極", // Kyogoku + 0x2940, + "F_SP114:雪山", // Snowpeak mountain + 0x14, + 0x15, +}, +{ + "F_0334", + "334 マスターソードゲット後にテルマの店でアッシュと話した", // Spoke with Ashei at Telma's shop after getting master sword + "京極", // Kyogoku + 0x2980, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0333", + "333 ウーリに剣のこと突っ込まれた", // Uli brings up the sword + "京極", // Kyogoku + 0x2801, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0332", + "332 子ども発見前にウーリと再会し、話しかけた（２回目）", // Meet again and talk with Uli after finding kids (2nd time) + "京極", // Kyogoku + 0x2802, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0331", + "331 子ども発見前にウーリと再会し、話しかけた（１回目）", // Meet again and talk with Uli after finding kids (1st time) + "京極", // Kyogoku + 0x2804, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0330", + "330 ウーリと初めて再会（最初の強制会話）", // Meet again with Uli for the first time (first forced conversation) + "京極", // Kyogoku + 0x2808, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0329", + "329 ジャガーに盾のことつっこまれた", // Jaggle brings up shield + "京極", // Kyogoku + 0x2810, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0328", + "328 子ども発見前にジャガーと再会して話した", // Talk again with Jaggle after finding kids + "京極", // Kyogoku + 0x2820, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0327", + "327 おばちゃんで初ワープした", // First time warped by Ooccoo Sr. + "京極", // Kyogoku + 0x2840, + "その他", // Misc. + 0x20, + 0x21, +}, +{ + "F_0326", + "326 LV8中ボス攻略フラグ", // LV8 mini-boss defeated flag + "京極（梅宮使用）", // Kyogoku (used by Umemiya) + 0x2880, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0325", + "325 フロー0023ゾーラと溶岩爆破後に会話した", // Flow 0023 Speak with Zora after blowing up magma rock + "京極", // Kyogoku + 0x2701, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0324", + "324 フロー0023ゾーラと溶岩爆破前に会話した", // Flow 0023 Speak with Zora before blowing up magma rock + "京極", // Kyogoku + 0x2702, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0323", + "323 フロー0020ゾーラと会話した", // Flow 0020 Spoke with Zora + "京極", // Kyogoku + 0x2704, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0322", + "322 フロー0010ゾーラとゾーラ服で会話した", // Flow 0010 Spoke with Zora in Zora armor + "京極", // Kyogoku + 0x2708, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "F_0321", + "321 町医者に請求書を見せた", // Showed reciept to town doctor + "京極", // Kyogoku + 0x2710, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0320", + "320 LV8ダンジョン用10", // LV8 Dungeon use 10 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2720, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0319", + "319 LV8ダンジョン用9", // LV8 Dungeon use 9 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2740, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0318", + "318 LV8ダンジョン用8", // LV8 Dungeon use 8 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2780, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0317", + "317 LV8ダンジョン用7", // LV8 Dungeon use 7 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2601, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0316", + "316 LV8ダンジョン用6", // LV8 Dungeon use 6 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2602, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0315", + "315 LV8ダンジョン用5", // LV8 Dungeon use 5 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2604, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0314", + "314 LV8ダンジョン用4", // LV8 Dungeon use 4 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2608, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0313", + "313 LV8ダンジョン用3", // LV8 Dungeon use 3 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2610, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0312", + "312 LV8ダンジョン用2", // LV8 Dungeon use 2 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2620, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0311", + "311 LV8ダンジョン用1", // LV8 Dungeon use 1 + "京極(梅宮使用)", // Kyogoku (used by Umemiya) + 0x2640, + "D_MN08:LV8ダンジョン", // LV8 Dungeon + 0x8, + 0x9, +}, +{ + "F_0310", + "310 トビーにラフレルのメモを渡した", // Hand Auru's note to Fyer + "京極", // Kyogoku + 0x2680, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0309", + "309 アゲハと屋内で初会話（黄金虫捕獲を依頼された）", // First conversation with Agetha inside (gives golden bug capture quest) + "京極", // Kyogoku + 0x2501, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0308", + "308 雪山頂上での雪男と初対面イベント見た（人間）", // Watched first meeting event with Yeto at top of mountain (human) + "京極", // Kyogoku + 0x2502, + "F_SP114:雪山", // Snowpeak mountain + 0x14, + 0x15, +}, +{ + "F_0307", + "307 雪山頂上で雪男と狼で会話した", // Spoke with Yeto at top of mountain as wolf + "京極", // Kyogoku + 0x2504, + "F_SP114:雪山", // Snowpeak mountain + 0x14, + 0x15, +}, +{ + "F_0306", + "306 トビーの大砲で砂漠に行った", // Used Fyer's cannon to go to desert + "京極", // Kyogoku + 0x2508, + "砂漠", // Desert + 0x26, + 0x27, +}, +{ + "F_0305", + "305 ラフレルからトビーの話を聞いた（砂漠大砲ON）", // Heard about Fyer from Auru (desert cannon ON) + "京極", // Kyogoku + 0x2510, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0304", + "304 ハイリア湖でラフレルと会話した", // Spoke with Auru at Hylia Lake + "京極", // Kyogoku + 0x2520, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0303", + "303 シャッドの呪文２みた", // Saw Shad's spell 2 + "京極", // Kyogoku + 0x2540, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0302", + "302 カカリコ村地下でシャッドが呪文を唱えるデモ見た", // Saw cutscene of Shad casting spells underneat Kakariko Village + "京極", // Kyogoku + 0x2580, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0301", + "301 LV7ダンクリア後、シャッドと会話", // Spoke with Shad after LV7 dungeon clear + "京極", // Kyogoku + 0x2401, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0300", + "300 テルマの店でシャッドから天空人の話聞いた", // Heard about Sky People from Shad at Telma's shop + "京極", // Kyogoku + 0x2402, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0299", + "299 マスターソードゲット後、シャッドとテルマの店で会話", // Spoke with Shad at Telma's shop after getting master sword + "京極", // Kyogoku + 0x2404, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0298", + "298 LV4D攻略後、ラフレルと会話した", // Spoke with Auru after completing LV4 dungeon + "京極", // Kyogoku + 0x2408, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0297", + "297 セレブ店員と初めて会話", // First spoke with Chudley store clerk + "京極", // Kyogoku + 0x2410, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0296", + "296 テルマの店の窓から侵入で放り出された後、ルイーズと会話した", // Spoke with Louise after kicked being kicked out of Telma's shop + "京極", // Kyogoku + 0x2420, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0295", + "295 テルマの店侵入（狼）時のルイーズと対面イベント見た", // Watched meeting Louise event when sneaking into Telma's shop (wolf) + "京極", // Kyogoku + 0x2440, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0294", + "294 祈祷師　−　祈りが天に届いた（ハート入手済）", // Shaman - Prayers reached the heavens (heart piece obtained complete) + "京極", // Kyogoku + 0x2480, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0293", + "293 ＷクローショットＬＶ２クリア", // Star Game 2 cleared + "京極", // Kyogoku + 0x2301, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0292", + "292 Ｗクローショット屋ＬＶ２初体験", // Star Game 2 first experience + "京極", // Kyogoku + 0x2302, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "M_097", + "291 魔法使える", // Can use magic + "坂口", // Sakaguchi + 0x2304, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "F_290", + "290 ＷクローショットゲームＬＶ１クリアした", // Double clawshot game LV1 cleared + "京極", // Kyogoku + 0x2308, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_289", + "289 ＷクローショットゲーＬＶ１入場の会話聞いた", // Heard conversation about entering double clawshot game LV1 + "京極", // Kyogoku + 0x2310, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_288", + "288 【デモ : 】イリアが記憶を取り戻した", // [cutscene: ] Ilia gets her memories back + "京極", // Kyogoku + 0x2320, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_287", + "287 イリアに木彫りの像を渡した", // Handed wood carving to Ilia + "京極", // Kyogoku + 0x2340, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_286", + "286 スモモのアトラクションクリア（ハートかけらゲット）", // Cleared Plumm's attraction (get heart piece) + "京極", // Kyogoku + 0x2380, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_285", + "285 スモモと狼で初会話", // First conversation with Plumm as wolf + "京極", // Kyogoku + 0x2201, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_284", + "284 スモモのゲームで得点記録したことある", // Already have a score recorded for Plumm's game + "京極（一角使用）", // Kyogoku (used by Ikkaku) + 0x2202, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_283", + "283 木彫りの像ゲットした", // Get wood carving + "京極", // Kyogoku + 0x2204, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_282", + "282 LV5ダンクリア後の山頂で雪男と初会話", // First conversation with Yeto at peak after LV5 dungeon clear + "京極", // Kyogoku + 0x2208, + "F_SP114:雪山", // Snowpeak mountain + 0x14, + 0x15, +}, +{ + "F_0281", + "281 マロマート城下町店オープン", // Malo Mart opens in Castle Town + "京極", // Kyogoku + 0x2210, + "店", // Shop + 0x2a, + 0x2b, +}, +{ + "F_0280", + "280 ポーチでイリアのにおいの回想デモを見た", // Saw cutscene about Ilia's scent from pouch + "京極", // Kyogoku + 0x2220, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0279", + "279 木刀で子供達のにおいの回想デモを見た", // Saw cutscene about scent of kids from wooden sword + "京極", // Kyogoku + 0x2240, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "F_0278", + "278 インパル婆さんからペンダントもらった", // Received pendant from Impaz + "京極", // Kyogoku + 0x2280, + "F_SP128:隠れ里", // Hidden Village + 0x18, + 0x19, +}, +{ + "F_0277", + "277 ＴＷテルマの店の店内でテルマ＆イリアの会話を聞いた", // Hear conversation between Telma and Ilia in Telma's shop (Twilight) + "京極", // Kyogoku + 0x2101, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0276", + "276 ルイーズに木彫りの像が盗まれた話聞いた", // Heard conversation with Louise about stolen wood carving + "京極", // Kyogoku + 0x2102, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0275", + "275 シャッドの居場所の地図を見た", // Saw Shad's location on map + "京極", // Kyogoku + 0x2104, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0274", + "274 モイの居場所の地図を見た", // Saw Rusl's location on map + "京極", // Kyogoku + 0x2108, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0273", + "273 アッシュの居場所の地図を見た", // Saw Ashei's location on map + "京極", // Kyogoku + 0x2110, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0272", + "272 ラフレルの居場所の地図を見た", // Saw Auru's location on map + "京極", // Kyogoku + 0x2120, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0271", + "271 テルマとマスターソードゲット後会話の後さらに会話した", // Talked with Telma again after the other conversation after getting master sword + "京極", // Kyogoku + 0x2140, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0270", + "270 テルマにレナードの手紙を渡した", // Gave Renado's letter to Telma + "京極", // Kyogoku + 0x2180, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0269", + "269 マスターソードゲット後にテルマと初会話", // First conversation with Telma after getting master sword + "京極", // Kyogoku + 0x2001, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0268", + "268 LV7ダンジョンクリア", // LV7 dungeon clear + "京極", // Kyogoku + 0x2002, + "D_MN07:LV7ダンジョン", // LV7 dungeon + 0x7, + 0x8, +}, +{ + "F_0267", + "267 LV6ダンジョンクリア", // LV6 dungeon clear + "京極", // Kyogoku + 0x2004, + "D_MN06:LV6ダンジョン", // LV6 Dungeon + 0x6, + 0x7, +}, +{ + "F_0266", + "266 LV5ダンジョンクリア", // LV5 dungeon clear + "京極", // Kyogoku + 0x2008, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "F_0265", + "265 LV4ダンジョンクリア", // LV4 dungeon clear + "京極", // Kyogoku + 0x2010, + "D_MN10:LV4ダンジョン" // LV4 Dungeon, + 0x9, + 0xa, +}, +{ + "F_0264", + "264 マスターソードゲット", // get master sword + "京極", // Kyogoku + 0x2020, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0263", + "263 レジスタンスのアッシュと初会話③（馬鹿にされる時）", // First conversation with Resistance Ashei (3) (made fun of) + "京極", // Kyogoku + 0x2040, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0262", + "262 レジスタンスのシャッドと初会話（馬鹿にされる時）", // First conversation with Resistance Shad (made fun of) + "京極", // Kyogoku + 0x2080, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0261", + "261 レジスタンスのラフレルと初会話（馬鹿にされる時）", // First conversation with Resistance Auru (made fun of) + "京極", // Kyogoku + 0x1f01, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0260", + "260 レジスタンスのモイに初めて声をかけた", // First time speaking to Resistance Rusl + "京極", // Kyogoku + 0x1f02, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0259", + "259 最初の強制ミドナ台詞を聞いた", // Heard first forced dialogue from Midna + "京極", // Kyogoku + 0x1f04, + "E3_2006用", // For E3 2006 + 0xb, + 0xc, +}, +{ + "F_0258", + "258 ヘビースイッチの真上でヒントを聞いた", // Heard hint right above heavy switch + "京極", // Kyogoku + 0x1f08, + "E3_2006用", // For E3 2006 + 0xb, + 0xc, +}, +{ + "F_0257", + "257 ボスがこけてる真っ最中のみON（普段はOFFでリアルタイム変化）", // Only ON when boss is in hollow state (normally off, changes in real time) + "京極", // Kyogoku + 0x1f10, + "E3_2006用", // For E3 2006 + 0xb, + 0xc, +}, +{ + "F_0256", + "256 一度でもボスをダウンさせた", // Knocked down boss at leased once + "京極（森田使用）", // Kyogoku (used by Morita) + 0x1f20, + "E3_2006用", // For E3 2006 + 0xb, + 0xc, +}, +{ + "F_0255", + "255 ボスがヘロヘロ（鎖つかむ場面）状態の時のみON（普段はOFF）", // Boss exhausted (grabbing chains) only on during state (normally off) + "京極", // Kyogoku + 0x1f40, + "E3_2006用", // For E3 2006 + 0xb, + 0xc, +}, +{ + "F_0254", + "254 一度でもボスの弱点にヒットさせた", // Hit boss's weak spot at least once + "京極（森田使用）", // Kyogoku (used by Morita) + 0x1f80, + "E3_2006用", // For E3 2006 + 0xb, + 0xc, +}, +{ + "F_0253", + "253 一度でもマグネリフトに張り付いた", // Stuck to magnet lift at least once + "京極（梅宮使用）", // Kyogoku (used by Umemiya) + 0x1e01, + "E3_2006用", // For E3 2006 + 0xb, + 0xc, +}, +{ + "F_0252", + "252 子供行方不明中にセーラに話しかけた（店処理に入った）", // Spoke to Sera while kids are missing (dealing with shop) + "京極", // Kyogoku + 0x1e02, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0251", + "251 子供発見前にセーラと再会（強制会話）", // Speak again with Sera before finding kids (forced conversation) + "京極", // Kyogoku + 0x1e04, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0250", + "250 【デモ : 21】ゼルダ再会・ミドナ復活（ガノンウォール発生）", // [cutscene: 21] reunion with Zelda / Midna revived (Ganon wall appears) + "京極", // Kyogoku + 0x1e08, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0249", + "249 ラッカゲーム代金払って出ようとした（初回のみ）", // Try to leave after paying for Flight by Fowl (first time only) + "京極", // Kyogoku + 0x1e10, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0248", + "248 森の神殿クリア後、キコルと会話した", // Speak with Coro after clearing Forest Temple + "京極", // Kyogoku + 0x1e20, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0247", + "247 マロマート資金援助後、マロと初会話（買い物終了時）", // First conversation with Malo (shopping complete) after helping Malo Mart fundraiser + "京極", // Kyogoku + 0x1e40, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0246", + "246 マロマート募金（＆温泉水運び）開始", // Malo Mart fundraiser (and carying spring water) start + "京極", // Kyogoku + 0x1e80, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "MAP_VISIBLE", + "245 エリアマップの表示・非表示", // Area map show/hide + "坂口", // Sakaguchi + 0x1d01, + "２Ｄマップ", // 2D Map + 0x1e, + 0x1f, +}, +{ + "F_0244", + "244 コリンが汗を拭かれている時にタロと会話した", // Speak to Talo while COlin is wiping sweat + "京極", // Kyogoku + 0x1d02, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0243", + "243 コリンの汗を拭くルダと会話した", // Speak with Luda wiping Colin's sweat + "京極", // Kyogoku + 0x1d04, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0242", + "242 火魔人戦直後、放心状態の族長ゴロンと会話した", // Spoke with the dazed chief goron after Fyrus battle + "京極", // Kyogoku + 0x1d08, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "F_0241", + "241 ボム屋開店後、バーンズと初会話", // First conversation with Barnes after bomb shop open + "京極", // Kyogoku + 0x1d10, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0240", + "240 爆弾制作中のバーンズと話した", // Speak with Barnes while heas making bombs + "京極", // Kyogoku + 0x1d20, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "T_0239", + "239 トビーと会話した（闇カーゴ開始）", // Spoke with Fyer (start dark carge) + "京極", // Kyogoku + 0x1d40, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0238", + "238 パペットを全滅させた（聖なる森前のメスザルイベント）", // Destroyed all puppets (monkey girl event before sacred grove) + "京極（森田使用）", // Kyogoku (used by Morita) + 0x1d80, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0237", + "237 マロの店に入った（マロと喋った）", // Entered Malo Mart (chatted with Malo) + "京極", // Kyogoku + 0x1c01, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0236", + "236 カカリコ村前の橋ワープ先間違えてミドナに怒られた", // Make Midna angry after doing wrong destination for Kakariko bridge warp + "京極", // Kyogoku + 0x1c02, + "その他", // Misc. + 0x20, + 0x21, +}, +{ + "F_0235", + "235 巨人ゲ−ムクリア", // Giant game clear + "住吉", // Sumiyoshi + 0x1c04, + "F_SP117:聖なる森", // Sacred Grove + 0x17, + 0x18, +}, +{ + "F_234", + "234 トリルに襲われた", // Attacked by Trill + "京極", // Kyogoku + 0x1c08, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0233", + "233 ボウとの練習試合に勝利（ブーツ入手前）", // Win practice battle with Bo (before getting boots) + "京極", // Kyogoku + 0x1c10, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0232", + "232 ボウからアイアンブーツを譲り受けた", // get iron boots from Bo + "京極", // Kyogoku + 0x1c20, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0231", + "231 ボウと初めて相撲とった", // Did first wrestle match with Bo + "京極", // Kyogoku + 0x1c40, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0230", + "230 トワイライト/ゴロンBのぼやきを聞いた", // Twilight - listened to goron B's complaints + "京極", // Kyogoku + 0x1c80, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0229", + "229 カンテラ拾わずに（猿返却後）迷い霧の森を出ようとした", // Try to leave the mist woods area without lantern (after returning monkey) + "京極", // Kyogoku + 0x1b01, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0228", + "228 トワイライト登山道入り口ゴロンのぼやきを聞いた", // Listened to goron's complaint at the entrance to twilight mountain path + "京極", // Kyogoku + 0x1b02, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0227", + "227 カンテラとられたまま迷い霧の森を出ようとした", // Try to leave mist woods after lantern taken + "京極", // Kyogoku + 0x1b04, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0226", + "226 猿にとられたカンテラを再取得", // Get lantern back from monkey + "京極/森田さん使用", // Kyoguku/Used by Mr. Morita + 0x1b08, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0225", + "225 カンテラ誘導猿が２度と出てこない", // Lanter guide monkey doesn't come out a second time + "京極/森田さん使用", // Kyoguku/Used by Mr. Morita + 0x1b10, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0224", + "224 カンテラ誘導ザルデモ用フラグ", // Flag for lantern guide monkey cutscene + "京極/森田さん使用", // Kyoguku/Used by Mr. Morita + 0x1b20, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0223", + "223 闇蟲倒す前のキコルの台詞聞いた", // Listened to Coro's dialogue before defeating shadow bugs + "京極", // Kyogoku + 0x1b40, + "R_SP108:フィローネの森キコリ屋内", // Farron Woods inside woodcutter's shop + 0x1a, + 0x1b, +}, +{ + "F_0222", + "222 キコル点火イベント終了", // Finished Coro ignite event + "京極", // Kyogoku + 0x1b80, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0221", + "221 精霊から光の器もらった", // Received vessel of light from spirit + "京極", // Kyogoku + 0x1a01, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0220", + "220 初・城の地下にいるＴＷハイラル兵どちらかの話を聞いた", // First time - Talked to one of the Hyrule soldiers underneath castle in Twilight + "京極", // Kyogoku + 0x1a02, + "R_SP107:ハイラル城内部", // Inside Hyrule Castle + 0x19, + 0x1a, +}, +{ + "F_0219", + "219 アゲハ「持ってるクセに」聞いた", // Heard Agetha say "but you have some" + "京極", // Kyogoku + 0x1a04, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0218", + "218 キコルから油入りビンを購入した", // Bought jar of oil from Coro + "京極", // Kyogoku + 0x1a08, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0217", + "217 TW晴らし直後のキコルと再会後　初会話", // First conversation after speaking with Coro again after clearing up twilight + "京極", // Kyogoku + 0x1a10, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0216", + "216 夜のトアル村コッコＢ（白）と会話", // Spoke with Ordon village cucco B (white) + "京極", // Kyogoku + 0x1a20, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0215", + "215 屋根の上のネコと会話した", // Spoke with cat on roof + "京極", // Kyogoku + 0x1a40, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0214", + "214 初めてのミドナＺ常駐ヒントを聞いた", // First heard Midna's hint about Z + "京極", // Kyogoku + 0x1a80, + "R_SP107:ハイラル城内部", // Inside Hyrule Castle + 0x19, + 0x1a, +}, +{ + "F_0213", + "213 カカリコ入り口NS戦後、精霊に呼ばれた", // Called by spirit after NS fight at Kakariko entrance + "京極", // Kyogoku + 0x1901, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0212", + "212 トアルの泉ゲート前のコリンと会話", // Conversation wtih Colin in front of Ordon springs gate + "京極", // Kyogoku + 0x1902, + "F_SP104:トアル森", // Ordon Woods + 0xe, + 0xf, +}, +{ + "F_0211", + "211 ボウ＆ジャガーの盗み聞き成功", // Successfully eavesdrop on Bo and Jaggle + "住吉", // Sumiyoshi + 0x1904, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0210", + "210 F0004:コリン馬止め中に馬に乗ろうとした", // F0004: Try to get on horse when Colin is stopping horse + "京極", // Kyogoku + 0x1908, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0209", + "209 ボウ＆ジャガー盗み聞き失敗で逃亡", // Escape after failing to eavesdrop to Bo and Jaggle + "京極", // Kyogoku + 0x1910, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0208", + "208 ハンジョ−、狼に驚き飛び込んだ", // Hanch leapt after being startled by wolf + "住吉", // Sumiyoshi + 0x1920, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0207", + "207 ハンジョ−、鷹匠デモ見た", // Viewed Hanch, the Hawker cutscene + "住吉", // Sumiyoshi + 0x1940, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0206", + "206 闇の結界タグ：剣と盾そろえずに入ろうとした", // Barrier of darkness tag: tried to enter without getting sword and shield + "京極", // Kyogoku + 0x1980, + "F_SP104:トアル森", // Ordon Woods + 0xe, + 0xf, +}, +{ + "F_0205", + "205 夜のトアル村でモイ＆ウーリの会話を聞いた", // Heard Rusl and Uli talking in Ordon village at night + "京極", // Kyogoku + 0x1801, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0204", + "204 下水道で格子ごしにミドナと会話した", // Talked to Midna from across the bars in the sewer + "京極", // Kyogoku + 0x1802, + "R_SP107:ハイラル城内部", // Inside Hyrule Castle + 0x19, + 0x1a, +}, +{ + "F_0203", + "203 無人販売で初めて盗もうとした（賽銭箱チェックしてない）", // First tried to steal from unnmaned shop (Havent checked donation box) + "京極", // Kyogoku + 0x1804, + "店", // Shop + 0x2a, + 0x2b, +}, +{ + "F_0202", + "202 モイ/狼剣パクり失敗した", // Rusl / Wolf fails to get sword + "京極", // Kyogoku + 0x1808, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0097", + "197 盗み聞きヒント犬と初会話した", // First conversation with dog eavesdrop hint + "京極", // Kyogoku + 0x1810, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0096", + "196 体力1の時にボウと会話したことがある", // Have spoken to Bo with 1 health + "京極", // Kyogoku + 0x1820, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0095", + "195 山羊暴走前にファドと話した", // Spoke to Fado before mountain goat rampage + "京極", // Kyogoku + 0x1840, + "F_SP00:牧場", // Ranch + 0xc, + 0xd, +}, +{ + "F_0094", + "194 タロがサルを追いかけていった", // Talo went after the monkey + "京極", // Kyogoku + 0x1880, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0093", + "193 F:1128 - 南 - 八百屋の女店主と話した", // F:1128 - South - Spoke with female clerk at vegetable stand + "京極", // Kyogoku + 0x1701, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0092", + "192 F:1127 - 南 - 道案内ハイラル兵と話した", // F:1127 - South - Spoke with the Hyrule soldier guide + "京極", // Kyogoku + 0x1702, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0091", + "191 F:1126 - 南 - アゲハのストーカーと話した（屋内でアゲハと会話後）", // F:1126 - South - Spoke with Agetha's stalker (after talking with Agetha inside) + "京極", // Kyogoku + 0x1704, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0090", + "190 F:1126 - 南 - アゲハのストーカーと話した（屋内でアゲハと会話前）", // F:1126 - South - Spoke with Agetha's stalker (before talking with Agetha inside) + "京極", // Kyogoku + 0x1708, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0089", + "189 村長と初めて話した", // Talked to village chief for first time + "京極", // Kyogoku + 0x1710, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0088", + "188 剣チュー中断後にベスと会話した", // Spoke to Beth after quitting sword tutorial + "京極", // Kyogoku + 0x1720, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0087", + "187 キュリーと初会話後、サーチ範囲を出た", // Left search area after first conversation with Pergie + "京極", // Kyogoku + 0x1740, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0086", + "186 鷹でハチの巣を落とした後ハンジョーと会話した", // Spoke with Hanch after knocking down beehive with hawk + "京極", // Kyogoku + 0x1780, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0085", + "184 森の入り口でモイ登場", // Rusl appears at woods entrance + "住吉", // Sumiyoshi + 0x1601, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0084", + "183 序盤２＆３日目：パチンコで蜂の巣を落とした", // Opening days 2&3: knocked down a beehive with slingshot + "京極（森田使用）", // Kyogoku (used by Morita) + 0x1602, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0083", + "182 アゲハからの手紙が届く", // Deliver letter from Agetha + "京極", // Kyogoku + 0x1604, + "手紙", // Letter + 0x27, + 0x28, +}, +{ + "F_0082", + "181 山羊20匹目暴走後にボウと会話済？", // Completed coversation with Bo after 20th mountain goat's rampage + "京極", // Kyogoku + 0x1608, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0081", + "180 山羊20匹暴走した", // 20 mountain goats rampaged + "京極", // Kyogoku + 0x1610, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0080", + "179 山羊暴走イベント全終了", // Completed all of mountain goat rampage event + "京極", // Kyogoku + 0x1620, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0079", + "178 ２日目−暴走山羊倒し成功", // 2nd Day - successful knocked down rampaging mountain goat + "京極", // Kyogoku + 0x1640, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0078", + "177 池に飛び込んでたハンジョーが陸に戻った", // Hanch returned to land after jumping into lake + "京極", // Kyogoku + 0x1680, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0077", + "176 アゲハと屋内で初会話", // First converstaion with Agetha inside + "京極", // Kyogoku + 0x1501, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0076", + "175 池の中にいるハンジョーと喋った", // Spoke to Hanch in lake + "京極", // Kyogoku + 0x1502, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0075", + "174 カボチャを割ってジャガーに怒られた", // Angered Jaggle by destroying pumpkin + "京極", // Kyogoku + 0x1504, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0074", + "173 ハンジョー、蜂に襲われた", // Hanch attacked by bees + "京極", // Kyogoku + 0x1508, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0073", + "172 デカい蜂の巣に突撃して襲われた", // Attacked after charging at large beehive + "京極", // Kyogoku + 0x1510, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0072", + "171 鷹でデカい蜂の巣を落とした", // Knocked down large beehive with hawk + "京極", // Kyogoku + 0x1520, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0071", + "170 ラネール地方ワープ不可", // Cannot warp to Lanayru + "京極", // Kyogoku + 0x1540, + "TW環状フィールド", // Twilight Ring field + 0x1d, + 0x1e, +}, +{ + "M_002", + "169 【デモ : 2】イリアとの出会い（馬を泉につれていく）", // [cutscene: 2] Met with Ilia (brings horse to spring) + "京極", // Kyogoku + 0x1580, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0070", + "168 コリン、ハイハイで森の奥へ行った", // Colin went deep into the woods + "京極", // Kyogoku + 0x1401, + "F_SP104:トアル森", // Ordon Woods + 0xe, + 0xf, +}, +{ + "F_0069", + "167 F0048:コリンに通せんぼを助けたお礼を言われた", // F0048: Thanked by Colen for clearing path + "京極", // Kyogoku + 0x1402, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0068", + "166 @", + "京極", // Kyogoku + 0x1404, + "***", + 0x0, + 0x1, +}, +{ + "F_0067", + "165 セーラに牛乳ビン（1/2）もらった", // Recieved milk jar (1/2) from Sera + "京極", // Kyogoku + 0x1408, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0066", + "164 登山道(R00) ゴロンデモ を初めて見た", // First saw Goron cutscene on mountain path + "京極", // Kyogoku + 0x1410, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0065", + "163 雪女に最後の地図印つけてもらった", // Yeta adds last symbol onto map + "京極", // Kyogoku + 0x1420, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "F_0064", + "162 トマトピューレ入手後に雪女と初会話", // first convo with yeta after obtaining tomato puree + "京極", // Kyogoku + 0x1440, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "F_0063", + "161 初めてトビー大砲を使った", // Used Fyer's cannon for first time + "京極", // Kyogoku + 0x1480, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0062", + "160 初めてトビー大砲ブッチした", // Abandoned taking Fyer's cannon after paying + "京極", // Kyogoku + 0x1301, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "F_0061", + "159 長老ゴロンとの相撲勝利後に温泉ゴロン＆店主の噂話聞いた", // Heard spring goron and shopkeeper rumers after winning wrestling match against elder goron + "京極", // Kyogoku + 0x1302, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0060", + "158 光の世界でホズと初会話", // First conversation with Hozu in the World of Light + "京極", // Kyogoku + 0x1304, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "F_0059", + "157 精霊と光の雫GET後会話（闇が晴れた）←多分未使用。。。", // Conversation after getting spirit and tears of light (darkness cleared) <- probably unused ... + "京極", // Kyogoku + 0x1308, + "+怖いフラグ", // + Scary flag + 0x2, + 0x3, +}, +{ + "F_0058", + "156 テルマの店の扉ごしの声を聞いた", // Listened to voices on other side of door in Telma's shop + "京極", // Kyogoku + 0x1310, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "F_0057", + "155 【デモ : 17】子供たちとの別れ", // [cutscene: 17] Part with the children + "京極", // Kyogoku + 0x1320, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0056", + "154 長老ゴロンに２回以上負けた", // Lost to elder goron 2+ times + "京極", // Kyogoku + 0x1340, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0055", + "153 精霊フィローネから光の器もらった", // Received Vessel of Light from Faron spirit + "京極", // Kyogoku + 0x1380, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0054", + "152 アイアンブーツを履いて長老ゴロンと相撲して負けた", // Lost wrestling match with elder goron while wearing iron boots + "京極", // Kyogoku + 0x1201, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "F_0053", + "151 ナイトストーカー出現デモ見た", // Saw night stalker appearance cutscene + "京極", // Kyogoku + 0x1202, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "F_0052", + "150 ネコ救出前のセーラと２回目の会話をした", // Had 2nd conversaton with Sera before saving cat + "京極", // Kyogoku + 0x1204, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0051", + "149 ネコ救出後、店内でセーラと話した", // Spoke to Sera in the shop after saving cat + "京極", // Kyogoku + 0x1208, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0050", + "148 アイアンブーツゲットデモみた", // Saw cutscene for getting iron boots + "京極", // Kyogoku + 0x1210, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0049", + "147 ウーリの持ち上げチュートリアル ＜投げて失敗＞", // Uli's pick up tutorial + "京極", // Kyogoku + 0x1220, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0048", + "146 ウーリの持ち上げチュートリアル ＜失敗＞", // Uli's pick-up tutorial + "京極", // Kyogoku + 0x1240, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0047", + "145 トアル村ショップ開店後、初来訪", // First visit after Ordon Village shop opens + "京極", // Kyogoku + 0x1280, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0046", + "144 ネコ救出<失敗>後、セーラと話した", // Spoke with Sera after saving(lt;) failing(gt;) cat + "京極", // Kyogoku + 0x1101, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0045", + "143 F0080:序盤３日目−ウーリと話した", // Opening 3rd day - spoke with Uli + "京極", // Kyogoku + 0x1102, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0044", + "142 剣チュートリアル初めて引き受けた", // Accepted sword tutorial first time + "京極", // Kyogoku + 0x1104, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0043", + "141 募金額が２００に減ってから初めて訪れた", // First visit after fundrasing funds drop to 200 + "京極", // Kyogoku + 0x1108, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "F_0042", + "140 寝室前到着直後に雪女と会話した", // Spoke with Yeta right after arriving at bedroom + "京極", // Kyogoku + 0x1110, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "F_0041", + "139 序盤２日目−これがONになった後でハンジョーが蜂に襲われる", // Opening 2nd day - After this is turned ON Hanch is attacked by bees + "京極", // Kyogoku + 0x1120, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0040", + "138 ２日目：草笛吹いた後にジャガーと話した", // 2nd day: Spoke to Jaggle after blowing on whistle + "京極", // Kyogoku + 0x1140, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0039", + "137 ２日目にツタに登ったことでハンジョーに注意された", // Warned by Hanch after climbing vines on 2nd day + "京極", // Kyogoku + 0x1180, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0038", + "136 序盤（２日目）ネコが家に帰った", // Opening (2nd day) cat returns home + "京極", // Kyogoku + 0x1001, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0037", + "135 ジャガー/高台の上で会話したか？", // Jaggle - Spoke on the hill? + "京極", // Kyogoku + 0x1002, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0036", + "134 ジャガーにツタに登る前にL注目で話しかけたか？", // Spoke to Jaggle using L-focus before climbing vines? + "京極", // Kyogoku + 0x1004, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "M_003", + "133 F0003:馬止め中のコリンと会話（釣竿アリ）", // F0003: Spoke to Colin while he is stopping hors (has fishing rod) + "京極", // Kyogoku + 0x1008, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "M_001", + "132 オープニングデモ", // Opening cutscene + "京極", // Kyogoku + 0x1010, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "F_0035", + "131 F0003:馬止め中のコリンと会話（釣竿ナシ）", // F0003: Spoke to Colin while he is stopping hors (doesn't have fishing rod) + "京極", // Kyogoku + 0x1020, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0034", + "130 モイと初会話", // first conversation wtih Rusl + "京極", // Kyogoku + 0x1040, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "M_096", + "129 ３日目：キュリーと話した", // 3rd day: spoke with Pergie + "京極", // Kyogoku + 0x1080, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "M_095", + "128 キコルと初対面（カンテラ入手）", // First time meeting Coro (obtain lantern) + "京極", // Kyogoku + 0xf01, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "M_094", + "127 バイト完了後、初めてホヅ小屋を訪ねた（強制会話）", // First time visiting Rizu's hut after completing river job (forced conversation) + "京極", // Kyogoku + 0xf02, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "M_093", + "126 砂漠デビュー後に初めてトビーと会話した", // First conversation with Fyer after desert's debut + "京極", // Kyogoku + 0xf04, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "M_092", + "125 オルディンの橋をワープで運んだ", // Warped Eldin Bridge + "京極", // Kyogoku + 0xf08, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "M_091", + "124 買収の募金達成（雑貨屋マロが優しくなる）", // Buy out fundraiser amount (Malo becomes nice) + "京極", // Kyogoku + 0xf10, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_090", + "123 請求書見せる前に町医者と会話した", // Spoke to town doctor before showing receipt + "京極", // Kyogoku + 0xf20, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "M_089", + "122 町医者診療所に初めて入った（強制会話）", // First time entering doctor's office (forced conversation) + "京極", // Kyogoku + 0xf40, + "F_SP116:城下町", // Castle Town + 0x16, + 0x17, +}, +{ + "M_088", + "121 牧師から「レナードからの手紙」ゲット", // Get Renado's Letter + "京極", // Kyogoku + 0xf80, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_087", + "120 イリアの記憶イベントスタート", // Ilia memory event start + "京極", // Kyogoku + 0xe01, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "M_086", + "119 闇蟲ボスの光の雫をマップに表示", // Show Boss Bug's Tear of Light on the map + "京極", // Kyogoku + 0xe02, + "TW環状フィールド", // Twilight Ring field + 0x1d, + 0x1e, +}, +{ + "M_085", + "118 闇蟲ボスの光の雫登場直前のミドナ台詞", // Midna dialogue right before Boss Bug's Tear of Light appears + "京極", // Kyogoku + 0xe04, + "TW環状フィールド", // Twilight Ring field + 0x1d, + 0x1e, +}, +{ + "M_084", + "117 雑貨屋マロ初めて買い物シーケンス終了", // Complete sequence of shopping at Malo Mart first time + "京極", // Kyogoku + 0xe08, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_083", + "116 水復活後にトビーの話を聞いた", // Heard Fyer's talk after water restored + "京極", // Kyogoku + 0xe10, + "F_SP115:ハイリア湖", // Lake Hylia + 0x15, + 0x16, +}, +{ + "M_082", + "115 温泉ゴロンAと会話した", // Spoke with spring Goron A + "京極", // Kyogoku + 0xe20, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "M_081", + "114 上に飛ばしてくれるゴロンと初会話（全員共通）", // First conversation with Goron that shoots you up (shared with everyone) + "京極", // Kyogoku + 0xe40, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "M_080", + "113 茶色のコッコと会話した", // Spoke with brown cucco + "京極", // Kyogoku + 0xe80, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "M_079", + "112 夜のトアル村：キュリー家の中のＺジャンプ台詞聞いた", // Ordon village night: Heard Z Jump dialogie in Pergie's house + "京極", // Kyogoku + 0xd01, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "M_078", + "111 カエルＡと会話した", // Spoke with frog A + "京極", // Kyogoku + 0xd02, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "M_077", + "110 ★陰呪の結晶ゲット（変身可能になる）", // Get shadow crystal (can now transform) + "京極", // Kyogoku + 0xd04, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_076", + "109 マロマート城下町店で店員と初会話", // First conversation with Castle Town Malo Mart shop clerk + "京極", // Kyogoku + 0xd08, + "その他", // Misc. + 0x20, + 0x21, +}, +{ + "M_075", + "108 寝室のカギGET直後に雪女と強制会話した", // Forced conversation with Yeta after getting bedroom key + "京極", // Kyogoku + 0xd10, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "M_074", + "107 馬車護衛後のレナードと話した[0031]", // Spoke with Renado after guarding carriage [0031] + "京極", // Kyogoku + 0xd20, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_073", + "106 馬車護衛後のレナードと話した[0030]", // Spoke with Renado after guarding carriage [0030] + "京極", // Kyogoku + 0xd40, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_072", + "105 木彫りの盾ゲット", // Get wooden shield + "京極", // Kyogoku + 0xd80, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "M_071", + "104 【デモ : 20】ザント登場（ミドナ瀕死に）", // [cutscene: 20] Zant appears (during Midna's desperate hour) + "京極", // Kyogoku + 0xc01, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_070", + "103 【デモ : 18】ラネールの精霊復活", // [cutscene: 18] Lanayru spirit restored + "京極", // Kyogoku + 0xc02, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_069", + "102 子どもゴロン店主と初会話", // First conversation with child goron shop clerk + "京極", // Kyogoku + 0xc04, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_068", + "101 ★★★OFFの時は狼の背中に剣盾を背負ってる★★★", // when OFF, wolf carries sword and shield on back + "京極", // Kyogoku + 0xc08, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_067", + "100 ★★★　ミドナ乗降(ON == 乗)　★★★", // Midna riding / not riding (ON == riding) + "京極", // Kyogoku + 0xc10, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_066", + "99 @", + "京極", // Kyogoku + 0xc20, + "***", + 0x0, + 0x1, +}, +{ + "M_065", + "98 LV1ダンジョンクリア後のフィローネ精霊の話を聞いた", // Spoke with Faron spirit after clearing LV1 dungeon + "京極", // Kyogoku + 0xc40, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "M_064", + "97 ハイリア湖の水が戻った（女王ルテラと会話した）", // Water returns to Hylia Lake (spoke with Queen Rutela) + "京極", // Kyogoku + 0xc80, + "F_SP113:ゾーラの里", // Zora's Domain + 0x13, + 0x14, +}, +{ + "M_063", + "96 【ホヅ川下り】バイト終了（川下り１回目）", // [Iza river descent] Finish job (First time descending river) + "京極", // Kyogoku + 0xb01, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "M_062", + "95 【ホヅ】ナイトストーカー戦後、礼を言われた", // [Iza] Says thanks after night stalker battle + "京極", // Kyogoku + 0xb02, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "M_061", + "94 【ホヅ川下り】ガレキ撤去の説明を１回受けている", // [Iza river descent] Got explanation for clearing rubble 1 time + "京極", // Kyogoku + 0xb04, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "M_060", + "93 【ホヅ川下り】小屋内のガレキ撤去中に逃亡２回目", // [Iza river descent] // 2nd time running away while clearing rubble in hut + "京極", // Kyogoku + 0xb08, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "M_059", + "92 雪女から地図をもらった", // received map from Yeta + "京極", // Kyogoku + 0xb10, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "M_058", + "91 雪女と初対面（強制会話）", // First time meeting Yeta (forced converation) + "京極", // Kyogoku + 0xb20, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "M_057", + "90 ライダーボスを倒して、猪デモを見た", // View boar cutscene after defeating King Bulblin + "京極", // Kyogoku + 0xb40, + "砂漠", // Desert + 0x26, + 0x27, +}, +{ + "M_056", + "89 ホヅの悩みを無視した", // Ignored Iza's concerns + "京極", // Kyogoku + 0xb80, + "環状フィールド", // Ring field + 0x25, + 0x26, +}, +{ + "M_055", + "88 一騎討ちで１回でもダメージ与えた", // Did damage at least once during joust/one-on-one battle + "京極", // Kyogoku + 0xa01, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_054", + "87 ★デモ★一騎討ちデモ", // Joust / one-on-one battle cutscene + "京極", // Kyogoku + 0xa02, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_053", + "86 ★デモ★馬上戦デモ", // Horseback battle cutscene + "京極", // Kyogoku + 0xa04, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_052", + "85 ★馬上戦クリア", // Horseback battle clear + "京極", // Kyogoku + 0xa08, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_051", + "84 ★闇カーゴ（大）イベント終了（トビ草が各地に登場）", // Shadow Kargorok (?) (Large) event complete (Horse grass appears in various places) + "京極", // Kyogoku + 0xa10, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_050", + "83 ★一騎うちの橋が消される", // Joust bridge disappears + "京極", // Kyogoku + 0xa20, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_049", + "82 デスマウンテン１匹目の転がりゴロンを投げた", // Threw first rolling goron at death mountain + "京極（吉見使用）", // Kyogoku (used by Yoshimi) + 0xa40, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "M_048", + "81 小屋内でガレキ撤去作業中に逃亡した", // Ran away while clearing rubble at hut + "京極", // Kyogoku + 0xa80, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "M_047", + "80 ホヅTW - 闇蟲倒した後に話を聞いた", // Iza Twilight - Talked after defeating shadow bugs + "京極", // Kyogoku + 0x901, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "M_046", + "79 【ホヅ川下り】川を塞ぐ岩の相談を受けた", // [Iza river descent] Get advice about boulder blocking river + "京極", // Kyogoku + 0x902, + "F_SP112:ゾーラ川", // Zora's River + 0x12, + 0x13, +}, +{ + "M_045", + "78 LV3ダンジョンクリア", // LV3 Dungeon clear + "京極", // Kyogoku + 0x904, + "D_MN01:LV3ダンジョン", // LV3 Dungeon + 0x3, + 0x4, +}, +{ + "M_044", + "77 【バーンズ・ボム屋】プレミアムパック購入した", // [Barnes Bomb Shop] Bought premium pack + "京極", // Kyogoku + 0x908, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_043", + "76 【弓矢ゲ−ム】ホークアイを使って攻略（再挑戦アリ）", // [Bow and Arrow game] Complete using Hawkeye + "京極", // Kyogoku + 0x910, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_042", + "75 【弓矢ゲ−ム】クリア済み", // [Bow and Arrow game] clear + "住吉", // Sumiyoshi + 0x920, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_041", + "74 【弓矢ゲ−ム】初体験した", // [Bow and Arrow game] First attempt + "住吉", // Sumiyoshi + 0x940, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_040", + "73 【弓矢ゲーム】攻略後にタロと話した", // [bow and arrow game] Spoke to Talo after completing + "京極", // Kyogoku + 0x980, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_039", + "72 【弓矢ゲーム】タロと初会話", // [Bow and arrow game] First time talking to Talo + "京極", // Kyogoku + 0x801, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_038", + "71 【弓矢ゲーム】ホークアイのヒント聞いた", // [bow and arrow game] listen to hawkeye hint + "京極", // Kyogoku + 0x802, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_037", + "70 女王ゾーラからゾーラの服をもらった", // Got Zora armor from Zora queen + "京極", // Kyogoku + 0x804, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_036", + "69 ★馬車護衛再開（一騎打ちリベンジ後）", // Begin carriage guarding (after joust revenge) + "京極", // Kyogoku + 0x808, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_035", + "68 【デモ : 35】馬車護衛イベント後", // [cutscene: 35] after carriage guarding event + "京極", // Kyogoku + 0x810, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_034", + "67 【デモ : 19】イリアとの再会LV3", // [cutscene: 19] Reunion with Ilia LV3 + "京極", // Kyogoku + 0x820, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_033", + "66 ★馬車護衛ゲーム開始（F:0022）", // Start carriage guarding game + "京極", // Kyogoku + 0x840, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_032", + "65 溶岩でゾーラ川の氷が溶けた", // Melted Zora river ice with magma rock + "京極", // Kyogoku + 0x880, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_031", + "64 LV2ダンジョンクリア", // LV2 dungeon clear + "京極", // Kyogoku + 0x701, + "D_MN04:LV2ダンジョン", // LV2 Dungeon + 0x4, + 0x5, +}, +{ + "M_030", + "63 ドン・コローネと初会話", // First conversation with Gor Coron + "京極", // Kyogoku + 0x702, + "R_SP110:デスマウンテン(部屋)", // Death Mountain (room) + 0x1b, + 0x1c, +}, +{ + "M_029", + "62 ドン・コローネに相撲勝利", // Win wrestle match against Gor Coron + "京極", // Kyogoku + 0x704, + "R_SP110:デスマウンテン(部屋)", // Death Mountain (room) + 0x1b, + 0x1c, +}, +{ + "M_028", + "61 【デモ : 14】山の精霊復活　コリン達との再会", // [cutscene: 14] restore mountain spirit - Reuinion with Colin et al. + "京極", // Kyogoku + 0x708, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_027", + "60 【デモ : 13】教会にいる子供達（獣の眼）", // [cutscene: 13] kids in the church (beast eyes) + "京極", // Kyogoku + 0x710, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_026", + "59 ボウと再会した（相撲勝負前のデモを見た）", // Reunion with Bo (Watched cutscene before wrestle match) + "京極", // Kyogoku + 0x720, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "M_025", + "58 デブ（長老）ゴロンと初めて相撲勝負した", // First wresting match against fat (elder) goron + "京極", // Kyogoku + 0x740, + "R_SP110:デスマウンテン(部屋)", // Death Mountain (room) + 0x1b, + 0x1c, +}, +{ + "M_024", + "57 【デモ : 16】コリン奪還", // [cutscene: 16] take back Colin + "京極", // Kyogoku + 0x780, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_023", + "56 ★エポナ救出したフラグ", // Epona rescued flag + "京極", // Kyogoku + 0x601, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_022", + "55 ★LV1ダンジョンクリア（ミドナがワープホール出す）★", // LV1 dungeon clear (Midna creates warp hole) + "京極", // Kyogoku + 0x602, + "D_MN05:LV1ダンジョン", // LV1 Dungeon + 0x5, + 0x6, +}, +{ + "M_021", + "54 初ポータルワープ", // First portal warp + "京極", // Kyogoku + 0x604, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_020", + "53 【デモ : 　】コリン誘拐 : 見たらON", // [cutscene: ] Colin kidnapped : ON once watched + "京極", // Kyogoku + 0x608, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_019", + "52 【デモ : 11】森の精霊復活・勇者誕生", // [cutscene: 11] forest spirit revived - Hero's birth + "京極", // Kyogoku + 0x610, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_018", + "51 ★カカリコ橋を元の場所に運んだ", // Brought Kakariko bridge back to original location + "京極", // Kyogoku + 0x620, + "メインイベント", // main event + 0x22, + 0x23, +}, +{ + "M_017", + "50 【デモ : 10】闇のハイラルの森・ミドナ再び", // [cutscene: 10] Dark Hyrule Forest - Midna again + "京極", // Kyogoku + 0x640, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_016", + "49 【デモ : 9】トアル村の精霊出現", // [cutscene: 9] Ordon village spirit appears + "京極", // Kyogoku + 0x680, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_015", + "48 ミドナのＢため攻撃使用可能になる", // Can use Midna's B charge attack + "京極", // Kyogoku + 0x501, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, +{ + "M_014", + "47 【デモ : 8】ミドナによる城からの初ワープ", // [cutscene: 8] First warped from castle by Midna + "京極", // Kyogoku + 0x502, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_013", + "46 ミドナから初めてトワイライトゲートの話を聞いた", // First heard about Twilight gate from Midna + "京極", // Kyogoku + 0x504, + "その他", // Misc. + 0x20, + 0x21, +}, +{ + "M_012", + "45 【デモ : 7】城でゼルダ姫と出会い", // [cutscene: 7] Meet Princess Zelda at castle + "京極", // Kyogoku + 0x508, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_011", + "44 牢屋でミドナが狼の鎖を外してくれる", // Midna removes wolf's chains in prison + "京極", // Kyogoku + 0x510, + "R_SP107:ハイラル城内部", // Inside Hyrule Castle + 0x19, + 0x1a, +}, +{ + "M_010", + "43 【デモ : 6A】牢屋でミドナ登場", // [cutscene: 6A] Midna appears in the prison + "京極", // Kyogoku + 0x520, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_009", + "42 【デモ : 6B】牢屋脱出 - ミドナが背中に乗る", // [cutscene: 6B] Prison escape - Midna rides on back + "京極", // Kyogoku + 0x540, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_008", + "41 ★デモ★トアルの泉で魔物に襲われるデモ", // cutscene - attacked by monsters at Ordon spring + "京極", // Kyogoku + 0x580, + "*河越デモ", // Kawagoe Cutscene + 0x1, + 0x2, +}, +{ + "M_007", + "40 地下室でシャッドと初会話（解封の言葉の話）", // first conversation with Shad in basement (about the words of opening) + "京極", // Kyogoku + 0x401, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "M_006", + "39 ３日目−山羊追いが終わってフリー状態のファドと会話", // 3rd day - finished chasing goats, speak to Fado in free state + "京極", // Kyogoku + 0x402, + "F_SP00:牧場", // Ranch + 0xc, + 0xd, +}, +{ + "F_0033", + "38 初日−ウーリと話した", // First day - spoke with Uli + "京極", // Kyogoku + 0x404, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0032", + "37 ３日目−ファドと初会話（山羊追い前の強制）", // 3rd day - First convo with fado (before forced goat chase) + "京極", // Kyogoku + 0x408, + "F_SP00:牧場", // Ranch + 0xc, + 0xd, +}, +{ + "F_0031", + "36 ２日目−カゴ発見前にウーリと話した？", // 2nd day - Spoke to Uli bfore finding basket + "京極", // Kyogoku + 0x410, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0030", + "35 剣チュートリアル前/ベスと初会話", // before sword tutorial - first conversation with Beth + "京極", // Kyogoku + 0x420, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0029", + "34 ２日目−剣チューの誘いを断った", // 2nd day - refused sword tutorial + "京極", // Kyogoku + 0x440, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0028", + "33 カボチャを持った状態で雪女と話した", // spoke to yeta while holding pumpkin + "京極", // Kyogoku + 0x480, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "F_0027", + "32 ウーリチュートリアル終了（成功/失敗共通）", // Uli tutorial ends (same whether pass or fail) + "京極", // Kyogoku + 0x301, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0026", + "31 F0027:タロ−３日目タロに木刀をあげた", // gave wooden sword to talo on 3rd day + "京極", // Kyogoku + 0x302, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0025", + "30 ウーリの持ち上げチュートリアル達成", // Pass Uli's pick-up tutorial + "京極", // Kyogoku + 0x304, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0024", + "29 F0001:タロ・マロ・ベスと話した（パチンコ入手前）", // Spoke with Talo/Malo/Beth (before obtaining slingshot) + "京極", // Kyogoku + 0x308, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0023", + "28 ジャガーに高台の下から呼ばれた", // Called by Jaggle from below hill + "京極", // Kyogoku + 0x310, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0022", + "27 １日目の柵越え開始", // Start fence-jump on 1st day + "京極", // Kyogoku + 0x320, + "F_SP00:牧場", // Ranch + 0xc, + 0xd, +}, +{ + "F_0021", + "26 ２日目：キュリーと話した", // 2nd day: spoke with Pergie + "京極", // Kyogoku + 0x340, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "D_0001", + "25 夜に家の前でリスに呼び止められた", // Stopped by squirrel in front of house at night + "京極", // Kyogoku + 0x380, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0020", + "24 商店休業中にセーラと初会話", // First convo with Sera while shop is closed + "京極", // Kyogoku + 0x201, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0019", + "23 泉のイリア（コリンも一緒）と話した", // Spoke with Ilia (Colin is there too) at the spring + "京極", // Kyogoku + 0x202, + "F_SP104:トアル森", // Ordon Woods + 0xe, + 0xf, +}, +{ + "F_0018", + "22 ファドに柵越え頼まれた", // Asked by Fado to jump fence + "京極", // Kyogoku + 0x204, + "F_SP00:牧場", // Ranch + 0xc, + 0xd, +}, +{ + "F_0017", + "21 剣チュー直後にベスと話した", // Spoke to beth right after sword tutorial + "京極", // Kyogoku + 0x208, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0016", + "20 F0048:コリン−３日目通せんぼ時のコリン追跡再開", // On 3rd day, start following Colin who is blocking path + "京極", // Kyogoku + 0x210, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0015", + "19 F0076:パチンコチュートリアル終了", // Slingshot tutorial ends + "京極", // Kyogoku + 0x220, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0014", + "18 剣チュートリアル終了", // sword tutorial ends + "京極", // Kyogoku + 0x240, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0013", + "17 ２日目−暴走山羊を初めて逃がした", // 2nd day - First time rampaging goat escapes + "京極", // Kyogoku + 0x280, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0012", + "16 金剛の剣ゲット！", // Get metal sword! + "京極", // Kyogoku + 0x101, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0011", + "15 柵越え終了", // Fence jumping complete + "京極", // Kyogoku + 0x102, + "F_SP00:牧場", // Ranch + 0xc, + 0xd, +}, +{ + "F_0010", + "14 F0048:コリン−３日目通せんぼ時に初会話（強制）", // First convo with Colin blocking path (forced) + "京極", // Kyogoku + 0x104, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0009", + "13 コリンと秘密の入り口前に近づいた", // Approach secret entrance with Colin + "京極", // Kyogoku + 0x108, + "F_SP104:トアル森", // Ordon Woods + 0xe, + 0xf, +}, +{ + "F_0008", + "12 １日目のファドと牧場で初会話", // First conversation with Fado at the farm on 1st day + "京極", // Kyogoku + 0x110, + "F_SP103:トアル村", // Ordon Village + 0xd, + 0xe, +}, +{ + "F_0007", + "11 チーズを持った状態で雪女と話した", // Spoke to Yeta while holding cheese + "京極", // Kyogoku + 0x120, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "F_0006", + "10 キッチンで雪男と初会話", // First conversation with Yeto in kitchen + "京極", // Kyogoku + 0x140, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "F_0005", + "9 エリア4で光の雫を14個集めた", // Gathered 14 Tears of Light in area 4 + "京極（今井使用）", // Kyogoku (used by Imai) + 0x180, + "その他", // Misc. + 0x20, + 0x21, +}, +{ + "F_0004", + "8 隠し味の素を渡して、部屋の外に出た", // Handed over secret ingredient and left room + "京極", // Kyogoku + 0x1, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "F_0003", + "7 トマトピューレを渡して、部屋の外に出た", // Handed over tomato puree and left room + "京極", // Kyogoku + 0x2, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "F_0002", + "6 長老ゴロンとの相撲勝負に初めて負けた", // Lost wrestling match to elder goron for first time + "京極", // Kyogoku + 0x4, + "R_SP110:デスマウンテン(部屋)", // Death Mountain (room) + 0x1b, + 0x1c, +}, +{ + "F_0001", + "5 コリン復帰後のレナードと話した", // Spoke to Renado after Colin returns + "京極", // Kyogoku + 0x8, + "F_SP109:カカリコ村", // Kakariko Village + 0x10, + 0x11, +}, +{ + "TEST_004", + "4 隠し味の素を渡した", // Handed over secret ingredient + "京極", // Kyogoku + 0x10, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "TEST_003", + "3 トマトピューレを渡した", // Handed over tomato puree + "京極", // Kyogoku + 0x20, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0xa, + 0xb, +}, +{ + "TEST_002", + "2 大溶岩弾ポータルワープヒント", // Big magma stone portal warp hint + "京極", // Kyogoku + 0x40, + "F_SP110:デスマウンテン", // Death Mountain + 0x11, + 0x12, +}, +{ + "TEST_001", + "1 カカリコ橋ポータルワープヒント", // Kakariko bridge portal warp hint + "京極", // Kyogoku + 0x80, + "F_SP108:フィローネの森", // Faron Woods + 0xf, + 0x10, +}, \ No newline at end of file diff --git a/src/d/event/d_event_debug_bit_table_tmp.inc b/src/d/event/d_event_debug_bit_table_tmp.inc new file mode 100644 index 0000000000..13c9f69928 --- /dev/null +++ b/src/d/event/d_event_debug_bit_table_tmp.inc @@ -0,0 +1,1521 @@ +{ + "T_0183", + "183 @", + "住吉", // Sumiyoshi + 0x1580, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "T_0182", + "182 山羊追いⅡ終了した", // Finished goat hearding Ⅱ + "住吉", // Sumiyoshi + 0x1401, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "T_0181", + "181 山羊追いⅡ開始した", // Started goat hearding Ⅱ + "住吉", // Sumiyoshi + 0x1402, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "T_0180", + "180 ３日目−山羊追いゲームEND", // 3rd day - goat hearding END + "住吉", // Sumiyoshi + 0x1404, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "T_0179", + "179 ３日目−山羊追いゲームＳＴＡＲＴ", // 3rd day - goat hearding START + "住吉", // Sumiyoshi + 0x1408, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "T_0178", + "178 １日目：柵越え中にファドと話した", // 1st day: Spoke with Fado while jumping over gate + "京極", // Kyogoku + 0x1410, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "T_0177", + "177 １日目：ファドに柵越えたのまれた", // 1st day : Asked to jump gate by Fado + "京極", // Kyogoku + 0x1420, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "T_0176", + "176 １日目：ファドの山羊追い終了", // 1st day: finish fado's goat herding + "京極", // Kyogoku + 0x1440, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "T_0175", + "175 １日目：ファドの山羊追い開始", // 1st day: strt Fado's goat herding + "京極", // Kyogoku + 0x1480, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "NO_TELOP", + "174 ONなら(シ−ン切り換え時)ステ−ジ名の表示なし", // When on (while changing scenes) stage name is not shown + "住吉", // Sumiyoshi + 0x1301, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "NODRAW_STAGE_NAME", + "173 @", + "住吉", // Sumiyoshi + 0x1302, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "Hanch_CLIMBOUT_POND", + "172 飛び込んだハンジョ−、池から出た", // Hanch gets out of lake after jumping in + "住吉", // Sumiyoshi + 0x1304, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "GUARD_URI", + "171 夜のトアル村、モイがウ−リを守り中", // Rusl is guarding Uli, Ordon village night + "住吉", // Sumiyoshi + 0x1308, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "CAT_20", + "170 20", + "京極", // Kyogoku + 0x1310, + "ボンニャーズ", // cat game + 0x12, + 0x13, +}, +{ + "CAT_19", + "169 19", + "京極", // Kyogoku + 0x1320, + "ボンニャーズ", // cat game + 0x12, + 0x13, +}, +{ + "CAT_18", + "168 初日のセーラ一家との会話用2", // Used in conversation with Sera's household on first day (2) + "京極", // Kyogoku + 0x1340, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "CAT_17", + "167 初日のセーラ一家との会話用１", // Used in conversation with Sera's household on first day (1) + "京極", // Kyogoku + 0x1380, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "CAT_16", + "166 16", + "京極", // Kyogoku + 0x1201, + "ボンニャーズ", // cat game + 0x12, + 0x13, +}, +{ + "CAT_15", + "165 15", + "京極", // Kyogoku + 0x1202, + "ボンニャーズ", // cat game + 0x12, + 0x13, +}, +{ + "CAT_14", + "164 Jpn06-0118天空人のオバチャン別れイベント用4", // Used in Ooccoo Sr. departure event (4) + "京極", // Kyogoku + 0x1204, + "F_SP117:聖なる森", // Sacred Grove + 0xe, + 0xf, +}, +{ + "CAT_13", + "163 Jpn06-0118天空人のオバチャン別れイベント用3", // Used in Ooccoo Sr. departure event (3) + "京極", // Kyogoku + 0x1208, + "F_SP117:聖なる森", // Sacred Grove + 0xe, + 0xf, +}, +{ + "CAT_12", + "162 Jpn06-0118天空人のオバチャン別れイベント用2", // Used in Ooccoo Sr. departure event (2) + "京極", // Kyogoku + 0x1210, + "F_SP117:聖なる森", // Sacred Grove + 0xe, + 0xf, +}, +{ + "CAT_11", + "161 Jpn06-0118天空人のオバチャン別れイベント用1", // Used in Ooccoo Sr. departure event (1) + "京極", // Kyogoku + 0x1220, + "F_SP117:聖なる森", // Sacred Grove + 0xe, + 0xf, +}, +{ + "CAT_10", + "160 10", + "京極", // Kyogoku + 0x1240, + "ボンニャーズ", // cat game + 0x12, + 0x13, +}, +{ + "CAT_9", + "159 9", + "京極", // Kyogoku + 0x1280, + "ボンニャーズ", // cat game + 0x12, + 0x13, +}, +{ + "CAT_8", + "158 8", + "京極", // Kyogoku + 0x1101, + "ボンニャーズ", // cat game + 0x12, + 0x13, +}, +{ + "CAT_7", + "157 7", + "京極", // Kyogoku + 0x1102, + "ボンニャーズ", // cat game + 0x12, + 0x13, +}, +{ + "CAT_6", + "156 子ども発見前にウーリの部屋に入った(強制会話時にON)", // Endered Uli's room before finding children (ON during forced conversation) + "京極", // Kyogoku + 0x1104, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "CAT_5", + "155 TW迷い霧の森でミドナの忠告聞いた(F:2021)", // Heard Midna's warning in Twilight fog woods + "京極", // Kyogoku + 0x1108, + "F_SP108:フィローネの森", // Faron Woods + 0x7, + 0x8, +}, +{ + "CAT_4", + "154 4", + "京極", // Kyogoku + 0x1110, + "ボンニャーズ", // cat game + 0x12, + 0x13, +}, +{ + "CAT_3", + "153 ３日目、最初のファドの会話", // 3rd day, Fado's first conversation + "京極", // Kyogoku + 0x1120, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "CAT_2", + "152 ３日目：山羊追い後にファドと話した", // 3rd day: Spoke with Fado after herding goats + "京極", // Kyogoku + 0x1140, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "CAT_1", + "151 ３日目：山羊追い結果聞いた", // 3rd day: Heard results of goat herding + "京極", // Kyogoku + 0x1180, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "DUNGEON_150", + "150 ダンジョン150", // Dungeon 150 + "京極", // Kyogoku + 0x1001, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_149", + "149 ダンジョン149", // Dungeon 149 + "京極", // Kyogoku + 0x1002, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_148", + "148 ダンジョン148", // Dungeon 148 + "京極", // Kyogoku + 0x1004, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_147", + "147 ダンジョン147", // Dungeon 147 + "京極", // Kyogoku + 0x1008, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_146", + "146 ダンジョン146", // Dungeon 146 + "京極", // Kyogoku + 0x1010, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_145", + "145 ダンジョン145", // Dungeon 145 + "京極", // Kyogoku + 0x1020, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_144", + "144 ダンジョン144", // Dungeon 144 + "京極", // Kyogoku + 0x1040, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_143", + "143 ダンジョン143", // Dungeon 143 + "京極", // Kyogoku + 0x1080, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_142", + "142 ダンジョン142", // Dungeon 142 + "京極", // Kyogoku + 0xf01, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_141", + "141 ダンジョン141", // Dungeon 141 + "京極", // Kyogoku + 0xf02, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_140", + "140 ダンジョン140", // Dungeon 140 + "京極", // Kyogoku + 0xf04, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_139", + "139 ダンジョン139", // Dungeon 139 + "京極", // Kyogoku + 0xf08, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_138", + "138 ダンジョン138", // Dungeon 138 + "京極", // Kyogoku + 0xf10, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_137", + "137 ダンジョン137", // Dungeon 137 + "京極", // Kyogoku + 0xf20, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_136", + "136 ダンジョン136", // Dungeon 136 + "京極", // Kyogoku + 0xf40, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_135", + "135 ダンジョン135", // Dungeon 135 + "京極", // Kyogoku + 0xf80, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_134", + "134 ダンジョン134", // Dungeon 134 + "京極", // Kyogoku + 0xe01, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_133", + "133 ダンジョン133", // Dungeon 133 + "京極", // Kyogoku + 0xe02, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_132", + "132 ダンジョン132", // Dungeon 132 + "京極", // Kyogoku + 0xe04, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_131", + "131 ダンジョン131", // Dungeon 131 + "京極", // Kyogoku + 0xe08, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "DUNGEON_130", + "130 中ボス戦中のミドナヒントを聞いた", // Heard Midna's hint during mini-boss + "京極", // Kyogoku + 0xe10, + "D_MN06:LV6ダンジョン", // LV6 Dungeon + 0x2, + 0x3, +}, +{ + "T_0125", + "129 @", + "京極", // Kyogoku + 0xe20, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "YKW_ATTN", + "128 スノボレ−ス待機時の雪女、プレイヤ−注視中", // Player focus while Yeta waits for snowboard race + "住吉", // Sumiyoshi + 0xe40, + "F_SP114:雪山", // Snowpeak mountain + 0xb, + 0xc, +}, +{ + "YKW_TALK", + "127 雪女が雪男に話しかける", // Yeta talks to Yeto + "住吉", // Sumiyoshi + 0xe80, + "F_SP114:雪山", // Snowpeak mountain + 0xb, + 0xc, +}, +{ + "YKM_TALK", + "126 雪男が雪女に話しかける", // Yeto talks to Yeta + "住吉", // Sumiyoshi + 0xd01, + "F_SP114:雪山", // Snowpeak mountain + 0xb, + 0xc, +}, +{ + "YKM_ATTN", + "125 スノボレ−ス待機時の雪男、プレイヤ−注視中", // Player focus while Yeto waits for snowboard race + "住吉", // Sumiyoshi + 0xd02, + "F_SP114:雪山", // Snowpeak mountain + 0xb, + 0xc, +}, +{ + "T_0124", + "124 大妖精用4", // Fairy use 4 + "京極（高橋使用）", // Kyogoku (used by Takahashi) + 0xd04, + "プログラム用", // program use + 0x11, + 0x12, +}, +{ + "T_0123", + "123 大妖精用3", // Fairy use 3 + "京極（高橋使用）", // Kyogoku (used by Takahashi) + 0xd08, + "プログラム用", // program use + 0x11, + 0x12, +}, +{ + "T_0122", + "122 大妖精用2", // Fairy use 2 + "京極（高橋使用）", // Kyogoku (used by Takahashi) + 0xd10, + "プログラム用", // program use + 0x11, + 0x12, +}, +{ + "T_0121", + "121 大妖精用1", // Fairy use 1 + "京極（高橋使用）", // Kyogoku (used by Takahashi) + 0xd20, + "プログラム用", // program use + 0x11, + 0x12, +}, +{ + "T_0120", + "120 ヘナのガイドで釣りをした", // Fished something with Hena's guidance + "京極", // Kyogoku + 0xd40, + "釣り", // Fishing + 0x13, + 0x15, +}, +{ + "T_0119", + "119 コロコロゲームでズルした直後", // After cheating in Roll goal game + "京極", // Kyogoku + 0xd80, + "釣り", // Fishing + 0x13, + 0x15, +}, +{ + "MN09_03", + "118 ラフレルの大砲が着弾したフラグ", // Auru's cannon hits Flag + "桑島", // Kuwashima + 0xc01, + "D_MN09:Lv9ダンジョン", // LV9 Dungeon + 0x3, + 0x4, +}, +{ + "MN09_02", + "117 モイがリンクに手を振るフラグ", // Risl waves at Link Flag + "桑島", // Kuwashima + 0xc02, + "D_MN09:Lv9ダンジョン", // LV9 Dungeon + 0x3, + 0x4, +}, +{ + "WXXTO", + "116 レジスタンス立ち去るフラグ", // Resistance leaves Flag + "桑島", // Kuwashima + 0xc04, + "D_MN09:Lv9ダンジョン", // LV9 Dungeon + 0x3, + 0x4, +}, +{ + "T_0113", + "113 【イベント制御】Jpn04-1063:ルイーズ用7", // (Event control) Jpn04-1063:Luoise Use (7) + "京極", // Kyogoku + 0xc08, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0112", + "112 【イベント制御】Jpn04-1063:ルイーズ用6", // (Event control) Jpn04-1063:Luoise Use (6) + "京極", // Kyogoku + 0xc10, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0111", + "111 【イベント制御】Jpn04-1063:ルイーズ用5", // (Event control) Jpn04-1063:Luoise Use (5) + "京極", // Kyogoku + 0xc20, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0110", + "110 【イベント制御】Jpn04-1063:ルイーズ用4", // (Event control) Jpn04-1063:Luoise Use (4) + "京極", // Kyogoku + 0xc40, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0109", + "109 【イベント制御】Jpn04-1063:ルイーズ用3", // (Event control) Jpn04-1063:Luoise Use (3) + "京極", // Kyogoku + 0xc80, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0108", + "108 【イベント制御】Jpn04-1063:ルイーズ用2", // (Event control) Jpn04-1063:Luoise Use (2) + "京極", // Kyogoku + 0xb01, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0107", + "107 【イベント制御】Jpn04-1063:ルイーズ用1", // (Event control) Jpn04-1063:Luoise Use (1) + "京極", // Kyogoku + 0xb02, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0100", + "100 ２日目はじまりデモ、子どもたち注目開始フラグ", // cutscene at start of 2nd day, start focus on kids Flags + "住吉", // Sumiyoshi + 0xb04, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0099", + "99 @", + "京極", // Kyogoku + 0xb08, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "T_0098", + "98 @", + "京極", // Kyogoku + 0xb10, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "T_0097", + "97 ゴールドウルフ識別７", // Gold wolf identification 7 + "京極（今井使用）", // Kyogoku (used by Imai) + 0xb20, + "勇者の霊", // Hero's spirit + 0x15, + 0x17, +}, +{ + "T_0096", + "96 ゴールドウルフ識別６", // Gold wolf identification 6 + "京極（今井使用）", // Kyogoku (used by Imai) + 0xb40, + "勇者の霊", // Hero's spirit + 0x15, + 0x17, +}, +{ + "T_0095", + "95 ゴールドウルフ識別５", // Gold wolf identification 5 + "京極（今井使用）", // Kyogoku (used by Imai) + 0xb80, + "勇者の霊", // Hero's spirit + 0x15, + 0x17, +}, +{ + "T_0094", + "94 ゴールドウルフ識別４", // Gold wolf identification 4 + "京極（今井使用）", // Kyogoku (used by Imai) + 0xa01, + "勇者の霊", // Hero's spirit + 0x15, + 0x17, +}, +{ + "T_0093", + "93 ゴールドウルフ識別３", // Gold wolf identification 3 + "京極（今井使用）", // Kyogoku (used by Imai) + 0xa02, + "勇者の霊", // Hero's spirit + 0x15, + 0x17, +}, +{ + "T_0092", + "92 ゴールドウルフ識別２", // Gold wolf identification 2 + "京極（今井使用）", // Kyogoku (used by Imai) + 0xa04, + "勇者の霊", // Hero's spirit + 0x15, + 0x17, +}, +{ + "T_0091", + "91 後半で山羊追いゲームした（一日チェック用）", // Goat hearding in second half (for day 1 check) + "京極", // Kyogoku + 0xa08, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "T_0090", + "90 牧場内にエポナがいる（山羊追いゲーム用）", // Epona is at the range (used in goat herding game) + "京極", // Kyogoku + 0xa10, + "F_SP00:牧場", // Ranch + 0x5, + 0x6, +}, +{ + "T_0089", + "89 トアル村中心の範囲内にエポナがいる（１日目ボウ用）", // Epona is in the middle of ordon village (used by Bo first day) + "京極", // Kyogoku + 0xa20, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0088", + "88 中ボスがダウン中のみON（復帰したらリセット）", // ON only with mini-boss is down (resets when they get up) + "京極", // Kyogoku + 0xa40, + "D_MN04:LV4ダンジョン", + 0x1, + 0x2, +}, +{ + "T_0087", + "87 マロマート店内の子供A[、]B用（共通）", // Used by child A,B (both) inside Malo Mart + "京極", // Kyogoku + 0xa80, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0086", + "86 雪男/雪女とのレースに勝った", // Won race against Yeto/Yeta + "京極", // Kyogoku + 0x901, + "F_SP114:雪山", // Snowpeak mountain + 0xb, + 0xc, +}, +{ + "T_0085", + "85 雪女とレ−ス中", // Racing with Yeta + "京極", // Kyogoku + 0x902, + "F_SP114:雪山", // Snowpeak mountain + 0xb, + 0xc, +}, +{ + "T_0084", + "84 雪男とレ−ス中", // Racing with Yeto + "京極", // Kyogoku + 0x904, + "F_SP114:雪山", // Snowpeak mountain + 0xb, + 0xc, +}, +{ + "T_0083", + "83 LV5Dクリア後の雪男（女）と雪山頂上で狼会話", // Speak with Yeta at top of mountain as wolf after clearing LV5 dungeon + "京極", // Kyogoku + 0x908, + "D_MN11:LV5ダンジョン", // LV5 Dungeon + 0x4, + 0x5, +}, +{ + "T_0082", + "82 温泉ゴロンにかけたのが水だった", // Threw water on spring goron + "京極", // Kyogoku + 0x910, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0081", + "81 募金イベント達成デモ用", // For use in fundraiser event completion cutscene + "京極", // Kyogoku + 0x920, + "F_SP109:カカリコ村", // Kakariko Village + 0x8, + 0x9, +}, +{ + "T_0080", + "80 募金箱にお金いれた", // Put money in fundraiser box + "京極", // Kyogoku + 0x940, + "F_SP109:カカリコ村", // Kakariko Village + 0x8, + 0x9, +}, +{ + "T_0079", + "79 Ｗクローショット屋：自己ベスト更新", // Double clawshot shop: new personal best + "京極", // Kyogoku + 0x980, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0078", + "78 Ｗクローショット屋：玉全部取った", // Double clawshot shop : Collected all the spheres + "京極", // Kyogoku + 0x801, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0077", + "77 @", + "京極", // Kyogoku + 0x802, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "T_0076", + "76 用心棒ゴロンのぼやきを聞いた", // Listened to bodyguard goron's complaints + "京極", // Kyogoku + 0x804, + "F_SP116:城下街", // Castle Town + 0xd, + 0xe, +}, +{ + "T_0075", + "75 スモモのアトラクションで一定の得点に達した", // Got more points than the set amount during Plumm's attraction + "京極", // Kyogoku + 0x808, + "F_SP115:ハイリア湖", // Lake Hylia + 0xc, + 0xd, +}, +{ + "T_0074", + "74 (会話後)スモモが画面外に消えたらリセット", // (after conversation) Resets when Plumm goes off-screen + "京極", // Kyogoku + 0x810, + "F_SP115:ハイリア湖", // Lake Hylia + 0xc, + 0xd, +}, +{ + "T_0073", + "73 マスターソードゲットイベント用", // For use in master sword obtaining event + "京極", // Kyogoku + 0x820, + "F_SP117:聖なる森", // Sacred Grove + 0xe, + 0xf, +}, +{ + "T_0072", + "72 ラッカ小屋のコッコを全部落とした", // Knocked down all the cucco in Falbi's hut + "京極（住吉使用）", // Kyogoku (used by Sumiyoshi) + 0x840, + "F_SP115:ハイリア湖", // Lake Hylia + 0xc, + 0xd, +}, +{ + "T_0071", + "71 夜、モイの剣とろうとして失敗（超接近or殴られた）", // Night, fail to take Rusl's sword (too close OR get hit) + "京極（住吉使用）", // Kyogoku (used by Sumiyoshi) + 0x880, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0070", + "70 【ホヅ川下り】ボート小屋内のガレキ破壊手伝い中", // [Iza's river descent] Helping to destroy rubble in boat hut + "京極", // Kyogoku + 0x701, + "F_SP112:ゾーラ川", // Zora's River + 0xa, + 0xb, +}, +{ + "T_0069", + "69 【水中爆弾屋】１５コ購入選択中", // [water bomb shop] choose to buy 15 + "京極", // Kyogoku + 0x702, + "F_SP115:ハイリア湖", // Lake Hylia + 0xc, + 0xd, +}, +{ + "T_0068", + "68 【水中爆弾屋】１０コ購入選択中", // [water bomb shop] choose to buy 10 + "京極", // Kyogoku + 0x704, + "F_SP115:ハイリア湖", // Lake Hylia + 0xc, + 0xd, +}, +{ + "T_0067", + "67 【ホヅ川下り】ボートに乗る", // [Iza's river descent] Get in boat + "住吉", // Sumiyoshi + 0x708, + "F_SP112:ゾーラ川", // Zora's River + 0xa, + 0xb, +}, +{ + "T_0066", + "66 【弓矢ゲーム】途中から再開した", // [bow and arrow game] Restart from the middle + "京極", // Kyogoku + 0x710, + "F_SP109:カカリコ村", // Kakariko Village + 0x8, + 0x9, +}, +{ + "T_0065", + "65 【弓矢ゲーム】１つ目をフックショットで破壊", // [bow and arrow game] destroy first one with hook shot + "京極（住吉使用）", // Kyogoku (used by Sumiyoshi) + 0x720, + "F_SP109:カカリコ村", // Kakariko Village + 0x8, + 0x9, +}, +{ + "T_0064", + "64 【弓矢ゲーム】的当て挑戦中...", // [bow and arrow game] attempting to hit target... + "京極（住吉使用）", // Kyogoku (used by Sumiyoshi) + 0x740, + "F_SP109:カカリコ村", // Kakariko Village + 0x8, + 0x9, +}, +{ + "T_0063", + "63 【弓矢ゲーム】最後の的、惜しい！", // [bow and arrow game] Missed the final target! + "京極（住吉使用）", // Kyogoku (used by Sumiyoshi) + 0x780, + "F_SP109:カカリコ村", // Kakariko Village + 0x8, + 0x9, +}, +{ + "T_0062", + "62 馬車護衛直前デモ（イリアと再会）", // cutscene right before carriage guarding mission (reunion with Ilia) + "京極", // Kyogoku + 0x601, + "？", + 0x10, + 0x11, +}, +{ + "T_0061", + "61 一騎リベンジ終了（馬車護衛再開）", // Joust revenge complete (restart carriage guarding mission) + "京極", // Kyogoku + 0x602, + "？", + 0x10, + 0x11, +}, +{ + "T_0060", + "60 弓矢ゲ−ム中", // during bow and arrow game + "住吉", // Sumiyoshi + 0x604, + "F_SP109:カカリコ村", // Kakariko Village + 0x8, + 0x9, +}, +{ + "T_0059", + "59 ルダ＆ベスが交互にコリンに食事をとらせる", // Luda and Beth both taking Colin's food + "京極", // Kyogoku + 0x608, + "R_SP109:カカリコ村(室内)", // Kakariko Village (inside) + 0xf, + 0x10, +}, +{ + "T_058", + "58 コリン看病中のレナードと会話", // Conversation with Renado while he is watching over Colin + "京極", // Kyogoku + 0x610, + "R_SP109:カカリコ村(室内)", // Kakariko Village (inside) + 0xf, + 0x10, +}, +{ + "T_0057", + "57 バーンズのボム屋＜買い取り＞", // Barnes bomb shop + "京極", // Kyogoku + 0x620, + "R_SP109:カカリコ村(室内)", // Kakariko Village (inside) + 0xf, + 0x10, +}, +{ + "T_0056", + "56 光の世界に出ようとしてミドナに止められた", // Stopped by Midna when trying to enter the world of light + "京極", // Kyogoku + 0x640, + "F_SP108:フィローネの森", // Faron Woods + 0x7, + 0x8, +}, +{ + "T_0055", + "55 汎用一時フラグ（フロー制御用） J", // General use temporary flag (flow control) J + "京極", // Kyogoku + 0x680, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0054", + "54 汎用一時フラグ（フロー制御用） I", // General use temporary flag (flow control) I + "京極", // Kyogoku + 0x501, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0053", + "53 汎用一時フラグ（フロー制御用） H", // General use temporary flag (flow control) H + "京極", // Kyogoku + 0x502, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0052", + "52 汎用一時フラグ（フロー制御用） G", // General use temporary flag (flow control) G + "京極", // Kyogoku + 0x504, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0051", + "51 汎用一時フラグ（フロー制御用） F", // General use temporary flag (flow control) F + "京極", // Kyogoku + 0x508, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0050", + "50 温泉ゴロンDと店主ゴロンの雑談聞いた(試合前)", // Heard spring goron D and shopkeeper goron's conversation (before match) + "京極", // Kyogoku + 0x510, + "F_SP110デスマウンテン", // Death Mountain + 0x9, + 0xa, +}, +{ + "T_0049", + "49 巨人ゲーム中", // During giant game + "京極", // Kyogoku + 0x520, + "F_SP117:聖なる森", // Sacred Grove + 0xe, + 0xf, +}, +{ + "T_0048", + "48 ボウとの相撲 - リンク負けた", // Wrestling with Bo - Link loses + "京極", // Kyogoku + 0x540, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0047", + "47 ボウとの相撲直後（服着た後の会話接続用）", // Right after wrestling with Bo (Used to connect with conversation after wearing clothes) + "京極", // Kyogoku + 0x580, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0046", + "46 ボウとの相撲 - リンクの勝利", // Wrestling with Bo - Link wins + "京極", // Kyogoku + 0x401, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0045", + "45 トワイライト/ゴロンCの話聞いた", // Twilight - Talked with Goron C + "京極", // Kyogoku + 0x402, + "F_SP110デスマウンテン", // Death Mountain + 0x9, + 0xa, +}, +{ + "T_0044", + "44 剣チュー終了デモ用", // For sword tutorial end cutscene + "京極", // Kyogoku + 0x404, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0043", + "43 @", + "京極", // Kyogoku + 0x408, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "T_0042", + "42 キコルに夜にカンテラ持たずに話しかけた", // Spoke to Coro at night without lantern + "京極", // Kyogoku + 0x410, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "T_0041", + "41 キコルが寝てる時だけONになっている", // Only ON when Coro is sleeping + "京極", // Kyogoku + 0x420, + "F_SP108:フィローネの森", // Faron Woods + 0x7, + 0x8, +}, +{ + "TEMP_0040", + "40 @", + "京極", // Kyogoku + 0x440, + "*未使用", //unused + 0x0, + 0x1, +}, +{ + "TEMP_0038", + "39 ハンジョー、鷹匠デモ用一時フラグ", // temporary flag for Hanch the Hawder cutscene + "京極", // Kyogoku + 0x480, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0036", + "38 モイの剣失敗カウント_3", // Rusl sword failure count 3 + "京極", // Kyogoku + 0x301, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0035", + "37 モイの剣失敗カウント_2", // Rusl sword failure count 2 + "京極", // Kyogoku + 0x302, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0034", + "36 モイの剣失敗カウント_1", // Rusl sword failure count 1 + "京極", // Kyogoku + 0x304, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0033", + "35 暴走山羊ゲーム中、Aと[3D]↑を押した", // Press A and [3D] ↑ during rampaging goat game, + "京極", // Kyogoku + 0x308, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0032", + "33 モイの剣を返す", // Return Rusl's sword + "京極", // Kyogoku + 0x310, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0031", + "32 モイの剣を借りる", // Borrow Rusl's sword + "京極", // Kyogoku + 0x320, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0030", + "31 モイ、Ｄｏボタン「とる」", // Rusl, Ｄｏ button "take" + "住吉", // Sumiyoshi + 0x340, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0029", + "30 モイの剣パクり成功", // Succeed at taking Rusl's sword + "京極", // Kyogoku + 0x380, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0028", + "29 山羊暴走後、間もない", // Right after rampaging goats + "京極", // Kyogoku + 0x201, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0027", + "28 山羊暴走終了", // Rampaging goats complete + "京極", // Kyogoku + 0x202, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0026", + "27 ジャガーの近くでカボチャを割った（ジャガーに怒られる）", // Destroy pumpkin near Jaggle (Jaggle gets angry) + "京極", // Kyogoku + 0x204, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0025", + "26 テーブルの上に乗った（キュリーに怒られる）", // Get on table (Pergie gets mad) + "京極", // Kyogoku + 0x208, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0024", + "25 剣チュ−トリアルへ", // To sword tutorial + "住吉", // Sumiyoshi + 0x210, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0023", + "24 剣チュ−トリアル直後に、タロ、コリンを呼んだ", // Called Talo, Colin right after sword game + "住吉", // Sumiyoshi + 0x220, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0022", + "23 ウーリ/赤ちゃんのカゴ持っている", // Uli - carrying baby basket + "京極", // Kyogoku + 0x240, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0021", + "22 リンクの家前でコリンがついてきている", // Colin follows to Link's house + "京極", // Kyogoku + 0x280, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0020", + "21 牛追い/時間切れ後〜再開の間までON", // cow herding - ON from `time's up` until `restart` + "京極", // Kyogoku + 0x101, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0019", + "20 牛追い/時間切れ", // cow herding - time's up + "京極", // Kyogoku + 0x102, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0018", + "19 牛追い/残り時間が少なくなった", // cow herding - time is almost up + "京極", // Kyogoku + 0x104, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0017", + "18 牛追い/最初の１匹を小屋に入れた", // cow herding - first one entered the hut + "京極", // Kyogoku + 0x108, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0016", + "17 剣チュ−トリアル中に、ベス、タロを一喝", // Scold Beth, Talo during sword tutorial + "住吉", // Sumiyoshi + 0x110, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0015", + "16 ジャガ−に呼ばれて、リンクが高台にきた", // Link came up the hill afte being called by Jaggle + "京極", // Kyogoku + 0x120, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0014", + "15 汎用一時フラグ（フロー制御用） E", // General use temporary flag (flow control) E + "京極", // Kyogoku + 0x140, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0013", + "14 汎用一時フラグ（フロー制御用） D", // General use temporary flag (flow control) D + "京極", // Kyogoku + 0x180, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0012", + "13 汎用一時フラグ（フロー制御用） C", // General use temporary flag (flow control) C + "京極", // Kyogoku + 0x1, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0011", + "12 汎用一時フラグ（フロー制御用） B", // General use temporary flag (flow control) B + "京極", // Kyogoku + 0x2, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0010", + "11 汎用一時フラグ（フロー制御用） A", // General use temporary flag (flow control) A + "京極", // Kyogoku + 0x4, + "汎用", // General use + 0x14, + 0x16, +}, +{ + "T_0009", + "10 ウーリの持ち上げチュートリアル、ある程度歩いた", // Walked a bit during Uli's pick-up tutorial + "京極", // Kyogoku + 0x8, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0008", + "9 弓矢ゲーム：ホークアイを使って的を射抜いた", // bow and arrow game: shoot target using Hawkeye + "京極（住吉使用）", // Kyogoku (used by Sumiyoshi) + 0x10, + "F_SP109:カカリコ村", // Kakariko Village + 0x8, + 0x9, +}, +{ + "T_0001", + "8 バーンズボム屋で連続買取", // Make successive purchased at Barnes bomb shop + "京極", // Kyogoku + 0x80, + "R_SP109:カカリコ村(室内)", // Kakariko Village (inside) + 0xf, + 0x10, +}, +{ + "T_0007", + "7 ウーリの持ち上げチュートリアル真っ最中", // During Uli's pick-up tutorial + "京極", // Kyogoku + 0x20, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, +{ + "T_0004", + "4 剣チュ−トリアル・成否判定", // sword tutorial - outcome + "住吉", // Sumiyoshi + 0x40, + "F_SP103:トアル村", // Ordon Village + 0x6, + 0x7, +}, \ No newline at end of file diff --git a/src/d/event/d_event_debug_reg_table.inc b/src/d/event/d_event_debug_reg_table.inc new file mode 100644 index 0000000000..fd32fc6a40 --- /dev/null +++ b/src/d/event/d_event_debug_reg_table.inc @@ -0,0 +1,189 @@ +{ + "KAKERA_GET_INFO_05", + "765 ハ−トのかけらゲット情報", // Info about getting heart piece + "住吉", // Sumiyoshi + 0xebff, + "その他", // Misc. + 0x3, + 0x21, +}, +{ + "KAKERA_GET_INFO_04", + "764 ハ−トのかけらゲット情報", // Info about getting heart piece + "住吉", // Sumiyoshi + 0xecff, + "その他", // Misc. + 0x3, + 0x21, +}, +{ + "KAKERA_GET_INFO_03", + "763 ハ−トのかけらゲット情報", // Info about getting heart piece + "住吉", // Sumiyoshi + 0xedff, + "その他", // Misc. + 0x3, + 0x21, +}, +{ + "KAKERA_GET_INFO_02", + "762 ハ−トのかけらゲット情報", // Info about getting heart piece + "住吉", // Sumiyoshi + 0xeeff, + "その他", // Misc. + 0x3, + 0x21, +}, +{ + "KAKERA_GET_INFO_01", + "761 ハ−トのかけらゲット情報", // Info about getting heart piece + "住吉", // Sumiyoshi + 0xefff, + "その他", // Misc. + 0x3, + 0x21, +}, +{ + "KAKERA_GET_INFO_00", + "760 ハ−トのかけらゲット情報", // Info about getting heart piece + "住吉", // Sumiyoshi + 0xf0ff, + "その他", // Misc. + 0x3, + 0x21, +}, +{ + "SP_LURE__USE_COUNT", + "731 沈むルアーで何匹釣ったか(最大31匹）", // Number of fish caught with sinking lure (Max: 31) + "森田", // Morita + 0xf11f, + "釣り", // Fishing + 0x4, + 0x29, +}, +{ + "CF_RECORD_0", + "714 つりぼり内水槽用（トアルナマズのサイズ）", // Fishing hut fish tank (Ordon Catfish Size) + "森田", // Morita + 0xf27f, + "釣り", // Fishing + 0x4, + 0x29, +}, +{ + "NP_RECORD_0", + "713 つりぼり内水槽用（ハイリアパイクのサイズ）", // Fishing hut fish tank (Hylian Pike Size) + "森田", // Morita + 0xf37f, + "釣り", // Fishing + 0x4, + 0x29, +}, +{ + "RI_RECORD_0", + "712 つりぼり内水槽用（ハイラルドジョウのサイズ）", // Fishing hut fish tank (Hylian Loach Size) + "森田", // Morita + 0xf47f, + "釣り", // Fishing + 0x4, + 0x29, +}, +{ + "LM_RECORD_0", + "711 つりぼり内水槽用（バスのサイズ）", // Fishing hut fish tank (Bass Size) + "森田", // Morita + 0xf57f, + "釣り", // Fishing + 0x4, + 0x29, +}, +{ + "KORO2_LEVEL", + "710 コロコロゲームのレベル記憶用", // Roll goal game level memory use + "森田", // Morita + 0xf63f, + "R_SP127:釣堀(屋内)", // Fishing Pond (inside) + 0x2, + 0x1d, +}, +{ + "FUND_RAISING_HIGH2", + "512 お布施上位ビット", // Donations top bit + "坂口", // Sakaguchi + 0xf7ff, + "店", // Shop + 0x5, + 0x2b, +}, +{ + "FUND_RAISING_LOW2", + "511 お布施下位ビット", // Donations bottom bit + "坂口", // Sakaguchi + 0xf8ff, + "店", // Shop + 0x5, + 0x2b, +}, +{ + "FUND_RAISING_HIGH", + "452 募金額上位ビット", // Fundraising top bit + "坂口", // Sakaguchi + 0xf9ff, + "店", // Shop + 0x5, + 0x2b, +}, +{ + "FUND_RAISING_LOW", + "451 募金額下位ビット", // Fundraising bottom bit + "坂口", // Sakaguchi + 0xfaff, + "店", // Shop + 0x5, + 0x2b, +}, +{ + "TOTAL_PAYMENT_LOW", + "201 無人販売支払い総額上位ビット", // Unmanned shop payment total top bit (typo maybe? should be bottom bit?) + "坂口", // Sakaguchi + 0xfbff, + "店", // Shop + 0x5, + 0x2b, +}, +{ + "TOTAL_PAYMENT_HIGH", + "200 無人販売支払い総額上位ビット", // Unmanned shop payment total top bit + "坂口", // Sakaguchi + 0xfcff, + "店", // Shop + 0x5, + 0x2b, +}, +{ + "TOTAL_PRICE_LOW", + "199 無人販売購入総額下位ビット", // Unmanned shop total price bottom bit + "坂口", // Sakaguchi + 0xfdff, + "店", // Shop + 0x5, + 0x2b, +}, +{ + "TOTAL_PRICE_HIGH", + "198 無人販売購入総額上位ビット", // unmanned shop total price top bit + "坂口", // Sakaguchi + 0xfeff, + "店", // Shop + 0x5, + 0x2b, +}, +{ + "EREG_000", + "185 山羊暴走回数", // Rampaging goats number + "住吉", // Sumiyoshi + 0xff1f, + "F_SP00:牧場", // Ranch + 0x1, + 0xd, +}, \ No newline at end of file diff --git a/src/d/event/d_event_debug_reg_table_tmp.inc b/src/d/event/d_event_debug_reg_table_tmp.inc new file mode 100644 index 0000000000..693f0c2265 --- /dev/null +++ b/src/d/event/d_event_debug_reg_table_tmp.inc @@ -0,0 +1,126 @@ +{ + "SHA_DBG", + "184 占い師デバッグ", // Fortune teller debug + "住吉", // Sumiyoshi + 0xf2ff, + "F_SP116:城下街", // Castle Town + 0x2, + 0xe, +}, +{ + "PACHITUTORIAL_INF", + "115 パチチュ−、ヒット情報", // Slingshot tutorial, hit information + "住吉", // Sumiyoshi + 0xf3ff, + "F_SP103:トアル村", // Ordon Village + 0x1, + 0x7, +}, +{ + "PACHITUTORIAL_CNT", + "114 パチチュ−、壊した的の数", // Slingshot tutorial, number of destroyed targets + "住吉", // Sumiyoshi + 0xf4ff, + "F_SP103:トアル村", // Ordon Village + 0x1, + 0x7, +}, +{ + "SHA_LOVEFORTUNE_05", + "106 恋愛運シ−ン切り替え先記憶用", // For memory use after love fortune scene change + "住吉", // Sumiyoshi + 0xf5ff, + "F_SP116:城下街", // Castle Town + 0x2, + 0xe, +}, +{ + "SHA_LOVEFORTUNE_04", + "105 恋愛運シ−ン切り替え先記憶用", // For memory use after love fortune scene change + "住吉", // Sumiyoshi + 0xf6ff, + "F_SP116:城下街", // Castle Town + 0x2, + 0xe, +}, +{ + "SHA_LOVEFORTUNE_03", + "104 恋愛運シ−ン切り替え先記憶用", // For memory use after love fortune scene change + "住吉", // Sumiyoshi + 0xf7ff, + "F_SP116:城下街", // Castle Town + 0x2, + 0xe, +}, +{ + "SHA_LOVEFORTUNE_02", + "103 恋愛運シ−ン切り替え先記憶用", // For memory use after love fortune scene change + "住吉", // Sumiyoshi + 0xf8ff, + "F_SP116:城下街", // Castle Town + 0x2, + 0xe, +}, +{ + "SHA_LOVEFORTUNE_01", + "102 恋愛運シ−ン切り替え先記憶用", // For memory use after love fortune scene change + "住吉", // Sumiyoshi + 0xf9ff, + "F_SP116:城下街", // Castle Town + 0x2, + 0xe, +}, +{ + "SHA_LOVEFORTUNE_00", + "101 恋愛運シ−ン切り替え先記憶用", // For memory use after love fortune scene change + "住吉", // Sumiyoshi + 0xfaff, + "F_SP116:城下街", // Castle Town + 0x2, + 0xe, +}, +{ + "TREG_000", + "34 キュリ−の会話で使います", // Used in conversation with Pergie + "住吉", // Sumiyoshi + 0xfbff, + "F_SP103:トアル村", // Ordon Village + 0x1, + 0x7, +}, +{ + "T_0006", + "6 戻り先のレイヤ−番号", // Return layer number + "住吉", // Sumiyoshi + 0xfcff, + "仮デモ", // temp cutscene + 0x3, + 0x14, +}, +{ + "T_0005", + "5 実行デモNo受け渡し", // Actual cutscene number delivery + "住吉", // Sumiyoshi + 0xfdff, + "仮デモ", // temp cutscene + 0x3, + 0x14, +}, +{ + "T_0003", + "3 剣チュ−トリアル・斬った回数", // Sword tutorial - slice count + "住吉", // Sumiyoshi + 0xfeff, + "F_SP103:トアル村", // Ordon Village + 0x1, + 0x7, +}, +{ + "T_0002", + "2 剣チュ−トリアル・ステップ", // Sword tutorial - step + "住吉", // Sumiyoshi + 0xff0f, + "F_SP103:トアル村", // Ordon Village + 0x1, + 0x7, +}, diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp index 22be9056b7..e673b7a13e 100644 --- a/src/d/menu/d_menu_save.cpp +++ b/src/d/menu/d_menu_save.cpp @@ -1929,7 +1929,7 @@ void dMenu_save_c::dataWrite() { u8* save = mSaveBuffer; for (int i = 0; i < 3; i++) { mDoMemCdRWm_TestCheckSumGameData(save); - save += 0xA94; + save += QUEST_LOG_SIZE; } dataSave(); @@ -2509,7 +2509,7 @@ void dMenu_save_c::saveSelectStart() { u8* saveData = mSaveBuffer; for (int i = 0; i < 3; i++) { mDoMemCdRWm_TestCheckSumGameData(saveData); - saveData += 0xA94; + saveData += QUEST_LOG_SIZE; } headerTxtSet(0x3A); // Saving... mWarning->openInit(); @@ -3804,7 +3804,7 @@ void dMenu_save_c::setSaveData() { field_0x1aa[i] = 1; } - save += 0xA94; + save += QUEST_LOG_SIZE; } } diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp index 38d072ac6b..9ee7d62214 100644 --- a/src/d/msg/d_msg_flow.cpp +++ b/src/d/msg/d_msg_flow.cpp @@ -883,8 +883,7 @@ int dMsgFlow_c::getParam(u8* params) { /* 8024B138-8024B180 245A78 0048+00 1/0 0/0 0/0 .text * query001__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ int dMsgFlow_c::query001(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { - u16 prm0 = *(u16*)flow_node->params & 0xFFFF; - return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[prm0]) == false; + return i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[flow_node->params[0] & 0xFFFF]) == false; } BOOL daPy_py_c::checkNowWolf() { @@ -919,7 +918,7 @@ int dMsgFlow_c::query003(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query003(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query003(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query003__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -928,14 +927,23 @@ asm int dMsgFlow_c::query003(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1 /* 8024B250-8024B2C0 245B90 0070+00 1/0 0/0 0/0 .text * query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query004(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query004__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query004(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { + u16 uVar1 = flow_node->params[0]; + u16 uVar2; + int p0 = flow_node->params[0]; + BOOL ret; + + if ( uVar1 == 0 ) { + uVar2 = dComIfGs_getRupeeMax(); + uVar1 = i_dComIfGs_getRupee(); + ret = uVar1 < uVar2; + + } else { + ret = i_dComIfGs_getRupee() < (u16)p0; + } + + return ret; } -#pragma pop /* 8024B2C0-8024B2F8 245C00 0038+00 2/1 1/1 1/1 .text * query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ @@ -954,7 +962,7 @@ int dMsgFlow_c::query006(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query007(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query007(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query007__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -973,7 +981,7 @@ int dMsgFlow_c::query008(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query009(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query009(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query009__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -984,7 +992,7 @@ asm int dMsgFlow_c::query009(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query010(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query010(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query010__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -992,120 +1000,98 @@ asm int dMsgFlow_c::query010(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1 /* 8024B504-8024B54C 245E44 0048+00 1/0 0/0 0/0 .text * query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query011(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query011__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query011(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { + return dComIfGs_isTmpBit(dSv_event_tmp_flag_c::tempBitLabels[flow_node->params[0] & 0xFFFF]) == 0; } -#pragma pop /* 8024B54C-8024B584 245E8C 0038+00 1/0 0/0 0/0 .text * query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query012(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query012__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query012(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { + return dComIfGs_isTbox(flow_node->params[0]) == 0; } -#pragma pop /* 8024B584-8024B5BC 245EC4 0038+00 1/0 0/0 0/0 .text * query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query013(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query013__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query013(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { + return dComIfGs_isSaveSwitch(flow_node->params[0]) == 0; } -#pragma pop /* 8024B5BC-8024B5F4 245EFC 0038+00 1/0 0/0 0/0 .text * query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query014(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query014__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query014(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { + return dComIfGs_isSaveItem(flow_node->params[0]) == 0; } -#pragma pop /* 8024B5F4-8024B62C 245F34 0038+00 1/0 0/0 0/0 .text * query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query015(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query015__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query015(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { + return dComIfGs_isSaveDunSwitch(flow_node->params[0]) == 0; } -#pragma pop /* 8024B62C-8024B664 245F6C 0038+00 1/0 0/0 0/0 .text * query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query016(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query016__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query016(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { + return dComIfGs_isSaveDunItem(flow_node->params[0]) == 0; } -#pragma pop /* 8024B664-8024B6A8 245FA4 0044+00 1/0 0/0 0/0 .text * query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query017(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query017__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query017(mesg_flow_node_branch* flow_node, fopAc_ac_c* actor, int param_2) { + int zone = flow_node->params[0]; + int roomNo = -1; + + if (actor != NULL) { + roomNo = fopAcM_GetRoomNo(actor); + } + + return dComIfGs_isZoneSwitch(zone, roomNo) == 0; } -#pragma pop /* 8024B6A8-8024B6EC 245FE8 0044+00 1/0 0/0 0/0 .text * query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query018(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query018__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query018(mesg_flow_node_branch* flow_node, fopAc_ac_c* actor, int param_2) { + int zone = flow_node->params[0]; + int roomNo = -1; + + if (actor != NULL) { + roomNo = fopAcM_GetRoomNo(actor); + } + + return dComIfGs_isZoneItem(zone, roomNo) == 0; } -#pragma pop /* 8024B6EC-8024B730 24602C 0044+00 1/0 0/0 0/0 .text * query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query019(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query019__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query019(mesg_flow_node_branch* flow_node, fopAc_ac_c* actor, int param_2) { + int zone = flow_node->params[0]; + int roomNo = -1; + + if (actor != NULL) { + roomNo = fopAcM_GetRoomNo(actor); + } + + return dComIfGs_isOneZoneSwitch(zone, roomNo) == 0; } -#pragma pop /* 8024B730-8024B774 246070 0044+00 1/0 0/0 0/0 .text * query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query020(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query020__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" +int dMsgFlow_c::query020(mesg_flow_node_branch* flow_node, fopAc_ac_c* actor, int param_2) { + int zone = flow_node->params[0]; + int roomNo = -1; + + if (actor != NULL) { + roomNo = fopAcM_GetRoomNo(actor); + } + + return dComIfGs_isOneZoneItem(zone, roomNo) == 0; } -#pragma pop /* 8024B774-8024B8E4 2460B4 0170+00 1/0 0/0 0/0 .text * query021__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query021(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query021(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query021__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1115,13 +1101,13 @@ asm int dMsgFlow_c::query021(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1 * query022__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ #ifdef NONMATCHING int dMsgFlow_c::query022(mesg_flow_node_branch* flow_node, fopAc_ac_c*, int) { - return checkItemGet(flow_node->params[0], 1) == false; + return checkItemGet(flow_node->params[0], 1) == 0; } #else #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query022(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query022(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query022__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1130,7 +1116,7 @@ asm int dMsgFlow_c::query022(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1 /* 8024B918-8024B954 246258 003C+00 1/0 0/0 0/0 .text * query023__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -int dMsgFlow_c::query023(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +int dMsgFlow_c::query023(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { return (u16)(3 - dComIfGs_checkBombBag(NO_ITEM)); } @@ -1139,7 +1125,7 @@ int dMsgFlow_c::query023(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, in #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query024(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query024(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query024__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1150,7 +1136,7 @@ asm int dMsgFlow_c::query024(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query025(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query025(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query025__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1168,7 +1154,7 @@ int dMsgFlow_c::query026(mesg_flow_node_branch*, fopAc_ac_c* actor, int) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query027(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query027(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query027__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1179,7 +1165,7 @@ asm int dMsgFlow_c::query027(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query028(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query028(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query028__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1190,7 +1176,7 @@ asm int dMsgFlow_c::query028(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query029(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query029(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query029__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1207,7 +1193,7 @@ int dMsgFlow_c::query030(mesg_flow_node_branch*, fopAc_ac_c*, int) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query031(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query031(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query031__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1218,7 +1204,7 @@ asm int dMsgFlow_c::query031(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1 #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm int dMsgFlow_c::query032(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { +asm int dMsgFlow_c::query032(mesg_flow_node_branch* flow_node, fopAc_ac_c* param_1, int param_2) { nofralloc #include "asm/d/msg/d_msg_flow/query032__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" } @@ -1403,34 +1389,24 @@ int dMsgFlow_c::query048(mesg_flow_node_branch*, fopAc_ac_c*, int) { /* 8024C2A0-8024C2FC 246BE0 005C+00 1/0 0/0 0/0 .text * query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ -// missing clrlwi -#ifdef NONMATCHING int dMsgFlow_c::query049(mesg_flow_node_branch*, fopAc_ac_c*, int) { - u8 ret; - if (dComIfGs_getPohSpiritNum() == 0) { - ret = 0; - } else if (dComIfGs_getPohSpiritNum() <= 19) { - ret = 1; - } else if (dComIfGs_getPohSpiritNum() <= 39) { - ret = 2; - } else if (dComIfGs_getPohSpiritNum() <= 59) { - ret = 3; + u8 uVar1; + u32 num = dComIfGs_getPohSpiritNum(); + + if (num == 0) { + uVar1 = 0; + } else if ((u8)num <= 19) { + uVar1 = 1; + } else if ((u8)num <= 39) { + uVar1 = 2; + } else if ((u8)num <= 59) { + uVar1 = 3; } else { - ret = 4; + uVar1 = 4; } - return ret; + return uVar1; } -#else -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm int dMsgFlow_c::query049(mesg_flow_node_branch* param_0, fopAc_ac_c* param_1, int param_2) { - nofralloc -#include "asm/d/msg/d_msg_flow/query049__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci.s" -} -#pragma pop -#endif /* 8024C2FC-8024C340 246C3C 0044+00 1/0 0/0 0/0 .text * query050__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp index 2feb933df9..fcc4225dea 100644 --- a/src/d/s/d_s_logo.cpp +++ b/src/d/s/d_s_logo.cpp @@ -132,8 +132,6 @@ extern "C" void _restgpr_26(); extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__10dDlst_2D_c[3]; extern "C" u8 m_cpadInfo__8mDoCPd_c[256]; extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; diff --git a/src/d/s/d_s_menu.cpp b/src/d/s/d_s_menu.cpp index ab87a820d0..30a1cafe0c 100644 --- a/src/d/s/d_s_menu.cpp +++ b/src/d/s/d_s_menu.cpp @@ -1,33 +1,28 @@ -// -// Generated By: dol2asm -// Translation Unit: d/s/d_s_menu -// +/** + * d_s_menu.cpp + * dolzel2 - Scene Menu + */ #include "d/s/d_s_menu.h" -#include "dol2asm.h" -#include "dolphin/types.h" +#include "d/d_procname.h" +#include "f_pc/f_pc_node.h" +#include "f_pc/f_pc_leaf.h" +#include "f_op/f_op_scene.h" -// -// Forward References: -// - -extern "C" extern void* g_profile_MENU_SCENE[10]; - -// -// External References: -// - -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; - -// -// Declarations: -// /* ############################################################################################## */ /* 803C3018-803C3040 -00001 0028+00 0/0 0/0 1/0 .data g_profile_MENU_SCENE */ -SECTION_DATA extern void* g_profile_MENU_SCENE[10] = { - (void*)NULL, (void*)0x0001FFFD, (void*)0x000A0000, (void*)&g_fpcNd_Method, - (void*)NULL, (void*)NULL, (void*)NULL, (void*)&g_fopScn_Method, - (void*)NULL, (void*)NULL, +extern scene_process_profile_definition g_profile_MENU_SCENE = { + 0, // mLayerID + 1, // mListID + -3, // mListPrio + PROC_MENU_SCENE, // mProcName + 0, // padding + &g_fpcNd_Method.mBase, // mSubMtd + 0, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopScn_Method.mBase, // mSubMtd + 0, // mpMtd + 0 // padding }; diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp index b181e2470d..abdc4a0cfc 100644 --- a/src/d/s/d_s_name.cpp +++ b/src/d/s/d_s_name.cpp @@ -181,8 +181,8 @@ extern "C" void __register_global_object(); extern "C" void __ptmf_scall(); extern "C" void _savegpr_28(); extern "C" void _restgpr_28(); -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; +// extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; +// extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; extern "C" void* mRenderModeObj__15mDoMch_render_c[1 + 1 /* padding */]; extern "C" u8 mFader__13mDoGph_gInf_c[4]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp index e5bff1a6cf..bb317ce116 100644 --- a/src/d/s/d_s_play.cpp +++ b/src/d/s/d_s_play.cpp @@ -182,8 +182,8 @@ extern "C" void _savegpr_29(); extern "C" void _restgpr_26(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; +// extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; +// extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; extern "C" extern void* __vt__14mDoHIO_entry_c[3]; extern "C" u8 m_bloom__13mDoGph_gInf_c[20]; extern "C" u8 mLineCheck__11fopAcM_lc_c[112]; diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp index dee514aed7..123607dee6 100644 --- a/src/d/s/d_s_room.cpp +++ b/src/d/s/d_s_room.cpp @@ -104,8 +104,8 @@ extern "C" void _restgpr_27(); extern "C" void _restgpr_28(); extern "C" void _restgpr_29(); extern "C" void strnicmp(); -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; +// extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; +// extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; extern "C" u8 mStatus__20dStage_roomControl_c[65792]; extern "C" u8 mDemoArcName__20dStage_roomControl_c[10 + 2 /* padding */]; extern "C" u8 mResetData__6mDoRst[4 + 4 /* padding */]; diff --git a/src/d/s/d_s_title.cpp b/src/d/s/d_s_title.cpp index 446ed6114a..234f025e64 100644 --- a/src/d/s/d_s_title.cpp +++ b/src/d/s/d_s_title.cpp @@ -1,41 +1,42 @@ -// -// Generated By: dol2asm -// Translation Unit: d/s/d_s_title -// +/** + * d_s_title.cpp + * dolzel2 - Scene Title + */ #include "d/s/d_s_title.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" extern void* g_profile_WARNING_SCENE[10]; -extern "C" extern void* g_profile_WARNING2_SCENE[10]; - -// -// External References: -// - -extern "C" extern void* g_fopScn_Method[5 + 1 /* padding */]; -extern "C" extern void* g_fpcNd_Method[5 + 1 /* padding */]; - -// -// Declarations: -// +#include "f_op/f_op_scene.h" +#include "f_pc/f_pc_leaf.h" +#include "d/d_procname.h" /* ############################################################################################## */ /* 803C32B0-803C32D8 -00001 0028+00 0/0 0/0 1/0 .data g_profile_WARNING_SCENE */ -SECTION_DATA extern void* g_profile_WARNING_SCENE[10] = { - (void*)NULL, (void*)0x0001FFFD, (void*)0x000F0000, (void*)&g_fpcNd_Method, - (void*)0x00000204, (void*)NULL, (void*)NULL, (void*)&g_fopScn_Method, - (void*)NULL, (void*)NULL, +extern scene_process_profile_definition g_profile_WARNING_SCENE = { + 0, // mLayerID + 1, // mListID + -3, // mListPrio + PROC_WARNING_SCENE, // mProcName + 0, // padding + &g_fpcNd_Method.mBase, // mSubMtd + 0x00000204, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopScn_Method.mBase, // mSubMtd + 0, // mpMtd + 0 // padding }; /* 803C32D8-803C3300 -00001 0028+00 0/0 0/0 1/0 .data g_profile_WARNING2_SCENE */ -SECTION_DATA extern void* g_profile_WARNING2_SCENE[10] = { - (void*)NULL, (void*)0x0001FFFD, (void*)0x00100000, (void*)&g_fpcNd_Method, - (void*)0x00000204, (void*)NULL, (void*)NULL, (void*)&g_fopScn_Method, - (void*)NULL, (void*)NULL, +extern scene_process_profile_definition g_profile_WARNING2_SCENE = { + 0, // mLayerID + 1, // mListID + -3, // mListPrio + PROC_WARNING2_SCENE, // mProcName + 0, // padding + &g_fpcNd_Method.mBase, // mSubMtd + 0x00000204, // mSize + 0, // mSizeOther + 0, // mParameters + &g_fopScn_Method.mBase, // mSubMtd + 0, // mpMtd + 0 // padding }; diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp index 251b3dce4c..6a778ff5eb 100644 --- a/src/d/save/d_save.cpp +++ b/src/d/save/d_save.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: d/save/d_save -// +/** + * d_save.cpp + * Save File Manager + */ #include "d/save/d_save.h" #include "Z2AudioLib/Z2AudioMgr.h" @@ -15,167 +15,12 @@ // Forward References: // -extern "C" static void dSv_item_rename__FUc(); -extern "C" void init__21dSv_player_status_a_cFv(); -extern "C" void setSelectItemIndex__21dSv_player_status_a_cFiUc(); -extern "C" void getSelectItemIndex__21dSv_player_status_a_cCFi(); -extern "C" void setMixItemIndex__21dSv_player_status_a_cFiUc(); -extern "C" void getMixItemIndex__21dSv_player_status_a_cCFi(); -extern "C" void getRupeeMax__21dSv_player_status_a_cCFv(); -extern "C" void isMagicFlag__21dSv_player_status_a_cCFUc(); -extern "C" void init__21dSv_player_status_b_cFv(); -extern "C" void onDarkClearLV__21dSv_player_status_b_cFi(); -extern "C" void isDarkClearLV__21dSv_player_status_b_cCFi(); -extern "C" void onTransformLV__21dSv_player_status_b_cFi(); -extern "C" void isTransformLV__21dSv_player_status_b_cCFi(); -extern "C" void init__17dSv_horse_place_cFv(); -extern "C" void set__17dSv_horse_place_cFPCcRC4cXyzsSc(); -extern "C" void init__25dSv_player_return_place_cFv(); -extern "C" void set__25dSv_player_return_place_cFPCcScUc(); -extern "C" void init__33dSv_player_field_last_stay_info_cFv(); -extern "C" void set__33dSv_player_field_last_stay_info_cFPCcRC4cXyzsScUc(); -extern "C" void onRegionBit__33dSv_player_field_last_stay_info_cFi(); -extern "C" void isRegionBit__33dSv_player_field_last_stay_info_cCFi(); -extern "C" void init__27dSv_player_last_mark_info_cFv(); -extern "C" void setWarpItemData__27dSv_player_last_mark_info_cFPCcRC4cXyzsScUcUc(); -extern "C" void init__17dSv_player_item_cFv(); extern "C" void setItem__17dSv_player_item_cFiUc(); extern "C" void getItem__17dSv_player_item_cCFib(); -extern "C" void setLineUpItem__17dSv_player_item_cFv(); -extern "C" void getLineUpItem__17dSv_player_item_cCFi(); -extern "C" void setBottleItemIn__17dSv_player_item_cFUcUc(); -extern "C" void setEmptyBottleItemIn__17dSv_player_item_cFUc(); -extern "C" void setEmptyBottle__17dSv_player_item_cFv(); -extern "C" void setEmptyBottle__17dSv_player_item_cFUc(); -extern "C" void setEquipBottleItemIn__17dSv_player_item_cFUcUc(); -extern "C" void setEquipBottleItemEmpty__17dSv_player_item_cFUc(); -extern "C" void checkBottle__17dSv_player_item_cFUc(); -extern "C" void checkInsectBottle__17dSv_player_item_cFv(); -extern "C" void checkEmptyBottle__17dSv_player_item_cFv(); -extern "C" void setBombBagItemIn__17dSv_player_item_cFUcUcb(); -extern "C" void setBombBagItemIn__17dSv_player_item_cFUcUcUcb(); -extern "C" void setEmptyBombBagItemIn__17dSv_player_item_cFUcb(); -extern "C" void setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb(); -extern "C" void setEmptyBombBag__17dSv_player_item_cFv(); -extern "C" void setEmptyBombBag__17dSv_player_item_cFUcUc(); -extern "C" void checkBombBag__17dSv_player_item_cFUc(); -extern "C" void setWarashibeItem__17dSv_player_item_cFUc(); -extern "C" void setRodTypeLevelUp__17dSv_player_item_cFv(); -extern "C" void setBaitItem__17dSv_player_item_cFUc(); -extern "C" void init__21dSv_player_get_item_cFv(); -extern "C" void onFirstBit__21dSv_player_get_item_cFUc(); -extern "C" void offFirstBit__21dSv_player_get_item_cFUc(); extern "C" void isFirstBit__21dSv_player_get_item_cCFUc(); -extern "C" void init__24dSv_player_item_record_cFv(); -extern "C" void setBombNum__24dSv_player_item_record_cFUcUc(); -extern "C" void getBombNum__24dSv_player_item_record_cCFUc(); -extern "C" void setBottleNum__24dSv_player_item_record_cFUcUc(); -extern "C" void addBottleNum__24dSv_player_item_record_cFUcs(); -extern "C" void getBottleNum__24dSv_player_item_record_cCFUc(); -extern "C" void init__21dSv_player_item_max_cFv(); -extern "C" void setBombNum__21dSv_player_item_max_cFUcUc(); -extern "C" void getBombNum__21dSv_player_item_max_cCFUc(); -extern "C" void init__20dSv_player_collect_cFv(); -extern "C" void setCollect__20dSv_player_collect_cFiUc(); -extern "C" void isCollect__20dSv_player_collect_cCFiUc(); -extern "C" void onCollectCrystal__20dSv_player_collect_cFUc(); -extern "C" void isCollectCrystal__20dSv_player_collect_cCFUc(); -extern "C" void onCollectMirror__20dSv_player_collect_cFUc(); -extern "C" void isCollectMirror__20dSv_player_collect_cCFUc(); -extern "C" void init__17dSv_player_wolf_cFv(); -extern "C" void init__16dSv_light_drop_cFv(); -extern "C" void setLightDropNum__16dSv_light_drop_cFUcUc(); -extern "C" void getLightDropNum__16dSv_light_drop_cCFUc(); -extern "C" void onLightDropGetFlag__16dSv_light_drop_cFUc(); -extern "C" void isLightDropGetFlag__16dSv_light_drop_cCFUc(); -extern "C" void init__17dSv_letter_info_cFv(); -extern "C" void onLetterGetFlag__17dSv_letter_info_cFi(); -extern "C" void isLetterGetFlag__17dSv_letter_info_cCFi(); -extern "C" void onLetterReadFlag__17dSv_letter_info_cFi(); -extern "C" void isLetterReadFlag__17dSv_letter_info_cCFi(); -extern "C" void init__18dSv_fishing_info_cFv(); -extern "C" void addFishCount__18dSv_fishing_info_cFUc(); -extern "C" void init__17dSv_player_info_cFv(); -extern "C" void init__19dSv_player_config_cFv(); -extern "C" void checkVibration__19dSv_player_config_cCFv(); -extern "C" void getSound__19dSv_player_config_cFv(); -extern "C" void setSound__19dSv_player_config_cFUc(); -extern "C" void getVibration__19dSv_player_config_cFv(); -extern "C" void setVibration__19dSv_player_config_cFUc(); -extern "C" void init__12dSv_player_cFv(); -extern "C" void init__12dSv_memBit_cFv(); -extern "C" void onTbox__12dSv_memBit_cFi(); -extern "C" void offTbox__12dSv_memBit_cFi(); -extern "C" void isTbox__12dSv_memBit_cCFi(); -extern "C" void onSwitch__12dSv_memBit_cFi(); -extern "C" void offSwitch__12dSv_memBit_cFi(); -extern "C" void isSwitch__12dSv_memBit_cCFi(); -extern "C" void revSwitch__12dSv_memBit_cFi(); -extern "C" void onItem__12dSv_memBit_cFi(); -extern "C" void isItem__12dSv_memBit_cCFi(); -extern "C" void onDungeonItem__12dSv_memBit_cFi(); -extern "C" void isDungeonItem__12dSv_memBit_cCFi(); -extern "C" void init__11dSv_event_cFv(); extern "C" void onEventBit__11dSv_event_cFUs(); extern "C" void offEventBit__11dSv_event_cFUs(); extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void setEventReg__11dSv_event_cFUsUc(); -extern "C" void getEventReg__11dSv_event_cCFUs(); -extern "C" void init__14dSv_MiniGame_cFv(); -extern "C" void init__12dSv_memory_cFv(); -extern "C" void init__13dSv_memory2_cFv(); -extern "C" void onVisitedRoom__13dSv_memory2_cFi(); -extern "C" void offVisitedRoom__13dSv_memory2_cFi(); -extern "C" void isVisitedRoom__13dSv_memory2_cFi(); -extern "C" void init__12dSv_danBit_cFSc(); -extern "C" void onSwitch__12dSv_danBit_cFi(); -extern "C" void offSwitch__12dSv_danBit_cFi(); -extern "C" void isSwitch__12dSv_danBit_cCFi(); -extern "C" void revSwitch__12dSv_danBit_cFi(); -extern "C" void onItem__12dSv_danBit_cFi(); -extern "C" void isItem__12dSv_danBit_cCFi(); -extern "C" void init__13dSv_zoneBit_cFv(); -extern "C" void clearRoomSwitch__13dSv_zoneBit_cFv(); -extern "C" void clearRoomItem__13dSv_zoneBit_cFv(); -extern "C" void onSwitch__13dSv_zoneBit_cFi(); -extern "C" void offSwitch__13dSv_zoneBit_cFi(); -extern "C" void isSwitch__13dSv_zoneBit_cCFi(); -extern "C" void revSwitch__13dSv_zoneBit_cFi(); -extern "C" void onOneSwitch__13dSv_zoneBit_cFi(); -extern "C" void offOneSwitch__13dSv_zoneBit_cFi(); -extern "C" void isOneSwitch__13dSv_zoneBit_cCFi(); -extern "C" void revOneSwitch__13dSv_zoneBit_cFi(); -extern "C" void onItem__13dSv_zoneBit_cFi(); -extern "C" void isItem__13dSv_zoneBit_cCFi(); -extern "C" void onOneItem__13dSv_zoneBit_cFi(); -extern "C" void isOneItem__13dSv_zoneBit_cCFi(); -extern "C" void init__15dSv_zoneActor_cFv(); -extern "C" void on__15dSv_zoneActor_cFi(); -extern "C" void off__15dSv_zoneActor_cFi(); -extern "C" void is__15dSv_zoneActor_cCFi(); -extern "C" void init__10dSv_zone_cFi(); -extern "C" void setRoom__13dSv_restart_cFRC4cXyzsSc(); -extern "C" void set__17dSv_turnRestart_cFRC4cXyzsScUl(); -extern "C" void init__10dSv_info_cFv(); -extern "C" void init__10dSv_save_cFv(); -extern "C" void getSave2__10dSv_save_cFi(); -extern "C" void getSave__10dSv_info_cFi(); -extern "C" void putSave__10dSv_info_cFi(); -extern "C" void initZone__10dSv_info_cFv(); -extern "C" void createZone__10dSv_info_cFi(); -extern "C" void onSwitch__10dSv_info_cFii(); -extern "C" void offSwitch__10dSv_info_cFii(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void revSwitch__10dSv_info_cFii(); -extern "C" void onItem__10dSv_info_cFii(); -extern "C" void isItem__10dSv_info_cCFii(); -extern "C" void onActor__10dSv_info_cFii(); -extern "C" void offActor__10dSv_info_cFii(); -extern "C" void isActor__10dSv_info_cCFii(); -extern "C" void memory_to_card__10dSv_info_cFPci(); -extern "C" void card_to_memory__10dSv_info_cFPci(); -extern "C" void initdata_to_card__10dSv_info_cFPci(); -extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */]; extern "C" extern char const* const d_save_d_save__stringBase0; extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; @@ -183,43 +28,16 @@ extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; // External References: // -extern "C" void setNowVibration__14dComIfG_play_cFUc(); -extern "C" void getNowVibration__14dComIfG_play_cFv(); -extern "C" void getZoneNo__20dStage_roomControl_cFi(); -extern "C" void dComIfGs_setSelectItemIndex__FiUc(int, u8); -extern "C" void dComIfGs_setMixItemIndex__FiUc(int, u8); -extern "C" u8 dComIfGs_getMixItemIndex__Fi(int); -extern "C" void dComIfGp_setSelectItem__Fi(int); -extern "C" u8 dComIfGs_getBottleMax__Fv(); -extern "C" void dComIfGs_setKeyNum__FiUc(); -extern "C" void __ct__13dSv_memory2_cFv(); -extern "C" void __ct__12dSv_memory_cFv(); -extern "C" void clrSaveFlag__12daObjCarry_cFv(); -extern "C" void setSaveFlag__12daObjCarry_cFv(); extern "C" void setInitEventBit__Fv(); -extern "C" void getString__13dMeter2Info_cFUlPcP14JMSMesgEntry_c(); -extern "C" void setHotSpringTimer__13dMeter2Info_cFUc(); -extern "C" void setSaveStageName__13dMeter2Info_cFPCc(); -extern "C" void setOutputMode__10Z2AudioMgrFUl(); -extern "C" void __construct_array(); extern "C" void _savegpr_22(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); extern "C" void _restgpr_22(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); extern "C" void __div2i(); -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; -extern "C" u8 sRumbleSupported__10JUTGamePad[4]; // // Declarations: // +/* 80032918-80032958 02D258 0040+00 4/4 0/0 0/0 .text dSv_item_rename__FUc */ static u8 dSv_item_rename(u8 i_itemNo) { switch (i_itemNo) { case OIL_BOTTLE_2: @@ -233,6 +51,7 @@ static u8 dSv_item_rename(u8 i_itemNo) { } } +/* 80032958-80032A48 02D298 00F0+00 1/1 0/0 0/0 .text init__21dSv_player_status_a_cFv */ void dSv_player_status_a_c::init() { mMaxLife = 15; mLife = 12; @@ -268,12 +87,16 @@ void dSv_player_status_a_c::init() { } } +/* 80032A48-80032A5C 02D388 0014+00 0/0 1/1 0/0 .text + * setSelectItemIndex__21dSv_player_status_a_cFiUc */ void dSv_player_status_a_c::setSelectItemIndex(int i_no, u8 i_slotNo) { if (i_no < MAX_SELECT_ITEM) { mSelectItem[i_no] = i_slotNo; } } +/* 80032A5C-80032A78 02D39C 001C+00 7/7 20/20 0/0 .text + * getSelectItemIndex__21dSv_player_status_a_cCFi */ u8 dSv_player_status_a_c::getSelectItemIndex(int i_no) const { if (i_no < MAX_SELECT_ITEM) { return mSelectItem[i_no]; @@ -281,12 +104,16 @@ u8 dSv_player_status_a_c::getSelectItemIndex(int i_no) const { return 0; } +/* 80032A78-80032A8C 02D3B8 0014+00 0/0 1/1 0/0 .text setMixItemIndex__21dSv_player_status_a_cFiUc + */ void dSv_player_status_a_c::setMixItemIndex(int i_no, u8 i_slotNo) { if (i_no < MAX_SELECT_ITEM) { mMixItem[i_no] = i_slotNo; } } +/* 80032A8C-80032AA8 02D3CC 001C+00 0/0 1/1 0/0 .text getMixItemIndex__21dSv_player_status_a_cCFi + */ u8 dSv_player_status_a_c::getMixItemIndex(int i_no) const { if (i_no < MAX_SELECT_ITEM) { return mMixItem[i_no]; @@ -294,6 +121,7 @@ u8 dSv_player_status_a_c::getMixItemIndex(int i_no) const { return 0; } +/* 80032AA8-80032AF8 02D3E8 0050+00 0/0 4/4 0/0 .text getRupeeMax__21dSv_player_status_a_cCFv */ u16 dSv_player_status_a_c::getRupeeMax() const { if (mWalletSize < 3) { // if you make this a default, it wont match. Compiler, pls. switch (mWalletSize) { @@ -308,14 +136,16 @@ u16 dSv_player_status_a_c::getRupeeMax() const { return 0; } +/* 80032AF8-80032B50 02D438 0058+00 0/0 1/1 0/0 .text isMagicFlag__21dSv_player_status_a_cCFUc */ BOOL dSv_player_status_a_c::isMagicFlag(u8 i_magic) const { if (i_magic == 0) { - return i_dComIfGs_isEventBit(0x2304); // Magic Unlocked + return i_dComIfGs_isEventBit(dSv_event_flag_c::M_097); // Magic Unlocked } return (mMagicFlag & (u8)(1 << i_magic)) ? TRUE : FALSE; } +/* 80032B50-80032B94 02D490 0044+00 1/1 0/0 0/0 .text init__21dSv_player_status_b_cFv */ void dSv_player_status_b_c::init() { mDateIpl = 0; mTransformLevelFlag = 0; @@ -329,22 +159,27 @@ void dSv_player_status_b_c::init() { } } +/* 80032B94-80032BB0 02D4D4 001C+00 0/0 1/1 0/0 .text onDarkClearLV__21dSv_player_status_b_cFi */ void dSv_player_status_b_c::onDarkClearLV(int i_no) { mDarkClearLevelFlag |= (u8)(1 << i_no); } +/* 80032BB0-80032BD0 02D4F0 0020+00 0/0 4/4 8/8 .text isDarkClearLV__21dSv_player_status_b_cCFi */ BOOL dSv_player_status_b_c::isDarkClearLV(int i_no) const { return mDarkClearLevelFlag & (u8)(1 << i_no) ? TRUE : FALSE; } +/* 80032BD0-80032BEC 02D510 001C+00 0/0 1/1 0/0 .text onTransformLV__21dSv_player_status_b_cFi */ void dSv_player_status_b_c::onTransformLV(int i_no) { mTransformLevelFlag |= (u8)(1 << i_no); } +/* 80032BEC-80032C0C 02D52C 0020+00 0/0 8/8 9/9 .text isTransformLV__21dSv_player_status_b_cCFi */ BOOL dSv_player_status_b_c::isTransformLV(int i_no) const { return mTransformLevelFlag & (u8)(1 << i_no) ? TRUE : FALSE; } +/* 80032C0C-80032C64 02D54C 0058+00 1/1 0/0 0/0 .text init__17dSv_horse_place_cFv */ void dSv_horse_place_c::init() { strcpy(mName, ""); mPos.set(0.0f, 0.0f, 0.0f); @@ -353,6 +188,7 @@ void dSv_horse_place_c::init() { mRoomNo = 0; } +/* 80032C64-80032CC8 02D5A4 0064+00 0/0 0/0 1/1 .text set__17dSv_horse_place_cFPCcRC4cXyzsSc */ void dSv_horse_place_c::set(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_roomNo) { strcpy(mName, i_name); mPos = i_pos; @@ -360,6 +196,8 @@ void dSv_horse_place_c::set(const char* i_name, const cXyz& i_pos, s16 i_angle, mRoomNo = i_roomNo; } +/* 80032CC8-80032D1C 02D608 0054+00 1/1 0/0 0/0 .text init__25dSv_player_return_place_cFv + */ void dSv_player_return_place_c::init() { strcpy(mName, "F_SP108"); mRoomNo = 1; @@ -368,12 +206,15 @@ void dSv_player_return_place_c::init() { unk11 = 0; } +/* 80032D1C-80032D60 02D65C 0044+00 0/0 0/0 1/1 .text set__25dSv_player_return_place_cFPCcScUc */ void dSv_player_return_place_c::set(const char* i_name, s8 i_roomNo, u8 i_status) { strcpy(mName, i_name); mRoomNo = i_roomNo; mPlayerStatus = i_status; } +/* 80032D60-80032DE0 02D6A0 0080+00 1/1 0/0 0/0 .text init__33dSv_player_field_last_stay_info_cFv + */ void dSv_player_field_last_stay_info_c::init() { strcpy(mName, ""); mPos.set(0.0f, 0.0f, 0.0f); @@ -388,6 +229,8 @@ void dSv_player_field_last_stay_info_c::init() { } } +/* 80032DE0-80032E4C 02D720 006C+00 0/0 2/2 0/0 .text + * set__33dSv_player_field_last_stay_info_cFPCcRC4cXyzsScUc */ void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_spawn, u8 i_regionNo) { strcpy(mName, i_name); @@ -397,12 +240,16 @@ void dSv_player_field_last_stay_info_c::set(const char* i_name, const cXyz& i_po mRegionNo = i_regionNo; } +/* 80032E4C-80032E78 02D78C 002C+00 0/0 1/1 0/0 .text + * onRegionBit__33dSv_player_field_last_stay_info_cFi */ void dSv_player_field_last_stay_info_c::onRegionBit(int i_region) { if (i_region >= 0 && i_region < 8) { mRegion |= (u8)(1 << i_region); } } +/* 80032E78-80032EB0 02D7B8 0038+00 0/0 2/2 0/0 .text + * isRegionBit__33dSv_player_field_last_stay_info_cCFi */ BOOL dSv_player_field_last_stay_info_c::isRegionBit(int i_region) const { if (i_region >= 0 && i_region < 8) { return (mRegion & (u8)(1 << i_region)) ? TRUE : FALSE; @@ -410,6 +257,7 @@ BOOL dSv_player_field_last_stay_info_c::isRegionBit(int i_region) const { return false; } +/* 80032EB0-80032F2C 02D7F0 007C+00 1/1 0/0 0/0 .text init__27dSv_player_last_mark_info_cFv */ void dSv_player_last_mark_info_c::init() { strcpy(mName, ""); mPos.set(0.0f, 0.0f, 0.0f); @@ -423,6 +271,8 @@ void dSv_player_last_mark_info_c::init() { } } +/* 80032F2C-80032F90 02D86C 0064+00 0/0 1/1 0/0 .text + * setWarpItemData__27dSv_player_last_mark_info_cFPCcRC4cXyzsScUcUc */ void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz& i_pos, s16 i_angle, s8 i_roomNo, u8, u8) { strcpy(mName, i_name); @@ -431,6 +281,7 @@ void dSv_player_last_mark_info_c::setWarpItemData(const char* i_name, const cXyz mRoomNo = i_roomNo; } +/* 80032F90-80032FB8 02D8D0 0028+00 1/1 0/0 0/0 .text init__17dSv_player_item_cFv */ void dSv_player_item_c::init() { for (int i = 0; i < MAX_ITEM_SLOTS; i++) { mItems[i] = NO_ITEM; @@ -438,6 +289,7 @@ void dSv_player_item_c::init() { } } +/* 80032FB8-80033030 02D8F8 0078+00 11/11 45/45 2/2 .text setItem__17dSv_player_item_cFiUc */ void dSv_player_item_c::setItem(int i_slotNo, u8 i_itemNo) { if (i_slotNo < MAX_ITEM_SLOTS) { mItems[i_slotNo] = i_itemNo; @@ -451,6 +303,8 @@ void dSv_player_item_c::setItem(int i_slotNo, u8 i_itemNo) { } } +/* 80033030-800332F8 02D970 02C8+00 7/7 70/70 2/2 .text getItem__17dSv_player_item_cCFib + */ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { if (i_slotNo < MAX_ITEM_SLOTS) { if (i_checkCombo) { @@ -523,6 +377,8 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { return NO_ITEM; } +/* ############################################################################################## */ +/* 803A7270-803A7288 004390 0017+01 1/1 0/0 0/0 .data i_item_lst$4006 */ static u8 i_item_lst[23] = { 0x0A, 0x08, 0x06, 0x02, 0x09, 0x04, 0x03, 0x00, 0x01, 0x17, 0x14, 0x05, 0x0F, 0x10, 0x11, 0x0B, 0x0C, 0x0D, 0x0E, 0x13, 0x12, 0x16, 0x15, @@ -545,6 +401,7 @@ void dSv_player_item_c::setLineUpItem() { } } +/* 80033354-80033370 02DC94 001C+00 0/0 2/2 0/0 .text getLineUpItem__17dSv_player_item_cCFi */ u8 dSv_player_item_c::getLineUpItem(int i_slotNo) const { if (i_slotNo < MAX_ITEM_SLOTS) { return mItemSlots[i_slotNo]; @@ -582,6 +439,7 @@ void dSv_player_item_c::setEmptyBottleItemIn(u8 i_itemNo) { setBottleItemIn(EMPTY_BOTTLE, i_itemNo); } +/* 80033494-80033514 02DDD4 0080+00 0/0 1/1 1/1 .text setEmptyBottle__17dSv_player_item_cFv */ void dSv_player_item_c::setEmptyBottle() { for (int i = 0; i < 4; i++) { if (dComIfGs_getItem((u8)(i + SLOT_11), true) == NO_ITEM) { @@ -591,6 +449,7 @@ void dSv_player_item_c::setEmptyBottle() { } } +/* 80033514-80033598 02DE54 0084+00 0/0 3/3 0/0 .text setEmptyBottle__17dSv_player_item_cFUc */ void dSv_player_item_c::setEmptyBottle(u8 i_itemNo) { for (int i = 0; i < 4; i++) { if (dComIfGs_getItem((u8)(i + SLOT_11), true) == NO_ITEM) { @@ -618,10 +477,13 @@ void dSv_player_item_c::setEquipBottleItemIn(u8 curItemIn, u8 newItemIn) { } } +/* 800336BC-800336E0 02DFFC 0024+00 0/0 4/4 0/0 .text + * setEquipBottleItemEmpty__17dSv_player_item_cFUc */ void dSv_player_item_c::setEquipBottleItemEmpty(u8 curItemIn) { setEquipBottleItemIn(curItemIn, EMPTY_BOTTLE); } +/* 800336E0-80033754 02E020 0074+00 0/0 30/30 0/0 .text checkBottle__17dSv_player_item_cFUc */ u8 dSv_player_item_c::checkBottle(u8 i_itemNo) { u8 num_bottles = 0; u8 item_id = dSv_item_rename(i_itemNo); @@ -637,77 +499,81 @@ u8 dSv_player_item_c::checkBottle(u8 i_itemNo) { /* ############################################################################################## */ /* 803A7288-803A78F8 0043A8 066C+04 2/2 45/45 148/148 .data saveBitLabels__16dSv_event_flag_c */ u16 dSv_event_flag_c::saveBitLabels[822] = { - 0xFFFF, 0x0080, 0x0040, 0x0020, 0x0010, 0x0008, 0x0004, 0x0002, 0x0001, 0x0180, 0x0140, 0x0120, - 0x0110, 0x0108, 0x0104, 0x0102, 0x0101, 0x0280, 0x0240, 0x0220, 0x0210, 0x0208, 0x0204, 0x0202, - 0x0201, 0x0380, 0x0340, 0x0320, 0x0310, 0x0308, 0x0304, 0x0302, 0x0301, 0x0480, 0x0440, 0x0420, - 0x0410, 0x0408, 0x0404, 0x0402, 0x0401, 0x0580, 0x0540, 0x0520, 0x0510, 0x0508, 0x0504, 0x0502, - 0x0501, 0x0680, 0x0640, 0x0620, 0x0610, 0x0608, 0x0604, 0x0602, 0x0601, 0x0780, 0x0740, 0x0720, - 0x0710, 0x0708, 0x0704, 0x0702, 0x0701, 0x0880, 0x0840, 0x0820, 0x0810, 0x0808, 0x0804, 0x0802, - 0x0801, 0x0980, 0x0940, 0x0920, 0x0910, 0x0908, 0x0904, 0x0902, 0x0901, 0x0A80, 0x0A40, 0x0A20, - 0x0A10, 0x0A08, 0x0A04, 0x0A02, 0x0A01, 0x0B80, 0x0B40, 0x0B20, 0x0B10, 0x0B08, 0x0B04, 0x0B02, - 0x0B01, 0x0C80, 0x0C40, 0x0C20, 0x0C10, 0x0C08, 0x0C04, 0x0C02, 0x0C01, 0x0D80, 0x0D40, 0x0D20, - 0x0D10, 0x0D08, 0x0D04, 0x0D02, 0x0D01, 0x0E80, 0x0E40, 0x0E20, 0x0E10, 0x0E08, 0x0E04, 0x0E02, - 0x0E01, 0x0F80, 0x0F40, 0x0F20, 0x0F10, 0x0F08, 0x0F04, 0x0F02, 0x0F01, 0x1080, 0x1040, 0x1020, - 0x1010, 0x1008, 0x1004, 0x1002, 0x1001, 0x1180, 0x1140, 0x1120, 0x1110, 0x1108, 0x1104, 0x1102, - 0x1101, 0x1280, 0x1240, 0x1220, 0x1210, 0x1208, 0x1204, 0x1202, 0x1201, 0x1380, 0x1340, 0x1320, - 0x1310, 0x1308, 0x1304, 0x1302, 0x1301, 0x1480, 0x1440, 0x1420, 0x1410, 0x1408, 0x1404, 0x1402, - 0x1401, 0x1580, 0x1540, 0x1520, 0x1510, 0x1508, 0x1504, 0x1502, 0x1501, 0x1680, 0x1640, 0x1620, - 0x1610, 0x1608, 0x1604, 0x1602, 0x1601, 0xFF1F, 0x1780, 0x1740, 0x1720, 0x1710, 0x1708, 0x1704, - 0x1702, 0x1701, 0x1880, 0x1840, 0x1820, 0x1810, 0xFEFF, 0xFDFF, 0xFCFF, 0xFBFF, 0x1808, 0x1804, - 0x1802, 0x1801, 0x1980, 0x1940, 0x1920, 0x1910, 0x1908, 0x1904, 0x1902, 0x1901, 0x1A80, 0x1A40, - 0x1A20, 0x1A10, 0x1A08, 0x1A04, 0x1A02, 0x1A01, 0x1B80, 0x1B40, 0x1B20, 0x1B10, 0x1B08, 0x1B04, - 0x1B02, 0x1B01, 0x1C80, 0x1C40, 0x1C20, 0x1C10, 0x1C08, 0x1C04, 0x1C02, 0x1C01, 0x1D80, 0x1D40, - 0x1D20, 0x1D10, 0x1D08, 0x1D04, 0x1D02, 0x1D01, 0x1E80, 0x1E40, 0x1E20, 0x1E10, 0x1E08, 0x1E04, - 0x1E02, 0x1E01, 0x1F80, 0x1F40, 0x1F20, 0x1F10, 0x1F08, 0x1F04, 0x1F02, 0x1F01, 0x2080, 0x2040, - 0x2020, 0x2010, 0x2008, 0x2004, 0x2002, 0x2001, 0x2180, 0x2140, 0x2120, 0x2110, 0x2108, 0x2104, - 0x2102, 0x2101, 0x2280, 0x2240, 0x2220, 0x2210, 0x2208, 0x2204, 0x2202, 0x2201, 0x2380, 0x2340, - 0x2320, 0x2310, 0x2308, 0x2304, 0x2302, 0x2301, 0x2480, 0x2440, 0x2420, 0x2410, 0x2408, 0x2404, - 0x2402, 0x2401, 0x2580, 0x2540, 0x2520, 0x2510, 0x2508, 0x2504, 0x2502, 0x2501, 0x2680, 0x2640, - 0x2620, 0x2610, 0x2608, 0x2604, 0x2602, 0x2601, 0x2780, 0x2740, 0x2720, 0x2710, 0x2708, 0x2704, - 0x2702, 0x2701, 0x2880, 0x2840, 0x2820, 0x2810, 0x2808, 0x2804, 0x2802, 0x2801, 0x2980, 0x2940, - 0x2920, 0x2910, 0x2908, 0x2904, 0x2902, 0x2901, 0x2A80, 0x2A40, 0x2A20, 0x2A10, 0x2A08, 0x2A04, - 0x2A02, 0x2A01, 0x2B80, 0x2B40, 0x2B20, 0x2B10, 0x2B08, 0x2B04, 0x2B02, 0x2B01, 0x2C80, 0x2C40, - 0x2C20, 0x2C10, 0x2C08, 0x2C04, 0x2C02, 0x2C01, 0x2D80, 0x2D40, 0x2D20, 0x2D10, 0x2D08, 0x2D04, - 0x2D02, 0x2D01, 0x2E80, 0x2E40, 0x2E20, 0x2E10, 0x2E08, 0x2E04, 0x2E02, 0x2E01, 0x2F80, 0x2F40, - 0x2F20, 0x2F10, 0x2F08, 0x2F04, 0x2F02, 0x2F01, 0x3080, 0x3040, 0x3020, 0x3010, 0x3008, 0x3004, - 0x3002, 0x3001, 0x3180, 0x3140, 0x3120, 0x3110, 0x3108, 0x3104, 0x3102, 0x3101, 0x3280, 0x3240, - 0x3220, 0x3210, 0x3208, 0x3204, 0x3202, 0x3201, 0x3380, 0x3340, 0x3320, 0x3310, 0x3308, 0x3304, - 0x3302, 0x3301, 0x3480, 0x3440, 0x3420, 0x3410, 0x3408, 0x3404, 0x3402, 0x3401, 0x3580, 0x3540, - 0x3520, 0x3510, 0x3508, 0x3504, 0x3502, 0x3501, 0x3680, 0x3640, 0x3620, 0x3610, 0x3608, 0x3604, - 0x3602, 0x3601, 0x3780, 0x3740, 0x3720, 0x3710, 0x3708, 0xFAFF, 0xF9FF, 0x3704, 0x3702, 0x3701, - 0x3880, 0x3840, 0x3820, 0x3810, 0x3808, 0x3804, 0x3802, 0x3801, 0x3980, 0x3940, 0x3920, 0x3910, - 0x3908, 0x3904, 0x3902, 0x3901, 0x3A80, 0x3A40, 0x3A20, 0x3A10, 0x3A08, 0x3A04, 0x3A02, 0x3A01, - 0x3B80, 0x3B40, 0x3B20, 0x3B10, 0x3B08, 0x3B04, 0x3B02, 0x3B01, 0x3C80, 0x3C40, 0x3C20, 0x3C10, - 0x3C08, 0x3C04, 0x3C02, 0x3C01, 0x3D80, 0x3D40, 0x3D20, 0x3D10, 0x3D08, 0x3D04, 0x3D02, 0x3D01, - 0x3E80, 0x3E40, 0x3E20, 0x3E10, 0x3E08, 0x3E04, 0x3E02, 0xF8FF, 0xF7FF, 0x3E01, 0x3F80, 0x3F40, - 0x3F20, 0x3F10, 0x3F08, 0x3F04, 0x3F02, 0x3F01, 0x4080, 0x4040, 0x4020, 0x4010, 0x4008, 0x4004, - 0x4002, 0x4001, 0x4180, 0x4140, 0x4120, 0x4110, 0x4108, 0x4104, 0x4102, 0x4101, 0x4280, 0x4240, - 0x4220, 0x4210, 0x4208, 0x4204, 0x4202, 0x4201, 0x4380, 0x4340, 0x4320, 0x4310, 0x4308, 0x4304, - 0x4302, 0x4301, 0x4480, 0x4440, 0x4420, 0x4410, 0x4408, 0x4404, 0x4402, 0x4401, 0x4580, 0x4540, - 0x4520, 0x4510, 0x4508, 0x4504, 0x4502, 0x4501, 0x4680, 0x4640, 0x4620, 0x4610, 0x4608, 0x4604, - 0x4602, 0x4601, 0x4780, 0x4740, 0x4720, 0x4710, 0x4708, 0x4704, 0x4702, 0x4701, 0x4880, 0x4840, - 0x4820, 0x4810, 0x4808, 0x4804, 0x4802, 0x4801, 0x4980, 0x4940, 0x4920, 0x4910, 0x4908, 0x4904, - 0x4902, 0x4901, 0xFFFF, 0x4A40, 0x4A20, 0x4A10, 0x4A08, 0x4A04, 0x4A02, 0x4A01, 0x4B80, 0x4B40, - 0x4B20, 0x4B10, 0x4B08, 0x4B04, 0x4B02, 0x4B01, 0x4C80, 0x4C40, 0x4C20, 0x4C10, 0x4C08, 0x4C04, - 0x4C02, 0x4C01, 0x4D80, 0x4D40, 0x4D20, 0x4D10, 0x4D08, 0x4A80, 0x4D04, 0x4D02, 0x4D01, 0x4E80, - 0x4E40, 0x4E20, 0x4E10, 0x4E08, 0x4E04, 0x4E02, 0x4E01, 0x4F80, 0x4F40, 0x4F20, 0x4F10, 0x4F08, - 0x4F04, 0x4F02, 0x4F01, 0x5080, 0x5040, 0x5020, 0x5010, 0x5008, 0x5004, 0x5002, 0x5001, 0x5180, - 0x5140, 0x5120, 0x5110, 0x5108, 0x5104, 0x5102, 0x5101, 0x5280, 0x5240, 0x5220, 0x5210, 0x5208, - 0x5204, 0x5202, 0x5201, 0x5380, 0x5340, 0x5320, 0x5310, 0x5308, 0x5304, 0x5302, 0x5301, 0x5480, - 0x5440, 0x5420, 0x5410, 0x5408, 0x5404, 0x5402, 0x5401, 0x5580, 0x5540, 0x5520, 0x5510, 0x5508, - 0x5504, 0x5502, 0x5501, 0x5680, 0x5640, 0x5620, 0x5610, 0x5608, 0x5604, 0x5602, 0x5601, 0x5780, - 0x5740, 0x5720, 0xF63F, 0xF57F, 0xF47F, 0xF37F, 0xF27F, 0x5710, 0x5708, 0x5704, 0x5702, 0x5701, - 0x5880, 0x5840, 0x5820, 0x5810, 0x5808, 0x5804, 0x5802, 0x5801, 0x5980, 0x5940, 0x5920, 0xF11F, - 0x5910, 0x5908, 0x5904, 0x5902, 0x5901, 0x5A80, 0x5A40, 0x5A20, 0x5A10, 0x5A08, 0x5A04, 0x5A02, - 0x5A01, 0x5B80, 0x5B40, 0x5B20, 0x5B10, 0x5B08, 0x5B04, 0x5B02, 0x5B01, 0x5C80, 0x5C40, 0x5C20, - 0x5C10, 0x5C08, 0x5C04, 0x5C02, 0xF0FF, 0xEFFF, 0xEEFF, 0xEDFF, 0xECFF, 0xEBFF, 0x5C01, 0x5D80, - 0x5D40, 0x5D20, 0x5D10, 0x5D08, 0x5D04, 0x5D02, 0x5D01, 0x5E80, 0x5E40, 0x5E20, 0x5E10, 0x5E08, - 0x5E04, 0x5E02, 0x5E01, 0x5F80, 0x5F40, 0x5F20, 0x5F10, 0x5F08, 0x5F04, 0x5F02, 0x5F01, 0x6080, - 0x6040, 0x6020, 0x6010, 0x6008, 0x6004, 0x6002, 0x6001, 0x6180, 0x6140, 0x6120, 0x6110, 0x6108, - 0x6104, 0x6102, 0x6101, 0x6280, 0x6240, 0x6220, 0x6210, 0x6208, 0x6204, 0x6202, 0x6201, 0x6380, - 0x6340, 0x6320, 0x6310, 0x6308, 0x6304, 0x6302, + UNUSED, TEST_001, TEST_002, TEST_003, TEST_004, F_0001, F_0002, F_0003, F_0004, F_0005, F_0006, + F_0007, F_0008, F_0009, F_0010, F_0011, F_0012, F_0013, F_0014, F_0015, F_0016, F_0017, F_0018, + F_0019, F_0020, D_0001, F_0021, F_0022, F_0023, F_0024, F_0025, F_0026, F_0027, F_0028, F_0029, + F_0030, F_0031, F_0032, F_0033, M_006, M_007, M_008, M_009, M_010, M_011, M_012, M_013, + M_014, M_015, M_016, M_017, M_018, M_019, M_020, M_021, M_022, M_023, M_024, M_025, + M_026, M_027, M_028, M_029, M_030, M_031, M_032, M_033, M_034, M_035, M_036, M_037, + M_038, M_039, M_040, M_041, M_042, M_043, M_044, M_045, M_046, M_047, M_048, M_049, + M_050, M_051, M_052, M_053, M_054, M_055, M_056, M_057, M_058, M_059, M_060, M_061, + M_062, M_063, M_064, M_065, M_066, M_067, M_068, M_069, M_070, M_071, M_072, M_073, + M_074, M_075, M_076, M_077, M_078, M_079, M_080, M_081, M_082, M_083, M_084, M_085, + M_086, M_087, M_088, M_089, M_090, M_091, M_092, M_093, M_094, M_095, M_096, F_0034, + F_0035, M_001, M_003, F_0036, F_0037, F_0038, F_0039, F_0040, F_0041, F_0042, F_0043, F_0044, + F_0045, F_0046, F_0047, F_0048, F_0049, F_0050, F_0051, F_0052, F_0053, F_0054, F_0055, F_0056, + F_0057, F_0058, F_0059, F_0060, F_0061, F_0062, F_0063, F_0064, F_0065, F_0066, F_0067, F_0068, + F_0069, F_0070, M_002, F_0071, F_0072, F_0073, F_0074, F_0075, F_0076, F_0077, F_0078, F_0079, + F_0080, F_0081, F_0082, F_0083, F_0084, F_0085, EREG_000, F_0086, F_0087, F_0088, F_0089, + F_0090, F_0091, F_0092, F_0093, F_0094, F_0095, F_0096, F_0097, TOTAL_PRICE_HIGH, TOTAL_PRICE_LOW, + TOTAL_PAYMENT_HIGH, TOTAL_PAYMENT_LOW, F_0202, F_0203, F_0204, F_0205, F_0206, F_0207, + F_0208, F_0209, F_0210, F_0211, F_0212, F_0213, F_0214, F_0215, F_0216, F_0217, F_0218, F_0219, + F_0220, F_0221, F_0222, F_0223, F_0224, F_0225, F_0226, F_0227, F_0228, F_0229, F_0230, F_0231, + F_0232, F_0233, F_234, F_0235, F_0236, F_0237, F_0238, T_0239, F_0240, F_0241, F_0242, F_0243, + F_0244, MAP_VISIBLE, F_0246, F_0247, F_0248, F_0249, F_0250, F_0251, F_0252, F_0253, F_0254, + F_0255, F_0256, F_0257, F_0258, F_0259, F_0260, F_0261, F_0262, F_0263, F_0264, F_0265, F_0266, + F_0267, F_0268, F_0269, F_0270, F_0271, F_0272, F_0273, F_0274, F_0275, F_0276, F_0277, F_0278, + F_0279, F_0280, F_0281, F_282, F_283, F_284, F_285, F_286, F_287, F_288, F_289, F_290, + M_097, F_0292, F_0293, F_0294, F_0295, F_0296, F_0297, F_0298, F_0299, F_0300, F_0301, F_0302, + F_0303, F_0304, F_0305, F_0306, F_0307, F_0308, F_0309, F_0310, F_0311, F_0312, F_0313, F_0314, + F_0315, F_0316, F_0317, F_0318, F_0319, F_0320, F_0321, F_0322, F_0323, F_0324, F_0325, F_0326, + F_0327, F_0328, F_0329, F_0330, F_0331, F_0332, F_0333, F_0334, F_0335, F_0336, F_0337, F_0338, + F_0339, F_0340, F_0341, F_0342, F_0343, F_0344, F_0345, F_0346, F_0347, F_0348, F_0349, F_0350, + F_0351, F_0352, F_0353, F_0354, F_0355, F_0356, F_0357, F_0358, F_0359, F_0360, F_0361, F_0362, + F_0363, F_0364, F_0365, F_0366, F_0367, F_0368, F_0369, F_0370, F_0371, F_0372, F_0373, F_0374, + F_0375, F_0376, F_0377, F_0378, F_0379, F_0380, F_0381, F_0382, F_0383, F_0384, F_0385, F_0386, + F_0387, F_0388, F_0389, F_0390, F_0391, F_0392, F_0393, F_0394, F_0395, F_0396, F_0397, F_0398, + F_0399, F_0400, F_0401, F_0402, F_0403, F_0404, F_0405, F_0406, F_0407, F_0408, F_0409, F_0410, + F_0411, F_0412, F_0413, F_0414, F_0415, F_0416, F_0417, F_0418, F_0419, F_0420, F_0421, F_0422, + F_0423, F_0424, F_0425, F_0426, F_0427, F_0428, F_0429, F_0430, F_0431, F_0432, F_0433, F_0434, + F_0435, F_0436, F_0437, F_0438, F_0439, F_0440, F_0441, F_0442, F_0443, F_0444, F_0445, F_0446, + F_0447, F_0448, F_0449, F_0450, FUND_RAISING_LOW, FUND_RAISING_HIGH, F_0453, F_0454, + F_0455, F_0456, F_0457, F_0458, F_0459, F_0460, F_0461, F_0462, F_0463, F_0464, F_0465, F_0466, + F_0467, F_0468, F_0469, F_0470, F_0471, F_0472, F_0473, F_0474, F_0475, F_0476, F_0477, F_0478, + F_0479, F_0480, F_0481, F_0482, F_0483, F_0484, F_0485, F_0486, F_0487, F_0488, F_0489, F_0490, + F_0491, F_0492, F_0493, F_0494, F_0495, F_0496, F_0497, F_0498, F_0499, F_0500, F_0501, F_0502, + F_0503, F_0504, F_0505, F_0506, F_0507, F_0508, F_0509, F_0510, FUND_RAISING_LOW2, FUND_RAISING_HIGH2, + F_0513, F_0514, F_0515, F_0516, F_0517, F_0518, F_0519, F_0520, F_0521, F_0522, F_0523, F_0524, + F_0525, F_0526, F_0527, F_0528, F_0529, F_0530, F_0531, F_0532, F_0533, F_0534, F_0535, F_0536, + F_0537, F_0538, F_0539, F_0540, F_0541, F_0542, F_0543, F_0544, F_0545, F_0546, F_0547, F_0548, + F_0549, F_0550, F_0551, F_0552, F_0553, F_0554, F_0555, F_0556, F_0557, F_0558, F_0559, F_0560, + F_0561, F_0562, F_0563, F_0564, F_0565, F_0566, F_0567, F_0568, F_0569, F_0570, F_0571, F_0572, + F_0573, F_0574, F_0575, F_0576, F_0577, F_0578, F_0579, F_0580, F_0581, F_0582, F_0583, F_0584, + F_0585, F_0586, F_0587, F_0588, F_0589, F_0590, F_0591, F_0592, F_0593, F_0594, F_0595, F_0596, + F_0597, F_0598, F_0599, F_0600, F_0601, UNUSED, F_0700, F_0701, F_0702, F_0606, F_0607, F_0608, + F_0609, F_0610, F_0611, F_0612, F_0613, F_0614, F_0615, F_0616, F_0617, F_0618, F_0619, F_0620, + F_0621, F_0622, F_0623, F_0624, F_0625, F_0626, F_0627, F_0628, F_0629, F_0630, F_0631, F_0632, + F_0633, F_0634, F_0635, F_0636, F_0637, F_0638, F_0639, F_0640, F_0641, F_0642, F_0643, F_0644, + F_0645, F_0646, F_0647, F_0648, F_0649, F_0650, F_0651, F_0652, F_0653, F_0654, F_0655, F_0656, + F_0657, F_0658, F_0659, F_0660, F_0661, F_0662, F_0663, F_0664, F_0665, F_0666, F_0667, F_0668, + F_0669, F_0670, F_0671, F_0672, F_0673, F_0674, F_0675, F_0676, F_0677, F_0678, F_0679, F_0680, + F_0681, F_0682, F_0683, F_0684, F_0685, F_0686, F_0687, F_0688, F_0689, F_0690, F_0691, F_0692, + F_0693, F_0694, F_0695, F_0696, F_0697, F_0698, F_0699, F_0700B, F_0701B, F_0702B, + F_0703, F_0704, F_0705, F_0706, F_0707, F_0708, F_0709, KORO2_LEVEL, LM_RECORD_0, RI_RECORD_0, + NP_RECORD_0, CF_RECORD_0, F_0715, F_0716, F_0717, F_0718, F_0719, F_0720, F_0721, F_0722, + F_0723, F_0724, F_0725, F_0726, F_0727, F_0728, F_0729, F_0730, SP_LURE__USE_COUNT, F_0732, + F_0733, F_0734, F_0735, F_0736, F_0737, F_0738, F_0739, F_0740, F_0741, F_0742, F_0743, F_0744, + F_0745, F_0746, F_0747, F_0748, F_0749, F_0750, F_0751, F_0752, F_0753, F_0754, F_0755, F_0756, + F_0757, F_0758, F_0759, KAKERA_GET_INFO_00, KAKERA_GET_INFO_01, KAKERA_GET_INFO_02, + KAKERA_GET_INFO_03, KAKERA_GET_INFO_04, KAKERA_GET_INFO_05, B_BTN_GUIDE, J_BTN_GUIDE, + F_0768, F_0769, F_0770, F_0771, F_0772, F_0773, F_0774, F_0775, F_0776, F_0777, F_0778, F_0779, + F_0780, F_0781, F_0782, F_0783, F_0784, F_0785, F_0786, F_0787, F_0788, F_0789, F_0790, F_0791, + F_0792, F_0793, F_0794, F_0795, F_0796, F_0797, F_0798, F_0799, F_0800, F_0801, F_0802, F_0803, + F_0804, F_0805, F_0806, F_0807, F_0808, F_0809, F_0810, F_0811, F_0812, F_0813, F_0814, F_0815, + F_0816, F_0817, F_0818, F_0819, F_0820, KORO2_ALLCLEAR, }; +/* 80033754-800337EC 02E094 0098+00 0/0 1/1 0/0 .text checkInsectBottle__17dSv_player_item_cFv */ BOOL dSv_player_item_c::checkInsectBottle() { for (int i = 0; i < 24; i++) { if (i_dComIfGs_isItemFirstBit(M_BEETLE + i) && @@ -718,6 +584,7 @@ BOOL dSv_player_item_c::checkInsectBottle() { return FALSE; } +/* 800337EC-80033828 02E12C 003C+00 0/0 1/1 1/1 .text checkEmptyBottle__17dSv_player_item_cFv */ u8 dSv_player_item_c::checkEmptyBottle() { u8 bottleNum = 0; @@ -729,6 +596,8 @@ u8 dSv_player_item_c::checkEmptyBottle() { return bottleNum; } +/* 80033828-80033910 02E168 00E8+00 1/1 0/0 0/0 .text setBombBagItemIn__17dSv_player_item_cFUcUcb + */ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setNum) { for (int i = 0; i < 3; i++) { if (i_curBomb == mItems[i + SLOT_15]) { @@ -748,6 +617,8 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, bool i_setN } } +/* 80033910-80033A20 02E250 0110+00 1/1 0/0 0/0 .text + * setBombBagItemIn__17dSv_player_item_cFUcUcUcb */ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNum, bool i_setNum) { for (int i = 0; i < 3; i++) { if (i_curBomb == mItems[i + SLOT_15]) { @@ -770,14 +641,19 @@ void dSv_player_item_c::setBombBagItemIn(u8 i_curBomb, u8 i_newBomb, u8 i_bombNu } } +/* 80033A20-80033A50 02E360 0030+00 0/0 2/2 0/0 .text + * setEmptyBombBagItemIn__17dSv_player_item_cFUcb */ void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, bool i_setNum) { setBombBagItemIn(BOMB_BAG_LV1, i_newBomb, i_setNum); } +/* 80033A50-80033A88 02E390 0038+00 0/0 1/1 1/1 .text + * setEmptyBombBagItemIn__17dSv_player_item_cFUcUcb */ void dSv_player_item_c::setEmptyBombBagItemIn(u8 i_newBomb, u8 i_bombNum, bool i_setNum) { setBombBagItemIn(BOMB_BAG_LV1, i_newBomb, i_bombNum, i_setNum); } +/* 80033A88-80033B08 02E3C8 0080+00 0/0 2/2 0/0 .text setEmptyBombBag__17dSv_player_item_cFv */ void dSv_player_item_c::setEmptyBombBag() { for (int i = 0; i < 3; i++) { if (dComIfGs_getItem((u8)(i + SLOT_15), true) == NO_ITEM) { @@ -787,6 +663,7 @@ void dSv_player_item_c::setEmptyBombBag() { } } +/* 80033B08-80033BEC 02E448 00E4+00 0/0 3/3 0/0 .text setEmptyBombBag__17dSv_player_item_cFUcUc */ void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) { for (int i = 0; i < 3; i++) { if (dComIfGs_getItem((u8)(i + SLOT_15), true) == NO_ITEM) { @@ -806,6 +683,7 @@ void dSv_player_item_c::setEmptyBombBag(u8 i_newBomb, u8 i_bombNum) { } } +/* 80033BEC-80033C2C 02E52C 0040+00 0/0 1/1 0/0 .text checkBombBag__17dSv_player_item_cFUc */ u8 dSv_player_item_c::checkBombBag(u8 i_itemNo) { u8 bombBags = 0; @@ -817,6 +695,7 @@ u8 dSv_player_item_c::checkBombBag(u8 i_itemNo) { return bombBags; } +/* 80033C2C-80033CBC 02E56C 0090+00 0/0 2/2 1/1 .text setWarashibeItem__17dSv_player_item_cFUc */ void dSv_player_item_c::setWarashibeItem(u8 i_itemNo) { dComIfGs_setItem(SLOT_21, i_itemNo); dComIfGp_setItem(SLOT_21, i_itemNo); @@ -828,6 +707,7 @@ void dSv_player_item_c::setWarashibeItem(u8 i_itemNo) { } } +/* 80033CBC-80033D40 02E5FC 0084+00 0/0 1/1 0/0 .text setRodTypeLevelUp__17dSv_player_item_cFv */ void dSv_player_item_c::setRodTypeLevelUp() { switch (mItems[SLOT_20]) { case BEE_ROD: { @@ -849,6 +729,8 @@ void dSv_player_item_c::setRodTypeLevelUp() { } } +/* 80033D40-80033E40 02E680 0100+00 0/0 2/2 0/0 .text setBaitItem__17dSv_player_item_cFUc + */ void dSv_player_item_c::setBaitItem(u8 i_itemNo) { switch (i_itemNo) { case BEE_CHILD: { @@ -873,6 +755,7 @@ void dSv_player_item_c::setBaitItem(u8 i_itemNo) { } } +/* 80033E40-80033E60 02E780 0020+00 1/1 0/0 0/0 .text init__21dSv_player_get_item_cFv */ void dSv_player_get_item_c::init() { for (int i = 0; i < 8; i++) { mItemFlags[i] = 0; @@ -894,6 +777,8 @@ int dSv_player_get_item_c::isFirstBit(u8 i_itemNo) const { return mItemFlags[i_itemNo / 32] & (1 << (i_itemNo % 32)) ? TRUE : FALSE; } +/* 80033F00-80033F6C 02E840 006C+00 1/1 0/0 0/0 .text init__24dSv_player_item_record_cFv + */ void dSv_player_item_record_c::init() { mArrowNum = 0; @@ -912,18 +797,26 @@ void dSv_player_item_record_c::init() { } } +/* 80033F6C-80033F7C 02E8AC 0010+00 3/3 5/5 0/0 .text setBombNum__24dSv_player_item_record_cFUcUc + */ void dSv_player_item_record_c::setBombNum(u8 i_bagIdx, u8 i_bombNum) { mBombNum[i_bagIdx] = i_bombNum; } +/* 80033F7C-80033F8C 02E8BC 0010+00 0/0 13/13 2/2 .text getBombNum__24dSv_player_item_record_cCFUc + */ u8 dSv_player_item_record_c::getBombNum(u8 i_bagIdx) const { return mBombNum[i_bagIdx]; } +/* 80033F8C-80033F9C 02E8CC 0010+00 0/0 2/2 0/0 .text + * setBottleNum__24dSv_player_item_record_cFUcUc */ void dSv_player_item_record_c::setBottleNum(u8 i_bottleIdx, u8 i_bottleNum) { mBottleNum[i_bottleIdx] = i_bottleNum; } +/* 80033F9C-80034030 02E8DC 0094+00 0/0 1/1 0/0 .text addBottleNum__24dSv_player_item_record_cFUcs + */ u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 i_no) { int bottleNum = mBottleNum[i_bottleIdx] + i_no; @@ -940,10 +833,13 @@ u8 dSv_player_item_record_c::addBottleNum(u8 i_bottleIdx, s16 i_no) { return mBottleNum[i_bottleIdx]; } +/* 80034030-80034040 02E970 0010+00 0/0 4/4 0/0 .text getBottleNum__24dSv_player_item_record_cCFUc + */ u8 dSv_player_item_record_c::getBottleNum(u8 i_bottleIdx) const { return mBottleNum[i_bottleIdx]; } +/* 80034040-800340B8 02E980 0078+00 1/1 0/0 0/0 .text init__21dSv_player_item_max_cFv */ void dSv_player_item_max_c::init() { for (int i = 0; i < 7; i++) { mItemMax[i] = 30; @@ -954,6 +850,7 @@ void dSv_player_item_max_c::init() { mItemMax[7] = 0; } +/* 800340B8-800340F8 02E9F8 0040+00 1/1 0/0 0/0 .text setBombNum__21dSv_player_item_max_cFUcUc */ void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) { switch (i_bombType) { case NORMAL_BOMB: @@ -968,6 +865,7 @@ void dSv_player_item_max_c::setBombNum(u8 i_bombType, u8 i_maxNum) { } } +/* 800340F8-800341AC 02EA38 00B4+00 3/3 14/14 2/2 .text getBombNum__21dSv_player_item_max_cCFUc */ u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const { u8 lv_multiplier = 1; if (i_dComIfGs_isItemFirstBit(BOMB_BAG_LV2)) { @@ -986,6 +884,7 @@ u8 dSv_player_item_max_c::getBombNum(u8 i_bombType) const { } } +/* 800341AC-800341E8 02EAEC 003C+00 1/1 0/0 0/0 .text init__20dSv_player_collect_cFv */ void dSv_player_collect_c::init() { for (int i = 0; i < 8; i++) { mItem[i] = 0; @@ -998,30 +897,41 @@ void dSv_player_collect_c::init() { mPohNum = 0; } +/* 800341E8-80034208 02EB28 0020+00 0/0 8/8 0/0 .text setCollect__20dSv_player_collect_cFiUc */ void dSv_player_collect_c::setCollect(int i_item_type, u8 i_item) { mItem[i_item_type] |= (u8)(1 << i_item); } +/* 80034208-8003422C 02EB48 0024+00 0/0 4/4 4/4 .text isCollect__20dSv_player_collect_cCFiUc */ BOOL dSv_player_collect_c::isCollect(int i_item_type, u8 i_item) const { return mItem[i_item_type] & (u8)(1 << i_item) ? TRUE : FALSE; } +/* 8003422C-8003424C 02EB6C 0020+00 0/0 1/1 1/1 .text onCollectCrystal__20dSv_player_collect_cFUc + */ void dSv_player_collect_c::onCollectCrystal(u8 i_item) { mCrystal |= (u8)(1 << i_item); } +/* 8003424C-80034270 02EB8C 0024+00 0/0 4/4 0/0 .text isCollectCrystal__20dSv_player_collect_cCFUc + */ BOOL dSv_player_collect_c::isCollectCrystal(u8 i_item) const { return mCrystal & (u8)(1 << i_item) ? TRUE : FALSE; } +/* 80034270-80034290 02EBB0 0020+00 0/0 1/1 1/1 .text onCollectMirror__20dSv_player_collect_cFUc + */ void dSv_player_collect_c::onCollectMirror(u8 i_item) { mMirror |= (u8)(1 << i_item); } +/* 80034290-800342B4 02EBD0 0024+00 0/0 4/4 0/0 .text isCollectMirror__20dSv_player_collect_cCFUc + */ BOOL dSv_player_collect_c::isCollectMirror(u8 i_item) const { return mMirror & (u8)(1 << i_item) ? TRUE : FALSE; } +/* 800342B4-800342DC 02EBF4 0028+00 1/1 0/0 0/0 .text init__17dSv_player_wolf_cFv */ void dSv_player_wolf_c::init() { for (int i = 0; i < 3; i++) { unk0[i] = 0; @@ -1030,6 +940,7 @@ void dSv_player_wolf_c::init() { unk3 = 0; } +/* 800342DC-80034320 02EC1C 0044+00 1/1 0/0 0/0 .text init__16dSv_light_drop_cFv */ void dSv_light_drop_c::init() { for (int i = 0; i < 4; i++) { mLightDropNum[i] = 0; @@ -1042,12 +953,14 @@ void dSv_light_drop_c::init() { } } +/* 80034320-80034340 02EC60 0020+00 0/0 0/0 1/1 .text setLightDropNum__16dSv_light_drop_cFUcUc */ void dSv_light_drop_c::setLightDropNum(u8 i_nowLevel, u8 i_dropNum) { if (i_nowLevel < LIGHT_DROP_STAGE || i_nowLevel > 6) { mLightDropNum[i_nowLevel] = i_dropNum; } } +/* 80034340-80034368 02EC80 0028+00 0/0 11/11 4/4 .text getLightDropNum__16dSv_light_drop_cCFUc */ u8 dSv_light_drop_c::getLightDropNum(u8 i_nowLevel) const { if (i_nowLevel >= LIGHT_DROP_STAGE && i_nowLevel <= 6) { return 0; @@ -1055,12 +968,15 @@ u8 dSv_light_drop_c::getLightDropNum(u8 i_nowLevel) const { return mLightDropNum[i_nowLevel]; } +/* 80034368-8003439C 02ECA8 0034+00 0/0 4/4 0/0 .text onLightDropGetFlag__16dSv_light_drop_cFUc */ void dSv_light_drop_c::onLightDropGetFlag(u8 i_nowLevel) { if (i_nowLevel < LIGHT_DROP_STAGE || i_nowLevel > 6) { mLightDropGetFlag |= (u8)(1 << i_nowLevel); } } +/* 8003439C-800343DC 02ECDC 0040+00 0/0 8/8 2/2 .text isLightDropGetFlag__16dSv_light_drop_cCFUc + */ BOOL dSv_light_drop_c::isLightDropGetFlag(u8 i_nowLevel) const { if (i_nowLevel >= LIGHT_DROP_STAGE && i_nowLevel <= 6) { return 0; @@ -1068,6 +984,7 @@ BOOL dSv_light_drop_c::isLightDropGetFlag(u8 i_nowLevel) const { return mLightDropGetFlag & (u8)(1 << i_nowLevel) ? TRUE : FALSE; } +/* 800343DC-80034428 02ED1C 004C+00 1/1 0/0 0/0 .text init__17dSv_letter_info_cFv */ void dSv_letter_info_c::init() { for (int i = 0; i < 2; i++) { mLetterGetFlags[i] = 0; @@ -1079,22 +996,27 @@ void dSv_letter_info_c::init() { } } +/* 80034428-8003444C 02ED68 0024+00 0/0 2/2 0/0 .text onLetterGetFlag__17dSv_letter_info_cFi */ void dSv_letter_info_c::onLetterGetFlag(int i_no) { mLetterGetFlags[i_no >> 5] |= 1 << (i_no & 0x1F); } +/* 8003444C-80034474 02ED8C 0028+00 0/0 4/4 0/0 .text isLetterGetFlag__17dSv_letter_info_cCFi */ BOOL dSv_letter_info_c::isLetterGetFlag(int i_no) const { return mLetterGetFlags[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE; } +/* 80034474-8003449C 02EDB4 0028+00 0/0 1/1 0/0 .text onLetterReadFlag__17dSv_letter_info_cFi */ void dSv_letter_info_c::onLetterReadFlag(int i_no) { mLetterReadFlags[i_no >> 5] |= 1 << (i_no & 0x1F); } +/* 8003449C-800344C8 02EDDC 002C+00 0/0 3/3 0/0 .text isLetterReadFlag__17dSv_letter_info_cCFi */ BOOL dSv_letter_info_c::isLetterReadFlag(int i_no) const { return mLetterReadFlags[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE; } +/* 800344C8-800344FC 02EE08 0034+00 1/1 0/0 0/0 .text init__18dSv_fishing_info_cFv */ void dSv_fishing_info_c::init() { for (int i = 0; i < 16; i++) { mFishCount[i] = 0; @@ -1102,12 +1024,14 @@ void dSv_fishing_info_c::init() { } } +/* 800344FC-80034518 02EE3C 001C+00 0/0 0/0 1/1 .text addFishCount__18dSv_fishing_info_cFUc */ void dSv_fishing_info_c::addFishCount(u8 i_fishIdx) { if (mFishCount[i_fishIdx] < 999) { mFishCount[i_fishIdx] += 1; } } +/* 80034518-800345AC 02EE58 0094+00 1/1 0/0 0/0 .text init__17dSv_player_info_cFv */ void dSv_player_info_c::init() { dMeter2Info_getString(0x382, mPlayerName, NULL); // Link dMeter2Info_getString(0x383, mHorseName, NULL); // Epona @@ -1124,6 +1048,7 @@ void dSv_player_info_c::init() { } } +/* 800345AC-80034644 02EEEC 0098+00 1/1 0/0 0/0 .text init__19dSv_player_config_cFv */ void dSv_player_config_c::init() { unk0 = 1; @@ -1146,26 +1071,34 @@ void dSv_player_config_c::init() { mPointer = 1; } +/* 80034644-80034684 02EF84 0040+00 0/0 4/4 0/0 .text checkVibration__19dSv_player_config_cCFv */ u32 dSv_player_config_c::checkVibration() const { return JUTGamePad::sRumbleSupported & 0x80000000 ? dComIfGp_getNowVibration() : 0; } +/* 80034684-8003468C 02EFC4 0008+00 1/1 2/2 0/0 .text getSound__19dSv_player_config_cFv + */ u8 dSv_player_config_c::getSound() { return mSoundMode; } +/* 8003468C-80034694 -00001 0008+00 0/0 0/0 0/0 .text setSound__19dSv_player_config_cFUc + */ void dSv_player_config_c::setSound(u8 i_mode) { mSoundMode = i_mode; } +/* 80034694-8003469C 02EFD4 0008+00 1/1 1/1 0/0 .text getVibration__19dSv_player_config_cFv */ u8 dSv_player_config_c::getVibration() { return mVibration; } +/* 8003469C-800346A4 -00001 0008+00 0/0 0/0 0/0 .text setVibration__19dSv_player_config_cFUc */ void dSv_player_config_c::setVibration(u8 i_status) { mVibration = i_status; } +/* 800346A4-80034750 02EFE4 00AC+00 1/1 0/0 0/0 .text init__12dSv_player_cFv */ void dSv_player_c::init() { mPlayerStatusA.init(); mPlayerStatusB.init(); @@ -1186,6 +1119,7 @@ void dSv_player_c::init() { mConfig.init(); } +/* 80034750-800347A0 02F090 0050+00 1/1 0/0 0/0 .text init__12dSv_memBit_cFv */ void dSv_memBit_c::init() { for (int i = 0; i < 2; i++) { mTbox[i] = 0; @@ -1200,25 +1134,32 @@ void dSv_memBit_c::init() { mDungeonItem = 0; } +/* 800347A0-800347C4 02F0E0 0024+00 0/0 0/0 15/15 .text onTbox__12dSv_memBit_cFi */ void dSv_memBit_c::onTbox(int i_no) { mTbox[i_no >> 5] |= 1 << (i_no & 0x1F); } +/* 800347C4-800347E8 02F104 0024+00 0/0 0/0 5/5 .text offTbox__12dSv_memBit_cFi */ void dSv_memBit_c::offTbox(int i_no) { mTbox[i_no >> 5] &= ~(1 << (i_no & 0x1F)); } +/* 800347E8-80034810 02F128 0028+00 0/0 6/6 7/7 .text isTbox__12dSv_memBit_cCFi */ BOOL dSv_memBit_c::isTbox(int i_no) const { return 1 << (i_no & 0x1f) & mTbox[i_no >> 5] ? TRUE : FALSE; } +/* 80034810-80034838 02F150 0028+00 1/1 5/5 18/18 .text onSwitch__12dSv_memBit_cFi */ void dSv_memBit_c::onSwitch(int i_no) { mSwitch[i_no >> 5] |= 1 << (i_no & 0x1F); } + +/* 80034838-80034860 02F178 0028+00 1/1 3/3 3/3 .text offSwitch__12dSv_memBit_cFi */ void dSv_memBit_c::offSwitch(int i_no) { mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F)); } +/* 80034860-8003488C 02F1A0 002C+00 1/1 11/11 23/23 .text isSwitch__12dSv_memBit_cCFi */ BOOL dSv_memBit_c::isSwitch(int i_no) const { return (mSwitch[i_no >> 5] & 1 << (i_no & 0x1F)) ? TRUE : FALSE; } @@ -1231,22 +1172,28 @@ BOOL dSv_memBit_c::revSwitch(int i_no) { return mSwitch[switchInd] & tmp ? TRUE : FALSE; } +/* 800348C4-800348EC 02F204 0028+00 1/1 0/0 0/0 .text onItem__12dSv_memBit_cFi */ void dSv_memBit_c::onItem(int i_no) { mItem[i_no >> 5] |= 1 << (i_no & 0x1F); } +/* 800348EC-80034918 02F22C 002C+00 1/1 2/2 1/1 .text isItem__12dSv_memBit_cCFi */ BOOL dSv_memBit_c::isItem(int i_no) const { return (mItem[i_no >> 5] & 1 << (i_no & 0x1F)) ? TRUE : FALSE; } +/* 80034918-80034934 02F258 001C+00 0/0 8/8 18/18 .text onDungeonItem__12dSv_memBit_cFi + */ void dSv_memBit_c::onDungeonItem(int i_no) { mDungeonItem |= (u8)(1 << i_no); } +/* 80034934-80034954 02F274 0020+00 0/0 27/27 47/47 .text isDungeonItem__12dSv_memBit_cCFi */ s32 dSv_memBit_c::isDungeonItem(int i_no) const { return mDungeonItem & (u8)(1 << i_no) ? TRUE : FALSE; } +/* 80034954-8003498C 02F294 0038+00 2/2 0/0 0/0 .text init__11dSv_event_cFv */ void dSv_event_c::init() { for (int i = 0; i < MAX_EVENTS; i++) { mEvent[i] = 0; @@ -1254,27 +1201,37 @@ void dSv_event_c::init() { setInitEventBit__Fv(); } +/* 8003498C-800349A4 02F2CC 0018+00 1/1 27/27 58/58 .text onEventBit__11dSv_event_cFUs */ void dSv_event_c::onEventBit(u16 i_no) { mEvent[(i_no >> 8)] |= (u8)i_no; } +/* 800349A4-800349BC 02F2E4 0018+00 1/1 14/14 23/23 .text offEventBit__11dSv_event_cFUs + */ void dSv_event_c::offEventBit(u16 i_no) { mEvent[(i_no >> 8)] &= ~(u8)i_no; } +/* 800349BC-800349E0 02F2FC 0024+00 3/3 77/77 153/153 .text isEventBit__11dSv_event_cCFUs + */ BOOL dSv_event_c::isEventBit(u16 i_no) const { return mEvent[(i_no >> 8)] & (i_no & 0xFF) ? TRUE : FALSE; } +/* 800349E0-80034A04 02F320 0024+00 0/0 12/12 17/17 .text setEventReg__11dSv_event_cFUsUc + */ void dSv_event_c::setEventReg(u16 i_reg, u8 i_no) { mEvent[i_reg >> 8] &= ~(u8)i_reg; mEvent[i_reg >> 8] |= i_no; } +/* 80034A04-80034A1C 02F344 0018+00 0/0 19/19 20/20 .text getEventReg__11dSv_event_cCFUs + */ u8 dSv_event_c::getEventReg(u16 i_reg) const { return (u8)i_reg & mEvent[i_reg >> 8]; } +/* 80034A1C-80034A64 02F35C 0048+00 1/1 0/0 0/0 .text init__14dSv_MiniGame_cFv */ void dSv_MiniGame_c::init() { unk0 = 0; for (int i = 0; i < 3; i++) { @@ -1287,28 +1244,35 @@ void dSv_MiniGame_c::init() { unk20 = 0; } +/* 80034A64-80034A84 02F3A4 0020+00 2/2 2/2 0/0 .text init__12dSv_memory_cFv */ void dSv_memory_c::init() { mBit.init(); } +/* 80034A84-80034AA4 02F3C4 0020+00 1/1 1/1 0/0 .text init__13dSv_memory2_cFv */ void dSv_memory2_c::init() { for (int i = 0; i < 2; i++) { mVisitedRoom[i] = 0; } } +/* 80034AA4-80034AC8 02F3E4 0024+00 0/0 1/1 1/1 .text onVisitedRoom__13dSv_memory2_cFi */ void dSv_memory2_c::onVisitedRoom(int i_no) { mVisitedRoom[i_no >> 5] |= 1 << (i_no & 0x1F); } +/* 80034AC8-80034AEC 02F408 0024+00 0/0 1/1 1/1 .text offVisitedRoom__13dSv_memory2_cFi + */ void dSv_memory2_c::offVisitedRoom(int i_no) { mVisitedRoom[i_no >> 5] &= ~(1 << (i_no & 0x1F)); } +/* 80034AEC-80034B14 02F42C 0028+00 0/0 4/4 0/0 .text isVisitedRoom__13dSv_memory2_cFi */ BOOL dSv_memory2_c::isVisitedRoom(int i_no) { return (1 << (i_no & 0x1F) & mVisitedRoom[i_no >> 5]) ? TRUE : FALSE; } +/* 80034B14-80034B98 02F454 0084+00 1/1 1/1 0/0 .text init__12dSv_danBit_cFSc */ bool dSv_danBit_c::init(s8 i_stageNo) { if (i_stageNo != mStageNo) { mSwitch[0] = 0; @@ -1333,32 +1297,39 @@ bool dSv_danBit_c::init(s8 i_stageNo) { } } +/* 80034B98-80034BC0 02F4D8 0028+00 1/1 2/2 26/26 .text onSwitch__12dSv_danBit_cFi */ void dSv_danBit_c::onSwitch(int i_no) { mSwitch[i_no >> 5] |= 1 << (i_no & 0x1F); } +/* 80034BC0-80034BE8 02F500 0028+00 1/1 1/1 10/10 .text offSwitch__12dSv_danBit_cFi */ void dSv_danBit_c::offSwitch(int i_no) { mSwitch[i_no >> 5] &= ~(1 << (i_no & 0x1F)); } +/* 80034BE8-80034C14 02F528 002C+00 1/1 6/6 14/14 .text isSwitch__12dSv_danBit_cCFi */ BOOL dSv_danBit_c::isSwitch(int i_no) const { return mSwitch[i_no >> 5] & (1 << (i_no & 0x1F)) ? TRUE : FALSE; } +/* 80034C14-80034C4C 02F554 0038+00 1/1 0/0 0/0 .text revSwitch__12dSv_danBit_cFi */ BOOL dSv_danBit_c::revSwitch(int i_no) { int uVar1 = 1 << (i_no & 0x1F); mSwitch[i_no >> 5] ^= uVar1; return mSwitch[i_no >> 5] & uVar1 ? TRUE : FALSE; } +/* 80034C4C-80034C74 02F58C 0028+00 1/1 0/0 0/0 .text onItem__12dSv_danBit_cFi */ void dSv_danBit_c::onItem(int i_no) { mItem[i_no >> 5] |= 1 << (i_no & 0x1F); } +/* 80034C74-80034CA0 02F5B4 002C+00 1/1 2/2 0/0 .text isItem__12dSv_danBit_cCFi */ BOOL dSv_danBit_c::isItem(int i_no) const { return mItem[i_no >> 5] & 1 << (i_no & 0x1F) ? TRUE : FALSE; } +/* 80034CA0-80034CEC 02F5E0 004C+00 1/1 0/0 0/0 .text init__13dSv_zoneBit_cFv */ void dSv_zoneBit_c::init() { for (int i = 0; i < 2; i++) { mSwitch[i] = 0; @@ -1372,22 +1343,28 @@ void dSv_zoneBit_c::init() { mRoomItem = 0; } +/* 80034CEC-80034CF8 02F62C 000C+00 0/0 3/3 0/0 .text clearRoomSwitch__13dSv_zoneBit_cFv + */ void dSv_zoneBit_c::clearRoomSwitch() { mRoomSwitch = 0; } +/* 80034CF8-80034D04 02F638 000C+00 0/0 3/3 0/0 .text clearRoomItem__13dSv_zoneBit_cFv */ void dSv_zoneBit_c::clearRoomItem() { mRoomItem = 0; } +/* 80034D04-80034D2C 02F644 0028+00 1/1 1/1 0/0 .text onSwitch__13dSv_zoneBit_cFi */ void dSv_zoneBit_c::onSwitch(int i_no) { mSwitch[i_no >> 4] |= (u16)(1 << (i_no & 0xF)); } +/* 80034D2C-80034D50 02F66C 0024+00 1/1 1/1 0/0 .text offSwitch__13dSv_zoneBit_cFi */ void dSv_zoneBit_c::offSwitch(int i_no) { mSwitch[i_no >> 4] &= ~(1 << (i_no & 0xF)); } +/* 80034D50-80034D78 02F690 0028+00 1/1 1/1 0/0 .text isSwitch__13dSv_zoneBit_cCFi */ BOOL dSv_zoneBit_c::isSwitch(int i_no) const { return mSwitch[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE; } @@ -1400,70 +1377,85 @@ BOOL dSv_zoneBit_c::revSwitch(int i_no) { return mSwitch[switchInd] & uVar1 ? TRUE : FALSE; } +/* 80034DAC-80034DC8 02F6EC 001C+00 1/1 1/1 0/0 .text onOneSwitch__13dSv_zoneBit_cFi */ void dSv_zoneBit_c::onOneSwitch(int i_no) { mRoomSwitch |= (u16)(1 << i_no); } +/* 80034DC8-80034DE0 02F708 0018+00 1/1 1/1 0/0 .text offOneSwitch__13dSv_zoneBit_cFi */ void dSv_zoneBit_c::offOneSwitch(int i_no) { mRoomSwitch &= ~(1 << i_no); } +/* 80034DE0-80034DFC 02F720 001C+00 1/1 1/1 0/0 .text isOneSwitch__13dSv_zoneBit_cCFi */ BOOL dSv_zoneBit_c::isOneSwitch(int i_no) const { return mRoomSwitch & 1 << i_no ? TRUE : FALSE; } +/* 80034DFC-80034E24 02F73C 0028+00 1/1 0/0 0/0 .text revOneSwitch__13dSv_zoneBit_cFi */ BOOL dSv_zoneBit_c::revOneSwitch(int i_no) { int iVar1 = 1 << i_no; mRoomSwitch ^= iVar1; return mRoomSwitch & iVar1 ? TRUE : FALSE; } +/* 80034E24-80034E50 02F764 002C+00 1/1 0/0 0/0 .text onItem__13dSv_zoneBit_cFi */ void dSv_zoneBit_c::onItem(int i_no) { mItem[i_no >> 4] |= (u16)(1 << (i_no & 0xF)); } +/* 80034E50-80034E7C 02F790 002C+00 1/1 1/1 0/0 .text isItem__13dSv_zoneBit_cCFi */ BOOL dSv_zoneBit_c::isItem(int i_no) const { return mItem[i_no >> 4] & 1 << (i_no & 0xF) ? TRUE : FALSE; } +/* 80034E7C-80034E98 02F7BC 001C+00 1/1 0/0 0/0 .text onOneItem__13dSv_zoneBit_cFi */ void dSv_zoneBit_c::onOneItem(int i_no) { mRoomItem |= (u16)(1 << i_no); } +/* 80034E98-80034EB4 02F7D8 001C+00 1/1 1/1 0/0 .text isOneItem__13dSv_zoneBit_cCFi */ BOOL dSv_zoneBit_c::isOneItem(int i_no) const { return mRoomItem & 1 << i_no ? TRUE : FALSE; } +/* 80034EB4-80034ED4 02F7F4 0020+00 1/1 0/0 0/0 .text init__15dSv_zoneActor_cFv */ void dSv_zoneActor_c::init() { for (int i = 0; i < 4; i++) { mActorFlags[i] = 0; } } +/* 80034ED4-80034EF8 02F814 0024+00 1/1 0/0 0/0 .text on__15dSv_zoneActor_cFi */ void dSv_zoneActor_c::on(int i_id) { mActorFlags[i_id >> 5] |= 1 << (i_id & 0x1F); } +/* 80034EF8-80034F1C 02F838 0024+00 1/1 0/0 0/0 .text off__15dSv_zoneActor_cFi */ void dSv_zoneActor_c::off(int i_id) { mActorFlags[i_id >> 5] &= ~(1 << (i_id & 0x1F)); } +/* 80034F1C-80034F44 02F85C 0028+00 1/1 0/0 0/0 .text is__15dSv_zoneActor_cCFi */ BOOL dSv_zoneActor_c::is(int i_id) const { return mActorFlags[i_id >> 5] & 1 << (i_id & 0x1F) ? TRUE : FALSE; } +/* 80034F44-80034F80 02F884 003C+00 2/2 0/0 0/0 .text init__10dSv_zone_cFi */ void dSv_zone_c::init(int i_roomNo) { mRoomNo = i_roomNo; mBit.init(); mActor.init(); } +/* 80034F80-80034FA4 02F8C0 0024+00 0/0 3/3 14/14 .text setRoom__13dSv_restart_cFRC4cXyzsSc */ void dSv_restart_c::setRoom(const cXyz& i_position, s16 i_angleY, s8 i_roomNo) { mRoomNo = i_roomNo; mRoomPos = i_position; mRoomAngleY = i_angleY; } +/* 80034FA4-80034FCC 02F8E4 0028+00 0/0 2/2 0/0 .text set__17dSv_turnRestart_cFRC4cXyzsScUl */ void dSv_turnRestart_c::set(const cXyz& i_position, s16 i_angleY, s8 param_3, u32 i_param) { mPosition = i_position; mAngleY = i_angleY; @@ -1471,6 +1463,7 @@ void dSv_turnRestart_c::set(const cXyz& i_position, s16 i_angleY, s8 param_3, u3 mParam = i_param; } +/* 80034FCC-8003501C 02F90C 0050+00 0/0 2/2 0/0 .text init__10dSv_info_cFv */ void dSv_info_c::init() { mSavedata.init(); mMemory.init(); @@ -1479,6 +1472,7 @@ void dSv_info_c::init() { mTmp.init(); } +/* 8003501C-800350A8 02F95C 008C+00 2/2 0/0 0/0 .text init__10dSv_save_cFv */ void dSv_save_c::init() { mPlayer.init(); for (int i = 0; i < STAGE_MAX; i++) { @@ -1493,24 +1487,29 @@ void dSv_save_c::init() { mMiniGame.init(); } +/* 800350A8-800350BC 02F9E8 0014+00 0/0 6/6 1/1 .text getSave2__10dSv_save_cFi */ dSv_memory2_c* dSv_save_c::getSave2(int i_stage2No) { return &mSave2[i_stage2No]; } +/* 800350BC-800350F0 02F9FC 0034+00 0/0 1/1 0/0 .text getSave__10dSv_info_cFi */ void dSv_info_c::getSave(int i_stageNo) { mMemory = mSavedata.getSave(i_stageNo); } +/* 800350F0-8003514C 02FA30 005C+00 0/0 2/2 0/0 .text putSave__10dSv_info_cFi */ void dSv_info_c::putSave(int i_stageNo) { mSavedata.putSave(i_stageNo, mMemory); } +/* 8003514C-800351A4 02FA8C 0058+00 1/1 1/1 0/0 .text initZone__10dSv_info_cFv */ void dSv_info_c::initZone() { for (int i = 0; i < 0x20; i++) { mZone[i].init(-1); } } +/* 800351A4-80035200 02FAE4 005C+00 0/0 1/1 0/0 .text createZone__10dSv_info_cFi */ u32 dSv_info_c::createZone(int i_roomNo) { dSv_zone_c* zone = mZone; for (int i = 0; i < 0x20; zone++, i++) { @@ -1522,6 +1521,7 @@ u32 dSv_info_c::createZone(int i_roomNo) { return -1; } +/* 80035200-800352B0 02FB40 00B0+00 0/0 8/8 352/352 .text onSwitch__10dSv_info_cFii */ void dSv_info_c::onSwitch(int i_no, int i_roomNo) { if (i_no == -1 || i_no == 255) { return; @@ -1542,6 +1542,7 @@ void dSv_info_c::onSwitch(int i_no, int i_roomNo) { } } +/* 800352B0-80035360 02FBF0 00B0+00 0/0 2/2 93/93 .text offSwitch__10dSv_info_cFii */ void dSv_info_c::offSwitch(int i_no, int i_roomNo) { if (i_no == -1 || i_no == 255) { return; @@ -1562,6 +1563,7 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) { } } +/* 80035360-8003542C 02FCA0 00CC+00 0/0 27/27 734/734 .text isSwitch__10dSv_info_cCFii */ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const { if (i_no == -1 || i_no == 255) { return FALSE; @@ -1586,6 +1588,7 @@ BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const { } } +/* 8003542C-800354E0 02FD6C 00B4+00 0/0 0/0 2/2 .text revSwitch__10dSv_info_cFii */ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) { if (i_no == -1 || i_no == 255) { return FALSE; @@ -1606,6 +1609,7 @@ BOOL dSv_info_c::revSwitch(int i_no, int i_roomNo) { } } +/* 800354E0-80035590 02FE20 00B0+00 0/0 1/1 3/3 .text onItem__10dSv_info_cFii */ void dSv_info_c::onItem(int i_no, int i_roomNo) { if (i_no == -1 || i_no == 255) { return; @@ -1625,6 +1629,7 @@ void dSv_info_c::onItem(int i_no, int i_roomNo) { } } +/* 80035590-80035644 02FED0 00B4+00 0/0 1/1 3/3 .text isItem__10dSv_info_cCFii */ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const { if (i_no == -1 || i_no == 255) { return FALSE; @@ -1644,6 +1649,7 @@ BOOL dSv_info_c::isItem(int i_no, int i_roomNo) const { } } +/* 80035644-800356B4 02FF84 0070+00 0/0 1/1 4/4 .text onActor__10dSv_info_cFii */ void dSv_info_c::onActor(int i_id, int i_roomNo) { if (i_id == -1 || i_id == dSv_zoneActor_c::ACTOR_MAX || i_roomNo == -1) { return; @@ -1653,6 +1659,7 @@ void dSv_info_c::onActor(int i_id, int i_roomNo) { mZone[zoneNo].getActor().on(i_id); } +/* 800356B4-80035724 02FFF4 0070+00 0/0 0/0 2/2 .text offActor__10dSv_info_cFii */ void dSv_info_c::offActor(int i_id, int i_roomNo) { if (i_id == -1 || i_id == dSv_zoneActor_c::ACTOR_MAX || i_roomNo == -1) { return; @@ -1662,6 +1669,7 @@ void dSv_info_c::offActor(int i_id, int i_roomNo) { mZone[zoneNo].getActor().off(i_id); } +/* 80035724-80035798 030064 0074+00 0/0 3/3 0/0 .text isActor__10dSv_info_cCFii */ BOOL dSv_info_c::isActor(int i_id, int i_roomNo) const { if (i_id == -1 || i_id == dSv_zoneActor_c::ACTOR_MAX || i_roomNo == -1) { return FALSE; @@ -1680,46 +1688,62 @@ SECTION_DEAD static char const* const stringBase_8037926C = "SAVE size:%d\n"; #pragma pop /* 80035798-80035A04 0300D8 026C+00 0/0 1/1 0/0 .text memory_to_card__10dSv_info_cFPci */ -// lots of regalloc issues +// regalloc #ifdef NONMATCHING int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { + BOOL lantern_stolen; + BOOL lantern_dropped; + OSTime play_time; + bool lantern_not_recovered = false; - s32 lantern_stolen; - s32 lantern_dropped; - bool phi_r30 = false; + bool tmp_lantern_check = false; u16 current_lantern_oil = 0; - + + + // If haven't gotten then lantern back from the monkey if (!i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[226])) { + // Store whether or not it's stolen and dropped lantern_stolen = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[224]); lantern_dropped = i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[225]); + + // Then turn those events off dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[224]); dComIfGs_offEventBit(dSv_event_flag_c::saveBitLabels[225]); + + // Used to turn events back on later lantern_not_recovered = true; } + // If have the lantern and Slot 1 in the item wheel is blank if (i_dComIfGs_isItemFirstBit(KANTERA) && dComIfGs_getItem(SLOT_1, 1) == NO_ITEM) { + // Set Slot 1 to Lantern and fetch current oil dComIfGs_setItem(SLOT_1, KANTERA); current_lantern_oil = dComIfGs_getOil(); + + // Set oil to oil gauge backup dComIfGs_setOil(dMeter2Info_getOilGaugeBackUp()); - phi_r30 = true; + + // Used to set slot 1 back later + tmp_lantern_check = true; } - card_ptr = card_ptr + (dataNum * 0xA94); // 0xA94 = Quest Log size + card_ptr += dataNum * QUEST_LOG_SIZE; dSv_save_c* savedata = dComIfGs_getSaveData(); - s64 play_time = (OSGetTime() - dComIfGs_getSaveStartTime()); - s64 total_time = (play_time + dComIfGs_getSaveTotalTime()); - s64 play_time_secs = play_time / (OS_BUS_CLOCK / 4); + play_time = OSGetTime() - dComIfGs_getSaveStartTime(); + play_time += dComIfGs_getSaveTotalTime(); + // play_time += (); // 3599940 = 999:59 in seconds - if (play_time_secs < 3599940) { - savedata->getPlayer().getPlayerInfo().setTotalTime(total_time); + if (dComIfGs_getSaveTotalTime() / OS_TIMER_CLOCK < 3599940) { + savedata->getPlayer().getPlayerInfo().setTotalTime(play_time); } - savedata->getPlayer().getPlayerStatusB().setDateIpl(OSGetTime()); + savedata->getPlayer().getPlayerStatusB().setDateIpl(OSGetTime()); memcpy(card_ptr, savedata, sizeof(dSv_save_c)); printf("Write size:%d\n", sizeof(dSv_save_c)); + // Now that we've saved, reset events if needed if (lantern_not_recovered == true) { if (lantern_stolen) { dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[224]); @@ -1729,7 +1753,8 @@ int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { } } - if (phi_r30 == true) { + // Now that we've saved, reset slot if needed + if (tmp_lantern_check == true) { dComIfGs_setItem(SLOT_1, NO_ITEM); dComIfGs_setOil(current_lantern_oil); } @@ -1748,11 +1773,9 @@ asm int dSv_info_c::memory_to_card(char* card_ptr, int dataNum) { #pragma pop #endif -/* ############################################################################################## */ - /* 80035A04-80035BD0 030344 01CC+00 0/0 2/2 0/0 .text card_to_memory__10dSv_info_cFPci */ int dSv_info_c::card_to_memory(char* card_ptr, int dataNum) { - card_ptr = card_ptr + dataNum * 0xa94; + card_ptr = card_ptr + dataNum * QUEST_LOG_SIZE; memcpy(dComIfGs_getSaveData(), card_ptr, sizeof(dSv_save_c)); if (OSGetSoundMode() == OS_SOUND_MODE_MONO) { @@ -1777,7 +1800,7 @@ int dSv_info_c::card_to_memory(char* card_ptr, int dataNum) { dComIfGs_setItem(SLOT_9, NO_ITEM); } - if (dComIfGs_getItem(SLOT_9, 1) == HOOKSHOT && dComIfGs_getItem(SLOT_10, 1) == W_HOOKSHOT) { + if (dComIfGs_getItem(SLOT_9, 1) == HOOKSHOT && dComIfGs_getItem(SLOT_10, true) == W_HOOKSHOT) { dComIfGs_setItem(SLOT_9, NO_ITEM); } @@ -1793,12 +1816,10 @@ int dSv_info_c::card_to_memory(char* card_ptr, int dataNum) { return 0; } -/* ############################################################################################## */ - /* 80035BD0-80035C88 030510 00B8+00 0/0 3/3 0/0 .text initdata_to_card__10dSv_info_cFPci */ int dSv_info_c::initdata_to_card(char* card_ptr, int dataNum) { - card_ptr = card_ptr + (dataNum * 0xa94); + card_ptr = card_ptr + (dataNum * QUEST_LOG_SIZE); dSv_save_c tmp; tmp.init(); @@ -1809,22 +1830,28 @@ int dSv_info_c::initdata_to_card(char* card_ptr, int dataNum) { return 0; } +/* ############################################################################################## */ +/* 803790C0-80379234 005720 0172+02 0/0 17/17 7/7 .rodata tempBitLabels__20dSv_event_tmp_flag_c */ u16 const dSv_event_tmp_flag_c::tempBitLabels[185] = { - 0xFFFF, 0xFFFF, 0xFF0F, 0xFEFF, 0x0040, 0xFDFF, 0xFCFF, 0x0020, 0x0080, 0x0010, 0x0008, 0x0004, - 0x0002, 0x0001, 0x0180, 0x0140, 0x0120, 0x0110, 0x0108, 0x0104, 0x0102, 0x0101, 0x0280, 0x0240, - 0x0220, 0x0210, 0x0208, 0x0204, 0x0202, 0x0201, 0x0380, 0x0340, 0x0320, 0x0310, 0xFBFF, 0x0308, - 0x0304, 0x0302, 0x0301, 0x0480, 0x0440, 0x0420, 0x0410, 0x0408, 0x0404, 0x0402, 0x0401, 0x0580, - 0x0540, 0x0520, 0x0510, 0x0508, 0x0504, 0x0502, 0x0501, 0x0680, 0x0640, 0x0620, 0x0610, 0x0608, - 0x0604, 0x0602, 0x0601, 0x0780, 0x0740, 0x0720, 0x0710, 0x0708, 0x0704, 0x0702, 0x0701, 0x0880, - 0x0840, 0x0820, 0x0810, 0x0808, 0x0804, 0x0802, 0x0801, 0x0980, 0x0940, 0x0920, 0x0910, 0x0908, - 0x0904, 0x0902, 0x0901, 0x0A80, 0x0A40, 0x0A20, 0x0A10, 0x0A08, 0x0A04, 0x0A02, 0x0A01, 0x0B80, - 0x0B40, 0x0B20, 0x0B10, 0x0B08, 0x0B04, 0xFAFF, 0xF9FF, 0xF8FF, 0xF7FF, 0xF6FF, 0xF5FF, 0x0B02, - 0x0B01, 0x0C80, 0x0C40, 0x0C20, 0x0C10, 0x0C08, 0xF4FF, 0xF3FF, 0x0C04, 0x0C02, 0x0C01, 0x0D80, - 0x0D40, 0x0D20, 0x0D10, 0x0D08, 0x0D04, 0x0D02, 0x0D01, 0x0E80, 0x0E40, 0x0E20, 0x0E10, 0x0E08, - 0x0E04, 0x0E02, 0x0E01, 0x0F80, 0x0F40, 0x0F20, 0x0F10, 0x0F08, 0x0F04, 0x0F02, 0x0F01, 0x1080, - 0x1040, 0x1020, 0x1010, 0x1008, 0x1004, 0x1002, 0x1001, 0x1180, 0x1140, 0x1120, 0x1110, 0x1108, - 0x1104, 0x1102, 0x1101, 0x1280, 0x1240, 0x1220, 0x1210, 0x1208, 0x1204, 0x1202, 0x1201, 0x1380, - 0x1340, 0x1320, 0x1310, 0x1308, 0x1304, 0x1302, 0x1301, 0x1480, 0x1440, 0x1420, 0x1410, 0x1408, - 0x1404, 0x1402, 0x1401, 0x1580, 0xF2FF}; + UNUSED, UNUSED, T_0002, T_0003, T_0004, T_0005, T_0006, T_0007, T_0001, T_0008, T_0009, T_0010, + T_0011, T_0012, T_0013, T_0014, T_0015, T_0016, T_0017, T_0018, T_0019, T_0020, T_0021, T_0022, + T_0023, T_0024, T_0025, T_0026, T_0027, T_0028, T_0029, T_0030, T_0031, T_0032, TREG_000, + T_0033, T_0034, T_0035, T_0036, TEMP_0038, TEMP_0040, T_0041, T_0042, T_0043, T_0044, + T_0045, T_0046, T_0047, T_0048, T_0049, T_0050, T_0051, T_0052, T_0053, T_0054, T_0055, T_0056, + T_0057, T_058, T_0059, T_0060, T_0061, T_0062, T_0063, T_0064, T_0065, T_0066, T_0067, T_0068, + T_0069, T_0070, T_0071, T_0072, T_0073, T_0074, T_0075, T_0076, T_0077, T_0078, T_0079, T_0080, + T_0081, T_0082, T_0083, T_0084, T_0085, T_0086, T_0087, T_0088, T_0089, T_0090, T_0091, T_0092, + T_0093, T_0094, T_0095, T_0096, T_0097, T_0098, T_0099, T_0100, SHA_LOVEFORTUNE_00, SHA_LOVEFORTUNE_01, + SHA_LOVEFORTUNE_02, SHA_LOVEFORTUNE_03, SHA_LOVEFORTUNE_04, SHA_LOVEFORTUNE_05, + T_0107, T_0108, T_0109, T_0110, T_0111, T_0112, T_0113, PACHITUTORIAL_CNT, PACHITUTORIAL_INF, + WXXTO, MN09_02, MN09_03, T_0119, T_0120, T_0121, T_0122, T_0123, T_0124, YKM_ATTN, + YKM_TALK, YKW_TALK, YKW_ATTN, T_0125, DUNGEON_130, DUNGEON_131, + DUNGEON_132, DUNGEON_133, DUNGEON_134, DUNGEON_135, DUNGEON_136, DUNGEON_137, + DUNGEON_138, DUNGEON_139, DUNGEON_140, DUNGEON_141, DUNGEON_142, DUNGEON_143, + DUNGEON_144, DUNGEON_145, DUNGEON_146, DUNGEON_147, DUNGEON_148, DUNGEON_149, + DUNGEON_150, CAT_1, CAT_2, CAT_3, CAT_4, CAT_5, CAT_6, CAT_7, CAT_8, CAT_9, CAT_10, + CAT_11, CAT_12, CAT_13, CAT_14, CAT_15, CAT_16, CAT_17, CAT_18, CAT_19, CAT_20, GUARD_URI, + Hanch_CLIMBOUT_POND, NODRAW_STAGE_NAME, NO_TELOP, T_0175, T_0176, T_0177, T_0178, + T_0179, T_0180, T_0181, T_0182, T_0183, SHA_DBG +}; -/* 80379234-80379234 005894 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ diff --git a/src/d/save/d_save_bit_labels.inc b/src/d/save/d_save_bit_labels.inc new file mode 100644 index 0000000000..0f46fdfe9f --- /dev/null +++ b/src/d/save/d_save_bit_labels.inc @@ -0,0 +1,833 @@ +/** + * d_save_bit_labels.inc + * Flag labels for dSv_event_flag_c::saveBitLabels + * + * Flag information comes from the debug table in d_event_debug.inc + * + */ + +/* +Name = Value // Location - Description +*/ + +B_BTN_GUIDE = 0x5c01, // Misc. - B-button guide +D_0001 = 0x0380, // Ordon Village - Stopped by squirrel in front of house at night +F_0001 = 0x0008, // Kakariko Village - Spoke to Renado after Colin returns +F_0002 = 0x0004, // Death Mountain (room) - Lost wrestling match to elder goron for first time +F_0003 = 0x0002, // Snowpeak Ruins - Handed over tomato puree and left room +F_0004 = 0x0001, // Snowpeak Ruins - Handed over secret ingredient and left room +F_0005 = 0x0180, // Misc. - Gathered 14 Tears of Light in area 4 +F_0006 = 0x0140, // Snowpeak Ruins - First conversation with Yeto in kitchen +F_0007 = 0x0120, // Snowpeak Ruins - Spoke to Yeta while holding cheese +F_0008 = 0x0110, // Ordon Village - First conversation with Fado at the farm on 1st day +F_0009 = 0x0108, // Ordon Woods - Approach secret entrance with Colin +F_0010 = 0x0104, // Ordon Village - First convo with Colin blocking path (forced) +F_0011 = 0x0102, // Ordon Ranch - Fence jumping complete +F_0012 = 0x0101, // Ordon Village - Get metal sword! +F_0013 = 0x0280, // Ordon Village - 2nd day - First time rampaging goat escapes +F_0014 = 0x0240, // Ordon Village - sword tutorial ends +F_0015 = 0x0220, // Ordon Village - Slingshot tutorial ends +F_0016 = 0x0210, // Ordon Village - On 3rd day, start following Colin who is blocking path +F_0017 = 0x0208, // Ordon Village - Spoke to beth right after sword tutorial +F_0018 = 0x0204, // Ordon Ranch - Asked by Fado to jump fence +F_0019 = 0x0202, // Ordon Woods - Spoke with Ilia (Colin is there too) at the spring +F_0020 = 0x0201, // Ordon Village - First convo with Sera while shop is closed +F_0021 = 0x0340, // Ordon Village - 2nd day: spoke with Pergie +F_0022 = 0x0320, // Ordon Ranch - Start fence-jump on 1st day +F_0023 = 0x0310, // Ordon Village - Called by Jaggle from below hill +F_0024 = 0x0308, // Ordon Village - Spoke with Talo/Malo/Beth (before obtaining slingshot) +F_0025 = 0x0304, // Ordon Village - Pass Uli's pick-up tutorial +F_0026 = 0x0302, // Ordon Village - gave wooden sword to talo on 3rd day +F_0027 = 0x0301, // Ordon Village - Uli tutorial ends (same whether pass or fail) +F_0028 = 0x0480, // Snowpeak Ruins - Spoke to yeta while holding pumpkin +F_0029 = 0x0440, // Ordon Village - 2nd day - refused sword tutorial +F_0030 = 0x0420, // Ordon Village - before sword tutorial - first conversation with Beth +F_0031 = 0x0410, // Ordon Village - 2nd day - Spoke to Uli bfore finding basket +F_0032 = 0x0408, // Ordon Ranch - 3rd day - First convo with fado (before forced goat chase) +F_0033 = 0x0404, // Ordon Village - First day - spoke with Uli +F_0034 = 0x1040, // Ordon Village - first conversation wtih Rusl +F_0035 = 0x1020, // Ordon Village - F0003: Spoke to Colin while he is stopping hors (doesn't have fishing rod) +F_0036 = 0x1004, // Ordon Village - Spoke to Jaggle using L-focus before climbing vines? +F_0037 = 0x1002, // Ordon Village - Jaggle - Spoke on the hill? +F_0038 = 0x1001, // Ordon Village - Opening (2nd day) cat returns home +F_0039 = 0x1180, // Ordon Village - Warned by Hanch after climbing vines on 2nd day +F_0040 = 0x1140, // Ordon Village - 2nd day: Spoke to Jaggle after blowing on whistle +F_0041 = 0x1120, // Ordon Village - Opening 2nd day - After this is turned ON Hanch is attacked by bees +F_0042 = 0x1110, // Snowpeak Ruins - Spoke with Yeta right after arriving at bedroom +F_0043 = 0x1108, // Kakariko Village - First visit after fundrasing funds drop to 200 +F_0044 = 0x1104, // Ordon Village - Accepted sword tutorial first time +F_0045 = 0x1102, // Ordon Village - Opening 3rd day - spoke with Uli +F_0046 = 0x1101, // Ordon Village - Spoke with Sera after saving(lt;) failing(gt;) cat +F_0047 = 0x1280, // Ordon Village - First visit after Ordon Village shop opens +F_0048 = 0x1240, // Ordon Village - Uli's pick-up tutorial +F_0049 = 0x1220, // Ordon Village - Uli's pick up tutorial +F_0050 = 0x1210, // Ordon Village - Saw cutscene for getting iron boots +F_0051 = 0x1208, // Ordon Village - Spoke to Sera in the shop after saving cat +F_0052 = 0x1204, // Ordon Village - Had 2nd conversaton with Sera before saving cat +F_0053 = 0x1202, // Faron Woods - Saw night stalker appearance cutscene +F_0054 = 0x1201, // Death Mountain - Lost wrestling match with elder goron while wearing iron boots +F_0055 = 0x1380, // Faron Woods - Received Vessel of Light from Faron spirit +F_0056 = 0x1340, // Death Mountain - Lost to elder goron 2+ times +F_0057 = 0x1320, // Cutscene - [cutscene: 17] Part with the children +F_0058 = 0x1310, // Castle Town - Listened to voices on other side of door in Telma's shop +F_0059 = 0x1308, // N/A - Conversation after getting spirit and tears of light (darkness cleared) <- probably unused ... +F_0060 = 0x1304, // Zora's River - First conversation with Hozu in the World of Light +F_0061 = 0x1302, // Death Mountain - Heard spring goron and shopkeeper rumers after winning wrestling match against elder goron +F_0062 = 0x1301, // Lake Hylia - Abandoned taking Fyer's cannon after paying +F_0063 = 0x1480, // Lake Hylia - Used Fyer's cannon for first time +F_0064 = 0x1440, // Snowpeak Ruins - First convo with Yeta after obtaining tomato puree +F_0065 = 0x1420, // Snowpeak Ruins - Yeta adds last symbol onto map +F_0066 = 0x1410, // Death Mountain - First saw Goron cutscene on mountain path +F_0067 = 0x1408, // Ordon Village - Recieved milk jar (1/2) from Sera +F_0068 = 0x1404, // N/A - N/A +F_0069 = 0x1402, // Ordon Village - F0048: Thanked by Colen for clearing path +F_0070 = 0x1401, // Ordon Woods - Colin went deep into the woods +F_0071 = 0x1540, // Twilight Hyrule Field - Cannot warp to Lanayru +F_0072 = 0x1520, // Ordon Village - Knocked down large beehive with hawk +F_0073 = 0x1510, // Ordon Village - Attacked after charging at large beehive +F_0074 = 0x1508, // Ordon Village - Hanch attacked by bees +F_0075 = 0x1504, // Ordon Village - Angered Jaggle by destroying pumpkin +F_0076 = 0x1502, // Ordon Village - Spoke to Hanch in lake +F_0077 = 0x1501, // Castle Town - First converstaion with Agetha inside +F_0078 = 0x1680, // Ordon Village - Hanch returned to land after jumping into lake +F_0079 = 0x1640, // Ordon Village - 2nd Day - successful knocked down rampaging mountain goat +F_0080 = 0x1620, // Ordon Village - Completed all of mountain goat rampage event +F_0081 = 0x1610, // Ordon Village - 20 mountain goats rampaged +F_0082 = 0x1608, // Ordon Village - Completed coversation with Bo after 20th mountain goat's rampage +F_0083 = 0x1604, // Letter - Deliver letter from Agetha +F_0084 = 0x1602, // Ordon Village - Opening days 2&3: knocked down a beehive with slingshot +F_0085 = 0x1601, // Ordon Village - Rusl appears at woods entrance +F_0086 = 0x1780, // Ordon Village - Spoke with Hanch after knocking down beehive with hawk +F_0087 = 0x1740, // Ordon Village - Left search area after first conversation with Pergie +F_0088 = 0x1720, // Ordon Village - Spoke to Beth after quitting sword tutorial +F_0089 = 0x1710, // Ordon Village - Talked to village chief for first time +F_0090 = 0x1708, // Castle Town - F:1126 - South - Spoke with Agetha's stalker (before talking with Agetha inside) +F_0091 = 0x1704, // Ordon Village - F:1126 - South - Spoke with Agetha's stalker (after talking with Agetha inside) +F_0092 = 0x1702, // Castle Town - F:1127 - South - Spoke with the Hyrule soldier guide +F_0093 = 0x1701, // Castle Town - F:1128 - South - Spoke with female clerk at vegetable stand +F_0094 = 0x1880, // Ordon Village - Talo went after the monkey +F_0095 = 0x1840, // Ordon Ranch - Spoke to Fado before mountain goat rampage +F_0096 = 0x1820, // Ordon Village - Have spoken to Bo with 1 health +F_0097 = 0x1810, // Ordon Village - First conversation with dog eavesdrop hint +F_0202 = 0x1808, // Ordon Village - Rusl / Wolf fails to get sword +F_0203 = 0x1804, // Shop - First tried to steal from unnmaned shop (Havent checked donation box) +F_0204 = 0x1802, // Inside Hyrule Castle - Talked to Midna from across the bars in the sewer +F_0205 = 0x1801, // Ordon Village - Heard Rusl and Uli talking in Ordon village at night +F_0206 = 0x1980, // Ordon Woods - Barrier of darkness tag: tried to enter without getting sword and shield +F_0207 = 0x1940, // Ordon Village - Viewed Hanch, the Hawker cutscene +F_0208 = 0x1920, // Ordon Village - Hanch leapt after being startled by wolf +F_0209 = 0x1910, // Ordon Village - Escape after failing to eavesdrop to Bo and Jaggle +F_0210 = 0x1908, // Ordon Village - F0004: Try to get on horse when Colin is stopping horse +F_0211 = 0x1904, // Ordon Village - Successfully eavesdrop on Bo and Jaggle +F_0212 = 0x1902, // Ordon Woods - Conversation wtih Colin in front of Ordon springs gate +F_0213 = 0x1901, // Kakariko Village - Called by spirit after NS fight at Kakariko entrance +F_0214 = 0x1a80, // Inside Hyrule Castle - First heard Midna's hint about Z +F_0215 = 0x1a40, // Ordon Village - Spoke with cat on roof +F_0216 = 0x1a20, // Ordon Village - Spoke with Ordon village cucco B (white) +F_0217 = 0x1a10, // Faron Woods - First conversation after speaking with Coro again after clearing up twilight +F_0218 = 0x1a08, // Faron Woods - Bought jar of oil from Coro +F_0219 = 0x1a04, // Castle Town - Heard Agetha say "but you have some" +F_0220 = 0x1a02, // Inside Hyrule Castle - First time - Talked to one of the Hyrule soldiers underneath castle in Twilight +F_0221 = 0x1a01, // Kakariko Village - Received vessel of light from spirit +F_0222 = 0x1b80, // Faron Woods - Finished Coro ignite event +F_0223 = 0x1b40, // Faron Woods (Coro's Shop) - Listened to Coro's dialogue before defeating shadow bugs +F_0224 = 0x1b20, // Faron Woods - Flag for lantern guide monkey cutscene +F_0225 = 0x1b10, // Faron Woods - Lanter guide monkey doesn't come out a second time +F_0226 = 0x1b08, // Faron Woods - Get lantern back from monkey +F_0227 = 0x1b04, // Faron Woods - Try to leave mist woods after lantern taken +F_0228 = 0x1b02, // Death Mountain - Listened to goron's complaint at the entrance to twilight mountain path +F_0229 = 0x1b01, // Faron Woods - Try to leave the mist woods area without lantern (after returning monkey) +F_0230 = 0x1c80, // Death Mountain - Twilight - listened to goron B's complaints +F_0231 = 0x1c40, // Ordon Village - Did first wrestle match with Bo +F_0232 = 0x1c20, // Ordon Village - get iron boots from Bo +F_0233 = 0x1c10, // Ordon Village - Win practice battle with Bo (before getting boots) +F_0235 = 0x1c04, // Sacred Grove - Giant game clear +F_0236 = 0x1c02, // Misc. - Make Midna angry after doing wrong destination for Kakariko bridge warp +F_0237 = 0x1c01, // Kakariko Village - Entered Malo Mart (chatted with Malo) +F_0238 = 0x1d80, // Faron Woods - Destroyed all puppets (monkey girl event before sacred grove) +F_0240 = 0x1d20, // Kakariko Village - Speak with Barnes while heas making bombs +F_0241 = 0x1d10, // Kakariko Village - First conversation with Barnes after bomb shop open +F_0242 = 0x1d08, // Goron Mines - Spoke with the dazed chief goron after Fyrus battle +F_0243 = 0x1d04, // Kakariko Village - Speak with Luda wiping Colin's sweat +F_0244 = 0x1d02, // Kakariko Village - Speak to Talo while COlin is wiping sweat +F_0246 = 0x1e80, // Kakariko Village - Malo Mart fundraiser (and carying spring water) start +F_0247 = 0x1e40, // Kakariko Village - First conversation with Malo (shopping complete) after helping Malo Mart fundraiser +F_0248 = 0x1e20, // Faron Woods - Speak with Coro after clearing Forest Temple +F_0249 = 0x1e10, // Lake Hylia - Try to leave after paying for Flight by Fowl (first time only) +F_0250 = 0x1e08, // Cutscene - [cutscene: 21] reunion with Zelda / Midna revived (Hyrule Castle barrier appears) +F_0251 = 0x1e04, // Ordon Village - Speak again with Sera before finding kids (forced conversation) +F_0252 = 0x1e02, // Ordon Village - Spoke to Sera while kids are missing (dealing with shop) +F_0253 = 0x1e01, // For E3 2006 - Stuck to magnet lift at least once +F_0254 = 0x1f80, // For E3 2006 - Hit boss's weak spot at least once +F_0255 = 0x1f40, // For E3 2006 - Boss exhausted (grabbing chains) only on during state (normally off) +F_0256 = 0x1f20, // For E3 2006 - Knocked down boss at leased once +F_0257 = 0x1f10, // For E3 2006 - Only ON when boss is in hollow state (normally off, changes in real time) +F_0258 = 0x1f08, // For E3 2006 - Heard hint right above heavy switch +F_0259 = 0x1f04, // For E3 2006 - Heard first forced dialogue from Midna +F_0260 = 0x1f02, // Castle Town - First time speaking to Resistance Rusl +F_0261 = 0x1f01, // Castle Town - First conversation with Resistance Auru (made fun of) +F_0262 = 0x2080, // Castle Town - First conversation with Resistance Shad (made fun of) +F_0263 = 0x2040, // Castle Town - First conversation with Resistance Ashei (3) (made fun of) +F_0264 = 0x2020, // Cutscene - Get master sword +F_0265 = 0x2010, // Arbiter's Grounds - Arbiter's Grounds clear +F_0266 = 0x2008, // Snowpeak Ruins - Snowpeak Ruins clear +F_0267 = 0x2004, // Temple of Time - Temple of Time clear +F_0268 = 0x2002, // City in the Sky - City in the Sky clear +F_0269 = 0x2001, // Castle Town - First conversation with Telma after getting master sword +F_0270 = 0x2180, // Castle Town - Gave Renado's letter to Telma +F_0271 = 0x2140, // Castle Town - Talked with Telma again after the other conversation after getting master sword +F_0272 = 0x2120, // Castle Town - Saw Auru's location on map +F_0273 = 0x2110, // Castle Town - Saw Ashei's location on map +F_0274 = 0x2108, // Castle Town - Saw Rusl's location on map +F_0275 = 0x2104, // Castle Town - Saw Shad's location on map +F_0276 = 0x2102, // Castle Town - Heard conversation with Louise about stolen wood carving +F_0277 = 0x2101, // Castle Town - Hear conversation between Telma and Ilia in Telma's shop (Twilight) +F_0278 = 0x2280, // Hidden Village - Received pendant from Impaz +F_0279 = 0x2240, // Hyrule Field - Saw cutscene about scent of kids from wooden sword +F_0280 = 0x2220, // Hyrule Field - Saw cutscene about Ilia's scent from pouch +F_0281 = 0x2210, // Shop - Malo Mart opens in Castle Town +F_0292 = 0x2302, // Castle Town - Star Game 2 first experience +F_0293 = 0x2301, // Castle Town - Star Game 2 cleared +F_0294 = 0x2480, // Castle Town - Shaman - Prayers reached the heavens (heart piece obtained complete) +F_0295 = 0x2440, // Castle Town - Watched meeting Louise event when sneaking into Telma's shop (wolf) +F_0296 = 0x2420, // Castle Town - Spoke with Louise after kicked being kicked out of Telma's shop +F_0297 = 0x2410, // Castle Town - First spoke with Chudley store clerk +F_0298 = 0x2408, // Castle Town - Spoke with Auru after completing Arbiter's Grounds +F_0299 = 0x2404, // Castle Town - Spoke with Shad at Telma's shop after getting master sword +F_0300 = 0x2402, // Castle Town - Heard about Sky People from Shad at Telma's shop +F_0301 = 0x2401, // Castle Town - Spoke with Shad after City in the Sky clear +F_0302 = 0x2580, // Kakariko Village - Saw cutscene of Shad casting spells underneat Kakariko Village +F_0303 = 0x2540, // Kakariko Village - Saw Shad's spell 2 +F_0304 = 0x2520, // Lake Hylia - Spoke with Auru at Hylia Lake +F_0305 = 0x2510, // Lake Hylia - Heard about Fyer from Auru (desert cannon ON) +F_0306 = 0x2508, // Desert - Used Fyer's cannon to go to desert +F_0307 = 0x2504, // Snowpeak mountain - Spoke with Yeto at top of mountain as wolf +F_0308 = 0x2502, // Snowpeak mountain - Watched first meeting event with Yeto at top of mountain (human) +F_0309 = 0x2501, // Castle Town - First conversation with Agetha inside (gives golden bug capture quest) +F_0310 = 0x2680, // Lake Hylia - Hand Auru's note to Fyer +F_0311 = 0x2640, // Palace of Twilight - Palace of Twilight use 1 +F_0312 = 0x2620, // Palace of Twilight - Palace of Twilight use 2 +F_0313 = 0x2610, // Palace of Twilight - Palace of Twilight use 3 +F_0314 = 0x2608, // Palace of Twilight - Palace of Twilight use 4 +F_0315 = 0x2604, // Palace of Twilight - Palace of Twilight use 5 +F_0316 = 0x2602, // Palace of Twilight - Palace of Twilight use 6 +F_0317 = 0x2601, // Palace of Twilight - Palace of Twilight use 7 +F_0318 = 0x2780, // Palace of Twilight - Palace of Twilight use 8 +F_0319 = 0x2740, // Palace of Twilight - Palace of Twilight use 9 +F_0320 = 0x2720, // Palace of Twilight - Palace of Twilight use 10 +F_0321 = 0x2710, // Castle Town - Showed reciept to town doctor +F_0322 = 0x2708, // Zora's Domain - Flow 0010 Spoke with Zora in Zora armor +F_0323 = 0x2704, // Zora's Domain - Flow 0020 Spoke with Zora +F_0324 = 0x2702, // Zora's Domain - Flow 0023 Speak with Zora before blowing up magma rock +F_0325 = 0x2701, // Zora's Domain - Flow 0023 Speak with Zora after blowing up magma rock +F_0326 = 0x2880, // Palace of Twilight - Mini-boss defeated flag +F_0327 = 0x2840, // Misc. - First time warped by Ooccoo Sr. +F_0328 = 0x2820, // Ordon Village - Talk again with Jaggle after finding kids +F_0329 = 0x2810, // Ordon Village - Jaggle brings up shield +F_0330 = 0x2808, // Ordon Village - Meet again with Uli for the first time (first forced conversation) +F_0331 = 0x2804, // Ordon Village - Meet again and talk with Uli after finding kids (1st time) +F_0332 = 0x2802, // Ordon Village - Meet again and talk with Uli after finding kids (2nd time) +F_0333 = 0x2801, // Ordon Village - Uli brings up the sword +F_0334 = 0x2980, // Castle Town - Spoke with Ashei at Telma's shop after getting master sword +F_0335 = 0x2940, // Snowpeak mountain - Obtained scribble from Ashei at mountain pass +F_0336 = 0x2920, // Zora's Domain - Blew up molten rock bomb +F_0337 = 0x2910, // Castle Town - Listened to old ladies A/B conversation (wolf / Ralis hint FLOW104) +F_0338 = 0x2908, // Secret techniques - Obtained 1 secret techinques - Shield attack +F_0339 = 0x2904, // Secret techniques - Obtained 2 secret techinques +F_0340 = 0x2902, // Secret techniques - Obtained 3 secret techinques +F_0341 = 0x2901, // Secret techniques - Obtained 4 secret techinques +F_0342 = 0x2a80, // Secret techniques - Obtained 5 secret techinques +F_0343 = 0x2a40, // Secret techniques - Obtained 6 secret techinques +F_0344 = 0x2a20, // Secret techniques - Obtained 7 secret techinques +F_0345 = 0x2a10, // Faron Woods - Opening 2nd day - lit Coro's pot +F_0346 = 0x2a08, // Lake Hylia - Turned down Auru's request to go to the desert +F_0347 = 0x2a04, // Castle Town - Spoke with Ashei after Snowpeak Ruins clear +F_0348 = 0x2a02, // Lake Hylia - Spoke with Zora soldier in front of Lakebed Temple (before bombing entrance) +F_0349 = 0x2a01, // Lake Hylia - Spoke with Zora soldier in front of Lakebed Temple (after bombing entrance) +F_0350 = 0x2b80, // Kakariko Village - Showed wood carving doll to Renado +F_0351 = 0x2b40, // Hyrule Field - First meeting with Agether outside (haven't met inside yet) : gives bug even quest +F_0352 = 0x2b20, // Hyrule Field - Second conversation with Agetha (outside) +F_0353 = 0x2b10, // Castle Town - Conversation with lady complaining about Chudley's shop +F_0354 = 0x2b08, // Cutscene - [cutscene] Mirror complete +F_0355 = 0x2b04, // Castle Town - Showed wood carving to village doctor +F_0356 = 0x2b02, // Castle Town - Spoke with village doctor after Ilia's memories restored +F_0357 = 0x2b01, // Death Mountain - Spoke with Telma's guardian goron after she came back +F_0358 = 0x2c80, // Castle Town - Spoke with Telma after Ilia's memories restored +F_0359 = 0x2c40, // Kakariko Village - Spoke with Ilia while she's watching over Ralis +F_0360 = 0x2c20, // Castle Town - Conversation with fortune teller as wolf +F_0361 = 0x2c10, // Arbiter's Grounds - Spun the spinning pillars +F_0362 = 0x2c08, // Castle Town - Properly spoke with Resistance Rusl again (2nd time) +F_0363 = 0x2c04, // Ordon Village - Stole sword from Rusl in Ordon Village at night (wolf) +F_0364 = 0x2c02, // Faron Woods - Listened to monkey girl's laments (Twilight) +F_0365 = 0x2c01, // Death Mountain (room) - Spoke with Gor Liggs after LV dungeon clear +F_0366 = 0x2d80, // Death Mountain (room) - Spoke with Gor Liggs after Ilia's memories restored +F_0367 = 0x2d40, // Death Mountain - Spoke with goron blocking mountain path after Goron Mines clear +F_0368 = 0x2d20, // Kakariko Village - First conversation wtih goron in front of hotel +F_0369 = 0x2d10, // Kakariko Village - First conversation with goron in front of watch tower +F_0370 = 0x2d08, // Kakariko Village - First converstaion with Karakiko springs goron (adult) +F_0371 = 0x2d04, // Kakariko Village - First conversation wtih goron in front of bomb shop (while only selling bombs) +F_0372 = 0x2d02, // Ordon Village - Tried to by milk before saving cat +F_0373 = 0x2d01, // Death Mountain - Coversation with Darbus after Ilia's memories restored +F_0374 = 0x2e80, // Death Mountain - Conversation with Darbus in wrestling room after Goron Mines clear +F_0375 = 0x2e40, // Kakariko Village - First conversation with fundraising goron at Malo Mart +F_0376 = 0x2e20, // Kakariko Village - Gathered funds for bridge repair! (set by program after raising funds) +F_0377 = 0x2e10, // Castle Town - Goron spring water shop open! +F_0378 = 0x2e08, // Hyrule Field - Darbus destroyed hidden village boulder +F_0379 = 0x2e04, // N/A - Completed golden bugs +F_0380 = 0x2e02, // N/A - Complete first meeting with Agetha (Recieved bug collection quest) +F_0381 = 0x2e01, // Castle Town - First conversation with parent goron after spring water shop opens +F_0382 = 0x2f80, // Castle Town - Listened to laments of fallen goron (while bridge broken) +F_0383 = 0x2f40, // Castle Town - Spoke with child goron after spring water shop opens +F_0384 = 0x2f20, // Castle Town - Spring water shop - Spoke with child goron while shop closed +F_0385 = 0x2f10, // Kakariko Village - First conversation with Barnes after stocking water bombs +F_0386 = 0x2f08, // Kakariko Village - Conversation with Barnes after he starts selling Bomblings and landmines +F_0387 = 0x2f04, // Castle Town - Learned scent of medicine +F_0388 = 0x2f02, // Kakariko Village - Graveyard - Spoke with Ralis after changing scene (before obtaining earrings) +F_0389 = 0x2f01, // Hyrule Field - First conversation with goron digging hole in south +F_0390 = 0x3080, // Castle Town - First conversation after saving Jovani +F_0391 = 0x3040, // Hyrule Field - Gave spring water to goron south of castle town +F_0392 = 0x3020, // Hyrule Field - spoke with goron digging hole after opening caslt town south road +F_0393 = 0x3010, // Castle Town - First conversation at Poe shop (generic Poe appearance) +F_0394 = 0x3008, // Goron Mines - Received first key from chibi elder (204) +F_0395 = 0x3004, // Kakariko Village - First conversation with Gor Liggs in Kakariko Village +F_0396 = 0x3002, // Kakariko Village - Failed to carry hot spring water (speak with elder to reset) +F_0397 = 0x3001, // Kakariko Village - Gor Liggs conversation sequence B +F_0398 = 0x3180, // Kakariko Village - Gor Liggs conversation sequence C +F_0399 = 0x3140, // Kakariko Village - Conversation with Gor Liggs - hot spring game available +F_0400 = 0x3120, // Kakariko Village - Warped sky cannon to Lake Hylia +F_0401 = 0x3110, // Misc. - Beetle (M) +F_0402 = 0x3108, // Misc. - Beetle (F) +F_0403 = 0x3104, // Misc. - Butterfly (M) +F_0404 = 0x3102, // Misc. - Butterfly (F) +F_0405 = 0x3101, // Misc. - Stag beetle (M) +F_0406 = 0x3280, // Misc. - Stag beetle (F) +F_0407 = 0x3240, // Misc. - Grasshopper (M) +F_0408 = 0x3220, // Misc. - Grasshopper (F) +F_0409 = 0x3210, // Misc. - Phasmid (M) +F_0410 = 0x3208, // Misc. - Phasmid (F) +F_0411 = 0x3204, // Misc. - Pill bug (M) +F_0412 = 0x3202, // Misc. - Pill bug (F) +F_0413 = 0x3201, // Misc. - Mantis (M) +F_0414 = 0x3380, // Misc. - Mantis (F) +F_0415 = 0x3340, // Misc. - Ladybug (M) +F_0416 = 0x3320, // Misc. - Ladybug (F) +F_0417 = 0x3310, // Misc. - Snail (M) +F_0418 = 0x3308, // Misc. - Snail (F) +F_0419 = 0x3304, // Misc. - Dragonfly (M) +F_0420 = 0x3302, // Misc. - Dragonfly (F) +F_0421 = 0x3301, // Misc. - Ant (M) +F_0422 = 0x3480, // Misc. - Ant (F) +F_0423 = 0x3440, // Misc. - Dayfly (M) +F_0424 = 0x3420, // Misc. - Dayfly (F) +F_0425 = 0x3410, // Misc. - [Captured in bottle] Beetle (M) +F_0426 = 0x3408, // Misc. - [Captured in bottle] Beetle (F) +F_0427 = 0x3404, // Misc. - [Captured in bottle] Butterfly (M) +F_0428 = 0x3402, // Misc. - [Captured in bottle] Butterfly (F) +F_0429 = 0x3401, // Misc. - [Captured in bottle] Stag beetle (M) +F_0430 = 0x3580, // Misc. - [Captured in bottle] Stag beetle (F) +F_0431 = 0x3540, // Misc. - [Captured in bottle] Grasshopper (M) +F_0432 = 0x3520, // Misc. - [Captured in bottle] Grasshopper (F) +F_0433 = 0x3510, // Misc. - [Captured in bottle] Phasmid (M) +F_0434 = 0x3508, // Misc. - [Captured in bottle] Phasmid (F) +F_0435 = 0x3504, // Misc. - [Captured in bottle] Pill bug (M) +F_0436 = 0x3502, // Misc. - [Captured in bottle] Pill bug (F) +F_0437 = 0x3501, // Misc. - [Captured in bottle] Mantis (M) +F_0438 = 0x3680, // Misc. - [Captured in bottle] Mantis (F) +F_0439 = 0x3640, // Misc. - [Captured in bottle] Ladybug (M) +F_0440 = 0x3620, // Misc. - [Captured in bottle] Ladybug (F) +F_0441 = 0x3610, // Misc. - [Captured in bottle] Snail (M) +F_0442 = 0x3608, // Misc. - [Captured in bottle] Snail (F) +F_0443 = 0x3604, // Misc. - [Captured in bottle] Dragonfly (M) +F_0444 = 0x3602, // Misc. - [Captured in bottle] Dragonfly (F) +F_0445 = 0x3601, // Misc. - [Captured in bottle] Ant (M) +F_0446 = 0x3780, // Misc. - [Captured in bottle] Ant (F) +F_0447 = 0x3740, // Misc. - [Captured in bottle] Dayfly (M) +F_0448 = 0x3720, // Misc. - [Captured in bottle] Dayfly (F) +F_0449 = 0x3710, // Kakariko Village - Talk with Gor Liggs again - first time after talking iwth Hot spring water parent goron (before fundraising) +F_0450 = 0x3708, // Castle Town - Double Clawshot shop final stage first conversation +F_0453 = 0x3704, // Hyrule Field - Postman first appears +F_0454 = 0x3702, // Goron Mines - Recieved 3rd key from fundraising elder (206) +F_0455 = 0x3701, // Goron Mines - Recieved 3rd key from fundraising elder (205) +F_0456 = 0x3880, // Castle Town - First time meeting with Jovani +F_0457 = 0x3840, // Castle Town - Revived cat +F_0458 = 0x3820, // Castle Town - Coversation with Jovani after collecting 60 ghosts +F_0459 = 0x3810, // Castle Town - Coversation with Gengle after collecting 40 ghosts +F_0460 = 0x3808, // Castle Town - Coversation with Gengle after collecting 50 ghosts +F_0461 = 0x3804, // Fishing Pond - First time entered fishing house +F_0462 = 0x3802, // Fishing Pond - Reserved for fishing +F_0463 = 0x3801, // Fishing Pond - Reserved for fishing +F_0464 = 0x3980, // Fishing Pond - Reserved for fishing +F_0465 = 0x3940, // Fishing Pond - Reserved for fishing +F_0466 = 0x3920, // Fishing Pond - Reserved for fishing +F_0467 = 0x3910, // Fishing Pond - N/A +F_0468 = 0x3908, // Fishing Pond - Reserved for fishing +F_0469 = 0x3904, // Fishing Pond - Reserved for fishing +F_0470 = 0x3902, // Fishing Pond - Reserved for fishing +F_0471 = 0x3901, // Ordon Village - Finished 2 wrestling matches against Bo +F_0472 = 0x3a80, // Secret techniques - Distant howling complete (for secret technique 2) +F_0473 = 0x3a40, // Secret techniques - Distant howling complete (for secret technique 3) +F_0474 = 0x3a20, // Secret techniques - Distant howling complete (for secret technique 4) +F_0475 = 0x3a10, // Secret techniques - Distant howling complete (for secret technique 5) +F_0476 = 0x3a08, // Secret techniques - Distant howling complete (for secret technique 6) +F_0477 = 0x3a04, // Secret techniques - Distant howling complete (for secret technique 7) +F_0478 = 0x3a02, // Zora's Domain - Spoke to Ralis who returned to Zora's domain +F_0479 = 0x3a01, // Kakariko Village - First conversation with Ralis in front of grave +F_0480 = 0x3b80, // Kakariko Village - Received Coral Earrings from Ralis +F_0481 = 0x3b40, // Snowpeak Mountain - Beat Yeta at snowboard first time +F_0482 = 0x3b20, // N/A - After beating Yeto, first conversation with Yeta at peak (challenged to a match) +F_0483 = 0x3b10, // Snowpeak Mountain - First beat Yeta at snowboard (heart piece) +F_0484 = 0x3b08, // Lake Hylia - Completed sky canon repairs! +F_0485 = 0x3b04, // Lake Hylia - Heard Fyer talk about repairs 1 time +F_0486 = 0x3b02, // Kakariko Village - Spoke with Luda while Ralis is visiting graveyard +F_0487 = 0x3b01, // Kakariko Village - Spoke with Luda after Ralis returns home +F_0488 = 0x3c80, // Kakariko Village - Conversation with goron in front of bomb shop - underwater bomb appears +F_0489 = 0x3c40, // Kakariko Village - Conversation with goron in front of bomb shop - all bomb types appear +F_0490 = 0x3c20, // Ordon Village - Spoke with cucco (thinks Link will eat him) +F_0491 = 0x3c10, // Goron Mines - Spoke with mini-boss (magnet goron) after Goron Mines clear +F_0492 = 0x3c08, // Secret techniques - Gold wolf disappearance 2 +F_0493 = 0x3c04, // Secret techniques - Gold wolf disappearance 3 +F_0494 = 0x3c02, // Secret techniques - Gold wolf disappearance 4 +F_0495 = 0x3c01, // Secret techniques - Gold wolf disappearance 5 +F_0496 = 0x3d80, // Secret techniques - Gold wolf disappearance 6 +F_0497 = 0x3d40, // Secret techniques - Gold wolf disappearance 7 +F_0498 = 0x3d20, // Kakariko Village - Spoke with Beth after Lalis is revived +F_0499 = 0x3d10, // Zora's Domain - Saved magma goron +F_0500 = 0x3d08, // Ordon Village - Met Uli before finding kids (look at sleeping Rusl) +F_0501 = 0x3d04, // sub-dungeon - Cave of Ordeals - B10 first arrival +F_0502 = 0x3d02, // sub-dungeon - Cave of Ordeals - B20 first arrival +F_0503 = 0x3d01, // sub-dungeon - Cave of Ordeals - B30 first arrival +F_0504 = 0x3e80, // sub-dungeon - Cave of Ordeals - B40 first arrival +F_0505 = 0x3e40, // sub-dungeon - Cave of Ordeals - B50 first arrival (clear) +F_0506 = 0x3e20, // N/A - Only met Ooccoo Sr. - not yet son (shared Forest - Snowpeak) +F_0507 = 0x3e10, // N/A - Also met the son in dungeon with first Ooccoo Sr. meeting - turns 506 OFF (shared Forest - Snowpeak) +F_0508 = 0x3e08, // Ooccoo Sr. stuff - Meb Ooccoo Sr. B - doesnt turn OFF (shared Forest - Snowpeak) +F_0509 = 0x3e04, // Ooccoo Sr. stuff - Met Ooccoo Sr. second time +F_0510 = 0x3e02, // City in the Sky - Watched City in the Sky start cutscene +F_0513 = 0x3e01, // Kakariko Village - Spoke with Colin when neither Ilia nor Ralis are doing well +F_0514 = 0x3f80, // Kakariko Village - Spoke with Colin after Ralis is revived but before Ilia is revived +F_0515 = 0x3f40, // Kakariko Village - Spoke with Colin after Ilia and Ralis are revived +F_0516 = 0x3f20, // Ordon Village - Told Uli directly about having found kids +F_0517 = 0x3f10, // Ordon Village - Had normal conversation 1 with Uli after finding kids (before Colin kidnapped) +F_0518 = 0x3f08, // Ordon Village - Colin kidnapped ~ Heard about giving letter to Colin from sleeping Uli +F_0519 = 0x3f04, // Ordon Village - Spoke with Juggle after finding children +F_0520 = 0x3f02, // Ordon Village - Spoke with Sera after finding children +F_0521 = 0x3f01, // Ordon Village - Spoke with Sera across the counter after finding children (her script is shortened after this) +F_0522 = 0x4080, // Faron Woods - Heard about Sacred Grove from saved monkey girl +F_0523 = 0x4040, // Ordon Village - Spoke with Hanch before finding children +F_0524 = 0x4020, // Ordon Village - Spoke with Hanch after finding children +F_0525 = 0x4010, // Lake Hylia - First conversation with underwater Zora bomb seller +F_0526 = 0x4008, // Cutscene - [Cutscene: 23] Midna reveals her true form +F_0527 = 0x4004, // Faron Woods - Refused Resistance Rusl's request +F_0528 = 0x4002, // Faron Woods - Resistance Rusl summoned golden cucco +F_0529 = 0x4001, // Castle Town - Spoke with Rusl after clearing Temple of Time dungion +F_0530 = 0x4180, // Ordon Village - Spoke with Pergie after finding children +F_0531 = 0x4140, // Ordon Village - Spoke with Pergie while children are kidnapped +F_0532 = 0x4120, // Ordon Village - Pergie butts in about a shield +F_0533 = 0x4110, // Ordon Village - Spoke with Fado after finding children +F_0534 = 0x4108, // Ordon Village - Spoke with Fado before finding children +F_0535 = 0x4104, // Zora's Domain - Spoke with goron in water after recieving reward (bomb bag) +F_0536 = 0x4102, // Zora's Domain - Spoke with goron in water before recieving reward +F_0537 = 0x4101, // Faron Woods - Had Coro and wolf conversation +F_0538 = 0x4280, // City in the Sky - Spoke with sky person Oocoo Sr. after clearing City in the Sky +F_0539 = 0x4240, // Ordon Village - Receieved heart piece from Fado for mountain goat chase +F_0540 = 0x4220, // Faron Woods - Heard hint from Midna right after first portal warp +F_0541 = 0x4210, // N/A - N/A +F_0542 = 0x4208, // Cutscene - [Cutscene] Hyrule Castle barrier disappears (Midna goes crazy) +F_0543 = 0x4204, // Faron Woods - Met Resistance Rusl again in the woods +F_0544 = 0x4202, // Faron Woods - Watched cutscene of monkey girl running away after being attacked by puppet +F_0545 = 0x4201, // Sacred Grove - Watched cutscene of Ooccoo Sr. parting (after Temple of Time) +F_0546 = 0x4380, // Castle Town - East - Spoke with soldier in front of east gate about light (while bridge is broken) +F_0547 = 0x4340, // Castle Town - conversation with Jovani after collecting 40 ghosts +F_0548 = 0x4320, // Ordon Village - Opening 3rd day - spoke with Jaggle +F_0549 = 0x4310, // Castle Town - Heard old lady A, B, soldier set (talking about water) (when there's no water) +F_0550 = 0x4308, // Main Event - Gain ability to use sense +F_0551 = 0x4304, // Palace of Twilight - Palace of Twilight control use 1 +F_0552 = 0x4302, // Palace of Twilight - Palace of Twilight control use 2 +F_0553 = 0x4301, // Palace of Twilight - Palace of Twilight control use 3 +F_0554 = 0x4480, // Palace of Twilight - Palace of Twilight control use 4 +F_0555 = 0x4440, // Palace of Twilight - Palace of Twilight control use 5 +F_0556 = 0x4420, // Palace of Twilight - Palace of Twilight control use 6 +F_0557 = 0x4410, // Palace of Twilight - Palace of Twilight control use 7 +F_0558 = 0x4408, // Palace of Twilight - Palace of Twilight control use 8 +F_0559 = 0x4404, // Palace of Twilight - Palace of Twilight control use 9 +F_0560 = 0x4402, // Palace of Twilight - Palace of Twilight control use 10 +F_0561 = 0x4401, // Palace of Twilight - Palace of Twilight control use 11 +F_0562 = 0x4580, // Palace of Twilight - Palace of Twilight control use 12 +F_0563 = 0x4540, // Misc. - Brought back Gengle (after getting 50 souls, dealt with by program) +F_0564 = 0x4520, // Castle Town - Heard story from solder at Telma's shop (during Twilight) +F_0565 = 0x4510, // N/A - 2nd Day Complete +F_0566 = 0x4508, // Ooccoo Sr. stuff - Letter from Ooccoo Sr. came in OK (no son) +F_0567 = 0x4504, // Ooccoo Sr. stuff - Letter from Ooccoo Sr. came in OK (yes son) +F_0568 = 0x4502, // Zora's River - Broke Iza's pots (first offence) +F_0569 = 0x4501, // Zora's River - Compensation demands from Iza (resets if paid) +F_0570 = 0x4680, // Palace of Twilight - Cleared Palace of Twilight +F_0571 = 0x4640, // Ordon Village - Refuse Talo's request (for wooden sword) on 3rd day (first time) +F_0572 = 0x4620, // Ordon Village - Refuse Talo's request (for wooden sword) on 3rd day (again) +F_0573 = 0x4610, // Ordon Village - 1st Day - Fado moves to the farm (disappears from in front of Link's house) +F_0574 = 0x4608, // Ordon Ranch - 1st Day - Start mountain goat chasing in evening +F_0575 = 0x4604, // Ordon Ranch - 1st Day - End mountain goat chasing in evening +F_0576 = 0x4602, // Ordon Village - 2nd Day - Spoke with Fado +F_0577 = 0x4601, // Ordon Village - 2nd Day - Retrieved basket from monkey (hit hawk) +F_0578 = 0x4780, // Ordon Village - Spoke to Beth on 3rd day +F_0579 = 0x4740, // Ordon Village - Opening (2nd day) First time talking with Hanch before being attacked by bees +F_0580 = 0x4720, // Ordon Village - 1st Day - Blew on Epona's reed whistle at Ordon Spring +F_0581 = 0x4710, // Ordon Village - 2nd Day - First time calling the hawk using the grass whistle +F_0582 = 0x4708, // Ordon Woods - 1st Day - spoke to Ilia before blowing the reed whistle +F_0583 = 0x4704, // Ordon Woods - 1st day - Spoke to Ilia after blowing the reed whistle +F_0584 = 0x4702, // Ordon Village - 1st Day - spoke to Rusl +F_0585 = 0x4701, // Ordon Village - 1st day - Spoke to Bo +F_0586 = 0x4880, // Ordon Village - Spoke to Bo after defeating mountain goat +F_0587 = 0x4840, // Ordon Village - successfully defeated rampaging mountain goat +F_0588 = 0x4820, // Ordon Village - First time letting rampaging mountain goat escape +F_0589 = 0x4810, // Ordon Village - Sera - spoke on first day +F_0590 = 0x4808, // Ordon Village - 2nd Day - Spoke to Malo during Talo's disappearance (after getting lantern) +F_0591 = 0x4804, // Ordon Woods - 2nd Day - Spoke to Malo right after Talo disappears +F_0592 = 0x4802, // Ordon Village - 2nd Day - Spoke with Beth during Talo's disappearance (after getting lantern) +F_0593 = 0x4801, // Ordon Woods - 2nd Day - Conversation with Beth right after Talo's disappearance +F_0594 = 0x4980, // Ordon Village - 2nd Day - Colin (conversation after receiving lantern from Coro) +F_0595 = 0x4940, // Ordon Village - 2nd Day - Conversation with Colin after sword tutorial and after horse rejection +F_0596 = 0x4920, // Ordon Village - 2nd Day - Conversation with Colin after sword tutorial, before horse rejection +F_0597 = 0x4910, // Ordon Village - 2nd Day - First time speaking with Bo (after successfully defeating mountain goat) +F_0598 = 0x4908, // Ordon Village - 2nd Day - First conversation with Bo +F_0599 = 0x4904, // Ordon Village - 2nd Day - tried to enter Bo's house +F_0600 = 0x4902, // Ordon Village - Purchase slingshot +F_0601 = 0x4901, // Faron Woods - Spoke to imprisoned Talo +F_0606 = 0x4a08, // Sacred Grove - Giants switched places +F_0607 = 0x4a04, // Ordon Village - Quit Slingshot tutorial +F_0608 = 0x4a02, // Ordon Village - Began Slingshot tutorial +F_0609 = 0x4a01, // Ordon Village - Slingshot Tutorial - First time hitting scarcrow torso +F_0610 = 0x4b80, // Ordon Village - Slingshot Tutorial - Hit it without using focus +F_0611 = 0x4b40, // Ordon Village - Slingshot Tutorial - Hit it using focusing +F_0612 = 0x4b20, // Ordon Village - Pachinco Tutorial - Spoke before hitting target +F_0613 = 0x4b10, // Ordon Village - Slingshot Tutorial - Spoke before getting 2 scarecrow heards +F_0614 = 0x4b08, // Ordon Village - 2nd Day - Heard forced conversation immediately after the slignshot tutorial +F_0615 = 0x4b04, // Lake Hylia - Recieved vessel of light from Lanayru spirit +F_0616 = 0x4b02, // Ordon Village - 3rd Day - Spoke to Talo/Malo after handing over wooden sword (1st time) +F_0617 = 0x4b01, // Ordon Village - 3rd Day - Spoke to Talo/Malo after handing over wooden sword (2nd time) +F_0618 = 0x4c80, // Ordon Village - Scooped bee larva into bottle on opening 2nd Day +F_0619 = 0x4c40, // Lake Hylia - Spoke to Zora soldier (near cannon) in Lake Hylia +F_0620 = 0x4c20, // Zora's Domain - First caught a Reek Fish +F_0621 = 0x4c10, // Ordon Village - Spoke to Hanch on 3rd day (knocked down beehive on 2nd day) +F_0622 = 0x4c08, // Ordon Village - Opening 2nd day: Spoke to Hanch before being attacked by bees +F_0623 = 0x4c04, // Ordon Village - Opening 3rd day: Spoke to Hanch before being attacked by bees +F_0624 = 0x4c02, // Ordon Village - 3rd day: Warned by Hanch when climbing vines +F_0625 = 0x4c01, // Faron Woods - Saved Talo and a monkey +F_0626 = 0x4d80, // Castle Town - Received a heart piece from Jovani +F_0627 = 0x4d40, // Castle Town - Spoke with Jovani at the bar +F_0628 = 0x4d20, // Castle Town - Received 200 Rupees from Gengle +F_0629 = 0x4d10, // Castle Town - First conversation iwth Gengle after speaking with Jovani at the bar +F_0630 = 0x4d08, // Cutscene - (Cutscene 4 - ?) Right after Link is captured (wolf) +F_0631 = 0x4a80, // Fishing Pond (inside) - Heard when zooming in on fish tank (1) +F_0632 = 0x4d04, // Fishing Pond (inside) - Heard first time zooming in on fish tank (2) +F_0633 = 0x4d02, // Fishing Pond (inside) - Heard second time zooming in on fish tank (2) +F_0634 = 0x4d01, // Fishing Pond (inside) - Heard zooming in on lure (no frog) +F_0635 = 0x4e80, // Fishing Pond (inside) - Heard zooming in on lure (yes frog) +F_0636 = 0x4e40, // Fishing Pond (inside) - Heard first time zooming in on frog lure +F_0637 = 0x4e20, // Fishing Pond (inside) - Cleard all of roll goal game (get frog lure) +F_0638 = 0x4e10, // Fishing Pond (inside) - Heard first time zooming in on canoe +F_0639 = 0x4e08, // Fishing Pond (inside) - Heard first time zooming in on hat +F_0640 = 0x4e04, // Fishing Pond (inside) - Heard first time zooming in on pot +F_0641 = 0x4e02, // Fishing Pond (inside) - Heard First time zooming in on rug +F_0642 = 0x4e01, // Fishing Pond (inside) - Heard first time zooming in on book +F_0643 = 0x4f80, // Fishing Pond (inside) - Heard first time zooming in on old man's photo +F_0644 = 0x4f40, // Fishing Pond (inside) - Heard first time zooming in on Coro's photo +F_0645 = 0x4f20, // Fishing Pond (inside) - Heard First time zoomin in on Iza's photo +F_0646 = 0x4f10, // Fishing Pond (inside) - Heard first time zooming in on Hena's photo +F_0647 = 0x4f08, // Fishing Pond (inside) - Heard second time zooming in on Hena's photo +F_0648 = 0x4f04, // Fishing Pond (inside) - Heard Hena's photo 1,2 (additional story) +F_0649 = 0x4f02, // Fishing Pond (inside) - Heard first time zooming in on Link's picture +F_0650 = 0x4f01, // Fishing Pond (inside) - Heard second time zooming in on Link's picture +F_0651 = 0x5080, // Fishing Pond - Caught Greengill with bobber first time +F_0652 = 0x5040, // Fishing Pond - Caught Hylian Bass with bobber first time +F_0653 = 0x5020, // Fishing Pond - Caught Hylian Pike with bobber first time +F_0654 = 0x5010, // Fishing Pond - Caught Hylian Loach using bobber first time +F_0655 = 0x5008, // Fishing Pond - Caught an Ordon Catfish using bobber first time +F_0656 = 0x5004, // Fishing Pond - Caught something (any fish) using lure first time +F_0657 = 0x5002, // Fishing Pond - Caught Hylian Loach in front of Hena first time +F_0658 = 0x5001, // Castle Town - Recieved large wallet from Agitha +F_0659 = 0x5180, // Castle Town - Hear information about spirit spring in Lake Hylia from Twilight Soldier or map +F_0660 = 0x5140, // Lake Hylia - Twilight Lake Hylia Listened to Zora soldier A talk +F_0661 = 0x5120, // Lake Hylia - Twilight Lake Hylia Listened to Zora soldier B&C talk +F_0662 = 0x5110, // Fishing Pond (inside) - Omit rules after clearing roll goal game once +F_0663 = 0x5108, // Fishing Pond (inside) - Listened to Purdy's unnecessary words +F_0664 = 0x5104, // Fishing Pond (inside) - After clearing roll goal game / first attempt +F_0665 = 0x5102, // Fishing Pond (inside) - First zoom in Roll goal game +F_0666 = 0x5101, // Zora's Domain - Showed Yeto sketch to Zora soldier next to Snowpeak Mountain +F_0667 = 0x5280, // Zora's Domain - Showed Yeto sketch to average Zora soldier (generic) +F_0668 = 0x5240, // Zora's Domain - Showed Yeto sketch to Zora civilian (generic) +F_0669 = 0x5220, // Goron Mines - Pulled on Fyrus chains at least once +F_0670 = 0x5210, // Goron Mines - Hitting knocked-down Fyrus +F_0671 = 0x5208, // Goron Mines - Through magnet goron into lava once +F_0672 = 0x5204, // Goron Mines - First time seeing magnet goron tumbling +F_0673 = 0x5202, // Goron Mines - Heard hint about Fyrus's weakness (F0215) +F_0674 = 0x5201, // Castle Town - Light - Spoke with cafe table: townsperson A1 +F_0675 = 0x5380, // Castle Town - Light - cafe counter: Spoke with townsgirl A1 (shop clerk) +F_0676 = 0x5340, // Castle Town - Light - Spoke with Cafe customer: Townsperson F1 (just the man) +F_0677 = 0x5320, // Castle Town - Light - Spoke with Cafe customer B: Townsperson D1 and Man B1 +F_0678 = 0x5310, // Castle Town - Spoke with Group A (Town girl C2, Boy B1, Town girl D1) in front of fountain +F_0679 = 0x5308, // Fishing Pond (inside) - Cheated during Roll goal game +F_0680 = 0x5304, // Arbiter's Grounds - Heard Midna's hint after cutscene of ghost escaping +F_0681 = 0x5302, // Arbiter's Grounds - Heard Midna's hint after defeating first ghost +F_0682 = 0x5301, // City in the Sky - First conversation with Oocca Shopkeeper +F_0683 = 0x5480, // Castle Town - Spoke with Group B (Old lady A1, Boy A1, Town girl B1) in central square +F_0684 = 0x5440, // Temple of Time - Look at R00 statue using sense +F_0685 = 0x5420, // Cutscene - (Cutscene 32) Sage appears, get first Mirror of Twilight shard +F_0686 = 0x5410, // Palace of Twilight - Get fused shadow piece (final mask) +F_0687 = 0x5408, // Castle Town - Spoke with town girl D1 in front of south road hot spring shop (CLOSED) +F_0688 = 0x5404, // Castle Town - Spoke with town girl D1 in front of south road hot spring shop (OPEN) +F_0689 = 0x5402, // Castle Town - South Road - Spoke with meat shop villager man C1 +F_0690 = 0x5401, // Castle Town - South Road - Spoke with woman A1 in front of fortune teller's shop +F_0691 = 0x5580, // Castle Town - Spoke with south alley children before guarding carriage +F_0692 = 0x5540, // Castle Town - Spoke with south alley children after guarding carriage +F_0693 = 0x5520, // Lake Hylia - First conversation with Plumm while human +F_0694 = 0x5510, // Castle Town - Conversation with Jovani after collecting 20 ghosts +F_0695 = 0x5508, // Fishing Pond - First time frog lure slips out +F_0696 = 0x5504, // Castle Town - Spoke with inquiring Hyrule guard before saving Jovani +F_0697 = 0x5502, // N/A - Spoke with inquiring Hyrule guard after saving Jovani +F_0698 = 0x5501, // Castle Town - Spoke with woman B1 in front of south vegetable stand (before guarding carriage) +F_0699 = 0x5680, // Castle Town - Spoke with woman B1 in front of south vegetable stand (after guarding carriage) +F_0700 = 0x4a40, // N/A - First day ends +F_0700B = 0x5640, // Castle Town - South Vegetable vendor - Spoke with Villager D2 (before guarding carriage) +F_0701 = 0x4a20, // N/A - Talo discovers monkey in Link's house garden +F_0701B = 0x5620, // N/A - South Vegetable vendor - Spoke with Villager D2 (after guarding carriage) +F_0702 = 0x4a10, // Ordon Village - Confirmed kidnapped Talo +F_0702B = 0x5610, // Castle Town - South Baker - Spoke with Boy A2 +F_0703 = 0x5608, // Fishing Pond - Caught Reek fish for first time while fishing +F_0704 = 0x5604, // Zora's River - Listened to Iza in Twilight before domain is thawed +F_0705 = 0x5602, // Castle Town - First conversation with Kaeru (frog) during Midna's desperate hour +F_0706 = 0x5601, // Castle Town - First conversation wtih Torako (cat) during Midna's desperate hour +F_0707 = 0x5780, // Castle Town - Midna's desperate hour, first conversation with Mii (cat) +F_0708 = 0x5740, // Castle Town - First conversaton with doctor after completing spirit +F_0709 = 0x5720, // Castle Town - Midna's desperate hour, first conversation wtih Stephanie (cat) +F_0715 = 0x5710, // Castle Town - Speak with dog to west +F_0716 = 0x5708, // Castle Town - Speak with dog to the east +F_0717 = 0x5704, // Castle Town - Wist - Speak to the dog owner +F_0718 = 0x5702, // Castle Town - South - Spoke to old lady at the vegetable stand (Chudley) +F_0719 = 0x5701, // Castle Town - South - Spoke to old lady at the vegetable stand (Malo Mart) +F_0720 = 0x5880, // Castle Town - South - Spoke to fruit stand vendor (before guarding carriage) +F_0721 = 0x5840, // Castle Town - South - Spoke to fruit stand vendor (after guarding carriage) +F_0722 = 0x5820, // Castle Town - East - Spoke to man at the T-shaped street +F_0723 = 0x5810, // Castle Town - East - Spoke to man in the alley +F_0724 = 0x5808, // Castle Town - East - Spoke to two ladies gossiping +F_0725 = 0x5804, // Kakariko Village - Speak to Renado who is announcing Shad's visit +F_0726 = 0x5802, // Zora's River - Talk to Iza as wolf +F_0727 = 0x5801, // Castle Town - First conversation with shoe-shine boy +F_0728 = 0x5980, // Castle Town - Refused entry into Chudley's shop because of dirty shoes +F_0729 = 0x5940, // Hyrule Field - Right after postman's "Hey!" +F_0730 = 0x5920, // Zora's River - Rode Iza's boat for the first time +F_0732 = 0x5910, // Hidden Village - Spoke with Cucco (After completing Ilia's memory event) +F_0733 = 0x5908, // Zora's River - Recieved Heart piece reward from Iza for going down the river +F_0734 = 0x5904, // Fishing - Spoke with wild duck +F_0735 = 0x5902, // Fishing - Spoke with domestic duck +F_0736 = 0x5901, // Forest Temple - Heard Midna's hint / monkey hint +F_0737 = 0x5a80, // Castle Town - First conversation with Udo (cat) during Midna's desperate hour +F_0738 = 0x5a40, // Castle Town - South - Spoke with female customer at vegetable stand +F_0739 = 0x5a20, // Castle Town - South - Spoke with old customer at fruit stand +F_0740 = 0x5a10, // Castle Town - Spoke with child Goron (selling lantern oil) (before Hyrule Castle barrier) +F_0741 = 0x5a08, // Castle Town - Spoke with child Goron (selling lantern oil) (after Hyrule Castle barrier) +F_0742 = 0x5a04, // Castle Town - Spoke with child Goron (selling red potion) +F_0743 = 0x5a02, // Castle Town - Spoke with adult Goron (30 arrows) (before Hyrule Castle barrier) +F_0744 = 0x5a01, // Castle Town - Spoke with adult Goron (30 arrows) (after Hyrule Castle barrier) +F_0745 = 0x5b80, // Castle Town - Spoke with adult Goron (Hylia shield) +F_0746 = 0x5b40, // Kakariko Village - Spoke with Cucco A +F_0747 = 0x5b20, // Kakariko Village - Spoke with Cucco B +F_0748 = 0x5b10, // Hyrule Field - First conversation with hint hawk +F_0749 = 0x5b08, // Hidden Village - After clearing cat game (Heart piece is buried, whether it is obtained depends on the player) +F_0750 = 0x5b04, // Hidden Village - First conversation with Captain Cucco after beginning cat game activities +F_0751 = 0x5b02, // Hidden Village - Heard detailed explaination from Captain Cucco for the first time +F_0752 = 0x5b01, // Hidden Village - Beat cat game again +F_0753 = 0x5c80, // Faron Woods - Scooped Coro's bad soup for the first time +F_0754 = 0x5c40, // Forest Temple - Heard Midna's hint / Monkey hint 2 times (SAVE72=ON) +F_0755 = 0x5c20, // Zora's River - Twilight Heard Iza's line right after shadow bug appears +F_0756 = 0x5c10, // City in the Sky - Join with Ooccoo Sr. +F_0757 = 0x5c08, // Faron Woods - Had Trill and wolf conversation +F_0758 = 0x5c04, // Faron Woods - Stole from unmanned shop (For use in Trill wolf conversation. Resets after speaking) +F_0759 = 0x5c02, // Ordon Village - Opening (3rd day) first conversation with Sera +F_0768 = 0x5d40, // Lake Hylia - Heard forced conversation with Midna after Hylia Lake introduction cutscene +F_0769 = 0x5d20, // Zora's River - Forced conversation with Midna right after first arrival at upper Zora's river +F_0770 = 0x5d10, // Zora's Domain - Twilight (frozen) Heard forced conversation after first visit cutscene +F_0771 = 0x5d08, // Faron Woods - Unmanned Shop : last payment stolen +F_0772 = 0x5d04, // Faron Woods - Unmanned Shop : last payment too little +F_0773 = 0x5d02, // Faron Woods - Unmanned Shop : last payment too much +F_0774 = 0x5d01, // Zora's Domain - Listened to Midna's conversation after seeing frozen Zora +F_0775 = 0x5e80, // Lake Hylia - Heard forced conversation with Midna after first Fyer's cannon +F_0776 = 0x5e40, // Palace of Twilight - Link first turned to wolf due to fog in Palace of Twilight +F_0777 = 0x5e20, // Misc. - Spoke to Epona +F_0778 = 0x5e10, // Faron Woods - Heard forced conversation with Midna after story about spirits after clearing Forest Temple +F_0779 = 0x5e08, // Lake Hylia - Heard one hint from Midna while bridge is burning +F_0780 = 0x5e04, // Kakariko Village - Heard Ilia talk about the messenger from the sky after her memories are restored +F_0781 = 0x5e02, // Kakariko Village - Spoke to Ilia in church after clearing Temple of Time +F_0782 = 0x5e01, // Kakariko Village - Spoke to Renado after Lakebed Temple complete, before Temple of Time complete +F_0783 = 0x5f80, // Hidden Village - Showed dominion rod to Impaz +F_0784 = 0x5f40, // Kakariko Village - Had normal conversation with Shad after he returns to church basement +F_0785 = 0x5f20, // Kakariko Village - Shad leaves after attempting to warp sky cannon +F_0786 = 0x5f10, // Kakariko Village - Forced conversation with Shad when he sees the sky cannon +F_0787 = 0x5f08, // Kakariko Village - Stopped by Midna when trying to warp the sky cannon +F_0788 = 0x5f04, // Zora's River - Talked to Zora going up the waterfall +F_0789 = 0x5f02, // Castle Town - Grabbed sweet apple 1 time +F_0790 = 0x5f01, // Ordon Village - Sera faces the cat (outside conversation area when 520 is ON) +F_0791 = 0x6080, // Sky character - Sky character 1 +F_0792 = 0x6040, // Sky character - Sky character 2 +F_0793 = 0x6020, // Sky character - Sky character 3 +F_0794 = 0x6010, // Sky character - Sky character 4 +F_0795 = 0x6008, // Sky character - Sky character 5 +F_0796 = 0x6004, // Sky character - Sky character 6 +F_0797 = 0x6002, // Lake Hylia - Have selected "Take Cannon / Repair" at Fyer's cannon (when there's no other business) +F_0798 = 0x6001, // Lake Hylia - Heard about Zora from Fyer +F_0799 = 0x6180, // Hyrule Field - Listened to the fallen Goron's complaints (after opening bridge) +F_0800 = 0x6140, // Cutscene - After returning to Ordon Woods, until Midna comes out of the shadows (If 800 is ON, Midna can't be called) +F_0801 = 0x6120, // Zora's Domain - First learned Reek Fish scent +F_0802 = 0x6110, // Faron Woods - Trill attacks when stealing +F_0803 = 0x6108, // Hidden Village - Talked to Old Lady Impaz after going to Sky +F_0804 = 0x6104, // Twilight Hyrule Field - Heard Midna's forced conversation immediately after plunge into Eldin Twilight +F_0805 = 0x6102, // Kakariko Village - Bought Hylian shield from Malo Mart +F_0806 = 0x6101, // Ordon Village - Talked to Hanch on the first day +F_0807 = 0x6280, // Ordon Village - Talked to Colin on the first day +F_0808 = 0x6240, // Ordon Village - Talked to Beth on the first day +F_0809 = 0x6220, // Castle Town - 3 groupie girls (first conversation where they become Link's groupies) +F_0810 = 0x6210, // Arbiter's Grounds - Learned ghost's scent +F_0811 = 0x6208, // Castle Town - Attempted Star Game for the first time +F_0812 = 0x6204, // N/A - N/A +F_0813 = 0x6202, // N/A - N/A +F_0814 = 0x6201, // N/A - N/A +F_0815 = 0x6380, // N/A - N/A +F_0816 = 0x6340, // N/A - N/A +F_0817 = 0x6320, // N/A - N/A +F_0818 = 0x6310, // N/A - N/A +F_0819 = 0x6308, // N/A - N/A +F_0820 = 0x6304, // N/A - N/A +F_234 = 0x1c08, // Faron Woods - Attacked by Trill +F_282 = 0x2208, // Snowpeak mountain - First conversation with Yeto at peak after Snowpeak Ruins clear +F_283 = 0x2204, // Hyrule Field - Get wood carving +F_284 = 0x2202, // Lake Hylia - Already have a score recorded for Plumm's game +F_285 = 0x2201, // Lake Hylia - First conversation with Plumm as wolf +F_286 = 0x2380, // Lake Hylia - Cleared Plumm's attraction (get heart piece) +F_287 = 0x2340, // Kakariko Village - Handed wood carving to Ilia +F_288 = 0x2320, // Cutscene - [cutscene: ] Ilia gets her memories back +F_289 = 0x2310, // Castle Town - Heard conversation about entering Star Game 1 +F_290 = 0x2308, // Castle Town - Star Game 1 cleared +J_BTN_GUIDE = 0x5d80, // Misc. - X-button guide +KORO2_ALLCLEAR = 0x6302, // Fishing - After all stages (8-8) of roll goal game cleared +M_001 = 0x1010, // Cutscene - Opening cutscene +M_002 = 0x1580, // Cutscene - [cutscene: 2] Met with Ilia (brings horse to spring) +M_003 = 0x1008, // Ordon Village - F0003: Spoke to Colin while he is stopping hors (has fishing rod) +M_006 = 0x0402, // Ordon Ranch - 3rd day - finished chasing goats, speak to Fado in free state +M_007 = 0x0401, // Kakariko Village - First conversation with Shad in basement (about the words of opening) +M_008 = 0x0580, // Cutscene - Cutscene - attacked by monsters at Ordon spring +M_009 = 0x0540, // Cutscene - [cutscene: 6B] Prison escape - Midna rides on back +M_010 = 0x0520, // Cutscene - [cutscene: 6A] Midna appears in the prison +M_011 = 0x0510, // Inside Hyrule Castle - Midna removes wolf's chains in prison +M_012 = 0x0508, // Cutscene - [cutscene: 7] Meet Princess Zelda at castle +M_013 = 0x0504, // Misc. - First heard about Twilight gate from Midna +M_014 = 0x0502, // Cutscene - [cutscene: 8] First warped from castle by Midna +M_015 = 0x0501, // Faron Woods - Can use Midna's B charge attack +M_016 = 0x0680, // Cutscene - [cutscene: 9] Ordon village spirit appears +M_017 = 0x0640, // Cutscene - [cutscene: 10] Dark Hyrule Forest - Midna again +M_018 = 0x0620, // Main Event - Brought Kakariko bridge back to original location +M_019 = 0x0610, // Cutscene - [cutscene: 11] forest spirit revived - Hero's birth +M_020 = 0x0608, // Cutscene - [cutscene: ] Colin kidnapped : ON once watched +M_021 = 0x0604, // Main Event - First portal warp +M_022 = 0x0602, // Forest Temple - Forest Temple clear (Midna creates warp hole) +M_023 = 0x0601, // Main Event - Epona rescued flag +M_024 = 0x0780, // Cutscene - [cutscene: 16] take back Colin +M_025 = 0x0740, // Death Mountain (room) - First wresting match against fat (elder) goron +M_026 = 0x0720, // Ordon Village - Reunion with Bo (Watched cutscene before wrestle match) +M_027 = 0x0710, // Cutscene - [cutscene: 13] kids in the church (beast eyes) +M_028 = 0x0708, // Cutscene - [cutscene: 14] restore mountain spirit - Reuinion with Colin et al. +M_029 = 0x0704, // Death Mountain (room) - Win wrestle match against Gor Coron +M_030 = 0x0702, // Death Mountain (room) - First conversation with Gor Coron +M_031 = 0x0701, // Goron Mines - Goron Mines clear +M_032 = 0x0880, // Main Event - Melted Zora river ice with magma rock +M_033 = 0x0840, // Main Event - Start carriage guarding game +M_034 = 0x0820, // Cutscene - [cutscene: 19] Reunion with Ilia (After Lakebed Temple?) +M_035 = 0x0810, // Cutscene - [cutscene: 35] after carriage guarding event +M_036 = 0x0808, // Main Event - Begin carriage guarding (after joust revenge) +M_037 = 0x0804, // Kakariko Village - Got Zora armor from Zora queen +M_038 = 0x0802, // Kakariko Village - [Bow and arrow game] listen to hawkeye hint +M_039 = 0x0801, // Kakariko Village - [Bow and arrow game] First time talking to Talo +M_040 = 0x0980, // Kakariko Village - [bow and arrow game] Spoke to Talo after completing +M_041 = 0x0940, // Kakariko Village - [Bow and Arrow game] First attempt +M_042 = 0x0920, // Kakariko Village - [Bow and Arrow game] clear +M_043 = 0x0910, // Kakariko Village - [Bow and Arrow game] Complete using Hawkeye +M_044 = 0x0908, // Kakariko Village - [Barnes Bomb Shop] Bought premium pack +M_045 = 0x0904, // Lakebed Temple - Lakebed Temple clear +M_046 = 0x0902, // Zora's River - [Iza river descent] Get advice about boulder blocking river +M_047 = 0x0901, // Zora's River - Iza Twilight - Talked after defeating shadow bugs +M_048 = 0x0a80, // Zora's River - Ran away while clearing rubble at hut +M_049 = 0x0a40, // Death Mountain - Threw first rolling goron at death mountain +M_050 = 0x0a20, // Main Event - Eldin Bridge disappears +M_051 = 0x0a10, // Main Event - Shadow Kargorok (?) (Large) event complete (Horse grass appears in various places) +M_052 = 0x0a08, // Main Event - Horseback battle clear +M_053 = 0x0a04, // Main Event - Horseback battle cutscene +M_054 = 0x0a02, // Main Event - Joust / one-on-one battle cutscene +M_055 = 0x0a01, // Main Event - Did damage at least once during joust/one-on-one battle +M_056 = 0x0b80, // Hyrule Field - Ignored Iza's concerns +M_057 = 0x0b40, // Desert - View boar cutscene after defeating King Bulblin +M_058 = 0x0b20, // Snowpeak Ruins - First time meeting Yeta (forced converation) +M_059 = 0x0b10, // Snowpeak Ruins - received map from Yeta +M_060 = 0x0b08, // Zora's River - [Iza river descent] // 2nd time running away while clearing rubble in hut +M_061 = 0x0b04, // Zora's River - [Iza river descent] Got explanation for clearing rubble 1 time +M_062 = 0x0b02, // Zora's River - [Iza] Says thanks after night stalker battle +M_063 = 0x0b01, // Zora's River - [Iza river descent] Finish job (First time descending river) +M_064 = 0x0c80, // Zora's Domain - Water returns to Hylia Lake (spoke with Queen Rutela) +M_065 = 0x0c40, // Faron Woods - Spoke with Faron spirit after clearing Forest Temple +M_066 = 0x0c20, // N/A - N/A +M_067 = 0x0c10, // Main Event - Midna riding / not riding (ON == riding) +M_068 = 0x0c08, // Main Event - when OFF, wolf carries sword and shield on back +M_069 = 0x0c04, // Kakariko Village - First conversation with child goron shop clerk +M_070 = 0x0c02, // Cutscene - [cutscene: 18] Lanayru spirit restored +M_071 = 0x0c01, // Cutscene - [cutscene: 20] Zant appears (during Midna's desperate hour) +M_072 = 0x0d80, // Ordon Village - Get wooden shield +M_073 = 0x0d40, // Kakariko Village - Spoke with Renado after guarding carriage [0030] +M_074 = 0x0d20, // Kakariko Village - Spoke with Renado after guarding carriage [0031] +M_075 = 0x0d10, // Snowpeak Ruins - Forced conversation with Yeta after getting bedroom key +M_076 = 0x0d08, // Misc. - First conversation with Castle Town Malo Mart shop clerk +M_077 = 0x0d04, // Main Event - Get shadow crystal (can now transform) +M_078 = 0x0d02, // Ordon Village - Spoke with frog A +M_079 = 0x0d01, // Ordon Village - Ordon village night: Heard Z Jump dialogie in Pergie's house +M_080 = 0x0e80, // Ordon Village - Spoke with brown cucco +M_081 = 0x0e40, // Death Mountain - First conversation with Goron that shoots you up (shared with everyone) +M_082 = 0x0e20, // Death Mountain - Spoke with spring Goron A +M_083 = 0x0e10, // Lake Hylia - Heard Fyer's talk after water restored +M_084 = 0x0e08, // Kakariko Village - Complete sequence of shopping at Malo Mart first time +M_085 = 0x0e04, // Twilight Hyrule Field - Midna dialogue right before Boss Bug's Tear of Light appears +M_086 = 0x0e02, // Twilight Hyrule Field - Show Boss Bug's Tear of Light on the map +M_087 = 0x0e01, // Hyrule Field - Ilia memory event start +M_088 = 0x0f80, // Kakariko Village - Get Renado's Letter +M_089 = 0x0f40, // Castle Town - First time entering doctor's office (forced conversation) +M_090 = 0x0f20, // Castle Town - Spoke to town doctor before showing receipt +M_091 = 0x0f10, // Kakariko Village - Buy out fundraiser amount (Malo becomes nice) +M_092 = 0x0f08, // Hyrule Field - Warped Eldin Bridge +M_093 = 0x0f04, // Lake Hylia - First conversation with Fyer after desert's debut +M_094 = 0x0f02, // Zora's River - First time visiting Rizu's hut after completing river job (forced conversation) +M_095 = 0x0f01, // Faron Woods - First time meeting Coro (obtain lantern) +M_096 = 0x1080, // Ordon Village - 3rd day: spoke with Pergie +M_097 = 0x2304, // Main Event - Can use magic +MAP_VISIBLE = 0x1d01, // 2D Map - Area map show/hide +T_0239 = 0x1d40, // Lake Hylia - Spoke with Fyer (start dark carge) +TEST_001 = 0x0080, // Faron Woods - Kakariko bridge portal warp hint +TEST_002 = 0x0040, // Death Mountain - Big magma stone portal warp hint +TEST_003 = 0x0020, // Snowpeak Ruins - Handed over tomato puree +TEST_004 = 0x0010, // Snowpeak Ruins - Handed over secret ingredient +KAKERA_GET_INFO_05 = 0xebff, // Misc. - Info about getting heart piece +KAKERA_GET_INFO_04 = 0xecff, // Misc. - Info about getting heart piece +KAKERA_GET_INFO_03 = 0xedff, // Misc. - Info about getting heart piece +KAKERA_GET_INFO_02 = 0xeeff, // Misc. - Info about getting heart piece +KAKERA_GET_INFO_01 = 0xefff, // Misc. - Info about getting heart piece +KAKERA_GET_INFO_00 = 0xf0ff, // Misc. - Info about getting heart piece +SP_LURE__USE_COUNT = 0xf11f, // Fishing Pond - Number of fish caught with sinking lure (Max: 31) +CF_RECORD_0 = 0xf27f, // Fishing Pond - Fishing hut fish tank (Ordon Catfish Size) +NP_RECORD_0 = 0xf37f, // Fishing Pond - Fishing hut fish tank (Hylian Pike Size) +RI_RECORD_0 = 0xf47f, // Fishing Pond - Fishing hut fish tank (Hylian Loach Size) +LM_RECORD_0 = 0xf57f, // Fishing Pond - Fishing hut fish tank (Bass Size) +KORO2_LEVEL = 0xf63f, // Fishing Pond (inside) - Roll goal game level memory use +FUND_RAISING_HIGH2 = 0xf7ff, // Shop - Donations top bit +FUND_RAISING_LOW2 = 0xf8ff, // Shop - Donations bottom bit +FUND_RAISING_HIGH = 0xf9ff, // Shop - Fundraising top bit +FUND_RAISING_LOW = 0xfaff, // Shop - Fundraising bottom bit +TOTAL_PAYMENT_LOW = 0xfbff, // Shop - Unmanned shop payment total top bit (typo maybe? should be bottom bit?) +TOTAL_PAYMENT_HIGH = 0xfcff, // Shop - Unmanned shop payment total top bit +TOTAL_PRICE_LOW = 0xfdff, // Shop - Unmanned shop total price bottom bit +TOTAL_PRICE_HIGH = 0xfeff, // Shop - unmanned shop total price top bit +EREG_000 = 0xff1f, // Ranch - Rampaging goats number +UNUSED = 0xffff, // N/A - Unused? This was the only flag not in the debug table \ No newline at end of file diff --git a/src/d/save/d_save_init.cpp b/src/d/save/d_save_init.cpp index 20106ed972..7b0c3029b7 100644 --- a/src/d/save/d_save_init.cpp +++ b/src/d/save/d_save_init.cpp @@ -1,25 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: d/save/d_save_init -// +/** + * d_save_init.cpp + * + */ #include "d/save/d_save_init.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Forward References: -// - -extern "C" void setInitEventBit__Fv(); - -// -// External References: -// - -// -// Declarations: -// /* 80035C88-80035C8C 0305C8 0004+00 0/0 1/1 0/0 .text setInitEventBit__Fv */ void setInitEventBit() { diff --git a/src/d/save/d_save_temp_bit_labels.inc b/src/d/save/d_save_temp_bit_labels.inc new file mode 100644 index 0000000000..021b8218bd --- /dev/null +++ b/src/d/save/d_save_temp_bit_labels.inc @@ -0,0 +1,196 @@ +/** + * d_save_temp_bit_labels.inc + * Flag labels for dSv_event_tmp_flag_c::tempBitLabels + * + * Flag information comes from the debug table in d_event_debug.inc + * + */ + +/* +Name = Value // Location - Description +*/ + +CAT_1 = 0x1180, // Ordon Village - 3rd day: Heard results of goat herding +CAT_2 = 0x1140, // Ordon Village - 3rd day: Spoke with Fado after herding goats +CAT_3 = 0x1120, // Ordon Village - 3rd day: Fado's first conversation +CAT_4 = 0x1110, // Cat game - N/A +CAT_5 = 0x1108, // Faron Woods - Heard Midna's warning in Twilight fog woods +CAT_6 = 0x1104, // Ordon Village - Entered Uli's room before finding children (ON during forced conversation) +CAT_7 = 0x1102, // Cat game - N/A +CAT_8 = 0x1101, // Cat game - N/A +CAT_9 = 0x1280, // Cat game - N/A +CAT_10 = 0x1240, // Cat game - N/A +CAT_11 = 0x1220, // Sacred Grove - Used in Ooccoo Sr. departure event (1) +CAT_12 = 0x1210, // Sacred Grove - Used in Ooccoo Sr. departure event (2) +CAT_13 = 0x1208, // Sacred Grove - Used in Ooccoo Sr. departure event (3) +CAT_14 = 0x1204, // Sacred Grove - Used in Ooccoo Sr. departure event (4) +CAT_15 = 0x1202, // Cat game - N/A +CAT_16 = 0x1201, // Cat game - N/A +CAT_17 = 0x1380, // Ordon Village - Used in conversation with Sera's household on first day (1) +CAT_18 = 0x1340, // Ordon Village - Used in conversation with Sera's household on first day (2) +CAT_19 = 0x1320, // Cat game - N/A +CAT_20 = 0x1310, // Cat game - N/A +DUNGEON_130 = 0x0e10, // Temple of Time - Heard Midna's hint during mini-boss +DUNGEON_131 = 0x0e08, // Unused - Dungeon 131 +DUNGEON_132 = 0x0e04, // Unused - Dungeon 132 +DUNGEON_133 = 0x0e02, // Unused - Dungeon 133 +DUNGEON_134 = 0x0e01, // Unused - Dungeon 134 +DUNGEON_135 = 0x0f80, // Unused - Dungeon 135 +DUNGEON_136 = 0x0f40, // Unused - Dungeon 136 +DUNGEON_137 = 0x0f20, // Unused - Dungeon 137 +DUNGEON_138 = 0x0f10, // Unused - Dungeon 138 +DUNGEON_139 = 0x0f08, // Unused - Dungeon 139 +DUNGEON_140 = 0x0f04, // Unused - Dungeon 140 +DUNGEON_141 = 0x0f02, // Unused - Dungeon 141 +DUNGEON_142 = 0x0f01, // Unused - Dungeon 142 +DUNGEON_143 = 0x1080, // Unused - Dungeon 143 +DUNGEON_144 = 0x1040, // Unused - Dungeon 144 +DUNGEON_145 = 0x1020, // Unused - Dungeon 145 +DUNGEON_146 = 0x1010, // Unused - Dungeon 146 +DUNGEON_147 = 0x1008, // Unused - Dungeon 147 +DUNGEON_148 = 0x1004, // Unused - Dungeon 148 +DUNGEON_149 = 0x1002, // Unused - Dungeon 149 +DUNGEON_150 = 0x1001, // Unused - Dungeon 150 +GUARD_URI = 0x1308, // Ordon Village - Rusl is guarding Uli, Ordon village night +Hanch_CLIMBOUT_POND = 0x1304, // Ordon Village - Hanch gets out of lake after jumping in +MN09_02 = 0x0c02, // Hyrule Castle - Rusl waves at Link Flag +MN09_03 = 0x0c01, // Hyrule Castle - Auru's cannon hits Flag +NO_TELOP = 0x1301, // General use - When on (while changing scenes) stage name is not shown +NODRAW_STAGE_NAME = 0x1302, // General use - N/A +PACHITUTORIAL_CNT = 0xf4ff, // Ordon Village - Slingshot tutorial, number of destroyed targets +PACHITUTORIAL_INF = 0xf3ff, // Ordon Village - Slingshot tutorial, hit information +SHA_DBG = 0xf2ff, // Castle Town - Fortune teller debug +SHA_LOVEFORTUNE_00 = 0xfaff, // Castle Town - For memory use after love fortune scene change +SHA_LOVEFORTUNE_01 = 0xf9ff, // Castle Town - For memory use after love fortune scene change +SHA_LOVEFORTUNE_02 = 0xf8ff, // Castle Town - For memory use after love fortune scene change +SHA_LOVEFORTUNE_03 = 0xf7ff, // Castle Town - For memory use after love fortune scene change +SHA_LOVEFORTUNE_04 = 0xf6ff, // Castle Town - For memory use after love fortune scene change +SHA_LOVEFORTUNE_05 = 0xf5ff, // Castle Town - For memory use after love fortune scene change +T_0001 = 0x0080, // Kakariko Village (inside) - Make successive purchase at Barnes bomb shop +T_0002 = 0xff0f, // Ordon Village - Sword tutorial - step +T_0003 = 0xfeff, // Ordon Village - Sword tutorial - slice count +T_0004 = 0x0040, // Ordon Village - sword tutorial - outcome +T_0005 = 0xfdff, // Temp cutscene - Actual cutscene number delivery +T_0006 = 0xfcff, // Temp cutscene - Return layer number +T_0007 = 0x0020, // Ordon Village - During Uli's pick-up tutorial +T_0008 = 0x0010, // Kakariko Village - Bow and arrow game: shoot target using Hawkeye +T_0009 = 0x0008, // Ordon Village - Walked a bit during Uli's pick-up tutorial +T_0010 = 0x0004, // General use - General use temporary flag (flow control) A +T_0011 = 0x0002, // General use - General use temporary flag (flow control) B +T_0012 = 0x0001, // General use - General use temporary flag (flow control) C +T_0013 = 0x0180, // General use - General use temporary flag (flow control) D +T_0014 = 0x0140, // General use - General use temporary flag (flow control) E +T_0015 = 0x0120, // Ordon Village - Link came up the hill afte being called by Jaggle +T_0016 = 0x0110, // Ordon Village - Scold Beth, Talo during sword tutorial +T_0017 = 0x0108, // Ordon Village - Goat herding - first one entered the hut +T_0018 = 0x0104, // Ordon Village - Goat herding - time is almost up +T_0019 = 0x0102, // Ordon Village - Goat herding - time's up +T_0020 = 0x0101, // Ordon Village - Goat herding - ON from `time's up` until `restart` +T_0021 = 0x0280, // Ordon Village - Colin follows to Link's house +T_0022 = 0x0240, // Ordon Village - Uli - carrying baby basket +T_0023 = 0x0220, // Ordon Village - Called Talo, Colin right after sword game +T_0024 = 0x0210, // Ordon Village - To sword tutorial +T_0025 = 0x0208, // Ordon Village - Get on table (Pergie gets mad) +T_0026 = 0x0204, // Ordon Village - Destroy pumpkin near Jaggle (Jaggle gets angry) +T_0027 = 0x0202, // Ordon Village - Rampaging goats complete +T_0028 = 0x0201, // Ordon Village - Right after rampaging goats +T_0029 = 0x0380, // Ordon Village - Succeed at taking Rusl's sword +T_0030 = 0x0340, // Ordon Village - Rusl, Press button to "take" +T_0031 = 0x0320, // Ordon Village - Borrow Rusl's sword +T_0032 = 0x0310, // Ordon Village - Return Rusl's sword +T_0033 = 0x0308, // Ordon Village - Press A and ↑ during rampaging goat game +T_0034 = 0x0304, // Ordon Village - Rusl sword failure count 1 +T_0035 = 0x0302, // Ordon Village - Rusl sword failure count 2 +T_0036 = 0x0301, // Ordon Village - Rusl sword failure count 3 +T_0041 = 0x0420, // Faron Woods - Only ON when Coro is sleeping +T_0042 = 0x0410, // Unused - Spoke to Coro at night without lantern +T_0043 = 0x0408, // Unused - N/A +T_0044 = 0x0404, // Ordon Village - For sword tutorial end cutscene +T_0045 = 0x0402, // Death Mountain - Twilight - Talked with Goron C +T_0046 = 0x0401, // Ordon Village - Wrestling with Bo - Link wins +T_0047 = 0x0580, // Ordon Village - Right after wrestling with Bo (Used to connect with conversation after wearing clothes) +T_0048 = 0x0540, // Ordon Village - Wrestling with Bo - Link loses +T_0049 = 0x0520, // Sacred Grove - During giant game +T_0050 = 0x0510, // Death Mountain - Heard spring goron D and shopkeeper goron's conversation (before match) +T_0051 = 0x0508, // General use - General use temporary flag (flow control) F +T_0052 = 0x0504, // General use - General use temporary flag (flow control) G +T_0053 = 0x0502, // General use - General use temporary flag (flow control) H +T_0054 = 0x0501, // General use - General use temporary flag (flow control) I +T_0055 = 0x0680, // General use - General use temporary flag (flow control) J +T_0056 = 0x0640, // Faron Woods - Stopped by Midna when trying to enter the world of light +T_0057 = 0x0620, // Kakariko Village (inside) - Barnes bomb shop +T_0059 = 0x0608, // Kakariko Village (inside) - Luda and Beth both taking Colin's food +T_0060 = 0x0604, // Kakariko Village - During bow and arrow game +T_0061 = 0x0602, // N/A - Joust revenge complete (restart carriage guarding mission) +T_0062 = 0x0601, // N/A - Cutscene right before carriage guarding mission (reunion with Ilia) +T_0063 = 0x0780, // Kakariko Village - [Bow and arrow game] Missed the final target! +T_0064 = 0x0740, // Kakariko Village - [Bow and arrow game] Attempting to hit target... +T_0065 = 0x0720, // Kakariko Village - [Bow and arrow game] Destroy first one with Clawshot +T_0066 = 0x0710, // Kakariko Village - [Bow and arrow game] Restart from the middle +T_0067 = 0x0708, // Zora's River - [Iza's river descent] Get in boat +T_0068 = 0x0704, // Lake Hylia - [Water bomb shop] choose to buy 10 +T_0069 = 0x0702, // Lake Hylia - [Water bomb shop] choose to buy 15 +T_0070 = 0x0701, // Zora's River - [Iza's river descent] Helping to destroy rubble in boat hut +T_0071 = 0x0880, // Ordon Village - Night, fail to take Rusl's sword (too close OR get hit) +T_0072 = 0x0840, // Lake Hylia - Knocked down all the cucco in Falbi's hut +T_0073 = 0x0820, // Sacred Grove - For use in master sword obtaining event +T_0074 = 0x0810, // Lake Hylia - (After conversation) Resets when Plumm goes off-screen +T_0075 = 0x0808, // Lake Hylia - Got more points than the set amount during Plumm's attraction +T_0076 = 0x0804, // Castle Town - Listened to bodyguard goron's complaints +T_0077 = 0x0802, // Unused - N/A +T_0078 = 0x0801, // Castle Town - Star Game: Collected all the spheres +T_0079 = 0x0980, // Castle Town - Star Game: New personal best +T_0080 = 0x0940, // Kakariko Village - Put money in fundraiser box +T_0081 = 0x0920, // Kakariko Village - For use in fundraiser event completion cutscene +T_0082 = 0x0910, // Castle Town - Threw water on spring goron +T_0083 = 0x0908, // LV5 Dungeon - Speak with Yeta at top of mountain as wolf after clearing Snowpeak Ruins +T_0084 = 0x0904, // Snowpeak mountain - Racing with Yeto +T_0085 = 0x0902, // Snowpeak mountain - Racing with Yeta +T_0086 = 0x0901, // Snowpeak mountain - Won race against Yeto/Yeta +T_0087 = 0x0a80, // Castle Town - Used by child A,B (both) inside Malo Mart +T_0088 = 0x0a40, // N/A - ON only with mini-boss is down (resets when they get up) +T_0089 = 0x0a20, // Ordon Village - Epona is in the middle of ordon village (used by Bo first day) +T_0090 = 0x0a10, // Ordon Ranch - Epona is at the range (used in goat herding game) +T_0091 = 0x0a08, // Ordon Ranch - Goat herding in second half (for day 1 check) +T_0092 = 0x0a04, // Hero's spirit - Gold wolf identification 2 +T_0093 = 0x0a02, // Hero's spirit - Gold wolf identification 3 +T_0094 = 0x0a01, // Hero's spirit - Gold wolf identification 4 +T_0095 = 0x0b80, // Hero's spirit - Gold wolf identification 5 +T_0096 = 0x0b40, // Hero's spirit - Gold wolf identification 6 +T_0097 = 0x0b20, // Hero's spirit - Gold wolf identification 7 +T_0098 = 0x0b10, // Unused - N/A +T_0099 = 0x0b08, // Unused - N/A +T_0100 = 0x0b04, // Ordon Village - cutscene at start of 2nd day, start focus on kids Flags +T_0107 = 0x0b02, // Castle Town - (Event control) Jpn04-1063:Louise Use (1) +T_0108 = 0x0b01, // Castle Town - (Event control) Jpn04-1063:Louise Use (2) +T_0109 = 0x0c80, // Castle Town - (Event control) Jpn04-1063:Louise Use (3) +T_0110 = 0x0c40, // Castle Town - (Event control) Jpn04-1063:Louise Use (4) +T_0111 = 0x0c20, // Castle Town - (Event control) Jpn04-1063:Louise Use (5) +T_0112 = 0x0c10, // Castle Town - (Event control) Jpn04-1063:Louise Use (6) +T_0113 = 0x0c08, // Castle Town - (Event control) Jpn04-1063:Louise Use (7) +T_0119 = 0x0d80, // Fishing Pond - After cheating in Roll goal game +T_0120 = 0x0d40, // Fishing Pond - Fished something with Hena's guidance +T_0121 = 0x0d20, // Program use - Fairy use 1 +T_0122 = 0x0d10, // Program use - Fairy use 2 +T_0123 = 0x0d08, // Program use - Fairy use 3 +T_0124 = 0x0d04, // Program use - Fairy use 4 +T_0125 = 0x0e20, // Unused - N/A +T_0175 = 0x1480, // Ordon Ranch - 1st day: Start Fado's goat herding +T_0176 = 0x1440, // Ordon Ranch - 1st day: Finish Fado's goat herding +T_0177 = 0x1420, // Ordon Ranch - 1st day: Asked to jump gate by Fado +T_0178 = 0x1410, // Ordon Ranch - 1st day: Spoke with Fado while jumping over gate +T_0179 = 0x1408, // Ordon Ranch - 3rd day - Goat herding START +T_0180 = 0x1404, // Ordon Ranch - 3rd day - Goat herding END +T_0181 = 0x1402, // Ordon Ranch - Started Goat herding Ⅱ +T_0182 = 0x1401, // Ordon Ranch - Finished Goat herding Ⅱ +T_0183 = 0x1580, // Unused - N/A +T_058 = 0x0610, // Kakariko Village (inside) - Conversation with Renado while he is watching over Colin +TEMP_0038 = 0x0480, // Ordon Village - Temporary flag for Hanch the Hawker cutscene +TEMP_0040 = 0x0440, // Unused - N/A +TREG_000 = 0xfbff, // Ordon Village - Used in conversation with Pergie +WXXTO = 0x0c04, // Hyrule Castle - Resistance leaves Flag +YKM_ATTN = 0x0d02, // Snowpeak Mountain - Player focus while Yeto waits for snowboard race +YKM_TALK = 0x0d01, // Snowpeak Mountain - Yeto talks to Yeta +YKW_ATTN = 0x0e40, // Snowpeak Mountain - Player focus while Yeta waits for snowboard race +YKW_TALK = 0x0e80, // Snowpeak Mountain - Yeta talks to Yeto +UNUSED = 0xffff, // Unused - Unused? This was the only flag not in the debug table \ No newline at end of file diff --git a/src/f_op/f_op_scene.cpp b/src/f_op/f_op_scene.cpp index ce0696895e..30a678f9a2 100644 --- a/src/f_op/f_op_scene.cpp +++ b/src/f_op/f_op_scene.cpp @@ -54,7 +54,9 @@ static s32 fopScn_Create(void* i_this) { /* ############################################################################################## */ /* 803A38B0-803A38C8 -00001 0014+04 0/0 9/0 0/0 .data g_fopScn_Method */ leafdraw_method_class g_fopScn_Method = { - (process_method_func)fopScn_Create, (process_method_func)fopScn_Delete, - (process_method_func)fopScn_Execute, (process_method_func)fopScn_IsDelete, - (process_method_func)fopScn_Draw, + (process_method_func)fopScn_Create, + (process_method_func)fopScn_Delete, + (process_method_func)fopScn_Execute, + (process_method_func)fopScn_IsDelete, + (process_method_func)fopScn_Draw }; diff --git a/src/f_op/f_op_scene_iter.cpp b/src/f_op/f_op_scene_iter.cpp index 3eec443632..b78dcd2fb5 100644 --- a/src/f_op/f_op_scene_iter.cpp +++ b/src/f_op/f_op_scene_iter.cpp @@ -1,6 +1,6 @@ /** * f_op_scene_iter.cpp - * Scene Process Iterator + * Framework - Scene Process Iteration */ #include "f_op/f_op_scene_iter.h" diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp index d70a06466a..8a7e1cc2a5 100644 --- a/src/f_op/f_op_scene_mng.cpp +++ b/src/f_op/f_op_scene_mng.cpp @@ -1,6 +1,6 @@ /** * f_op_scene_mng.cpp - * Scene Process Manager + * Framework - Scene Process Manager */ #include "f_op/f_op_scene_mng.h" diff --git a/src/f_pc/f_pc_base.cpp b/src/f_pc/f_pc_base.cpp index 155d6b2be1..d0897bc53e 100644 --- a/src/f_pc/f_pc_base.cpp +++ b/src/f_pc/f_pc_base.cpp @@ -1,23 +1,18 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_base -// +/** + * f_pc_base.cpp + * Framework - Process Base + */ #include "f_pc/f_pc_base.h" #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SComponent/c_phase.h" #include "SSystem/SStandard/s_basic.h" -#include "dol2asm.h" #include "f_pc/f_pc_pause.h" #include "global.h" -// -// Declarations: -// - /* 8002064C-8002065C 0010+00 s=0 e=14 z=0 None .text fpcBs_Is_JustOfType__Fii */ -BOOL fpcBs_Is_JustOfType(int pType1, int pType2) { - return checkEqual(pType1, pType2); +s32 fpcBs_Is_JustOfType(int pType1, int pType2) { + return checkEqual(pType1, pType2); // return pType2 == pType1 matches when return type is bool } /* ############################################################################################## */ diff --git a/src/f_pc/f_pc_create_iter.cpp b/src/f_pc/f_pc_create_iter.cpp index 5daf12a44d..c16f89da5d 100644 --- a/src/f_pc/f_pc_create_iter.cpp +++ b/src/f_pc/f_pc_create_iter.cpp @@ -1,17 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_create_iter -// +/** + * f_pc_create_iter.cpp + * Framework - Process Create Iteration + */ #include "f_pc/f_pc_create_iter.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_create_req.h" -// -// Declarations: -// - /* 800209C8-80020A04 003C+00 s=0 e=1 z=0 None .text fpcCtIt_Method__FPFPvPv_iPv */ s32 fpcCtIt_Method(fpcCtIt_MethodFunc pJudge, void* pUserData) { node_method_data iter; diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp index ae686f2518..a9fd48cc32 100644 --- a/src/f_pc/f_pc_create_req.cpp +++ b/src/f_pc/f_pc_create_req.cpp @@ -1,21 +1,15 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_create_req -// +/** + * f_pc_create_req.cpp + * Framework - Process Create Request + */ #include "f_pc/f_pc_create_req.h" #include "SSystem/SComponent/c_malloc.h" -#include "dol2asm.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_create_tag.h" #include "f_pc/f_pc_deletor.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_layer_iter.h" -#include "global.h" - -// -// Declarations: -// /* 80020ACC-80020AE8 001C+00 s=1 e=0 z=0 None .text fpcCtRq_isCreatingByID__FP10create_tagPUi */ diff --git a/src/f_pc/f_pc_create_tag.cpp b/src/f_pc/f_pc_create_tag.cpp index 08e513b116..bf94fa969c 100644 --- a/src/f_pc/f_pc_create_tag.cpp +++ b/src/f_pc/f_pc_create_tag.cpp @@ -1,15 +1,10 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_create_tag -// +/** + * f_pc_create_tag.cpp + * Framework - Process Create Tag + */ #include "f_pc/f_pc_create_tag.h" -#include "dol2asm.h" -#include "dolphin/types.h" -// -// Declarations: -// /* ############################################################################################## */ /* 803A3990-803A39A0 000C+04 s=1 e=2 z=0 None .data g_fpcCtTg_Queue */ diff --git a/src/f_pc/f_pc_creator.cpp b/src/f_pc/f_pc_creator.cpp index 1f500669c7..325cbba5bf 100644 --- a/src/f_pc/f_pc_creator.cpp +++ b/src/f_pc/f_pc_creator.cpp @@ -1,11 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_creator -// +/** + * f_pc_creator.cpp + * Framework - Process Creator + */ #include "f_pc/f_pc_creator.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_req.h" diff --git a/src/f_pc/f_pc_delete_tag.cpp b/src/f_pc/f_pc_delete_tag.cpp index 1f3193b29a..3f3911373d 100644 --- a/src/f_pc/f_pc_delete_tag.cpp +++ b/src/f_pc/f_pc_delete_tag.cpp @@ -1,15 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_delete_tag -// +/** + * f_pc_delete_tag.cpp + * Framework - Process Delete Tag + */ #include "f_pc/f_pc_delete_tag.h" -#include "dol2asm.h" #include "global.h" -// -// Declarations: -// /* ############################################################################################## */ /* 803A39A0-803A39B0 000C+04 s=2 e=1 z=0 None .data g_fpcDtTg_Queue */ diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp index a0a77f0946..ab63505a5f 100644 --- a/src/f_pc/f_pc_deletor.cpp +++ b/src/f_pc/f_pc_deletor.cpp @@ -1,22 +1,16 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_deletor -// +/** + * f_pc_deletor.cpp + * Framework - Process Deletor + */ #include "f_pc/f_pc_deletor.h" #include "SSystem/SComponent/c_list_iter.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_creator.h" #include "f_pc/f_pc_executor.h" #include "f_pc/f_pc_layer_iter.h" #include "f_pc/f_pc_load.h" #include "f_pc/f_pc_node.h" -// -// Declarations: -// - /* 80021040-80021060 0020+00 s=0 e=1 z=0 None .text fpcDt_IsComplete__Fv */ BOOL fpcDt_IsComplete() { return fpcDtTg_IsEmpty(); diff --git a/src/f_pc/f_pc_draw.cpp b/src/f_pc/f_pc_draw.cpp index 4ce1ebbebb..d00104e032 100644 --- a/src/f_pc/f_pc_draw.cpp +++ b/src/f_pc/f_pc_draw.cpp @@ -1,19 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_draw -// +/** + * f_pc_draw.cpp + * Framework - Process Draw + */ #include "f_pc/f_pc_draw.h" #include "SSystem/SComponent/c_API_graphic.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_leaf.h" #include "f_pc/f_pc_pause.h" -// -// Declarations: -// - /* 80023954-800239F4 00A0+00 s=0 e=1 z=0 None .text fpcDw_Execute__FP18base_process_class */ s32 fpcDw_Execute(base_process_class* pProc) { if (!fpcPause_IsEnable(pProc, 2)) { diff --git a/src/f_pc/f_pc_draw_priority.cpp b/src/f_pc/f_pc_draw_priority.cpp index b87011f5a5..8486a3d9f5 100644 --- a/src/f_pc/f_pc_draw_priority.cpp +++ b/src/f_pc/f_pc_draw_priority.cpp @@ -1,15 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_draw_priority -// +/** + * f_pc_draw_priority.cpp + * Framework - Process Draw Priority + */ #include "f_pc/f_pc_draw_priority.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80021308-80021310 0008+00 s=0 e=1 z=0 None .text fpcDwPi_Get__FPC19draw_priority_class */ s16 fpcDwPi_Get(const draw_priority_class* pDwPi) { diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp index 78b128d250..2a2c1bdd4c 100644 --- a/src/f_pc/f_pc_executor.cpp +++ b/src/f_pc/f_pc_executor.cpp @@ -1,19 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_executor -// +/** + * f_pc_executor.cpp + * Framework - Process Executor + */ #include "f_pc/f_pc_executor.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_node.h" #include "f_pc/f_pc_pause.h" #include "f_pc/f_pc_searcher.h" -// -// Declarations: -// - /* 80021338-80021358 0020+00 s=1 e=9 z=291 None .text fpcEx_Search__FPFPvPv_PvPv */ base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc pFunc, void* pUserData) { return (base_process_class*)fpcLyIt_AllJudge(pFunc, pUserData); diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp index 9c243d82de..8faa23bc45 100644 --- a/src/f_pc/f_pc_fstcreate_req.cpp +++ b/src/f_pc/f_pc_fstcreate_req.cpp @@ -1,17 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_fstcreate_req -// +/** + * f_pc_fstcreate_req.cpp + * Framework - Process Fast Create Request + */ #include "f_pc/f_pc_fstcreate_req.h" #include "dol2asm.h" #include "dolphin/types.h" #include "f_pc/f_pc_load.h" -// -// Declarations: -// - /* 80023A48-80023A98 0050+00 s=1 e=3 z=52 None .text fpcFCtRq_Do__FP19fast_create_request */ s32 fpcFCtRq_Do(fast_create_request* pFstCreateReq) { if (pFstCreateReq->mpFastCreateFunc != NULL && diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp index 2e06220f15..4f1920f8dd 100644 --- a/src/f_pc/f_pc_layer.cpp +++ b/src/f_pc/f_pc_layer.cpp @@ -1,19 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_layer -// +/** + * f_pc_layer.cpp + * Framework - Process Layer + */ #include "f_pc/f_pc_layer.h" -#include "dol2asm.h" #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_method.h" #include "f_pc/f_pc_method_iter.h" #include "f_pc/f_pc_method_tag.h" -#include "global.h" - -// -// Declarations: -// /* 80021588-800215A8 0020+00 s=0 e=4 z=0 None .text fpcLy_CancelQTo__FP24process_method_tag_class */ diff --git a/src/f_pc/f_pc_layer_iter.cpp b/src/f_pc/f_pc_layer_iter.cpp index ad6208942f..44f47edaa9 100644 --- a/src/f_pc/f_pc_layer_iter.cpp +++ b/src/f_pc/f_pc_layer_iter.cpp @@ -1,18 +1,12 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_layer_iter -// +/** + * f_pc_layer_iter.cpp + * Framework - Process Layer Iterator + */ #include "f_pc/f_pc_layer_iter.h" #include "SSystem/SComponent/c_node_iter.h" #include "SSystem/SComponent/c_tag_iter.h" #include "SSystem/SComponent/c_tree_iter.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80021B88-80021BC0 0038+00 s=1 e=4 z=0 None .text fpcLyIt_OnlyHere__FP11layer_classPFPvPv_iPv */ diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp index 371dd48a09..bf094a563a 100644 --- a/src/f_pc/f_pc_layer_tag.cpp +++ b/src/f_pc/f_pc_layer_tag.cpp @@ -1,15 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_layer_tag -// +/** + * f_pc_layer_tag.cpp + * Framework - Process Layer Tag + */ #include "f_pc/f_pc_layer_tag.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80021CD4-80021DCC 00F8+00 s=1 e=1 z=0 None .text * fpcLyTg_ToQueue__FP26layer_management_tag_classUiUsUs */ diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index 6da1588191..37ba0bb318 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -1,15 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_leaf -// +/** + * f_pc_leaf.cpp + * Framework - Process Leaf + */ #include "f_pc/f_pc_leaf.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80021A00-80021A24 0024+00 s=0 e=4 z=2 None .text fpcLf_GetPriority__FPC14leafdraw_class */ s16 fpcLf_GetPriority(const leafdraw_class* pLeaf) { diff --git a/src/f_pc/f_pc_line.cpp b/src/f_pc/f_pc_line.cpp index 29cf9891b3..b5e0397b33 100644 --- a/src/f_pc/f_pc_line.cpp +++ b/src/f_pc/f_pc_line.cpp @@ -1,17 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_line -// +/** + * f_pc_line.cpp + * Framework - Process Line + */ #include "f_pc/f_pc_line.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_node.h" -// -// Declarations: -// - #define ARRAY_SIZE(o) (sizeof((o)) / sizeof(*(o))) /* ############################################################################################## */ diff --git a/src/f_pc/f_pc_line_iter.cpp b/src/f_pc/f_pc_line_iter.cpp index 739471a4a7..ce6f02b5ff 100644 --- a/src/f_pc/f_pc_line_iter.cpp +++ b/src/f_pc/f_pc_line_iter.cpp @@ -1,21 +1,16 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_line_iter -// +/** + * f_pc_line_iter.cpp + * Framework - Process Line Iterator + */ #include "f_pc/f_pc_line_iter.h" #include "SSystem/SComponent/c_tag_iter.h" #include "SSystem/SComponent/c_tree_iter.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_tag.h" #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_line.h" -// -// Declarations: -// /* 800236C0-80023728 0068+00 s=1 e=0 z=0 None .text * fpcLnIt_MethodCall__FP16create_tag_classP13method_filter */ diff --git a/src/f_pc/f_pc_line_tag.cpp b/src/f_pc/f_pc_line_tag.cpp index 219d194c6d..29ac73c080 100644 --- a/src/f_pc/f_pc_line_tag.cpp +++ b/src/f_pc/f_pc_line_tag.cpp @@ -1,16 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_line_tag -// +/** + * f_pc_line_tag.cpp + * Framework - Process Line Tag + */ #include "f_pc/f_pc_line_tag.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_line.h" -// -// Declarations: -// /* 800235A8-80023600 0058+00 s=0 e=1 z=0 None .text fpcLnTg_Move__FP8line_tagi */ s32 fpcLnTg_Move(line_tag* pLineTag, int newLineListID) { diff --git a/src/f_pc/f_pc_load.cpp b/src/f_pc/f_pc_load.cpp index ae8cbf425d..b309c4849b 100644 --- a/src/f_pc/f_pc_load.cpp +++ b/src/f_pc/f_pc_load.cpp @@ -1,7 +1,7 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_load -// +/** + * f_pc_load.cpp + * Framework - Process Loader + */ #include "f_pc/f_pc_load.h" #include "SSystem/SComponent/c_phase.h" @@ -12,10 +12,6 @@ extern s32 cDyl_IsLinked(s16 procName); extern s32 cDyl_Unlink(s16 procName); extern s32 cDyl_LinkASync(s16 procName); -// -// Declarations: -// - /* 80021FB8-80022008 0050+00 s=0 e=1 z=0 None .text fpcLd_Use__Fs */ BOOL fpcLd_Use(s16 procName) { if (fpcLd_IsLoaded(procName) == TRUE && fpcLd_Load(procName) == cPhs_COMPLEATE_e) diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 56f9350bf3..791ea1a2c2 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -1,11 +1,10 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_manager -// +/** + * f_pc_manager.cpp + * Framework - Process Manager + */ +#include "d/d_error_msg.h" #include "f_pc/f_pc_manager.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_iter.h" #include "f_pc/f_pc_creator.h" @@ -25,81 +24,7 @@ #include "f_pc/f_pc_pause.h" #include "f_pc/f_pc_priority.h" #include "f_pc/f_pc_profile.h" - #include "SSystem/SComponent/c_API_graphic.h" -#include "d/com/d_com_inf_game.h" -#include "m_Do/m_Do_audio.h" - -// -// Types: -// - -struct dShutdownErrorMsg_c { - /* 8009D790 */ static bool execute(); -}; - -struct dDvdErrorMsg_c { - /* 8009D354 */ static u8 execute(); -}; - -// -// Forward References: -// - -extern "C" void fpcM_Draw__FPv(); -extern "C" static void fpcM_DrawIterater__FPFPvPv_i(); -extern "C" void fpcM_Execute__FPv(); -extern "C" void fpcM_Delete__FPv(); -extern "C" void fpcM_IsCreating__FUi(); -extern "C" void fpcM_Management__FPFv_vPFv_v(); -extern "C" void fpcM_Init__Fv(); -extern "C" void fpcM_FastCreate__FsPFPv_iPvPv(); -extern "C" void fpcM_IsPause__FPvUc(); -extern "C" void fpcM_PauseEnable__FPvUc(); -extern "C" void fpcM_PauseDisable__FPvUc(); -extern "C" void fpcM_JudgeInLayer__FUiPFPvPv_PvPv(); - -// -// External References: -// - -extern "C" void fpcCtIt_JudgeInLayer__FUiPFPvPv_PvPv(); -extern "C" void fpcCt_IsCreatingByID__FUi(); -extern "C" void fpcCt_Handler__Fv(); -extern "C" void fpcDt_Handler__Fv(); -extern "C" void fpcDt_Delete__FPv(); -extern "C" void fpcEx_Execute__FP18base_process_class(); -extern "C" void fpcEx_Handler__FPFPvPv_i(); -extern "C" void fpcLy_RootLayer__Fv(); -extern "C" void fpcLy_CurrentLayer__Fv(); -extern "C" void fpcLy_Layer__FUi(); -extern "C" void fpcLy_Create__FP11layer_classPvP15node_list_classi(); -extern "C" void fpcLyIt_OnlyHere__FP11layer_classPFPvPv_iPv(); -extern "C" void fpcLyIt_Judge__FP11layer_classPFPvPv_PvPv(); -extern "C" void fpcLn_Create__Fv(); -extern "C" void fpcPi_Handler__Fv(); -extern "C" void fpcPause_IsEnable__FPvUc(); -extern "C" void fpcPause_Enable__FPvUc(); -extern "C" void fpcPause_Disable__FPvUc(); -extern "C" void fpcDw_Execute__FP18base_process_class(); -extern "C" void fpcDw_Handler__FPFPFPvPv_i_iPFPvPv_i(); -extern "C" void fpcFCtRq_Request__FP11layer_classsPFPvPv_iPvPv(); -extern "C" void drawSimpleModel__14dComIfG_play_cFv(); -extern "C" void stopTime__11dLib_time_cFv(); -extern "C" void startTime__11dLib_time_cFv(); -extern "C" void peekData__13dDlst_peekZ_cFv(); -extern "C" void execute__14dDvdErrorMsg_cFv(); -extern "C" void execute__19dShutdownErrorMsg_cFv(); -extern "C" void cAPIGph_Painter__Fv(); -extern "C" void MtxInit__Fv(); -extern "C" void pauseAllGameSound__10Z2SoundMgrFb(); -extern "C" void stopPatternedRumble__Q210JUTGamePad7CRumbleFs(); -extern "C" void _savegpr_28(); -extern "C" void _restgpr_28(); -extern "C" extern u8 m_gamePad__8mDoCPd_c[16]; -// -// Declarations: -// /* 800220A0-800220C0 0020+00 s=1 e=1 z=0 None .text fpcM_Draw__FPv */ void fpcM_Draw(void* pProc) { diff --git a/src/f_pc/f_pc_method.cpp b/src/f_pc/f_pc_method.cpp index a4af37cd0a..bb4fc1aa0d 100644 --- a/src/f_pc/f_pc_method.cpp +++ b/src/f_pc/f_pc_method.cpp @@ -1,15 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_method -// +/** + * f_pc_method.cpp + * Framework - Process Method + */ #include "f_pc/f_pc_method.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80022428-80022460 0038+00 s=4 e=6 z=0 None .text fpcMtd_Method__FPFPv_iPv */ s32 fpcMtd_Method(process_method_func pFunc, void* pUserData) { diff --git a/src/f_pc/f_pc_method_iter.cpp b/src/f_pc/f_pc_method_iter.cpp index ddc72e3852..529eb7899a 100644 --- a/src/f_pc/f_pc_method_iter.cpp +++ b/src/f_pc/f_pc_method_iter.cpp @@ -1,15 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_method_iter -// +/** + * f_pc_method_iter.cpp + * Framework - Process Method Iteration + */ #include "f_pc/f_pc_method_iter.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80023764-80023788 0024+00 s=0 e=1 z=0 None .text fpcMtdIt_Method__FP15node_list_classPFPv_i */ diff --git a/src/f_pc/f_pc_method_tag.cpp b/src/f_pc/f_pc_method_tag.cpp index db16d95652..f01c94309b 100644 --- a/src/f_pc/f_pc_method_tag.cpp +++ b/src/f_pc/f_pc_method_tag.cpp @@ -1,15 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_method_tag -// +/** + * f_pc_method_tag.cpp + * Framework - Process Method Tag + */ #include "f_pc/f_pc_method_tag.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80023788-800237B8 0030+00 s=0 e=1 z=0 None .text fpcMtdTg_Do__FP24process_method_tag_class */ diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index ffcfe0e489..24a78adcba 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -1,17 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_node -// +/** + * f_pc_node.cpp + * Framework - Process Node + */ #include "f_pc/f_pc_node.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_layer_iter.h" -// -// Declarations: -// - /* 800224F0-80022514 0024+00 s=1 e=1 z=0 None .text fpcNd_DrawMethod__FP21nodedraw_method_classPv */ s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData) { @@ -118,7 +112,9 @@ s32 fpcNd_Create(process_node_class* pProcNode1) { /* ############################################################################################## */ /* 803A3A20-803A3A38 0014+04 s=0 e=9 z=0 None .data g_fpcNd_Method */ nodedraw_method_class g_fpcNd_Method = { - (process_method_func)fpcNd_Create, (process_method_func)fpcNd_Delete, - (process_method_func)fpcNd_Execute, (process_method_func)fpcNd_IsDelete, - (process_method_func)fpcNd_Draw, + (process_method_func)fpcNd_Create, + (process_method_func)fpcNd_Delete, + (process_method_func)fpcNd_Execute, + (process_method_func)fpcNd_IsDelete, + (process_method_func)fpcNd_Draw }; diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 7c239ee9eb..b6d38e05b0 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -1,13 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_node_req -// +/** + * f_pc_node_req.cpp + * Framework - Process Node Request + */ #include "f_pc/f_pc_node_req.h" #include "SSystem/SComponent/c_malloc.h" #include "SSystem/SStandard/s_basic.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_create_req.h" #include "f_pc/f_pc_creator.h" @@ -16,10 +14,6 @@ #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_stdcreate_req.h" -// -// Declarations: -// - /* 800227C4-80022804 0040+00 s=1 e=0 z=0 None .text fpcNdRq_RequestQTo__FP19node_create_request */ void fpcNdRq_RequestQTo(node_create_request* pNodeCreateReq) { diff --git a/src/f_pc/f_pc_pause.cpp b/src/f_pc/f_pc_pause.cpp index b73a436775..3fd9a81a14 100644 --- a/src/f_pc/f_pc_pause.cpp +++ b/src/f_pc/f_pc_pause.cpp @@ -1,17 +1,11 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_pause -// +/** + * f_pc_pause.cpp + * Framework - Process Pause + */ #include "f_pc/f_pc_pause.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_layer_iter.h" -// -// Declarations: -// - /* 80023844-80023868 0024+00 s=0 e=3 z=0 None .text fpcPause_IsEnable__FPvUc */ s32 fpcPause_IsEnable(void* pProcess, u8 flag) { base_process_class* pProc = (base_process_class*)pProcess; diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp index 1ae9e4492d..7ba902b769 100644 --- a/src/f_pc/f_pc_priority.cpp +++ b/src/f_pc/f_pc_priority.cpp @@ -1,19 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_priority -// +/** + * f_pc_priority.cpp + * Framework - Process Priority + */ #include "f_pc/f_pc_priority.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_layer.h" #include "f_pc/f_pc_layer_tag.h" -// -// Declarations: -// - /* 80023130-80023150 0020+00 s=0 e=1 z=0 None .text fpcPi_IsInQueue__FP22process_priority_class */ s32 fpcPi_IsInQueue(process_priority_class* pPi) { @@ -179,4 +173,4 @@ s32 fpcPi_Init(process_priority_class* pPi, void* pUserData, unsigned int layer, /* ############################################################################################## */ /* 804505F0-804505F8 0008+00 s=0 e=5 z=1 None .sdata None */ -SECTION_SDATA s8 data_804505F0 = 0xFF; +s8 data_804505F0 = 0xFF; diff --git a/src/f_pc/f_pc_profile.cpp b/src/f_pc/f_pc_profile.cpp index 5c39867585..28e38b5fe7 100644 --- a/src/f_pc/f_pc_profile.cpp +++ b/src/f_pc/f_pc_profile.cpp @@ -1,12 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_profile -// - +/** + * f_pc_profile.cpp + * Framework - Process Profile + */ #include "f_pc/f_pc_profile.h" -#include "dol2asm.h" -#include "dolphin/types.h" /* ############################################################################################## */ /* 80450D50-80450D58 0004+04 s=1 e=0 z=2 None .sbss g_fpcPf_ProfileList_p */ diff --git a/src/f_pc/f_pc_searcher.cpp b/src/f_pc/f_pc_searcher.cpp index 3eef07bbf0..16a9b8e741 100644 --- a/src/f_pc/f_pc_searcher.cpp +++ b/src/f_pc/f_pc_searcher.cpp @@ -1,15 +1,9 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_searcher -// +/** + * f_pc_searcher.cpp + * Framework - Process Searcher + */ #include "f_pc/f_pc_searcher.h" -#include "dol2asm.h" -#include "dolphin/types.h" - -// -// Declarations: -// /* 80023578-80023590 0018+00 s=0 e=3 z=77 None .text fpcSch_JudgeForPName__FPvPv */ void* fpcSch_JudgeForPName(void* pProc, void* pUserData) { diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index 77f2f9503a..c1811c92a8 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -1,19 +1,13 @@ -// -// Generated By: dol2asm -// Translation Unit: f_pc/f_pc_stdcreate_req -// +/** + * f_pc_stdcreate_req.cpp + * Framework - Process Standard Create Request + */ #include "f_pc/f_pc_stdcreate_req.h" -#include "dol2asm.h" -#include "dolphin/types.h" #include "f_pc/f_pc_base.h" #include "f_pc/f_pc_load.h" #include "f_pc/f_pc_node.h" -// -// Declarations: -// - /* 80023B70-80023BC4 0054+00 s=1 e=0 z=5 None .text * fpcSCtRq_phase_Load__FP29standard_create_request_class */ s32 fpcSCtRq_phase_Load(standard_create_request_class* pStdCreateReq) { diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 532aba4740..4e1bedc7db 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -216,7 +216,7 @@ BOOL mDoMemCdRWm_TestCheckSumGameData(void* data) { /* 80017D38-80017D7C 012678 0044+00 0/0 4/4 0/0 .text mDoMemCdRWm_SetCheckSumGameData__FPUcUc */ void mDoMemCdRWm_SetCheckSumGameData(u8* data, u8 dataNum) { - u8* file_ptr = data + (dataNum * 0xA94); + u8* file_ptr = data + (dataNum * QUEST_LOG_SIZE); *(u64*)(file_ptr + 0xA8C) = mDoMemCdRWm_CalcCheckSumGameData(file_ptr, 0xA8C); }