diff --git a/src/ReceiveCommands.cc b/src/ReceiveCommands.cc
index 13f4f8fa..d43a0b21 100644
--- a/src/ReceiveCommands.cc
+++ b/src/ReceiveCommands.cc
@@ -2058,7 +2058,7 @@ static process_command_t gc_handlers[0x100] = {
   nullptr, nullptr, nullptr, nullptr,
 
   // D0
-  nullptr, nullptr, nullptr, nullptr,
+  nullptr, nullptr, nullptr, nullptr, // D0 is process trade
   nullptr, nullptr, process_message_box_closed, process_gba_file_request,
   process_info_board_request, process_write_info_board_dc_gc, nullptr, process_verify_license_gc,
   process_ep3_menu_challenge, nullptr, nullptr, nullptr,
diff --git a/src/ReceiveSubcommands.cc b/src/ReceiveSubcommands.cc
index 84a78185..d0741950 100644
--- a/src/ReceiveSubcommands.cc
+++ b/src/ReceiveSubcommands.cc
@@ -1016,7 +1016,7 @@ subcommand_handler_t subcommand_handlers[0x100] = {
   process_subcommand_pick_up_item,
   process_subcommand_unimplemented,
   process_subcommand_unimplemented,
-  process_subcommand_unimplemented,
+  process_subcommand_forward_check_size_game, // drop meseta
   process_subcommand_forward_check_size_game,
   process_subcommand_forward_check_size_game,
   // 60
@@ -1054,10 +1054,10 @@ subcommand_handler_t subcommand_handlers[0x100] = {
   process_subcommand_unimplemented,
   process_subcommand_unimplemented,
   // 80
+  process_subcommand_forward_check_size_game, // trigger trap
   process_subcommand_unimplemented,
   process_subcommand_unimplemented,
-  process_subcommand_unimplemented,
-  process_subcommand_unimplemented,
+  process_subcommand_forward_check_size_game, // place trap
   process_subcommand_forward_check_size_game,
   process_subcommand_forward_check_size_game,
   process_subcommand_unimplemented,
@@ -1094,7 +1094,7 @@ subcommand_handler_t subcommand_handlers[0x100] = {
   process_subcommand_unimplemented,
   process_subcommand_unimplemented,
   process_subcommand_unimplemented,
-  process_subcommand_unimplemented,
+  process_subcommand_forward_check_size, // trade proposal
   process_subcommand_unimplemented,
   process_subcommand_unimplemented,
   process_subcommand_unimplemented,